Merge branch 'bug/map'

saygoweb · Mar 1, 2019 · bd7833f · bd7833f
2 parents 652d130 + 8d6f970
commit bd7833f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/DataMapper.php b/src/DataMapper.php
@@ -70,7 +70,7 @@ public static function autoTable($c)
     public static function splitUpper($s)
     {
         $matches = array();
-        $matchCount = preg_match_all('/[A-Z][a-z]*/', $s, $matches);
+        $matchCount = preg_match_all('/[A-Z][a-z0-9]*/', $s, $matches);
         if ($matchCount > 0) {
             return $matches[0];
         }
@@ -80,7 +80,7 @@ public static function splitUpper($s)
     public static function propertyName($s)
     {
         $matches = array();
-        $matchCount = preg_match_all('/^([a-z]+)((?:[A-Z][a-z]*)*)/', $s, $matches);
+        $matchCount = preg_match_all('/^([a-z0-9]+)((?:[A-Z][a-z0-9]*)*)/', $s, $matches);
         $propertyName = '';
         if ($matchCount == 1 && count($matches) == 3) {
             $propertyName .= strtolower($matches[1][0]);
@@ -211,7 +211,7 @@ public function delete($id)
         return $result->rowCount() >= 1;
     }
 
-    public static function find($creatable, \PDO $pdo)
+    public static function find($creatable, $pdo)
     {
         return new QueryBuilder($creatable, $pdo);
     }

diff --git a/test/anorm/DataMapper_Test.php b/test/anorm/DataMapper_Test.php
@@ -31,6 +31,18 @@ function testPropertyName_TwoWords_OK()
         $this->assertEquals('test_two_three_four', $name);
     }
 
+    function testPropertyName_EndsWithDigit_OK()
+    {
+        $name = DataMapper::propertyName('test1');
+        $this->assertEquals('test1', $name);
+    }
+
+    function testPropertyName_TwoWordsEndsWithDigit_OK()
+    {
+        $name = DataMapper::propertyName('testTwo1');
+        $this->assertEquals('test_two1', $name);
+    }
+
     function testAutoMap_TestClass_OK()
     {
         $actual = DataMapper::autoMap(new TestClassModel());