Merge 3.x into 4.x

sonata-project · Oct 19, 2021 · aca24b7 · aca24b7
2 parents 2dbe966 + c118906
commit aca24b7
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 51 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -57,4 +57,4 @@ jobs:
               with:
                   args: --short --error-format=github
               env:
-                  DOCS_DIR: 'docs/'
+                  DOCS_DIR: docs/
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -21,24 +21,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

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -24,19 +24,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: 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
 
@@ -49,16 +49,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: 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
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -8,7 +8,7 @@ name: Stale
 
 on:
   schedule:
-    - cron: "0 9-18 * * *"
+    - cron: 0 9-18 * * *
 
 jobs:
   stale:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -30,7 +30,7 @@ jobs:
                     - '8.0'
                 dependencies: [highest]
                 allowed-to-fail: [false]
-                symfony-require: [""]
+                symfony-require: ['']
                 variant: [normal]
                 include:
                     - php-version: '7.3'
@@ -40,12 +40,12 @@ jobs:
                     - php-version: '8.0'
                       dependencies: highest
                       allowed-to-fail: false
-                      variant: 'sonata-project/admin-bundle:"3.*"'
+                      variant: sonata-project/admin-bundle:"3.*"
                     - php-version: '8.0'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 4.4.*
-                      variant: 'symfony/symfony:"4.4.*"'
+                      variant: symfony/symfony:"4.4.*"
 
         steps:
             - name: Checkout
@@ -62,9 +62,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')
@@ -77,16 +77,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
diff --git a/.php-cs-fixer.dist.php b/.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,
 ];
 

diff --git a/Makefile b/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:

diff --git a/composer.json b/composer.json
@@ -70,6 +70,7 @@
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^0.12.99",
         "phpstan/phpstan-phpunit": "^0.12.22",
+        "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.16.1",
         "sonata-project/admin-bundle": "^3.59",
         "sonata-project/block-bundle": "^3.18",
@@ -101,13 +102,5 @@
             "Sonata\\NewsBundle\\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"
-        ]
-    },
     "abandoned": true
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,8 +3,6 @@ includes:
 
 parameters:
     level: 2
-    bootstrapFiles:
-        - vendor/bin/.phpunit/phpunit/vendor/autoload.php
     paths:
         - src
         - tests

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -26,10 +26,12 @@ It's auto-generated by sonata-project/dev-kit package.
         </include>
     </coverage>
 
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
+
     <php>
         <ini name="precision" value="8" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
-        <env name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
     </php>
-
 </phpunit>
diff --git a/psalm.xml b/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="8" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" autoloader="vendor/bin/.phpunit/phpunit/vendor/autoload.php" errorBaseline="psalm-baseline.xml">
+<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="8" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" errorBaseline="psalm-baseline.xml">
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -11,6 +11,8 @@
  * file that was distributed with this source code.
  */
 
+use Doctrine\Deprecations\Deprecation;
+
 /*
  * DO NOT EDIT THIS FILE!
  *
@@ -24,6 +26,10 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
+if (class_exists(Deprecation::class)) {
+    Deprecation::enableWithTriggerError();
+}
+
 if (file_exists($file = __DIR__.'/custom_bootstrap.php')) {
     require_once $file;
 }