🔃 [EngCom] Public Pull Requests - 2.3-develop

Stanislav Idolov · web-flow · commit b0d58ccf6988 · 2018-03-30T10:28:17.000+03:00
Accepted Public Pull Requests: - magento/magento2#14433: [Forwardport] Add getters to product image builder (by @mastiuhin-olexandr) - magento/magento2#14322: #7816: Customer_account.xml file abused (2.3) (by @mikewhitby) - magento/magento2#14414: [FORWARDPORT 2.3] Remove duplicated case statement (by @coderimus) - magento/magento2#14416: [FORWARDPORT 2.3] Removed cache backend option which explicitly set file permissions (by @xtremeperf) Fixed GitHub Issues: - magento/magento2#7816: Customer_account.xml file abused (reported by @LiamFielding) has been fixed in magento/magento2#14322 by @mikewhitby in 2.3-develop branch Related commits: 1. caf5b3e - magento/magento2#10700: Magento 2 Admin panel show loading on each page (reported by @historylife) has been fixed in magento/magento2#14416 by @xtremeperf in 2.3-develop branch Related commits: 1. 87ad6eb - magento/magento2#11930: setup:di:compile's generated cache files inaccessible by the web-server user (reported by @JanisE) has been fixed in magento/magento2#14416 by @xtremeperf in 2.3-develop branch Related commits: 1. 87ad6eb
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
@@ -46,9 +46,6 @@
         <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>" class="input-text <?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>"/>
     </span>
       <?php break;
-    case 'hidden': ?>
-        <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>">
-      <?php break;
     case 'radios': ?>
     <span class="form_row">
         <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
diff --git a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
@@ -146,6 +146,7 @@ public function create()
                 'custom_attributes' => $this->getCustomAttributes(),
                 'resized_image_width' => $imagesize[0],
                 'resized_image_height' => $imagesize[1],
+                'product_id' => $this->product->getId()
             ],
         ];
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
@@ -252,6 +252,7 @@ private function getTestDataWithoutAttributes(): array
                     'custom_attributes' => '',
                     'resized_image_width' => 100,
                     'resized_image_height' => 100,
+                    'product_id' => null
                 ],
             ],
         ];
@@ -286,6 +287,7 @@ private function getTestDataWithAttributes(): array
                     'custom_attributes' => 'name_1="value_1" name_2="value_2"',
                     'resized_image_width' => 120,
                     'resized_image_height' => 70,
+                    'product_id' => null
                 ],
             ],
         ];
diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php
@@ -35,9 +35,6 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->resultPageFactory->create();
-        $resultPage->getConfig()->getTitle()->set(__('My Account'));
-        return $resultPage;
+        return $this->resultPageFactory->create();
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" label="Customer My Account (All Pages)" design_abstraction="custom">
+    <head>
+        <title>My Account</title>
+    </head>
     <body>
         <attribute name="class" value="account"/>
         <referenceContainer name="sidebar.main">
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
@@ -56,9 +56,6 @@ protected function _isAllowed()
             case 'coupons':
                 return $this->_authorization->isAllowed('Magento_Reports::coupons');
                 break;
-            case 'shipping':
-                return $this->_authorization->isAllowed('Magento_Reports::shipping');
-                break;
             case 'bestsellers':
                 return $this->_authorization->isAllowed('Magento_Reports::bestsellers');
                 break;
diff --git a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
@@ -71,7 +71,6 @@ class Factory
      */
     protected $_backendOptions = [
         'hashed_directory_level' => 1,
-        'hashed_directory_umask' => 0777,
         'file_name_prefix' => 'mage',
     ];
 

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ public function __construct(`
`35`	`35`	`*/`
`36`	`36`	`public function execute()`
`37`	`37`	`{`
`38`		`- /** @var \Magento\Framework\View\Result\Page $resultPage */`
`39`		`- $resultPage = $this->resultPageFactory->create();`
`40`		`- $resultPage->getConfig()->getTitle()->set(__('My Account'));`
`41`		`- return $resultPage;`
	`38`	`+ return $this->resultPageFactory->create();`
`42`	`39`	`}`
`43`	`40`	`}`