Start upgrade to more modern toolchain

Author: Willem Stuursma

.gitignore

@@ -1,5 +1,6 @@
 /.idea
+/.php_cs
+/.phpunit.result.cache
 /vendor
 /composer.lock
 /phpunit.xml
-/.php_cs

.travis.yml

@@ -5,7 +5,6 @@ cache:
     - $HOME/.composer/cache
 
 php:
-  - 7.1
   - 7.2
   - 7.3
   - 7.4

composer.json

@@ -42,22 +42,22 @@
         }
     },
     "require": {
-        "php": ">=7.1",
+        "php": "^7.2",
         "psr/log": "^1"
     },
     "require-dev": {
         "ext-memcached": "*",
         "ext-pcntl": "*",
+        "ext-pdo": "*",
         "ext-pdo_mysql": "*",
         "ext-pdo_sqlite": "*",
         "ext-sysvsem": "*",
         "eloquent/liberator": "^2.0",
-        "friendsofphp/php-cs-fixer": "^2.14",
         "johnkary/phpunit-speedtrap": "^3.0",
         "kriswallsmith/spork": "^0.3",
         "mikey179/vfsstream": "^1.6",
         "php-mock/php-mock-phpunit": "^2.1",
-        "phpunit/phpunit": "^7.4",
+        "phpunit/phpunit": "^9.4",
         "predis/predis": "^1.1",
         "squizlabs/php_codesniffer": "^3.3",
         "symfony/event-dispatcher": "^2.8"

tests/mutex/CASMutexTest.php

@@ -2,6 +2,7 @@
 
 namespace malkusch\lock\mutex;
 
+use malkusch\lock\exception\LockAcquireException;
 use phpmock\environment\SleepEnvironmentBuilder;
 use phpmock\phpunit\PHPMock;
 use PHPUnit\Framework\TestCase;
@@ -18,7 +19,7 @@ class CASMutexTest extends TestCase
 {
     use PHPMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -33,11 +34,11 @@ protected function setUp()
 
     /**
      * Tests exceeding the execution timeout.
-     *
-     * @expectedException malkusch\lock\exception\LockAcquireException
      */
     public function testExceedTimeout()
     {
+        $this->expectException(LockAcquireException::class);
+
         $mutex = new CASMutex(1);
         $mutex->synchronized(function (): void {
             sleep(2);
@@ -46,11 +47,11 @@ public function testExceedTimeout()
 
     /**
      * Tests that an exception would stop any further iteration.
-     *
-     * @expectedException \DomainException
      */
     public function testExceptionStopsIteration()
     {
+        $this->expectException(\DomainException::class);
+
         $mutex = new CASMutex();
         $mutex->synchronized(function () {
             throw new \DomainException();

tests/mutex/FlockMutexTest.php

@@ -3,6 +3,8 @@
 namespace malkusch\lock\mutex;
 
 use Eloquent\Liberator\Liberator;
+use malkusch\lock\exception\DeadlineException;
+use malkusch\lock\exception\TimeoutException;
 use malkusch\lock\util\PcntlTimeout;
 use PHPUnit\Framework\TestCase;
 
@@ -24,15 +26,15 @@ class FlockMutexTest extends TestCase
      */
     private $file;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->file = tempnam(sys_get_temp_dir(), 'flock-');
         $this->mutex = Liberator::liberate(new FlockMutex(fopen($this->file, 'r'), 1));
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unlink($this->file);
 
@@ -54,12 +56,13 @@ public function testCodeExecutedOutsideLockIsNotThrown(int $strategy)
     }
 
     /**
-     * @expectedException \malkusch\lock\exception\TimeoutException
-     * @expectedExceptionMessage Timeout of 1 seconds exceeded.
      * @dataProvider dpTimeoutableStrategies
      */
     public function testTimeoutOccurs(int $strategy)
     {
+        $this->expectException(TimeoutException::class);
+        $this->expectExceptionMessage('Timeout of 1 seconds exceeded.');
+
         $another_resource = fopen($this->file, 'r');
         flock($another_resource, LOCK_EX);
 
@@ -84,19 +87,18 @@ public function dpTimeoutableStrategies()
         ];
     }
 
-    /**
-     * @expectedException \malkusch\lock\exception\DeadlineException
-     */
     public function testNoTimeoutWaitsForever()
     {
+        $this->expectException(DeadlineException::class);
+
         $another_resource = fopen($this->file, 'r');
         flock($another_resource, LOCK_EX);
 
         $this->mutex->strategy = FlockMutex::STRATEGY_BLOCK;
 
         $timebox = new PcntlTimeout(1);
         $timebox->timeBoxed(function () {
-            $this->mutex->synchronized(function () {
+            $this->mutex->synchronized(function (): void {
                 $this->fail('Did not expect code execution.');
             });
         });

tests/mutex/LockMutexTest.php

@@ -21,7 +21,7 @@ class LockMutexTest extends TestCase
      */
     private $mutex;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -30,23 +30,22 @@ protected function setUp()
 
     /**
      * Tests lock() fails and the code is not executed.
-     *
-     * @expectedException malkusch\lock\exception\LockAcquireException
      */
     public function testLockFails()
     {
+        $this->expectException(LockAcquireException::class);
+        
         $this->mutex->expects($this->once())
             ->method('lock')
             ->willThrowException(new LockAcquireException());
 
-        $this->mutex->synchronized(function () {
+        $this->mutex->synchronized(function (): void {
             $this->fail('Should not execute code.');
         });
     }
 
     /**
      * Tests unlock() is called after the code was executed.
-     *
      */
     public function testUnlockAfterCode()
     {
@@ -74,11 +73,11 @@ public function testUnlockAfterException()
 
     /**
      * Tests unlock() fails after the code was executed.
-     *
-     * @expectedException malkusch\lock\exception\LockReleaseException
      */
     public function testUnlockFailsAfterCode()
     {
+        $this->expectException(LockReleaseException::class);
+
         $this->mutex->expects($this->once())
             ->method('unlock')
             ->willThrowException(new LockReleaseException());
@@ -89,11 +88,11 @@ public function testUnlockFailsAfterCode()
 
     /**
      * Tests unlock() fails after the code threw an exception.
-     *
-     * @expectedException malkusch\lock\exception\LockReleaseException
      */
     public function testUnlockFailsAfterException()
     {
+        $this->expectException(LockReleaseException::class);
+
         $this->mutex->expects($this->once())
             ->method('unlock')
             ->willThrowException(new LockReleaseException());

tests/mutex/MemcachedMutexTest.php

@@ -2,6 +2,8 @@
 
 namespace malkusch\lock\mutex;
 
+use malkusch\lock\exception\LockReleaseException;
+use malkusch\lock\exception\TimeoutException;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -28,19 +30,19 @@ class MemcachedMutexTest extends TestCase
      */
     private $mutex;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->memcached = $this->createMock(\Memcached::class);
         $this->mutex = new MemcachedMutex('test', $this->memcached, 1);
     }
 
     /**
      * Tests failing to acquire the lock within the timeout.
-     *
-     * @expectedException \malkusch\lock\exception\TimeoutException
      */
     public function testFailAcquireLock()
     {
+        $this->expectException(TimeoutException::class);
+
         $this->memcached->expects($this->atLeastOnce())
             ->method('add')
             ->with('lock_test', true, 2)
@@ -53,11 +55,11 @@ public function testFailAcquireLock()
 
     /**
      * Tests failing to release a lock.
-     *
-     * @expectedException \malkusch\lock\exception\LockReleaseException
      */
     public function testFailReleasingLock()
     {
+        $this->expectException(LockReleaseException::class);
+
         $this->memcached->expects($this->once())
             ->method('add')
             ->with('lock_test', true, 2)

tests/mutex/MutexConcurrencyTest.php

@@ -36,7 +36,7 @@ class MutexConcurrencyTest extends TestCase
      */
     private $path;
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->path) {
             unlink($this->path);

tests/mutex/MutexTest.php

@@ -26,7 +26,7 @@ class MutexTest extends TestCase
 {
     const TIMEOUT = 4;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         vfsStream::setup('test');
     }
@@ -92,12 +92,10 @@ public function provideMutexFactories()
             'LockMutex' => [function (): Mutex {
                 $mock = $this->getMockForAbstractClass(LockMutex::class);
                 $mock->expects($this->atLeastOnce())
-                    ->method('lock')
-                    ->willReturn(true);
+                    ->method('lock');
 
                 $mock->expects($this->atLeastOnce())
-                    ->method('unlock')
-                    ->willReturn(true);
+                    ->method('unlock');
 
                 return $mock;
             }],
@@ -183,7 +181,7 @@ public function testSynchronizedDelegates(callable $mutexFactory)
     {
         /** @var Mutex $mutex */
         $mutex = $mutexFactory();
-        $result = $mutex->synchronized(function () {
+        $result = $mutex->synchronized(function (): string {
             return 'test';
         });
         $this->assertSame('test', $result);
@@ -211,10 +209,11 @@ public function testRelease(callable $mutexFactory)
      *
      * @param callable $mutexFactory The Mutex factory.
      * @dataProvider provideMutexFactories
-     * @expectedException \DomainException
      */
     public function testSynchronizedPassesExceptionThrough(callable $mutexFactory)
     {
+        $this->expectException(\DomainException::class);
+
         /** @var Mutex $mutex */
         $mutex = $mutexFactory();
         $mutex->synchronized(function () {

tests/mutex/PHPRedisMutexTest.php

@@ -2,6 +2,9 @@
 
 namespace malkusch\lock\mutex;
 
+use malkusch\lock\exception\LockAcquireException;
+use malkusch\lock\exception\LockReleaseException;
+use malkusch\lock\exception\MutexException;
 use PHPUnit\Framework\TestCase;
 use Redis;
 
@@ -31,7 +34,7 @@ class PHPRedisMutexTest extends TestCase
      */
     private $mutex;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -108,12 +111,11 @@ private function closeMinorityConnections()
         }
     }
 
-    /**
-     * @expectedException \malkusch\lock\exception\LockAcquireException
-     * @expectedExceptionCode \malkusch\lock\exception\MutexException::REDIS_NOT_ENOUGH_SERVERS
-     */
     public function testAddFails()
     {
+        $this->expectException(LockAcquireException::class);
+        $this->expectExceptionCode(MutexException::REDIS_NOT_ENOUGH_SERVERS);
+
         $this->closeMajorityConnections();
 
         $this->mutex->synchronized(function (): void {
@@ -123,11 +125,11 @@ public function testAddFails()
 
     /**
      * Tests evalScript() fails.
-     *
-     * @expectedException \malkusch\lock\exception\LockReleaseException
      */
     public function testEvalScriptFails()
     {
+        $this->expectException(LockReleaseException::class);
+
         $this->mutex->synchronized(function (): void {
             $this->closeMajorityConnections();
         });