Skip to content

Commit 9d42b6e

Browse files
committed
lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface was removed
1 parent 3306f1e commit 9d42b6e

File tree

5 files changed

+3
-83
lines changed

5 files changed

+3
-83
lines changed

app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
use Magento\Framework\App\ObjectManager;
1111
use Magento\Framework\Serialize\Serializer\Json;
12-
use Magento\Framework\Image\Adapter\UploadConfigInterface;
1312
use Magento\Backend\Model\Image\UploadResizeConfigInterface;
1413

1514
/**
@@ -44,33 +43,22 @@ class Uploader extends \Magento\Backend\Block\Widget
4443
*/
4544
private $imageUploadConfig;
4645

47-
/**
48-
* @var UploadConfigInterface
49-
* @deprecated 101.0.1
50-
* @see \Magento\Backend\Model\Image\UploadResizeConfigInterface
51-
*/
52-
private $imageConfig;
53-
5446
/**
5547
* @param \Magento\Backend\Block\Template\Context $context
5648
* @param \Magento\Framework\File\Size $fileSize
5749
* @param array $data
5850
* @param Json $jsonEncoder
59-
* @param UploadConfigInterface $imageConfig
6051
* @param UploadResizeConfigInterface $imageUploadConfig
6152
*/
6253
public function __construct(
6354
\Magento\Backend\Block\Template\Context $context,
6455
\Magento\Framework\File\Size $fileSize,
6556
array $data = [],
6657
Json $jsonEncoder = null,
67-
UploadConfigInterface $imageConfig = null,
6858
UploadResizeConfigInterface $imageUploadConfig = null
6959
) {
7060
$this->_fileSizeService = $fileSize;
7161
$this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
72-
$this->imageConfig = $imageConfig
73-
?: ObjectManager::getInstance()->get(UploadConfigInterface::class);
7462
$this->imageUploadConfig = $imageUploadConfig
7563
?: ObjectManager::getInstance()->get(UploadResizeConfigInterface::class);
7664
parent::__construct($context, $data);

app/etc/di.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
<preference for="Magento\Framework\View\Design\Theme\CustomizationInterface" type="Magento\Framework\View\Design\Theme\Customization" />
8888
<preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
8989
<preference for="Magento\Framework\Image\Adapter\ConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
90-
<preference for="Magento\Framework\Image\Adapter\UploadConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
9190
<preference for="Magento\Framework\View\Design\Theme\Image\PathInterface" type="Magento\Theme\Model\Theme\Image\Path" />
9291
<preference for="Magento\Framework\Session\Config\ConfigInterface" type="Magento\Framework\Session\Config" />
9392
<preference for="Magento\Framework\Session\SidResolverInterface" type="Magento\Framework\Session\SidResolver\Proxy" />

lib/internal/Magento/Framework/File/Uploader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ class Uploader
161161

162162
/**
163163
* Maximum Image Width resolution in pixels. For image resizing on client side
164-
* @deprecated @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxWidth()
164+
* @deprecated @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxWidth()
165165
*/
166166
const MAX_IMAGE_WIDTH = 1920;
167167

168168
/**
169169
* Maximum Image Height resolution in pixels. For image resizing on client side
170-
* @deprecated @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxHeight()
170+
* @deprecated @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
171171
*/
172172
const MAX_IMAGE_HEIGHT = 1200;
173173

lib/internal/Magento/Framework/Image/Adapter/Config.php

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,12 @@
1010
/**
1111
* Image config provider.
1212
*/
13-
class Config implements ConfigInterface, UploadConfigInterface
13+
class Config implements ConfigInterface
1414
{
1515
const XML_PATH_IMAGE_ADAPTER = 'dev/image/default_adapter';
1616

1717
const XML_PATH_IMAGE_ADAPTERS = 'dev/image/adapters';
1818

19-
/**
20-
* Config path for the maximal image width value
21-
* @deprecated Used in a method that is deprecated
22-
*/
23-
const XML_PATH_MAX_WIDTH_IMAGE = 'system/upload_configuration/max_width';
24-
25-
/**
26-
* Config path for the maximal image height value
27-
* @deprecated Used in a method that is deprecated
28-
*/
29-
const XML_PATH_MAX_HEIGHT_IMAGE = 'system/upload_configuration/max_height';
30-
3119
/**
3220
* @var \Magento\Framework\App\Config\ScopeConfigInterface
3321
*/
@@ -60,28 +48,4 @@ public function getAdapters()
6048
{
6149
return $this->config->getValue(self::XML_PATH_IMAGE_ADAPTERS);
6250
}
63-
64-
/**
65-
* Get Maximum Image Width resolution in pixels. For image resizing on client side.
66-
*
67-
* @return int
68-
* @deprecated 102.0.1
69-
* @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
70-
*/
71-
public function getMaxWidth(): int
72-
{
73-
return (int)$this->config->getValue(self::XML_PATH_MAX_WIDTH_IMAGE);
74-
}
75-
76-
/**
77-
* Get Maximum Image Height resolution in pixels. For image resizing on client side.
78-
*
79-
* @return int
80-
* @deprecated 102.0.1
81-
* @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
82-
*/
83-
public function getMaxHeight(): int
84-
{
85-
return (int)$this->config->getValue(self::XML_PATH_MAX_HEIGHT_IMAGE);
86-
}
8751
}

lib/internal/Magento/Framework/Image/Adapter/UploadConfigInterface.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)