jaxon-php / jaxon-core

src/Di/Traits/RegisterTrait.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
      */
     private function setDiAttributes($xRegisteredObject, array $aDiOptions)
     {
-        foreach($aDiOptions as $sName => $sClass)
+        foreach ($aDiOptions as $sName => $sClass)
         {
             // Set the protected attributes of the object
             $cSetter = function($xInjectedObject) use($sName) {
@@ -63,7 +63,7 @@ 
         $this->setDiAttributes($xRegisteredObject, $aDiOptions);
 
         // Set the Jaxon request target in the helper
-        if($xRegisteredObject instanceof CallableClass)
+        if ($xRegisteredObject instanceof CallableClass)
         {
             // Set the protected attributes of the object
             $cSetter = function() use($xTarget) {
@@ -91,13 +91,13 @@ 
         $sReflectionClass = $sClassName . '_ReflectionClass';
 
         // Prevent duplication
-        if($this->h($sReflectionClass)) // It's important not to use the class name here.
+        if ($this->h($sReflectionClass)) // It's important not to use the class name here.
         {
             return;
         }
 
         // Make sure the registered class exists
-        if(isset($aOptions['include']))
+        if (isset($aOptions['include']))
         {
             require_once($aOptions['include']);
         }
@@ -106,7 +106,7 @@ 
         {
             $this->val($sReflectionClass, new ReflectionClass($sClassName));
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.invalid', ['name' => $sClassName]);
@@ -130,7 +130,7 @@ 
         });
 
         // Register the user class, but only if the user already didn't.
-        if(!$this->h($sClassName))
+        if (!$this->h($sClassName))
         {
             $this->set($sClassName, function($c) use($sReflectionClass) {
                 return $this->make($c->g($sReflectionClass));
@@ -138,7 +138,7 @@ 
         }
         // Initialize the user class instance
         $this->extend($sClassName, function($xRegisteredObject, $c) use($sCallableObject, $sClassName) {
-            if($xRegisteredObject instanceof CallableClass)
+            if ($xRegisteredObject instanceof CallableClass)
             {
                 // Set the protected attributes of the object
                 $cSetter = function($c, $sClassName) {
@@ -151,7 +151,7 @@ 
 
             // Run the callbacks for class initialisation
             $aCallbacks = $c->g(CallbackManager::class)->getInitCallbacks();
-            foreach($aCallbacks as $xCallback)
+            foreach ($aCallbacks as $xCallback)
             {
                 call_user_func($xCallback, $xRegisteredObject);
             }

src/Plugin/Request/CallableClass/CallableObjectOptions.php

Switch Indentation +37 added lines, -37 removed lines

@@ -173,36 +173,36 @@ 
         switch($sName)
         {
         // Set the separator
-        case 'separator':
-            if($xValue === '_' || $xValue === '.')
-            {
-                $this->sSeparator = $xValue;
-            }
-            break;
-        // Set the protected methods
-        case 'protected':
-            if(is_array($xValue))
-            {
-                $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
-            }
-            break;
-        // Set the methods to call before processing the request
-        case '__before':
-            $this->setHookMethods($this->aBeforeMethods, $xValue);
-            break;
-        // Set the methods to call after processing the request
-        case '__after':
-            $this->setHookMethods($this->aAfterMethods, $xValue);
-            break;
-        // Set the attributes to inject in the callable object
-        case '__di':
-            $this->addDiOption($xValue);
-            break;
-        case 'excluded':
-            $this->bExcluded = (bool)$xValue;
-            break;
-        default:
-            break;
+            case 'separator':
+                if($xValue === '_' || $xValue === '.')
+                {
+                    $this->sSeparator = $xValue;
+                }
+                break;
+            // Set the protected methods
+            case 'protected':
+                if(is_array($xValue))
+                {
+                    $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
+                }
+                break;
+            // Set the methods to call before processing the request
+            case '__before':
+                $this->setHookMethods($this->aBeforeMethods, $xValue);
+                break;
+            // Set the methods to call after processing the request
+            case '__after':
+                $this->setHookMethods($this->aAfterMethods, $xValue);
+                break;
+            // Set the attributes to inject in the callable object
+            case '__di':
+                $this->addDiOption($xValue);
+                break;
+            case 'excluded':
+                $this->bExcluded = (bool)$xValue;
+                break;
+            default:
+                break;
         }
     }
 
@@ -251,13 +251,13 @@ 
         switch($sOptionName)
         {
         // For databags, all the value are merged in a single array.
-        case 'bags':
-            $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);
-            return;
-        // For all the other options, including callback, only the last value is kept.
-        case 'callback':
-        default:
-            $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);
+            case 'bags':
+                $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);
+                return;
+            // For all the other options, including callback, only the last value is kept.
+            case 'callback':
+            default:
+                $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
 

Spacing +17 added lines, -19 removed lines

@@ -139,13 +139,13 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue)
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = $xMethodToCall;
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = [$xMethodToCall];
             }
@@ -170,18 +170,18 @@ 
      */
     public function addOption(string $sName, $xValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the separator
         case 'separator':
-            if($xValue === '_' || $xValue === '.')
+            if ($xValue === '_' || $xValue === '.')
             {
                 $this->sSeparator = $xValue;
             }
             break;
         // Set the protected methods
         case 'protected':
-            if(is_array($xValue))
+            if (is_array($xValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
             }
@@ -199,7 +199,7 @@ 
             $this->addDiOption($xValue);
             break;
         case 'excluded':
-            $this->bExcluded = (bool)$xValue;
+            $this->bExcluded = (bool) $xValue;
             break;
         default:
             break;
@@ -215,11 +215,11 @@ 
      */
     private function _addJsArrayOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        if(is_string($xOptionValue))
+        if (is_string($xOptionValue))
         {
             $xOptionValue = [$xOptionValue];
         }
-        if(!is_array($xOptionValue))
+        if (!is_array($xOptionValue))
         {
             return; // Do not save.
         }
@@ -248,7 +248,7 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         // For databags, all the value are merged in a single array.
         case 'bags':
@@ -269,12 +269,11 @@ 
      */
     private function addFunctionOptions(string $sFunctionName, array $aFunctionOptions)
     {
-        foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+        foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
         {
             substr($sOptionName, 0, 2) === '__' ?
                 // Options for PHP classes. They start with "__".
-                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) :
-                // Options for javascript code.
+                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) : // Options for javascript code.
                 $this->addJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
@@ -292,15 +291,15 @@ 
         $this->addOption('separator', $aOptions['separator']);
         $this->addOption('protected', array_merge($aOptions['protected'], $aAnnotationProtected));
 
-        foreach($aOptions['functions'] as $sNames => $aFunctionOptions)
+        foreach ($aOptions['functions'] as $sNames => $aFunctionOptions)
         {
             $aFunctionNames = explode(',', $sNames); // Names are in comma-separated list.
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
             }
         }
-        foreach($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
         {
             $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
         }
@@ -317,12 +316,11 @@ 
         $aOptions = array_merge($this->aJsOptions['*'] ?? []); // Clone the array
         // Then add the method options.
         $aMethodOptions = $this->aJsOptions[$sMethodName] ?? [];
-        foreach($aMethodOptions as $sOptionName => $xOptionValue)
+        foreach ($aMethodOptions as $sOptionName => $xOptionValue)
         {
             // For databags, merge the values in a single array.
             // For all the other options, including callback, keep the last value.
-            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue :
-                array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
+            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue : array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
         }
         return $aOptions;
     }

src/Plugin/Request/CallableClass/CallableObject.php

Spacing +4 added lines, -4 removed lines

@@ -113,8 +113,8 @@ 
         $aMethods = $this->getPublicMethods($aProtectedMethods);
         $aProperties = $this->getProperties();
         $aAnnotations = $xAnnotationReader->getAttributes($sClassName, $aMethods, $aProperties);
-        [$bExcluded,] = $aAnnotations;
-        if($bExcluded)
+        [$bExcluded, ] = $aAnnotations;
+        if ($bExcluded)
         {
             $this->configure('excluded', true);
             return;
@@ -304,11 +304,11 @@ 
         $sMethod = $this->xTarget->getMethodName();
         // The hooks defined at method level are merged with those defined at class level.
         $aMethods = array_merge($aHookMethods['*'] ?? [], $aHookMethods[$sMethod] ?? []);
-        foreach($aMethods as $xKey => $xValue)
+        foreach ($aMethods as $xKey => $xValue)
         {
             $sHookName = $xValue;
             $aHookArgs = [];
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $sHookName = $xKey;
                 $aHookArgs = is_array($xValue) ? $xValue : [$xValue];