Merge branch '2.2-develop' into 2.2.6-develop

Author: Dmytro Voskoboinikov

app/code/Magento/Analytics/ReportXml/ReportProvider.php

@@ -57,7 +57,7 @@ public function __construct(
     private function getIteratorName(Query $query)
     {
         $config = $query->getConfig();
-        return isset($config['iterator']) ? $config['iterator'] : null;
+        return $config['iterator'] ?? null;
     }
 
     /**

app/code/Magento/Backend/App/DefaultPath.php

@@ -42,6 +42,6 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config)
      */
     public function getPart($code)
     {
-        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+        return $this->_parts[$code] ?? null;
     }
 }

app/code/Magento/Backend/Block/Dashboard/Bar.php

@@ -38,14 +38,6 @@ public function getTotals()
      */
     public function addTotal($label, $value, $isQuantity = false)
     {
-        /*if (!$isQuantity) {
-          $value = $this->format($value);
-          $decimals = substr($value, -2);
-          $value = substr($value, 0, -2);
-          } else {
-          $value = ($value != '')?$value:0;
-          $decimals = '';
-          }*/
         if (!$isQuantity) {
             $value = $this->format($value);
         }

app/code/Magento/Backend/Model/Menu/Builder.php

@@ -102,6 +102,6 @@ public function getResult(\Magento\Backend\Model\Menu $menu)
      */
     protected function _getParam($params, $paramName, $defaultValue = null)
     {
-        return isset($params[$paramName]) ? $params[$paramName] : $defaultValue;
+        return $params[$paramName] ?? $defaultValue;
     }
 }

app/code/Magento/Backup/Helper/Data.php

@@ -110,7 +110,7 @@ public function getBackupsDir()
     public function getExtensionByType($type)
     {
         $extensions = $this->getExtensions();
-        return isset($extensions[$type]) ? $extensions[$type] : '';
+        return $extensions[$type] ?? '';
     }
 
     /**

app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php

@@ -321,7 +321,7 @@ function ($title, $storeName) {
      */
     protected function getTypeValue($type)
     {
-        return isset($this->typeMapping[$type]) ? $this->typeMapping[$type] : self::VALUE_DYNAMIC;
+        return $this->typeMapping[$type] ?? self::VALUE_DYNAMIC;
     }
 
     /**
@@ -332,7 +332,7 @@ protected function getTypeValue($type)
      */
     protected function getPriceViewValue($type)
     {
-        return isset($this->priceViewMapping[$type]) ? $this->priceViewMapping[$type] : self::VALUE_PRICE_RANGE;
+        return $this->priceViewMapping[$type] ?? self::VALUE_PRICE_RANGE;
     }
 
     /**
@@ -343,7 +343,7 @@ protected function getPriceViewValue($type)
      */
     protected function getPriceTypeValue($type)
     {
-        return isset($this->priceTypeMapping[$type]) ? $this->priceTypeMapping[$type] : null;
+        return $this->priceTypeMapping[$type] ?? null;
     }
 
     /**
@@ -354,7 +354,7 @@ protected function getPriceTypeValue($type)
      */
     private function getShipmentTypeValue($type)
     {
-        return isset($this->shipmentTypeMapping[$type]) ? $this->shipmentTypeMapping[$type] : null;
+        return $this->shipmentTypeMapping[$type] ?? null;
     }
 
     /**

app/code/Magento/Captcha/Observer/CaptchaStringResolver.php

@@ -18,6 +18,6 @@ public function resolve(\Magento\Framework\App\RequestInterface $request, $formI
     {
         $captchaParams = $request->getPost(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);
 
-        return isset($captchaParams[$formId]) ? $captchaParams[$formId] : '';
+        return $captchaParams[$formId] ?? '';
     }
 }

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php

@@ -14,5 +14,5 @@ class Attribute extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
+    protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/attribute.phtml';
 }

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php

@@ -113,7 +113,7 @@ public function getElementHtml()
      */
     public function getImages()
     {
-        $images = $this->registry->registry('current_product')->getData('media_gallery') ?: null;
+        $images = $this->getDataObject()->getData('media_gallery') ?: null;
         if ($images === null) {
             $images = ((array)$this->dataPersistor->get('catalog_product'))['product']['media_gallery'] ?? null;
         }

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();