Skip to content

Commit 3cc0e5a

Browse files
fix travis reported issues
1 parent ea5332c commit 3cc0e5a

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class Robots extends \Magento\Framework\App\Config\Value
3333
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
3434
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
3535
* @param array $data
36+
* @param DocumentRoot $documentRoot
3637
*/
3738
public function __construct(
3839
\Magento\Framework\Model\Context $context,
@@ -42,8 +43,8 @@ public function __construct(
4243
\Magento\Framework\Filesystem $filesystem,
4344
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
4445
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
45-
\Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null,
46-
array $data = []
46+
array $data = [],
47+
\Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null
4748
) {
4849
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
4950

app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,24 @@
88

99
use Magento\Framework\Config\ConfigOptionsListConstants;
1010
use Magento\Framework\App\Filesystem\DirectoryList;
11+
use Magento\Framework\App\DeploymentConfig;
1112

1213
/**
1314
* Class DocumentRoot
1415
* @package Magento\Config\Model\Config\Reader\Source\Deployed
1516
*/
1617
class DocumentRoot
1718
{
19+
/**
20+
* @var DeploymentConfig
21+
*/
1822
private $config;
1923

2024
/**
2125
* DocumentRoot constructor.
22-
* @param \Magento\Framework\App\DeploymentConfig $config
26+
* @param DeploymentConfig $config
2327
*/
24-
public function __construct(\Magento\Framework\App\DeploymentConfig $config)
28+
public function __construct(DeploymentConfig $config)
2529
{
2630
$this->config = $config;
2731
}

app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class DocumentRootTest extends \PHPUnit_Framework_TestCase
2525
private $configMock;
2626

2727
/**
28-
* @var SettingChecker
28+
* @var Reader\Source\Deployed\DocumentRoot
2929
*/
3030
private $documentRoot;
3131

app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
2727
protected $_sitemapFactory;
2828

2929
/**
30-
* @var \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot
30+
* @var DocumentRoot
3131
*/
3232
protected $documentRoot;
3333

@@ -36,13 +36,14 @@ class Link extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
3636
* @param \Magento\Sitemap\Model\SitemapFactory $sitemapFactory
3737
* @param \Magento\Framework\Filesystem $filesystem
3838
* @param array $data
39+
* @param DocumentRoot $documentRoot
3940
*/
4041
public function __construct(
4142
\Magento\Backend\Block\Context $context,
4243
\Magento\Sitemap\Model\SitemapFactory $sitemapFactory,
4344
\Magento\Framework\Filesystem $filesystem,
44-
\Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null,
45-
array $data = []
45+
array $data = [],
46+
DocumentRoot $documentRoot = null
4647
) {
4748
$this->_sitemapFactory = $sitemapFactory;
4849
$this->_filesystem = $filesystem;

0 commit comments

Comments
 (0)