Fix old code

loevgaard · loevgaard · commit b3377be80cbb · 2022-04-07T14:39:52.000+02:00
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/composer.json b/composer.json
@@ -4,13 +4,14 @@
     "description": "Add barcodes to your products using this plugin",
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4",
         "doctrine/persistence": "^1.3 || ^2.0",
         "setono/doctrine-orm-batcher-bundle": "^0.3.1",
         "sylius/sylius": "^1.3",
-        "symfony/config": "^4.4 || ^5.0",
-        "symfony/event-dispatcher": "^4.4 || ^5.0",
-        "symfony/messenger": "^4.4 || ^5.0",
+        "symfony/config": "^4.4 || ^5.4",
+        "symfony/event-dispatcher": "^4.4 || ^5.4",
+        "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
+        "symfony/messenger": "^4.4 || ^5.4",
         "thecodingmachine/safe": "^1.0",
         "violuke/php-barcodes": "^1.0"
     },
@@ -20,34 +21,29 @@
         "behat/mink-browserkit-driver": "^1.3",
         "behat/mink-extension": "^2.2",
         "behat/mink-selenium2-driver": "^1.3",
-        "ergebnis/composer-normalize": "^2.0",
         "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
         "friends-of-behat/symfony-extension": "^2.0",
         "friends-of-behat/variadic-extension": "^1.1",
         "lakion/mink-debug-extension": "^1.2.3",
         "phpspec/phpspec": "^6.1",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-doctrine": "^0.12",
-        "phpstan/phpstan-strict-rules": "^0.12",
-        "phpstan/phpstan-webmozart-assert": "^0.12",
         "phpunit/phpunit": "^8.3",
         "roave/security-advisories": "dev-latest",
         "sensiolabs/security-checker": "^5.0",
-        "sylius-labs/coding-standard": "^3.1",
+        "setono/code-quality-pack": "^2.1.3",
         "symfony/browser-kit": "^4.4 || ^5.0",
         "symfony/debug-bundle": "^4.4 || ^5.0",
         "symfony/dotenv": "^4.4 || ^5.0",
         "symfony/intl": "^4.4 || ^5.0",
         "symfony/web-profiler-bundle": "^4.4 || ^5.0",
-        "symfony/web-server-bundle": "^4.4 || ^5.0",
-        "thecodingmachine/phpstan-safe-rule": "^1.0"
+        "symfony/web-server-bundle": "^4.4 || ^5.0"
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
             "symfony/thanks": true,
-            "ergebnis/composer-normalize": true
+            "ergebnis/composer-normalize": true,
+            "dealerdirect/phpcodesniffer-composer-installer": false
         }
     },
     "extra": {
@@ -72,7 +68,7 @@
             "@checks",
             "@tests"
         ],
-        "analyse": "vendor/bin/phpstan analyse -c phpstan.neon -l max src/",
+        "analyse": "psalm",
         "assets": [
             "@ensure-assets-installed",
             "@ensure-assets-compiled"
@@ -82,7 +78,7 @@
             "SYMFONY_ENV=test composer ensure-env-copied",
             "vendor/bin/behat --tags=\"~@javascript\" --no-interaction --format=progress"
         ],
-        "check-style": "vendor/bin/ecs check src/ spec/",
+        "check-style": "ecs check",
         "checks": [
             "composer validate --strict",
             "composer normalize --dry-run",
@@ -101,7 +97,7 @@
         "ensure-env-test-copied": "(cd tests/Application && ([[ -f .env.test.local ]] || cp .env.test .env.test.local))",
         "ensure-schema-updated": "composer ensure-env-copied && (cd tests/Application && bin/console doctrine:schema:update --force -e ${SYMFONY_ENV:-'dev'})",
         "ensure-vendors-installed": "[[ -f vendor/autoload.php ]] || php -d memory_limit=-1 /usr/local/bin/composer install",
-        "fix-style": "vendor/bin/ecs check src/ spec/ --fix",
+        "fix-style": "ecs check --fix",
         "fixtures": [
             "@ensure-database-ready",
             "(cd tests/Application && bin/console sylius:fixtures:load --no-interaction -e ${SYMFONY_ENV:-'dev'})"
diff --git a/easy-coding-standard.yml b/easy-coding-standard.yml
diff --git a/ecs.php b/ecs.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Option;
+use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import('vendor/sylius-labs/coding-standard/ecs.php');
+
+    $containerConfigurator->parameters()->set(Option::PATHS, [
+        'src', 'tests', 'spec'
+    ]);
+
+    $containerConfigurator->parameters()->set(Option::SKIP, [
+        VisibilityRequiredFixer::class => ['*Spec.php'],
+    ]);
+};
diff --git a/phpstan.neon b/phpstan.neon
diff --git a/psalm.xml b/psalm.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<psalm
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    errorLevel="4"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
+    </projectFiles>
+    <forbiddenFunctions>
+        <function name="dd"/>
+        <function name="dump"/>
+    </forbiddenFunctions>
+</psalm>
diff --git a/src/BarcodeChecker/BarcodeChecker.php b/src/BarcodeChecker/BarcodeChecker.php
@@ -13,15 +13,12 @@
 
 final class BarcodeChecker implements BarcodeCheckerInterface
 {
-    /** @var EventDispatcherInterface */
+    /** @var LegacyEventDispatcherProxy */
     private $eventDispatcher;
 
     public function __construct(EventDispatcherInterface $eventDispatcher)
     {
-        /** @var EventDispatcherInterface $eventDispatcher */
-        $eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
-
-        $this->eventDispatcher = $eventDispatcher;
+        $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
     }
 
     public function check(BarcodeAwareInterface $barcodeAware): void
diff --git a/src/DependencyInjection/LoevgaardSyliusBarcodeExtension.php b/src/DependencyInjection/LoevgaardSyliusBarcodeExtension.php
@@ -11,9 +11,9 @@
 
 final class LoevgaardSyliusBarcodeExtension extends Extension
 {
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
-        $config = $this->processConfiguration($this->getConfiguration([], $container), $config);
+        $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
         $container->setParameter('loevgaard_sylius_barcode.form.require', $config['form']['require']);
         $container->setParameter('loevgaard_sylius_barcode.form.require_valid', $config['form']['require_valid']);
         $container->setParameter('loevgaard_sylius_barcode.form.require_unique', $config['form']['require_unique']);
diff --git a/src/Event/PostBarcodeCheckEvent.php b/src/Event/PostBarcodeCheckEvent.php
@@ -5,7 +5,7 @@
 namespace Loevgaard\SyliusBarcodePlugin\Event;
 
 use Loevgaard\SyliusBarcodePlugin\Model\BarcodeAwareInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 final class PostBarcodeCheckEvent extends Event
 {
diff --git a/src/Event/PreBarcodeCheckEvent.php b/src/Event/PreBarcodeCheckEvent.php
@@ -5,7 +5,7 @@
 namespace Loevgaard\SyliusBarcodePlugin\Event;
 
 use Loevgaard\SyliusBarcodePlugin\Model\BarcodeAwareInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 final class PreBarcodeCheckEvent extends Event
 {
diff --git a/src/Fixture/Factory/ProductExampleFactoryTrait.php b/src/Fixture/Factory/ProductExampleFactoryTrait.php
@@ -4,6 +4,7 @@
 
 namespace Loevgaard\SyliusBarcodePlugin\Fixture\Factory;
 
+use Faker\Factory;
 use Loevgaard\SyliusBarcodePlugin\Model\ProductVariantInterface as LoevgaardBarcodeProductVariantInterface;
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
@@ -16,14 +17,14 @@ protected function setRandomBarcodesToVariants(ProductInterface $product): void
         static $faker;
 
         if (null === $faker) {
-            $faker = \Faker\Factory::create();
+            $faker = Factory::create();
         }
 
         /** @var ProductVariantInterface|LoevgaardBarcodeProductVariantInterface $variant */
         foreach ($product->getVariants() as $variant) {
             Assert::isInstanceOf($variant, LoevgaardBarcodeProductVariantInterface::class);
 
-            $variant->setBarcode($faker->ean13);
+            $variant->setBarcode($faker->ean13());
         }
     }
 }
diff --git a/src/Message/Handler/ProcessBatchHandler.php b/src/Message/Handler/ProcessBatchHandler.php
@@ -4,8 +4,8 @@
 
 namespace Loevgaard\SyliusBarcodePlugin\Message\Handler;
 
-use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ManagerRegistry;
 use InvalidArgumentException;
 use Loevgaard\SyliusBarcodePlugin\BarcodeChecker\BarcodeCheckerInterface;
 use Loevgaard\SyliusBarcodePlugin\Message\Command\ProcessBatch;
diff --git a/tests/Application/Kernel.php b/tests/Application/Kernel.php
@@ -82,19 +82,18 @@ protected function getContainerBaseClass(): string
 
     protected function getContainerLoader(ContainerInterface $container): LoaderInterface
     {
-        /** @var ContainerBuilder $container */
         Assert::isInstanceOf($container, ContainerBuilder::class);
 
         $locator = new FileLocator($this, $this->getRootDir() . '/Resources');
-        $resolver = new LoaderResolver(array(
+        $resolver = new LoaderResolver([
             new XmlFileLoader($container, $locator),
             new YamlFileLoader($container, $locator),
             new IniFileLoader($container, $locator),
             new PhpFileLoader($container, $locator),
             new GlobFileLoader($container, $locator),
             new DirectoryLoader($container, $locator),
             new ClosureLoader($container),
-        ));
+        ]);
 
         return new DelegatingLoader($resolver);
     }
diff --git a/tests/Application/config/bootstrap.php b/tests/Application/config/bootstrap.php
@@ -1,21 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 use Symfony\Component\Dotenv\Dotenv;
 
-require dirname(__DIR__).'../../../vendor/autoload.php';
+require dirname(__DIR__) . '../../../vendor/autoload.php';
 
 // Load cached env vars if the .env.local.php file exists
 // Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)
-if (is_array($env = @include dirname(__DIR__).'/.env.local.php')) {
+if (is_array($env = @include dirname(__DIR__) . '/.env.local.php')) {
     $_SERVER += $env;
     $_ENV += $env;
 } elseif (!class_exists(Dotenv::class)) {
     throw new RuntimeException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.');
 } else {
     // load all the .env files
-    (new Dotenv())->loadEnv(dirname(__DIR__).'/.env');
+    (new Dotenv())->loadEnv(dirname(__DIR__) . '/.env');
 }
 
 $_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';
diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
diff --git a/tests/Application/public/index.php b/tests/Application/public/index.php
@@ -1,10 +1,12 @@
 <?php
 
-use Tests\Loevgaard\SyliusBarcodePlugin\Application\Kernel;
+declare(strict_types=1);
+
 use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Request;
+use Tests\Loevgaard\SyliusBarcodePlugin\Application\Kernel;
 
-require dirname(__DIR__).'/config/bootstrap.php';
+require dirname(__DIR__) . '/config/bootstrap.php';
 
 if ($_SERVER['APP_DEBUG']) {
     umask(0000);
diff --git a/tests/Behat/Context/Ui/Admin/ManagingProductsContext.php b/tests/Behat/Context/Ui/Admin/ManagingProductsContext.php
@@ -11,14 +11,10 @@
 
 final class ManagingProductsContext implements Context
 {
-    /**
-     * @var CreateSimpleProductPage
-     */
+    /** @var CreateSimpleProductPage */
     private $createSimpleProductPage;
 
-    /**
-     * @var UpdateSimpleProductPage
-     */
+    /** @var UpdateSimpleProductPage */
     private $updateSimpleProductPage;
 
     public function __construct(CreateSimpleProductPage $createSimpleProductPage, UpdateSimpleProductPage $updateSimpleProductPage)
diff --git a/tests/Behat/Page/Admin/Product/CreateSimpleProductPage.php b/tests/Behat/Page/Admin/Product/CreateSimpleProductPage.php
@@ -10,6 +10,7 @@ class CreateSimpleProductPage extends BaseCreatePage
 {
     /**
      * @param $barcode
+     *
      * @throws \Behat\Mink\Exception\ElementNotFoundException
      */
     public function setBarcode($barcode): void
@@ -18,7 +19,7 @@ public function setBarcode($barcode): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getDefinedElements(): array
     {
diff --git a/tests/Behat/Page/Admin/Product/UpdateSimpleProductPage.php b/tests/Behat/Page/Admin/Product/UpdateSimpleProductPage.php
@@ -9,7 +9,7 @@
 class UpdateSimpleProductPage extends BaseUpdatePage
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getDefinedElements(): array
     {
diff --git a/tests/EventListener/AddIndicesSubscriberTest.php b/tests/EventListener/AddIndicesSubscriberTest.php
@@ -23,7 +23,7 @@ public function it_subscribes_to_the_correct_event(): void
         $events = $subscriber->getSubscribedEvents();
 
         $this->assertSame([
-            Events::loadClassMetadata
+            Events::loadClassMetadata,
         ], $events);
     }
 
@@ -48,7 +48,7 @@ public function it_does_not_add_indices_when_subclass_is_wrong(): void
      */
     public function it_adds_indices(): void
     {
-        $class = new class implements BarcodeAwareInterface {
+        $class = new class() implements BarcodeAwareInterface {
             use ProductVariantTrait;
         };
         $metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
@@ -66,12 +66,12 @@ public function it_adds_indices(): void
         $this->assertSame([
             'indexes' => [
                 [
-                    'columns' => ['barcode_checked']
+                    'columns' => ['barcode_checked'],
                 ],
                 [
-                    'columns' => ['barcode_valid']
-                ]
-            ]
+                    'columns' => ['barcode_valid'],
+                ],
+            ],
         ], $metadata->table);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,12 @@`
`13`	`13`
`14`	`14`	`final class BarcodeChecker implements BarcodeCheckerInterface`
`15`	`15`	`{`
`16`		`- /** @var EventDispatcherInterface */`
	`16`	`+ /** @var LegacyEventDispatcherProxy */`
`17`	`17`	`private $eventDispatcher;`
`18`	`18`
`19`	`19`	`public function __construct(EventDispatcherInterface $eventDispatcher)`
`20`	`20`	`{`
`21`		`- /** @var EventDispatcherInterface $eventDispatcher */`
`22`		`- $eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);`
`23`		`-`
`24`		`- $this->eventDispatcher = $eventDispatcher;`
	`21`	`+ $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);`
`25`	`22`	`}`
`26`	`23`
`27`	`24`	`public function check(BarcodeAwareInterface $barcodeAware): void`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`
`12`	`12`	`final class LoevgaardSyliusBarcodeExtension extends Extension`
`13`	`13`	`{`
`14`		`- public function load(array $config, ContainerBuilder $container): void`
	`14`	`+ public function load(array $configs, ContainerBuilder $container): void`
`15`	`15`	`{`
`16`		`- $config = $this->processConfiguration($this->getConfiguration([], $container), $config);`
	`16`	`+ $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);`
`17`	`17`	`$container->setParameter('loevgaard_sylius_barcode.form.require', $config['form']['require']);`
`18`	`18`	`$container->setParameter('loevgaard_sylius_barcode.form.require_valid', $config['form']['require_valid']);`
`19`	`19`	`$container->setParameter('loevgaard_sylius_barcode.form.require_unique', $config['form']['require_unique']);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Loevgaard\SyliusBarcodePlugin\Event;`
`6`	`6`
`7`	`7`	`use Loevgaard\SyliusBarcodePlugin\Model\BarcodeAwareInterface;`
`8`		`-use Symfony\Component\EventDispatcher\Event;`
	`8`	`+use Symfony\Contracts\EventDispatcher\Event;`
`9`	`9`
`10`	`10`	`final class PostBarcodeCheckEvent extends Event`
`11`	`11`	`{`