ENGCOM-2640: [Forwardport] Code cleanup of lib files #17329

magento-engcom-team · magento-engcom-team · commit 58a97869b7ed · 2018-08-02T18:38:27.000-05:00
- Merge Pull Request #17329 from mage2pratik/magento2:2.3-develop-PR-port-17103 - Merged commits: 1. c4eeaa9
diff --git a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
@@ -76,7 +76,7 @@ public function getCustomAttribute($attributeCode)
      */
     public function getCustomAttributes()
     {
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES]) ? $this->_data[self::CUSTOM_ATTRIBUTES] : [];
+        return $this->_data[self::CUSTOM_ATTRIBUTES] ?? [];
     }
 
     /**
@@ -131,7 +131,7 @@ public function setCustomAttribute($attributeCode, $attributeValue)
      */
     protected function getCustomAttributesCodes()
     {
-        return isset($this->customAttributesCodes) ? $this->customAttributesCodes : [];
+        return $this->customAttributesCodes ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObject.php
@@ -34,7 +34,7 @@ public function __construct(array $data = [])
      */
     protected function _get($key)
     {
-        return isset($this->_data[$key]) ? $this->_data[$key] : null;
+        return $this->_data[$key] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/ImageProcessor.php b/lib/internal/Magento/Framework/Api/ImageProcessor.php
@@ -172,7 +172,7 @@ public function processImageContent($entityType, $imageContent)
      */
     protected function getMimeTypeExtension($mimeType)
     {
-        return isset($this->mimeTypeExtensionMap[$mimeType]) ? $this->mimeTypeExtensionMap[$mimeType] : '';
+        return $this->mimeTypeExtensionMap[$mimeType] ?? '';
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/Search/Document.php b/lib/internal/Magento/Framework/Api/Search/Document.php
@@ -33,9 +33,7 @@ public function setId($id)
      */
     public function getCustomAttribute($attributeCode)
     {
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode])
-            ? $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]
-            : null;
+        return $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
@@ -123,6 +123,6 @@ private function getCustomFilterForField($field)
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
@@ -121,6 +121,6 @@ private function getCustomJoin($field)
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/SortingProcessor.php
@@ -59,7 +59,7 @@ public function process(SearchCriteriaInterface $searchCriteria, AbstractDb $col
      */
     private function getFieldMapping($field)
     {
-        return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;
+        return $this->fieldMapping[$field] ?? $field;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/ActionFlag.php b/lib/internal/Magento/Framework/App/ActionFlag.php
@@ -65,9 +65,7 @@ public function get($action, $flag = '')
             $action = $this->_request->getActionName();
         }
         if ('' === $flag) {
-            return isset(
-                $this->_flags[$this->_getControllerKey()]
-            ) ? $this->_flags[$this->_getControllerKey()] : [];
+            return $this->_flags[$this->_getControllerKey()] ?? [];
         } elseif (isset($this->_flags[$this->_getControllerKey()][$action][$flag])) {
             return $this->_flags[$this->_getControllerKey()][$action][$flag];
         } else {
diff --git a/lib/internal/Magento/Framework/App/AreaList.php b/lib/internal/Magento/Framework/App/AreaList.php
@@ -88,7 +88,7 @@ public function getCodeByFrontName($frontName)
      */
     public function getFrontName($areaCode)
     {
-        return isset($this->_areas[$areaCode]['frontName']) ? $this->_areas[$areaCode]['frontName'] : null;
+        return $this->_areas[$areaCode]['frontName'] ?? null;
     }
 
     /**
@@ -111,7 +111,7 @@ public function getCodes()
      */
     public function getDefaultRouter($areaCode)
     {
-        return isset($this->_areas[$areaCode]['router']) ? $this->_areas[$areaCode]['router'] : null;
+        return $this->_areas[$areaCode]['router'] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Config/Initial.php b/lib/internal/Magento/Framework/App/Config/Initial.php
@@ -72,9 +72,9 @@ public function getData($scope)
         list($scopeType, $scopeCode) = array_pad(explode('|', $scope), 2, null);
 
         if (ScopeConfigInterface::SCOPE_TYPE_DEFAULT == $scopeType) {
-            return isset($this->_data[$scopeType]) ? $this->_data[$scopeType] : [];
+            return $this->_data[$scopeType] ?? [];
         } elseif ($scopeCode) {
-            return isset($this->_data[$scopeType][$scopeCode]) ? $this->_data[$scopeType][$scopeCode] : [];
+            return $this->_data[$scopeType][$scopeCode] ?? [];
         }
         return [];
     }
diff --git a/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php b/lib/internal/Magento/Framework/App/DefaultPath/DefaultPath.php
@@ -32,6 +32,6 @@ public function __construct(array $parts)
      */
     public function getPart($code)
     {
-        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+        return $this->_parts[$code] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,7 +70,7 @@ public function get($key = null, $defaultValue = null)
         if ($key === null) {
             return $this->flatData;
         }
-        return isset($this->flatData[$key]) ? $this->flatData[$key] : $defaultValue;
+        return $this->flatData[$key] ?? $defaultValue;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Http/Context.php b/lib/internal/Magento/Framework/App/Http/Context.php
@@ -84,9 +84,7 @@ public function unsValue($name)
      */
     public function getValue($name)
     {
-        return isset($this->data[$name])
-            ? $this->data[$name]
-            : (isset($this->default[$name]) ? $this->default[$name] : null);
+        return $this->data[$name] ?? ($this->default[$name] ?? null);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -70,7 +70,7 @@ public function getPaths($type)
     public function getPath($type, $componentName)
     {
         self::validateType($type);
-        return isset(self::$paths[$type][$componentName]) ? self::$paths[$type][$componentName] : null;
+        return self::$paths[$type][$componentName] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
@@ -71,7 +71,7 @@ public function __construct(
     public function getVars($module)
     {
         $this->initData();
-        return isset($this->data['vars'][$module]) ? $this->data['vars'][$module] : [];
+        return $this->data['vars'][$module] ?? [];
     }
 
     /**
@@ -110,7 +110,7 @@ public function getVarValue($module, $var)
     public function getMediaEntities($module, $mediaType)
     {
         $this->initData();
-        return isset($this->data['media'][$module][$mediaType]) ? $this->data['media'][$module][$mediaType] : [];
+        return $this->data['media'][$module][$mediaType] ?? [];
     }
 
     /**
@@ -124,9 +124,7 @@ public function getMediaEntities($module, $mediaType)
     public function getMediaAttributes($module, $mediaType, $mediaId)
     {
         $this->initData();
-        return isset($this->data['media'][$module][$mediaType][$mediaId])
-            ? $this->data['media'][$module][$mediaType][$mediaId]
-            : [];
+        return $this->data['media'][$module][$mediaType][$mediaId] ?? [];
     }
 
     /**
@@ -163,7 +161,7 @@ protected function getIdAttributes()
     public function getExcludedFiles()
     {
         $items = $this->getItems();
-        return isset($items['file']) ? $items['file'] : [];
+        return $items['file'] ?? [];
     }
 
     /**
@@ -174,7 +172,7 @@ public function getExcludedFiles()
     public function getExcludedDir()
     {
         $items = $this->getItems();
-        return isset($items['directory']) ? $items['directory'] : [];
+        return $items['directory'] ?? [];
     }
 
     /**
@@ -185,7 +183,7 @@ public function getExcludedDir()
     protected function getItems()
     {
         $this->initData();
-        return isset($this->data['exclude']) ? $this->data['exclude'] : [];
+        return $this->data['exclude'] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -490,7 +490,7 @@ public function rawFetchRow($sql, $field = null)
         if (empty($field)) {
             return $row;
         } else {
-            return isset($row[$field]) ? $row[$field] : false;
+            return $row[$field] ?? false;
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Data/AbstractCriteria.php b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
@@ -274,7 +274,7 @@ public function getLimit()
      */
     public function getPart($name, $default = null)
     {
-        return isset($this->data[$name]) ? $this->data[$name] : $default;
+        return $this->data[$name] ?? $default;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/AbstractDataObject.php b/lib/internal/Magento/Framework/Data/AbstractDataObject.php
@@ -50,6 +50,6 @@ public function toArray()
      */
     protected function get($key)
     {
-        return isset($this->data[$key]) ? $this->data[$key] : null;
+        return $this->data[$key] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
@@ -851,7 +851,7 @@ public function count()
      */
     public function getFlag($flag)
     {
-        return isset($this->_flags[$flag]) ? $this->_flags[$flag] : null;
+        return $this->_flags[$flag] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Structure.php b/lib/internal/Magento/Framework/Data/Structure.php
@@ -172,7 +172,7 @@ public function createElement($elementId, array $data)
      */
     public function getElement($elementId)
     {
-        return isset($this->_elements[$elementId]) ? $this->_elements[$elementId] : false;
+        return $this->_elements[$elementId] ?? false;
     }
 
     /**
@@ -466,9 +466,7 @@ public function getChildId($parentId, $alias)
      */
     public function getChildren($parentId)
     {
-        return isset(
-            $this->_elements[$parentId][self::CHILDREN]
-        ) ? $this->_elements[$parentId][self::CHILDREN] : [];
+        return $this->_elements[$parentId][self::CHILDREN] ?? [];
     }
 
     /**
@@ -479,7 +477,7 @@ public function getChildren($parentId)
      */
     public function getParentId($childId)
     {
-        return isset($this->_elements[$childId][self::PARENT]) ? $this->_elements[$childId][self::PARENT] : false;
+        return $this->_elements[$childId][self::PARENT] ?? false;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Event.php b/lib/internal/Magento/Framework/Event.php
@@ -88,7 +88,7 @@ public function dispatch()
      */
     public function getName()
     {
-        return isset($this->_data['name']) ? $this->_data['name'] : null;
+        return $this->_data['name'] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/File.php b/lib/internal/Magento/Framework/Filesystem/Io/File.php
@@ -233,7 +233,7 @@ public function streamStat($part = null, $default = null)
         }
         $stat = @fstat($this->_streamHandler);
         if ($part !== null) {
-            return isset($stat[$part]) ? $stat[$part] : $default;
+            return $stat[$part] ?? $default;
         }
         return $stat;
     }
diff --git a/lib/internal/Magento/Framework/Filter/AbstractFactory.php b/lib/internal/Magento/Framework/Filter/AbstractFactory.php
@@ -68,7 +68,7 @@ public function canCreateFilter($alias)
      */
     public function isShared($class)
     {
-        return isset($this->shared[$class]) ? $this->shared[$class] : $this->shareByDefault;
+        return $this->shared[$class] ?? $this->shareByDefault;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filter/Input.php b/lib/internal/Magento/Framework/Filter/Input.php
@@ -183,7 +183,7 @@ public function getFilters($name = null)
         if (null === $name) {
             return $this->_filters;
         } else {
-            return isset($this->_filters[$name]) ? $this->_filters[$name] : null;
+            return $this->_filters[$name] ?? null;
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -268,7 +268,7 @@ public function getNext($type, $method, $code = '__self')
             $this->_inheritPlugins($type);
         }
         $key = $type . '_' . lcfirst($method) . '_' . $code;
-        return isset($this->_processed[$key]) ? $this->_processed[$key] : null;
+        return $this->_processed[$key] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Message/Collection.php b/lib/internal/Magento/Framework/Message/Collection.php
@@ -136,7 +136,7 @@ public function getItems()
      */
     public function getItemsByType($type)
     {
-        return isset($this->messages[$type]) ? $this->messages[$type] : [];
+        return $this->messages[$type] ?? [];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -154,9 +154,7 @@ public function getCustomAttributes()
     public function getCustomAttribute($attributeCode)
     {
         $this->initializeCustomAttributes();
-        return isset($this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode])
-            ? $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]
-            : null;
+        return $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/FullModuleList.php b/lib/internal/Magento/Framework/Module/FullModuleList.php
@@ -55,7 +55,7 @@ public function getAll()
     public function getOne($name)
     {
         $data = $this->getAll();
-        return isset($data[$name]) ? $data[$name] : null;
+        return $data[$name] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleList.php b/lib/internal/Magento/Framework/Module/ModuleList.php
@@ -90,7 +90,7 @@ public function getAll()
     public function getOne($name)
     {
         $enabled = $this->getAll();
-        return isset($enabled[$name]) ? $enabled[$name] : null;
+        return $enabled[$name] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleResource.php b/lib/internal/Magento/Framework/Module/ModuleResource.php
@@ -87,7 +87,7 @@ public function getDbVersion($moduleName)
             return false;
         }
         $this->_loadVersion('db');
-        return isset(self::$schemaVersions[$moduleName]) ? self::$schemaVersions[$moduleName] : false;
+        return self::$schemaVersions[$moduleName] ?? false;
     }
 
     /**
@@ -119,7 +119,7 @@ public function getDataVersion($moduleName)
             return false;
         }
         $this->_loadVersion('data');
-        return isset(self::$dataVersions[$moduleName]) ? self::$dataVersions[$moduleName] : false;
+        return self::$dataVersions[$moduleName] ?? false;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
@@ -283,6 +283,6 @@ public function getConflict($moduleName)
     public function getVersion($moduleName)
     {
         $this->load();
-        return isset($this->modulePackageVersionMap[$moduleName]) ? $this->modulePackageVersionMap[$moduleName] : '';
+        return $this->modulePackageVersionMap[$moduleName] ?? '';
     }
 }
diff --git a/lib/internal/Magento/Framework/Notification/MessageList.php b/lib/internal/Magento/Framework/Notification/MessageList.php
@@ -72,7 +72,7 @@ protected function _loadMessages()
     public function getMessageByIdentity($identity)
     {
         $this->_loadMessages();
-        return isset($this->_messages[$identity]) ? $this->_messages[$identity] : null;
+        return $this->_messages[$identity] ?? null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Polymorphous.php
@@ -26,6 +26,6 @@ public function __construct()
      */
     public function getArg($key)
     {
-        return isset($this->args[$key]) ? $this->args[$key] : null;
+        return $this->args[$key] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/Base.php b/lib/internal/Magento/Framework/Pricing/Amount/Base.php
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Pool.php b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
diff --git a/lib/internal/Magento/Framework/Search/Response/Aggregation.php b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
diff --git a/lib/internal/Magento/Framework/Validator/Exception.php b/lib/internal/Magento/Framework/Validator/Exception.php
diff --git a/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php b/lib/internal/Magento/Framework/View/Asset/PropertyGroup.php
diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProvider.php
diff --git a/lib/internal/Magento/Framework/View/Layout/Generic.php b/lib/internal/Magento/Framework/View/Layout/Generic.php
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
diff --git a/lib/internal/Magento/Framework/Xml/Generator.php b/lib/internal/Magento/Framework/Xml/Generator.php

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function getCustomAttribute($attributeCode)`
`76`	`76`	`*/`
`77`	`77`	`public function getCustomAttributes()`
`78`	`78`	`{`
`79`		`- return isset($this->_data[self::CUSTOM_ATTRIBUTES]) ? $this->_data[self::CUSTOM_ATTRIBUTES] : [];`
	`79`	`+ return $this->_data[self::CUSTOM_ATTRIBUTES] ?? [];`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
`@@ -131,7 +131,7 @@ public function setCustomAttribute($attributeCode, $attributeValue)`
`131`	`131`	`*/`
`132`	`132`	`protected function getCustomAttributesCodes()`
`133`	`133`	`{`
`134`		`- return isset($this->customAttributesCodes) ? $this->customAttributesCodes : [];`
	`134`	`+ return $this->customAttributesCodes ?? [];`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(array $data = [])`
`34`	`34`	`*/`
`35`	`35`	`protected function _get($key)`
`36`	`36`	`{`
`37`		`- return isset($this->_data[$key]) ? $this->_data[$key] : null;`
	`37`	`+ return $this->_data[$key] ?? null;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public function processImageContent($entityType, $imageContent)`
`172`	`172`	`*/`
`173`	`173`	`protected function getMimeTypeExtension($mimeType)`
`174`	`174`	`{`
`175`		`- return isset($this->mimeTypeExtensionMap[$mimeType]) ? $this->mimeTypeExtensionMap[$mimeType] : '';`
	`175`	`+ return $this->mimeTypeExtensionMap[$mimeType] ?? '';`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,7 @@ public function setId($id)`
`33`	`33`	`*/`
`34`	`34`	`public function getCustomAttribute($attributeCode)`
`35`	`35`	`{`
`36`		`- return isset($this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode])`
`37`		`- ? $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]`
`38`		`- : null;`
	`36`	`+ return $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode] ?? null;`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,6 @@ private function getCustomFilterForField($field)`
`123`	`123`	`*/`
`124`	`124`	`private function getFieldMapping($field)`
`125`	`125`	`{`
`126`		`- return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;`
	`126`	`+ return $this->fieldMapping[$field] ?? $field;`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,6 @@ private function getCustomJoin($field)`
`121`	`121`	`*/`
`122`	`122`	`private function getFieldMapping($field)`
`123`	`123`	`{`
`124`		`- return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;`
	`124`	`+ return $this->fieldMapping[$field] ?? $field;`
`125`	`125`	`}`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function process(SearchCriteriaInterface $searchCriteria, AbstractDb $col`
`59`	`59`	`*/`
`60`	`60`	`private function getFieldMapping($field)`
`61`	`61`	`{`
`62`		`- return isset($this->fieldMapping[$field]) ? $this->fieldMapping[$field] : $field;`
	`62`	`+ return $this->fieldMapping[$field] ?? $field;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function getCodeByFrontName($frontName)`
`88`	`88`	`*/`
`89`	`89`	`public function getFrontName($areaCode)`
`90`	`90`	`{`
`91`		`- return isset($this->_areas[$areaCode]['frontName']) ? $this->_areas[$areaCode]['frontName'] : null;`
	`91`	`+ return $this->_areas[$areaCode]['frontName'] ?? null;`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`
`@@ -111,7 +111,7 @@ public function getCodes()`
`111`	`111`	`*/`
`112`	`112`	`public function getDefaultRouter($areaCode)`
`113`	`113`	`{`
`114`		`- return isset($this->_areas[$areaCode]['router']) ? $this->_areas[$areaCode]['router'] : null;`
	`114`	`+ return $this->_areas[$areaCode]['router'] ?? null;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ public function getData($scope)`
`72`	`72`	`list($scopeType, $scopeCode) = array_pad(explode('\|', $scope), 2, null);`
`73`	`73`
`74`	`74`	`if (ScopeConfigInterface::SCOPE_TYPE_DEFAULT == $scopeType) {`
`75`		`- return isset($this->_data[$scopeType]) ? $this->_data[$scopeType] : [];`
	`75`	`+ return $this->_data[$scopeType] ?? [];`
`76`	`76`	`} elseif ($scopeCode) {`
`77`		`- return isset($this->_data[$scopeType][$scopeCode]) ? $this->_data[$scopeType][$scopeCode] : [];`
	`77`	`+ return $this->_data[$scopeType][$scopeCode] ?? [];`
`78`	`78`	`}`
`79`	`79`	`return [];`
`80`	`80`	`}`