🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #17019: Fixes Black color coding standard. (by @chirag-wagento)
 - #16965: fix: add hasrequired notice for create account form and password forg� (by @DanielRuf)
 - #16921: Slight Changes to Code (by @tiagosampaio)
 - #16946: Delete all unused imports of lib/internal/Magento (by @osrecio)
 - #16883: Update nginx.config.sample to exclude php5-fpm (by @sean-wcb)
 - #16900: Add Clean Code (by @hryvinskyi)
 - #16863: Configurable Product with Only Size Options (No Color Options) Shows � (by @ronak2ram)
 - #16560: Admin user auth controller refactor (by @AnshuMishra17)


Fixed GitHub Issues:
 - #16843: Magento 2.2.5: Configurable Product with Only Size Options (No Color Options) Shows No Image in Cart (reported by @uandiweb) has been fixed in #16863 by @ronak2ram in 2.2-develop branch
   Related commits:
     1. 108c2c5
     2. 4e32d06

Author: Stanislav Idolov

app/code/Magento/Catalog/Block/Product/ImageBuilder.php

@@ -122,7 +122,7 @@ protected function getRatio(\Magento\Catalog\Helper\Image $helper)
     public function create()
     {
         /** @var \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface $simpleOption */
-        $simpleOption = $this->product->getCustomOption('simple_product');
+        $simpleOption = $this->product->getOptionById('simple_product');
 
         if ($simpleOption !== null) {
             $optionProduct = $simpleOption->getProduct();

app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php

@@ -306,7 +306,7 @@ public function testCreateWithSimpleProduct($data, $expected)
         $simpleOptionMock = $this->createMock(\Magento\Wishlist\Model\Item\Option::class);
         $simpleProductMock = $this->createMock(\Magento\Catalog\Model\Product::class);
 
-        $productMock->expects($this->once())->method('getCustomOption')
+        $productMock->expects($this->once())->method('getOptionById')
             ->with('simple_product')->willReturn($simpleOptionMock);
 
         $simpleOptionMock->expects($this->once())->method('getProduct')->willReturn($simpleProductMock);

app/code/Magento/CatalogRule/Model/Rule/Job.php

@@ -8,6 +8,10 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\CatalogRule\Model\Rule;
+
+use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
+
 /**
  * Catalog Rule job model
  *
@@ -18,13 +22,8 @@
  * @method bool hasSuccess()
  * @method bool hasError()
  *
- * @author    Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\CatalogRule\Model\Rule;
-
-use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
-
-/**
+ * @author Magento Core Team <core@magentocommerce.com>
+ *
  * @api
  * @since 100.0.2
  */
@@ -39,10 +38,14 @@ class Job extends \Magento\Framework\DataObject
      * Basic object initialization
      *
      * @param RuleProductProcessor $ruleProcessor
+     * @param array $data
      */
-    public function __construct(RuleProductProcessor $ruleProcessor)
-    {
+    public function __construct(
+        RuleProductProcessor $ruleProcessor,
+        array $data = []
+    ) {
         $this->ruleProcessor = $ruleProcessor;
+        parent::__construct($data);
     }
 
     /**

app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php

@@ -26,18 +26,18 @@ public function execute()
                 $model->load($id);
                 $model->delete();
                 // display success message
-                $this->messageManager->addSuccess(__('You deleted the block.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the block.'));
                 // go to grid
                 return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 // display error message
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 // go back to edit form
                 return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
             }
         }
         // display error message
-        $this->messageManager->addError(__('We can\'t find a block to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a block to delete.'));
         // go to grid
         return $resultRedirect->setPath('*/*/');
     }

app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php

@@ -42,7 +42,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This block no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This block no longer exists.'));
                 /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('*/*/');

app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php

@@ -46,6 +46,7 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {

app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php

@@ -60,7 +60,7 @@ public function execute()
             $block->delete();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
+        $this->messageManager->addSuccessMessage(__('A total of %1 record(s) have been deleted.', $collectionSize));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php

@@ -26,35 +26,42 @@ public function execute()
         $id = $this->getRequest()->getParam('page_id');
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
+        
         if ($id) {
             $title = "";
             try {
                 // init model and delete
                 $model = $this->_objectManager->create(\Magento\Cms\Model\Page::class);
                 $model->load($id);
+                
                 $title = $model->getTitle();
                 $model->delete();
+                
                 // display success message
-                $this->messageManager->addSuccess(__('The page has been deleted.'));
+                $this->messageManager->addSuccessMessage(__('The page has been deleted.'));
+                
                 // go to grid
-                $this->_eventManager->dispatch(
-                    'adminhtml_cmspage_on_delete',
-                    ['title' => $title, 'status' => 'success']
-                );
+                $this->_eventManager->dispatch('adminhtml_cmspage_on_delete', [
+                    'title' => $title,
+                    'status' => 'success'
+                ]);
+                
                 return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 $this->_eventManager->dispatch(
                     'adminhtml_cmspage_on_delete',
                     ['title' => $title, 'status' => 'fail']
                 );
                 // display error message
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 // go back to edit form
                 return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]);
             }
         }
+        
         // display error message
-        $this->messageManager->addError(__('We can\'t find a page to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a page to delete.'));
+        
         // go to grid
         return $resultRedirect->setPath('*/*/');
     }

app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php

@@ -76,7 +76,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This page no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This page no longer exists.'));
                 /** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('*/*/');

app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php

@@ -57,6 +57,7 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {