Merge pull request #2 from GeneaLabs/laravel-5.5

Fix gate method calls
mikebronner · Oct 3, 2017 · 86d1802 · 86d1802
2 parents 7432374 + 5913725
commit 86d1802
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/AuthorizationAddOns.php b/src/AuthorizationAddOns.php
@@ -4,21 +4,21 @@ class AuthorizationAddOns
 {
     public function canAny(string $expression)
     {
-        return "<?php if (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkAny({$expression})): ?>";
+        return "<?php if (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->any({$expression})): ?>";
     }
 
     public function canEvery(string $expression)
     {
-        return "<?php if (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkEvery({$expression})): ?>";
+        return "<?php if (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->every({$expression})): ?>";
     }
 
     public function elseCanAny(string $expression)
     {
-        return "<?php elseif (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkAny({$expression})): ?>";
+        return "<?php elseif (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->any({$expression})): ?>";
     }
 
     public function elseCanEvery(string $expression)
     {
-        return "<?php elseif (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkEvery({$expression})): ?>";
+        return "<?php elseif (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->every({$expression})): ?>";
     }
 }
diff --git a/tests/Unit/BladeDirectivesTest.php b/tests/Unit/BladeDirectivesTest.php
@@ -7,31 +7,31 @@ class BladeDirectivesTest extends TestCase
     public function testCanAnyDirectiveIsRegistered()
     {
         $string = '@canAny (\'update\', [$post])';
-        $expected = '<?php if (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkAny(\'update\', [$post])): ?>';
+        $expected = '<?php if (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->any(\'update\', [$post])): ?>';
 
         $this->assertEquals($expected, app('blade.compiler')->compileString($string));
     }
 
     public function testCanEveryDirectiveIsRegistered()
     {
         $string = '@canEvery (\'update\', [$post])';
-        $expected = '<?php if (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkEvery(\'update\', [$post])): ?>';
+        $expected = '<?php if (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->every(\'update\', [$post])): ?>';
 
         $this->assertEquals($expected, app('blade.compiler')->compileString($string));
     }
 
     public function testElseCanAnyDirectiveIsRegistered()
     {
         $string = '@elseCanAny (\'update\', [$post])';
-        $expected = '<?php elseif (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkAny(\'update\', [$post])): ?>';
+        $expected = '<?php elseif (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->any(\'update\', [$post])): ?>';
 
         $this->assertEquals($expected, app('blade.compiler')->compileString($string));
     }
 
     public function testElseCanEveryDirectiveIsRegistered()
     {
         $string = '@elseCanEvery (\'update\', [$post])';
-        $expected = '<?php elseif (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->checkEvery(\'update\', [$post])): ?>';
+        $expected = '<?php elseif (app(\\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->every(\'update\', [$post])): ?>';
 
         $this->assertEquals($expected, app('blade.compiler')->compileString($string));
     }