Merge pull request #895 from magento-engcom/develop-prs-isolated

ishakhsuvarov · web-flow · commit dc47c0675603 · 2017-03-08T15:29:59.000+02:00
[EngCom] Merge Community Pull Requests: - #8776 - #8772 - #8762 - #8768 - #8758 - #8759 - #8623 - #8695 - #8723 - #8678 - #8711 - #8706
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -12,6 +12,7 @@
 namespace Magento\Catalog\Block\Product\View;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\Phrase;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 class Attributes extends \Magento\Framework\View\Element\Template
@@ -85,8 +86,8 @@ public function getAdditionalData(array $excludeAttr = [])
                 } elseif ($attribute->getFrontendInput() == 'price' && is_string($value)) {
                     $value = $this->priceCurrency->convertAndFormat($value);
                 }
-
-                if (is_string($value) && strlen($value)) {
+    
+                if ($value instanceof Phrase || (is_string($value) && strlen($value))) {
                     $data[$attribute->getAttributeCode()] = [
                         'label' => __($attribute->getStoreLabel()),
                         'value' => $value,
diff --git a/app/code/Magento/Config/Model/Config/SourceFactory.php b/app/code/Magento/Config/Model/Config/SourceFactory.php
@@ -26,7 +26,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      * Create backend model by name
      *
      * @param string $modelName
-     * @return mixed
+     * @return \Magento\Framework\Option\ArrayInterface
      */
     public function create($modelName)
     {
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php
@@ -105,7 +105,7 @@ public function testGetNextBunch($entityType, $bunchData, $expectedData)
             ->getMock();
         $jsonDecoderMock->expects($this->once())
             ->method('decode')
-            ->willReturn(\Zend_Json::decode($bunchData));
+            ->willReturn(json_decode($bunchData, true));
         $jsonHelper = $helper->getObject(
             \Magento\Framework\Json\Helper\Data::class,
             [
@@ -140,7 +140,7 @@ public function getNextBunchDataProvider()
         return [
             'address entity' => [
                 '$entityType' => CustomerComposite::COMPONENT_ENTITY_ADDRESS,
-                '$bunchData' => \Zend_Json::encode(
+                '$bunchData' => json_encode(
                     [
                         [
                             '_scope' => CustomerComposite::SCOPE_DEFAULT,
@@ -170,7 +170,7 @@ public function getNextBunchDataProvider()
             ],
             'customer entity default scope' => [
                 '$entityType' => CustomerComposite::COMPONENT_ENTITY_CUSTOMER,
-                '$bunchData' => \Zend_Json::encode(
+                '$bunchData' => json_encode(
                     [
                         [
                             '_scope' => CustomerComposite::SCOPE_DEFAULT,
@@ -202,7 +202,7 @@ public function getNextBunchDataProvider()
             ],
             'customer entity address scope' => [
                 '$entityType' => CustomerComposite::COMPONENT_ENTITY_CUSTOMER,
-                '$bunchData' => \Zend_Json::encode(
+                '$bunchData' => json_encode(
                     [
                         [
                             '_scope' => CustomerComposite::SCOPE_ADDRESS,
diff --git a/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php b/app/code/Magento/Developer/Console/Command/DevTestsRunCommand.php
@@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             list($dir, $options) = $this->commands[$key];
             $dirName = realpath(BP . '/dev/tests/' . $dir);
             chdir($dirName);
-            $command = 'php '. BP . '/' . $vendorDir . '/phpunit/phpunit/phpunit ' . $options;
+            $command = PHP_BINARY . ' ' . BP . '/' . $vendorDir . '/phpunit/phpunit/phpunit ' . $options;
             $message = $dirName . '> ' . $command;
             $output->writeln(['', str_pad("---- {$message} ", 70, '-'), '']);
             passthru($command, $returnVal);
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
@@ -56,7 +56,7 @@ public function synchronize($relativeFileName)
         } catch (\Exception $e) {
         }
         if ($storage->getId()) {
-            /** @var Write $file */
+            /** @var \Magento\Framework\Filesystem\File\WriteInterface $file */
             $file = $this->mediaDirectory->openFile($relativeFileName, 'w');
             try {
                 $file->lock();
diff --git a/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php b/app/code/Magento/Persistent/Observer/SetRememberMeStatusForAjaxLoginObserver.php
@@ -29,17 +29,27 @@ class SetRememberMeStatusForAjaxLoginObserver implements ObserverInterface
     protected $_persistentData = null;
 
     /**
-     * Constructor
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
+    /**
+     * SetRememberMeStatusForAjaxLoginObserver constructor.
      *
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Persistent\Helper\Session $persistentSession
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
-        \Magento\Persistent\Helper\Session $persistentSession
+        \Magento\Persistent\Helper\Session $persistentSession,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->_persistentData = $persistentData;
         $this->_persistentSession = $persistentSession;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -63,7 +73,7 @@ public function execute(Observer $observer)
             $requestData = [];
             $content = $request->getContent();
             if ($content) {
-                $requestData = \Zend_Json::decode($content);
+                $requestData = $this->serializer->unserialize($content);
             }
             $isRememberMeChecked = empty($requestData['persistent_remember_me']) ? false : true;
             $this->_persistentSession->setRememberMeChecked((bool)$isRememberMeChecked);
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js b/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js
@@ -15,11 +15,12 @@ define([
 
     var totals = quote.getTotals(),
         couponCode = ko.observable(null),
-        isApplied = ko.observable(couponCode() != null);
+        isApplied;
 
     if (totals()) {
         couponCode(totals()['coupon_code']);
     }
+    isApplied = ko.observable(couponCode() != null);
 
     return Component.extend({
         defaults: {
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js
@@ -122,6 +122,7 @@ define([
          * @param {Boolean} isActive
          */
         setActiveState: function (isActive) {
+            this.searchForm.toggleClass('active', isActive);
             this.searchLabel.toggleClass('active', isActive);
 
             if (this.isExpandable) {
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Range.php b/app/code/Magento/Ui/Component/Filters/Type/Range.php
@@ -53,7 +53,7 @@ protected function applyFilter()
      */
     protected function applyFilterByType($type, $value)
     {
-        if (!empty($value) && $value !== '0') {
+        if (is_numeric($value)) {
             $filter = $this->filterBuilder->setConditionType($type)
                 ->setField($this->getName())
                 ->setValue($value)
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/RangeTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/RangeTest.php
@@ -97,37 +97,58 @@ public function testGetComponentName()
      *
      * @param string $name
      * @param array $filterData
-     * @param array|null $expectedCondition
+     * @param array|null $expectedCalls
      * @dataProvider getPrepareDataProvider
      * @return void
      */
-    public function testPrepare($name, $filterData, $expectedCondition)
+    public function testPrepare($name, $filterData, $expectedCalls)
     {
+        $filter = $this->getMock(
+            \Magento\Framework\Api\Filter::class,
+            [],
+            [],
+            '',
+            false,
+            false
+        );
+        $this->filterBuilderMock->expects($this->any())
+            ->method('setConditionType')
+            ->willReturnSelf();
+        $this->filterBuilderMock->expects($this->any())
+            ->method('setField')
+            ->willReturnSelf();
+        $this->filterBuilderMock->expects($this->any())
+            ->method('setValue')
+            ->willReturnSelf();
+        $this->filterBuilderMock->expects($this->any())
+            ->method('create')
+            ->willReturn($filter);
+
         $this->contextMock->expects($this->any())
             ->method('getNamespace')
             ->willReturn(Range::NAME);
         $this->contextMock->expects($this->any())
             ->method('addComponentDefinition')
             ->with(Range::NAME, ['extends' => Range::NAME]);
         $this->contextMock->expects($this->any())
-            ->method('getRequestParam')
-            ->with(UiContext::FILTER_VAR)
+            ->method('getFiltersParams')
             ->willReturn($filterData);
+
         /** @var DataProviderInterface $dataProvider */
         $dataProvider = $this->getMockForAbstractClass(
             \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class,
             [],
             '',
             false
         );
-        $this->contextMock->expects($this->any())
+
+        $this->contextMock->expects($this->atLeastOnce())
             ->method('getDataProvider')
             ->willReturn($dataProvider);
-        if ($expectedCondition !== null) {
-            $dataProvider->expects($this->any())
-                ->method('addFilter')
-                ->with($expectedCondition, $name);
-        }
+
+        $dataProvider->expects($this->exactly($expectedCalls))
+            ->method('addFilter')
+            ->with($filter);
 
         $range = new Range(
             $this->contextMock,
@@ -149,37 +170,67 @@ public function getPrepareDataProvider()
             [
                 'test_date',
                 ['test_date' => ['from' => 0, 'to' => 1]],
-                ['from' => null, 'orig_from' => 0, 'to' => 1],
+                2
             ],
             [
                 'test_date',
                 ['test_date' => ['from' => '', 'to' => 2]],
-                ['from' => null, 'orig_from' => '', 'to' => 2],
+                1
             ],
             [
                 'test_date',
                 ['test_date' => ['from' => 1, 'to' => '']],
-                ['from' => 1, 'orig_to' => '', 'to' => null],
+                1
             ],
             [
                 'test_date',
                 ['test_date' => ['from' => 1, 'to' => 0]],
-                ['from' => 1, 'orig_to' => 0, 'to' => null],
+                2
             ],
             [
                 'test_date',
                 ['test_date' => ['from' => 1, 'to' => 2]],
-                ['from' => 1, 'to' => 2],
+                2
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => 0, 'to' => 0]],
+                2
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => '0', 'to' => '0']],
+                2
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => '0.0', 'to' => 1]],
+                2
             ],
             [
                 'test_date',
                 ['test_date' => ['from' => '', 'to' => '']],
-                null,
+                0
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => 'a', 'to' => 'b']],
+                0
+            ],
+            [
+                'test_date',
+                ['test_date' => ['from' => '1']],
+                1
+            ],
+            [
+                'test_date',
+                ['test_date' => ['to' => '1']],
+                1
             ],
             [
                 'test_date',
                 ['test_date' => []],
-                null,
+                0
             ],
         ];
     }
diff --git a/app/code/Magento/Widget/Model/Config/Converter.php b/app/code/Magento/Widget/Model/Config/Converter.php
@@ -44,7 +44,7 @@ public function convert($source)
                     case 'parameters':
                         /** @var $parameter \DOMNode */
                         foreach ($widgetSubNode->childNodes as $parameter) {
-                            if ($parameter->nodeName === '#text') {
+                            if ($parameter->nodeName === '#text' || $parameter->nodeName === '#comment') {
                                 continue;
                             }
                             $subNodeAttributes = $parameter->attributes;
@@ -57,7 +57,7 @@ public function convert($source)
                             $widgetArray['supported_containers'] = [];
                         }
                         foreach ($widgetSubNode->childNodes as $container) {
-                            if ($container->nodeName === '#text') {
+                            if ($container->nodeName === '#text' || $container->nodeName === '#comment') {
                                 continue;
                             }
                             $widgetArray['supported_containers'] = array_merge(
diff --git a/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml b/app/code/Magento/Widget/Test/Unit/Model/_files/widget.xml
@@ -11,6 +11,7 @@
         <label translate="true">Orders and Returns</label>
         <description translate="true">Orders and Returns Search Form</description>
         <parameters>
+            <!-- Comment added to check fix to https://github.com/magento/magento2/issues/3882 -->
             <parameter name="title" xsi:type="text" visible="false">
                 <label translate="true">Anchor Custom Title</label>
             </parameter>
@@ -54,6 +55,7 @@
             </parameter>
         </parameters>
         <containers>
+            <!-- Comment added to check fix to https://github.com/magento/magento2/issues/3882 -->
             <container name="left">
                 <template name="default" value="default_template" />
             </container>
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
@@ -112,7 +112,7 @@ public function generateClass($className)
             $this->tryToLoadSourceClass($className, $generator);
             if (!($file = $generator->generate())) {
                 $errors = $generator->getErrors();
-                throw new \RuntimeException(implode(' ', $errors));
+                throw new \RuntimeException(implode(' ', $errors) . ' in [' . $className . ']');
             }
             if (!$this->definedClasses->isClassLoadableFromMemory($className)) {
                 $this->_ioObject->includeFile($file);
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Table.php b/lib/internal/Magento/Framework/DB/Ddl/Table.php
@@ -41,14 +41,13 @@ class Table
 
     // Capable to support long date-time before 1970
     const TYPE_TEXT = 'text';
-
+    
+    // A real blob, stored as binary inside DB
     const TYPE_BLOB = 'blob';
 
     // Used for back compatibility, when query param can't use statement options
     const TYPE_VARBINARY = 'varbinary';
 
-    // A real blob, stored as binary inside DB
-
     /**
      * Default and maximal TEXT and BLOB columns sizes we can support for different DB systems.
      */

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan`
`26`	`26`	`* Create backend model by name`
`27`	`27`	`*`
`28`	`28`	`* @param string $modelName`
`29`		`- * @return mixed`
	`29`	`+ * @return \Magento\Framework\Option\ArrayInterface`
`30`	`30`	`*/`
`31`	`31`	`public function create($modelName)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function testGetNextBunch($entityType, $bunchData, $expectedData)`
`105`	`105`	`->getMock();`
`106`	`106`	`$jsonDecoderMock->expects($this->once())`
`107`	`107`	`->method('decode')`
`108`		`- ->willReturn(\Zend_Json::decode($bunchData));`
	`108`	`+ ->willReturn(json_decode($bunchData, true));`
`109`	`109`	`$jsonHelper = $helper->getObject(`
`110`	`110`	`\Magento\Framework\Json\Helper\Data::class,`
`111`	`111`	`[`
`@@ -140,7 +140,7 @@ public function getNextBunchDataProvider()`
`140`	`140`	`return [`
`141`	`141`	`'address entity' => [`
`142`	`142`	`'$entityType' => CustomerComposite::COMPONENT_ENTITY_ADDRESS,`
`143`		`- '$bunchData' => \Zend_Json::encode(`
	`143`	`+ '$bunchData' => json_encode(`
`144`	`144`	`[`
`145`	`145`	`[`
`146`	`146`	`'_scope' => CustomerComposite::SCOPE_DEFAULT,`
`@@ -170,7 +170,7 @@ public function getNextBunchDataProvider()`
`170`	`170`	`],`
`171`	`171`	`'customer entity default scope' => [`
`172`	`172`	`'$entityType' => CustomerComposite::COMPONENT_ENTITY_CUSTOMER,`
`173`		`- '$bunchData' => \Zend_Json::encode(`
	`173`	`+ '$bunchData' => json_encode(`
`174`	`174`	`[`
`175`	`175`	`[`
`176`	`176`	`'_scope' => CustomerComposite::SCOPE_DEFAULT,`
`@@ -202,7 +202,7 @@ public function getNextBunchDataProvider()`
`202`	`202`	`],`
`203`	`203`	`'customer entity address scope' => [`
`204`	`204`	`'$entityType' => CustomerComposite::COMPONENT_ENTITY_CUSTOMER,`
`205`		`- '$bunchData' => \Zend_Json::encode(`
	`205`	`+ '$bunchData' => json_encode(`
`206`	`206`	`[`
`207`	`207`	`[`
`208`	`208`	`'_scope' => CustomerComposite::SCOPE_ADDRESS,`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function synchronize($relativeFileName)`
`56`	`56`	`} catch (\Exception $e) {`
`57`	`57`	`}`
`58`	`58`	`if ($storage->getId()) {`
`59`		`- /** @var Write $file */`
	`59`	`+ /** @var \Magento\Framework\Filesystem\File\WriteInterface $file */`
`60`	`60`	`$file = $this->mediaDirectory->openFile($relativeFileName, 'w');`
`61`	`61`	`try {`
`62`	`62`	`$file->lock();`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function applyFilter()`
`53`	`53`	`*/`
`54`	`54`	`protected function applyFilterByType($type, $value)`
`55`	`55`	`{`
`56`		`- if (!empty($value) && $value !== '0') {`
	`56`	`+ if (is_numeric($value)) {`
`57`	`57`	`$filter = $this->filterBuilder->setConditionType($type)`
`58`	`58`	`->setField($this->getName())`
`59`	`59`	`->setValue($value)`