Merge pull request #128 from DonCallisto/patch-4

Added php7.4

Author: jakzal

.travis.yml

@@ -2,10 +2,10 @@ language: php
 
 matrix:
     include:
-        - php: 7.1
-          env: deps=low
         - php: 7.2
+          env: deps=low
         - php: 7.3
+        - php: 7.4
     fast_finish: true
 
 before_script:

composer.json

@@ -20,17 +20,17 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3,<7.4",
+        "php": "^7.2",
         "behat/behat": "^3.3",
         "behat/mink": "^1.7",
         "behat/mink-extension": "^2.2",
         "ocramius/proxy-manager": "^2.1.1"
     },
     "require-dev": {
         "behat/mink-goutte-driver": "^1.2",
-        "bossa/phpspec2-expect": "^3.1",
+        "bossa/phpspec2-expect": "^3.1.1",
         "fabpot/goutte": "^3.2",
-        "phpspec/phpspec": "^5.1",
+        "phpspec/phpspec": "^6.1",
         "symfony/filesystem": "^4.2 || ^5.0",
         "symfony/process": "^4.2 || ^5.0",
         "symfony/yaml": "^4.2 || ^5.0"
@@ -50,5 +50,8 @@
         "psr-4": {
             "SensioLabs\\Behat\\PageObjectExtension\\": "src/"
         }
+    },
+    "conflict": {
+        "guzzlehttp/guzzle": "<6.3"
     }
 }

features/bootstrap/BehatRunnerContext.php

@@ -14,11 +14,6 @@ class BehatRunnerContext implements Context
      */
     private $workingDir;
 
-    /**
-     * @var string|null
-     */
-    private $phpBin;
-
     /**
      * @var Process|null
      */
@@ -32,8 +27,12 @@ public function bootstrap()
         $this->workingDir = sprintf('%s/%s/', sys_get_temp_dir(), uniqid('BehatPageObjectExtension_'));
         $this->getFilesystem()->mkdir($this->workingDir, 0777);
 
-        $this->phpBin = $this->findPhpBinary();
-        $this->process = new Process(null);
+        $this->process = new Process([
+            $this->findPhpBinary(),
+            BEHAT_BIN_PATH,
+            '--format-settings={"timer": false}',
+            '--format=progress'
+        ], $this->workingDir);
     }
 
     /**
@@ -85,16 +84,6 @@ public function aContextFileNamedWith($fileName, PyStringNode $content)
      */
     public function iRunBehat()
     {
-        $this->process->setWorkingDirectory($this->workingDir);
-        $this->process->setCommandLine(
-            sprintf(
-                '%s %s %s %s',
-                $this->phpBin,
-                escapeshellarg(BEHAT_BIN_PATH),
-                strtr('--format-settings=\'{"timer": false}\'', array('\'' => '"', '"' => '\"')),
-                '--format=progress'
-            )
-        );
         $this->process->start();
         $this->process->wait();
     }

features/bootstrap/PhpServerContext.php

@@ -15,7 +15,7 @@ class PhpServerContext implements Context
      */
     public static function startPhpServer()
     {
-        self::$phpServer = new Process('php -S localhost:8000 features/application/index.php');
+        self::$phpServer = new Process(['php', '-S', 'localhost:8000', 'features/application/index.php']);
         self::$phpServer->start();
 
         sleep(1);

src/PageObject/Factory/CamelcasedClassNameResolver.php

@@ -67,7 +67,7 @@ private function resolve($pageObjectName, array $namespaces, $pageObjectType)
         }
 
         $message = sprintf('Could not find a class for the "%s" %s. ', $pageObjectName, $pageObjectType);
-        $message.= sprintf('None of the configured namespaces worked: "%s"', implode($classNameCandidates, ', '));
+        $message.= sprintf('None of the configured namespaces worked: "%s"', implode(', ', $classNameCandidates));
 
         throw new \InvalidArgumentException($message);
     }