afshinpersian / afshlim_framework

bootstrap/dependencies.php

Spacing +17 added lines, -17 removed lines

@@ -6,7 +6,7 @@ 
 /* database connection */
 
 
-$container['db'] = function ($container) {
+$container['db'] = function($container) {
     $db = $container['settings']['db'];
     $pdo = new PDO("mysql:host=" . $db['host'] . ";dbname=" . $db['database'],
         $db['username'], $db['password']);
@@ -18,19 +18,19 @@ 
 //
 
 
-$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) {
     $capsule = new \Illuminate\Database\Capsule\Manager;
     $capsule->addConnection($container['settings']['db']);
     $capsule->setAsGlobal();
@@ -48,7 +48,7 @@ 
 
 
 // monolog
-$container['logger'] = function ($c) {
+$container['logger'] = function($c) {
     $settings = $c->get('settings')['logger'];
     $logger = new Monolog\Logger($settings['name']);
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -57,20 +57,20 @@ 
 };
 
 // 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');
     };
 };
 
 // Register Blade View helper
-$container['view'] = function ($container) {
+$container['view'] = function($container) {
 
     $messages = $container->flash->getMessages();
 
     $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,
         [
@@ -83,13 +83,13 @@ 
 $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();
 };
 
@@ -104,14 +104,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 +11 added lines, -11 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-define('__APP_ROOT__',__DIR__ . '/../') ;
+define('__APP_ROOT__', __DIR__ . '/../');
 
-require  __APP_ROOT__.'bootstrap/bootstrap.php';
-require  __APP_ROOT__.'core/Functions/helpers.php';
-require __APP_ROOT__.'vendor/autoload.php';
-require __APP_ROOT__.'config/settings.php';
+require  __APP_ROOT__ . 'bootstrap/bootstrap.php';
+require  __APP_ROOT__ . 'core/Functions/helpers.php';
+require __APP_ROOT__ . 'vendor/autoload.php';
+require __APP_ROOT__ . 'config/settings.php';
 
 
 
@@ -12,20 +12,20 @@ 
 
 use SlimFacades\Facade;
 // get container app
-require __APP_ROOT__.'bootstrap/dependencies.php';
-require  __APP_ROOT__.'bootstrap/routes.php';
+require __APP_ROOT__ . 'bootstrap/dependencies.php';
+require  __APP_ROOT__ . 'bootstrap/routes.php';
 
-if(php_sapi_name() != 'cli') {
+if (php_sapi_name() != 'cli') {
     $settings['tracy']['path'] = '';
-    if($app->getContainer() instanceof Psr\Container\ContainerInterface){
+    if ($app->getContainer() instanceof Psr\Container\ContainerInterface) {
         $settings = $app->getContainer()->settings;
-        if($settings['debug'] == true){
+        if ($settings['debug'] == true) {
             Tracy\Debugger::enable(Tracy\Debugger::DEVELOPMENT, $settings['tracy']['path']);
         }
         Facade::setFacadeApplication($app);
     }
 
-    require  __APP_ROOT__.'bootstrap/middlewares.php';
+    require  __APP_ROOT__ . 'bootstrap/middlewares.php';
 
     $app->run();
 

core/Helpers/Hash.php

Spacing +4 added lines, -4 removed lines

@@ -8,14 +8,14 @@ 
 
 namespace Core\Helpers;
 
-class Hash{
+class Hash {
     /**
      * Receives a string password and hashes it.
      *
      * @param string $password
      * @return string $hash
      */
-    public static function hash($password){
+    public static function hash($password) {
 //        return (string)password_hash($password, PASSWORD_DEFAULT);
         return sha1(md5($password));
     }
@@ -27,8 +27,8 @@ 
      * @param string $hash
      * @return boolean If the hash was generated from the password
      */
-    public static function checkHash($string, $hash){
-        if( password_verify( $string, $hash ) ){
+    public static function checkHash($string, $hash) {
+        if (password_verify($string, $hash)) {
             return true;
         }
         return false;

core/Services/AuthService.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,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) {
@@ -35,17 +35,17 @@ 
             ];
         }
         $setting = Config::get('settings.auth');
-        if($setting['2step']){
+        if ($setting['2step']) {
             $this->twoStepAuth();
-        }else{
-            if ($this->checkPass($password,$user->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',
@@ -60,9 +60,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;

Braces +2 added lines, -2 removed lines

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

database/migrations/20171130091220_Add_Password_To_Users_Table_Migration.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     {
         Capsule::schema()->table('users', function($table)
         {
-            $table->string('password',128);
+            $table->string('password', 128);
         });
     }