afshinpersian / afshlim_framework

core/Translator/Translator.php

Spacing +23 added lines, -23 removed lines

@@ -23,48 +23,48 @@ 
 
     }
 
-    private function _loadkey(string $key , array $replace = [])
+    private function _loadkey(string $key, array $replace = [])
     {
-        list($namespace,$group) = explode('.',$key);
+        list($namespace, $group) = explode('.', $key);
         $t_dir = $this->getTranslation_dirs();
 
-        if(in_array($this->local,$t_dir)){
-            $translationBaseFolder = $this->settings['app']['translation']['translations_path'].$this->local;
-            $translationBaseFile = $translationBaseFolder.'/'.$namespace.'.php';
-            if(file_exists($translationBaseFile)){
+        if (in_array($this->local, $t_dir)) {
+            $translationBaseFolder = $this->settings['app']['translation']['translations_path'] . $this->local;
+            $translationBaseFile = $translationBaseFolder . '/' . $namespace . '.php';
+            if (file_exists($translationBaseFile)) {
                 $lang = include ($translationBaseFile);
-            }else{
+            }else {
                 return  $key;
             }
-        }else{
+        }else {
         }
-        $keyArr = explode('.',$key);
+        $keyArr = explode('.', $key);
         unset($keyArr[0]);
         $keyArr = array_values($keyArr);
-        $lang_new = $this->getDataFromTranslation($lang,$keyArr);
+        $lang_new = $this->getDataFromTranslation($lang, $keyArr);
 
-        if(count($replace) > 0){
-            foreach($replace as $key=>$replace_item){
-                if(strpos($lang_new,'%') != 0){
-                    str_replace($key,$replace_item,$lang_new);
+        if (count($replace) > 0) {
+            foreach ($replace as $key=>$replace_item) {
+                if (strpos($lang_new, '%') != 0) {
+                    str_replace($key, $replace_item, $lang_new);
                 }
             }
-        }else{
+        }else {
             return $lang_new;
         }
     }
 
 
-    public function getDataFromTranslation( $data, $keyArr){
-        $arrayFound  = isset($data[$keyArr[0]]) ? $data[$keyArr[0]] : '';
-        if($arrayFound){
+    public function getDataFromTranslation($data, $keyArr) {
+        $arrayFound = isset($data[$keyArr[0]]) ? $data[$keyArr[0]] : '';
+        if ($arrayFound) {
             unset($keyArr[0]);
             $keyArr = array_values($keyArr);
-            if(isset($keyArr[0])){
-                return $this->getDataFromTranslation($arrayFound,$keyArr);
+            if (isset($keyArr[0])) {
+                return $this->getDataFromTranslation($arrayFound, $keyArr);
             }
         }
-        return $arrayFound ;
+        return $arrayFound;
     }
 
 
@@ -73,7 +73,7 @@ 
 
     public function trans(string $key, array $replace = [])
     {
-        return $this->_loadkey($key,$replace);
+        return $this->_loadkey($key, $replace);
     }
 
 
@@ -85,7 +85,7 @@ 
 
 
 
-        return array_diff($dir,$ex_folders);
+        return array_diff($dir, $ex_folders);
     }
 
 }
\ No newline at end of file

core/Services/ImageService.php

Spacing +21 added lines, -21 removed lines

@@ -7,70 +7,70 @@
 class ImageService extends _Service
 {
 
-    public function cropResize($src,$destUrl, $width, $height, $quality = 80,$fileExt  = 'jpg')
+    public function cropResize($src, $destUrl, $width, $height, $quality = 80, $fileExt = 'jpg')
     {
         $image = GImage::open($src);
         $image->cropResize($width, $height);
-        $destUrl = $destUrl.'.'.$fileExt;
-        $image->save($destUrl, $fileExt = 'jpg', $quality );
+        $destUrl = $destUrl . '.' . $fileExt;
+        $image->save($destUrl, $fileExt = 'jpg', $quality);
         
 
         return $image;
     }
 
-    public function scaleResize($src,$destUrl, $width, $height, $quality = 80,$fileExt  = 'jpg')
+    public function scaleResize($src, $destUrl, $width, $height, $quality = 80, $fileExt = 'jpg')
     {
         $image = GImage::open($src);
         $image->scaleResize($width, $height);
-        $destUrl = $destUrl.'.'.$fileExt;
-        $image->save($destUrl, $fileExt = 'jpg', $quality );
+        $destUrl = $destUrl . '.' . $fileExt;
+        $image->save($destUrl, $fileExt = 'jpg', $quality);
 
 
         return $image;
     }
 
-    public function resize($src,$destUrl, $width, $height, $quality = 80,$fileExt  = 'jpg')
+    public function resize($src, $destUrl, $width, $height, $quality = 80, $fileExt = 'jpg')
     {
         $image = GImage::open($src);
         $image->resize($width, $height);
-        $destUrl = $destUrl.'.'.$fileExt;
-        $image->save($destUrl, $fileExt = 'jpg', $quality );
+        $destUrl = $destUrl . '.' . $fileExt;
+        $image->save($destUrl, $fileExt = 'jpg', $quality);
 
 
         return $image;
     }
 
-    public function zoomCrop($src,$destUrl, $width, $height, $quality = 80,$fileExt  = 'jpg')
+    public function zoomCrop($src, $destUrl, $width, $height, $quality = 80, $fileExt = 'jpg')
     {
         $image = GImage::open($src);
         $image->zoomCrop($width, $height);
-        $destUrl = $destUrl.'.'.$fileExt;
-        $image->save($destUrl, $fileExt = 'jpg', $quality );
+        $destUrl = $destUrl . '.' . $fileExt;
+        $image->save($destUrl, $fileExt = 'jpg', $quality);
         return $image;
     }
 
-    public function createPhotos($src,$photoid,$type='user_photo', $dimensions = false)
+    public function createPhotos($src, $photoid, $type = 'user_photo', $dimensions = false)
     {
         // Get default dimensions
-        $dest = realpath('.'.$GLOBALS['settings']['image']['upload_path']);
+        $dest = realpath('.' . $GLOBALS['settings']['image']['upload_path']);
 
         $defaultDimensions = $dimensions ? $dimensions : $GLOBALS['settings']['image'][$type]['dimensions'];
         foreach ($defaultDimensions as $keys=>$dimension)
         {
-            if(!isset($dimension[2])) $dimension[2] = 100; // quality
-            if(!isset($dimension[4])) $dimension[4] = 'jpg'; // quality
+            if (!isset($dimension[2])) $dimension[2] = 100; // quality
+            if (!isset($dimension[4])) $dimension[4] = 'jpg'; // quality
 
-            $destUrl = $dest.'/'.getImageDirName($photoid,$type).getImageFileName($photoid,$keys,$type);
+            $destUrl = $dest . '/' . getImageDirName($photoid, $type) . getImageFileName($photoid, $keys, $type);
 
-            if(isset($dimension[3]) && $dimension[3] == true){
-                $image = $this->zoomCrop($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]);
+            if (isset($dimension[3]) && $dimension[3] == true) {
+                $image = $this->zoomCrop($src, trim($destUrl), $dimension[0], $dimension[1], $dimension[2], $dimension[4]);
             }else {
-                $image = $this->cropResize($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]);
+                $image = $this->cropResize($src, trim($destUrl), $dimension[0], $dimension[1], $dimension[2], $dimension[4]);
             }
             
             // $image = $this->cropResize($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]);
 
-            if($image ){
+            if ($image) {
                 $cropedArr[$keys] = $src;
             }
         }

Braces +9 added lines, -3 removed lines

@@ -57,14 +57,20 @@
         $defaultDimensions = $dimensions ? $dimensions : $GLOBALS['settings']['image'][$type]['dimensions'];
         foreach ($defaultDimensions as $keys=>$dimension)
         {
-            if(!isset($dimension[2])) $dimension[2] = 100; // quality
-            if(!isset($dimension[4])) $dimension[4] = 'jpg'; // quality
+            if(!isset($dimension[2])) {
+                $dimension[2] = 100;
+            }
+            // quality
+            if(!isset($dimension[4])) {
+                $dimension[4] = 'jpg';
+            }
+            // quality
 
             $destUrl = $dest.'/'.getImageDirName($photoid,$type).getImageFileName($photoid,$keys,$type);
 
             if(isset($dimension[3]) && $dimension[3] == true){
                 $image = $this->zoomCrop($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]);
-            }else {
+            } else {
                 $image = $this->cropResize($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]);
             }
             

core/Services/AuthService.php

Spacing +15 added lines, -15 removed lines

@@ -22,13 +22,13 @@ 
 
     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,7 +42,7 @@ 
         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) {
@@ -52,17 +52,17 @@ 
             ];
         }
         $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;
                 return [
                     'type'=>'success',
                     'message'=> 'Logined',
                 ];
-            }else{
+            }else {
                 return [
                     'type'=>'error',
                     'message'=> 'password mismatch',
@@ -77,9 +77,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;
@@ -87,10 +87,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;
 
@@ -98,7 +98,7 @@ 
                 'type'=>'success',
                 'message'=> 'Logined',
             ];
-        }else{
+        }else {
             return [
                 'type'=>'error',
                 'message'=> 'problem!',

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!',

bootstrap/dependencies.php

Spacing +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
 $container = $app->getContainer();
 
 /* database connection */
-$container['db'] = function ($container) {
+$container['db'] = function($container) {
     $db = $container['settings']['databases']['db'];
     $pdo = new PDO("mysql:host=" . $db['host'] . ";dbname=" . $db['database'],
         $db['username'], $db['password']);
@@ -52,18 +52,18 @@ 
 //
 
 
-$container['generalErrorHandler'] = function ($container) {
+$container['generalErrorHandler'] = function($container) {
     return new \Core\Handlers\GeneralErrorHandler($container);
 };
 
 
 // Service factory for the ORM
-$container['validator'] = function () {
+$container['validator'] = function() {
     return new App\Validation\Validator();
 };
 
 
-$container['eloquent'] = function ($container) {
+$container['eloquent'] = function($container) {
     $db = $container['settings']['databases']['db'];
 
     $capsule = new \Illuminate\Database\Capsule\Manager;
@@ -83,7 +83,7 @@ 
 
 
 // monolog
-$container['logger'] = function ($c) {
+$container['logger'] = function($c) {
     $settings = $c->get('settings')['app']['logger'];
     $logger = new Monolog\Logger($settings['name']);
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -92,8 +92,8 @@ 
 };
 
 // not found handler
-$container['notFoundHandler'] = function ($container) {
-    return function (\Slim\Http\Request $request, \Slim\Http\Response $response) use ($container) {
+$container['notFoundHandler'] = function($container) {
+    return function(\Slim\Http\Request $request, \Slim\Http\Response $response) use ($container) {
         return $container['view']->render($response->withStatus(404), '404');
     };
 };
@@ -103,23 +103,23 @@ 
 $translator = new \Core\Translator\Translator($container);
 $translator->init();
 
-$container['translator'] = function () use ($translator) {
+$container['translator'] = function() use ($translator) {
     return $translator;
 };
 
 
 // Register provider
-$container['flash'] = function () {
+$container['flash'] = function() {
     return new \Slim\Flash\Messages();
 };
 
 
 //
-$container['session'] = function ($container)  {
+$container['session'] = function($container) {
     $setting_session_driver = $container['settings']['session']['driver'] ?? 'session';
 
     $sessionOBJ = new \Core\Services\Session();
-    $session = $sessionOBJ->init($setting_session_driver) ;
+    $session = $sessionOBJ->init($setting_session_driver);
     return $session;
 };
 
@@ -130,17 +130,17 @@ 
 
 
 // Register Blade View helper
-$container['view'] = function ($container) {
+$container['view'] = function($container) {
     $messages = $container->flash->getMessages();
 
-    if(!is_dir('../app/View/cache')){
+    if (!is_dir('../app/View/cache')) {
         @mkdir('../app/View/cache');
     }
 
 
     $viewSettings = $container['settings']['view'];
     return new \Slim\Views\Blade(
-        [$viewSettings['blade_template_path'].$viewSettings['template']],
+        [$viewSettings['blade_template_path'] . $viewSettings['template']],
         $viewSettings['blade_cache_path'],
         null,
         [
@@ -152,11 +152,11 @@ 
 };
 
 // Register Blade View helper
-$container['json'] = function ($container) {
+$container['json'] = function($container) {
     return new \Core\Handlers\JsonHandler();
 };
 
-$app->getContainer()['view']->getRenderer()->getCompiler()->directive('helloWorld', function(){
+$app->getContainer()['view']->getRenderer()->getCompiler()->directive('helloWorld', function() {
 
     return "<?php echo 'Hello Directive'; ?>";
 });
@@ -171,14 +171,14 @@ 
 
 
 /*Dynamic containers in services*/
-$dir = scandir(__APP_ROOT__.'/core/Services/');
+$dir = scandir(__APP_ROOT__ . '/core/Services/');
 $ex_folders = array('..', '.');
-$filesInServices =  array_diff($dir,$ex_folders);
+$filesInServices = array_diff($dir, $ex_folders);
 
-foreach($filesInServices as $service){
-    $content = preg_replace('/.php/','',$service);
-    $container[$content] = function () use ($content){
-        $class =  '\\Core\\Services\\'.$content ;
+foreach ($filesInServices as $service) {
+    $content = preg_replace('/.php/', '', $service);
+    $container[$content] = function() use ($content){
+        $class = '\\Core\\Services\\' . $content;
         return new $class();
     };
 }

bootstrap/app.php

Spacing +18 added lines, -18 removed lines

@@ -1,25 +1,25 @@ 
 <?php
-define('__APP_ROOT__',__DIR__ . '/../') ;
+define('__APP_ROOT__', __DIR__ . '/../');
 $APPROOT = __APP_ROOT__;
-require  __APP_ROOT__.'bootstrap/bootstrap.php';
-require __APP_ROOT__.'vendor/autoload.php';
+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++;
 	}
@@ -27,12 +27,12 @@ 
 }
 
 $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']['debug'] && !$config['settings']['tracy']['active']){
+if ($config['settings']['debug'] && !$config['settings']['tracy']['active']) {
     ini_set('display_errors', 1);
     ini_set('display_startup_errors', 1);
     error_reporting(E_ALL);
@@ -41,18 +41,18 @@ 
 
 use SlimFacades\Facade;
 // get container app
-require __APP_ROOT__.'bootstrap/dependencies.php';
+require __APP_ROOT__ . 'bootstrap/dependencies.php';
 
-require  __APP_ROOT__.'bootstrap/routes.php';
-require  __APP_ROOT__.'core/Functions/helpers.php';
+require  __APP_ROOT__ . 'bootstrap/routes.php';
+require  __APP_ROOT__ . 'core/Functions/helpers.php';
 
-if(php_sapi_name() != 'cli') {
-    if($config['settings']['debug'] && $config['settings']['tracy']['active']){
+if (php_sapi_name() != 'cli') {
+    if ($config['settings']['debug'] && $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();
 

config/tracy.php

Spacing +3 added lines, -3 removed lines

@@ -9,11 +9,11 @@
         'showSlimEnvironmentPanel' => 1,
         'showSlimRequestPanel' => 1,
         'showSlimResponsePanel' => 1,
-        'showSlimContainer' =>1 ,
+        'showSlimContainer' =>1,
         'showEloquentORMPanel' => 1,
-        'showIdiormPanel' => 0,// > 0 mean you enable logging
+        'showIdiormPanel' => 0, // > 0 mean you enable logging
         // but show or not panel you decide in browser in panel selector
-        'showDoctrinePanel' => 'em',// here also enable logging and you must enter your Doctrine container name
+        'showDoctrinePanel' => 'em', // here also enable logging and you must enter your Doctrine container name
         // and also as above show or not panel you decide in browser in panel selector
         'showProfilerPanel' => 1,
         'showVendorVersionsPanel' => 1,

config/view.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php 
 return [
     // Renderer settings
-	'view' => [
-	    'blade_template_path' => '../app/View/', // String or array of multiple paths
-	    'blade_cache_path'    => '../app/View/cache', // Mandatory by default, though could probably turn caching off for development
-	    'template'    => 'blade', // template name
-	],
+    'view' => [
+        'blade_template_path' => '../app/View/', // String or array of multiple paths
+        'blade_cache_path'    => '../app/View/cache', // Mandatory by default, though could probably turn caching off for development
+        'template'    => 'blade', // template name
+    ],
 ];
 ?>

config/app.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
         'displayErrorDetails' => true,
         'addContentLengthHeader' => true,
         'determineRouteBeforeAppMiddleware' => true,
-        'debug'=>true ,
+        'debug'=>true,
         'image' => [
             'dir' =>  $APPROOT . '/public/uploads'
         ],