jaxon-php / jaxon-core

src/Request/Support/CallableRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
      * @param string        $sClassName            The class name of the callable object
      * @param array         $aOptions              The callable object options
      *
-     * @return object
+     * @return null|CallableObject
      */
     protected function _getCallableObject($sClassName, array $aOptions)
     {

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 namespace Jaxon\Request\Support;
 
 use Jaxon\Request\Request;
-
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 // use RegexIterator;

Spacing +39 added lines, -39 removed lines

@@ -93,19 +93,19 @@ 
     private function getClassOptions($sClassName, array $aDirectoryOptions, array $aDefaultOptions = [])
     {
         $aOptions = $aDefaultOptions;
-        if(key_exists('separator', $aDirectoryOptions))
+        if (key_exists('separator', $aDirectoryOptions))
         {
             $aOptions['separator'] = $aDirectoryOptions['separator'];
         }
-        if(key_exists('protected', $aDirectoryOptions))
+        if (key_exists('protected', $aDirectoryOptions))
         {
             $aOptions['protected'] = $aDirectoryOptions['protected'];
         }
-        if(key_exists('*', $aDirectoryOptions))
+        if (key_exists('*', $aDirectoryOptions))
         {
             $aOptions = array_merge($aOptions, $aDirectoryOptions['*']);
         }
-        if(key_exists($sClassName, $aDirectoryOptions))
+        if (key_exists($sClassName, $aDirectoryOptions))
         {
             $aOptions = array_merge($aOptions, $aDirectoryOptions[$sClassName]);
         }
@@ -125,17 +125,17 @@ 
         $itDir = new RecursiveDirectoryIterator($sDirectory);
         $itFile = new RecursiveIteratorIterator($itDir);
         // Iterate on dir content
-        foreach($itFile as $xFile)
+        foreach ($itFile as $xFile)
         {
             // skip everything except PHP files
-            if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+            if (!$xFile->isFile() || $xFile->getExtension() != 'php')
             {
                 continue;
             }
 
             $aClassOptions = [];
             // No more classmap autoloading. The file will be included when needed.
-            if(($aOptions['autoload']))
+            if (($aOptions['autoload']))
             {
                 $aClassOptions['include'] = $xFile->getPathname();
             }
@@ -156,7 +156,7 @@ 
     public function addNamespace($sNamespace, array $aOptions)
     {
         // Separator default value
-        if(!key_exists('separator', $aOptions))
+        if (!key_exists('separator', $aOptions))
         {
             $aOptions['separator'] = '.';
         }
@@ -172,7 +172,7 @@ 
      */
     private function getOptionsFromClass($sClassName)
     {
-        if(!key_exists($sClassName, $this->aClassOptions))
+        if (!key_exists($sClassName, $this->aClassOptions))
         {
             return null; // Class not registered
         }
@@ -190,18 +190,18 @@ 
     private function getOptionsFromNamespace($sClassName, $sNamespace = null)
     {
         // Find the corresponding namespace
-        if($sNamespace == null)
+        if ($sNamespace == null)
         {
-            foreach(array_keys($this->aNamespaceOptions) as $_sNamespace)
+            foreach (array_keys($this->aNamespaceOptions) as $_sNamespace)
             {
-                if(substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\')
+                if (substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\')
                 {
                     $sNamespace = $_sNamespace;
                     break;
                 }
             }
         }
-        if($sNamespace == null)
+        if ($sNamespace == null)
         {
             return null; // Class not registered
         }
@@ -209,7 +209,7 @@ 
         // Get the class options
         $aOptions = $this->aNamespaceOptions[$sNamespace];
         $aDefaultOptions = []; // ['namespace' => $aOptions['namespace']];
-        if(key_exists('separator', $aOptions))
+        if (key_exists('separator', $aOptions))
         {
             $aDefaultOptions['separator'] = $aOptions['separator'];
         }
@@ -227,11 +227,11 @@ 
     protected function _getCallableObject($sClassName, array $aOptions)
     {
         // Make sure the registered class exists
-        if(key_exists('include', $aOptions))
+        if (key_exists('include', $aOptions))
         {
             require_once($aOptions['include']);
         }
-        if(!class_exists($sClassName))
+        if (!class_exists($sClassName))
         {
             return null;
         }
@@ -239,13 +239,13 @@ 
         // Create the callable object
         $xCallableObject = new \Jaxon\Request\Support\CallableObject($sClassName);
         $this->aCallableOptions[$sClassName] = [];
-        foreach($aOptions as $sName => $xValue)
+        foreach ($aOptions as $sName => $xValue)
         {
-            if($sName == 'separator' || $sName == 'protected')
+            if ($sName == 'separator' || $sName == 'protected')
             {
                 $xCallableObject->configure($sName, $xValue);
             }
-            elseif(is_array($xValue) && $sName != 'include')
+            elseif (is_array($xValue) && $sName != 'include')
             {
                 // These options are to be included in javascript code.
                 $this->aCallableOptions[$sClassName][$sName] = $xValue;
@@ -254,12 +254,12 @@ 
         $this->aCallableObjects[$sClassName] = $xCallableObject;
 
         // Register the request factory for this callable object
-        jaxon()->di()->set($sClassName . '_Factory_Rq', function () use ($sClassName) {
+        jaxon()->di()->set($sClassName . '_Factory_Rq', function() use ($sClassName) {
             $xCallableObject = $this->aCallableObjects[$sClassName];
             return new \Jaxon\Factory\Request\Portable($xCallableObject);
         });
         // Register the paginator factory for this callable object
-        jaxon()->di()->set($sClassName . '_Factory_Pg', function () use ($sClassName) {
+        jaxon()->di()->set($sClassName . '_Factory_Pg', function() use ($sClassName) {
             $xCallableObject = $this->aCallableObjects[$sClassName];
             return new \Jaxon\Factory\Request\Paginator($xCallableObject);
         });
@@ -280,17 +280,17 @@ 
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\');
 
-        if(key_exists($sClassName, $this->aCallableObjects))
+        if (key_exists($sClassName, $this->aCallableObjects))
         {
             return $this->aCallableObjects[$sClassName];
         }
 
         $aOptions = $this->getOptionsFromClass($sClassName);
-        if($aOptions === null)
+        if ($aOptions === null)
         {
             $aOptions = $this->getOptionsFromNamespace($sClassName);
         }
-        if($aOptions === null)
+        if ($aOptions === null)
         {
             return null;
         }
@@ -306,9 +306,9 @@ 
     private function createCallableObjects()
     {
         // Create callable objects for registered classes
-        foreach($this->aClassOptions as $sClassName => $aClassOptions)
+        foreach ($this->aClassOptions as $sClassName => $aClassOptions)
         {
-            if(!key_exists($sClassName, $this->aCallableObjects))
+            if (!key_exists($sClassName, $this->aCallableObjects))
             {
                 $this->_getCallableObject($sClassName, $aClassOptions);
             }
@@ -316,9 +316,9 @@ 
 
         // Create callable objects for registered namespaces
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aOptions)
         {
-            if(key_exists($sNamespace, $this->aNamespaces))
+            if (key_exists($sNamespace, $this->aNamespaces))
             {
                 continue;
             }
@@ -329,10 +329,10 @@ 
             $sDirectory = $aOptions['directory'];
             $itDir = new RecursiveDirectoryIterator($sDirectory);
             $itFile = new RecursiveIteratorIterator($itDir);
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -341,7 +341,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath != '')
+                if ($sRelativePath != '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -349,7 +349,7 @@ 
                 $this->aNamespaces[$sClassPath] = ['separator' => $aOptions['separator']];
                 $sClassName = $sClassPath . '\\' . $xFile->getBasename('.php');
 
-                if(!key_exists($sClassName, $this->aCallableObjects))
+                if (!key_exists($sClassName, $this->aCallableObjects))
                 {
                     $aClassOptions = $this->getOptionsFromNamespace($sClassName, $sNamespace);
                     $this->_getCallableObject($sClassName, $aClassOptions);
@@ -382,11 +382,11 @@ 
         $this->createCallableObjects();
 
         $sHash = '';
-        foreach($this->aNamespaces as $sNamespace => $aOptions)
+        foreach ($this->aNamespaces as $sNamespace => $aOptions)
         {
             $sHash .= $sNamespace . $aOptions['separator'];
         }
-        foreach($this->aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($this->aCallableObjects as $sClassName => $xCallableObject)
         {
             $sHash .= $sClassName . implode('|', $xCallableObject->getMethods());
         }
@@ -407,16 +407,16 @@ 
 
         $aJsClasses = [];
         $sCode = '';
-        foreach(array_keys($this->aNamespaces) as $sNamespace)
+        foreach (array_keys($this->aNamespaces) as $sNamespace)
         {
             $offset = 0;
             $sJsNamespace = str_replace('\\', '.', $sNamespace);
             $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsNamespace, 0, $dotPosition);
                 // Generate code for this object
-                if(!key_exists($sJsClass, $aJsClasses))
+                if (!key_exists($sJsClass, $aJsClasses))
                 {
                     $sCode .= "$sPrefix$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -425,13 +425,13 @@ 
             }
         }
 
-        foreach($this->aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($this->aCallableObjects as $sClassName => $xCallableObject)
         {
             $aConfig = $this->aCallableOptions[$sClassName];
             $aCommonConfig = key_exists('*', $aConfig) ? $aConfig['*'] : [];
 
             $aMethods = [];
-            foreach($xCallableObject->getMethods() as $sMethodName)
+            foreach ($xCallableObject->getMethods() as $sMethodName)
             {
                 // Specific options for this method
                 $aMethodConfig = key_exists($sMethodName, $aConfig) ?

src/Request/Plugin/CallableDir.php

Spacing +9 added lines, -9 removed lines

@@ -105,33 +105,33 @@ 
      */
     public function register($sType, $sDirectory, $aOptions)
     {
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sDirectory) || !is_dir($sDirectory))
+        if (!is_string($sDirectory) || !is_dir($sDirectory))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['namespace' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
 
         $sDirectory = rtrim(trim($sDirectory), DIRECTORY_SEPARATOR);
-        if(!is_dir($sDirectory))
+        if (!is_dir($sDirectory))
         {
             return false;
         }
         $aOptions['directory'] = realpath($sDirectory);
 
         $sNamespace = key_exists('namespace', $aOptions) ? $aOptions['namespace'] : '';
-        if(!($sNamespace = trim($sNamespace, ' \\')))
+        if (!($sNamespace = trim($sNamespace, ' \\')))
         {
             $sNamespace = '';
         }
@@ -145,17 +145,17 @@ 
 
         // Change the keys in $aOptions to have "\" as separator
         $_aOptions = [];
-        foreach($aOptions as $sName => $aOption)
+        foreach ($aOptions as $sName => $aOption)
         {
             $sName = trim(str_replace('.', '\\', $sName), ' \\');
             $_aOptions[$sName] = $aOption;
         }
         $aOptions = $_aOptions;
 
-        if(($sNamespace))
+        if (($sNamespace))
         {
             // Register the dir with PSR4 autoloading
-            if(($this->xAutoloader))
+            if (($this->xAutoloader))
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }