Update tools and use make to run them

nucleos · Dec 4, 2021 · 1297c85 · 1297c85
1 parent fddf614
commit 1297c85
Show file tree

Hide file tree

Showing 11 changed files with 820 additions and 1,580 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 8.0
+          - 8.1
 
     steps:
       - name: "Checkout"
@@ -31,9 +31,6 @@ jobs:
           extensions: "mbstring, json"
           php-version: ${{ matrix.php-version }}
 
-      - name: "Validate composer.json and composer.lock"
-        run: composer validate --strict
-
       - name: "Cache dependencies installed with composer"
         uses: actions/cache@v2.1.7
         with:
@@ -45,8 +42,8 @@ jobs:
       - name: "Install locked dependencies with composer"
         run: composer install --no-interaction --no-progress --no-suggest
 
-      - name: "Run localheinz/composer-normalize"
-        run: composer normalize --dry-run
+      - name: "Run composer lint"
+        run: make lint-composer
 
       - name: "Create cache directory for friendsofphp/php-cs-fixer"
         run: mkdir -p .build/php-cs-fixer
@@ -60,7 +57,9 @@ jobs:
             php${{ matrix.php-version }}-php-cs-fixer-
 
       - name: "Run friendsofphp/php-cs-fixer"
-        run: composer cs-diff
+        env:
+            PHP_CS_FIXER_IGNORE_ENV: 1
+        run: make cs
 
   static-code-analysis:
     name: "Static Code Analysis"
@@ -95,13 +94,13 @@ jobs:
         run: composer install --no-interaction --no-progress --no-suggest
 
       - name: "Run phpstan/phpstan"
-        run: composer phpstan
+        run: make phpstan
 
       - name: "Run psalm"
-        run: vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4
+        run: make psalm
 
       - name: "Run phpmd"
-        run: composer phpmd
+        run: make phpmd
 
   tests:
     name: "Test (PHP ${{ matrix.php-version }}, symfony ${{ matrix.symfony }}, ${{ matrix.dependencies }})"
@@ -157,7 +156,7 @@ jobs:
         run: composer update --no-interaction --no-progress --no-suggest
 
       - name: "Run tests with phpunit/phpunit"
-        run: composer test
+        run: make test
 
   code-coverage:
     name: "Code Coverage"
@@ -192,7 +191,7 @@ jobs:
         run: composer install --no-interaction --no-progress --no-suggest
 
       - name: "Collect code coverage with pcov and phpunit/phpunit"
-        run: composer coverage
+        run: make coverage
 
       - name: "Send code coverage report to Codecov.io"
         env:
@@ -231,8 +230,5 @@ jobs:
       - name: "Install locked dependencies with composer"
         run: composer install --no-interaction --no-progress --no-suggest
 
-      - name: "Download infection"
-        run: wget -O infection https://github.com/infection/infection/releases/download/0.19.0/infection.phar && chmod +x infection
-
       - name: "Run mutation tests with pcov and infection/infection"
-        run: ./infection
+        run: make infection
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,11 @@
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 coverage
 composer.lock
 phpunit.xml
+Makefile
 /build/
 /vendor/
 !/vendor-bin/tools/composer.lock
 /vendor-bin/tools/vendor/
+/vendor-bin/tools/bin/
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -11,7 +11,7 @@
     ->in([ __DIR__.'/src',  __DIR__.'/tests'])
 ;
 
-$config = PhpCsFixer\Config::create()
+$config = (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
@@ -35,7 +35,10 @@
         ],
         'php_unit_internal_class' => false,
         'php_unit_test_class_requires_covers' => false,
-        'no_superfluous_phpdoc_tags' => true,
+        'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+            'remove_inheritdoc' => true,
+        ],
         'static_lambda' => true,
         'global_namespace_import' => [
            'import_classes' => true,

diff --git a/Makefile b/Makefile
@@ -0,0 +1,64 @@
+.PHONY: default
+default: lint
+
+.PHONY: fix
+fix: cs-fix lint-fix
+
+.PHONY: lint
+lint: lint-composer
+
+.PHONY: lint-composer
+lint-composer:
+	composer validate --strict
+	composer normalize --dry-run
+
+.PHONY: test
+test: vendor-bin/tools/vendor
+	vendor/bin/phpunit --colors=always
+
+.PHONY: infection
+infection: vendor/bin/infection
+	vendor/bin/infection
+
+.PHONY: coverage
+coverage: vendor-bin/tools/vendor
+	vendor/bin/phpunit --colors=always --coverage-clover=build/logs/clover.xml
+
+.PHONY: cs
+cs: vendor-bin/tools/vendor
+	vendor/bin/php-cs-fixer fix  --verbose --diff --dry-run
+
+.PHONY: cs-fix
+cs-fix: vendor-bin/tools/vendor
+	vendor/bin/php-cs-fixer fix --verbose
+
+.PHONY: psalm
+psalm: vendor-bin/tools/vendor
+	vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4
+
+.PHONY: phpstan
+phpstan: vendor-bin/tools/vendor
+	vendor/bin/phpstan analyse
+
+.PHONY: phpmd
+phpmd: vendor-bin/tools/vendor
+	vendor/bin/phpmd src,tests ansi phpmd.xml
+
+.PHONY: lint-fix
+lint-fix:
+	find ./src \\( -name '*.xml' -or -name '*.xml.dist' -or -name '*.xlf' \\) -type f -exec xmllint --encode UTF-8 --output '{}' --format '{}' \\;
+	find ./src \\( -name '*.yml' -or -name '*.yaml' \\) -not -path '*/vendor/*' | xargs yaml-lint
+
+.PHONY: check-dependencies
+check-dependencies: vendor-bin/tools/vendor
+	vendor/bin/composer-require-checker check --config-file composer-require.json composer.json
+
+#
+# Installation tasks
+#
+
+vendor-bin/tools/vendor:
+	composer --working-dir=vendor-bin/tools install
+
+vendor/bin/infection: vendor-bin/tools/vendor
+	wget -O vendor/bin/infection https://github.com/infection/infection/releases/download/0.25.0/infection.phar && chmod +x vendor/bin/infection
diff --git a/composer.json b/composer.json
@@ -34,7 +34,6 @@
         "symfony/framework-bundle": "<4.4"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.3",
         "doctrine/doctrine-bundle": "^2.0",
         "ergebnis/composer-normalize": "^2.0.1",
         "symfony/browser-kit": "^4.4 || ^5.3",
@@ -58,26 +57,6 @@
             "Nucleos\\Doctrine\\Tests\\": "tests/"
         }
     },
-    "scripts": {
-        "post-install-cmd": [
-            "@composer bin all install --ansi"
-        ],
-        "post-update-cmd": [
-            "@composer bin all install --ansi"
-        ],
-        "coverage": "vendor/bin/phpunit --colors=always --coverage-clover=build/logs/clover.xml",
-        "cs": "PHP_CS_FIXER_IGNORE_ENV=1 && vendor/bin/php-cs-fixer fix --verbose",
-        "cs-diff": "PHP_CS_FIXER_IGNORE_ENV=1 && vendor/bin/php-cs-fixer fix  --verbose --diff --diff-format=udiff --dry-run",
-        "deps": "vendor/bin/composer-require-checker check --config-file composer-require.json composer.json",
-        "infection": "vendor/bin/infection",
-        "lint": [
-            "find ./src \\( -name '*.xml' -or -name '*.xml.dist' -or -name '*.xlf' \\) -type f -exec xmllint --encode UTF-8 --output '{}' --format '{}' \\;",
-            "find ./src \\( -name '*.yml' -or -name '*.yaml' \\) -not -path '*/vendor/*' | xargs yaml-lint"
-        ],
-        "phpmd": "vendor/bin/phpmd src,tests ansi phpmd.xml",
-        "phpstan": "vendor/bin/phpstan analyse",
-        "test": "vendor/bin/phpunit --colors=always"
-    },
     "funding": [
         {
             "type": "github",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -65,6 +65,21 @@ parameters:
 			count: 1
 			path: src/EventListener/ORM/UniqueActiveListener.php
 
+		-
+			message: "#^Method Nucleos\\\\Doctrine\\\\Tests\\\\Bridge\\\\Symfony\\\\App\\\\AppKernel\\:\\:configureContainer\\(\\) has parameter \\$container with no type specified\\.$#"
+			count: 1
+			path: tests/Bridge/Symfony/App/AppKernel.php
+
+		-
+			message: "#^Method Nucleos\\\\Doctrine\\\\Tests\\\\Bridge\\\\Symfony\\\\App\\\\AppKernel\\:\\:configureContainer\\(\\) has parameter \\$loader with no type specified\\.$#"
+			count: 1
+			path: tests/Bridge/Symfony/App/AppKernel.php
+
+		-
+			message: "#^Method Nucleos\\\\Doctrine\\\\Tests\\\\Bridge\\\\Symfony\\\\App\\\\AppKernel\\:\\:configureRoutes\\(\\) has parameter \\$routes with no type specified\\.$#"
+			count: 1
+			path: tests/Bridge/Symfony/App/AppKernel.php
+
 		-
 			message: "#^Call to method getResponse\\(\\) on an unknown class Symfony\\\\Component\\\\HttpKernel\\\\Client\\.$#"
 			count: 1

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,14 +2,11 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: max
+    level: 8
 
     paths:
         - src
         - tests
 
     bootstrapFiles:
         - vendor-bin/tools/vendor/autoload.php
-
-    excludes_analyse:
-        - tests/bootstrap.php
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.18.2@19aa905f7c3c7350569999a93c40ae91ae4e1626">
+<files psalm-version="4.13.1@5cf660f63b548ccd4a56f62d916ee4d6028e01a3">
   <file src="src/Bridge/Symfony/DependencyInjection/Configuration.php">
     <ArgumentTypeCoercion occurrences="1">
       <code>$rootNode</code>
@@ -11,11 +11,6 @@
       <code>end</code>
     </PossiblyUndefinedMethod>
   </file>
-  <file src="src/EventListener/ORM/TablePrefixEventListener.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$newDefinition</code>
-    </InvalidScalarArgument>
-  </file>
   <file src="src/Test/ORM/EntityManagerMockFactory.php">
     <MismatchingDocblockReturnType occurrences="1">
       <code>EntityManager|MockObject</code>

diff --git a/src/EventListener/ORM/TablePrefixEventListener.php b/src/EventListener/ORM/TablePrefixEventListener.php
@@ -85,6 +85,7 @@ private function addSequencePrefix(ClassMetadata $classMetadata, EntityManager $
 
         $classMetadata->setSequenceGeneratorDefinition($newDefinition);
 
+        // @phpstan-ignore-next-line
         if (isset($classMetadata->idGenerator)) {
             $this->addSequenceGenerator($classMetadata, $em, $newDefinition);
         }

diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -3,27 +3,27 @@
     "type": "project",
     "description": "Development tools that do not conflict the project dependencies",
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16",
-        "infection/infection": "^0.18.2",
-        "jangregor/phpstan-prophecy": "^0.8",
-        "maglnet/composer-require-checker": "^2.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
-        "phpmd/phpmd": "^2.9",
-        "phpspec/prophecy-phpunit": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.3",
+        "jangregor/phpstan-prophecy": "^1.0",
+        "maglnet/composer-require-checker": "^3.5",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.3",
+        "phpmd/phpmd": "^2.10",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
-        "phpstan/phpstan-strict-rules": "^0.12",
-        "phpstan/phpstan-symfony": "^0.12",
-        "phpunit/phpunit": "^8.5 || ^9.0",
-        "psalm/plugin-phpunit": "^0.12",
-        "psalm/plugin-symfony": "^1.3",
-        "symfony/phpunit-bridge": "^5.1",
-        "vimeo/psalm": "^3.11"
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
+        "phpunit/phpunit": "^9.5",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "psalm/plugin-phpunit": "^0.16",
+        "psalm/plugin-symfony": "^3.0",
+        "symfony/phpunit-bridge": "^6.0",
+        "vimeo/psalm": "^4.13"
     },
     "config": {
         "platform": {
-            "php": "8.0"
-        }
+            "php": "8.0.2"
+        },
+        "bin-dir": "../../vendor/bin"
     }
 }