Allow doctrine/annotations 2.0

Author: mbabker

.github/workflows/continuous-integration.yml

@@ -69,6 +69,10 @@ jobs:
         if: "${{ matrix.mongodb-odm-version }}"
         run: "composer require --dev --no-update doctrine/mongodb-odm:${{ matrix.mongodb-odm-version }}"
 
+      # Remove PHP-CS-Fixer to avoid conflicting dependency ranges (i.e. doctrine/annotations)
+      - name: "Remove PHP-CS-Fixer"
+        run: "composer remove --dev --no-update friendsofphp/php-cs-fixer"
+
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v2"
         with:

composer.json

@@ -40,7 +40,7 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "behat/transliterator": "~1.2",
-        "doctrine/annotations": "^1.13",
+        "doctrine/annotations": "^1.13 || ^2.0",
         "doctrine/collections": "^1.2 || ^2.0",
         "doctrine/common": "^2.13 || ^3.0",
         "doctrine/event-manager": "^1.2 || ^2.0",

tests/Gedmo/Mapping/SluggableMappingTest.php

@@ -12,7 +12,6 @@
 namespace Gedmo\Tests\Mapping;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\Mapping\Driver\YamlDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
@@ -49,10 +48,6 @@ protected function setUp(): void
             'Gedmo\Tests\Mapping\Fixture\Yaml'
         );
         $reader = new AnnotationReader();
-        AnnotationRegistry::registerAutoloadNamespace(
-            'Gedmo\\Mapping\\Annotation',
-            dirname(VENDOR_PATH).'/src'
-        );
         $chainDriverImpl->addDriver(
             new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader),
             'Gedmo\Tests\Mapping\Fixture'

tests/bootstrap.php

@@ -24,7 +24,6 @@
 
 define('TESTS_PATH', __DIR__);
 define('TESTS_TEMP_DIR', sys_get_temp_dir().'/doctrine-extension-tests');
-define('VENDOR_PATH', realpath(dirname(__DIR__).'/vendor'));
 
 require dirname(__DIR__).'/vendor/autoload.php';