diff --git a/phpstan.neon.dist b/phpstan.neon.dist index a2df6f90e97e65195067ae19055d5df12ad8ac45..9b8ee11ea2884157ae2645d70e04cd7e0c8d89fe 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -6,6 +6,8 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. +includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon parameters: level: 8 paths: diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 603adbd80b2219b03b0283850ea912fe754b2ca1..755a1fd3f3a01047758bb8dff94dad52c817d690 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,6 @@ @@ -21,11 +21,11 @@ - + tests/Unit - + tests/Functional diff --git a/resources/config/Drupal/10.x/Module/phpstan.neon.dist b/resources/config/Drupal/10.x/Module/phpstan.neon.dist index 5b6c90ebacd630d11c68d4ef882b25c5d50cfe50..fbfc591786ec6073c92b3c661f95eaca6d327aa1 100644 --- a/resources/config/Drupal/10.x/Module/phpstan.neon.dist +++ b/resources/config/Drupal/10.x/Module/phpstan.neon.dist @@ -7,6 +7,8 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. +includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon parameters: level: 8 fileExtensions: diff --git a/resources/config/Drupal/10.x/Module/phpunit.xml.dist b/resources/config/Drupal/10.x/Module/phpunit.xml.dist index 50e40b5f5525f34cb14a07a2b27fd2d455237473..624f5247027f85d192904fc924b9b19c6940b408 100644 --- a/resources/config/Drupal/10.x/Module/phpunit.xml.dist +++ b/resources/config/Drupal/10.x/Module/phpunit.xml.dist @@ -1,6 +1,6 @@ @@ -17,11 +17,11 @@ - + tests/Unit - + tests/Functional diff --git a/resources/config/Drupal/10.x/Project/phpstan.neon.dist b/resources/config/Drupal/10.x/Project/phpstan.neon.dist index 3053b985027187697db50ab21ebde0b6b1bfc664..f66b4a17c85ca19b3a3e8dab206c6cfd740165d9 100644 --- a/resources/config/Drupal/10.x/Project/phpstan.neon.dist +++ b/resources/config/Drupal/10.x/Project/phpstan.neon.dist @@ -7,6 +7,8 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. +includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon parameters: level: 8 fileExtensions: diff --git a/resources/config/Drupal/10.x/Project/phpunit.xml.dist b/resources/config/Drupal/10.x/Project/phpunit.xml.dist index 9222a23effa59e0627e3031d8350c5117ac1c017..f7634bca260ae699f3962167bb79b17da0cc2c66 100644 --- a/resources/config/Drupal/10.x/Project/phpunit.xml.dist +++ b/resources/config/Drupal/10.x/Project/phpunit.xml.dist @@ -1,6 +1,6 @@ @@ -19,11 +19,11 @@ - + tests/Unit - + tests/Functional diff --git a/resources/config/Drupal/11.x/Module/phpstan.neon.dist b/resources/config/Drupal/11.x/Module/phpstan.neon.dist index 5b6c90ebacd630d11c68d4ef882b25c5d50cfe50..fbfc591786ec6073c92b3c661f95eaca6d327aa1 100644 --- a/resources/config/Drupal/11.x/Module/phpstan.neon.dist +++ b/resources/config/Drupal/11.x/Module/phpstan.neon.dist @@ -7,6 +7,8 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. +includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon parameters: level: 8 fileExtensions: diff --git a/resources/config/Drupal/11.x/Module/phpunit.xml.dist b/resources/config/Drupal/11.x/Module/phpunit.xml.dist index 603adbd80b2219b03b0283850ea912fe754b2ca1..755a1fd3f3a01047758bb8dff94dad52c817d690 100644 --- a/resources/config/Drupal/11.x/Module/phpunit.xml.dist +++ b/resources/config/Drupal/11.x/Module/phpunit.xml.dist @@ -1,6 +1,6 @@ @@ -21,11 +21,11 @@ - + tests/Unit - + tests/Functional diff --git a/resources/config/Drupal/11.x/Project/phpstan.neon.dist b/resources/config/Drupal/11.x/Project/phpstan.neon.dist index 3053b985027187697db50ab21ebde0b6b1bfc664..f66b4a17c85ca19b3a3e8dab206c6cfd740165d9 100644 --- a/resources/config/Drupal/11.x/Project/phpstan.neon.dist +++ b/resources/config/Drupal/11.x/Project/phpstan.neon.dist @@ -7,6 +7,8 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. +includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon parameters: level: 8 fileExtensions: diff --git a/resources/config/Drupal/11.x/Project/phpunit.xml.dist b/resources/config/Drupal/11.x/Project/phpunit.xml.dist index 40584437cdc9b466c11604b9a2ba8649468771a0..f993e4847f8e53c73bd8e0dbe8ba56cd2c46be36 100644 --- a/resources/config/Drupal/11.x/Project/phpunit.xml.dist +++ b/resources/config/Drupal/11.x/Project/phpunit.xml.dist @@ -1,6 +1,6 @@ @@ -23,11 +23,11 @@ - + tests/Unit - + tests/Functional diff --git a/resources/config/Laravel/11.x/Package/phpstan.neon.dist b/resources/config/Laravel/11.x/Package/phpstan.neon.dist index 00d9f2b5a26b7a8b404f59da5230b4eccc5b3735..40f784acbd8ab2bcdc4b33a97fd6f403084e3068 100644 --- a/resources/config/Laravel/11.x/Package/phpstan.neon.dist +++ b/resources/config/Laravel/11.x/Package/phpstan.neon.dist @@ -8,6 +8,7 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon - ./vendor/larastan/larastan/extension.neon - ./vendor/wterberg/phpstan-laravel/extension.neon parameters: diff --git a/resources/config/Laravel/11.x/Package/phpunit.xml.dist b/resources/config/Laravel/11.x/Package/phpunit.xml.dist index f3da19004199958e8b36f03e09ae584d7cef0255..c7b2ff164a17216c255b6f4ccc6d2c671ab2a14e 100644 --- a/resources/config/Laravel/11.x/Package/phpunit.xml.dist +++ b/resources/config/Laravel/11.x/Package/phpunit.xml.dist @@ -1,6 +1,6 @@ @@ -21,11 +21,11 @@ - + tests/Unit - + tests/Functional @@ -34,9 +34,11 @@ - - - + + + + + diff --git a/resources/config/Laravel/11.x/Project/phpstan.neon.dist b/resources/config/Laravel/11.x/Project/phpstan.neon.dist index 11d53e8dfce79ea90d80015e20ca5a8489d1116a..8fc4814b8181d8fa9efbd2b810f57ce0b7f0cb73 100644 --- a/resources/config/Laravel/11.x/Project/phpstan.neon.dist +++ b/resources/config/Laravel/11.x/Project/phpstan.neon.dist @@ -8,10 +8,15 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon - ./vendor/larastan/larastan/extension.neon - ./vendor/wterberg/phpstan-laravel/extension.neon parameters: level: 8 paths: - app + - bootstrap + - database + excludePaths: + - bootstrap/cache tipsOfTheDay: false diff --git a/resources/config/Laravel/11.x/Project/phpunit.xml.dist b/resources/config/Laravel/11.x/Project/phpunit.xml.dist index 9e6abb2303fe497274dbe5d3f4393c65ed85b085..7bac8dedfd4a2552ea63281d6a9a4cfc26f2f67b 100644 --- a/resources/config/Laravel/11.x/Project/phpunit.xml.dist +++ b/resources/config/Laravel/11.x/Project/phpunit.xml.dist @@ -21,11 +21,11 @@ - + tests/Unit - + tests/Functional @@ -34,9 +34,11 @@ - - - + + + + + diff --git a/resources/config/Standard/phpstan.neon.dist b/resources/config/Standard/phpstan.neon.dist index a2df6f90e97e65195067ae19055d5df12ad8ac45..9b8ee11ea2884157ae2645d70e04cd7e0c8d89fe 100644 --- a/resources/config/Standard/phpstan.neon.dist +++ b/resources/config/Standard/phpstan.neon.dist @@ -6,6 +6,8 @@ # This file was generated using XpertSelect/Tools. Please refer to the README for more information. +includes: + - ./vendor/phpstan/phpstan-strict-rules/rules.neon parameters: level: 8 paths: diff --git a/resources/config/Standard/phpunit.xml.dist b/resources/config/Standard/phpunit.xml.dist index 603adbd80b2219b03b0283850ea912fe754b2ca1..755a1fd3f3a01047758bb8dff94dad52c817d690 100644 --- a/resources/config/Standard/phpunit.xml.dist +++ b/resources/config/Standard/phpunit.xml.dist @@ -1,6 +1,6 @@ @@ -21,11 +21,11 @@ - + tests/Unit - + tests/Functional diff --git a/src/Services/DependencyService.php b/src/Services/DependencyService.php index e1cd398651313fb7605c641fab913a45b90451aa..9bd8e3be55c6fe75a368ced1f1cbdf0fbfb3de23 100644 --- a/src/Services/DependencyService.php +++ b/src/Services/DependencyService.php @@ -33,7 +33,7 @@ final readonly class DependencyService */ public function __construct(string $composerFilePath = '') { - $this->composerFilePath = empty($composerFilePath) ? Factory::getComposerFile() : $composerFilePath; + $this->composerFilePath = '' === $composerFilePath ? Factory::getComposerFile() : $composerFilePath; } /** diff --git a/src/Services/ProjectClassifierService.php b/src/Services/ProjectClassifierService.php index 30c61dd26af34170d7b973d7e307554982b38942..e834c587f5e9f9d33bfe758c303e80fd39cfdbee 100644 --- a/src/Services/ProjectClassifierService.php +++ b/src/Services/ProjectClassifierService.php @@ -221,6 +221,6 @@ final readonly class ProjectClassifierService */ private function isModuleOrPackage(string $type): bool { - return in_array($type, self::MODULE_OR_PACKAGE_COMPOSER_TYPES); + return in_array($type, self::MODULE_OR_PACKAGE_COMPOSER_TYPES, true); } } diff --git a/src/ToolsPlugin.php b/src/ToolsPlugin.php index 69e46de30b953f9dd5cd1e200c9b380172022226..3734965547f1c0038c678169e9454ef885e2f298 100644 --- a/src/ToolsPlugin.php +++ b/src/ToolsPlugin.php @@ -118,7 +118,8 @@ final class ToolsPlugin implements PluginInterface, EventSubscriberInterface */ private function getProjectRoot(Composer $composer): string { - $vendorDir = $composer->getConfig()->get('vendor-dir') ?: 'vendor'; + $vendorDir = $composer->getConfig()->get('vendor-dir') ?? null; + $vendorDir = is_string($vendorDir) && '' !== $vendorDir ? $vendorDir : 'vendor'; if (!$this->isAbsolutePath($vendorDir)) { $composerFile = Factory::getComposerFile(); @@ -126,7 +127,8 @@ final class ToolsPlugin implements PluginInterface, EventSubscriberInterface $vendorDir = $baseDir . DIRECTORY_SEPARATOR . $vendorDir; } - $vendorDir = realpath($vendorDir) ?: $vendorDir; + $realPath = realpath($vendorDir); + $vendorDir = is_string($realPath) ? $realPath : $vendorDir; return dirname($vendorDir); } @@ -147,6 +149,6 @@ final class ToolsPlugin implements PluginInterface, EventSubscriberInterface return true; } - return preg_match('#^[A-Za-z]:\\\\#', $path) || strpos($path, '\\\\') === 0; + return boolval(preg_match('#^[A-Za-z]:\\\\#', $path)) || strpos($path, '\\\\') === 0; } }