phpffcms / ffcms

Apps/ActiveRecord/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
     /**
      * Get user person like a object via email
      * @param string|null $email
-     * @return null|self
+     * @return null|ActiveModel
      */
     public static function getIdentityViaEmail(?string $email = null)
     {

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ffcms\Core\App as MainApp;
 use Ffcms\Core\Arch\ActiveModel;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Interfaces\iUser;
 

Spacing +9 added lines, -9 removed lines

@@ -50,13 +50,13 @@ 
         }
 
         // check if id is looks like integer
-        if (!Any::isInt($id) || (int)$id < 1) {
+        if (!Any::isInt($id) || (int) $id < 1) {
             return null;
         }
 
         // check in memory cache object
-        if (MainApp::$Memory->get('user.object.cache.' . $id) !== null) {
-            return MainApp::$Memory->get('user.object.cache.' . $id);
+        if (MainApp::$Memory->get('user.object.cache.'.$id) !== null) {
+            return MainApp::$Memory->get('user.object.cache.'.$id);
         }
 
         // not founded in memory? lets make query
@@ -64,7 +64,7 @@ 
             ->find($id);
 
         // 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;
     }
 
@@ -74,7 +74,7 @@ 
      */
     public function getId(): ?int
     {
-        return (int)$this->id;
+        return (int) $this->id;
     }
 
     /**
@@ -95,7 +95,7 @@ 
     public static function isAuth(): bool
     {
         // 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) {
@@ -128,10 +128,10 @@ 
             return false;
         }
 
-        $find = MainApp::$Memory->get('user.counter.cache.' . $id);
+        $find = MainApp::$Memory->get('user.counter.cache.'.$id);
         if (!$find) {
             $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;
@@ -231,7 +231,7 @@ 
      */
     public function inBlacklist(?string $target = null): bool
     {
-        if ($target === null || (int)$target < 1) {
+        if ($target === null || (int) $target < 1) {
             return false;
         }
 

Apps/Console/MigrationCreateCommand.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 
 use Ffcms\Console\Command;
 use Ffcms\Core\Helper\FileSystem\File;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

Spacing +2 added lines, -2 removed lines

@@ -58,9 +58,9 @@
         // work with migration template: read & parse & save
         $tpl = File::read('/Private/Carcase/Migration.tphp');
         $classContent = Str::replace(['%class%', '%table%'], [$name, $table], $tpl);
-        $fullPath = $dir . $name . '-' . $suffix . '.php';
+        $fullPath = $dir.$name.'-'.$suffix.'.php';
         File::write($fullPath, $classContent);
         // show success msg
-        $output->write('New migration is created: ' . $fullPath);
+        $output->write('New migration is created: '.$fullPath);
     }
 }
\ No newline at end of file

Apps/Console/MigrationDownCommand.php

Unused Use Statements -3 removed lines

@@ -5,10 +5,7 @@
 
 use Apps\ActiveRecord\Migration;
 use Ffcms\Console\Command;
-use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
-use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Managers\MigrationsManager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         // list found migrations and ask to revert each one
         $fired = false;
         foreach ($search as $migration) {
-            if (!$this->confirm('Are you sure to revert: ' . $migration)) {
+            if (!$this->confirm('Are you sure to revert: '.$migration)) {
                 continue;
             }
             // run down migration

Apps/Console/MigrationUpCommand.php

Unused Use Statements -5 removed lines

@@ -3,13 +3,8 @@
 namespace Apps\Console;
 
 
-use Apps\ActiveRecord\Migration;
 use Ffcms\Console\Command;
-use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
-use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Managers\MigrationsManager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

Spacing +2 added lines, -2 removed lines

@@ -51,11 +51,11 @@
         // require confirmation from user each ever migration file
         $fired = false;
         foreach ($search as $migration) {
-            if (!$this->confirm('Are you sure to apply migration: ' . $migration, true)) {
+            if (!$this->confirm('Are you sure to apply migration: '.$migration, true)) {
                 continue;
             }
             $manager->makeUp($migration);
-            $fired =  true;
+            $fired = true;
         }
 
         if ($fired) {

Apps/Model/Admin/Content/FormContentUpdate.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Ffcms\Core\Helper\FileSystem\Directory;
 use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -59,7 +59,7 @@ 
         if ($this->_content->id === null) {
             $this->_new = true;
             if (!$this->galleryFreeId) {
-                $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32));
+                $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32));
             }
 
             if (!$this->authorId) {
@@ -94,8 +94,8 @@ 
     public function rules(): array
     {
         $res = [
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required'],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required'],
             ['text', 'used'],
             ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'],
             [['path', 'categoryId', 'authorId', 'display', 'galleryFreeId', 'title', 'important'], 'required'],
@@ -108,9 +108,9 @@ 
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $res[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $res[] = ['keywords.' . $lang, 'length_max', 150];
-            $res[] = ['description.' . $lang, 'length_max', 250];
+            $res[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $res[] = ['keywords.'.$lang, 'length_max', 150];
+            $res[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $res;
@@ -166,10 +166,10 @@ 
         $this->_content->meta_keywords = $this->metaKeywords;
         $this->_content->meta_description = $this->metaDescription;
         $this->_content->source = $this->source;
-        $this->_content->important = (int)$this->important;
+        $this->_content->important = (int) $this->important;
         // check if rating is changed
-        if ((int)$this->addRating !== 0) {
-            $this->_content->rating += (int)$this->addRating;
+        if ((int) $this->addRating !== 0) {
+            $this->_content->rating += (int) $this->addRating;
         }
         // check if special comment hash is exist
         if ($this->_new || Str::length($this->_content->comment_hash) < 32) {
@@ -182,7 +182,7 @@ 
         }
 
         // save poster data
-        $posterPath = '/upload/gallery/' . $this->galleryFreeId . '/orig/' . $this->poster;
+        $posterPath = '/upload/gallery/'.$this->galleryFreeId.'/orig/'.$this->poster;
         if (File::exist($posterPath)) {
             $this->_content->poster = $this->poster;
         }
@@ -217,7 +217,7 @@ 
 
         // move files
         if ($tmpGalleryId !== $this->_content->id) {
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
         }
     }
 

Apps/Model/Admin/Main/FormUpdateDatabase.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Apps\ActiveRecord\System;
 use Ffcms\Core\Arch\Model;
-use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Managers\MigrationsManager;
 

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
             $name = Str::firstIn($fullName, '-');
             // get update version number from migration name
             list($type, $obj, $version) = explode('_', $name);
-            $intVersion = (int)Str::replace('.', '', $this->dbVersion);
+            $intVersion = (int) Str::replace('.', '', $this->dbVersion);
             // if migration version > db version - implement it
             if ($version > $intVersion) {
                 $this->updateQueries[] = $file;

Apps/Model/Admin/User/FormUserUpdate.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Interfaces\iUser;
 

Apps/Model/Front/Content/EntityContentSearch.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     /**
      * EntityContentSearch constructor. Pass search terms (query string) to model and used items to skip it by id.
      * @param $terms
-     * @param int|array $skipIds
+     * @param integer $skipIds
      * @param int|null $categoryId
      */
     public function __construct($terms, $skipIds = 0, $categoryId = null)

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\Exception\NotFoundException;
 use Ffcms\Core\Helper\Text;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 
         $index = implode('-', $this->_skip);
         // try to get this slow query from cache
-        $cache = App::$Cache->getItem('entity.content.search.index.' . $index);
+        $cache = App::$Cache->getItem('entity.content.search.index.'.$index);
         if (!$cache->isHit()) {
             $cache->set($this->makeSearch());
             $cache->expiresAfter(static::CACHE_TIME);
@@ -94,7 +94,7 @@ 
             $this->items[] = [
                 'title' => $item->getLocaled('title'),
                 'snippet' => Text::snippet($text),
-                'uri' => '/content/read/' . $item->getPath(),
+                'uri' => '/content/read/'.$item->getPath(),
                 'thumb' => $item->getPosterThumbUri()
             ];
         }

Apps/Model/Front/Content/FormNarrowContentUpdate.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Ffcms\Core\Helper\FileSystem\Directory;
 use Ffcms\Core\Helper\FileSystem\Normalize;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Gregwar\Image\Image;
 

Indentation +8 added lines, -8 removed lines

@@ -44,8 +44,8 @@ 
     }
 
     /**
-    * Set default values from database record
-    */
+     * Set default values from database record
+     */
     public function before()
     {
         // set data from db record
@@ -85,9 +85,9 @@ 
     }
 
     /**
-    * Form labels
-    * @return array
-    */
+     * Form labels
+     * @return array
+     */
     public function labels(): array
     {
         return [
@@ -100,9 +100,9 @@ 
     }
 
     /**
-    * Content update form validation rules
-    * @return array
-    */
+     * Content update form validation rules
+     * @return array
+     */
     public function rules(): array
     {
         $r = [

Spacing +17 added lines, -17 removed lines

@@ -57,13 +57,13 @@ 
         // set current user id
         $this->authorId = App::$User->identity()->getId();
         // set true if it is a new content item
-        if ($this->_record->id === null || (int)$this->_record->id < 1) {
+        if ($this->_record->id === null || (int) $this->_record->id < 1) {
             $this->_new = true;
         }
 
         // set random path slug if not defined
         if ($this->path === null || Str::likeEmpty($this->path)) {
-            $randPath = date('d-m-Y') . '-' . Str::randomLatin(mt_rand(8, 12));
+            $randPath = date('d-m-Y').'-'.Str::randomLatin(mt_rand(8, 12));
             $this->path = Str::lowerCase($randPath);
         }
     }
@@ -107,21 +107,21 @@ 
     {
         $r = [
             [['path', 'categoryId'], 'required'],
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required', null, true, true],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required', null, true, true],
             ['text', 'used', null, true, true],
             ['path', 'direct_match', '/^[a-zA-Z0-9\-]+$/'],
             ['categoryId', 'in', $this->categoryIds()],
             ['path', 'Apps\Model\Front\Content\FormNarrowContentUpdate::validatePath'],
             ['poster', 'used'],
             ['poster', 'isFile', ['jpg', 'png', 'gif', 'jpeg']],
-            ['poster', 'sizeFile', (int)$this->_configs['gallerySize'] * 1024] // in bytes
+            ['poster', 'sizeFile', (int) $this->_configs['gallerySize'] * 1024] // in bytes
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $r[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $r[] = ['keywords.' . $lang, 'length_max', 150];
-            $r[] = ['description.' . $lang, 'length_max', 250];
+            $r[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $r[] = ['keywords.'.$lang, 'length_max', 150];
+            $r[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $r;
@@ -147,9 +147,9 @@ 
         $this->_record->title = $this->title;
         $this->_record->text = $this->text;
         $this->_record->path = $this->path;
-        $this->_record->category_id = (int)$this->categoryId;
+        $this->_record->category_id = (int) $this->categoryId;
         $this->_record->display = 0; // set to premoderation
-        $this->_record->author_id = (int)$this->authorId;
+        $this->_record->author_id = (int) $this->authorId;
         if ($this->_new) {
             $this->_record->comment_hash = $this->generateCommentHash();
         }
@@ -159,8 +159,8 @@ 
         // work with poster data
         if ($this->poster !== null) {
             // lets move poster from tmp to gallery
-            $originDir = '/upload/gallery/' . $this->_record->id . '/orig/';
-            $thumbDir = '/upload/gallery/' . $this->_record->id . '/thumb/';
+            $originDir = '/upload/gallery/'.$this->_record->id.'/orig/';
+            $thumbDir = '/upload/gallery/'.$this->_record->id.'/thumb/';
             if (!Directory::exist($originDir)) {
                 Directory::create($originDir);
             }
@@ -169,17 +169,17 @@ 
                 Directory::create($thumbDir);
             }
 
-            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName() . $this->poster->getSize());
-            $newFullName = $fileName . '.' . $this->poster->guessExtension();
+            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName().$this->poster->getSize());
+            $newFullName = $fileName.'.'.$this->poster->guessExtension();
             // move poster to upload gallery directory
             $this->poster->move(Normalize::diskFullPath($originDir), $newFullName);
             // initialize image resizer
             $thumb = new Image();
-            $thumb->setCacheDir(root . '/Private/Cache/images');
+            $thumb->setCacheDir(root.'/Private/Cache/images');
 
             // open original file, resize it and save
-            $thumbSaveName = Normalize::diskFullPath($thumbDir) . '/' . $fileName . '.jpg';
-            $thumb->open(Normalize::diskFullPath($originDir) . DIRECTORY_SEPARATOR . $newFullName)
+            $thumbSaveName = Normalize::diskFullPath($thumbDir).'/'.$fileName.'.jpg';
+            $thumb->open(Normalize::diskFullPath($originDir).DIRECTORY_SEPARATOR.$newFullName)
                 ->cropResize($this->_configs['galleryResize'])
                 ->save($thumbSaveName, 'jpg', 90);
             $thumb = null;