_get returns mixed not Component

cakephp · Oct 28, 2016 · b1cf698 · b1cf698
1 parent 4286ab0
commit b1cf698
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Controller/Component.php b/src/Controller/Component.php
@@ -146,7 +146,7 @@ public function initialize(array $config)
      * Magic method for lazy loading $components.
      *
      * @param string $name Name of component to get.
-     * @return Component|null A Component object or null.
+     * @return mixed A Component object or null.
      */
     public function __get($name)
     {

diff --git a/tests/TestCase/Controller/ComponentTest.php b/tests/TestCase/Controller/ComponentTest.php
@@ -13,18 +13,18 @@
  */
 namespace Cake\Test\TestCase\Controller;
 
-use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Component\CookieComponent;
+use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\EventManager;
 use Cake\TestSuite\TestCase;
-use TestApp\Controller\ComponentTestController;
 use TestApp\Controller\Component\AppleComponent;
 use TestApp\Controller\Component\BananaComponent;
 use TestApp\Controller\Component\ConfiguredComponent;
 use TestApp\Controller\Component\OrangeComponent;
 use TestApp\Controller\Component\SomethingWithCookieComponent;
+use TestApp\Controller\ComponentTestController;
 
 /**
  * ComponentTest class