Merge branch '4.0'

api-platform · Sep 21, 2024 · 034fcbc · 034fcbc
2 parents e2d232a + 55ec1ee
commit 034fcbc
Show file tree

Hide file tree

Showing 75 changed files with 702 additions and 162 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,14 +1,18 @@
-/.editorconfig export-ignore
-/.gitattributes export-ignore
-/.github export-ignore
-/.gitignore export-ignore
-/.php_cs.dist export-ignore
+*.sh export-ignore
+.editorconfig export-ignore
+.gitattributes export-ignore
+.github export-ignore
+.gitignore export-ignore
+.php-cs-fixer.dist.php export-ignore
+phpstan.neon.dist export-ignore
+phpunit.xml.dist export-ignore
+/.commitlintrc export-ignore
 /appveyor.yml export-ignore
 /behat.yml.dist export-ignore
+/codecov.yml
 /docs export-ignore
 /features export-ignore
-/phpstan.neon.dist export-ignore
-/phpunit.xml.dist export-ignore
+/package-lock.json export-ignore
+/pmu.baseline
 /tests export-ignore
-/update-js.sh export-ignore
 /yarn.lock export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 *.log
 /.php-cs-fixer.php
 /.php-cs-fixer.cache

diff --git a/composer.json b/composer.json
@@ -1,7 +1,66 @@
 {
-    "name": "api-platform/core",
+    "authors": [
+        {
+            "name": "Kévin Dunglas",
+            "email": "[email protected]",
+            "homepage": "https://dunglas.fr"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "ApiPlatform\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ApiPlatform\\Tests\\": "tests/",
+            "App\\": "tests/Fixtures/app/var/tmp/src/"
+        }
+    },
+    "config": {
+        "preferred-install": {
+            "*": "dist"
+        },
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "phpstan/extension-installer": true,
+            "php-http/discovery": true,
+            "soyuka/pmu": true
+        }
+    },
+    "conflict": {
+        "doctrine/common": "<3.2.2",
+        "doctrine/dbal": "<2.10",
+        "doctrine/orm": "<2.14.0",
+        "doctrine/mongodb-odm": "<2.4",
+        "doctrine/persistence": "<1.3",
+        "symfony/framework-bundle": "6.4.6 || 7.0.6",
+        "symfony/var-exporter": "<6.1.1",
+        "phpunit/phpunit": "<9.5",
+        "phpspec/prophecy": "<1.15"
+    },
     "description": "Build a fully-featured hypermedia or GraphQL API in minutes!",
-    "type": "library",
+    "extra": {
+        "branch-alias": {
+            "dev-3.4": "3.4.x-dev",
+            "dev-main": "4.0.x-dev"
+        },
+        "symfony": {
+            "require": "^6.4 || ^7.1"
+        },
+        "pmu": {
+            "projects": [
+                "./src/*/composer.json",
+                "src/Doctrine/*/composer.json"
+            ]
+        },
+        "thanks": {
+            "name": "api-platform/api-platform",
+            "url": "https://github.com/api-platform/api-platform"
+        }
+    },
+    "homepage": "https://api-platform.com",
     "keywords": [
         "REST",
         "GraphQL",
@@ -15,15 +74,31 @@
         "Symfony",
         "Laravel"
     ],
-    "homepage": "https://api-platform.com",
     "license": "MIT",
-    "authors": [
-        {
-            "name": "Kévin Dunglas",
-            "email": "[email protected]",
-            "homepage": "https://dunglas.fr"
-        }
-    ],
+    "name": "api-platform/core",
+    "replace": {
+        "api-platform/doctrine-common": "self.version",
+        "api-platform/doctrine-odm": "self.version",
+        "api-platform/doctrine-orm": "self.version",
+        "api-platform/documentation": "self.version",
+        "api-platform/elasticsearch": "self.version",
+        "api-platform/graphql": "self.version",
+        "api-platform/http-cache": "self.version",
+        "api-platform/hydra": "self.version",
+        "api-platform/json-api": "self.version",
+        "api-platform/json-hal": "self.version",
+        "api-platform/json-schema": "self.version",
+        "api-platform/jsonld": "self.version",
+        "api-platform/laravel": "self.version",
+        "api-platform/metadata": "self.version",
+        "api-platform/openapi": "self.version",
+        "api-platform/parameter-validator": "self.version",
+        "api-platform/ramsey-uuid": "self.version",
+        "api-platform/serializer": "self.version",
+        "api-platform/state": "self.version",
+        "api-platform/symfony": "self.version",
+        "api-platform/validator": "self.version"
+    },
     "require": {
         "php": ">=8.2",
         "doctrine/inflector": "^1.0 || ^2.0",
@@ -40,24 +115,24 @@
         "willdurand/negotiation": "^3.1"
     },
     "require-dev": {
-        "api-platform/json-schema": "^3.4 || ^4.0",
-        "api-platform/metadata": "^3.4 || ^4.0",
-        "api-platform/state": "^3.4 || ^4.0",
         "api-platform/doctrine-common": "^3.4 || ^4.0",
         "api-platform/doctrine-odm": "^3.4 || ^4.0",
         "api-platform/doctrine-orm": "^3.4 || ^4.0",
+        "api-platform/documentation": "^3.4 || ^4.0",
+        "api-platform/elasticsearch": "^3.4 || ^4.0",
+        "api-platform/graphql": "^3.4 || ^4.0",
+        "api-platform/http-cache": "^3.4 || ^4.0",
+        "api-platform/hydra": "^3.4 || ^4.0",
+        "api-platform/json-api": "^3.3 || ^4.0",
+        "api-platform/json-schema": "^3.4 || ^4.0",
+        "api-platform/jsonld": "^3.4 || ^4.0",
+        "api-platform/metadata": "^3.4 || ^4.0",
         "api-platform/openapi": "^3.4 || ^4.0",
         "api-platform/ramsey-uuid": "^3.4 || ^4.0",
-        "api-platform/jsonld": "^3.4 || ^4.0",
         "api-platform/json-hal": "^3.4 || ^4.0",
         "api-platform/serializer": "^3.4 || ^4.0",
-        "api-platform/json-api": "^3.3 || ^4.0",
-        "api-platform/http-cache": "^3.4 || ^4.0",
-        "api-platform/elasticsearch": "^3.4 || ^4.0",
-        "api-platform/hydra": "^3.4 || ^4.0",
-        "api-platform/documentation": "^3.4 || ^4.0",
+        "api-platform/state": "^3.4 || ^4.0",
         "api-platform/validator": "^3.4 || ^4.0",
-        "api-platform/graphql": "^3.4 || ^4.0",
         "behat/behat": "^3.11",
         "behat/mink": "^1.9",
         "doctrine/cache": "^1.11 || ^2.1",
@@ -130,17 +205,6 @@
         "twig/twig": "^1.42.3 || ^2.12 || ^3.0",
         "webonyx/graphql-php": "^15.0"
     },
-    "conflict": {
-        "doctrine/common": "<3.2.2",
-        "doctrine/dbal": "<2.10",
-        "doctrine/orm": "<2.14.0",
-        "doctrine/mongodb-odm": "<2.4",
-        "doctrine/persistence": "<1.3",
-        "symfony/framework-bundle": "6.4.6 || 7.0.6",
-        "symfony/var-exporter": "<6.1.1",
-        "phpunit/phpunit": "<9.5",
-        "phpspec/prophecy": "<1.15"
-    },
     "suggest": {
         "doctrine/mongodb-odm-bundle": "To support MongoDB. Only versions 4.0 and later are supported.",
         "elasticsearch/elasticsearch": "To support Elasticsearch.",
@@ -159,46 +223,5 @@
         "symfony/web-profiler-bundle": "To use the data collector.",
         "webonyx/graphql-php": "To support GraphQL."
     },
-    "autoload": {
-        "psr-4": {
-            "ApiPlatform\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "ApiPlatform\\Tests\\": "tests/",
-            "App\\": "tests/Fixtures/app/var/tmp/src/",
-            "Workbench\\App\\": "src/Laravel/workbench/app/",
-            "Workbench\\Database\\Factories\\": "src/Laravel/workbench/database/factories/",
-            "Workbench\\Database\\Seeders\\": "src/Laravel/workbench/database/seeders/"
-        }
-    },
-    "config": {
-        "preferred-install": {
-            "*": "dist"
-        },
-        "sort-packages": true,
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "phpstan/extension-installer": true,
-            "php-http/discovery": true,
-            "soyuka/pmu": true
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-3.4": "3.4.x-dev",
-            "dev-main": "4.0.x-dev"
-        },
-        "symfony": {
-            "require": "^6.4 || ^7.0"
-        },
-        "pmu": {
-            "projects": ["./src/*/composer.json", "src/Doctrine/*/composer.json"]
-        },
-        "thanks": {
-            "name": "api-platform/api-platform",
-            "url": "https://github.com/api-platform/api-platform"
-        }
-    }
+    "type": "library"
 }
diff --git a/src/Doctrine/Common/.gitattributes b/src/Doctrine/Common/.gitattributes
@@ -1,2 +1,5 @@
+/.github export-ignore
+/.gitattributes export-ignore
 /.gitignore export-ignore
 /Tests export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/src/Doctrine/Common/.github/workflows/close_pr.yml b/src/Doctrine/Common/.github/workflows/close_pr.yml
@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+    pull_request_target:
+        types: [opened]
+
+jobs:
+    run:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: superbrothers/close-pull-request@v3
+              with:
+                  comment: "Thank you for your pull request. However, you have submitted this PR on a read-only sub split of `api-platform/core`. Please submit your PR on the https://github.com/api-platform/core repository.<br><br>Thanks!"
diff --git a/src/Doctrine/Common/README.md b/src/Doctrine/Common/README.md
@@ -1,7 +1,12 @@
-# API Platform - Doctrine Common
+# API Platform - Doctrine Common Support
 
-Common files used by api-platform/doctrine-orm and api-platform/doctrine-odm
-
-## Resources
+Integration for [Doctrine](https://www.doctrine-project.org) with the [API Platform](https://api-platform.com) framework.
 
+[Documentation](https://api-platform.com/docs/core/getting-started/)
 
+> [!CAUTION]
+>
+> This is a read-only sub split of `api-platform/core`, please
+> [report issues](https://github.com/api-platform/core/issues) and
+> [send Pull Requests](https://github.com/api-platform/core/pulls)
+> in the [core API Platform repository](https://github.com/api-platform/core).
diff --git a/src/Doctrine/Odm/.gitattributes b/src/Doctrine/Odm/.gitattributes
@@ -1,2 +1,5 @@
+/.github export-ignore
+/.gitattributes export-ignore
 /.gitignore export-ignore
 /Tests export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/src/Doctrine/Odm/.github/workflows/close_pr.yml b/src/Doctrine/Odm/.github/workflows/close_pr.yml
@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+    pull_request_target:
+        types: [opened]
+
+jobs:
+    run:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: superbrothers/close-pull-request@v3
+              with:
+                  comment: "Thank you for your pull request. However, you have submitted this PR on a read-only sub split of `api-platform/core`. Please submit your PR on the https://github.com/api-platform/core repository.<br><br>Thanks!"
diff --git a/src/Doctrine/Odm/README.md b/src/Doctrine/Odm/README.md
@@ -0,0 +1,12 @@
+# API Platform - Doctrine MongoDB ODM Support
+
+Integration for [Doctrine MongoDB ODM](https://www.doctrine-project.org/projects/doctrine-mongodb-odm/en/current/index.html) with the [API Platform](https://api-platform.com) framework.
+
+[Documentation](https://api-platform.com/docs/core/mongodb/)
+
+> [!CAUTION]
+>
+> This is a read-only sub split of `api-platform/core`, please
+> [report issues](https://github.com/api-platform/core/issues) and
+> [send Pull Requests](https://github.com/api-platform/core/pulls)
+> in the [core API Platform repository](https://github.com/api-platform/core).
diff --git a/src/Doctrine/Odm/composer.json b/src/Doctrine/Odm/composer.json
@@ -28,14 +28,14 @@
         "api-platform/doctrine-common": "^3.4 || ^4.0",
         "api-platform/metadata": "^3.4 || ^4.0",
         "api-platform/state": "^3.4 || ^4.0",
-        "doctrine/mongodb-odm": "^2.6",
-        "doctrine/mongodb-odm-bundle": "^4.0 || ^5.0",
-        "symfony/property-info": "^6.4 || ^7.0"
+        "doctrine/mongodb-odm": "^2.2",
+        "symfony/property-info": "^6.4 || ^7.1"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.11",
-        "phpspec/prophecy-phpunit": "^2.2",
-        "phpunit/phpunit": "^11.2",
+        "doctrine/mongodb-odm-bundle": "^5.0",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^10.0",
         "symfony/cache": "^6.4 || ^7.0",
         "symfony/framework-bundle": "^6.4 || ^7.0",
         "symfony/property-access": "^6.4 || ^7.0",

diff --git a/src/Doctrine/Orm/.gitattributes b/src/Doctrine/Orm/.gitattributes
@@ -1,2 +1,5 @@
+/.github export-ignore
+/.gitattributes export-ignore
 /.gitignore export-ignore
 /Tests export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/src/Doctrine/Orm/.github/workflows/close_pr.yml b/src/Doctrine/Orm/.github/workflows/close_pr.yml
@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+    pull_request_target:
+        types: [opened]
+
+jobs:
+    run:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: superbrothers/close-pull-request@v3
+              with:
+                  comment: "Thank you for your pull request. However, you have submitted this PR on a read-only sub split of `api-platform/core`. Please submit your PR on the https://github.com/api-platform/core repository.<br><br>Thanks!"
diff --git a/src/Doctrine/Orm/README.md b/src/Doctrine/Orm/README.md
@@ -0,0 +1,12 @@
+# API Platform - Doctrine ORM Support 
+
+Integration for [Doctrine ORM](https://www.doctrine-project.org/projects/doctrine-orm/en/current/index.html) with the [API Platform](https://api-platform.com) framework.
+
+[Documentation](https://api-platform.com/docs/core/getting-started/)
+
+> [!CAUTION]
+>
+> This is a read-only sub split of `api-platform/core`, please
+> [report issues](https://github.com/api-platform/core/issues) and
+> [send Pull Requests](https://github.com/api-platform/core/pulls)
+> in the [core API Platform repository](https://github.com/api-platform/core).
diff --git a/src/Doctrine/Orm/composer.json b/src/Doctrine/Orm/composer.json
@@ -32,9 +32,9 @@
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.11",
-        "phpspec/prophecy-phpunit": "^2.2",
-        "phpunit/phpunit": "^11.2",
-        "ramsey/uuid": "^4.0",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^10.0",
+        "ramsey/uuid": "^4.7",
         "ramsey/uuid-doctrine": "^2.0",
         "symfony/cache": "^6.4 || ^7.0",
         "symfony/framework-bundle": "^6.4 || ^7.0",

diff --git a/src/Documentation/.gitattributes b/src/Documentation/.gitattributes
@@ -1,2 +1,5 @@
+/.github export-ignore
+/.gitattributes export-ignore
 /.gitignore export-ignore
 /Tests export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/src/Documentation/.github/workflows/close_pr.yml b/src/Documentation/.github/workflows/close_pr.yml
@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+    pull_request_target:
+        types: [opened]
+
+jobs:
+    run:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: superbrothers/close-pull-request@v3
+              with:
+                  comment: "Thank you for your pull request. However, you have submitted this PR on a read-only sub split of `api-platform/core`. Please submit your PR on the https://github.com/api-platform/core repository.<br><br>Thanks!"