Merge fecb90f into 69a7f92

prooph · Mar 19, 2021 · 2433285 · 2433285
2 parents 69a7f92 + fecb90f
commit 2433285
Show file tree

Hide file tree

Showing 44 changed files with 115 additions and 96 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@
 nbproject
 composer.lock
 docs/html
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -3,18 +3,24 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPENDENCIES=""
         - EXECUTE_CS_CHECK=true
         - TEST_COVERAGE=true
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
-    - php: 7.2
+    - php: 7.4
       env:
         - DEPENDENCIES=""
-    - php: 7.2
+    - php: 7.4
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+    - php: 8.0
+      env:
+        - DEPENDENCIES=""
+    - php: 8.0
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
 
@@ -31,7 +37,7 @@ before_script:
   - composer update $DEPENDENCIES
 
 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 [[ $TEST_COVERAGE == 'true' ]]; then XDEBUG_MODE=coverage 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
 
 after_success:

diff --git a/composer.json b/composer.json
@@ -22,16 +22,17 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.1",
+        "php": "^7.3 || ^8.0",
         "prooph/event-store" : "^7.0"
     },
     "require-dev": {
         "psr/container": "^1.0",
         "sandrokeil/interop-config": "^2.0.1",
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^9.3",
         "prooph/snapshot-store": "^1.2.0",
-        "prooph/php-cs-fixer-config": "^0.3",
-        "phpspec/prophecy": "^1.7",
+        "prooph/php-cs-fixer-config": "^0.4",
+        "phpspec/prophecy": "^1.9",
+        "phpspec/prophecy-phpunit": "^2.0",
         "satooshi/php-coveralls": "^1.0",
         "prooph/bookdown-template": "^0.2.3"
     },

diff --git a/examples/quickstart.php b/examples/quickstart.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -7,16 +7,15 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
         >
     <testsuite name="Prooph Event-Sourcing Test Suite">
         <directory>./tests/</directory>
     </testsuite>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/src/Aggregate/AggregateRepository.php b/src/Aggregate/AggregateRepository.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/AggregateTranslator.php b/src/Aggregate/AggregateTranslator.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/AggregateType.php b/src/Aggregate/AggregateType.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/AggregateTypeProvider.php b/src/Aggregate/AggregateTypeProvider.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/EventProducerTrait.php b/src/Aggregate/EventProducerTrait.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/EventSourcedTrait.php b/src/Aggregate/EventSourcedTrait.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/Exception/AggregateException.php b/src/Aggregate/Exception/AggregateException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/Exception/AggregateTranslationFailedException.php b/src/Aggregate/Exception/AggregateTranslationFailedException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/Exception/AggregateTypeException.php b/src/Aggregate/Exception/AggregateTypeException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/Exception/InvalidArgumentException.php b/src/Aggregate/Exception/InvalidArgumentException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Aggregate/Exception/RuntimeException.php b/src/Aggregate/Exception/RuntimeException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/AggregateChanged.php b/src/AggregateChanged.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/AggregateRoot.php b/src/AggregateRoot.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/Container/Aggregate/AggregateRepositoryFactory.php b/src/Container/Aggregate/AggregateRepositoryFactory.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/EventStoreIntegration/AggregateRootDecorator.php b/src/EventStoreIntegration/AggregateRootDecorator.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/EventStoreIntegration/AggregateTranslator.php b/src/EventStoreIntegration/AggregateTranslator.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/src/EventStoreIntegration/ClosureAggregateTranslator.php b/src/EventStoreIntegration/ClosureAggregateTranslator.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/tests/Aggregate/AggregateRepositoryTest.php b/tests/Aggregate/AggregateRepositoryTest.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.
@@ -34,10 +34,13 @@
 use ProophTest\EventSourcing\Mock\UsernameChanged;
 use ProophTest\EventStore\ActionEventEmitterEventStoreTestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use ReflectionClass;
 
 class AggregateRepositoryTest extends ActionEventEmitterEventStoreTestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var AggregateRepository
      */

diff --git a/tests/Aggregate/AggregateTypeTest.php b/tests/Aggregate/AggregateTypeTest.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.
@@ -20,9 +20,12 @@
 use Prooph\EventSourcing\Aggregate\Exception\InvalidArgumentException;
 use ProophTest\EventStore\Mock\Post;
 use ProophTest\EventStore\Mock\User;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class AggregateTypeTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */

diff --git a/tests/AggregateChangedTest.php b/tests/AggregateChangedTest.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.
@@ -16,7 +16,7 @@
 use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 use Prooph\EventSourcing\AggregateChanged;
-use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidInterface;
 
 class AggregateChangedTest extends TestCase
 {
@@ -27,7 +27,7 @@ public function it_has_a_new_uuid_after_construct(): void
     {
         $event = AggregateChanged::occur('1', []);
 
-        $this->assertInstanceOf(Uuid::class, $event->uuid());
+        $this->assertInstanceOf(UuidInterface::class, $event->uuid());
     }
 
     /**

diff --git a/tests/AggregateRootTest.php b/tests/AggregateRootTest.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.

diff --git a/tests/Container/Aggregate/AggregateRepositoryFactoryTest.php b/tests/Container/Aggregate/AggregateRepositoryFactoryTest.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-sourcing.
- * (c) 2014-2019 Alexander Miertsch <kontakt@codeliner.ws>
- * (c) 2015-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (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.
@@ -22,10 +22,13 @@
 use ProophTest\EventSourcing\Mock\RepositoryMock;
 use ProophTest\EventStore\ActionEventEmitterEventStoreTestCase;
 use ProophTest\EventStore\Mock\User;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
 
 class AggregateRepositoryFactoryTest extends ActionEventEmitterEventStoreTestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */