php-resta / resta-core

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/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();

         }

 

src/resta/Contracts/ApplicationContracts.php

Indentation +10 added lines, -10 removed lines

@@ -39,18 +39,18 @@ 
     /**

      * @return mixed

      */

-   public function console();

+    public function console();

 

     /**

      * @return mixed

      */

-   public function corePath();

+    public function corePath();

 

     /**

      * @param array $environment

      * @return mixed

      */

-   public function environment($environment=array());

+    public function environment($environment=array());

 

     /**

      * @param $abstract

@@ -61,7 +61,7 @@ 
     /**

      * @return mixed

      */

-   public function handle();

+    public function handle();

 

     /**

      * @param $abstract

@@ -74,12 +74,12 @@ 
      * @param $instance

      * @return mixed

      */

-   public function instance ($abstract,$instance);

+    public function instance ($abstract,$instance);

 

     /**

      * @return mixed

      */

-   public function isLocale();

+    public function isLocale();

 

     /**

      * @method kernel

@@ -90,12 +90,12 @@ 
     /**

      * @return array

      */

-   public function kernelGroupKeys();

+    public function kernelGroupKeys();

 

     /**

      * @return array

      */

-   public function kernelGroupList();

+    public function kernelGroupList();

 

     /**

      * @param callable $callback

@@ -160,7 +160,7 @@ 
      * @param string $path

      * @return mixed

      */

-   public function setPaths($name,$path);

+    public function setPaths($name,$path);

 

     /**

      * @param null $object

@@ -178,5 +178,5 @@ 
     /**

      * @return mixed

      */

-   public function version();

+    public function version();

 }
\ No newline at end of file

Spacing +11 added lines, -11 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 $object

@@ -23,7 +23,7 @@ 
      * @param array $arguments

      * @return mixed

      */

-    public function command($command,$arguments=array());

+    public function command($command, $arguments = array());

 

     /**

      * @return array

@@ -50,7 +50,7 @@ 
      * @param array $environment

      * @return mixed

      */

-   public function environment($environment=array());

+   public function environment($environment = array());

 

     /**

      * @param $abstract

@@ -74,7 +74,7 @@ 
      * @param $instance

      * @return mixed

      */

-   public function instance ($abstract,$instance);

+   public function instance($abstract, $instance);

 

     /**

      * @return mixed

@@ -107,7 +107,7 @@ 
      * @param array $loaders

      * @return mixed

      */

-    public function loadIfNotExistBoot($loaders=array());

+    public function loadIfNotExistBoot($loaders = array());

 

     /**

      * @method bind

@@ -116,7 +116,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 $maker

@@ -140,14 +140,14 @@ 
      * @param mixed $concrete

      * @return mixed

      */

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

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

 

     /**

      * @param $class

      * @param array $bind

      * @return mixed

      */

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

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

 

     /**

      * @param $class

@@ -170,14 +170,14 @@ 
      * @param string $path

      * @return mixed

      */

-   public function setPaths($name,$path);

+   public function setPaths($name, $path);

 

     /**

      * @param null $object

      * @param null $callback

      * @return mixed

      */

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

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

 

     /**

      * @method singleton

@@ -190,7 +190,7 @@ 
      * @param null|string $object

      * @return mixed

      */

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

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

 

     /**

      * @return mixed

src/resta/Url/UrlVersionIdentifier.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
      */

     public static function clientVersion()

     {

-        if(defined('version')){

+        if (defined('version')) {

             return version;

         }

 

@@ -44,7 +44,7 @@ 
      */

     public static function getConsoleVersion()

     {

-        if(Utils::isNamespaceExists(self::versionNamespace()) && method_exists(self::versionNamespace(),'consoleVersion')){

+        if (Utils::isNamespaceExists(self::versionNamespace()) && method_exists(self::versionNamespace(), 'consoleVersion')) {

             return self::versionNamespace()::consoleVersion();

         }

 

@@ -55,9 +55,9 @@ 
      * @param array $versions

      * @return array

      */

-    private static function getSupportedVersions($versions=array())

+    private static function getSupportedVersions($versions = array())

     {

-        if(count($versions)){

+        if (count($versions)) {

             return $versions;

         }

         return self::$supportedVersions;

@@ -69,7 +69,7 @@ 
      * @param array $versions

      * @return mixed

      */

-    public static function supportedVersions($versions=array())

+    public static function supportedVersions($versions = array())

     {

         return self::versionNamespace()::getSupportedVersions($versions);

     }

@@ -81,11 +81,11 @@ 
      */

     public static function version()

     {

-        if(self::clientVersion()!==null){

+        if (self::clientVersion()!==null) {

             return self::clientVersion();

         }

 

-        if(app()->console() && self::getConsoleVersion()!==null){

+        if (app()->console() && self::getConsoleVersion()!==null) {

             return self::getConsoleVersion();

         }

 

@@ -99,7 +99,7 @@ 
      */

     public static function versionNamespace()

     {

-        if(file_exists(app()->path()->kernel())){

+        if (file_exists(app()->path()->kernel())) {

             return app()->namespace()->kernel().'\Version';

         }