Optimize snail_case replacement to PascalCase

Author: lbajsarowicz

app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php

@@ -47,7 +47,7 @@ public function execute()
         $this->productBuilder->build($this->getRequest());
 
         $block = $this->getRequest()->getParam('gridOnlyBlock');
-        $blockClassSuffix = str_replace(' ', '_', ucwords(str_replace('_', ' ', $block)));
+        $blockClassSuffix = ucwords($block, '_');
 
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php

@@ -252,7 +252,7 @@ protected function getCurrentRewritesMocks($currentRewrites)
                 ->disableOriginalConstructor()->getMock();
             foreach ($urlRewrite as $key => $value) {
                 $url->expects($this->any())
-                    ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
+                    ->method('get' . str_replace('_', '', ucwords($key, '_')))
                     ->will($this->returnValue($value));
             }
             $rewrites[] = $url;

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/CurrentUrlRewritesRegeneratorTest.php

@@ -294,7 +294,7 @@ protected function getCurrentRewritesMocks($currentRewrites)
                 ->disableOriginalConstructor()->getMock();
             foreach ($urlRewrite as $key => $value) {
                 $url->expects($this->any())
-                    ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
+                    ->method('get' . str_replace('_', '', ucwords($key, '_')))
                     ->will($this->returnValue($value));
             }
             $rewrites[] = $url;

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php

@@ -694,7 +694,7 @@ protected function currentUrlRewritesRegeneratorGetCurrentRewritesMocks($current
                 ->disableOriginalConstructor()->getMock();
             foreach ($urlRewrite as $key => $value) {
                 $url->expects($this->any())
-                    ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
+                    ->method('get' . str_replace('_', '', ucwords($key, '_')))
                     ->will($this->returnValue($value));
             }
             $rewrites[] = $url;

app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php

@@ -252,7 +252,7 @@ private function getTaxRateMock(array $taxRateData)
         foreach ($taxRateData as $key => $value) {
             // convert key from snake case to upper case
             $taxRateMock->expects($this->any())
-                ->method('get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))))
+                ->method('get' . str_replace('_', '', ucwords($key, '_')))
                 ->will($this->returnValue($value));
         }
 

app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php

@@ -133,7 +133,7 @@ private function getMockObject($className, array $objectState)
         $getterValueMap = [];
         $methods = ['__wakeup'];
         foreach ($objectState as $key => $value) {
-            $getterName = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
+            $getterName = 'get' . str_replace('_', '', ucwords($key, '_'));
             $getterValueMap[$getterName] = $value;
             $methods[] = $getterName;
         }

dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php

@@ -61,7 +61,7 @@ private function createProducts(FixtureFactory $fixtureFactory, $productsData)
                 $searchValue = isset($productData[2]) ? $productData[2] : $productData[1];
                 if ($this->data === null) {
                     if ($product->hasData($searchValue)) {
-                        $getProperty = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $searchValue)));
+                        $getProperty = 'get' . str_replace('_', '', ucwords($searchValue, '_'));
                         $this->data = $product->$getProperty();
                     } else {
                         $this->data = $searchValue;

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

@@ -172,7 +172,7 @@ protected function prepareWidgetInstance(array $data)
         $widgetInstances = [];
         foreach ($data['widget_instance'] as $key => $widgetInstance) {
             $pageGroup = $widgetInstance['page_group'];
-            $method = 'prepare' . str_replace(' ', '', ucwords(str_replace('_', ' ', $pageGroup))) . 'Group';
+            $method = 'prepare' . str_replace('_', '', ucwords($pageGroup, '_')) . 'Group';
             if (!method_exists(__CLASS__, $method)) {
                 throw new \Exception('Method for prepare page group "' . $method . '" is not exist.');
             }

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

@@ -58,7 +58,7 @@ public function convertKeysToCamelCase(array $dataArray)
             if (is_array($fieldValue) && !$this->_isSimpleSequentialArray($fieldValue)) {
                 $fieldValue = $this->convertKeysToCamelCase($fieldValue);
             }
-            $fieldName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $fieldName))));
+            $fieldName = lcfirst(str_replace('_', '', ucwords($fieldName, '_')));
             $response[$fieldName] = $fieldValue;
         }
         return $response;
@@ -148,7 +148,7 @@ protected function _unpackAssociativeArray($data)
      */
     public static function snakeCaseToUpperCamelCase($input)
     {
-        return str_replace(' ', '', ucwords(str_replace('_', ' ', $input)));
+        return str_replace('_', '', ucwords($input, '_'));
     }
 
     /**

lib/internal/Magento/Framework/Code/NameBuilder.php

@@ -23,7 +23,7 @@ public function buildClassName($parts)
         $separator = '\\';
         $string = join($separator, $parts);
         $string = str_replace('_', $separator, $string);
-        $className = str_replace(' ', $separator, ucwords(str_replace($separator, ' ', $string)));
+        $className = ucwords($string, $separator);
         return $className;
     }
 }