Merge remote-tracking branch 'arcticfoxes/B2B-1701-DbStorage-deprecated' into 2.4-develop-pr

joanhe · joanhe · commit b4227f23aea9 · 2021-03-12T13:50:54.000-06:00
diff --git a/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php b/app/code/Magento/MediaStorage/Helper/File/Storage/Database.php
@@ -14,6 +14,9 @@
  *
  * @api
  * @since 100.0.2
+ *
+ * @deprecated Database Media Storage is deprecated
+ *
  */
 class Database extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/app/code/Magento/MediaStorage/Model/Config/Backend/Storage/Media/Database.php b/app/code/Magento/MediaStorage/Model/Config/Backend/Storage/Media/Database.php
@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\MediaStorage\Model\Config\Backend\Storage\Media;
-
+/**
+* @deprecated Database Media Storage is deprecated
+**/
 class Database extends \Magento\Framework\App\Config\Value
 {
     /**
diff --git a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Database.php
@@ -12,6 +12,9 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 
+/**
+ * @deprecated Database Media Storage is deprecated
+ **/
 class Database implements \Magento\Framework\Option\ArrayInterface
 {
     /**
diff --git a/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php b/app/code/Magento/MediaStorage/Model/Config/Source/Storage/Media/Storage.php
@@ -23,7 +23,7 @@ public function toOptionArray()
                 'value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_FILE_SYSTEM,
                 'label' => __('File System'),
             ],
-            ['value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_DATABASE, 'label' => __('Database')]
+            ['value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_DATABASE, 'label' => __('Database (Deprecated)')]
         ];
     }
 }
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Database.php b/app/code/Magento/MediaStorage/Model/File/Storage/Database.php
@@ -10,6 +10,8 @@
  *
  * @api
  * @since 100.0.2
+ *
+ * @deprecated Database Media Storage is deprecated
  */
 class Database extends \Magento\MediaStorage\Model\File\Storage\Database\AbstractDatabase
 {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Database/AbstractDatabase.php b/app/code/Magento/MediaStorage/Model/File/Storage/Database/AbstractDatabase.php
@@ -7,7 +7,10 @@
 
 /**
  * Class AbstractDatabase
- */
+ *
+ * @deprecated Database Media Storage is deprecated
+ *
+ **/
 abstract class AbstractDatabase extends \Magento\Framework\Model\AbstractModel
 {
     /**
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php b/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php
@@ -11,6 +11,8 @@
  *
  * @api
  * @since 100.0.2
+ *
+ * @deprecated Database Media Storage is deprecated
  */
 class Database extends \Magento\MediaStorage\Model\File\Storage\Database\AbstractDatabase
 {
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php
@@ -7,6 +7,8 @@
 
 /**
  * Class AbstractStorage
+ *
+ * @deprecated Database Media Storage is deprecated
  */
 abstract class AbstractStorage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Database.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Database.php
@@ -10,6 +10,8 @@
  *
  * @api
  * @since 100.0.2
+ *
+ * @deprecated Database Media Storage is deprecated
  */
 class Database extends \Magento\MediaStorage\Model\ResourceModel\File\Storage\AbstractStorage
 {
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Directory/Database.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/Directory/Database.php
@@ -7,6 +7,8 @@
 
 /**
  * Class Database
+ *
+ * @deprecated Database Media Storage is deprecated
  */
 class Database extends \Magento\MediaStorage\Model\ResourceModel\File\Storage\AbstractStorage
 {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`*`
`15`	`15`	`* @api`
`16`	`16`	`* @since 100.0.2`
	`17`	`+ *`
	`18`	`+ * @deprecated Database Media Storage is deprecated`
	`19`	`+ *`
`17`	`20`	`*/`
`18`	`21`	`class Database extends \Magento\Framework\App\Helper\AbstractHelper`
`19`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@`
`12`	`12`	`use Magento\Framework\App\DeploymentConfig;`
`13`	`13`	`use Magento\Framework\Config\ConfigOptionsListConstants;`
`14`	`14`
	`15`	`+/**`
	`16`	`+ * @deprecated Database Media Storage is deprecated`
	`17`	`+ **/`
`15`	`18`	`class Database implements \Magento\Framework\Option\ArrayInterface`
`16`	`19`	`{`
`17`	`20`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function toOptionArray()`
`23`	`23`	`'value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_FILE_SYSTEM,`
`24`	`24`	`'label' => __('File System'),`
`25`	`25`	`],`
`26`		`- ['value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_DATABASE, 'label' => __('Database')]`
	`26`	`+ ['value' => \Magento\MediaStorage\Model\File\Storage::STORAGE_MEDIA_DATABASE, 'label' => __('Database (Deprecated)')]`
`27`	`27`	`];`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`*`
`11`	`11`	`* @api`
`12`	`12`	`* @since 100.0.2`
	`13`	`+ *`
	`14`	`+ * @deprecated Database Media Storage is deprecated`
`13`	`15`	`*/`
`14`	`16`	`class Database extends \Magento\MediaStorage\Model\File\Storage\Database\AbstractDatabase`
`15`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`*`
`12`	`12`	`* @api`
`13`	`13`	`* @since 100.0.2`
	`14`	`+ *`
	`15`	`+ * @deprecated Database Media Storage is deprecated`
`14`	`16`	`*/`
`15`	`17`	`class Database extends \Magento\MediaStorage\Model\File\Storage\Database\AbstractDatabase`
`16`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Class AbstractStorage`
	`10`	`+ *`
	`11`	`+ * @deprecated Database Media Storage is deprecated`
`10`	`12`	`*/`
`11`	`13`	`abstract class AbstractStorage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb`
`12`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Class Database`
	`10`	`+ *`
	`11`	`+ * @deprecated Database Media Storage is deprecated`
`10`	`12`	`*/`
`11`	`13`	`class Database extends \Magento\MediaStorage\Model\ResourceModel\File\Storage\AbstractStorage`
`12`	`14`	`{`