浏览代码

Rename Driver::createPDO() to Driver::createPdo()

ADmad 4 年之前
父节点
当前提交
d69f959ee4

+ 1 - 1
src/Database/Driver.php

@@ -128,7 +128,7 @@ abstract class Driver implements DriverInterface
      * @param array<string, mixed> $config configuration to be used for creating connection
      * @return \PDO
      */
-    protected function createPDO(string $dsn, array $config): PDO
+    protected function createPdo(string $dsn, array $config): PDO
     {
         $action = function () use ($dsn, $config): PDO {
             return new PDO(

+ 1 - 1
src/Database/Driver/Mysql.php

@@ -149,7 +149,7 @@ class Mysql extends Driver
             $dsn .= ";charset={$config['encoding']}";
         }
 
-        $this->pdo = $this->createPDO($dsn, $config);
+        $this->pdo = $this->createPdo($dsn, $config);
 
         if (!empty($config['init'])) {
             foreach ((array)$config['init'] as $command) {

+ 1 - 1
src/Database/Driver/Postgres.php

@@ -92,7 +92,7 @@ class Postgres extends Driver
             $dsn = "pgsql:dbname={$config['database']}";
         }
 
-        $this->pdo = $this->createPDO($dsn, $config);
+        $this->pdo = $this->createPdo($dsn, $config);
         if (!empty($config['encoding'])) {
             $this->setEncoding($config['encoding']);
         }

+ 1 - 1
src/Database/Driver/Sqlite.php

@@ -152,7 +152,7 @@ class Sqlite extends Driver
             $dsn = 'sqlite:' . $config['database'];
         }
 
-        $this->pdo = $this->createPDO($dsn, $config);
+        $this->pdo = $this->createPdo($dsn, $config);
         if ($chmodFile) {
             // phpcs:disable
             @chmod($config['database'], $config['mask']);

+ 1 - 1
src/Database/Driver/Sqlserver.php

@@ -150,7 +150,7 @@ class Sqlserver extends Driver
             $dsn .= ";MultiSubnetFailover={$config['multiSubnetFailover']}";
         }
 
-        $this->pdo = $this->createPDO($dsn, $config);
+        $this->pdo = $this->createPdo($dsn, $config);
         if (!empty($config['init'])) {
             foreach ((array)$config['init'] as $command) {
                 $this->pdo->exec($command);

+ 6 - 6
tests/TestCase/Database/Driver/MysqlTest.php

@@ -43,7 +43,7 @@ class MysqlTest extends TestCase
     public function testConnectionConfigDefault(): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Mysql')
-            ->onlyMethods(['createPDO', 'getPdo'])
+            ->onlyMethods(['createPdo', 'getPdo'])
             ->getMock();
         $dsn = 'mysql:host=localhost;port=3306;dbname=cake;charset=utf8mb4';
         $expected = [
@@ -68,7 +68,7 @@ class MysqlTest extends TestCase
             ->addMethods(['exec'])
             ->getMock();
 
-        $driver->expects($this->once())->method('createPDO')
+        $driver->expects($this->once())->method('createPdo')
             ->with($dsn, $expected);
 
         $driver->expects($this->any())
@@ -98,7 +98,7 @@ class MysqlTest extends TestCase
             ],
         ];
         $driver = $this->getMockBuilder('Cake\Database\Driver\Mysql')
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->setConstructorArgs([$config])
             ->getMock();
         $dsn = 'mysql:host=foo;port=3440;dbname=bar';
@@ -119,7 +119,7 @@ class MysqlTest extends TestCase
             ->method('exec')
             ->withConsecutive(['Execute this'], ['this too'], ["SET time_zone = 'Antarctica'"]);
 
-        $driver->expects($this->once())->method('createPDO')
+        $driver->expects($this->once())->method('createPdo')
             ->with($dsn, $expected)
             ->will($this->returnValue($connection));
         $driver->connect($config);
@@ -186,11 +186,11 @@ class MysqlTest extends TestCase
 
         /** @var \PHPUnit\Framework\MockObject\MockObject&\Cake\Database\Driver\Mysql $driver */
         $driver = $this->getMockBuilder(Mysql::class)
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
 
         $driver->expects($this->once())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($connection);
 
         $result = $driver->version();

+ 5 - 5
tests/TestCase/Database/Driver/PostgresTest.php

@@ -34,7 +34,7 @@ class PostgresTest extends TestCase
     public function testConnectionConfigDefault(): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Postgres')
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
         $dsn = 'pgsql:host=localhost;port=5432;dbname=cake';
         $expected = [
@@ -76,7 +76,7 @@ class PostgresTest extends TestCase
                 ['SET search_path TO public']
             );
 
-        $driver->expects($this->once())->method('createPDO')
+        $driver->expects($this->once())->method('createPdo')
             ->with($dsn, $expected)
             ->will($this->returnValue($connection));
 
@@ -102,7 +102,7 @@ class PostgresTest extends TestCase
             'init' => ['Execute this', 'this too'],
         ];
         $driver = $this->getMockBuilder('Cake\Database\Driver\Postgres')
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->setConstructorArgs([$config])
             ->getMock();
         $dsn = 'pgsql:host=foo;port=3440;dbname=bar';
@@ -136,7 +136,7 @@ class PostgresTest extends TestCase
                 ['SET timezone = Antarctica']
             );
 
-        $driver->expects($this->once())->method('createPDO')
+        $driver->expects($this->once())->method('createPdo')
             ->with($dsn, $expected)
             ->will($this->returnValue($connection));
 
@@ -149,7 +149,7 @@ class PostgresTest extends TestCase
     public function testInsertReturning(): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Postgres')
-            ->onlyMethods(['createPDO', 'getPdo'])
+            ->onlyMethods(['createPdo', 'getPdo'])
             ->setConstructorArgs([[]])
             ->getMock();
         $connection = $this

+ 6 - 6
tests/TestCase/Database/Driver/SqliteTest.php

@@ -41,7 +41,7 @@ class SqliteTest extends TestCase
     public function testConnectionConfigDefault(): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Sqlite')
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
         $dsn = 'sqlite::memory:';
         $expected = [
@@ -62,7 +62,7 @@ class SqliteTest extends TestCase
             PDO::ATTR_EMULATE_PREPARES => false,
             PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         ];
-        $driver->expects($this->once())->method('createPDO')
+        $driver->expects($this->once())->method('createPdo')
             ->with($dsn, $expected);
         $driver->connect([]);
     }
@@ -82,7 +82,7 @@ class SqliteTest extends TestCase
             'mask' => 0666,
         ];
         $driver = $this->getMockBuilder('Cake\Database\driver\Sqlite')
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->setConstructorArgs([$config])
             ->getMock();
         $dsn = 'sqlite:bar.db';
@@ -103,7 +103,7 @@ class SqliteTest extends TestCase
             ->method('exec')
             ->withConsecutive(['Execute this'], ['this too']);
 
-        $driver->expects($this->once())->method('createPDO')
+        $driver->expects($this->once())->method('createPdo')
             ->with($dsn, $expected)
             ->will($this->returnValue($connection));
 
@@ -206,11 +206,11 @@ class SqliteTest extends TestCase
             }));
 
         $driver = $this->getMockBuilder(Sqlite::class)
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
 
         $driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($mock);
 
         $this->assertEquals($expected, $driver->schemaValue($input));

+ 7 - 7
tests/TestCase/Database/Driver/SqlserverTest.php

@@ -101,11 +101,11 @@ class SqlserverTest extends TestCase
     public function testDnsString($constructorArgs, $dnsString): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Sqlserver')
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->setConstructorArgs([$constructorArgs])
             ->getMock();
 
-        $driver->method('createPDO')
+        $driver->method('createPdo')
             ->with($this->callback(function ($dns) use ($dnsString) {
                 $this->assertSame($dns, $dnsString);
 
@@ -132,7 +132,7 @@ class SqlserverTest extends TestCase
             'settings' => ['config1' => 'value1', 'config2' => 'value2'],
         ];
         $driver = $this->getMockBuilder('Cake\Database\Driver\Sqlserver')
-            ->onlyMethods(['createPDO', 'getPdo'])
+            ->onlyMethods(['createPdo', 'getPdo'])
             ->setConstructorArgs([$config])
             ->getMock();
         $dsn = 'sqlsrv:Server=foo;Database=bar;MultipleActiveResultSets=false';
@@ -171,7 +171,7 @@ class SqlserverTest extends TestCase
                 ['SET config2 value2']
             );
 
-        $driver->expects($this->once())->method('createPDO')
+        $driver->expects($this->once())->method('createPdo')
             ->with($dsn, $expected)
             ->will($this->returnValue($connection));
 
@@ -228,7 +228,7 @@ class SqlserverTest extends TestCase
     public function testSelectLimitVersion12(): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Sqlserver')
-            ->onlyMethods(['createPDO', 'getPdo', 'version', 'enabled'])
+            ->onlyMethods(['createPdo', 'getPdo', 'version', 'enabled'])
             ->setConstructorArgs([[]])
             ->getMock();
         $driver->method('version')
@@ -275,7 +275,7 @@ class SqlserverTest extends TestCase
     public function testSelectLimitOldServer(): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Sqlserver')
-            ->onlyMethods(['createPDO', 'getPdo', 'version', 'enabled'])
+            ->onlyMethods(['createPdo', 'getPdo', 'version', 'enabled'])
             ->setConstructorArgs([[]])
             ->getMock();
         $driver->expects($this->any())
@@ -401,7 +401,7 @@ class SqlserverTest extends TestCase
     public function testInsertUsesOutput(): void
     {
         $driver = $this->getMockBuilder('Cake\Database\Driver\Sqlserver')
-            ->onlyMethods(['createPDO', 'getPdo', 'enabled'])
+            ->onlyMethods(['createPdo', 'getPdo', 'enabled'])
             ->setConstructorArgs([[]])
             ->getMock();
         $driver->method('enabled')

+ 4 - 4
tests/TestCase/Database/DriverTest.php

@@ -56,7 +56,7 @@ class DriverTest extends TestCase
             true,
             true,
             true,
-            ['createPDO']
+            ['createPdo']
         );
     }
 
@@ -141,7 +141,7 @@ class DriverTest extends TestCase
             ->will($this->returnValue('string'));
 
         $this->driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($connection);
 
         $this->driver->schemaValue($value);
@@ -163,7 +163,7 @@ class DriverTest extends TestCase
             ->willReturn('all-the-bears');
 
         $this->driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($connection);
 
         $this->assertSame('all-the-bears', $this->driver->lastInsertId());
@@ -187,7 +187,7 @@ class DriverTest extends TestCase
             ->willReturn(new PDOStatement());
 
         $this->driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($connection);
 
         $this->driver->connect();

+ 2 - 2
tests/TestCase/Database/Schema/MysqlSchemaTest.php

@@ -1384,11 +1384,11 @@ SQL;
             }));
 
         $driver = $this->getMockBuilder(Mysql::class)
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
 
         $driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($this->pdo);
 
         $driver->connect();

+ 2 - 2
tests/TestCase/Database/Schema/PostgresSchemaTest.php

@@ -1370,11 +1370,11 @@ SQL;
             }));
 
         $driver = $this->getMockBuilder(Postgres::class)
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
 
         $driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($mock);
 
         $driver->connect();

+ 2 - 2
tests/TestCase/Database/Schema/SqliteSchemaTest.php

@@ -1106,11 +1106,11 @@ SQL;
             }));
 
         $driver = $this->getMockBuilder(Sqlite::class)
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
 
         $driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($this->pdo);
 
         $driver->connect();

+ 2 - 2
tests/TestCase/Database/Schema/SqlserverSchemaTest.php

@@ -1139,11 +1139,11 @@ SQL;
             }));
 
         $driver = $this->getMockBuilder(Sqlserver::class)
-            ->onlyMethods(['createPDO'])
+            ->onlyMethods(['createPdo'])
             ->getMock();
 
         $driver->expects($this->any())
-            ->method('createPDO')
+            ->method('createPdo')
             ->willReturn($mock);
 
         $driver->connect();

+ 1 - 1
tests/test_app/TestApp/Database/Driver/RetryDriver.php

@@ -34,7 +34,7 @@ class RetryDriver extends Sqlserver
         $testConfig = ConnectionManager::get('test')->config() + $this->_baseConfig;
         $dsn = "sqlsrv:Server={$testConfig['host']};Database={$testConfig['database']}";
 
-        $this->pdo = $this->createPDO($dsn, ['username' => 'invalid', 'password' => '', 'flags' => []]);
+        $this->pdo = $this->createPdo($dsn, ['username' => 'invalid', 'password' => '', 'flags' => []]);
     }
 
     public function getConnectRetries(): int

+ 1 - 1
tests/test_app/TestApp/Database/Driver/StubDriver.php

@@ -21,6 +21,6 @@ abstract class StubDriver extends Driver
 {
     public function connect(): void
     {
-        $this->pdo = $this->createPDO('', []);
+        $this->pdo = $this->createPdo('', []);
     }
 }