Update versions

Author: doncem

composer.json

@@ -12,19 +12,22 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": "~8",
         "ext-json":"*",
-        "regex-guard/regex-guard": "~1.0",
-        "nikic/php-parser" : ">=2.0 <5.0.0"
+        "regex-guard/regex-guard": "~1.1",
+        "nikic/php-parser" : ">=4.0 <5.0.0"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9",
-        "phpunit/phpunit": ">=4.8 <6.0.0"
+        "mockery/mockery": "~1.6",
+        "phpunit/phpunit": "~10"
     },
     "autoload": {
         "psr-4": { "Minime\\Annotations\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Minime\\Annotations\\Fixtures\\": "test/fixtures/" }
+    },
+    "scripts": {
+        "test": "phpunit"
     }
 }

phpunit.xml.dist

@@ -2,50 +2,18 @@
 
 <phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
-         backupStaticAttributes="false"
+         backupStaticProperties="false"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false">
-    
+
     <testsuites>
-        <testsuite>
+        <testsuite name="unit">
             <directory>test/suite/</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory>src/</directory>
-        </whitelist>
-    </filter>
-
     <logging>
-        <log
-            type="tap"
-            target="build/logs/report.tap"
-        />
-        <log
-            type="junit"
-            target="build/logs/report.junit.xml"
-        />
-        <log
-            type="coverage-html"
-            target="build/logs/coverage"
-            charset="UTF-8"
-            yui="true"
-            highlight="true"
-        />
-        <log
-            type="coverage-text"
-            target="build/logs/coverage.txt"
-        />
-        <log
-            type="coverage-clover"
-            target="build/logs/clover.xml"
-        />
+        <junit outputFile="build/logs/report.junit.xml"/>
     </logging>
 </phpunit>

test/suite/AnnotationsBagTest.php

@@ -7,12 +7,12 @@
 /**
  * @group bag
  */
-class AnnotationsBagTest extends \PHPUnit_Framework_TestCase
+class AnnotationsBagTest extends \PHPUnit\Framework\TestCase
 {
 
     private $Bag;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->Bag = new AnnotationsBag(
             [

test/suite/BaseTest.php

@@ -10,12 +10,12 @@
 use Minime\Annotations\Cache\ApcCache;
 use Minime\Annotations\Fixtures\AnnotationsFixture;
 
-class CacheTest extends \PHPUnit_Framework_TestCase
+class CacheTest extends \PHPUnit\Framework\TestCase
 {
 
     protected $fixtureClass = 'Minime\Annotations\Fixtures\AnnotationsFixture';
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         Mockery::close();
     }
@@ -54,14 +54,13 @@ public function testFileCache(){
     }
 
     public function testFileCacheWithDefaultStoragePath(){
-        new FileCache();
+        $this->assertCacheHandlerWorks(new FileCache());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp #^Cache path is not a writable/readable directory: .+\.#
-     */
     public function testFileCacheWithBadStoragePath(){
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Cache path is not a writable/readable directory:');
+
         new FileCache(__DIR__ . '/invalid/path/');
     }
 

test/suite/CacheTest.php

@@ -2,16 +2,39 @@
 
 namespace Minime\Annotations;
 
+use \ReflectionProperty;
+use Minime\Annotations\Fixtures\AnnotationsFixture;
+use Minime\Annotations\Interfaces\ParserInterface;
+
 /**
  * DynamicParserTest
- * 
+ *
  * @group parser
  */
-class DynamicParserTest extends BaseTest
+class DynamicParserTest extends \PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    protected $fixture;
+
+    /**
+     * @var ParserInterface
+     */
+    protected $parser;
+
+    protected function getDocblock($fixture)
+    {
+        $reflection = new ReflectionProperty($this->fixture, $fixture);
+
+        return $reflection->getDocComment();
+    }
+
+    protected function getFixture($fixture)
+    {
+        return $this->parser->parse($this->getDocblock($fixture));
+    }
+
+    protected function setUp(): void
     {
-        parent::setup();
+        $this->fixture = new AnnotationsFixture;
         $this->parser = new DynamicParser;
     }
 

test/suite/DynamicParserTest.php

@@ -9,7 +9,7 @@
  */
 class ParserTest extends DynamicParserTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setup();
         $this->parser = new Parser;
@@ -73,15 +73,16 @@ public function parseConcreteFixture()
 
     /**
      * @test
-     * @expectedException \Minime\Annotations\ParserException
      * @dataProvider invalidConcreteAnnotationFixtureProvider
      */
     public function parseInvalidConcreteFixture($fixture)
     {
+        $this->expectException(ParserException::class);
+
         $this->getFixture($fixture);
     }
 
-    public function invalidConcreteAnnotationFixtureProvider()
+    public static function invalidConcreteAnnotationFixtureProvider()
     {
       return [
         ['bad_concrete_fixture'],
@@ -140,28 +141,31 @@ public function tolerateUnrecognizedTypes()
 
     /**
      * @test
-     * @expectedException \Minime\Annotations\ParserException
      */
     public function exceptionWithBadJsonValue()
     {
+        $this->expectException(ParserException::class);
+
         $this->getFixture('bad_json_fixture');
     }
 
     /**
      * @test
-     * @expectedException \Minime\Annotations\ParserException
      */
     public function exceptionWithBadIntegerValue()
     {
+        $this->expectException(ParserException::class);
+
         $this->getFixture('bad_integer_fixture');
     }
 
     /**
      * @test
-     * @expectedException \Minime\Annotations\ParserException
      */
     public function exceptionWithBadFloatValue()
     {
+        $this->expectException(ParserException::class);
+
         $this->getFixture('bad_float_fixture');
     }
 

test/suite/ParserTest.php

@@ -3,11 +3,11 @@
 
 use Minime\Annotations\Fixtures\AnnotationsFixture;
 
-class ReaderTest extends \PHPUnit_Framework_TestCase
+class ReaderTest extends \PHPUnit\Framework\TestCase
 {
     private $fixture;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->fixture = new AnnotationsFixture;
     }
@@ -32,15 +32,6 @@ public function testGetAnnotations()
         $this->assertTrue($annotations->get('get'));
     }
 
-    public function testReadFunctionAnnotations()
-    {
-        if(! function_exists($fn = __NAMESPACE__ . '\\fn')){
-            /** @bar */ function fn(){}
-        }
-
-        $this->assertTrue($this->getReader()->getFunctionAnnotations($fn)->get('bar'));
-    }
-
     public function testReadClosureAnnotations()
     {
         /** @foo */