Merge 497a9ad into 9b74792

prooph · Jan 5, 2021 · f7dbf5c · f7dbf5c
2 parents 9b74792 + 497a9ad
commit f7dbf5c
Show file tree

Hide file tree

Showing 114 changed files with 336 additions and 273 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@
 nbproject
 composer.lock
 docs/html
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -3,20 +3,15 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPENDENCIES=""
-        - EXECUTE_CS_CHECK=true
+        - XDEBUG_MODE="coverage"
         - TEST_COVERAGE=true
-    - php: 7.1
-      env:
-        - DEPENDENCIES="--prefer-lowest --prefer-stable"
-    - php: 7.2
+    - php: 7.3
       env:
         - DEPENDENCIES=""
-    - php: 7.2
-      env:
-        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+        - PHP_CS=true
     - php: 7.3
       env:
         - DEPENDENCIES=""
@@ -29,6 +24,12 @@ matrix:
     - php: 7.4
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
+    - php: 8.0
+      env:
+        - DEPENDENCIES=""
+    - php: 8.0
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
 
 cache:
   directories:
@@ -41,10 +42,10 @@ before_script:
   - phpenv config-rm xdebug.ini
   - composer self-update
   - composer update --prefer-dist $DEPENDENCIES
+  - rm -rf .php_cs.cache
 
 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
+  - if [[ $TEST_COVERAGE == 'true' ]]; then php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml; elif [[ $PHP_CS == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run; else ./vendor/bin/phpunit; fi
 
 after_success:
   - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/coveralls -v; fi

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 PHP 7.1 EventStore Implementation.
 
-[![Build Status](https://travis-ci.org/prooph/event-store.svg?branch=master)](https://travis-ci.org/prooph/event-store)
-[![Coverage Status](https://coveralls.io/repos/prooph/event-store/badge.svg?branch=master&service=github)](https://coveralls.io/github/prooph/event-store?branch=master)
+[![Build Status](https://travis-ci.com/prooph/event-store.svg?branch=7.x)](https://travis-ci.com/prooph/event-store)
+[![Coverage Status](https://coveralls.io/repos/prooph/event-store/badge.svg?branch=7.x&service=github)](https://coveralls.io/github/prooph/event-store?branch=7.x)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/prooph/improoph)
 
 ## Overview
@@ -57,11 +57,11 @@ To establish a consistent code quality, please provide unit tests for all your c
 
 ## Version Guidance
 
-| Version | Status     | PHP Version | Support Until |
-|---------|------------|-------------|---------------|
-| 5.x     | EOL        | >= 5.5      | EOL           |
-| 6.x     | Maintained | >= 5.5      | 3 Dec 2017    |
-| 7.x     | Latest     | >= 7.1      | active        |
+| Version | Status     | PHP Version   | Support Until |
+|---------|------------|---------------|---------------|
+| 5.x     | EOL        | \>= 5.5        | EOL           |
+| 6.x     | Maintained | \>= 5.5        | 3 Dec 2017    |
+| 7.x     | Latest     | \>= 7.1 \| 8.0  | active        |
 
 ## License
 

diff --git a/composer.json b/composer.json
@@ -24,16 +24,17 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "marc-mabe/php-enum": "^2.3.1 || ^3.0.0 || ^4.0.0",
-        "prooph/common": "^4.1.0"
+        "prooph/common": "^4.5.0"
     },
     "require-dev": {
         "phpspec/prophecy": "^1.10.3",
-        "phpunit/php-invoker": "^2.0",
-        "phpunit/phpunit": "^7.5.20",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/php-invoker": "^3.1",
+        "phpunit/phpunit": "^9.3",
         "prooph/bookdown-template": "^0.2.3",
-        "prooph/php-cs-fixer-config": "v0.3.1",
+        "prooph/php-cs-fixer-config": "^0.4",
         "psr/container": "^1.0",
         "sandrokeil/interop-config": "^2.0.1",
         "satooshi/php-coveralls": "^1.0"

diff --git a/examples/event/QuickStartSucceeded.php b/examples/event/QuickStartSucceeded.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/examples/quickstart.php b/examples/quickstart.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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
@@ -13,14 +13,15 @@
          enforceTimeLimit="true"
          failOnWarning="true"
          failOnRisky="true"
+         timeoutForLargeTests="180"
 >
     <testsuite name="Prooph EventStore Test Suite">
         <directory>./tests</directory>
     </testsuite>
 
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/src/ActionEventEmitterEventStore.php b/src/ActionEventEmitterEventStore.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/InMemoryEventStoreFactory.php b/src/Container/InMemoryEventStoreFactory.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/InMemoryProjectionManagerFactory.php b/src/Container/InMemoryProjectionManagerFactory.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/EventStore.php b/src/EventStore.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/EventStoreDecorator.php b/src/EventStoreDecorator.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/ConcurrencyException.php b/src/Exception/ConcurrencyException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/ConfigurationException.php b/src/Exception/ConfigurationException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/EventStoreException.php b/src/Exception/EventStoreException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/ExtensionNotLoadedException.php b/src/Exception/ExtensionNotLoadedException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/OutOfRangeException.php b/src/Exception/OutOfRangeException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/ProjectionNotFound.php b/src/Exception/ProjectionNotFound.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/StreamExistsAlready.php b/src/Exception/StreamExistsAlready.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/StreamNotFound.php b/src/Exception/StreamNotFound.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/TransactionAlreadyStarted.php b/src/Exception/TransactionAlreadyStarted.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Exception/TransactionNotStarted.php b/src/Exception/TransactionNotStarted.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/InMemoryEventStore.php b/src/InMemoryEventStore.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Metadata/FieldType.php b/src/Metadata/FieldType.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Metadata/MetadataEnricher.php b/src/Metadata/MetadataEnricher.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Metadata/MetadataEnricherAggregate.php b/src/Metadata/MetadataEnricherAggregate.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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/Metadata/MetadataEnricherPlugin.php b/src/Metadata/MetadataEnricherPlugin.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/event-store.
- * (c) 2014-2020 prooph software GmbH <contact@prooph.de>
- * (c) 2015-2020 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ * (c) 2014-2021 prooph software GmbH <contact@prooph.de>
+ * (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.