Merge pull request #7 from tyx/feature/new-namespace

shouze · web-flow · commit 02676384a3a2 · 2017-12-08T10:40:57.000+01:00
Change vendor namespace
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,20 @@
 language: php
 
 php:
-    - 5.5
     - 5.6
     - 7.0
+    - 7.1
+    - 7.2
+
+env:
+    matrix:
+        - COMPOSER_FLAGS=""
+        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+        - COMPOSER_FLAGS="--prefer-stable"
 
 before_script:
-    - composer install --prefer-dist --optimize-autoloader
+    - composer clearcache
+    - composer update $COMPOSER_FLAGS
     - bin/install-moco.sh
 
 script:
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Moco Extension for Behat 3
 
-[![Build Status](https://travis-ci.org/rezzza/moco-behat-extension.svg?branch=master)](https://travis-ci.org/rezzza/moco-behat-extension)
+[![Build Status](https://travis-ci.org/ubirak/moco-behat-extension.svg?branch=master)](https://travis-ci.org/ubirak/moco-behat-extension)
 
 [Moco](https://github.com/dreamhead/moco) is a stub server we used to use in test env.
 
@@ -11,14 +11,14 @@ Here is a small extension to make its usage more friendly.
 ```yml
 default:
     extensions:
-        Rezzza\MocoBehatExtension\MocoExtension:
+        Ubirak\MocoBehatExtension\MocoExtension:
             json_file: features/fixtures.yml
             hostname: 127.0.0.1
             port: 9997
     suites:
         default:
             contexts:
-                - Rezzza\MocoBehatExtension\MocoContext
+                - Ubirak\MocoBehatExtension\MocoContext
 ```
 
 Then you just need to add `MocoWriter` as an argument of your context and tag your scenario with `@moco`
diff --git a/composer.json b/composer.json
@@ -10,17 +10,22 @@
             "email": "team@ubirak.org"
         }
     ],
+    "replace": {
+        "rezzza/moco-behat-extension": "self.version"
+    },
     "autoload": {
-        "psr-4": { "Rezzza\\MocoBehatExtension\\": "src/" }
+        "psr-4": { "Ubirak\\MocoBehatExtension\\": "src/" }
     },
     "require": {
         "php": ">=5.5.9",
         "behat/behat": "~3.0"
     },
     "require-dev": {
-        "rezzza/rest-api-behat-extension": "^3.1",
+        "ubirak/rest-api-behat-extension": "^7.0",
         "symfony/process": "^3.0",
-        "atoum/atoum": "^2.8"
+        "atoum/atoum": "^3.2",
+        "php-http/curl-client": "^1.7",
+        "guzzlehttp/psr7": "^1.4"
     },
     "bin": ["bin/install-moco.sh"]
 }
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Process\PhpExecutableFinder;
 
 /**
- * Test workflow totally copied from https://github.com/Behat/WebApiExtension/blob/master/features/bootstrap/FeatureContext.php
+ * Test workflow totally copied from https://github.com/Behat/WebApiExtension/blob/master/features/bootstrap/FeatureContext.php.
  */
 class FeatureContext implements Context
 {
@@ -44,8 +44,8 @@ public static function cleanTestFolders()
      */
     public function prepareScenario()
     {
-        $dir = self::workingDir() . DIRECTORY_SEPARATOR . md5(microtime() * rand(0, 10000));
-        mkdir($dir . '/features/bootstrap', 0777, true);
+        $dir = self::workingDir().DIRECTORY_SEPARATOR.md5((microtime(true) * rand(0, 10000)));
+        mkdir($dir.'/features/bootstrap', 0777, true);
 
         $phpFinder = new PhpExecutableFinder();
 
@@ -64,7 +64,7 @@ public function prepareScenario()
     public function aFileNamedWith($filename, PyStringNode $fileContent)
     {
         $content = strtr((string) $fileContent, array("'''" => '"""'));
-        $this->createFile($this->workingDir . '/' . $filename, $content);
+        $this->createFile($this->workingDir.'/'.$filename, $content);
     }
 
     /**
@@ -119,14 +119,14 @@ private function getExitCode()
 
     private function getOutput()
     {
-        $output = $this->process->getErrorOutput() . $this->process->getOutput();
+        $output = $this->process->getErrorOutput().$this->process->getOutput();
 
         // Normalize the line endings in the output
         if ("\n" !== PHP_EOL) {
             $output = str_replace(PHP_EOL, "\n", $output);
         }
 
-        return trim(preg_replace("/ +$/m", '', $output));
+        return trim(preg_replace('/ +$/m', '', $output));
     }
 
     private function createFile($filename, $content)
@@ -142,7 +142,7 @@ private function createFile($filename, $content)
 
     public static function workingDir()
     {
-        return sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'json-api-behat';
+        return sys_get_temp_dir().DIRECTORY_SEPARATOR.'json-api-behat';
     }
 
     private static function clearDirectory($path)
@@ -152,7 +152,7 @@ private static function clearDirectory($path)
         array_shift($files);
 
         foreach ($files as $file) {
-            $file = $path . DIRECTORY_SEPARATOR . $file;
+            $file = $path.DIRECTORY_SEPARATOR.$file;
             if (is_dir($file)) {
                 self::clearDirectory($file);
             } else {
diff --git a/features/check-moco.feature b/features/check-moco.feature
@@ -8,19 +8,19 @@ Feature: Check moco
             """
             default:
                 extensions:
-                    Rezzza\MocoBehatExtension\MocoExtension:
+                    Ubirak\MocoBehatExtension\MocoExtension:
                         json_file: features/fixtures.yml
                         hostname: 127.0.0.1
                         port: 9997
-                    Rezzza\RestApiBehatExtension\Extension:
+                    Ubirak\RestApiBehatExtension\Extension:
                         rest:
                             base_url: http://127.0.0.1:9997
-                            adaptor_name: curl
+                            store_response: true
                 suites:
                     default:
                         contexts:
-                            - Rezzza\RestApiBehatExtension\RestApiContext
-                            - Rezzza\MocoBehatExtension\MocoContext
+                            - Ubirak\RestApiBehatExtension\RestApiContext
+                            - Ubirak\MocoBehatExtension\MocoContext
             """
         And a file named "features/call_moco.feature" with:
             """
diff --git a/features/mock-http-call.feature b/features/mock-http-call.feature
@@ -8,26 +8,26 @@ Feature: Mock HTTP call
             """
             default:
                 extensions:
-                    Rezzza\MocoBehatExtension\MocoExtension:
+                    Ubirak\MocoBehatExtension\MocoExtension:
                         json_file: features/fixtures.yml
                         hostname: 127.0.0.1
                         port: 9999
-                    Rezzza\RestApiBehatExtension\Extension:
+                    Ubirak\RestApiBehatExtension\Extension:
                         rest:
                             base_url: http://127.0.0.1:9999
-                            adaptor_name: curl
+                            store_response: true
                 suites:
                     default:
                         contexts:
                             - FeatureContext
-                            - Rezzza\RestApiBehatExtension\RestApiContext
-                            - Rezzza\MocoBehatExtension\MocoContext
+                            - Ubirak\RestApiBehatExtension\RestApiContext
+                            - Ubirak\MocoBehatExtension\MocoContext
             """
         And a file named "features/bootstrap/FeatureContext.php" with:
             """
             <?php
             use Behat\Behat\Context\Context;
-            use Rezzza\MocoBehatExtension\MocoWriter;
+            use Ubirak\MocoBehatExtension\MocoWriter;
 
             class FeatureContext implements Context
             {
diff --git a/src/MocoContext.php b/src/MocoContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rezzza\MocoBehatExtension;
+namespace Ubirak\MocoBehatExtension;
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
diff --git a/src/MocoExtension.php b/src/MocoExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rezzza\MocoBehatExtension;
+namespace Ubirak\MocoBehatExtension;
 
 use Behat\Testwork\ServiceContainer\Extension;
 use Behat\Testwork\ServiceContainer\ExtensionManager;
@@ -13,9 +13,9 @@ class MocoExtension implements Extension
 {
     public function load(ContainerBuilder $container, array $config)
     {
-        $container->setParameter('rezzza.moco.json_file', $config['json_file']);
-        $container->setParameter('rezzza.moco.port', $config['port']);
-        $container->setParameter('rezzza.moco.hostname', $config['hostname']);
+        $container->setParameter('ubirak.moco.json_file', $config['json_file']);
+        $container->setParameter('ubirak.moco.port', $config['port']);
+        $container->setParameter('ubirak.moco.hostname', $config['hostname']);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/Resources/config'));
         $loader->load('services.xml');
     }
diff --git a/src/MocoWriter.php b/src/MocoWriter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rezzza\MocoBehatExtension;
+namespace Ubirak\MocoBehatExtension;
 
 class MocoWriter
 {
diff --git a/src/MocoWriterResolver.php b/src/MocoWriterResolver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rezzza\MocoBehatExtension;
+namespace Ubirak\MocoBehatExtension;
 
 use Behat\Behat\Context\Argument\ArgumentResolver;
 
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -3,14 +3,14 @@
            xmlns="http://symfony.com/schema/dic/services"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="rezzza.moco.moco_writer" class="Rezzza\MocoBehatExtension\MocoWriter" public="false">
-            <argument>%rezzza.moco.json_file%</argument>
-            <argument>%rezzza.moco.hostname%</argument>
-            <argument>%rezzza.moco.port%</argument>
+        <service id="ubirak.moco.moco_writer" class="Ubirak\MocoBehatExtension\MocoWriter" public="false">
+            <argument>%ubirak.moco.json_file%</argument>
+            <argument>%ubirak.moco.hostname%</argument>
+            <argument>%ubirak.moco.port%</argument>
         </service>
 
-        <service id="rezzza.moco.moco_writer_resolver" class="Rezzza\MocoBehatExtension\MocoWriterResolver" public="false">
-            <argument type="service" id="rezzza.moco.moco_writer" />
+        <service id="ubirak.moco.moco_writer_resolver" class="Ubirak\MocoBehatExtension\MocoWriterResolver" public="false">
+            <argument type="service" id="ubirak.moco.moco_writer" />
             <tag name="context.argument_resolver" />
         </service>
     </services>
diff --git a/tests/units/MocoWriter.php b/tests/units/MocoWriter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rezzza\MocoBehatExtension\Tests\Units;
+namespace Ubirak\MocoBehatExtension\Tests\Units;
 
 use mageekguy\atoum;
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Symfony\Component\Process\PhpExecutableFinder;`
`8`	`8`
`9`	`9`	`/**`
`10`		`- * Test workflow totally copied from https://github.com/Behat/WebApiExtension/blob/master/features/bootstrap/FeatureContext.php`
	`10`	`+ * Test workflow totally copied from https://github.com/Behat/WebApiExtension/blob/master/features/bootstrap/FeatureContext.php.`
`11`	`11`	`*/`
`12`	`12`	`class FeatureContext implements Context`
`13`	`13`	`{`
`@@ -44,8 +44,8 @@ public static function cleanTestFolders()`
`44`	`44`	`*/`
`45`	`45`	`public function prepareScenario()`
`46`	`46`	`{`
`47`		`- $dir = self::workingDir() . DIRECTORY_SEPARATOR . md5(microtime() * rand(0, 10000));`
`48`		`- mkdir($dir . '/features/bootstrap', 0777, true);`
	`47`	`+ $dir = self::workingDir().DIRECTORY_SEPARATOR.md5((microtime(true) * rand(0, 10000)));`
	`48`	`+ mkdir($dir.'/features/bootstrap', 0777, true);`
`49`	`49`
`50`	`50`	`$phpFinder = new PhpExecutableFinder();`
`51`	`51`
`@@ -64,7 +64,7 @@ public function prepareScenario()`
`64`	`64`	`public function aFileNamedWith($filename, PyStringNode $fileContent)`
`65`	`65`	`{`
`66`	`66`	`$content = strtr((string) $fileContent, array("'''" => '"""'));`
`67`		`- $this->createFile($this->workingDir . '/' . $filename, $content);`
	`67`	`+ $this->createFile($this->workingDir.'/'.$filename, $content);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`
`@@ -119,14 +119,14 @@ private function getExitCode()`
`119`	`119`
`120`	`120`	`private function getOutput()`
`121`	`121`	`{`
`122`		`- $output = $this->process->getErrorOutput() . $this->process->getOutput();`
	`122`	`+ $output = $this->process->getErrorOutput().$this->process->getOutput();`
`123`	`123`
`124`	`124`	`// Normalize the line endings in the output`
`125`	`125`	`if ("\n" !== PHP_EOL) {`
`126`	`126`	`$output = str_replace(PHP_EOL, "\n", $output);`
`127`	`127`	`}`
`128`	`128`
`129`		`- return trim(preg_replace("/ +$/m", '', $output));`
	`129`	`+ return trim(preg_replace('/ +$/m', '', $output));`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private function createFile($filename, $content)`
`@@ -142,7 +142,7 @@ private function createFile($filename, $content)`
`142`	`142`
`143`	`143`	`public static function workingDir()`
`144`	`144`	`{`
`145`		`- return sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'json-api-behat';`
	`145`	`+ return sys_get_temp_dir().DIRECTORY_SEPARATOR.'json-api-behat';`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`private static function clearDirectory($path)`
`@@ -152,7 +152,7 @@ private static function clearDirectory($path)`
`152`	`152`	`array_shift($files);`
`153`	`153`
`154`	`154`	`foreach ($files as $file) {`
`155`		`- $file = $path . DIRECTORY_SEPARATOR . $file;`
	`155`	`+ $file = $path.DIRECTORY_SEPARATOR.$file;`
`156`	`156`	`if (is_dir($file)) {`
`157`	`157`	`self::clearDirectory($file);`
`158`	`158`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Rezzza\MocoBehatExtension;`
	`3`	`+namespace Ubirak\MocoBehatExtension;`
`4`	`4`
`5`	`5`	`use Behat\Testwork\ServiceContainer\Extension;`
`6`	`6`	`use Behat\Testwork\ServiceContainer\ExtensionManager;`
`@@ -13,9 +13,9 @@ class MocoExtension implements Extension`
`13`	`13`	`{`
`14`	`14`	`public function load(ContainerBuilder $container, array $config)`
`15`	`15`	`{`
`16`		`- $container->setParameter('rezzza.moco.json_file', $config['json_file']);`
`17`		`- $container->setParameter('rezzza.moco.port', $config['port']);`
`18`		`- $container->setParameter('rezzza.moco.hostname', $config['hostname']);`
	`16`	`+ $container->setParameter('ubirak.moco.json_file', $config['json_file']);`
	`17`	`+ $container->setParameter('ubirak.moco.port', $config['port']);`
	`18`	`+ $container->setParameter('ubirak.moco.hostname', $config['hostname']);`
`19`	`19`	`$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/Resources/config'));`
`20`	`20`	`$loader->load('services.xml');`
`21`	`21`	`}`