Skip to content

Commit

Permalink
Merge pull request #3076 from neos/analysis-e74pRP
Browse files Browse the repository at this point in the history
TASK: Apply fixes from StyleCI
  • Loading branch information
kdambekalns committed Aug 13, 2020
2 parents 1d613eb + 0847882 commit d368a0e
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions Classes/Core/RuntimeConfiguration.php
Expand Up @@ -134,8 +134,12 @@ private function matchCurrentPathPart(string $pathPart, array $previousConfigura
}

if (isset($configuration['__prototypes'])) {
$currentPrototypeDefinitions = Arrays::arrayMergeRecursiveOverruleWithCallback($currentPrototypeDefinitions,
$configuration['__prototypes'], $this->simpleTypeToArrayClosure, $this->shouldOverrideFirstClosure);
$currentPrototypeDefinitions = Arrays::arrayMergeRecursiveOverruleWithCallback(
$currentPrototypeDefinitions,
$configuration['__prototypes'],
$this->simpleTypeToArrayClosure,
$this->shouldOverrideFirstClosure
);
}

$currentPathSegmentType = null;
Expand All @@ -148,8 +152,10 @@ private function matchCurrentPathPart(string $pathPart, array $previousConfigura

if ($currentPathSegmentType !== null) {
$configuration['__objectType'] = $currentPathSegmentType;
$configuration = $this->mergePrototypesWithConfigurationForPathSegment($configuration,
$currentPrototypeDefinitions);
$configuration = $this->mergePrototypesWithConfigurationForPathSegment(
$configuration,
$currentPrototypeDefinitions
);
}

if (is_array($configuration) && !isset($configuration['__value']) && !isset($configuration['__eelExpression']) && !isset($configuration['__meta']['class']) && !isset($configuration['__objectType']) && isset($configuration['__meta']['process'])) {
Expand Down Expand Up @@ -186,7 +192,9 @@ private function mergePrototypesWithConfigurationForPathSegment(array $configura
if (!array_key_exists($prototypeName, $currentPrototypeDefinitions)) {
throw new Exception(sprintf(
'The Fusion object `%s` which you tried to inherit from does not exist. Maybe you have a typo on the right hand side of your inheritance statement for `%s`.',
$prototypeName, $currentPathSegmentType), 1427134340);
$prototypeName,
$currentPathSegmentType
), 1427134340);
}

$currentPrototypeWithInheritanceTakenIntoAccount = Arrays::arrayMergeRecursiveOverruleWithCallback(
Expand Down

0 comments on commit d368a0e

Please sign in to comment.