Fix phpcq

Author: zonky2

.check-author.yml

@@ -1,52 +1,75 @@
 name: MetaModels attribute_file
 
 on:
-  push:
-    branches-ignore:
-      - '**-translation'
   pull_request:
+  push:
+    branches:
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    name: 'PHP: ${{ matrix.php }} Contao: ${{ matrix.contao }}'
     strategy:
+      fail-fast: false
       matrix:
-        php: [7.4]
-        contao: [~4.9.0]
+        php: [ '8.1', '8.2', '8.3' ]
+        contao: [ '~4.13.0' ]
+        phpcq_install: [ 'update' ]
+        output: [ '-o github-action -o default' ]
 
     steps:
-      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+      - name: Pull source
+        uses: actions/checkout@v4
 
-      # see https://github.com/shivammathur/setup-php
-      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup PHP.
+      - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          coverage: none
 
-      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache composer cache directory
-        uses: actions/cache@v3
+      # setup caches
+      - name: Cache composer cache directory
+        uses: actions/cache@v4
         env:
           cache-name: composer-cache-dir
         with:
           path: ~/.cache/composer
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          key: ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}
 
-      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache vendor directory
-        uses: actions/cache@v3
+      - name: Cache vendor directory
+        uses: actions/cache@v4
         env:
-          cache-name: composer-vendor
+          cache-name: vendor
         with:
           path: vendor
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.contao }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.contao }}-build-${{ env.cache-name }}-
 
-      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
-        run: composer update --prefer-dist --no-interaction --no-suggest
+      - name: Cache phpcq directory
+        uses: actions/cache@v4
+        env:
+          cache-name: phpcq
+        with:
+          path: .phpcq
+          key: ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}-${{ hashFiles('**/.phpcq.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}-
+
+      # install dependencies and tools
+      - name: Install composer dependencies
+        run: |
+          composer require contao/core-bundle ${{ matrix.contao }} --no-update
+          composer install
+      - name: Install phpcq toolchain
+        run: ./vendor/bin/phpcq ${{ matrix.phpcq_install }} -v
 
-      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Run tests
-        run: ant -keep-going
+      # run tests
+      - name: Run tests
+        run: ./vendor/bin/phpcq run -v ${{ matrix.output }}
+
+      - name: Upload build directory to artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ success() }} || ${{ failure() }}
+        with:
+          name: phpcq-builds-php-${{ matrix.php }}-${{ matrix.contao }}
+          path: .phpcq/build/

.github/workflows/diagnostics.yml

@@ -9,6 +9,7 @@ Thumbs.db
 .build/
 .external*/
 .idea/
+.phpcq/
 nbproject/
 
 # composer related

.gitignore

@@ -15,6 +15,9 @@ phpcq:
     psalm:
       version: ^1.0
       signed: false
+      requirements:
+        psalm:
+          version: ^5.26.1
     composer-require-checker:
       version: ^1.0
       signed: false

.phpcq.yaml.dist

@@ -35,7 +35,7 @@
     "contao-community-alliance/dc-general": "^2.3",
     "contao/core-bundle": "^4.13.0 <5.0",
     "doctrine/dbal": "^3.6.0",
-    "metamodels/core": "^2.3@dev",
+    "metamodels/core": "^2.3",
     "symfony/cache": "^5.4",
     "symfony/config": "^5.4",
     "symfony/dependency-injection": "^5.4",
@@ -49,7 +49,7 @@
     "contao/manager-plugin": "^2.1",
     "inspiredminds/contao-file-usage": "^3.0.1",
     "menatwork/contao-multicolumnwizard-bundle": "^3.4",
-    "metamodels/contao-frontend-editing": "^2.3@dev",
+    "metamodels/contao-frontend-editing": "^2.3",
     "phpcq/runner-bootstrap": "^1.0@dev"
   },
   "autoload": {

composer.json

@@ -33,13 +33,13 @@ services:
       tags:
         - name: contao.migration
 
-#    MetaModels\AttributeFileBundle\FileUsage\FileUsageProvider:
-#      public: true
-#      arguments:
-#        $factory: '@metamodels.factory'
-#        $urlGenerator: '@router'
-#        $requestStack: '@request_stack'
-#        $csrfTokenManager: '@contao.csrf.token_manager'
-#        $csrfTokenName: '%contao.csrf_token_name%'
-#      tags:
-#        - { name: contao_file_usage.provider }
+    MetaModels\AttributeFileBundle\FileUsage\FileUsageProvider:
+      public: true
+      arguments:
+        $factory: '@metamodels.factory'
+        $urlGenerator: '@router'
+        $requestStack: '@request_stack'
+        $csrfTokenManager: '@contao.csrf.token_manager'
+        $csrfTokenName: '%contao.csrf_token_name%'
+      tags:
+        - { name: contao_file_usage.provider }