upgrade

- adding PHP8 support - dropping unsupported versions - upgrading to phpunit v9 - removing dependency for phpunit v7 due its dependency to php7.1 - running tests and code analysis on PHP8 - symfony/flex changed default branch name
prooph · Apr 15, 2021 · 0551dbc · 0551dbc
1 parent 9c4dd67
commit 0551dbc
Show file tree

Hide file tree

Showing 71 changed files with 638 additions and 168 deletions.
diff --git a/.docheader b/.docheader
@@ -0,0 +1,8 @@
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-%year% Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-%year% Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ env:
 before_install:
   - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
   - composer self-update
-  - composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
+  - composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main
 
 install:
   - travis_retry composer update -n --prefer-dist --prefer-stable
@@ -28,23 +28,6 @@ script:
 
 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.*"
@@ -67,17 +50,18 @@ jobs:
         - travis_retry composer update -n --prefer-dist
 
     - stage: Code Quality
-      env: CODING_STANDARDS
-      php: 7.4
+      env: CODING_STANDARDS=1
+      php: 8.0
       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
+        - ./vendor/bin/phpstan analyse -c phpstan.neon -l 6 src
 
     - stage: Coverage
-      php: 7.4
+      php: 8.0
+      env: XDEBUG_MODE=coverage
       install:
         - composer require --dev symfony/messenger --no-update
         - travis_retry composer update -n --prefer-dist

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,29 +1,28 @@
-New BSD License
-===============
-
-Copyright (c) 2016 - 2019, Alexander Miertsch <kontakt@codeliner.ws> and Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+Copyright (c) 2014-2021, Alexander Miertsch
+Copyright (c) 2015-2021, Sascha-Oliver Prolic
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
-* Neither the names of the copyright holders nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+
+* Neither the name of prooph nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
     }
   },
   "require": {
-    "php": "^7.1",
+    "php": "^7.4|^8.0",
     "ext-pdo": "*",
     "ext-json": "*",
     "symfony/config": "^3.4 || ^4.4 || ^5.0",
@@ -63,12 +63,12 @@
   },
   "require-dev": {
     "prooph/pdo-event-store": "^1.12",
-    "phpunit/phpunit": "^7 || ^8",
+    "phpunit/phpunit": "^8 || ^9",
     "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",
+    "prooph/php-cs-fixer-config": "^0.4",
     "matthiasnoback/symfony-dependency-injection-test": "^3.1 || ^4.1",
     "phpstan/phpstan": "^0.12"
   },
@@ -89,7 +89,8 @@
     "cs-fix": "php-cs-fixer fix -v --diff",
     "test": "phpunit --no-coverage",
     "test-coverage": "phpunit",
-    "docs": "bookdown doc/bookdown.json"
+    "docs": "bookdown doc/bookdown.json",
+    "phpstan": "phpstan analyse -c phpstan.neon -l 6 src"
   },
   "archive": {
     "exclude": [

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- disable strict to debug tests -->
-<phpunit bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="false"
-         backupGlobals="true"
-         backupStaticAttributes="false">
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true"
+         convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="false"
+         backupGlobals="true" backupStaticAttributes="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage includeUncoveredFiles="true" processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <text outputFile="php://stdout" showOnlySummary="true"/>
+        </report>
+    </coverage>
     <testsuites>
         <testsuite name="Prooph Event Store Bundle Test Suite">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/src/Command/AbstractProjectionCommand.php b/src/Command/AbstractProjectionCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/Command/FormatsOutput.php b/src/Command/FormatsOutput.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/Command/ProjectionDeleteCommand.php b/src/Command/ProjectionDeleteCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/Command/ProjectionNamesCommand.php b/src/Command/ProjectionNamesCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;
@@ -47,8 +56,8 @@ protected function configure(): void
             ->setDescription('Shows a list of all projection names. Can be filtered.')
             ->addArgument(self::ARGUMENT_FILTER, InputArgument::OPTIONAL, 'Filter by this string')
             ->addOption(self::OPTION_REGEX, 'r', InputOption::VALUE_NONE, 'Enable regex syntax for filter')
-            ->addOption(self::OPTION_LIMIT, 'l', InputOption::VALUE_REQUIRED, 'Limit the result set', 20)
-            ->addOption(self::OPTION_OFFSET, 'o', InputOption::VALUE_REQUIRED, 'Offset for result set', 0)
+            ->addOption(self::OPTION_LIMIT, 'l', InputOption::VALUE_REQUIRED, 'Limit the result set', '20')
+            ->addOption(self::OPTION_OFFSET, 'o', InputOption::VALUE_REQUIRED, 'Offset for result set', '0')
             ->addOption(self::OPTION_MANAGER, 'm', InputOption::VALUE_REQUIRED, 'Manager for result set', null);
     }
 
@@ -81,10 +90,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln('</action>');
 
         $names = [];
-        /** @var int $offset */
-        $offset = $input->getOption(self::OPTION_OFFSET);
-        /** @var int $limit */
-        $limit = $input->getOption(self::OPTION_LIMIT);
+        $offset = (int) $input->getOption(self::OPTION_OFFSET);
+        $limit = (int) $input->getOption(self::OPTION_LIMIT);
         $maxNeeded = $offset + $limit;
 
         foreach ($managerNames as $managerName) {
@@ -100,7 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $names[] = [$managerName, $projectionName];
             }
 
-            if (\count($names) >= $maxNeeded) {
+            if (--$maxNeeded <= 0) {
                 break;
             }
         }

diff --git a/src/Command/ProjectionResetCommand.php b/src/Command/ProjectionResetCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/Command/ProjectionRunCommand.php b/src/Command/ProjectionRunCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/Command/ProjectionStateCommand.php b/src/Command/ProjectionStateCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/Command/ProjectionStopCommand.php b/src/Command/ProjectionStopCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/Command/ProjectionStreamPositionsCommand.php b/src/Command/ProjectionStreamPositionsCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\Command;

diff --git a/src/DependencyInjection/Compiler/DeprecateFqcnProjectionsPass.php b/src/DependencyInjection/Compiler/DeprecateFqcnProjectionsPass.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\DependencyInjection\Compiler;

diff --git a/src/DependencyInjection/Compiler/MetadataEnricherPass.php b/src/DependencyInjection/Compiler/MetadataEnricherPass.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
- * prooph (http://getprooph.org/)
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
  *
- * @see       https://github.com/prooph/event-store-symfony-bundle for the canonical source repository
- * @copyright Copyright (c) 2016 - 2019 Alexander Miertsch <kontakt@codeliner.ws>
- * @license   https://github.com/prooph/event-store-symfony-bundle/blob/master/LICENSE.md New BSD License
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 declare(strict_types=1);

diff --git a/src/DependencyInjection/Compiler/PluginLocatorPass.php b/src/DependencyInjection/Compiler/PluginLocatorPass.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of prooph/event-store-symfony-bundle.
+ * (c) 2014-2021 Alexander Miertsch <kontakt@codeliner.ws>
+ * (c) 2015-2021 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Prooph\Bundle\EventStore\DependencyInjection\Compiler;