change mutex interface & update dependencies

Author: mmasiukevich

Diff for: .github/workflows/continuous-integration.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
           tools: composer:v2
 
@@ -33,7 +33,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
           tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
           tools: composer:v2
 
@@ -82,7 +82,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: ${{ env.PHP_EXTENSIONS }}
           ini-values: ${{ env.PHP_INI_VALUES }}
           tools: composer:v2

Diff for: .php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -28,25 +28,25 @@
   },
   "require": {
     "php": ">=8.0",
-    "amphp/amp": "v2.5.*",
-    "amphp/file": "v1.0.*",
+    "amphp/amp": "v2.6.*",
+    "amphp/file": "v2.0.*",
     "amphp/redis": "v1.0.*"
   },
   "require-dev": {
-    "php-service-bus/code-style-config": "v1.3.*",
+    "php-service-bus/code-style-config": "v5.1.*",
     "phpunit/phpunit": "v9.5.*",
-    "vimeo/psalm": "v4.6.*",
-    "phpstan/phpstan": "v0.12.*"
+    "vimeo/psalm": "v4.12.*",
+    "phpstan/phpstan": "v1.1.*"
   },
   "prefer-stable": true,
   "minimum-stability": "dev",
   "scripts": {
     "psalm": "rm -rf ~/.cache/psalm/ && ./vendor/bin/psalm --config=psalm.xml",
     "phpstan": "./vendor/bin/phpstan analyse src --level 7",
-    "tests": "./vendor/bin/phpunit --configuration phpunit.xml --debug --verbose --debug",
-    "coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration phpunit.xml --coverage-html ./coverage --debug --verbose --debug",
-    "cs-check": "./vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run",
-    "cs-fix": "./vendor/bin/php-cs-fixer fix --allow-risky=yes",
+    "tests": "./vendor/bin/phpunit --configuration phpunit.xml --verbose --debug",
+    "coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration phpunit.xml --coverage-html ./coverage --verbose --debug",
+    "cs-check": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run",
+    "cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes",
     "pre-commit": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes && ./vendor/bin/psalm --config=psalm.xml && ./vendor/bin/phpstan analyse src --level 7 && ./vendor/bin/phpunit --configuration phpunit.xml --verbose"
   },
   "config": {

Diff for: composer.json

@@ -1,2 +1,3 @@
 parameters:
-
+	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false

Diff for: phpstan.neon

@@ -3,7 +3,7 @@
          backupStaticAttributes="false" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" verbose="true"
          convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true"
          failOnRisky="true" failOnWarning="true" stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd">
     <coverage>
         <include>
             <directory>./src</directory>
@@ -17,7 +17,7 @@
         <env name="REDIS_CONNECTION_DSN" value="tcp://localhost:6379"/>
     </php>
     <testsuites>
-        <testsuite name="Mutex component">
+        <testsuite name="Common component">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

Diff for: phpunit.xml

@@ -3,7 +3,6 @@
         totallyTyped="true"
         useDocblockTypes="true"
         useDocblockPropertyTypes="true"
-        allowPhpStormGenerics="true"
         strictBinaryOperands="true"
         findUnusedPsalmSuppress="true"
         ignoreInternalFunctionFalseReturn="false"
@@ -21,5 +20,6 @@
 
     <issueHandlers>
         <PropertyNotSetInConstructor errorLevel="suppress"/>
+        <UnnecessaryVarAnnotation errorLevel="suppress"/>
     </issueHandlers>
-</psalm>
+</psalm>

Diff for: psalm.xml

@@ -8,7 +8,7 @@
  * @license https://opensource.org/licenses/MIT
  */
 
-declare(strict_types = 0);
+declare(strict_types=0);
 
 namespace ServiceBus\Mutex\Exceptions;
 

Diff for: src/AmpLock.php

@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * PHP Mutex implementation.
+ *
+ * @author  Maksim Masiukevich <[email protected]>
+ * @license MIT
+ * @license https://opensource.org/licenses/MIT
+ */
+
+declare(strict_types=0);
+
+namespace ServiceBus\Mutex\InMemory;
+
+use Amp\Promise;
+use ServiceBus\Mutex\MutexService;
+use function Amp\call;
+use function Amp\delay;
+
+/**
+ * Can only be used when working in one process.
+ */
+final class InMemoryMutexService implements MutexService
+{
+    private const LATENCY_TIMEOUT = 50;
+
+    public function withLock(string $id, callable $code): Promise
+    {
+        return call(
+            static function () use ($id, $code): \Generator
+            {
+                try
+                {
+                    while (InMemoryMutexStorage::instance()->has($id))
+                    {
+                        yield delay(self::LATENCY_TIMEOUT);
+                    }
+
+                    InMemoryMutexStorage::instance()->lock($id);
+
+                    yield $code();
+                }
+                finally
+                {
+                    InMemoryMutexStorage::instance()->unlock($id);
+                }
+            }
+        );
+    }
+}

Diff for: src/Exceptions/SyncException.php

@@ -8,7 +8,7 @@
  * @license https://opensource.org/licenses/MIT
  */
 
-declare(strict_types = 0);
+declare(strict_types=0);
 
 namespace ServiceBus\Mutex\InMemory;