Added support for Symfony 6

pmishev · pmishev · commit dfd2296d13eb · 2024-12-12T16:23:09.000Z
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
@@ -48,39 +48,39 @@ jobs:
                     - 'highest'
                 php:
                     - '8.1'
-                    - '8.2'
+                    - '8.3'
                 elasticsearch:
-                    - '7.17.13'
+                    - '7.17.24'
                 symfony:
-                    - '~5.0'
+                    - '~6.0'
                 include:
-                    - php: '8.1'
-                      symfony: '~5.0'
+                    - php: '8.3'
+                      symfony: '~6.0'
                       elasticsearch: '8.0.1'
                       experimental: false
-                    - php: '8.1'
-                      symfony: '~5.0'
+                    - php: '8.3'
+                      symfony: '~6.0'
                       elasticsearch: '8.1.3' # there are some bc in minor version https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.1.html#breaking-changes-8.1
                       experimental: false
-                    - php: '8.1'
-                      symfony: '~5.0'
+                    - php: '8.3'
+                      symfony: '~6.0'
                       elasticsearch: '8.5.3' # there are some bc in minor version https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.5.html
                       experimental: false
-                    - php: '8.1'
-                      symfony: '~5.0'
+                    - php: '8.3'
+                      symfony: '~6.0'
                       elasticsearch: '8.6.2' # there are no bc in minor version https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.6.html
                       experimental: false
-                    - php: '8.1'
-                      symfony: '~5.0'
+                    - php: '8.3'
+                      symfony: '~6.0'
                       elasticsearch: '8.7.1' # there are no bc in minor version https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.7.html
                       experimental: false
-                    - php: '8.1'
-                      symfony: '~5.0'
+                    - php: '8.3'
+                      symfony: '~6.0'
                       elasticsearch: '8.8.0' # there are no bc in minor version https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.8.html
                       experimental: false
                     - php: '8.1'
-                      symfony: '~6.0'
-                      elasticsearch: '8.10.2' # newest version
+                      symfony: '~5.0'
+                      elasticsearch: '8.15.2' # newest version
                       experimental: false
             fail-fast: false
         steps:
@@ -115,7 +115,7 @@ jobs:
 
             - name: 'Run phpunit tests'
               run: |
-                  vendor/bin/simple-phpunit --coverage-clover=tests/App/build/clover.xml 2>/dev/null
+                  vendor/bin/simple-phpunit --coverage-clover=tests/App/build/clover.xml
 
             - name: Upload coverage results to Coveralls
               env:
diff --git a/composer.json b/composer.json
@@ -14,25 +14,25 @@
         "php": "^7.3 || ^8.0",
         "psr/log": "^1.0",
 
-        "symfony/framework-bundle": "^4.4 || ^5.0",
-        "symfony/options-resolver": "^4.4 || ^5.0",
-        "symfony/config": "^4.4 || ^5.0",
-        "symfony/event-dispatcher": "^4.4 || ^5.0",
-        "symfony/translation": "^4.4 || ^5.0",
-        "symfony/console": "^4.4 || ^5.0",
-        "symfony/http-kernel": "^4.4 || ^5.0",
+        "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
+        "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
+        "symfony/config": "^4.4 || ^5.0 || ^6.0",
+        "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0",
+        "symfony/translation": "^4.4 || ^5.0 || ^6.0",
+        "symfony/console": "^4.4 || ^5.0 || ^6.0",
+        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
         "symfony/event-dispatcher-contracts": "^1.1 || ^2.2",
 
         "doctrine/annotations": "^1.2",
         "doctrine/cache": "^1.4",
         "elasticsearch/elasticsearch": "^7.0"
     },
     "require-dev": {
-        "symfony/debug": "^4.4 || ^5.0",
-        "symfony/stopwatch": "^4.4 || ^5.0",
-        "symfony/phpunit-bridge": "^4.4 || ^5.0",
-        "symfony/browser-kit": "^4.4 || ^5.0",
-        "symfony/dotenv": "^4.4 || ^5.0",
+        "symfony/debug": "^4.4 || ^5.0 || ^6.0",
+        "symfony/stopwatch": "^4.4 || ^5.0 || ^6.0",
+        "symfony/phpunit-bridge": "^4.4 || ^5.0 || ^6.0",
+        "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
+        "symfony/dotenv": "^4.4 || ^5.0 || ^6.0",
         "doctrine/orm": "^2.6.3",
 
         "monolog/monolog": "^1.0|^2.0|^3.0",
diff --git a/src/Annotation/DocObject.php b/src/Annotation/DocObject.php
@@ -6,7 +6,6 @@
  * Annotation to mark a class as an object during the parsing process.
  *
  * @Annotation
- *
  * @Target("CLASS")
  */
 final class DocObject
diff --git a/src/Annotation/Document.php b/src/Annotation/Document.php
@@ -8,7 +8,6 @@
  * Annotation to mark a class as an Elasticsearch document.
  *
  * @Annotation
- *
  * @Target("CLASS")
  */
 final class Document implements DumperInterface
diff --git a/src/Annotation/Id.php b/src/Annotation/Id.php
@@ -6,7 +6,6 @@
  * Annotation used for the meta _id field
  *
  * @Annotation
- *
  * @Target("PROPERTY")
  */
 final class Id
diff --git a/src/Annotation/Property.php b/src/Annotation/Property.php
@@ -8,7 +8,6 @@
  * Annotation used to check mapping type during the parsing process.
  *
  * @Annotation
- *
  * @Target("PROPERTY")
  */
 final class Property implements DumperInterface
diff --git a/src/Annotation/Score.php b/src/Annotation/Score.php
@@ -6,7 +6,6 @@
  * Annotation used for the meta _score field, returned when searching
  *
  * @Annotation
- *
  * @Target("PROPERTY")
  */
 final class Score
diff --git a/src/Document/Provider/ElasticsearchProvider.php b/src/Document/Provider/ElasticsearchProvider.php
@@ -45,7 +45,7 @@ class ElasticsearchProvider extends AbstractProvider
     public function __construct(
         DocumentMetadataCollector $metadataCollector,
         IndexManager $sourceIndexManager,
-        string $sourceDocumentClass
+        string $sourceDocumentClass,
     ) {
         $this->metadataCollector = $metadataCollector;
         $this->sourceIndexManager = $sourceIndexManager;
diff --git a/src/Document/Provider/ProviderRegistry.php b/src/Document/Provider/ProviderRegistry.php
@@ -38,7 +38,7 @@ public function __construct(
         ServiceLocator $serviceLocator,
         DocumentMetadataCollector $documentMetadataCollector,
         IndexManagerRegistry $indexManagerRegistry,
-        string $selfProviderClass
+        string $selfProviderClass,
     ) {
         $this->serviceLocator = $serviceLocator;
         $this->documentMetadataCollector = $documentMetadataCollector;
diff --git a/src/Document/Repository/Repository.php b/src/Document/Repository/Repository.php
@@ -65,7 +65,7 @@ public function getById(string $id, int $resultType = Finder::RESULTS_OBJECT)
      *
      * @return mixed
      */
-    public function find(array $searchBody, int $resultsType = Finder::RESULTS_OBJECT, array $additionalRequestParams = [], int &$totalHits = null)
+    public function find(array $searchBody, int $resultsType = Finder::RESULTS_OBJECT, array $additionalRequestParams = [], ?int &$totalHits = null)
     {
         return $this->finder->find([$this->documentClass], $searchBody, $resultsType, $additionalRequestParams, $totalHits);
     }
diff --git a/src/Exception/IndexOrAliasNotFoundException.php b/src/Exception/IndexOrAliasNotFoundException.php
@@ -17,7 +17,7 @@ class IndexOrAliasNotFoundException extends Exception
      *
      * @param int $code
      */
-    public function __construct(string $indexOrAlias, bool $isAlias = false, $code = 0, \Throwable $previous = null)
+    public function __construct(string $indexOrAlias, bool $isAlias = false, $code = 0, ?\Throwable $previous = null)
     {
         $this->indexOrAlias = $indexOrAlias;
 
diff --git a/src/Exception/IndexRebuildingException.php b/src/Exception/IndexRebuildingException.php
@@ -16,7 +16,7 @@ class IndexRebuildingException extends Exception
      * @param array $indicesInProgress The physical indices, which are in the process of being built
      * @param int   $code
      */
-    public function __construct(array $indicesInProgress, $code = 0, Exception $previous = null)
+    public function __construct(array $indicesInProgress, $code = 0, ?Exception $previous = null)
     {
         parent::__construct(\sprintf('Index is currently being rebuilt as "%s"', \implode(', ', $indicesInProgress)), $code, $previous);
 
diff --git a/src/Finder/Finder.php b/src/Finder/Finder.php
@@ -48,7 +48,7 @@ class Finder
     public function __construct(
         DocumentMetadataCollector $documentMetadataCollector,
         IndexManagerRegistry $indexManagerRegistry,
-        DocumentConverter $documentConverter
+        DocumentConverter $documentConverter,
     ) {
         $this->documentMetadataCollector = $documentMetadataCollector;
         $this->indexManagerRegistry = $indexManagerRegistry;
@@ -154,7 +154,7 @@ public function find(array $documentClasses, array $searchBody, $resultsType = s
      *
      * @return mixed
      */
-    public function scroll(array $documentClasses, string &$scrollId, string $scrollTime = self::SCROLL_TIME, int $resultsType = self::RESULTS_OBJECT, int &$totalHits = null)
+    public function scroll(array $documentClasses, string &$scrollId, string $scrollTime = self::SCROLL_TIME, int $resultsType = self::RESULTS_OBJECT, ?int &$totalHits = null)
     {
         $client = $this->getConnection($documentClasses)->getClient();
 
@@ -235,7 +235,7 @@ public function getTargetIndices(array $documentClasses): array
      *
      * @return array|DocumentIterator
      */
-    public function parseResult(array $raw, int $resultsType, array $documentClasses = null)
+    public function parseResult(array $raw, int $resultsType, ?array $documentClasses = null)
     {
         switch ($resultsType & self::BITMASK_RESULT_TYPES) {
             case self::RESULTS_OBJECT:
diff --git a/src/Manager/IndexManager.php b/src/Manager/IndexManager.php
@@ -105,7 +105,7 @@ public function __construct(
         ProviderRegistry $providerRegistry,
         Finder $finder,
         DocumentConverter $documentConverter,
-        RepositoryFactory $repositoryFactory
+        RepositoryFactory $repositoryFactory,
     ) {
         $this->managerName = $managerName;
         $this->connection = $connection;
@@ -601,7 +601,7 @@ public function persistRaw(array $documentArray, array $metaParams = [])
     /**
      * Created a new index with a unique name
      */
-    protected function createNewIndexWithUniqueName(string $suffix = null): string
+    protected function createNewIndexWithUniqueName(?string $suffix = null): string
     {
         $settings = $this->getIndexMapping();
         $newIndex = $this->getUniqueIndexName($suffix);
diff --git a/src/Mapping/DocumentParser.php b/src/Mapping/DocumentParser.php
@@ -311,7 +311,7 @@ private function getProperties(\ReflectionClass $documentReflection, array $inde
      *
      * @throws \ReflectionException
      */
-    private function getPropertyMapping(Property $propertyAnnotation, string $language = null, array $indexAnalyzers = [])
+    private function getPropertyMapping(Property $propertyAnnotation, ?string $language = null, array $indexAnalyzers = [])
     {
         $propertyMapping = $propertyAnnotation->dump([
             'language'       => $language,
diff --git a/src/Profiler/ElasticsearchProfiler.php b/src/Profiler/ElasticsearchProfiler.php
@@ -44,7 +44,7 @@ public function addLogger(Logger $logger)
     /**
      * {@inheritDoc}
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null)
     {
         $this->data['indexManagers'] = $this->cloneVar($this->indexManagers);
 
diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -20,7 +20,7 @@ class AppKernel extends Kernel
      *
      * @return array
      */
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $bundles = [
             new FrameworkBundle(),
diff --git a/tests/Functional/Mapping/DocumentMetadataCollectorTest.php b/tests/Functional/Mapping/DocumentMetadataCollectorTest.php
diff --git a/tests/Functional/Mapping/DocumentParserTest.php b/tests/Functional/Mapping/DocumentParserTest.php
diff --git a/tests/Functional/Result/DocumentConverterTest.php b/tests/Functional/Result/DocumentConverterTest.php
diff --git a/tests/Unit/Annotation/PropertyTest.php b/tests/Unit/Annotation/PropertyTest.php

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`* Annotation to mark a class as an object during the parsing process.`
`7`	`7`	`*`
`8`	`8`	`* @Annotation`
`9`		`- *`
`10`	`9`	`* @Target("CLASS")`
`11`	`10`	`*/`
`12`	`11`	`final class DocObject`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`* Annotation to mark a class as an Elasticsearch document.`
`9`	`9`	`*`
`10`	`10`	`* @Annotation`
`11`		`- *`
`12`	`11`	`* @Target("CLASS")`
`13`	`12`	`*/`
`14`	`13`	`final class Document implements DumperInterface`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`* Annotation used for the meta _id field`
`7`	`7`	`*`
`8`	`8`	`* @Annotation`
`9`		`- *`
`10`	`9`	`* @Target("PROPERTY")`
`11`	`10`	`*/`
`12`	`11`	`final class Id`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`* Annotation used to check mapping type during the parsing process.`
`9`	`9`	`*`
`10`	`10`	`* @Annotation`
`11`		`- *`
`12`	`11`	`* @Target("PROPERTY")`
`13`	`12`	`*/`
`14`	`13`	`final class Property implements DumperInterface`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`* Annotation used for the meta _score field, returned when searching`
`7`	`7`	`*`
`8`	`8`	`* @Annotation`
`9`		`- *`
`10`	`9`	`* @Target("PROPERTY")`
`11`	`10`	`*/`
`12`	`11`	`final class Score`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function getById(string $id, int $resultType = Finder::RESULTS_OBJECT)`
`65`	`65`	`*`
`66`	`66`	`* @return mixed`
`67`	`67`	`*/`
`68`		`- public function find(array $searchBody, int $resultsType = Finder::RESULTS_OBJECT, array $additionalRequestParams = [], int &$totalHits = null)`
	`68`	`+ public function find(array $searchBody, int $resultsType = Finder::RESULTS_OBJECT, array $additionalRequestParams = [], ?int &$totalHits = null)`
`69`	`69`	`{`
`70`	`70`	`return $this->finder->find([$this->documentClass], $searchBody, $resultsType, $additionalRequestParams, $totalHits);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class IndexOrAliasNotFoundException extends Exception`
`17`	`17`	`*`
`18`	`18`	`* @param int $code`
`19`	`19`	`*/`
`20`		`- public function __construct(string $indexOrAlias, bool $isAlias = false, $code = 0, \Throwable $previous = null)`
	`20`	`+ public function __construct(string $indexOrAlias, bool $isAlias = false, $code = 0, ?\Throwable $previous = null)`
`21`	`21`	`{`
`22`	`22`	`$this->indexOrAlias = $indexOrAlias;`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class IndexRebuildingException extends Exception`
`16`	`16`	`* @param array $indicesInProgress The physical indices, which are in the process of being built`
`17`	`17`	`* @param int $code`
`18`	`18`	`*/`
`19`		`- public function __construct(array $indicesInProgress, $code = 0, Exception $previous = null)`
	`19`	`+ public function __construct(array $indicesInProgress, $code = 0, ?Exception $previous = null)`
`20`	`20`	`{`
`21`	`21`	`parent::__construct(\sprintf('Index is currently being rebuilt as "%s"', \implode(', ', $indicesInProgress)), $code, $previous);`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class Finder`
`48`	`48`	`public function __construct(`
`49`	`49`	`DocumentMetadataCollector $documentMetadataCollector,`
`50`	`50`	`IndexManagerRegistry $indexManagerRegistry,`
`51`		`- DocumentConverter $documentConverter`
	`51`	`+ DocumentConverter $documentConverter,`
`52`	`52`	`) {`
`53`	`53`	`$this->documentMetadataCollector = $documentMetadataCollector;`
`54`	`54`	`$this->indexManagerRegistry = $indexManagerRegistry;`
`@@ -154,7 +154,7 @@ public function find(array $documentClasses, array $searchBody, $resultsType = s`
`154`	`154`	`*`
`155`	`155`	`* @return mixed`
`156`	`156`	`*/`
`157`		`- public function scroll(array $documentClasses, string &$scrollId, string $scrollTime = self::SCROLL_TIME, int $resultsType = self::RESULTS_OBJECT, int &$totalHits = null)`
	`157`	`+ public function scroll(array $documentClasses, string &$scrollId, string $scrollTime = self::SCROLL_TIME, int $resultsType = self::RESULTS_OBJECT, ?int &$totalHits = null)`
`158`	`158`	`{`
`159`	`159`	`$client = $this->getConnection($documentClasses)->getClient();`
`160`	`160`
`@@ -235,7 +235,7 @@ public function getTargetIndices(array $documentClasses): array`
`235`	`235`	`*`
`236`	`236`	`* @return array\|DocumentIterator`
`237`	`237`	`*/`
`238`		`- public function parseResult(array $raw, int $resultsType, array $documentClasses = null)`
	`238`	`+ public function parseResult(array $raw, int $resultsType, ?array $documentClasses = null)`
`239`	`239`	`{`
`240`	`240`	`switch ($resultsType & self::BITMASK_RESULT_TYPES) {`
`241`	`241`	`case self::RESULTS_OBJECT:`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ private function getProperties(\ReflectionClass $documentReflection, array $inde`
`311`	`311`	`*`
`312`	`312`	`* @throws \ReflectionException`
`313`	`313`	`*/`
`314`		`- private function getPropertyMapping(Property $propertyAnnotation, string $language = null, array $indexAnalyzers = [])`
	`314`	`+ private function getPropertyMapping(Property $propertyAnnotation, ?string $language = null, array $indexAnalyzers = [])`
`315`	`315`	`{`
`316`	`316`	`$propertyMapping = $propertyAnnotation->dump([`
`317`	`317`	`'language' => $language,`