diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php index f09b5d0868b..1978662840e 100644 --- a/src/Controller/Controller.php +++ b/src/Controller/Controller.php @@ -343,7 +343,7 @@ public function __get($name) ]; if (isset($deprecated[$name])) { $method = $deprecated[$name]; - deprecationWarning(sprintf('aaaaController::$%s is deprecated. Use $this->viewBuilder()->%s() instead.', $name, $method)); + deprecationWarning(sprintf('Controller::$%s is deprecated. Use $this->viewBuilder()->%s() instead.', $name, $method)); return $this->viewBuilder()->{$method}(); } diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php index b496feb8cb0..0de17d2ba43 100644 --- a/tests/TestCase/Controller/ControllerTest.php +++ b/tests/TestCase/Controller/ControllerTest.php @@ -1115,7 +1115,7 @@ public function testDeprecatedViewProperty($property, $getter, $setter, $value) * @param mixed $value Value to be set * @return void * @expectedException PHPUnit\Framework\Error\Deprecated - * @expectedExceptionMessageRegExp /Controller::\$\w+ is deprecated(.*)/ + * @expectedExceptionMessageRegExp /^Controller::\$\w+ is deprecated(.*)/ * @dataProvider deprecatedViewPropertyProvider */ public function testDeprecatedViewPropertySetterMessage($property, $getter, $setter, $value) @@ -1136,7 +1136,7 @@ public function testDeprecatedViewPropertySetterMessage($property, $getter, $set * @param mixed $value Value to be set * @return void * @expectedException PHPUnit\Framework\Error\Deprecated - * @expectedExceptionMessageRegExp /Controller::\$\w+ is deprecated(.*)/ + * @expectedExceptionMessageRegExp /^Controller::\$\w+ is deprecated(.*)/ * @dataProvider deprecatedViewPropertyProvider */ public function testDeprecatedViewPropertyGetterMessage($property, $getter, $setter, $value)