Merge pull request #2640 from magento-tsg/2.2-develop-pr27

[TSG] Backporting for 2.2 (pr27) (2.2.6)

Author: Alexander Akimov

app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml

@@ -10,7 +10,7 @@
 ?>
 <?php $_total = $block->getItems()->getSize() ?>
 <?php if ($_total): ?>
-    <a href="#" class="action print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
+    <a href="#" class="action print hidden-print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
         <span><?= /* @escapeNotVerified */ __('Print This Page') ?></span>
     </a>
         <div class="table-wrapper comparison">
@@ -29,7 +29,7 @@
                         <?php if ($_i++ == 0): ?>
                             <th scope="row" class="cell label remove"><span><?= /* @escapeNotVerified */ __('Remove Product') ?></span></th>
                         <?php endif; ?>
-                        <td class="cell remove product">
+                        <td class="cell remove product hidden-print">
                             <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                             <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($_item) ?>'
                                class="action delete" title="<?= /* @escapeNotVerified */ __('Remove Product') ?>">
@@ -59,7 +59,7 @@
                             </strong>
                             <?= $block->getReviewsSummaryHtml($_item, 'short') ?>
                             <?= /* @escapeNotVerified */ $block->getProductPrice($_item, '-compare-list-top') ?>
-                            <div class="product-item-actions">
+                            <div class="product-item-actions hidden-print">
                                 <div class="actions-primary">
                                     <?php if ($_item->isSaleable()): ?>
                                         <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" method="post">

app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php

@@ -165,7 +165,7 @@ public function getValue(\Magento\Framework\DataObject $object)
                 $options = $opt->getAllOptions();
                 if ($options) {
                     foreach ($options as $option) {
-                        if ($option['value'] == $value) {
+                        if ($option['value'] === $value) {
                             $valueOption = $option['label'];
                         }
                     }

app/design/frontend/Magento/blank/web/css/print.less

@@ -132,4 +132,8 @@
     .footer.content {
         padding: 0;
     }
+
+    .hidden-print {
+        display: none !important;
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php

@@ -32,8 +32,8 @@
             'is_filterable_in_search'       => 0,
             'is_used_for_promo_rules'       => 0,
             'is_html_allowed_on_front'      => 1,
-            'is_visible_on_front'           => 0,
-            'used_in_product_listing'       => 0,
+            'is_visible_on_front'           => 1,
+            'used_in_product_listing'       => 1,
             'used_for_sort_by'              => 0,
             'frontend_label'                => ['Drop-Down Attribute'],
             'backend_type'                  => 'varchar',

dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php

@@ -78,6 +78,21 @@ public function testGetSelectOptions()
         );
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
+     * @return void
+     */
+    public function testAttributeEntityValueNotSet()
+    {
+        $entity = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+        $entity->setStoreId(0);
+        $entity->load(1);
+        $frontEnd = $this->attribute->loadByCode('catalog_product', 'dropdown_attribute');
+        $value = $frontEnd->getFrontend()->getValue($entity);
+
+        $this->assertFalse($value);
+    }
+
     /**
      * Cache key generation
      * @return string

dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php

@@ -40,7 +40,7 @@ private function getPattern()
     {
         if ($this->pattern === null) {
             $this->pattern = '~\b(?<class>(?<module>('
-                . implode('_|', Files::init()->getNamespaces())
+                . implode('[_\\\\]|', Files::init()->getNamespaces())
                 . '[_\\\\])[a-zA-Z0-9]+)[a-zA-Z0-9_\\\\]*)\b~';
         }
 

dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php

@@ -89,7 +89,7 @@ public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
         }
 
         $pattern = '~\b(?<class>(?<module>(' . implode(
-            '_|',
+            '[_\\\\]|',
             Files::init()->getNamespaces()
         ) . '[_\\\\])[a-zA-Z0-9]+)[a-zA-Z0-9_\\\\]*)\b~';