DevKit updates for 3.x branch (#7541)

* DevKit updates * DevKit updates * DevKit updates * Fix build Co-authored-by: Vincent Langlet <[email protected]>
sonata-project · Oct 17, 2021 · ec8c8ab · ec8c8ab
1 parent 57255c6
commit ec8c8ab
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 46 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -58,4 +58,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
@@ -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

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -25,18 +25,18 @@ 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
 
             - 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,15 +49,15 @@ 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
 
             - 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
@@ -31,7 +31,7 @@ jobs:
                     - '8.0'
                 dependencies: [highest]
                 allowed-to-fail: [false]
-                symfony-require: [""]
+                symfony-require: ['']
                 variant: [normal]
                 include:
                     - php-version: '7.3'
@@ -41,12 +41,12 @@ jobs:
                     - php-version: '8.0'
                       dependencies: highest
                       allowed-to-fail: false
-                      variant: 'sonata-project/block-bundle:"3.*"'
+                      variant: sonata-project/block-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
@@ -81,6 +81,7 @@
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.84",
         "phpstan/phpstan-symfony": "^0.12.10",
+        "phpunit/phpunit": "^9.5",
         "psalm/plugin-symfony": "^2.0",
         "psr/event-dispatcher": "^1.0",
         "sensio/framework-extra-bundle": "^5.6 || ^6.1",

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/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php b/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php
@@ -485,7 +485,7 @@ private function replaceDefaultArguments(
             $declaredInParent = $parentDefinition && \array_key_exists($index, $parentArguments);
             $argumentValue = $declaredInParent ? $parentArguments[$index] : $arguments[$index];
 
-            if (null === $argumentValue || 0 === \strlen($argumentValue)) {
+            if (null === $argumentValue || '' === $argumentValue) {
                 $arguments[$declaredInParent ? sprintf('index_%s', $index) : $index] = $value;
             }
         }

diff --git a/src/DependencyInjection/Compiler/ModelManagerCompilerPass.php b/src/DependencyInjection/Compiler/ModelManagerCompilerPass.php
@@ -21,10 +21,6 @@
 /**
  * This class injects available model managers to services which depend on them.
  *
- * @final since sonata-project/admin-bundle 3.52
- *
- * NEXT_MAJOR: Remove the "since" part of the internal annotation.
- *
  * @internal since sonata-project/admin-bundle version 4.0
  *
  * @author Gaurav Singh Faudjdar <[email protected]>

diff --git a/src/Filter/FilterInterface.php b/src/Filter/FilterInterface.php
@@ -113,7 +113,7 @@ public function getParentAssociationMappings();
     public function getFieldMapping();
 
     /**
-     * @return array<string, string>  association mapping
+     * @return array<string, string> association mapping
      */
     public function getAssociationMapping();
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ name: Stale @@
     on:
       schedule:
-        - cron: "0 9-18 * * *"
+        - cron: 0 9-18 * * *
     jobs:
       stale:
@@ Expand Down @@