Fix build integration tests (#836)

* Fix build integration tests

* phpstan 1.12

* make sure phpstan is also updated

* try a fix for core_baseline

* try a fix

* try a fix

* try again for baseline

* try again

* typo

* try ^1?

* remove baseline

* 11.1

Author: mglaman

.github/workflows/php.yml

@@ -93,8 +93,8 @@ jobs:
             drupal: "^9.0"
             experimental: false
           - php-version: "8.3"
-            drupal: "11.x-dev"
-            experimental: true
+            drupal: "~11.1"
+            experimental: false
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -121,7 +121,7 @@ jobs:
       - name: "require phpstan-drupal"
         run: |
           cd ~/drupal
-          COMPOSER_MEMORY_LIMIT=-1 composer require mglaman/phpstan-drupal "${{ steps.branch_alias.outputs.VERSION_ALIAS }} as 1.2.99" phpstan/extension-installer --with-all-dependencies
+          COMPOSER_MEMORY_LIMIT=-1 composer require phpstan/phpstan:"^1" mglaman/phpstan-drupal "${{ steps.branch_alias.outputs.VERSION_ALIAS }} as 1.99.99" phpstan/extension-installer --with-all-dependencies
           cp $GITHUB_WORKSPACE/tests/fixtures/config/drupal-phpstan.neon phpstan.neon
       - name: "Test core/install.php"
         run: |
@@ -203,58 +203,3 @@ jobs:
         run: |
           cd ~/drupal
           ./vendor/bin/phpstan analyze web/core/modules/dynamic_page_cache --debug
-
-  core_baseline:
-    needs:
-      - lint
-      - tests
-    continue-on-error: true
-    runs-on: "ubuntu-latest"
-    name: "Drupal core HEAD baseline check"
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v4"
-      - name: "set the version alias for self"
-        run: |
-          if [ "${{ github.event_name }}" == 'pull_request' ]; then
-            echo "VERSION_ALIAS=dev-"${{ github.sha }}"" >> $GITHUB_OUTPUT
-          else
-            echo "VERSION_ALIAS=dev-main" >> $GITHUB_OUTPUT
-          fi
-        id: branch_alias
-      - name: determine phpstan cache directory
-        run: echo PHPSTAN_TMP_DIR=$(php -r "print sys_get_temp_dir() . '/phpstan';") >> $GITHUB_OUTPUT
-        id: phpstan_tmp_dir
-      - name: cache phpstan
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.phpstan_tmp_dir.outputs.PHPSTAN_TMP_DIR }}
-          key: ${{ runner.os }}-phpstan-core-baseline
-          restore-keys: ${{ runner.os }}-phpstan-core-baseline
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "8.3"
-          tools: composer:v2
-          extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd, apcu
-      - name: "Checkout Drupal core"
-        run: |
-         cd ${{ runner.temp }}
-         git clone https://git.drupalcode.org/project/drupal.git
-         cd drupal
-         composer config repositories.0 composer https://packages.drupal.org/8
-         composer config repositories.1 path $GITHUB_WORKSPACE
-
-      - name: "Install Drupal core dependencies"
-        uses: "ramsey/composer-install@v3"
-        with:
-          working-directory: "${{ runner.temp }}/drupal"
-      - name: "require phpstan-drupal"
-        run: |
-          cd ${{ runner.temp }}/drupal
-          composer require --dev mglaman/phpstan-drupal "${{ steps.branch_alias.outputs.VERSION_ALIAS }} as 1.1.99" --with-all-dependencies
-      - name: "Check baseline"
-        run: |
-          cd ${{ runner.temp }}/drupal
-          ./vendor/bin/phpstan analyze --configuration=core/phpstan.neon.dist

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "phpstan/phpstan": "^1.10.56",
+        "phpstan/phpstan": "^1.12",
         "phpstan/phpstan-deprecation-rules": "^1.1.4",
         "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0",
         "symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0",