afshinpersian / afshlim_framework

core/ModuleInitializer.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      */
     protected $moduleInstances = [];
 
-    public function __construct($app, $modules=array())
+    public function __construct($app, $modules = array())
     {
         $this->app = $app;
         // build an class map of [[module => moduleClassPath], ..]
@@ -92,7 +92,7 @@ 
         }
 
         $allSettings['modules'] = array_merge_recursive($allSettings['modules'], $this->getModuleConfig());
-        $container['settings']->__construct( $allSettings );
+        $container['settings']->__construct($allSettings);
     }
 
     /**

core/Config.php

Spacing +4 added lines, -4 removed lines

@@ -10,11 +10,11 @@
 
 class Config {
 
-    public static function get($key,$default = null){
-        $path = __APP_ROOT__ . '/config/'.$key[0].'.php';
+    public static function get($key, $default = null) {
+        $path = __APP_ROOT__ . '/config/' . $key[0] . '.php';
         $result = include_once $path;
-        foreach (explode('.' , $key) as $segment) {
-            if(isset($result[$segment]))
+        foreach (explode('.', $key) as $segment) {
+            if (isset($result[$segment]))
                 $result = $result[$segment];
             else
                 $result = $default;

Braces +5 added lines, -4 removed lines

@@ -14,10 +14,11 @@
         $path = __APP_ROOT__ . '/config/'.$key[0].'.php';
         $result = include_once $path;
         foreach (explode('.' , $key) as $segment) {
-            if(isset($result[$segment]))
-                $result = $result[$segment];
-            else
-                $result = $default;
+            if(isset($result[$segment])) {
+                            $result = $result[$segment];
+            } else {
+                            $result = $default;
+            }
         }
         return $result;
     }

database/migrations/20171228211415_Add_Has_Pic_To_Users_Table_Migration.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     {
         Capsule::schema()->table('users', function($table)
         {
-            $table->enum('has_pic',['no','yes'])->default('no');
+            $table->enum('has_pic', ['no', 'yes'])->default('no');
         });
     }
 

core/Facades/Image.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
     /**
      * @param Core\Services\AuthService\AuthService
      * @return AuthService
-    */
+     */
     protected static function getFacadeAccessor()
     {
         return 'ImageService';

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Core\Facades;
 
-use Core\Services\ImageService  ;
+use Core\Services\ImageService;
 use SlimFacades\Facade;
 class Image extends Facade
 {

core/Facades/File.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     /**
      * @param Core\Services\AuthService\AuthService
      * @return AuthService
-    */
+     */
     protected static function getFacadeAccessor()
     {
         return 'FileService';

core/Services/FileService.php

Indentation +12 added lines, -12 removed lines

@@ -6,17 +6,17 @@
 
 class FileService extends _Service
 {
-	public function moveUploadedFile($directory,$fileName, UploadedFile $uploadedFile)
-	{
-	    $extension = pathinfo($uploadedFile->getClientFilename(), PATHINFO_EXTENSION);
-	    $basename = bin2hex(random_bytes(8)); // see http://php.net/manual/en/function.random-bytes.php
-	    $filename = sprintf('%s.%0.8s', $fileName, $extension);
-	    $uploadedFile->moveTo($directory . DIRECTORY_SEPARATOR . $filename);
-	    return $directory . DIRECTORY_SEPARATOR . $filename;
-	}
-	public function delete($file)
-	{
-		@unlink($file);
-	}
+    public function moveUploadedFile($directory,$fileName, UploadedFile $uploadedFile)
+    {
+        $extension = pathinfo($uploadedFile->getClientFilename(), PATHINFO_EXTENSION);
+        $basename = bin2hex(random_bytes(8)); // see http://php.net/manual/en/function.random-bytes.php
+        $filename = sprintf('%s.%0.8s', $fileName, $extension);
+        $uploadedFile->moveTo($directory . DIRECTORY_SEPARATOR . $filename);
+        return $directory . DIRECTORY_SEPARATOR . $filename;
+    }
+    public function delete($file)
+    {
+        @unlink($file);
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class FileService extends _Service
 {
-	public function moveUploadedFile($directory,$fileName, UploadedFile $uploadedFile)
+	public function moveUploadedFile($directory, $fileName, UploadedFile $uploadedFile)
 	{
 	    $extension = pathinfo($uploadedFile->getClientFilename(), PATHINFO_EXTENSION);
 	    $basename = bin2hex(random_bytes(8)); // see http://php.net/manual/en/function.random-bytes.php

core/Functions/helpers.php

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,9 @@
     $url .= "?s=$s&d=$d&r=$r";
     if ( $img ) {
         $url = '<img src="' . $url . '"';
-        foreach ( $atts as $key => $val )
-            $url .= ' ' . $key . '="' . $val . '"';
+        foreach ( $atts as $key => $val ) {
+                    $url .= ' ' . $key . '="' . $val . '"';
+        }
         $url .= ' />';
     }
     return $url;

Spacing +12 added lines, -12 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 
-function route(string $name ,array $params = [])
+function route(string $name, array $params = [])
 {
     $url = new \Core\Helpers\Url($GLOBALS['container']);
-    return $url->get($name , $params);
+    return $url->get($name, $params);
 }
 
-function url(string $name ,array $params = [])
+function url(string $name, array $params = [])
 {
     $url = new \Core\Helpers\Url($GLOBALS['container']);
-    return $url->get($name , $params);
+    return $url->get($name, $params);
 }
 
 // translate
-function trans($key , $replace = []){
+function trans($key, $replace = []) {
     $container = $GLOBALS['container'];
-    return $container->translator->trans($key,$replace);
+    return $container->translator->trans($key, $replace);
 }
 
 function public_path(string $uri = '') {
@@ -25,7 +25,7 @@ 
 
     $url = new \Core\Helpers\Url($container);
 
-    $url_asset = $url->getBasePath($request) .'/'. $uri;
+    $url_asset = $url->getBasePath($request) . '/' . $uri;
     return $url_asset;
 }
 
@@ -78,17 +78,17 @@ 
 
 function asset(string $uri = '') {
     $url = public_path();
-    $url_asset = $url.'assets/'.$uri;
+    $url_asset = $url . 'assets/' . $uri;
     return $url_asset;
 }
 
-function get_gravatar( $email, $s = 380, $d = 'mm', $r = 'g', $img = false, $atts = array() ) {
+function get_gravatar($email, $s = 380, $d = 'mm', $r = 'g', $img = false, $atts = array()) {
     $url = 'https://www.gravatar.com/avatar/';
-    $url .= md5( strtolower( trim( $email ) ) );
+    $url .= md5(strtolower(trim($email)));
     $url .= "?s=$s&d=$d&r=$r";
-    if ( $img ) {
+    if ($img) {
         $url = '<img src="' . $url . '"';
-        foreach ( $atts as $key => $val )
+        foreach ($atts as $key => $val)
             $url .= ' ' . $key . '="' . $val . '"';
         $url .= ' />';
     }

bootstrap/app.php

Indentation +6 added lines, -6 removed lines

@@ -17,12 +17,12 @@
 }
 $i=0;
 foreach($filesInConfig as $config_file){
-	if($config_file === 'phpmig.php'){continue;}
-	$file[$i] = include_once  __APP_ROOT__.'config/'.$config_file;
-	if(is_array($file[$i])){
-		$configs = array_merge($configs, $file[$i]);
-		$i++;
-	}
+    if($config_file === 'phpmig.php'){continue;}
+    $file[$i] = include_once  __APP_ROOT__.'config/'.$config_file;
+    if(is_array($file[$i])){
+        $configs = array_merge($configs, $file[$i]);
+        $i++;
+    }
 
 }
 

Spacing +18 added lines, -18 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-define('__APP_ROOT__',__DIR__ . '/../') ;
-require  __APP_ROOT__.'bootstrap/bootstrap.php';
-require __APP_ROOT__.'vendor/autoload.php';
+define('__APP_ROOT__', __DIR__ . '/../');
+require  __APP_ROOT__ . 'bootstrap/bootstrap.php';
+require __APP_ROOT__ . 'vendor/autoload.php';
 
 $env = new \Core\Helpers\Env();
 defined('DS') || define('DS', DIRECTORY_SEPARATOR);
 
 /*Dynamic containers in services*/
-$config_dir = scandir(__APP_ROOT__.'/config/');
+$config_dir = scandir(__APP_ROOT__ . '/config/');
 $ex_config_folders = array('..', '.');
-$filesInConfig =  array_diff($config_dir,$ex_config_folders);
+$filesInConfig = array_diff($config_dir, $ex_config_folders);
 if (!isset($configs)) {
     $configs = array();
 }
-$i=0;
-foreach($filesInConfig as $config_file){
-	if($config_file === 'phpmig.php'){continue;}
-	$file[$i] = include_once  __APP_ROOT__.'config/'.$config_file;
-	if(is_array($file[$i])){
+$i = 0;
+foreach ($filesInConfig as $config_file) {
+	if ($config_file === 'phpmig.php') {continue; }
+	$file[$i] = include_once  __APP_ROOT__ . 'config/' . $config_file;
+	if (is_array($file[$i])) {
 		$configs = array_merge($configs, $file[$i]);
 		$i++;
 	}
@@ -25,10 +25,10 @@ 
 }
 
 $config['settings'] = $configs;
-require  __APP_ROOT__.'core/Functions/general_helpers.php';
+require  __APP_ROOT__ . 'core/Functions/general_helpers.php';
 
 $app = new \Core\App($config);
-if($config['settings']['app']['debug'] && !$config['settings']['tracy']['active']){
+if ($config['settings']['app']['debug'] && !$config['settings']['tracy']['active']) {
     error_reporting(-1);
     ini_set('display_errors', 1);
     ini_set('display_startup_errors', 1);
@@ -37,16 +37,16 @@ 
 
 use SlimFacades\Facade;
 // get container app
-require __APP_ROOT__.'bootstrap/dependencies.php';
-require  __APP_ROOT__.'bootstrap/routes.php';
-require  __APP_ROOT__.'core/Functions/helpers.php';
-if(php_sapi_name() != 'cli') {
-    if($config['settings']['app']['debug'] && (int)$config['settings']['tracy']['active']){
+require __APP_ROOT__ . 'bootstrap/dependencies.php';
+require  __APP_ROOT__ . 'bootstrap/routes.php';
+require  __APP_ROOT__ . 'core/Functions/helpers.php';
+if (php_sapi_name() != 'cli') {
+    if ($config['settings']['app']['debug'] && (int) $config['settings']['tracy']['active']) {
         Tracy\Debugger::enable(Tracy\Debugger::DEVELOPMENT, $config['settings']['tracy']['path']);
     }
     Facade::setFacadeApplication($app);
 
-    require  __APP_ROOT__.'bootstrap/middlewares.php';
+    require  __APP_ROOT__ . 'bootstrap/middlewares.php';
 
     $app->run();
 

core/Services/AuthService.php

Braces +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
         $setting = Config::get('settings.auth');
         if(1 || $setting['2step']){
             return $this->twoStepAuth($loginField,$password);
-        }else{
+        } else{
             if ($this->checkPass($password,$user->password)) {
                 $_SESSION['user']['user_id'] = $user->id;
                 $_SESSION['user']['mobile'] = $user->mobile;
@@ -62,7 +62,7 @@ 
                     'type'=>'success',
                     'message'=> 'Logined',
                 ];
-            }else{
+            } else{
                 return [
                     'type'=>'error',
                     'message'=> 'password mismatch',
@@ -98,7 +98,7 @@ 
                 'type'=>'success',
                 'message'=> 'Logined',
             ];
-        }else{
+        } else{
             return [
                 'type'=>'error',
                 'message'=> 'problem!',

Spacing +19 added lines, -19 removed lines

@@ -17,21 +17,21 @@ 
 {
     public function user()
     {
-        if(!isset($_SESSION['user']) && json_decode($_COOKIE['user'],true) !== null){
-            $_SESSION['user'] = json_decode($_COOKIE['user'],true);
+        if (!isset($_SESSION['user']) && json_decode($_COOKIE['user'], true) !== null) {
+            $_SESSION['user'] = json_decode($_COOKIE['user'], true);
         }
         return UserDataAccess::getUserById(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0);
     }
 
     public function hasRole($roleName)
     {
-        if(!self::check()){
+        if (!self::check()) {
             return false;
         }
-        $userRoles =  UserDataAccess::getUserRoles(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0);
+        $userRoles = UserDataAccess::getUserRoles(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0);
         $hasAccess = false;
-        foreach ($userRoles as $role){
-            if($role->name == $roleName){
+        foreach ($userRoles as $role) {
+            if ($role->name == $roleName) {
                 $hasAccess = true;
                 break;
             }
@@ -42,13 +42,13 @@ 
 
     public function check()
     {
-        if(!isset($_SESSION['user']) && json_decode($_COOKIE['user'],true) !== null){
-            $_SESSION['user'] = json_decode($_COOKIE['user'],true);
+        if (!isset($_SESSION['user']) && json_decode($_COOKIE['user'], true) !== null) {
+            $_SESSION['user'] = json_decode($_COOKIE['user'], true);
         }
         return isset($_SESSION['user']['user_id']);
     }
 
-    public function attempt(string $loginField,string $password)
+    public function attempt(string $loginField, string $password)
     {
         $user = UserDataAccess::getUserLoginField($loginField);
         if (!$user) {
@@ -58,10 +58,10 @@ 
             ];
         }
         $setting = Config::get('settings.auth');
-        if(1 || $setting['2step']){
-            return $this->twoStepAuth($loginField,$password);
-        }else{
-            if ($this->checkPass($password,$user->password)) {
+        if (1 || $setting['2step']) {
+            return $this->twoStepAuth($loginField, $password);
+        }else {
+            if ($this->checkPass($password, $user->password)) {
                 $_SESSION['user']['user_id'] = $user->id;
                 $_SESSION['user']['mobile'] = $user->mobile;
 
@@ -75,7 +75,7 @@ 
                     'type'=>'success',
                     'message'=> 'Logined',
                 ];
-            }else{
+            }else {
                 return [
                     'type'=>'error',
                     'message'=> 'password mismatch',
@@ -90,9 +90,9 @@ 
 
 
 
-    public function checkPass($password,$database_pass)
+    public function checkPass($password, $database_pass)
     {
-        if($database_pass == $password){
+        if ($database_pass == $password) {
             return true;
         }
         return false;
@@ -100,10 +100,10 @@ 
     }
 
 
-    public function twoStepAuth(string $loginField,string $password)
+    public function twoStepAuth(string $loginField, string $password)
     {
         $user = UserDataAccess::getUserLoginField($loginField);
-        if(UserDataAccess::checkToken($password,$loginField)){
+        if (UserDataAccess::checkToken($password, $loginField)) {
             $_SESSION['user']['user_id'] = $user->id;
             $_SESSION['user']['mobile'] = $user->mobile;
 
@@ -117,7 +117,7 @@ 
                 'type'=>'success',
                 'message'=> 'Logined',
             ];
-        }else{
+        }else {
             return [
                 'type'=>'error',
                 'message'=> 'problem!',