@@ -61,11 +61,11 @@ public function __construct($dependentEntities = null)
6161 * @param EntityDataObject $entityObject
6262 * @param array $operationMetadata
6363 * @param string $operation
64- * @param integer $depth
64+ * @param bool $fromArray
6565 * @return array
6666 * @throws \Exception
6767 */
68- public function resolveOperationDataArray ($ entityObject , $ operationMetadata , $ operation , $ depth = 0 )
68+ public function resolveOperationDataArray ($ entityObject , $ operationMetadata , $ operation , $ fromArray = false )
6969 {
7070 $ operationDataArray = [];
7171 self ::incrementSequence ($ entityObject ->getName ());
@@ -87,9 +87,9 @@ public function resolveOperationDataArray($entityObject, $operationMetadata, $op
8787 $ entityObj ,
8888 $ operationElement ->getNestedMetadata (),
8989 $ operation ,
90- $ depth + 1
90+ $ fromArray
9191 );
92- if ($ depth == 0 ) {
92+ if (! $ fromArray ) {
9393 $ operationDataArray [$ operationElement ->getKey ()] = $ operationData ;
9494 } else {
9595 $ operationDataArray = $ operationData ;
@@ -148,7 +148,7 @@ public function resolveOperationDataArray($entityObject, $operationMetadata, $op
148148 $ entityName ,
149149 $ operationElement ,
150150 $ operation ,
151- $ depth
151+ $ fromArray
152152 );
153153
154154 if ($ operationElement ->getType () == OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY ) {
@@ -254,10 +254,10 @@ private function resolveOperationObjectAndEntityData($entityObject, $operationEl
254254 * @param string $entityName
255255 * @param OperationElement $operationElement
256256 * @param string $operation
257- * @param integer $depth
257+ * @param bool $fromArray
258258 * @return array
259259 */
260- private function resolveNonPrimitiveElement ($ entityName , $ operationElement , $ operation , $ depth )
260+ private function resolveNonPrimitiveElement ($ entityName , $ operationElement , $ operation , $ fromArray = false )
261261 {
262262 $ linkedEntityObj = $ this ->resolveLinkedEntityObject ($ entityName );
263263
@@ -269,7 +269,7 @@ private function resolveNonPrimitiveElement($entityName, $operationElement, $ope
269269 $ linkedEntityObj ,
270270 [$ operationElement ->getNestedOperationElement ($ operationElement ->getValue ())],
271271 $ operation ,
272- $ depth + 1
272+ true
273273 );
274274
275275 return $ operationSubArray ;
@@ -280,7 +280,7 @@ private function resolveNonPrimitiveElement($entityName, $operationElement, $ope
280280 $ linkedEntityObj ->getType ()
281281 )->getOperationMetadata ();
282282
283- return $ this ->resolveOperationDataArray ($ linkedEntityObj , $ operationMetadata , $ operation );
283+ return $ this ->resolveOperationDataArray ($ linkedEntityObj , $ operationMetadata , $ operation, $ fromArray );
284284 }
285285
286286 /**
0 commit comments