Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit bb5abddd5f15 · 2020-02-03T09:22:04.000+01:00
* 3.4:
  [Config] dont catch instances of Error
diff --git a/Tests/Loader/AnnotationFileLoaderTest.php b/Tests/Loader/AnnotationFileLoaderTest.php
@@ -59,9 +59,6 @@ public function testLoadVariadic()
         $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/VariadicClass.php');
     }
 
-    /**
-     * @requires PHP 7.0
-     */
     public function testLoadAnonymousClass()
     {
         $this->reader->expects($this->never())->method('getClassAnnotation');

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,6 @@ public function testLoadVariadic()`
`59`	`59`	`$this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/VariadicClass.php');`
`60`	`60`	`}`
`61`	`61`
`62`		`- /**`
`63`		`- * @requires PHP 7.0`
`64`		`- */`
`65`	`62`	`public function testLoadAnonymousClass()`
`66`	`63`	`{`
`67`	`64`	`$this->reader->expects($this->never())->method('getClassAnnotation');`