Skip to content

Commit

Permalink
Declared strict_types. Fixed the params order and changed the referen…
Browse files Browse the repository at this point in the history
…ce to a public type.
  • Loading branch information
eduard13 committed Jun 12, 2018
1 parent 4ecce14 commit c51b1d4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
10 changes: 6 additions & 4 deletions app/code/Magento/Backend/Block/Media/Uploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Backend\Block\Media;

/**
Expand All @@ -28,20 +30,20 @@ class Uploader extends \Magento\Backend\Block\Widget
protected $_fileSizeService;

/**
* @var \Magento\Framework\Image\Config
* @var \Magento\Framework\Image\Adapter\ConfigInterface
*/
protected $imageConfig;

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Framework\File\Size $fileSize
* @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig
* @param array $data
* @param \Magento\Framework\Image\Adapter\Config $imageConfig
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Framework\File\Size $fileSize,
\Magento\Framework\Image\Adapter\Config $imageConfig,
\Magento\Framework\Image\Adapter\ConfigInterface $imageConfig,
array $data = []
) {
$this->_fileSizeService = $fileSize;
Expand Down Expand Up @@ -90,7 +92,7 @@ public function getFileSizeService()
/**
* Get image config
*
* @return \Magento\Framework\Image\Adapter\Config
* @return \Magento\Framework\Image\Adapter\ConfigInterface
*/
public function getImageConfigService()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;

/**
Expand All @@ -21,14 +23,15 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Framework\File\Size $fileSize
* @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig
* @param \Magento\Cms\Model\Wysiwyg\Images\Storage $imagesStorage
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Framework\File\Size $fileSize,
\Magento\Framework\Image\Adapter\ConfigInterface $imageConfig,
\Magento\Cms\Model\Wysiwyg\Images\Storage $imagesStorage,
\Magento\Framework\Image\Adapter\Config $imageConfig,
array $data = []
) {
$this->_imagesStorage = $imagesStorage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content;

/**
Expand All @@ -29,13 +31,14 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Framework\File\Size $fileSize
* @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig
* @param \Magento\Theme\Helper\Storage $storageHelper
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Framework\File\Size $fileSize,
\Magento\Framework\Image\Adapter\Config $imageConfig,
\Magento\Framework\Image\Adapter\ConfigInterface $imageConfig,
\Magento\Theme\Helper\Storage $storageHelper,
array $data = []
) {
Expand Down

0 comments on commit c51b1d4

Please sign in to comment.