Fix some prefix collisions when extracting default values.

crysalead · Feb 11, 2019 · 0c7c8bb · 0c7c8bb
1 parent cc35493
commit 0c7c8bb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
-sudo: required
 dist: xenial
 language: php
 
 php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 matrix:
   fast_finish: true

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "crysalead/validator": "~3.0"
     },
     "require-dev": {
-        "kahlan/kahlan": "~3.0"
+        "kahlan/kahlan": "~4.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/spec/Suite/Schema.spec.php b/spec/Suite/Schema.spec.php
@@ -257,6 +257,23 @@
 
         });
 
+        it("correctly sets default values with stars and prefix collisions", function() {
+
+            $schema = new Schema();
+            $schema->column('datasource', ['type' => 'boolean', 'default' => false]);
+            $schema->column('data', ['type' => 'object', 'default' => []]);
+            $schema->column('data.*', ['type' => 'object', 'default' => []]);
+            $schema->column('data.*.checked', ['type' => 'boolean', 'default' => true]);
+
+            $schema->locked(true);
+
+            $document = new Document(['schema' => $schema]);
+
+            expect($document->get('datasource'))->toBe(false);
+            expect($document->get('data.value1.checked'))->toBe(true);
+
+        });
+
     });
 
     describe("->type()", function() {
@@ -1304,7 +1321,6 @@
 
     });
 
-
     describe(".bulkInsert()", function() {
 
         it("throws an ORMException", function() {

diff --git a/src/Schema.php b/src/Schema.php
@@ -347,10 +347,11 @@ public function defaults($basePath = null)
     {
         $defaults = [];
         foreach ($this->_columns as $key => $value) {
-            if ($basePath && strpos($key, $basePath) !== 0) {
-                continue;
+            if ($basePath) {
+                $fieldName = strpos($key, $basePath . '.') === 0 ? substr($key, strlen($basePath) + 1) : null;
+            } else {
+                $fieldName = $key;
             }
-            $fieldName = $basePath ? substr($key, strlen($basePath) + 1) : $key;
             if (!$fieldName || $fieldName === '*' || strpos($fieldName, '.') !== false) {
                 continue;
             }