Merge remote-tracking branch '72engcom/libs-upgrade' into MAGETWO-89235-credis-zendview

danielrenaud · danielrenaud · commit 930d8801f211 · 2018-04-04T11:02:50.000-05:00
diff --git a/app/code/Magento/Downloadable/Controller/Download.php b/app/code/Magento/Downloadable/Controller/Download.php
@@ -64,7 +64,7 @@ protected function _processDownload($path, $resourceType)
         $contentDisposition = $helper->getContentDisposition();
         if (!$contentDisposition || in_array($contentType, $this->disallowedContentTypes)) {
             // For security reasons we force browsers to download the file instead of opening it.
-            $contentDisposition = \Zend_Mime::DISPOSITION_ATTACHMENT;
+            $contentDisposition = \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT;
         }
 
         $response->setHeader('Content-Disposition', $contentDisposition  . '; filename=' . $fileName);
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php
@@ -492,8 +492,8 @@ public function linkNotAvailableDataProvider()
     public function downloadTypesDataProvider()
     {
         return [
-            ['mimeType' => 'text/html',  'disposition' => \Zend_Mime::DISPOSITION_ATTACHMENT],
-            ['mimeType' => 'image/jpeg', 'disposition' => \Zend_Mime::DISPOSITION_INLINE],
+            ['mimeType' => 'text/html',  'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT],
+            ['mimeType' => 'image/jpeg', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_INLINE],
         ];
     }
 }
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
         "tubalmartin/cssmin": "4.1.1",
         "webonyx/graphql-php": "^0.11.1",
         "zendframework/zend-captcha": "^2.7.1",
-        "zendframework/zend-code": "~3.1.0",
+        "zendframework/zend-code": "~3.3.0",
         "zendframework/zend-config": "^2.6.0",
         "zendframework/zend-console": "^2.6.0",
         "zendframework/zend-crypt": "^2.6.0",
@@ -79,7 +79,7 @@
         "zendframework/zend-server": "^2.6.1",
         "zendframework/zend-servicemanager": "^2.7.8",
         "zendframework/zend-session": "^2.7.3",
-        "zendframework/zend-soap": "^2.6.0",
+        "zendframework/zend-soap": "^2.7.0",
         "zendframework/zend-stdlib": "^2.7.7",
         "zendframework/zend-text": "^2.6.0",
         "zendframework/zend-uri": "^2.5.1",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample
@@ -41,7 +41,7 @@ class SourceClassWithNamespaceExtensionInterfaceFactory
      * @param array $data
      * @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespaceExtension
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->_objectManager->create($this->_instanceName, $data);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample
@@ -41,7 +41,7 @@ class SourceClassWithNamespaceFactory
      * @param array $data
      * @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->_objectManager->create($this->_instanceName, $data);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample
@@ -18,7 +18,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
     /**
      * {@inheritdoc}
      */
-    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicChildMethod');
         if (!$pluginInfo) {
@@ -57,7 +57,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
     /**
      * {@inheritdoc}
      */
-    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         $pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicParentMethod');
         if (!$pluginInfo) {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
@@ -93,7 +93,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
     /**
      * {@inheritdoc}
      */
-    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         return $this->_getSubject()->publicChildMethod($classGenerator, $param1, $param2, $param3, $array);
     }
@@ -117,7 +117,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
     /**
      * {@inheritdoc}
      */
-    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
+    public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
     {
         return $this->_getSubject()->publicParentMethod($docBlockGenerator, $param1, $param2, $param3, $array);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
@@ -169,9 +169,7 @@ public function testSendAction()
             \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
         );
 
-        $actualResult = \Zend_Mime_Decode::decodeQuotedPrintable(
-            $transportBuilder->getSentMessage()->getRawMessage()
-        );
+        $actualResult = quoted_printable_decode($transportBuilder->getSentMessage()->getRawMessage());
 
         $this->assertStringMatchesFormat(
             '%A' . $this->_customerViewHelper->getCustomerName($this->_customerSession->getCustomerDataObject())
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4234,5 +4234,6 @@
         'Magento\Elasticsearch\Test\Unit\Model\SearchAdapter\ConnectionManagerTest',
         'Magento\Elasticsearch\Test\Unit\SearchAdapter\ConnectionManagerTest'
     ],
-    ['Zend_Feed', 'Zend\Feed']
+    ['Zend_Feed', 'Zend\Feed'],
+    ['Zend_Mime', 'Magento\Framework\HTTP\Mime'],
 ];
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt
@@ -17,9 +17,9 @@ class SampleMapper
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Mapper constructor
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php b/lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php
@@ -32,7 +32,7 @@ interface SevenInterface extends \Magento\Framework\Code\Generator\CodeGenerator
      * @param array $data
      * @return TestThree
      */
-    public static function testMethod1(array &$data = array());
+    public static function testMethod1(array &$data = []);
 
     /**
      * Method short description
diff --git a/lib/internal/Magento/Framework/HTTP/Mime.php b/lib/internal/Magento/Framework/HTTP/Mime.php
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\HTTP;
+
+/**
+ * Support class for MultiPart Mime Messages
+ */
+class Mime
+{
+    const TYPE_OCTETSTREAM         = 'application/octet-stream';
+    const TYPE_TEXT                = 'text/plain';
+    const TYPE_HTML                = 'text/html';
+    const ENCODING_7BIT            = '7bit';
+    const ENCODING_8BIT            = '8bit';
+    const ENCODING_QUOTEDPRINTABLE = 'quoted-printable';
+    const ENCODING_BASE64          = 'base64';
+    const DISPOSITION_ATTACHMENT   = 'attachment';
+    const DISPOSITION_INLINE       = 'inline';
+    const LINELENGTH               = 72;
+    const LINEEND                  = "\n";
+    const MULTIPART_ALTERNATIVE    = 'multipart/alternative';
+    const MULTIPART_MIXED          = 'multipart/mixed';
+    const MULTIPART_RELATED        = 'multipart/related';
+}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt
@@ -37,7 +37,7 @@ class SampleFactory
      * @param array $data
      * @return \Magento\Framework\ObjectManager\Code\Generator\Sample
      */
-    public function create(array $data = array())
+    public function create(array $data = [])
     {
         return $this->_objectManager->create($this->_instanceName, $data);
     }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt
@@ -27,9 +27,9 @@ class SampleRepository implements SampleRepositoryInterface
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Extension attributes join processor.
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleRepository.txt
@@ -27,9 +27,9 @@ class TSampleRepository implements TSampleRepositoryInterface
      *
      * @var array
      */
-    protected $registry = array(
+    protected $registry = [
         
-    );
+    ];
 
     /**
      * Extension attributes join processor.

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected function _processDownload($path, $resourceType)`
`64`	`64`	`$contentDisposition = $helper->getContentDisposition();`
`65`	`65`	`if (!$contentDisposition \|\| in_array($contentType, $this->disallowedContentTypes)) {`
`66`	`66`	`// For security reasons we force browsers to download the file instead of opening it.`
`67`		`- $contentDisposition = \Zend_Mime::DISPOSITION_ATTACHMENT;`
	`67`	`+ $contentDisposition = \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`$response->setHeader('Content-Disposition', $contentDisposition . '; filename=' . $fileName);`
Original file line number	Diff line number	Diff line change
`@@ -492,8 +492,8 @@ public function linkNotAvailableDataProvider()`
`492`	`492`	`public function downloadTypesDataProvider()`
`493`	`493`	`{`
`494`	`494`	`return [`
`495`		`- ['mimeType' => 'text/html', 'disposition' => \Zend_Mime::DISPOSITION_ATTACHMENT],`
`496`		`- ['mimeType' => 'image/jpeg', 'disposition' => \Zend_Mime::DISPOSITION_INLINE],`
	`495`	`+ ['mimeType' => 'text/html', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_ATTACHMENT],`
	`496`	`+ ['mimeType' => 'image/jpeg', 'disposition' => \Magento\Framework\HTTP\Mime::DISPOSITION_INLINE],`
`497`	`497`	`];`
`498`	`498`	`}`
`499`	`499`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class SourceClassWithNamespaceExtensionInterfaceFactory`
`41`	`41`	`* @param array $data`
`42`	`42`	`* @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespaceExtension`
`43`	`43`	`*/`
`44`		`- public function create(array $data = array())`
	`44`	`+ public function create(array $data = [])`
`45`	`45`	`{`
`46`	`46`	`return $this->_objectManager->create($this->_instanceName, $data);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa`
`93`	`93`	`/**`
`94`	`94`	`* {@inheritdoc}`
`95`	`95`	`*/`
`96`		`- public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())`
	`96`	`+ public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])`
`97`	`97`	`{`
`98`	`98`	`return $this->_getSubject()->publicChildMethod($classGenerator, $param1, $param2, $param3, $array);`
`99`	`99`	`}`
`@@ -117,7 +117,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa`
`117`	`117`	`/**`
`118`	`118`	`* {@inheritdoc}`
`119`	`119`	`*/`
`120`		`- public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())`
	`120`	`+ public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])`
`121`	`121`	`{`
`122`	`122`	`return $this->_getSubject()->publicParentMethod($docBlockGenerator, $param1, $param2, $param3, $array);`
`123`	`123`	`}`