PHP 8 support

.gitignore

@@ -5,6 +5,7 @@
 /build
 .idea
 .php_cs.cache
+.phpunit.result.cache
 nbproject
 composer.lock
 docs/html

.travis.yml

@@ -29,6 +29,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:

composer.json

@@ -24,19 +24,18 @@
     "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"
     },
     "require-dev": {
-        "phpspec/prophecy": "^1.10.3",
-        "phpunit/php-invoker": "^2.0",
-        "phpunit/phpunit": "^7.5.20",
-        "prooph/bookdown-template": "^0.2.3",
-        "prooph/php-cs-fixer-config": "v0.3.1",
+        "phpspec/prophecy-phpunit": "^2.0.0",
         "psr/container": "^1.0",
         "sandrokeil/interop-config": "^2.0.1",
-        "satooshi/php-coveralls": "^1.0"
+        "phpunit/phpunit": "^9.0",
+        "prooph/php-cs-fixer-config": "^0.4",
+        "satooshi/php-coveralls": "^1.0",
+        "prooph/bookdown-template": "^0.2.3"
     },
     "suggest" : {
         "prooph/pdo-event-store": "For usage with MySQL or Postgres as event store",

phpunit.xml.dist

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="vendor/autoload.php"
-         timeoutForSmallTests="2"
-         enforceTimeLimit="true"
-         failOnWarning="true"
-         failOnRisky="true"
+<phpunit
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    bootstrap="vendor/autoload.php"
+    timeoutForSmallTests="2"
+    enforceTimeLimit="true"
+    failOnWarning="true"
+    failOnRisky="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
-    <testsuite name="Prooph EventStore Test Suite">
-        <directory>./tests</directory>
-    </testsuite>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
+  <coverage>
+    <include>
+      <directory>./src/</directory>
+    </include>
+  </coverage>
+  <testsuite name="Prooph EventStore Test Suite">
+    <directory>./tests</directory>
+  </testsuite>
 </phpunit>

tests/AbstractEventStoreTest.php

@@ -28,13 +28,15 @@
 use ProophTest\EventStore\Mock\TestDomainEvent;
 use ProophTest\EventStore\Mock\UserCreated;
 use ProophTest\EventStore\Mock\UsernameChanged;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Common tests for all event store implementations
  */
 abstract class AbstractEventStoreTest extends TestCase
 {
     use EventStoreTestStreamTrait;
+    use ProphecyTrait;
 
     /**
      * @var EventStore

tests/ActionEventEmitterEventStoreTest.php

@@ -25,9 +25,11 @@
 use Prooph\EventStore\Metadata\Operator;
 use Prooph\EventStore\StreamName;
 use ProophTest\EventStore\Mock\UsernameChanged;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class ActionEventEmitterEventStoreTest extends ActionEventEmitterEventStoreTestCase
 {
+    use ProphecyTrait;
     use EventStoreTestStreamTrait;
 
     /**

tests/Container/InMemoryEventStoreFactoryTest.php

@@ -32,9 +32,12 @@
 use ProophTest\EventStore\Mock\UsernameChanged;
 use Prophecy\Argument;
 use Psr\Container\ContainerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class InMemoryEventStoreFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */
@@ -43,7 +46,7 @@ public function it_creates_event_store_with_default_event_emitter(): void
         $config['prooph']['event_store']['default'] = [];
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
+        $containerMock->expects($this->once())->method('get')->with('config')->willReturn($config);
 
         $factory = new InMemoryEventStoreFactory();
         $eventStore = $factory($containerMock);
@@ -59,7 +62,7 @@ public function it_creates_event_store_without_event_emitter(): void
         $config['prooph']['event_store']['default'] = ['wrap_action_event_emitter' => false];
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
+        $containerMock->expects($this->once())->method('get')->with('config')->willReturn($config);
 
         $factory = new InMemoryEventStoreFactory();
         $eventStore = $factory($containerMock);
@@ -75,7 +78,7 @@ public function it_creates_non_transactional_event_store_without_event_emitter()
         $config['prooph']['event_store']['default'] = ['wrap_action_event_emitter' => false, 'transactional' => false];
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
+        $containerMock->expects($this->once())->method('get')->with('config')->willReturn($config);
 
         $factory = new InMemoryEventStoreFactory();
         $eventStore = $factory($containerMock);
@@ -91,7 +94,7 @@ public function it_creates_read_only_event_store(): void
         $config['prooph']['event_store']['default'] = ['wrap_action_event_emitter' => false, 'read_only' => true];
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
+        $containerMock->expects($this->once())->method('get')->with('config')->willReturn($config);
 
         $factory = new InMemoryEventStoreFactory();
         $eventStore = $factory($containerMock);
@@ -107,7 +110,7 @@ public function it_creates_event_store_with_default_event_emitter_via_callstatic
         $config['prooph']['event_store']['another'] = [];
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
+        $containerMock->expects($this->once())->method('get')->with('config')->willReturn($config);
 
         $type = 'another';
         $eventStore = InMemoryEventStoreFactory::$type($containerMock);
@@ -123,7 +126,7 @@ public function it_creates_non_transactional_event_store_with_non_transactional_
         $config['prooph']['event_store']['another'] = ['transactional' => false];
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
+        $containerMock->expects($this->once())->method('get')->with('config')->willReturn($config);
 
         $type = 'another';
         $eventStore = InMemoryEventStoreFactory::$type($containerMock);
@@ -141,8 +144,10 @@ public function it_injects_custom_event_emitter(): void
         $eventEmitterMock = $this->getMockForAbstractClass(ActionEventEmitter::class);
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
-        $containerMock->expects($this->at(1))->method('get')->with('event_emitter')->willReturn($eventEmitterMock);
+        $containerMock->expects($this->any())->method('get')->willReturnMap([
+            ['config', $config],
+            ['event_emitter', $eventEmitterMock]
+        ]);
 
         $factory = new InMemoryEventStoreFactory();
         $eventStore = $factory($containerMock);
@@ -152,6 +157,7 @@ public function it_injects_custom_event_emitter(): void
 
     /**
      * @test
+     * @group only
      */
     public function it_injects_plugins(): void
     {
@@ -161,8 +167,10 @@ public function it_injects_plugins(): void
         $featureMock->attachToEventStore(Argument::type(TransactionalActionEventEmitterEventStore::class))->shouldBeCalled();
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
-        $containerMock->expects($this->at(1))->method('get')->with('plugin')->willReturn($featureMock->reveal());
+        $containerMock->expects($this->any())->method('get')->willReturnMap([
+            ['config', $config],
+            ['plugin', $featureMock->reveal()]
+        ]);
 
         $factory = new InMemoryEventStoreFactory();
         $eventStore = $factory($containerMock);
@@ -183,8 +191,10 @@ public function it_throws_exception_when_invalid_plugin_configured(): void
         $featureMock = 'foo';
 
         $containerMock = $this->getMockForAbstractClass(ContainerInterface::class);
-        $containerMock->expects($this->at(0))->method('get')->with('config')->willReturn($config);
-        $containerMock->expects($this->at(1))->method('get')->with('plugin')->willReturn($featureMock);
+        $containerMock->expects($this->any())->method('get')->willReturnMap([
+            ['config', $config],
+            ['plugin', $featureMock]
+        ]);
 
         $factory = new InMemoryEventStoreFactory();
         $factory($containerMock);

tests/Container/InMemoryProjectionManagerFactoryTest.php

@@ -19,9 +19,12 @@
 use Prooph\EventStore\InMemoryEventStore;
 use Prooph\EventStore\Projection\InMemoryProjectionManager;
 use Psr\Container\ContainerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class InMemoryProjectionManagerFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */

tests/Example/QuickStartTest.php

@@ -27,7 +27,7 @@ public function it_provides_the_correct_example_output(): void
             '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}'
         );
 
-        $this->assertRegExp($pattern, $this->getQuickstartOutput());
+        $this->assertMatchesRegularExpression($pattern, $this->getQuickstartOutput());
     }
 
     private function getQuickstartOutput(): string

tests/Metadata/MetadataEnricherAggregateTest.php

@@ -20,9 +20,12 @@
 use Prooph\EventStore\Metadata\MetadataEnricherAggregate;
 use ProophTest\EventStore\Mock\TestDomainEvent;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class MetadataEnricherAggregateTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */

tests/Metadata/MetadataEnricherPluginTest.php

@@ -25,9 +25,12 @@
 use Prooph\EventStore\StreamName;
 use ProophTest\EventStore\Mock\TestDomainEvent;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class MetadataEnricherPluginTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */

tests/Plugin/PluginManagerTest.php

@@ -19,9 +19,12 @@
 use ProophTest\EventStore\Mock\EventLoggerPlugin;
 use ProophTest\EventStore\Mock\UserCreated;
 use Psr\Container\ContainerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class PluginManagerTest extends ActionEventEmitterEventStoreTestCase
 {
+    use ProphecyTrait;
+
     /**
      * @test
      */

tests/Projection/AbstractEventStoreProjectorTest.php

@@ -777,13 +777,13 @@ public function it_resets_to_empty_array(): void
 
         $state = $projection->getState();
 
-        $this->assertInternalType('array', $state);
+        $this->assertIsArray($state);
 
         $projection->reset();
 
         $state2 = $projection->getState();
 
-        $this->assertInternalType('array', $state2);
+        $this->assertIsArray($state2);
     }
 
     /**

tests/Projection/AbstractEventStoreQueryTest.php

@@ -300,13 +300,13 @@ public function it_resets_to_empty_array(): void
 
         $state = $query->getState();
 
-        $this->assertInternalType('array', $state);
+        $this->assertIsArray($state);
 
         $query->reset();
 
         $state2 = $query->getState();
 
-        $this->assertInternalType('array', $state2);
+        $this->assertIsArray($state2);
     }
 
     /**

tests/Projection/AbstractEventStoreReadModelProjectorTest.php

@@ -418,13 +418,13 @@ public function it_resets_to_empty_array(): void
 
         $state = $projection->getState();
 
-        $this->assertInternalType('array', $state);
+        $this->assertIsArray($state);
 
         $projection->reset();
 
         $state2 = $projection->getState();
 
-        $this->assertInternalType('array', $state2);
+        $this->assertIsArray($state2);
     }
 
     /**

tests/Projection/InMemoryEventStoreProjectorTest.php

@@ -20,9 +20,12 @@
 use Prooph\EventStore\NonTransactionalInMemoryEventStore;
 use Prooph\EventStore\Projection\InMemoryEventStoreProjector;
 use Prooph\EventStore\Projection\InMemoryProjectionManager;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class InMemoryEventStoreProjectorTest extends AbstractEventStoreProjectorTest
 {
+    use ProphecyTrait;
+
     /**
      * @var InMemoryProjectionManager
      */

tests/Projection/InMemoryEventStoreQueryTest.php

@@ -20,9 +20,12 @@
 use Prooph\EventStore\NonTransactionalInMemoryEventStore;
 use Prooph\EventStore\Projection\InMemoryEventStoreQuery;
 use Prooph\EventStore\Projection\InMemoryProjectionManager;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class InMemoryEventStoreQueryTest extends AbstractEventStoreQueryTest
 {
+    use ProphecyTrait;
+
     /**
      * @var InMemoryProjectionManager
      */

tests/Projection/InMemoryEventStoreReadModelProjectorTest.php

@@ -21,9 +21,12 @@
 use Prooph\EventStore\Projection\InMemoryEventStoreReadModelProjector;
 use Prooph\EventStore\Projection\InMemoryProjectionManager;
 use ProophTest\EventStore\Mock\ReadModelMock;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class InMemoryEventStoreReadModelProjectorTest extends AbstractEventStoreReadModelProjectorTest
 {
+    use ProphecyTrait;
+
     /**
      * @var InMemoryProjectionManager
      */