Merge pull request #12 from sctice/php-code--handle-empty-constant

PhpCode: Handle empty constant

Author: vearutop

src/PhpCode.php

@@ -107,17 +107,21 @@ public static function makePhpConstantName($rawName)
     {
         $phpName = preg_replace("/([^a-zA-Z0-9_]+)/", "_", $rawName);
         $phpName = trim($phpName, '_');
-        $phpName = self::fromCamelCase($phpName);
 
-        if (in_array(strtolower($phpName), self::$keywords)) {
-            $phpName = '_' . $phpName;
-        }
+        if ($phpName) {
+            $phpName = self::fromCamelCase($phpName);
 
-        if (!$phpName) {
+            if (in_array(strtolower($phpName), self::$keywords)) {
+                $phpName = '_' . $phpName;
+            }
+
+            if (is_numeric($phpName[0])) {
+                $phpName = 'const_' . $phpName;
+            }
+        } else {
             $phpName = 'const_' . substr(md5($rawName), 0, 6);
-        } elseif (is_numeric($phpName[0])) {
-            $phpName = 'const_' . $phpName;
         }
+
         return strtoupper($phpName);
     }
 

tests/src/PHPUnit/PhpCodeTest.php

@@ -7,6 +7,26 @@
 
 class PhpCodeTest extends \PHPUnit_Framework_TestCase
 {
+    public function testMakePhpConstantName()
+    {
+        $this->assertSame('A', PhpCode::makePhpConstantName('a'));
+        $this->assertSame('ABC', PhpCode::makePhpConstantName('abc'));
+        $this->assertSame('A_B_C', PhpCode::makePhpConstantName('a*b##c'));
+        $this->assertSame('ABC', PhpCode::makePhpConstantName('_abc_'));
+        $this->assertSame('ABC', PhpCode::makePhpConstantName('__abc__'));
+        $this->assertSame('AB_C', PhpCode::makePhpConstantName('__AB__c__'));
+
+        // Keyword would be invalid.
+        $this->assertSame('_AS', PhpCode::makePhpConstantName('as'));
+
+        // Leading numeric would be invalid.
+        $this->assertSame('CONST_1_A', PhpCode::makePhpConstantName('1A'));
+
+        // Empty would be invalid.
+        $this->assertSame('CONST_CFCD20', PhpCode::makePhpConstantName('0'));
+        $this->assertSame('CONST_B14A7B', PhpCode::makePhpConstantName('_'));
+    }
+
     public function testFromCamelCase()
     {
         $this->assertSame('api_key', PhpCode::fromCamelCase('apiKey'));
@@ -18,4 +38,4 @@ public function testFromCamelCase()
         $this->assertSame('_x-', PhpCode::fromCamelCase('_x-'));
     }
 
-}
+}