Merge pull request #13009 from themsaid/array-dot-dilemma

[5.2] A case with Arr:dot()
laravel · Apr 4, 2016 · 4461e6f · 4461e6f
2 parents 341fe49 + bf55c09
commit 4461e6f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
@@ -105,7 +105,7 @@ public static function dot($array, $prepend = '')
         $results = [];
 
         foreach ($array as $key => $value) {
-            if (is_array($value)) {
+            if (is_array($value) && ! empty($value)) {
                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));
             } else {
                 $results[$prepend.$key] = $value;

diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php
@@ -41,6 +41,15 @@ public function testDot()
     {
         $array = Arr::dot(['foo' => ['bar' => 'baz']]);
         $this->assertEquals(['foo.bar' => 'baz'], $array);
+
+        $array = Arr::dot([]);
+        $this->assertEquals([], $array);
+
+        $array = Arr::dot(['foo' => []]);
+        $this->assertEquals(['foo' => []], $array);
+
+        $array = Arr::dot(['foo' => ['bar' => []]]);
+        $this->assertEquals(['foo.bar' => []], $array);
     }
 
     public function testExcept()

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -2099,6 +2099,15 @@ public function testValidateImplicitEachWithAsterisks()
         $this->assertFalse($v->passes());
     }
 
+    public function testSometimesFailOnEmptyArrayInImplicitRules()
+    {
+        $trans = $this->getRealTranslator();
+
+        $data = ['names' => [['second' => []]]];
+        $v = new Validator($trans, $data, ['names.*.second' => 'sometimes|required']);
+        $this->assertFalse($v->passes());
+    }
+
     public function testValidateImplicitEachWithAsterisksForRequiredNonExistingKey()
     {
         $trans = $this->getRealTranslator();