Fix PHPUnit 8.5 deprecations.

derrabus · derrabus · commit 58381b7b815c · 2020-07-23T11:37:51.000+02:00
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -339,7 +339,7 @@ public function testLoadRouteWithControllerSetInDefaults()
     public function testOverrideControllerInDefaults()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');
         $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('override_defaults.xml');
     }
@@ -371,7 +371,7 @@ public function provideFilesImportingRoutesWithControllers()
     public function testImportWithOverriddenController()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');
         $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('import_override_defaults.xml');
     }
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -142,7 +142,7 @@ public function testLoadRouteWithControllerSetInDefaults()
     public function testOverrideControllerInDefaults()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');
         $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('override_defaults.yml');
     }
@@ -174,7 +174,7 @@ public function provideFilesImportingRoutesWithControllers()
     public function testImportWithOverriddenController()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');
         $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('import_override_defaults.yml');
     }

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ public function testLoadRouteWithControllerSetInDefaults()`
`339`	`339`	`public function testOverrideControllerInDefaults()`
`340`	`340`	`{`
`341`	`341`	`$this->expectException('InvalidArgumentException');`
`342`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');`
	`342`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');`
`343`	`343`	`$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`344`	`344`	`$loader->load('override_defaults.xml');`
`345`	`345`	`}`
`@@ -371,7 +371,7 @@ public function provideFilesImportingRoutesWithControllers()`
`371`	`371`	`public function testImportWithOverriddenController()`
`372`	`372`	`{`
`373`	`373`	`$this->expectException('InvalidArgumentException');`
`374`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');`
	`374`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');`
`375`	`375`	`$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`376`	`376`	`$loader->load('import_override_defaults.xml');`
`377`	`377`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function testLoadRouteWithControllerSetInDefaults()`
`142`	`142`	`public function testOverrideControllerInDefaults()`
`143`	`143`	`{`
`144`	`144`	`$this->expectException('InvalidArgumentException');`
`145`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');`
	`145`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');`
`146`	`146`	`$loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`147`	`147`	`$loader->load('override_defaults.yml');`
`148`	`148`	`}`
`@@ -174,7 +174,7 @@ public function provideFilesImportingRoutesWithControllers()`
`174`	`174`	`public function testImportWithOverriddenController()`
`175`	`175`	`{`
`176`	`176`	`$this->expectException('InvalidArgumentException');`
`177`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');`
	`177`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');`
`178`	`178`	`$loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`179`	`179`	`$loader->load('import_override_defaults.yml');`
`180`	`180`	`}`