fix: lint + standards (#16)

Author: Rodrigue Villetard

composer.json

@@ -29,5 +29,10 @@
             "Gorghoa\\ScenarioStateBehatExtension\\": "src/",
             "Symfony\\Component\\Process\\": "vendor/symfony/process/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Gorghoa\\ScenarioStateBehatExtension\\TestApp\\": "testapp/"
+        }
     }
 }

src/ScenarioStateArgumentOrganiser.php

@@ -40,12 +40,16 @@ public function __construct(ArgumentOrganiser $organiser, ScenarioStateInitializ
     public function organiseArguments(ReflectionFunctionAbstract $function, array $match)
     {
         $i = array_slice(array_keys($match), -1, 1)[0];
-        $paramsKeys = array_map(function ($element) {
+        $paramsKeys = array_map(function($element) {
             return $element->name;
         }, $function->getParameters());
 
         $store = $this->store->getStore();
 
+        if (!($function instanceof \ReflectionMethod)) {
+            return $this->baseOrganiser->organiseArguments($function, $match);
+        }
+
         /** @var ScenarioStateArgument[] $annotations */
         $annotations = $this->reader->getMethodAnnotations($function);
         foreach ($annotations as $annotation) {

testapp/Gorilla.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Gorghoa\ScenarioStateBehatExtension\TestApp;
+
 /*
  * This file is part of the ScenarioStateBehatExtension project.
  *
@@ -16,7 +18,10 @@ class Gorilla
 {
     private $banana;
 
-    public function setBanana(array $banana)
+    /**
+     * @param string $banana
+     */
+    public function setBanana($banana)
     {
         $this->banana = $banana;
     }

testapp/features/bootstrap/FeatureContext.php

@@ -9,17 +9,24 @@
  * file that was distributed with this source code.
  */
 
-require_once __DIR__.'/../../autoload.php';
-
 use Gorghoa\ScenarioStateBehatExtension\Annotation\ScenarioStateArgument;
 use Gorghoa\ScenarioStateBehatExtension\Context\ScenarioStateAwareContext;
 use Gorghoa\ScenarioStateBehatExtension\ScenarioStateInterface;
+use Gorghoa\ScenarioStateBehatExtension\TestApp\Gorilla;
 
 /**
  * @author Rodrigue Villetard <[email protected]>
  */
 class FeatureContext implements ScenarioStateAwareContext
 {
+    /**
+     * @beforeSuite
+     */
+    public static function setUpSuite()
+    {
+        require_once __DIR__.'/../../autoload.php';
+    }
+
     /**
      * @var ScenarioStateInterface
      */
@@ -35,7 +42,7 @@ public function setScenarioState(ScenarioStateInterface $scenarioState)
      */
     public function takeBanana()
     {
-        $this->scenarioState->provideStateFragment('scenarioBanana', ['Yammy Banana']);
+        $this->scenarioState->provideStateFragment('scenarioBanana', 'Yammy Banana');
     }
 
     /**
@@ -47,7 +54,7 @@ public function takeBanana()
      */
     public function giveBananaToGorilla($scenarioBanana)
     {
-        \PHPUnit_Framework_Assert::assertEquals($scenarioBanana, ['Yammy Banana']);
+        \PHPUnit_Framework_Assert::assertEquals($scenarioBanana, 'Yammy Banana');
         $gorilla = new Gorilla();
         $gorilla->setBanana($scenarioBanana);
         $this->scenarioState->provideStateFragment('scenarioGorilla', $gorilla);
@@ -64,7 +71,7 @@ public function giveBananaToGorilla($scenarioBanana)
      */
     public function gorillaHasBanana($scenarioBanana, Gorilla $gorilla)
     {
-        \PHPUnit_Framework_Assert::assertEquals($scenarioBanana, ['Yammy Banana']);
-        \PHPUnit_Framework_Assert::assertEquals($gorilla->getBanana(), ['Yammy Banana']);
+        \PHPUnit_Framework_Assert::assertEquals($scenarioBanana, 'Yammy Banana');
+        \PHPUnit_Framework_Assert::assertEquals($gorilla->getBanana(), 'Yammy Banana');
     }
 }

tests/ScenarioStateArgumentOrganiserTest.php

@@ -76,9 +76,9 @@ protected function setUp()
     public function testOrganiseArguments()
     {
         $this->functionMock->getParameters()->willReturn([
-            (object)['name' => 'scenarioBanana'],
-            (object)['name' => 'gorilla'],
-            (object)['name' => 'foo'],
+            (object) ['name' => 'scenarioBanana'],
+            (object) ['name' => 'gorilla'],
+            (object) ['name' => 'foo'],
         ])->shouldBeCalledTimes(1);
 
         $this->initializerMock->getStore()->willReturn($this->storeMock->reveal())->shouldBeCalledTimes(1);