From f300bad6149ca2292d115735e1c0c40fa3de9e9d Mon Sep 17 00:00:00 2001 From: Martin de Keijzer Date: Mon, 2 May 2022 16:12:03 +0200 Subject: [PATCH 1/5] Upgrade to actual supported Symfony versions --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index f997c20..1eb03f2 100644 --- a/composer.json +++ b/composer.json @@ -8,23 +8,23 @@ "doctrine/annotations": "^1.6", "doctrine/doctrine-bundle": "^1.10 || ^2.0", "doctrine/orm": "^2.5", - "symfony/asset": "^3.4 || ^4.2 || ^5.0", - "symfony/dependency-injection": "^3.4 || ^4.2 || ^5.0", - "symfony/doctrine-bridge": "^3.4 || ^4.2 || ^5.0", - "symfony/expression-language": "^3.4 || ^4.2 || ^5.0", - "symfony/form": "^3.4 || ^4.2 || ^5.0", - "symfony/framework-bundle": "^3.4 || ^4.2 || ^5.0", - "symfony/http-foundation": "^3.4 || ^4.2 || ^5.0", - "symfony/templating": "^3.4 || ^4.2 || ^5.0", - "symfony/translation": "^3.4 || ^4.2 || ^5.0", - "symfony/twig-bridge": "^3.4 || ^4.2 || ^5.0", - "symfony/twig-bundle": "^3.4 || ^4.2 || ^5.0", + "symfony/asset": "^4.4 || ^5.4 || ^6.0", + "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0", + "symfony/doctrine-bridge": "^4.4 || ^5.4 || ^6.0", + "symfony/expression-language": "^4.4 || ^5.4 || ^6.0", + "symfony/form": "^4.4 || ^5.4 || ^6.0", + "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0", + "symfony/templating": "^4.4 || ^5.4 || ^6.0", + "symfony/translation": "^4.4 || ^5.4 || ^6.0", + "symfony/twig-bridge": "^4.4 || ^5.4 || ^6.0", + "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.0", "twig/twig": "^2.6 || ^3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", "phpunit/phpunit": "^7.5", - "symfony/yaml": "^3.4 || ^4.2 || ^5.0" + "symfony/yaml": "^4.4 || ^5.4 || ^6.0" }, "prefer-stable": true, "autoload": { From 9d99011d22aae1ff121f835a74feb31e2401e7ed Mon Sep 17 00:00:00 2001 From: Martin de Keijzer Date: Mon, 11 Jul 2022 11:32:15 +0200 Subject: [PATCH 2/5] Add compatibility for Symfony 6.1 --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 1eb03f2..062c508 100644 --- a/composer.json +++ b/composer.json @@ -9,22 +9,22 @@ "doctrine/doctrine-bundle": "^1.10 || ^2.0", "doctrine/orm": "^2.5", "symfony/asset": "^4.4 || ^5.4 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0", - "symfony/doctrine-bridge": "^4.4 || ^5.4 || ^6.0", - "symfony/expression-language": "^4.4 || ^5.4 || ^6.0", - "symfony/form": "^4.4 || ^5.4 || ^6.0", - "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0", - "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0", - "symfony/templating": "^4.4 || ^5.4 || ^6.0", - "symfony/translation": "^4.4 || ^5.4 || ^6.0", - "symfony/twig-bridge": "^4.4 || ^5.4 || ^6.0", - "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/doctrine-bridge": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/expression-language": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/form": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/templating": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/translation": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/twig-bridge": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.0 || ^6.1", "twig/twig": "^2.6 || ^3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", "phpunit/phpunit": "^7.5", - "symfony/yaml": "^4.4 || ^5.4 || ^6.0" + "symfony/yaml": "^4.4 || ^5.4 || ^6.0 || ^6.1" }, "prefer-stable": true, "autoload": { From 387b0b3c6f290293a504bb8de77cdb6175a639ee Mon Sep 17 00:00:00 2001 From: Martin de Keijzer Date: Wed, 20 Jul 2022 10:23:47 +0200 Subject: [PATCH 3/5] Fix parameter defaults --- Tests/Cookie/CookieCheckerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/Cookie/CookieCheckerTest.php b/Tests/Cookie/CookieCheckerTest.php index 4f64ee7..898062d 100644 --- a/Tests/Cookie/CookieCheckerTest.php +++ b/Tests/Cookie/CookieCheckerTest.php @@ -38,7 +38,7 @@ public function setUp(): void * * Test CookieChecker:isCookieConsentSavedByUser */ - public function testIsCookieConsentSavedByUser(array $cookies = [], bool $expected): void + public function testIsCookieConsentSavedByUser(array $cookies = [], bool $expected = false): void { $this->request->cookies = new ParameterBag($cookies); @@ -65,7 +65,7 @@ public function isCookieConsentSavedByUserDataProvider(): array * * Test CookieChecker:isCategoryAllowedByUser */ - public function testIsCategoryAllowedByUser(array $cookies = [], string $category, bool $expected): void + public function testIsCategoryAllowedByUser(array $cookies = [], string $category = '', bool $expected = false): void { $this->request->cookies = new ParameterBag($cookies); From d478497eb47215cb093e813db351be1eed856eba Mon Sep 17 00:00:00 2001 From: Martin de Keijzer Date: Mon, 27 Feb 2023 10:55:47 +0100 Subject: [PATCH 4/5] Merge upstream --- .../translations/CHCookieConsentBundle.sk.yml | 23 ++++++++++++++++ composer.json | 26 +++++++++---------- 2 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 Resources/translations/CHCookieConsentBundle.sk.yml diff --git a/Resources/translations/CHCookieConsentBundle.sk.yml b/Resources/translations/CHCookieConsentBundle.sk.yml new file mode 100644 index 0000000..04f7106 --- /dev/null +++ b/Resources/translations/CHCookieConsentBundle.sk.yml @@ -0,0 +1,23 @@ +ch_cookie_consent: + title: 'Používame súbory cookies' + intro: '' + read_more: 'Ďalšie informácie' + analytics: + title: 'Povoliť štatistické cookies?' + description: '' + tracking: + title: 'Povoliť sledovacie cookies?' + description: '' + marketing: + title: 'Povoliť personalizované reklamy?' + description: '' + social_media: + title: 'Povoliť cookies sociálnych sietí?' + description: '' + no: 'Nie' + yes: 'Áno' + save: 'Uložiť' + use_only_functional_cookies: 'Povoliť len nevyhnutné cookies' + use_all_cookies: 'Povoliť všetky cookies' + show_details: 'Zobraziť podrobnosti' + hide_details: 'Skryť podrobnosti' diff --git a/composer.json b/composer.json index 062c508..35440db 100644 --- a/composer.json +++ b/composer.json @@ -4,27 +4,27 @@ "description": "Symfony bundle for implementing Cookie Consent to comply to AVG/GDPR.", "license": "MIT", "require": { - "php": "^7.2 || ^8.0", + "php": "^7.2 || ^8.0.2", "doctrine/annotations": "^1.6", "doctrine/doctrine-bundle": "^1.10 || ^2.0", "doctrine/orm": "^2.5", - "symfony/asset": "^4.4 || ^5.4 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/doctrine-bridge": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/expression-language": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/form": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/templating": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/translation": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/twig-bridge": "^4.4 || ^5.4 || ^6.0 || ^6.1", - "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.0 || ^6.1", + "symfony/asset": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/dependency-injection": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/doctrine-bridge": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/expression-language": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/form": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/framework-bundle": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/http-foundation": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/templating": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/translation": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/twig-bridge": "^3.4 || ^4.2 || ^5.0 || ^6.0", + "symfony/twig-bundle": "^3.4 || ^4.2 || ^5.0 || ^6.0", "twig/twig": "^2.6 || ^3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", "phpunit/phpunit": "^7.5", - "symfony/yaml": "^4.4 || ^5.4 || ^6.0 || ^6.1" + "symfony/yaml": "^3.4 || ^4.2 || ^5.0 || ^6.0" }, "prefer-stable": true, "autoload": { From 4a6caee67326cfea35a4223ecb364f431052cdb9 Mon Sep 17 00:00:00 2001 From: Martin de Keijzer Date: Mon, 27 Feb 2023 10:56:38 +0100 Subject: [PATCH 5/5] Allow Doctrine annotations 2.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 35440db..a7c2576 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "license": "MIT", "require": { "php": "^7.2 || ^8.0.2", - "doctrine/annotations": "^1.6", + "doctrine/annotations": "^1.6|^2.0", "doctrine/doctrine-bundle": "^1.10 || ^2.0", "doctrine/orm": "^2.5", "symfony/asset": "^3.4 || ^4.2 || ^5.0 || ^6.0",