Merge pull request #70 from fezfez/php8.2

Drop support php 7, add php 8.2 support

composer.json

@@ -23,16 +23,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "laminas/laminas-loader": "^2.8",
         "laminas/laminas-stdlib": "^3.6",
         "laminas/laminas-uri": "^2.9.1",
         "laminas/laminas-validator": "^2.15"
     },
     "require-dev": {
         "ext-curl": "*",
-        "laminas/laminas-coding-standard": "~2.2.1",
-        "phpunit/phpunit": "^9.5.5"
+        "laminas/laminas-coding-standard": "~2.4.0",
+        "phpunit/phpunit": "^9.5.25"
     },
     "suggest": {
         "paragonie/certainty": "For automated management of cacert.pem"

phpcs.xml.dist

@@ -19,4 +19,8 @@
 
     <!-- Include all rules from Laminas Coding Standard -->
     <rule ref="LaminasCodingStandard"/>
+
+    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing">
+        <exclude-pattern>src/</exclude-pattern>
+    </rule>
 </ruleset>

src/Header/ContentType.php

@@ -9,7 +9,6 @@
 use function array_walk;
 use function count;
 use function explode;
-use function get_class;
 use function gettype;
 use function implode;
 use function is_object;
@@ -295,7 +294,7 @@ protected function getMediaTypeObjectFromString($string)
         if (! is_string($string)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Non-string mediatype "%s" provided',
-                is_object($string) ? get_class($string) : gettype($string)
+                is_object($string) ? $string::class : gettype($string)
             ));
         }
 

src/Headers.php

@@ -20,7 +20,6 @@
 use function count;
 use function current;
 use function explode;
-use function get_class;
 use function gettype;
 use function implode;
 use function in_array;
@@ -160,7 +159,7 @@ public function addHeaders($headers)
         if (! is_array($headers) && ! $headers instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Expected array or Traversable; received "%s"',
-                is_object($headers) ? get_class($headers) : gettype($headers)
+                is_object($headers) ? $headers::class : gettype($headers)
             ));
         }
 

test/Client/CurlTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use ArrayObject;
@@ -580,6 +582,6 @@ public function testMustRemoveProxyConnectionEstablishedLine()
         $response = $this->client->getResponse();
 
         $this->assertSame(200, $response->getStatusCode());
-        $this->assertMatchesRegularExpression('#^HTTP/1.(0|1) 200 OK$#', trim(strstr($response, "\n", true)));
+        $this->assertMatchesRegularExpression('#^HTTP/1.(0|1) 200 OK$#', trim(strstr((string) $response, "\n", true)));
     }
 }

test/Client/ProxyAdapterTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use Laminas\Http\Client;

test/Client/SocketKeepaliveTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use Laminas\Http\Client\Adapter\Socket;

test/Client/SocketPersistentTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use Laminas\Http\Client\Adapter\Socket;

test/Client/SocketTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use ArrayObject;

test/Client/StaticClientTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use Laminas\Http\Client;

test/Client/StaticTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use ArrayObject;

test/Client/TestAdapterTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use Exception;

test/Client/TestAsset/MockAdapter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client\TestAsset;
 
 use Laminas\Http\Client\Adapter\Test;

test/Client/TestAsset/MockClient.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client\TestAsset;
 
 use Laminas\Http\Client;

test/Client/UseCaseTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Client;
 
 use Laminas\Http\Client as HTTPClient;

test/CookiesTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http;
 
 use Laminas\Http\Cookies;

test/Header/AcceptCharsetTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\AcceptCharset;

test/Header/AcceptEncodingTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\AcceptEncoding;

test/Header/AcceptLanguageTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\AcceptLanguage;

test/Header/AcceptRangesTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\AcceptRanges;

test/Header/AcceptTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Accept;

test/Header/AgeTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Age;

test/Header/AllowTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Allow;

test/Header/AuthenticationInfoTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\AuthenticationInfo;

test/Header/AuthorizationTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Authorization;

test/Header/CacheControlTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\CacheControl;

test/Header/ConnectionTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Connection;

test/Header/ContentDispositionTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentDisposition;

test/Header/ContentEncodingTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentEncoding;

test/Header/ContentLanguageTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentLanguage;

test/Header/ContentLengthTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentLength;

test/Header/ContentLocationTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentLocation;

test/Header/ContentRangeTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentRange;

test/Header/ContentSecurityPolicyReportOnlyTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentSecurityPolicyReportOnly;

test/Header/ContentSecurityPolicyTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Exception\RuntimeException;

test/Header/ContentTransferEncodingTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentTransferEncoding;

test/Header/ContentTypeTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\ContentType;

test/Header/CookieTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use ArrayObject;

test/Header/DateTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use DateTime;
@@ -36,7 +38,7 @@ public function testDateFromTimeStringCreatesValidDateHeader()
         $this->assertInstanceOf(Date::class, $dateHeader);
 
         $date     = new DateTime('now', new DateTimeZone('GMT'));
-        $interval = $dateHeader->date()->diff($date, 1);
+        $interval = $dateHeader->date()->diff($date, true);
 
         if (PHP_VERSION_ID >= 70200) {
             $this->assertSame('+11 hours 59 minutes 59 seconds', $interval->format('%R%H hours %I minutes %S seconds'));
@@ -55,7 +57,7 @@ public function testDateFromTimestampCreatesValidDateHeader()
         $this->assertInstanceOf(Date::class, $dateHeader);
 
         $date     = new DateTime('now', new DateTimeZone('GMT'));
-        $interval = $dateHeader->date()->diff($date, 1);
+        $interval = $dateHeader->date()->diff($date, true);
 
         if (PHP_VERSION_ID >= 70200) {
             $this->assertSame('+11 hours 59 minutes 59 seconds', $interval->format('%R%H hours %I minutes %S seconds'));

test/Header/EtagTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Etag;

test/Header/ExpectTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Exception\InvalidArgumentException;

test/Header/ExpiresTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Http\Header;
 
 use Laminas\Http\Header\Exception\InvalidArgumentException;