Merge pull request #375 from Ocramius/renovate/doctrine-coding-standa…

…rd-10.x Update dependency doctrine/coding-standard to v10, drop PHP 7.4, drop PHP 8.0
Ocramius · Oct 31, 2022 · 5d5473c · 5d5473c
2 parents 6e1f083 + aa055c7
commit 5d5473c
Show file tree

Hide file tree

Showing 9 changed files with 136 additions and 134 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -43,7 +43,8 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.0"
+          - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/composer.json b/composer.json
@@ -18,12 +18,12 @@
         }
     ],
     "require": {
-        "php":                  "^7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php":                  "~8.1.0 || ~8.2.0",
         "doctrine/orm":         "^2.9.5",
-        "doctrine/persistence": "^2.2.2 || ^3.0.2"
+        "doctrine/persistence": "^3.0.2"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9.0.0",
+        "doctrine/coding-standard": "^10.0.0",
         "roave/infection-static-analysis-plugin": "^1.18.0",
         "phpunit/phpunit": "^9.5.25",
         "vimeo/psalm": "^4.29.0",
@@ -44,6 +44,9 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "infection/extension-installer": true
+        },
+        "platform": {
+            "php": "8.1.99"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/DoctrineBatchUtils/BatchProcessing/Exception/MissingBatchItemException.php b/src/DoctrineBatchUtils/BatchProcessing/Exception/MissingBatchItemException.php
@@ -24,7 +24,7 @@ public static function fromInvalidReference(ClassMetadata $metadata, object $obj
             get_class($object),
             spl_object_hash($object),
             $metadata->getName(),
-            json_encode($metadata->getIdentifierValues($object))
+            json_encode($metadata->getIdentifierValues($object)),
         ));
     }
 }
diff --git a/src/DoctrineBatchUtils/BatchProcessing/SelectBatchIteratorAggregate.php b/src/DoctrineBatchUtils/BatchProcessing/SelectBatchIteratorAggregate.php
@@ -33,9 +33,7 @@ final class SelectBatchIteratorAggregate implements IteratorAggregate
     /** @psalm-var positive-int */
     private int $batchSize;
 
-    /**
-     * @psalm-param positive-int $batchSize
-     */
+    /** @psalm-param positive-int $batchSize */
     public static function fromQuery(AbstractQuery $query, int $batchSize): self
     {
         return new self($query->toIterable(), $query->getEntityManager(), $batchSize);
@@ -75,9 +73,7 @@ public static function fromTraversableResult(
         return new self($results, $entityManager, $batchSize);
     }
 
-    /**
-     * @return Traversable<TKey, TValue>
-     */
+    /** @return Traversable<TKey, TValue> */
     #[ReturnTypeWillChange]
     public function getIterator(): iterable
     {

diff --git a/src/DoctrineBatchUtils/BatchProcessing/SimpleBatchIteratorAggregate.php b/src/DoctrineBatchUtils/BatchProcessing/SimpleBatchIteratorAggregate.php
@@ -30,9 +30,7 @@ final class SimpleBatchIteratorAggregate implements IteratorAggregate
     /** @psalm-var positive-int */
     private int $batchSize;
 
-    /**
-     * @psalm-param positive-int $batchSize
-     */
+    /** @psalm-param positive-int $batchSize */
     public static function fromQuery(AbstractQuery $query, int $batchSize): self
     {
         return new self($query->toIterable(), $query->getEntityManager(), $batchSize);
@@ -69,9 +67,7 @@ public static function fromTraversableResult(
         return new self($results, $entityManager, $batchSize);
     }
 
-    /**
-     * @return Traversable<TKey, TValue>
-     */
+    /** @return Traversable<TKey, TValue> */
     #[ReturnTypeWillChange]
     public function getIterator(): iterable
     {

diff --git a/test/DoctrineBatchUtilsTest/BatchProcessing/Exception/MissingBatchItemExceptionTest.php b/test/DoctrineBatchUtilsTest/BatchProcessing/Exception/MissingBatchItemExceptionTest.php
@@ -13,9 +13,7 @@
 
 use function spl_object_hash;
 
-/**
- * @covers \DoctrineBatchUtils\BatchProcessing\Exception\MissingBatchItemException
- */
+/** @covers \DoctrineBatchUtils\BatchProcessing\Exception\MissingBatchItemException */
 final class MissingBatchItemExceptionTest extends TestCase
 {
     public function testFromInvalidReference(): void
@@ -36,7 +34,7 @@ public function testFromInvalidReference(): void
             'Requested batch item stdClass#'
             . spl_object_hash($object)
             . ' (of type Foo) with identifier "{"abc":"def"}" could not be found',
-            $exception->getMessage()
+            $exception->getMessage(),
         );
     }
 }