Merge branch 'sprint-develop' into MQE-431

Author: tomreece

etc/di.xml

@@ -309,4 +309,36 @@
             <argument name="reader" xsi:type="object">Magento\FunctionalTestingFramework\Config\Reader\ActionGroupData</argument>
         </arguments>
     </virtualType>
+
+    <!--Config for Suite Data -->
+
+    <type name="Magento\FunctionalTestingFramework\Suite\Parsers\SuiteDataParser">
+        <arguments>
+            <argument name="suiteData" xsi:type="object">Magento\FunctionalTestingFramework\Suite\Config\SuiteData</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\FunctionalTestingFramework\Suite\Config\SuiteData" type="Magento\FunctionalTestingFramework\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\FunctionalTestingFramework\Config\Reader\SuiteData</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\FunctionalTestingFramework\Config\SchemaLocator\SuiteData" type="Magento\FunctionalTestingFramework\Config\SchemaLocator">
+        <arguments>
+            <argument name="schemaPath" xsi:type="string">Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\FunctionalTestingFramework\Config\Reader\SuiteData" type="Magento\FunctionalTestingFramework\Config\Reader\Filesystem">
+        <arguments>
+            <argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Root</argument>
+            <argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\SuiteData</argument>
+            <argument name="idAttributes" xsi:type="array">
+                <item name="/config/suite" xsi:type="string">name</item>
+                <item name="/config/suite/include/group" xsi:type="string">name</item>
+                <item name="/config/suite/exclude/group" xsi:type="string">name</item>
+            </argument>
+            <argument name="fileName" xsi:type="string">*.xml</argument>
+            <argument name="defaultScope" xsi:type="string">_suite</argument>
+        </arguments>
+    </virtualType>
 </config>

src/Magento/FunctionalTestingFramework/Config/FileResolver/Root.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © 2017 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\FunctionalTestingFramework\Config\FileResolver;
+
+use Magento\FunctionalTestingFramework\Config\FileResolverInterface;
+use Magento\FunctionalTestingFramework\Util\Iterator\File;
+
+class Root implements FileResolverInterface
+{
+
+    /**
+     * Retrieve the list of configuration files with given name that relate to specified scope at the tests level
+     *
+     * @param string $filename
+     * @param string $scope
+     * @return array|\Iterator,\Countable
+     */
+    public function get($filename, $scope)
+    {
+        $paths = glob(dirname(TESTS_BP) . DIRECTORY_SEPARATOR . $scope . DIRECTORY_SEPARATOR . $filename);
+
+        return new File($paths);
+    }
+}

src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php

@@ -204,7 +204,7 @@ public function getDataByName($dataName, $uniDataFormat)
      * category->id)
      *
      * @param string $dataKey
-     * @return array|null
+     * @return string|null
      */
     public function getVarReference($dataKey)
     {

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/FrontendExecutor.php

@@ -132,16 +132,16 @@ protected function setCookies()
      * @param string $url
      * @param array $data
      * @param string $method
-     * @param mixed $headers
+     * @param array $headers
      * @return void
      * @throws TestFrameworkException
      */
     public function write($url, $data = [], $method = CurlInterface::POST, $headers = [])
     {
-        if(isset($data['customer_email'])) {
+        if (isset($data['customer_email'])) {
             unset($data['customer_email']);
         }
-        if(isset($data['customer_password'])) {
+        if (isset($data['customer_password'])) {
             unset($data['customer_password']);
         }
         $apiUrl = parent::$baseUrl . $url;
@@ -190,7 +190,7 @@ public function read($successRegex = null, $returnRegex = null)
      * Add additional option to cURL.
      *
      * @param int $option the CURLOPT_* constants
-     * @param mixed $value
+     * @param int|string|bool|array $value
      * @return void
      */
     public function addOption($option, $value)

src/Magento/FunctionalTestingFramework/ObjectManager/ObjectHandlerInterface.php

@@ -21,10 +21,10 @@ public static function getInstance();
     /**
      * Function to return a single object by name
      *
-     * @param string $jsonDefitionName
+     * @param string $objectName
      * @return object
      */
-    public function getObject($jsonDefitionName);
+    public function getObject($objectName);
 
     /**
      * Function to return all objects the handler is responsible for