Merge pull request #59 from magento-cia/cia-2.4.7-beta3-develop-2.4-develop-sync-02162024

Cia 2.4.7 beta3 develop 2.4 develop sync 02162024

Author: sidolov

README.md

@@ -5,6 +5,7 @@ Installing sample data is optional.
 Technically, sample data is a set of regular Magento modules, which can be deployed and installed together with the Magento instance, or later in the scope of upgrade.
 
 ## Deploy Sample Data
+
 You can deploy sample data from one of the following sources:
 
 * From the Magento composer repository, optionally using Magento CLI
@@ -49,9 +50,11 @@ To deploy sample data from the GitHub repository:
 2. Link the sample data and your Magento instance by running: `# php -f <sample-data_clone_dir>/dev/tools/build-sample-data.php -- --ce-source="<path_to_your_magento_instance>"`
 
 ## Install Sample Data
+
 Once the sample data is deployed, it will be installed automatically when you install or upgrade your Magento instance by using the command line.
 
 ## Uninstall Sample Data
+
 To remove the sample data modules from the code base, run one of the following commands from the Magento root directory:
 
 * If sample data was deployed from the composer repository, run: `# bin/magento sampledata:remove`
@@ -61,6 +64,7 @@ To remove the sample data modules from the code base, run one of the following c
 To delete all the products and other entities provided by the sample data modules, delete the database and reinstall Magento with a clean database.
 
 ## Reinstall Sample Data
+
 If you have deleted certain entities provided by sample data and want to restore them, take the following steps:
 
 1. From the Magento root directory, run the following command: `# bin/magento sampledata:reset`
@@ -69,4 +73,5 @@ If you have deleted certain entities provided by sample data and want to restore
 The deleted sample data entities will be restored. Those entities, which were changed, will preserve these changes and will not be restored to the default view.
 
 ## Documentation
-You can find the more detailed description of sample data manipulation procedures at [http://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-sample-data.html](http://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-sample-data.html)
+
+You can find the more detailed description of sample data manipulation procedures at [Sample data overview](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/next-steps/sample-data/overview.html).

app/code/Magento/BundleSampleData/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-bundle-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog-sample-data": "*",

app/code/Magento/CatalogRuleSampleData/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-rule-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-catalog-rule": "*",
         "magento/module-store": "*",

app/code/Magento/CatalogSampleData/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-eav": "*",

app/code/Magento/CmsSampleData/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-cms-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-cms": "*",
         "magento/module-theme-sample-data": "*",

app/code/Magento/ConfigurableSampleData/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-configurable-product": "*",
         "magento/module-product-links-sample-data": "*",

app/code/Magento/CustomerSampleData/Model/Customer.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CustomerSampleData\Model;
 
+use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\RegionInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
@@ -79,6 +80,11 @@ class Customer
      */
     private $serializer;
 
+    /**
+     * @var CustomerMetadataInterface
+     */
+    private $customerMetadata;
+
     /**
      * @param SampleDataContext $sampleDataContext
      * @param \Magento\Directory\Model\CountryFactory $countryFactory
@@ -89,7 +95,8 @@ class Customer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\App\State $appState
-     * @param Json|null $serializer
+     * @param Json $serializer
+     * @param CustomerMetadataInterface $customerMetadata
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -102,7 +109,8 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\App\State $appState,
-        Json $serializer = null
+        Json $serializer,
+        CustomerMetadataInterface $customerMetadata
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
@@ -114,7 +122,8 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->appState = $appState;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
+        $this->serializer = $serializer;
+        $this->customerMetadata = $customerMetadata;
     }
 
     /**
@@ -246,14 +255,25 @@ protected function getDefaultCustomerAddress()
      */
     protected function convertRowData($row, $data)
     {
+        $genders = [];
+        $genderAttr = $this->customerMetadata->getAttributeMetadata('gender');
+        foreach ($genderAttr->getOptions() as $genderOption) {
+            $genders[$genderOption->getValue()] = $genderOption->getLabel();
+        }
+
         foreach ($row as $field => $value) {
             if (isset($data[$field])) {
-                if ($field == 'street') {
-                    $data[$field] = $this->serializer->unserialize($value);
+                if ($field === 'password') {
                     continue;
                 }
-                if ($field == 'password') {
-                    continue;
+
+                switch ($field) {
+                    case 'street':
+                        $value = $this->serializer->unserialize($value);
+                        break;
+                    case 'gender':
+                        $value = array_search($value, $genders);
+                        break;
                 }
                 $data[$field] = $value;
             }

app/code/Magento/CustomerSampleData/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-customer-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-directory": "*",

app/code/Magento/CustomerSampleData/fixtures/customer_profile.csv

@@ -1,2 +1,2 @@
 firstname,lastname,email,password,dob,gender,street,city,region,country_id,postcode,telephone
-Veronica,Costello,"roni_cost@example.com","roni_cost3@example.com","1973-12-15",2,"[""6146 Honey Bluff Parkway"",""""]",Calder,Michigan,US,"49628-7978","(555) 229-3326"
+Veronica,Costello,"roni_cost@example.com","roni_cost3@example.com","1973-12-15","Female","[""6146 Honey Bluff Parkway"",""""]",Calder,Michigan,US,"49628-7978","(555) 229-3326"

app/code/Magento/DownloadableSampleData/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-downloadable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-catalog-sample-data": "*",
         "magento/module-downloadable": "*",