Mistralys / application-utils

src/ConvertHelper/StorageSizeEnum/Size.php

Indentation +18 added lines, -18 removed lines

@@ -25,34 +25,34 @@
  */
 class ConvertHelper_StorageSizeEnum_Size
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $name;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $base;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $exponent;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $singular;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $plural;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $suffix;
     
     public function __construct(string $name, int $base, int $exponent, string $suffix, string $singular, string $plural)

src/ConvertHelper/SizeNotation.php

Spacing +11 added lines, -11 removed lines

@@ -99,7 +99,7 @@ 
     * @return string
     * @see ConvertHelper::bytes2readable()
     */
-    public function toString(int $precision=1) : string
+    public function toString(int $precision = 1) : string
     {
         return ConvertHelper::bytes2readable($this->bytes, $precision, $this->getBase());
     }
@@ -110,7 +110,7 @@ 
     */
     public function getBase() : int
     {
-        if($this->isValid()) {
+        if ($this->isValid()) {
             return $this->sizeDefinition->getBase(); 
         }
         
@@ -126,7 +126,7 @@ 
     */
     public function getSizeDefinition() : ?ConvertHelper_StorageSizeEnum_Size
     {
-        if($this->isValid()) {
+        if ($this->isValid()) {
             return $this->sizeDefinition;
         }
         
@@ -175,18 +175,18 @@ 
     
     protected function parseSize() : void
     {
-        if(!$this->detectParts()) {
+        if (!$this->detectParts()) {
             return;
         }
         
         // we detected units in the string: all good.
-        if($this->units !== null)
+        if ($this->units !== null)
         {
             return;
         }
         
         // just a numeric value: we assume this means we're dealing with bytes.
-        if(is_numeric($this->number)) 
+        if (is_numeric($this->number)) 
         {
             $this->units = 'b';
             return;
@@ -212,12 +212,12 @@ 
         
         $number = $this->sizeString;
         
-        foreach($units as $unit)
+        foreach ($units as $unit)
         {
-            if(stristr($number, $unit))
+            if (stristr($number, $unit))
             {
                 // there are more than 1 unit defined in the string
-                if($this->units !== null)
+                if ($this->units !== null)
                 {
                     $this->setError(
                         t(
@@ -273,14 +273,14 @@ 
     {
         $this->parseSize();
         
-        if(!$this->valid) {
+        if (!$this->valid) {
             return;
         }
         
         $int = intval($this->number);
         
         // negative values
-        if($int < 0) 
+        if ($int < 0) 
         {
             $this->setError(
                 t('Negative values cannot be used as size.'),

Indentation +89 added lines, -89 removed lines

@@ -31,9 +31,9 @@ 
     
     public const VALIDATION_ERROR_NEGATIVE_VALUE = 43803;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $sizeString;
 
     /**
@@ -41,44 +41,44 @@ 
      */
     protected $sizeDefinition;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $bytes = 0;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $valid = true;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $units = null;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $number = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $errorMessage = '';
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $errorCode = 0;
     
-   /**
-    * Create a new instance for the specified size string.
-    * 
-    * @param string $sizeString A size notation in the format "50 MB", or a number of bytes without units. Spaces are ignored, so "50MB" = "50 MB" = "  50   MB   ". Floating point values are accepted, both with dot and comma notation ("50.5" = "50,5"). To use Base 2 values, ose appropriate units, e.g. "50 MiB", "1.5 GiB". The units are case-insensitive, so "50 MB" = "50 mb".
-    *
-    * @throws ConvertHelper_Exception
-    * @see ConvertHelper_StorageSizeEnum::ERROR_UNKNOWN_UNIT_NAME
-    */
+    /**
+     * Create a new instance for the specified size string.
+     * 
+     * @param string $sizeString A size notation in the format "50 MB", or a number of bytes without units. Spaces are ignored, so "50MB" = "50 MB" = "  50   MB   ". Floating point values are accepted, both with dot and comma notation ("50.5" = "50,5"). To use Base 2 values, ose appropriate units, e.g. "50 MiB", "1.5 GiB". The units are case-insensitive, so "50 MB" = "50 mb".
+     *
+     * @throws ConvertHelper_Exception
+     * @see ConvertHelper_StorageSizeEnum::ERROR_UNKNOWN_UNIT_NAME
+     */
     public function __construct(string $sizeString)
     {
         $this->sizeString = $this->cleanString($sizeString);
@@ -86,31 +86,31 @@ 
         $this->convert();
     }
     
-   /**
-    * Gets the amount of bytes contained in the size notation.
-    * @return int
-    */
+    /**
+     * Gets the amount of bytes contained in the size notation.
+     * @return int
+     */
     public function toBytes() : int
     {
         return $this->bytes;
     }
     
-   /**
-    * Converts the size notation to a human-readable string, e.g. "50 MB".
-    * 
-    * @param int $precision
-    * @return string
-    * @see ConvertHelper::bytes2readable()
-    */
+    /**
+     * Converts the size notation to a human-readable string, e.g. "50 MB".
+     * 
+     * @param int $precision
+     * @return string
+     * @see ConvertHelper::bytes2readable()
+     */
     public function toString(int $precision=1) : string
     {
         return ConvertHelper::bytes2readable($this->bytes, $precision, $this->getBase());
     }
     
-   /**
-    * Retrieves the detected number's base.
-    * @return int The base number (1000 for Base 10, or 1024 for Base 2), or 0 if it is not valid.
-    */
+    /**
+     * Retrieves the detected number's base.
+     * @return int The base number (1000 for Base 10, or 1024 for Base 2), or 0 if it is not valid.
+     */
     public function getBase() : int
     {
         if($this->isValid()) {
@@ -120,13 +120,13 @@ 
         return 0;
     }
     
-   /**
-    * Retrieves the detected storage size instance, if 
-    * the size string is valid.
-    * 
-    * @return ConvertHelper_StorageSizeEnum_Size|NULL
-    * @see ConvertHelper_StorageSizeEnum_Size
-    */
+    /**
+     * Retrieves the detected storage size instance, if 
+     * the size string is valid.
+     * 
+     * @return ConvertHelper_StorageSizeEnum_Size|NULL
+     * @see ConvertHelper_StorageSizeEnum_Size
+     */
     public function getSizeDefinition() : ?ConvertHelper_StorageSizeEnum_Size
     {
         if($this->isValid()) {
@@ -136,27 +136,27 @@ 
         return null;
     }
     
-   /**
-    * Checks whether the size notation was valid and could be parsed
-    * into a meaningful byte value. If this returns `false`, it is 
-    * possible to use the `getErrorXXX` methods to retrieve information
-    * on what went wrong. 
-    * 
-    * @return bool
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
-    * @see ConvertHelper_SizeNotation::getErrorCode()
-    */
+    /**
+     * Checks whether the size notation was valid and could be parsed
+     * into a meaningful byte value. If this returns `false`, it is 
+     * possible to use the `getErrorXXX` methods to retrieve information
+     * on what went wrong. 
+     * 
+     * @return bool
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
+     * @see ConvertHelper_SizeNotation::getErrorCode()
+     */
     public function isValid() : bool
     {
         return $this->valid;
     }
     
-   /**
-    * Retrieves the error message if the size notation validation failed.
-    * 
-    * @return string
-    * @see ConvertHelper_SizeNotation::getErrorCode()
-    */
+    /**
+     * Retrieves the error message if the size notation validation failed.
+     * 
+     * @return string
+     * @see ConvertHelper_SizeNotation::getErrorCode()
+     */
     public function getErrorMessage() : string
     {
         return $this->errorMessage;
@@ -201,12 +201,12 @@ 
         );
     }
     
-   /**
-    * Detects the units and the number in the size notation string.
-    * Populates the `units` and `number` properties.
-    * 
-    * @return bool Whether the string could be parsed successfully.
-    */
+    /**
+     * Detects the units and the number in the size notation string.
+     * Populates the `units` and `number` properties.
+     * 
+     * @return bool Whether the string could be parsed successfully.
+     */
     protected function detectParts() : bool
     {
         $units = ConvertHelper_StorageSizeEnum::getSizeNames();
@@ -242,16 +242,16 @@ 
         return true;
     }
     
-   /**
-    * If the validation fails, this is used to store the reason for retrieval later.
-    *  
-    * @param string $message
-    * @param int $code
-    * 
-    * @see ConvertHelper_SizeNotation::isValid()
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
-    * @see ConvertHelper_SizeNotation::getErrorCode()
-    */
+    /**
+     * If the validation fails, this is used to store the reason for retrieval later.
+     *  
+     * @param string $message
+     * @param int $code
+     * 
+     * @see ConvertHelper_SizeNotation::isValid()
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
+     * @see ConvertHelper_SizeNotation::getErrorCode()
+     */
     protected function setError(string $message, int $code) : void
     {
         $this->valid = false;
@@ -259,12 +259,12 @@ 
         $this->errorCode = $code;
     }
     
-   /**
-    * Retrieves the error code, if the size notation validation failed.
-    * 
-    * @return int
-    * @see ConvertHelper_SizeNotation::getErrorMessage()
-    */
+    /**
+     * Retrieves the error code, if the size notation validation failed.
+     * 
+     * @return int
+     * @see ConvertHelper_SizeNotation::getErrorMessage()
+     */
     public function getErrorCode() : int
     {
         return $this->errorCode;

src/Request/AcceptHeaders.php

Indentation +37 added lines, -37 removed lines

@@ -28,20 +28,20 @@ 
         $this->parse();
     }
     
-   /**
-    * Retrieves an indexed array with accept mime types
-    * that the client sent, in the order of preference
-    * the client specified.
-    *
-    * Example:
-    *
-    * array(
-    *     'text/html',
-    *     'application/xhtml+xml',
-    *     'image/webp'
-    *     ...
-    * )
-    */
+    /**
+     * Retrieves an indexed array with accept mime types
+     * that the client sent, in the order of preference
+     * the client specified.
+     *
+     * Example:
+     *
+     * array(
+     *     'text/html',
+     *     'application/xhtml+xml',
+     *     'image/webp'
+     *     ...
+     * )
+     */
     public function getMimeStrings() : array
     {
         $result = array();
@@ -54,9 +54,9 @@ 
         return $result;
     }
     
-   /**
-    * Checks that an accept header string exists, and tries to parse it.
-    */
+    /**
+     * Checks that an accept header string exists, and tries to parse it.
+     */
     protected function parse() : void
     {
         // we may be in a CLI environment where the headers
@@ -68,11 +68,11 @@ 
         $this->headers = $this->parseHeader($_SERVER['HTTP_ACCEPT']);
     }
     
-   /**
-    * Splits the accept header string and parses the mime types.
-    *  
-    * @param string $acceptHeader 
-    */
+    /**
+     * Splits the accept header string and parses the mime types.
+     *  
+     * @param string $acceptHeader 
+     */
     protected function parseHeader(string $acceptHeader) : array
     {
         $tokens = preg_split('/\s*,\s*/', $acceptHeader);
@@ -89,13 +89,13 @@ 
         return $accept;
     }
     
-   /**
-    * Parses a single mime type entry.
-    * 
-    * @param int $i The position in the accept string
-    * @param string $mime The mime type
-    * @return array
-    */
+    /**
+     * Parses a single mime type entry.
+     * 
+     * @param int $i The position in the accept string
+     * @param string $mime The mime type
+     * @return array
+     */
     protected function parseEntry(int $i, string $mime) : array
     {
         $entry = array(
@@ -125,14 +125,14 @@ 
         return $entry;
     }
     
-   /**
-    * Sorts the mime types collection, first by quality
-    * and then by position in the list.
-    * 
-    * @param array $a
-    * @param array $b
-    * @return number
-    */
+    /**
+     * Sorts the mime types collection, first by quality
+     * and then by position in the list.
+     * 
+     * @param array $a
+     * @param array $b
+     * @return number
+     */
     protected function sortMimeTypes(array $a, array $b)
     {
         /* first tier: highest q factor wins */

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
     {
         $result = array();
         
-        foreach($this->headers as $header)
+        foreach ($this->headers as $header)
         {
             $result[] = $header['type'];
         }
@@ -61,7 +61,7 @@ 
     {
         // we may be in a CLI environment where the headers
         // are not populated.
-        if(!isset($_SERVER['HTTP_ACCEPT'])) {
+        if (!isset($_SERVER['HTTP_ACCEPT'])) {
             return;
         }
         
@@ -79,7 +79,7 @@ 
         
         $accept = array();
         
-        foreach($tokens as $i => $term)
+        foreach ($tokens as $i => $term)
         {
             $accept[] = $this->parseEntry($i, $term);
         }
@@ -105,7 +105,7 @@ 
             'type' => null
         );
         
-        if(strstr($mime, ';'))
+        if (strstr($mime, ';'))
         {
             $parts = explode(';', $mime);
             $mime = array_shift($parts);
@@ -114,7 +114,7 @@ 
             // like an URL query string if separated by ampersands;
             $entry['params'] = ConvertHelper::parseQueryString(implode('&', $parts));
                 
-            if(isset($entry['params']['q'])) 
+            if (isset($entry['params']['q'])) 
             {
                 $entry['quality'] = (double)$entry['params']['q'];
             } 

Braces +2 added lines, -4 removed lines

@@ -141,14 +141,12 @@
         if ($diff > 0) 
         {
             $diff = 1;
-        } 
-        else 
+        } else 
         {
             if ($diff < 0) 
             {
                 $diff = -1;
-            } 
-            else 
+            } else 
             {
                 /* tie-breaker: first listed item wins */
                 $diff = $a['pos'] - $b['pos'];

src/Request/Param/Filter.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 {
     use Traits_Optionable;
     
-   /**
-    * @var Request_Param
-    */
+    /**
+     * @var Request_Param
+     */
     protected $param;
     
     protected $value;

src/Request/Param/Filter/Boolean.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     
     protected function _filter()
     {
-        if($this->value === 'yes' || $this->value === 'true' || $this->value === true) {
+        if ($this->value === 'yes' || $this->value === 'true' || $this->value === true) {
             return true;
         }
         

src/Request/Param/Filter/CommaSeparated.php

Spacing +6 added lines, -6 removed lines

@@ -23,11 +23,11 @@ 
     
     protected function _filter()
     {
-        if(is_array($this->value)) {
+        if (is_array($this->value)) {
             return $this->value;
         }
         
-        if($this->value === '' || $this->value === null || !is_string($this->value)) {
+        if ($this->value === '' || $this->value === null || !is_string($this->value)) {
             return array();
         }
         
@@ -35,19 +35,19 @@ 
         $stripEmptyEntries = $this->getBoolOption('stripEmptyEntries');
         $result = explode(',', $this->value);
         
-        if(!$trimEntries && !$stripEmptyEntries) {
+        if (!$trimEntries && !$stripEmptyEntries) {
             return $result;
         }
         
         $keep = array();
         
-        foreach($result as $entry)
+        foreach ($result as $entry)
         {
-            if($trimEntries === true) {
+            if ($trimEntries === true) {
                 $entry = trim($entry);
             }
             
-            if($stripEmptyEntries === true && $entry === '') {
+            if ($stripEmptyEntries === true && $entry === '') {
                 continue;
             }
             

src/Request/Param/Filter/String.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     
     protected function _filter()
     {
-        if(!is_scalar($this->value)) {
+        if (!is_scalar($this->value)) {
             return '';
         }
         

src/Request/Param/Validator/Alpha.php

Spacing +2 added lines, -2 removed lines

@@ -27,11 +27,11 @@
     
     protected function _validate()
     {
-        if(!is_scalar($this->value)) {
+        if (!is_scalar($this->value)) {
             return null;
         }
         
-        if(preg_match('/\A[a-zA-Z]+\z/', $this->value)) {
+        if (preg_match('/\A[a-zA-Z]+\z/', $this->value)) {
             return $this->value;
         }
         

src/Request/Param/Validator/Callback.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         array_unshift($args, $this->value);
         
         $result = call_user_func_array($this->getOption('callback'), $args);
-        if($result !== false) {
+        if ($result !== false) {
             return $this->value;
         }