Add tests for classes with non variadic and variadic arguments in constructor

Author: adrian-martinez-interactiv4

lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php

@@ -251,7 +251,7 @@ protected function resolveArgumentsInRuntime($requestedType, array $parameters,
             }
 
             if ($isVariadic && is_array($argument)) {
-                $resolvedArguments += $argument;
+                $resolvedArguments = array_merge($resolvedArguments, $argument);
             } else {
                 $this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);
                 $resolvedArguments[] = $argument;

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php

@@ -314,4 +314,131 @@ public function testCreateVariadicFromDiConfig()
         $this->assertSame($oneScalar1, $variadic->getOneScalarByKey(0));
         $this->assertSame($oneScalar2, $variadic->getOneScalarByKey(1));
     }
+
+    /**
+     * Test create objects with non variadic and variadic argument in constructor
+     *
+     * @param        $createArgs
+     * @param        $expectedFooValue
+     * @param        $expectedArg0
+     * @param        $expectedArg1
+     * @dataProvider testCreateUsingSemiVariadicDataProvider
+     */
+    public function testCreateUsingSemiVariadic(
+        $createArgs,
+        $expectedFooValue,
+        $expectedArg0,
+        $expectedArg1
+    ) {
+        $type = \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::class;
+        $definitions = $this->createMock(\Magento\Framework\ObjectManager\DefinitionInterface::class);
+
+        $definitions->expects($this->once())->method('getParameters')->with($type)->will(
+            $this->returnValue(
+                [
+                    [
+                        'foo',
+                        null,
+                        false,
+                        \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                        false
+                    ],
+                    [
+                        'oneScalars',
+                        \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class,
+                        false,
+                        [],
+                        true
+                    ],
+                ]
+            )
+        );
+        $factory = new Developer($this->config, null, $definitions);
+
+        /**
+         * @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic $semiVariadic
+         */
+        $semiVariadic = is_null($createArgs)
+            ? $factory->create($type)
+            : $factory->create($type, $createArgs);
+
+        $this->assertSame($expectedFooValue, $semiVariadic->getFoo());
+        $this->assertSame($expectedArg0, $semiVariadic->getOneScalarByKey(0));
+        $this->assertSame($expectedArg1, $semiVariadic->getOneScalarByKey(1));
+    }
+
+    /**
+     * @return array
+     */
+    public function testCreateUsingSemiVariadicDataProvider()
+    {
+        $oneScalar1 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+        $oneScalar2 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+
+        return [
+            'without_args'    => [
+                null,
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                null,
+                null,
+            ],
+            'with_empty_args' => [
+                [],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                null,
+                null,
+            ],
+            'only_with_foo_value' => [
+                [
+                    'foo' => 'baz'
+                ],
+                'baz',
+                null,
+                null,
+            ],
+            'only_with_oneScalars_empty_value' => [
+                [
+                    'oneScalars' => []
+                ],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                null,
+                null,
+            ],
+            'only_with_oneScalars_full_value' => [
+                [
+                    'oneScalars' => [
+                        $oneScalar1,
+                        $oneScalar2,
+                    ]
+                ],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                $oneScalar1,
+                $oneScalar2,
+            ],
+            'with_all_values_defined_in_right_order' => [
+                [
+                    'foo' => 'baz',
+                    'oneScalars' => [
+                        $oneScalar1,
+                        $oneScalar2,
+                    ]
+                ],
+                'baz',
+                $oneScalar1,
+                $oneScalar2,
+            ],
+            'with_all_values_defined_in_reverse_order' => [
+                [
+                    'oneScalars' => [
+                        $oneScalar1,
+                        $oneScalar2,
+                    ],
+                    'foo' => 'baz',
+                ],
+                'baz',
+                $oneScalar1,
+                $oneScalar2,
+            ],
+        ];
+    }
 }

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/SemiVariadic.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture;
+
+/**
+ * Constructor with non variadic and variadic argument in constructor
+ */
+class SemiVariadic
+{
+    const DEFAULT_FOO_VALUE = 'bar';
+    /**
+     * @var OneScalar[]
+     */
+    private $oneScalars;
+
+    /**
+     * @var string
+     */
+    private $foo;
+
+    /**
+     * SemiVariadic constructor.
+     * @param string $foo
+     * @param OneScalar[] ...$oneScalars
+     */
+    public function __construct(
+        string $foo = self::DEFAULT_FOO_VALUE,
+        OneScalar ...$oneScalars
+    ) {
+        $this->foo = $foo;
+        $this->oneScalars = $oneScalars;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getOneScalarByKey($key)
+    {
+        return $this->oneScalars[$key] ?? null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFoo(): string
+    {
+        return $this->foo;
+    }
+}