afshinpersian / afshlim_framework

core/Route.php

Spacing +16 added lines, -16 removed lines

@@ -34,21 +34,21 @@ 
 
     public  function resource($url, $controller, $args = [])
     {
-        $url = rtrim($url,'/');
-        $routeNames = implode('.',explode('/',trim($url,'/')));
-
-        $this->app->group($url, function () use ($controller,$routeNames, $args) {
-            $this->get('', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames.'.index');
-            $this->get('/', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames.'.index');
-            $this->get('/index', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames.'.index');
-
-            $this->get('/create', $controller . ':create')->add(self::middleware('create', $args))->setName($routeNames.'.create');
-            $this->get('/{id:[0-9]+}', $controller . ':show')->add(self::middleware('show', $args))->setName($routeNames.'.show');
-            $this->get('/{id:[0-9]+}/edit', $controller . ':edit')->add(self::middleware('edit', $args))->setName($routeNames.'.edit');
-            $this->post('', $controller . ':store')->add(self::middleware('store', $args))->setName($routeNames.'.store');
-            $this->put('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('update', $args))->setName($routeNames.'.update');
-            $this->patch('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('index', $args))->setName($routeNames.'.update');
-            $this->delete('/{id:[0-9]+}', $controller . ':destroy')->add(self::middleware('destroy', $args))->setName($routeNames.'.destroy');
+        $url = rtrim($url, '/');
+        $routeNames = implode('.', explode('/', trim($url, '/')));
+
+        $this->app->group($url, function() use ($controller, $routeNames, $args) {
+            $this->get('', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames . '.index');
+            $this->get('/', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames . '.index');
+            $this->get('/index', $controller . ':index')->add(self::middleware('index', $args))->setName($routeNames . '.index');
+
+            $this->get('/create', $controller . ':create')->add(self::middleware('create', $args))->setName($routeNames . '.create');
+            $this->get('/{id:[0-9]+}', $controller . ':show')->add(self::middleware('show', $args))->setName($routeNames . '.show');
+            $this->get('/{id:[0-9]+}/edit', $controller . ':edit')->add(self::middleware('edit', $args))->setName($routeNames . '.edit');
+            $this->post('', $controller . ':store')->add(self::middleware('store', $args))->setName($routeNames . '.store');
+            $this->put('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('update', $args))->setName($routeNames . '.update');
+            $this->patch('/{id:[0-9]+}', $controller . ':update')->add(self::middleware('index', $args))->setName($routeNames . '.update');
+            $this->delete('/{id:[0-9]+}', $controller . ':destroy')->add(self::middleware('destroy', $args))->setName($routeNames . '.destroy');
 
         })->add(self::middleware('group', $args));
     }
@@ -60,7 +60,7 @@ 
      */
     public static function middleware($middleWare = "group", $args)
     {
-        $routeResourceMiddleWare_default = function ($request, $response, $next) {
+        $routeResourceMiddleWare_default = function($request, $response, $next) {
             return $next($request, $response);
         };
 

core/Translator/_TranslateHandler.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 abstract class _TranslateHandler
 {
-    protected $container ;
+    protected $container;
     protected $local;
 
     function __construct(ContainerInterface $container)
@@ -39,5 +39,5 @@ 
         return $this->container;
     }
 
-    abstract public function trans(string $key , array $replace);
+    abstract public function trans(string $key, array $replace);
 }
\ No newline at end of file

core/Translator/Translator.php

Braces +3 added lines, -3 removed lines

@@ -33,10 +33,10 @@ 
             $translationBaseFile = $translationBaseFolder.'/'.$namespace.'.php';
             if(file_exists($translationBaseFile)){
                 $lang = include ($translationBaseFile);
-            }else{
+            } else{
                 return  $key;
             }
-        }else{
+        } else{
         }
         $keyArr = explode('.',$key);
         unset($keyArr[0]);
@@ -49,7 +49,7 @@ 
                     str_replace($key,$replace_item,$lang_new);
                 }
             }
-        }else{
+        } else{
             return $lang_new;
         }
     }

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

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     /**
      * @var ContainerInterface $setting
      *
-    */
+     */
     public function init()
     {
         $setting = $this->settings['app']['translation'];

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;

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);
         });
     }
 

core/Helpers/Url.php

Spacing +5 added lines, -5 removed lines

@@ -19,9 +19,9 @@ 
     {
         $this->container = $container;
     }
-    public function get( $name, $params = array() )
+    public function get($name, $params = array())
     {
-            $route = $this->container->get('router')->pathFor($name,$params);
+            $route = $this->container->get('router')->pathFor($name, $params);
 
 
             return $route;
@@ -47,9 +47,9 @@ 
         $protocol = $request->getUri()->getScheme();
         $baseHost = $request->getUri()->getHost();
         $path = $request->getUri()->getPath();
-        $pathArr = explode('/',$path);
-        unset($pathArr[count($pathArr)-1]);
-        $path = implode('/',$pathArr);
+        $pathArr = explode('/', $path);
+        unset($pathArr[count($pathArr) - 1]);
+        $path = implode('/', $pathArr);
         $port = $request->getUri()->getPort() ? ':' . $request->getUri()->getPort() : '';
         $baseUrl = $protocol . '://' . $baseHost . $port . $path;
         return $baseUrl;

core/Facades/Auth.php

Indentation +1 added lines, -1 removed lines

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

core/Handlers/Session/SessionHandler.php

Braces +4 added lines, -2 removed lines

@@ -15,11 +15,13 @@
 {
     public function get($key = null)
     {
-        if(!isset($_SESSION)) return [];
+        if(!isset($_SESSION)) {
+            return [];
+        }
 
         if(!$key){
             return $_SESSION;
-        }else{
+        } else{
             $keys = explode('.',$key);
             $sessionVal = $this->getRecursiveSessionKey($_SESSION,$keys);
             return $sessionVal;

Indentation +5 added lines, -5 removed lines

@@ -34,12 +34,12 @@
 
     public function exists($key,$val)
     {
-       $keySession = $this->get($key);
+        $keySession = $this->get($key);
 
-       if($keySession){
-          return true;
-       }
-       return false;
+        if($keySession){
+            return true;
+        }
+        return false;
     }
 
 

Spacing +9 added lines, -9 removed lines

@@ -15,28 +15,28 @@
 {
     public function get($key = null)
     {
-        if(!isset($_SESSION)) return [];
+        if (!isset($_SESSION)) return [];
 
-        if(!$key){
+        if (!$key) {
             return $_SESSION;
-        }else{
-            $keys = explode('.',$key);
-            $sessionVal = $this->getRecursiveSessionKey($_SESSION,$keys);
+        }else {
+            $keys = explode('.', $key);
+            $sessionVal = $this->getRecursiveSessionKey($_SESSION, $keys);
             return $sessionVal;
         }
     }
 
-    public function set($key,$val)
+    public function set($key, $val)
     {
-        $_SESSION = $this->setArr($key,$val);
+        $_SESSION = $this->setArr($key, $val);
     }
 
 
-    public function exists($key,$val)
+    public function exists($key, $val)
     {
        $keySession = $this->get($key);
 
-       if($keySession){
+       if ($keySession) {
           return true;
        }
        return false;

core/Services/Session.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     {
         $namespace = 'Core\\Handlers\\Session\\';
 
-        $className = $namespace.ucfirst($driver).'Handler';
+        $className = $namespace . ucfirst($driver) . 'Handler';
         $this->handler = new $className();
 
         return $this->handler;