mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
Code Issues Releases Wiki Activity

Fix failing tests + CS

Browse Source
This commit is contained in:
Toby Zerner
2015-10-11 23:37:51 +10:30
parent 208d90293d
commit b53e612007
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Core/Access/Gate.php
View File

@@ -183,9 +183,7 @@ class Gate implements GateContract
return $result;
}
$callback = $this->resolveAuthCallback(
$user, $ability, $arguments
);
$callback = $this->resolveAuthCallback($user, $ability, $arguments);
return call_user_func_array($callback, array_merge([$user], $arguments));
}
@@ -224,7 +222,9 @@ class Gate implements GateContract
} elseif (isset($this->abilities[$ability])) {
return $this->abilities[$ability];
} else {
return function () { return false; };
return function () {
return false;
};
}
}
@@ -266,9 +266,7 @@ class Gate implements GateContract
// into the policy before methods with the arguments and get the result.
$beforeArguments = array_merge([$user, $ability], $arguments);
$result = call_user_func_array(
[$instance, 'before'], $beforeArguments
);
$result = call_user_func_array([$instance, 'before'], $beforeArguments);
// If we recieved a non-null result from the before method, we will return it
// as the result of a check. This allows developers to override the checks
@@ -282,9 +280,7 @@ class Gate implements GateContract
return false;
}
return call_user_func_array(
[$instance, $ability], array_merge([$user], $arguments)
);
return call_user_func_array([$instance, $ability], array_merge([$user], $arguments));
};
}
@@ -329,7 +325,13 @@ class Gate implements GateContract
public function forUser($user)
{
return new static(
$this->container, function () use ($user) { return $user; }, $this->abilities, $this->policies, $this->beforeCallbacks
$this->container,
function () use ($user) {
return $user;
},
$this->abilities,
$this->policies,
$this->beforeCallbacks
);
}

1
src/Core/Access/UserPolicy.php
View File

@@ -31,4 +31,3 @@ class UserPolicy extends AbstractPolicy
}
}
}