Replace deprecated methods for 3.6

Docs/Documentation/Extending-the-Plugin.md

@@ -151,7 +151,7 @@ You could use a new Trait. For example, you want to add an 'impersonate' feature
 namespace App\Controller\Traits;
 
 use Cake\Datasource\Exception\RecordNotFoundException;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 
 /**
  * Impersonate Trait

composer.json

@@ -27,7 +27,7 @@
         "source": "https://github.com/CakeDC/users"
     },
     "require": {
-        "cakephp/cakephp": "^3.5.0",
+        "cakephp/cakephp": "dev-3.next",
         "cakedc/auth": "^2.0"
     },
     "require-dev": {

config/bootstrap.php

@@ -22,8 +22,8 @@
     Configure::load($file);
 });
 
-TableRegistry::config('Users', ['className' => Configure::read('Users.table')]);
-TableRegistry::config('CakeDC/Users.Users', ['className' => Configure::read('Users.table')]);
+TableRegistry::getTableLocator()->setConfig('Users', ['className' => Configure::read('Users.table')]);
+TableRegistry::getTableLocator()->setConfig('CakeDC/Users.Users', ['className' => Configure::read('Users.table')]);
 
 if (Configure::check('Users.auth')) {
     Configure::write('Auth.authenticate.all.userModel', Configure::read('Users.table'));

config/permissions.php

@@ -39,7 +39,7 @@
         'action' => ['edit', 'delete'],
         'allowed' => function(array $user, $role, Request $request) {
             $postId = Hash::get($request->params, 'pass.0');
-            $post = TableRegistry::get('Posts')->get($postId);
+            $post = TableRegistry::getTableLocator()->get('Posts')->get($postId);
             $userId = Hash::get($user, 'id');
             if (!empty($post->user_id) && !empty($userId)) {
                 return $post->user_id === $userId;

src/Auth/SocialAuthenticate.php

@@ -268,8 +268,8 @@ protected function _map($data)
      * application.
      *
      * @param \Cake\Http\ServerRequest $request Request object.
-     * @param \Cake\Network\Response $response Response object.
-     * @return \Cake\Network\Response|null
+     * @param \Cake\Http\Response $response Response object.
+     * @return \Cake\Http\Response|null
      */
     public function unauthenticated(ServerRequest $request, Response $response)
     {
@@ -480,7 +480,7 @@ protected function _socialLogin($data)
         ];
 
         $userModel = Configure::read('Users.table');
-        $User = TableRegistry::get($userModel);
+        $User = TableRegistry::getTableLocator()->get($userModel);
         $user = $User->socialLogin($data, $options);
 
         return $user;

src/Controller/Component/RememberMeComponent.php

@@ -105,8 +105,8 @@ public function setLoginCookie(Event $event)
         if (empty($user)) {
             return;
         }
-        $user['user_agent'] = $this->getController()->request->getHeaderLine('User-Agent');
-        if (!(bool)$this->getController()->request->getData(Configure::read('Users.Key.Data.rememberMe'))) {
+        $user['user_agent'] = $this->getController()->getRequest()->getHeaderLine('User-Agent');
+        if (!(bool)$this->getController()->getRequest()->getData(Configure::read('Users.Key.Data.rememberMe'))) {
              return;
         }
         $this->Cookie->write($this->_cookieName, $user);
@@ -135,10 +135,10 @@ public function beforeFilter(Event $event)
     {
         $user = $this->Auth->user();
         if (!empty($user) ||
-            $this->getController()->request->is(['post', 'put']) ||
-            $this->getController()->request->getParam('action') === 'logout' ||
-            $this->getController()->request->getSession()->check(Configure::read('Users.Key.Session.social')) ||
-            $this->getController()->request->getParam('provider')) {
+            $this->getController()->getRequest()->is(['post', 'put']) ||
+            $this->getController()->getRequest()->getParam('action') === 'logout' ||
+            $this->getController()->getRequest()->getSession()->check(Configure::read('Users.Key.Session.social')) ||
+            $this->getController()->getRequest()->getParam('provider')) {
             return;
         }
 
@@ -152,7 +152,7 @@ public function beforeFilter(Event $event)
         if (is_array($event->result)) {
             return $this->getController()->redirect($event->result);
         }
-        $url = $this->getController()->request->getRequestTarget();
+        $url = $this->getController()->getRequest()->getRequestTarget();
 
         return $this->getController()->redirect($url);
     }

src/Controller/Component/UsersAuthComponent.php

@@ -116,8 +116,8 @@ protected function _initAuth()
         }
 
         list($plugin, $controller) = pluginSplit(Configure::read('Users.controller'));
-        if ($this->getController()->request->getParam('plugin', null) === $plugin &&
-            $this->getController()->request->getParam('controller') === $controller
+        if ($this->getController()->getRequest()->getParam('plugin', null) === $plugin &&
+            $this->getController()->getRequest()->getParam('controller') === $controller
         ) {
             $this->getController()->Auth->allow([
                 // LoginTrait
@@ -150,7 +150,7 @@ protected function _initAuth()
      */
     public function isUrlAuthorized(Event $event)
     {
-        $url = Hash::get((array)$event->data, 'url');
+        $url = Hash::get((array)$event->getData(), 'url');
         if (empty($url)) {
             return false;
         }
@@ -185,7 +185,7 @@ public function isUrlAuthorized(Event $event)
         }
 
         $request = new ServerRequest($requestUrl);
-        $request = $request->addParams($requestParams);
+        $request = $request->withAttribute('params', $requestParams);
 
         $isAuthorized = $this->getController()->Auth->isAuthorized(null, $request);
 
@@ -220,7 +220,7 @@ protected function _isActionAllowed($requestParams = [])
         if (empty($requestParams['action'])) {
             return false;
         }
-        if (!empty($requestParams['controller']) && $requestParams['controller'] !== $this->getController()->name) {
+        if (!empty($requestParams['controller']) && $requestParams['controller'] !== $this->getController()->getName()) {
             return false;
         }
         $action = strtolower($requestParams['action']);

src/Controller/SocialAccountsController.php

@@ -15,7 +15,7 @@
 use CakeDC\Users\Exception\AccountAlreadyActiveException;
 use CakeDC\Users\Model\Table\SocialAccountsTable;
 use Cake\Datasource\Exception\RecordNotFoundException;
-use Cake\Network\Response;
+use Cake\Http\Response;
 
 /**
  * SocialAccounts Controller

src/Controller/Traits/CustomUsersTableTrait.php

@@ -33,7 +33,7 @@ public function getUsersTable()
         if ($this->_usersTable instanceof Table) {
             return $this->_usersTable;
         }
-        $this->_usersTable = TableRegistry::get(Configure::read('Users.table'));
+        $this->_usersTable = TableRegistry::getTableLocator()->get(Configure::read('Users.table'));
 
         return $this->_usersTable;
     }

src/Controller/Traits/LinkSocialTrait.php

@@ -13,7 +13,7 @@
 
 use CakeDC\Users\Model\Table\SocialAccountsTable;
 use Cake\Core\Configure;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 use League\OAuth1\Client\Server\Twitter;
 
 /**
@@ -27,8 +27,8 @@ trait LinkSocialTrait
      *
      * @param string $alias of the provider.
      *
-     * @throws \Cake\Network\Exception\NotFoundException Quando o provider informado não existe
-     * @return  \Cake\Network\Response Redirects on successful
+     * @throws \Cake\Http\Exception\NotFoundException Quando o provider informado não existe
+     * @return  \Cake\Http\Response Redirects on successful
      */
     public function linkSocial($alias = null)
     {
@@ -52,8 +52,8 @@ public function linkSocial($alias = null)
      *
      * @param string $alias of the provider.
      *
-     * @throws \Cake\Network\Exception\NotFoundException Quando o provider informado não existe
-     * @return  \Cake\Network\Response Redirects to profile if okay or error
+     * @throws \Cake\Http\Exception\NotFoundException Quando o provider informado não existe
+     * @return  \Cake\Http\Response Redirects to profile if okay or error
      */
     public function callbackLinkSocial($alias = null)
     {
@@ -117,7 +117,7 @@ public function callbackLinkSocial($alias = null)
 
             $this->getUsersTable()->linkSocialAccount($user, $data);
 
-            if ($user->errors()) {
+            if ($user->getErrors()) {
                 $this->Flash->error($message);
             } else {
                 $this->Flash->success(__d('CakeDC/Users', 'Social account was associated.'));
@@ -161,7 +161,7 @@ protected function _mapSocialUser($alias, $data)
      *
      * @param string $alias of the provider.
      *
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      * @return \League\OAuth2\Client\Provider\AbstractProvider|\League\OAuth1\Client\Server\Twitter
      */
     protected function _getSocialProvider($alias)
@@ -184,7 +184,7 @@ protected function _getSocialProvider($alias)
      * @param array $config for social provider.
      * @param string $alias provider alias
      *
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      * @return \League\OAuth2\Client\Provider\AbstractProvider|\League\OAuth1\Client\Server\Twitter
      */
     protected function _createSocialProvider($config, $alias = null)

src/Controller/Traits/LoginTrait.php

@@ -19,7 +19,7 @@
 use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
 use Cake\Event\Event;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 use Cake\Utility\Hash;
 use League\OAuth1\Client\Server\Twitter;
 

src/Controller/Traits/PasswordManagementTrait.php

@@ -47,12 +47,12 @@ public function changePassword()
             $validatePassword = false;
             if (!$user->id) {
                 $this->Flash->error(__d('CakeDC/Users', 'User was not found'));
-                $this->redirect($this->Auth->config('loginAction'));
+                $this->redirect($this->Auth->getConfig('loginAction'));
 
                 return;
             }
             //@todo add to the documentation: list of routes used
-            $redirect = $this->Auth->config('loginAction');
+            $redirect = $this->Auth->getConfig('loginAction');
         }
         $this->set('validatePassword', $validatePassword);
         if ($this->request->is('post')) {
@@ -66,7 +66,7 @@ public function changePassword()
                     $this->request->getData(),
                     ['validate' => $validator]
                 );
-                if ($user->errors()) {
+                if ($user->getErrors()) {
                     $this->Flash->error(__d('CakeDC/Users', 'Password could not be changed'));
                 } else {
                     $user = $this->getUsersTable()->changePassword($user);
@@ -105,7 +105,7 @@ public function resetPassword($token = null)
     /**
      * Reset password
      *
-     * @return void|\Cake\Network\Response
+     * @return void|\Cake\Http\Response
      */
     public function requestResetPassword()
     {

src/Controller/Traits/RegisterTrait.php

@@ -14,8 +14,8 @@
 use CakeDC\Users\Controller\Component\UsersAuthComponent;
 use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
-use Cake\Network\Exception\NotFoundException;
-use Cake\Network\Response;
+use Cake\Http\Exception\NotFoundException;
+use Cake\Http\Response;
 
 /**
  * Covers registration features and email token validation

src/Controller/Traits/SimpleCrudTrait.php

@@ -11,8 +11,8 @@
 
 namespace CakeDC\Users\Controller\Traits;
 
-use Cake\Network\Exception\NotFoundException;
-use Cake\Network\Response;
+use Cake\Http\Exception\NotFoundException;
+use Cake\Http\Response;
 use Cake\Utility\Inflector;
 
 /**
@@ -30,7 +30,7 @@ trait SimpleCrudTrait
     public function index()
     {
         $table = $this->loadModel();
-        $tableAlias = $table->alias();
+        $tableAlias = $table->getAlias();
         $this->set($tableAlias, $this->paginate($table));
         $this->set('tableAlias', $tableAlias);
         $this->set('_serialize', [$tableAlias, 'tableAlias']);
@@ -46,7 +46,7 @@ public function index()
     public function view($id = null)
     {
         $table = $this->loadModel();
-        $tableAlias = $table->alias();
+        $tableAlias = $table->getAlias();
         $entity = $table->get($id, [
             'contain' => []
         ]);
@@ -63,7 +63,7 @@ public function view($id = null)
     public function add()
     {
         $table = $this->loadModel();
-        $tableAlias = $table->alias();
+        $tableAlias = $table->getAlias();
         $entity = $table->newEntity();
         $this->set($tableAlias, $entity);
         $this->set('tableAlias', $tableAlias);
@@ -91,7 +91,7 @@ public function add()
     public function edit($id = null)
     {
         $table = $this->loadModel();
-        $tableAlias = $table->alias();
+        $tableAlias = $table->getAlias();
         $entity = $table->get($id, [
             'contain' => []
         ]);
@@ -122,7 +122,7 @@ public function delete($id = null)
     {
         $this->request->allowMethod(['post', 'delete']);
         $table = $this->loadModel();
-        $tableAlias = $table->alias();
+        $tableAlias = $table->getAlias();
         $entity = $table->get($id, [
             'contain' => []
         ]);

src/Controller/Traits/SocialTrait.php

@@ -12,7 +12,7 @@
 namespace CakeDC\Users\Controller\Traits;
 
 use Cake\Core\Configure;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 
 /**
  * Covers registration features and email token validation

src/Controller/Traits/UserValidationTrait.php

@@ -15,7 +15,7 @@
 use CakeDC\Users\Exception\UserAlreadyActiveException;
 use CakeDC\Users\Exception\UserNotFoundException;
 use Cake\Core\Configure;
-use Cake\Network\Response;
+use Cake\Http\Response;
 use Exception;
 
 /**

src/Mailer/UsersMailer.php

@@ -11,7 +11,6 @@
 namespace CakeDC\Users\Mailer;
 
 use Cake\Datasource\EntityInterface;
-use Cake\Mailer\Email;
 use Cake\Mailer\Mailer;
 
 /**
@@ -33,10 +32,10 @@ protected function validation(EntityInterface $user)
         $user->setHidden(['password', 'token_expires', 'api_token']);
         $subject = __d('CakeDC/Users', 'Your account validation link');
         $this
-            ->to($user['email'])
-            ->setSubject($firstName . $subject)
-            ->setViewVars($user->toArray())
-            ->setTemplate('CakeDC/Users.validation');
+            ->setTo($user['email'])
+             ->setSubject($firstName . $subject)
+             ->setViewVars($user->toArray())
+             ->setTemplate('CakeDC/Users.validation');
     }
 
     /**
@@ -54,7 +53,7 @@ protected function resetPassword(EntityInterface $user)
         $user->setHidden(['password', 'token_expires', 'api_token']);
 
         $this
-            ->to($user['email'])
+            ->setTo($user['email'])
             ->setSubject($subject)
             ->setViewVars($user->toArray())
             ->setTemplate('CakeDC/Users.resetPassword');
@@ -74,7 +73,7 @@ protected function socialAccountValidation(EntityInterface $user, EntityInterfac
         // note: we control the space after the username in the previous line
         $subject = __d('CakeDC/Users', '{0}Your social account validation link', $firstName);
         $this
-            ->to($user['email'])
+            ->setTo($user['email'])
             ->setSubject($subject)
             ->setViewVars(compact('user', 'socialAccount'))
             ->setTemplate('CakeDC/Users.socialAccountValidation');