Locked the PHP_CodeSniffer version to 3.5 for better compatibility with PHP 7.4

parent a6af8ffd
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b8d34165a2e5fbd1c74f7a5125e7d9f1", "content-hash": "44b68871fc8d7e631feabb7d92727d6c",
"packages": [ "packages": [
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
...@@ -2678,16 +2678,16 @@ ...@@ -2678,16 +2678,16 @@
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
"version": "3.4.0", "version": "3.5.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "379deb987e26c7cd103a7b387aea178baec96e48" "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48", "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
"reference": "379deb987e26c7cd103a7b387aea178baec96e48", "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2720,12 +2720,12 @@ ...@@ -2720,12 +2720,12 @@
} }
], ],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "http://www.squizlabs.com/php-codesniffer", "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"keywords": [ "keywords": [
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2018-12-19T23:57:18+00:00" "time": "2019-10-28T04:36:32+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
......
...@@ -76,4 +76,10 @@ ...@@ -76,4 +76,10 @@
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing"> <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing">
<exclude-pattern>lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php</exclude-pattern> <exclude-pattern>lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php</exclude-pattern>
</rule> </rule>
<!-- 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 -->
<rule ref="Squiz.PHP.LowercasePHPFunctions.UseStatementUppercase">
<exclude-pattern>lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
</rule>
</ruleset> </ruleset>
...@@ -48,7 +48,7 @@ class ResultCacheTest extends DbalFunctionalTestCase ...@@ -48,7 +48,7 @@ class ResultCacheTest extends DbalFunctionalTestCase
$this->connection->insert('caching', $row); $this->connection->insert('caching', $row);
} }
$config = $this->connection->getConfiguration(); $config = $this->connection->getConfiguration();
$config->setSQLLogger($this->sqlLogger = new DebugStack()); $config->setSQLLogger($this->sqlLogger = new DebugStack());
$cache = new ArrayCache(); $cache = new ArrayCache();
......
...@@ -272,7 +272,7 @@ class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase ...@@ -272,7 +272,7 @@ class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
public function testColumnCollation() : void public function testColumnCollation() : void
{ {
$table = new Table('test_collation'); $table = new Table('test_collation');
$table->addOption('collate', $collation = 'latin1_swedish_ci'); $table->addOption('collate', $collation = 'latin1_swedish_ci');
$table->addOption('charset', 'latin1'); $table->addOption('charset', 'latin1');
$table->addColumn('id', 'integer'); $table->addColumn('id', 'integer');
......
...@@ -172,7 +172,6 @@ class SQLServer2012PlatformTest extends AbstractSQLServerPlatformTestCase ...@@ -172,7 +172,6 @@ class SQLServer2012PlatformTest extends AbstractSQLServerPlatformTestCase
); );
self::assertEquals( self::assertEquals(
'SELECT ' . 'SELECT ' .
'u.id, ' . 'u.id, ' .
'(u.foo/2) foodiv, ' . '(u.foo/2) foodiv, ' .
......
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