Merge remote-tracking branch 'tsg/develop-pr6' into PRS

Author: slavvka

dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php

@@ -28,7 +28,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Framework\Search\Request\Builder
      */
-    private $requestBuilder;
+    protected $requestBuilder;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
@@ -94,7 +94,7 @@ protected function createAdapter()
     /**
      * @return \Magento\Framework\Search\Response\QueryResponse
      */
-    private function executeQuery()
+    protected function executeQuery()
     {
         /** @var \Magento\Framework\Search\RequestInterface $queryRequest */
         $queryRequest = $this->requestBuilder->create();

lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php

@@ -30,15 +30,16 @@ class Compiled implements ConfigInterface
     private $preferences;
 
     /**
-     * Constructor
-     *
      * @param array $data
      */
     public function __construct($data)
     {
-        $this->arguments = $data['arguments'] ?: [];
-        $this->virtualTypes = $data['instanceTypes'] ?: [];
-        $this->preferences = $data['preferences'] ?: [];
+        $this->arguments = isset($data['arguments']) && is_array($data['arguments'])
+            ? $data['arguments'] : [];
+        $this->virtualTypes = isset($data['instanceTypes']) && is_array($data['instanceTypes'])
+            ? $data['instanceTypes'] : [];
+        $this->preferences = isset($data['preferences']) && is_array($data['preferences'])
+            ? $data['preferences'] : [];
     }
 
     /**
@@ -134,13 +135,13 @@ public function getPreference($type)
      */
     public function extend(array $configuration)
     {
-        $this->arguments = isset($configuration['arguments'])
+        $this->arguments = isset($configuration['arguments']) && is_array($configuration['arguments'])
             ? array_replace($this->arguments, $configuration['arguments'])
             : $this->arguments;
-        $this->virtualTypes = isset($configuration['instanceTypes'])
+        $this->virtualTypes = isset($configuration['instanceTypes']) && is_array($configuration['instanceTypes'])
             ? array_replace($this->virtualTypes, $configuration['instanceTypes'])
             : $this->virtualTypes;
-        $this->preferences = isset($configuration['preferences'])
+        $this->preferences = isset($configuration['preferences']) && is_array($configuration['preferences'])
             ? array_replace($this->preferences, $configuration['preferences'])
             : $this->preferences;
     }

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php

@@ -165,4 +165,122 @@ public function testGetArgumentsNotDefined()
     {
         $this->assertSame(null, $this->compiled->getArguments('class_not_stored_in_config'));
     }
+
+    /**
+     * Test that $arguments, $virtualTypes and $preferences initializing in construct must be array.
+     *
+     * @param $data
+     * @param array $expectedResult
+     *
+     * @dataProvider constructorFieldsValidation
+     */
+    public function testConstructorFieldsValidation($data, $expectedResult)
+    {
+        /** @var Compiled $compiled */
+        $compiled = $this->objectManager->getObject(
+            Compiled::class,
+            [
+                'data' => $data,
+            ]
+        );
+
+        $reflection = new \ReflectionClass(Compiled::class);
+        $arguments = $reflection->getProperty('arguments');
+        $arguments->setAccessible(true);
+
+        $this->assertEquals($expectedResult['arguments'], $arguments->getValue($compiled));
+        $this->assertEquals($expectedResult['preferences'], $compiled->getPreferences());
+        $this->assertEquals($expectedResult['instanceTypes'], $compiled->getVirtualTypes());
+    }
+
+    /**
+     * Data provider for testConstructorFieldsValidation.
+     *
+     * @return array
+     */
+    public function constructorFieldsValidation()
+    {
+        return [
+            [
+                'no array',
+                [
+                    'arguments' => [],
+                    'instanceTypes' => [],
+                    'preferences' => [],
+                ],
+            ],
+            [
+                [
+                    'arguments' => 1,
+                    'instanceTypes' => [1, 2, 3],
+                    'preferences' => 'test',
+                ],
+                [
+                    'arguments' => [],
+                    'instanceTypes' => [1, 2, 3],
+                    'preferences' => [],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Test that $arguments, $virtualTypes and $preferences initializing in extend must be array.
+     *
+     * @param $data
+     * @param array $expectedResult
+     *
+     * @dataProvider extendFieldsValidation
+     */
+    public function testExtendFieldsValidation($data, $expectedResult)
+    {
+        /** @var Compiled $compiled */
+        $compiled = $this->objectManager->getObject(
+            Compiled::class,
+            [
+                'data' => $data,
+            ]
+        );
+
+        $compiled->extend($data);
+
+        $reflection = new \ReflectionClass(Compiled::class);
+        $arguments = $reflection->getProperty('arguments');
+        $arguments->setAccessible(true);
+
+        $this->assertEquals($expectedResult['arguments'], $arguments->getValue($compiled));
+        $this->assertEquals($expectedResult['preferences'], $compiled->getPreferences());
+        $this->assertEquals($expectedResult['instanceTypes'], $compiled->getVirtualTypes());
+    }
+
+    /**
+     * Data provider for testExtendFieldsValidation.
+     *
+     * @return array
+     */
+    public function extendFieldsValidation()
+    {
+        return [
+            [
+                [],
+                [
+                    'arguments' => [],
+                    'instanceTypes' => [],
+                    'preferences' => [],
+                ],
+            ],
+            [
+                [
+                    'arguments' => 1,
+                    'instanceTypes' => [1, 2, 3],
+                    'preferences' => 'test',
+                ],
+                [
+                    'arguments' => [],
+                    'instanceTypes' => [1, 2, 3],
+                    'preferences' => [],
+                ],
+            ],
+        ];
+    }
 }