Merge branch '3.0'

.php_cs

@@ -24,12 +24,16 @@ return Symfony\CS\Config\Config::create()
         'multiline_array_trailing_comma',
         'new_with_braces',
         'no_blank_lines_after_class_opening',
+        'no_blank_lines_before_namespace',
         'no_empty_lines_after_phpdocs',
         'object_operator',
         'operators_spaces',
         'phpdoc_indent',
+        'phpdoc_no_access',
         '-phpdoc_no_empty_return',
+        'phpdoc_no_package',
         '-phpdoc_params',
+        'phpdoc_scalar',
         'phpdoc_separation',
         'phpdoc_short_description',
         'phpdoc_to_comment',
@@ -40,8 +44,11 @@ return Symfony\CS\Config\Config::create()
         'remove_leading_slash_use',
         'remove_lines_between_uses',
         'short_array_syntax',
+        'single_quote',
         'spaces_cast',
         'standardize_not_equal',
+        'ternary_spaces',
+        'trim_array_spaces',
         'unused_use',
         'whitespacy_lines',
         'visibility',

src/Auth/CommandServiceProvider.php

@@ -8,7 +8,7 @@ class CommandServiceProvider extends ServiceProvider
     /**
      * Indicates if loading of the provider is deferred.
      *
-     * @var boolean
+     * @var bool
      */
     protected $defer = true;
 

src/Authorization/Authorization.php

@@ -161,9 +161,9 @@ public function sync()
             $name = $this->name;
 
             $this->memory->put("acl_{$name}", [
-                "acl"     => $this->acl,
-                "actions" => $this->actions->get(),
-                "roles"   => $this->roles->get(),
+                'acl'     => $this->acl,
+                'actions' => $this->actions->get(),
+                'roles'   => $this->roles->get(),
             ]);
         }
 

src/Authorization/AuthorizationServiceProvider.php

@@ -7,7 +7,7 @@ class AuthorizationServiceProvider extends ServiceProvider
     /**
      * Indicates if loading of the provider is deferred.
      *
-     * @var boolean
+     * @var bool
      */
     protected $defer = true;
 

src/Authorization/Fluent.php

@@ -131,7 +131,7 @@ public function filter($request)
      *
      * @param  mixed  $name
      *
-     * @return integer|null
+     * @return int|null
      */
     public function findKey($name)
     {

tests/Authorization/AuthorizationTest.php

@@ -28,9 +28,9 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->app           = new IlluminateContainer();
-        $this->app['auth']   = $auth   = m::mock('\Orchestra\Auth\Guard');
-        $this->app['config'] = $config = m::mock('Config');
-        $this->app['events'] = $event = m::mock('Event');
+        $this->app['auth']   = $auth   = m::mock('\Orchestra\Contracts\Auth\Guard');
+        $this->app['config'] = $config = m::mock('\Illuminate\Contracts\Config\Repository');
+        $this->app['events'] = $event = m::mock('\Illuminate\Contracts\Events\Dispatcher');
 
         $auth->shouldReceive('guest')->andReturn(true)
             ->shouldReceive('user')->andReturn(null);
@@ -96,7 +96,7 @@ public function testInstanceOfStub()
         $acl->setAccessible(true);
 
         $this->assertInstanceOf('\Orchestra\Authorization\Authorization', $this->stub);
-        $this->assertInstanceOf('\Orchestra\Memory\Provider', $memory->getValue($this->stub));
+        $this->assertInstanceOf('\Orchestra\Contracts\Memory\Provider', $memory->getValue($this->stub));
         $this->assertInstanceOf('\Orchestra\Authorization\Fluent', $roles->getValue($this->stub));
         $this->assertInstanceOf('\Orchestra\Authorization\Fluent', $actions->getValue($this->stub));
         $this->assertTrue(is_array($acl->getValue($this->stub)));
@@ -248,7 +248,7 @@ public function testDenyMethod()
      */
     public function testCanMethodAsAdminUser()
     {
-        $auth = m::mock('\Orchestra\Auth\Guard');
+        $auth = m::mock('\Orchestra\Contracts\Auth\Guard');
 
         $auth->shouldReceive('guest')->times(4)->andReturn(false)
             ->shouldReceive('roles')->times(4)->andReturn(['Admin']);
@@ -267,6 +267,58 @@ public function testCanMethodAsAdminUser()
         $this->assertFalse($stub->can('manage-photo'));
     }
 
+    /**
+     * Test Orchestra\Authorization\Authorization::can() method as "normal" user.
+     *
+     * @test
+     */
+    public function testCanMethodAsUser()
+    {
+        $auth = m::mock('\Orchestra\Contracts\Auth\Guard');
+
+        $auth->shouldReceive('guest')->times(2)->andReturn(false)
+            ->shouldReceive('roles')->times(2)->andReturn(['Admin', 'Staff']);
+
+        $runtime = $this->getRuntimeMemoryProvider();
+        $runtime->put('acl_foo', $this->memoryProvider());
+
+        $stub = new Authorization($auth, 'foo', $runtime);
+
+        $stub->addRoles(['Staff']);
+        $stub->addActions(['Manage Application', 'Manage Photo']);
+        $stub->allow('Admin', ['Manage Application', 'Manage Photo']);
+        $stub->allow('Staff', ['Manage Photo']);
+
+        $this->assertTrue($stub->can('manage application'));
+        $this->assertTrue($stub->can('manage photo'));
+    }
+
+    /**
+     * Test Orchestra\Authorization\Authorization::can() method as "normal" user.
+     *
+     * @test
+     */
+    public function testCanMethodAsUserShouldNotBeAffectedByRoleOrder()
+    {
+        $auth = m::mock('\Orchestra\Contracts\Auth\Guard');
+
+        $auth->shouldReceive('guest')->times(2)->andReturn(false)
+            ->shouldReceive('roles')->times(2)->andReturn(['Staff', 'Admin']);
+
+        $runtime = $this->getRuntimeMemoryProvider();
+        $runtime->put('acl_foo', $this->memoryProvider());
+
+        $stub = new Authorization($auth, 'foo', $runtime);
+
+        $stub->addRoles(['Staff']);
+        $stub->addActions(['Manage Application', 'Manage Photo']);
+        $stub->allow('Admin', ['Manage Application', 'Manage Photo']);
+        $stub->allow('Staff', ['Manage Photo']);
+
+        $this->assertTrue($stub->can('manage application'));
+        $this->assertTrue($stub->can('manage photo'));
+    }
+
     /**
      * Test Orchestra\Authorization\Authorization::can() method as "guest" user.
      *
@@ -368,7 +420,7 @@ public function testMemoryIsProperlySync()
         $roles->setAccessible(true);
         $actions->setAccessible(true);
 
-        $this->assertInstanceOf('\Orchestra\Memory\Provider', $memory->getValue($stub));
+        $this->assertInstanceOf('\Orchestra\Contracts\Memory\Provider', $memory->getValue($stub));
         $this->assertInstanceOf('\Orchestra\Authorization\Fluent', $roles->getValue($stub));
 
         $this->assertTrue($stub->roles()->has('guest'));

tests/Authorization/FactoryTest.php

@@ -20,7 +20,7 @@ public function tearDown()
      */
     public function testMakeMethod()
     {
-        $auth = m::mock('\Orchestra\Auth\Guard');
+        $auth = m::mock('\Orchestra\Contracts\Auth\Guard');
         $stub = new Factory($auth);
 
         $this->assertInstanceOf('\Orchestra\Authorization\Authorization', $stub->make('mock-one'));
@@ -39,7 +39,7 @@ public function testMakeMethod()
      */
     public function testRegisterMethod()
     {
-        $auth = m::mock('\Orchestra\Auth\Guard');
+        $auth = m::mock('\Orchestra\Contracts\Auth\Guard');
         $stub = new Factory($auth);
 
         $auth->shouldReceive('guest')->times(3)->andReturn(true);
@@ -64,7 +64,7 @@ public function testRegisterMethod()
      */
     public function testMagicMethods()
     {
-        $auth = m::mock('\Orchestra\Auth\Guard');
+        $auth = m::mock('\Orchestra\Contracts\Auth\Guard');
         $stub = new Factory($auth);
 
         $acl1 = $stub->make('mock-one');
@@ -100,7 +100,7 @@ public function testMagicMethods()
      */
     public function testAllMethod()
     {
-        $auth = m::mock('\Orchestra\Auth\Guard');
+        $auth = m::mock('\Orchestra\Contracts\Auth\Guard');
         $stub = new Factory($auth);
 
         $mock1 = $stub->make('mock-one');