Laravel 11 support

Author: dmitry-ivanov

.github/workflows/tests.yml

@@ -8,14 +8,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1, 8.2]
+        php: [8.2, 8.3, 8.4]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} / ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -41,6 +41,8 @@ jobs:
         run: vendor/bin/phpunit --colors=always --coverage-clover ./build/logs/clover.xml
 
       - name: Code coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
-          file: ./build/logs/clover.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./build/logs/clover.xml
+          fail_ci_if_error: true

README.md

@@ -17,7 +17,7 @@ Mutex for Laravel Console Commands.
 
 | Laravel | Console Mutex                                                            |
 |---------|--------------------------------------------------------------------------|
-| 11.x    | _[Support](https://buymeacoffee.com/dmitry.ivanov)_ ☕                    |
+| 11.x    | [11.x](https://github.com/dmitry-ivanov/laravel-console-mutex/tree/11.x) |
 | 10.x    | [10.x](https://github.com/dmitry-ivanov/laravel-console-mutex/tree/10.x) |
 | 9.x     | [9.x](https://github.com/dmitry-ivanov/laravel-console-mutex/tree/9.x)   |
 | 8.x     | [8.x](https://github.com/dmitry-ivanov/laravel-console-mutex/tree/8.x)   |

composer.json

@@ -12,19 +12,19 @@
         "email": "dmitry.g.ivanov@gmail.com"
     }],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "arvenil/ninja-mutex": "dev-master#82cbb2c",
-        "illuminate/console": "^10.0",
-        "illuminate/support": "^10.0"
+        "illuminate/console": "^11.0",
+        "illuminate/support": "^11.0"
     },
     "require-dev": {
         "ext-redis": "*",
         "ext-pdo_mysql": "*",
-        "phpunit/phpunit": "^10.5",
-        "mockery/mockery": "^1.5.1",
-        "orchestra/testbench": "^8.0",
-        "illuminated/testing-tools": "^10.0",
-        "predis/predis": "^2.0.2"
+        "phpunit/phpunit": "^11.3.6",
+        "mockery/mockery": "^1.6.10",
+        "orchestra/testbench": "^9.11.2",
+        "illuminated/testing-tools": "^11.0",
+        "predis/predis": "^2.3"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticProperties="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
     beStrictAboutTestsThatDoNotTestAnything="false"
     beStrictAboutOutputDuringTests="true"
     bootstrap="vendor/autoload.php"
-    cacheDirectory=".phpunit.cache"
     colors="true"
-    processIsolation="false"
-    stopOnError="false"
-    stopOnFailure="false"
+    displayDetailsOnPhpunitDeprecations="true"
+    displayDetailsOnTestsThatTriggerErrors="true"
+    displayDetailsOnTestsThatTriggerNotices="true"
+    displayDetailsOnTestsThatTriggerWarnings="true"
 >
     <testsuites>
         <testsuite name="Laravel Console Mutex Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
     <source>
         <include>
-            <directory suffix=".php">./src</directory>
+            <directory>./src</directory>
         </include>
     </source>
 </phpunit>

tests/MutexTest.php

@@ -13,6 +13,9 @@
 use NinjaMutex\Lock\MySQLPDOLock;
 use NinjaMutex\Lock\PhpRedisLock;
 use NinjaMutex\Lock\PredisRedisLock;
+use PHPUnit\Framework\Attributes\PreserveGlobalState;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\Test;
 use Predis\Client as PredisClient;
 use Redis;
 
@@ -35,22 +38,22 @@ protected function setUp(): void
         $this->command->expects('argument')->andReturn(['foo' => 'bar']);
     }
 
-    /** @test */
-    public function it_requires_command_as_constructor_parameter()
+    #[Test]
+    public function it_requires_command_as_constructor_parameter(): void
     {
         $mutex = new Mutex($this->command);
         $this->assertInstanceOf(Mutex::class, $mutex);
     }
 
-    /** @test */
-    public function it_determines_ninja_mutex_lock_once_while_creation()
+    #[Test]
+    public function it_determines_ninja_mutex_lock_once_while_creation(): void
     {
         $mutex = new Mutex($this->command);
         $this->assertSame($mutex->getNinjaMutexLock(), $mutex->getNinjaMutexLock());
     }
 
-    /** @test */
-    public function it_has_default_strategy_which_is_file()
+    #[Test]
+    public function it_has_default_strategy_which_is_file(): void
     {
         $this->command->expects('getMutexStrategy')->andReturn('foobar');
 
@@ -59,8 +62,8 @@ public function it_has_default_strategy_which_is_file()
         $this->assertEquals($expectedLock, $mutex->getNinjaMutexLock());
     }
 
-    /** @test */
-    public function it_supports_mysql_strategy()
+    #[Test]
+    public function it_supports_mysql_strategy(): void
     {
         $this->command->expects('getMutexStrategy')->andReturn('mysql');
 
@@ -77,8 +80,8 @@ public function it_supports_mysql_strategy()
         $this->assertEquals($expectedLock, $mutex->getNinjaMutexLock());
     }
 
-    /** @test */
-    public function it_supports_redis_strategy_with_phpredis_client_which_is_default()
+    #[Test]
+    public function it_supports_redis_strategy_with_phpredis_client_which_is_default(): void
     {
         $this->command->expects('getMutexStrategy')->andReturn('redis');
 
@@ -90,8 +93,8 @@ public function it_supports_redis_strategy_with_phpredis_client_which_is_default
         $this->assertEquals($expectedLock, $mutex->getNinjaMutexLock());
     }
 
-    /** @test */
-    public function it_supports_redis_strategy_with_predis_client()
+    #[Test]
+    public function it_supports_redis_strategy_with_predis_client(): void
     {
         config(['database.redis.client' => 'predis']);
 
@@ -105,8 +108,8 @@ public function it_supports_redis_strategy_with_predis_client()
         $this->assertEquals($expectedLock, $mutex->getNinjaMutexLock());
     }
 
-    /** @test */
-    public function it_supports_memcached_strategy()
+    #[Test]
+    public function it_supports_memcached_strategy(): void
     {
         Cache::shouldReceive('getStore')->withNoArgs()->twice()->andReturnSelf();
         Cache::shouldReceive('getMemcached')->withNoArgs()->twice()->andReturnSelf();
@@ -118,12 +121,8 @@ public function it_supports_memcached_strategy()
         $this->assertEquals($expectedLock, $mutex->getNinjaMutexLock());
     }
 
-    /**
-     * @test
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function it_delegates_public_method_calls_to_ninja_mutex()
+    #[Test] #[RunInSeparateProcess] #[PreserveGlobalState(false)]
+    public function it_delegates_public_method_calls_to_ninja_mutex(): void
     {
         $ninja = mock('overload:NinjaMutex\Mutex');
         $ninja->expects('isLocked');

tests/TestCase.php

@@ -15,11 +15,8 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
 
     /**
      * Resolve application Console Kernel implementation.
-     *
-     * @param \Illuminate\Foundation\Application $app
-     * @return void
      */
-    protected function resolveApplicationConsoleKernel($app)
+    protected function resolveApplicationConsoleKernel($app): void
     {
         $app->singleton(KernelContract::class, Kernel::class);
 

tests/WithoutOverlappingTraitTest.php

@@ -7,68 +7,71 @@
 use Illuminated\Console\Tests\App\Console\Commands\MysqlStrategyCommand;
 use Illuminated\Console\Tests\App\Console\Commands\NullTimeoutCommand;
 use Illuminated\Console\Tests\App\Console\Commands\TimeoutCommand;
+use PHPUnit\Framework\Attributes\PreserveGlobalState;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\Test;
 
 class WithoutOverlappingTraitTest extends TestCase
 {
-    /** @test */
-    public function it_adds_mutex_strategy_which_is_file_by_default()
+    #[Test]
+    public function it_adds_mutex_strategy_which_is_file_by_default(): void
     {
         $this->assertEquals('file', (new GenericCommand)->getMutexStrategy());
     }
 
-    /** @test */
-    public function mutex_strategy_can_be_overloaded_by_protected_field()
+    #[Test]
+    public function mutex_strategy_can_be_overloaded_by_protected_field(): void
     {
         $this->assertEquals('mysql', (new MysqlStrategyCommand)->getMutexStrategy());
     }
 
-    /** @test */
-    public function mutex_strategy_can_be_set_by_the_public_method()
+    #[Test]
+    public function mutex_strategy_can_be_set_by_the_public_method(): void
     {
         $command = new GenericCommand;
         $command->setMutexStrategy('redis');
 
         $this->assertEquals('redis', $command->getMutexStrategy());
     }
 
-    /** @test */
-    public function it_adds_mutex_timeout_which_is_zero_by_default()
+    #[Test]
+    public function it_adds_mutex_timeout_which_is_zero_by_default(): void
     {
         $this->assertEquals(0, (new GenericCommand)->getMutexTimeout());
     }
 
-    /** @test */
-    public function mutex_timeout_can_be_overloaded_by_protected_field()
+    #[Test]
+    public function mutex_timeout_can_be_overloaded_by_protected_field(): void
     {
         $this->assertEquals(3000, (new TimeoutCommand)->getMutexTimeout());
     }
 
-    /** @test */
-    public function mutex_timeout_can_be_set_to_null_by_protected_field()
+    #[Test]
+    public function mutex_timeout_can_be_set_to_null_by_protected_field(): void
     {
         $this->assertNull((new NullTimeoutCommand)->getMutexTimeout());
     }
 
-    /** @test */
-    public function mutex_timeout_can_be_set_by_the_public_method()
+    #[Test]
+    public function mutex_timeout_can_be_set_by_the_public_method(): void
     {
         $command = new GenericCommand;
         $command->setMutexTimeout(5000);
 
         $this->assertEquals(5000, $command->getMutexTimeout());
     }
 
-    /** @test */
-    public function mutex_timeout_can_be_set_to_null_by_the_public_method()
+    #[Test]
+    public function mutex_timeout_can_be_set_to_null_by_the_public_method(): void
     {
         $command = new GenericCommand;
         $command->setMutexTimeout(null);
 
         $this->assertNull($command->getMutexTimeout());
     }
 
-    /** @test */
-    public function it_generates_mutex_name_based_on_the_command_name_and_arguments()
+    #[Test]
+    public function it_generates_mutex_name_based_on_the_command_name_and_arguments(): void
     {
         /** @var \Mockery\Mock|\Illuminated\Console\WithoutOverlapping $command */
         $command = mock(GenericCommand::class)->makePartial();
@@ -79,12 +82,8 @@ public function it_generates_mutex_name_based_on_the_command_name_and_arguments(
         $this->assertEquals("icmutex-icm:generic-{$hash}", $command->getMutexName());
     }
 
-    /**
-     * @test
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function it_allows_to_run_command_if_there_is_no_other_running_instances()
+    #[Test] #[RunInSeparateProcess] #[PreserveGlobalState(false)]
+    public function it_allows_to_run_command_if_there_is_no_other_running_instances(): void
     {
         $mutex = mock('overload:Illuminated\Console\Mutex');
         $mutex->expects('acquireLock')->with(0)->andReturn(true);
@@ -93,12 +92,8 @@ public function it_allows_to_run_command_if_there_is_no_other_running_instances(
         $this->artisan('icm:generic');
     }
 
-    /**
-     * @test
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function it_blocks_if_trying_to_run_another_instance_of_the_command()
+    #[Test] #[RunInSeparateProcess] #[PreserveGlobalState(false)]
+    public function it_blocks_if_trying_to_run_another_instance_of_the_command(): void
     {
         $this->expectException(MutexRuntimeException::class);
         $this->expectExceptionMessage('Command is running now!');
@@ -109,12 +104,8 @@ public function it_blocks_if_trying_to_run_another_instance_of_the_command()
         $this->artisan('icm:generic');
     }
 
-    /**
-     * @test
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function it_is_releasing_the_lock_after_command_execution()
+    #[Test] #[RunInSeparateProcess] #[PreserveGlobalState(false)]
+    public function it_is_releasing_the_lock_after_command_execution(): void
     {
         /** @var \Mockery\Mock|\Illuminated\Console\Mutex $mutex */
         $mutex = mock('overload:Illuminated\Console\Mutex');