Merge remote-tracking branch 'upstream/3.x' into 4.x

.github/workflows/documentation.yaml

@@ -58,4 +58,4 @@ jobs:
               with:
                   args: --short --error-format=github
               env:
-                  DOCS_DIR: 'docs/'
+                  DOCS_DIR: docs/

.github/workflows/lint.yaml

@@ -22,24 +22,38 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v2
 
-            - name: Run PHP-CS-Fixer
-              uses: docker://oskarstark/php-cs-fixer-ga:3.0.0
+            - name: Install PHP with extensions
+              uses: shivammathur/setup-php@v2
               with:
-                  args: --ansi --verbose --diff --dry-run
+                  php-version: '8.0'
+                  coverage: none
+                  tools: composer:v2, php-cs-fixer:3
+              env:
+                  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    composer-normalize:
-        name: composer-normalize
+            - name: Lint PHP files
+              run: make lint-php
+
+    composer:
+        name: Composer
 
         runs-on: ubuntu-latest
 
         steps:
             - name: Checkout
               uses: actions/checkout@v2
 
-            - name: Run composer-normalize
-              uses: docker://ergebnis/composer-normalize-action:0.8.0
+            - name: Install PHP with extensions
+              uses: shivammathur/setup-php@v2
               with:
-                  args: --dry-run
+                  php-version: '8.0'
+                  coverage: none
+                  tools: composer:v2, composer-normalize:2
+              env:
+                  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Lint Composer
+              run: make lint-composer
 
     yaml-files:
         name: YAML files

.github/workflows/qa.yaml

@@ -25,19 +25,19 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: '8.0'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb-1.9.0, zip
 
             - name: Install Composer dependencies (highest)
-              uses: "ramsey/composer-install@v1"
+              uses: ramsey/composer-install@v1
               with:
-                  dependency-versions: "highest"
-                  composer-options: "--prefer-dist --prefer-stable"
+                  dependency-versions: highest
+                  composer-options: --prefer-dist --prefer-stable
 
             - name: PHPStan
-              run: vendor/bin/phpstan --memory-limit=1G analyse
+              run: vendor/bin/phpstan --memory-limit=1G analyse --error-format=github
     psalm:
         name: Psalm
 
@@ -50,16 +50,16 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: '8.0'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb-1.9.0, zip
 
             - name: Install Composer dependencies (highest)
-              uses: "ramsey/composer-install@v1"
+              uses: ramsey/composer-install@v1
               with:
-                  dependency-versions: "highest"
-                  composer-options: "--prefer-dist --prefer-stable"
+                  dependency-versions: highest
+                  composer-options: --prefer-dist --prefer-stable
 
             - name: Psalm
               run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.0

.github/workflows/stale.yaml

@@ -8,7 +8,7 @@ name: Stale
 
 on:
   schedule:
-    - cron: "0 9-18 * * *"
+    - cron: 0 9-18 * * *
 
 jobs:
   stale:

.github/workflows/test.yaml

@@ -37,7 +37,7 @@ jobs:
                     - '8.0'
                 dependencies: [highest]
                 allowed-to-fail: [false]
-                symfony-require: [""]
+                symfony-require: ['']
                 variant: [normal]
                 include:
                     - php-version: '7.3'
@@ -79,9 +79,9 @@ jobs:
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-            - name: "Globally install symfony/flex"
+            - name: Globally install symfony/flex
               if: matrix.symfony-require != ''
-              run: "composer global require --no-progress --no-scripts --no-plugins symfony/flex"
+              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
 
             - name: Install variant
               if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
@@ -94,16 +94,16 @@ jobs:
               if: matrix.symfony-require == '6.0.*'
               run: composer remove vimeo/psalm psalm/plugin-phpunit psalm/plugin-symfony weirdan/doctrine-psalm-plugin --dev --no-update --no-interaction
 
-            - name: "Install Composer dependencies (${{ matrix.dependencies }})"
-              uses: "ramsey/composer-install@v1"
+            - name: Install Composer dependencies (${{ matrix.dependencies }})
+              uses: ramsey/composer-install@v1
               with:
-                  dependency-versions: "${{ matrix.dependencies }}"
-                  composer-options: "--prefer-dist --prefer-stable"
+                  dependency-versions: ${{ matrix.dependencies }}
+                  composer-options: --prefer-dist --prefer-stable
 
             - name: Run Tests with coverage
               run: make coverage
 
             - name: Send coverage to Codecov
-              uses: codecov/codecov-action@v1
+              uses: codecov/codecov-action@v2
               with:
                   file: build/logs/clover.xml

.php-cs-fixer.dist.php

@@ -24,16 +24,12 @@
     '@PHPUnit60Migration:risky' => true,
     '@Symfony' => true,
     '@Symfony:risky' => true,
-    'array_syntax' => [
-        'syntax' => 'short',
-    ],
+    'array_syntax' => ['syntax' => 'short'],
     'combine_consecutive_issets' => true,
     'combine_consecutive_unsets' => true,
     'compact_nullable_typehint' => true,
     'global_namespace_import' => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false],
-    'header_comment' => [
-        'header' => $header,
-    ],
+    'header_comment' => ['header' => $header],
     'list_syntax' => ['syntax' => 'short'],
     'logical_operators' => true,
     'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
@@ -56,6 +52,7 @@
     'static_lambda' => true,
     'strict_comparison' => true,
     'strict_param' => true,
+    'types_spaces' => ['space' => 'single'],
     'void_return' => false,
 ];
 

Makefile

@@ -10,6 +10,7 @@ lint: lint-composer lint-yaml lint-xml lint-xliff lint-php
 .PHONY: lint
 
 lint-composer:
+	composer-normalize --dry-run
 	composer validate
 .PHONY: lint-composer
 
@@ -46,7 +47,7 @@ lint-php:
 	php-cs-fixer fix --ansi --verbose --diff --dry-run
 .PHONY: lint-php
 
-cs-fix: cs-fix-php cs-fix-xml cs-fix-xliff
+cs-fix: cs-fix-php cs-fix-xml cs-fix-xliff cs-fix-composer
 .PHONY: cs-fix
 
 cs-fix-php:
@@ -73,15 +74,19 @@ cs-fix-xliff:
 	done
 .PHONY: cs-fix-xliff
 
+cs-fix-composer:
+	composer-normalize
+.PHONY: cs-fix-composer
+
 build:
 	mkdir $@
 
 test:
-	vendor/bin/simple-phpunit -c phpunit.xml.dist
+	vendor/bin/phpunit -c phpunit.xml.dist
 .PHONY: test
 
 coverage:
-	vendor/bin/simple-phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
+	vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
 .PHONY: coverage
 
 docs:

composer.json

@@ -57,6 +57,7 @@
         "phpstan/phpstan-phpunit": "^0.12.17",
         "phpstan/phpstan-strict-rules": "^0.12.10",
         "phpstan/phpstan-symfony": "^0.12.20",
+        "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.15.1",
         "psalm/plugin-symfony": "^2.0",
         "sonata-project/block-bundle": "^4.2",
@@ -83,13 +84,5 @@
         "psr-4": {
             "Sonata\\DoctrineMongoDBAdminBundle\\Tests\\": "tests/"
         }
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/simple-phpunit install"
-        ],
-        "post-update-cmd": [
-            "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/simple-phpunit install"
-        ]
     }
 }

phpstan.neon.dist

@@ -4,9 +4,6 @@ includes:
 parameters:
     level: max
 
-    bootstrapFiles:
-        - vendor/bin/.phpunit/phpunit/vendor/autoload.php
-
     paths:
         - src
         - tests

phpunit.xml.dist

@@ -26,15 +26,17 @@ It's auto-generated by sonata-project/dev-kit package.
         </include>
     </coverage>
 
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
+
     <extensions>
         <extension class="Symfony\Component\Panther\ServerExtension" />
     </extensions>
 
     <php>
         <ini name="precision" value="8" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
-        <env name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
         <server name="PANTHER_WEB_SERVER_DIR" value="./tests/App/public/" />
     </php>
-
 </phpunit>

psalm.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="2" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" autoloader="vendor/bin/.phpunit/phpunit/vendor/autoload.php">
+<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="2" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>