Skip to content

Commit fbe68d1

Browse files
authored
Merge pull request #743 from cakephp/3.x-deprecations
Remove deprecations.
2 parents f2ed910 + d80c44a commit fbe68d1

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Diff for: src/Panel/RequestPanel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function shutdown(Event $event)
3232
{
3333
/* @var \Cake\Controller\Controller $controller */
3434
$controller = $event->getSubject();
35-
$request = $controller->request;
35+
$request = $controller->getRequest();
3636
$this->_data = [
3737
'params' => $request->getAttribute("params"),
3838
'query' => $request->getQueryParams(),

Diff for: src/Panel/RoutesPanel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public function summary()
5151
*/
5252
public function shutdown(Event $event)
5353
{
54+
/* @var \Cake\Controller\Controller|null $controller */
5455
$controller = $event->getSubject();
55-
/* @var \Cake\Http\ServerRequest $request */
56-
$request = $controller ? $controller->request : null;
56+
$request = $controller ? $controller->getRequest() : null;
5757
$this->_data = [
5858
'matchedRoute' => $request ? $request->getParam('_matchedRoute') : null,
5959
];

Diff for: src/Panel/VariablesPanel.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ protected function _walkDebugInfo(callable $walker, $item)
8989
*/
9090
public function shutdown(Event $event)
9191
{
92+
/* @var \Cake\Controller\Controller $controller */
9293
$controller = $event->getSubject();
9394
$errors = [];
9495

@@ -145,7 +146,7 @@ public function shutdown(Event $event)
145146
if ($v instanceof EntityInterface) {
146147
$errors[$k] = $this->_getErrors($v);
147148
} elseif ($v instanceof Form) {
148-
$formError = $v->errors();
149+
$formError = $v->getErrors();
149150
if (!empty($formError)) {
150151
$errors[$k] = $formError;
151152
}

0 commit comments

Comments
 (0)