Mark Scherer 9 years ago
parent
commit
c411b64b61

+ 2 - 2
src/Controller/Component/CommonComponent.php

@@ -83,10 +83,10 @@ class CommonComponent extends Component {
 			return;
 			return;
 		}
 		}
 		if (method_exists($this->Controller->{$componentName}, 'beforeFilter')) {
 		if (method_exists($this->Controller->{$componentName}, 'beforeFilter')) {
-			$this->Controller->{$componentName}->beforeFilter(new \Cake\Event\Event('Controller.initialize', $this->Controller->{$componentName}));
+			$this->Controller->{$componentName}->beforeFilter(new Event('Controller.initialize', $this->Controller->{$componentName}));
 		}
 		}
 		if (method_exists($this->Controller->{$componentName}, 'startup')) {
 		if (method_exists($this->Controller->{$componentName}, 'startup')) {
-			$this->Controller->{$componentName}->startup(new \Cake\Event\Event('Controller.startup', $this->Controller->{$componentName}));
+			$this->Controller->{$componentName}->startup(new Event('Controller.startup', $this->Controller->{$componentName}));
 		}
 		}
 	}
 	}
 
 

+ 2 - 1
src/Controller/ShuntRequestController.php

@@ -5,6 +5,7 @@ namespace Tools\Controller;
 use App\Controller\AppController;
 use App\Controller\AppController;
 use Cake\Core\Configure;
 use Cake\Core\Configure;
 use Cake\I18n\I18n;
 use Cake\I18n\I18n;
+use RuntimeException;
 
 
 /**
 /**
  * Language switching
  * Language switching
@@ -38,7 +39,7 @@ class ShuntRequestController extends AppController {
 		}
 		}
 
 
 		if (!array_key_exists($language, $allowedLanguages)) {
 		if (!array_key_exists($language, $allowedLanguages)) {
-			throw new \RuntimeException('Invalid Language');
+			throw new RuntimeException('Invalid Language');
 		}
 		}
 		$language = $allowedLanguages[$language];
 		$language = $allowedLanguages[$language];
 
 

+ 2 - 1
src/Utility/Time.php

@@ -4,6 +4,7 @@ namespace Tools\Utility;
 
 
 use Cake\Core\Configure;
 use Cake\Core\Configure;
 use Cake\I18n\Time as CakeTime;
 use Cake\I18n\Time as CakeTime;
+use DateInterval;
 
 
 /**
 /**
  * Extend CakeTime with a few important improvements:
  * Extend CakeTime with a few important improvements:
@@ -1298,7 +1299,7 @@ class Time extends CakeTime {
 		if (!$duration instanceof \DateInterval) {
 		if (!$duration instanceof \DateInterval) {
 			$d1 = new self();
 			$d1 = new self();
 			$d2 = new self();
 			$d2 = new self();
-			$d2->add(new \DateInterval('PT' . $duration . 'S'));
+			$d2->add(new DateInterval('PT' . $duration . 'S'));
 
 
 			$duration = $d2->diff($d1);
 			$duration = $d2->diff($d1);
 		}
 		}

+ 2 - 1
src/Utility/Utility.php

@@ -4,6 +4,7 @@ namespace Tools\Utility;
 
 
 use Cake\Routing\Router;
 use Cake\Routing\Router;
 use Cake\Utility\Hash;
 use Cake\Utility\Hash;
+use RuntimeException;
 
 
 /**
 /**
  * Main class for all app-wide utility methods
  * Main class for all app-wide utility methods
@@ -532,7 +533,7 @@ class Utility {
 			$keys = array_reverse($keys);
 			$keys = array_reverse($keys);
 			if (!isset($keys[0])) {
 			if (!isset($keys[0])) {
 				if ($undefinedKey === null) {
 				if ($undefinedKey === null) {
-					throw new \RuntimeException('Key-less values are not supported without $undefinedKey.');
+					throw new RuntimeException('Key-less values are not supported without $undefinedKey.');
 				}
 				}
 				$keys[0] = $undefinedKey;
 				$keys[0] = $undefinedKey;
 			}
 			}

+ 2 - 1
src/View/Helper/AuthUserHelper.php

@@ -4,6 +4,7 @@ namespace Tools\View\Helper;
 
 
 use Cake\View\Helper;
 use Cake\View\Helper;
 use Tools\Auth\AuthUserTrait;
 use Tools\Auth\AuthUserTrait;
+use RuntimeException;
 
 
 /**
 /**
  * Helper to access auth user data.
  * Helper to access auth user data.
@@ -21,7 +22,7 @@ class AuthUserHelper extends Helper {
 	 */
 	 */
 	protected function _getUser() {
 	protected function _getUser() {
 		if (!isset($this->_View->viewVars['authUser'])) {
 		if (!isset($this->_View->viewVars['authUser'])) {
-			throw new \RuntimeException('AuthUser helper needs AuthUser component to function');
+			throw new RuntimeException('AuthUser helper needs AuthUser component to function');
 		}
 		}
 		return $this->_View->viewVars['authUser'];
 		return $this->_View->viewVars['authUser'];
 	}
 	}

+ 3 - 2
src/View/Helper/TreeHelper.php

@@ -12,6 +12,7 @@ namespace Tools\View\Helper;
 
 
 use Cake\Core\Configure;
 use Cake\Core\Configure;
 use Cake\View\Helper;
 use Cake\View\Helper;
+use Exception;
 
 
 /**
 /**
  * Helper to generate tree representations of MPTT or recursively nested data.
  * Helper to generate tree representations of MPTT or recursively nested data.
@@ -214,7 +215,7 @@ class TreeHelper extends Helper {
 					$lastChild = true;
 					$lastChild = true;
 				}
 				}
 			} else {
 			} else {
-				throw new \Exception('Invalid Tree Structure');
+				throw new Exception('Invalid Tree Structure');
 			}
 			}
 
 
 			$activePathElement = null;
 			$activePathElement = null;
@@ -516,7 +517,7 @@ class TreeHelper extends Helper {
 				$subTree = $subTree->toArray();
 				$subTree = $subTree->toArray();
 			}
 			}
 			if (!isset($subTree['children'])) {
 			if (!isset($subTree['children'])) {
-				throw new \Exception('Only works with threaded (nested children) results');
+				throw new Exception('Only works with threaded (nested children) results');
 			}
 			}
 
 
 			if (!empty($path[$level]) && $subTree['id'] == $path[$level]['id']) {
 			if (!empty($path[$level]) && $subTree['id'] == $path[$level]['id']) {

+ 2 - 1
tests/TestCase/BootstrapTest.php

@@ -6,6 +6,7 @@ use Cake\Controller\Controller;
 use Cake\Network\Request;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\Network\Response;
 use Cake\Routing\Router;
 use Cake\Routing\Router;
+use DateTime;
 use Tools\TestSuite\TestCase;
 use Tools\TestSuite\TestCase;
 use Tools\View\RssView;
 use Tools\View\RssView;
 
 
@@ -18,7 +19,7 @@ class BootstrapTest extends TestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testIsEmpty() {
 	public function testIsEmpty() {
-		$result = isEmpty(new \DateTime(date(FORMAT_DB_DATE)));
+		$result = isEmpty(new DateTime(date(FORMAT_DB_DATE)));
 		$this->assertFalse($result);
 		$this->assertFalse($result);
 	}
 	}
 
 

+ 5 - 4
tests/TestCase/Controller/Component/MobileComponentTest.php

@@ -8,6 +8,7 @@ use Cake\Event\Event;
 use Cake\Network\Request;
 use Cake\Network\Request;
 use Cake\Network\Session;
 use Cake\Network\Session;
 use Cake\Routing\DispatcherFactory;
 use Cake\Routing\DispatcherFactory;
+use Detection\MobileDetect;
 use Shim\Controller\Component\Component;
 use Shim\Controller\Component\Component;
 use Tools\Controller\Controller;
 use Tools\Controller\Controller;
 use Tools\TestSuite\TestCase;
 use Tools\TestSuite\TestCase;
@@ -31,12 +32,12 @@ class MobileComponentTest extends TestCase {
 		parent::setUp();
 		parent::setUp();
 
 
 		Request::addDetector('mobile', function ($request) {
 		Request::addDetector('mobile', function ($request) {
-		    $detector = new \Detection\MobileDetect();
-		    return $detector->isMobile();
+			$detector = new MobileDetect();
+			return $detector->isMobile();
 		});
 		});
 		Request::addDetector('tablet', function ($request) {
 		Request::addDetector('tablet', function ($request) {
-		    $detector = new \Detection\MobileDetect();
-		    return $detector->isTablet();
+			$detector = new MobileDetect();
+			return $detector->isTablet();
 		});
 		});
 
 
 		$this->event = new Event('Controller.beforeFilter');
 		$this->event = new Event('Controller.beforeFilter');

+ 6 - 5
tests/TestCase/Model/Behavior/JsonableBehaviorTest.php

@@ -4,6 +4,7 @@ namespace Tools\Test\TestCase\Model\Behavior;
 
 
 use Cake\Core\Configure;
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
 use Cake\ORM\TableRegistry;
+use stdClass;
 use Tools\Model\Behavior\JsonableBehavior;
 use Tools\Model\Behavior\JsonableBehavior;
 use Tools\TestSuite\TestCase;
 use Tools\TestSuite\TestCase;
 
 
@@ -247,8 +248,8 @@ class JsonableBehaviorTest extends TestCase {
 		$this->Comments->save($entity);
 		$this->Comments->save($entity);
 
 
 		$res = $this->Comments->find('all', ['conditions' => ['title' => 'param']])->first();
 		$res = $this->Comments->find('all', ['conditions' => ['title' => 'param']])->first();
-		$obj = new \stdClass();
-		$obj->x = new \stdClass();
+		$obj = new stdClass();
+		$obj->x = new stdClass();
 		$obj->x->y = 'z';
 		$obj->x->y = 'z';
 		$expected = $obj;
 		$expected = $obj;
 		$this->assertEquals($expected, $res['details']);
 		$this->assertEquals($expected, $res['details']);
@@ -272,7 +273,7 @@ class JsonableBehaviorTest extends TestCase {
 		$this->Comments->save($entity);
 		$this->Comments->save($entity);
 
 
 		$res = $this->Comments->find('all', ['conditions' => ['title' => 'param']])->first();
 		$res = $this->Comments->find('all', ['conditions' => ['title' => 'param']])->first();
-		$obj = new \stdClass();
+		$obj = new stdClass();
 		$obj->y = 'yy';
 		$obj->y = 'yy';
 		$expected = $obj;
 		$expected = $obj;
 		$this->assertEquals($expected, $res['details']);
 		$this->assertEquals($expected, $res['details']);
@@ -316,8 +317,8 @@ class JsonableBehaviorTest extends TestCase {
 
 
 		// Test decode with default params
 		// Test decode with default params
 		$res = $this->Comments->find('all', ['conditions' => ['title' => 'param']])->first();
 		$res = $this->Comments->find('all', ['conditions' => ['title' => 'param']])->first();
-		$obj = new \stdClass();
-		$obj->x = new \stdClass();
+		$obj = new stdClass();
+		$obj->x = new stdClass();
 		$obj->x->y = 'z';
 		$obj->x->y = 'z';
 		$expected = $obj;
 		$expected = $obj;
 		$this->assertEquals($expected, $res['details']);
 		$this->assertEquals($expected, $res['details']);

+ 4 - 3
tests/TestCase/Utility/TimeTest.php

@@ -3,6 +3,7 @@
 namespace Tools\TestCase\Utility;
 namespace Tools\TestCase\Utility;
 
 
 use Cake\Core\Configure;
 use Cake\Core\Configure;
+use DateTime;
 use Tools\Misc\ZodiacLib;
 use Tools\Misc\ZodiacLib;
 use Tools\TestSuite\TestCase;
 use Tools\TestSuite\TestCase;
 use Tools\Utility\Time;
 use Tools\Utility\Time;
@@ -1013,8 +1014,8 @@ class TimeTest extends TestCase {
 		}
 		}
 
 
 		// using DateTime interval
 		// using DateTime interval
-		$datetime1 = new \DateTime('2009-10-11 13:13:13');
-		$datetime2 = new \DateTime('2009-10-12 13:13:15');
+		$datetime1 = new DateTime('2009-10-11 13:13:13');
+		$datetime2 = new DateTime('2009-10-12 13:13:15');
 		$interval = $datetime1->diff($datetime2);
 		$interval = $datetime1->diff($datetime2);
 		$result = $this->Time->buildTime($interval, 'H:MM:SS');
 		$result = $this->Time->buildTime($interval, 'H:MM:SS');
 		$this->assertEquals('24:00:02', $result);
 		$this->assertEquals('24:00:02', $result);
@@ -1126,7 +1127,7 @@ class TimeTest extends TestCase {
 		$this->assertTrue(isset($location['latitude']));
 		$this->assertTrue(isset($location['latitude']));
 		$this->assertTrue(isset($location['longitude']));
 		$this->assertTrue(isset($location['longitude']));
 
 
-		$offset = $timezone->getOffset(new \DateTime('@' . mktime(0, 0, 0, 1, 1, date('Y'))));
+		$offset = $timezone->getOffset(new DateTime('@' . mktime(0, 0, 0, 1, 1, date('Y'))));
 		//$this->debug($offset);
 		//$this->debug($offset);
 
 
 		$phpTimezone = date_default_timezone_get();
 		$phpTimezone = date_default_timezone_get();

+ 3 - 2
tests/TestCase/View/Helper/TimelineHelperTest.php

@@ -4,6 +4,7 @@ namespace Tools\TestCase\View\Helper;
 
 
 use Cake\Core\Configure;
 use Cake\Core\Configure;
 use Cake\View\View;
 use Cake\View\View;
+use DateTime;
 use Tools\TestSuite\TestCase;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\TimelineHelper;
 use Tools\View\Helper\TimelineHelper;
 
 
@@ -61,12 +62,12 @@ class TimelineHelperTest extends TestCase {
 	public function testFinalize() {
 	public function testFinalize() {
 		$this->testAddItem();
 		$this->testAddItem();
 		$data = [
 		$data = [
-			'start' => new \DateTime(),
+			'start' => new DateTime(),
 			'content' => '',
 			'content' => '',
 		];
 		];
 		$this->Timeline->addItem($data);
 		$this->Timeline->addItem($data);
 		$data = [
 		$data = [
-			'start' => new \DateTime(date(FORMAT_DB_DATE)),
+			'start' => new DateTime(date(FORMAT_DB_DATE)),
 			'content' => '',
 			'content' => '',
 		];
 		];
 		$this->Timeline->addItem($data);
 		$this->Timeline->addItem($data);