php-resta / resta-core

src/resta/Support/App.php

Spacing +41 added lines, -41 removed lines

@@ -24,29 +24,29 @@ 
      * @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);

         }

 

@@ -75,7 +75,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);

@@ -103,16 +103,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};

     }

@@ -122,8 +122,8 @@ 
      */

     public function createAppInstance($object)

     {

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

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

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

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

         }

     }

 

@@ -131,9 +131,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);

     }

@@ -153,8 +153,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'];

@@ -181,9 +181,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'];

 

         }

@@ -195,18 +195,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();

@@ -217,17 +217,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);

     }

 

@@ -236,9 +236,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'];

 

         }

@@ -249,13 +249,13 @@ 
      * @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;

+        $saltRouteParameters = $kernel->routeParameters;

 

-        if($param===null){

+        if ($param===null) {

             return $saltRouteParameters;

         }

 

@@ -271,14 +271,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);

Braces +3 added lines, -1 removed lines

@@ -206,7 +206,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();

src/resta/Router/Route.php

Spacing +29 added lines, -29 removed lines

@@ -42,13 +42,13 @@ 
      * @param $urlRoute

      * @return int|string

      */

-    public static function checkArrayEqual($patterns,$urlRoute)

+    public static function checkArrayEqual($patterns, $urlRoute)

     {

         // calculates the equality difference between

         // the route pattern and the urlRoute value.

-        foreach ($patterns as $key=>$pattern){

+        foreach ($patterns as $key=>$pattern) {

 

-            if(Utils::isArrayEqual($pattern,$urlRoute)){

+            if (Utils::isArrayEqual($pattern, $urlRoute)) {

                 return $key;

             }

         }

@@ -68,17 +68,17 @@ 
         // get routes data and the resolving pattern

         // Both are interrelated.

         $routes         = self::getRoutes();

-        $patternResolve = app()->resolve(RouteMatching::class,['route'=>new self()])->getPatternResolve();

+        $patternResolve = app()->resolve(RouteMatching::class, ['route'=>new self()])->getPatternResolve();

 

         //

         self::updateRouteParameters($patternResolve);

 

         //if routes data is available in pattern resolve.

-        if(isset($routes['data'][$patternResolve])){

+        if (isset($routes['data'][$patternResolve])) {

 

             // if the incoming http value is

             // the same as the real request method, the data is processed.

-            if($routes['data'][$patternResolve]['http'] == strtolower(httpMethod)){

+            if ($routes['data'][$patternResolve]['http']==strtolower(httpMethod)) {

 

                 // we are set the solved pattern to a variable.

                 $resolve = $routes['data'][$patternResolve];

@@ -104,24 +104,24 @@ 
     {

         $list = [];

 

-        if(isset(static::$routes['pattern'][$patternResolvedKey])){

+        if (isset(static::$routes['pattern'][$patternResolvedKey])) {

 

             $routeParameters = static::$routes['pattern'][$patternResolvedKey];

             $route = route();

 

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

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

 

-                $param = str_replace('{','',$param);

-                $param = str_replace('?','',$param);

-                $param = str_replace('}','',$param);

+                $param = str_replace('{', '', $param);

+                $param = str_replace('?', '', $param);

+                $param = str_replace('}', '', $param);

 

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

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

                     $list[$param] = $route[$key];

                 }

             }

         }

 

-        app()->register('routeParams',$list);

+        app()->register('routeParams', $list);

     }

 

     /**

@@ -133,7 +133,7 @@ 
     {

         // we will record the path data for the route.

         // We set the routeMapper variables and the route path.

-        self::setPath(function(){

+        self::setPath(function() {

 

             // we are sending

             // the controller and routes.php path.

@@ -145,7 +145,7 @@ 
 

         // in the paths data,

         // we run the route mapper values ​​and the route files one by one.

-        foreach (self::$paths as $mapper=>$controller){

+        foreach (self::$paths as $mapper=>$controller) {

             core()->fileSystem->callFile($mapper);

         }

     }

@@ -159,7 +159,7 @@ 
     {

         $routeDefinitor = call_user_func($callback);

 

-        if(isset($routeDefinitor['controllerPath']) && isset($routeDefinitor['routePath'])){

+        if (isset($routeDefinitor['controllerPath']) && isset($routeDefinitor['routePath'])) {

 

             //the route paths to be saved to the mappers static property.

             static::$mappers['routePaths'][] = $routeDefinitor['routePath'];

@@ -167,22 +167,22 @@ 
 

             // if there is endpoint,

             // then only that endpoint is transferred into the path

-            if(defined('endpoint')){

+            if (defined('endpoint')) {

 

                 $routeName      = endpoint.'Route.php';

                 $routeMapper    = $routeDefinitor['routePath'].''.DIRECTORY_SEPARATOR.''.$routeName;

 

-                if(file_exists($routeMapper) && !isset(static::$paths[$routeMapper])){

+                if (file_exists($routeMapper) && !isset(static::$paths[$routeMapper])) {

                     static::$paths[$routeMapper] = $routeDefinitor['controllerPath'];

                 }

             }

-            else{

+            else {

 

                 // if there is no endpoint,

                 // all files in the path of the route are transferred to path.

                 $allFilesInThatRoutePath = Utils::glob($routeDefinitor['routePath']);

 

-                foreach ($allFilesInThatRoutePath as $item){

+                foreach ($allFilesInThatRoutePath as $item) {

                     static::$paths[$item] = $routeDefinitor['controllerPath'];

                 }

             }

@@ -196,13 +196,13 @@ 
      * @param $function

      * @param null $controller

      */

-    public static function setRoute($params,$function,$controller=null)

+    public static function setRoute($params, $function, $controller = null)

     {

-        [$pattern,$route]   = $params;

-        [$class,$method]    = explode("@",$route);

+        [$pattern, $route]   = $params;

+        [$class, $method]    = explode("@", $route);

 

         $patternList = array_values(

-            array_filter(explode("/",$pattern),'strlen')

+            array_filter(explode("/", $pattern), 'strlen')

         );

 

         static::$routes['pattern'][] = $patternList;

@@ -212,7 +212,7 @@ 
             'http'          => $function,

             'controller'    => $controller,

             'namespace'     => static::$namespace,

-            'endpoint'      => strtolower(str_replace(StaticPathList::$controllerBundleName,'',static::$namespace))

+            'endpoint'      => strtolower(str_replace(StaticPathList::$controllerBundleName, '', static::$namespace))

         ];

     }

 

@@ -222,11 +222,11 @@ 
      * @param null $value

      * @return bool

      */

-    public static function isMatchVaribleRegexPattern($value=null)

+    public static function isMatchVaribleRegexPattern($value = null)

     {

         // determines if the variable that can be used

         // in the route file meets the regex rule.

-        return (preg_match('@\{(.*?)\}@is',$value)) ? true : false;

+        return (preg_match('@\{(.*?)\}@is', $value)) ? true : false;

     }

 

 

@@ -236,11 +236,11 @@ 
      * @param null $value

      * @return bool

      */

-    public static function isOptionalVaribleRegexPattern($value=null)

+    public static function isOptionalVaribleRegexPattern($value = null)

     {

         // determines if the variable that can be used

         // in the route file meets the regex rule.

-        return preg_match('@\{[a-z]+\?\}@is',$value) ? true : false;

+        return preg_match('@\{[a-z]+\?\}@is', $value) ? true : false;

     }

 

 

src/resta/Foundation/ApplicationHelpers.php

Spacing +33 added lines, -33 removed lines

@@ -49,7 +49,7 @@ 
      */

     function applicationKey()

     {

-        if(property_exists($kernel=app()->kernel(),'applicationKey')){

+        if (property_exists($kernel = app()->kernel(), 'applicationKey')) {

             return $kernel->applicationKey;

         }

         return null;

@@ -82,7 +82,7 @@ 
      */

     function bundleName()

     {

-        if(defined('endpoint')){

+        if (defined('endpoint')) {

 

             return endpoint.''.StaticPathList::$controllerBundleName;

         }

@@ -97,11 +97,11 @@ 
      * @param null $default

      * @return mixed|null

      */

-    function config($config=null,$default=null)

+    function config($config = null, $default = null)

     {

         $configResult = app()->config($config);

 

-        if($configResult === null && $default!==null){

+        if ($configResult===null && $default!==null) {

             return $default;

         }

 

@@ -116,9 +116,9 @@ 
      * @param $bind array

      * @return mixed

      */

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

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

     {

-        return app()->singleton()->appClass->container(appInstance(),$class,$bind);

+        return app()->singleton()->appClass->container(appInstance(), $class, $bind);

     }

 }

 

@@ -178,10 +178,10 @@ 
      * @param array $params

      * @return ExceptionContracts

      */

-    function exception($name=null,$params=array())

+    function exception($name = null, $params = array())

     {

-        $exceptionManager=ExceptionManager::class;

-        return app()->resolve($exceptionManager,['name'=>$name,'params'=>$params]);

+        $exceptionManager = ExceptionManager::class;

+        return app()->resolve($exceptionManager, ['name'=>$name, 'params'=>$params]);

     }

 }

 

@@ -191,13 +191,13 @@ 
      * @param null $locale

      * @return Generator

      */

-    function faker($locale=null)

+    function faker($locale = null)

     {

-        if($locale===null){

-            $faker=Factory::create();

+        if ($locale===null) {

+            $faker = Factory::create();

         }

-        else{

-            $faker=Factory::create($locale);

+        else {

+            $faker = Factory::create($locale);

         }

 

         return $faker;

@@ -208,8 +208,8 @@ 
 

     function fingerPrint()

     {

-        return md5(sha1(implode("|",[

-            request()->getClientIp(),$_SERVER['HTTP_USER_AGENT'],applicationKey()

+        return md5(sha1(implode("|", [

+            request()->getClientIp(), $_SERVER['HTTP_USER_AGENT'], applicationKey()

         ])));

     }

 }

@@ -229,10 +229,10 @@ 
      * @param null $default

      * @return null

      */

-    function get($param=null,$default=null)

+    function get($param = null, $default = null)

     {

         //symfony request query object

-        $get=core()->get;

+        $get = core()->get;

 

         return ($param===null) ? $get : (isset($get[$param]) ? $get[$param] : $default);

     }

@@ -245,14 +245,14 @@ 
      * @param null $default

      * @return array

      */

-    function headers($param=null,$default=null)

+    function headers($param = null, $default = null)

     {

-        $list=[];

+        $list = [];

 

         //We only get the objects in the list name to match the header objects

         //that come with the request path to the objects sent by the client

         foreach (request()->headers->all() as $key=>$value) {

-            $list[$key]=$value;

+            $list[$key] = $value;

         }

 

         //return header list

@@ -277,9 +277,9 @@ 
      * @param $file null

      * @return LoggerHandler

      */

-    function logger($file=null)

+    function logger($file = null)

     {

-        return app()->resolve(LoggerHandler::class,['file'=>$file]);

+        return app()->resolve(LoggerHandler::class, ['file'=>$file]);

     }

 }

 

@@ -301,7 +301,7 @@ 
      */

     function response()

     {

-        $object=debug_backtrace()[1]['object'];

+        $object = debug_backtrace()[1]['object'];

         return new ResponseOutManager($object);

     }

 }

@@ -316,9 +316,9 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

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

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

     {

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

+        return app()->resolve($class, $bind);

     }

 }

 

@@ -328,10 +328,10 @@ 
      * @param $key

      * @return mixed

      */

-    function route($key=null)

+    function route($key = null)

     {

-        if(is_null($key)){

-            return array_map(function($route){

+        if (is_null($key)) {

+            return array_map(function($route) {

                 return strtolower($route);

             },app()->singleton()->appClass->route($key));

         }

@@ -359,10 +359,10 @@ 
      * @param null $default

      * @return mixed

      */

-    function post($param=null,$default=null)

+    function post($param = null, $default = null)

     {

         //symfony request query object

-        $post=core()->post;

+        $post = core()->post;

 

         return ($param===null) ? $post : (isset($post[$param]) ? $post[$param] : $default);

     }

@@ -393,8 +393,8 @@ 
      * @param array $select

      * @return mixed

      */

-    function trans($lang,$select=array())

+    function trans($lang, $select = array())

     {

-        return app()->singleton()->appClass->translator($lang,$select);

+        return app()->singleton()->appClass->translator($lang, $select);

     }

 }
\ No newline at end of file