Allow LocationCreateStruct objects inside the $locations argument of ContentCreateStructure to have more control over the created locations. (#40)

Author: jeremycr

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 3.1.0
+
+* Allow `LocationCreateStruct` objects inside the `$locations` argument of `ContentCreateStructure` to have more control over the created locations.
+
 # Version 3.0.1
 
 * Bump minimum PHP version to PHP 7.3 like code-rhapsodie/dataflow-bundle dependency.

src/Core/Content/ContentCreator.php

@@ -60,9 +60,15 @@ private function getLocationCreateStructs(array $locations): array
     {
         $locationCreateStructs = [];
 
-        foreach ($locations as $locationOrIdOrRemoteId) {
+        foreach ($locations as $locationOrIdOrRemoteIdOrStruct) {
+            if ($locationOrIdOrRemoteIdOrStruct instanceof LocationCreateStruct) {
+                $locationCreateStructs[] = $locationOrIdOrRemoteIdOrStruct;
+
+                continue;
+            }
+
             $locationCreateStructs[] = new LocationCreateStruct([
-                'parentLocationId' => $this->matcher->matchLocation($locationOrIdOrRemoteId)->id,
+                'parentLocationId' => $this->matcher->matchLocation($locationOrIdOrRemoteIdOrStruct)->id,
             ]);
         }
 

src/Model/ContentCreateStructure.php

@@ -6,6 +6,7 @@
 
 use CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException;
 use eZ\Publish\API\Repository\Values\Content\Location;
+use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct;
 
 class ContentCreateStructure extends ContentStructure
 {
@@ -24,6 +25,7 @@ class ContentCreateStructure extends ContentStructure
      *                         <li>an integer, the id of the Location object</li>
      *                         <li>a string, the remote id of the Location object</li>
      *                         <li>a Location object</li>
+     *                         <li>a LocationCreateStruct object</li>
      *                         </ul>
      *
      * @throws InvalidArgumentTypeException
@@ -52,12 +54,13 @@ public function getLocations(): array
      */
     private function setLocations(array $locations)
     {
-        foreach ($locations as $locationOrIdOrRemoteId) {
-            if (!is_int($locationOrIdOrRemoteId)
-                && !is_string($locationOrIdOrRemoteId)
-                && !$locationOrIdOrRemoteId instanceof Location
+        foreach ($locations as $locationOrIdOrRemoteIdOrStruct) {
+            if (!is_int($locationOrIdOrRemoteIdOrStruct)
+                && !is_string($locationOrIdOrRemoteIdOrStruct)
+                && !$locationOrIdOrRemoteIdOrStruct instanceof Location
+                && !$locationOrIdOrRemoteIdOrStruct instanceof LocationCreateStruct
             ) {
-                throw InvalidArgumentTypeException::create(['int', 'string', Location::class], $locationOrIdOrRemoteId);
+                throw InvalidArgumentTypeException::create(['int', 'string', Location::class, LocationCreateStruct::class], $locationOrIdOrRemoteIdOrStruct);
             }
         }