Fully-qualified function calls

slimphp · Jan 3, 2020 · 8f87a94 · 8f87a94
1 parent 5fa2471
commit 8f87a94
Show file tree

Hide file tree

Showing 17 changed files with 97 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -37,6 +37,7 @@
     "psr/http-message": "^1.0"
   },
   "require-dev": {
+    "adriansuter/php-autoload-override": "v0.1-beta",
     "laminas/laminas-diactoros": "^2.0",
     "nyholm/psr7": "^1.0",
     "php-http/psr7-integration-tests": "dev-master",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
          colors="true"
          bootstrap="tests/bootstrap.php"
 >

diff --git a/src/Response.php b/src/Response.php
@@ -16,6 +16,24 @@
 use Psr\Http\Message\StreamInterface;
 use RuntimeException;
 
+use function basename;
+use function in_array;
+use function is_array;
+use function is_resource;
+use function is_string;
+use function json_encode;
+use function json_last_error;
+use function json_last_error_msg;
+use function mime_content_type;
+use function preg_replace;
+use function rawurlencode;
+use function sprintf;
+use function stream_get_meta_data;
+use function strlen;
+use function substr;
+
+use const JSON_ERROR_NONE;
+
 class Response implements ResponseInterface
 {
     /**

diff --git a/src/ServerRequest.php b/src/ServerRequest.php
@@ -16,6 +16,22 @@
 use Psr\Http\Message\UriInterface;
 use RuntimeException;
 
+use function array_merge;
+use function count;
+use function explode;
+use function is_array;
+use function is_null;
+use function is_object;
+use function json_decode;
+use function libxml_clear_errors;
+use function libxml_disable_entity_loader;
+use function libxml_use_internal_errors;
+use function parse_str;
+use function preg_split;
+use function property_exists;
+use function simplexml_load_string;
+use function strtolower;
+
 class ServerRequest implements ServerRequestInterface
 {
     /**

diff --git a/tests/Psr7Integration/Laminas/ResponseTest.php b/tests/Psr7Integration/Laminas/ResponseTest.php
@@ -15,6 +15,9 @@
 use Slim\Http\Factory\DecoratedResponseFactory;
 use Slim\Tests\Http\Providers\LaminasDiactorosPsr17FactoryProvider;
 
+use function define;
+use function defined;
+
 class ResponseTest extends ResponseIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Laminas/ServerRequestTest.php b/tests/Psr7Integration/Laminas/ServerRequestTest.php
@@ -15,6 +15,9 @@
 use Slim\Http\Factory\DecoratedServerRequestFactory;
 use Slim\Tests\Http\Providers\LaminasDiactorosPsr17FactoryProvider;
 
+use function define;
+use function defined;
+
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Laminas/UriTest.php b/tests/Psr7Integration/Laminas/UriTest.php
@@ -15,6 +15,9 @@
 use Slim\Http\Factory\DecoratedUriFactory;
 use Slim\Tests\Http\Providers\LaminasDiactorosPsr17FactoryProvider;
 
+use function define;
+use function defined;
+
 class UriTest extends UriIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Nyholm/ResponseTest.php b/tests/Psr7Integration/Nyholm/ResponseTest.php
@@ -15,6 +15,9 @@
 use Slim\Http\Factory\DecoratedResponseFactory;
 use Slim\Tests\Http\Providers\NyholmPsr17FactoryProvider;
 
+use function define;
+use function defined;
+
 class ResponseTest extends ResponseIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Nyholm/ServerRequestTest.php b/tests/Psr7Integration/Nyholm/ServerRequestTest.php
@@ -15,6 +15,9 @@
 use Slim\Http\Factory\DecoratedServerRequestFactory;
 use Slim\Tests\Http\Providers\NyholmPsr17FactoryProvider;
 
+use function define;
+use function defined;
+
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Nyholm/UriTest.php b/tests/Psr7Integration/Nyholm/UriTest.php
@@ -15,6 +15,9 @@
 use Slim\Http\Factory\DecoratedUriFactory;
 use Slim\Tests\Http\Providers\NyholmPsr17FactoryProvider;
 
+use function define;
+use function defined;
+
 class UriTest extends UriIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Zend/ResponseTest.php b/tests/Psr7Integration/Zend/ResponseTest.php
@@ -15,6 +15,9 @@
 use Slim\Tests\Http\Providers\ZendDiactorosPsr17FactoryProvider;
 use Zend\Diactoros\StreamFactory;
 
+use function define;
+use function defined;
+
 class ResponseTest extends ResponseIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Zend/ServerRequestTest.php b/tests/Psr7Integration/Zend/ServerRequestTest.php
@@ -15,6 +15,9 @@
 use Slim\Tests\Http\Providers\ZendDiactorosPsr17FactoryProvider;
 use Zend\Diactoros\StreamFactory;
 
+use function define;
+use function defined;
+
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/Psr7Integration/Zend/UriTest.php b/tests/Psr7Integration/Zend/UriTest.php
@@ -15,6 +15,9 @@
 use Slim\Tests\Http\Providers\ZendDiactorosPsr17FactoryProvider;
 use Zend\Diactoros\StreamFactory;
 
+use function define;
+use function defined;
+
 class UriTest extends UriIntegrationTest
 {
     public static function setUpBeforeClass(): void

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -16,6 +16,15 @@
 use Slim\Http\Response;
 use Slim\Tests\Http\Providers\Psr17FactoryProvider;
 
+use function chr;
+use function fclose;
+use function fopen;
+use function is_resource;
+use function json_decode;
+use function property_exists;
+
+use const JSON_HEX_AMP;
+
 class ResponseTest extends TestCase
 {
     public function testDisableSetter()

diff --git a/tests/ServerRequestTest.php b/tests/ServerRequestTest.php
@@ -14,6 +14,9 @@
 use RuntimeException;
 use Slim\Http\Factory\DecoratedServerRequestFactory;
 use Slim\Tests\Http\Providers\Psr17FactoryProvider;
+use stdClass;
+
+use function property_exists;
 
 class ServerRequestTest extends TestCase
 {
@@ -833,7 +836,7 @@ public function testGetParsedBodyXml()
                 ->withHeader('Content-Type', 'application/hal+xml;charset=utf8')
                 ->withBody($stream);
 
-            /** @var \stdClass $obj */
+            /** @var stdClass $obj */
             $obj = $request->getParsedBody();
             $this->assertEquals('John', $obj->name);
         }
@@ -854,7 +857,7 @@ public function testGetParsedBodyStructuredSuffixXml()
                 ->withHeader('Content-Type', 'application/xml;charset=utf8')
                 ->withBody($stream);
 
-            /** @var \stdClass $obj */
+            /** @var stdClass $obj */
             $obj = $request->getParsedBody();
             $this->assertEquals('John', $obj->name);
         }
@@ -875,7 +878,7 @@ public function testGetParsedBodyXmlWithTextXMLMediaType()
                 ->withHeader('Content-Type', 'text/xml')
                 ->withBody($stream);
 
-            /** @var \stdClass $obj */
+            /** @var stdClass $obj */
             $obj = $request->getParsedBody();
             $this->assertEquals('John', $obj->name);
         }

diff --git a/tests/UriTest.php b/tests/UriTest.php
@@ -14,6 +14,8 @@
 use Slim\Http\Factory\DecoratedUriFactory;
 use Slim\Tests\Http\Providers\Psr17FactoryProvider;
 
+use function property_exists;
+
 class UriTest extends TestCase
 {
     public function testDisableSetter()

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -8,6 +8,21 @@
 
 declare(strict_types=1);
 
-require __DIR__ . '/../vendor/autoload.php';
+use AdrianSuter\Autoload\Override\Override;
+use Slim\Http\ServerRequest;
 
-require __DIR__ . '/Assets/PhpFunctionOverrides.php';
+$classLoader = require __DIR__ . '/../vendor/autoload.php';
+
+//require __DIR__ . '/Assets/PhpFunctionOverrides.php';
+
+Override::apply($classLoader, [
+    ServerRequest::class => [
+        'preg_split' => function (string $pattern, string $subject, int $limit = -1, int $flags = 0) {
+            if (isset($GLOBALS['preg_split_return'])) {
+                return $GLOBALS['preg_split_return'];
+            }
+
+            return preg_split($pattern, $subject, $limit, $flags);
+        }
+    ]
+]);