From fe4489cfe7df718d6b0245377e3504eb96109ebd Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Tue, 18 Feb 2014 09:43:30 +0100 Subject: [PATCH] Fixing CS errors --- src/Datasource/ConnectionManager.php | 6 ++++-- src/ORM/Table.php | 2 +- tests/TestCase/Datasource/ConnectionManagerTest.php | 2 +- tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php | 2 +- tests/TestCase/ORM/EagerLoaderTest.php | 2 +- tests/TestCase/ORM/TableTest.php | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Datasource/ConnectionManager.php b/src/Datasource/ConnectionManager.php index a6e597f810e..83a2cb52174 100644 --- a/src/Datasource/ConnectionManager.php +++ b/src/Datasource/ConnectionManager.php @@ -89,7 +89,8 @@ public static function config($key, $config = null) { * @param string $from The connection to add an alias to. * @param string $to The alias to create. $from should return when loaded with get(). * @return void - * @throws Cake\Error\MissingDatasourceConfigException When aliasing a connection that does not exist. + * @throws Cake\Datasource\Error\MissingDatasourceConfigException When aliasing a + * connection that does not exist. */ public static function alias($from, $to) { if (empty(static::$_config[$to]) && empty(static::$_config[$from])) { @@ -123,7 +124,8 @@ public static function dropAlias($name) { * @param string $name The connection name. * @param boolean $useAliases Set to false to not use aliased connections. * @return Connection A connection object. - * @throws Cake\Error\MissingDatasourceConfigException When config data is missing. + * @throws Cake\Datasource\Error\MissingDatasourceConfigException When config + * data is missing. */ public static function get($name, $useAliases = true) { if ($useAliases && isset(static::$_aliasMap[$name])) { diff --git a/src/ORM/Table.php b/src/ORM/Table.php index 8f7bcf1e977..8ce66575f11 100644 --- a/src/ORM/Table.php +++ b/src/ORM/Table.php @@ -17,6 +17,7 @@ use Cake\Core\App; use Cake\Database\Schema\Table as Schema; use Cake\Database\Type; +use Cake\Datasource\EntityInterface; use Cake\Datasource\RepositoryInterface; use Cake\Event\Event; use Cake\Event\EventListener; @@ -27,7 +28,6 @@ use Cake\ORM\Association\HasMany; use Cake\ORM\Association\HasOne; use Cake\ORM\BehaviorRegistry; -use Cake\Datasource\EntityInterface; use Cake\ORM\Error\MissingEntityException; use Cake\ORM\Error\RecordNotFoundException; use Cake\ORM\Marshaller; diff --git a/tests/TestCase/Datasource/ConnectionManagerTest.php b/tests/TestCase/Datasource/ConnectionManagerTest.php index 836994a3e80..2bc28b8564d 100644 --- a/tests/TestCase/Datasource/ConnectionManagerTest.php +++ b/tests/TestCase/Datasource/ConnectionManagerTest.php @@ -15,8 +15,8 @@ use Cake\Core\App; use Cake\Core\Plugin; -use Cake\Datasource\ConnectionManager; use Cake\Database\Driver\Sqlite; +use Cake\Datasource\ConnectionManager; use Cake\TestSuite\TestCase; class FakeConnection { diff --git a/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php b/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php index b6519e4d744..0af324509ff 100644 --- a/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php +++ b/tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php @@ -14,8 +14,8 @@ */ namespace Cake\Test\TestCase\Model\Behavior; -use Cake\Datasource\ConnectionManager; use Cake\Database\Query; +use Cake\Datasource\ConnectionManager; use Cake\Event\Event; use Cake\Model\Behavior\CounterCacheBehavior; use Cake\ORM\Entity; diff --git a/tests/TestCase/ORM/EagerLoaderTest.php b/tests/TestCase/ORM/EagerLoaderTest.php index 656bd92ea97..50dbf45025a 100644 --- a/tests/TestCase/ORM/EagerLoaderTest.php +++ b/tests/TestCase/ORM/EagerLoaderTest.php @@ -14,9 +14,9 @@ */ namespace Cake\Test\TestCase\ORM; -use Cake\Datasource\ConnectionManager; use Cake\Database\Expression\IdentifierExpression; use Cake\Database\Expression\QueryExpression; +use Cake\Datasource\ConnectionManager; use Cake\ORM\EagerLoader; use Cake\ORM\Query; use Cake\ORM\Table; diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php index 722a9425088..df877c3485a 100644 --- a/tests/TestCase/ORM/TableTest.php +++ b/tests/TestCase/ORM/TableTest.php @@ -15,9 +15,9 @@ namespace Cake\Test\TestCase\ORM; use Cake\Core\Configure; -use Cake\Datasource\ConnectionManager; use Cake\Database\Expression\OrderByExpression; use Cake\Database\Expression\QueryExpression; +use Cake\Datasource\ConnectionManager; use Cake\ORM\Table; use Cake\ORM\TableRegistry; use Cake\Validation\Validator;