Skip to content

D
doctrine-dbal
Unverified Commit 0d7999ee authored by Grégoire Paris's avatar Grégoire Paris Committed by GitHub
Browse files
Options

Merge pull request #4040 from greg0ire/merge-up-mistakes 

Merge up mistakes
parents 90b68ab6 eaa55bda
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
phpcs.xml.dist
View file @ 0d7999ee
...@@ -112,6 +112,6 @@ ...@@ -112,6 +112,6 @@
<!-- The SQLSRV_* functions are defined in the upper case by the sqlsrv extension and violate the standard <!-- The SQLSRV_* functions are defined in the upper case by the sqlsrv extension and violate the standard
see https://docs.microsoft.com/en-us/sql/connect/php/constants-microsoft-drivers-for-php-for-sql-server --> see https://docs.microsoft.com/en-us/sql/connect/php/constants-microsoft-drivers-for-php-for-sql-server -->
<rule ref="Squiz.PHP.LowercasePHPFunctions"> <rule ref="Squiz.PHP.LowercasePHPFunctions">
<exclude-pattern>lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern> <exclude-pattern>src/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
</rule> </rule>
</ruleset> </ruleset>
tests/Platforms/AbstractPostgreSQLPlatformTestCase.php
View file @ 0d7999ee
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace Doctrine\DBAL\Tests\Platforms; namespace Doctrine\DBAL\Tests\Platforms;
use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Platforms\PostgreSQL100Platform;
use Doctrine\DBAL\Platforms\PostgreSQL94Platform; use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
use Doctrine\DBAL\Schema\Column; use Doctrine\DBAL\Schema\Column;
use Doctrine\DBAL\Schema\ColumnDiff; use Doctrine\DBAL\Schema\ColumnDiff;
...@@ -19,10 +18,10 @@ use function sprintf; ...@@ -19,10 +18,10 @@ use function sprintf;
abstract class AbstractPostgreSQLPlatformTestCase extends AbstractPlatformTestCase abstract class AbstractPostgreSQLPlatformTestCase extends AbstractPlatformTestCase
{ {
/** @var PostgreSQL94Platform|PostgreSQL100Platform */ /** @var PostgreSQL94Platform */
protected $platform; protected $platform;
/** @return PostgreSQL94Platform|PostgreSQL100Platform */ /** @return PostgreSQL94Platform */
abstract public function createPlatform() : AbstractPlatform; abstract public function createPlatform() : AbstractPlatform;
public function getGenerateTableSql() : string public function getGenerateTableSql() : string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment