Merge branch 'laravel:8.x' into 8.x

Author: Plytas

src/Illuminate/Auth/Access/Gate.php

@@ -279,10 +279,6 @@ public function denies($ability, $arguments = [])
      */
     public function check($abilities, $arguments = [])
     {
-        if (is_array($abilities) && class_exists($abilities[0])) {
-            $abilities = [$abilities];
-        }
-
         return collect($abilities)->every(function ($ability) use ($arguments) {
             return $this->inspect($ability, $arguments)->allowed();
         });
@@ -297,13 +293,6 @@ public function check($abilities, $arguments = [])
      */
     public function any($abilities, $arguments = [])
     {
-        // Gate::any([Policy::class, ['view', 'create']], $post)...
-        if (isset($abilities[1]) && is_array($abilities[1])) {
-            $abilities = collect($abilities[1])->map(function ($ability) use ($abilities) {
-                return [$abilities[0], $ability];
-            })->all();
-        }
-
         return collect($abilities)->contains(function ($ability) use ($arguments) {
             return $this->check($ability, $arguments);
         });
@@ -567,19 +556,6 @@ protected function resolveAuthCallback($user, $ability, array $arguments)
             return $callback;
         }
 
-        if (is_array($ability)) {
-            [$class, $method] = $ability;
-
-            if ($this->canBeCalledWithUser($user, $class, $method)) {
-                return $this->getCallableFromClassAndMethod($class, $method);
-            }
-        }
-
-        if (class_exists($ability) &&
-            $this->canBeCalledWithUser($user, $ability, '__invoke')) {
-            return $this->getCallableFromClassAndMethod($ability);
-        }
-
         if (isset($this->stringCallbacks[$ability])) {
             [$class, $method] = Str::parseCallback($this->stringCallbacks[$ability]);
 
@@ -805,20 +781,6 @@ protected function resolveUser()
         return call_user_func($this->userResolver);
     }
 
-    /**
-     * Get a callable from a class and method.
-     *
-     * @param  string  $class
-     * @param  string  $method
-     * @return \Closure
-     */
-    protected function getCallableFromClassAndMethod($class, $method = '__invoke')
-    {
-        return function (...$params) use ($class, $method) {
-            return $this->container->make($class)->{$method}(...$params);
-        };
-    }
-
     /**
      * Get all of the defined abilities.
      *

src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php

@@ -181,7 +181,8 @@ protected function getDefaultOneOfManyJoinAlias($relation)
     protected function newOneOfManySubQuery($groupBy, $column = null, $aggregate = null)
     {
         $subQuery = $this->query->getModel()
-            ->newQuery();
+            ->newQuery()
+            ->withoutGlobalScopes($this->removedScopes());
 
         foreach (Arr::wrap($groupBy) as $group) {
             $subQuery->groupBy($this->qualifyRelatedColumn($group));

src/Illuminate/Foundation/Application.php

@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '8.65.0';
+    const VERSION = '8.66.0';
 
     /**
      * The base path for the Laravel installation.

src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php

@@ -53,10 +53,6 @@ protected function parseAbilityAndArguments($ability, $arguments)
             return [$ability, $arguments];
         }
 
-        if (is_array($ability)) {
-            return [$ability, $arguments];
-        }
-
         $method = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3)[2]['function'];
 
         return [$this->normalizeGuessedAbilityName($method), $ability];

src/Illuminate/Support/Testing/Fakes/BusFake.php

@@ -135,6 +135,16 @@ public function assertNotDispatched($command, $callback = null)
         );
     }
 
+    /**
+     * Assert that no jobs were dispatched.
+     *
+     * @return void
+     */
+    public function assertNothingDispatched()
+    {
+        PHPUnit::assertEmpty($this->commands, 'Jobs were dispatched unexpectedly.');
+    }
+
     /**
      * Assert if a job was explicitly dispatched synchronously based on a truth-test callback.
      *

tests/Auth/AuthAccessGateTest.php

@@ -759,46 +759,6 @@ public function testEveryAbilityCheckFailsIfNonePass()
         $this->assertFalse($gate->check(['edit', 'update'], new AccessGateTestDummy));
     }
 
-    public function testInspectPolicyCallback()
-    {
-        $gate = $this->getBasicGate();
-
-        $response = $gate->inspect([AccessGateTestPolicyWithAllPermissions::class, 'edit'], new AccessGateTestDummy);
-
-        $this->assertFalse($response->denied());
-        $this->assertTrue($response->allowed());
-    }
-
-    public function testInspectPolicyCallbackInvoke()
-    {
-        $gate = $this->getBasicGate();
-
-        $response = $gate->inspect(AccessGateTestGuestInvokableClass::class, new AccessGateTestDummy);
-
-        $this->assertFalse($response->denied());
-        $this->assertTrue($response->allowed());
-    }
-
-    public function testCheckUsingPolicyCallback()
-    {
-        $gate = $this->getBasicGate();
-
-        $this->assertTrue($gate->check(
-            [AccessGateTestPolicyWithAllPermissions::class, 'edit'],
-            new AccessGateTestDummy)
-        );
-    }
-
-    public function testAnyUsingPolicyCallback()
-    {
-        $gate = $this->getBasicGate();
-
-        $this->assertTrue($gate->any(
-            [AccessGateTestPolicyWithAllPermissions::class, ['edit', 'update']],
-            new AccessGateTestDummy)
-        );
-    }
-
     /**
      * @dataProvider hasAbilitiesTestDataProvider
      *

tests/Database/DatabaseEloquentHasOneOfManyTest.php

@@ -110,6 +110,29 @@ public function testEagerLoadingAppliesConstraintsToInnerJoinSubQuery()
         $this->assertSame('select MAX("id") as "id_aggregate", "logins"."user_id" from "logins" where "logins"."user_id" = ? and "logins"."user_id" is not null and "logins"."user_id" in (1) group by "logins"."user_id"', $relation->getOneOfManySubQuery()->toSql());
     }
 
+    public function testGlobalScopeIsNotAppliedWhenRelationIsDefinedWithoutGlobalScope()
+    {
+        HasOneOfManyTestLogin::addGlobalScope(function ($query) {
+            $query->orderBy('id');
+        });
+
+        $user = HasOneOfManyTestUser::create();
+        $relation = $user->latest_login_without_global_scope();
+        $relation->addEagerConstraints([$user]);
+        $this->assertSame('select * from "logins" inner join (select MAX("id") as "id_aggregate", "logins"."user_id" from "logins" where "logins"."user_id" = ? and "logins"."user_id" is not null and "logins"."user_id" in (1) group by "logins"."user_id") as "latestOfMany" on "latestOfMany"."id_aggregate" = "logins"."id" and "latestOfMany"."user_id" = "logins"."user_id" where "logins"."user_id" = ? and "logins"."user_id" is not null', $relation->getQuery()->toSql());
+    }
+
+    public function testGlobalScopeIsNotAppliedWhenRelationIsDefinedWithoutGlobalScopeWithComplexQuery()
+    {
+        HasOneOfManyTestPrice::addGlobalScope(function ($query) {
+            $query->orderBy('id');
+        });
+
+        $user = HasOneOfManyTestUser::create();
+        $relation = $user->price_without_global_scope();
+        $this->assertSame('select * from "prices" inner join (select max("id") as "id_aggregate", "prices"."user_id" from "prices" inner join (select max("published_at") as "published_at_aggregate", "prices"."user_id" from "prices" where "published_at" < ? and "prices"."user_id" = ? and "prices"."user_id" is not null group by "prices"."user_id") as "price_without_global_scope" on "price_without_global_scope"."published_at_aggregate" = "prices"."published_at" and "price_without_global_scope"."user_id" = "prices"."user_id" where "published_at" < ? group by "prices"."user_id") as "price_without_global_scope" on "price_without_global_scope"."id_aggregate" = "prices"."id" and "price_without_global_scope"."user_id" = "prices"."user_id" where "prices"."user_id" = ? and "prices"."user_id" is not null', $relation->getQuery()->toSql());
+    }
+
     public function testQualifyingSubSelectColumn()
     {
         $user = HasOneOfManyTestUser::create();
@@ -468,6 +491,11 @@ public function latest_login_with_invalid_aggregate()
         return $this->hasOne(HasOneOfManyTestLogin::class, 'user_id')->ofMany('id', 'count');
     }
 
+    public function latest_login_without_global_scope()
+    {
+        return $this->hasOne(HasOneOfManyTestLogin::class, 'user_id')->withoutGlobalScopes()->latestOfMany();
+    }
+
     public function first_login()
     {
         return $this->hasOne(HasOneOfManyTestLogin::class, 'user_id')->ofMany('id', 'min');
@@ -522,6 +550,16 @@ public function price_with_shortcut()
     {
         return $this->hasOne(HasOneOfManyTestPrice::class, 'user_id')->latestOfMany(['published_at', 'id']);
     }
+
+    public function price_without_global_scope()
+    {
+        return $this->hasOne(HasOneOfManyTestPrice::class, 'user_id')->withoutGlobalScopes()->ofMany([
+            'published_at' => 'max',
+            'id' => 'max',
+        ], function ($q) {
+            $q->where('published_at', '<', now());
+        });
+    }
 }
 
 class HasOneOfManyTestModel extends Eloquent

tests/Foundation/FoundationAuthorizesRequestsTraitTest.php

@@ -17,18 +17,6 @@ protected function tearDown(): void
         Container::setInstance(null);
     }
 
-    public function testCallableGateCheck()
-    {
-        unset($_SERVER['_test.authorizes.trait']);
-
-        $gate = $this->getBasicGate();
-
-        $response = (new FoundationTestAuthorizeTraitClass)->authorize([FoundationAuthorizesRequestTestPolicy::class, 'create']);
-
-        $this->assertInstanceOf(Response::class, $response);
-        $this->assertTrue($_SERVER['_test.authorizes.trait.policy']);
-    }
-
     public function testBasicGateCheck()
     {
         unset($_SERVER['_test.authorizes.trait']);

tests/Support/SupportTestingBusFakeTest.php

@@ -362,6 +362,20 @@ public function testAssertNotDispatchedSyncClosure()
         }
     }
 
+    public function testAssertNothingDispatched()
+    {
+        $this->fake->assertNothingDispatched();
+
+        $this->fake->dispatch(new BusJobStub);
+
+        try {
+            $this->fake->assertNothingDispatched();
+            $this->fail();
+        } catch (ExpectationFailedException $e) {
+            $this->assertThat($e, new ExceptionMessage('Jobs were dispatched unexpectedly.'));
+        }
+    }
+
     public function testAssertDispatchedWithIgnoreClass()
     {
         $dispatcher = m::mock(QueueingDispatcher::class);