Bumps minimum version of doctrine annotations to 1.13.3 to solve te…

…st failures Doctrine Annotations now converts deprecations to exceptions ref: doctrine/annotations#438 Signed-off-by: George Steel <george@net-glue.co.uk>
laminas · Jul 25, 2022 · 8c7543c · 8c7543c
1 parent c1a8474
commit 8c7543c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     },
     "require-dev": {
         "ext-intl": "*",
-        "doctrine/annotations": "^1.13.2",
+        "doctrine/annotations": "^1.13.3",
         "laminas/laminas-captcha": "^2.11.0",
         "laminas/laminas-coding-standard": "^2.3.0",
         "laminas/laminas-db": "^2.13.4",

diff --git a/composer.lock b/composer.lock
diff --git a/test/Annotation/AbstractBuilderTestCase.php b/test/Annotation/AbstractBuilderTestCase.php
@@ -4,6 +4,7 @@
 
 namespace LaminasTest\Form\Annotation;
 
+use Doctrine\Common\Annotations\AnnotationException;
 use Generator;
 use Laminas\Form\Annotation;
 use Laminas\Form\Element;
@@ -406,37 +407,37 @@ public function testInputFilterAnnotationAllowsComposition(): void
 
     public function testLegacyComposedObjectAnnotation(): void
     {
-        $this->expectDeprecation();
-        $this->expectDeprecationMessageMatches('/Passing a single array .* is deprecated/');
+        $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessageMatches('/Passing a single array .* is deprecated/');
         $entity  = new TestAsset\Annotation\LegacyComposedObjectAnnotation();
         $builder = $this->createBuilder();
-        $form    = $builder->createForm($entity);
+        $builder->createForm($entity);
     }
 
     public function testLegacyStyleFilterAnnotations(): void
     {
-        $this->expectDeprecation();
-        $this->expectDeprecationMessageMatches('/Passing a single array .* is deprecated/');
+        $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessageMatches('/Passing a single array .* is deprecated/');
         $entity  = new TestAsset\Annotation\LegacyFilterAnnotation();
         $builder = $this->createBuilder();
-        $form    = $builder->createForm($entity);
+        $builder->createForm($entity);
     }
 
     public function testLegacyStyleHydratorAnnotations(): void
     {
-        $this->expectDeprecation();
-        $this->expectDeprecationMessageMatches('/Passing a single array .* is deprecated/');
+        $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessageMatches('/Passing a single array .* is deprecated/');
         $entity  = new TestAsset\Annotation\LegacyHydratorAnnotation();
         $builder = $this->createBuilder();
-        $form    = $builder->createForm($entity);
+        $builder->createForm($entity);
     }
 
     public function testLegacyStyleValidatorAnnotations(): void
     {
-        $this->expectDeprecation();
-        $this->expectDeprecationMessageMatches('/Passing a single array .* is deprecated/');
+        $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessageMatches('/Passing a single array .* is deprecated/');
         $entity  = new TestAsset\Annotation\LegacyValidatorAnnotation();
         $builder = $this->createBuilder();
-        $form    = $builder->createForm($entity);
+        $builder->createForm($entity);
     }
 }