Bump minimum PHP requirement to 7.4

Also improved tests.

Author: jaylinski

composer.json

@@ -17,12 +17,17 @@
             "FriendsOfPhpSpec\\PhpSpec\\Expect\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "FriendsOfPhpSpec\\PhpSpec\\Tests\\": "tests/"
+        }
+    },
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4",
         "phpspec/phpspec": "^6.0 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.0 || ^10.0",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "scripts": {

src/Subject.php

@@ -6,7 +6,7 @@
 
 class Subject extends BaseSubject
 {
-    public function __call(string $method, array $arguments = array())
+    public function __call(string $method, array $arguments = [])
     {
         if (preg_match('/^(to|notTo)(.+)$/', $method, $matches)) {
             $method = 'should' . $matches[2];

src/Wrapper.php

@@ -17,11 +17,11 @@
 
 class Wrapper extends BaseWrapper
 {
-    private $matchers;
-    private $presenter;
-    private $dispatcher;
-    private $example;
-    private $accessInspector;
+    private MatcherManager $matchers;
+    private Presenter $presenter;
+    private EventDispatcherInterface $dispatcher;
+    private ExampleNode $example;
+    private AccessInspector $accessInspector;
 
     public function __construct(
         MatcherManager $matchers,

tests/ExpectTest.php

@@ -1,55 +1,46 @@
 <?php
 
-include __DIR__ . '/Foo.php';
-include __DIR__ . '/FooMatcher.php';
+namespace FriendsOfPhpSpec\PhpSpec\Tests;
 
 use PhpSpec\Exception\Exception as PhpSpecException;
 use PhpSpec\Matcher\MatchersProvider;
 use PHPUnit\Framework\TestCase;
 
 class ExpectTest extends TestCase implements MatchersProvider
 {
-    private $addInvalidMatcher;
+    private bool $addInvalidMatcher = false;
 
-    function setUp(): void
+    protected function setUp(): void
     {
         $this->addInvalidMatcher = false;
     }
 
     /**
-     * @test
      * @dataProvider correctExpectations
      */
-    function it_does_not_throw_when_expectation_is_met($expectation)
+    public function testItDoesNotThrowWhenExpectationIsMet($expectation): void
     {
         $expectation();
         $this->addToAssertionCount(1); // No exception thrown
     }
 
     /**
-     * @test
      * @dataProvider incorrectExpectations
      */
-    function it_throws_when_expectation_is_not_met($expectation)
+    public function testItThrowsWhenExpectationIsNotMet($expectation): void
     {
         $this->expectException(PhpSpecException::class);
         $expectation();
     }
 
-    /**
-     * @test
-     */
-    function it_throws_when_custom_matcher_does_not_implement_correct_interface()
+    public function testItThrowsWhenCustomMatcherDoesNotImplementCorrectInterface(): void
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(\RuntimeException::class);
         $this->addInvalidMatcher = true;
         expect(1)->toBe(1);
     }
 
-    /**
-     * @test
-     */
-    function it_can_be_deactivated()
+    public function testItCanBeDeactivated(): void
     {
         // Active by default
         $this->assertTrue(e710d4e7_friends_of_phpspec_use_expect());
@@ -67,13 +58,13 @@ function it_can_be_deactivated()
     /**
      * Cases that should evaluate without an exception
      */
-    function correctExpectations()
+    public function correctExpectations(): array
     {
         return [
             [ function () { expect(5)->toBe(5); } ],
             [ function () { expect(5)->notToBe(1); } ],
             [ function () { expect(5)->toBeLike('5'); } ],
-            [ function () { expect((new Foo()))->toHaveType('Foo'); } ],
+            [ function () { expect((new Foo()))->toHaveType(Foo::class); } ],
             [ function () { expect((new Foo()))->toHaveCount(1); } ],
             [ function () { expect((new Foo()))->toBeFoo(); } ],
             [ function () { expect((new Foo())->getArray())->toBeArray(); } ],
@@ -98,7 +89,7 @@ function correctExpectations()
     /**
      * Cases that should throw an exception when evaluated
      */
-    function incorrectExpectations()
+    public function incorrectExpectations(): array
     {
         return [
             [ function () { expect(6)->toBe(5); } ],
@@ -132,7 +123,7 @@ public function getMatchers(): array
         return [
             'haveKey' => function ($subject, $key) { return array_key_exists($key, $subject); },
             'haveFoo' => new FooMatcher(),
-            'haveBar' => $this->addInvalidMatcher ? new stdClass() : new FooMatcher(),
+            'haveBar' => $this->addInvalidMatcher ? new \stdClass() : new FooMatcher(),
         ];
     }
 }

tests/Foo.php

@@ -1,9 +1,11 @@
 <?php
 
+namespace FriendsOfPhpSpec\PhpSpec\Tests;
+
 /**
  * Test fixture used in ExpectTest
  */
-class Foo implements Countable
+class Foo implements \Countable
 {
     function isFoo()
     {
@@ -23,7 +25,7 @@ public function getArray()
     }
     public function throwException()
     {
-        throw new InvalidArgumentException;
+        throw new \InvalidArgumentException;
     }
     public function triggerError()
     {

tests/FooMatcher.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace FriendsOfPhpSpec\PhpSpec\Tests;
+
 use PhpSpec\Exception\Example\FailureException;
 use PhpSpec\Matcher\BasicMatcher;