[PhpUnitBridge] add PolyfillTestCaseTrait::expectExceptionMessageMatches to provide FC with recent phpunit versions

soyuka · nicolas-grekas · commit b10c9cb1fc7c · 2020-04-15T17:55:41.000+02:00
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -439,7 +439,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');
     }
@@ -471,7 +471,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
@@ -144,7 +144,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');
     }
@@ -176,7 +176,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
`@@ -439,7 +439,7 @@ public function testLoadRouteWithControllerSetInDefaults()`
`439`	`439`	`public function testOverrideControllerInDefaults()`
`440`	`440`	`{`
`441`	`441`	`$this->expectException('InvalidArgumentException');`
`442`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');`
	`442`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');`
`443`	`443`	`$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`444`	`444`	`$loader->load('override_defaults.xml');`
`445`	`445`	`}`
`@@ -471,7 +471,7 @@ public function provideFilesImportingRoutesWithControllers()`
`471`	`471`	`public function testImportWithOverriddenController()`
`472`	`472`	`{`
`473`	`473`	`$this->expectException('InvalidArgumentException');`
`474`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');`
	`474`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');`
`475`	`475`	`$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`476`	`476`	`$loader->load('import_override_defaults.xml');`
`477`	`477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function testLoadRouteWithControllerSetInDefaults()`
`144`	`144`	`public function testOverrideControllerInDefaults()`
`145`	`145`	`{`
`146`	`146`	`$this->expectException('InvalidArgumentException');`
`147`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');`
	`147`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');`
`148`	`148`	`$loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`149`	`149`	`$loader->load('override_defaults.yml');`
`150`	`150`	`}`
`@@ -176,7 +176,7 @@ public function provideFilesImportingRoutesWithControllers()`
`176`	`176`	`public function testImportWithOverriddenController()`
`177`	`177`	`{`
`178`	`178`	`$this->expectException('InvalidArgumentException');`
`179`		`- $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');`
	`179`	`+ $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');`
`180`	`180`	`$loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));`
`181`	`181`	`$loader->load('import_override_defaults.yml');`
`182`	`182`	`}`