Use modern structure

composer.json

@@ -50,7 +50,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Meilisearch\\Bundle\\Test\\": "tests/"
+      "Meilisearch\\Bundle\\Tests\\": "tests/"
     }
   },
   "config": {

src/Resources/config/services.xml → config/services.xml

@@ -6,7 +6,7 @@
     <services>
         <defaults autowire="true" autoconfigure="true"/>
 
-        <prototype namespace="Meilisearch\Bundle\Command\" resource="../../Command" />
+        <prototype namespace="Meilisearch\Bundle\Command\" resource="../src/Command" />
 
         <service id="search.search_indexer_subscriber"
                  class="Meilisearch\Bundle\EventListener\DoctrineEventSubscriber"

phpunit.xml.dist

@@ -8,7 +8,7 @@
         </include>
     </coverage>
     <php>
-        <env name="KERNEL_CLASS" value="Meilisearch\Bundle\Test\Kernel"/>
+        <env name="KERNEL_CLASS" value="Meilisearch\Bundle\Tests\Kernel"/>
         <env name="APP_ENV" value="test"/>
         <env name="APP_DEBUG" value="false"/>
         <env name="MEILISEARCH_PREFIX" value="sf_phpunit_"/>

src/DependencyInjection/MeilisearchExtension.php

@@ -24,7 +24,7 @@ final class MeilisearchExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new Loader\XmlFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
+        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
         $loader->load('services.xml');
 
         $configuration = new Configuration();

src/MeilisearchBundle.php

@@ -17,4 +17,9 @@ public static function qualifiedVersion()
     {
         return sprintf('Meilisearch Symfony (v%s)', MeilisearchBundle::VERSION);
     }
+
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
 }

tests/BaseKernelTestCase.php

@@ -2,20 +2,20 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test;
+namespace Meilisearch\Bundle\Tests;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\SchemaTool;
 use Meilisearch\Bundle\Collection;
 use Meilisearch\Bundle\SearchableEntity;
 use Meilisearch\Bundle\SearchService;
-use Meilisearch\Bundle\Test\Entity\Comment;
-use Meilisearch\Bundle\Test\Entity\Image;
-use Meilisearch\Bundle\Test\Entity\Link;
-use Meilisearch\Bundle\Test\Entity\ObjectId\DummyObjectId;
-use Meilisearch\Bundle\Test\Entity\Page;
-use Meilisearch\Bundle\Test\Entity\Post;
-use Meilisearch\Bundle\Test\Entity\Tag;
+use Meilisearch\Bundle\Tests\Entity\Comment;
+use Meilisearch\Bundle\Tests\Entity\Image;
+use Meilisearch\Bundle\Tests\Entity\Link;
+use Meilisearch\Bundle\Tests\Entity\ObjectId\DummyObjectId;
+use Meilisearch\Bundle\Tests\Entity\Page;
+use Meilisearch\Bundle\Tests\Entity\Post;
+use Meilisearch\Bundle\Tests\Entity\Tag;
 use Meilisearch\Exceptions\ApiException;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 

tests/Entity/Comment.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;

tests/Entity/ContentAggregator.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Meilisearch\Bundle\Entity\Aggregator;

tests/Entity/EmptyAggregator.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Meilisearch\Bundle\Entity\Aggregator;

tests/Entity/Image.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

tests/Entity/Link.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Meilisearch\Bundle\Searchable;

tests/Entity/ObjectId/DummyObjectId.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity\ObjectId;
+namespace Meilisearch\Bundle\Tests\Entity\ObjectId;
 
 class DummyObjectId
 {

tests/Entity/Page.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;

tests/Entity/Post.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;

tests/Entity/Tag.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Entity;
+namespace Meilisearch\Bundle\Tests\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Meilisearch\Bundle\Searchable;

tests/Integration/AggregatorTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Integration;
+namespace Meilisearch\Bundle\Tests\Integration;
 
 use Meilisearch\Bundle\Exception\EntityNotFoundInObjectID;
 use Meilisearch\Bundle\Exception\InvalidEntityForAggregator;
-use Meilisearch\Bundle\Test\BaseKernelTestCase;
-use Meilisearch\Bundle\Test\Entity\ContentAggregator;
-use Meilisearch\Bundle\Test\Entity\EmptyAggregator;
-use Meilisearch\Bundle\Test\Entity\Post;
+use Meilisearch\Bundle\Tests\BaseKernelTestCase;
+use Meilisearch\Bundle\Tests\Entity\ContentAggregator;
+use Meilisearch\Bundle\Tests\Entity\EmptyAggregator;
+use Meilisearch\Bundle\Tests\Entity\Post;
 use Symfony\Component\Serializer\Serializer;
 
 class AggregatorTest extends BaseKernelTestCase

tests/Integration/CommandsTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Integration;
+namespace Meilisearch\Bundle\Tests\Integration;
 
-use Meilisearch\Bundle\Test\BaseKernelTestCase;
+use Meilisearch\Bundle\Tests\BaseKernelTestCase;
 use Meilisearch\Client;
 use Meilisearch\Endpoints\Indexes;
 use Meilisearch\Exceptions\ApiException;
@@ -72,25 +72,25 @@ public function testSearchImportAndClearAndDeleteWithoutIndices(): void
         $importOutput = $importCommandTester->getDisplay();
 
         $this->assertSame(<<<'EOD'
-Importing for index Meilisearch\Bundle\Test\Entity\Post
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Post entities into sf_phpunit__posts index
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Post entities into sf_phpunit__aggregated index
+Importing for index Meilisearch\Bundle\Tests\Entity\Post
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index
 Settings updated.
 Settings updated.
 Settings updated.
-Importing for index Meilisearch\Bundle\Test\Entity\Comment
-Importing for index Meilisearch\Bundle\Test\Entity\Tag
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Tag entities into sf_phpunit__tags index
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Tag entities into sf_phpunit__aggregated index
-Importing for index Meilisearch\Bundle\Test\Entity\Link
-Importing for index Meilisearch\Bundle\Test\Entity\Page
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index
-Importing for index Meilisearch\Bundle\Test\Entity\Post
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Post entities into sf_phpunit__posts index
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Post entities into sf_phpunit__aggregated index
-Importing for index Meilisearch\Bundle\Test\Entity\Tag
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Tag entities into sf_phpunit__tags index
-Indexed 6 / 6 Meilisearch\Bundle\Test\Entity\Tag entities into sf_phpunit__aggregated index
+Importing for index Meilisearch\Bundle\Tests\Entity\Comment
+Importing for index Meilisearch\Bundle\Tests\Entity\Tag
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Tag entities into sf_phpunit__tags index
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Tag entities into sf_phpunit__aggregated index
+Importing for index Meilisearch\Bundle\Tests\Entity\Link
+Importing for index Meilisearch\Bundle\Tests\Entity\Page
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index
+Importing for index Meilisearch\Bundle\Tests\Entity\Post
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__posts index
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__aggregated index
+Importing for index Meilisearch\Bundle\Tests\Entity\Tag
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Tag entities into sf_phpunit__tags index
+Indexed 6 / 6 Meilisearch\Bundle\Tests\Entity\Tag entities into sf_phpunit__aggregated index
 Done!
 
 EOD, $importOutput);
@@ -102,12 +102,12 @@ public function testSearchImportAndClearAndDeleteWithoutIndices(): void
         $clearOutput = $clearCommandTester->getDisplay();
 
         $this->assertSame(<<<'EOD'
-Cleared sf_phpunit__posts index of Meilisearch\Bundle\Test\Entity\Post
-Cleared sf_phpunit__comments index of Meilisearch\Bundle\Test\Entity\Comment
-Cleared sf_phpunit__aggregated index of Meilisearch\Bundle\Test\Entity\ContentAggregator
-Cleared sf_phpunit__tags index of Meilisearch\Bundle\Test\Entity\Tag
-Cleared sf_phpunit__tags index of Meilisearch\Bundle\Test\Entity\Link
-Cleared sf_phpunit__pages index of Meilisearch\Bundle\Test\Entity\Page
+Cleared sf_phpunit__posts index of Meilisearch\Bundle\Tests\Entity\Post
+Cleared sf_phpunit__comments index of Meilisearch\Bundle\Tests\Entity\Comment
+Cleared sf_phpunit__aggregated index of Meilisearch\Bundle\Tests\Entity\ContentAggregator
+Cleared sf_phpunit__tags index of Meilisearch\Bundle\Tests\Entity\Tag
+Cleared sf_phpunit__tags index of Meilisearch\Bundle\Tests\Entity\Link
+Cleared sf_phpunit__pages index of Meilisearch\Bundle\Tests\Entity\Page
 Done!
 
 EOD, $clearOutput);
@@ -145,13 +145,13 @@ public function testSearchImportWithCustomBatchSize(): void
         $importOutput = $importCommandTester->getDisplay();
 
         $this->assertSame(<<<'EOD'
-Importing for index Meilisearch\Bundle\Test\Entity\Page
-Indexed 2 / 2 Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index
-Indexed 2 / 2 Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index
-Indexed 2 / 2 Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index
-Indexed 2 / 2 Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index
-Indexed 2 / 2 Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index
-Indexed 1 / 1 Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index
+Importing for index Meilisearch\Bundle\Tests\Entity\Page
+Indexed 2 / 2 Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index
+Indexed 2 / 2 Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index
+Indexed 2 / 2 Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index
+Indexed 2 / 2 Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index
+Indexed 2 / 2 Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index
+Indexed 1 / 1 Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index
 Done!
 
 EOD, $importOutput);
@@ -171,8 +171,8 @@ public function testSearchImportWithCustomResponseTimeout(): void
         ]);
         $output = $importCommandTester->getDisplay();
 
-        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Test\Entity\Page', $output);
-        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index', $output);
+        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Tests\Entity\Page', $output);
+        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index', $output);
         $this->assertStringContainsString('Done!', $output);
         $this->assertSame(0, $return);
 
@@ -192,8 +192,8 @@ public function testSearchImportWithCustomResponseTimeout(): void
         ]);
         $output = $importCommandTester->getDisplay();
 
-        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Test\Entity\Page', $output);
-        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Test\Entity\Page entities into sf_phpunit__pages index', $output);
+        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Tests\Entity\Page', $output);
+        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Tests\Entity\Page entities into sf_phpunit__pages index', $output);
         $this->assertStringContainsString('Done!', $output);
         $this->assertSame(0, $return);
     }
@@ -216,9 +216,9 @@ public function testImportDifferentEntitiesIntoSameIndex(): void
         ]);
 
         $output = $commandTester->getDisplay();
-        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Test\Entity\Tag', $output);
-        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Test\Entity\Tag entities into sf_phpunit__tags index', $output);
-        $this->assertStringContainsString('Indexed 2 / 2 Meilisearch\Bundle\Test\Entity\Link entities into sf_phpunit__tags index', $output);
+        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Tests\Entity\Tag', $output);
+        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Tests\Entity\Tag entities into sf_phpunit__tags index', $output);
+        $this->assertStringContainsString('Indexed 2 / 2 Meilisearch\Bundle\Tests\Entity\Link entities into sf_phpunit__tags index', $output);
         $this->assertStringContainsString('Done!', $output);
 
         /** @var SearchResult $searchResult */
@@ -240,8 +240,8 @@ public function testSearchImportAggregator(): void
         ]);
 
         $output = $commandTester->getDisplay();
-        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Test\Entity\Post', $output);
-        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Test\Entity\Post entities into sf_phpunit__'.self::$indexName.' index', $output);
+        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Tests\Entity\Post', $output);
+        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__'.self::$indexName.' index', $output);
         $this->assertStringContainsString('Done!', $output);
         $this->assertSame(0, $return);
     }
@@ -259,8 +259,8 @@ public function testImportingIndexNameWithAndWithoutPrefix(): void
         ]);
 
         $output = $commandTester->getDisplay();
-        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Test\Entity\Post', $output);
-        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Test\Entity\Post entities into sf_phpunit__'.self::$indexName.' index', $output);
+        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Tests\Entity\Post', $output);
+        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__'.self::$indexName.' index', $output);
         $this->assertStringContainsString('Done!', $output);
         $this->assertSame(0, $return);
 
@@ -278,8 +278,8 @@ public function testImportingIndexNameWithAndWithoutPrefix(): void
         ]);
 
         $output = $commandTester->getDisplay();
-        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Test\Entity\Post', $output);
-        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Test\Entity\Post entities into sf_phpunit__'.self::$indexName.' index', $output);
+        $this->assertStringContainsString('Importing for index Meilisearch\Bundle\Tests\Entity\Post', $output);
+        $this->assertStringContainsString('Indexed '.$i.' / '.$i.' Meilisearch\Bundle\Tests\Entity\Post entities into sf_phpunit__'.self::$indexName.' index', $output);
         $this->assertStringContainsString('Done!', $output);
         $this->assertSame(0, $return);
     }
@@ -293,13 +293,13 @@ public function testSearchCreateWithoutIndices(): void
         $createOutput = $createCommandTester->getDisplay();
 
         $this->assertSame(<<<'EOD'
-Creating index sf_phpunit__posts for Meilisearch\Bundle\Test\Entity\Post
-Creating index sf_phpunit__comments for Meilisearch\Bundle\Test\Entity\Comment
-Creating index sf_phpunit__tags for Meilisearch\Bundle\Test\Entity\Tag
-Creating index sf_phpunit__tags for Meilisearch\Bundle\Test\Entity\Link
-Creating index sf_phpunit__pages for Meilisearch\Bundle\Test\Entity\Page
-Creating index sf_phpunit__aggregated for Meilisearch\Bundle\Test\Entity\Post
-Creating index sf_phpunit__aggregated for Meilisearch\Bundle\Test\Entity\Tag
+Creating index sf_phpunit__posts for Meilisearch\Bundle\Tests\Entity\Post
+Creating index sf_phpunit__comments for Meilisearch\Bundle\Tests\Entity\Comment
+Creating index sf_phpunit__tags for Meilisearch\Bundle\Tests\Entity\Tag
+Creating index sf_phpunit__tags for Meilisearch\Bundle\Tests\Entity\Link
+Creating index sf_phpunit__pages for Meilisearch\Bundle\Tests\Entity\Page
+Creating index sf_phpunit__aggregated for Meilisearch\Bundle\Tests\Entity\Post
+Creating index sf_phpunit__aggregated for Meilisearch\Bundle\Tests\Entity\Tag
 Done!
 
 EOD, $createOutput);
@@ -316,7 +316,7 @@ public function testSearchCreateWithIndices(): void
         $createOutput = $createCommandTester->getDisplay();
 
         $this->assertSame(<<<'EOD'
-Creating index sf_phpunit__posts for Meilisearch\Bundle\Test\Entity\Post
+Creating index sf_phpunit__posts for Meilisearch\Bundle\Tests\Entity\Post
 Done!
 
 EOD, $createOutput);

tests/Integration/EngineTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Integration;
+namespace Meilisearch\Bundle\Tests\Integration;
 
 use Meilisearch\Bundle\Engine;
-use Meilisearch\Bundle\Test\BaseKernelTestCase;
+use Meilisearch\Bundle\Tests\BaseKernelTestCase;
 use Meilisearch\Exceptions\ApiException;
 
 /**

tests/Integration/EventListener/DoctrineEventSubscriberTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Meilisearch\Bundle\Test\Integration\EventListener;
+namespace Meilisearch\Bundle\Tests\Integration\EventListener;
 
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Meilisearch\Bundle\EventListener\DoctrineEventSubscriber;
-use Meilisearch\Bundle\Test\BaseKernelTestCase;
-use Meilisearch\Bundle\Test\Entity\Page;
-use Meilisearch\Bundle\Test\Entity\Post;
+use Meilisearch\Bundle\Tests\BaseKernelTestCase;
+use Meilisearch\Bundle\Tests\Entity\Page;
+use Meilisearch\Bundle\Tests\Entity\Post;
 use Meilisearch\Client;
 
 class DoctrineEventSubscriberTest extends BaseKernelTestCase