7241 Undo creation of constants due to @api reasons

See #11462 (review)
magento · Dec 1, 2017 · eb79b38 · eb79b38
1 parent 519b805
commit eb79b38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/app/code/Magento/Config/Model/Config/Source/Nooptreq.php b/app/code/Magento/Config/Model/Config/Source/Nooptreq.php
@@ -11,19 +11,15 @@
  */
 class Nooptreq implements \Magento\Framework\Option\ArrayInterface
 {
-    const VALUE_NO = '';
-    const VALUE_OPTIONAL = 'opt';
-    const VALUE_REQUIRED = 'req';
-
     /**
      * @return array
      */
     public function toOptionArray()
     {
         return [
-            ['value' => self::VALUE_NO, 'label' => __('No')],
-            ['value' => self::VALUE_OPTIONAL, 'label' => __('Optional')],
-            ['value' => self::VALUE_REQUIRED, 'label' => __('Required')]
+            ['value' => '', 'label' => __('No')],
+            ['value' => 'opt', 'label' => __('Optional')],
+            ['value' => 'req', 'label' => __('Required')]
         ];
     }
 }
diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
@@ -45,7 +45,7 @@ public function getNamePrefixOptions($store = null)
     {
         return $this->prepareNamePrefixSuffixOptions(
             $this->addressHelper->getConfig('prefix_options', $store),
-            $this->addressHelper->getConfig('prefix_show', $store) == NooptreqSource::VALUE_OPTIONAL
+            $this->addressHelper->getConfig('prefix_show', $store) == 'opt'
         );
     }
 
@@ -59,7 +59,7 @@ public function getNameSuffixOptions($store = null)
     {
         return $this->prepareNamePrefixSuffixOptions(
             $this->addressHelper->getConfig('suffix_options', $store),
-            $this->addressHelper->getConfig('suffix_show', $store) == NooptreqSource::VALUE_OPTIONAL
+            $this->addressHelper->getConfig('suffix_show', $store) == 'opt'
         );
     }