Merge pull request #743 from cakephp/3.x-deprecations

Remove deprecations.
cakephp · Mar 10, 2020 · fbe68d1 · fbe68d1
2 parents f2ed910 + d80c44a
commit fbe68d1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Panel/RequestPanel.php b/src/Panel/RequestPanel.php
@@ -32,7 +32,7 @@ public function shutdown(Event $event)
     {
         /* @var \Cake\Controller\Controller $controller */
         $controller = $event->getSubject();
-        $request = $controller->request;
+        $request = $controller->getRequest();
         $this->_data = [
             'params' => $request->getAttribute("params"),
             'query' => $request->getQueryParams(),

diff --git a/src/Panel/RoutesPanel.php b/src/Panel/RoutesPanel.php
@@ -51,9 +51,9 @@ public function summary()
      */
     public function shutdown(Event $event)
     {
+        /* @var \Cake\Controller\Controller|null $controller */
         $controller = $event->getSubject();
-        /* @var \Cake\Http\ServerRequest $request */
-        $request = $controller ? $controller->request : null;
+        $request = $controller ? $controller->getRequest() : null;
         $this->_data = [
             'matchedRoute' => $request ? $request->getParam('_matchedRoute') : null,
         ];

diff --git a/src/Panel/VariablesPanel.php b/src/Panel/VariablesPanel.php
@@ -89,6 +89,7 @@ protected function _walkDebugInfo(callable $walker, $item)
      */
     public function shutdown(Event $event)
     {
+        /* @var \Cake\Controller\Controller $controller */
         $controller = $event->getSubject();
         $errors = [];
 
@@ -145,7 +146,7 @@ public function shutdown(Event $event)
             if ($v instanceof EntityInterface) {
                 $errors[$k] = $this->_getErrors($v);
             } elseif ($v instanceof Form) {
-                $formError = $v->errors();
+                $formError = $v->getErrors();
                 if (!empty($formError)) {
                     $errors[$k] = $formError;
                 }