jaxon-php / jaxon-core

src/Request/Support/CallableObject.php

Spacing +23 added lines, -23 removed lines

@@ -107,15 +107,15 @@ 
     private function makeCallable()
     {
         // Create an instance of the registered class
-        if($this->callableObject == null)
+        if ($this->callableObject == null)
         {
             $di = jaxon()->di();
             // Use the Reflection class to get the parameters of the constructor
-            if(($constructor = $this->reflectionClass->getConstructor()) != null)
+            if (($constructor = $this->reflectionClass->getConstructor()) != null)
             {
                 $parameters = $constructor->getParameters();
                 $parameterInstances = [];
-                foreach($parameters as $parameter)
+                foreach ($parameters as $parameter)
                 {
                     // Get the parameter instance from the DI
                     $parameterInstances[] = $di->get($parameter->getClass()->getName());
@@ -136,7 +136,7 @@ 
      */
     public function getRegisteredObject()
     {
-        if($this->callableObject == null)
+        if ($this->callableObject == null)
         {
             $this->makeCallable();
         }
@@ -164,7 +164,7 @@ 
         // The class name without the namespace.
         $name = $this->reflectionClass->getShortName();
         // Append the classpath to the name
-        if(($this->classpath))
+        if (($this->classpath))
         {
             $name = $this->classpath . '\\' . $name;
         }
@@ -211,16 +211,16 @@ 
     public function getMethods()
     {
         $aReturn = [];
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't take magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't take excluded methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -241,37 +241,37 @@ 
     public function configure($sMethod, $sName, $sValue)
     {
         // Set the namespace
-        if($sName == 'namespace')
+        if ($sName == 'namespace')
         {
-            if($sValue != '')
+            if ($sValue != '')
                 $this->namespace = $sValue;
             return;
         }
         // Set the classpath
-        if($sName == 'classpath')
+        if ($sName == 'classpath')
         {
-            if($sValue != '')
+            if ($sValue != '')
                 $this->classpath = trim($sValue, '\\');
             return;
         }
         // Set the separator
-        if($sName == 'separator')
+        if ($sName == 'separator')
         {
-            if($sValue == '_' || $sValue == '.')
+            if ($sValue == '_' || $sValue == '.')
                 $this->separator = $sValue;
             return;
         }
         // Set the excluded methods
-        if($sName == 'protected')
+        if ($sName == 'protected')
         {
-            if(is_array($sValue))
+            if (is_array($sValue))
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            elseif(is_string($sValue))
+            elseif (is_string($sValue))
                 $this->aProtectedMethods[] = $sValue;
             return;
         }
 
-        if(!isset($this->aConfiguration[$sMethod]))
+        if (!isset($this->aConfiguration[$sMethod]))
         {
             $this->aConfiguration[$sMethod] = [];
         }
@@ -292,16 +292,16 @@ 
 
         // Common options to be set on all methods
         $aCommonConfig = array_key_exists('*', $this->aConfiguration) ? $this->aConfiguration['*'] : [];
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't export magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 0 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 0 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't export "protected" methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -351,14 +351,14 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
+        if (!$this->hasMethod($sMethod))
         {
             return;
         }
         $reflectionMethod = $this->reflectionClass->getMethod($sMethod);
         $callableObject = $this->getRegisteredObject();
         $response = $reflectionMethod->invokeArgs($callableObject, $aArgs);
-        if(($response))
+        if (($response))
         {
             $this->getResponseManager()->append($response);
         }

Braces +15 added lines, -12 removed lines

@@ -121,8 +121,7 @@ 
                     $parameterInstances[] = $di->get($parameter->getClass()->getName());
                 }
                 $this->callableObject = $this->reflectionClass->newInstanceArgs($parameterInstances);
-            }
-            else
+            } else
             {
                 $this->callableObject = $this->reflectionClass->newInstance();
             }
@@ -243,31 +242,35 @@ 
         // Set the namespace
         if($sName == 'namespace')
         {
-            if($sValue != '')
-                $this->namespace = $sValue;
+            if($sValue != '') {
+                            $this->namespace = $sValue;
+            }
             return;
         }
         // Set the classpath
         if($sName == 'classpath')
         {
-            if($sValue != '')
-                $this->classpath = trim($sValue, '\\');
+            if($sValue != '') {
+                            $this->classpath = trim($sValue, '\\');
+            }
             return;
         }
         // Set the separator
         if($sName == 'separator')
         {
-            if($sValue == '_' || $sValue == '.')
-                $this->separator = $sValue;
+            if($sValue == '_' || $sValue == '.') {
+                            $this->separator = $sValue;
+            }
             return;
         }
         // Set the excluded methods
         if($sName == 'protected')
         {
-            if(is_array($sValue))
-                $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            elseif(is_string($sValue))
-                $this->aProtectedMethods[] = $sValue;
+            if(is_array($sValue)) {
+                            $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
+            } elseif(is_string($sValue)) {
+                            $this->aProtectedMethods[] = $sValue;
+            }
             return;
         }
 

src/Factory/Request.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public function setClassName($sClass)
     {
         $sClass = trim($sClass, '.\\ ');
-        if(($sClass))
+        if (($sClass))
         {
             $xCallable = jaxon()->di()->get($sClass);
             $this->sPrefix = $this->getOption('core.prefix.class') . $xCallable->getJsName() . '.';
@@ -83,7 +83,7 @@ 
         array_shift($aArguments);
 
         // Makes legacy code works
-        if(strpos($sFunction, '.') !== false)
+        if (strpos($sFunction, '.') !== false)
         {
             // If there is a dot in the name, then it is a call to a class
             $this->sPrefix = $this->getOption('core.prefix.class');

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
         {
             $xCallable = jaxon()->di()->get($sClass);
             $this->sPrefix = $this->getOption('core.prefix.class') . $xCallable->getJsName() . '.';
-        }
-        else
+        } else
         {
             $this->sPrefix = $this->getOption('core.prefix.function');
         }

Doc Comments +2 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @param string|null            $sClass              The callable class
      *
-     * @return Factory
+     * @return Request
      */
     public function setClassName($sClass)
     {
@@ -58,7 +58,7 @@ 
      *
      * @param CallableObject          $xCallable              The callable object
      *
-     * @return Factory
+     * @return Request
      */
     public function setCallable(CallableObject $xCallable)
     {
@@ -71,7 +71,6 @@ 
      * Return the javascript call to a Jaxon function or object method
      *
      * @param string            $sFunction          The function or method (without class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -100,7 +99,6 @@ 
      * Return the javascript call to a generic function
      *
      * @param string            $sFunction          The function or method (with class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -124,7 +122,6 @@ 
      * @param integer       $nItemsPerPage          The number of items per page page
      * @param integer       $nCurrentPage           The current page
      * @param string        $sMethod                The name of function or a method prepended with its class name
-     * @param ...           $xParams                The parameters of the function or method
      *
      * @return string the pagination links
      */