Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-03 19:11:35 +01:00
Code Issues Packages Projects Releases Activity

Change typehints from User to UserInterface

Browse Source
This commit is contained in:
Matias Griese
2019-02-14 11:34:41 +02:00
parent 674ea8ae25
commit a3bf38b182
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/Grav/Common/Data/Blueprint.php
View File

@@ -11,7 +11,7 @@ namespace Grav\Common\Data;
use Grav\Common\File\CompiledYamlFile;
use Grav\Common\Grav;
use Grav\Common\User\User;
use Grav\Common\User\Interfaces\UserInterface;
use RocketTheme\Toolbox\Blueprints\BlueprintForm;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
@@ -291,7 +291,7 @@ class Blueprint extends BlueprintForm
$grav = Grav::instance();
$actions = (array)$call['params'];
/** @var User $user */
/** @var UserInterface $user */
if (isset($grav['user'])) {
$user = Grav::instance()['user'];
foreach ($actions as $action) {

6
system/src/Grav/Common/Form/FormFlash.php
View File

@@ -11,7 +11,7 @@ namespace Grav\Common\Form;
use Grav\Common\Filesystem\Folder;
use Grav\Common\Grav;
use Grav\Common\User\User;
use Grav\Common\User\Interfaces\UserInterface;
use RocketTheme\Toolbox\File\YamlFile;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
@@ -41,10 +41,10 @@ class FormFlash extends \Grav\Framework\Form\FormFlash
}
/**
* @param User|null $user
* @param UserInterface|null $user
* @return $this
*/
public function setUser(?User $user = null)
public function setUser(UserInterface $user = null)
{
if ($user && $user->username) {
$this->user = [

4
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -22,7 +22,7 @@ use Grav\Common\Twig\TokenParser\TwigTokenParserSwitch;
use Grav\Common\Twig\TokenParser\TwigTokenParserThrow;
use Grav\Common\Twig\TokenParser\TwigTokenParserTryCatch;
use Grav\Common\Twig\TokenParser\TwigTokenParserMarkdown;
use Grav\Common\User\User;
use Grav\Common\User\Interfaces\UserInterface;
use Grav\Common\Utils;
use Grav\Common\Yaml;
use Grav\Common\Helpers\Base32;
@@ -987,7 +987,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
*/
public function authorize($action)
{
/** @var User $user */
/** @var UserInterface $user */
$user = $this->grav['user'];
if (!$user->authenticated || (isset($user->authorized) && !$user->authorized)) {