Merge branch 'master' into union-types-deserialisation

schmittjoh · Jun 11, 2024 · c9dba7b · c9dba7b
2 parents 6532bda + 4478166
commit c9dba7b
Show file tree

Hide file tree

Showing 160 changed files with 1,387 additions and 1,073 deletions.
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -14,9 +14,8 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "8.0"
-          - "8.1"
+          - "7.4"
+          - "8.2"
 
     steps:
       - name: Checkout code
@@ -29,7 +28,7 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
-        
+
       - name: Run performance benchmarks
         run: |
           vendor/bin/phpbench run tests/Benchmark/Performance --report=aggregate

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,15 +15,17 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
           - "8.2"
         dependencies:
           - "lowest"
           - "highest"
+        include:
+          - php-version: '8.3'
+            dependencies: 'highest'
+            composer-stability: 'dev'
 
     env:
       JMS_TESTS_SHOW_DEPRECATIONS: 1
@@ -37,6 +39,13 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
 
+      - name: Composer config
+        if: ${{ matrix.composer-stability }}
+        run: composer config minimum-stability ${{ matrix.composer-stability }}
+
+      - name: Uninstall Doctrine ODM
+        run: composer remove doctrine/phpcr-odm jackalope/jackalope-doctrine-dbal --no-update --dev
+
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:

diff --git a/.github/workflows/coding-standards.yaml b/.github/workflows/coding-standards.yaml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
+          - "7.4"
 
     steps:
       - name: "Checkout"

diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -38,3 +38,7 @@ jobs:
 
       - name: "Run a static analysis with phpstan/phpstan"
         run: "vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr"
+
+      - name: "Run a static analysis with rector/rector"
+        run: "vendor/bin/rector --dry-run"
+        if: ${{ matrix.php-version == 8.2 }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+New versions can be found on the [realeases page](https://github.com/schmittjoh/serializer/releases)
+
 ## [3.15.0](https://github.com/schmittjoh/serializer/tree/3.15.0) (2021-10-14)
 
 **Merged pull requests:**

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -5,6 +5,15 @@ Unreleased
 - Deprecated the `@ReadOnly` annotation due to `readonly` becoming a keyword in PHP 8.1, use the `@ReadOnlyProperty` annotation instead
 - Doctrine type `decimal` is now correctly mapped to `string` instead of `float`
 
+From 3.x to 3.30.0
+==================
+
+Starting from this release [doctrine/annotations](https://github.com/doctrine/annotations) is an optional package. 
+If you still want to use them, please make sure that you require in `composer.json` file.
+
+We strongly recommend to start using [Attributes](https://www.php.net/manual/en/language.attributes.overview.php) with PHP 8. 
+You can easily migrate annotations to attributes with [rector](https://github.com/rectorphp/rector) and `Rector\Symfony\Set\SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES` rules.  
+
 From 2.x to 3.0.0
 =================
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,13 @@
     "name": "jms/serializer",
     "type": "library",
     "description": "Library for (de-)serializing data of any complexity; supports XML, and JSON.",
-    "keywords": ["serialization", "deserialization", "json", "jaxb", "xml"],
+    "keywords": [
+        "serialization",
+        "deserialization",
+        "json",
+        "jaxb",
+        "xml"
+    ],
     "homepage": "http://jmsyst.com/libs/serializer",
     "license": "MIT",
     "authors": [
@@ -16,12 +22,11 @@
         }
     ],
     "require": {
-        "php": "^7.2||^8.0",
-        "doctrine/annotations": "^1.13 || ^2.0",
-        "doctrine/instantiator": "^1.0.3 || ^2.0",
+        "php": "^7.4 || ^8.0",
+        "doctrine/instantiator": "^1.3.1 || ^2.0",
         "doctrine/lexer": "^2.0 || ^3.0",
         "jms/metadata": "^2.6",
-        "phpstan/phpdoc-parser": "^0.4 || ^0.5 || ^1.0"
+        "phpstan/phpdoc-parser": "^1.20"
     },
     "suggest": {
         "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
@@ -31,25 +36,27 @@
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
-        "doctrine/coding-standard": "^9.0",
-        "doctrine/orm": "~2.1",
-        "doctrine/persistence": "^1.3.3|^2.0|^3.0",
-        "doctrine/phpcr-odm": "^1.3|^2.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-        "ocramius/proxy-manager": "^1.0|^2.0",
+        "doctrine/annotations": "^1.14 || ^2.0",
+        "doctrine/coding-standard": "^12.0",
+        "doctrine/orm": "^2.14 || ^3.0",
+        "doctrine/persistence": "^2.5.2 || ^3.0",
+        "doctrine/phpcr-odm": "^1.5.2 || ^2.0",
+        "jackalope/jackalope-doctrine-dbal": "^1.3",
+        "ocramius/proxy-manager": "^1.0 || ^2.0",
         "phpbench/phpbench": "^1.0",
-        "phpstan/phpstan": "^1.0.2",
-        "phpunit/phpunit": "^8.5.21||^9.0||^10.0",
-        "psr/container": "^1.0|^2.0",
-        "symfony/dependency-injection": "^3.0|^4.0|^5.0|^6.0",
-        "symfony/expression-language": "^3.2|^4.0|^5.0|^6.0",
-        "symfony/filesystem": "^3.0|^4.0|^5.0|^6.0",
-        "symfony/form": "^3.0|^4.0|^5.0|^6.0",
-        "symfony/translation": "^3.0|^4.0|^5.0|^6.0",
-        "symfony/uid": "^5.1|^6.0",
-        "symfony/validator": "^3.1.9|^4.0|^5.0|^6.0",
-        "symfony/yaml": "^3.3|^4.0|^5.0|^6.0",
-        "twig/twig": "~1.34|~2.4|^3.0"
+        "phpstan/phpstan": "^1.10.57",
+        "phpunit/phpunit": "^9.0 || ^10.0 || ^11.0",
+        "psr/container": "^1.0 || ^2.0",
+        "rector/rector": "^1.0.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/expression-language": "^5.4 || ^6.0 || ^7.0",
+        "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+        "symfony/form": "^5.4 || ^6.0 || ^7.0",
+        "symfony/translation": "^5.4 || ^6.0 || ^7.0",
+        "symfony/uid": "^5.4 || ^6.0 || ^7.0",
+        "symfony/validator": "^5.4 || ^6.0 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
+        "twig/twig": "^1.34 || ^2.4 || ^3.0"
     },
     "autoload": {
         "psr-4": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ jobs: @@
         strategy:
           matrix:
             php-version:
-              - "7.2"
+              - "7.4"
         steps:
           - name: "Checkout"
@@ Expand Down @@