Merge pull request #545 from magento-mpi/prs

[GITHUB] Merge public Github PRs

Author: vpelipenko

app/code/Magento/Customer/Setup/UpgradeData.php

@@ -56,11 +56,10 @@ public function __construct(
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
+        /** @var CustomerSetup $customerSetup */
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $setup]);
 
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            /** @var CustomerSetup $customerSetup */
-            $customerSetup = $this->customerSetupFactory->create(['setup' => $setup]);
-
             $entityAttributes = [
                 'customer' => [
                     'website_id' => [
@@ -185,11 +184,18 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                     $attribute->save();
                 }
             }
+            $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
+            $indexer->reindexAll();
+            $this->eavConfig->clear();
         }
 
-        $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
-        $indexer->reindexAll();
-        $this->eavConfig->clear();
+        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+            $entityTypeId = $customerSetup->getEntityTypeId(Customer::ENTITY);
+            $attributeId = $customerSetup->getAttributeId($entityTypeId, 'gender');
+
+            $option = ['attribute_id' => $attributeId, 'values' => [3 => 'Not Specified']];
+            $customerSetup->addAttributeOption($option);
+        }
 
         $setup->endSetup();
     }

app/code/Magento/Customer/Test/Unit/Block/Widget/GenderTest.php

@@ -169,7 +169,11 @@ public function testGetCustomer()
      */
     public function testGetGenderOptions()
     {
-        $options = [['label' => __('Male'), 'value' => 'M'], ['label' => __('Female'), 'value' => 'F']];
+        $options = [
+            ['label' => __('Male'), 'value' => 'M'],
+            ['label' => __('Female'), 'value' => 'F'],
+            ['label' => __('Not Specified'), 'value' => 'NA']
+        ];
 
         $this->attribute->expects($this->once())->method('getOptions')->will($this->returnValue($options));
         $this->assertSame($options, $this->block->getGenderOptions());

app/code/Magento/Customer/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Customer" setup_version="2.0.1">
+    <module name="Magento_Customer" setup_version="2.0.2">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Directory"/>

app/code/Magento/Eav/Setup/EavSetup.php

@@ -803,7 +803,7 @@ public function addAttribute($entityTypeId, $code, array $attr)
     }
 
     /**
-     * Add Attribure Option
+     * Add Attribute Option
      *
      * @param array $option
      * @return void

app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php

@@ -644,7 +644,7 @@ protected function _sortTotalsList($a, $b)
     /**
      * Return total list
      *
-     * @return \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
+     * @return \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal[] Array of totals
      */
     protected function _getTotalsList()
     {

dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php

@@ -104,6 +104,7 @@ public function getAttributeMetadataDataProvider()
                         ['label' => '', 'value' => ''],
                         ['label' => 'Male', 'value' => '1'],
                         ['label' => 'Female', 'value' => '2'],
+                        ['label' => 'Not Specified', 'value' => '3']
                     ],
                     AttributeMetadata::FRONTEND_CLASS   => '',
                     AttributeMetadata::USER_DEFINED     => false,

dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Curl.php

@@ -37,6 +37,7 @@ class Curl extends AbstractCurl implements CustomerInterface
         'gender' => [
             'Male' => 1,
             'Female' => 2,
+            'Not Specified' => 3
         ],
         'region_id' => [
             'California' => 12,

dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php

@@ -49,5 +49,6 @@ public function testToHtml()
         $this->assertContains('<span>Gender</span>', $html);
         $this->assertContains('<option value="1">Male</option>', $html);
         $this->assertContains('<option value="2">Female</option>', $html);
+        $this->assertContains('<option value="3">Not Specified</option>', $html);
     }
 }