Mistralys / application-utils

src/NumberInfo/Comparer.php

Spacing +7 added lines, -7 removed lines

@@ -55,12 +55,12 @@ 
      */
     private function validate() : bool
     {
-        if($this->a->getUnits() !== $this->b->getUnits())
+        if ($this->a->getUnits() !== $this->b->getUnits())
         {
             return false;
         }
 
-        if($this->a->isEmpty() || $this->b->isEmpty())
+        if ($this->a->isEmpty() || $this->b->isEmpty())
         {
             return false;
         }
@@ -70,7 +70,7 @@ 
 
     public function isBiggerThan() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -80,7 +80,7 @@ 
 
     public function isBiggerEqual() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -90,7 +90,7 @@ 
 
     public function isSmallerThan() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -100,7 +100,7 @@ 
 
     public function isSmallerEqual() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -110,7 +110,7 @@ 
 
     public function isEqual() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }

src/NumberInfo/Immutable.php

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
     {
         $number = parseNumber($value, true);
 
-        if($number->getNumber() === $this->getNumber() && $number->hasUnits() === $this->hasUnits())
+        if ($number->getNumber() === $this->getNumber() && $number->hasUnits() === $this->hasUnits())
         {
             return $this;
         }
@@ -30,7 +30,7 @@ 
     {
         $number = parseNumber($number, true);
 
-        if($number->getNumber() === $this->getNumber() && $number->getUnits() === $this->getUnits())
+        if ($number->getNumber() === $this->getNumber() && $number->getUnits() === $this->getUnits())
         {
             return $this;
         }
@@ -47,7 +47,7 @@ 
         $number = parseNumber($this, true);
         $number->add($value);
 
-        if($number->getNumber() === $this->getNumber())
+        if ($number->getNumber() === $this->getNumber())
         {
             return $this;
         }
@@ -64,7 +64,7 @@ 
         $number = parseNumber($this, true);
         $number->subtract($value);
 
-        if($number->getNumber() === $this->getNumber())
+        if ($number->getNumber() === $this->getNumber())
         {
             return $this;
         }
@@ -81,7 +81,7 @@ 
         $number = parseNumber($this, true);
         $number->subtractPercent($percent);
 
-        if($number->getNumber() === $this->getNumber())
+        if ($number->getNumber() === $this->getNumber())
         {
             return $this;
         }
@@ -98,7 +98,7 @@ 
         $number = parseNumber($this, true);
         $number->addPercent($percent);
 
-        if($number->getNumber() === $this->getNumber())
+        if ($number->getNumber() === $this->getNumber())
         {
             return $this;
         }
@@ -114,7 +114,7 @@ 
         $number = parseNumber($this, true);
         $number->floorEven();
 
-        if($number->getNumber() === $this->getNumber())
+        if ($number->getNumber() === $this->getNumber())
         {
             return $this;
         }
@@ -130,7 +130,7 @@ 
         $number = parseNumber($this, true);
         $number->ceilEven();
 
-        if($number->getNumber() === $this->getNumber())
+        if ($number->getNumber() === $this->getNumber())
         {
             return $this;
         }

src/NumberInfo.php

Indentation +77 added lines, -77 removed lines

@@ -40,19 +40,19 @@ 
  */
 class NumberInfo
 {
-   /**
-    * @var string|int|float|null
-    */
+    /**
+     * @var string|int|float|null
+     */
     protected $rawValue;
     
-   /**
-    * @var array<string,mixed>
-    */
+    /**
+     * @var array<string,mixed>
+     */
     protected $info;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $empty = false;
 
     /**
@@ -62,8 +62,8 @@ 
 
     /**
      * Units and whether they allow decimal values.
-    * @var array<string,bool>
-    */
+     * @var array<string,bool>
+     */
     protected $knownUnits = array(
         '%' => true,
         'rem' => true,
@@ -141,21 +141,21 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the raw, internal information array resulting
-    * from the parsing of the number.
-    *  
-    * @return array<string,mixed>
-    */
+    /**
+     * Retrieves the raw, internal information array resulting
+     * from the parsing of the number.
+     *  
+     * @return array<string,mixed>
+     */
     public function getRawInfo() : array
     {
         return $this->info;
     }
     
-   /**
-    * Whether the number was empty (null or empty string).
-    * @return boolean
-    */
+    /**
+     * Whether the number was empty (null or empty string).
+     * @return boolean
+     */
     public function isEmpty() : bool
     {
         return $this->empty;
@@ -729,12 +729,12 @@ 
         return $cache[$key];
     }
     
-   /**
-    * Parses a string number notation with units included, e.g. 14px, 50%...
-    * 
-    * @param string $test
-    * @return array<string,mixed>
-    */
+    /**
+     * Parses a string number notation with units included, e.g. 14px, 50%...
+     * 
+     * @param string $test
+     * @return array<string,mixed>
+     */
     private function parseStringValue(string $test) : array
     {
         $number = null;
@@ -785,13 +785,13 @@ 
         return $this->filterInfo($result);
     }
     
-   /**
-    * Attempts to determine what kind of units are specified
-    * in the string. Returns NULL if none could be matched.
-    * 
-    * @param string $value
-    * @return array<string,mixed>|NULL
-    */
+    /**
+     * Attempts to determine what kind of units are specified
+     * in the string. Returns NULL if none could be matched.
+     * 
+     * @param string $value
+     * @return array<string,mixed>|NULL
+     */
     private function findUnits(string $value) : ?array
     {
         $vlength = strlen($value);
@@ -819,12 +819,12 @@ 
         return null;
     }
     
-   /**
-    * Creates the cache key for the specified value.
-    * 
-    * @param mixed $value
-    * @return string
-    */
+    /**
+     * Creates the cache key for the specified value.
+     * 
+     * @param mixed $value
+     * @return string
+     */
     private function createValueKey($value) : string
     {
         if(!is_string($value) && !is_numeric($value))
@@ -835,59 +835,59 @@ 
         return (string)$value;
     }
 
-   /**
-    * Called if explicitly enabled: allows filtering the 
-    * number after the detection process has completed.
-    * 
-    * @param string|NULL $number The adjusted number
-    * @param string $originalString The original value before it was parsed
-    * @return string|null
-    */
+    /**
+     * Called if explicitly enabled: allows filtering the 
+     * number after the detection process has completed.
+     * 
+     * @param string|NULL $number The adjusted number
+     * @param string $originalString The original value before it was parsed
+     * @return string|null
+     */
     protected function postProcess(?string $number, /** @scrutinizer ignore-unused */ string $originalString)
     {
         return $number;
     }
     
-   /**
-    * Filters the value before it is parsed, but only if it is a string.
-    * 
-    * NOTE: This may be overwritten in a subclass, to allow custom filtering
-    * the values. An example of a use case would be a preprocessor for
-    * variables in a templating system.
-    * 
-    * @param string $trimmedString The trimmed value.
-    * @param array<string,mixed> $cache The internal values cache array.
-    * @param string $originalValue The original value that the NumberInfo was created for.
-    * @return string
-    * 
-    * @see NumberInfo::enablePostProcess()
-    */
+    /**
+     * Filters the value before it is parsed, but only if it is a string.
+     * 
+     * NOTE: This may be overwritten in a subclass, to allow custom filtering
+     * the values. An example of a use case would be a preprocessor for
+     * variables in a templating system.
+     * 
+     * @param string $trimmedString The trimmed value.
+     * @param array<string,mixed> $cache The internal values cache array.
+     * @param string $originalValue The original value that the NumberInfo was created for.
+     * @return string
+     * 
+     * @see NumberInfo::enablePostProcess()
+     */
     protected function preProcess(string $trimmedString, /** @scrutinizer ignore-unused */ array &$cache, /** @scrutinizer ignore-unused */ string $originalValue) : string
     {
         return str_replace(',', '.', $trimmedString);
     }
     
-   /**
-    * Enables the post-processing so the postProcess method gets called.
-    * This should be called in the {@link NumberInfo::preProcess()}
-    * method as needed.
-    * 
-    * @return $this
-    * @see NumberInfo::postProcess()
-    */
+    /**
+     * Enables the post-processing so the postProcess method gets called.
+     * This should be called in the {@link NumberInfo::preProcess()}
+     * method as needed.
+     * 
+     * @return $this
+     * @see NumberInfo::postProcess()
+     */
     protected function enablePostProcess() : NumberInfo
     {
         $this->postProcess = true;
         return $this;
     }
     
-   /**
-    * Filters the number info array to adjust the units
-    * and number according to the required rules.
-    * 
-    * @param array<string,mixed> $info
-    * @return array<string,mixed>
-    */
+    /**
+     * Filters the number info array to adjust the units
+     * and number according to the required rules.
+     * 
+     * @param array<string,mixed> $info
+     * @return array<string,mixed>
+     */
     protected function filterInfo(array $info) : array
     {
         $useUnits = 'px';

Spacing +48 added lines, -48 removed lines

@@ -130,7 +130,7 @@ 
      */
     protected function _setValue($value)
     {
-        if($value instanceof NumberInfo) {
+        if ($value instanceof NumberInfo) {
             $value = $value->getValue();
         }
 
@@ -170,7 +170,7 @@ 
      */
     public function isPositive() : bool
     {
-        if($this->isEmpty())
+        if ($this->isEmpty())
         {
             return false;
         }
@@ -185,7 +185,7 @@ 
      */
     public function isZero() : bool
     {
-        if($this->isEmpty())
+        if ($this->isEmpty())
         {
             return false;
         }
@@ -231,23 +231,23 @@ 
     {
         // Append the units if the value is a number,
         // so they can be inherited.
-        if($this->hasUnits() && is_numeric($number))
+        if ($this->hasUnits() && is_numeric($number))
         {
             $number .= $this->getUnits();
         }
 
         $new = parseNumber($number);
 
-        if($new->isEmpty())
+        if ($new->isEmpty())
         {
             return $this;
         }
 
-        if($new->getUnits() === $this->getUnits())
+        if ($new->getUnits() === $this->getUnits())
         {
             $value = $new->getNumber();
 
-            if($this->hasUnits()) {
+            if ($this->hasUnits()) {
                 $value .= $this->getUnits();
             }
 
@@ -289,7 +289,7 @@ 
     {
         $number = (float)$this->info['number'];
 
-        if($this->hasDecimals())
+        if ($this->hasDecimals())
         {
             return $number;
         }
@@ -325,11 +325,11 @@ 
      */
     public function getUnits() : string
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
 
-        if(!$this->hasUnits()) {
+        if (!$this->hasUnits()) {
             return 'px';
         }
         
@@ -363,15 +363,15 @@ 
      */
     public function toAttribute() : string
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
-        if($this->isPercent()) {
+        if ($this->isPercent()) {
             return $this->getNumber().$this->getUnits();
         }
         
@@ -384,11 +384,11 @@ 
      */
     public function toCSS() : string
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
-        if($this->isZero()) {
+        if ($this->isZero()) {
             return '0';
         }
         
@@ -397,7 +397,7 @@ 
     
     public function __toString()
     {
-        if($this->isEmpty()) {
+        if ($this->isEmpty()) {
             return '';
         }
         
@@ -503,7 +503,7 @@ 
      */
     public function add($value)
     {
-        if($this->isEmpty())
+        if ($this->isEmpty())
         {
             $this->setValue($value);
             return $this;
@@ -511,11 +511,11 @@ 
         
         $number = parseNumber($value);
         
-        if($number->getUnits() === $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() === $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() + $number->getNumber();
 
-            if($this->hasUnits())
+            if ($this->hasUnits())
             {
                 $new .= $this->getUnits();
             }
@@ -536,7 +536,7 @@ 
      */
     public function subtract($value)
     {
-        if($this->isEmpty())
+        if ($this->isEmpty())
         {
             $this->setValue($value);
             return $this;
@@ -544,11 +544,11 @@ 
         
         $number = parseNumber($value);
         
-        if($number->getUnits() == $this->getUnits() || !$number->hasUnits())
+        if ($number->getUnits() == $this->getUnits() || !$number->hasUnits())
         {
             $new = $this->getNumber() - $number->getNumber();
 
-            if($this->hasUnits())
+            if ($this->hasUnits())
             {
                 $new .= $this->getUnits();
             }
@@ -588,13 +588,13 @@ 
      */
     protected function percentOperation(string $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;
         }
@@ -602,18 +602,18 @@ 
         $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);
         }
 
-        if($this->hasUnits())
+        if ($this->hasUnits())
         {
             $number .= $this->getUnits();
         }
@@ -627,7 +627,7 @@ 
     {
         $units = $this->getUnits();
 
-        if(isset($this->knownUnits[$units]))
+        if (isset($this->knownUnits[$units]))
         {
             return !$this->knownUnits[$units];
         }
@@ -639,7 +639,7 @@ 
     {
         $units = $this->getUnits();
 
-        if(isset($this->knownUnits[$units]))
+        if (isset($this->knownUnits[$units]))
         {
             return $this->knownUnits[$units];
         }
@@ -678,7 +678,7 @@ 
         
         $key = $this->createValueKey($value);
 
-        if(array_key_exists($key, $cache)) {
+        if (array_key_exists($key, $cache)) {
             return $cache[$key];
         }
         
@@ -688,13 +688,13 @@ 
             'number' => null
         );
         
-        if($key === '_EMPTY_') 
+        if ($key === '_EMPTY_') 
         {
             $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]);
@@ -703,20 +703,20 @@ 
         
         $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'] = (float)$test * 1;
             $cache[$key] = $this->filterInfo($cache[$key]);
@@ -742,19 +742,19 @@ 
         $empty = false;
         
         $found = $this->findUnits($test);
-        if($found !== null) 
+        if ($found !== null) 
         {
             $number = $found['number'];
             $units = $found['units'];
         }
         
         // 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;
             $empty = true;
@@ -765,7 +765,7 @@ 
             $number = trim($number);
             
             // may be an arbitrary string in some cases
-            if(!is_numeric($number))
+            if (!is_numeric($number))
             {
                 $number = null;
                 $empty = true;
@@ -797,17 +797,17 @@ 
         $vlength = strlen($value);
         $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($value, $start, $ulength);
             
-            if($search==$unit) 
+            if ($search == $unit) 
             {
                 return array(
                     'units' => $unit,
@@ -827,7 +827,7 @@ 
     */
     private function createValueKey($value) : string
     {
-        if(!is_string($value) && !is_numeric($value))
+        if (!is_string($value) && !is_numeric($value))
         {
             return '_EMPTY_';
         }
@@ -891,12 +891,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($this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
+        if ($this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number']))
         {
             $info['number'] = intval($info['number']);
         }
@@ -922,7 +922,7 @@ 
     {
         $number = floor($this->getNumber());
 
-        if($number % 2 == 1) $number--;
+        if ($number % 2 == 1) $number--;
 
         return $this->setNumber($number);
     }
@@ -938,7 +938,7 @@ 
     {
         $number = ceil($this->getNumber());
 
-        if($number % 2 == 1) $number++;
+        if ($number % 2 == 1) $number++;
 
         return $this->setNumber($number);
     }

Braces +7 added lines, -4 removed lines

@@ -769,8 +769,7 @@ 
             {
                 $number = null;
                 $empty = true;
-            }
-            else
+            } else
             {
                 $number = (float)$number * 1;
             }
@@ -922,7 +921,9 @@ 
     {
         $number = floor($this->getNumber());
 
-        if($number % 2 == 1) $number--;
+        if($number % 2 == 1) {
+            $number--;
+        }
 
         return $this->setNumber($number);
     }
@@ -938,7 +939,9 @@ 
     {
         $number = ceil($this->getNumber());
 
-        if($number % 2 == 1) $number++;
+        if($number % 2 == 1) {
+            $number++;
+        }
 
         return $this->setNumber($number);
     }