Upgrade doctrine/annotations to 2.0 and refactor code to fit it

Author: ApetroaeiClaudiu

GearmanBundle.php

@@ -3,6 +3,8 @@
 namespace Mmoreram\GearmanBundle;
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Mmoreram\GearmanBundle\Driver\Gearman\Work;
+use Mmoreram\GearmanBundle\Driver\Gearman\Job;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class GearmanBundle extends Bundle
@@ -12,16 +14,7 @@ class GearmanBundle extends Bundle
      */
     public function boot()
     {
-        $kernel = $this->container->get('kernel');
-
-        AnnotationRegistry::registerFile(
-            $kernel
-                ->locateResource("@GearmanBundle/Driver/Gearman/Work.php")
-        );
-
-        AnnotationRegistry::registerFile(
-            $kernel
-                ->locateResource("@GearmanBundle/Driver/Gearman/Job.php")
-        );
+        AnnotationRegistry::loadAnnotationClass(Work::class);
+        AnnotationRegistry::loadAnnotationClass(Job::class);
     }
 }

Tests/Module/WorkerClassTest.php

@@ -13,7 +13,7 @@
 
 namespace Mmoreram\GearmanBundle\Tests\Module;
 
-use Doctrine\Common\Annotations\SimpleAnnotationReader;
+use Doctrine\Common\Annotations\AnnotationReader;
 
 use Mmoreram\GearmanBundle\Driver\Gearman\Work as WorkAnnotation;
 use Mmoreram\GearmanBundle\Module\WorkerClass;
@@ -38,7 +38,7 @@ class WorkerClassTest extends \PHPUnit\Framework\TestCase
     private $reflectionClass;
 
     /**
-     * @var SimpleAnnotationReader
+     * @var AnnotationReader
      *
      * Reader
      */
@@ -115,7 +115,7 @@ public function setUp(): void
             ->getMock();
 
         $this->reader = $this
-            ->getMockBuilder('Doctrine\Common\Annotations\SimpleAnnotationReader')
+            ->getMockBuilder('Doctrine\Common\Annotations\AnnotationReader')
             ->disableOriginalConstructor()
             ->setMethods([
                 'getMethodAnnotations',

Tests/Service/GearmanParserTest.php

@@ -188,7 +188,7 @@ public function testParseNamespaceMapSomePaths()
         $excludedPaths = [];
 
         $reader = $this
-            ->getMockBuilder('\Doctrine\Common\Annotations\SimpleAnnotationReader')
+            ->getMockBuilder('\Doctrine\Common\Annotations\AnnotationReader')
             ->setMethods(null)
             ->getMock();
 

composer.json

@@ -25,7 +25,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-gearman": "*",
-        "doctrine/annotations": "^1.5",
+        "doctrine/annotations": "^2.0",
         "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0",
         "symfony/yaml": "^4.4 || ^5.0 || ^6.0",
         "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",