From 34d6d5599178d5939baf9d11bb4780b145f46e84 Mon Sep 17 00:00:00 2001
From: Vinai Kopp <vinai@netzarbeiter.com>
Date: Fri, 16 Aug 2019 09:08:41 -0500
Subject: [PATCH 1/4] Fix config backend model PDF file name extension

---
 .../Config/Model/Config/Backend/File/Pdf.php  | 21 +++++++++++++++++++
 .../Config/Model/Config/Backend/Image/Pdf.php | 10 +++------
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 app/code/Magento/Config/Model/Config/Backend/File/Pdf.php

diff --git a/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php b/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
new file mode 100644
index 0000000000000..f4acd6ed21dbb
--- /dev/null
+++ b/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Config\Model\Config\Backend\Image;
+
+/**
+ * @api
+ */
+class Pdf extends \Magento\Config\Model\Config\Backend\File
+{
+    /**
+     * @return string[]
+     */
+    protected function _getAllowedExtensions()
+    {
+        return ['pdf'];
+    }
+}
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
index 44131fe8a7966..6e1ff24a65ce3 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
@@ -4,16 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * System config image field backend model for Zend PDF generator
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Config\Model\Config\Backend\Image;
 
 /**
  * @api
- * @since 100.0.2
+ * @deprecated The wrong file type extensions are returned.
+ * @see \Magento\Config\Model\Config\Backend\File\Pdf
  */
 class Pdf extends \Magento\Config\Model\Config\Backend\Image
 {
@@ -22,6 +18,6 @@ class Pdf extends \Magento\Config\Model\Config\Backend\Image
      */
     protected function _getAllowedExtensions()
     {
-        return ['tif', 'tiff', 'png', 'jpg', 'jpe', 'jpeg'];
+        return ['tif', 'tiff', 'png', 'jpg', 'jpe', 'jpeg', 'pdf'];
     }
 }

From 8628a3a1acf0f34ada315b2e80b11f0c6d17ad62 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 22 Aug 2019 14:46:22 +0300
Subject: [PATCH 2/4] magento/magento2#24153: Static tests fix.

---
 app/code/Magento/Config/Model/Config/Backend/File/Pdf.php  | 6 ++++--
 app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php b/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
index f4acd6ed21dbb..9e3a5ec507a4b 100644
--- a/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
+++ b/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
@@ -4,15 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Config\Model\Config\Backend\Image;
+namespace Magento\Config\Model\Config\Backend\File;
 
 /**
+ * System config PDF field backend model.
+ *
  * @api
  */
 class Pdf extends \Magento\Config\Model\Config\Backend\File
 {
     /**
-     * @return string[]
+     * @inheritdoc
      */
     protected function _getAllowedExtensions()
     {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
index 6e1ff24a65ce3..bde392547a7f9 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
@@ -7,6 +7,8 @@
 namespace Magento\Config\Model\Config\Backend\Image;
 
 /**
+ * System config PDF field backend model.
+ *
  * @api
  * @deprecated The wrong file type extensions are returned.
  * @see \Magento\Config\Model\Config\Backend\File\Pdf
@@ -14,7 +16,7 @@
 class Pdf extends \Magento\Config\Model\Config\Backend\Image
 {
     /**
-     * @return string[]
+     * @inheritdoc
      */
     protected function _getAllowedExtensions()
     {

From 992602f6237b6f8b50ce61f6b8d69eb708971b29 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Mon, 16 Sep 2019 17:09:30 -0300
Subject: [PATCH 3/4] Removed api annotation

---
 app/code/Magento/Config/Model/Config/Backend/File/Pdf.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php b/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
index 9e3a5ec507a4b..8716fe5a23ad3 100644
--- a/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
+++ b/app/code/Magento/Config/Model/Config/Backend/File/Pdf.php
@@ -8,8 +8,6 @@
 
 /**
  * System config PDF field backend model.
- *
- * @api
  */
 class Pdf extends \Magento\Config\Model\Config\Backend\File
 {

From 2e97e8fc03ff286b4b5eac3b0ec92192a17efb5b Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Mon, 16 Sep 2019 17:10:03 -0300
Subject: [PATCH 4/4] Removed deprecated tag

---
 app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
index bde392547a7f9..4ddc848784551 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Image/Pdf.php
@@ -10,7 +10,7 @@
  * System config PDF field backend model.
  *
  * @api
- * @deprecated The wrong file type extensions are returned.
+ * @since 100.0.2
  * @see \Magento\Config\Model\Config\Backend\File\Pdf
  */
 class Pdf extends \Magento\Config\Model\Config\Backend\Image