Merge branch 'main' into bump-meilisearch-v1.0.0

Author: brunoocasali

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1']
+        php-version: ['7.4', '8.0', '8.1', '8.2']
         include:
           - php-version: '7.4'
             sf-version: '4.4.*'
@@ -29,8 +29,10 @@ jobs:
             sf-version: '6.0.*'
           - php-version: '8.1'
             sf-version: '6.1.*'
+          - php-version: '8.2'
+            sf-version: '6.2.*'
 
-    name: integration-tests (PHP ${{ matrix.php-version }})
+    name: integration-tests (PHP ${{ matrix.php-version }}) (Symfony ${{ matrix.sf-version }})
     steps:
       - uses: actions/checkout@v3
       - name: Install PHP
@@ -58,7 +60,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
 
       - name: Validate composer.json and composer.lock
         run: composer validate

bors.toml

@@ -1,7 +1,8 @@
 status = [
-    'integration-tests (PHP 7.4)',
-    'integration-tests (PHP 8.0)',
-    'integration-tests (PHP 8.1)',
+    'integration-tests (PHP 7.4) (Symfony 5.4.*)',
+    'integration-tests (PHP 8.0) (Symfony 6.0.*)',
+    'integration-tests (PHP 8.1) (Symfony 6.1.*)',
+    'integration-tests (PHP 8.2) (Symfony 6.2.*)',
     'Code style'
 ]
 # 1 hour timeout

composer.json

@@ -21,7 +21,7 @@
     "php": "^7.4|^8.0",
     "ext-json": "*",
     "doctrine/doctrine-bundle": "^2.4",
-    "meilisearch/meilisearch-php": "^0.26.1",
+    "meilisearch/meilisearch-php": "^1.0.0",
     "symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
     "symfony/property-access": "^4.4 || ^5.0 || ^6.0",
     "symfony/serializer": "^4.4 || ^5.0 || ^6.0"
@@ -50,7 +50,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Meilisearch\\Bundle\\Test\\": "tests/"
+      "Meilisearch\\Bundle\\Tests\\": "tests/"
     }
   },
   "config": {

src/Resources/config/doctrine/Aggregator.mongodb.xml renamed to config/doctrine/Aggregator.mongodb.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"

src/Resources/config/doctrine/Aggregator.orm.xml renamed to config/doctrine/Aggregator.orm.xml

@@ -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/Resources/config/services.xml renamed to config/services.xml

@@ -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();

phpunit.xml.dist

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

src/DependencyInjection/MeilisearchExtension.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;