Skip to content

Fix CI: PHPStan's error, Dependency conflicts, MySQL version #22

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

Merged
merged 1 commit into from
Apr 2, 2021
Merged

Fix CI: PHPStan's error, Dependency conflicts, MySQL version #22

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:

services:
mysql:
image: "mysql:8"
image: "mysql:5.7"
env:
MYSQL_ALLOW_EMPTY_PASSWORD: true
MYSQL_ROOT_PASSWORD:
Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/TdbmCompilerPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class TdbmCompilerPass implements CompilerPassInterface
/**
* @inheritDoc
*/
public function process(ContainerBuilder $container)
public function process(ContainerBuilder $container): void
{
$generatorListeners = $this->taggedServicesToReferences($container->findTaggedServiceIds(TdbmExtension::TAG_GENERATOR_LISTENER));
$codeGeneratorListeners = $this->taggedServicesToReferences($container->findTaggedServiceIds(TdbmExtension::TAG_CODE_GENERATOR_LISTENER));
Expand Down
2 changes: 1 addition & 1 deletion TdbmBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

class TdbmBundle extends Bundle
{
public function build(ContainerBuilder $container)
public function build(ContainerBuilder $container): void
{
parent::build($container);

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"require" : {
"php" : ">=7.2",
"thecodingmachine/tdbm" : "~5.2.0",
"doctrine/doctrine-bundle": "^1.9 || ^2",
"doctrine/orm": "^1 || ^2",
"doctrine/doctrine-bundle": "^2",
"doctrine/orm": "^2",
"symfony/http-kernel": "^4.1.9 || ^5"
},
"require-dev": {
Expand Down