Merge remote-tracking branch 'upstream/2.6' into merge-26

Author: soyuka

.github/workflows/ci.yml

@@ -17,10 +17,8 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8'
+          - '8.0'
       fail-fast: false
-    env:
-      PHP_CS_FIXER_FUTURE_MODE: '1'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -42,7 +40,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8'
+          - '8.0'
       fail-fast: false
     env:
       APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37

.php-cs-fixer.dist.php

@@ -36,8 +36,6 @@
         '@PHPUnit60Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'single_line_comment_style' => false, // Temporary fix for compatibility with PHP 8 attributes, see https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/5284
-        'comment_to_phpdoc' => true, // Temporary fix for compatibility with PHP 8 attributes, see https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/5284
         'align_multiline_comment' => [
             'comment_type' => 'phpdocs_like',
         ],
@@ -76,9 +74,10 @@
             ],
         ],
         'no_superfluous_elseif' => true,
-        'no_superfluous_phpdoc_tags' => [
-            'allow_mixed' => false,
-        ],
+        // To re-enable in API Platform 3: https://github.com/symfony/symfony/issues/43021
+        //'no_superfluous_phpdoc_tags' => [
+        //    'allow_mixed' => false,
+        //],
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_useless_else' => true,

CHANGELOG.md

@@ -46,6 +46,20 @@
 * Add support for `security_post_validation` attribute
 * Mark the GraphQL subsystem as stable (#4500)
 
+## 2.6.6
+
+* fix(json-schema): consider `SplFileInfo` class as a binary type (#4332)
+* fix(json-schema): use `collectionKeyType` for building JSON Schema (#4385)
+* fix(openapi): failing recursion on api resources with "paths" key (#4325)
+* fix(graphql): make sure form content type is recognized as a multipart request (#4461)
+* fix(doctrine): handle inverse side of OneToOne association in Doctrine search filter (#4366)
+* fix(doctrine): usage of deprecated DBAL type constants (#4399)
+* fix(test): fix `REMOTE_ADDR` support in `ApiTestCase` (#4446)
+* fix(docs): use `asset_package` for all assets (#4470)
+* fix(docs): upgrade Swagger UI to version 3.52.3 (#4477)
+* fix(docs): upgrade ReDoc to version 2.0.0-rc.56 (#4477)
+* fix(docs): upgrade Swagger UI to version 2.0.0-rc.56 (#4477)
+
 ## 2.6.5
 
 * Fix various usage of various deprecated methods

composer.json

@@ -73,6 +73,7 @@
         "symfony/framework-bundle": "^4.4 || ^5.1",
         "symfony/http-client": "^4.4 || ^5.1",
         "symfony/maker-bundle": "^1.24",
+        "symfony/intl": "^4.4 || ^5.3",
         "symfony/mercure-bundle": "*",
         "symfony/messenger": "^4.4 || ^5.1",
         "symfony/phpunit-bridge": "^5.1.7",

features/jsonld/non_resource.feature

@@ -38,6 +38,34 @@ Feature: JSON-LD non-resource handling
     }
     """
 
+  Scenario: Get a resource containing a raw object with selected properties
+    Given there are 1 dummy objects with relatedDummy and its thirdLevel
+    When I send a "GET" request to "/contain_non_resources/1?properties[]=id&properties[nested][notAResource][]=foo&properties[notAResource][]=bar"
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the JSON should be a superset of:
+    """
+    {
+      "@context": "/contexts/ContainNonResource",
+      "@id": "/contain_non_resources/1",
+      "@type": "ContainNonResource",
+      "id": 1,
+      "nested": {
+        "@id": "/contain_non_resources/1-nested",
+        "@type": "ContainNonResource",
+        "notAResource": {
+          "@type": "NotAResource",
+          "foo": "f2"
+        }
+      },
+      "notAResource": {
+        "@type": "NotAResource",
+        "bar": "b1"
+      }
+    }
+    """
+
   @!mongodb
   @createSchema
   Scenario: Create a resource that has a non-resource relation.

src/Api/IdentifiersExtractor.php

@@ -75,6 +75,8 @@ public function getIdentifiersFromItem($item, string $operationName = null, arra
 
     /**
      * Gets the value of the given class property.
+     *
+     * @param mixed $item
      */
     private function getIdentifierValue($item, string $class, string $property, string $parameterName)
     {

src/Core/Api/ResourceClassResolverInterface.php

@@ -27,6 +27,7 @@ interface ResourceClassResolverInterface
      *
      * @param string $resourceClass The expected resource class
      * @param bool   $strict        If true, value must match the expected resource class
+     * @param mixed  $value
      *
      * @throws InvalidArgumentException
      */

src/Core/Bridge/Doctrine/Common/DataPersister.php

@@ -80,6 +80,8 @@ public function remove($data, array $context = [])
 
     /**
      * Gets the Doctrine object manager associated with given data.
+     *
+     * @param mixed $data
      */
     private function getManager($data): ?DoctrineObjectManager
     {
@@ -88,6 +90,8 @@ private function getManager($data): ?DoctrineObjectManager
 
     /**
      * Checks if doctrine does not manage data automatically.
+     *
+     * @param mixed $data
      */
     private function isDeferredExplicit(DoctrineObjectManager $manager, $data): bool
     {

src/Core/Bridge/Doctrine/EventListener/WriteListener.php

@@ -71,6 +71,8 @@ public function onKernelView(ViewEvent $event): void
 
     /**
      * Gets the manager if applicable.
+     *
+     * @param mixed $data
      */
     private function getManager(string $resourceClass, $data): ?ObjectManager
     {

src/Core/Bridge/Doctrine/MongoDbOdm/CollectionDataProvider.php

@@ -38,6 +38,7 @@ final class CollectionDataProvider implements CollectionDataProviderInterface, R
 
     /**
      * @param AggregationCollectionExtensionInterface[] $collectionExtensions
+     * @param mixed                                     $resourceMetadataFactory
      */
     public function __construct(ManagerRegistry $managerRegistry, $resourceMetadataFactory, iterable $collectionExtensions = [])
     {
@@ -56,7 +57,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      *
      * @throws RuntimeException
      */
-    public function getCollection(string $resourceClass, string $operationName = null, array $context = [])
+    public function getCollection(string $resourceClass, string $operationName = null, array $context = []): iterable
     {
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);