Clean code

GraysonChiang · nmalevanec · commit f70fef1df9c0 · 2018-08-23T13:27:53.000+03:00
diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
@@ -55,7 +55,7 @@ public function __construct(
     private function getIteratorName(Query $query)
     {
         $config = $query->getConfig();
-        return isset($config['iterator']) ? $config['iterator'] : null;
+        return $config['iterator'] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/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;
     }
 }
diff --git a/app/code/Magento/Backend/Model/Menu/Builder.php b/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;
     }
 }
diff --git a/app/code/Magento/Backup/Helper/Data.php b/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] ?? '';
     }
 
     /**
diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
@@ -322,7 +322,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;
     }
 
     /**
@@ -333,7 +333,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;
     }
 
     /**
@@ -344,7 +344,7 @@ protected function getPriceViewValue($type)
      */
     protected function getPriceTypeValue($type)
     {
-        return isset($this->priceTypeMapping[$type]) ? $this->priceTypeMapping[$type] : null;
+        return $this->priceTypeMapping[$type] ?? null;
     }
 
     /**
@@ -355,7 +355,7 @@ protected function getPriceTypeValue($type)
      */
     private function getShipmentTypeValue($type)
     {
-        return isset($this->shipmentTypeMapping[$type]) ? $this->shipmentTypeMapping[$type] : null;
+        return $this->shipmentTypeMapping[$type] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php b/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] ?? '';
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -205,7 +205,7 @@ public function getImageAttribute($imageId, $attributeName, $default = null)
     {
         $attributes =
             $this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
-        return isset($attributes[$attributeName]) ? $attributes[$attributeName] : $default;
+        return $attributes[$attributeName] ?? $default;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php b/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
@@ -57,8 +57,7 @@ private function getLifeTimeByNamespace($namespace)
             ];
         }
 
-        return isset($configuration['lifetime']) ?
-            (int) $configuration['lifetime'] : FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
+        return (int)$configuration['lifetime'] ?? FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
@@ -859,7 +859,7 @@ public function getFrame()
      */
     protected function getAttribute($name)
     {
-        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+        return $this->attributes[$name] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
@@ -116,7 +116,7 @@ public function addHandler($method, $handler)
     public function getHandlers($method)
     {
         $method = strtolower($method);
-        return isset($this->_handlers[$method]) ? $this->_handlers[$method] : [];
+        return $this->_handlers[$method] ?? [];
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
@@ -77,7 +77,7 @@ private function mapConditionType(string $conditionType, string $field): string
             ];
         }
 
-        return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
+        return $conditionsMap[$conditionType] ?? $conditionType;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
@@ -381,7 +381,7 @@ public function getProductTypeName($id)
 
         $this->loadProductTypes();
 
-        return isset($this->_productTypesById[$id]) ? $this->_productTypesById[$id] : false;
+        return $this->_productTypesById[$id] ?? false;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -323,7 +323,7 @@ public function getGroupByType($type = null)
             self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE,
         ];
 
-        return isset($optionGroupsToTypes[$type]) ? $optionGroupsToTypes[$type] : '';
+        return $optionGroupsToTypes[$type] ?? '';
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -279,7 +279,7 @@ public function getFormattedOptionValue($optionValue)
      */
     public function getCustomizedView($optionInfo)
     {
-        return isset($optionInfo['value']) ? $optionInfo['value'] : $optionInfo;
+        return $optionInfo['value'] ?? $optionInfo;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
@@ -29,6 +29,6 @@ public function __construct(array $validators)
      */
     public function get($type)
     {
-        return isset($this->validators[$type]) ? $this->validators[$type] : $this->validators['default'];
+        return $this->validators[$type] ?? $this->validators['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php
@@ -232,7 +232,7 @@ public function getOptions()
     public function getOptionText($optionId)
     {
         $options = $this->getOptionArray();
-        return isset($options[$optionId]) ? $options[$optionId] : null;
+        return $options[$optionId] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
@@ -71,8 +71,6 @@ public function create($attribute, $context, $config = [])
      */
     protected function getFilterType($attribute)
     {
-        return isset($this->filterMap[$attribute->getFrontendInput()])
-            ? $this->filterMap[$attribute->getFrontendInput()]
-            : $this->filterMap['default'];
+        return $this->filterMap[$attribute->getFrontendInput()] ?? $this->filterMap['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
@@ -80,6 +80,6 @@ public function prepare()
      */
     protected function getFilterType($frontendInput)
     {
-        return isset($this->filterMap[$frontendInput]) ? $this->filterMap[$frontendInput] : $this->filterMap['default'];
+        return $this->filterMap[$frontendInput] ?? $this->filterMap['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -854,7 +854,7 @@ private function getFormElementsMapValue($value)
     {
         $valueMap = $this->formElementMapper->getMappings();
 
-        return isset($valueMap[$value]) ? $valueMap[$value] : $value;
+        return $valueMap[$value] ?? $value;
     }
 
     /**
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
@@ -234,7 +234,7 @@ public function clearFailedCategories()
      */
     public function getCategoryById($categoryId)
     {
-        return isset($this->categoriesCache[$categoryId]) ? $this->categoriesCache[$categoryId] : null;
+        return $this->categoriesCache[$categoryId] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
@@ -142,7 +142,7 @@ public function getNewSku($sku = null)
     {
         if ($sku !== null) {
             $sku = strtolower($sku);
-            return isset($this->newSkus[$sku]) ? $this->newSkus[$sku] : null;
+            return $this->newSkus[$sku] ?? null;
         }
         return $this->newSkus;
     }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -75,7 +75,7 @@ public function getWebsiteCodeToId($code = null)
             $this->_initWebsites();
         }
         if ($code) {
-            return isset($this->websiteCodeToId[$code]) ? $this->websiteCodeToId[$code] : null;
+            return $this->websiteCodeToId[$code] ?? null;
         }
         return $this->websiteCodeToId;
     }
@@ -90,7 +90,7 @@ public function getWebsiteCodeToStoreIds($code = null)
             $this->_initWebsites();
         }
         if ($code) {
-            return isset($this->websiteCodeToStoreIds[$code]) ? $this->websiteCodeToStoreIds[$code] : null;
+            return $this->websiteCodeToStoreIds[$code] ?? null;
         }
         return $this->websiteCodeToStoreIds;
     }
@@ -119,7 +119,7 @@ public function getStoreCodeToId($code = null)
             $this->_initStores();
         }
         if ($code) {
-            return isset($this->storeCodeToId[$code]) ? $this->storeCodeToId[$code] : null;
+            return $this->storeCodeToId[$code] ??  null;
         }
         return $this->storeCodeToId;
     }
@@ -134,7 +134,7 @@ public function getStoreIdToWebsiteStoreIds($code = null)
             $this->_initStores();
         }
         if ($code) {
-            return isset($this->storeIdToWebsiteStoreIds[$code]) ? $this->storeIdToWebsiteStoreIds[$code] : null;
+            return $this->storeIdToWebsiteStoreIds[$code] ?? null;
         }
         return $this->storeIdToWebsiteStoreIds;
     }
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
@@ -84,7 +84,7 @@ protected function _getCustomerGroups($groupId = null)
             $this->_customerGroups[$notLoggedInGroup->getId()] = $notLoggedInGroup->getCode();
         }
         if ($groupId !== null) {
-            return isset($this->_customerGroups[$groupId]) ? $this->_customerGroups[$groupId] : null;
+            return $this->_customerGroups[$groupId] ?? null;
         }
         return $this->_customerGroups;
     }
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
@@ -68,7 +68,7 @@ public function removeStock($scopeId = null)
      */
     public function getStockItem($productId, $scopeId)
     {
-        return isset($this->stockItems[$productId][$scopeId]) ? $this->stockItems[$productId][$scopeId] : null;
+        return $this->stockItems[$productId][$scopeId] ?? null;
     }
 
     /**
@@ -103,7 +103,7 @@ public function removeStockItem($productId, $scopeId = null)
      */
     public function getStockStatus($productId, $scopeId)
     {
-        return isset($this->stockStatuses[$productId][$scopeId]) ? $this->stockStatuses[$productId][$scopeId] : null;
+        return $this->stockStatuses[$productId][$scopeId] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
@@ -22,7 +22,7 @@ class RulePricesStorage
      */
     public function getRulePrice($id)
     {
-        return isset($this->rulePrices[$id]) ? $this->rulePrices[$id] : false;
+        return $this->rulePrices[$id] ?? false;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config.php b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
@@ -44,6 +44,6 @@ public function getFieldset($name, $root = 'global')
         if (empty($fieldsets)) {
             return null;
         }
-        return isset($fieldsets[$name]) ? $fieldsets[$name] : null;
+        return $fieldsets[$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Structure.php b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
@@ -251,6 +251,6 @@ public function populateWithArray(array $data)
      */
     private function getArrayValueByKey($key, array $array)
     {
-        return isset($array[$key]) ? $array[$key] : [];
+        return $array[$key] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
@@ -122,7 +122,7 @@ public function postprocessing($content)
         return preg_replace_callback(
             '#' . $patternTag . '(.+?)' . $patternTag . '#',
             function ($match) {
-                return isset($this->data[$match[1]]) ? $this->data[$match[1]] : '';
+                return $this->data[$match[1]] ?? '';
             },
             $content
         );
diff --git a/setup/src/Magento/Setup/Fixtures/ImagesFixture.php b/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
@@ -417,7 +417,7 @@ private function getImagesToGenerate()
     {
         $config = $this->fixtureModel->getValue('product-images', []);
 
-        return isset($config['images-count']) ? $config['images-count'] : null;
+        return $config['images-count'] ?? null;
     }
 
     /**
@@ -429,7 +429,7 @@ private function getImagesPerProduct()
     {
         $config = $this->fixtureModel->getValue('product-images', []);
 
-        return isset($config['images-per-product']) ? $config['images-per-product'] : null;
+        return $config['images-per-product'] ?? null;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Module/Setup/SetupCache.php b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
@@ -41,13 +41,9 @@ public function setField($table, $parentId, $rowId, $field, $value)
     public function get($table, $parentId, $rowId, $field = null)
     {
         if (null === $field) {
-            return isset($this->data[$table][$parentId][$rowId]) ?
-                $this->data[$table][$parentId][$rowId] :
-                false;
+            return $this->data[$table][$parentId][$rowId] ?? false;
         } else {
-            return isset($this->data[$table][$parentId][$rowId][$field]) ?
-                $this->data[$table][$parentId][$rowId][$field] :
-                false;
+            return $this->data[$table][$parentId][$rowId][$field] ?? false;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function __construct(`
`55`	`55`	`private function getIteratorName(Query $query)`
`56`	`56`	`{`
`57`	`57`	`$config = $query->getConfig();`
`58`		`- return isset($config['iterator']) ? $config['iterator'] : null;`
	`58`	`+ return $config['iterator'] ?? null;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config)`
`42`	`42`	`*/`
`43`	`43`	`public function getPart($code)`
`44`	`44`	`{`
`45`		`- return isset($this->_parts[$code]) ? $this->_parts[$code] : null;`
	`45`	`+ return $this->_parts[$code] ?? null;`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,6 @@ public function getResult(\Magento\Backend\Model\Menu $menu)`
`102`	`102`	`*/`
`103`	`103`	`protected function _getParam($params, $paramName, $defaultValue = null)`
`104`	`104`	`{`
`105`		`- return isset($params[$paramName]) ? $params[$paramName] : $defaultValue;`
	`105`	`+ return $params[$paramName] ?? $defaultValue;`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function getBackupsDir()`
`110`	`110`	`public function getExtensionByType($type)`
`111`	`111`	`{`
`112`	`112`	`$extensions = $this->getExtensions();`
`113`		`- return isset($extensions[$type]) ? $extensions[$type] : '';`
	`113`	`+ return $extensions[$type] ?? '';`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ function ($title, $storeName) {`
`322`	`322`	`*/`
`323`	`323`	`protected function getTypeValue($type)`
`324`	`324`	`{`
`325`		`- return isset($this->typeMapping[$type]) ? $this->typeMapping[$type] : self::VALUE_DYNAMIC;`
	`325`	`+ return $this->typeMapping[$type] ?? self::VALUE_DYNAMIC;`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`/**`
`@@ -333,7 +333,7 @@ protected function getTypeValue($type)`
`333`	`333`	`*/`
`334`	`334`	`protected function getPriceViewValue($type)`
`335`	`335`	`{`
`336`		`- return isset($this->priceViewMapping[$type]) ? $this->priceViewMapping[$type] : self::VALUE_PRICE_RANGE;`
	`336`	`+ return $this->priceViewMapping[$type] ?? self::VALUE_PRICE_RANGE;`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`/**`
`@@ -344,7 +344,7 @@ protected function getPriceViewValue($type)`
`344`	`344`	`*/`
`345`	`345`	`protected function getPriceTypeValue($type)`
`346`	`346`	`{`
`347`		`- return isset($this->priceTypeMapping[$type]) ? $this->priceTypeMapping[$type] : null;`
	`347`	`+ return $this->priceTypeMapping[$type] ?? null;`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`/**`
`@@ -355,7 +355,7 @@ protected function getPriceTypeValue($type)`
`355`	`355`	`*/`
`356`	`356`	`private function getShipmentTypeValue($type)`
`357`	`357`	`{`
`358`		`- return isset($this->shipmentTypeMapping[$type]) ? $this->shipmentTypeMapping[$type] : null;`
	`358`	`+ return $this->shipmentTypeMapping[$type] ?? null;`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public function resolve(\Magento\Framework\App\RequestInterface $request, $formI`
`18`	`18`	`{`
`19`	`19`	`$captchaParams = $request->getPost(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);`
`20`	`20`
`21`		`- return isset($captchaParams[$formId]) ? $captchaParams[$formId] : '';`
	`21`	`+ return $captchaParams[$formId] ?? '';`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function getImageAttribute($imageId, $attributeName, $default = null)`
`205`	`205`	`{`
`206`	`206`	`$attributes =`
`207`	`207`	`$this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);`
`208`		`- return isset($attributes[$attributeName]) ? $attributes[$attributeName] : $default;`
	`208`	`+ return $attributes[$attributeName] ?? $default;`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ private function getLifeTimeByNamespace($namespace)`
`57`	`57`	`];`
`58`	`58`	`}`
`59`	`59`
`60`		`- return isset($configuration['lifetime']) ?`
`61`		`- (int) $configuration['lifetime'] : FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;`
	`60`	`+ return (int)$configuration['lifetime'] ?? FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,7 @@ public function getFrame()`
`859`	`859`	`*/`
`860`	`860`	`protected function getAttribute($name)`
`861`	`861`	`{`
`862`		`- return isset($this->attributes[$name]) ? $this->attributes[$name] : null;`
	`862`	`+ return $this->attributes[$name] ?? null;`
`863`	`863`	`}`
`864`	`864`
`865`	`865`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function addHandler($method, $handler)`
`116`	`116`	`public function getHandlers($method)`
`117`	`117`	`{`
`118`	`118`	`$method = strtolower($method);`
`119`		`- return isset($this->_handlers[$method]) ? $this->_handlers[$method] : [];`
	`119`	`+ return $this->_handlers[$method] ?? [];`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/**`