Compatibility with Laravel 6

hollow-en · hollow-en · commit 75ecdfbec168 · 2020-01-21T18:27:26.000+05:00
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "illuminate/support": "^5.4 || ^6.0",
         "illuminate/validation": "^5.4 || ^6.0",
         "saritasa/php-common": "^1.0",
-        "propaganistas/laravel-phone": "^3.0.4"
+        "propaganistas/laravel-phone": "^3.0 || ^4.0 || ^5.0"
     },
     "require-dev": {
         "mockery/mockery": "^0.9",
diff --git a/src/StringRuleSet.php b/src/StringRuleSet.php
@@ -54,10 +54,10 @@ public function __construct(array $rules = [])
      */
     public function regex(string $pattern, bool $ignoreCase = false): StringRuleSet
     {
-        if (!starts_with($pattern, '/')) {
+        if (!Str::startsWith($pattern, '/')) {
             $pattern = "/$pattern/";
         }
-        if ($ignoreCase && !ends_with('i', $pattern)) {
+        if ($ignoreCase && !Str::endsWith('i', $pattern)) {
             $pattern .= 'i';
         }
         return $this->appendIfNotExists("regex:$pattern");

Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@ public function __construct(array $rules = [])`
`54`	`54`	`*/`
`55`	`55`	`public function regex(string $pattern, bool $ignoreCase = false): StringRuleSet`
`56`	`56`	`{`
`57`		`- if (!starts_with($pattern, '/')) {`
	`57`	`+ if (!Str::startsWith($pattern, '/')) {`
`58`	`58`	`$pattern = "/$pattern/";`
`59`	`59`	`}`
`60`		`- if ($ignoreCase && !ends_with('i', $pattern)) {`
	`60`	`+ if ($ignoreCase && !Str::endsWith('i', $pattern)) {`
`61`	`61`	`$pattern .= 'i';`
`62`	`62`	`}`
`63`	`63`	`return $this->appendIfNotExists("regex:$pattern");`