Merge 2.x into 3.x

sonata-project · Dec 10, 2021 · 0713819 · 0713819
2 parents b02462c + 9ee6f6f
commit 0713819
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -45,7 +45,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
+                  php-version: '8.1'
                   coverage: none
                   tools: composer:v2, composer-normalize:2
               env:

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -24,7 +24,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
+                  php-version: '8.1'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -49,7 +49,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
+                  php-version: '8.1'
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb
@@ -61,4 +61,4 @@ jobs:
                   composer-options: --prefer-dist --prefer-stable
 
             - name: Psalm
-              run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.0
+              run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.1
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -34,6 +34,7 @@ jobs:
                     - '7.3'
                     - '7.4'
                     - '8.0'
+                    - '8.1'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
@@ -43,22 +44,22 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 4.4.*
                       variant: symfony/symfony:"4.4.*"
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 5.3.*
                       variant: symfony/symfony:"5.3.*"
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 5.4.*
                       variant: symfony/symfony:"5.4.*"
-                    - php-version: '8.0'
+                    - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.0.*

diff --git a/src/Source/AbstractPropertySourceIterator.php b/src/Source/AbstractPropertySourceIterator.php
@@ -65,6 +65,7 @@ public function __construct(array $fields, string $dateTimeFormat = 'r')
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $current = $this->iterator->current();
@@ -80,6 +81,7 @@ public function next(): void
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iterator->key();

diff --git a/src/Source/AbstractXmlSourceIterator.php b/src/Source/AbstractXmlSourceIterator.php
@@ -105,6 +105,7 @@ abstract public function tagContent($parser, string $data);
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     final public function current()
     {
         return $this->currentRow;
@@ -113,6 +114,7 @@ final public function current()
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     final public function key()
     {
         return $this->position;

diff --git a/src/Source/ChainSourceIterator.php b/src/Source/ChainSourceIterator.php
@@ -37,6 +37,7 @@ public function addSource(SourceIteratorInterface $source): void
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->sources->current()->current();
@@ -50,6 +51,7 @@ public function next(): void
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->sources->current()->key();

diff --git a/src/Source/CsvSourceIterator.php b/src/Source/CsvSourceIterator.php
@@ -87,6 +87,7 @@ public function __construct(
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->currentLine;
@@ -95,6 +96,7 @@ public function current()
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;

diff --git a/src/Source/IteratorSourceIterator.php b/src/Source/IteratorSourceIterator.php
@@ -39,6 +39,7 @@ final public function getIterator(): \Iterator
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->iterator->current();
@@ -52,6 +53,7 @@ final public function next(): void
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     final public function key()
     {
         return $this->iterator->key();

diff --git a/src/Source/PDOStatementSourceIterator.php b/src/Source/PDOStatementSourceIterator.php
@@ -45,6 +45,7 @@ public function __construct(\PDOStatement $statement)
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -59,6 +60,7 @@ public function next(): void
     /**
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;