Skip to content

Commit 6ef4a2b

Browse files
committed
B2B-1701: Deprecate database media storage function
- Fixed static test errors
1 parent 3301a80 commit 6ef4a2b

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

app/code/Magento/MediaStorage/Helper/File/Storage/Database.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ public function getResourceStorageModel()
143143
public function saveFile($filename)
144144
{
145145
if ($this->checkDbUsage()) {
146-
//phpcs:ignore Magento2.Functions.DiscouragedFunction
147-
trigger_error('Database media storage function is deprecated', E_USER_DEPRECATED);
148146
$this->getStorageDatabaseModel()->saveFile($this->_removeAbsPathFromFileName($filename));
149147
}
150148
}

app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function toOptionArray()
2727
'value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_FILE_SYSTEM,
2828
'label' => __('File System'),
2929
],
30-
['value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_DATABASE, 'label' => __('Database(Deprecated)')]
30+
['value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_DATABASE, 'label' => __('Database (Deprecated)')]
3131
];
3232
}
3333
}

app/code/Magento/MediaStorage/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<source_model>Magento\MediaStorage\Model\Config\Source\Storage\Media\Storage</source_model>
1616
</field>
1717
<field id="media_database" translate="label" type="select" sortOrder="200" showInDefault="1">
18-
<label>Select Media Database(Deprecated)</label>
18+
<label>Select Media Database (Deprecated)</label>
1919
<source_model>Magento\MediaStorage\Model\Config\Source\Storage\Media\Database</source_model>
2020
<backend_model>Magento\MediaStorage\Model\Config\Backend\Storage\Media\Database</backend_model>
2121
<depends>

0 commit comments

Comments
 (0)