Merge pull request #12 from memio/sf-5

gnugat · web-flow · commit 3874f6b009aa · 2019-12-02T16:22:24.000Z
Symfony 5, phpspec 6 and PHP 7.2
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 /vendor
 /phpunit.xml
 /.couscous
+/.php_cs.cache
+/.phpunit.result.cache
 
 # Temporary files
 /.php_cs.cache
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 7.1
     - 7.2
+    - 7.3
 
 before_script:
     - composer selfupdate
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.10.0: Symfony 5, phpspec 6, PHP 7.2
+
+Upgraded requirements:
+
+* Symfony 5
+* phpspec 6.1
+* PHP 7.2
+
 ## 0.9.0: phpspec 5
 
 Upgraded phpspec to v5.0@rc, meaning:
diff --git a/composer.json b/composer.json
@@ -25,19 +25,19 @@
         }
     },
     "require": {
-        "gnugat/redaktilo": "^1.7",
+        "gnugat/redaktilo": "^2.0",
         "memio/memio": "^2.0",
         "memio/linter": "^2.0",
         "memio/validator": "^2.0",
         "memio/model": "^2.0.1",
         "memio/pretty-printer": "^2.0",
         "memio/twig-template-engine": "^2.0.1",
-        "php": "^7.1",
-        "phpspec/phpspec": "^5.0@rc",
-        "symfony/event-dispatcher": "^3.4 || ^4.0"
+        "php": "^7.2",
+        "phpspec/phpspec": "^6.1",
+        "symfony/event-dispatcher": "^5.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.12",
-        "phpunit/phpunit": "^7.2"
+        "friendsofphp/php-cs-fixer": "^2.16",
+        "phpunit/phpunit": "^8.4"
     }
 }
diff --git a/spec/Memio/SpecGen/CodeEditor/InsertPropertiesHandlerSpec.php b/spec/Memio/SpecGen/CodeEditor/InsertPropertiesHandlerSpec.php
@@ -13,9 +13,9 @@
 
 use Gnugat\Redaktilo\File;
 use Memio\Model\Property;
-use Memio\SpecGen\CodeEditor\InsertPropertyHandler;
 use Memio\SpecGen\CodeEditor\InsertProperties;
 use Memio\SpecGen\CodeEditor\InsertProperty;
+use Memio\SpecGen\CodeEditor\InsertPropertyHandler;
 use Memio\SpecGen\CommandBus\CommandHandler;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
diff --git a/spec/Memio/SpecGen/CodeEditor/InsertUseStatementsHandlerSpec.php b/spec/Memio/SpecGen/CodeEditor/InsertUseStatementsHandlerSpec.php
@@ -14,9 +14,9 @@
 use Gnugat\Redaktilo\Editor;
 use Gnugat\Redaktilo\File;
 use Memio\Model\FullyQualifiedName;
+use Memio\SpecGen\CodeEditor\InsertUseStatement;
 use Memio\SpecGen\CodeEditor\InsertUseStatementHandler;
 use Memio\SpecGen\CodeEditor\InsertUseStatements;
-use Memio\SpecGen\CodeEditor\InsertUseStatement;
 use Memio\SpecGen\CommandBus\CommandHandler;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
diff --git a/spec/Memio/SpecGen/GenerateConstructor/GenerateConstructorHandlerSpec.php b/spec/Memio/SpecGen/GenerateConstructor/GenerateConstructorHandlerSpec.php
@@ -11,10 +11,10 @@
 
 namespace spec\Memio\SpecGen\GenerateConstructor;
 
+use Memio\SpecGen\CommandBus\CommandHandler;
 use Memio\SpecGen\GenerateConstructor\GenerateConstructor;
 use Memio\SpecGen\GenerateConstructor\GeneratedConstructor;
 use Memio\SpecGen\Marshaller\VariableArgumentMarshaller;
-use Memio\SpecGen\CommandBus\CommandHandler;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -49,7 +49,10 @@ function it_builds_a_memio_method_model(
 
         $variableArgumentMarshaller->marshal($variableArguments)->willReturn([]);
         $generatedConstructor = Argument::type(GeneratedConstructor::class);
-        $eventDispatcher->dispatch(GeneratedConstructor::EVENT_NAME, $generatedConstructor)->shouldBeCalled();
+        $eventDispatcher->dispatch(
+            $generatedConstructor,
+            GeneratedConstructor::EVENT_NAME
+        )->shouldBeCalled();
 
         $this->handle($command);
     }
diff --git a/spec/Memio/SpecGen/GenerateConstructor/InsertGeneratedConstructorListenerSpec.php b/spec/Memio/SpecGen/GenerateConstructor/InsertGeneratedConstructorListenerSpec.php
@@ -11,6 +11,7 @@
 
 namespace spec\Memio\SpecGen\GenerateConstructor;
 
+use Gnugat\Redaktilo\File;
 use Memio\Model\File as FileModel;
 use Memio\Model\FullyQualifiedName as FullyQualifiedNameModel;
 use Memio\Model\Method as MethodModel;
@@ -21,7 +22,6 @@
 use Memio\SpecGen\CodeEditor\InsertProperties;
 use Memio\SpecGen\CodeEditor\InsertUseStatements;
 use Memio\SpecGen\GenerateConstructor\GeneratedConstructor;
-use Gnugat\Redaktilo\File;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 
diff --git a/spec/Memio/SpecGen/GenerateMethod/GenerateMethodHandlerSpec.php b/spec/Memio/SpecGen/GenerateMethod/GenerateMethodHandlerSpec.php
@@ -12,8 +12,8 @@
 namespace spec\Memio\SpecGen\GenerateMethod;
 
 use Memio\SpecGen\CommandBus\CommandHandler;
-use Memio\SpecGen\GenerateMethod\GenerateMethod;
 use Memio\SpecGen\GenerateMethod\GeneratedMethod;
+use Memio\SpecGen\GenerateMethod\GenerateMethod;
 use Memio\SpecGen\Marshaller\VariableArgumentMarshaller;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
@@ -49,7 +49,10 @@ function it_builds_a_memio_method_model(
 
         $variableArgumentMarshaller->marshal($variableArguments)->willReturn([]);
         $generatedMethod = Argument::type(GeneratedMethod::class);
-        $eventDispatcher->dispatch(GeneratedMethod::EVENT_NAME, $generatedMethod)->shouldBeCalled();
+        $eventDispatcher->dispatch(
+            $generatedMethod,
+            GeneratedMethod::EVENT_NAME
+        )->shouldBeCalled();
 
         $this->handle($command);
     }
diff --git a/spec/Memio/SpecGen/GenerateMethod/InsertGeneratedMethodListenerSpec.php b/spec/Memio/SpecGen/GenerateMethod/InsertGeneratedMethodListenerSpec.php
@@ -11,6 +11,7 @@
 
 namespace spec\Memio\SpecGen\GenerateMethod;
 
+use Gnugat\Redaktilo\File;
 use Memio\Model\File as FileModel;
 use Memio\Model\FullyQualifiedName as FullyQualifiedNameModel;
 use Memio\Model\Method as MethodModel;
@@ -19,7 +20,6 @@
 use Memio\SpecGen\CodeEditor\InsertMethod;
 use Memio\SpecGen\CodeEditor\InsertUseStatements;
 use Memio\SpecGen\GenerateMethod\GeneratedMethod;
-use Gnugat\Redaktilo\File;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 
diff --git a/src/Memio/SpecGen/GenerateConstructor/GenerateConstructorHandler.php b/src/Memio/SpecGen/GenerateConstructor/GenerateConstructorHandler.php
@@ -74,7 +74,10 @@ public function handle(Command $command): void
             $method->setBody($body);
         }
         $generatedConstructor = new GeneratedConstructor($file);
-        $this->eventDispatcher->dispatch(GeneratedConstructor::EVENT_NAME, $generatedConstructor);
+        $this->eventDispatcher->dispatch(
+            $generatedConstructor,
+            GeneratedConstructor::EVENT_NAME
+        );
     }
 
     private function shouldAddUseStatement(File $file, FullyQualifiedName $fullyQualifiedName): bool
diff --git a/src/Memio/SpecGen/GenerateConstructor/GeneratedConstructor.php b/src/Memio/SpecGen/GenerateConstructor/GeneratedConstructor.php
@@ -12,7 +12,7 @@
 namespace Memio\SpecGen\GenerateConstructor;
 
 use Memio\Model\File;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Data Transfer Object (DTO).
diff --git a/src/Memio/SpecGen/GenerateMethod/GenerateMethodHandler.php b/src/Memio/SpecGen/GenerateMethod/GenerateMethodHandler.php
@@ -67,7 +67,10 @@ public function handle(Command $command): void
             $method->addArgument($argument);
         }
         $generatedMethod = new GeneratedMethod($file);
-        $this->eventDispatcher->dispatch(GeneratedMethod::EVENT_NAME, $generatedMethod);
+        $this->eventDispatcher->dispatch(
+            $generatedMethod,
+            GeneratedMethod::EVENT_NAME
+        );
     }
 
     private function shouldAddUseStatement(File $file, FullyQualifiedName $fullyQualifiedName): bool
diff --git a/src/Memio/SpecGen/GenerateMethod/GeneratedMethod.php b/src/Memio/SpecGen/GenerateMethod/GeneratedMethod.php
@@ -12,7 +12,7 @@
 namespace Memio\SpecGen\GenerateMethod;
 
 use Memio\Model\File;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Data Transfer Object (DTO).
diff --git a/src/Memio/SpecGen/Marshaller/Service/TypeGuesser.php b/src/Memio/SpecGen/Marshaller/Service/TypeGuesser.php
@@ -11,8 +11,8 @@
 
 namespace Memio\SpecGen\Marshaller\Service;
 
-use Prophecy\Prophecy\ProphecySubjectInterface;
 use Prophecy\Doubler\Generator\ReflectionInterface;
+use Prophecy\Prophecy\ProphecySubjectInterface;
 
 class TypeGuesser
 {
diff --git a/tests/Memio/SpecGen/Build.php b/tests/Memio/SpecGen/Build.php
@@ -11,9 +11,9 @@
 
 namespace tests\Memio\SpecGen;
 
+use Memio\SpecGen\MemioSpecGenExtension;
 use PhpSpec\ServiceContainer;
 use PhpSpec\ServiceContainer\IndexedServiceContainer;
-use Memio\SpecGen\MemioSpecGenExtension;
 
 class Build
 {
diff --git a/tests/Memio/SpecGen/Generator/GenerateConstructorTest.php b/tests/Memio/SpecGen/Generator/GenerateConstructorTest.php
@@ -11,9 +11,9 @@
 
 namespace tests\Memio\SpecGen\Generator;
 
+use PhpSpec\Locator\Resource;
 use tests\Memio\SpecGen\Build;
 use tests\Memio\SpecGen\GeneratorTestCase;
-use PhpSpec\Locator\Resource;
 
 class GenerateConstructorTest extends GeneratorTestCase
 {
@@ -22,7 +22,7 @@ class GenerateConstructorTest extends GeneratorTestCase
 
     private $constructorGenerator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->constructorGenerator = Build::serviceContainer()->get('code_generator.generators.constructor');
     }
diff --git a/tests/Memio/SpecGen/Generator/GenerateMethodTest.php b/tests/Memio/SpecGen/Generator/GenerateMethodTest.php
@@ -11,9 +11,9 @@
 
 namespace tests\Memio\SpecGen\Generator;
 
+use PhpSpec\Locator\Resource;
 use tests\Memio\SpecGen\Build;
 use tests\Memio\SpecGen\GeneratorTestCase;
-use PhpSpec\Locator\Resource;
 
 class GenerateMethodTest extends GeneratorTestCase
 {
@@ -22,7 +22,7 @@ class GenerateMethodTest extends GeneratorTestCase
 
     private $methodGenerator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->methodGenerator = Build::serviceContainer()->get('code_generator.generators.method');
     }
