phpffcms / ffcms

Apps/ActiveRecord/User.php

Doc Comments +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
     /**
      * Get user person like a object via email
      * @param string $email
-     * @return null|static
+     * @return null|ActiveModel
      */
     public static function getIdentityViaEmail($email)
     {
@@ -209,7 +209,7 @@ 
 
     /**
      * Get user logs
-     * @return \Apps\ActiveRecord\UserLog
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function getLogs()
     {

Spacing +10 added lines, -10 removed lines

@@ -35,15 +35,15 @@ 
         }
 
         // convert id to real integer
-        $user_id = (int)$user_id;
+        $user_id = (int) $user_id;
 
         if (!Obj::isInt($user_id) || $user_id < 1) {
             return null;
         }
 
         // check in memory cache object
-        if (MainApp::$Memory->get('user.object.cache.' . $user_id) !== null) {
-            return MainApp::$Memory->get('user.object.cache.' . $user_id);
+        if (MainApp::$Memory->get('user.object.cache.'.$user_id) !== null) {
+            return MainApp::$Memory->get('user.object.cache.'.$user_id);
         }
         // not founded in memory? lets make query
         $user = self::find($user_id);
@@ -53,7 +53,7 @@ 
         }
 
         // store cache and return object
-        MainApp::$Memory->set('user.object.cache.' . $user->id, $user);
+        MainApp::$Memory->set('user.object.cache.'.$user->id, $user);
         return $user;
     }
 
@@ -63,7 +63,7 @@ 
      */
     public function getId()
     {
-        return (int)$this->id;
+        return (int) $this->id;
     }
 
     /**
@@ -84,7 +84,7 @@ 
     public static function isAuth()
     {
         // get data from session
-        $sessionUserId = (int)MainApp::$Session->get('ff_user_id', 0);
+        $sessionUserId = (int) MainApp::$Session->get('ff_user_id', 0);
 
         // check if session contains user id data
         if ($sessionUserId < 1) {
@@ -103,7 +103,7 @@ 
             return false;
         }
 
-        return ((int)$identity->id > 0 && (int)$identity->id === $sessionUserId);
+        return ((int) $identity->id > 0 && (int) $identity->id === $sessionUserId);
     }
 
     /**
@@ -118,12 +118,12 @@ 
         }
 
         // convert id to real integer
-        $id = (int)$id;
+        $id = (int) $id;
 
-        $find = MainApp::$Memory->get('user.counter.cache.' . $id);
+        $find = MainApp::$Memory->get('user.counter.cache.'.$id);
         if ($find === null) {
             $find = self::where('id', '=', $id)->count();
-            MainApp::$Memory->set('user.counter.cache.' . $id, $find);
+            MainApp::$Memory->set('user.counter.cache.'.$id, $find);
         }
 
         return $find === 1;

Apps/Controller/Front/User.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use Ffcms\Core\Exception\NotFoundException;
 use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
-use Apps\ActiveRecord\UserLog;
 
 /**
  * Class User - standard user controller: login/signup/logout/etc

Indentation +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
             App::$Session->getFlashBag()->add('error', __('User is never exist or password is incorrect!'));
             // initialize fail event
             App::$Event->run(static::EVENT_USER_LOGIN_FAIL, [
-               'model' => $loginForm
+                'model' => $loginForm
             ]);
         }
 
@@ -114,14 +114,14 @@ 
             if ($registerForm->tryRegister($configs['registrationType'] === 1)) {
                 // initialize succes signup event
                 App::$Event->run(static::EVENT_USER_REGISTER_SUCCESS, [
-                   'model' => $registerForm
+                    'model' => $registerForm
                 ]);
                 // send notification of successful registering
                 App::$Session->getFlashBag()->add('success', __('Your account is registered. You must confirm account via email'));
             } else {
                 // init fail signup event
                 App::$Event->run(static::EVENT_USER_REGISTER_FAIL, [
-                   'model' => $registerForm
+                    'model' => $registerForm
                 ]);
                 App::$Session->getFlashBag()->add('error', __('Login or email is always used on website'));
             }

Widgets/Front/Contenttag/Contenttag.php

Doc Comments +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     
     /**
      * Make query to database
-     * @return object
+     * @return string
      */
     private function makeQuery()
     {

Indentation +31 added lines, -31 removed lines

@@ -10,18 +10,18 @@ 
 
 class Contenttag extends AbstractWidget
 {
-	use OopTools;
+    use OopTools;
 
-	public $count;
-	public $cache;
+    public $count;
+    public $cache;
 
-	public $tpl = 'widgets/contenttag/default';
+    public $tpl = 'widgets/contenttag/default';
 
-	/**
-	 * Set default configurations if not defined
-	 * {@inheritDoc}
-	 * @see \Ffcms\Core\Arch\Widget::init()
-	 */
+    /**
+     * Set default configurations if not defined
+     * {@inheritDoc}
+     * @see \Ffcms\Core\Arch\Widget::init()
+     */
     public function init()
     {
         $cfg = $this->getConfigs();
@@ -43,29 +43,29 @@ 
     public function display()
     {
         // get special properties hash
-    	$classHash = $this->createStringClassSnapshotHash();
+        $classHash = $this->createStringClassSnapshotHash();
 
-    	// get records rows from cache or directly from db
-    	$records = null;
-    	if ($this->cache === 0) {
-    	    $records = $this->makeQuery();
-    	} else {
-    	    $records === App::$Cache->get('widget.contenttag.' . $classHash);
-    	    if ($records === null) {
-    	        $records = $this->makeQuery();
-    	        App::$Cache->set('widget.contenttag' . $classHash, $records, $this->cache);
-    	    }
-    	}
+        // get records rows from cache or directly from db
+        $records = null;
+        if ($this->cache === 0) {
+            $records = $this->makeQuery();
+        } else {
+            $records === App::$Cache->get('widget.contenttag.' . $classHash);
+            if ($records === null) {
+                $records = $this->makeQuery();
+                App::$Cache->set('widget.contenttag' . $classHash, $records, $this->cache);
+            }
+        }
 
-    	// check if result is not empty
+        // check if result is not empty
         if ($records === null || $records->count() < 1) {
             return __('Content tags is not found');
         }
 
         // render view
-    	return App::$View->render($this->tpl, [
-    	    'records' => $records
-    	]);
+        return App::$View->render($this->tpl, [
+            'records' => $records
+        ]);
     }
 
     /**
@@ -75,11 +75,11 @@ 
     private function makeQuery()
     {
         return TagRecord::select([
-    	    App::$Database->getConnection()->raw('SQL_CALC_FOUND_ROWS tag'),
-    	    App::$Database->getConnection()->raw('COUNT(*) AS count')
-    	])->groupBy('tag')
-        	->orderBy('count', 'DESC')
-        	->take($this->count)
-        	->get();
+            App::$Database->getConnection()->raw('SQL_CALC_FOUND_ROWS tag'),
+            App::$Database->getConnection()->raw('COUNT(*) AS count')
+        ])->groupBy('tag')
+            ->orderBy('count', 'DESC')
+            ->take($this->count)
+            ->get();
     }
 }
\ No newline at end of file

Private/Database/install.php

Spacing +23 added lines, -23 removed lines

@@ -5,28 +5,28 @@
 }
 
 // require all tables
-require_once(root . '/Private/Database/Tables/App.php');
-require_once(root . '/Private/Database/Tables/Blacklist.php');
-require_once(root . '/Private/Database/Tables/CommentAnswer.php');
-require_once(root . '/Private/Database/Tables/CommentPost.php');
-require_once(root . '/Private/Database/Tables/Content.php');
-require_once(root . '/Private/Database/Tables/ContentCategory.php');
-require_once(root . '/Private/Database/Tables/ContentRating.php');
-require_once(root . '/Private/Database/Tables/ContentTag.php');
-require_once(root . '/Private/Database/Tables/FeedbackAnswer.php');
-require_once(root . '/Private/Database/Tables/FeedbackPost.php');
-require_once(root . '/Private/Database/Tables/Invite.php');
-require_once(root . '/Private/Database/Tables/Message.php');
-require_once(root . '/Private/Database/Tables/Profile.php');
-require_once(root . '/Private/Database/Tables/ProfileField.php');
-require_once(root . '/Private/Database/Tables/ProfileRating.php');
-require_once(root . '/Private/Database/Tables/Role.php');
-require_once(root . '/Private/Database/Tables/Session.php');
-require_once(root . '/Private/Database/Tables/User.php');
-require_once(root . '/Private/Database/Tables/UserLog.php');
-require_once(root . '/Private/Database/Tables/UserRecovery.php');
-require_once(root . '/Private/Database/Tables/WallPost.php');
-require_once(root . '/Private/Database/Tables/WallAnswer.php');
+require_once(root.'/Private/Database/Tables/App.php');
+require_once(root.'/Private/Database/Tables/Blacklist.php');
+require_once(root.'/Private/Database/Tables/CommentAnswer.php');
+require_once(root.'/Private/Database/Tables/CommentPost.php');
+require_once(root.'/Private/Database/Tables/Content.php');
+require_once(root.'/Private/Database/Tables/ContentCategory.php');
+require_once(root.'/Private/Database/Tables/ContentRating.php');
+require_once(root.'/Private/Database/Tables/ContentTag.php');
+require_once(root.'/Private/Database/Tables/FeedbackAnswer.php');
+require_once(root.'/Private/Database/Tables/FeedbackPost.php');
+require_once(root.'/Private/Database/Tables/Invite.php');
+require_once(root.'/Private/Database/Tables/Message.php');
+require_once(root.'/Private/Database/Tables/Profile.php');
+require_once(root.'/Private/Database/Tables/ProfileField.php');
+require_once(root.'/Private/Database/Tables/ProfileRating.php');
+require_once(root.'/Private/Database/Tables/Role.php');
+require_once(root.'/Private/Database/Tables/Session.php');
+require_once(root.'/Private/Database/Tables/User.php');
+require_once(root.'/Private/Database/Tables/UserLog.php');
+require_once(root.'/Private/Database/Tables/UserRecovery.php');
+require_once(root.'/Private/Database/Tables/WallPost.php');
+require_once(root.'/Private/Database/Tables/WallAnswer.php');
 
 // insert demo content
-require_once (root . '/Private/Database/Other/DemoContent.php');
\ No newline at end of file
+require_once (root.'/Private/Database/Other/DemoContent.php');
\ No newline at end of file