Merge pull request #71 from greg0ire/upgrade-cs

Upgrade to doctrine/coding-standard 12
doctrine · Dec 3, 2024 · 02c4605 · 02c4605
2 parents c80c8ed + 409330d
commit 02c4605
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "php": "^7.1 || ^8.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9",
+        "doctrine/coding-standard": "^9 || ^12",
         "phpstan/phpstan": "1.4.10 || 2.0.3",
         "phpstan/phpstan-phpunit": "^1.0 || ^2",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",

diff --git a/src/Deprecation.php b/src/Deprecation.php
@@ -173,9 +173,7 @@ public static function triggerIfCalledFromOutside(string $package, string $link,
         self::delegateTriggerToBackend($message, $backtrace, $link, $package);
     }
 
-    /**
-     * @param list<array{function: string, line?: int, file?: string, class?: class-string, type?: string, args?: mixed[], object?: object}> $backtrace
-     */
+    /** @param list<array{function: string, line?: int, file?: string, class?: class-string, type?: string, args?: mixed[], object?: object}> $backtrace */
     private static function delegateTriggerToBackend(string $message, array $backtrace, string $link, string $package): void
     {
         $type = self::$type ?? self::getTypeFromEnv();
@@ -289,9 +287,7 @@ public static function getTriggeredDeprecations(): array
         return self::$triggeredDeprecations;
     }
 
-    /**
-     * @return int-mask-of<self::TYPE_*>
-     */
+    /** @return int-mask-of<self::TYPE_*> */
     private static function getTypeFromEnv(): int
     {
         switch ($_SERVER['DOCTRINE_DEPRECATIONS'] ?? $_ENV['DOCTRINE_DEPRECATIONS'] ?? null) {

diff --git a/src/PHPUnit/VerifyDeprecations.php b/src/PHPUnit/VerifyDeprecations.php
@@ -26,17 +26,13 @@ public function expectNoDeprecationWithIdentifier(string $identifier): void
         $this->doctrineNoDeprecationsExpectations[$identifier] = Deprecation::getTriggeredDeprecations()[$identifier] ?? 0;
     }
 
-    /**
-     * @before
-     */
+    /** @before */
     public function enableDeprecationTracking(): void
     {
         Deprecation::enableTrackingDeprecations();
     }
 
-    /**
-     * @after
-     */
+    /** @after */
     public function verifyDeprecationsAreTriggered(): void
     {
         foreach ($this->doctrineDeprecationsExpectations as $identifier => $expectation) {