From 7b673e40a837d86a7b6eb862425eb9693c09f9dd Mon Sep 17 00:00:00 2001
From: thinkingmedia <mathew@thinkingmedia.ca>
Date: Fri, 28 Oct 2016 12:00:24 -0400
Subject: [PATCH] swap returns

---
 src/Controller/Component.php                | 6 +++---
 tests/TestCase/Controller/ComponentTest.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Controller/Component.php b/src/Controller/Component.php
index 61742b008a2..650771dc98f 100644
--- a/src/Controller/Component.php
+++ b/src/Controller/Component.php
@@ -154,11 +154,11 @@ public function __get($name)
             $config = (array)$this->_componentMap[$name]['config'] + ['enabled' => false];
             $this->{$name} = $this->_registry->load($this->_componentMap[$name]['class'], $config);
         }
-        if (isset($this->{$name})) {
-            return $this->{$name};
+        if (!isset($this->{$name})) {
+            return null;
         }
 
-        return null;
+        return $this->{$name};
     }
 
     /**
diff --git a/tests/TestCase/Controller/ComponentTest.php b/tests/TestCase/Controller/ComponentTest.php
index 013d320bc08..cad5469b898 100644
--- a/tests/TestCase/Controller/ComponentTest.php
+++ b/tests/TestCase/Controller/ComponentTest.php
@@ -13,18 +13,18 @@
  */
 namespace Cake\Test\TestCase\Controller;
 
-use Cake\Controller\Component\CookieComponent;
 use Cake\Controller\ComponentRegistry;
+use Cake\Controller\Component\CookieComponent;
 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