Merge 4.x into 5.x

composer.json

@@ -76,6 +76,7 @@
     },
     "require-dev": {
         "aws/aws-sdk-php": "^3.0",
+        "doctrine/doctrine-bundle": "^2.3.2",
         "doctrine/mongodb-odm": "^2.2",
         "doctrine/orm": "^2.9",
         "jackalope/jackalope-doctrine-dbal": "^1.1",

tests/App/.gitignore

@@ -0,0 +1 @@
+uploads

tests/App/Resources/config/config.yml

@@ -58,8 +58,8 @@ sonata_media:
 
     filesystem:
         local:
-            directory: "%kernel.project_dir%/public/uploads/media"
-            create: false
+            directory: "%kernel.project_dir%/uploads"
+            create: true
 
         s3:
             bucket: my-bucket

tests/Functional/Command/AddMediaCommandTest.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\MediaBundle\Tests\Functional\Command;
+
+use Sonata\MediaBundle\Tests\App\AppKernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+
+final class AddMediaCommandTest extends KernelTestCase
+{
+    private CommandTester $commandTester;
+
+    protected function setUp(): void
+    {
+        static::bootKernel();
+
+        $this->commandTester = new CommandTester(
+            (new Application(static::createKernel()))->find('sonata:media:add')
+        );
+    }
+
+    public function testAddsMedia(): void
+    {
+        $this->commandTester->execute([
+            'providerName' => 'sonata.media.provider.image',
+            'context' => 'default',
+            'binaryContent' => realpath(__DIR__.'/../../Fixtures/logo.png'),
+        ]);
+
+        static::assertStringContainsString('done!', $this->commandTester->getDisplay());
+    }
+
+    /**
+     * @return class-string<\Symfony\Component\HttpKernel\KernelInterface>
+     */
+    protected static function getKernelClass(): string
+    {
+        return AppKernel::class;
+    }
+}

tests/custom_bootstrap.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Sonata\MediaBundle\Tests\App\AppKernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\NullOutput;
+
+$application = new Application(new AppKernel());
+$application->setAutoExit(false);
+
+$input = new ArrayInput([
+    'command' => 'doctrine:database:drop',
+    '--force' => true,
+]);
+$application->run($input, new NullOutput());
+
+$input = new ArrayInput([
+    'command' => 'doctrine:database:create',
+    '--no-interaction' => true,
+]);
+$application->run($input, new NullOutput());
+
+$input = new ArrayInput([
+    'command' => 'doctrine:schema:create',
+]);
+$application->run($input, new NullOutput());