Skip to content

Commit

Permalink
bug #3 Allow Symfony 6 in require-dev (sstok)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the main branch.

Discussion
----------

| Q             | A
| ------------- | ---
| Branch?       | main
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets | Fix #2 instead -->
| License       | MIT


Commits
-------

d01d954 Allow Symfony 6 in require-dev
b1eb80c Fix CI workflow
0e7413d Fix PHP 8 deprecation warnings
  • Loading branch information
sstok authored Dec 6, 2022
1 parent 28090c0 commit 46923a0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ jobs:
git config --global user.email [email protected]
rm -f composer.lock
composer global config --no-plugins allow-plugins.symfony/flex true
composer config --no-plugins allow-plugins.symfony/flex true
composer global require symfony/flex
composer install --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
Expand Down Expand Up @@ -86,6 +88,8 @@ jobs:
name: Install Composer dependencies
run: |
rm -f composer.lock
composer global config --no-plugins allow-plugins.symfony/flex true
composer config --no-plugins allow-plugins.symfony/flex true
composer global require symfony/flex
composer install --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"phpstan/phpstan": "^0.12.99",
"phpstan/phpstan-phpunit": "^0.12.22",
"phpunit/phpunit": "^9.5",
"symfony/framework-bundle": "^5.3",
"symfony/framework-bundle": "^5.3 || ^6.0",
"symfony/phpunit-bridge": "^5.3 || ^6.0"
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions tests/Constraints/NotInPasswordCommonListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function it_ignores_empty_values(): void

$this->validator->validate(
new class() implements Stringable {
public function __toString()
public function __toString(): string
{
return '';
}
Expand Down Expand Up @@ -87,7 +87,7 @@ public function __construct(string $password)
$this->password = $password;
}

public function __toString()
public function __toString(): string
{
return $this->password;
}
Expand Down

0 comments on commit 46923a0

Please sign in to comment.