Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated doctrine/coding-standard to 6.0 #932

Merged
merged 1 commit into from Apr 2, 2019
Merged

Updated doctrine/coding-standard to 6.0 #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Controller/ProfilerController.php
View file
Open in desktop
Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions DataCollector/DoctrineDataCollector.php
View file
Open in desktop
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion Tests/Repository/ContainerRepositoryFactoryTest.php
View file
Open in desktop
Expand Up @@ -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".
Expand Down
1 change: 1 addition & 0 deletions Twig/DoctrineExtension.php
View file
Open in desktop
Expand Up @@ -290,6 +290,7 @@ public function replaceQueryParameters($query, $parameters)
'/\?|((?<!:):[a-z0-9_]+)/i',
static function ($matches) use ($parameters, &$i) {
$key = substr($matches[0], 1);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be related to slevomat/coding-standard#635

Will confirm and see if we can fix the upstream issue

if (! array_key_exists($i, $parameters) && ($key === false || ! array_key_exists($key, $parameters))) {
return $matches[0];
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down