Merge pull request #4 from MyOnlineStore/php74-8

feat: Upgrade for PHP `^7.4 | ^8.0`

.github/workflows/test.yaml

@@ -0,0 +1,54 @@
+name: Test
+
+on:
+    push:
+        branches-ignore:
+            - 'master'
+        tags-ignore:
+            - '**'
+
+jobs:
+    setup:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 7.4
+                    coverage: none
+            -   uses: actions/cache@v2
+                with:
+                    path: vendor
+                    key: php-7.4-vendor-${{ hashFiles('**/composer.json') }}
+                    restore-keys: php-7.4-vendor-
+            -   run: composer install --no-interaction --no-ansi
+            -   id: set-php-versions
+                run: echo "::set-output name=php-versions::$(vendor/bin/devtools list:php-versions)"
+            -   id: set-tools
+                run: echo "::set-output name=tools::$(vendor/bin/devtools list:enabled-tools)"
+        outputs:
+            php-versions: ${{ steps.set-php-versions.outputs.php-versions }}
+            tools: ${{ steps.set-tools.outputs.tools }}
+
+    test:
+        needs: setup
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php-version: ${{ fromJson(needs.setup.outputs.php-versions) }}
+                tool: ${{ fromJson(needs.setup.outputs.tools) }}
+            fail-fast: false
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-version }}
+                    ini-values: date.timezone=Europe/Amsterdam, assert.exception=1, zend.assertions=1
+            -   uses: actions/cache@v2
+                with:
+                    path: vendor
+                    key: php-${{ matrix.php-version }}-vendor-${{ hashFiles('**/composer.json') }}
+                    restore-keys: php-${{ matrix.php-version }}-vendor-
+            -   run: composer install --no-interaction --no-ansi
+
+            -   run: vendor/bin/devtools ${{ matrix.tool }}

.gitignore

@@ -1,5 +1,6 @@
 /.idea
 /.DS_Store
 /.phpcs-cache
+/.phpunit.result.cache
 /vendor
 /composer.lock

composer.json

@@ -15,21 +15,23 @@
         }
     },
     "require": {
-        "php": "^7.0.33",
-        "league/tactician": "^1.0"
+        "php": "^7.4 | ^8.0",
+        "league/tactician": "^1.1"
     },
     "require-dev": {
-        "myonlinestore/coding-standard": "^1.0",
-        "phpunit/phpunit": "^6.5"
+        "myonlinestore/coding-standard": "^3.1",
+        "myonlinestore/php-devtools": "^0.2",
+        "phpunit/phpunit": "^9.5",
+        "vimeo/psalm": "^4.18"
     },
     "config": {
-        "vendor-dir": "vendor",
         "preferred-install": {
             "*": "dist"
         },
         "sort-packages": true,
-        "platform": {
-            "php": "7.0.33"
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
 }

phpcs.xml.dist

@@ -13,7 +13,7 @@
     <file>tests</file>
 
     <rule ref="vendor/myonlinestore/coding-standard/MyOnlineStore/ruleset.xml">
-        <exclude name="Symfony.NamingConventions.ValidClassName.InvalidExceptionName"/>
-        <exclude name="Symfony.NamingConventions.ValidClassName.InvalidInterfaceName"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
     </rule>
 </ruleset>

phpunit.xml.dist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+>
+
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

psalm.xml.dist

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    totallyTyped="true"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Application/CommandBusInterface.php

@@ -10,11 +10,10 @@ interface CommandBusInterface
     /**
      * Executes the given command and optionally returns a value
      *
-     * @param object $command
-     *
      * @return mixed
      *
      * @throws CommandFailedException
      */
-    public function handle($command);
+    // phpcs:ignore SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
+    public function handle(object $command);
 }

src/Domain/Exception/CommandFailedException.php

@@ -7,6 +7,6 @@ final class CommandFailedException extends \RuntimeException
 {
     public static function wrap(\Throwable $previous): self
     {
-        return new self($previous->getMessage(), $previous->getCode(), $previous);
+        return new self($previous->getMessage(), (int) $previous->getCode(), $previous);
     }
 }

src/Infrastructure/League/Tactician/CommandBus.php

@@ -8,10 +8,7 @@
 
 final class CommandBus implements CommandBusInterface
 {
-    /**
-     * @var TacticianCommandBus
-     */
-    private $commandBus;
+    private TacticianCommandBus $commandBus;
 
     public function __construct(TacticianCommandBus $commandBus)
     {
@@ -21,7 +18,7 @@ public function __construct(TacticianCommandBus $commandBus)
     /**
      * @inheritdoc
      */
-    public function handle($command)
+    public function handle(object $command)
     {
         return $this->commandBus->handle($command);
     }

tests/Domain/Exception/CommandFailedExceptionTest.php

@@ -8,7 +8,7 @@
 
 final class CommandFailedExceptionTest extends TestCase
 {
-    public function testWrap()
+    public function testWrap(): void
     {
         $commandFailed = CommandFailedException::wrap(
             $previous = new \Exception('Foobar', 234)

tests/Infrastructure/MyOnlineStore/Infrastructure/League/Tactician/CommandBusTest.php → tests/Infrastructure/League/Tactician/CommandBusTest.php

@@ -5,28 +5,23 @@
 
 use League\Tactician\CommandBus as TacticianCommandBus;
 use MyOnlineStore\CommandBus\Infrastructure\League\Tactician\CommandBus;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 final class CommandBusTest extends TestCase
 {
-    /**
-     * @var TacticianCommandBus
-     */
-    private $tacticianCommandBus;
+    /** @var TacticianCommandBus&MockObject */
+    private TacticianCommandBus $tacticianCommandBus;
+    private CommandBus $commandBus;
 
-    /**
-     * @var CommandBus
-     */
-    private $commandBus;
-
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->tacticianCommandBus = $this->createMock(TacticianCommandBus::class);
 
         $this->commandBus = new CommandBus($this->tacticianCommandBus);
     }
 
-    public function testWillThrowOnTheBus()
+    public function testWillThrowOnTheBus(): void
     {
         $command = new \stdClass();