Merge pull request #744 from cakephp/master-docblock-cleanup

Cleanup docblocks.

Author: markstory

src/Panel/RoutesPanel.php

@@ -46,8 +46,8 @@ public function summary()
      */
     public function shutdown(EventInterface $event)
     {
+        /** @var \Cake\Controller\Controller|null $controller */
         $controller = $event->getSubject();
-        /** @var \Cake\Http\ServerRequest $request */
         $request = $controller ? $controller->getRequest() : null;
         $this->_data = [
             'matchedRoute' => $request ? $request->getParam('_matchedRoute') : null,

src/Panel/VariablesPanel.php

@@ -97,6 +97,7 @@ protected function _walkDebugInfo(callable $walker, $item)
      */
     public function shutdown(EventInterface $event)
     {
+        /** @var \Cake\Controller\Controller $controller */
         $controller = $event->getSubject();
         $errors = [];
 
@@ -153,9 +154,9 @@ public function shutdown(EventInterface $event)
             if ($v instanceof EntityInterface) {
                 $errors[$k] = $this->_getErrors($v);
             } elseif ($v instanceof Form) {
-                $formError = $v->getErrors();
-                if (!empty($formError)) {
-                    $errors[$k] = $formError;
+                $formErrors = $v->getErrors();
+                if ($formErrors) {
+                    $errors[$k] = $formErrors;
                 }
             }
         }