Pass phpstan level 1 tests

This commit is contained in:
Matias Griese
2020-02-04 11:22:27 +02:00
parent e3dc114636
commit 87f3fd83ff
4 changed files with 25 additions and 1 deletions

View File

@@ -1,3 +1,9 @@
# v1.10.0-rc.6
## mm/dd/2020
1. [](#new)
* Pass phpstan level 1 tests
# v1.10.0-rc.5 # v1.10.0-rc.5
## 02/03/2020 ## 02/03/2020

View File

@@ -309,7 +309,17 @@ class Admin
*/ */
public static function getLastPageRoute() public static function getLastPageRoute()
{ {
return Grav::instance()['session']->lastPageRoute ?: self::route(); /** @var Session $session */
$session = Grav::instance()['session'];
$route = $session->lastPageRoute;
if ($route) {
return $route;
}
/** @var Admin $admin */
$admin = Grav::instance()['admin'];
return $admin->getCurrentRoute();
} }
public function getAdminRoute(string $path = '', $languageCode = null): Route public function getAdminRoute(string $path = '', $languageCode = null): Route

View File

@@ -1080,6 +1080,7 @@ class AdminController extends AdminBaseController
$data = $this->post; $data = $this->post;
$package = $data['package'] ?? ''; $package = $data['package'] ?? '';
$type = $data['type'] ?? ''; $type = $data['type'] ?? '';
$result = false;
if (!$this->authorizeTask('uninstall ' . $type, ['admin.' . $type, 'admin.super'])) { if (!$this->authorizeTask('uninstall ' . $type, ['admin.' . $type, 'admin.super'])) {
$json_response = [ $json_response = [
@@ -1106,6 +1107,7 @@ class AdminController extends AdminBaseController
$this->sendJsonResponse($json_response, 200); $this->sendJsonResponse($json_response, 200);
} }
$dependencies = false;
try { try {
$dependencies = $this->admin->dependenciesThatCanBeRemovedWhenRemoving($package); $dependencies = $this->admin->dependenciesThatCanBeRemovedWhenRemoving($package);
$result = Gpm::uninstall($package, []); $result = Gpm::uninstall($package, []);

View File

@@ -8,6 +8,7 @@ use Grav\Common\Grav;
use Grav\Common\Inflector; use Grav\Common\Inflector;
use Grav\Common\Language\Language; use Grav\Common\Language\Language;
use Grav\Common\Utils; use Grav\Common\Utils;
use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
use Grav\Framework\Form\Interfaces\FormInterface; use Grav\Framework\Form\Interfaces\FormInterface;
use Grav\Framework\Psr7\Response; use Grav\Framework\Psr7\Response;
use Grav\Framework\RequestHandler\Exception\NotFoundException; use Grav\Framework\RequestHandler\Exception\NotFoundException;
@@ -172,6 +173,11 @@ abstract class AbstractController implements RequestHandlerInterface
return $form; return $form;
} }
/**
* @return FlexObjectInterface
*/
abstract public function getObject();
/** /**
* Get Grav instance. * Get Grav instance.
* *