build: allow symfony 4 or higher, raise minimum php version to 7.4

Author: timonf

.travis.yml

@@ -4,9 +4,9 @@ sudo: false
 
 matrix:
   include:
-    - php: 7.1
+    - php: 7.4
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
-    - php: 7.2
+    - php: 8.0
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
     - php: nightly
       env: COLLECT_COVERAGE=false VALIDATE_CODING_STYLE=false

README.md

@@ -6,31 +6,32 @@ Blocking Component
 [![Build Status](https://img.shields.io/travis/brainbits/blocking/master.svg?style=flat-square)](https://travis-ci.org/brainbits/blocking)
 [![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/brainbits/blocking.svg?style=flat-square)](https://scrutinizer-ci.com/g/brainbits/blocking/code-structure)
 [![Quality Score](https://img.shields.io/scrutinizer/g/brainbits/blocking.svg?style=flat-square)](https://scrutinizer-ci.com/g/brainbits/blocking)
-[![Insight](https://img.shields.io/sensiolabs/i/bc35527c-11d8-45a1-a482-18d376cfe382.svg)](https://insight.sensiolabs.com/projects/bc35527c-11d8-45a1-a482-18d376cfe382)
 [![Total Downloads](https://img.shields.io/packagist/dt/brainbits/blocking.svg?style=flat-square)](https://packagist.org/packages/brainbits/blocking)
 
 The Blocking Component provides methods to manage content based blocking.
 
-    <?php
+```php
+<?php
 
-    use Brainbits\Blocking\Blocker;
-    use Brainbits\Blocking\Identity\Identity;
-    use Brainbits\Blocking\Owner\SymfonySessionOwnerFactory;
-    use Brainbits\Blocking\Storage\FilesystemStorage;
-    use Brainbits\Blocking\Validator\ExpiredValidator;
+use Brainbits\Blocking\Blocker;
+use Brainbits\Blocking\Identity\Identity;
+use Brainbits\Blocking\Owner\SymfonySessionOwnerFactory;
+use Brainbits\Blocking\Storage\FilesystemStorage;
+use Brainbits\Blocking\Validator\ExpiredValidator;
 
-    $storage = new FilesystemStorage('/where/to/store/blocks' /* path to directory on filesystem */);
-    $ownerFactory = new SymfonySessionOwnerFactory($session /* symfony session */);
-    $validator = new ExpiredValidator(300 /* block will expire after 300 seconds */);
+$storage = new FilesystemStorage('/where/to/store/blocks' /* path to directory on filesystem */);
+$ownerFactory = new SymfonySessionOwnerFactory($session /* symfony session */);
+$validator = new ExpiredValidator(300 /* block will expire after 300 seconds */);
 
-    $blocker = new Blocker($storage, $ownerFactory, $validator);
+$blocker = new Blocker($storage, $ownerFactory, $validator);
 
-    $identity = new Identity('my_content_123);
+$identity = new Identity('my_content_123');
 
-    $block = $blocker->block($identity);
-    $result = $blocker->unblock($identity);
-    $result = $blocker->isBlocked($identity);
-    $block = $blocker->getBlock($identity);
+$block = $blocker->block($identity);
+$result = $blocker->unblock($identity);
+$result = $blocker->isBlocked($identity);
+$block = $blocker->getBlock($identity);
+```
 
 Blocking Storage
 ----------------

composer.json

@@ -11,13 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.1"
+        "php": "^7.4|^8.0"
     },
     "require-dev": {
         "mikey179/vfsstream": "^1.2",
-        "phpunit/phpunit": "^6.0",
-        "symfony/http-foundation": "^2.8|^3.0",
-        "symfony/security-core": "^2.8|^3.0"
+        "phpunit/phpunit": "^9.5",
+        "symfony/http-foundation": ">=4.4",
+        "symfony/security-core": ">=4.4",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "suggest": {
         "symfony/http-foundation": "If you want to use the SymfonySessionOwnerFactory",

phpunit.xml.dist

@@ -3,14 +3,8 @@
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         syntaxCheck="true">
+         convertWarningsToExceptions="true">
     <testsuite name="blocking">
-        <directory>Tests</directory>
+        <directory suffix=".php">Tests</directory>
     </testsuite>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
 </phpunit>

tests/BlockTest.php

@@ -16,13 +16,16 @@
 use Brainbits\Blocking\Owner\OwnerInterface;
 use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 
 /**
  * Block test
  */
 class BlockTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var IdentityInterface|ObjectProphecy
      */
@@ -33,7 +36,7 @@ class BlockTest extends TestCase
      */
     private $owner;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->identifier = $this->prophesize(IdentityInterface::class)->reveal();
 
@@ -42,28 +45,28 @@ protected function setUp()
             ->willReturn('dummyOwner');
     }
 
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
 
         $this->assertInstanceOf(Block::class, $block);
     }
 
-    public function testGetIdentifierReturnsCorrectValue()
+    public function testGetIdentifierReturnsCorrectValue(): void
     {
         $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
 
         $this->assertSame($this->identifier, $block->getIdentity());
     }
 
-    public function testGetOwnerReturnsCorrectValue()
+    public function testGetOwnerReturnsCorrectValue(): void
     {
         $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
 
         $this->assertSame($this->owner->reveal(), $block->getOwner());
     }
 
-    public function testIsOwnedByReturnsTrue()
+    public function testIsOwnedByReturnsTrue(): void
     {
         $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
 
@@ -73,7 +76,7 @@ public function testIsOwnedByReturnsTrue()
         $this->assertTrue($block->isOwnedBy($this->owner->reveal()));
     }
 
-    public function testIsOwnedByReturnsFalse()
+    public function testIsOwnedByReturnsFalse(): void
     {
         $block = new Block($this->identifier, $this->owner->reveal(), new DateTimeImmutable());
 
@@ -87,7 +90,7 @@ public function testIsOwnedByReturnsFalse()
         $this->assertFalse($block->isOwnedBy($owner->reveal()));
     }
 
-    public function testGetCreatedAtReturnsCorrectValue()
+    public function testGetCreatedAtReturnsCorrectValue(): void
     {
         $createdAt = new DateTimeImmutable();
 
@@ -98,7 +101,7 @@ public function testGetCreatedAtReturnsCorrectValue()
         $this->assertSame($createdAt, $result);
     }
 
-    public function testGetUpdatedAtReturnsCreatedAtValueAfterInstanciation()
+    public function testGetUpdatedAtReturnsCreatedAtValueAfterInstanciation(): void
     {
         $createdAt = new DateTimeImmutable();
 
@@ -109,7 +112,7 @@ public function testGetUpdatedAtReturnsCreatedAtValueAfterInstanciation()
         $this->assertSame($createdAt, $result);
     }
 
-    public function testTouchUpdatesValue()
+    public function testTouchUpdatesValue(): void
     {
         $createdAt = new DateTimeImmutable();
 

tests/BlockerTest.php

@@ -21,13 +21,16 @@
 use Brainbits\Blocking\Validator\ValidatorInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 
 /**
  * Blocker test
  */
 class BlockerTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var BlockInterface|ObjectProphecy
      */
@@ -45,7 +48,7 @@ class BlockerTest extends TestCase
 
     private $owner;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->owner = new Owner('bar');
 
@@ -62,7 +65,7 @@ protected function setUp()
             ->willReturn(new Owner('baz'));
     }
 
-    public function testBlockReturnsBlockOnNonexistingBlock()
+    public function testBlockReturnsBlockOnNonexistingBlock(): void
     {
         $storage = $this->createNonexistingStorage();
         $storage->write(Argument::type(BlockInterface::class))
@@ -78,7 +81,7 @@ public function testBlockReturnsBlockOnNonexistingBlock()
         $this->assertInstanceOf(BlockInterface::class, $result);
     }
 
-    public function testBlockReturnsBlockOnExistingAndInvalidBlock()
+    public function testBlockReturnsBlockOnExistingAndInvalidBlock(): void
     {
         $storage = $this->createExistingStorage();
         $storage->remove(Argument::type(BlockInterface::class))
@@ -96,7 +99,7 @@ public function testBlockReturnsBlockOnExistingAndInvalidBlock()
         $this->assertInstanceOf(BlockInterface::class, $result);
     }
 
-    public function testBlockThrowsExceptionOnExistingAndValidAndNonOwnerBlock()
+    public function testBlockThrowsExceptionOnExistingAndValidAndNonOwnerBlock(): void
     {
         $this->expectException(BlockFailedException::class);
 
@@ -117,7 +120,7 @@ public function testBlockThrowsExceptionOnExistingAndValidAndNonOwnerBlock()
         $this->assertNull($result);
     }
 
-    public function testBlockUpdatesBlockOnExistingAndValidAndOwnedBlock()
+    public function testBlockUpdatesBlockOnExistingAndValidAndOwnedBlock(): void
     {
         $storage = $this->createExistingStorage();
         $storage->touch($this->block)
@@ -136,7 +139,7 @@ public function testBlockUpdatesBlockOnExistingAndValidAndOwnedBlock()
         $this->assertInstanceOf(BlockInterface::class, $result);
     }
 
-    public function testUnblockReturnsNullOnExistingAndInvalidBlock()
+    public function testUnblockReturnsNullOnExistingAndInvalidBlock(): void
     {
         $storage = $this->createExistingStorage();
         $storage->remove(Argument::type(BlockInterface::class))
@@ -152,7 +155,7 @@ public function testUnblockReturnsNullOnExistingAndInvalidBlock()
         $this->assertNull($result);
     }
 
-    public function testUnblockReturnsBlockOnExistingAndValidBlock()
+    public function testUnblockReturnsBlockOnExistingAndValidBlock(): void
     {
         $storage = $this->createExistingStorage();
         $storage->remove(Argument::type(BlockInterface::class))
@@ -168,7 +171,7 @@ public function testUnblockReturnsBlockOnExistingAndValidBlock()
         $this->assertSame($this->block->reveal(), $result);
     }
 
-    public function testUnblockReturnsNullOnNonexistingBlock()
+    public function testUnblockReturnsNullOnNonexistingBlock(): void
     {
         $storage = $this->createNonexistingStorage();
         $storage->remove()
@@ -184,7 +187,7 @@ public function testUnblockReturnsNullOnNonexistingBlock()
         $this->assertNull($result);
     }
 
-    public function testIsBlockedReturnsFalseOnExistingAndInvalidBlock()
+    public function testIsBlockedReturnsFalseOnExistingAndInvalidBlock(): void
     {
         $storage = $this->createExistingStorage();
         $storage->remove(Argument::type(BlockInterface::class))
@@ -196,7 +199,7 @@ public function testIsBlockedReturnsFalseOnExistingAndInvalidBlock()
         $this->assertFalse($result);
     }
 
-    public function testIsBlockedReturnsTrueOnExistingAndValidBlock()
+    public function testIsBlockedReturnsTrueOnExistingAndValidBlock(): void
     {
         $blocker = new Blocker(
             $this->createExistingStorage()->reveal(),
@@ -208,7 +211,7 @@ public function testIsBlockedReturnsTrueOnExistingAndValidBlock()
         $this->assertTrue($result);
     }
 
-    public function testIsBlockedReturnsFalseOnNonexistingBlock()
+    public function testIsBlockedReturnsFalseOnNonexistingBlock(): void
     {
         $blocker = new Blocker(
             $this->createNonexistingStorage()->reveal(),
@@ -220,7 +223,7 @@ public function testIsBlockedReturnsFalseOnNonexistingBlock()
         $this->assertFalse($result);
     }
 
-    public function testGetBlockReturnsBlockOnExistingBlock()
+    public function testGetBlockReturnsBlockOnExistingBlock(): void
     {
         $blocker = new Blocker(
             $this->createExistingStorage()->reveal(),

tests/Identifier/IdentifierTest.php

@@ -19,14 +19,14 @@
  */
 class IdentifierTest extends TestCase
 {
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $identifier = new Identity('test_123');
 
         $this->assertInstanceOf(Identity::class, $identifier);
     }
 
-    public function testEquals()
+    public function testEquals(): void
     {
         $identifier1 = new Identity('foo');
         $identifier2 = new Identity('foo');
@@ -37,7 +37,7 @@ public function testEquals()
         $this->assertFalse($identifier2->equals($identifier3));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $identifier = new Identity('test_123');
 

tests/Owner/OwnerTest.php

@@ -19,14 +19,14 @@
  */
 class OwnerTest extends TestCase
 {
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $owner = new Owner('test_123');
 
         $this->assertInstanceOf(Owner::class, $owner);
     }
 
-    public function testEquals()
+    public function testEquals(): void
     {
         $owner1 = new Owner('foo');
         $owner2 = new Owner('foo');
@@ -37,7 +37,7 @@ public function testEquals()
         $this->assertFalse($owner2->equals($owner3));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $owner = new Owner('test_123');
 

tests/Owner/SymfonySessionOwnerFactoryTest.php

@@ -14,21 +14,27 @@
 use Brainbits\Blocking\Owner\Owner;
 use Brainbits\Blocking\Owner\SymfonySessionOwnerFactory;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
  * Symfony session owner test
  */
 class SymfonySessionOwnerFactoryTest extends TestCase
 {
-    public function testToString()
+    use ProphecyTrait;
+
+    public function testToString(): void
     {
         $factory = new SymfonySessionOwnerFactory($this->createSession('foo'));
         $owner = $factory->createOwner();
 
         $this->assertEquals($owner, new Owner('foo'));
     }
 
+    /**
+     * @return SessionInterface|ObjectProphecy
+     */
     private function createSession($sessionId)
     {
         $session = $this->prophesize(SessionInterface::class);