Merge branch 'MAGETWO-38857' of https://github.corp.ebay.com/magento-tango/magento2ce into MAGETWO-38857

Author: Bohdan Korablov

app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -15,11 +14,11 @@ class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
     /**
      * Validate path to generate
      *
-     * @param $data
+     * @param array $data
      * @return bool
      * @throws \Exception
      */
-    protected function validatePathToGenerate($data)
+    protected function validatePathToGenerate(array $data)
     {
         if (!empty($data['sitemap_filename']) && !empty($data['sitemap_path'])) {
             $data['sitemap_path'] = '/' . ltrim($data['sitemap_path'], '/');
@@ -45,9 +44,10 @@ protected function validatePathToGenerate($data)
     /**
      * Clear sitemap
      *
-     * @param $model
+     * @param \Magento\Sitemap\Model\Sitemap $model
+     * @return void
      */
-    protected function clearSiteMap($model)
+    protected function clearSiteMap(\Magento\Sitemap\Model\Sitemap $model)
     {
         /** @var \Magento\Framework\Filesystem\Directory\Write $directory */
         $directory = $this->_objectManager->get('Magento\Framework\Filesystem')
@@ -68,7 +68,7 @@ protected function clearSiteMap($model)
      * Save model
      *
      * @param array $data
-     * @return Controller\Result\Redirect|Controller\Result\Forward
+     * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward
      */
     protected function saveModel($data)
     {
@@ -105,22 +105,22 @@ protected function saveModel($data)
             $this->_objectManager->get('Magento\Backend\Model\Session')->setFormData($data);
             // redirect to edit form
             return $this->resultFactory->create(Controller\ResultFactory::TYPE_REDIRECT)
-                ->setPath('adminhtml/*/edit',['sitemap_id' => $this->getRequest()->getParam('sitemap_id')]);
+                ->setPath('adminhtml/*/edit', ['sitemap_id' => $this->getRequest()->getParam('sitemap_id')]);
         }
     }
 
     /**
      * Save action
      *
-     * @return Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
         // check if data sent
         $data = $this->getRequest()->getPostValue();
         if ($data) {
             if (!$this->validatePathToGenerate($data)) {
-                /** @var Controller\Result\Redirect $resultRedirect */
+                /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultFactory->create(Controller\ResultFactory::TYPE_REDIRECT);
                 return $resultRedirect->setPath(
                     'adminhtml/*/edit',
@@ -131,5 +131,4 @@ public function execute()
         }
         return $this->resultFactory->create(Controller\ResultFactory::TYPE_REDIRECT)->setPath('adminhtml/*/');
     }
-
 }

app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php

@@ -3,9 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Sitemap\Test\Unit\Controller\Adminhtml;
-
+namespace Magento\Sitemap\Test\Unit\Controller\Adminhtml\Sitemap;
 
 class SaveTest extends \PHPUnit_Framework_TestCase
 {

app/code/Magento/Widget/Model/Widget.php

@@ -359,7 +359,7 @@ public function getPlaceholderImageUrls()
     }
 
     /**
-     * Remove attributes from widget array so that emulates how \Magento\Framework\Simplexml\Element::asCanonicalArray works
+     * Remove attributes from widget array and emulates how \Magento\Framework\Simplexml\Element::asCanonicalArray works
      *
      * @param array $inputArray
      * @return array