Skip to content

Commit a92cddf

Browse files
committed
Rename files
I find it is easier to keep editor tabs straight when there are fewer files with the same name.
1 parent 2012437 commit a92cddf

File tree

10 files changed

+26
-38
lines changed

10 files changed

+26
-38
lines changed

lib/Cake/Database/Dialect/MysqlDialectTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ trait MysqlDialectTrait {
4848
* Used by Cake\Schema package to reflect schema and
4949
* generate schema.
5050
*
51-
* @return Cake\Database\Schema\Dialect\Mysql
51+
* @return Cake\Database\Schema\MysqlSchema
5252
*/
5353
public function schemaDialect() {
54-
return new \Cake\Database\Schema\Dialect\Mysql($this);
54+
return new \Cake\Database\Schema\MysqlSchema($this);
5555
}
5656

5757
}

lib/Cake/Database/Dialect/PostgresDialectTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ protected function _transformFunctionExpression(FunctionExpression $expression)
153153
* Used by Cake\Schema package to reflect schema and
154154
* generate schema.
155155
*
156-
* @return Cake\Database\Schema\Dialect\Postgres
156+
* @return Cake\Database\Schema\PostgresSchema
157157
*/
158158
public function schemaDialect() {
159-
return new \Cake\Database\Schema\Dialect\Postgres($this);
159+
return new \Cake\Database\Schema\PostgresSchema($this);
160160
}
161161
}

lib/Cake/Database/Dialect/SqliteDialectTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ protected function _insertQueryTranslator($query) {
132132
* Used by Cake\Schema package to reflect schema and
133133
* generate schema.
134134
*
135-
* @return Cake\Database\Schema\Dialect\Sqlite
135+
* @return Cake\Database\Schema\SqliteSchema
136136
*/
137137
public function schemaDialect() {
138-
return new \Cake\Database\Schema\Dialect\Sqlite($this);
138+
return new \Cake\Database\Schema\SqliteSchema($this);
139139
}
140140

141141
}

lib/Cake/Database/Schema/Dialect/Mysql.php renamed to lib/Cake/Database/Schema/MysqlSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* @since CakePHP(tm) v 3.0.0
1515
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1616
*/
17-
namespace Cake\Database\Schema\Dialect;
17+
namespace Cake\Database\Schema;
1818

19-
class Mysql {
19+
class MysqlSchema {
2020

2121
/**
2222
* The driver instance being used.

lib/Cake/Database/Schema/Dialect/Postgres.php renamed to lib/Cake/Database/Schema/PostgresSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* @since CakePHP(tm) v 3.0.0
1515
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1616
*/
17-
namespace Cake\Database\Schema\Dialect;
17+
namespace Cake\Database\Schema;
1818

19-
class Postgres {
19+
class PostgresSchema {
2020

2121
/**
2222
* The driver instance being used.

lib/Cake/Database/Schema/Dialect/Sqlite.php renamed to lib/Cake/Database/Schema/SqliteSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* @since CakePHP(tm) v 3.0.0
1515
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1616
*/
17-
namespace Cake\Database\Schema\Dialect;
17+
namespace Cake\Database\Schema;
1818

19-
class Sqlite {
19+
class SqliteSchema {
2020

2121
/**
2222
* The driver instance being used.

lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,9 @@ public function setUp() {
4444
*/
4545
public function tearDown() {
4646
parent::tearDown();
47-
$this->connection->disconnect();
4847
unset($this->connection);
4948
}
5049

51-
/**
52-
* Test getting table listings.
53-
*
54-
* @return void
55-
*/
56-
public function testListTables() {
57-
}
58-
5950
/**
6051
* Test getting simple descriptions for tables.
6152
*

lib/Cake/Test/TestCase/Database/Schema/Dialect/MysqlTest.php renamed to lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414
* @since CakePHP(tm) v 3.0.0
1515
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1616
*/
17-
namespace Cake\Test\TestCase\Database\Schema\Dialect;
17+
namespace Cake\Test\TestCase\Database\Schema;
1818

1919
use Cake\Core\Configure;
2020
use Cake\Database\Connection;
2121
use Cake\Database\Schema\Collection as SchemaCollection;
22-
use Cake\Database\Schema\Dialect\Mysql;
23-
use Cake\Database\Schema\Driver\Mysql as MysqlDriver;
22+
use Cake\Database\Schema\MysqlSchema;
2423
use Cake\TestSuite\TestCase;
2524

2625

2726
/**
2827
* Test case for Mysql Schema Dialect.
2928
*/
30-
class MysqlTest extends TestCase {
29+
class MysqlSchemaTest extends TestCase {
3130

3231
/**
3332
* Helper method for skipping tests that need a real connection.
@@ -117,7 +116,7 @@ public static function columnProvider() {
117116
*/
118117
public function testConvertColumnType($input, $expected) {
119118
$driver = $this->getMock('Cake\Database\Driver\Mysql');
120-
$dialect = new Mysql($driver);
119+
$dialect = new MysqlSchema($driver);
121120
$this->assertEquals($expected, $dialect->convertColumn($input));
122121
}
123122

@@ -141,7 +140,7 @@ public static function convertIndexProvider() {
141140
*/
142141
public function testConvertIndex($input, $expected) {
143142
$driver = $this->getMock('Cake\Database\Driver\Mysql');
144-
$dialect = new Mysql($driver);
143+
$dialect = new MysqlSchema($driver);
145144
$this->assertEquals($expected, $dialect->convertIndex($input));
146145
}
147146

lib/Cake/Test/TestCase/Database/Schema/Dialect/PostgresTest.php renamed to lib/Cake/Test/TestCase/Database/Schema/PostgresSchemaTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@
1414
* @since CakePHP(tm) v 3.0.0
1515
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1616
*/
17-
namespace Cake\Test\TestCase\Database\Schema\Dialect;
17+
namespace Cake\Test\TestCase\Database\Schema;
1818

1919
use Cake\Core\Configure;
2020
use Cake\Database\Connection;
2121
use Cake\Database\Schema\Collection as SchemaCollection;
22-
use Cake\Database\Schema\Dialect\Postgres;
23-
use Cake\Database\Schema\Driver\Postgres as PostgresDriver;
22+
use Cake\Database\Schema\PostgresSchema;
2423
use Cake\TestSuite\TestCase;
2524

2625
/**
27-
* Postgres dialect test case.
26+
* Postgres schema test case.
2827
*/
29-
class PostgresTest extends TestCase {
28+
class PostgresSchemaTest extends TestCase {
3029

3130
/**
3231
* Helper method for skipping tests that need a real connection.
@@ -180,7 +179,7 @@ public static function columnProvider() {
180179
*/
181180
public function testConvertColumnType($input, $expected) {
182181
$driver = $this->getMock('Cake\Database\Driver\Postgres');
183-
$dialect = new Postgres($driver);
182+
$dialect = new PostgresSchema($driver);
184183
$this->assertEquals($expected, $dialect->convertColumn($input));
185184
}
186185

lib/Cake/Test/TestCase/Database/Schema/Dialect/SqliteTest.php renamed to lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414
* @since CakePHP(tm) v 3.0.0
1515
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1616
*/
17-
namespace Cake\Test\TestCase\Database\Schema\Dialect;
17+
namespace Cake\Test\TestCase\Database\Schema;
1818

1919
use Cake\Core\Configure;
2020
use Cake\Database\Connection;
2121
use Cake\Database\Schema\Collection as SchemaCollection;
22-
use Cake\Database\Schema\Dialect\Sqlite;
23-
use Cake\Database\Schema\Driver\Sqlite as SqliteDriver;
22+
use Cake\Database\Schema\SqliteSchema;
2423
use Cake\TestSuite\TestCase;
2524

2625

2726
/**
2827
* Test case for Sqlite Schema Dialect.
2928
*/
30-
class SqliteTest extends TestCase {
29+
class SqliteSchemaTest extends TestCase {
3130

3231
/**
3332
* Helper method for skipping tests that need a real connection.
@@ -117,7 +116,7 @@ public static function columnProvider() {
117116
*/
118117
public function testConvertColumnType($input, $expected) {
119118
$driver = $this->getMock('Cake\Database\Driver\Sqlite');
120-
$dialect = new Sqlite($driver);
119+
$dialect = new SqliteSchema($driver);
121120
$this->assertEquals($expected, $dialect->convertColumn($input));
122121
}
123122

0 commit comments

Comments
 (0)