Merge remote-tracking branch 'origin/analytics-sprint-3' into analytics-sprint-3

Author: valdislav

app/code/Magento/Analytics/Cron/CollectData.php

@@ -29,6 +29,7 @@ class CollectData
 
     /**
      * @param ExportDataHandler $exportDataHandler
+     * @param SubscriptionStatusProvider $subscriptionStatus
      */
     public function __construct(
         ExportDataHandler $exportDataHandler,

app/code/Magento/Analytics/Model/StoreConfigurationProvider.php

@@ -77,22 +77,23 @@ public function getReport()
 
     /**
      * Creates report from config for scope type and scope id.
+     *
      * @param string $scope
-     * @param int $scope_id
+     * @param int $scopeId
      * @return array
      */
-    private function generateReportForScope($scope, $scope_id)
+    private function generateReportForScope($scope, $scopeId)
     {
         $report = [];
         foreach ($this->configPaths as $configPath) {
             $report[] = [
                 "config_path" => $configPath,
                 "scope" => $scope,
-                "scope_id" => $scope_id,
+                "scope_id" => $scopeId,
                 "value" => $this->scopeConfig->getValue(
                     $configPath,
                     $scope,
-                    $scope_id
+                    $scopeId
                 )
             ];
         }

app/code/Magento/Analytics/ReportXml/ReportProvider.php

@@ -32,8 +32,10 @@ class ReportProvider
 
     /**
      * ReportProvider constructor.
+     *
      * @param QueryFactory $queryFactory
      * @param ConnectionFactory $connectionFactory
+     * @param IteratorFactory $iteratorFactory
      */
     public function __construct(
         QueryFactory $queryFactory,

app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php

@@ -29,7 +29,6 @@ class UpdateCommandTest extends \PHPUnit_Framework_TestCase
      */
     private $analyticsTokenMock;
 
-
     /**
      * @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -93,8 +92,6 @@ protected function setUp()
     public function testExecuteSuccess()
     {
         $url = "old.localhost.com";
-        $newurl = "new.localhost.com";
-        $updateUrl = "update.localhost.com";
         $configVal = "Config val";
         $token = "Secret token!";
         $requestJson = sprintf('{"url":"%s","new-url":"%s","access-token":"%s"}', $url, $configVal, $token);
@@ -111,7 +108,6 @@ public function testExecuteSuccess()
             ->with(BaseUrlConfigPlugin::OLD_BASE_URL_FLAG_CODE)
             ->willReturn($url);
 
-
         $this->analyticsTokenMock->expects($this->once())
             ->method('getToken')
             ->willReturn($token);

app/code/Magento/Analytics/Test/Unit/Model/FileRecorderTest.php

@@ -192,7 +192,6 @@ function ($parameters) {
                 );
         }
 
-
         $this->assertTrue($this->fileRecorder->recordNewFile($this->encodedContextMock));
     }
 

app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php

@@ -104,7 +104,6 @@ public function testPluginForAfterSave(
         $this->subscriptionStatusProvider->expects($this->any())->method('getStatus')
             ->willReturn($testData['subscriptionStatus']);
 
-
         $oldUrl = 'mage.dev';
         $this->configValueMock->expects($oldValueInvokeMatcher)
             ->method('getOldValue')
@@ -118,8 +117,7 @@ public function testPluginForAfterSave(
                 BaseUrlConfigPlugin::UPDATE_CRON_STRING_PATH,
                 '0 * * * *'
             );
-
-
+        
         $this->assertEquals(
             $this->configValueMock,
             $this->plugin->afterAfterSave($this->configValueMock, $this->configValueMock)

app/code/Magento/Analytics/Test/Unit/ReportXml/IteratorFactoryTest.php

@@ -17,6 +17,7 @@ class IteratorFactoryTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $objectManagerMock;
+
     /**
      * @var \IteratorIterator|\PHPUnit_Framework_MockObject_MockObject
      */

app/code/Magento/Analytics/etc/webapi.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->