Merge 8b88a9f into c61489e

deprecated-packages · Oct 14, 2018 · 8d6836b · 8d6836b
2 parents c61489e + 8b88a9f
commit 8d6836b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/packages/EasyCodingStandard/packages/FixerRunner/src/Application/FixerFileProcessor.php b/packages/EasyCodingStandard/packages/FixerRunner/src/Application/FixerFileProcessor.php
@@ -78,7 +78,7 @@ public function __construct(
         Skipper $skipper,
         DifferInterface $differ,
         CurrentFileProvider $currentFileProvider,
-        array $fixers = []
+        array $fixers
     ) {
         $this->errorAndDiffCollector = $errorAndDiffCollector;
         $this->skipper = $skipper;

diff --git a/packages/EasyCodingStandard/packages/SniffRunner/src/Application/SniffFileProcessor.php b/packages/EasyCodingStandard/packages/SniffRunner/src/Application/SniffFileProcessor.php
@@ -96,7 +96,7 @@ public function __construct(
         DifferInterface $differ,
         AppliedCheckersCollector $appliedCheckersCollector,
         CurrentFileProvider $currentFileProvider,
-        array $sniffs = []
+        array $sniffs
     ) {
         $this->fixer = $fixer;
         $this->fileFactory = $fileFactory;

diff --git a/packages/LatteToTwigConverter/src/LatteToTwigConverter.php b/packages/LatteToTwigConverter/src/LatteToTwigConverter.php
@@ -16,7 +16,7 @@ final class LatteToTwigConverter
     /**
      * @param CaseConverterInterface[] $caseConverters
      */
-    public function __construct(array $caseConverters = [])
+    public function __construct(array $caseConverters)
     {
         $this->caseConverters = $caseConverters;
     }

diff --git a/packages/MonorepoBuilder/src/DependenciesMerger.php b/packages/MonorepoBuilder/src/DependenciesMerger.php
@@ -36,7 +36,7 @@ public function __construct(
         array $mergeSections,
         JsonFileManager $jsonFileManager,
         MergedPackagesCollector $mergedPackagesCollector,
-        array $composerJsonDecorators = []
+        array $composerJsonDecorators
     ) {
         $this->mergeSections = $mergeSections;
         $this->jsonFileManager = $jsonFileManager;

diff --git a/packages/MonorepoBuilder/src/DependencyInjection/MonorepoBuilderKernel.php b/packages/MonorepoBuilder/src/DependencyInjection/MonorepoBuilderKernel.php
@@ -7,6 +7,7 @@
 use Symfony\Component\HttpKernel\Kernel;
 use Symplify\MonorepoBuilder\Split\DependencyInjection\CompilerPass\DetectParametersCompilerPass;
 use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutoBindParametersCompilerPass;
+use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireArrayParameterCompilerPass;
 use Symplify\PackageBuilder\DependencyInjection\CompilerPass\ConfigurableCollectorCompilerPass;
 use Symplify\PackageBuilder\DependencyInjection\CompilerPass\PublicForTestsCompilerPass;
 use Symplify\PackageBuilder\HttpKernel\SimpleKernelTrait;
@@ -40,6 +41,7 @@ protected function build(ContainerBuilder $containerBuilder): void
         $containerBuilder->addCompilerPass(new ConfigurableCollectorCompilerPass());
         $containerBuilder->addCompilerPass(new DetectParametersCompilerPass());
         $containerBuilder->addCompilerPass(new PublicForTestsCompilerPass());
+        $containerBuilder->addCompilerPass(new AutowireArrayParameterCompilerPass());
         $containerBuilder->addCompilerPass(new AutoBindParametersCompilerPass());
     }
 }
diff --git a/...ackageBuilder/src/DependencyInjection/CompilerPass/AutowireArrayParameterCompilerPass.php b/...ackageBuilder/src/DependencyInjection/CompilerPass/AutowireArrayParameterCompilerPass.php
@@ -60,7 +60,7 @@ private function processParameters(
             }
 
             $parameterType = $this->resolveParameterType($parameterReflection->getName(), $reflectionMethod);
-            if ($parameterType === null || ctype_lower($parameterType[0])) {
+            if ($parameterType === null) {
                 continue;
             }
 
@@ -69,15 +69,9 @@ private function processParameters(
             }
 
             $definitionsOfType = $this->definitionFinder->findAllByType($containerBuilder, $parameterType);
-            // no services of such type were found
-            if ($definitionsOfType === []) {
-                continue;
-            }
 
-            $definition->setArgument(
-                '$' . $parameterReflection->getName(),
-                $this->createReferencesFromDefinitions($definitionsOfType)
-            );
+            $argumentName = '$' . $parameterReflection->getName();
+            $definition->setArgument($argumentName, $this->createReferencesFromDefinitions($definitionsOfType));
         }
     }
 
@@ -91,6 +85,11 @@ private function resolveParameterType(string $parameterName, ReflectionMethod $r
             return null;
         }
 
+        // not a class|interface type
+        if (ctype_lower($result['type'][0])) {
+            return null;
+        }
+
         return Reflection::expandClassName($result['type'], $reflectionMethod->getDeclaringClass());
     }
 

diff --git a/packages/Statie/packages/Latte/src/LatteFactory.php b/packages/Statie/packages/Latte/src/LatteFactory.php
@@ -21,7 +21,7 @@ final class LatteFactory
     /**
      * @param FilterProviderInterface[] $filterProviders
      */
-    public function __construct(ILoader $loader, array $filterProviders = [])
+    public function __construct(ILoader $loader, array $filterProviders)
     {
         $this->loader = $loader;
         $this->filterProviders = $filterProviders;

diff --git a/packages/Statie/packages/Twig/src/TwigFactory.php b/packages/Statie/packages/Twig/src/TwigFactory.php
@@ -39,7 +39,7 @@ public function __construct(
         ArrayLoader $arrayLoader,
         string $twigCacheDirectory,
         FilterExecutor $filterExecutor,
-        array $filterProviders = []
+        array $filterProviders
     ) {
         $this->arrayLoader = $arrayLoader;
         $this->twigCacheDirectory = $twigCacheDirectory;

diff --git a/packages/Statie/src/Renderable/RenderableFilesProcessor.php b/packages/Statie/src/Renderable/RenderableFilesProcessor.php
@@ -33,7 +33,7 @@ final class RenderableFilesProcessor
     /**
      * @param FileDecoratorInterface[] $fileDecorators
      */
-    public function __construct(FileFactory $fileFactory, Configuration $configuration, array $fileDecorators = [])
+    public function __construct(FileFactory $fileFactory, Configuration $configuration, array $fileDecorators)
     {
         $this->fileFactory = $fileFactory;
         $this->configuration = $configuration;