diff --git a/.travis.yml b/.travis.yml
index ec57673..634a854 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: php
 
-dist: trusty
-
 matrix:
   include:
   - php: 7.2
@@ -17,10 +15,10 @@ before_script:
 - composer install -n
 
 script:
+- if [[ "$ANALYSIS" != 'true' ]]; then vendor/bin/phpunit ; fi
 - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
-- vendor/bin/phpunit
-- vendor/bin/phpcs
-- vendor/bin/phpstan analyse src
+- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpcs ; fi
+- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpstan analyse src ; fi
 
 after_success:
 - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --coverage_clover=clover.xml -v ; fi
diff --git a/composer.json b/composer.json
index e1ef9c8..3241463 100644
--- a/composer.json
+++ b/composer.json
@@ -28,21 +28,22 @@
     }
   ],
   "require": {
+    "php": "^7.2",
+    "ext-SimpleXML": "*",
     "ext-fileinfo": "*",
     "ext-json": "*",
     "ext-libxml": "*",
-    "ext-SimpleXML": "*",
-    "php": "^7.2",
     "psr/http-factory": "^1.0",
     "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",
     "phpstan/phpstan": "^0.10.3",
     "phpunit/phpunit": "^8.5",
-    "php-http/psr7-integration-tests": "dev-master",
-    "squizlabs/php_codesniffer": "^3.3.2",
-    "laminas/laminas-diactoros": "^2.0"
+    "squizlabs/php_codesniffer": "^3.5"
   },
   "provide": {
     "psr/http-factory": "^1.0"
@@ -66,5 +67,8 @@
     "phpunit": "phpunit",
     "phpcs": "phpcs",
     "phpstan": "phpstan analyse src --memory-limit=-1"
-  }
+  },
+    "config": {
+        "sort-packages": true
+    }
 }
diff --git a/phpcs.xml b/phpcs.xml
index 72e9907..07c6f0f 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,10 +8,10 @@
     <arg name="colors"/>
 
     <!-- inherit rules from: -->
-    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
 
     <!-- Paths to check -->
     <file>src</file>
     <file>tests</file>
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d8dcc8f..71290c3 100644
--- 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/Factory/DecoratedResponseFactory.php b/src/Factory/DecoratedResponseFactory.php
index 8b69d9c..1838076 100644
--- a/src/Factory/DecoratedResponseFactory.php
+++ b/src/Factory/DecoratedResponseFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/src/Factory/DecoratedServerRequestFactory.php b/src/Factory/DecoratedServerRequestFactory.php
index 04f7042..5e68053 100644
--- a/src/Factory/DecoratedServerRequestFactory.php
+++ b/src/Factory/DecoratedServerRequestFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/src/Factory/DecoratedUriFactory.php b/src/Factory/DecoratedUriFactory.php
index c1087d2..90f48c3 100644
--- a/src/Factory/DecoratedUriFactory.php
+++ b/src/Factory/DecoratedUriFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/src/Response.php b/src/Response.php
index 750009e..f1e207d 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -15,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
 {
     /**
@@ -32,7 +51,7 @@ class Response implements ResponseInterface
      *
      * @var string
      */
-    const EOL = "\r\n";
+    public const EOL = "\r\n";
 
     /**
      * @param ResponseInterface $response
diff --git a/src/ServerRequest.php b/src/ServerRequest.php
index fd6e07f..310bcd5 100644
--- a/src/ServerRequest.php
+++ b/src/ServerRequest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -15,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/src/Uri.php b/src/Uri.php
index b46b57c..54452d5 100644
--- a/src/Uri.php
+++ b/src/Uri.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/tests/Assets/PhpFunctionOverrides.php b/tests/Assets/PhpFunctionOverrides.php
index 44e8464..32ec764 100644
--- a/tests/Assets/PhpFunctionOverrides.php
+++ b/tests/Assets/PhpFunctionOverrides.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/tests/Providers/LaminasDiactorosPsr17FactoryProvider.php b/tests/Providers/LaminasDiactorosPsr17FactoryProvider.php
index f655945..8516a05 100644
--- a/tests/Providers/LaminasDiactorosPsr17FactoryProvider.php
+++ b/tests/Providers/LaminasDiactorosPsr17FactoryProvider.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/tests/Providers/NyholmPsr17FactoryProvider.php b/tests/Providers/NyholmPsr17FactoryProvider.php
index e235b69..c0e9886 100644
--- a/tests/Providers/NyholmPsr17FactoryProvider.php
+++ b/tests/Providers/NyholmPsr17FactoryProvider.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/tests/Providers/Psr17FactoryProvider.php b/tests/Providers/Psr17FactoryProvider.php
index d1f0cee..e74b8a3 100644
--- a/tests/Providers/Psr17FactoryProvider.php
+++ b/tests/Providers/Psr17FactoryProvider.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/tests/Providers/ZendDiactorosPsr17FactoryProvider.php b/tests/Providers/ZendDiactorosPsr17FactoryProvider.php
index 7855038..e909035 100644
--- a/tests/Providers/ZendDiactorosPsr17FactoryProvider.php
+++ b/tests/Providers/ZendDiactorosPsr17FactoryProvider.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/tests/Psr7Integration/Laminas/ResponseTest.php b/tests/Psr7Integration/Laminas/ResponseTest.php
index 57d421a..db3ef94 100644
--- a/tests/Psr7Integration/Laminas/ResponseTest.php
+++ b/tests/Psr7Integration/Laminas/ResponseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index 369b15e..5920410 100644
--- a/tests/Psr7Integration/Laminas/ServerRequestTest.php
+++ b/tests/Psr7Integration/Laminas/ServerRequestTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index 23aaa52..6dee255 100644
--- a/tests/Psr7Integration/Laminas/UriTest.php
+++ b/tests/Psr7Integration/Laminas/UriTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index a627883..6dda21b 100644
--- a/tests/Psr7Integration/Nyholm/ResponseTest.php
+++ b/tests/Psr7Integration/Nyholm/ResponseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index 3196131..079613c 100644
--- a/tests/Psr7Integration/Nyholm/ServerRequestTest.php
+++ b/tests/Psr7Integration/Nyholm/ServerRequestTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index f3a037a..950eadf 100644
--- a/tests/Psr7Integration/Nyholm/UriTest.php
+++ b/tests/Psr7Integration/Nyholm/UriTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index cdff871..e4d05b6 100644
--- a/tests/Psr7Integration/Zend/ResponseTest.php
+++ b/tests/Psr7Integration/Zend/ResponseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index 11f9cd8..d15a040 100644
--- a/tests/Psr7Integration/Zend/ServerRequestTest.php
+++ b/tests/Psr7Integration/Zend/ServerRequestTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index 9590390..2976d23 100644
--- a/tests/Psr7Integration/Zend/UriTest.php
+++ b/tests/Psr7Integration/Zend/UriTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -14,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
index aaa1420..cb3ebb2 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -15,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()
@@ -639,8 +649,8 @@ public function testWithInvalidJsonThrowsException()
     {
         $this->expectException(RuntimeException::class);
 
-        $data = ['foo' => 'bar'.chr(233)];
-        $this->assertEquals('bar'.chr(233), $data['foo']);
+        $data = ['foo' => 'bar' . chr(233)];
+        $this->assertEquals('bar' . chr(233), $data['foo']);
 
         foreach ($this->factoryProviders as $factoryProvider) {
             /** @var Psr17FactoryProvider $provider */
diff --git a/tests/ServerRequestTest.php b/tests/ServerRequestTest.php
index 27b2524..b672516 100644
--- a/tests/ServerRequestTest.php
+++ b/tests/ServerRequestTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -13,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
 {
@@ -832,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);
         }
@@ -853,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);
         }
@@ -874,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/TestCase.php b/tests/TestCase.php
index 7d31737..19ff61a 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
diff --git a/tests/UriTest.php b/tests/UriTest.php
index 3270dba..39d04d1 100644
--- a/tests/UriTest.php
+++ b/tests/UriTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -13,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
index ddea278..875acb9 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -7,6 +8,21 @@
 
 declare(strict_types=1);
 
-require __DIR__ . '/../vendor/autoload.php';
+use AdrianSuter\Autoload\Override\Override;
+use Slim\Http\ServerRequest;
+
+$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'];
+            }
 
-require __DIR__ . '/Assets/PhpFunctionOverrides.php';
+            return preg_split($pattern, $subject, $limit, $flags);
+        }
+    ]
+]);