Improve Orchestra\Support\Str::searchable() options

Signed-off-by: crynobone <[email protected]>

src/Orchestra/Support/Str.php

@@ -18,11 +18,19 @@ public static function humanize($text)
 	/**
 	 * Convert basic string to searchable result.
 	 */
-	public static function searchable($text)
+	public static function searchable($text, $wildcard = '*', $replacement = '%')
 	{
-		if (static::contains($text, '_') or static::contains($text, '%') return array($text);
-
-		return array("{$text}", "{$text}%", "%{$text}", "%{$text}%");
+		if ( ! static::contains($text, $wildcard)) 
+		{
+			return array(
+				"{$text}", 
+				"{$text}{$replacement}", 
+				"{$replacement}{$text}", 
+				"{$replacement}{$text}{$replacement}",
+			);
+		}
+
+		return array(str_replace($wildcard, $replacement, $text));
 	}
 
 	/**

tests/StrTest.php

@@ -17,6 +17,24 @@ public function testHumanizeSuccessful()
 		$this->assertEquals($expected, $output);
 	}
 
+	/**
+	 * Test Authorize\Str::searchable() method.
+	 *
+	 * @test
+	 */
+	public function testSearchableSuccessful()
+	{
+		$expected = array('foobar%'); 
+		$output   = Str::searchable('foobar*');
+
+		$this->assertEquals($expected, $output);
+
+		$expected = array('foobar', 'foobar%', '%foobar', '%foobar%'); 
+		$output   = Str::searchable('foobar');
+
+		$this->assertEquals($expected, $output);
+	}
+
 	/**
 	 * Test Orchestra\Support\Str::streamGetContents() method.
 	 *