Merge branch 'develop'

Baptouuuu · Baptouuuu · commit 62ed9f17e45a · 2023-07-08T17:23:00.000+02:00
* develop:
  use blackbox 5
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.0', '8.1']
+        php-version: ['8.2']
         dependencies: ['lowest', 'highest']
     name: 'Tests'
     steps:
@@ -45,7 +45,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.0', '8.1']
+        php-version: ['8.2']
         dependencies: ['lowest', 'highest']
     name: 'Fixtures'
     steps:
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.0', '8.1']
+        php-version: ['8.2']
         dependencies: ['lowest', 'highest']
     name: 'Psalm'
     steps:
@@ -113,7 +113,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.0']
+        php-version: ['8.2']
     name: 'CS'
     steps:
       - name: Checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## [Unreleased]
+## 4.2.0 - 2023-07-08
+
+### Changed
+
+- Require `innmind/black-box` `5`
+
+### Removed
+
+- Support for PHP `8.0` and `8.1`
 
 ## 4.1.0 - 2022-01-23
 
diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
         "issues": "http://github.com/Innmind/Url/issues"
     },
     "require": {
-        "php": "~8.0",
-        "innmind/immutable": "~4.0",
+        "php": "~8.2",
+        "innmind/immutable": "~4.15",
         "league/uri-parser": "~1.2",
         "league/uri-components": "~2.0"
     },
@@ -32,18 +32,18 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~9.5",
-        "vimeo/psalm": "~4.1",
-        "innmind/black-box": "^4.5",
+        "phpunit/phpunit": "~10.2",
+        "vimeo/psalm": "~5.13",
+        "innmind/black-box": "~5.0",
         "innmind/coding-standard": "~2.0"
     },
     "conflict": {
-        "innmind/black-box": "<4.0|~5.0"
+        "innmind/black-box": "<5.0|~6.0"
     },
     "suggest": {
         "innmind/black-box": "For property based testing"
     },
     "provide": {
-        "innmind/black-box-sets": "4.0"
+        "innmind/black-box-sets": "5.0"
     }
 }
diff --git a/fixtures/Authority.php b/fixtures/Authority.php
@@ -18,11 +18,11 @@ static function($userInfo, $host, $port): Model {
                 return Model::of($userInfo, $host, $port);
             },
             Authority\UserInformation::any(),
-            new Set\Either(
+            Set\Either::any(
                 Authority\Host::any(),
                 Set\Elements::of(Model\Host::none()),
             ),
-            new Set\Either(
+            Set\Either::any(
                 Authority\Port::any(),
                 Set\Elements::of(Model\Port::none()),
             ),
diff --git a/fixtures/Authority/UserInformation.php b/fixtures/Authority/UserInformation.php
@@ -13,13 +13,13 @@ final class UserInformation
      */
     public static function any(): Set
     {
-        return new Set\Either(
+        return Set\Either::any(
             Set\Composite::immutable(
                 static function($user, $password): Model {
                     return Model::of($user, $password);
                 },
                 UserInformation\User::any(),
-                new Set\Either(
+                Set\Either::any(
                     UserInformation\Password::any(),
                     Set\Elements::of(Model\Password::none()),
                 ),
diff --git a/fixtures/Url.php b/fixtures/Url.php
@@ -24,19 +24,19 @@ static function($scheme, $authority, $path, $query, $fragment): Model {
                 return new Model($scheme, $authority, $path, $query, $fragment);
             },
             Scheme::any(),
-            new Set\Either(
+            Set\Either::any(
                 Authority::any(),
                 Set\Elements::of(AuthorityModel::none()),
             ),
-            new Set\Either(
+            Set\Either::any(
                 Path::any(),
                 Set\Elements::of(PathModel::none()),
             ),
-            new Set\Either(
+            Set\Either::any(
                 Query::any(),
                 Set\Elements::of(QueryModel::none()),
             ),
-            new Set\Either(
+            Set\Either::any(
                 Fragment::any(),
                 Set\Elements::of(FragmentModel::none()),
             ),
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" printerClass="Innmind\BlackBox\PHPUnit\ResultPrinterV9" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd">
+  <extensions>
+    <bootstrap class="Innmind\BlackBox\PHPUnit\Extension">
+    </bootstrap>
+  </extensions>
+  <coverage/>
+  <testsuites>
+    <testsuite name="Url test suite">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
     <include>
       <directory>.</directory>
     </include>
@@ -9,10 +19,5 @@
       <directory>./vendor</directory>
       <directory>./fixtures</directory>
     </exclude>
-  </coverage>
-  <testsuites>
-    <testsuite name="Url test suite">
-      <directory>./tests</directory>
-    </testsuite>
-  </testsuites>
+  </source>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
diff --git a/tests/Fixtures/Authority/UserInformation/PasswordTest.php b/tests/Fixtures/Authority/UserInformation/PasswordTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class PasswordTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/Authority/UserInformation/UserTest.php b/tests/Fixtures/Authority/UserInformation/UserTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class UserTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/Authority/UserInformationTest.php b/tests/Fixtures/Authority/UserInformationTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class UserInformationTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/AuthorityTest.php b/tests/Fixtures/AuthorityTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class AuthorityTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/FragmentTest.php b/tests/Fixtures/FragmentTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class FragmentTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/PathTest.php b/tests/Fixtures/PathTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class PathTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
@@ -38,7 +38,7 @@ public function testDirectories()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/QueryTest.php b/tests/Fixtures/QueryTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class QueryTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/SchemeTest.php b/tests/Fixtures/SchemeTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class SchemeTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/Fixtures/UrlTest.php b/tests/Fixtures/UrlTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
     Set,
-    Random\RandomInt,
+    Random,
 };
 
 class UrlTest extends TestCase
@@ -22,7 +22,7 @@ public function testInterface()
 
         $this->assertInstanceOf(Set::class, $set);
 
-        foreach ($set->values(new RandomInt) as $value) {
+        foreach ($set->values(Random::default) as $value) {
             $this->assertInstanceOf(Set\Value::class, $value);
             $this->assertTrue($value->isImmutable());
             $this->assertInstanceOf(Model::class, $value->unwrap());
diff --git a/tests/PathTest.php b/tests/PathTest.php
@@ -81,7 +81,7 @@ public function testNamedConstructorsReturnsAppropriateSubType()
         $this->assertInstanceOf(RelativePath::class, Path::of('../somewhere'));
     }
 
-    public function resolutions(): array
+    public static function resolutions(): array
     {
         return [
             'target is absolute' => [
diff --git a/tests/UrlTest.php b/tests/UrlTest.php
@@ -300,15 +300,15 @@ public function testEquals()
             });
     }
 
-    public function cases(): array
+    public static function cases(): array
     {
         return [
             ['#foobar'],
             ['?some=query'],
         ];
     }
 
-    public function parseable(): array
+    public static function parseable(): array
     {
         return [
             ['/wiki/Category:42'],
@@ -374,7 +374,7 @@ public function parseable(): array
         ];
     }
 
-    public function fromString(): array
+    public static function fromString(): array
     {
         return [
             ['http://foo:bar@localhost:8080/foo?bar=baz#whatever', 'http', 'foo', 'bar', 'localhost', '8080', '/foo', 'bar=baz', 'whatever'],
