ACP2E-1381: Different behaviors on snake_case formatting

Author: viktym

dev/tests/integration/testsuite/Magento/Framework/Api/DataObjectHelperTest.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api;
+
+use Magento\Framework\Api\Fixture\DataObjectInterface;
+use Magento\Framework\Api\Fixture\DataObjectFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class DataObjectHelperTest extends TestCase
+{
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var DataObjectFactory
+     */
+    private $dataObjectFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+        $this->dataObjectFactory = Bootstrap::getObjectManager()->get(DataObjectFactory::class);
+    }
+
+    /**
+     * Test object is populated with data from array.
+     *
+     * @return void
+     */
+    public function testPopulateWithArray(): void
+    {
+        $inputArray = [
+            'first_a_second' => '1',
+            'first_at_second' => '1',
+            'first_a_t_m_second' => '1',
+            'random_attribute' => 'random'
+        ];
+        $expectedData = [
+            'first_a_second' => '1',
+            'first_at_second' => '1',
+            'first_a_t_m_second' => '1',
+        ];
+        $object = $this->dataObjectFactory->create();
+        $this->dataObjectHelper->populateWithArray($object, $inputArray, DataObjectInterface::class);
+        $this->assertEquals($expectedData, $object->getData());
+    }
+}

dev/tests/integration/testsuite/Magento/Framework/Api/Fixture/DataObject.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Api\Fixture;
+
+use Magento\Framework\Model\AbstractExtensibleModel;
+
+class DataObject extends AbstractExtensibleModel implements DataObjectInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function setFirstASecond(string $value): void
+    {
+        $this->setData('first_a_second', $value);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setFirstAtSecond(string $value): void
+    {
+        $this->setData('first_at_second', $value);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setFirstATMSecond(string$value): void
+    {
+        $this->setData('first_a_t_m_second', $value);
+    }
+}

dev/tests/integration/testsuite/Magento/Framework/Api/Fixture/DataObjectInterface.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Api\Fixture;
+
+interface DataObjectInterface
+{
+    /**
+     * Set A
+     *
+     * @param string $value
+     *
+     * @return void
+     */
+    public function setFirstASecond(string $value): void;
+
+    /**
+     * Set At
+     *
+     * @param string $value
+     *
+     * @return void
+     */
+    public function setFirstAtSecond(string $value): void;
+
+    /**
+     * Set ATM
+     *
+     * @param string $value
+     *
+     * @return void
+     */
+    public function setFirstATMSecond(string $value): void;
+}

dev/tests/integration/testsuite/Magento/Framework/Api/SimpleDataObjectConverterTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Api;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class SimpleDataObjectConverterTest extends TestCase
+{
+    /**
+     * @var SimpleDataObjectConverter
+     */
+    private $simpleDataObjectConverter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->simpleDataObjectConverter = Bootstrap::getObjectManager()->get(SimpleDataObjectConverter::class);
+    }
+
+    /**
+     * Test snake case to camel case conversion and vice versa.
+     *
+     * @return void
+     */
+    public function testCaseConversion(): void
+    {
+        $snakeCaseToCamelCase = [
+            'first_a_second' => 'firstASecond',
+            'first_at_second' => 'firstAtSecond',
+            'first_a_t_m_second' => 'firstATMSecond',
+        ];
+
+        foreach ($snakeCaseToCamelCase as $snakeCase => $camelCase) {
+            $this->assertEquals(
+                $camelCase,
+                $this->simpleDataObjectConverter->snakeCaseToCamelCase($snakeCase)
+            );
+            $this->assertEquals(
+                $snakeCase,
+                $this->simpleDataObjectConverter->camelCaseToSnakeCase($camelCase)
+            );
+        }
+    }
+}

lib/internal/Magento/Framework/Api/DataObjectHelper.php

@@ -305,8 +305,8 @@ private function getSetters(object $dataObject): array
                         // (2) remove set_ in start of name
                         // (3) add name without is_ prefix
                         preg_replace(
-                            ['/(^|,)(?!set)[^,]*/S','/(.)([A-Z])/S', '/(^|,)set_/iS', '/(^|,)is_([^,]+)/is'],
-                            ['', '$1_$2', '$1', '$1$2,is_$2'],
+                            ['/(^|,)(?!set)[^,]*/S','/([A-Z])/S', '/(^|,)set_/iS', '/(^|,)is_([^,]+)/is'],
+                            ['', '_$1', '$1', '$1$2,is_$2'],
                             implode(',', $dataObjectMethods)
                         )
                     )

lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php

@@ -172,6 +172,6 @@ public static function snakeCaseToCamelCase($input)
      */
     public static function camelCaseToSnakeCase($name)
     {
-        return $name !== null ? strtolower(preg_replace('/(.)([A-Z])/', "$1_$2", $name)) : '';
+        return $name !== null ? strtolower(ltrim(preg_replace('/([A-Z])/m', "_$1", $name), '_')) : '';
     }
 }