ENH CMS 6 compatibility

README.md

@@ -2,9 +2,9 @@
 
 [![CI](https://github.com/silverstripe/doorman/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/doorman/actions/workflows/ci.yml)
 
-Child process management. Compatible from PHP `5.3` to PHP `7`. Needs no extensions.
+Child process management. Needs no extensions.
 
-> `2.x` supports PHP `5.5.9` and upwards. If you need PHP `5.3/4` support, use a `1.x` release.
+The is currently only intended for use with Silverstripe CMS.
 
 ## Usage
 

composer.json

@@ -3,11 +3,11 @@
   "description": "Child process management",
   "license": "MIT",
   "require": {
-    "php": "^8.1",
-    "silverstripe/closure": "^3.6"
+    "php": "^8.3",
+    "laravel/serializable-closure": "^2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
+    "phpunit/phpunit": "^11.3",
     "squizlabs/php_codesniffer": "^3.5"
   },
   "autoload": {

phpunit.xml.dist

@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="false"
-    processIsolation="false"
-    stopOnFailure="false"
-    syntaxCheck="false"
-    >
+<phpunit colors="true">
     <testsuites>
-        <testsuite>
-            <directory suffix="Test.php">tests</directory>
+        <testsuite name="Default">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
 </phpunit>

src/Task/CallbackTask.php

@@ -4,7 +4,7 @@
 
 use AsyncPHP\Doorman\Task;
 use Closure;
-use Opis\Closure\SerializableClosure;
+use Laravel\SerializableClosure\SerializableClosure;
 
 class CallbackTask implements Task
 {

tests/Handler/CallbackHandlerTest.php

@@ -4,32 +4,23 @@
 
 use AsyncPHP\Doorman\Handler\CallbackHandler;
 use AsyncPHP\Doorman\Task\CallbackTask;
-use AsyncPHP\Doorman\Tests\Test;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers AsyncPHP\Doorman\Handler\CallbackHandler
- */
-class CallbackHandlerTest extends Test
+class CallbackHandlerTest extends TestCase
 {
     /**
      * @var CallbackHandler
      */
     protected $handler;
 
-    /**
-     * @inheritdoc
-     */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->handler = new CallbackHandler();
     }
 
-    /**
-     * @test
-     */
-    public function handlesCallbackTasks()
+    public function testHandlesCallbackTasks()
     {
         $store = 0;
 

tests/Manager/GroupProcessManagerTest.php

@@ -5,21 +5,15 @@
 use AsyncPHP\Doorman\Manager\GroupProcessManager;
 use AsyncPHP\Doorman\Manager\ProcessManager;
 use AsyncPHP\Doorman\Task\ProcessCallbackTask;
-use AsyncPHP\Doorman\Tests\Test;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers AsyncPHP\Doorman\Manager\GroupProcessManager
- */
-class GroupProcessManagerTest extends Test
+class GroupProcessManagerTest extends TestCase
 {
     /**
      * @var GroupProcessManager
      */
     protected $manager;
 
-    /**
-     * @inheritdoc
-     */
     public function setUp(): void
     {
         parent::setUp();
@@ -29,11 +23,9 @@ public function setUp(): void
         );
     }
 
-    /**
-     * @test
-     */
-    public function groupsExecuteInPredictableOrder()
+    public function testGroupsExecuteInPredictableOrder()
     {
+        $this->expectNotToPerformAssertions();
         $this->unlink("task1");
         $this->unlink("task2");
         $this->unlink("task3");

tests/Manager/ProcessManagerTest.php

@@ -7,32 +7,23 @@
 use AsyncPHP\Doorman\Rules\InMemoryRules;
 use AsyncPHP\Doorman\Shell\BashShell;
 use AsyncPHP\Doorman\Task\ProcessCallbackTask;
-use AsyncPHP\Doorman\Tests\Test;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers AsyncPHP\Doorman\Manager\ProcessManager
- */
-class ProcessManagerTest extends Test
+class ProcessManagerTest extends TestCase
 {
     /**
      * @var ProcessManager
      */
     protected $manager;
 
-    /**
-     * @inheritdoc
-     */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->manager = new ProcessManager();
     }
 
-    /**
-     * @test
-     */
-    public function gettersAndSettersWork()
+    public function testGettersAndSettersWork()
     {
         $this->manager->setLogPath(__DIR__);
 
@@ -55,11 +46,9 @@ public function gettersAndSettersWork()
         $this->assertEquals($rules, $this->manager->getRules());
     }
 
-    /**
-     * @test
-     */
-    public function basicRulesAndTasksWork()
+    public function testBasicRulesAndTasksWork()
     {
+        $this->expectNotToPerformAssertions();
         $task1 = new ProcessCallbackTask(function () {
             touch(__DIR__ . "/task1.temp");
 

tests/Manager/SynchronousManagerTest.php

@@ -4,32 +4,23 @@
 
 use AsyncPHP\Doorman\Manager\SynchronousManager;
 use AsyncPHP\Doorman\Task\CallbackTask;
-use AsyncPHP\Doorman\Tests\Test;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers AsyncPHP\Doorman\Manager\SynchronousManager
- */
-class SynchronousManagerTest extends Test
+class SynchronousManagerTest extends TestCase
 {
     /**
      * @var SynchronousManager
      */
     protected $manager;
 
-    /**
-     * @inheritdoc
-     */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->manager = new SynchronousManager();
     }
 
-    /**
-     * @test
-     */
-    public function handlesCallbackTasks()
+    public function testHandlesCallbackTasks()
     {
         $task1 = new CallbackTask(function () {
             touch(__DIR__ . "/task1.tmp");
@@ -55,4 +46,11 @@ public function handlesCallbackTasks()
         $this->unlink(__DIR__ . "/task1.tmp");
         $this->unlink(__DIR__ . "/task2.tmp");
     }
+
+    private function unlink($file)
+    {
+        if (file_exists($file)) {
+            unlink($file);
+        }
+    }
 }

tests/Profile/InMemoryProfileTest.php

@@ -4,21 +4,16 @@
 
 use AsyncPHP\Doorman\Profile\InMemoryProfile;
 use AsyncPHP\Doorman\Task\ProcessCallbackTask;
-use AsyncPHP\Doorman\Tests\Test;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
-/**
- * @covers AsyncPHP\Doorman\Profile\InMemoryProfile
- */
-class InMemoryProfileTest extends Test
+class InMemoryProfileTest extends TestCase
 {
     /**
      * @var InMemoryProfile
      */
     protected $rule;
 
-    /**
-     * @inheritdoc
-     */
     public function setUp(): void
     {
         parent::setUp();
@@ -27,15 +22,12 @@ public function setUp(): void
     }
 
     /**
-     * @test
-     *
-     * @dataProvider gettersAndSettersProvider
-     *
      * @param string $getter
      * @param string $setter
      * @param mixed $value
      */
-    public function gettersAndSettersWork($getter, $setter, $value)
+    #[DataProvider('provideGettersAndSetters')]
+    public function testGettersAndSettersWork($getter, $setter, $value)
     {
         $this->rule->$setter($value);
 
@@ -45,7 +37,7 @@ public function gettersAndSettersWork($getter, $setter, $value)
     /**
      * @return array
      */
-    public function gettersAndSettersProvider()
+    public static function provideGettersAndSetters()
     {
         $task = new ProcessCallbackTask(function () {
             return;

tests/Rule/InMemoryRuleTest.php

@@ -3,21 +3,16 @@
 namespace AsyncPHP\Doorman\Tests\Rule;
 
 use AsyncPHP\Doorman\Rule\InMemoryRule;
-use AsyncPHP\Doorman\Tests\Test;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
-/**
- * @covers AsyncPHP\Doorman\Rule\InMemoryRule
- */
-class InMemoryRuleTest extends Test
+class InMemoryRuleTest extends TestCase
 {
     /**
      * @var InMemoryRule
      */
     protected $rule;
 
-    /**
-     * @inheritdoc
-     */
     public function setUp(): void
     {
         parent::setUp();
@@ -26,15 +21,12 @@ public function setUp(): void
     }
 
     /**
-     * @test
-     *
-     * @dataProvider gettersAndSettersProvider
-     *
      * @param string $getter
      * @param string $setter
      * @param mixed $value
      */
-    public function gettersAndSettersWork($getter, $setter, $value)
+    #[DataProvider('provideGettersAndSetters')]
+    public function testGettersAndSettersWork($getter, $setter, $value)
     {
         $this->rule->$setter($value);
 
@@ -44,7 +36,7 @@ public function gettersAndSettersWork($getter, $setter, $value)
     /**
      * @return array
      */
-    public function gettersAndSettersProvider()
+    public static function provideGettersAndSetters()
     {
         return array(
             array("getProcesses", "setProcesses", 3),

tests/Rules/InMemoryRulesTest.php

@@ -6,32 +6,23 @@
 use AsyncPHP\Doorman\Rule\InMemoryRule;
 use AsyncPHP\Doorman\Rules\InMemoryRules;
 use AsyncPHP\Doorman\Task\ProcessCallbackTask;
-use AsyncPHP\Doorman\Tests\Test;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers AsyncPHP\Doorman\Rules\InMemoryRules
- */
-class InMemoryRulesTest extends Test
+class InMemoryRulesTest extends TestCase
 {
     /**
      * @var InMemoryRules
      */
     protected $rules;
 
-    /**
-     * @inheritdoc
-     */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->rules = new InMemoryRules();
     }
 
-    /**
-     * @test
-     */
-    public function rulesLimitParallelProcesses()
+    public function testRulesLimitParallelProcesses()
     {
         $task1 = new ProcessCallbackTask(function () {
             return;
@@ -79,10 +70,7 @@ public function rulesLimitParallelProcesses()
         $this->assertTrue($this->rules->canRunTask($task2, $profile2));
     }
 
-    /**
-     * @test
-     */
-    public function rulesLimitProcessorAndMemoryUsage()
+    public function testRulesLimitProcessorAndMemoryUsage()
     {
         $task1 = new ProcessCallbackTask(function () {
             return;