Browse Source

remove forgotten text/fix regex

saeid 8 years ago
parent
commit
69f26e4a58
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/Controller/Controller.php
  2. 2 2
      tests/TestCase/Controller/ControllerTest.php

+ 1 - 1
src/Controller/Controller.php

@@ -343,7 +343,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
         ];
         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}();
         }

+ 2 - 2
tests/TestCase/Controller/ControllerTest.php

@@ -1115,7 +1115,7 @@ class ControllerTest extends TestCase
      * @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 @@ class ControllerTest extends TestCase
      * @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)