Skip to content

Commit

Permalink
Merge pull request #307 from Seb33300/master
Browse files Browse the repository at this point in the history
Symfony 7 compatibility
  • Loading branch information
excelwebzone committed Jan 9, 2024
2 parents 704b228 + 01ce73c commit 5e6c96f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 13 deletions.
25 changes: 19 additions & 6 deletions .github/workflows/build.yml
Expand Up @@ -14,13 +14,13 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
symfony: [2.8, 3.4, 4.4, 5.2, 6.0]
php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
symfony: [2.8, 3.4, 4.4, 5.2, 6.0, 7.0]
exclude:
# Symfony 5 requires PHP >= 7.2
- php: 7.1
symfony: 5.2
- php: 8.0
symfony: 3.4
# Symfony 6 requires PHP >= 8.0
- php: 7.1
symfony: 6.0
- php: 7.2
Expand All @@ -29,9 +29,22 @@ jobs:
symfony: 6.0
- php: 7.4
symfony: 6.0
# Symfony 7 requires PHP >= 8.2
- php: 7.1
symfony: 7.0
- php: 7.2
symfony: 7.0
- php: 7.3
symfony: 7.0
- php: 7.4
symfony: 7.0
- php: 8.0
symfony: 7.0
- php: 8.1
symfony: 7.0
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install PHP
uses: shivammathur/setup-php@v2
Expand All @@ -44,7 +57,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Expand Up @@ -17,11 +17,11 @@
"require": {
"php": "^7.1 || ^8.0",
"google/recaptcha": "^1.1",
"symfony/form": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/security-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/validator": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/yaml": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/form": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
"symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
"symfony/security-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
"symfony/validator": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
"symfony/yaml": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
"twig/twig": "^1.40 || ^2.9 || ^3.0"
},
"require-dev": {
Expand Down
4 changes: 2 additions & 2 deletions src/Validator/Constraints/IsTrue.php
Expand Up @@ -24,9 +24,9 @@ public function __construct(array $options = null, string $message = null, strin
}

/**
* @return string|string[]
* {@inheritdoc}
*/
public function getTargets()
public function getTargets(): string
{
return Constraint::PROPERTY_CONSTRAINT;
}
Expand Down

0 comments on commit 5e6c96f

Please sign in to comment.