jaxon-php / jaxon-mono

jaxon-examples/examples/pagination-component/code.php

Indentation +6 added lines, -6 removed lines

@@ -4,17 +4,17 @@
 
 class PageContent extends PageComponent
 {
-   /**
-    * @inheritDoc
-    */
+    /**
+     * @inheritDoc
+     */
     protected function limit(): int
     {
         return 10;
     }
 
-   /**
-    * @inheritDoc
-    */
+    /**
+     * @inheritDoc
+     */
     protected function count(): int
     {
         return 150;

jaxon-examples/examples/html-attributes/code.php

Indentation +15 added lines, -15 removed lines

@@ -4,23 +4,23 @@
 
 class PageContent extends PageComponent
 {
-   /**
-    * @inheritDoc
-    */
-   protected function limit(): int
-   {
-       return 10;
-   }
+    /**
+     * @inheritDoc
+     */
+    protected function limit(): int
+    {
+        return 10;
+    }
 
-   /**
-    * @inheritDoc
-    */
-   protected function count(): int
-   {
-       return 150;
-   }
+    /**
+     * @inheritDoc
+     */
+    protected function count(): int
+    {
+        return 150;
+    }
 
-   public function html():  string
+    public function html():  string
     {
         return 'Showing page number ' . $this->currentPage();
     }

jaxon-examples/examples/plugins/code.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
     public function sayHello(bool $isCaps, bool $bNotify = true)
     {
         $text = $isCaps ? 'HELLO WORLD!' : 'Hello World!';
-        if(($bNotify))
+        if (($bNotify))
         {
             // $this->response->confirmCommands(2, 'Skip text assignement?');
             $this->response->assign('div2', 'innerHTML', $text);
@@ -26,7 +26,7 @@ 
 
     public function setColor(string $sColor, bool $bNotify = true)
     {
-        if(($bNotify))
+        if (($bNotify))
         {
             // $this->response->confirmCommands(1, 'Skip color assignement?');
             $this->response->assign('div2', 'style.color', $sColor);

Braces +2 added lines, -4 removed lines

@@ -16,8 +16,7 @@ 
             $this->response->assign('div2', 'innerHTML', $text);
             // $this->response->confirmCommands(1, 'Skip text notification?');
             $this->response->dialog->success("div2 text is now $text");
-        }
-        else
+        } else
         {
             // $this->response->confirmCommands(1, 'Skip text assignement?');
             $this->response->assign('div2', 'innerHTML', $text);
@@ -32,8 +31,7 @@ 
             $this->response->assign('div2', 'style.color', $sColor);
             // $this->response->confirmCommands(1, 'Skip color assignement?');
             $this->response->dialog->success("div2 color is now $sColor");
-        }
-        else
+        } else
         {
             // $this->response->confirmCommands(1, 'Skip color assignement?');
             $this->response->assign('div2', 'style.color', $sColor);

jaxon-examples/examples/config/code.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
         $text = $isCaps ? 'HELLO WORLD!' : 'Hello World!';
         $xResponse = jaxon()->newResponse();
         $xResponse->assign('div2', 'innerHTML', $text);
-        if(($bNotify))
+        if (($bNotify))
             $xResponse->dialog->success("div2 text is now $text");
     }
 
@@ -15,7 +15,7 @@ 
     {
         $xResponse = jaxon()->newResponse();
         $xResponse->assign('div2', 'style.color', $sColor);
-        if(($bNotify))
+        if (($bNotify))
             $xResponse->dialog->success("div2 color is now $sColor");
     }
 

Braces +6 added lines, -4 removed lines

@@ -7,16 +7,18 @@
         $text = $isCaps ? 'HELLO WORLD!' : 'Hello World!';
         $xResponse = jaxon()->newResponse();
         $xResponse->assign('div2', 'innerHTML', $text);
-        if(($bNotify))
-            $xResponse->dialog->success("div2 text is now $text");
+        if(($bNotify)) {
+                    $xResponse->dialog->success("div2 text is now $text");
+        }
     }
 
     public function setColor(string $sColor, bool $bNotify = true)
     {
         $xResponse = jaxon()->newResponse();
         $xResponse->assign('div2', 'style.color', $sColor);
-        if(($bNotify))
-            $xResponse->dialog->success("div2 color is now $sColor");
+        if(($bNotify)) {
+                    $xResponse->dialog->success("div2 color is now $sColor");
+        }
     }
 
     public function showDialog()

jaxon-examples/public/index.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 $menus = menu_entries();
 $example = menu_current();
-if(isset($menus[$example]))
+if (isset($menus[$example]))
 {
     renderExample($example);
     exit();

jaxon-examples/public/ajax.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 $menus = menu_entries();
 $example = menu_current();
-if(isset($menus[$example]))
+if (isset($menus[$example]))
 {
     require dirname(__DIR__) . "/examples/$example/code.php";
 

jaxon-utils/src/Http/UriDetector.php

Spacing +24 added lines, -24 removed lines

@@ -43,16 +43,16 @@ 
      */
     private function setScheme(array $aServerParams): void
     {
-        if(isset($this->aUrl['scheme']))
+        if (isset($this->aUrl['scheme']))
         {
             return;
         }
-        if(isset($aServerParams['HTTP_SCHEME']))
+        if (isset($aServerParams['HTTP_SCHEME']))
         {
             $this->aUrl['scheme'] = $aServerParams['HTTP_SCHEME'];
             return;
         }
-        if((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
+        if ((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
             (isset($aServerParams['HTTP_X_FORWARDED_SSL']) && $aServerParams['HTTP_X_FORWARDED_SSL'] === 'on') ||
             (isset($aServerParams['HTTP_X_FORWARDED_PROTO']) && $aServerParams['HTTP_X_FORWARDED_PROTO'] === 'https'))
         {
@@ -72,11 +72,11 @@ 
      */
     private function setHostFromServer(array $aServerParams, string $sKey): void
     {
-        if(isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
+        if (isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
         {
             return;
         }
-        if(strpos($aServerParams[$sKey], ':') === false)
+        if (strpos($aServerParams[$sKey], ':') === false)
         {
             $this->aUrl['host'] = $aServerParams[$sKey];
             return;
@@ -95,11 +95,11 @@ 
         $this->setHostFromServer($aServerParams, 'HTTP_X_FORWARDED_HOST');
         $this->setHostFromServer($aServerParams, 'HTTP_HOST');
         $this->setHostFromServer($aServerParams, 'SERVER_NAME');
-        if(empty($this->aUrl['host']))
+        if (empty($this->aUrl['host']))
         {
             throw new UriException();
         }
-        if(empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
+        if (empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
         {
             $this->aUrl['port'] = $aServerParams['SERVER_PORT'];
         }
@@ -112,16 +112,16 @@ 
      */
     private function setPath(array $aServerParams): void
     {
-        if(isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
+        if (isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
         {
             unset($this->aUrl['path']);
         }
-        if(isset($this->aUrl['path']))
+        if (isset($this->aUrl['path']))
         {
             return;
         }
         $aPath = parse_url($aServerParams['PATH_INFO'] ?? ($aServerParams['PHP_SELF'] ?? ''));
-        if(isset($aPath['path']))
+        if (isset($aPath['path']))
         {
             $this->aUrl['path'] = $aPath['path'];
         }
@@ -140,12 +140,12 @@ 
      */
     private function getUser(): string
     {
-        if(empty($this->aUrl['user']))
+        if (empty($this->aUrl['user']))
         {
             return '';
         }
         $sUrl = $this->aUrl['user'];
-        if(isset($this->aUrl['pass']))
+        if (isset($this->aUrl['pass']))
         {
             $sUrl .= ':' . $this->aUrl['pass'];
         }
@@ -157,7 +157,7 @@ 
      */
     private function getPort(): string
     {
-        if(isset($this->aUrl['port']) &&
+        if (isset($this->aUrl['port']) &&
             (($this->aUrl['scheme'] === 'http' && $this->aUrl['port'] != 80) ||
                 ($this->aUrl['scheme'] === 'https' && $this->aUrl['port'] != 443)))
         {
@@ -173,7 +173,7 @@ 
      */
     private function setQuery(array $aServerParams): void
     {
-        if(empty($this->aUrl['query']))
+        if (empty($this->aUrl['query']))
         {
             $this->aUrl['query'] = $aServerParams['QUERY_STRING'] ?? '';
         }
@@ -184,19 +184,19 @@ 
      */
     private function getQuery(): string
     {
-        if(empty($this->aUrl['query']))
+        if (empty($this->aUrl['query']))
         {
             return '';
         }
         $aQueries = explode('&', $this->aUrl['query']);
-        foreach($aQueries as $sKey => $sQuery)
+        foreach ($aQueries as $sKey => $sQuery)
         {
-            if(substr($sQuery, 0, 11) === 'jxnGenerate')
+            if (substr($sQuery, 0, 11) === 'jxnGenerate')
             {
                 unset($aQueries[$sKey]);
             }
         }
-        if(empty($aQueries))
+        if (empty($aQueries))
         {
             return '';
         }
@@ -215,7 +215,7 @@ 
     {
         $this->aUrl = [];
         // Try to get the request URL
-        if(isset($aServerParams['REQUEST_URI']))
+        if (isset($aServerParams['REQUEST_URI']))
         {
             $this->aUrl = parse_url($aServerParams['REQUEST_URI']);
         }
@@ -255,17 +255,17 @@ 
     {
         $aQueryParts = [];
         parse_str($sQueryPart, $aQueryParts);
-        if(empty($aQueryParts))
+        if (empty($aQueryParts))
         {
             // Couldn't break up the query, but there's one there.
             // Possibly "http://url/page.html?query1234" type of query?
             // Try to get data from the server environment var.
             parse_str($aServerParams['QUERY_STRING'] ?? '', $aQueryParts);
         }
-        if(($aQueryParts))
+        if (($aQueryParts))
         {
             $aNewQueryParts = [];
-            foreach($aQueryParts as $sKey => $sValue)
+            foreach ($aQueryParts as $sKey => $sValue)
             {
                 $aNewQueryParts[] = $this->makeQueryPart($sQueryPart, $sKey, $sValue);
             }
@@ -288,13 +288,13 @@ 
         // Can't just use parse_url() cos we could be dealing with a relative URL which parse_url() can't deal with.
         $sURL = trim($sURL);
         $nQueryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-        if($nQueryStart === false)
+        if ($nQueryStart === false)
         {
             return $sURL;
         }
         $nQueryStart++;
         $nQueryEnd = strpos($sURL, '#', $nQueryStart);
-        if($nQueryEnd === false)
+        if ($nQueryEnd === false)
         {
             $nQueryEnd = strlen($sURL);
         }

Switch Indentation +196 added lines, -196 removed lines

@@ -29,40 +29,40 @@ 
 
 class UriDetector
 {
-    /**
+/**
      * The URL components
      *
      * @var array
      */
-    protected $aUrl;
+protected $aUrl;
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      */
-    private function setScheme(array $aServerParams): void
-    {
-        if(isset($this->aUrl['scheme']))
-        {
-            return;
-        }
-        if(isset($aServerParams['HTTP_SCHEME']))
-        {
-            $this->aUrl['scheme'] = $aServerParams['HTTP_SCHEME'];
-            return;
-        }
-        if((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
-            (isset($aServerParams['HTTP_X_FORWARDED_SSL']) && $aServerParams['HTTP_X_FORWARDED_SSL'] === 'on') ||
-            (isset($aServerParams['HTTP_X_FORWARDED_PROTO']) && $aServerParams['HTTP_X_FORWARDED_PROTO'] === 'https'))
-        {
-            $this->aUrl['scheme'] = 'https';
-            return;
-        }
-        $this->aUrl['scheme'] = 'http';
-    }
+private function setScheme(array $aServerParams): void
+{
+if(isset($this->aUrl['scheme']))
+{
+return;
+}
+if(isset($aServerParams['HTTP_SCHEME']))
+{
+$this->aUrl['scheme'] = $aServerParams['HTTP_SCHEME'];
+return;
+}
+if((isset($aServerParams['HTTPS']) && strtolower($aServerParams['HTTPS']) === 'on') ||
+(isset($aServerParams['HTTP_X_FORWARDED_SSL']) && $aServerParams['HTTP_X_FORWARDED_SSL'] === 'on') ||
+(isset($aServerParams['HTTP_X_FORWARDED_PROTO']) && $aServerParams['HTTP_X_FORWARDED_PROTO'] === 'https'))
+{
+$this->aUrl['scheme'] = 'https';
+return;
+}
+$this->aUrl['scheme'] = 'http';
+}
 
-    /**
+/**
      * Get the URL from the $aServerParams var
      *
      * @param array $aServerParams The server environment variables
@@ -70,140 +70,140 @@ 
      *
      * @return void
      */
-    private function setHostFromServer(array $aServerParams, string $sKey): void
-    {
-        if(isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
-        {
-            return;
-        }
-        if(strpos($aServerParams[$sKey], ':') === false)
-        {
-            $this->aUrl['host'] = $aServerParams[$sKey];
-            return;
-        }
-        list($this->aUrl['host'], $this->aUrl['port']) = explode(':', $aServerParams[$sKey]);
-    }
+private function setHostFromServer(array $aServerParams, string $sKey): void
+{
+if(isset($this->aUrl['host']) || empty($aServerParams[$sKey]))
+{
+return;
+}
+if(strpos($aServerParams[$sKey], ':') === false)
+{
+$this->aUrl['host'] = $aServerParams[$sKey];
+return;
+}
+list($this->aUrl['host'], $this->aUrl['port']) = explode(':', $aServerParams[$sKey]);
+}
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      * @throws UriException
      */
-    private function setHost(array $aServerParams): void
-    {
-        $this->setHostFromServer($aServerParams, 'HTTP_X_FORWARDED_HOST');
-        $this->setHostFromServer($aServerParams, 'HTTP_HOST');
-        $this->setHostFromServer($aServerParams, 'SERVER_NAME');
-        if(empty($this->aUrl['host']))
-        {
-            throw new UriException();
-        }
-        if(empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
-        {
-            $this->aUrl['port'] = $aServerParams['SERVER_PORT'];
-        }
-    }
+private function setHost(array $aServerParams): void
+{
+$this->setHostFromServer($aServerParams, 'HTTP_X_FORWARDED_HOST');
+$this->setHostFromServer($aServerParams, 'HTTP_HOST');
+$this->setHostFromServer($aServerParams, 'SERVER_NAME');
+if(empty($this->aUrl['host']))
+{
+throw new UriException();
+}
+if(empty($this->aUrl['port']) && isset($aServerParams['SERVER_PORT']))
+{
+$this->aUrl['port'] = $aServerParams['SERVER_PORT'];
+}
+}
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      */
-    private function setPath(array $aServerParams): void
-    {
-        if(isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
-        {
-            unset($this->aUrl['path']);
-        }
-        if(isset($this->aUrl['path']))
-        {
-            return;
-        }
-        $aPath = parse_url($aServerParams['PATH_INFO'] ?? ($aServerParams['PHP_SELF'] ?? ''));
-        if(isset($aPath['path']))
-        {
-            $this->aUrl['path'] = $aPath['path'];
-        }
-    }
+private function setPath(array $aServerParams): void
+{
+if(isset($this->aUrl['path']) && strlen(basename($this->aUrl['path'])) === 0)
+{
+unset($this->aUrl['path']);
+}
+if(isset($this->aUrl['path']))
+{
+return;
+}
+$aPath = parse_url($aServerParams['PATH_INFO'] ?? ($aServerParams['PHP_SELF'] ?? ''));
+if(isset($aPath['path']))
+{
+$this->aUrl['path'] = $aPath['path'];
+}
+}
 
-    /**
+/**
      * @return string
      */
-    private function getPath(): string
-    {
-        return '/' . ltrim($this->aUrl['path'], '/');
-    }
+private function getPath(): string
+{
+return '/' . ltrim($this->aUrl['path'], '/');
+}
 
-    /**
+/**
      * @return string
      */
-    private function getUser(): string
-    {
-        if(empty($this->aUrl['user']))
-        {
-            return '';
-        }
-        $sUrl = $this->aUrl['user'];
-        if(isset($this->aUrl['pass']))
-        {
-            $sUrl .= ':' . $this->aUrl['pass'];
-        }
-        return $sUrl . '@';
-    }
+private function getUser(): string
+{
+if(empty($this->aUrl['user']))
+{
+return '';
+}
+$sUrl = $this->aUrl['user'];
+if(isset($this->aUrl['pass']))
+{
+$sUrl .= ':' . $this->aUrl['pass'];
+}
+return $sUrl . '@';
+}
 
-    /**
+/**
      * @return string
      */
-    private function getPort(): string
-    {
-        if(isset($this->aUrl['port']) &&
-            (($this->aUrl['scheme'] === 'http' && $this->aUrl['port'] != 80) ||
-                ($this->aUrl['scheme'] === 'https' && $this->aUrl['port'] != 443)))
-        {
-            return ':' . $this->aUrl['port'];
-        }
-        return '';
-    }
+private function getPort(): string
+{
+if(isset($this->aUrl['port']) &&
+(($this->aUrl['scheme'] === 'http' && $this->aUrl['port'] != 80) ||
+    ($this->aUrl['scheme'] === 'https' && $this->aUrl['port'] != 443)))
+{
+return ':' . $this->aUrl['port'];
+}
+return '';
+}
 
-    /**
+/**
      * @param array $aServerParams The server environment variables
      *
      * @return void
      */
-    private function setQuery(array $aServerParams): void
-    {
-        if(empty($this->aUrl['query']))
-        {
-            $this->aUrl['query'] = $aServerParams['QUERY_STRING'] ?? '';
-        }
-    }
+private function setQuery(array $aServerParams): void
+{
+if(empty($this->aUrl['query']))
+{
+$this->aUrl['query'] = $aServerParams['QUERY_STRING'] ?? '';
+}
+}
 
-    /**
+/**
      * @return string
      */
-    private function getQuery(): string
-    {
-        if(empty($this->aUrl['query']))
-        {
-            return '';
-        }
-        $aQueries = explode('&', $this->aUrl['query']);
-        foreach($aQueries as $sKey => $sQuery)
-        {
-            if(substr($sQuery, 0, 11) === 'jxnGenerate')
-            {
-                unset($aQueries[$sKey]);
-            }
-        }
-        if(empty($aQueries))
-        {
-            return '';
-        }
-        return '?' . implode("&", $aQueries);
-    }
+private function getQuery(): string
+{
+if(empty($this->aUrl['query']))
+{
+return '';
+}
+$aQueries = explode('&', $this->aUrl['query']);
+foreach($aQueries as $sKey => $sQuery)
+{
+if(substr($sQuery, 0, 11) === 'jxnGenerate')
+{
+    unset($aQueries[$sKey]);
+}
+}
+if(empty($aQueries))
+{
+return '';
+}
+return '?' . implode("&", $aQueries);
+}
 
-    /**
+/**
      * Detect the URI of the current request
      *
      * @param array $aServerParams The server environment variables
@@ -211,70 +211,70 @@ 
      * @return string
      * @throws UriException
      */
-    public function detect(array $aServerParams): string
-    {
-        $this->aUrl = [];
-        // Try to get the request URL
-        if(isset($aServerParams['REQUEST_URI']))
-        {
-            $this->aUrl = parse_url($aServerParams['REQUEST_URI']);
-        }
+public function detect(array $aServerParams): string
+{
+$this->aUrl = [];
+// Try to get the request URL
+if(isset($aServerParams['REQUEST_URI']))
+{
+$this->aUrl = parse_url($aServerParams['REQUEST_URI']);
+}
 
-        // Fill in the empty values
-        $this->setScheme($aServerParams);
-        $this->setHost($aServerParams);
-        $this->setPath($aServerParams);
-        $this->setQuery($aServerParams);
+// Fill in the empty values
+$this->setScheme($aServerParams);
+$this->setHost($aServerParams);
+$this->setPath($aServerParams);
+$this->setQuery($aServerParams);
 
-        // Build the URL: Start with scheme, user and pass
-        return $this->aUrl['scheme'] . '://' . $this->getUser() . $this->aUrl['host'] .
-            $this->getPort() . str_replace(['"', "'", '<', '>'],
-                ['%22', '%27', '%3C', '%3E'], $this->getPath() . $this->getQuery());
-    }
+// Build the URL: Start with scheme, user and pass
+return $this->aUrl['scheme'] . '://' . $this->getUser() . $this->aUrl['host'] .
+$this->getPort() . str_replace(['"', "'", '<', '>'],
+    ['%22', '%27', '%3C', '%3E'], $this->getPath() . $this->getQuery());
+}
 
-    /**
+/**
      * @param string $sQueryPart
      * @param string $sKey
      * @param string $sValue
      *
      * @return string
      */
-    private function makeQueryPart(string $sQueryPart, string $sKey, string $sValue): string
-    {
-        return $sValue === '' && strpos($sQueryPart, "$sKey=") === false ?
-            rawurlencode($sKey) : rawurlencode($sKey) . '=' . rawurlencode($sValue);
-    }
+private function makeQueryPart(string $sQueryPart, string $sKey, string $sValue): string
+{
+return $sValue === '' && strpos($sQueryPart, "$sKey=") === false ?
+rawurlencode($sKey) : rawurlencode($sKey) . '=' . rawurlencode($sValue);
+}
 
-    /**
+/**
      * @param string $sQueryPart
      * @param array $aServerParams
      *
      * @return string
      */
-    private function parseQueryPart(string $sQueryPart, array $aServerParams): string
-    {
-        $aQueryParts = [];
-        parse_str($sQueryPart, $aQueryParts);
-        if(empty($aQueryParts))
-        {
-            // Couldn't break up the query, but there's one there.
-            // Possibly "http://url/page.html?query1234" type of query?
-            // Try to get data from the server environment var.
-            parse_str($aServerParams['QUERY_STRING'] ?? '', $aQueryParts);
-        }
-        if(($aQueryParts))
-        {
-            $aNewQueryParts = [];
-            foreach($aQueryParts as $sKey => $sValue)
-            {
-                $aNewQueryParts[] = $this->makeQueryPart($sQueryPart, $sKey, $sValue);
-            }
-            return '?' . implode('&', $aNewQueryParts);
-        }
-        return trim($sQueryPart);
-    }
+private function parseQueryPart(string $sQueryPart, array $aServerParams): string
+{
+$aQueryParts = [];
+parse_str($sQueryPart, $aQueryParts);
+if(empty($aQueryParts))
+{
+// Couldn't break up the query, but there's one there.
+// Possibly "http://url/page.html?query1234" type of query?
+// Try to get data from the server environment var.
+parse_str($aServerParams['QUERY_STRING'] ?? '', $aQueryParts);
+}
+if(($aQueryParts))
+{
+$aNewQueryParts = [];
+foreach($aQueryParts as $sKey => $sValue)
+{
+    $aNewQueryParts[] = $this->makeQueryPart($sQueryPart, $sKey, $sValue);
+}
+return '?' . implode('&', $aNewQueryParts);
+}
+return trim($sQueryPart);
+}
 
-    /**
+/**
      * Make the specified URL suitable for redirect
      *
      * @param string $sURL The relative or fully qualified URL
@@ -282,23 +282,23 @@ 
      *
      * @return string
      */
-    public function redirect(string $sURL, array $aServerParams): string
-    {
-        // We need to parse the query part so that the values are rawurlencode()'ed.
-        // Can't just use parse_url() cos we could be dealing with a relative URL which parse_url() can't deal with.
-        $sURL = trim($sURL);
-        $nQueryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-        if($nQueryStart === false)
-        {
-            return $sURL;
-        }
-        $nQueryStart++;
-        $nQueryEnd = strpos($sURL, '#', $nQueryStart);
-        if($nQueryEnd === false)
-        {
-            $nQueryEnd = strlen($sURL);
-        }
-        $sQueryPart = substr($sURL, $nQueryStart, $nQueryEnd - $nQueryStart);
-        return str_replace('?' . $sQueryPart, $this->parseQueryPart($sQueryPart, $aServerParams), $sURL);
-    }
+public function redirect(string $sURL, array $aServerParams): string
+{
+// We need to parse the query part so that the values are rawurlencode()'ed.
+// Can't just use parse_url() cos we could be dealing with a relative URL which parse_url() can't deal with.
+$sURL = trim($sURL);
+$nQueryStart = strpos($sURL, '?', strrpos($sURL, '/'));
+if($nQueryStart === false)
+{
+return $sURL;
+}
+$nQueryStart++;
+$nQueryEnd = strpos($sURL, '#', $nQueryStart);
+if($nQueryEnd === false)
+{
+$nQueryEnd = strlen($sURL);
+}
+$sQueryPart = substr($sURL, $nQueryStart, $nQueryEnd - $nQueryStart);
+return str_replace('?' . $sQueryPart, $this->parseQueryPart($sQueryPart, $aServerParams), $sURL);
+}
 }

jaxon-utils/src/Template/Context.php

Spacing +5 added lines, -6 removed lines

@@ -138,13 +138,13 @@ 
         // Get the namespace name
         $namespace = $this->__default_namespace__;
         $separatorPosition = strrpos($template, '::');
-        if($separatorPosition !== false)
+        if ($separatorPosition !== false)
         {
             $namespace = substr($template, 0, $separatorPosition);
             $template = substr($template, $separatorPosition + 2);
         }
         // Check if the namespace is defined
-        if(!isset($this->__namespaces__[$namespace]))
+        if (!isset($this->__namespaces__[$namespace]))
         {
             return $template;
         }
@@ -165,13 +165,13 @@ 
     {
         // Get the template path
         $templatePath = $this->__path();
-        if(!@is_readable($templatePath))
+        if (!@is_readable($templatePath))
         {
             return '';
         }
 
         // Save the template properties.
-        foreach($vars as $name => $value)
+        foreach ($vars as $name => $value)
         {
             $this->__set((string)$name, $value);
         }
@@ -182,8 +182,7 @@ 
             include $templatePath;
             $content = ob_get_clean();
 
-            return $this->__extends__ === null ? $content :
-                // Render the extended template with the same properties.
+            return $this->__extends__ === null ? $content : // Render the extended template with the same properties.
                 $this->__extends__->__render($this->__properties__);
         };
 

Switch Indentation +100 added lines, -100 removed lines

@@ -30,54 +30,54 @@ 
 
 class Context
 {
-    /**
+/**
      * @var Context|null
      */
-    private $__extends__ = null;
+private $__extends__ = null;
 
-    /**
+/**
      * @var string
      */
-    private $__block_name__;
+private $__block_name__;
 
-    /**
+/**
      * @var array
      */
-    private $__properties__ = [];
+private $__properties__ = [];
 
-    /**
+/**
      * The constructor
      *
      * @param array $__namespaces__
      * @param string $__default_namespace__
      * @param string $__template__
      */
-    public function __construct(protected array $__namespaces__,
-        protected string $__default_namespace__, protected string $__template__)
-    {}
+public function __construct(protected array $__namespaces__,
+protected string $__default_namespace__, protected string $__template__)
+{}
 
-    /**
+/**
      * @param string $name
      *
      * @return mixed
      */
-    public function __get(string $name): mixed
-    {
-        return $this->__properties__[$name] ?? '';
-    }
+public function __get(string $name): mixed
+{
+return $this->__properties__[$name] ?? '';
+}
 
-    /**
+/**
      * @param string $name
      * @param mixed $value
      *
      * @return void
      */
-    public function __set(string $name, $value): void
-    {
-        $this->__properties__[$name] = $value;
-    }
+public function __set(string $name, $value): void
+{
+$this->__properties__[$name] = $value;
+}
 
-    /**
+/**
      * Include a template
      *
      * @param string $template The name of template to be rendered
@@ -85,110 +85,110 @@ 
      *
      * @return void
      */
-    protected function include(string $template, array $vars = []): void
-    {
-        $context = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-        echo $context->__render($vars);
-    }
-
-    /**
+protected function include(string $template, array $vars = []): void
+{
+$context = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+echo $context->__render($vars);
+}
+
+/**
      * @param string $template The name of template to be rendered
      *
      * @return void
      */
-    public function extends(string $template): void
-    {
-        $this->__extends__ = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-    }
+public function extends(string $template): void
+{
+$this->__extends__ = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+}
 
-    /**
+/**
      * Start a new block
      *
      * @param string $name
      *
      * @return void
      */
-    public function block(string $name): void
-    {
-        ob_start();
-        $this->__block_name__ = $name;
-    }
+public function block(string $name): void
+{
+ob_start();
+$this->__block_name__ = $name;
+}
 
-    /**
+/**
      * End the current block
      *
      * @param Closure|null $filter
      *
      * @return void
      */
-    public function endblock(?Closure $filter = null): void
-    {
-        $content = ob_get_clean();
-        $this->__set($this->__block_name__, !$filter ? $content : $filter($content));
-    }
+public function endblock(?Closure $filter = null): void
+{
+$content = ob_get_clean();
+$this->__set($this->__block_name__, !$filter ? $content : $filter($content));
+}
 
-    /**
+/**
      * @return string
      */
-    private function __path(): string
-    {
-        $template = trim($this->__template__);
-        // Get the namespace name
-        $namespace = $this->__default_namespace__;
-        $separatorPosition = strrpos($template, '::');
-        if($separatorPosition !== false)
-        {
-            $namespace = substr($template, 0, $separatorPosition);
-            $template = substr($template, $separatorPosition + 2);
-        }
-        // Check if the namespace is defined
-        if(!isset($this->__namespaces__[$namespace]))
-        {
-            return $template;
-        }
-
-        $namespace = $this->__namespaces__[$namespace];
-        // Get the template path
-        return $namespace['directory'] . $template . $namespace['extension'];
-    }
-
-    /**
+private function __path(): string
+{
+$template = trim($this->__template__);
+// Get the namespace name
+$namespace = $this->__default_namespace__;
+$separatorPosition = strrpos($template, '::');
+if($separatorPosition !== false)
+{
+$namespace = substr($template, 0, $separatorPosition);
+$template = substr($template, $separatorPosition + 2);
+}
+// Check if the namespace is defined
+if(!isset($this->__namespaces__[$namespace]))
+{
+return $template;
+}
+
+$namespace = $this->__namespaces__[$namespace];
+// Get the template path
+return $namespace['directory'] . $template . $namespace['extension'];
+}
+
+/**
      * Render a template
      *
      * @param array $vars The template vars
      *
      * @return string
      */
-    public function __render(array $vars): string
-    {
-        // Get the template path
-        $templatePath = $this->__path();
-        if(!@is_readable($templatePath))
-        {
-            return '';
-        }
-
-        // Save the template properties.
-        foreach($vars as $name => $value)
-        {
-            $this->__set((string)$name, $value);
-        }
-
-        // Render the template
-        $renderer = function() use($templatePath) {
-            ob_start();
-            include $templatePath;
-            $content = ob_get_clean();
-
-            return $this->__extends__ === null ? $content :
-                // Render the extended template with the same properties.
-                $this->__extends__->__render($this->__properties__);
-        };
-
-        // Call the closure in the context of this object.
-        // So the keyword '$this' in the template will refer to this object.
-        return call_user_func($renderer->bindTo($this));
-    }
+public function __render(array $vars): string
+{
+// Get the template path
+$templatePath = $this->__path();
+if(!@is_readable($templatePath))
+{
+return '';
+}
+
+// Save the template properties.
+foreach($vars as $name => $value)
+{
+$this->__set((string)$name, $value);
+}
+
+// Render the template
+$renderer = function() use($templatePath) {
+ob_start();
+include $templatePath;
+$content = ob_get_clean();
+
+return $this->__extends__ === null ? $content :
+    // Render the extended template with the same properties.
+    $this->__extends__->__render($this->__properties__);
+};
+
+// Call the closure in the context of this object.
+// So the keyword '$this' in the template will refer to this object.
+return call_user_func($renderer->bindTo($this));
+}
 }

jaxon-utils/src/Translation/Translator.php

Spacing +12 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function setLocale(string $sLocale): void
     {
-        if(($sLocale = trim($sLocale)))
+        if (($sLocale = trim($sLocale)))
         {
             $this->sDefaultLocale = $sLocale;
         }
@@ -73,11 +73,11 @@ 
      */
     private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
     {
-        foreach($aTranslations as $sKey => $xTranslation)
+        foreach ($aTranslations as $sKey => $xTranslation)
         {
             $sKey = trim($sKey);
             $sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
-            if(is_array($xTranslation))
+            if (is_array($xTranslation))
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
@@ -100,18 +100,18 @@ 
      */
     public function loadTranslations(string $sFilePath, string $sLanguage): bool
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return false;
         }
         $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
+        if (!is_array($aTranslations))
         {
             return false;
         }
 
         // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
+        if (!isset($this->aTranslations[$sLanguage]))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -133,16 +133,16 @@ 
     public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
     {
         $sText = trim($sText);
-        if(empty($sLanguage))
+        if (empty($sLanguage))
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!isset($this->aTranslations[$sLanguage][$sText]))
+        if (!isset($this->aTranslations[$sLanguage][$sText]))
         {
             return $sText;
         }
         $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(!empty($aPlaceHolders))
+        if (!empty($aPlaceHolders))
         {
             $aVars = array_map(function($sVar) {
                 return ':' . $sVar;
@@ -162,16 +162,16 @@ 
      */
     public function translations(string $sKey, string $sLanguage = ''): array
     {
-        if(empty($sLanguage))
+        if (empty($sLanguage))
         {
             $sLanguage = $this->sDefaultLocale;
         }
         $aKeys = explode('.', $sKey);
 
         $aTranslations = $this->aRawTranslations[$sLanguage];
-        foreach($aKeys as $sKey)
+        foreach ($aKeys as $sKey)
         {
-            if($sKey !== '')
+            if ($sKey !== '')
             {
                 $aTranslations = $aTranslations[$sKey] ?? [];
             }

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
-            }
-            else
+            } else
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sKey] = $xTranslation;

Switch Indentation +95 added lines, -95 removed lines

@@ -26,43 +26,43 @@ 
 
 class Translator
 {
-    /**
+/**
      * The default locale
      *
      * @var string
      */
-    protected $sDefaultLocale = 'en';
+protected $sDefaultLocale = 'en';
 
-    /**
+/**
      * The translations in a flattened array
      *
      * @var array
      */
-    protected $aTranslations = [];
+protected $aTranslations = [];
 
-    /**
+/**
      * The translations as received as input
      *
      * @var array
      */
-    protected $aRawTranslations = [];
+protected $aRawTranslations = [];
 
-    /**
+/**
      * Set the default locale
      *
      * @param string $sLocale
      *
      * @return void
      */
-    public function setLocale(string $sLocale): void
-    {
-        if(($sLocale = trim($sLocale)))
-        {
-            $this->sDefaultLocale = $sLocale;
-        }
-    }
+public function setLocale(string $sLocale): void
+{
+if(($sLocale = trim($sLocale)))
+{
+$this->sDefaultLocale = $sLocale;
+}
+}
 
-    /**
+/**
      * Recursively load translated strings from an array
      *
      * @param string $sLanguage The language of the translations
@@ -71,26 +71,26 @@ 
      *
      * @return void
      */
-    private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
-    {
-        foreach($aTranslations as $sKey => $xTranslation)
-        {
-            $sKey = trim($sKey);
-            $sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
-            if(is_array($xTranslation))
-            {
-                // Recursively read the translations in the array
-                $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
-            }
-            else
-            {
-                // Save this translation
-                $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
-            }
-        }
-    }
+private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
+{
+foreach($aTranslations as $sKey => $xTranslation)
+{
+$sKey = trim($sKey);
+$sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
+if(is_array($xTranslation))
+{
+    // Recursively read the translations in the array
+    $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
+}
+else
+{
+    // Save this translation
+    $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
+}
+}
+}
 
-    /**
+/**
      * Load translated strings from a file
      *
      * @param string $sFilePath The file full path
@@ -98,30 +98,30 @@ 
      *
      * @return bool
      */
-    public function loadTranslations(string $sFilePath, string $sLanguage): bool
-    {
-        if(!file_exists($sFilePath))
-        {
-            return false;
-        }
-        $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
-        {
-            return false;
-        }
+public function loadTranslations(string $sFilePath, string $sLanguage): bool
+{
+if(!file_exists($sFilePath))
+{
+return false;
+}
+$aTranslations = require($sFilePath);
+if(!is_array($aTranslations))
+{
+return false;
+}
 
-        // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
-        {
-            $this->aTranslations[$sLanguage] = [];
-        }
-        $this->aRawTranslations[$sLanguage] =
-            array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
-        $this->_loadTranslations($sLanguage, '', $aTranslations);
-        return true;
-    }
+// Load the translations
+if(!isset($this->aTranslations[$sLanguage]))
+{
+$this->aTranslations[$sLanguage] = [];
+}
+$this->aRawTranslations[$sLanguage] =
+array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
+$this->_loadTranslations($sLanguage, '', $aTranslations);
+return true;
+}
 
-    /**
+/**
      * Get a translated string
      *
      * @param string $sText The key of the translated string
@@ -130,29 +130,29 @@ 
      *
      * @return string
      */
-    public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
-    {
-        $sText = trim($sText);
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        if(!isset($this->aTranslations[$sLanguage][$sText]))
-        {
-            return $sText;
-        }
-        $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(!empty($aPlaceHolders))
-        {
-            $aVars = array_map(function($sVar) {
-                return ':' . $sVar;
-            }, array_keys($aPlaceHolders));
-            $sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
-        }
-        return $sMessage;
-    }
+public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
+{
+$sText = trim($sText);
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+if(!isset($this->aTranslations[$sLanguage][$sText]))
+{
+return $sText;
+}
+$sMessage = $this->aTranslations[$sLanguage][$sText];
+if(!empty($aPlaceHolders))
+{
+$aVars = array_map(function($sVar) {
+    return ':' . $sVar;
+}, array_keys($aPlaceHolders));
+$sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
+}
+return $sMessage;
+}
 
-    /**
+/**
      * Get all the translations under a given key
      *
      * @param string $sKey
@@ -160,22 +160,22 @@ 
      *
      * @return array
      */
-    public function translations(string $sKey, string $sLanguage = ''): array
-    {
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        $aKeys = explode('.', $sKey);
+public function translations(string $sKey, string $sLanguage = ''): array
+{
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+$aKeys = explode('.', $sKey);
 
-        $aTranslations = $this->aRawTranslations[$sLanguage];
-        foreach($aKeys as $sKey)
-        {
-            if($sKey !== '')
-            {
-                $aTranslations = $aTranslations[$sKey] ?? [];
-            }
-        }
-        return $aTranslations;
-    }
+$aTranslations = $this->aRawTranslations[$sLanguage];
+foreach($aKeys as $sKey)
+{
+if($sKey !== '')
+{
+    $aTranslations = $aTranslations[$sKey] ?? [];
+}
+}
+return $aTranslations;
+}
 }