Merge pull request #68 from ptondereau/update-symfony-5

Add support of Symfony 5.0
prooph · Dec 18, 2019 · 70b6e6d · 70b6e6d
2 parents 46ea0a5 + 1ce6c4b
commit 70b6e6d
Show file tree

Hide file tree

Showing 31 changed files with 177 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ doc/html
 .php_cs.cache
 /test/Command/Fixture/var/*
 !/test/Command/Fixture/var/.gitkeep
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
-sudo: false
-
 language: php
+sudo: false
+dist: xenial
 
 branches:
   except:
@@ -11,46 +11,83 @@ cache:
     - $HOME/.composer/cache
     - $HOME/.php-cs-fixer
 
-php:
- - 7.1
- - 7.2
-
 env:
   global:
-    - EXECUTE_CS_CHECK=false
-    - TEST_COVERAGE=false
-  matrix:
-    - DEPENDENCIES="--prefer-lowest --prefer-stable"
-    - DEPENDENCIES=""
-
-matrix:
-  fast_finish: true
-  include:
-    - php: 7.2
-      env: DEPENDENCIES="" EXECUTE_CS_CHECK=true TEST_COVERAGE=true
-  exclude:
-    - php: 7.2
-      env: DEPENDENCIES=""
+    - COMPOSER_MEMORY_LIMIT=-1
 
 before_install:
-  - phpenv config-rm xdebug.ini || return 0
+  - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
   - composer self-update
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer require --no-update satooshi/php-coveralls:^1.0 ; fi
+  - composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
 
 install:
-  - travis_retry composer update --no-interaction --prefer-dist $DEPENDENCIES
-  - composer info -i
-
-before_script:
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then mkdir -p "$HOME/.php-cs-fixer" ; fi
+  - travis_retry composer update -n --prefer-dist --prefer-stable
 
 script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml; else ./vendor/bin/phpunit; fi
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run; fi
-  - ./vendor/bin/phpstan analyse -c phpstan.neon -l 7 src
+  - ./vendor/bin/phpunit -v
+
+jobs:
+  include:
+    - php: 7.1
+      env: LOWEST SYMFONY_DEPRECATIONS_HELP=weak SYMFONY_REQUIRE="3.4.*"
+      install:
+        - composer require --dev lendable/symfony-messenger-polyfill --no-update
+        - travis_retry composer update -n --prefer-lowest --prefer-stable --prefer-dist
+
+    - php: 7.2
+      install:
+        - composer require --dev symfony/messenger --no-update
+        - travis_retry composer update -n --prefer-dist
+
+    - php: 7.3
+      install:
+        - composer require --dev symfony/messenger --no-update
+        - travis_retry composer update -n --prefer-dist
+
+
+    # Test against latest Symfony 3.4
+    - php: 7.4
+      env: SYMFONY_REQUIRE="3.4.*"
+      install:
+        - composer require --dev lendable/symfony-messenger-polyfill --no-update
+        - travis_retry composer update -n --prefer-dist
+
+    # Test against latest Symfony 4.4
+    - php: 7.4
+      env: SYMFONY_REQUIRE="4.4.*"
+      install:
+        - composer require --dev symfony/messenger --no-update
+        - travis_retry composer update -n --prefer-dist
+
+    # Test against latest Symfony 5.0
+    - php: 7.4
+      env: SYMFONY_REQUIRE="5.0.*"
+      install:
+        - composer require --dev symfony/messenger --no-update
+        - travis_retry composer update -n --prefer-dist
+
+    - stage: Code Quality
+      env: CODING_STANDARDS
+      php: 7.4
+      install:
+        - composer require --dev symfony/messenger --no-update
+        - travis_retry composer update -n --prefer-dist
+      script:
+        - ./vendor/bin/php-cs-fixer fix -v --diff --dry-run
+        - ./vendor/bin/phpstan analyse -c phpstan.neon -l 7 src
 
-after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/coveralls -v; fi
+    - stage: Coverage
+      php: 7.4
+      install:
+        - composer require --dev symfony/messenger --no-update
+        - travis_retry composer update -n --prefer-dist
+      before_script:
+        - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
+        - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
+        - composer require --dev php-coveralls/php-coveralls
+      script:
+        - ./vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml
+        - ./vendor/bin/php-coveralls -v
 
 notifications:
   webhooks:

diff --git a/composer.json b/composer.json
@@ -52,25 +52,26 @@
   },
   "require": {
     "php": "^7.1",
-    "symfony/config": "^3.3 || ^4.0",
-    "symfony/dependency-injection": "^3.3 || ^4.0",
-    "symfony/http-kernel": "^3.3 || ^4.0",
-    "symfony/framework-bundle": "^3.3 || ^4.0",
+    "ext-pdo": "*",
+    "ext-json": "*",
+    "symfony/config": "^3.4 || ^4.4 || ^5.0",
+    "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.0",
+    "symfony/http-kernel": "^3.4 || ^4.4 || ^5.0",
+    "symfony/framework-bundle": "^3.4 || ^4.4 || ^5.0",
     "prooph/event-store": "^7.0"
   },
   "require-dev": {
     "prooph/event-sourcing": "^5.0",
     "prooph/snapshot-store": "^1.0",
     "prooph/pdo-event-store": "^1.0",
-    "phpunit/phpunit": "^6",
-    "symfony/yaml" : "^3.3 || ^4.0",
+    "phpunit/phpunit": "^7 || ^8",
+    "symfony/yaml" : "^3.4 || ^4.4 || ^5.0",
     "bookdown/bookdown": "1.x-dev as 1.0.0",
     "prooph/bookdown-template": "^0.2.3",
     "friendsofphp/php-cs-fixer": "^2.8.1",
     "prooph/php-cs-fixer-config": "^0.2.1",
-    "matthiasnoback/symfony-dependency-injection-test": "^2.3",
-    "phpstan/phpstan": "^0.9.2",
-    "symfony/messenger": "^4.3"
+    "matthiasnoback/symfony-dependency-injection-test": "^3.1 || ^4.1",
+    "phpstan/phpstan": "^0.12"
   },
   "suggest": {
     "prooph/event-store-bus-bridge": "To Marry CQRS (ProophSerivceBus) with Event Sourcing"

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,7 @@
 parameters:
     reportUnmatchedIgnoredErrors: false
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
         # Only available in ArrayNodeDefinition which is given
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\)\.#'
@@ -9,6 +11,7 @@ parameters:
         # TreeBuilder in Symfony 4.2 and up has a constructor and a getRootNode() method
         - '#Class Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder does not have a constructor and must be instantiated without any parameters\.#'
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder::getRootNode\(\)#'
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder::root\(\)#'
         # More Symfony 4.2 compatibility errors
         - '#Parameter \#2 \$deleteEmittedEvents of method Prooph\\EventStore\\Projection\\ProjectionManager::deleteProjection\(\) expects bool, array<string>\|bool\|string\|null given\.#'
         - '#Property Prooph\\Bundle\\EventStore\\Command\\AbstractProjectionCommand::\$projectionName \(string\) does not accept array<string>\|string\|null\.#'
@@ -18,4 +21,5 @@ parameters:
         # MariaDbEventStore is available since pdo-event-store v1.3
         - '#Class Prooph\\EventStore\\Pdo\\MariaDbEventStore not found\.#'
         - '#Method Prooph\\Bundle\\EventStore\\ProjectionManagerFactory::createProjectionManager\(\) should return Prooph\\EventStore\\Projection\\ProjectionManager but returns Prooph\\EventStore\\Pdo\\Projection\\MariaDbProjectionManager\.#'
-        - '#Instantiated class Prooph\\EventStore\\Pdo\\Projection\\MariaDbProjectionManager not found\.#'
+        - '#Instantiated class Prooph\\EventStore\\Pdo\\Projection\\MariaDbProjectionManager not found\.#'
+        - '#Parameter \#1 $argument of class ReflectionClass constructor expects class-string<T of object>\|T of object, string\|null given.#'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,8 +4,7 @@
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         syntaxCheck="true"
+         convertWarningsToExceptions="false"
          backupGlobals="true"
          backupStaticAttributes="false">
 

diff --git a/src/Command/AbstractProjectionCommand.php b/src/Command/AbstractProjectionCommand.php
@@ -75,12 +75,12 @@ public function __construct(
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->addArgument(static::ARGUMENT_PROJECTION_NAME, InputArgument::REQUIRED, 'The name of the Projection');
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output)
+    protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         $input->validate();
 
@@ -89,18 +89,18 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         $this->projectionName = $input->getArgument(static::ARGUMENT_PROJECTION_NAME);
 
         if (! $this->projectionManagerForProjectionsLocator->has($this->projectionName)) {
-            throw new RuntimeException(\sprintf('ProjectionManager for "%s" not found', $this->projectionName));
+            throw new RuntimeException(\vsprintf('ProjectionManager for "%s" not found', \is_array($this->projectionName) ? $this->projectionName : [$this->projectionName]));
         }
         $this->projectionManager = $this->projectionManagerForProjectionsLocator->get($this->projectionName);
 
         if (! $this->projectionsLocator->has($this->projectionName)) {
-            throw new RuntimeException(\sprintf('Projection "%s" not found', $this->projectionName));
+            throw new RuntimeException(\vsprintf('Projection "%s" not found', \is_array($this->projectionName) ? $this->projectionName : [$this->projectionName]));
         }
         $this->projection = $this->projectionsLocator->get($this->projectionName);
 
         if ($this->projection instanceof ReadModelProjection) {
             if (! $this->projectionReadModelLocator->has($this->projectionName)) {
-                throw new RuntimeException(\sprintf('ReadModel for "%s" not found', $this->projectionName));
+                throw new RuntimeException(\vsprintf('ReadModel for "%s" not found', \is_array($this->projectionName) ? $this->projectionName : [$this->projectionName]));
             }
             $this->readModel = $this->projectionReadModelLocator->get($this->projectionName);
 
@@ -114,7 +114,7 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         if (null === $this->projector) {
             throw new RuntimeException('Projection was not created');
         }
-        $output->writeln(\sprintf('<header>Initialized projection "%s"</header>', $this->projectionName));
+        $output->writeln(\vsprintf('<header>Initialized projection "%s"</header>', \is_array($this->projectionName) ? $this->projectionName : [$this->projectionName]));
         try {
             $state = $this->projectionManager->fetchProjectionStatus($this->projectionName)->getValue();
         } catch (\Prooph\EventStore\Exception\RuntimeException $e) {

diff --git a/src/Command/FormatsOutput.php b/src/Command/FormatsOutput.php
@@ -9,7 +9,7 @@
 
 trait FormatsOutput
 {
-    protected function formatOutput(OutputInterface $output)
+    protected function formatOutput(OutputInterface $output): void
     {
         $outputFormatter = $output->getFormatter();
         $outputFormatter->setStyle('header', new OutputFormatterStyle('green', null));

diff --git a/src/Command/ProjectionDeleteCommand.php b/src/Command/ProjectionDeleteCommand.php
@@ -12,7 +12,7 @@ class ProjectionDeleteCommand extends AbstractProjectionCommand
 {
     protected const OPTION_WITH_EVENTS = 'with-emitted-events';
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
         $this
@@ -21,7 +21,7 @@ protected function configure()
             ->addOption(static::OPTION_WITH_EVENTS, 'w', InputOption::VALUE_NONE, 'Delete with emitted events');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $withEvents = $input->getOption(self::OPTION_WITH_EVENTS);
         if ($withEvents) {
@@ -30,5 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln(\sprintf('<action>Deleting projection </action><highlight>%s</highlight>', $this->projectionName));
         }
         $this->projectionManager->deleteProjection($this->projectionName, $withEvents);
+
+        return 0;
     }
 }
diff --git a/src/Command/ProjectionNamesCommand.php b/src/Command/ProjectionNamesCommand.php
@@ -40,7 +40,7 @@ public function __construct(ContainerInterface $projectionManagersLocator, array
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('event-store:projection:names')
@@ -64,6 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             });
         }
 
+        /** @var string|null $filter */
         $filter = $input->getArgument(self::ARGUMENT_FILTER);
         $regex = $input->getOption(static::OPTION_REGEX);
 
@@ -80,8 +81,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln('</action>');
 
         $names = [];
-        $offset = (int) $input->getOption(self::OPTION_OFFSET);
-        $limit = (int) $input->getOption(self::OPTION_LIMIT);
+        /** @var int $offset */
+        $offset = $input->getOption(self::OPTION_OFFSET);
+        /** @var int $limit */
+        $limit = $input->getOption(self::OPTION_LIMIT);
         $maxNeeded = $offset + $limit;
 
         foreach ($managerNames as $managerName) {
@@ -110,5 +113,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             ->setRows($names);
 
         $table->render();
+
+        return 0;
     }
 }
diff --git a/src/Command/ProjectionResetCommand.php b/src/Command/ProjectionResetCommand.php
@@ -9,7 +9,7 @@
 
 class ProjectionResetCommand extends AbstractProjectionCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
         $this
@@ -21,5 +21,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln(\sprintf('<action>Resetting projection <highlight>%s</highlight></action>', $this->projectionName));
         $this->projectionManager->resetProjection($this->projectionName);
+
+        return 0;
     }
 }
diff --git a/src/Command/ProjectionRunCommand.php b/src/Command/ProjectionRunCommand.php
@@ -34,5 +34,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $projector = $this->projection->project($this->projector);
         $projector->run($keepRunning);
         $output->writeln(\sprintf('<action>Projection <highlight>%s</highlight> completed.</action>', $this->projectionName));
+
+        return 0;
     }
 }
diff --git a/src/Command/ProjectionStateCommand.php b/src/Command/ProjectionStateCommand.php
@@ -9,7 +9,7 @@
 
 class ProjectionStateCommand extends AbstractProjectionCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
         $this
@@ -20,6 +20,11 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln('<action>Current state:</action>');
-        $output->writeln(\json_encode($this->projectionManager->fetchProjectionState($this->projectionName)));
+
+        /** @var string $state */
+        $state = \json_encode($this->projectionManager->fetchProjectionState($this->projectionName));
+        $output->writeln($state);
+
+        return 0;
     }
 }
diff --git a/src/Command/ProjectionStopCommand.php b/src/Command/ProjectionStopCommand.php
@@ -9,7 +9,7 @@
 
 class ProjectionStopCommand extends AbstractProjectionCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
         $this
@@ -21,5 +21,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln(\sprintf('<action>Stopping projection <highlight>%s</highlight></action>', $this->projectionName));
         $this->projectionManager->stopProjection($this->projectionName);
+
+        return 0;
     }
 }
diff --git a/src/Command/ProjectionStreamPositionsCommand.php b/src/Command/ProjectionStreamPositionsCommand.php
@@ -10,7 +10,7 @@
 
 class ProjectionStreamPositionsCommand extends AbstractProjectionCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
         $this
@@ -26,5 +26,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $table->addRow([$stream, $position]);
         }
         $table->render();
+
+        return 0;
     }
 }