Doctrine CS 12 (#487)

doctrine · Aug 14, 2023 · 002e496 · 002e496
1 parent fb0d71a
commit 002e496
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
     },
     "require-dev": {
         "doctrine/cache": "^1.11 || ^2.0",
-        "doctrine/coding-standard": "^9 || ^10",
+        "doctrine/coding-standard": "^9 || ^12",
         "phpstan/phpstan": "~1.4.10 || ^1.8.0",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "symfony/cache": "^4.4 || ^5.4 || ^6",

diff --git a/lib/Doctrine/Common/Annotations/DocLexer.php b/lib/Doctrine/Common/Annotations/DocLexer.php
@@ -74,7 +74,7 @@ public function nextTokenIsAdjacent(): bool
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function getCatchablePatterns()
     {
@@ -86,15 +86,15 @@ protected function getCatchablePatterns()
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function getNonCatchablePatterns()
     {
         return ['\s+', '\*+', '(.)'];
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function getType(&$value)
     {

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -56,6 +56,11 @@
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php</exclude-pattern>
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/*</exclude-pattern>
     </rule>
+    <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing">
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/SimpleAnnotationReaderTest.php</exclude-pattern>
+    </rule>
     <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash.UseStartsWithBackslash">
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/*</exclude-pattern>
     </rule>
@@ -88,6 +93,7 @@
 
     <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName">
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/PhpParserTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php</exclude-pattern>
     </rule>
 
     <!-- It is easier to understand tests that involve annotations if you can
@@ -119,6 +125,7 @@
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint">
         <!-- there is a class property with an empty var annotation on purpose -->
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/DummyClass.php</exclude-pattern>
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithValidAnnotationTarget.php</exclude-pattern>
     </rule>
 

diff --git a/...Doctrine/Tests/Common/Annotations/Fixtures/ClassWithInvalidAnnotationTargetAtProperty.php b/...Doctrine/Tests/Common/Annotations/Fixtures/ClassWithInvalidAnnotationTargetAtProperty.php
@@ -16,7 +16,6 @@ class ClassWithInvalidAnnotationTargetAtProperty
      */
     public $foo;
 
-
     /**
      * @var mixed
      * @AnnotationTargetAnnotation("Foo")

diff --git a/tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithValidAnnotationTarget.php b/tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithValidAnnotationTarget.php
@@ -14,7 +14,6 @@ class ClassWithValidAnnotationTarget
     /** @AnnotationTargetPropertyMethod("Some data") */
     public $foo;
 
-
     /** @AnnotationTargetAll("Some data",name="Some name") */
     public $name;
 

diff --git a/tests/Doctrine/Tests/Common/Annotations/SimpleAnnotationReaderTest.php b/tests/Doctrine/Tests/Common/Annotations/SimpleAnnotationReaderTest.php
@@ -19,6 +19,7 @@ class SimpleAnnotationReaderTest extends AbstractReaderTest
     public function testImportDetectsNotImportedAnnotation(): void
     {
         $this->ignoreIssues();
+
         parent::testImportDetectsNotImportedAnnotation();
     }
 
@@ -31,6 +32,7 @@ public function testImportDetectsNotImportedAnnotation(): void
     public function testImportDetectsNonExistentAnnotation(): void
     {
         $this->ignoreIssues();
+
         parent::testImportDetectsNonExistentAnnotation();
     }
 
@@ -43,6 +45,7 @@ public function testImportDetectsNonExistentAnnotation(): void
     public function testClassWithInvalidAnnotationTargetAtClassDocBlock(): void
     {
         $this->ignoreIssues();
+
         parent::testClassWithInvalidAnnotationTargetAtClassDocBlock();
     }
 
@@ -55,6 +58,7 @@ public function testClassWithInvalidAnnotationTargetAtClassDocBlock(): void
     public function testClassWithInvalidAnnotationTargetAtPropertyDocBlock(): void
     {
         $this->ignoreIssues();
+
         parent::testClassWithInvalidAnnotationTargetAtPropertyDocBlock();
     }
 
@@ -67,6 +71,7 @@ public function testClassWithInvalidAnnotationTargetAtPropertyDocBlock(): void
     public function testClassWithInvalidNestedAnnotationTargetAtPropertyDocBlock(): void
     {
         $this->ignoreIssues();
+
         parent::testClassWithInvalidNestedAnnotationTargetAtPropertyDocBlock();
     }
 
@@ -79,6 +84,7 @@ public function testClassWithInvalidNestedAnnotationTargetAtPropertyDocBlock():
     public function testClassWithInvalidAnnotationTargetAtMethodDocBlock(): void
     {
         $this->ignoreIssues();
+
         parent::testClassWithInvalidAnnotationTargetAtMethodDocBlock();
     }
 
@@ -91,6 +97,7 @@ public function testClassWithInvalidAnnotationTargetAtMethodDocBlock(): void
     public function testErrorWhenInvalidAnnotationIsUsed(): void
     {
         $this->ignoreIssues();
+
         parent::testErrorWhenInvalidAnnotationIsUsed();
     }