New dir structure

.github/workflows/build.yml

@@ -88,7 +88,7 @@ jobs:
 
             -
                 name: Run ECS
-                run: vendor/bin/ecs check src
+                run: vendor/bin/ecs check
                 if: always() && steps.end-of-setup.outcome == 'success'
 
             -

composer.json

@@ -27,10 +27,11 @@
         "friends-of-behat/variadic-extension": "^1.3",
         "nyholm/psr7": "^1.4",
         "phpspec/phpspec": "^7.0",
-        "phpstan/extension-installer": "^1.2",
-        "phpstan/phpstan-doctrine": "^1",
-        "phpstan/phpstan-strict-rules": "^1",
-        "phpstan/phpstan-webmozart-assert": "^1",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan-doctrine": "^1.5",
+        "phpstan/phpstan-symfony": "^1.4",
+        "phpstan/phpstan-webmozart-assert": "^1.2",
         "phpunit/phpunit": "^10",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "robertfausk/behat-panther-extension": "^1.1",

ecs.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-return static function (ECSConfig $config): void {
-    $config->import('vendor/sylius-labs/coding-standard/ecs.php');
-    $config->paths([
+return ECSConfig::configure()
+    ->withSets([
+        'vendor/sylius-labs/coding-standard/ecs.php',
+    ])
+    ->withPaths([
         'src',
         'tests',
-    ]);
-};
+    ])
+;

phpstan.neon

@@ -0,0 +1,6 @@
+includes:
+    - 'phpstan.neon.dist'
+
+parameters:
+    editorUrl: '%%file%%:%%line%%'
+

phpstan.neon.dist

@@ -1,22 +1,7 @@
 parameters:
-    reportUnmatchedIgnoredErrors: false
-    checkMissingIterableValueType: false
 
     level: max
 
     paths:
         - src
-        - tests
-
-    excludePaths:
-        # Makes PHPStan crash
-        - 'src/DependencyInjection/Configuration.php'
-
-        - tests/Application/Kernel.php
-        - tests/Application/public/index.php
-        - tests/Application/config/**.php
-        - tests/Application/var/**.php
-        - tests/Application/node_modules/**.php
-
-    ignoreErrors:
-        - '/Parameter #1 \$configuration of method Symfony\\Component\\DependencyInjection\\Extension\\Extension::processConfiguration\(\) expects Symfony\\Component\\Config\\Definition\\ConfigurationInterface, Symfony\\Component\\Config\\Definition\\ConfigurationInterface\|null given\./'
+        - tests/Behat

src/DependencyInjection/CompilerPass/SymfonyHttpClientCompilerPass.php

@@ -20,21 +20,21 @@ public function process(ContainerBuilder $container): void
         if (false === $container->has(ClientInterface::class)) {
             $container->setDefinition(
                 ClientInterface::class,
-                new Definition(Psr18Client::class)
+                new Definition(Psr18Client::class),
             );
         }
 
         if (false === $container->has(RequestFactoryInterface::class)) {
             $container->setDefinition(
                 RequestFactoryInterface::class,
-                new Definition(Psr17Factory::class)
+                new Definition(Psr17Factory::class),
             );
         }
 
         if (false === $container->has(StreamFactoryInterface::class)) {
             $container->setDefinition(
                 StreamFactoryInterface::class,
-                new Definition(Psr17Factory::class)
+                new Definition(Psr17Factory::class),
             );
         }
     }

src/DependencyInjection/FluxSESyliusHCaptchaExtension.php

@@ -7,10 +7,9 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-final class FluxSESyliusHCaptchaExtension extends Extension implements PrependExtensionInterface
+final class FluxSESyliusHCaptchaExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
@@ -27,7 +26,7 @@ public function prepend(ContainerBuilder $container): void
                     'form_themes' => [
                         '@FluxSESyliusHCaptchaPlugin/hcaptcha.html.twig',
                     ],
-                ]
+                ],
             );
         }
 
@@ -53,7 +52,7 @@ public function prepend(ContainerBuilder $container): void
                             ],
                         ],
                     ],
-                ]
+                ],
             );
         }
     }

src/FluxSESyliusHCaptchaPlugin.php

@@ -21,4 +21,9 @@ public function build(ContainerBuilder $container): void
             ->addCompilerPass(new SymfonyHttpClientCompilerPass())
         ;
     }
+
+    public function getPath(): string
+    {
+        return dirname(__DIR__);
+    }
 }

tests/Application/config/bootstrap.php

@@ -24,4 +24,4 @@
 
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
 $_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
-$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
+$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], \FILTER_VALIDATE_BOOLEAN) ? '1' : '0';

tests/Application/config/sylius/1.12/bundles.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
     SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],

tests/Behat/Context/Ui/Shop/CaptchaContext.php

@@ -13,9 +13,6 @@ final class CaptchaContext implements Context
     /** @var PageInterface */
     private $page;
 
-    /**
-     * @param PageInterface $page
-     */
     public function __construct(PageInterface $page)
     {
         $this->page = $page;