Skip to content

Commit

Permalink
Fixing CS errors
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed Feb 18, 2014
1 parent 613919f commit fe4489c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions src/Datasource/ConnectionManager.php
Expand Up @@ -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])) {
Expand Down Expand Up @@ -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])) {
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Table.php
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Datasource/ConnectionManagerTest.php
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/ORM/EagerLoaderTest.php
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/ORM/TableTest.php
Expand Up @@ -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;
Expand Down

0 comments on commit fe4489c

Please sign in to comment.