refactor #28 Add support for Symfony 5.0 / PHP 7.4 (pamil)

This PR was merged into the 1.6-dev branch.

Discussion
----------

Includes and closes #27, includes a bit of maintenance as well.

BC breaks in commands, though it has really low impact and I'd be surprised if it breaks the application for any of end-users. Totally worth it (so we can add Symfony 5 support).

Commits
-------

d0113a9 Remove "zendframework/zend-stdlib" dependency
b36dd74 Update dependencies to allow for Symfony 5
6cecb52 Apply coding standard fixes
8bb6b98 Improve Travis: PHP 7.4 support, Symfony 4.4 and 5.0
64ea901 Add an UPGRADE.md note about a BC break

Author: lchrusciel

.gitignore

@@ -6,3 +6,4 @@
 
 /phpspec.yml
 /phpunit.xml
+/.phpunit.result.cache

.travis.yml

@@ -3,11 +3,11 @@ language: php
 php:
     - 7.2
     - 7.3
+    - 7.4
 
 env:
-    - SYMFONY_VERSION=3.4.*
-    - SYMFONY_VERSION=4.1.*
-    - SYMFONY_VERSION=4.2.*
+    - SYMFONY_VERSION=4.4.*
+    - SYMFONY_VERSION=5.0.*
 
 cache:
     directories:
@@ -26,5 +26,4 @@ script:
 
     - composer analyse
 
-    - vendor/bin/phpspec run
-    - vendor/bin/phpunit tests
+    - composer test

UPGRADE.md

@@ -0,0 +1,4 @@
+## UPGRADE FROM `1.5.x` TO `1.6`
+
+- Commands `FixturesListCommand` and `FixturesLoadCommand` are not container aware anymore, they have dependencies
+  injected through the constructor. Adjust your code if you've modified them or their DI definitions.

composer.json

@@ -24,22 +24,19 @@
 
         "doctrine/data-fixtures": "^1.2",
         "monolog/monolog": "^1.8",
-        "symfony/framework-bundle": "^3.4|^4.1.1",
-        "symfony/monolog-bridge": "^3.4|^4.1.1",
-        "webmozart/assert": "^1.0",
-        "zendframework/zend-stdlib": "^3.0"
+        "symfony/framework-bundle": "^4.4|^5.0",
+        "symfony/monolog-bridge": "^4.4|^5.0",
+        "webmozart/assert": "^1.0"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^1.3",
-        "doctrine/orm": "^2.5",
-        "matthiasnoback/symfony-config-test": "^4.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
-        "phpspec/phpspec": "^5.0",
-        "phpstan/phpstan-phpunit": "^0.10",
-        "phpstan/phpstan-shim": "^0.10",
-        "phpunit/phpunit": "^7.0",
-        "proget-hq/phpstan-phpspec": "^0.1.1",
-        "sylius-labs/coding-standard": "^3.0"
+        "doctrine/doctrine-bundle": "^2.0",
+        "doctrine/orm": "^2.7",
+        "matthiasnoback/symfony-config-test": "^4.2",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "phpspec/phpspec": "^6.1",
+        "phpunit/phpunit": "^8.5",
+        "sylius-labs/coding-standard": "^3.1",
+        "vimeo/psalm": "3.11.4"
     },
     "autoload": {
         "psr-4": { "Sylius\\Bundle\\FixturesBundle\\": "src/" }
@@ -52,7 +49,15 @@
     },
     "scripts": {
         "analyse": [
-            "@php vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max spec src tests"
+            "vendor/bin/ecs check spec src tests",
+            "vendor/bin/psalm"
+        ],
+        "fix": [
+            "vendor/bin/ecs check spec src tests --fix"
+        ],
+        "test": [
+            "vendor/bin/phpspec run --ansi --no-interaction",
+            "vendor/bin/phpunit --colors=always"
         ]
     },
     "extra": {

easy-coding-standard.yml

@@ -1,6 +1,10 @@
 imports:
     - { resource: 'vendor/sylius-labs/coding-standard/easy-coding-standard.yml' }
 
+parameters:
+    exclude_files:
+        - '**/var/*'
+
 services:
     PhpCsFixer\Fixer\Comment\HeaderCommentFixer:
         header: |

phpstan.neon

@@ -5,7 +5,11 @@
          colors="true"
 >
     <php>
+        <ini name="error_reporting" value="-1" />
+
         <env name="KERNEL_CLASS" value="Sylius\Bundle\FixturesBundle\Tests\Application\Kernel" />
+
+        <server name="SHELL_VERBOSITY" value="-1" />
     </php>
 
     <testsuites>

phpunit.xml.dist

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="2"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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" />
+            <file name="src/Listener/MongoDBPurgerListener.php" />
+            <file name="src/Listener/PHPCRPurgerListener.php" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

psalm.xml

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Bundle\FixturesBundle\Suite;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\FixturesBundle\Suite\PriorityQueue;
+
+final class PriorityQueueSpec extends ObjectBehavior
+{
+    function it_is_initializable(): void
+    {
+        $this->shouldHaveType(PriorityQueue::class);
+    }
+
+    function it_keeps_fifo_order_for_elements_with_same_priority(): void
+    {
+        $this->insert(['element' => 1]);
+        $this->insert(['element' => 2]);
+
+        $this->getIterator()->shouldIterateAs([['element' => 1], ['element' => 2]]);
+    }
+
+    function it_sorts_elements_by_their_priority(): void
+    {
+        $this->insert(['element' => 3], -1);
+        $this->insert(['element' => 2], 0);
+        $this->insert(['element' => 1], 1);
+
+        $this->getIterator()->shouldIterateAs([['element' => 1], ['element' => 2], ['element' => 3]]);
+    }
+}

spec/Suite/PriorityQueueSpec.php

@@ -15,12 +15,26 @@
 
 use Sylius\Bundle\FixturesBundle\Fixture\FixtureRegistryInterface;
 use Sylius\Bundle\FixturesBundle\Suite\SuiteRegistryInterface;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-final class FixturesListCommand extends ContainerAwareCommand
+final class FixturesListCommand extends Command
 {
+    /** @var SuiteRegistryInterface */
+    private $suiteRegistry;
+
+    /** @var FixtureRegistryInterface */
+    private $fixtureRegistry;
+
+    public function __construct(SuiteRegistryInterface $suiteRegistry, FixtureRegistryInterface $fixtureRegistry)
+    {
+        parent::__construct(null);
+
+        $this->suiteRegistry = $suiteRegistry;
+        $this->fixtureRegistry = $fixtureRegistry;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -35,15 +49,17 @@ protected function configure(): void
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output): void
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->listSuites($output);
         $this->listFixtures($output);
+
+        return 0;
     }
 
     private function listSuites(OutputInterface $output): void
     {
-        $suites = $this->getSuiteRegistry()->getSuites();
+        $suites = $this->suiteRegistry->getSuites();
 
         $output->writeln('Available suites:');
 
@@ -54,30 +70,12 @@ private function listSuites(OutputInterface $output): void
 
     private function listFixtures(OutputInterface $output): void
     {
-        $fixtures = $this->getFixtureRegistry()->getFixtures();
+        $fixtures = $this->fixtureRegistry->getFixtures();
 
         $output->writeln('Available fixtures:');
 
         foreach ($fixtures as $name => $fixture) {
             $output->writeln(' - ' . $name);
         }
     }
-
-    private function getSuiteRegistry(): SuiteRegistryInterface
-    {
-        $suiteRegistry = $this->getContainer()->get('sylius_fixtures.suite_registry');
-
-        assert($suiteRegistry instanceof SuiteRegistryInterface);
-
-        return $suiteRegistry;
-    }
-
-    private function getFixtureRegistry(): FixtureRegistryInterface
-    {
-        $fixtureRegistry = $this->getContainer()->get('sylius_fixtures.fixture_registry');
-
-        assert($fixtureRegistry instanceof FixtureRegistryInterface);
-
-        return $fixtureRegistry;
-    }
 }