diff --git a/composer.json b/composer.json index e322d82fc..a01223635 100644 --- 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 index dbba52522..3aa4c7aa4 100644 --- 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,7 +86,7 @@ protected function getCatchablePatterns() } /** - * {@inheritdoc} + * {@inheritDoc} */ protected function getNonCatchablePatterns() { @@ -94,7 +94,7 @@ protected function getNonCatchablePatterns() } /** - * {@inheritdoc} + * {@inheritDoc} */ protected function getType(&$value) { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index eeadabad2..0d84d28ba 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -56,6 +56,11 @@ */tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php */tests/Doctrine/Tests/Common/Annotations/Fixtures/* + + */tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php + */tests/Doctrine/Tests/Common/Annotations/Fixtures/* + */tests/Doctrine/Tests/Common/Annotations/SimpleAnnotationReaderTest.php + */tests/Doctrine/Tests/Common/Annotations/Fixtures/* @@ -88,6 +93,7 @@ */tests/Doctrine/Tests/Common/Annotations/PhpParserTest.php + */tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php */tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php + */tests/Doctrine/Tests/Common/Annotations/DummyClass.php */tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithValidAnnotationTarget.php diff --git a/tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithInvalidAnnotationTargetAtProperty.php b/tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithInvalidAnnotationTargetAtProperty.php index 3077e45d0..8d988bbd3 100644 --- a/tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithInvalidAnnotationTargetAtProperty.php +++ b/tests/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 index 05e106e69..7700c94ab 100644 --- 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 index f65861c60..788ce703f 100644 --- 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(); }