Merge pull request #860 from vabrell/master

stevebauman · web-flow · commit eec35357e2b5 · 2020-05-28T14:28:02.000-04:00
str_contains deprecated - docs out of date
diff --git a/docs/auth/setup.md b/docs/auth/setup.md
@@ -135,6 +135,7 @@ With this example rule, we only want to allow users to login if they are inside
 namespace App\Rules;
 
 use Adldap\Laravel\Validation\Rules\Rule;
+use Illuminate\Support\Str; // Laravel >= 5.7
 
 class OnlyManagersAndAccounting extends Rule
 {
@@ -150,7 +151,11 @@ class OnlyManagersAndAccounting extends Rule
             'ou=Managers,dc=acme,dc=org',
         ];
     
+        // Laravel <= 5.6
         return str_contains($this->user->getDn(), $ous);
+
+        // Laravel >= 5.7
+        return Str::contains($this->user->getDn(), $ous)
     }
 }
 ```

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ With this example rule, we only want to allow users to login if they are inside`
`135`	`135`	`namespace App\Rules;`
`136`	`136`
`137`	`137`	`use Adldap\Laravel\Validation\Rules\Rule;`
	`138`	`+use Illuminate\Support\Str; // Laravel >= 5.7`
`138`	`139`
`139`	`140`	`class OnlyManagersAndAccounting extends Rule`
`140`	`141`	`{`
`@@ -150,7 +151,11 @@ class OnlyManagersAndAccounting extends Rule`
`150`	`151`	`'ou=Managers,dc=acme,dc=org',`
`151`	`152`	`];`
`152`	`153`
	`154`	`+ // Laravel <= 5.6`
`153`	`155`	`return str_contains($this->user->getDn(), $ous);`
	`156`	`+`
	`157`	`+ // Laravel >= 5.7`
	`158`	`+ return Str::contains($this->user->getDn(), $ous)`
`154`	`159`	`}`
`155`	`160`	`}`
`156`	`161`	```