Ensure implode works with stringable

alleyinteractive · Nov 26, 2024 · f6ecef1 · f6ecef1
1 parent 5edb71f
commit f6ecef1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/src/mantle/support/class-collection.php b/src/mantle/support/class-collection.php
@@ -583,7 +583,7 @@ public function implode( $value, $glue = null ) {
 
 		$first = $this->first();
 
-		if ( is_array( $first ) || is_object( $first ) ) {
+		if ( is_array( $first ) || ( is_object( $first ) && ! $first instanceof \Stringable ) ) {
 			return implode( $glue ?? '', $this->pluck( $value )->all() );
 		}
 

diff --git a/src/mantle/support/class-stringable.php b/src/mantle/support/class-stringable.php
@@ -13,6 +13,7 @@
 use Mantle\Support\Traits\Conditionable;
 use Mantle\Support\Traits\Macroable;
 use JsonSerializable;
+use Mantle\Support\Traits\Makeable;
 use Mantle\Support\Traits\Tappable;
 use Symfony\Component\VarDumper\VarDumper;
 
@@ -24,9 +25,9 @@
  * Allows for the chaining of string methods.
  */
 class Stringable implements ArrayAccess, JsonSerializable, \Stringable {
-
 	use Conditionable;
 	use Macroable;
+	use Makeable;
 	use Tappable;
 
 	/**

diff --git a/tests/Support/CollectionTest.php b/tests/Support/CollectionTest.php
@@ -14,6 +14,7 @@
 use Mantle\Database\Model;
 use InvalidArgumentException;
 use JsonSerializable;
+use Mantle\Support\Stringable;
 use Mantle\Testing\Framework_Test_Case;
 use Mockery as m;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -1753,6 +1754,38 @@ public function testImplode($collection)
 		$this->assertSame('taylor,dayle', $data->implode(','));
 	}
 
+	/**
+	 * @dataProvider collectionClassProvider
+	 */
+	#[DataProvider( 'collectionClassProvider' )]
+	public function testImplodeStringable($collection)
+	{
+		$data = new $collection( [
+			Stringable::make( 'example' ),
+			Stringable::make( 'string' ),
+			Stringable::make( 'here' ),
+		] );
+
+		$this->assertSame( 'example string here', $data->implode( ' ' ) );
+		$this->assertSame( 'example,string,here', $data->implode( ',' ) );
+	}
+
+	/**
+	 * @dataProvider collectionClassProvider
+	 */
+	#[DataProvider( 'collectionClassProvider' )]
+	public function testImplodeStr($collection)
+	{
+		$data = new $collection( [
+			Stringable::make( 'example' ),
+			Stringable::make( 'string' ),
+			Stringable::make( 'here' ),
+		] );
+
+		$this->assertInstanceof( \Mantle\Support\Stringable::class, $data->implode_str( ' ' ) );
+		$this->assertSame( 'example string here', $data->implode_str( ' ' )->value() );
+	}
+
 	/**
 	 * @dataProvider collectionClassProvider
 	 */