From 7e3988bd16cadd752b644af7a0010bc4cf795a64 Mon Sep 17 00:00:00 2001 From: Artem Henvald Date: Wed, 1 Dec 2021 21:01:58 +0200 Subject: [PATCH 1/7] Update composer.json --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b471953..ddb883a 100644 --- a/composer.json +++ b/composer.json @@ -22,16 +22,16 @@ "issues": "https://github.com/fre5h/VichUploaderSerializationBundle/issues" }, "require": { - "php": ">=7.3.0", + "php": ">=7.4.0", "doctrine/cache": "^1.11", "doctrine/common": "^2.11|^3.0", "doctrine/persistence": "^1.3|^2.0", "jms/serializer-bundle": "^3.7", "monolog/monolog": "^2.0", - "symfony/config": "^5.0", - "symfony/dependency-injection": "^5.0", - "symfony/property-access": "^5.0", - "symfony/routing": "^5.0", + "symfony/config": "^5.0 || v6.0", + "symfony/dependency-injection": "^5.0 || v6.0", + "symfony/property-access": "^5.0 || v6.0", + "symfony/routing": "^5.0 || v6.0", "vich/uploader-bundle": "^1.16" }, "require-dev": { @@ -40,7 +40,7 @@ "phpstan/phpstan-doctrine":"^0.12", "phpstan/phpstan-phpunit": "^0.12", "phpunit/phpunit": "^9.5", - "symfony/yaml": "^5.0" + "symfony/yaml": "^5.0 || v6.0" }, "autoload": { "psr-4": { From 41c41a44c4a6ec51870e9f7eff05f6eed8a11fff Mon Sep 17 00:00:00 2001 From: Artem Henvald Date: Wed, 1 Dec 2021 21:02:20 +0200 Subject: [PATCH 2/7] Update ci.yaml --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2907461..2fcc340 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -86,7 +86,6 @@ jobs: fail-fast: false matrix: php-version: - - '7.3' - '7.4' - '8.0' - '8.1' From 26e3fed94230bf4ad5f490b3907dd7085e4e81ca Mon Sep 17 00:00:00 2001 From: Artem Henvald Date: Wed, 1 Dec 2021 21:02:43 +0200 Subject: [PATCH 3/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4effafc..4d85509 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Allows to generate full or relative URIs to entity fields mapped with `@Vich` an ## Requirements 🧐 -* PHP 7.3, 7.4, 8.0, 8.1 -* Symfony 5.0, 5.1, 5.2, 5.3, 5.4, 6.0 +* PHP >=7.4 +* Symfony >= 5.0 ## Installation 🌱 From 0622734b9309efc5dc858cad066283ab47aaae94 Mon Sep 17 00:00:00 2001 From: Artem Henvald Date: Wed, 1 Dec 2021 21:10:11 +0200 Subject: [PATCH 4/7] Update composer.json --- composer.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index ddb883a..99a52ea 100644 --- a/composer.json +++ b/composer.json @@ -23,22 +23,23 @@ }, "require": { "php": ">=7.4.0", - "doctrine/cache": "^1.11", - "doctrine/common": "^2.11|^3.0", - "doctrine/persistence": "^1.3|^2.0", - "jms/serializer-bundle": "^3.7", - "monolog/monolog": "^2.0", + "doctrine/cache": "^2.1", + "doctrine/common": "^3.2", + "doctrine/persistence": "2.2", + "jms/serializer-bundle": "^4.0", + "monolog/monolog": "^2.3", "symfony/config": "^5.0 || v6.0", "symfony/dependency-injection": "^5.0 || v6.0", "symfony/property-access": "^5.0 || v6.0", "symfony/routing": "^5.0 || v6.0", - "vich/uploader-bundle": "^1.16" + "vich/uploader-bundle": "^1.18" }, "require-dev": { "escapestudios/symfony2-coding-standard": "^3.12", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-doctrine":"^0.12", - "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan": "^1.2", + "phpstan/phpstan-doctrine": "^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "phpstan/phpstan-symfony": "^1.0", "phpunit/phpunit": "^9.5", "symfony/yaml": "^5.0 || v6.0" }, From a5e59fc9f329fb7e3779a5263dcc0e7a58d44e98 Mon Sep 17 00:00:00 2001 From: Artem Henvald Date: Wed, 1 Dec 2021 21:11:42 +0200 Subject: [PATCH 5/7] Update phpstan.neon --- phpstan.neon | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index b47882e..04f50a8 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -2,10 +2,12 @@ includes: - 'vendor/phpstan/phpstan-phpunit/extension.neon' - 'vendor/phpstan/phpstan-phpunit/rules.neon' - 'vendor/phpstan/phpstan-doctrine/extension.neon' + - 'vendor/phpstan/phpstan-symfony/extension.neon' parameters: - level: 8 - excludes_analyse: + level: 9 + excludePaths: - '%rootDir%/../../../Tests/*' - '%rootDir%/../../../vendor/*' fileExtensions: - 'php' + checkGenericClassInNonGenericObjectType: false From 3f4a22f1b359e728de0499d02617c1b8eba92689 Mon Sep 17 00:00:00 2001 From: Artem Henvald Date: Fri, 3 Dec 2021 10:07:26 +0200 Subject: [PATCH 6/7] Update JmsSerializerSubscriber.php --- EventListener/JmsSerializerSubscriber.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EventListener/JmsSerializerSubscriber.php b/EventListener/JmsSerializerSubscriber.php index 5976389..c94ab80 100644 --- a/EventListener/JmsSerializerSubscriber.php +++ b/EventListener/JmsSerializerSubscriber.php @@ -74,7 +74,7 @@ public function __construct(StorageInterface $storage, RequestContext $requestCo } /** - * @return iterable|array[] + * @return array, array> */ public static function getSubscribedEvents(): iterable { From 1a75ba11347e8c8599861b03730111918189742a Mon Sep 17 00:00:00 2001 From: Artem Henvald Date: Fri, 28 Apr 2023 16:21:12 +0300 Subject: [PATCH 7/7] Fix into update (#51) * Update LICENSE * Update composer.json (#46) * Update dependencies for symfony 6 (#49) * Update README.md * Update README.md * Update ci.yaml * Update LICENSE * Update ci.yaml * Update README.md --------- Co-authored-by: Uladzimir Sadkou --- .github/workflows/ci.yaml | 15 ++++++--------- EventListener/JmsSerializerSubscriber.php | 3 ++- LICENSE | 2 +- README.md | 10 +++++----- composer.json | 14 +++++++------- phpstan.neon | 1 + 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2fcc340..446d160 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: - name: 'Setup PHP' uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 ini-values: memory_limit=-1 coverage: none tools: composer:v2 @@ -66,7 +66,7 @@ jobs: - name: 'Setup PHP' uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 ini-values: memory_limit=-1 coverage: none tools: composer:v2 @@ -86,16 +86,13 @@ jobs: fail-fast: false matrix: php-version: - - '7.4' - '8.0' - '8.1' + - '8.2' symfony-version: - - '5.0' - - '5.1' - - '5.2' - - '5.3' - - '5.4' - '6.0' + - '6.1' + - '6.2' steps: - name: 'Checkout Code' uses: actions/checkout@v2 @@ -130,7 +127,7 @@ jobs: - name: 'Setup PHP' uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 ini-values: memory_limit=-1 coverage: pcov tools: composer:v2 diff --git a/EventListener/JmsSerializerSubscriber.php b/EventListener/JmsSerializerSubscriber.php index c94ab80..e8bbd7e 100644 --- a/EventListener/JmsSerializerSubscriber.php +++ b/EventListener/JmsSerializerSubscriber.php @@ -18,6 +18,7 @@ use Fresh\VichUploaderSerializationBundle\Annotation\VichSerializableClass; use Fresh\VichUploaderSerializationBundle\Annotation\VichSerializableField; use Fresh\VichUploaderSerializationBundle\Exception\IncompatibleUploadableAndSerializableFieldAnnotationException; +use Generator; use JMS\Serializer\EventDispatcher\Events; use JMS\Serializer\EventDispatcher\EventSubscriberInterface; use JMS\Serializer\EventDispatcher\ObjectEvent; @@ -76,7 +77,7 @@ public function __construct(StorageInterface $storage, RequestContext $requestCo /** * @return array, array> */ - public static function getSubscribedEvents(): iterable + public static function getSubscribedEvents(): Generator { yield ['event' => Events::PRE_SERIALIZE, 'method' => 'onPreSerialize']; yield ['event' => Events::POST_SERIALIZE, 'method' => 'onPostSerialize']; diff --git a/LICENSE b/LICENSE index 69fe62a..c51384e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2021 Artem Henvald +Copyright (c) 2015-2023 Artem Henvald Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 4d85509..776fd44 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ [JMSSerializerBundle](https://github.com/schmittjoh/JMSSerializerBundle "JMSSerializerBundle"). Allows to generate full or relative URIs to entity fields mapped with `@Vich` and `@JMS` annotations during the serialization. -[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/fre5h/VichUploaderSerializationBundle.svg?style=flat-square)](https://scrutinizer-ci.com/g/fre5h/VichUploaderSerializationBundle/) -[![Build Status](https://img.shields.io/github/workflow/status/fre5h/VichUploaderSerializationBundle/CI/main?style=flat-square)](https://github.com/fre5h/VichUploaderSerializationBundle/actions?query=workflow%3ACI+branch%3Amain+) +[![Scrutinizer Quality Score](https://img.shields.io/github/actions/workflow/status/fre5h/VichUploaderSerializationBundle/ci.yaml?branch=main&style=flat-square)](https://scrutinizer-ci.com/g/fre5h/VichUploaderSerializationBundle/) +[![Build Status](https://img.shields.io/github/actions/workflow/status/fre5h/VichUploaderSerializationBundle/ci.yaml?branch=main&style=flat-square)](https://github.com/fre5h/VichUploaderSerializationBundle/actions?query=workflow%3ACI+branch%3Amain+) [![CodeCov](https://img.shields.io/codecov/c/github/fre5h/VichUploaderSerializationBundle.svg?style=flat-square)](https://codecov.io/github/fre5h/VichUploaderSerializationBundle) [![License](https://img.shields.io/packagist/l/fresh/vich-uploader-serialization-bundle.svg?style=flat-square)](https://packagist.org/packages/fresh/vich-uploader-serialization-bundle) [![Latest Stable Version](https://img.shields.io/packagist/v/fresh/vich-uploader-serialization-bundle.svg?style=flat-square)](https://packagist.org/packages/fresh/vich-uploader-serialization-bundle) @@ -15,12 +15,12 @@ Allows to generate full or relative URIs to entity fields mapped with `@Vich` an ## Requirements 🧐 -* PHP >=7.4 -* Symfony >= 5.0 +* PHP >=8.0 +* Symfony >= 6.0 ## Installation 🌱 -```composer req fresh/vich-uploader-serialization-bundle='~3.2'``` +```composer req fresh/vich-uploader-serialization-bundle='~3.3'``` ## Usage 🧑‍🎓 diff --git a/composer.json b/composer.json index 99a52ea..5532ef7 100644 --- a/composer.json +++ b/composer.json @@ -22,16 +22,16 @@ "issues": "https://github.com/fre5h/VichUploaderSerializationBundle/issues" }, "require": { - "php": ">=7.4.0", + "php": ">=8.0.0", "doctrine/cache": "^2.1", "doctrine/common": "^3.2", "doctrine/persistence": "2.2", - "jms/serializer-bundle": "^4.0", + "jms/serializer-bundle": "^5.0", "monolog/monolog": "^2.3", - "symfony/config": "^5.0 || v6.0", - "symfony/dependency-injection": "^5.0 || v6.0", - "symfony/property-access": "^5.0 || v6.0", - "symfony/routing": "^5.0 || v6.0", + "symfony/config": "^6.0", + "symfony/dependency-injection": "^6.0", + "symfony/property-access": "^6.0", + "symfony/routing": "^6.0", "vich/uploader-bundle": "^1.18" }, "require-dev": { @@ -41,7 +41,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-symfony": "^1.0", "phpunit/phpunit": "^9.5", - "symfony/yaml": "^5.0 || v6.0" + "symfony/yaml": "^6.0" }, "autoload": { "psr-4": { diff --git a/phpstan.neon b/phpstan.neon index 04f50a8..0815614 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -8,6 +8,7 @@ parameters: excludePaths: - '%rootDir%/../../../Tests/*' - '%rootDir%/../../../vendor/*' + - './vendor/*' fileExtensions: - 'php' checkGenericClassInNonGenericObjectType: false