fix travis reported issues

magento · Apr 2, 2017 · 3cc0e5a · 3cc0e5a
1 parent ea5332c
commit 3cc0e5a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
@@ -33,6 +33,7 @@ class Robots extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param DocumentRoot $documentRoot
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -42,8 +43,8 @@ public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null,
-        array $data = []
+        array $data = [],
+        \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null
     ) {
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
 

diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
@@ -8,20 +8,24 @@
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Class DocumentRoot
  * @package Magento\Config\Model\Config\Reader\Source\Deployed
  */
 class DocumentRoot
 {
+    /**
+     * @var DeploymentConfig
+     */
     private $config;
 
     /**
      * DocumentRoot constructor.
-     * @param \Magento\Framework\App\DeploymentConfig $config
+     * @param DeploymentConfig $config
      */
-    public function __construct(\Magento\Framework\App\DeploymentConfig $config)
+    public function __construct(DeploymentConfig $config)
     {
         $this->config = $config;
     }

diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php
@@ -25,7 +25,7 @@ class DocumentRootTest extends \PHPUnit_Framework_TestCase
     private $configMock;
 
     /**
-     * @var SettingChecker
+     * @var Reader\Source\Deployed\DocumentRoot
      */
     private $documentRoot;
 

diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -27,7 +27,7 @@ class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
     protected $_sitemapFactory;
 
     /**
-     * @var \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot
+     * @var DocumentRoot
      */
     protected $documentRoot;
 
@@ -36,13 +36,14 @@ class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * @param \Magento\Sitemap\Model\SitemapFactory $sitemapFactory
      * @param \Magento\Framework\Filesystem $filesystem
      * @param array $data
+     * @param DocumentRoot $documentRoot
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Sitemap\Model\SitemapFactory $sitemapFactory,
         \Magento\Framework\Filesystem $filesystem,
-        \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null,
-        array $data = []
+        array $data = [],
+        DocumentRoot $documentRoot = null
     ) {
         $this->_sitemapFactory = $sitemapFactory;
         $this->_filesystem = $filesystem;