Http library moderinsation

.github/workflows/push-run-test-suite.yml

@@ -0,0 +1,29 @@
+name: push-run-test-suite
+run-name: ${{ github.event.repository.name }} ${{ github.event.ref }} ${{ github.event.head_commit.message }} run test suite.
+on: [push]
+jobs:
+  run-test-suite:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          coverage: xdebug
+          tools: composer:v2
+      - name : Install php-coveralls
+        run: composer global require php-coveralls/php-coveralls:~2.5
+      - name: Install dependencies
+        run: composer install --dev --no-interaction
+      - name: Create build directory
+        run: mkdir -p build/logs
+      - name: Run test suite
+        run: ./vendor/bin/phpunit --bootstrap vendor/autoload.php --coverage-clover build/logs/clover.xml test
+      - name: Upload coverage to Coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          php-coveralls --coverage_clover=build/logs/clover.xml -v
+

.gitignore

@@ -1,3 +1,5 @@
 vendor
 composer.lock
-.idea
+.idea
+.phpunit.cache
+build

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 php:
-  - "5.5"
+  - "8.2"
 
 install:
-  - composer require satooshi/php-coveralls:~0.6@stable
+  - composer require php-coveralls/php-coveralls:~2.5
 
 before_script:
   - mkdir -p build/logs

composer.json

@@ -14,7 +14,7 @@
         "php": ">=5.5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*"
+        "phpunit/phpunit": "^10"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+</phpunit>

src/HttpRequest.php

@@ -9,14 +9,15 @@ class HttpRequest implements Request
     protected $server;
     protected $files;
     protected $cookies;
+    protected $inputStream;
 
     public function __construct(
         array $get,
         array $post,
         array $cookies,
         array $files,
         array $server,
-        $inputStream = ''
+        string $inputStream = ''
     ) {
         $this->getParameters = $get;
         $this->postParameters = $post;

test/Unit/CookieBuilderTest.php

@@ -4,7 +4,11 @@
 
 use Http\CookieBuilder;
 
-class CookieBuilderTest extends \PHPUnit_Framework_TestCase
+/**
+ * @covers Http\CookieBuilder
+ * @covers Http\HttpCookie
+ */
+class CookieBuilderTest extends \PHPUnit\Framework\TestCase
 {
     public function testSetDefaultDomain()
     {

test/Unit/HttpCookieTest.php

@@ -4,7 +4,10 @@
 
 use Http\HttpCookie;
 
-class HttpCookieTest extends \PHPUnit_Framework_TestCase
+/**
+ * @covers Http\HttpCookie
+ */
+class HttpCookieTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetName()
     {

test/Unit/HttpRequestTest.php

@@ -4,7 +4,11 @@
 
 use Http\HttpRequest;
 
-class HttpRequestTest extends \PHPUnit_Framework_TestCase
+/**
+ * @covers Http\HttpRequest
+ * @uses Http\MissingRequestMetaVariableException
+ */
+class HttpRequestTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetParameter()
     {
@@ -241,11 +245,9 @@ public function testGetMethod()
         );
     }
 
-    /**
-     * @expectedException Http\MissingRequestMetaVariableException
-     */
     public function testGetMethodException()
     {
+        $this->expectException(\Http\MissingRequestMetaVariableException::class);
         $request = new HttpRequest([], [], [], [], []);
         $request->getMethod();
     }
@@ -271,11 +273,9 @@ public function testGetUri()
         );
     }
 
-    /**
-     * @expectedException Http\MissingRequestMetaVariableException
-     */
     public function testGetUriException()
     {
+        $this->expectException(\Http\MissingRequestMetaVariableException::class);
         $request = new HttpRequest([], [], [], [], []);
         $request->getUri();
     }
@@ -313,11 +313,9 @@ public function testGetHttpAccept()
         );
     }
 
-    /**
-     * @expectedException Http\MissingRequestMetaVariableException
-     */
     public function testGetHttpAcceptException()
     {
+        $this->expectException(\Http\MissingRequestMetaVariableException::class);
         $request = new HttpRequest([], [], [], [], []);
         $request->getHttpAccept();
     }
@@ -334,11 +332,9 @@ public function testGetReferer()
         );
     }
 
-    /**
-     * @expectedException Http\MissingRequestMetaVariableException
-     */
     public function testGetRefererException()
     {
+        $this->expectException(\Http\MissingRequestMetaVariableException::class);
         $request = new HttpRequest([], [], [], [], []);
         $request->getReferer();
     }
@@ -355,11 +351,9 @@ public function testGetUserAgent()
         );
     }
 
-    /**
-     * @expectedException Http\MissingRequestMetaVariableException
-     */
     public function testGetUserAgentException()
     {
+        $this->expectException(\Http\MissingRequestMetaVariableException::class);
         $request = new HttpRequest([], [], [], [], []);
         $request->getUserAgent();
     }
@@ -376,11 +370,9 @@ public function testGetIpAddress()
         );
     }
 
-    /**
-     * @expectedException Http\MissingRequestMetaVariableException
-     */
     public function testGetIpAddressException()
     {
+        $this->expectException(\Http\MissingRequestMetaVariableException::class);
         $request = new HttpRequest([], [], [], [], []);
         $request->getIpAddress();
     }
@@ -409,11 +401,9 @@ public function testGetQueryString()
         );
     }
 
-    /**
-     * @expectedException Http\MissingRequestMetaVariableException
-     */
     public function testGetQueryStringException()
     {
+        $this->expectException(\Http\MissingRequestMetaVariableException::class);
         $request = new HttpRequest([], [], [], [], []);
         $request->getQueryString();
     }

test/Unit/HttpResponseTest.php

@@ -4,7 +4,10 @@
 
 use Http\HttpResponse;
 
-class HttpResponseTest extends \PHPUnit_Framework_TestCase
+/**
+ * @covers Http\HttpResponse
+ */
+class HttpResponseTest extends \PHPUnit\Framework\TestCase
 {
     public function testSetStatusCode()
     {