From 4286ab017ec176319387bcd1a8b0fffcad0a1852 Mon Sep 17 00:00:00 2001
From: thinkingmedia <mathew@thinkingmedia.ca>
Date: Fri, 28 Oct 2016 11:21:36 -0400
Subject: [PATCH] C:/Program Files/Git/ should not be part of use sort order

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

diff --git a/src/Controller/Component.php b/src/Controller/Component.php
index e4430847dab..641d986595a 100644
--- a/src/Controller/Component.php
+++ b/src/Controller/Component.php
@@ -157,6 +157,7 @@ public function __get($name)
         if (isset($this->{$name})) {
             return $this->{$name};
         }
+
         return null;
     }
 
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