php-resta / resta-core

src/resta/Contracts/ApplicationContracts.php

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/Container/Container.php

Spacing +58 added lines, -58 removed lines

@@ -7,12 +7,12 @@ 
 use Resta\Contracts\ContainerContracts;

 use Resta\Container\ContainerKernelAssigner;

 

-class Container implements ContainerContracts,\ArrayAccess

+class Container implements ContainerContracts, \ArrayAccess

 {

     /**

      * @var $singleton

      */

-    public $singleton=false;

+    public $singleton = false;

 

     /**

      * @var $kernel

@@ -22,7 +22,7 @@ 
     /**

      * @var array  $instance

      */

-    private static $instance=[];

+    private static $instance = [];

 

     /**

      * @var array $instances

@@ -32,7 +32,7 @@ 
     /**

      * @var array $bindParams

      */

-    private static $bindParams=[];

+    private static $bindParams = [];

 

     /**

      * @var $unregister

@@ -42,19 +42,19 @@ 
     /**

      * @var array

      */

-    protected $values=[];

+    protected $values = [];

 

     /**

      * @param $make

      * @param array $bind

      * @return array

      */

-    public function applicationProviderBinding($make,$bind=array())

+    public function applicationProviderBinding($make, $bind = array())

     {

         //service container is an automatic application provider

         //that we can bind to the special class di in the dependency condition.

         //This method is automatically added to the classes resolved by the entire make bind method.

-        return array_merge($bind,['app'=>$make]);

+        return array_merge($bind, ['app'=>$make]);

     }

 

     /**

@@ -65,12 +65,12 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

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

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

     {

         //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object.

         //Otherwise, when the bind object and callback are sent, the closure class inherits

         //the applicationProvider object and the resolve method is called

-        return $this->make($object,$callback,'container');

+        return $this->make($object, $callback, 'container');

     }

 

     /**

@@ -82,16 +82,16 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

-    private function build($object,$callback,$sync=false)

+    private function build($object, $callback, $sync = false)

     {

         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($sync===false) return $this->consoleKernelObjectChecker($object,$callback);

+        if ($sync===false) return $this->consoleKernelObjectChecker($object, $callback);

 

         //the value corresponding to the bind value for the global object is assigned and

         //the resolve method is called for the dependency injection.

-        $this->kernelAssigner()->setKernelObject($object,$callback);

+        $this->kernelAssigner()->setKernelObject($object, $callback);

 

         //return kernel object

         return $this->kernel();

@@ -106,11 +106,11 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

-    private function consoleKernelObject($object,$callback,$container=false)

+    private function consoleKernelObject($object, $callback, $container = false)

     {

         //we use the console bindings class to specify the classes to be preloaded in the console application.

         //Thus, classes that can not be bound with http are called without closure in global loaders directory.

-        $this->resolve(ConsoleBindings::class)->console($object,$callback,$container);

+        $this->resolve(ConsoleBindings::class)->console($object, $callback, $container);

 

         //The console application must always return the kernel method.

         return $this->kernel();

@@ -125,7 +125,7 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

-    private function consoleKernelObjectChecker($object,$callback,$container=false)

+    private function consoleKernelObjectChecker($object, $callback, $container = false)

     {

         //we check whether the callback value is a callable function.

         $isCallableForCallback = is_callable($callback);

@@ -133,10 +133,10 @@ 
         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object,$callback,$container);

+        if ($this->console() AND $isCallableForCallback) return $this->consoleKernelObject($object, $callback, $container);

 

         //If the application is not a console operation, we re-bind to existing methods synchronously.

-        return ($container) ? $this->containerBuild($object,$callback,true) : $this->build($object,$callback,true);

+        return ($container) ? $this->containerBuild($object, $callback, true) : $this->build($object, $callback, true);

     }

 

     /**

@@ -146,11 +146,11 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

-    private function consoleShared($object,$callback)

+    private function consoleShared($object, $callback)

     {

         //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound.

         //The work to be done here is to bind the classes to be included in the console share privately.

-        $this->kernelAssigner()->consoleShared($object,$callback);

+        $this->kernelAssigner()->consoleShared($object, $callback);

     }

 

     /**

@@ -162,12 +162,12 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

-    public function containerBuild($object,$callback,$sync=false)

+    public function containerBuild($object, $callback, $sync = false)

     {

         //If the console object returns true,

         //we do not cancel binding operations

         //We are getting what applies to console with consoleKernelObject.

-        if($sync===false) return $this->consoleKernelObjectChecker($object,$callback,true);

+        if ($sync===false) return $this->consoleKernelObjectChecker($object, $callback, true);

 

         //Since the objects that come to the build method are objects from the container method,

         //we need to automatically create a kernel object named serviceContainer in this method.

@@ -175,7 +175,7 @@ 
 

         //the value corresponding to the bind value for the global object is assigned and

         //the resolve method is called for the dependency method.

-        $this->kernelAssigner()->setKernelObject($object,$callback,'serviceContainer');

+        $this->kernelAssigner()->setKernelObject($object, $callback, 'serviceContainer');

 

         //return kernel object

         return $this->kernel();

@@ -185,11 +185,11 @@ 
      * @param $class

      * @param $bind

      */

-    private function contextualBindCleaner($class,$bind)

+    private function contextualBindCleaner($class, $bind)

     {

         //the context bind objects are checked again and the bind sequence submitted by

         //the user is checked and forced to re-instantiate the object.

-        if(isset(self::$instance[$class]) && self::$bindParams[$class]!==$bind){

+        if (isset(self::$instance[$class]) && self::$bindParams[$class]!==$bind) {

             unset(self::$instance[$class]);

             unset(self::$bindParams[$class]);

         }

@@ -208,11 +208,11 @@ 
 

         // the has method can have a dotted string value so

         // we need to be able to control the string or array within the container.

-        foreach (explode(".",$abstract) as $item){

-            if(isset($container[$item])){

+        foreach (explode(".", $abstract) as $item) {

+            if (isset($container[$item])) {

                 $container = $container[$item];

             }

-            else{

+            else {

                 return null;

             }

         }

@@ -235,11 +235,11 @@ 
 

         // the has method can have a dotted string value so

         // we need to be able to control the string or array within the container.

-        foreach (explode(".",$abstract) as $item){

+        foreach (explode(".", $abstract) as $item) {

 

             // this blog will work

             // if the data in the container loop points to an array.

-            if(!is_array($container)){

+            if (!is_array($container)) {

 

                 // we are querying the value of

                 // the items corresponding to the dotted value in the container.

@@ -247,7 +247,7 @@ 
                 $container = $container[$item];

                 $bools[] = is_null($container) ? false : true;

             }

-            else{

+            else {

 

                 // if the container array corresponds to a string,

                 // the bools array is filled with the isset control directly.

@@ -257,7 +257,7 @@ 
 

         // the method returns false if the bools sequence is false,

         // otherwise it will return true.

-        return in_array(false,$bools) ? false : true;

+        return in_array(false, $bools) ? false : true;

     }

 

     /**

@@ -307,7 +307,7 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

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

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

     {

         //we check whether the boolean value of the singleton variable used

         //for booting does not reset every time the object variable to be assigned to the kernel variable is true

@@ -315,8 +315,8 @@ 
 

         //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound.

         //The work to be done here is to bind the classes to be included in the console share privately.

-        if($container){

-            $this->consoleShared($object,$callback);

+        if ($container) {

+            $this->consoleShared($object, $callback);

         }

 

         //If the third parameter passed to the bind method carries a container value,

@@ -326,7 +326,7 @@ 
         //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object.

         //Otherwise, when the bind object and callback are sent, the closure class inherits

         //the applicationProvider object and the resolve method is called

-        return ($object===null) ? $this->kernel() : $this->{$makeBuild}($object,$callback);

+        return ($object===null) ? $this->kernel() : $this->{$makeBuild}($object, $callback);

     }

 

     /**

@@ -343,7 +343,7 @@ 
      */

     public function offsetGet($offset) {

 

-        return $this->resolve($this->instances['containerInstanceResolve'],[

+        return $this->resolve($this->instances['containerInstanceResolve'], [

             'instances' => $this->instances

         ])->{$offset}();

     }

@@ -367,7 +367,7 @@ 
      * @param null $concrete

      * @return bool|mixed

      */

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

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

     {

         // we assign the values ​​required

         // for register to the global value variable.

@@ -377,7 +377,7 @@ 
 

         // If there is an instance of the application class,

         // the register method is saved both in this example and in the global.

-        if(defined('appInstance')){

+        if (defined('appInstance')) {

 

             // where we will assign both the global instance

             // and the registered application object.

@@ -396,19 +396,19 @@ 
      * @param bool $withConcrete

      * @return bool

      */

-    private function registerProcess($instance,$withConcrete=false)

+    private function registerProcess($instance, $withConcrete = false)

     {

         // values recorded without concrete.

         // or values deleted

-        if(false===$withConcrete){

+        if (false===$withConcrete) {

 

             //values registered without concrete

-            $instance->{$this->values['key']}=$this->values['object'];

+            $instance->{$this->values['key']} = $this->values['object'];

             return false;

         }

 

         //values registered with concrete

-        $instance->{$this->values['key']}[$this->values['object']]=$this->values['concrete'];

+        $instance->{$this->values['key']}[$this->values['object']] = $this->values['concrete'];

     }

 

     /**

@@ -419,22 +419,22 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

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

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

     {

         //the context bind objects are checked again and the bind sequence submitted by

         //the user is checked and forced to re-instantiate the object.

-        $this->contextualBindCleaner($class,$bind);

+        $this->contextualBindCleaner($class, $bind);

 

         //We do an instance check to get the static instance values of

         //the classes to be resolved with the make bind method.

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

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

 

             //bind params object

-            self::$bindParams[$class]=$bind;

+            self::$bindParams[$class] = $bind;

 

             //By singleton checking, we solve the dependency injection of the given class.

             //Thus, each class can be called together with its dependency.

-            self::$instance[$class] = DIContainerManager::make($class,$this->applicationProviderBinding($this,self::$bindParams[$class]));

+            self::$instance[$class] = DIContainerManager::make($class, $this->applicationProviderBinding($this, self::$bindParams[$class]));

             $this->singleton()->resolved[$class] = self::$instance[$class];

 

             //return resolve class

@@ -452,9 +452,9 @@ 
      * @param $class

      * @return mixed

      */

-    public function resolved($class){

+    public function resolved($class) {

 

-        if(isset($this['resolved'][$class])){

+        if (isset($this['resolved'][$class])) {

             return $this['resolved'][$class];

         }

 

@@ -469,7 +469,7 @@ 
      * @throws \DI\DependencyException

      * @throws \DI\NotFoundException

      */

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

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

     {

         //we check whether the boolean value of the singleton variable used

         //for booting does not reset every time the object variable to be assigned to the kernel variable is true

@@ -477,12 +477,12 @@ 
 

         //The console share is evaluated as a true variable to be assigned as the 3rd parameter in the classes to be bound.

         //The work to be done here is to bind the classes to be included in the console share privately.

-        $this->consoleShared($object,$callback);

+        $this->consoleShared($object, $callback);

 

         //If the bind method does not have parameters object and callback, the value is directly assigned to the kernel object.

         //Otherwise, when the bind object and callback are sent, the closure class inherits

         //the applicationProvider object and the resolve method is called

-        return ($object===null) ? $this->kernel() : $this->build($object,$callback);

+        return ($object===null) ? $this->kernel() : $this->build($object, $callback);

 

     }

 

@@ -502,7 +502,7 @@ 
      */

     public function singleton()

     {

-        if($this->singleton===false){

+        if ($this->singleton===false) {

 

             //after first initializing, the singleton variable is set to true,

             //and subsequent incoming classes can inherit the loaded object.

@@ -523,12 +523,12 @@ 
         // for application instance

         // if the values ​​to be saved are to be saved without the concrete,

         // if it is an array.

-        if($this->values['concrete']===null) {

+        if ($this->values['concrete']===null) {

 

             // Without concrete,

             // the saved value will be saved

             // if the it does not exist in application instance.

-            if(!isset($instance->{$this->values['key']})) {

+            if (!isset($instance->{$this->values['key']})) {

                 $this->registerProcess($instance);

             }

             return false;

@@ -536,7 +536,7 @@ 
 

         // We send concrete values to be recorded with concrete as true.

         // these values will be recorded as a array.

-        $this->registerProcess($instance,true);

+        $this->registerProcess($instance, true);

     }

 

     /**

@@ -544,11 +544,11 @@ 
      * @param null|string $object

      * @return mixed

      */

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

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

     {

         // object null is

         // sent to just terminate a key.

-        if($object===null){

+        if ($object===null) {

             unset(core()->{$key});

             return false;

         }

src/resta/Exception/ExceptionTrace.php

Spacing +25 added lines, -25 removed lines

@@ -14,13 +14,13 @@ 
      * @param null $name

      * @param array $params

      */

-    public function __construct($app,$name=null,$params=array())

+    public function __construct($app, $name = null, $params = array())

     {

         parent::__construct($app);

 

         // we help the user to pull a special message from

         // the translate section to be specified by the user for the exception.

-        $this->exceptionTranslate($name,$params);

+        $this->exceptionTranslate($name, $params);

 

         // for real file path with

         // debug backtrace method are doing follow.

@@ -33,13 +33,13 @@ 
      * @param $name

      * @param array $params

      */

-    private function exceptionTranslate($name,$params=array())

+    private function exceptionTranslate($name, $params = array())

     {

-        if($name!==null){

-            if(count($params)){

-                $this->app->register('exceptionTranslateParams',$name,$params);

+        if ($name!==null) {

+            if (count($params)) {

+                $this->app->register('exceptionTranslateParams', $name, $params);

             }

-            $this->app->register('exceptionTranslate',$name);

+            $this->app->register('exceptionTranslate', $name);

         }

     }

 

@@ -50,23 +50,23 @@ 
      */

     public function debugBackTrace()

     {

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

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

 

-            if(isset(debug_backtrace()[$key],debug_backtrace()[$key]['file']))

+            if (isset(debug_backtrace()[$key], debug_backtrace()[$key]['file']))

             {

-                $this->app->register('exceptionFile',debug_backtrace()[$key]['file']);

-                $this->app->register('exceptionLine',debug_backtrace()[$key]['line']);

+                $this->app->register('exceptionFile', debug_backtrace()[$key]['file']);

+                $this->app->register('exceptionLine', debug_backtrace()[$key]['line']);

             }

 

             Dependencies::loadBootstrapperNeedsForException();

 

-            if(isset($value['file']) && isset(core()->urlComponent)){

-                if(preg_match('@'.core()->urlComponent['project'].'|boot|providers@',$value['file'])){

+            if (isset($value['file']) && isset(core()->urlComponent)) {

+                if (preg_match('@'.core()->urlComponent['project'].'|boot|providers@', $value['file'])) {

 

                     $this->app->terminate('exceptionFile');

                     $this->app->terminate('exceptionLine');

-                    $this->app->register('exceptionFile',$value['file']);

-                    $this->app->register('exceptionLine',$value['line']);

+                    $this->app->register('exceptionFile', $value['file']);

+                    $this->app->register('exceptionLine', $value['line']);

 

                     break;

                 }

@@ -88,7 +88,7 @@ 
      * @param $name

      * @param null|string $msg

      */

-    public function customException($name,$msg=null)

+    public function customException($name, $msg = null)

     {

         //We use the magic method for the exception and

         //call the exception class in the application to get the instance.

@@ -97,20 +97,20 @@ 
 

         // first, you are looking for an exception

         // in the application directory class.

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

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

             $callNamespace = new $nameNamespace;

         }

-        else{

+        else {

 

             // if you do not have an exception in the application directory,

             // this time we are looking for an exception in the core directory.

             $nameNamespace = __NAMESPACE__.'\\'.$nameException;

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

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

                 $callNamespace = new $nameNamespace;

             }

         }

 

-        if(isset($callNamespace)){

+        if (isset($callNamespace)) {

 

             // we will set the information about the exception trace,

             // and then bind it specifically to the event method.

@@ -122,19 +122,19 @@ 
 

 

             // we register the custom exception trace value with the global kernel object.

-            $this->app->register('exceptiontrace',$customExceptionTrace);

+            $this->app->register('exceptiontrace', $customExceptionTrace);

 

             //If the developer wants to execute an event when calling a special exception,

             //we process the event method.

-            if(method_exists($callNamespace,'event')){

+            if (method_exists($callNamespace, 'event')) {

                 $callNamespace->event($customExceptionTrace);

             }

 

             //throw exception

-            if($msg===null){

+            if ($msg===null) {

                 throw new $callNamespace;

             }

-            else{

+            else {

                 throw new $callNamespace($msg);

             }

 

@@ -149,6 +149,6 @@ 
      */

     public function __call($name, $arguments)

     {

-        $this->customException($name,current($arguments));

+        $this->customException($name, current($arguments));

     }

 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -99,8 +99,7 @@ 
         // in the application directory class.

         if(Utils::isNamespaceExists($nameNamespace)){

             $callNamespace = new $nameNamespace;

-        }

-        else{

+        } else{

 

             // if you do not have an exception in the application directory,

             // this time we are looking for an exception in the core directory.

@@ -133,8 +132,7 @@ 
             //throw exception

             if($msg===null){

                 throw new $callNamespace;

-            }

-            else{

+            } else{

                 throw new $callNamespace($msg);

             }