Merge pull request #5 from PcComponentes/feature/upgrade-ddd-2.0

Upgrade ddd to 2.0
PcComponentes · May 1, 2020 · 6d6f477 · 6d6f477
2 parents c3f66f6 + b1149f3
commit 6d6f477
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 27 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,9 @@
-FROM php:7.3-cli-alpine
+FROM php:7.4-cli-alpine
 
 RUN apk update && \
     apk add --no-cache \
         libzip-dev \
+        git \
         openssl-dev && \
     docker-php-ext-install -j$(nproc) \
         zip

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
   },
   "require": {
     "ext-json": "*",
-    "php": "^7.3",
+    "php": "^7.4",
     "symfony/yaml": "^4.0",
     "symfony/messenger": "^4.0",
     "justinrainbow/json-schema": "^5.2",
@@ -30,12 +30,12 @@
     "behat/mink-browserkit-driver": "^1.3",
     "behat/symfony2-extension": "^2.1",
     "behat/mink-extension": "^2.3",
-    "pccomponentes/ddd": "^1.2",
+    "pccomponentes/ddd": "^2.0",
     "beberlei/assert": "^3.2"
   },
   "require-dev": {
     "pccomponentes/ganchudo": "^1.0",
-    "phpunit/phpunit": "^7.3",
+    "phpunit/phpunit": "^9.0",
     "symfony/var-dumper": "^4.0",
     "pccomponentes/coding-standard": "^1.0"
   }

diff --git a/src/Behat/AggregateMessageContext.php b/src/Behat/AggregateMessageContext.php
@@ -6,14 +6,14 @@
 use Assert\Assert;
 use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\PyStringNode;
-use Pccomponentes\Ddd\Util\Message\Serialization\AggregateMessageUnserializable;
-use Pccomponentes\Ddd\Util\Message\Serialization\JsonApi\AggregateMessageStream;
+use PcComponentes\Ddd\Util\Message\Serialization\AggregateMessageUnserializable;
+use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\AggregateMessageStream;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 final class AggregateMessageContext implements Context
 {
-    private $bus;
-    private $aggregateMessageUnserializable;
+    private MessageBusInterface $bus;
+    private AggregateMessageUnserializable $aggregateMessageUnserializable;
 
     public function __construct(
         MessageBusInterface $bus,

diff --git a/src/Behat/MessageValidatorOpenApiContext.php b/src/Behat/MessageValidatorOpenApiContext.php
@@ -11,13 +11,13 @@
 
 final class MessageValidatorOpenApiContext implements Context
 {
-    private $spyMiddleware;
-    private $rootPath;
+    private string $rootPath;
+    private SpyMiddleware $spyMiddleware;
 
     public function __construct(string $rootPath, SpyMiddleware $spyMiddleware)
     {
-        $this->spyMiddleware = $spyMiddleware;
         $this->rootPath = $rootPath;
+        $this->spyMiddleware = $spyMiddleware;
     }
 
     /**

diff --git a/src/Behat/ResponseValidatorOpenApiContext.php b/src/Behat/ResponseValidatorOpenApiContext.php
@@ -12,9 +12,8 @@
 
 final class ResponseValidatorOpenApiContext implements Context
 {
-    /** @var MinkContext */
-    private $minkContext;
-    private $rootPath;
+    private MinkContext $minkContext;
+    private string $rootPath;
 
     public function __construct(string $rootPath)
     {

diff --git a/src/Behat/SimpleMessageContext.php b/src/Behat/SimpleMessageContext.php
@@ -6,8 +6,8 @@
 use Assert\Assert;
 use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\PyStringNode;
-use Pccomponentes\Ddd\Util\Message\Serialization\JsonApi\SimpleMessageStream;
-use Pccomponentes\Ddd\Util\Message\Serialization\SimpleMessageUnserializable;
+use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\SimpleMessageStream;
+use PcComponentes\Ddd\Util\Message\Serialization\SimpleMessageUnserializable;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 final class SimpleMessageContext implements Context

diff --git a/src/Messaging/SpyMiddleware.php b/src/Messaging/SpyMiddleware.php
@@ -3,9 +3,9 @@
 
 namespace Pccomponentes\OpenApiMessagingContext\Messaging;
 
-use Pccomponentes\Ddd\Util\Message\AggregateMessage;
-use Pccomponentes\Ddd\Util\Message\MessageVisitor;
-use Pccomponentes\Ddd\Util\Message\SimpleMessage;
+use PcComponentes\Ddd\Util\Message\AggregateMessage;
+use PcComponentes\Ddd\Util\Message\MessageVisitor;
+use PcComponentes\Ddd\Util\Message\SimpleMessage;
 use Pccomponentes\OpenApiMessagingContext\Serialization\SchemaValidatorAggregateMessageSerializable;
 use Pccomponentes\OpenApiMessagingContext\Serialization\SchemaValidatorSimpleMessageSerializable;
 use Symfony\Component\Messenger\Envelope;

diff --git a/src/OpenApi/JsonSchema.php b/src/OpenApi/JsonSchema.php
@@ -9,7 +9,7 @@
 final class JsonSchema
 {
     private $schema;
-    private $uri;
+    private ?string $uri;
 
     public function __construct($schema, ?string $uri = null)
     {

diff --git a/src/OpenApi/OpenApiSchemaParser.php b/src/OpenApi/OpenApiSchemaParser.php
@@ -5,7 +5,7 @@
 
 final class OpenApiSchemaParser
 {
-    private $originalContent;
+    private array $originalContent;
 
     public function __construct(array $originalContent)
     {

diff --git a/src/Serialization/SchemaValidatorAggregateMessageSerializable.php b/src/Serialization/SchemaValidatorAggregateMessageSerializable.php
@@ -3,8 +3,8 @@
 
 namespace Pccomponentes\OpenApiMessagingContext\Serialization;
 
-use Pccomponentes\Ddd\Util\Message\AggregateMessage;
-use Pccomponentes\Ddd\Util\Message\Serialization\AggregateMessageSerializable;
+use PcComponentes\Ddd\Util\Message\AggregateMessage;
+use PcComponentes\Ddd\Util\Message\Serialization\AggregateMessageSerializable;
 
 final class SchemaValidatorAggregateMessageSerializable implements AggregateMessageSerializable
 {

diff --git a/src/Serialization/SchemaValidatorSimpleMessageSerializable.php b/src/Serialization/SchemaValidatorSimpleMessageSerializable.php
@@ -3,8 +3,8 @@
 
 namespace Pccomponentes\OpenApiMessagingContext\Serialization;
 
-use Pccomponentes\Ddd\Util\Message\Serialization\SimpleMessageSerializable;
-use Pccomponentes\Ddd\Util\Message\SimpleMessage;
+use PcComponentes\Ddd\Util\Message\Serialization\SimpleMessageSerializable;
+use PcComponentes\Ddd\Util\Message\SimpleMessage;
 
 final class SchemaValidatorSimpleMessageSerializable implements SimpleMessageSerializable
 {

diff --git a/tests/OpenApi/AsyncApiParserTest.php b/tests/OpenApi/AsyncApiParserTest.php
@@ -9,7 +9,7 @@
 final class AsyncApiParserTest extends TestCase
 {
     /** @test */
-    public function given_valid_schema_when_parse_then_get_parsed_schema()
+    public function given_valid_schema_when_parse_then_get_parsed_schema(): void
     {
         $allSpec = Yaml::parse(file_get_contents(__DIR__ . '/valid-asyncapi-spec.yaml'));
         $schema = (new AsyncApiParser($allSpec))->parse('pccomponentes.test.testtopic');
@@ -18,7 +18,7 @@ public function given_valid_schema_when_parse_then_get_parsed_schema()
     }
 
     /** @test */
-    public function given_valid_schema_when_parse_non_existent_topic_then_exception()
+    public function given_valid_schema_when_parse_non_existent_topic_then_exception(): void
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Topic with name <non.existent.topic> not found');