Merge pull request #932 from patrickjahns/bump-coding-standard-6.0

Updated doctrine/coding-standard to 6.0
doctrine · Apr 2, 2019 · 4f0f2d1 · 4f0f2d1
2 parents ab34380 + 181cc55
commit 4f0f2d1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/Controller/ProfilerController.php b/Controller/ProfilerController.php
@@ -86,6 +86,7 @@ private function explainSQLServerPlatform(Connection $connection, $query)
 
         $stmt = $connection->executeQuery($sql, $params, $query['types']);
         $stmt->nextRowset();
+
         return $stmt->fetchAll(PDO::FETCH_ASSOC);
     }
 

diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -221,6 +221,7 @@ public function getGroupedQueries()
                 if ($a['executionMS'] === $b['executionMS']) {
                     return 0;
                 }
+
                 return $a['executionMS'] < $b['executionMS'] ? 1 : -1;
             });
             $this->groupedQueries[$connection] = $connectionGroupedQueries;

diff --git a/Tests/Repository/ContainerRepositoryFactoryTest.php b/Tests/Repository/ContainerRepositoryFactoryTest.php
@@ -81,7 +81,6 @@ public function testServiceRepositoriesCanNotExtendsEntityRepository()
         $this->assertSame($repo, $actualRepo);
     }
 
-
     /**
      * @expectedException \RuntimeException
      * @expectedExceptionMessage The "Doctrine\Bundle\DoctrineBundle\Tests\Repository\StubServiceRepository" entity repository implements "Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepositoryInterface", but its service could not be found. Make sure the service exists and is tagged with "doctrine.repository_service".

diff --git a/Twig/DoctrineExtension.php b/Twig/DoctrineExtension.php
@@ -290,6 +290,7 @@ public function replaceQueryParameters($query, $parameters)
             '/\?|((?<!:):[a-z0-9_]+)/i',
             static function ($matches) use ($parameters, &$i) {
                 $key = substr($matches[0], 1);
+
                 if (! array_key_exists($i, $parameters) && ($key === false || ! array_key_exists($key, $parameters))) {
                     return $matches[0];
                 }

diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "php-coveralls/php-coveralls": "^2.1",
         "phpunit/phpunit": "7.0",
         "symfony/web-profiler-bundle": "^3.4|^4.1",
-        "doctrine/coding-standard": "^5.0"
+        "doctrine/coding-standard": "^6.0"
     },
     "conflict": {
         "doctrine/orm": "<2.6",