Merge remote-tracking branch '36345/patch-6' into comm_jul

Author: engcom-Charlie

app/code/Magento/Paypal/Model/Payflow/Request.php

@@ -14,6 +14,7 @@ class Request extends \Magento\Framework\DataObject
 {
     /**
      * Set/Get attribute wrapper
+     *
      * Also add length path if key contains = or &
      *
      * @param string $method
@@ -24,7 +25,7 @@ class Request extends \Magento\Framework\DataObject
      */
     public function __call($method, $args)
     {
-        $key = $this->_underscore(substr($method, 3));
+        $key = $this->_underscore($method);
         if (isset($args[0]) && (strstr($args[0], '=') || strstr($args[0], '&'))) {
             $key .= '[' . strlen($args[0]) . ']';
         }

lib/internal/Magento/Framework/DataObject.php

@@ -387,22 +387,37 @@ public function toString($format = '')
      */
     public function __call($method, $args)
     {
-        switch (substr((string)$method, 0, 3)) {
+        // Compare 3 first letters of the method name
+        switch ($method[0] . ($method[1] ?? '') . ($method[2] ?? '')) {
             case 'get':
-                $key = $this->_underscore(substr($method, 3));
-                $index = isset($args[0]) ? $args[0] : null;
-                return $this->getData($key, $index);
+                if (isset($args[0]) && $args[0] !== null) {
+                    return $this->getData(
+                        self::$_underscoreCache[$method] ?? $this->_underscore($method),
+                        $args[0]
+                    );
+                }
+
+                return $this->getData(
+                    self::$_underscoreCache[$method] ?? $this->_underscore($method),
+                    $args[0] ?? null
+                );
             case 'set':
-                $key = $this->_underscore(substr($method, 3));
-                $value = isset($args[0]) ? $args[0] : null;
-                return $this->setData($key, $value);
+                return $this->setData(
+                    self::$_underscoreCache[$method] ?? $this->_underscore($method),
+                    $args[0] ?? null
+                );
             case 'uns':
-                $key = $this->_underscore(substr($method, 3));
-                return $this->unsetData($key);
+                return $this->unsetData(
+                    self::$_underscoreCache[$method] ?? $this->_underscore($method)
+                );
             case 'has':
-                $key = $this->_underscore(substr($method, 3));
-                return isset($this->_data[$key]);
+                return isset(
+                    $this->_data[
+                        self::$_underscoreCache[$method] ?? $this->_underscore($method)
+                    ]
+                );
         }
+
         throw new \Magento\Framework\Exception\LocalizedException(
             new \Magento\Framework\Phrase('Invalid method %1::%2', [get_class($this), $method])
         );
@@ -435,7 +450,23 @@ protected function _underscore($name)
         if (isset(self::$_underscoreCache[$name])) {
             return self::$_underscoreCache[$name];
         }
-        $result = strtolower(trim(preg_replace('/([A-Z]|[0-9]+)/', "_$1", $name), '_'));
+
+        $result = strtolower(
+            trim(
+                preg_replace(
+                    '/([A-Z]|[0-9]+)/',
+                    "_$1",
+                    lcfirst(
+                        substr(
+                            $name,
+                            3
+                        )
+                    )
+                ),
+                '_'
+            )
+        );
+
         self::$_underscoreCache[$name] = $result;
         return $result;
     }

lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php

@@ -396,13 +396,13 @@ public function testUnderscore($input, $expectedOutput)
     public function underscoreDataProvider()
     {
         return [
-            'Test 1' => ['Stone1Color', 'stone_1_color'],
-            'Test 2' => ['StoneColor', 'stone_color'],
-            'Test 3' => ['StoneToXml', 'stone_to_xml'],
-            'Test 4' => ['1StoneColor', '1_stone_color'],
-            'Test 5' => ['getCcLast4', 'get_cc_last_4'],
-            'Test 6' => ['99Bottles', '99_bottles'],
-            'Test 7' => ['XApiLogin', 'x_api_login']
+            'Test 1' => ['GetStone1Color', 'stone_1_color'],
+            'Test 2' => ['SetStoneColor', 'stone_color'],
+            'Test 3' => ['GetStoneToXml', 'stone_to_xml'],
+            'Test 4' => ['Set1StoneColor', '1_stone_color'],
+            'Test 5' => ['GetgetCcLast4', 'get_cc_last_4'],
+            'Test 6' => ['Set99Bottles', '99_bottles'],
+            'Test 7' => ['GetXApiLogin', 'x_api_login']
         ];
     }
 }