Remove unneeded use statements.

src/Controller/Component/CommonComponent.php

@@ -5,7 +5,6 @@ namespace Tools\Controller\Component;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Routing\Router;
-use Cake\Utility\Inflector;
 use Shim\Controller\Component\Component;
 use Tools\Utility\Utility;
 

src/Controller/Component/MobileComponent.php

@@ -7,7 +7,6 @@ use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Routing\Router;
 use Shim\Controller\Component\Component;
-use Tools\Utility\Utility;
 
 /**
  * A component to easily store mobile in session and serve mobile views to users.

src/Database/Type/ArrayType.php

@@ -2,9 +2,7 @@
 
 namespace Tools\Database\Type;
 
-use Cake\Database\Driver;
 use Cake\Database\Type;
-use PDO;
 
 /**
  * Do not convert input on marshal().

src/Error/ErrorHandler.php

@@ -2,7 +2,6 @@
 
 namespace Tools\Error;
 
-use Cake\Core\Configure;
 use Cake\Error\ErrorHandler as CoreErrorHandler;
 use Cake\Log\Log;
 use Exception;

src/Model/Behavior/ConfirmableBehavior.php

@@ -2,12 +2,8 @@
 
 namespace Tools\Model\Behavior;
 
-use ArrayObject;
-use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
-use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;
 

src/Model/Behavior/JsonableBehavior.php

@@ -4,7 +4,6 @@ namespace Tools\Model\Behavior;
 
 use ArrayObject;
 use Cake\Database\Type;
-use Cake\Datasource\ResultSetInterface;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;

src/Model/Behavior/NeighborBehavior.php

@@ -3,7 +3,6 @@
 namespace Tools\Model\Behavior;
 
 use Cake\ORM\Behavior;
-use Cake\ORM\Query;
 use Cake\Utility\Hash;
 use InvalidArgumentException;
 

src/Model/Behavior/ResetBehavior.php

@@ -4,7 +4,6 @@ namespace Tools\Model\Behavior;
 
 use Cake\Core\Configure;
 use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Exception;
 

src/Model/Behavior/SluggedBehavior.php

@@ -3,14 +3,12 @@
 namespace Tools\Model\Behavior;
 
 use Cake\Core\Configure;
-use Cake\Error\Exception;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\Utility\Inflector;
-use Exception as PhpException;
 use InvalidArgumentException;
 
 /**
@@ -128,11 +126,11 @@ class SluggedBehavior extends Behavior {
 				if (strpos($field, '.')) {
 					list($alias, $field) = explode('.', $field);
 					if (!$this->_table->$alias->hasField($field)) {
-						throw new PhpException('(SluggedBehavior::setup) model ' . $this->_table->$alias->name . ' is missing the field ' . $field .
+						throw new Exception('(SluggedBehavior::setup) model ' . $this->_table->$alias->name . ' is missing the field ' . $field .
 							' (specified in the setup for model ' . $this->_table->name . ') ');
 					}
 				} elseif (!$this->_table->hasField($field) && !method_exists($this->_table->entityClass(), '_get' . Inflector::classify($field))) {
-					throw new PhpException('(SluggedBehavior::setup) model ' . $this->_table->name . ' is missing the field ' . $field . ' specified in the setup.');
+					throw new Exception('(SluggedBehavior::setup) model ' . $this->_table->name . ' is missing the field ' . $field . ' specified in the setup.');
 				}
 			}
 		}
@@ -296,7 +294,7 @@ class SluggedBehavior extends Behavior {
 		}
 		if ($this->_config['unique']) {
 			if (!$entity) {
-				throw new PhpException('Needs an Entity to work on');
+				throw new Exception('Needs an Entity to work on');
 			}
 			$field = $this->_table->alias() . '.' . $this->_config['field'];
 			$conditions = [$field => $slug];
@@ -337,7 +335,7 @@ class SluggedBehavior extends Behavior {
 	 */
 	public function resetSlugs($params = []) {
 		if (!$this->_table->hasField($this->_config['field'])) {
-			throw new PhpException('Table does not have field ' . $this->_config['field']);
+			throw new Exception('Table does not have field ' . $this->_config['field']);
 		}
 		$defaults = [
 			'page' => 1,
@@ -363,7 +361,7 @@ class SluggedBehavior extends Behavior {
 					'fieldList' => array_merge([$this->_table->primaryKey(), $this->_config['field']], $this->_config['label'])
 				];
 				if (!$this->_table->save($record, $options)) {
-					throw new PhpException(print_r($this->_table->errors(), true));
+					throw new Exception(print_r($this->_table->errors(), true));
 				}
 			}
 			$params['page']++;

src/Model/Behavior/StringBehavior.php

@@ -3,13 +3,11 @@
 namespace Tools\Model\Behavior;
 
 use ArrayObject;
-use Cake\Database\Type;
 use Cake\Datasource\ResultSetInterface;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
-use Tools\Utility\Text;
 
 /**
  * A behavior that will apply basic string operations for your input.

src/Model/Table/Table.php

@@ -2,13 +2,8 @@
 
 namespace Tools\Model\Table;
 
-use Cake\Core\Configure;
-use Cake\Event\Event;
-use Cake\ORM\Query;
 use Cake\Routing\Router;
-use Cake\Utility\Inflector;
 use Cake\Validation\Validation;
-use Cake\Validation\Validator;
 use Shim\Model\Table\Table as ShimTable;
 use Tools\Utility\Time;
 use Tools\Utility\Utility;

src/TestSuite/IntegrationTestCase.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestSuite;
 
-use Cake\Routing\Router;
 use Cake\TestSuite\IntegrationTestCase as CakeIntegrationTestCase;
 
 /**

src/View/Helper/AuthUserHelper.php

@@ -3,8 +3,8 @@
 namespace Tools\View\Helper;
 
 use Cake\View\Helper;
-use Tools\Auth\AuthUserTrait;
 use RuntimeException;
+use Tools\Auth\AuthUserTrait;
 
 /**
  * Helper to access auth user data.

src/View/Helper/GravatarHelper.php

@@ -4,7 +4,6 @@ namespace Tools\View\Helper;
 
 use Cake\Validation\Validation;
 use Cake\View\Helper;
-use Cake\View\View;
 
 /**
  * CakePHP Gravatar Helper

src/View/Helper/HtmlHelper.php

@@ -15,11 +15,7 @@
 
 namespace Tools\View\Helper;
 
-use Cake\Core\Configure;
-use Cake\Network\Response;
 use Cake\View\Helper\HtmlHelper as CoreHtmlHelper;
-use Cake\View\StringTemplateTrait;
-use Cake\View\View;
 
 /**
  * Html Helper class for easy use of HTML widgets.

src/View/Helper/TimelineHelper.php

@@ -3,7 +3,6 @@
 namespace Tools\View\Helper;
 
 use Cake\View\Helper;
-use Cake\View\View;
 
 /**
  * TimelineHelper for easy output of a timeline with multiple items.

src/View/Helper/UrlHelper.php

@@ -15,11 +15,7 @@
 
 namespace Tools\View\Helper;
 
-use Cake\Core\Configure;
-use Cake\Network\Response;
 use Cake\View\Helper\UrlHelper as CoreUrlHelper;
-use Cake\View\StringTemplateTrait;
-use Cake\View\View;
 
 /**
  * Url Helper class.

tests/TestApp/Controller/Component/AppleComponent.php

@@ -2,7 +2,6 @@
 
 namespace TestApp\Controller\Component;
 
-use Cake\Controller\Controller;
 use Cake\Event\Event;
 use Shim\Controller\Component\Component;
 

tests/TestApp/Controller/Component/BananaComponent.php

@@ -2,7 +2,6 @@
 
 namespace TestApp\Controller\Component;
 
-use Cake\Controller\Controller;
 use Cake\Event\Event;
 use Shim\Controller\Component\Component;
 

tests/TestCase/BootstrapTest.php

@@ -2,13 +2,8 @@
 
 namespace Tools\Test\TestCase;
 
-use Cake\Controller\Controller;
-use Cake\Network\Request;
-use Cake\Network\Response;
-use Cake\Routing\Router;
 use DateTime;
 use Tools\TestSuite\TestCase;
-use Tools\View\RssView;
 
 /**
  * RssViewTest

tests/TestCase/Controller/Component/AuthUserComponentTest.php

@@ -4,9 +4,7 @@ namespace Tools\Test\TestCase\Controller\Component;
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;
-use Cake\Core\Configure;
 use Cake\Network\Request;
-use Cake\Network\Session;
 use Tools\Controller\Component\AuthUserComponent;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -2,14 +2,10 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Component\CommonComponent;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Network\Request;
 use Cake\Network\Session;
-use Cake\Routing\DispatcherFactory;
-use Shim\Controller\Component\Component;
 use Tools\TestSuite\TestCase;
 
 /**

tests/TestCase/Controller/Component/FlashComponentTest.php

@@ -2,14 +2,9 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\Event;
-use Cake\Network\Request;
-use Cake\Network\Session;
-use Cake\Routing\DispatcherFactory;
-use Shim\Controller\Component\Component;
 use Tools\TestSuite\TestCase;
 
 /**

tests/TestCase/Controller/Component/MobileComponentTest.php

@@ -2,14 +2,10 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use Cake\Controller\ComponentRegistry;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Network\Request;
-use Cake\Network\Session;
-use Cake\Routing\DispatcherFactory;
 use Detection\MobileDetect;
-use Shim\Controller\Component\Component;
 use Tools\Controller\Controller;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Controller/ControllerTest.php

@@ -2,13 +2,8 @@
 
 namespace Tools\Test\TestCase\Controller;
 
-use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Component\CommonComponent;
 use Cake\Core\Configure;
-use Cake\Network\Request;
-use Cake\Network\Session;
 use Cake\ORM\TableRegistry;
-use Shim\Controller\Component\Component;
 use Tools\Controller\Controller;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Form/ContactFormTest.php

@@ -2,18 +2,7 @@
 
 namespace Tools\Form;
 
-use Cake\Auth\DefaultPasswordHasher;
-use Cake\Auth\PasswordHasherFactory;
 use Cake\Core\Configure;
-use Cake\Datasource\ConnectionManager;
-use Cake\I18n\Time;
-use Cake\Network\Request;
-use Cake\ORM\Entity;
-use Cake\ORM\Query;
-use Cake\ORM\Table;
-use Cake\ORM\TableRegistry;
-use Cake\Routing\Router;
-use Cake\Utility\Security;
 use Tools\Form\ContactForm;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/HtmlDom/HtmlDomTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\HtmlDom;
 
-use Cake\Core\Configure;
 use Tools\HtmlDom\HtmlDom;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php

@@ -3,11 +3,8 @@
 namespace Tools\Test\TestCase\Model\Behavior;
 
 use Cake\Core\Configure;
-use Cake\Database\Query;
-use Cake\Event\Event;
 use Cake\ORM\TableRegistry;
 use TestApp\Model\Entity\BitmaskedComment;
-use Tools\Model\Behavior\BitmaskedBehavior;
 use Tools\TestSuite\TestCase;
 
 class BitmaskedBehaviorTest extends TestCase {

tests/TestCase/Model/Behavior/ConfirmableBehaviorTest.php

@@ -3,7 +3,6 @@
 namespace Tools\Test\TestCase\Model\Behavior;
 
 use Cake\ORM\TableRegistry;
-use Tools\Model\Behavior\ConfirmableBehavior;
 use Tools\TestSuite\TestCase;
 
 class ConfirmableBehaviorTest extends TestCase {

tests/TestCase/Model/Behavior/JsonableBehaviorTest.php

@@ -5,7 +5,6 @@ namespace Tools\Test\TestCase\Model\Behavior;
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
 use stdClass;
-use Tools\Model\Behavior\JsonableBehavior;
 use Tools\TestSuite\TestCase;
 
 class JsonableBehaviorTest extends TestCase {

tests/TestCase/Model/Behavior/NeighborBehaviorTest.php

@@ -2,9 +2,7 @@
 
 namespace Tools\Model\Behavior;
 
-use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
-use Tools\Model\Behavior\NeighborBehavior;
 use Tools\Model\Table\Table;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

@@ -2,17 +2,11 @@
 
 namespace Tools\Test\TestCase\Model\Behavior;
 
-use Cake\Auth\DefaultPasswordHasher;
 use Cake\Auth\PasswordHasherFactory;
 use Cake\Core\Configure;
 use Cake\Network\Request;
-use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
-use Cake\ORM\Query;
-use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
-use Cake\Utility\Security;
 use Tools\TestSuite\TestCase;
 
 class PasswordableBehaviorTest extends TestCase {

tests/TestCase/Model/Behavior/ResetBehaviorTest.php

@@ -4,7 +4,6 @@ namespace Tools\Model\Behavior;
 
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
-use Tools\Model\Behavior\ResetBehavior;
 use Tools\Model\Table\Table;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -3,11 +3,7 @@
 namespace Tools\Test\TestCase\Model\Behavior;
 
 use Cake\Core\Configure;
-use Cake\Database\Query;
-use Cake\Datasource\ConnectionManager;
-use Cake\Event\Event;
 use Cake\ORM\Entity;
-use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Model/Behavior/StringBehaviorTest.php

@@ -2,9 +2,7 @@
 
 namespace Tools\Test\TestCase\Model\Behavior;
 
-use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
-use Tools\Model\Behavior\StringBehavior;
 use Tools\TestSuite\TestCase;
 
 class StringBehaviorTest extends TestCase {

tests/TestCase/Model/Entity/EntityTest.php

@@ -3,8 +3,6 @@
 namespace Tools\Model\Entity;
 
 use Cake\Core\Configure;
-use Cake\ORM\Query;
-use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Tools\Model\Entity\Entity;
 use Tools\TestSuite\TestCase;

tests/TestCase/Model/Table/TableTest.php

@@ -2,19 +2,10 @@
 
 namespace Tools\Model\Table;
 
-use Cake\Auth\DefaultPasswordHasher;
-use Cake\Auth\PasswordHasherFactory;
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
 use Cake\I18n\Time;
-use Cake\Network\Request;
-use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
-use Cake\ORM\Query;
-use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
-use Cake\Routing\Router;
-use Cake\Utility\Security;
 use Tools\TestSuite\TestCase;
 
 class TableTest extends TestCase {

tests/TestCase/Model/Table/TokensTableTest.php

@@ -3,7 +3,6 @@
 namespace Tools\Test\Model\Table;
 
 use Cake\ORM\TableRegistry;
-use Tools\Model\Table\TokensTable;
 use Tools\TestSuite\TestCase;
 
 class TokensTableTest extends TestCase {

tests/TestCase/Shell/InflectShellTest.php

@@ -3,7 +3,6 @@
 namespace Tools\Test\TestCase\Shell;
 
 use Cake\Console\ConsoleIo;
-use Tools\Shell\InflectShell;
 use Tools\TestSuite\ConsoleOutput;
 use Tools\TestSuite\TestCase;
 

tests/TestCase/Utility/NumberTest.php

@@ -2,8 +2,6 @@
 
 namespace Tools\TestCase\Utility;
 
-use Cake\Core\Configure;
-use Cake\I18n\I18n;
 use Tools\TestSuite\TestCase;
 use Tools\Utility\Number;
 

tests/TestCase/View/Helper/AuthUserHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\Test\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\AuthUserHelper;

tests/TestCase/View/Helper/CommonHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\Routing\Router;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;

tests/TestCase/View/Helper/CookieHelperTest.php

@@ -2,11 +2,7 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Datasource\ConnectionManager;
-use Cake\Network\Request;
-use Cake\ORM\Entity;
 use Cake\ORM\Table;
-use Cake\ORM\TableRegistry;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\CookieHelper;

tests/TestCase/View/Helper/FlashHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\Routing\Router;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;

tests/TestCase/View/Helper/FormHelperTest.php

@@ -3,7 +3,6 @@
 namespace Tools\TestCase\View\Helper;
 
 use Cake\Core\Configure;
-use Cake\Routing\Router;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\FormHelper;

tests/TestCase/View/Helper/GravatarHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\GravatarHelper;

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -2,13 +2,11 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Network\Request;
 use Cake\Routing\Router;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
-use Tools\Utility\Time;
 use Tools\View\Helper\HtmlHelper;
 
 /**

tests/TestCase/View/Helper/JsHelperTest.php

@@ -2,9 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
-use Cake\Datasource\ConnectionManager;
-use Cake\ORM\TableRegistry;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\JsHelper;

tests/TestCase/View/Helper/ObsfuscateHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\ObfuscateHelper;

tests/TestCase/View/Helper/TextHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\Utility\Text;

tests/TestCase/View/Helper/TimeHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\Utility\Time;

tests/TestCase/View/Helper/TimelineHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\View\View;
 use DateTime;
 use Tools\TestSuite\TestCase;

tests/TestCase/View/Helper/TreeHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;

tests/TestCase/View/Helper/UrlHelperTest.php

@@ -2,12 +2,10 @@
 
 namespace Tools\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\Network\Request;
 use Cake\Routing\Router;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
-use Tools\Utility\Time;
 use Tools\View\Helper\UrlHelper;
 
 /**