Fix #1198 - MakeEntity is not compatible with api-platform 3.0

Author: Yoann Brieux

src/Maker/MakeEntity.php

@@ -11,7 +11,8 @@
 
 namespace Symfony\Bundle\MakerBundle\Maker;
 
-use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Annotation\ApiResource as LegacyApiResource;
+use ApiPlatform\Metadata\ApiResource;
 use Doctrine\DBAL\Types\Type;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
@@ -133,7 +134,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
 
         if (
             !$input->getOption('api-resource') &&
-            class_exists(ApiResource::class) &&
+            (class_exists(ApiResource::class) || class_exists(LegacyApiResource::class)) &&
             !class_exists($this->generator->createClassNameDetails($entityClassName, 'Entity\\')->getFullName())
         ) {
             $description = $command->getDefinition()->getOption('api-resource')->getDescription();
@@ -317,10 +318,17 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
     public function configureDependencies(DependencyBuilder $dependencies, InputInterface $input = null): void
     {
         if (null !== $input && $input->getOption('api-resource')) {
-            $dependencies->addClassDependency(
-                ApiResource::class,
-                'api'
-            );
+            if (class_exists(LegacyApiResource::class)) {
+                $dependencies->addClassDependency(
+                    LegacyApiResource::class,
+                    'api'
+                );
+            } else {
+                $dependencies->addClassDependency(
+                    ApiResource::class,
+                    'api'
+                );
+            }
         }
 
         if (null !== $input && $input->getOption('broadcast')) {

src/Test/MakerTestRunner.php

@@ -157,7 +157,7 @@ public function configureDatabase(bool $createSchema = true): void
     {
         $this->replaceInFile(
             '.env',
-            'postgresql://symfony:[email protected]:5432/app?serverVersion=13&charset=utf8',
+            'mysql://behat:behat@mysql_behat:3306/behat?serverVersion=8.0',
             getenv('TEST_DATABASE_DSN')
         );
 

tests/Maker/MakeEntityTest.php

@@ -74,7 +74,7 @@ public function getTestDetails(): \Generator
                 $this->assertFileExists($runner->getPath('src/Entity/User.php'));
 
                 $content = file_get_contents($runner->getPath('src/Entity/User.php'));
-                $this->assertStringContainsString('use ApiPlatform\Core\Annotation\ApiResource;', $content);
+                $this->assertStringContainsString('use ApiPlatform\Metadata\ApiResource;', $content);
                 $this->assertStringContainsString('#[ApiResource]', $content);
 
                 $this->runEntityTest($runner);