Merge pull request #43 from mokevnin/master

Fix broken flatten and some other things
phpfunct · Dec 19, 2018 · 3f01f3f · 3f01f3f
2 parents cea9a9d + 8c509a7
commit 3f01f3f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/src/Tests/Collection/CollectionFlattenTest.php b/src/Tests/Collection/CollectionFlattenTest.php
@@ -44,6 +44,11 @@ public function dataCollectionFlatten()
             ['a', 'b', ['c', ['d']]],
         ];
 
+        $out[] = [
+            [['a'], 'b', ['c', 'd'], ['e', ['j']]],
+            ['a', 'b', 'c', 'd', 'e', ['j']],
+        ];
+
         return $out;
     }
 

diff --git a/src/Tests/Collection/CollectionSizeTest.php b/src/Tests/Collection/CollectionSizeTest.php
@@ -15,12 +15,12 @@ class CollectionSizeTest extends \PHPUnit_Framework_TestCase
     public function dataCollectionSize()
     {
         $out = [];
-	 	$out[] = [['a', 'b', 'c'], false, 3];
-	 	$out[] = [['a', 'b', ['c', 'd']], false, 3];
-	 	$out[] = [['a', 'b', ['c', 'd']], true, 5];
-	 	$out[] = [null, true, 0];
-	 	$out[] = [['fruits' => ['orange', 'banana', 'apple'], 'veggie' => ['carrot', 'collard', 'pea']], false, 2];
-	 	$out[] = [['fruits' => ['orange', 'banana', 'apple'], 'veggie' => ['carrot', 'collard', 'pea']], true, 8];
+        $out[] = [['a', 'b', 'c'], false, 3];
+        $out[] = [['a', 'b', ['c', 'd']], false, 3];
+        $out[] = [['a', 'b', ['c', 'd']], true, 5];
+        $out[] = [null, true, 0];
+        $out[] = [['fruits' => ['orange', 'banana', 'apple'], 'veggie' => ['carrot', 'collard', 'pea']], false, 2];
+        $out[] = [['fruits' => ['orange', 'banana', 'apple'], 'veggie' => ['carrot', 'collard', 'pea']], true, 8];
 
         return $out;
     }

diff --git a/src/Tests/Objects/AssignIfIssetTest.php b/src/Tests/Objects/AssignIfIssetTest.php
@@ -2,7 +2,7 @@
 
 namespace Funct\Tests\Objects;
 
-use Funct\Object;
+use Funct\Object as Obj;
 
 /**
  * Class AssignIfIssetTest
@@ -18,13 +18,13 @@ public function testMethod()
         $object = new \stdClass();
         $array = [];
 
-        Object\assignIfIsset($object, 'foo', $array, 'bar');
+        Obj\assignIfIsset($object, 'foo', $array, 'bar');
 
         $this->assertObjectNotHasAttribute('foo', $object);
 
         $array = ['bar' => 'foobar'];
 
-        Object\assignIfIsset($object, 'foo', $array, 'bar');
+        Obj\assignIfIsset($object, 'foo', $array, 'bar');
         $this->assertObjectHasAttribute('foo', $object);
         $this->assertSame('foobar', $object->foo);
     }

diff --git a/src/Tests/Objects/ObjectsToArrayTest.php b/src/Tests/Objects/ObjectsToArrayTest.php
@@ -2,8 +2,8 @@
 
 namespace Funct\Tests\Objects;
 
-use Funct\Object;
-use Funct\Tests\Fixtures\SampleObject;;
+use Funct\Object as Obj;
+use Funct\Tests\Fixtures\SampleObject;
 
 /**
  * Class ObjectsToArrayTest
@@ -32,7 +32,7 @@ public function testObjectsToArray()
 
         $expected = ['bar', 'bar', 'bar', 'bar'];
 
-        $this->assertEquals($expected, Object\toArray($objects, 'getFoo'));
+        $this->assertEquals($expected, Obj\toArray($objects, 'getFoo'));
 
         $expected = [
             'foo1' => 'bar',
@@ -41,6 +41,6 @@ public function testObjectsToArray()
             'foo4' => 'bar',
         ];
 
-        $this->assertEquals($expected, Object\toArray($objects, 'getFoo', 'getBar'));
+        $this->assertEquals($expected, Obj\toArray($objects, 'getFoo', 'getBar'));
     }
 }