Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[8.x] Add gate policy callback" #39290

Merged
merged 1 commit into from
Oct 21, 2021
Merged

Revert "[8.x] Add gate policy callback" #39290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions src/Illuminate/Auth/Access/Gate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand All @@ -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);
});
Expand Down Expand Up @@ -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]);

Expand Down Expand Up @@ -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.
*
Expand Down
4 changes: 0 additions & 4 deletions src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
40 changes: 0 additions & 40 deletions tests/Auth/AuthAccessGateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
12 changes: 0 additions & 12 deletions tests/Foundation/FoundationAuthorizesRequestsTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down