diff --git a/CHANGELOG.md b/CHANGELOG.md index e172ff7d..a0960b6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.10.0-rc.6 +## mm/dd/2020 + +1. [](#new) + * Pass phpstan level 1 tests + # v1.10.0-rc.5 ## 02/03/2020 diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php index 7ccb75cb..746dd8d2 100644 --- a/classes/plugin/Admin.php +++ b/classes/plugin/Admin.php @@ -309,7 +309,17 @@ class Admin */ 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 diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php index 42be349f..cd8893ec 100644 --- a/classes/plugin/AdminController.php +++ b/classes/plugin/AdminController.php @@ -1080,6 +1080,7 @@ class AdminController extends AdminBaseController $data = $this->post; $package = $data['package'] ?? ''; $type = $data['type'] ?? ''; + $result = false; if (!$this->authorizeTask('uninstall ' . $type, ['admin.' . $type, 'admin.super'])) { $json_response = [ @@ -1106,6 +1107,7 @@ class AdminController extends AdminBaseController $this->sendJsonResponse($json_response, 200); } + $dependencies = false; try { $dependencies = $this->admin->dependenciesThatCanBeRemovedWhenRemoving($package); $result = Gpm::uninstall($package, []); diff --git a/classes/plugin/Controllers/AbstractController.php b/classes/plugin/Controllers/AbstractController.php index c0860b3d..0b1d8e8a 100644 --- a/classes/plugin/Controllers/AbstractController.php +++ b/classes/plugin/Controllers/AbstractController.php @@ -8,6 +8,7 @@ use Grav\Common\Grav; use Grav\Common\Inflector; use Grav\Common\Language\Language; use Grav\Common\Utils; +use Grav\Framework\Flex\Interfaces\FlexObjectInterface; use Grav\Framework\Form\Interfaces\FormInterface; use Grav\Framework\Psr7\Response; use Grav\Framework\RequestHandler\Exception\NotFoundException; @@ -172,6 +173,11 @@ abstract class AbstractController implements RequestHandlerInterface return $form; } + /** + * @return FlexObjectInterface + */ + abstract public function getObject(); + /** * Get Grav instance. *