php74+, github actions, cs

prooph · Oct 21, 2022 · ee582e4 · ee582e4
1 parent e8a37e9
commit ee582e4
Show file tree

Hide file tree

Showing 43 changed files with 147 additions and 158 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -1,3 +1,3 @@
 # for php-coveralls
-service_name: travis-ci
-coverage_clover: build/logs/clover.xml
+coverage_clover: clover.xml
+json_path: coveralls-upload.json
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -0,0 +1,11 @@
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  push:
+    branches:
+    tags:
+
+jobs:
+  ci:
+    uses: laminas/workflow-continuous-integration/.github/workflows/[email protected]
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,4 @@
 nbproject
 composer.lock
 .phpunit.result.cache
-/build
+.phpcs-cache
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -0,0 +1,5 @@
+{
+    "additional_composer_arguments": [
+        "--prefer-stable"
+    ]
+}
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -0,0 +1,8 @@
+<?php
+
+$config = new Prooph\CS\Config\Prooph();
+$config->getFinder()->in(__DIR__);
+
+$config->setCacheFile(__DIR__ . '/.php_cs.cache');
+
+return $config;
diff --git a/.php_cs b/.php_cs
diff --git a/composer.json b/composer.json
@@ -21,18 +21,15 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.3.0 | ^8.0",
-        "ramsey/uuid" : "^3.6.0 || ^4.0",
+        "php": "^7.4 || ^8.0",
+        "ramsey/uuid": "4.2.1 || ^4.3",
         "beberlei/assert": "^2.7.1 || ^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
-        "prooph/php-cs-fixer-config": "^0.4",
-        "satooshi/php-coveralls": "^1.0",
-        "prooph/bookdown-template": "^0.2.3"
-    },
-    "conflict": {
-        "php": "7.1.3"
+        "php-coveralls/php-coveralls": "^2.2",
+        "phpunit/phpunit": "^9.5.5",
+        "prooph/bookdown-template": "^0.2.3",
+        "prooph/php-cs-fixer-config": "^0.5"
     },
     "autoload": {
         "psr-4": {
@@ -43,5 +40,14 @@
         "psr-4": {
             "ProophTest\\Common\\": "tests"
         }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "php-cs-fixer fix -v --diff --dry-run",
+        "cs-fix": "php-cs-fixer fix -v --diff",
+        "test": "phpunit --colors=always"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,21 +1,12 @@
 <?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"
-        >
-    <testsuite name="Prooph Common Test Suite">
-        <directory>./tests/</directory>
-    </testsuite>
-
-    <coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" convertDeprecationsToExceptions="true" colors="true">
+    <coverage processUncoveredFiles="true">
         <include>
-            <directory suffix=".php">src</directory>
+            <directory suffix=".php">./src</directory>
         </include>
     </coverage>
+
+    <testsuite name="Prooph Common Test Suite">
+        <directory>./tests/</directory>
+    </testsuite>
 </phpunit>
diff --git a/src/Event/ActionEvent.php b/src/Event/ActionEvent.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Event/ActionEventEmitter.php b/src/Event/ActionEventEmitter.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Event/ActionEventListenerAggregate.php b/src/Event/ActionEventListenerAggregate.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Event/DefaultActionEvent.php b/src/Event/DefaultActionEvent.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Event/DefaultListenerHandler.php b/src/Event/DefaultListenerHandler.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Event/DetachAggregateHandlers.php b/src/Event/DetachAggregateHandlers.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Event/ListenerHandler.php b/src/Event/ListenerHandler.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Event/ProophActionEventEmitter.php b/src/Event/ProophActionEventEmitter.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/Command.php b/src/Messaging/Command.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/DomainEvent.php b/src/Messaging/DomainEvent.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/DomainMessage.php b/src/Messaging/DomainMessage.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,7 @@
 use DateTimeZone;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
+use ReflectionClass;
 
 /**
  * Base class for commands, domain events and queries. All are messages but differ in their intention.
@@ -50,12 +51,12 @@ public static function fromArray(array $messageData): DomainMessage
     {
         MessageDataAssertion::assert($messageData);
 
-        $messageRef = new \ReflectionClass(\get_called_class());
+        $messageRef = new ReflectionClass(\get_called_class());
 
         /** @var $message DomainMessage */
         $message = $messageRef->newInstanceWithoutConstructor();
 
-        $message->uuid = Uuid::fromString($messageData['uuid']);
+        $message->uuid = Uuid::fromString((string) $messageData['uuid']);
         $message->messageName = $messageData['message_name'];
         $message->metadata = $messageData['metadata'];
         $message->createdAt = $messageData['created_at'];

diff --git a/src/Messaging/FQCNMessageFactory.php b/src/Messaging/FQCNMessageFactory.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -38,7 +38,7 @@ public function createMessageFromArray(string $messageName, array $messageData):
         }
 
         if (! isset($messageData['uuid'])) {
-            $messageData['uuid'] = Uuid::uuid4()->toString();
+            $messageData['uuid'] = Uuid::uuid4();
         }
 
         if (! isset($messageData['created_at'])) {

diff --git a/src/Messaging/HasMessageName.php b/src/Messaging/HasMessageName.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/Message.php b/src/Messaging/Message.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,9 @@
 interface Message extends HasMessageName
 {
     public const TYPE_COMMAND = 'command';
+
     public const TYPE_EVENT = 'event';
+
     public const TYPE_QUERY = 'query';
 
     /**

diff --git a/src/Messaging/MessageConverter.php b/src/Messaging/MessageConverter.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/MessageDataAssertion.php b/src/Messaging/MessageDataAssertion.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/MessageFactory.php b/src/Messaging/MessageFactory.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/NoOpMessageConverter.php b/src/Messaging/NoOpMessageConverter.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/PayloadConstructable.php b/src/Messaging/PayloadConstructable.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/PayloadTrait.php b/src/Messaging/PayloadTrait.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

diff --git a/src/Messaging/Query.php b/src/Messaging/Query.php
@@ -2,8 +2,8 @@
 
 /**
  * This file is part of prooph/common.
- * (c) 2014-2021 Alexander Miertsch <[email protected]>
- * (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
+ * (c) 2014-2022 Alexander Miertsch <[email protected]>
+ * (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.