Support CakePHP 3.6

src/Controller/Admin/GroupsController.php

@@ -40,6 +40,7 @@ class GroupsController extends AppController
      * @return  mixed
      *
      * @throws  RolledbackTransactionException
+     * @throws  \Aura\Intl\Exception
      */
     public function add()
     {
@@ -82,6 +83,7 @@ public function down($id)
      * @throws  RecordNotFoundException
      * @throws  InvalidPrimaryKeyException
      * @throws  RolledbackTransactionException
+     * @throws  \Aura\Intl\Exception
      */
     public function edit($id)
     {
@@ -108,6 +110,8 @@ public function edit($id)
      * Index action.
      *
      * @return  void
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function index()
     {
@@ -120,6 +124,8 @@ public function index()
      *
      * @return  void
      *
+     * @throws  \Aura\Intl\Exception
+     * @throws  \JBZoo\Utils\Exception
      * @throws  \Cake\Core\Exception\Exception When trying to set a key that is invalid.
      */
     public function initialize()
@@ -136,6 +142,8 @@ public function initialize()
      * Process action.
      *
      * @return  \Cake\Http\Response|null
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function process()
     {

src/Controller/Admin/UsersController.php

@@ -40,6 +40,7 @@ class UsersController extends AppController
      *
      * @return  \Cake\Http\Response|null
      *
+     * @throws  \Aura\Intl\Exception
      * @throws  \Cake\ORM\Exception\RolledbackTransactionException
      */
     public function add()
@@ -76,6 +77,8 @@ public function add()
      *
      * @param   null|int $id User id.
      * @return  \Cake\Http\Response|null
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function changePassword($id = null)
     {
@@ -103,6 +106,7 @@ public function changePassword($id = null)
      * @param   null|int $id User id.
      * @return  \Cake\Http\Response|null
      *
+     * @throws  \Aura\Intl\Exception
      * @throws  RecordNotFoundException
      * @throws  InvalidPrimaryKeyException
      * @throws  RolledbackTransactionException
@@ -138,6 +142,7 @@ public function edit($id = null)
      *
      * @return  void
      *
+     * @throws  \Aura\Intl\Exception
      * @throws  \RuntimeException
      */
     public function index()
@@ -169,6 +174,8 @@ public function initialize()
      * Login action.
      *
      * @return  \Cake\Http\Response|null
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function login()
     {
@@ -200,6 +207,8 @@ public function logout()
      * Process action.
      *
      * @return  \Cake\Http\Response|null
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function process()
     {

src/Controller/Component/AuthComponent.php

@@ -52,18 +52,20 @@ protected function _getLoginRedirect()
      * Sets defaults for configs.
      *
      * @return  void
+     *
+     * @throws  \Aura\Intl\Exception
      */
     protected function _setDefaults()
     {
         $defaults = [
             'authenticate' => [
                 'Form' => [
-                    'userModel' => 'Users',
-                    'scope'     => ['Users.status' => 1],
+                    'finder'    => 'auth',
+                    'userModel' => 'Community.Users',
                     'fields'    => [
                         'username' => 'login',
                         'password' => 'password'
-                    ]
+                    ],
                 ]
             ],
             'flash' => [

src/Controller/Component/UserComponent.php

@@ -42,7 +42,9 @@ public function implementedEvents()
     /**
      * Startup callback.
      *
-     * @param Event $event
+     * @param   Event $event
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function startup(Event $event)
     {
@@ -55,7 +57,9 @@ public function startup(Event $event)
     /**
      * Setup profile nav bar for admin.
      *
-     * @return void
+     * @return  void
+     *
+     * @throws  \Aura\Intl\Exception
      */
     protected function _setupAdminProfileNavBar()
     {

src/Controller/UsersController.php

@@ -18,7 +18,6 @@
 use Core\Event\EventManager;
 use Community\Model\Entity\User;
 use Community\Model\Table\UsersTable;
-use Cake\Network\Exception\BadRequestException;
 
 /**
  * Class UsersController
@@ -32,7 +31,9 @@ class UsersController extends AppController
     /**
      * Default profile page action.
      *
-     * @return void
+     * @return  void
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function profile()
     {
@@ -53,13 +54,16 @@ public function profile()
      * @param   null|int $id            User id.
      * @param   null|string $token      User activation token.
      * @return  \Cake\Http\Response|null
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function activate($id = null, $token = null)
     {
         $user = $this->_getUser($id, $token);
 
         if ($user === null) {
-            throw new BadRequestException(__d('community', 'User was not found'));
+            $this->Flash->error(__d('community', 'User was not found'));
+            return $this->redirect(['action' => 'login']);
         }
 
         if ($user->status) {
@@ -97,6 +101,8 @@ public function activate($id = null, $token = null)
      * Login action.
      *
      * @return  \Cake\Http\Response|null
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function login()
     {
@@ -129,13 +135,16 @@ public function logout()
      * @param   null|int $id        User id.
      * @param   null|string $token  User activation token.
      * @return  \Cake\Http\Response|null
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function setupPassword($id = null, $token = null)
     {
         $user = $this->_getUser($id, $token);
 
         if ($user === null) {
-            throw new BadRequestException(__d('community', 'User was not found'));
+            $this->Flash->error(__d('community', 'User was not found'));
+            return $this->redirect(['action' => 'login']);
         }
 
         if ($this->request->is(['patch', 'post', 'put'])) {

src/Model/Entity/Group.php

@@ -20,14 +20,14 @@
 /**
  * Class Group
  *
- * @package Community\Model\Entity
+ * @package     Community\Model\Entity
  *
- * @property int $id
- * @property null|int $parent_id
- * @property string $name
- * @property string $slug
- * @property int $lft
- * @property int $rght
+ * @property    int $id
+ * @property    null|int $parent_id
+ * @property    string $name
+ * @property    string $slug
+ * @property    int $lft
+ * @property    int $rght
  */
 class Group extends Entity
 {

src/Model/Entity/User.php

@@ -23,23 +23,23 @@
 /**
  * Class User
  *
- * @package Community\Model\Entity
+ * @package     Community\Model\Entity
  *
- * @property int        $id
- * @property int        $group_id
- * @property Group      $group
- * @property string     $login
- * @property string     $name
- * @property string     $slug
- * @property string     $email
- * @property string     $password
- * @property string     $token
- * @property bool       $status
- * @property FrozenTime $last_login
- * @property FrozenTime $last_action
- * @property FrozenTime $modified
- * @property FrozenTime $created
- * @property string     activation_url  Virtual field.
+ * @property    int        $id
+ * @property    int        $group_id
+ * @property    Group      $group
+ * @property    string     $login
+ * @property    string     $name
+ * @property    string     $slug
+ * @property    string     $email
+ * @property    string     $password
+ * @property    string     $token
+ * @property    bool       $status
+ * @property    FrozenTime $last_login
+ * @property    FrozenTime $last_action
+ * @property    FrozenTime $modified
+ * @property    FrozenTime $created
+ * @property    string     activation_url  Virtual field.
  */
 class User extends Entity
 {

src/Model/Table/GroupsTable.php

@@ -82,6 +82,8 @@ public function initialize(array $config)
      *
      * @param   Validator $validator The validator that can be modified to add some rules to it.
      * @return  Validator
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function validationDefault(Validator $validator)
     {
@@ -100,7 +102,7 @@ public function validationDefault(Validator $validator)
             ->add('slug', 'unique', [
                 'message'  => __d('community', 'Group with this slug already exists.'),
                 'rule'     => 'validateUnique',
-                'provider' => 'table',
+                'provider' => 'table'
             ]);
 
         return $validator;

src/Model/Table/UsersTable.php

@@ -15,6 +15,7 @@
 
 namespace Community\Model\Table;
 
+use Cake\ORM\Query;
 use Core\ORM\Table;
 use Core\Event\EventManager;
 use Cake\Validation\Validator;
@@ -93,6 +94,8 @@ public function save(EntityInterface $entity, $options = [])
      *
      * @param   Validator $validator The validator that can be modified to add some rules to it.
      * @return  Validator
+     *
+     * @throws  \Aura\Intl\Exception
      */
     public function validationDefault(Validator $validator)
     {
@@ -155,4 +158,17 @@ public function validationDefault(Validator $validator)
 
         return $validator;
     }
+
+    /**
+     * Find auth user.
+     *
+     * @param   Query $query
+     * @param   array $options
+     *
+     * @return  \Cake\ORM\Query
+     */
+    public function findAuth(Query $query, array $options)
+    {
+        return $query->where(['Users.status' => 1]);
+    }
 }

tests/App/config/bootstrap.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * CakeCMS Community
+ *
+ * This file is part of the of the simple cms based on CakePHP 3.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package     Community
+ * @license     MIT
+ * @copyright   MIT License http://www.opensource.org/licenses/mit-license.php
+ * @link        https://github.com/CakeCMS/Community".
+ * @author      Sergey Kalistratov <kalistratov.s.m@gmail.com>
+ */

tests/App/src/Application.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * CakeCMS Community
+ *
+ * This file is part of the of the simple cms based on CakePHP 3.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package     Community
+ * @license     MIT
+ * @copyright   MIT License http://www.opensource.org/licenses/mit-license.php
+ * @link        https://github.com/CakeCMS/Community".
+ * @author      Sergey Kalistratov <kalistratov.s.m@gmail.com>
+ */
+
+namespace Test\App;
+
+use Core\Application as CoreApplication;
+
+/**
+ * Class Application
+ *
+ * @package Test\App
+ */
+class Application extends CoreApplication
+{
+}