Minimum PHP 7.4

.github/workflows/ci.yml

@@ -12,11 +12,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['8.0', '8.1']
         coverage: ['pcov']
         code-analysis: ['no']
         include:
-          - php-versions: '7.1'
+          - php-versions: '7.4'
             coverage: 'none'
             code-analysis: 'yes'
     steps:

.gitignore

@@ -6,3 +6,4 @@ composer.lock
 tests/cov/
 tests/.phpunit.result.cache
 .php_cs.cache
+.php-cs-fixer.cache

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,12 +1,13 @@
 <?php
 
-$config = PhpCsFixer\Config::create();
-$config->getFinder()
+$finder = PhpCsFixer\Finder::create()
     ->exclude('vendor')
     ->in(__DIR__);
+
+$config = new PhpCsFixer\Config();
 $config->setRules([
     '@PSR1' => true,
     '@Symfony' => true
 ]);
-
+$config->setFinder($finder);
 return $config;

composer.json

@@ -9,7 +9,7 @@
     "homepage": "http://sabre.io/uri/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^7.4 || ^8.0"
     },
     "authors": [
         {
@@ -37,9 +37,9 @@
         }
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.19.3",
-        "phpstan/phpstan": "^0.12",
-        "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
+        "friendsofphp/php-cs-fixer": "^3.9",
+        "phpstan/phpstan": "^1.8",
+        "phpunit/phpunit" : "^9.0"
     },
     "scripts": {
         "phpstan": [

lib/Version.php

@@ -16,5 +16,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '2.2.3';
+    public const VERSION = '2.3.0';
 }

lib/functions.php

@@ -69,7 +69,7 @@ function resolve(string $basePath, string $newPath): string
     $newPathParts = [];
     foreach ($pathParts as $pathPart) {
         switch ($pathPart) {
-            //case '' :
+            // case '' :
             case '.':
                 break;
             case '..':
@@ -322,6 +322,10 @@ function ($matches) {
         $uri
     );
 
+    if (null === $uri) {
+        throw new InvalidUriException('Invalid, or could not parse URI');
+    }
+
     $result = [
         'scheme' => null,
         'host' => null,

tests/Uri/BuildTest.php

@@ -4,14 +4,14 @@
 
 namespace Sabre\Uri;
 
-class BuildTest extends \PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class BuildTest extends TestCase
 {
     /**
      * @dataProvider buildUriData
-     *
-     * @param string $value
      */
-    public function testBuild($value): void
+    public function testBuild(string $value): void
     {
         /** @var array<string, int|string> $parsedUrl */
         $parsedUrl = parse_url($value);
@@ -25,7 +25,7 @@ public function testBuild($value): void
     /**
      * @return array<int, array<int, string>>
      */
-    public function buildUriData()
+    public function buildUriData(): array
     {
         return [
             ['http://example.org/'],

tests/Uri/NormalizeTest.php

@@ -4,15 +4,14 @@
 
 namespace Sabre\Uri;
 
-class NormalizeTest extends \PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class NormalizeTest extends TestCase
 {
     /**
      * @dataProvider normalizeData
-     *
-     * @param string $in
-     * @param string $out
      */
-    public function testNormalize($in, $out): void
+    public function testNormalize(string $in, string $out): void
     {
         $this->assertEquals(
             $out,
@@ -23,7 +22,7 @@ public function testNormalize($in, $out): void
     /**
      * @return array<int, array<int, string>>
      */
-    public function normalizeData()
+    public function normalizeData(): array
     {
         return [
             ['https://example.org/',            'https://example.org/'],
@@ -41,7 +40,7 @@ public function normalizeData()
             ['http://example.org:80/',          'http://example.org/'],
             // See issue #6. parse_url corrupts strings like this, but only on
             // macs.
-            //[ 'http://example.org/有词法别名.zh','http://example.org/%E6%9C%89%E8%AF%8D%E6%B3%95%E5%88%AB%E5%90%8D.zh'],
+            // [ 'http://example.org/有词法别名.zh','http://example.org/%E6%9C%89%E8%AF%8D%E6%B3%95%E5%88%AB%E5%90%8D.zh'],
         ];
     }
 }

tests/Uri/ParseTest.php

@@ -4,15 +4,16 @@
 
 namespace Sabre\Uri;
 
-class ParseTest extends \PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class ParseTest extends TestCase
 {
     /**
      * @dataProvider parseData
      *
-     * @param string $in
-     * @param string $out
+     * @param array<int, array<int, array<string, int|string|null>|string>> $out
      */
-    public function testParse($in, $out): void
+    public function testParse(string $in, array $out): void
     {
         $this->assertEquals(
             $out,
@@ -23,10 +24,9 @@ public function testParse($in, $out): void
     /**
      * @dataProvider parseData
      *
-     * @param string $in
-     * @param string $out
+     * @param array<int, array<int, array<string, int|string|null>|string>> $out
      */
-    public function testParseFallback($in, $out): void
+    public function testParseFallback(string $in, array $out): void
     {
         $result = _parse_fallback($in);
         $result = $result + [
@@ -54,7 +54,7 @@ public function testParseFallbackShouldThrowInvalidUriException(): void
     }
 
     /**
-     * @return array<int, array<int, string|array>>
+     * @return array<int, array<int, array<string, int|string|null>|string>>
      */
     public function parseData(): array
     {

tests/Uri/ResolveTest.php

@@ -4,18 +4,16 @@
 
 namespace Sabre\Uri;
 
-class ResolveTest extends \PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class ResolveTest extends TestCase
 {
     /**
      * @dataProvider resolveData
      *
-     * @param string $base
-     * @param string $update
-     * @param string $expected
-     *
      * @throws InvalidUriException
      */
-    public function testResolve($base, $update, $expected): void
+    public function testResolve(string $base, string $update, string $expected): void
     {
         $this->assertEquals(
             $expected,

tests/Uri/SplitTest.php

@@ -4,7 +4,9 @@
 
 namespace Sabre\Uri;
 
-class SplitTest extends \PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class SplitTest extends TestCase
 {
     public function testSplit(): void
     {