Merge pull request #8370 from cakephp/namespace-cleanup

3.2 import cleanup in test suite
cakephp · Feb 27, 2016 · 94e84db · 94e84db
2 parents b615cb1 + 2b70af9
commit 94e84db
Show file tree

Hide file tree

Showing 102 changed files with 3 additions and 177 deletions.
diff --git a/src/I18n/RelativeTimeFormatter.php b/src/I18n/RelativeTimeFormatter.php
@@ -303,7 +303,7 @@ public function dateAgoInWords(DatetimeInterface $date, array $options = [])
         }
 
         $diffData = $this->_diffData($futureTime, $pastTime, $backwards, $options);
-        list($fNum, $fWord, $years, $months, $weeks, $days, $hours, $minutes, $seconds) = array_values($diffData);
+        list($fNum, $fWord, $years, $months, $weeks, $days) = array_values($diffData);
 
         $relativeDate = [];
         if ($fNum >= 1 && $years > 0) {

diff --git a/src/Network/Socket.php b/src/Network/Socket.php
@@ -324,7 +324,7 @@ public function write($data)
             }
         }
         $totalBytes = strlen($data);
-        for ($written = 0, $rv = 0; $written < $totalBytes; $written += $rv) {
+        for ($written = 0; $written < $totalBytes; $written += $rv) {
             $rv = fwrite($this->connection, substr($data, $written));
             if ($rv === false || $rv === 0) {
                 return $written;

diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -977,7 +977,6 @@ protected function _addDefaultFields()
     protected function _addDefaultSelectTypes()
     {
         $typeMap = $this->typeMap()->defaults();
-        $selectTypeMap = $this->selectTypeMap();
         $select = $this->clause('select');
         $types = [];
 

diff --git a/src/TestSuite/TestCase.php b/src/TestSuite/TestCase.php
@@ -481,7 +481,6 @@ protected function _assertAttributes($assertions, $string, $fullDebug = false, $
     {
         $asserts = $assertions['attrs'];
         $explains = $assertions['explains'];
-        $len = count($asserts);
         do {
             $matches = false;
             foreach ($asserts as $j => $assert) {

diff --git a/tests/TestCase/Auth/BasicAuthenticateTest.php b/tests/TestCase/Auth/BasicAuthenticateTest.php
@@ -18,10 +18,8 @@
 use Cake\I18n\Time;
 use Cake\Network\Exception\UnauthorizedException;
 use Cake\Network\Request;
-use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Security;
 
 /**
  * Test case for BasicAuthentication

diff --git a/tests/TestCase/Auth/DigestAuthenticateTest.php b/tests/TestCase/Auth/DigestAuthenticateTest.php
@@ -20,7 +20,6 @@
 use Cake\I18n\Time;
 use Cake\Network\Exception\UnauthorizedException;
 use Cake\Network\Request;
-use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 

diff --git a/tests/TestCase/Auth/FormAuthenticateTest.php b/tests/TestCase/Auth/FormAuthenticateTest.php
@@ -15,8 +15,6 @@
 namespace Cake\Test\TestCase\Auth;
 
 use Cake\Auth\FormAuthenticate;
-use Cake\Cache\Cache;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\I18n\Time;

diff --git a/tests/TestCase/BasicsTest.php b/tests/TestCase/BasicsTest.php
@@ -16,12 +16,8 @@
  */
 namespace Cake\Test\TestCase;
 
-use Cake\Cache\Cache;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Event\EventManager;
-use Cake\Filesystem\Folder;
-use Cake\Log\Log;
 use Cake\Network\Response;
 use Cake\TestSuite\TestCase;
 

diff --git a/tests/TestCase/Cache/CacheTest.php b/tests/TestCase/Cache/CacheTest.php
@@ -17,7 +17,6 @@
 use Cake\Cache\Cache;
 use Cake\Cache\CacheRegistry;
 use Cake\Cache\Engine\FileEngine;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Collection/Iterator/SortIteratorTest.php b/tests/TestCase/Collection/Iterator/SortIteratorTest.php
@@ -16,7 +16,6 @@
 
 use ArrayObject;
 use Cake\Collection\Iterator\SortIterator;
-use Cake\I18n\Time;
 use Cake\TestSuite\TestCase;
 
 /**

diff --git a/tests/TestCase/Console/ConsoleErrorHandlerTest.php b/tests/TestCase/Console/ConsoleErrorHandlerTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Console;
 
-use Cake\Console\ConsoleErrorHandler;
 use Cake\Controller\Exception\MissingActionException;
 use Cake\Core\Exception\Exception;
 use Cake\Log\Log;

diff --git a/tests/TestCase/Console/HelpFormatterTest.php b/tests/TestCase/Console/HelpFormatterTest.php
@@ -19,7 +19,6 @@
 use Cake\Console\ConsoleOptionParser;
 use Cake\Console\HelpFormatter;
 use Cake\TestSuite\TestCase;
-use \DOMDocument as DomDocument;
 
 /**
  * Class HelpFormatterTest

diff --git a/tests/TestCase/Console/ShellDispatcherTest.php b/tests/TestCase/Console/ShellDispatcherTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Console;
 
 use Cake\Console\ShellDispatcher;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Console/ShellTest.php b/tests/TestCase/Console/ShellTest.php
@@ -17,13 +17,10 @@
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
 use Cake\Console\Shell;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Filesystem\Folder;
-use Cake\Log\Log;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Hash;
 use TestApp\Shell\TestingDispatchShell;
 
 /**

diff --git a/tests/TestCase/Console/TaskRegistryTest.php b/tests/TestCase/Console/TaskRegistryTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Console;
 
 use Cake\Console\TaskRegistry;
-use Cake\Core\App;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 

diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php
@@ -14,19 +14,13 @@
  */
 namespace Cake\Test\TestCase\Controller\Component;
 
-use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Component\AuthComponent;
-use Cake\Controller\Controller;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Event\EventManager;
-use Cake\Network\Exception\ForbiddenException;
-use Cake\Network\Exception\UnauthorizedException;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\Network\Session;
-use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Controller/Component/CookieComponentTest.php b/tests/TestCase/Controller/Component/CookieComponentTest.php
@@ -16,8 +16,6 @@
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Component\CookieComponent;
-use Cake\Controller\Controller;
-use Cake\Event\Event;
 use Cake\I18n\Time;
 use Cake\Network\Request;
 use Cake\Network\Response;

diff --git a/tests/TestCase/Controller/Component/PaginatorComponentTest.php b/tests/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -23,7 +23,6 @@
 use Cake\Network\Request;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Hash;
 
 /**
  * PaginatorTestController class

diff --git a/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php b/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php
@@ -16,12 +16,9 @@
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Component\RequestHandlerComponent;
-use Cake\Controller\Controller;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Network\Request;
-use Cake\Network\Response;
 use Cake\Routing\DispatcherFactory;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Controller/ComponentRegistryTest.php b/tests/TestCase/Controller/ComponentRegistryTest.php
@@ -18,7 +18,6 @@
 use Cake\Controller\Component\AuthComponent;
 use Cake\Controller\Component\CookieComponent;
 use Cake\Controller\Controller;
-use Cake\Core\App;
 use Cake\Core\Plugin;
 use Cake\Network\Request;
 use Cake\Network\Response;

diff --git a/tests/TestCase/Controller/ComponentTest.php b/tests/TestCase/Controller/ComponentTest.php
@@ -21,7 +21,6 @@
 use Cake\TestSuite\TestCase;
 use TestApp\Controller\ComponentTestController;
 use TestApp\Controller\Component\AppleComponent;
-use TestApp\Controller\Component\OrangeComponent;
 
 /**
  * ComponentTest class

diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -16,7 +16,6 @@
 
 use Cake\Controller\Component;
 use Cake\Controller\Controller;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Event\Event;
@@ -26,7 +25,6 @@
 use Cake\Routing\Router;
 use Cake\TestSuite\Fixture\TestModel;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Hash;
 use TestApp\Controller\Admin\PostsController;
 use TestPlugin\Controller\TestPluginController;
 

diff --git a/tests/TestCase/Core/Configure/Engine/IniConfigTest.php b/tests/TestCase/Core/Configure/Engine/IniConfigTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Core\Configure\Engine;
 
-use Cake\Core\App;
 use Cake\Core\Configure\Engine\IniConfig;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Core/Configure/Engine/JsonConfigTest.php b/tests/TestCase/Core/Configure/Engine/JsonConfigTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Core\Configure\Engine;
 
-use Cake\Core\App;
 use Cake\Core\Configure\Engine\JsonConfig;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Core/Configure/Engine/PhpConfigTest.php b/tests/TestCase/Core/Configure/Engine/PhpConfigTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Core\Configure\Engine;
 
-use Cake\Core\App;
 use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Core/ConfigureTest.php b/tests/TestCase/Core/ConfigureTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Core;
 
 use Cake\Cache\Cache;
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Core\Plugin;

diff --git a/tests/TestCase/Core/PluginTest.php b/tests/TestCase/Core/PluginTest.php
@@ -13,7 +13,6 @@
  */
 namespace Cake\Test\TestCase\Core;
 
-use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Core/StaticConfigTraitTest.php b/tests/TestCase/Core/StaticConfigTraitTest.php
@@ -15,7 +15,6 @@
 
 use Cake\Core\StaticConfigTrait;
 use Cake\TestSuite\TestCase;
-use PHPUnit_Framework_Test;
 
 /**
  * TestConnectionManagerStaticConfig

diff --git a/tests/TestCase/Database/Driver/MysqlTest.php b/tests/TestCase/Database/Driver/MysqlTest.php
@@ -15,8 +15,6 @@
 namespace Cake\Test\TestCase\Database\Driver;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
-use Cake\Database\Driver\Mysql;
 use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
 use \PDO;

diff --git a/tests/TestCase/Database/Driver/PostgresTest.php b/tests/TestCase/Database/Driver/PostgresTest.php
@@ -15,10 +15,6 @@
 namespace Cake\Test\TestCase\Database\Driver;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
-use Cake\Database\Driver\Postgres;
-use Cake\Database\Query;
-use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
 use \PDO;
 

diff --git a/tests/TestCase/Database/Driver/SqliteTest.php b/tests/TestCase/Database/Driver/SqliteTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Database\Driver;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
 use Cake\Database\Driver\Sqlite;
 use Cake\Testsuite\TestCase;
 use \PDO;

diff --git a/tests/TestCase/Database/Driver/SqlserverTest.php b/tests/TestCase/Database/Driver/SqlserverTest.php
@@ -15,9 +15,6 @@
 namespace Cake\Test\TestCase\Database\Driver;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
-use Cake\Database\Driver\Sqlserver;
-use Cake\Database\Query;
 use Cake\TestSuite\TestCase;
 use \PDO;
 

diff --git a/tests/TestCase/Database/Expression/QueryExpressionTest.php b/tests/TestCase/Database/Expression/QueryExpressionTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Database\Expression;
 
-use Cake\Database\Expression\CaseExpression;
 use Cake\Database\Expression\QueryExpression;
 use Cake\Database\ValueBinder;
 use Cake\TestSuite\TestCase;

diff --git a/tests/TestCase/Database/Log/LoggingStatementTest.php b/tests/TestCase/Database/Log/LoggingStatementTest.php
@@ -16,7 +16,6 @@
 
 use Cake\Database\Log\LoggingStatement;
 use Cake\TestSuite\TestCase;
-use PDOStatement;
 
 /**
  * Tests LoggingStatement class

diff --git a/tests/TestCase/Database/Schema/CollectionTest.php b/tests/TestCase/Database/Schema/CollectionTest.php
@@ -16,9 +16,7 @@
 
 use Cake\Cache\Cache;
 use Cake\Core\Configure;
-use Cake\Database\Connection;
 use Cake\Database\Schema\Collection;
-use Cake\Database\Schema\Table;
 use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
 

diff --git a/tests/TestCase/Database/Statement/StatementDecoratorTest.php b/tests/TestCase/Database/Statement/StatementDecoratorTest.php
@@ -16,7 +16,6 @@
 
 use Cake\Database\Statement\StatementDecorator;
 use Cake\TestSuite\TestCase;
-use \PDO;
 
 /**
  * Tests StatementDecorator class

diff --git a/tests/TestCase/Database/Type/BinaryTypeTest.php b/tests/TestCase/Database/Type/BinaryTypeTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Database\Type;
 
 use Cake\Database\Type;
-use Cake\Database\Type\BinaryType;
 use Cake\TestSuite\TestCase;
 use \PDO;
 

diff --git a/tests/TestCase/Database/Type/IntegerTypeTest.php b/tests/TestCase/Database/Type/IntegerTypeTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Database\Type;
 
 use Cake\Database\Type;
-use Cake\Database\Type\IntegerType;
 use Cake\TestSuite\TestCase;
 use \PDO;
 

diff --git a/tests/TestCase/Database/Type/UuidTypeTest.php b/tests/TestCase/Database/Type/UuidTypeTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Database\Type;
 
 use Cake\Database\Type;
-use Cake\Database\Type\UuidType;
 use Cake\TestSuite\TestCase;
 use \PDO;
 

diff --git a/tests/TestCase/Datasource/ConnectionManagerTest.php b/tests/TestCase/Datasource/ConnectionManagerTest.php
@@ -11,9 +11,7 @@
  */
 namespace Cake\Test\TestCase\Datasource;
 
-use Cake\Core\App;
 use Cake\Core\Plugin;
-use Cake\Database\Driver\Sqlite;
 use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
 

diff --git a/tests/TestCase/Error/DebuggerTest.php b/tests/TestCase/Error/DebuggerTest.php
@@ -19,7 +19,6 @@
 use Cake\Error\Debugger;
 use Cake\Log\Log;
 use Cake\TestSuite\TestCase;
-use Cake\View\View;
 
 /**
  * DebuggerTestCaseDebugger class