fix: Update dependencies

Author: Stephan Wentz

.github/workflows/test.yml

@@ -18,6 +18,7 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
         operating-system: ["ubuntu-latest"]
 
     steps:

.gitignore

@@ -1,4 +1,7 @@
-vendor
-composer.lock
-.idea/
-.phpunit.result.cache
+/.idea/
+/.phpunit.cache
+/composer.lock
+/phpcs.xml
+/phpstan.neon
+/phpunit.xml
+/vendor

composer.json

@@ -15,12 +15,10 @@
     },
     "require-dev": {
         "mikey179/vfsstream": "^1.6.10",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.1",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/security-core": "^5.4|^6.0",
-        "phpspec/prophecy-phpunit": "^2.0.1",
-        "squizlabs/php_codesniffer": "^3.6",
-        "brainbits/phpcs-standard": "^6.0",
+        "brainbits/phpcs-standard": "^7.0",
         "phpstan/phpstan": "^1.0",
         "brainbits/phpstan-rules": "^3.0"
     },

phpcs.xml phpcs.xml.distphpcs.xml renamed to phpcs.xml.dist

@@ -1,10 +1,6 @@
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true">
-    <testsuite name="blocking">
-        <directory suffix=".php">tests</directory>
-    </testsuite>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuite name="blocking">
+    <directory suffix=".php">tests</directory>
+  </testsuite>
 </phpunit>

phpstan.neon phpstan.neon.distphpstan.neon renamed to phpstan.neon.dist

@@ -0,0 +1,10 @@
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true">
+    <testsuite name="blocking">
+        <directory suffix=".php">tests</directory>
+    </testsuite>
+</phpunit>

phpunit.xml.dist

@@ -15,86 +15,86 @@
 use Brainbits\Blocking\Identity\IdentityInterface;
 use Brainbits\Blocking\Owner\OwnerInterface;
 use DateTimeImmutable;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Prophecy\Prophecy\ObjectProphecy;
 
-/**
- * Block test
- */
 class BlockTest extends TestCase
 {
-    use ProphecyTrait;
-
     /**
-     * @var IdentityInterface|ObjectProphecy
+     * @var IdentityInterface|MockObject
      */
     private $identifier;
 
     /**
-     * @var OwnerInterface|ObjectProphecy
+     * @var OwnerInterface|MockObject
      */
     private $owner;
 
     protected function setUp(): void
     {
-        $this->identifier = $this->prophesize(IdentityInterface::class)->reveal();
+        $this->identifier = $this->createMock(IdentityInterface::class);
 
-        $this->owner = $this->prophesize(OwnerInterface::class);
-        $this->owner->__toString()
+        $this->owner = $this->createMock(OwnerInterface::class);
+        $this->owner->expects($this->any())
+            ->method('__toString')
             ->willReturn('dummyOwner');
     }
 
     public function testConstruct(): void
     {
-        $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
+        $block = new Block($this->identifier, $this->owner, new DateTimeImmutable());
 
         $this->assertInstanceOf(Block::class, $block);
     }
 
     public function testGetIdentifierReturnsCorrectValue(): void
     {
-        $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
+        $block = new Block($this->identifier, $this->owner, new DateTimeImmutable());
 
         $this->assertSame($this->identifier, $block->getIdentity());
     }
 
     public function testGetOwnerReturnsCorrectValue(): void
     {
-        $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
+        $block = new Block($this->identifier, $this->owner, new DateTimeImmutable());
 
-        $this->assertSame($this->owner->reveal(), $block->getOwner());
+        $this->assertSame($this->owner, $block->getOwner());
     }
 
     public function testIsOwnedByReturnsTrue(): void
     {
-        $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
+        $block = new Block($this->identifier, $this->owner, new DateTimeImmutable());
 
-        $this->owner->equals($this->owner->reveal())
+        $this->owner->expects($this->once())
+            ->method('equals')
+            ->with($this->owner)
             ->willReturn(true);
 
-        $this->assertTrue($block->isOwnedBy($this->owner->reveal()));
+        $this->assertTrue($block->isOwnedBy($this->owner));
     }
 
     public function testIsOwnedByReturnsFalse(): void
     {
-        $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
+        $block = new Block($this->identifier, $this->owner, new DateTimeImmutable());
 
-        $owner = $this->prophesize(OwnerInterface::class);
-        $owner->__toString()
+        $owner = $this->createMock(OwnerInterface::class);
+        $this->owner->expects($this->any())
+            ->method('__toString')
             ->willReturn('dummyOwner');
 
-        $this->owner->equals($owner->reveal())
-           ->willReturn(false);
+        $this->owner->expects($this->once())
+            ->method('equals')
+            ->with($owner)
+            ->willReturn(false);
 
-        $this->assertFalse($block->isOwnedBy($owner->reveal()));
+        $this->assertFalse($block->isOwnedBy($owner));
     }
 
     public function testGetCreatedAtReturnsCorrectValue(): void
     {
         $createdAt = new DateTimeImmutable();
 
-        $block = new Block($this->identifier, $this->owner->reveal(), $createdAt);
+        $block = new Block($this->identifier, $this->owner, $createdAt);
         $result = $block->getCreatedAt();
 
         $this->assertInstanceOf(DateTimeImmutable::class, $result);
@@ -105,7 +105,7 @@ public function testGetUpdatedAtReturnsCreatedAtValueAfterInstanciation(): void
     {
         $createdAt = new DateTimeImmutable();
 
-        $block = new Block($this->identifier, $this->owner->reveal(), $createdAt);
+        $block = new Block($this->identifier, $this->owner, $createdAt);
         $result = $block->getUpdatedAt();
 
         $this->assertInstanceOf(DateTimeImmutable::class, $result);
@@ -116,7 +116,7 @@ public function testTouchUpdatesValue(): void
     {
         $createdAt = new DateTimeImmutable();
 
-        $block = new Block($this->identifier, $this->owner->reveal(), $createdAt);
+        $block = new Block($this->identifier, $this->owner, $createdAt);
 
         $updatedAt = new DateTimeImmutable();