Fix bug introduced by APIP 4.3.3

Author: silverbackdan

.symfony.insight.yaml

@@ -1,4 +1,4 @@
-php_version: 8.4
+php_version: 8.5
 rules:
     doctrine.public_doctrine_property:
         enabled: false

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=8.4",
+        "php": ">=8.5",
         "ext-exif": "*",
         "ext-fileinfo": "*",
         "ext-json": "*",

features/bootstrap/DoctrineContext.php

@@ -298,7 +298,7 @@ public function thereIsADummyComponent(): DummyComponent
     }
 
     /**
-     * @Given(removed as was not used in features, only internal) there is a DummyPublishableComponent
+     * @Given there is a DummyPublishableComponent
      */
     public function thereIsADummyPublishableComponent(): DummyPublishableComponent
     {
@@ -387,7 +387,7 @@ public function thereIsAComponentGroupWithComponents(int $count, ?string $id = n
         if ($id) {
             $reflection = new \ReflectionClass($componentGroup);
             $reflectionProp = $reflection->getProperty('id');
-            $reflectionProp->setAccessible(true);
+//            $reflectionProp->setAccessible(true);
             $reflectionProp->setValue($componentGroup, Uuid::fromString($id));
             $this->manager->flush();
             $repo = $this->manager->getRepository(ComponentGroup::class);

features/main/component_groups.feature

@@ -59,15 +59,16 @@ Feature: ComponentGroup resource
   Scenario: I can add a component collection to pages and layouts
     Given there is a Page
     And there is a Layout
-    And there is a DummyComponent
+    And there is a DummyPublishableComponent
     When I send a "POST" request to "/_/component_groups" with data:
-     | reference | location  | pages                             | layouts                             | components                                   |
-     | main_body | main      | json_decode([ "resource[page]" ]) | json_decode([ "resource[layout]" ]) | json_decode([ "resource[dummy_component]" ]) |
+     | reference | location                                   | pages                             | layouts                             | components                                   |
+     | main_body | resource[dummy_publishable_component]      | json_decode([ "resource[page]" ]) | json_decode([ "resource[layout]" ]) | json_decode([ "resource[dummy_publishable_component]" ]) |
     Then the response status code should be 201
     And the JSON should be valid according to the schema file "component_group.schema.json"
     And the JSON node "pages[0]" should be equal to the IRI of the resource "page"
     And the JSON node "layouts[0]" should be equal to the IRI of the resource "layout"
-    And the JSON node "components[0]" should be equal to the IRI of the resource "dummy_component"
+    And the JSON node "location" should be equal to the IRI of the resource "dummy_publishable_component"
+    And the JSON node "components[0]" should be equal to the IRI of the resource "dummy_publishable_component"
 
   @loginAdmin
   Scenario: If a component group is orphaned it should be deleted

src/Entity/User/AbstractUser.php

@@ -404,7 +404,7 @@ public static function createFromPayload($username, array $payload): JWTUserInte
 
         $reflection = new \ReflectionClass(static::class);
         $idProperty = $reflection->getProperty('id');
-        $idProperty->setAccessible(true);
+//        $idProperty->setAccessible(true);
         $idProperty->setValue($newUser, Uuid::fromString($payload['id']));
 
         return $newUser;

src/EventListener/Api/PublishableEventListener.php

@@ -230,14 +230,14 @@ private function mergeDraftIntoPublished(string $identifierFieldName, object $dr
         }
 
         foreach ($properties as $property) {
-            $property->setAccessible(true);
+//            $property->setAccessible(true);
             $name = $property->getName();
             if ($identifierFieldName === $name) {
                 continue;
             }
             $draftProperty = $draftReflection->hasProperty($name) ? $draftReflection->getProperty($name) : null;
             if ($draftProperty) {
-                $draftProperty->setAccessible(true);
+//                $draftProperty->setAccessible(true);
                 $draftValue = $draftProperty->getValue($draftResource);
                 $property->setValue($publishedResource, $draftValue);
             }

src/Serializer/Normalizer/PublishableNormalizer.php

@@ -45,6 +45,7 @@
  */
 final class PublishableNormalizer implements NormalizerInterface, NormalizerAwareInterface, DenormalizerInterface, DenormalizerAwareInterface
 {
+    use DenormalizerAwareTrait;
     use DenormalizerAwareTrait;
     use NormalizerAwareTrait;
 
@@ -258,7 +259,7 @@ public function createDraft(object $object, Publishable $configuration, string $
      */
     public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        return !isset($context[self::ALREADY_CALLED]) && $this->publishableStatusChecker->getAttributeReader()->isConfigured($type);
+        return !isset($context[self::ALREADY_CALLED]) && $this->publishableStatusChecker->getAttributeReader()->isConfigured($type) && is_array($data);
     }
 
     private function getManagerFromType(string $type): ObjectManager