php-resta / resta-core

src/resta/Support/YamlManager.php

Spacing +2 added lines, -2 removed lines

@@ -36,10 +36,10 @@
         return $this->yaml;

     }

 

-    public function set($data=array())

+    public function set($data = array())

     {

         //we merge the data in yaml with new data.

-        $newYamlData = array_merge($this->yaml,$data);

+        $newYamlData = array_merge($this->yaml, $data);

 

         //we dump new data.

         $yaml = Yaml::dump($newYamlData);

src/resta/Support/App.php

Indentation +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
     {

         $locale = (count($arg)=="0") ? config('app.locale','en') : current($arg);

 

-       return app()->resolve(Date::class)->setLocale($locale);

+        return app()->resolve(Date::class)->setLocale($locale);

     }

 

     /**

Braces +4 added lines, -3 removed lines

@@ -210,7 +210,9 @@ 
         $repositoryAdapterName  = $repositoryName.'Adapter';

         $repositoryNamespace    = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName;

 

-        if($namespace) return $repositoryNamespace;

+        if($namespace) {

+            return $repositoryNamespace;

+        }

 

         //and eventually we conclude the adapter class of the repository package as an instance.

         return app()->resolve($repositoryNamespace)->adapter();

@@ -270,8 +272,7 @@ 
         foreach ($saltRouteParameters as $key=>$value){

             if(isset($serviceConfRouteParameters[$key])){

                 $list[$serviceConfRouteParameters[$key]]=$value;

-            }

-            else{

+            } else{

                 $list[$key]=$value;

             }

         }

Spacing +52 added lines, -52 removed lines

@@ -21,36 +21,36 @@ 
     /**

      * @var array

      */

-    protected static $instance=[];

+    protected static $instance = [];

 

     /**

      * @param $service

      * @param $arg

      * @return mixed

      */

-    public static function annotationsLoaders($service,$arg)

+    public static function annotationsLoaders($service, $arg)

     {

         //factory runner

-        if($service=="factory"){

+        if ($service=="factory") {

             return self::factory();

         }

         //if $name starts with $needles for repository

-        if(Str::endsWith($service,'Repository')){

+        if (Str::endsWith($service, 'Repository')) {

             return self::repository($service);

         }

 

         //if $name starts with $needles for source

-        if(Str::endsWith($service,'Source')){

-            return self::source($service,$arg);

+        if (Str::endsWith($service, 'Source')) {

+            return self::source($service, $arg);

         }

 

         //if $name starts with $needles for model

-        if(Str::endsWith($service,'Builder')){

+        if (Str::endsWith($service, 'Builder')) {

             return self::Builder(ucfirst($service));

         }

 

 

-        if(method_exists(new self,$service)){

+        if (method_exists(new self, $service)) {

             return self::$service($arg);

         }

 

@@ -79,7 +79,7 @@ 
     private static function builder($service)

     {

         //we are making a namespace assignment for the builder.

-        $builder=app()->namespace()->builder().'\\'.$service;

+        $builder = app()->namespace()->builder().'\\'.$service;

 

         //we are getting builder instance.

         return app()->resolve($builder);

@@ -107,16 +107,16 @@ 
      * @param array $bind

      * @return mixed

      */

-    public function container($instance,$class,$bind=array())

+    public function container($instance, $class, $bind = array())

     {

-        if(!property_exists($instance->container(),$class)){

+        if (!property_exists($instance->container(), $class)) {

             throw new \InvalidArgumentException('container object false for ('.$class.') object');

         }

 

-        $container=$instance->container()->{$class};

+        $container = $instance->container()->{$class};

 

-        if(!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)){

-            return $instance->resolve($container,$bind);

+        if (!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)) {

+            return $instance->resolve($container, $bind);

         }

         return $instance->container()->{$class};

     }

@@ -126,8 +126,8 @@ 
      */

     public function createAppInstance($object)

     {

-        if(!defined('appInstance')){

-            define('appInstance',(base64_encode(serialize($object))));

+        if (!defined('appInstance')) {

+            define('appInstance', (base64_encode(serialize($object))));

         }

     }

 

@@ -135,9 +135,9 @@ 
      * @param array $arg

      * @return mixed

      */

-    private static function date($arg=array())

+    private static function date($arg = array())

     {

-        $locale = (count($arg)=="0") ? config('app.locale','en') : current($arg);

+        $locale = (count($arg)=="0") ? config('app.locale', 'en') : current($arg);

 

        return app()->resolve(Date::class)->setLocale($locale);

     }

@@ -157,8 +157,8 @@ 
     {

         //we save an instance for the entire application

         //and add it to the helper file to be accessed from anywhere in the application.

-        if(!isset(self::$instance['appInstance'])){

-            self::$instance['appInstance']=unserialize(base64_decode(appInstance));

+        if (!isset(self::$instance['appInstance'])) {

+            self::$instance['appInstance'] = unserialize(base64_decode(appInstance));

             return self::$instance['appInstance'];

         }

         return self::$instance['appInstance'];

@@ -185,9 +185,9 @@ 
      */

     private static function queue()

     {

-        if(!isset(self::$instance['queue'])){

+        if (!isset(self::$instance['queue'])) {

 

-            self::$instance['queue']=(new Queue());

+            self::$instance['queue'] = (new Queue());

             return self::$instance['queue'];

 

         }

@@ -199,18 +199,18 @@ 
      * @param bool $namespace

      * @return string

      */

-    public static function repository($service,$namespace=false)

+    public static function repository($service, $namespace = false)

     {

         //I can get the repository name from the magic method as a salt repository,

         //after which we will edit it as an adapter namespace.

-        $repositoryName=ucfirst(preg_replace('@Repository@is','',$service));

+        $repositoryName = ucfirst(preg_replace('@Repository@is', '', $service));

 

         //If we then configure the name of the simple repository to be an adapter

         //then we will give the user an example of the adapter class in each repository call.

         $repositoryAdapterName  = $repositoryName.'Adapter';

         $repositoryNamespace    = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName;

 

-        if($namespace) return $repositoryNamespace;

+        if ($namespace) return $repositoryNamespace;

 

         //and eventually we conclude the adapter class of the repository package as an instance.

         return app()->resolve($repositoryNamespace)->adapter();

@@ -221,17 +221,17 @@ 
      * @param $arg

      * @return mixed

      */

-    private static function source($service,$arg)

+    private static function source($service, $arg)

     {

         //get Source path

-        $service=ucfirst($service);

-        $getCalledClass=str_replace('\\'.class_basename($arg[0]),'',get_class($arg[0]));

-        $getCalledClass=class_basename($getCalledClass);

+        $service = ucfirst($service);

+        $getCalledClass = str_replace('\\'.class_basename($arg[0]), '', get_class($arg[0]));

+        $getCalledClass = class_basename($getCalledClass);

 

-        $service=str_replace($getCalledClass,'',$service);

+        $service = str_replace($getCalledClass, '', $service);

 

         //run service for endpoint

-        $serviceSource=StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main';

+        $serviceSource = StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main';

         return app()->resolve($serviceSource);

     }

 

@@ -240,9 +240,9 @@ 
      */

     public static function redis()

     {

-        if(!isset(self::$instance['redis'])){

+        if (!isset(self::$instance['redis'])) {

 

-            self::$instance['redis']=(new Redis())->client();

+            self::$instance['redis'] = (new Redis())->client();

             return self::$instance['redis'];

 

         }

@@ -253,30 +253,30 @@ 
      * @param null $param

      * @return array|null|string

      */

-    public function route($param=null)

+    public function route($param = null)

     {

-        $kernel=self::getAppInstance()->kernel;

+        $kernel = self::getAppInstance()->kernel;

 

-        $saltRouteParameters=$kernel->routeParameters;

-        $urlMethod=strtolower($kernel->urlComponent['method']);

+        $saltRouteParameters = $kernel->routeParameters;

+        $urlMethod = strtolower($kernel->urlComponent['method']);

 

-        $serviceConfRouteParameters=[];

-        if(isset($kernel->serviceConf['routeParameters'][$urlMethod])){

-            $serviceConfRouteParameters=$kernel->serviceConf['routeParameters'][$urlMethod];

+        $serviceConfRouteParameters = [];

+        if (isset($kernel->serviceConf['routeParameters'][$urlMethod])) {

+            $serviceConfRouteParameters = $kernel->serviceConf['routeParameters'][$urlMethod];

         }

 

-        $list=[];

+        $list = [];

 

-        foreach ($saltRouteParameters as $key=>$value){

-            if(isset($serviceConfRouteParameters[$key])){

-                $list[$serviceConfRouteParameters[$key]]=$value;

+        foreach ($saltRouteParameters as $key=>$value) {

+            if (isset($serviceConfRouteParameters[$key])) {

+                $list[$serviceConfRouteParameters[$key]] = $value;

             }

-            else{

-                $list[$key]=$value;

+            else {

+                $list[$key] = $value;

             }

         }

 

-        if($param===null){

+        if ($param===null) {

             return $list;

         }

 

@@ -288,14 +288,14 @@ 
      * @param array $select

      * @return mixed|string

      */

-    public function translator($data,$select=array())

+    public function translator($data, $select = array())

     {

-        $lang=(new Lingua(path()->appLanguage()));

+        $lang = (new Lingua(path()->appLanguage()));

 

-        $defaultLocale=config('app.locale');

+        $defaultLocale = config('app.locale');

 

-        if(count($select)){

-            return $lang->include(['default'])->locale($defaultLocale)->get($data,$select);

+        if (count($select)) {

+            return $lang->include(['default'])->locale($defaultLocale)->get($data, $select);

         }

 

         return $lang->include(['default'])->locale($defaultLocale)->get($data);

src/resta/Support/Utils.php

Braces +24 added lines, -14 removed lines

@@ -103,8 +103,7 @@ 
     {

         if($extension){

             $default=root.'/'.str_replace("\\","/",$class).'.php';

-        }

-        else{

+        } else{

             $default=root.'/'.str_replace("\\","/",$class).'';

         }

 

@@ -262,21 +261,32 @@ 
      */

     public static function array_diff_key_recursive ($array1, $array2)

     {

-        if(count($array1)!==count($array2)) self::$bool[]=false;

+        if(count($array1)!==count($array2)) {

+            self::$bool[]=false;

+        }

 

         foreach ($array1 as $array1_key=>$array1_value){

 

             if(!is_array($array1_value)){

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

-            }

-            else{

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+                if(!array_key_exists($array1_key,$array2)) {

+                    self::$bool[]=false;

+                }

+            } else{

+                if(!array_key_exists($array1_key,$array2)) {

+                    self::$bool[]=false;

+                }

 

-                if(!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key]=[];

+                if(!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) {

+                    $array2[$array1_key]=[];

+                }

 

-                if(isset($array1_value[0])) $array1_value=$array1_value[0];

+                if(isset($array1_value[0])) {

+                    $array1_value=$array1_value[0];

+                }

 

-                if(isset($array2[$array1_key][0])) $array2[$array1_key]=$array2[$array1_key][0];

+                if(isset($array2[$array1_key][0])) {

+                    $array2[$array1_key]=$array2[$array1_key][0];

+                }

 

                 self::array_diff_key_recursive($array1_value,$array2[$array1_key]);

             }

@@ -322,8 +332,9 @@ 
     {

         $dp = opendir($dir);

         while($file = readdir($dp)) {

-            if (($file == ".") || ($file == ".."))

-                continue;

+            if (($file == ".") || ($file == "..")) {

+                            continue;

+            }

 

             $fullPath = $dir."/".$file;

 

@@ -401,8 +412,7 @@ 
 

                 if($reelPath===null){

                     $pathWithPhpList[] = $pathWithPhp[0];

-                }

-                else{

+                } else{

                     $pathWithPhpList[] = $reelPath.'/'.$pathWithPhp[0];

                 }

 

Spacing +69 added lines, -69 removed lines

@@ -16,13 +16,13 @@ 
      * @param bool $shift

      * @return array

      */

-    public static function upperCase($argument,$shift=true)

+    public static function upperCase($argument, $shift = true)

     {

-        if($shift){

+        if ($shift) {

             array_shift($argument);

         }

 

-        return array_map(function($argument){

+        return array_map(function($argument) {

             return ucfirst($argument);

         },$argument);

     }

@@ -46,10 +46,10 @@ 
      */

     public static function strtolower($argument)

     {

-        if(!is_array($argument)){

+        if (!is_array($argument)) {

             return strtolower($argument);

         }

-        return array_map(function($argument){

+        return array_map(function($argument) {

             return strtolower($argument);

         },$argument);

     }

@@ -58,9 +58,9 @@ 
      * @param array $data

      * @return string

      */

-    public static function generatorNamespace($data=array())

+    public static function generatorNamespace($data = array())

     {

-        return str_replace('.php','',implode("\\",$data));

+        return str_replace('.php', '', implode("\\", $data));

     }

 

     /**

@@ -68,16 +68,16 @@ 
      * @param bool $extension

      * @return mixed

      */

-    public static function getPathFromNamespace($class,$extension=true)

+    public static function getPathFromNamespace($class, $extension = true)

     {

-        if($extension){

-            $default=root.'/'.str_replace("\\","/",$class).'.php';

+        if ($extension) {

+            $default = root.'/'.str_replace("\\", "/", $class).'.php';

         }

-        else{

-            $default=root.'/'.str_replace("\\","/",$class).'';

+        else {

+            $default = root.'/'.str_replace("\\", "/", $class).'';

         }

 

-        return str_replace("/App",'/src/app',$default);

+        return str_replace("/App", '/src/app', $default);

     }

 

     /**

@@ -94,9 +94,9 @@ 
      * @param $method

      * @return bool

      */

-    public static function existMethod($class,$method)

+    public static function existMethod($class, $method)

     {

-        return method_exists($class,$method);

+        return method_exists($class, $method);

     }

 

     /**

@@ -104,9 +104,9 @@ 
      * @param $second

      * @return bool

      */

-    public static function isArrayEqual($first,$second)

+    public static function isArrayEqual($first, $second)

     {

-        return (count( $first ) == count( $second ) && !array_diff( $first, $second ));

+        return (count($first)==count($second) && !array_diff($first, $second));

     }

 

     /**

@@ -123,17 +123,17 @@ 
      * @param bool $filename

      * @return array

      */

-    public static function glob($path,$filename=false)

+    public static function glob($path, $filename = false)

     {

         $configList = [];

 

         foreach (glob($path.'/*.php') as $config) {

 

-            $configArray=str_replace(".php","",explode("/",$config));

-            $configList[end($configArray)]=$config;

+            $configArray = str_replace(".php", "", explode("/", $config));

+            $configList[end($configArray)] = $config;

         }

 

-        if($filename===true){

+        if ($filename===true) {

             return array_keys($configList);

         }

 

@@ -162,7 +162,7 @@ 
      * @param string $seperator

      * @return mixed

      */

-    public static function getJustClassName($namespace,$seperator="\\")

+    public static function getJustClassName($namespace, $seperator = "\\")

     {

         $path = explode($seperator, $namespace);

         return array_pop($path);

@@ -173,15 +173,15 @@ 
      * @param array $param

      * @return bool

      */

-    public static function changeClass($class,$param=array())

+    public static function changeClass($class, $param = array())

     {

-        $executionPath=$class;

+        $executionPath = $class;

         $dt = fopen($executionPath, "r");

         $content = fread($dt, filesize($executionPath));

         fclose($dt);

 

-        foreach ($param as $key=>$value){

-            $content=str_replace($key,$value,$content);

+        foreach ($param as $key=>$value) {

+            $content = str_replace($key, $value, $content);

         }

 

         $dt = fopen($executionPath, "w");

@@ -196,9 +196,9 @@ 
      * @param $callback

      * @return mixed

      */

-    public static function returnCallback($data,$callback)

+    public static function returnCallback($data, $callback)

     {

-        return call_user_func_array($callback,[$data]);

+        return call_user_func_array($callback, [$data]);

     }

 

     /**

@@ -207,10 +207,10 @@ 
      */

     public static function getNamespace($namespace)

     {

-        $rootDelete=str_replace(root.''.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'','',$namespace);

+        $rootDelete = str_replace(root.''.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'', '', $namespace);

 

         return 'App\\'.self::generatorNamespace(

-                explode(''.DIRECTORY_SEPARATOR.'',$rootDelete)

+                explode(''.DIRECTORY_SEPARATOR.'', $rootDelete)

             );

 

     }

@@ -221,7 +221,7 @@ 
      */

     public static function callbackProcess($callback)

     {

-        return (is_callable($callback)) ? call_user_func_array($callback,[app()]) : $callback;

+        return (is_callable($callback)) ? call_user_func_array($callback, [app()]) : $callback;

     }

 

     /**

@@ -229,29 +229,29 @@ 
      * @param $array2

      * @return bool

      */

-    public static function array_diff_key_recursive ($array1, $array2)

+    public static function array_diff_key_recursive($array1, $array2)

     {

-        if(count($array1)!==count($array2)) self::$bool[]=false;

+        if (count($array1)!==count($array2)) self::$bool[] = false;

 

-        foreach ($array1 as $array1_key=>$array1_value){

+        foreach ($array1 as $array1_key=>$array1_value) {

 

-            if(!is_array($array1_value)){

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+            if (!is_array($array1_value)) {

+                if (!array_key_exists($array1_key, $array2)) self::$bool[] = false;

             }

-            else{

-                if(!array_key_exists($array1_key,$array2)) self::$bool[]=false;

+            else {

+                if (!array_key_exists($array1_key, $array2)) self::$bool[] = false;

 

-                if(!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key]=[];

+                if (!isset($array2[$array1_key]) OR !is_array($array2[$array1_key])) $array2[$array1_key] = [];

 

-                if(isset($array1_value[0])) $array1_value=$array1_value[0];

+                if (isset($array1_value[0])) $array1_value = $array1_value[0];

 

-                if(isset($array2[$array1_key][0])) $array2[$array1_key]=$array2[$array1_key][0];

+                if (isset($array2[$array1_key][0])) $array2[$array1_key] = $array2[$array1_key][0];

 

-                self::array_diff_key_recursive($array1_value,$array2[$array1_key]);

+                self::array_diff_key_recursive($array1_value, $array2[$array1_key]);

             }

         }

 

-        if(in_array(false,self::$bool)){

+        if (in_array(false, self::$bool)) {

             return false;

         }

         return true;

@@ -263,7 +263,7 @@ 
      */

     public static function slashToBackSlash($data)

     {

-        return str_replace("/","\\",$data);

+        return str_replace("/", "\\", $data);

     }

 

     /**

@@ -271,11 +271,11 @@ 
      * @param null $key

      * @return null

      */

-    public static function trace($debug=0,$key=null)

+    public static function trace($debug = 0, $key = null)

     {

-        $trace=debug_backtrace();

+        $trace = debug_backtrace();

 

-        if($key===null){

+        if ($key===null) {

             return $trace[$debug] ?? null;

         }

         return $trace[$debug][$key] ?? null;

@@ -290,13 +290,13 @@ 
     public  static function chmod_r($dir, $dirPermissions, $filePermissions)

     {

         $dp = opendir($dir);

-        while($file = readdir($dp)) {

-            if (($file == ".") || ($file == ".."))

+        while ($file = readdir($dp)) {

+            if (($file==".") || ($file==".."))

                 continue;

 

             $fullPath = $dir."/".$file;

 

-            if(is_dir($fullPath)) {

+            if (is_dir($fullPath)) {

                 chmod($fullPath, $dirPermissions);

                 self::chmod_r($fullPath, $dirPermissions, $filePermissions);

             } else {

@@ -312,7 +312,7 @@ 
      */

     public static function getServiceConf()

     {

-        if(property_exists(core(),'serviceConf') && defined('methodName')){

+        if (property_exists(core(), 'serviceConf') && defined('methodName')) {

             return core()->serviceConf;

         }

         return [];

@@ -328,17 +328,17 @@ 
      */

     public static function getAllFilesInDirectory($dir, $recursive = true, $basedir = '', $include_dirs = false)

     {

-        if ($dir == '') {return array();} else {$results = array(); $subresults = array();}

-        if (!is_dir($dir)) {$dir = dirname($dir);} // so a files path can be sent

-        if ($basedir == '') {$basedir = realpath($dir).DIRECTORY_SEPARATOR;}

+        if ($dir=='') {return array(); } else {$results = array(); $subresults = array(); }

+        if (!is_dir($dir)) {$dir = dirname($dir); } // so a files path can be sent

+        if ($basedir=='') {$basedir = realpath($dir).DIRECTORY_SEPARATOR; }

 

         $files = scandir($dir);

-        foreach ($files as $key => $value){

-            if ( ($value != '.') && ($value != '..') ) {

+        foreach ($files as $key => $value) {

+            if (($value!='.') && ($value!='..')) {

                 $path = realpath($dir.DIRECTORY_SEPARATOR.$value);

                 if (is_dir($path)) {

                     // optionally include directories in file list

-                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path);}

+                    if ($include_dirs) {$subresults[] = str_replace($basedir, '', $path); }

                     // optionally get file list for all subdirectories

                     if ($recursive) {

                         $subdirresults = self::getAllFilesInDirectory($path, $recursive, $basedir, $include_dirs);

@@ -351,7 +351,7 @@ 
             }

         }

         // merge the subarray to give the list of files then subdirectory files

-        if (count($subresults) > 0) {$results = array_merge($subresults, $results);}

+        if (count($subresults)>0) {$results = array_merge($subresults, $results); }

         return $results;

     }

 

@@ -360,18 +360,18 @@ 
      * @param null $reelPath

      * @return array

      */

-    public static function getPathWithPhpExtension($files,$reelPath=null)

+    public static function getPathWithPhpExtension($files, $reelPath = null)

     {

         $pathWithPhpList = [];

 

-        foreach ($files as $file){

+        foreach ($files as $file) {

 

-            if(preg_match('@(.*).php@is',$file,$pathWithPhp)){

+            if (preg_match('@(.*).php@is', $file, $pathWithPhp)) {

 

-                if($reelPath===null){

+                if ($reelPath===null) {

                     $pathWithPhpList[] = $pathWithPhp[0];

                 }

-                else{

+                else {

                     $pathWithPhpList[] = $reelPath.'/'.$pathWithPhp[0];

                 }

 

@@ -404,7 +404,7 @@ 
      */

     public static function resolverClass($class)

     {

-        if(self::isNamespaceExists($class)){

+        if (self::isNamespaceExists($class)) {

             return app()->resolve($class);

         }

 

@@ -416,8 +416,8 @@ 
      */

     public static function getRequestPathInfo()

     {

-        if(is_null(BootStaticManager::getRequestPath())){

-            return explode("/",request()->getPathInfo());

+        if (is_null(BootStaticManager::getRequestPath())) {

+            return explode("/", request()->getPathInfo());

         }

         return BootStaticManager::getRequestPath();

     }

@@ -427,13 +427,13 @@ 
      * @param null $remove

      * @return array

      */

-    public static function removeTrace($trace,$remove=null)

+    public static function removeTrace($trace, $remove = null)

     {

         $list = [];

 

-        foreach($trace as $key=>$item){

+        foreach ($trace as $key=>$item) {

 

-            if(isset($item['file']) && !preg_match('@'.$remove.'@',$item['file'])){

+            if (isset($item['file']) && !preg_match('@'.$remove.'@', $item['file'])) {

                 $list[$key] = $item;

             }

         }

src/resta/Support/ClosureDispatcher.php

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
      */

     public function call(\Closure $closure)

     {

-        if(!is_null($this->bind))

-            $closure = \Closure::bind($closure, $this->bind, $this->bind);

+        if(!is_null($this->bind)) {

+                    $closure = \Closure::bind($closure, $this->bind, $this->bind);

+        }

         return $closure();

     }

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */

     public function call(\Closure $closure)

     {

-        if(!is_null($this->bind))

+        if (!is_null($this->bind))

             $closure = \Closure::bind($closure, $this->bind, $this->bind);

         return $closure();

     }

bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php

 

 //root definer: application root path

-define("root",str_replace("\\","/",realpath(__DIR__.'/')));

+define("root", str_replace("\\", "/", realpath(__DIR__.'/')));

 

 /**

  * resta system composer vendor autoload.

src/resta/Request/RequestHttpManager.php

Spacing +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
     {

         $inputs = $this->app->get($this->method);

 

-        $content = json_decode($this->app['request']->getContent(),1);

+        $content = json_decode($this->app['request']->getContent(), 1);

 

-        if(is_array($inputs) && count($inputs)){

+        if (is_array($inputs) && count($inputs)) {

             return $inputs;

         }

 

src/resta/Contracts/ContainerContracts.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
      * @param $callback null

      * @return mixed

      */

-    public function bind($object=null,$callback=null);

+    public function bind($object = null, $callback = null);

 

     /**

      * @param $abstract

@@ -37,7 +37,7 @@ 
      * @param $container false

      * @return mixed

      */

-    public function make($object=null,$callback=null,$container=false);

+    public function make($object = null, $callback = null, $container = false);

 

     /**

      * @param $key

@@ -45,14 +45,14 @@ 
      * @param null $concrete

      * @return mixed

      */

-    public function register($key,$object,$concrete=null);

+    public function register($key, $object, $concrete = null);

 

     /**

      * @param null $object

      * @param null $callback

      * @return mixed

      */

-    public function share($object=null,$callback=null);

+    public function share($object = null, $callback = null);

 

     /**

      * @method singleton

@@ -65,7 +65,7 @@ 
      * @param array $bind

      * @return mixed

      */

-    public function resolve($class,$bind=array());

+    public function resolve($class, $bind = array());

 

     /**

      * @param $class

src/resta/Provider/ServiceProvider.php

Spacing +16 added lines, -16 removed lines

@@ -21,11 +21,11 @@ 
      * @param string $provider

      * @param string $method

      */

-    private function applyProvider($key,$provider,$method='register')

+    private function applyProvider($key, $provider, $method = 'register')

     {

         // If the provider classes are a real object

         // we will run them.

-        if(Utils::isNamespaceExists($provider)){

+        if (Utils::isNamespaceExists($provider)) {

 

             // after determining whether the register or boot methods

             // we are running the provider.

@@ -33,12 +33,12 @@ 
             $providerInstance = $this->app->resolve($provider);

 

             //we need to do method check for provider.

-            if(method_exists($providerInstance,$method)){

+            if (method_exists($providerInstance, $method)) {

                 $providerInstance->{$method}();

 

-                if($method=="register"){

+                if ($method=="register") {

                     /** @scrutinizer ignore-call */

-                    $this->app->register('loadedProviders',$key,$provider);

+                    $this->app->register('loadedProviders', $key, $provider);

                 }

             }

         }

@@ -51,12 +51,12 @@ 
      */

     private function assignerLoadedProvidersInitialCoreValue()

     {

-        if(!isset($this->app['loadedProviders'])){

+        if (!isset($this->app['loadedProviders'])) {

 

             // for loaded providers,

             // we register an empty array for the container object.

             /** @scrutinizer ignore-call */

-            $this->app->register('loadedProviders',[]);

+            $this->app->register('loadedProviders', []);

         }

     }

 

@@ -71,7 +71,7 @@ 
         /** @scrutinizer ignore-call */

         $providers = $this->app->serviceProviders();

 

-        if(count($providers)){

+        if (count($providers)) {

             $this->providers = $providers;

         }

 

@@ -85,7 +85,7 @@ 
      */

     public function handle()

     {

-        define ('serviceprovider',true);

+        define('serviceprovider', true);

 

         //check providers and resolve

         $this->resolveProviders($this->getServiceProviders());

@@ -96,28 +96,28 @@ 
      *

      * @param array $providers

      */

-    public function resolveProviders($providers=array())

+    public function resolveProviders($providers = array())

     {

         // for loaded providers,

         // we register an empty array for the container object.

         $this->assignerLoadedProvidersInitialCoreValue();

 

         //first we are running register methods of provider classes.

-        foreach($providers as $key=>$provider){

+        foreach ($providers as $key=>$provider) {

 

             // providers can only be installed once.

             // apply providers and register for kernel

-            if(!isset($this->app['loadedProviders'][$key])){

-                $this->applyProvider($key,$provider);

+            if (!isset($this->app['loadedProviders'][$key])) {

+                $this->applyProvider($key, $provider);

             }

         }

 

         //then we are running boot methods of provider classes.

-        foreach($providers as $key=>$provider){

+        foreach ($providers as $key=>$provider) {

 

             //if the providers register is already booted.

-            if(isset($this->app['loadedProviders'][$key])){

-                $this->applyProvider($key,$provider,'boot');

+            if (isset($this->app['loadedProviders'][$key])) {

+                $this->applyProvider($key, $provider, 'boot');

             }

         }

     }

src/resta/Foundation/Bootstrapper/CustomBooter.php

Spacing +5 added lines, -5 removed lines

@@ -48,20 +48,20 @@ 
 

         //Now, let's get our custom boot list.

         //Let's assign the final state to our booterList list along with our custom boot list.

-        foreach (array_keys($this->getBootDirectory()) as $customBoots){

+        foreach (array_keys($this->getBootDirectory()) as $customBoots) {

 

             //We assign the namespace data of the bootable class to the bootNamespace property.

-            $this->bootNamespace=''.StaticPathList::$boot.'\\'.$customBoots;

+            $this->bootNamespace = ''.StaticPathList::$boot.'\\'.$customBoots;

 

             //Your custom boot objects in

             //the boot directory should not be in the middlewaregroups list.

-            if(false===app()->console() && !in_array($this->bootNamespace,$booterList)){

+            if (false===app()->console() && !in_array($this->bootNamespace, $booterList)) {

                 $this->booterManifest();

             }

         }

 

         //The booterList property combines booterList variables.

-        return array_merge($booterList,$this->booterList);

+        return array_merge($booterList, $this->booterList);

     }

 

     /**

@@ -72,7 +72,7 @@ 
     {

         //if the boot list belongs to the custom booter,

         //then we can boot our custom boot objects by adding them at the end of this class.

-        if(array_pop($booter)==$this->customBooter){

+        if (array_pop($booter)==$this->customBooter) {

             return $this->addCustomBooter();

         }