Mistralys / application-utils

src/PaginationHelper.php

Spacing +14 added lines, -14 removed lines

@@ -113,7 +113,7 @@ 
     */
     public function getNextPage() : int
     {
-        if($this->next === 0) {
+        if ($this->next === 0) {
             return $this->last;
         }
         
@@ -137,7 +137,7 @@ 
     */
     public function getPreviousPage() : int
     {
-        if($this->prev === 0) {
+        if ($this->prev === 0) {
             return 1;
         }
         
@@ -182,7 +182,7 @@ 
         // adjust the adjacent value if it exceeds the
         // total amount of pages
         $adjacentTotal = ($adjacent * 2) + 1;
-        if($adjacentTotal > $this->last) 
+        if ($adjacentTotal > $this->last) 
         {
             $adjacent = (int)floor($this->last / 2);
         }
@@ -195,13 +195,13 @@ 
         $back = 0;
         $fwd = 0;
         
-        if($maxBack >= $adjacent) {
+        if ($maxBack >= $adjacent) {
             $back = $adjacent; 
         } else {
             $back = $maxBack;
         }
         
-        if($maxFwd >= $adjacent)  {
+        if ($maxFwd >= $adjacent) {
             $fwd = $adjacent;
         } else {
             $fwd = $maxFwd;
@@ -217,16 +217,16 @@ 
         $fwd += $backDiff;
         $back += $fwdDiff;
         
-        if($fwd > $maxFwd) { $fwd = $maxFwd; }
-        if($back > $maxBack) { $back = $maxBack; }
+        if ($fwd > $maxFwd) { $fwd = $maxFwd; }
+        if ($back > $maxBack) { $back = $maxBack; }
         
         // calculate the first and last page in the list
         $prev = $this->current - $back;
         $next = $this->current + $fwd;
         
         // failsafe so we stay within the bounds
-        if($prev < 1) { $prev = 1; }
-        if($next > $this->last) { $next = $this->last; }
+        if ($prev < 1) { $prev = 1; }
+        if ($next > $this->last) { $next = $this->last; }
         
         // create and return the page numbers list
         $numbers = range($prev, $next);
@@ -319,11 +319,11 @@ 
     {
         $pages = (int)ceil($this->total / $this->perPage);
         
-        if($this->current < 1)
+        if ($this->current < 1)
         {
             $this->current = 1;
         }
-        else if($this->current > $pages)
+        else if ($this->current > $pages)
         {
             $this->current = $pages;
         }
@@ -331,19 +331,19 @@ 
         $this->last = $pages;
         
         $nextPage = $this->current + 1;
-        if($nextPage <= $pages) {
+        if ($nextPage <= $pages) {
             $this->next = $nextPage;
         }
         
         $prevPage = $this->current - 1;
-        if($prevPage > 0) {
+        if ($prevPage > 0) {
             $this->prev = $prevPage;
         }
         
         $this->offsetStart = ($this->current - 1) * $this->perPage;
         
         $this->offsetEnd = $this->offsetStart + $this->perPage;
-        if($this->offsetEnd > ($this->total - 1)) {
+        if ($this->offsetEnd > ($this->total - 1)) {
             $this->offsetEnd = ($this->total - 1);
         }
     }

src/ConvertHelper/ThrowableInfo.php

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
     
     protected function __construct($subject)
     {
-        if(is_array($subject))
+        if (is_array($subject))
         {
             $this->parseSerialized($subject);
         }
@@ -115,7 +115,7 @@ 
     */
     public function getPrevious() : ConvertHelper_ThrowableInfo
     {
-        if(isset($this->previous)) {
+        if (isset($this->previous)) {
             return $this->previous;
         }
         
@@ -140,18 +140,18 @@ 
         
         $string = 'Exception';
         
-        if($this->hasCode()) {
+        if ($this->hasCode()) {
             $string .= ' #'.$this->code;
         }
         
         $string .= ': '.$this->getMessage().PHP_EOL;
         
-        foreach($calls as $call) 
+        foreach ($calls as $call) 
         {
             $string .= $call->toString().PHP_EOL;
         }
         
-        if($this->hasPrevious())
+        if ($this->hasPrevious())
         {
             $string .= PHP_EOL.PHP_EOL.
             'Previous error:'.PHP_EOL.PHP_EOL.
@@ -242,11 +242,11 @@ 
             'previous' => null,
         );
         
-        if($this->hasPrevious()) {
-            $result['previous'] =  $this->previous->serialize();
+        if ($this->hasPrevious()) {
+            $result['previous'] = $this->previous->serialize();
         }
         
-        foreach($this->calls as $call)
+        foreach ($this->calls as $call)
         {
             $result['calls'][] = $call->serialize(); 
         }
@@ -275,7 +275,7 @@ 
     public function getFolderDepth() : int
     {
         $depth = $this->getOption('folder-depth');
-        if(!empty($depth)) {
+        if (!empty($depth)) {
             return $depth;
         }
         
@@ -311,12 +311,12 @@ 
         
         $this->setOptions($serialized['options']);
         
-        if(!empty($serialized['previous']))
+        if (!empty($serialized['previous']))
         {
             $this->previous = ConvertHelper_ThrowableInfo::fromSerialized($serialized['previous']);
         }
         
-        foreach($serialized['calls'] as $def)
+        foreach ($serialized['calls'] as $def)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromSerialized($this, $def);
         }
@@ -328,16 +328,16 @@ 
         $this->message = $e->getMessage();
         $this->code = intval($e->getCode());
         
-        if(!isset($_REQUEST) || !isset($_REQUEST['REQUEST_URI'])) {
+        if (!isset($_REQUEST) || !isset($_REQUEST['REQUEST_URI'])) {
             $this->context = self::CONTEXT_COMMAND_LINE;
         }
         
         $previous = $e->getPrevious();
-        if(!empty($previous)) {
+        if (!empty($previous)) {
             $this->previous = ConvertHelper::throwable2info($previous);
         }
         
-        if(isset($_SERVER) && isset($_SERVER['REQUEST_URI'])) {
+        if (isset($_SERVER) && isset($_SERVER['REQUEST_URI'])) {
             $this->referer = $_SERVER['REQUEST_URI'];
         }
         
@@ -351,7 +351,7 @@ 
         
         $idx = 1;
         
-        foreach($trace as $entry)
+        foreach ($trace as $entry)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromTrace($this, $idx, $entry);
             

src/FileHelper/FileFinder.php

Spacing +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
  * @see FileHelper_FileFinder
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppUtils;
 
@@ -125,7 +125,7 @@ 
     
     public function getAll() : array
     {
-        if(!isset($this->found)) {
+        if (!isset($this->found)) {
             $this->find($this->path, true);
         }
         
@@ -150,25 +150,25 @@ 
     
     protected $found;
     
-    protected function find($path, $isRoot=false)
+    protected function find($path, $isRoot = false)
     {
-        if($isRoot) {
+        if ($isRoot) {
             $this->found = array();
         }
         
         $d = new \DirectoryIterator($path);
-        foreach($d as $item)
+        foreach ($d as $item)
         {
-            if($item->isDir())
+            if ($item->isDir())
             {
-                if($this->getOption('recursive') === true && !$item->isDot()) {
+                if ($this->getOption('recursive') === true && !$item->isDot()) {
                     $this->find($item->getPathname());
                 }
             }
             else
             {
                 $file = $this->filterFile($item->getPathname());
-                if($file) {
+                if ($file) {
                     $this->found[] = $file;
                 }
             }
@@ -184,20 +184,20 @@ 
         $include = $this->getOption('include-extensions');
         $exclude = $this->getOption('exclude-extensions');
         
-        if(!empty($include))
+        if (!empty($include))
         {
-            if(!in_array($info['extension'], $include)) {
+            if (!in_array($info['extension'], $include)) {
                 return false;
             }
         }
-        else if(!empty($exclude))
+        else if (!empty($exclude))
         {
-            if(in_array($info['extension'], $exclude)) {
+            if (in_array($info['extension'], $exclude)) {
                 return false;
             }
         }
         
-        switch($this->getOption('pathmode'))
+        switch ($this->getOption('pathmode'))
         {
             case self::PATH_MODE_STRIP:
                 $path = basename($path);
@@ -213,13 +213,13 @@ 
                 break;
         }
         
-        if($this->getOption('strip-extensions') === true)
+        if ($this->getOption('strip-extensions') === true)
         {
             $path = str_replace('.'.$info['extension'], '', $path);
         }
         
         $replace = $this->getOption('slash-replacement');
-        if(!empty($replace)) {
+        if (!empty($replace)) {
             $path = str_replace('/', $replace, $path);
         }
         

src/BaseException.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
     * @param int $code
     * @param \Exception $previous
     */
-    public function __construct(string $message, $details=null, $code=null, $previous=null)
+    public function __construct(string $message, $details = null, $code = null, $previous = null)
     {
         parent::__construct($message, $code, $previous);
         
@@ -44,7 +44,7 @@ 
     */
     public function getDetails() : string
     {
-        if($this->details !== null) {
+        if ($this->details !== null) {
             return $this->details;
         }
         
@@ -57,7 +57,7 @@ 
     */
     public function display()
     {
-        if(!headers_sent()) {
+        if (!headers_sent()) {
             header('Content-type:text/plain; charset=utf-8');
         }
         
@@ -85,7 +85,7 @@ 
         {
             throw new BaseException('');
         }
-        catch(BaseException $e) 
+        catch (BaseException $e) 
         {
             echo self::createInfo($e)->toString();
         }
@@ -100,7 +100,7 @@ 
         {
             throw new BaseException('');
         }
-        catch(BaseException $e)
+        catch (BaseException $e)
         {
             echo '<pre style="background:#fff;font-family:monospace;font-size:14px;color:#444;padding:16px;border:solid 1px #999;border-radius:4px;">';
             echo self::createInfo($e)->toString();

src/NumberInfo.php

Spacing +37 added lines, -37 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function setValue($value) : NumberInfo
     {
-        if($value instanceof NumberInfo) {
+        if ($value instanceof NumberInfo) {
             $value = $value->getValue();
         }
         
@@ -117,7 +117,7 @@ 
     
     public function isPositive() : bool
     {
-        if(!$this->isEmpty()) {
+        if (!$this->isEmpty()) {
             $number = $this->getNumber();
             return $number > 0;
         }
@@ -148,7 +148,7 @@ 
      */
     public function hasValue() : bool
     {
-        if(!$this->isEmpty() && !$this->isZero()) {
+        if (!$this->isEmpty() && !$this->isZero()) {
             return true;
         }
         
@@ -221,7 +221,7 @@ 
      */
     public function getUnits()
     {
-        if(!$this->hasUnits()) {
+        if (!$this->hasUnits()) {
             return 'px';
         }
         
@@ -255,15 +255,15 @@ 
      */
     public function toAttribute()
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return null;
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
-        if($this->isPercent()) {
+        if ($this->isPercent()) {
             return $this->getNumber().$this->getUnits();
         }
         
@@ -276,11 +276,11 @@ 
      */
     public function toCSS()
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return null;
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
@@ -289,7 +289,7 @@ 
     
     public function __toString()
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
@@ -307,7 +307,7 @@ 
     public function isBiggerThan($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -325,7 +325,7 @@ 
     public function isSmallerThan($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -335,7 +335,7 @@ 
     public function isBiggerEqual($number)
     {
         $number = parseNumber($number);
-        if($number->getUnits() != $this->getUnits()) {
+        if ($number->getUnits() != $this->getUnits()) {
             return false;
         }
         
@@ -352,14 +352,14 @@ 
      */
     public function add($value)
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             $this->setValue($value);
             return $this;
         }
         
         $number = parseNumber($value);
         
-        if($number->getUnits() == $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() == $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() + $number->getNumber();
             $this->setValue($new.$this->getUnits());
@@ -378,14 +378,14 @@ 
      */
     public function subtract($value)
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             $this->setValue($value);
             return $this;
         }
         
         $number = parseNumber($value);
         
-        if($number->getUnits() == $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() == $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() - $number->getNumber();
             $this->setValue($new.$this->getUnits());
@@ -412,25 +412,25 @@ 
     
     protected function percentOperation($operation, $percent)
     {
-        if($this->isZeroOrEmpty()) {
+        if ($this->isZeroOrEmpty()) {
             return $this;
         }
         
         $percent = parseNumber($percent);
-        if($percent->hasUnits() && !$percent->isPercent()) {
+        if ($percent->hasUnits() && !$percent->isPercent()) {
             return $this;
         }
         
         $number = $this->getNumber();
         $value = $number * $percent->getNumber() / 100;
         
-        if($operation == '-') {
+        if ($operation == '-') {
             $number = $number - $value;
         } else {
             $number = $number + $value;
         }
         
-        if($this->isUnitInteger()) {
+        if ($this->isUnitInteger()) {
             $number = intval($number);
         }
         
@@ -479,7 +479,7 @@ 
     {
         static $cache = array();
         
-        if(!is_string($value) && !is_numeric($value)) 
+        if (!is_string($value) && !is_numeric($value)) 
         {
             $value = '';
             $key = '_EMPTY_';
@@ -489,7 +489,7 @@ 
             $key = (string)$value;
         }
 
-        if(array_key_exists($key, $cache)) {
+        if (array_key_exists($key, $cache)) {
             return $cache[$key];
         }
         
@@ -499,31 +499,31 @@ 
             'number' => null
         );
         
-        if($value === '') {
+        if ($value === '') {
             $cache[$key]['empty'] = true;
             return $cache[$key];
         }
         
-        if($value === 0 || $value === '0') {
+        if ($value === 0 || $value === '0') {
             $cache[$key]['number'] = 0;
             $cache[$key] = $this->filterInfo($cache[$key]);
             return $cache[$key];
         }
         
         $test = trim((string)$value);
-        if($test === '') {
+        if ($test === '') {
             $cache[$key]['empty'] = true;
             return $cache[$key];
         }
         
         // replace comma notation (which is only possible if it's a string)
-        if(is_string($value))
+        if (is_string($value))
         {
             $test = $this->preProcess($test, $cache, $value);
         }
         
         // convert to a number if it's numeric
-        if(is_numeric($test)) {
+        if (is_numeric($test)) {
             $cache[$key]['number'] = $test * 1;
             $cache[$key] = $this->filterInfo($cache[$key]);
             return $cache[$key];
@@ -536,16 +536,16 @@ 
         
         $vlength = strlen($test);
         $names = array_keys($this->knownUnits);
-        foreach($names as $unit)
+        foreach ($names as $unit)
         {
             $ulength = strlen($unit);
-            $start = $vlength-$ulength;
-            if($start < 0) {
+            $start = $vlength - $ulength;
+            if ($start < 0) {
                 continue;
             }
             
             $search = substr($test, $start, $ulength);
-            if($search==$unit) {
+            if ($search == $unit) {
                 $units = $unit;
                 $number = substr($test, 0, $start);
                 break;
@@ -553,12 +553,12 @@ 
         }
         
         // the filters have to restore the value
-        if($this->postProcess)
+        if ($this->postProcess)
         {
             $number = $this->postProcess($number, $test);
         }
         // empty number
-        else if($number === '' || $number === null || is_bool($number))
+        else if ($number === '' || $number === null || is_bool($number))
         {
             $number = null;
             $cache[$key]['empty'] = true;
@@ -569,7 +569,7 @@ 
             $number = trim($number);
             
             // may be an arbitrary string in some cases
-            if(!is_numeric($number))
+            if (!is_numeric($number))
             {
                 $number = null;
                 $cache[$key]['empty'] = true;
@@ -648,12 +648,12 @@ 
     protected function filterInfo(array $info) : array
     {
         $useUnits = 'px';
-        if($info['units'] !== null) {
+        if ($info['units'] !== null) {
             $useUnits = $info['units'];
         }
         
         // the units are non-decimal: convert decimal values
-        if($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
+        if ($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
         {
             $info['number'] = intval($info['number']);
         }

src/IniHelper.php

Spacing +14 added lines, -14 removed lines

@@ -35,12 +35,12 @@ 
     {
         $section = $this->addSection(self::SECTION_DEFAULT);
         
-        if(empty($iniString)) {
+        if (empty($iniString)) {
             return;
         }
         
         $eol = ConvertHelper::detectEOLCharacter($iniString);
-        if($eol !== null) {
+        if ($eol !== null) {
             $this->eol = $eol->getCharacter();
         }
         
@@ -48,11 +48,11 @@ 
         
         $total = count($lines);
         
-        for($i=0; $i < $total; $i++) 
+        for ($i = 0; $i < $total; $i++) 
         {
             $line = new IniHelper_Line($lines[$i], $i);
             
-            if($line->isSection()) {
+            if ($line->isSection()) {
                 $section = $this->addSection($line->getSectionName());
             }
 
@@ -82,7 +82,7 @@ 
         $iniPath = FileHelper::requireFileExists($iniPath);
         
         $content = file_get_contents($iniPath);
-        if($content !== false) {
+        if ($content !== false) {
             return self::createFromString($content);
         }
         
@@ -127,7 +127,7 @@ 
     */
     public function addSection(string $name) : IniHelper_Section
     {
-        if(!isset($this->sections[$name])) {
+        if (!isset($this->sections[$name])) {
             $this->sections[$name] = new IniHelper_Section($this, $name);
         }
         
@@ -142,7 +142,7 @@ 
     */
     public function getSection(string $name) : ?IniHelper_Section
     {
-        if(isset($this->sections[$name])) {
+        if (isset($this->sections[$name])) {
             return $this->sections[$name];
         }
         
@@ -158,9 +158,9 @@ 
     {
         $result = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
-            if($section->isDefault()) 
+            if ($section->isDefault()) 
             {
                 $result = array_merge($result, $section->toArray());
             } 
@@ -200,7 +200,7 @@ 
     {
         $parts = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
             $parts[] = $section->toString();
         }
@@ -243,8 +243,8 @@ 
     */
     public function sectionExists(string $name) : bool
     {
-        foreach($this->sections as $section) {
-            if($section->getName() === $name) {
+        foreach ($this->sections as $section) {
+            if ($section->getName() === $name) {
                 return true;
             }
         }
@@ -273,7 +273,7 @@ 
     {
         $path = $this->parsePath($path);
         
-        if(!$this->sectionExists($path['section'])) {
+        if (!$this->sectionExists($path['section'])) {
             return array();
         }
         
@@ -284,7 +284,7 @@ 
     {
         $path = explode($this->pathSeparator, $path);
         
-        if(count($path) === 1)
+        if (count($path) === 1)
         {
             return array(
                 'section' => self::SECTION_DEFAULT,

src/VariableInfo.php

Spacing +12 added lines, -12 removed lines

@@ -51,9 +51,9 @@ 
     * @param mixed $value
     * @param array|null $serialized
     */
-    public function __construct($value, $serialized=null)
+    public function __construct($value, $serialized = null)
     {
-        if(is_array($serialized))
+        if (is_array($serialized))
         {
             $this->parseSerialized($serialized);
         }
@@ -101,7 +101,7 @@ 
         $this->value = $value;
         $this->type = strtolower(gettype($value));
         
-        if(is_array($value) && is_callable($value)) {
+        if (is_array($value) && is_callable($value)) {
             $this->type = self::TYPE_CALLABLE;
         }
         
@@ -134,7 +134,7 @@ 
     * @param bool $enable
     * @return VariableInfo
     */
-    public function enableType(bool $enable=true) : VariableInfo
+    public function enableType(bool $enable = true) : VariableInfo
     {
         return $this->setOption('prepend-type', $enable);
     }
@@ -143,9 +143,9 @@ 
     {
         $converted = $this->string;
         
-        if($this->getOption('prepend-type') === true && !$this->isNull())
+        if ($this->getOption('prepend-type') === true && !$this->isNull())
         {
-            if($this->isString())
+            if ($this->isString())
             {
                 $converted = '"'.$converted.'"';
             }
@@ -177,16 +177,16 @@ 
         
         $converted = $this->$varMethod();
         
-        if($format === 'HTML')
+        if ($format === 'HTML')
         {
             $converted = '<span style="color:#'.self::$colors[$type].'" class="variable-value-'.$this->type.'">'.$converted.'</span>';
         }
         
-        if($this->getOption('prepend-type') === true && !$this->isNull()) 
+        if ($this->getOption('prepend-type') === true && !$this->isNull()) 
         {
             $typeLabel = $type;
             
-            switch($format)
+            switch ($format)
             {
                 case 'HTML':
                     $typeLabel = '<span style="color:#1c2eb1" class="variable-type">'.$type.'</span> ';
@@ -215,7 +215,7 @@ 
         
         // the array may not be encodable - for example if it contains
         // broken unicode characters. 
-        if(is_string($result) && $result !== '') {
+        if (is_string($result) && $result !== '') {
             return $result;
         }
         
@@ -226,7 +226,7 @@ 
     {
         $string = '';
         
-        if(is_string($this->value[0])) {
+        if (is_string($this->value[0])) {
             $string .= $this->value[0].'::';
         } else {
             $string .= get_class($this->value[0]).'->';
@@ -353,7 +353,7 @@ 
             str_replace(' ', '-', $this->type)
         );
         
-        if($this->getOption('prepend-type') === true && !$this->isNull())
+        if ($this->getOption('prepend-type') === true && !$this->isNull())
         {
             $typeLabel = '<span style="color:#1c2eb1" class="variable-type">'.$this->type.'</span> ';
             $converted = $typeLabel.' '.$converted;

src/JSHelper.php

Spacing +22 added lines, -22 removed lines

@@ -95,20 +95,20 @@ 
         $quoteStyle = array_shift($params);
         $method = array_shift($params);
         
-        $call = $method . '(';
+        $call = $method.'(';
         
         $total = count($params);
-        if($total > 0) {
-            for($i=0; $i < $total; $i++) 
+        if ($total > 0) {
+            for ($i = 0; $i < $total; $i++) 
             {
                 $call .= self::phpVariable2JS($params[$i], $quoteStyle);
-                if($i < ($total-1)) {
+                if ($i < ($total - 1)) {
                     $call .= ',';
                 }
             }
         }
         
-        return $call . ');';
+        return $call.');';
     }
 
    /**
@@ -132,7 +132,7 @@ 
     */
     public static function buildVariable(string $varName, $varValue) : string
     {
-        return $varName . "=" . self::phpVariable2JS($varValue) . ';';
+        return $varName."=".self::phpVariable2JS($varValue).';';
     }
     
    /**
@@ -144,7 +144,7 @@ 
     * @param int $quoteStyle The quote style to use for strings
     * @return string
     */
-    public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
+    public static function phpVariable2JS($variable, int $quoteStyle = self::QUOTE_STYLE_DOUBLE) : string
     {
         // after much profiling, this variant of the method offers
         // the best performance. Repeat scalar values are cached 
@@ -152,22 +152,22 @@ 
         
         $type = gettype($variable);
         $hash = null;
-        if(is_scalar($variable) === true) 
+        if (is_scalar($variable) === true) 
         {
             $hash = $variable;
         
-            if($hash === true) 
+            if ($hash === true) 
             { 
                 $hash = 'true'; 
             } 
-            else if($hash === false) 
+            else if ($hash === false) 
             { 
                 $hash = 'false'; 
             }
             
             $hash .= '-'.$quoteStyle.'-'.$type;
             
-            if(isset(self::$variableCache[$hash])) {
+            if (isset(self::$variableCache[$hash])) {
                 return self::$variableCache[$hash];
             }
         }
@@ -175,19 +175,19 @@ 
         $result = 'null';
 
         // one gettype call is better than a strict if-else.
-        switch($type) 
+        switch ($type) 
         {
             case 'double':
             case 'string':
                 $string = json_encode($variable);
                 
-                if($string === false) 
+                if ($string === false) 
                 {
                     $string = '';
                 } 
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
+                else if ($quoteStyle === self::QUOTE_STYLE_SINGLE) 
                 {
-                    $string = mb_substr($string, 1, mb_strlen($string)-2);
+                    $string = mb_substr($string, 1, mb_strlen($string) - 2);
                     $string = "'".str_replace("'", "\'", $string)."'";
                 }
                 
@@ -195,7 +195,7 @@ 
                 break;
                 
             case 'boolean':
-                if($variable === true) {
+                if ($variable === true) {
                     $result = 'true';
                 } else {
                     $result = 'false';
@@ -213,7 +213,7 @@ 
         }
 
         // cache cacheable values
-        if($hash !== null) 
+        if ($hash !== null) 
         {
             self::$variableCache[$hash] = $result;
         }
@@ -245,7 +245,7 @@ 
     {
         self::$elementCounter++;
 
-        return self::$idPrefix . self::$elementCounter;
+        return self::$idPrefix.self::$elementCounter;
     }
     
    /**
@@ -319,7 +319,7 @@ 
      * @see JSHelper::JS_REGEX_OBJECT
      * @see JSHelper::JS_REGEX_JSON
      */
-    public static function buildRegexStatement(string $regex, string $statementType=self::JS_REGEX_OBJECT) : string
+    public static function buildRegexStatement(string $regex, string $statementType = self::JS_REGEX_OBJECT) : string
     {
         $regex = trim($regex);
         $separator = substr($regex, 0, 1);
@@ -327,7 +327,7 @@ 
         array_shift($parts);
         
         $modifiers = array_pop($parts);
-        if($modifiers == $separator) {
+        if ($modifiers == $separator) {
             $modifiers = '';
         }
         
@@ -343,7 +343,7 @@ 
         // convert the anchors that are not supported in js regexes
         $format = str_replace(array('\\A', '\\Z', '\\z'), array('^', '$', ''), $format);
         
-        if($statementType==self::JS_REGEX_JSON)
+        if ($statementType == self::JS_REGEX_JSON)
         {
             return ConvertHelper::var2json(array(
                 'format' => $format,
@@ -351,7 +351,7 @@ 
             ));
         }
         
-        if(!empty($modifiers)) {
+        if (!empty($modifiers)) {
             return sprintf(
                 'new RegExp(%s, %s)',
                 ConvertHelper::var2json($format),

src/Request.php

Spacing +36 added lines, -36 removed lines

@@ -90,11 +90,11 @@ 
     public function getParam($name, $default = null)
     {
         $value = $default;
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             $value = $_REQUEST[$name];
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             $value = $this->knownParams[$name]->validate($value);
         }
         
@@ -137,8 +137,8 @@ 
     
     public function getRefreshParams($params = array(), $exclude = array())
     {
-        if(empty($params)) { $params = array(); }
-        if(empty($exclude)) { $exclude = array(); }
+        if (empty($params)) { $params = array(); }
+        if (empty($exclude)) { $exclude = array(); }
         
         $vars = $_REQUEST;
 
@@ -158,8 +158,8 @@ 
         // remove the quickform form variable if present, to 
         // avoid redirect loops when using the refresh URL in
         // a page in which a form has been submitted.
-        foreach($names as $name) {
-            if(strstr($name, '_qf__')) {
+        foreach ($names as $name) {
+            if (strstr($name, '_qf__')) {
                 unset($vars[$name]);
                 break;
             }
@@ -186,13 +186,13 @@ 
      * @param string $dispatcher Relative path to script to use for the URL. Append trailing slash if needed.
      * @return string
      */
-    public function buildURL($params = array(), string $dispatcher='')
+    public function buildURL($params = array(), string $dispatcher = '')
     {
-        $url = rtrim($this->getBaseURL(), '/') . '/' . $dispatcher;
+        $url = rtrim($this->getBaseURL(), '/').'/'.$dispatcher;
         
         // append any leftover parameters to the end of the URL
         if (!empty($params)) {
-            $url .= '?' . http_build_query($params, null, '&');
+            $url .= '?'.http_build_query($params, null, '&');
         }
         
         return $url;
@@ -223,7 +223,7 @@ 
      */
     public function registerParam($name)
     {
-        if(!isset($this->knownParams[$name])) {
+        if (!isset($this->knownParams[$name])) {
             $param = new Request_Param($this, $name);
             $this->knownParams[$name] = $param;
         }
@@ -240,7 +240,7 @@ 
     */
     public function getRegisteredParam(string $name) : Request_Param
     {
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             return $this->knownParams[$name];
         }
         
@@ -307,12 +307,12 @@ 
             {
                 $entry['type'] = $matches[1];
                 
-                if(isset($matches[2]) && !empty($matches[2])) 
+                if (isset($matches[2]) && !empty($matches[2])) 
                 {
                     $params = ConvertHelper::parseQueryString($matches[2]);
                     $entry['params'] = $params;
                      
-                    if(isset($params['q'])) {
+                    if (isset($params['q'])) {
                         $entry['quality'] = (double)$params['q'];
                     }
                 }
@@ -365,7 +365,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -399,11 +399,11 @@ 
     */
     public function removeParam(string $name) : Request
     {
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             unset($_REQUEST[$name]);
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -418,7 +418,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -434,10 +434,10 @@ 
      * @param string $name
      * @return bool
      */
-    public function getBool($name, $default=false)
+    public function getBool($name, $default = false)
     {
         $value = $this->getParam($name, $default);
-        if(ConvertHelper::isBoolean($value)) {
+        if (ConvertHelper::isBoolean($value)) {
             return ConvertHelper::string2bool($value);
         }
         
@@ -446,9 +446,9 @@ 
     
     public function validate()
     {
-        foreach($this->knownParams as $param) {
+        foreach ($this->knownParams as $param) {
             $name = $param->getName();
-            if($param->isRequired() && !$this->hasParam($name)) {
+            if ($param->isRequired() && !$this->hasParam($name)) {
                 throw new Request_Exception(
                     'Missing request parameter '.$name,
                     sprintf(
@@ -470,10 +470,10 @@ 
      * @param mixed $default
      * @return string
      */
-    public function getFilteredParam($name, $default=null)
+    public function getFilteredParam($name, $default = null)
     {
         $val = $this->getParam($name, $default);
-        if(is_string($val)) {
+        if (is_string($val)) {
             $val = htmlspecialchars(trim(strip_tags($val)), ENT_QUOTES, 'UTF-8');
         }
         
@@ -492,24 +492,24 @@ 
     * @see Request::getJSONAssoc()
     * @see Request::getJSONObject()
     */
-    public function getJSON(string $name, bool $assoc=true)
+    public function getJSON(string $name, bool $assoc = true)
     {
         $value = $this->getParam($name);
         
-        if(!empty($value) && is_string($value)) 
+        if (!empty($value) && is_string($value)) 
         {
             $data = json_decode($value, $assoc);
             
-            if($assoc && is_array($data)) {
+            if ($assoc && is_array($data)) {
                 return $data;
             }
             
-            if(is_object($data)) {
+            if (is_object($data)) {
                 return $data;
             }
         }
         
-        if($assoc) {
+        if ($assoc) {
             return array();
         }
         
@@ -526,7 +526,7 @@ 
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -543,7 +543,7 @@ 
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
-        if(is_object($result)) {
+        if (is_object($result)) {
             return $result;
         }
         
@@ -556,10 +556,10 @@ 
     * @param array|string $data
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendJSON($data, bool $exit=true)
+    public static function sendJSON($data, bool $exit = true)
     {
         $payload = $data;
-        if(!is_string($payload)) {
+        if (!is_string($payload)) {
             $payload = json_encode($payload);
         }
         
@@ -569,7 +569,7 @@ 
         
         echo $payload;
         
-        if($exit) 
+        if ($exit) 
         {
             exit;
         }
@@ -581,7 +581,7 @@ 
     * @param string $html
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendHTML(string $html, bool $exit=true)
+    public static function sendHTML(string $html, bool $exit = true)
     {
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -589,7 +589,7 @@ 
         
         echo $html;
         
-        if($exit)
+        if ($exit)
         {
             exit;
         }
@@ -605,7 +605,7 @@ 
     * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present)
     * @return Request_URLComparer
     */
-    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams=array()) : Request_URLComparer
+    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams = array()) : Request_URLComparer
     {
         $comparer = new Request_URLComparer($this, $sourceURL, $targetURL);
         $comparer->addLimitParams($limitParams);