Merge branch 'master' into 3.next

src/Auth/DigestAuthenticate.php

@@ -15,7 +15,6 @@
 namespace Cake\Auth;
 
 use Cake\Controller\ComponentRegistry;
-use Cake\Core\Configure;
 use Cake\Http\ServerRequest;
 use Cake\Utility\Security;
 

src/Collection/Collection.php

@@ -17,7 +17,6 @@ namespace Cake\Collection;
 use ArrayIterator;
 use InvalidArgumentException;
 use IteratorIterator;
-use LogicException;
 use Serializable;
 use Traversable;
 

src/Command/HelpCommand.php

@@ -21,7 +21,6 @@ use Cake\Console\CommandCollectionAwareInterface;
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
 use Cake\Console\ConsoleOutput;
-use Cake\Utility\Inflector;
 use SimpleXMLElement;
 
 /**

src/Console/CommandScanner.php

@@ -19,7 +19,6 @@ use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Filesystem\Folder;
 use Cake\Utility\Inflector;
-use InvalidArgumentException;
 
 /**
  * Used by CommandCollection and CommandTask to scan the filesystem

src/Core/BasePlugin.php

@@ -13,7 +13,6 @@
  */
 namespace Cake\Core;
 
-use Cake\Event\EventManagerInterface;
 use InvalidArgumentException;
 use ReflectionClass;
 

src/Core/PluginApplicationInterface.php

@@ -15,7 +15,6 @@
 namespace Cake\Core;
 
 use Cake\Event\EventDispatcherInterface;
-use Cake\Event\EventManagerInterface;
 
 /**
  * Interface for Applications that leverage plugins & events.

src/Core/PluginCollection.php

@@ -13,12 +13,10 @@
  */
 namespace Cake\Core;
 
-use ArrayIterator;
 use Cake\Core\Exception\MissingPluginException;
 use Countable;
 use InvalidArgumentException;
 use Iterator;
-use RuntimeException;
 
 /**
  * Plugin Collection

src/Core/PluginInterface.php

@@ -12,8 +12,6 @@
  */
 namespace Cake\Core;
 
-use Cake\Event\EventManagerInterface;
-
 /**
  * Plugin Interface
  */

src/Database/DriverInterface.php

@@ -15,10 +15,6 @@
 namespace Cake\Database;
 
 use Cake\Database\Query;
-use Cake\Database\Statement\PDOStatement;
-use InvalidArgumentException;
-use PDO;
-use PDOException;
 
 /**
  * Interface for database driver.

src/Database/SchemaCache.php

@@ -16,8 +16,6 @@ namespace Cake\Database;
 
 use Cake\Cache\Cache;
 use Cake\Database\Connection;
-use Cake\Datasource\ConnectionManager;
-use InvalidArgumentException;
 use RuntimeException;
 
 /**

src/Database/Type/BinaryUuidType.php

@@ -16,7 +16,6 @@ namespace Cake\Database\Type;
 
 use Cake\Core\Exception\Exception;
 use Cake\Database\Driver;
-use Cake\Database\Driver\Sqlserver;
 use Cake\Database\Type;
 use Cake\Database\TypeInterface;
 use Cake\Utility\Text;

src/Database/Type/DateType.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\Database\Type;
 
-use Cake\Database\Driver;
 use DateTime;
 
 /**

src/ORM/Table.php

@@ -1675,13 +1675,13 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
      */
     public function findOrCreate($search, callable $callback = null, $options = [])
     {
-        $options += [
+        $options = new ArrayObject($options + [
             'atomic' => true,
             'defaults' => true,
-        ];
+        ]);
 
         $entity = $this->_executeTransaction(function () use ($search, $callback, $options) {
-            return $this->_processFindOrCreate($search, $callback, $options);
+            return $this->_processFindOrCreate($search, $callback, $options->getArrayCopy());
         }, $options['atomic']);
 
         if ($entity && $this->_transactionCommitted($options['atomic'], true)) {

src/Routing/Middleware/RoutingMiddleware.php

@@ -15,7 +15,6 @@
 namespace Cake\Routing\Middleware;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
 use Cake\Core\PluginApplicationInterface;
 use Cake\Http\BaseApplication;
 use Cake\Http\MiddlewareQueue;

src/Routing/Route/Route.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\Routing\Route;
 
-use Cake\Http\ServerRequest;
 use Cake\Http\ServerRequestFactory;
 use Cake\Routing\Router;
 use InvalidArgumentException;

src/Routing/Router.php

@@ -19,7 +19,6 @@ use Cake\Http\ServerRequest;
 use Cake\Routing\Exception\MissingRouteException;
 use Cake\Utility\Inflector;
 use Psr\Http\Message\ServerRequestInterface;
-use RuntimeException;
 
 /**
  * Parses the request URL into controller, action, and parameters. Uses the connected routes

src/Shell/Task/CommandTask.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\Shell\Task;
 
-use Cake\Console\Command;
 use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Plugin;

tests/TestCase/Console/CommandCollectionTest.php

@@ -14,14 +14,12 @@
  */
 namespace Cake\Test\Console;
 
-use Cake\Console\Command;
 use Cake\Console\CommandCollection;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Shell\I18nShell;
 use Cake\Shell\RoutesShell;
 use Cake\TestSuite\TestCase;
-use InvalidArgumentException;
 use stdClass;
 use TestApp\Command\DemoCommand;
 

tests/TestCase/Console/CommandFactoryTest.php

@@ -13,7 +13,6 @@
 namespace Cake\Test\TestCase\Console;
 
 use Cake\Console\CommandFactory;
-use Cake\Console\ConsoleIo;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
 use TestApp\Command\DemoCommand;

tests/TestCase/Console/CommandRunnerTest.php

@@ -21,7 +21,6 @@ use Cake\Console\ConsoleIo;
 use Cake\Console\Shell;
 use Cake\Core\Configure;
 use Cake\Core\ConsoleApplicationInterface;
-use Cake\Event\EventList;
 use Cake\Event\EventManager;
 use Cake\Http\BaseApplication;
 use Cake\Routing\Router;
@@ -29,7 +28,6 @@ use Cake\TestSuite\Stub\ConsoleOutput;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
 use TestApp\Command\DemoCommand;
-use TestApp\Http\EventApplication;
 use TestApp\Shell\SampleShell;
 
 /**

tests/TestCase/Core/BasePluginTest.php

@@ -18,7 +18,6 @@ use Cake\Core\BasePlugin;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Core\PluginApplicationInterface;
-use Cake\Event\EventManager;
 use Cake\Http\MiddlewareQueue;
 use Cake\TestSuite\TestCase;
 use Company\TestPluginThree\Plugin as TestPluginThree;

tests/TestCase/Database/ConnectionTest.php

@@ -21,8 +21,6 @@ use Cake\Database\Exception\MissingConnectionException;
 use Cake\Database\Exception\NestedTransactionRollbackException;
 use Cake\Database\Log\LoggingStatement;
 use Cake\Database\Log\QueryLogger;
-use Cake\Database\Retry\CommandRetry;
-use Cake\Database\Retry\ReconnectStrategy;
 use Cake\Database\StatementInterface;
 use Cake\Database\Statement\BufferedStatement;
 use Cake\Datasource\ConnectionManager;

tests/TestCase/Database/SchemaCacheTest.php

@@ -19,7 +19,6 @@ use Cake\Cache\CacheEngine;
 use Cake\Database\SchemaCache;
 use Cake\Database\Schema\CachedCollection;
 use Cake\Datasource\ConnectionManager;
-use Cake\ORM\Entity;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Database/Type/BinaryUuidTypeTest.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Database\Type;
 
-use Cake\Database\Type;
 use Cake\Database\Type\BinaryUuidType;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Text;

tests/TestCase/Http/ActionDispatcherTest.php

@@ -20,7 +20,6 @@ use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Http\Session;
 use Cake\Routing\DispatcherFactory;
-use Cake\Routing\Filter\ControllerFactoryFilter;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 

tests/TestCase/Http/ServerTest.php

@@ -16,7 +16,6 @@ namespace Cake\Test\TestCase;
 
 use Cake\Core\HttpApplicationInterface;
 use Cake\Event\Event;
-use Cake\Event\EventList;
 use Cake\Event\EventManager;
 use Cake\Http\BaseApplication;
 use Cake\Http\CallbackStream;
@@ -24,10 +23,8 @@ use Cake\Http\MiddlewareQueue;
 use Cake\Http\Server;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
-use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
 use TestApp\Http\BadResponseApplication;
-use TestApp\Http\EventApplication;
 use TestApp\Http\InvalidMiddlewareApplication;
 use TestApp\Http\MiddlewareApplication;
 use Zend\Diactoros\Response;

tests/TestCase/Mailer/EmailTest.php

@@ -20,7 +20,6 @@ use Cake\Log\Log;
 use Cake\Mailer\Email;
 use Cake\Mailer\Transport\DebugTransport;
 use Cake\TestSuite\TestCase;
-use Cake\View\Exception\MissingTemplateException;
 use Exception;
 use SimpleXmlElement;
 

tests/TestCase/ORM/TableRegressionTest.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\ORM;
 
-use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
 

tests/TestCase/ORM/TableTest.php

@@ -6150,7 +6150,7 @@ class TableTest extends TestCase
     public function testFindOrCreateTransactions()
     {
         $articles = $this->getTableLocator()->get('Articles');
-        $articles->getEventManager()->on('Model.afterSaveCommit', function ($event, $entity) {
+        $articles->getEventManager()->on('Model.afterSaveCommit', function (Event $event, EntityInterface $entity, ArrayObject $options) {
             $entity->afterSaveCommit = true;
         });
 

tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php

@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Routing\Middleware;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
 use Cake\Routing\Middleware\RoutingMiddleware;
 use Cake\Routing\RouteBuilder;
 use Cake\Routing\RouteCollection;

tests/TestCase/Shell/Task/LoadTaskTest.php

@@ -14,7 +14,6 @@
 namespace Cake\Test\TestCase\Shell\Task;
 
 use Cake\Console\Shell;
-use Cake\Core\Plugin;
 use Cake\Filesystem\File;
 use Cake\TestSuite\ConsoleIntegrationTestCase;
 

tests/TestCase/TestSuite/CookieEncryptedUsingControllerTest.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Controller;
 
-use Cake\Routing\DispatcherFactory;
 use Cake\Routing\Router;
 use Cake\TestSuite\IntegrationTestCase;
 use Cake\Utility\Security;

tests/TestCase/Utility/SecurityTest.php

@@ -18,7 +18,6 @@ use Cake\TestSuite\TestCase;
 use Cake\Utility\Crypto\Mcrypt;
 use Cake\Utility\Crypto\OpenSsl;
 use Cake\Utility\Security;
-use RuntimeException;
 
 /**
  * SecurityTest class