Skip to content

Commit

Permalink
Remove empty()
Browse files Browse the repository at this point in the history
  • Loading branch information
HypeMC committed May 13, 2022
1 parent 2fb12f5 commit 71cba11
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ protected static function mergeConfigurations(array $firstConfiguration, array $

$firstConfiguration += $secondConfiguration;

if (!empty($extraOptions)) {
if ($extraOptions) {
$firstConfiguration['extra_options'] = $extraOptions;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ public function __invoke(LoggableOutputInterface $loggableOutput): array
$configuration = self::mergeConfigurations($configuration, $annotation->getOptions());
} while (false !== $reflection = $reflection->getParentClass());

return empty($configuration) ? $configuration : $this->containerBag->resolveValue($configuration);
return $configuration ? $this->containerBag->resolveValue($configuration) : $configuration;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ public function __invoke(LoggableOutputInterface $loggableOutput): array
$configuration = self::mergeConfigurations($configuration, $attribute->getOptions());
} while (false !== $reflectionObject = $reflectionObject->getParentClass());

return empty($configuration) ? $configuration : $this->containerBag->resolveValue($configuration);
return $configuration ? $this->containerBag->resolveValue($configuration) : $configuration;
}
}
2 changes: 1 addition & 1 deletion src/ConfigurationProvider/MergedConfigurationProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __invoke(LoggableOutputInterface $loggableOutput): array
$mergedConfiguration = [];

foreach ($this->configurationProviders as $configurationProvider) {
if ([] !== $configuration = $configurationProvider($loggableOutput)) {
if ($configuration = $configurationProvider($loggableOutput)) {
$mergedConfiguration = self::mergeConfigurations($mergedConfiguration, $configuration);
}
}
Expand Down

0 comments on commit 71cba11

Please sign in to comment.