Browse Source

remove deprecated calls form Cake\Controller

antograssiot 9 years ago
parent
commit
56200bb593

+ 2 - 2
src/Auth/FormAuthenticate.php

@@ -74,8 +74,8 @@ class FormAuthenticate extends BaseAuthenticate
         }
 
         return $this->_findUser(
-            $request->data[$fields['username']],
-            $request->data[$fields['password']]
+            $request->getData($fields['username']),
+            $request->getData($fields['password'])
         );
     }
 }

+ 5 - 5
src/Controller/Component/CsrfComponent.php

@@ -94,7 +94,7 @@ class CsrfComponent extends Component
         if ($request->is('get') && $cookieData === null) {
             $this->_setCookie($request, $response);
         }
-        if ($request->is(['put', 'post', 'delete', 'patch']) || $request->data()) {
+        if ($request->is(['put', 'post', 'delete', 'patch']) || $request->getData()) {
             $this->_validateToken($request);
             unset($request->data[$this->_config['field']]);
         }
@@ -132,7 +132,7 @@ class CsrfComponent extends Component
             'name' => $this->_config['cookieName'],
             'value' => $value,
             'expire' => $expiry->format('U'),
-            'path' => $request->webroot,
+            'path' => $request->getAttribute('webroot'),
             'secure' => $this->_config['secure'],
             'httpOnly' => $this->_config['httpOnly'],
         ]);
@@ -147,9 +147,9 @@ class CsrfComponent extends Component
      */
     protected function _validateToken(ServerRequest $request)
     {
-        $cookie = $request->cookie($this->_config['cookieName']);
-        $post = $request->data($this->_config['field']);
-        $header = $request->header('X-CSRF-Token');
+        $cookie = $request->getCookie($this->_config['cookieName']);
+        $post = $request->getData($this->_config['field']);
+        $header = $request->getHeaderLine('X-CSRF-Token');
 
         if (!$cookie) {
             throw new InvalidCsrfTokenException(__d('cake', 'Missing CSRF token cookie'));

+ 2 - 2
src/Controller/Component/PaginatorComponent.php

@@ -224,10 +224,10 @@ class PaginatorComponent extends Component
             'scope' => $options['scope'],
         ];
 
-        if (!$request->param('paging')) {
+        if (!$request->getParam('paging')) {
             $request->params['paging'] = [];
         }
-        $request->params['paging'] = [$alias => $paging] + (array)$request->param('paging');
+        $request->params['paging'] = [$alias => $paging] + (array)$request->getParam('paging');
 
         if ($requestedPage > $page) {
             throw new NotFoundException();

+ 7 - 7
src/Controller/Component/RequestHandlerComponent.php

@@ -577,26 +577,26 @@ class RequestHandlerComponent extends Component
         }
 
         $viewClass = null;
-        if ($builder->className() === null) {
+        if ($builder->getClassName() === null) {
             $viewClass = App::className($view, 'View', 'View');
         }
 
         if ($viewClass) {
             $controller->viewClass = $viewClass;
-            $builder->className($viewClass);
+            $builder->getClassName($viewClass);
         } else {
             if (!$this->_renderType) {
-                $builder->templatePath($builder->templatePath() . DIRECTORY_SEPARATOR . $type);
+                $builder->setTemplatePath($builder->getTemplatePath() . DIRECTORY_SEPARATOR . $type);
             } else {
-                $builder->templatePath(preg_replace(
+                $builder->setTemplatePath(preg_replace(
                     "/([\/\\\\]{$this->_renderType})$/",
                     DIRECTORY_SEPARATOR . $type,
-                    $builder->templatePath()
+                    $builder->getTemplatePath()
                 ));
             }
 
             $this->_renderType = $type;
-            $builder->layoutPath($type);
+            $builder->setLayoutPath($type);
         }
 
         $response = $controller->response;
@@ -645,7 +645,7 @@ class RequestHandlerComponent extends Component
         if (!$type) {
             return false;
         }
-        if (!$request->param('requested')) {
+        if (!$request->getParam('requested')) {
             $response->type($cType);
         }
         if (!empty($options['charset'])) {

+ 9 - 9
src/Controller/Component/SecurityComponent.php

@@ -260,7 +260,7 @@ class SecurityComponent extends Component
         $request = $controller->request;
         if (is_array($this->_config['requireAuth']) &&
             !empty($this->_config['requireAuth']) &&
-            $request->data()
+            $request->getData()
         ) {
             $requireAuth = $this->_config['requireAuth'];
 
@@ -273,23 +273,23 @@ class SecurityComponent extends Component
                     $tData = $this->session->read('_Token');
 
                     if (!empty($tData['allowedControllers']) &&
-                        !in_array($request->param('controller'), $tData['allowedControllers'])) {
+                        !in_array($request->getParam('controller'), $tData['allowedControllers'])) {
                         throw new AuthSecurityException(
                             sprintf(
                                 'Controller \'%s\' was not found in allowed controllers: \'%s\'.',
-                                $request->param('controller'),
+                                $request->getParam('controller'),
                                 implode(', ', (array)$tData['allowedControllers'])
                             )
                         );
                     }
                     if (!empty($tData['allowedActions']) &&
-                        !in_array($request->param('action'), $tData['allowedActions'])
+                        !in_array($request->getParam('action'), $tData['allowedActions'])
                     ) {
                         throw new AuthSecurityException(
                             sprintf(
                                 'Action \'%s::%s\' was not found in allowed actions: \'%s\'.',
-                                $request->param('controller'),
-                                $request->param('action'),
+                                $request->getParam('controller'),
+                                $request->getParam('action'),
                                 implode(', ', (array)$tData['allowedActions'])
                             )
                         );
@@ -312,7 +312,7 @@ class SecurityComponent extends Component
      */
     protected function _validatePost(Controller $controller)
     {
-        if (!$controller->request->data()) {
+        if (!$controller->request->getData()) {
             return true;
         }
         $token = $this->_validToken($controller);
@@ -375,8 +375,8 @@ class SecurityComponent extends Component
      */
     protected function _hashParts(Controller $controller)
     {
-        $fieldList = $this->_fieldsList($controller->request->data());
-        $unlocked = $this->_sortedUnlocked($controller->request->data());
+        $fieldList = $this->_fieldsList($controller->request->getData());
+        $unlocked = $this->_sortedUnlocked($controller->request->getData());
 
         return [
             $controller->request->here(),

+ 8 - 8
src/Controller/Controller.php

@@ -235,8 +235,8 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
             $this->name = $name;
         }
 
-        if ($this->name === null && $request && $request->param('controller')) {
-            $this->name = $request->param('controller');
+        if ($this->name === null && $request && $request->getParam('controller')) {
+            $this->name = $request->getParam('controller');
         }
 
         if ($this->name === null) {
@@ -401,10 +401,10 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
     public function setRequest(ServerRequest $request)
     {
         $this->request = $request;
-        $this->plugin = $request->param('plugin') ?: null;
+        $this->plugin = $request->getParam('plugin') ?: null;
 
-        if ($request->param('pass')) {
-            $this->passedArgs = $request->param('pass');
+        if ($request->getParam('pass')) {
+            $this->passedArgs = $request->getParam('pass');
         }
     }
 
@@ -551,7 +551,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
             return null;
         }
 
-        if (!$response->location()) {
+        if (!$response->getHeaderLine('Location')) {
             $response = $response->withLocation(Router::url($url, true));
         }
 
@@ -595,10 +595,10 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
             $builder->setTemplatePath($this->_viewPath());
         }
 
-        if (!empty($this->request->params['bare'])) {
+        if ($this->request->getParam('bare')) {
             $builder->enableAutoLayout(false);
         }
-        $builder->className($this->viewClass);
+        $builder->getClassName($this->viewClass);
 
         $this->autoRender = false;
 

+ 1 - 1
src/Controller/ErrorController.php

@@ -42,6 +42,6 @@ class ErrorController extends Controller
      */
     public function beforeRender(Event $event)
     {
-        $this->viewBuilder()->templatePath('Error');
+        $this->viewBuilder()->setTemplatePath('Error');
     }
 }

+ 5 - 5
src/Error/ExceptionRenderer.php

@@ -167,7 +167,7 @@ class ExceptionRenderer implements ExceptionRendererInterface
         }
 
         $message = $this->_message($exception, $code);
-        $url = $this->controller->request->here();
+        $url = $this->controller->request->getRequestTarget();
 
         if (method_exists($exception, 'responseHeader')) {
             $this->controller->response->header($exception->responseHeader());
@@ -351,9 +351,9 @@ class ExceptionRenderer implements ExceptionRendererInterface
         $helpers = ['Form', 'Html'];
         $this->controller->helpers = $helpers;
         $builder = $this->controller->viewBuilder();
-        $builder->helpers($helpers, false)
-            ->layoutPath('')
-            ->templatePath('Error');
+        $builder->setHelpers($helpers, false)
+            ->setLayout('')
+            ->setTemplatePath('Error');
         $view = $this->controller->createView('View');
 
         $this->controller->response->body($view->render($template, 'error'));
@@ -375,7 +375,7 @@ class ExceptionRenderer implements ExceptionRendererInterface
         $dispatcher = DispatcherFactory::create();
         $eventManager = $dispatcher->eventManager();
         foreach ($dispatcher->filters() as $filter) {
-            $eventManager->attach($filter);
+            $eventManager->on($filter);
         }
         $args = [
             'request' => $this->controller->request,

+ 12 - 12
src/Http/ControllerFactory.php

@@ -35,19 +35,19 @@ class ControllerFactory
     {
         $pluginPath = $controller = null;
         $namespace = 'Controller';
-        if (isset($request->params['plugin'])) {
-            $pluginPath = $request->params['plugin'] . '.';
+        if ($request->getParam('plugin')) {
+            $pluginPath = $request->getParam('plugin') . '.';
         }
-        if (isset($request->params['controller'])) {
-            $controller = $request->params['controller'];
+        if ($request->getParam('controller')) {
+            $controller = $request->getParam('controller');
         }
-        if (isset($request->params['prefix'])) {
-            if (strpos($request->params['prefix'], '/') === false) {
-                $namespace .= '/' . Inflector::camelize($request->params['prefix']);
+        if ($request->getParam('prefix')) {
+            if (strpos($request->getParam('prefix'), '/') === false) {
+                $namespace .= '/' . Inflector::camelize($request->getParam('prefix'));
             } else {
                 $prefixes = array_map(
                     'Cake\Utility\Inflector::camelize',
-                    explode('/', $request->params['prefix'])
+                    explode('/', $request->getParam('prefix'))
                 );
                 $namespace .= '/' . implode('/', $prefixes);
             }
@@ -87,10 +87,10 @@ class ControllerFactory
     protected function missingController($request)
     {
         throw new MissingControllerException([
-            'class' => $request->param('controller'),
-            'plugin' => $request->param('plugin'),
-            'prefix' => $request->param('prefix'),
-            '_ext' => $request->param('_ext')
+            'class' => $request->getParam('controller'),
+            'plugin' => $request->getParam('plugin'),
+            'prefix' => $request->getParam('prefix'),
+            '_ext' => $request->getParam('_ext')
         ]);
     }
 }

+ 1 - 1
src/Routing/Filter/LocaleSelectorFilter.php

@@ -60,7 +60,7 @@ class LocaleSelectorFilter extends DispatcherFilter
     {
         /* @var \Cake\Http\ServerRequest $request */
         $request = $event->data('request');
-        $locale = Locale::acceptFromHttp($request->header('Accept-Language'));
+        $locale = Locale::acceptFromHttp($request->getHeaderLine('Accept-Language'));
 
         if (!$locale || (!empty($this->_locales) && !in_array($locale, $this->_locales))) {
             return;