Merge pull request #4 from Eden-PHP/v4

Christian Blanquera · web-flow · commit a66188d736c0 · 2016-07-24T09:32:26.000+08:00
Fixed recursive dependancies
diff --git a/src/Index.php b/src/Index.php
@@ -130,7 +130,7 @@ public function __call($name, $args)
         $result = call_user_func_array($name, $args);
 
         //if the result is a string
-        if (is_string($result)) {
+        if (is_string($result) && class_exists('Eden_String_Index')) {
             //if this class is a string type
             if ($this instanceof Eden_String_Index) {
                 //set value
diff --git a/test/Index.php b/test/Index.php
@@ -907,10 +907,9 @@ public function test_array_implode()
 	{
 		$test = eden('array')
 			->set(1, 2, 3)
-			->implode(', ')
-			->get();
+			->implode(', ');
 		
-		$this->assertEquals('1, 2, 3', $test);
+		$this->assertEquals('1, 2, 3', (string) $test);
 	}
 	
 	public function test_in_array()

Original file line number	Diff line number	Diff line change
`@@ -907,10 +907,9 @@ public function test_array_implode()`
`907`	`907`	`{`
`908`	`908`	`$test = eden('array')`
`909`	`909`	`->set(1, 2, 3)`
`910`		`- ->implode(', ')`
`911`		`- ->get();`
	`910`	`+ ->implode(', ');`
`912`	`911`
`913`		`- $this->assertEquals('1, 2, 3', $test);`
	`912`	`+ $this->assertEquals('1, 2, 3', (string) $test);`
`914`	`913`	`}`
`915`	`914`
`916`	`915`	`public function test_in_array()`