From 44be11e3fbcd5d5a427b8da6d29393e7775ea970 Mon Sep 17 00:00:00 2001 From: saifulislamferoz Date: Sun, 15 Sep 2024 19:56:47 +0600 Subject: [PATCH] feat: allow symfony dependency from 5.4 --- .github/workflows/ci.yml | 2 +- Tests/Functional/config/switchuser.yml | 6 +++++- Tests/Functional/config/validation_php80.yaml | 2 ++ Tests/Functional/config/validation_php81.yaml | 2 ++ composer.json | 12 ++++++------ 5 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 Tests/Functional/config/validation_php80.yaml create mode 100644 Tests/Functional/config/validation_php81.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60ae411..46346d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: operating-system: [ ubuntu-latest ] - php-versions: [ '8.0', '8.1', '8.2','8.3' ] + php-versions: [ '8.0', '8.1', '8.2', '8.3' ] steps: - name: Checkout diff --git a/Tests/Functional/config/switchuser.yml b/Tests/Functional/config/switchuser.yml index 3e6a77f..91672c9 100644 --- a/Tests/Functional/config/switchuser.yml +++ b/Tests/Functional/config/switchuser.yml @@ -1,8 +1,12 @@ imports: - { resource: ./config.yml } + # Load validation config for PHP 8.0 + - { resource: 'validation_php80.yaml', when@php: '8.0' } + # Load validation config for PHP 8.1 and higher + - { resource: 'validation_php81.yaml', when@php: '>=8.1' } framework: - validation: { enabled: true, enable_attributes: true } + router: resource: "%kernel.project_dir%/config/common/login_routing.yml" csrf_protection: true diff --git a/Tests/Functional/config/validation_php80.yaml b/Tests/Functional/config/validation_php80.yaml new file mode 100644 index 0000000..51fcc79 --- /dev/null +++ b/Tests/Functional/config/validation_php80.yaml @@ -0,0 +1,2 @@ +framework: + validation: { enabled: true, enable_annotations: true } \ No newline at end of file diff --git a/Tests/Functional/config/validation_php81.yaml b/Tests/Functional/config/validation_php81.yaml new file mode 100644 index 0000000..8c05814 --- /dev/null +++ b/Tests/Functional/config/validation_php81.yaml @@ -0,0 +1,2 @@ +framework: + validation: { enabled: true, enable_attributes: true } \ No newline at end of file diff --git a/composer.json b/composer.json index 0402e37..0d867c2 100644 --- a/composer.json +++ b/composer.json @@ -21,19 +21,19 @@ "source": "https://github.com/xiidea/EasyAuditBundle" }, "require": { - "php": ">=8.1", + "php": ">=8.0.2", "psr/log": "^1|^2|^3", - "symfony/framework-bundle": ">=6.0 <7.4.0", - "symfony/security-bundle": ">=6.0 <7.4.0" + "symfony/framework-bundle": ">=5.4 <7.4.0", + "symfony/security-bundle": ">=5.4 <7.4.0" }, "require-dev": { "phpunit/phpunit": "^9.5", "php-coveralls/php-coveralls": "^2.1", "doctrine/common": ">=2.2 <4.0", "symfony/test-pack": "^1.0", - "symfony/twig-bundle": "^6.0", - "symfony/form": "^6.0", - "symfony/validator": "^6.0" + "symfony/twig-bundle": ">=5.4 <7.4", + "symfony/form": ">=5.4 <7.4", + "symfony/validator": ">=5.4 <7.4" }, "autoload": { "psr-4": {