Skip to content

Commit 7e835c3

Browse files
author
Francesco Marangi
committed
#15929: Reset changes to HTTP response classes
1 parent b0b82d0 commit 7e835c3

File tree

2 files changed

+3
-6
lines changed
  • app/code/Magento/MediaStorage/Model/File/Storage
  • lib/internal/Magento/Framework/App/Response

2 files changed

+3
-6
lines changed

app/code/Magento/MediaStorage/Model/File/Storage/Response.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
use Magento\Framework\App\Response\Http;
99
use Magento\Framework\App\Request\Http as HttpRequest;
10-
use Magento\Framework\Session\Config\ConfigInterface;
1110
use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
1211
use Magento\Framework\Stdlib\CookieManagerInterface;
1312

@@ -35,7 +34,6 @@ class Response extends Http implements
3534
* @param CookieMetadataFactory $cookieMetadataFactory
3635
* @param \Magento\Framework\App\Http\Context $context
3736
* @param \Magento\Framework\Stdlib\DateTime $dateTime
38-
* @param ConfigInterface $sessionConfig
3937
* @param \Magento\Framework\File\Transfer\Adapter\Http $transferAdapter
4038
*/
4139
public function __construct(
@@ -44,10 +42,9 @@ public function __construct(
4442
CookieMetadataFactory $cookieMetadataFactory,
4543
\Magento\Framework\App\Http\Context $context,
4644
\Magento\Framework\Stdlib\DateTime $dateTime,
47-
ConfigInterface $sessionConfig,
4845
\Magento\Framework\File\Transfer\Adapter\Http $transferAdapter
4946
) {
50-
parent::__construct($request, $cookieManager, $cookieMetadataFactory, $context, $dateTime, $sessionConfig);
47+
parent::__construct($request, $cookieManager, $cookieMetadataFactory, $context, $dateTime);
5148
$this->_transferAdapter = $transferAdapter;
5249
}
5350

lib/internal/Magento/Framework/App/Response/Http.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ public function __construct(
7171
CookieMetadataFactory $cookieMetadataFactory,
7272
Context $context,
7373
DateTime $dateTime,
74-
ConfigInterface $sessionConfig
74+
ConfigInterface $sessionConfig = null
7575
) {
7676
$this->request = $request;
7777
$this->cookieManager = $cookieManager;
7878
$this->cookieMetadataFactory = $cookieMetadataFactory;
7979
$this->context = $context;
8080
$this->dateTime = $dateTime;
81-
$this->sessionConfig = $sessionConfig;
81+
$this->sessionConfig = $sessionConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
8282
}
8383

8484
/**

0 commit comments

Comments
 (0)