Merge pull request #160 from maxbaldanza/upgrade-to-phpspec4

Upgrade to phpspec4

Author: maxbaldanza

.travis.yml

@@ -6,14 +6,14 @@ dist: trusty
 
 matrix:
   include:
-    - php: 5.6
     - php: 7.0
     - php: 7.1
+    - php: 7.2
       env: ANALYSIS='true'
-    - php: hhvm
-    - php: 5.6
+    - php: 7.0
       env: COMPOSER_ARGS='--prefer-lowest'
     - php: nightly
+      env: COMPOSER_ARGS='--ignore-platform-reqs'
   allow_failures:
     - php: nightly
 

composer.json

@@ -5,16 +5,17 @@
     "type": "library",
     "license": "MIT",
     "require": {
-        "php": "^5.6 || ^7.0",
-        "phpspec/phpspec": "^3.0 <3.5.0",
-        "symfony/dependency-injection": "^2.7 || ^3.0",
-        "symfony/config": "^2.7 || ^3.0",
+        "php": "^7.0",
+        "phpspec/phpspec": "^4.0 <4.1.0",
+        "phpspec/prophecy": "^1.6",
+        "symfony/dependency-injection": "^3.2",
+        "symfony/config": "^3.2",
         "shanethehat/pretty-xml": "~1.0.2"
     },
     "require-dev": {
         "magetest/magento": "~1.8.1.0",
-        "behat/behat": "~3.0",
-        "phpunit/phpunit": "^4.0|^5.0",
+        "behat/behat": "~3.3",
+        "phpunit/phpunit": "^5.7|^6.0",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "config": {

features/bootstrap/Fake/YesPrompter.php

@@ -11,7 +11,7 @@ class YesPrompter implements Prompter
      * @param boolean $default
      * @return boolean
      */
-    public function askConfirmation($question, $default = true)
+    public function askConfirmation(string $question, bool $default = true) : bool
     {
         return true;
     }

features/bootstrap/FeatureContext.php

@@ -6,6 +6,7 @@
 use OutputSpecification\ObjectSpecification;
 use OutputSpecification\SpecSpecification;
 use PhpSpec\Console\Application;
+use PHPUnit\Framework\Assert;
 use Symfony\Component\Console\Tester\ApplicationTester;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -274,7 +275,7 @@ public function aModelClassShouldBeGenerated()
     public function thereIsANewModule()
     {
         $this->moduleName = $moduleName = 'Unique' . self::$uniqueCount;
-        PHPUnit_Framework_Assert::assertFileNotExists("public/app/code/local/Behat/$moduleName");
+        Assert::assertFileNotExists("public/app/code/local/Behat/$moduleName");
     }
 
     /**
@@ -326,7 +327,7 @@ public function theConfigXmlFileShouldContainAnElement($objectType)
             throw new \RuntimeException('Element not found in config XML');
         }
 
-        PHPUnit_Framework_Assert::assertEquals($expectedClass, (string) $result[0]);
+        Assert::assertEquals($expectedClass, (string) $result[0]);
     }
 
     /**
@@ -436,7 +437,7 @@ private function checkSpecIsCorrect(SpecSpecification $specSpecification)
 
         $generatedSpec = file_get_contents($specSpecification->getFilePath());
 
-        PHPUnit_Framework_Assert::assertEquals($expectedSpec, $generatedSpec);
+        Assert::assertEquals($expectedSpec, $generatedSpec);
     }
 
     private function getTemplate($objectType)

spec/MageTest/PhpSpec/MagentoExtension/ExtensionSpec.php

@@ -194,28 +194,28 @@ protected function service($class, $container)
 
 class FakeIndexedServiceContainer implements ServiceContainer
 {
-    public function setParam($id, $value)
+    public function setParam(string $id, $value)
     {}
 
-    public function getParam($id, $default = null)
+    public function getParam(string $id, $default = null)
     {}
 
-    public function set($id, $service, $tags = [])
+    public function set(string $id, $service, array $tags = [])
     {}
 
-    public function define($id, callable $definition, $tags = [])
+    public function define(string $id, callable $definition, array $tags = [])
     {}
 
-    public function get($id)
+    public function get(string $id)
     {}
 
-    public function has($id)
+    public function has(string $id): bool
     {}
 
-    public function remove($id)
+    public function remove(string $id)
     {}
 
-    public function getByTag($tag)
+    public function getByTag(string $tag): array
     {}
 
     public function addConfigurator($configurator)

spec/MageTest/PhpSpec/MagentoExtension/Listener/ModuleUpdateListenerSpec.php

@@ -30,6 +30,8 @@ function it_extracts_class_names_from_event_exceptions(ExampleEvent $event, Clas
     {
         $event->getException()->willReturn($exception);
 
+        $exception->getClassname()->willReturn('Vendor_Module_Model_Foo');
+
         $this->getClassNameAfterExample($event);
 
         $exception->getClassname()->shouldHaveBeenCalled();

src/MageTest/PhpSpec/MagentoExtension/CodeGenerator/Generator/BlockGenerator.php

@@ -35,42 +35,23 @@
  */
 class BlockGenerator extends MagentoObjectGenerator implements GeneratorInterface
 {
-    /**
-     * @param ResourceInterface $resource
-     * @param string $generation
-     * @param array $data
-     * @return bool
-     */
-    public function supports(ResourceInterface $resource, $generation, array $data)
+
+    public function supports(ResourceInterface $resource, string $generation, array $data): bool
     {
         return 'class' === $generation && $resource instanceof BlockResource;
     }
 
-    /**
-     * @return int
-     */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 30;
     }
 
-    /**
-     * @param ResourceInterface $resource
-     *
-     * @return string
-     */
-    protected function getFilePath(ResourceInterface $resource)
+    protected function getFilePath(ResourceInterface $resource): string
     {
         return $resource->getSrcFilename();
     }
 
-    /**
-     * @param ResourceInterface $resource
-     * @param string $filepath
-     *
-     * @return string
-     */
-    protected function getGeneratedMessage(ResourceInterface $resource, $filepath)
+    protected function getGeneratedMessage(ResourceInterface $resource, string $filepath): string
     {
         return sprintf(
             "<info>Magento block <value>%s</value> created in <value>'%s'</value>.</info>\n",
@@ -79,18 +60,12 @@ protected function getGeneratedMessage(ResourceInterface $resource, $filepath)
         );
     }
 
-    /**
-     * @return string
-     */
-    protected function getParentClass()
+    protected function getParentClass(): string
     {
         return 'Mage_Core_Block_Abstract';
     }
 
-    /**
-     * @return string
-     */
-    protected function getTemplateName()
+    protected function getTemplateName(): string
     {
         return 'mage_block';
     }

src/MageTest/PhpSpec/MagentoExtension/CodeGenerator/Generator/ControllerGenerator.php

@@ -35,42 +35,22 @@
  */
 class ControllerGenerator extends MagentoObjectGenerator implements GeneratorInterface
 {
-    /**
-     * @param ResourceInterface $resource
-     * @param string $generation
-     * @param array $data
-     * @return bool
-     */
-    public function supports(ResourceInterface $resource, $generation, array $data)
+    public function supports(ResourceInterface $resource, string $generation, array $data): bool
     {
         return 'class' === $generation && $resource instanceof ControllerResource;
     }
 
-    /**
-     * @return int
-     */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 10;
     }
 
-    /**
-     * @param ResourceInterface $resource
-     *
-     * @return string
-     */
-    protected function getFilePath(ResourceInterface $resource)
+    protected function getFilePath(ResourceInterface $resource): string
     {
         return $resource->getSrcFilename();
     }
 
-    /**
-     * @param ResourceInterface $resource
-     * @param string $filepath
-     *
-     * @return string
-     */
-    protected function getGeneratedMessage(ResourceInterface $resource, $filepath)
+    protected function getGeneratedMessage(ResourceInterface $resource, string $filepath): string
     {
         return sprintf(
             "<info>Magento controller <value>%s</value> created in <value>'%s'</value>.</info>\n",
@@ -79,18 +59,12 @@ protected function getGeneratedMessage(ResourceInterface $resource, $filepath)
         );
     }
 
-    /**
-     * @return string
-     */
-    protected function getParentClass()
+    protected function getParentClass(): string
     {
         return 'Mage_Core_Controller_Front_Action';
     }
 
-    /**
-     * @return string
-     */
-    protected function getTemplateName()
+    protected function getTemplateName(): string
     {
         return 'mage_controller';
     }

src/MageTest/PhpSpec/MagentoExtension/CodeGenerator/Generator/ControllerSpecificationGenerator.php

@@ -10,39 +10,22 @@ class ControllerSpecificationGenerator extends PromptingGenerator implements Gen
 {
     const SUPPORTED_GENERATOR = 'controller_specification';
 
-    /**
-     * @param ResourceInterface $resource
-     * @param string $generation
-     * @param array $data
-     * @return bool
-     */
-    public function supports(ResourceInterface $resource, $generation, array $data)
+    public function supports(ResourceInterface $resource, string $generation, array $data): bool
     {
         return self::SUPPORTED_GENERATOR === $generation;
     }
 
-    public function getPriority()
+    public function getPriority(): int
     {
         return 0;
     }
 
-    /**
-     * @param ResourceInterface $resource
-     *
-     * @return string
-     */
-    protected function getFilePath(ResourceInterface $resource)
+    protected function getFilePath(ResourceInterface $resource): string
     {
         return $resource->getSpecFilename();
     }
 
-    /**
-     * @param ResourceInterface $resource
-     * @param string $filepath
-     *
-     * @return string
-     */
-    protected function renderTemplate(ResourceInterface $resource, $filepath)
+    protected function renderTemplate(ResourceInterface $resource, string $filepath): string
     {
         $values = [
             '%filepath%'  => $filepath,
@@ -61,13 +44,7 @@ protected function renderTemplate(ResourceInterface $resource, $filepath)
         return $content;
     }
 
-    /**
-     * @param ResourceInterface $resource
-     * @param string $filepath
-     *
-     * @return string
-     */
-    protected function getGeneratedMessage(ResourceInterface $resource, $filepath)
+    protected function getGeneratedMessage(ResourceInterface $resource, string $filepath): string
     {
         return sprintf(
             "<info>ControllerSpecification for <value>%s</value> created in <value>'%s'</value>.</info>\n",

src/MageTest/PhpSpec/MagentoExtension/CodeGenerator/Generator/HelperGenerator.php

@@ -35,42 +35,23 @@
  */
 class HelperGenerator extends MagentoObjectGenerator implements GeneratorInterface
 {
-    /**
-     * @param ResourceInterface $resource
-     * @param string $generation
-     * @param array $data
-     * @return bool
-     */
-    public function supports(ResourceInterface $resource, $generation, array $data)
+
+    public function supports(ResourceInterface $resource, string $generation, array $data): bool
     {
         return 'class' === $generation && $resource instanceof HelperResource;
     }
 
-    /**
-     * @return int
-     */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 20;
     }
 
-    /**
-     * @param ResourceInterface $resource
-     *
-     * @return string
-     */
-    protected function getFilePath(ResourceInterface $resource)
+    protected function getFilePath(ResourceInterface $resource): string
     {
         return $resource->getSrcFilename();
     }
 
-    /**
-     * @param ResourceInterface $resource
-     * @param string $filepath
-     *
-     * @return string
-     */
-    protected function getGeneratedMessage(ResourceInterface $resource, $filepath)
+    protected function getGeneratedMessage(ResourceInterface $resource, string $filepath): string
     {
         return sprintf(
             "<info>Magento helper <value>%s</value> created in <value>'%s'</value>.</info>\n",
@@ -79,18 +60,12 @@ protected function getGeneratedMessage(ResourceInterface $resource, $filepath)
         );
     }
 
-    /**
-     * @return string
-     */
-    protected function getParentClass()
+    protected function getParentClass(): string
     {
         return 'Mage_Core_Helper_Abstract';
     }
 
-    /**
-     * @return string
-     */
-    protected function getTemplateName()
+    protected function getTemplateName(): string
     {
         return 'mage_helper';
     }