34569: Fix Magento OS codebase for Integration Tests to be compatible with PHP 8.1

xmav · xmav · commit 4255f1fd9878 · 2021-12-09T16:32:11.000-06:00
- remove duplicated logic
diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
@@ -61,11 +61,10 @@ public function getNamePrefixOptions($store = null)
      */
     public function getNameSuffixOptions($store = null)
     {
-        $options = $this->addressHelper->getConfig('suffix_options', $store);
-        return $options !== null ? $this->prepareNamePrefixSuffixOptions(
-            $options,
+        return $this->prepareNamePrefixSuffixOptions(
+            $this->addressHelper->getConfig('suffix_options', $store),
             $this->addressHelper->getConfig('suffix_show', $store) === NooptreqSource::VALUE_OPTIONAL
-        ) : false;
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,10 @@ public function getNamePrefixOptions($store = null)`
`61`	`61`	`*/`
`62`	`62`	`public function getNameSuffixOptions($store = null)`
`63`	`63`	`{`
`64`		`- $options = $this->addressHelper->getConfig('suffix_options', $store);`
`65`		`- return $options !== null ? $this->prepareNamePrefixSuffixOptions(`
`66`		`- $options,`
	`64`	`+ return $this->prepareNamePrefixSuffixOptions(`
	`65`	`+ $this->addressHelper->getConfig('suffix_options', $store),`
`67`	`66`	`$this->addressHelper->getConfig('suffix_show', $store) === NooptreqSource::VALUE_OPTIONAL`
`68`		`- ) : false;`
	`67`	`+ );`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`/**`