ソースを参照

_get returns mixed not Component

thinkingmedia 9 年 前
コミット
b1cf6982ae

+ 1 - 1
src/Controller/Component.php

@@ -146,7 +146,7 @@ class Component implements EventListenerInterface
      * Magic method for lazy loading $components.
      * Magic method for lazy loading $components.
      *
      *
      * @param string $name Name of component to get.
      * @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)
     public function __get($name)
     {
     {

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

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