Merge pull request #14 from TavoNiievez/return-types

Code standards updated to PHP 7.2

Author: Jeckerson

composer.json

@@ -1,41 +1,43 @@
 {
-    "name":"codeception/module-phalcon4",
-    "description":"Codeception module for Phalcon 4 framework",
-    "keywords":["codeception", "phalcon", "phalcon4"],
-    "homepage":"https://codeception.com/",
-    "type":"library",
-    "license":"MIT",
-    "authors": [
-        {
-            "name": "Phalcon Team",
-            "email": "[email protected]",
-            "homepage": "https://phalcon.io/en/team"
-        },
-        {
-            "name": "Codeception Team",
-            "email": "[email protected]",
-            "homepage": "http://codeception.com/"
-        }
-    ],
-    "require": {
-        "php": ">=7.2.0",
-        "ext-phalcon": ">=4",
-        "codeception/codeception": "^4.0",
-        "codeception/lib-innerbrowser": "^1.0",
-        "codeception/module-asserts": "^1.0",
-        "codeception/module-phpbrowser": "^1.0",
-        "codeception/module-db": "^1.0"
-    },
-    "require-dev": {
-        "codeception/util-robohelpers": "dev-master",
-        "vlucas/phpdotenv": "^4.1",
-        "squizlabs/php_codesniffer": "^3.4",
-        "vimeo/psalm": "^3.6"
-    },
-    "autoload":{
-        "classmap": ["src/"]
-    },
-    "config": {
-        "classmap-authoritative": true
-    }
+	"name": "codeception/module-phalcon4",
+	"description": "Codeception module for Phalcon 4 framework",
+	"keywords": [ "codeception", "phalcon", "phalcon4" ],
+	"homepage": "https://codeception.com/",
+	"type": "library",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Phalcon Team",
+			"email": "[email protected]",
+			"homepage": "https://phalcon.io/en/team"
+		},
+		{
+			"name": "Codeception Team",
+			"email": "[email protected]",
+			"homepage": "https://codeception.com/"
+		}
+	],
+	"require": {
+		"php": ">=7.2.0",
+		"ext-json": "*",
+		"codeception/codeception": "^4.0",
+		"codeception/lib-innerbrowser": "^1.0",
+		"codeception/module-asserts": "^1.0",
+		"codeception/module-phpbrowser": "^1.0",
+		"codeception/module-db": "^1.0"
+	},
+	"require-dev": {
+		"codeception/util-robohelpers": "dev-master",
+		"vlucas/phpdotenv": "^4.1",
+		"squizlabs/php_codesniffer": "^3.4",
+		"vimeo/psalm": "^3.6"
+	},
+	"autoload": {
+		"classmap": [
+			"src/"
+		]
+	},
+	"config": {
+		"classmap-authoritative": true
+	}
 }

readme.md

@@ -7,6 +7,10 @@ A Codeception module for Phalcon4 framework
 [![Total Downloads](https://poser.pugx.org/codeception/module-phalcon4/downloads)](https://packagist.org/packages/codeception/module-phalcon4)
 [![License](https://poser.pugx.org/codeception/module-phalcon4/license)](/LICENSE)
 
+## Requirements
+
+* `PHP 7.2` or higher.
+
 ## Installation
 
 ```

src/Codeception/Lib/Connector/Phalcon4.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Codeception\Lib\Connector;
 
 use Closure;
@@ -9,13 +11,15 @@
 use Phalcon\Http;
 use Phalcon\Mvc\Application;
 use Phalcon\Mvc\Micro as MicroApplication;
+use ReflectionException;
 use ReflectionProperty;
 use RuntimeException;
-use Symfony\Component\BrowserKit\AbstractBrowser as Client;
+use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Cookie;
+use Symfony\Component\BrowserKit\Request;
 use Symfony\Component\BrowserKit\Response;
 
-class Phalcon4 extends Client
+class Phalcon4 extends AbstractBrowser
 {
     use PhpSuperGlobalsConverter;
 
@@ -30,7 +34,7 @@ class Phalcon4 extends Client
      *
      * @param mixed $application
      */
-    public function setApplication($application)
+    public function setApplication($application): void
     {
         $this->application = $application;
     }
@@ -43,10 +47,11 @@ public function setApplication($application)
     public function getApplication()
     {
         $application = $this->application;
-
         if ($application instanceof Closure) {
             return $application();
-        } elseif (is_string($application)) {
+        }
+
+        if (is_string($application)) {
             /** @noinspection PhpIncludeInspection */
             return require $application;
         }
@@ -57,12 +62,11 @@ public function getApplication()
     /**
      * Makes a request.
      *
-     * @param \Symfony\Component\BrowserKit\Request $request
+     * @param Request $request
      *
-     * @return \Symfony\Component\BrowserKit\Response
-     * @throws \RuntimeException
+     * @throws RuntimeException|ReflectionException
      */
-    public function doRequest($request)
+    public function doRequest($request): Response
     {
         $application = $this->getApplication();
         if (!$application instanceof Application && !$application instanceof MicroApplication) {
@@ -99,7 +103,7 @@ public function doRequest($request)
             $_POST = $_REQUEST;
         }
 
-        parse_str($queryString, $output);
+        parse_str((string) $queryString, $output);
         foreach ($output as $k => $v) {
             $_GET[$k] = $v;
         }
@@ -125,12 +129,14 @@ public function doRequest($request)
 
         $headersProperty = new ReflectionProperty($headers, 'headers');
         $headersProperty->setAccessible(true);
+
         $headers = $headersProperty->getValue($headers);
         if (!is_array($headers)) {
             $headers = [];
         }
 
         $cookiesProperty = new ReflectionProperty($di['cookies'], 'cookies');
+
         $cookiesProperty->setAccessible(true);
         $cookies = $cookiesProperty->getValue($di['cookies']);
         if (is_array($cookies)) {
@@ -156,7 +162,7 @@ public function doRequest($request)
 
         return new Response(
             $response->getContent() ?: '',
-            $status ? $status : 200,
+            $status !== 0 ? $status : 200,
             $headers
         );
     }