Next release

.gitattributes

@@ -1,4 +1,3 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/phpunit.xml.dist export-ignore
 /tests export-ignore

.github/workflows/ci.yml

@@ -3,86 +3,12 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  phpunit:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.2', '8.3']
-    name: 'PHPUnit'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: mbstring, intl
-          coverage: none
-      - name: Composer
-        uses: "ramsey/composer-install@v2"
-      - name: PHPUnit
-        run: vendor/bin/phpunit
-        env:
-          BLACKBOX_DETAILED_PROPERTIES: 1
+  blackbox:
+    uses: innmind/github-workflows/.github/workflows/black-box-matrix.yml@main
   coverage:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macOS-latest]
-        php-version: ['8.2', '8.3']
-    name: 'Coverage'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: mbstring, intl
-          coverage: xdebug
-      - name: Composer
-        uses: "ramsey/composer-install@v2"
-      - name: PHPUnit
-        run: vendor/bin/phpunit --coverage-clover=coverage.clover
-        env:
-          BLACKBOX_SET_SIZE: 1
-      - uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+    uses: innmind/github-workflows/.github/workflows/coverage-matrix.yml@main
+    secrets: inherit
   psalm:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-version: ['8.2', '8.3']
-    name: 'Psalm'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: mbstring, intl
-      - name: Composer
-        uses: "ramsey/composer-install@v2"
-      - name: Psalm
-        run: vendor/bin/psalm --shepherd
+    uses: innmind/github-workflows/.github/workflows/psalm-matrix.yml@main
   cs:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-version: ['8.2']
-    name: 'CS'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: mbstring, intl
-      - name: Composer
-        uses: "ramsey/composer-install@v2"
-      - name: CS
-        run: vendor/bin/php-cs-fixer fix --diff --dry-run
+    uses: innmind/github-workflows/.github/workflows/cs.yml@main

.github/workflows/release.yml

@@ -0,0 +1,11 @@
+name: Create release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    uses: innmind/github-workflows/.github/workflows/release.yml@main
+    secrets: inherit

.gitignore

@@ -1,3 +1,2 @@
 composer.lock
 vendor
-.phpunit.result.cache

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [Unreleased]
+
+### Changed
+
+- Requires PHP `8.4`
+- Requires `innmind/immutable:~6.0`
+
+### Fixed
+
+- Deprecations related to the use of `\ReflectionProperty::setAccessible()`
+
 ## 5.2.0 - 2023-09-16
 
 ### Added

blackbox.php

@@ -0,0 +1,26 @@
+<?php
+declare(strict_types = 1);
+
+require 'vendor/autoload.php';
+
+use Innmind\BlackBox\{
+    Application,
+    PHPUnit\Load,
+    Runner\CodeCoverage,
+};
+
+Application::new($argv)
+    ->when(
+        \getenv('ENABLE_COVERAGE') !== false,
+        static fn(Application $app) => $app
+            ->codeCoverage(
+                CodeCoverage::of(
+                    __DIR__.'/src/',
+                    __DIR__.'/tests/',
+                )
+                    ->dumpTo('coverage.clover')
+                    ->enableWhen(true),
+            ),
+    )
+    ->tryToProve(Load::directory(__DIR__.'/tests/'))
+    ->exit();

composer.json

@@ -15,8 +15,8 @@
         "issues": "http://github.com/Innmind/Reflection/issues"
     },
     "require": {
-        "php": "~8.2",
-        "innmind/immutable": "~4.0|~5.0",
+        "php": "~8.4",
+        "innmind/immutable": "~6.0",
         "innmind/type": "~1.0"
     },
     "autoload": {
@@ -31,9 +31,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~10.2",
-        "vimeo/psalm": "~5.13",
+        "innmind/static-analysis": "~1.3",
         "innmind/coding-standard": "~2.0",
-        "innmind/black-box": "~5.1"
+        "innmind/black-box": "~6.5"
     }
 }

src/ReflectionClass.php

@@ -3,10 +3,7 @@
 
 namespace Innmind\Reflection;
 
-use Innmind\Immutable\{
-    Map,
-    Set,
-};
+use Innmind\Immutable\Set;
 
 /**
  * @template T of object

src/ReflectionProperty.php

@@ -83,17 +83,8 @@ public function inject(object $object, mixed $value): Maybe
         }
 
         $reflection = new \ReflectionProperty($this->class, $this->name);
-
-        if (!$reflection->isPublic()) {
-            $reflection->setAccessible(true);
-        }
-
         $reflection->setValue($object, $value);
 
-        if (!$reflection->isPublic()) {
-            $reflection->setAccessible(false);
-        }
-
         return Maybe::just($object);
     }
 
@@ -103,18 +94,9 @@ public function inject(object $object, mixed $value): Maybe
     public function extract(object $object): mixed
     {
         $reflection = new \ReflectionProperty($this->class, $this->name);
-
-        if (!$reflection->isPublic()) {
-            $reflection->setAccessible(true);
-        }
-
         /** @var mixed */
         $value = $reflection->getValue($object);
 
-        if (!$reflection->isPublic()) {
-            $reflection->setAccessible(false);
-        }
-
         return $value;
     }
 }

tests/ExtractTest.php

@@ -11,8 +11,8 @@
     Map,
     Set,
 };
-use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
+    PHPUnit\Framework\TestCase,
     PHPUnit\BlackBox,
     Set as DataSet,
 };
@@ -22,14 +22,14 @@ class ExtractTest extends TestCase
 {
     use BlackBox;
 
-    public function testExtract()
+    public function testExtract(): BlackBox\Proof
     {
-        $this
+        return $this
             ->forAll(
-                DataSet\Type::any(),
-                DataSet\Type::any(),
+                DataSet::type(),
+                DataSet::type(),
             )
-            ->then(function($a, $b) {
+            ->prove(function($a, $b) {
                 $instanciate = new Instanciate;
 
                 $object = $instanciate(WithConstructor::class, Map::of(['a', $a], ['b', $b]))->match(
@@ -58,14 +58,14 @@ public function testExtract()
             });
     }
 
-    public function testReturnNothingWhenFailingToExtractAProperty()
+    public function testReturnNothingWhenFailingToExtractAProperty(): BlackBox\Proof
     {
-        $this
+        return $this
             ->forAll(
-                DataSet\Type::any(),
-                DataSet\Type::any(),
+                DataSet::type(),
+                DataSet::type(),
             )
-            ->then(function($a, $b) {
+            ->prove(function($a, $b) {
                 $instanciate = new Instanciate;
 
                 $object = $instanciate(WithConstructor::class, Map::of(['a', $a], ['b', $b]))->match(

tests/InstanciateTest.php

@@ -5,8 +5,8 @@
 
 use Innmind\Reflection\Instanciate;
 use Innmind\Immutable\Map;
-use PHPUnit\Framework\TestCase;
 use Innmind\BlackBox\{
+    PHPUnit\Framework\TestCase,
     PHPUnit\BlackBox,
     Set,
 };
@@ -19,11 +19,11 @@ class InstanciateTest extends TestCase
 {
     use BlackBox;
 
-    public function testInvoke()
+    public function testInvoke(): BlackBox\Proof
     {
-        $this
-            ->forAll(Set\Type::any())
-            ->then(function($value) {
+        return $this
+            ->forAll(Set::type())
+            ->prove(function($value) {
                 $instanciate = new Instanciate;
 
                 $object = $instanciate(NoConstructor::class, Map::of(['a', $value]))->match(
@@ -36,14 +36,14 @@ public function testInvoke()
             });
     }
 
-    public function testPartialInstance()
+    public function testPartialInstance(): BlackBox\Proof
     {
-        $this
+        return $this
             ->forAll(
-                Set\Integers::any(),
-                Set\Elements::of(true, false),
+                Set::integers(),
+                Set::of(true, false),
             )
-            ->then(function($value, $bool) {
+            ->prove(function($value, $bool) {
                 $instanciate = new Instanciate;
 
                 $object = $instanciate(ManyTypes::class, Map::of(['a', $value], ['d', $bool]))->match(
@@ -67,15 +67,15 @@ public function testPartialInstance()
             });
     }
 
-    public function testReturnNothingWhenFailingToInjectAProperty()
+    public function testReturnNothingWhenFailingToInjectAProperty(): BlackBox\Proof
     {
-        $this
+        return $this
             ->forAll(
-                Set\Integers::any(),
-                Set\Type::any(),
+                Set::integers(),
+                Set::type(),
             )
             ->filter(static fn($value, $invalid) => !\is_bool($invalid))
-            ->then(function($value, $invalid) {
+            ->prove(function($value, $invalid) {
                 $instanciate = new Instanciate;
 
                 $object = $instanciate(ManyTypes::class, Map::of(['a', $value], ['d', $invalid]))->match(