Mistralys / application-utils

src/ConvertHelper/IntervalConverter.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
     
     public function __construct()
     {
-        if(class_exists('\AppLocalize\Localization')) {
+        if (class_exists('\AppLocalize\Localization')) {
             \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged'));
         }
     }
@@ -69,17 +69,17 @@ 
         $keep = $this->resolveTokens($interval);
 
         $parts = array();
-        foreach($keep as $token)
+        foreach ($keep as $token)
         {
             $value = $interval->getToken($token);
-            if($value === 0) {
+            if ($value === 0) {
                 continue;
             }
             
             $parts[] = $this->translateToken($token, $interval);
         }
         
-        if(count($parts) == 1) {
+        if (count($parts) == 1) {
             return $parts[0];
         }
         
@@ -101,10 +101,10 @@ 
         $value = $interval->getToken($token);
         
         $suffix = 'p';
-        if($value == 1) { $suffix = 's'; }
+        if ($value == 1) { $suffix = 's'; }
         $token .= $suffix;
         
-        if(!isset(self::$texts[$token]))
+        if (!isset(self::$texts[$token]))
         {
             throw new ConvertHelper_Exception(
                 'Missing interval translation',
@@ -134,9 +134,9 @@ 
     {
         $offset = 0;
         
-        foreach($this->tokens as $token) 
+        foreach ($this->tokens as $token) 
         {
-            if($interval->getToken($token) > 0) 
+            if ($interval->getToken($token) > 0) 
             {
                 return array_slice($this->tokens, $offset);
             }
@@ -152,7 +152,7 @@ 
     */
     protected function initTexts() : void
     {
-        if(isset(self::$texts)) {
+        if (isset(self::$texts)) {
             return;
         }
         

Indentation +38 added lines, -39 removed lines

@@ -17,21 +17,20 @@ 
  * @package Application Utils
  * @subpackage ConvertHelper
  * @author Sebastian Mordziol <s.mordziol@mistralys.eu>
-
  * @see ConvertHelper::interval2string()
  */
 class ConvertHelper_IntervalConverter
 {
     const ERROR_MISSING_TRANSLATION = 43501;
     
-   /**
-    * @var array|NULL
-    */
+    /**
+     * @var array|NULL
+     */
     protected static $texts = null;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $tokens = array('y', 'm', 'd', 'h', 'i', 's');
     
     public function __construct()
@@ -41,25 +40,25 @@ 
         }
     }
     
-   /**
-    * Called whenever the application locale has changed,
-    * to reset the internal translation cache.
-    */
+    /**
+     * Called whenever the application locale has changed,
+     * to reset the internal translation cache.
+     */
     public function handle_localeChanged()
     {
         self::$texts = null;
     }
     
-   /**
-    * Converts the specified interval to a human readable
-    * string, e.g. "2 hours and 4 minutes".
-    * 
-    * @param \DateInterval $interval
-    * @return string
-    * @throws ConvertHelper_Exception
-    * 
-    * @see ConvertHelper_IntervalConverter::ERROR_MISSING_TRANSLATION
-    */
+    /**
+     * Converts the specified interval to a human readable
+     * string, e.g. "2 hours and 4 minutes".
+     * 
+     * @param \DateInterval $interval
+     * @return string
+     * @throws ConvertHelper_Exception
+     * 
+     * @see ConvertHelper_IntervalConverter::ERROR_MISSING_TRANSLATION
+     */
     public function toString(\DateInterval $interval) : string
     {
         $this->initTexts();
@@ -88,14 +87,14 @@ 
         return t('%1$s and %2$s', implode(', ', $parts), $last);
     }
     
-   /**
-    * Translates the selected time token, e.g. "y" (for year).
-    * 
-    * @param string $token
-    * @param ConvertHelper_DateInterval $interval
-    * @throws ConvertHelper_Exception
-    * @return string
-    */
+    /**
+     * Translates the selected time token, e.g. "y" (for year).
+     * 
+     * @param string $token
+     * @param ConvertHelper_DateInterval $interval
+     * @throws ConvertHelper_Exception
+     * @return string
+     */
     protected function translateToken(string $token, ConvertHelper_DateInterval $interval) : string
     {
         $value = $interval->getToken($token);
@@ -123,13 +122,13 @@ 
         );
     }
     
-   /**
-    * Resolves all time tokens that need to be translated in
-    * the subject interval, depending on its length.
-    * 
-    * @param ConvertHelper_DateInterval $interval
-    * @return array
-    */
+    /**
+     * Resolves all time tokens that need to be translated in
+     * the subject interval, depending on its length.
+     * 
+     * @param ConvertHelper_DateInterval $interval
+     * @return array
+     */
     protected function resolveTokens(ConvertHelper_DateInterval $interval) : array
     {
         $offset = 0;
@@ -147,9 +146,9 @@ 
         return array();
     }
     
-   /**
-    * Initializes the translateable strings.
-    */
+    /**
+     * Initializes the translateable strings.
+     */
     protected function initTexts() : void
     {
         if(isset(self::$texts)) {

src/ZIPHelper.php

Indentation +55 added lines, -55 removed lines

@@ -36,14 +36,14 @@ 
         'WriteThreshold' => 100
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $file;
     
-   /**
-    * @var \ZipArchive
-    */
+    /**
+     * @var \ZipArchive
+     */
     protected $zip;
     
     public function __construct(string $targetFile)
@@ -51,35 +51,35 @@ 
         $this->file = $targetFile;
     }
     
-   /**
-    * Sets an option, among the available options:
-    * 
-    * <ul>
-    * <li>WriteThreshold: The amount of files to add before the zip is automatically written to disk and re-opened to release the file handles. Set to 0 to disable.</li>
-    * </ul>
-    * 
-    * @param string $name
-    * @param mixed $value
-    * @return ZIPHelper
-    */
+    /**
+     * Sets an option, among the available options:
+     * 
+     * <ul>
+     * <li>WriteThreshold: The amount of files to add before the zip is automatically written to disk and re-opened to release the file handles. Set to 0 to disable.</li>
+     * </ul>
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return ZIPHelper
+     */
     public function setOption(string $name, $value) : ZIPHelper
     {
         $this->options[$name] = $value;
         return $this;
     }
     
-   /**
-    * Adds a file to the zip. By default, the file is stored
-    * with the same name in the root of the zip. Use the optional
-    * parameter to change the location in the zip.
-    * 
-    * @param string $filePath
-    * @param string|null $zipPath If no path is specified, file will be added with the same name in the ZIP's root.
-    * @throws ZIPHelper_Exception
-    * @return bool
-    * 
-    * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST
-    */
+    /**
+     * Adds a file to the zip. By default, the file is stored
+     * with the same name in the root of the zip. Use the optional
+     * parameter to change the location in the zip.
+     * 
+     * @param string $filePath
+     * @param string|null $zipPath If no path is specified, file will be added with the same name in the ZIP's root.
+     * @throws ZIPHelper_Exception
+     * @return bool
+     * 
+     * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST
+     */
     public function addFile(string $filePath, ?string $zipPath=null) : bool
     {
         $this->open();
@@ -255,13 +255,13 @@ 
         return $fileName;
     }
     
-   /**
-    * Like {@link ZIPHelper::download()}, but deletes the
-    * file after sending it to the browser.
-    * 
-    * @param string|NULL $fileName Override the ZIP's file name for the download
-    * @see ZIPHelper::download()
-    */
+    /**
+     * Like {@link ZIPHelper::download()}, but deletes the
+     * file after sending it to the browser.
+     * 
+     * @param string|NULL $fileName Override the ZIP's file name for the download
+     * @see ZIPHelper::download()
+     */
     public function downloadAndDelete(?string $fileName=null)
     {
         $this->download($fileName);
@@ -269,14 +269,14 @@ 
         FileHelper::deleteFile($this->file);
     }
 
-   /**
-    * Extracts all files and folders from the zip to the 
-    * target folder. If no folder is specified, the files
-    * are extracted into the same folder as the zip itself.
-    * 
-    * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder.
-    * @return boolean
-    */
+    /**
+     * Extracts all files and folders from the zip to the 
+     * target folder. If no folder is specified, the files
+     * are extracted into the same folder as the zip itself.
+     * 
+     * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder.
+     * @return boolean
+     */
     public function extractAll(?string $outputFolder=null) : bool
     {
         if(empty($outputFolder)) {
@@ -289,9 +289,9 @@ 
     }
 
     
-   /**
-    * @return \ZipArchive
-    */
+    /**
+     * @return \ZipArchive
+     */
     public function getArchive() : \ZipArchive
     {
         $this->open();
@@ -299,14 +299,14 @@ 
         return $this->zip;
     }
     
-   /**
-    * JSON encodes the specified data and adds the json as
-    * a file in the ZIP archive.
-    * 
-    * @param mixed $data
-    * @param string $zipPath
-    * @return boolean
-    */
+    /**
+     * JSON encodes the specified data and adds the json as
+     * a file in the ZIP archive.
+     * 
+     * @param mixed $data
+     * @param string $zipPath
+     * @return boolean
+     */
     public function addJSON($data, $zipPath)
     {
         return $this->addString(

Spacing +17 added lines, -17 removed lines

@@ -30,7 +30,7 @@ 
     
     const ERROR_OPENING_ZIP_FILE = 338003;
     
-    const ERROR_CANNOT_SAVE_FILE_TO_DISK =338004;
+    const ERROR_CANNOT_SAVE_FILE_TO_DISK = 338004;
     
     protected $options = array(
         'WriteThreshold' => 100
@@ -80,7 +80,7 @@ 
     * 
     * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST
     */
-    public function addFile(string $filePath, ?string $zipPath=null) : bool
+    public function addFile(string $filePath, ?string $zipPath = null) : bool
     {
         $this->open();
         
@@ -126,16 +126,16 @@ 
     
     protected function open()
     {
-        if($this->open) {
+        if ($this->open) {
             return;
         }
         
-        if(!isset($this->zip)) {
+        if (!isset($this->zip)) {
             $this->zip = new \ZipArchive();
         }
         
         $flag = null;
-        if(!file_exists($this->file)) {
+        if (!file_exists($this->file)) {
             $flag = \ZipArchive::CREATE;
         }
         
@@ -175,7 +175,7 @@ 
     {
         $this->fileTracker++;
 
-        if($this->options['WriteThreshold'] < 1) {
+        if ($this->options['WriteThreshold'] < 1) {
             return;
         }
         
@@ -188,7 +188,7 @@ 
     
     protected function close()
     {
-        if(!$this->open) {
+        if (!$this->open) {
             return;
         }
         
@@ -197,8 +197,8 @@ 
             throw new ZIPHelper_Exception(
                 'Could not save ZIP file to disk',
                 sprintf(
-                    'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, ' .
-                    'including adding files that do not exist on disk, trying to create an empty zip, ' .
+                    'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, '.
+                    'including adding files that do not exist on disk, trying to create an empty zip, '.
                     'or trying to save to a directory that does not exist.',
                     $this->file
                 ),
@@ -213,7 +213,7 @@ 
     {
         $this->open();
         
-        if($this->countFiles() < 1) 
+        if ($this->countFiles() < 1) 
         {
             throw new ZIPHelper_Exception(
                 'No files in the zip file',
@@ -237,17 +237,17 @@ 
      * @throws ZIPHelper_Exception
      * @return string The file name that was sent (useful in case none was specified).
      */
-    public function download(?string $fileName=null) : string
+    public function download(?string $fileName = null) : string
     {
         $this->save();
         
-        if(empty($fileName)) {
+        if (empty($fileName)) {
             $fileName = basename($this->file);
         }
         
         header('Content-type: application/zip');
-        header('Content-Disposition: attachment; filename=' . $fileName);
-        header('Content-length: ' . filesize($this->file));
+        header('Content-Disposition: attachment; filename='.$fileName);
+        header('Content-length: '.filesize($this->file));
         header('Pragma: no-cache');
         header('Expires: 0');
         readfile($this->file);
@@ -262,7 +262,7 @@ 
     * @param string|NULL $fileName Override the ZIP's file name for the download
     * @see ZIPHelper::download()
     */
-    public function downloadAndDelete(?string $fileName=null)
+    public function downloadAndDelete(?string $fileName = null)
     {
         $this->download($fileName);
         
@@ -277,9 +277,9 @@ 
     * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder.
     * @return boolean
     */
-    public function extractAll(?string $outputFolder=null) : bool
+    public function extractAll(?string $outputFolder = null) : bool
     {
-        if(empty($outputFolder)) {
+        if (empty($outputFolder)) {
             $outputFolder = dirname($this->file);
         }
         

src/SVNHelper/CommandResult.php

Indentation +27 added lines, -27 removed lines

@@ -4,37 +4,37 @@ 
 
 class SVNHelper_CommandResult
 {
-   /**
-    * @var SVNHelper_Command
-    */
+    /**
+     * @var SVNHelper_Command
+     */
     protected $command;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $output;
     
-   /**
-    * @var SVNHelper_CommandError[]
-    */
+    /**
+     * @var SVNHelper_CommandError[]
+     */
     protected $errors = array();
     
-   /**
-    * @var SVNHelper_CommandError[]
-    */
+    /**
+     * @var SVNHelper_CommandError[]
+     */
     protected $warnings = array();
     
-   /**
-    * The actual command that has been executed
-    * @var string
-    */
+    /**
+     * The actual command that has been executed
+     * @var string
+     */
     protected $commandLine;
     
-   /**
-    * @param SVNHelper_Command $command
-    * @param string[] $output
-    * @param SVNHelper_CommandError[] $errors
-    */
+    /**
+     * @param SVNHelper_Command $command
+     * @param string[] $output
+     * @param SVNHelper_CommandError[] $errors
+     */
     public function __construct(SVNHelper_Command $command, $commandLine, $output, $errors)
     {
         $this->command = $command;
@@ -86,12 +86,12 @@ 
         return $this->command;
     }
     
-   /**
-    * Retrieves all error messages.
-    * 
-    * @param bool $asString
-    * @return string|string[]
-    */
+    /**
+     * Retrieves all error messages.
+     * 
+     * @param bool $asString
+     * @return string|string[]
+     */
     public function getErrorMessages(bool $asString=false)
     {
         if($asString) {

Spacing +15 added lines, -15 removed lines

@@ -41,8 +41,8 @@ 
         $this->commandLine = $commandLine;
         $this->output = $output;
         
-        foreach($errors as $error) {
-            if($error->isError()) {
+        foreach ($errors as $error) {
+            if ($error->isError()) {
                 $this->errors[] = $error;
             } else {
                 $this->warnings[] = $error;
@@ -62,8 +62,8 @@ 
     
     public function hasErrorCode($code)
     {
-        foreach($this->errors as $error) {
-            if($error->getCode() == $code) {
+        foreach ($this->errors as $error) {
+            if ($error->getCode() == $code) {
                 return true;
             }
         }
@@ -92,11 +92,11 @@ 
     * @param bool $asString
     * @return string|string[]
     */
-    public function getErrorMessages(bool $asString=false)
+    public function getErrorMessages(bool $asString = false)
     {
-        if($asString) {
+        if ($asString) {
             $lines = array();
-            foreach($this->errors as $error) {
+            foreach ($this->errors as $error) {
                 $lines[] = (string)$error;
             }
             
@@ -104,7 +104,7 @@ 
         }
         
         $messages = array();
-        foreach($this->errors as $error) {
+        foreach ($this->errors as $error) {
             $messages[] = (string)$error;
         }
         
@@ -123,7 +123,7 @@ 
     
     public function getLastLine()
     {
-        return $this->output[count($this->output)-1];
+        return $this->output[count($this->output) - 1];
     }
     
     public function getFirstLine()
@@ -138,8 +138,8 @@ 
     
     public function isConnectionFailed()
     {
-        foreach($this->errors as $error) {
-            if($error->isConnectionFailed()) {
+        foreach ($this->errors as $error) {
+            if ($error->isConnectionFailed()) {
                 return true;
             }
         }
@@ -149,8 +149,8 @@ 
     
     public function hasConflicts()
     {
-        foreach($this->errors as $error) {
-            if($error->isConflict()) {
+        foreach ($this->errors as $error) {
+            if ($error->isConflict()) {
                 return true;
             }
         }
@@ -160,8 +160,8 @@ 
     
     public function hasLocks()
     {
-        foreach($this->errors as $error) {
-            if($error->isLock()) {
+        foreach ($this->errors as $error) {
+            if ($error->isLock()) {
                 return true;
             }
         }

src/Transliteration.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
      * The converted string will be all lowercase.
      * @return Transliteration
      */
-    public function setLowercase(bool $lowercase=true) : Transliteration
+    public function setLowercase(bool $lowercase = true) : Transliteration
     {
         $this->setOption('lowercase', $lowercase);
 
@@ -97,8 +97,8 @@ 
 
         $result = implode('', $keep);
 
-        while (strstr($result, $space . $space)) {
-            $result = str_replace($space . $space, $space, $result);
+        while (strstr($result, $space.$space)) {
+            $result = str_replace($space.$space, $space, $result);
         }
 
         $result = trim($result, $space);

src/ConvertHelper/ByteConverter.php

Indentation +63 added lines, -63 removed lines

@@ -23,9 +23,9 @@ 
  */
 class ConvertHelper_ByteConverter
 {
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $bytes;
     
     public function __construct(int $bytes)
@@ -39,12 +39,12 @@ 
         }
     }
     
-   /**
-    * Detects the size matching the byte value for the specified base.
-    * 
-    * @param int $base
-    * @return ConvertHelper_StorageSizeEnum_Size
-    */
+    /**
+     * Detects the size matching the byte value for the specified base.
+     * 
+     * @param int $base
+     * @return ConvertHelper_StorageSizeEnum_Size
+     */
     protected function detectSize(int $base) : ConvertHelper_StorageSizeEnum_Size
     {
         $sizes = $this->getSizesSorted($base);   
@@ -70,13 +70,13 @@ 
         return ConvertHelper_StorageSizeEnum::getSizeByName('b');
     }
     
-   /**
-    * Retrieves all storage sizes for the specified base, 
-    * sorted from smallest byte size to highest.
-    * 
-    * @param int $base
-    * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
-    */
+    /**
+     * Retrieves all storage sizes for the specified base, 
+     * sorted from smallest byte size to highest.
+     * 
+     * @param int $base
+     * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
+     */
     protected function getSizesSorted(int $base)
     {
         $sizes = ConvertHelper_StorageSizeEnum::getSizesByBase($base);
@@ -89,16 +89,16 @@ 
         return $sizes;
     }
     
-   /**
-    * Converts the byte value to a human readable string, e.g. "5 KB", "140 MB".
-    * 
-    * @param int $precision The amount of decimals (rounded up)
-    * @param int $base The base to calculate bytes with.
-    * @return string
-    * 
-    * @see ConvertHelper_StorageSizeEnum::BASE_10
-    * @see ConvertHelper_StorageSizeEnum::BASE_2
-    */
+    /**
+     * Converts the byte value to a human readable string, e.g. "5 KB", "140 MB".
+     * 
+     * @param int $precision The amount of decimals (rounded up)
+     * @param int $base The base to calculate bytes with.
+     * @return string
+     * 
+     * @see ConvertHelper_StorageSizeEnum::BASE_10
+     * @see ConvertHelper_StorageSizeEnum::BASE_2
+     */
     public function toString(int $precision, int $base=ConvertHelper_StorageSizeEnum::BASE_10) : string
     {
         $size = $this->detectSize($base);
@@ -106,13 +106,13 @@ 
         return round($this->bytes / $size->getBytes(), $precision) . ' ' . $size->getSuffix();
     }
     
-   /**
-    * Converts the byte value to the amount of the corresponding units (KB, MB...).
-    * 
-    * @param int $precision The amount of decimals (rounded up)
-    * @param string $sizeName The lowercase storage size name (e.g. "kb", "kib")
-    * @return float
-    */
+    /**
+     * Converts the byte value to the amount of the corresponding units (KB, MB...).
+     * 
+     * @param int $precision The amount of decimals (rounded up)
+     * @param string $sizeName The lowercase storage size name (e.g. "kb", "kib")
+     * @return float
+     */
     public function toNumber(int $precision, string $sizeName) : float
     {
         $size = ConvertHelper_StorageSizeEnum::getSizeByName($sizeName);
@@ -120,56 +120,56 @@ 
         return round($this->bytes / $size->getBytes(), $precision);
     }
     
-   /**
-    * Converts the bytes to Kilobytes.
-    * 
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Kilobytes.
+     * 
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toKilobytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'kb');
     }
     
-   /**
-    * Converts the bytes to Megabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Megabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toMegabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'mb');
     }
 
-   /**
-    * Converts the bytes to Gigabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Gigabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toGigabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'gb');
     }
 
-   /**
-    * Converts the bytes to Terabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Terabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toTerabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'tb');
     }
     
-   /**
-    * Converts the bytes to Petabytes.
-    *
-    * @param int $precision Amount of decimals (rounded up)
-    * @return float
-    */
+    /**
+     * Converts the bytes to Petabytes.
+     *
+     * @param int $precision Amount of decimals (rounded up)
+     * @return float
+     */
     public function toPetabytes(int $precision=1) : float
     {
         return $this->toNumber($precision, 'pb');

Spacing +17 added lines, -17 removed lines

@@ -33,7 +33,7 @@ 
         $this->bytes = $bytes;
         
         // correct negative values
-        if($this->bytes < 0) 
+        if ($this->bytes < 0) 
         {
             $this->bytes = 0;
         }
@@ -49,19 +49,19 @@ 
     {
         $sizes = $this->getSizesSorted($base);   
 
-        if($this->bytes >= $sizes[0]->getBytes()) 
+        if ($this->bytes >= $sizes[0]->getBytes()) 
         {
             $total = count($sizes);
             
-            for($i=0; $i < $total; $i++)
+            for ($i = 0; $i < $total; $i++)
             {
                 $size = $sizes[$i];
                 
-                if(!isset($sizes[($i+1)])) {
+                if (!isset($sizes[($i + 1)])) {
                     return $size;
                 }
                 
-                if($this->bytes >= $size->getBytes() && $this->bytes < $sizes[($i+1)]->getBytes()) {
+                if ($this->bytes >= $size->getBytes() && $this->bytes < $sizes[($i + 1)]->getBytes()) {
                     return $size;
                 }
             }
@@ -99,11 +99,11 @@ 
     * @see ConvertHelper_StorageSizeEnum::BASE_10
     * @see ConvertHelper_StorageSizeEnum::BASE_2
     */
-    public function toString(int $precision, int $base=ConvertHelper_StorageSizeEnum::BASE_10) : string
+    public function toString(int $precision, int $base = ConvertHelper_StorageSizeEnum::BASE_10) : string
     {
         $size = $this->detectSize($base);
         
-        return round($this->bytes / $size->getBytes(), $precision) . ' ' . $size->getSuffix();
+        return round($this->bytes / $size->getBytes(), $precision).' '.$size->getSuffix();
     }
     
    /**
@@ -126,7 +126,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toKilobytes(int $precision=1) : float
+    public function toKilobytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'kb');
     }
@@ -137,7 +137,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toMegabytes(int $precision=1) : float
+    public function toMegabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'mb');
     }
@@ -148,7 +148,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toGigabytes(int $precision=1) : float
+    public function toGigabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'gb');
     }
@@ -159,7 +159,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toTerabytes(int $precision=1) : float
+    public function toTerabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'tb');
     }
@@ -170,7 +170,7 @@ 
     * @param int $precision Amount of decimals (rounded up)
     * @return float
     */
-    public function toPetabytes(int $precision=1) : float
+    public function toPetabytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'pb');
     }
@@ -181,7 +181,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toKibibytes(int $precision=1) : float
+    public function toKibibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'kib');
     }
@@ -192,7 +192,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toMebibytes(int $precision=1) : float
+    public function toMebibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'mib');
     }
@@ -203,7 +203,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toGibibytes(int $precision=1) : float
+    public function toGibibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'gib');
     }
@@ -214,7 +214,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toTebibytes(int $precision=1) : float
+    public function toTebibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'tib');
     }
@@ -225,7 +225,7 @@ 
      * @param int $precision Amount of decimals (rounded up)
      * @return float
      */
-    public function toPebibytes(int $precision=1) : float
+    public function toPebibytes(int $precision = 1) : float
     {
         return $this->toNumber($precision, 'pib');
     }

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

Indentation +86 added lines, -86 removed lines

@@ -31,9 +31,9 @@ 
     
     const VALIDATION_ERROR_NEGATIVE_VALUE = 43803;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $sizeString;
 
     /**
@@ -41,41 +41,41 @@ 
      */
     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". 
-    */
+    /**
+     * 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". 
+     */
     public function __construct(string $sizeString)
     {
         $this->sizeString = $this->cleanString($sizeString);
@@ -83,31 +83,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()) {
@@ -117,13 +117,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()) {
@@ -133,27 +133,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;
@@ -200,12 +200,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();
@@ -241,16 +241,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;
@@ -258,12 +258,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;

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.'),

src/Request.php

Indentation +122 added lines, -122 removed lines

@@ -39,9 +39,9 @@ 
      */
     protected static $instance;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $baseURL = '';
     
     public function __construct()
@@ -51,10 +51,10 @@ 
         $this->init();
     }
     
-   /**
-    * Can be extended in a subclass, to avoid
-    * redefining the constructor.
-    */
+    /**
+     * Can be extended in a subclass, to avoid
+     * redefining the constructor.
+     */
     protected function init()
     {
         
@@ -124,12 +124,12 @@ 
         return $this->buildURL($params, $dispatcher);
     }
     
-   /**
-    * Retrieves the name of the current dispatcher script / page.
-    * This is made to be extended and implemented in a subclass.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the name of the current dispatcher script / page.
+     * This is made to be extended and implemented in a subclass.
+     * 
+     * @return string
+     */
     public function getDispatcher() : string
     {
         return '';
@@ -198,10 +198,10 @@ 
         return $url;
     }
     
-   /**
-    * Retrieves the base URL of the application.
-    * @return string
-    */
+    /**
+     * Retrieves the base URL of the application.
+     * @return string
+     */
     public function getBaseURL() : string
     {
         return $this->baseURL;
@@ -231,13 +231,13 @@ 
         return $this->knownParams[$name];
     }
     
-   /**
-    * Retrieves a previously registered parameter instance.
-    * 
-    * @param string $name
-    * @throws Request_Exception
-    * @return Request_Param
-    */
+    /**
+     * Retrieves a previously registered parameter instance.
+     * 
+     * @param string $name
+     * @throws Request_Exception
+     * @return Request_Param
+     */
     public function getRegisteredParam(string $name) : Request_Param
     {
         if(isset($this->knownParams[$name])) {
@@ -254,48 +254,48 @@ 
         );
     }
     
-   /**
-    * Checks whether a parameter with the specified name 
-    * has been registered.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Checks whether a parameter with the specified name 
+     * has been registered.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function hasRegisteredParam(string $name) : bool
     {
         return isset($this->knownParams[$name]);
     }
     
-   /**
-    * 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'
-    *     ...
-    * )
-    * 
-    * @return array
-    * @see Request::parseAcceptHeaders()
-    */
+    /**
+     * 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'
+     *     ...
+     * )
+     * 
+     * @return array
+     * @see Request::parseAcceptHeaders()
+     */
     public static function getAcceptHeaders() : array
     {
         return self::parseAcceptHeaders()->getMimeStrings();
     }
     
-   /**
-    * Returns an instance of the accept headers parser,
-    * to access information on the browser's accepted
-    * mime types.
-    *  
-    * @return Request_AcceptHeaders
-    * @see Request::getAcceptHeaders()
-    */
+    /**
+     * Returns an instance of the accept headers parser,
+     * to access information on the browser's accepted
+     * mime types.
+     *  
+     * @return Request_AcceptHeaders
+     * @see Request::getAcceptHeaders()
+     */
     public static function parseAcceptHeaders() : Request_AcceptHeaders
     {
         static $accept;
@@ -343,14 +343,14 @@ 
         return false;
     }
     
-   /**
-    * Removes a single parameter from the request.
-    * If the parameter has been registered, also
-    * removes the registration info.
-    * 
-    * @param string $name
-    * @return Request
-    */
+    /**
+     * Removes a single parameter from the request.
+     * If the parameter has been registered, also
+     * removes the registration info.
+     * 
+     * @param string $name
+     * @return Request
+     */
     public function removeParam(string $name) : Request
     {
         if(isset($_REQUEST[$name])) {
@@ -364,12 +364,12 @@ 
         return $this;
     }
     
-   /**
-    * Removes several parameters from the request.
-    * 
-    * @param string[] $names
-    * @return Request
-    */
+    /**
+     * Removes several parameters from the request.
+     * 
+     * @param string[] $names
+     * @return Request
+     */
     public function removeParams(array $names) : Request
     {
         foreach($names as $name) {
@@ -434,18 +434,18 @@ 
         return $val;
     }
     
-   /**
-    * Treats the request parameter as a JSON string, and
-    * if it exists and contains valid JSON, returns the
-    * decoded JSON value as an array (default).
-    *
-    * @param string $name
-    * @param bool $assoc
-    * @return array|object
-    * 
-    * @see Request::getJSONAssoc()
-    * @see Request::getJSONObject()
-    */
+    /**
+     * Treats the request parameter as a JSON string, and
+     * if it exists and contains valid JSON, returns the
+     * decoded JSON value as an array (default).
+     *
+     * @param string $name
+     * @param bool $assoc
+     * @return array|object
+     * 
+     * @see Request::getJSONAssoc()
+     * @see Request::getJSONObject()
+     */
     public function getJSON(string $name, bool $assoc=true)
     {
         $value = $this->getParam($name);
@@ -470,13 +470,13 @@ 
         return new \stdClass();
     }
     
-   /**
-    * Like {@link Request::getJSON()}, but omitting the second
-    * parameter. Use this for more readable code.
-    * 
-    * @param string $name
-    * @return array
-    */
+    /**
+     * Like {@link Request::getJSON()}, but omitting the second
+     * parameter. Use this for more readable code.
+     * 
+     * @param string $name
+     * @return array
+     */
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
@@ -487,13 +487,13 @@ 
         return array();
     }
     
-   /**
-    * Like {@link Request::getJSON()}, but omitting the second
-    * parameter. Use this for more readable code.
-    *
-    * @param string $name
-    * @return object
-    */
+    /**
+     * Like {@link Request::getJSON()}, but omitting the second
+     * parameter. Use this for more readable code.
+     *
+     * @param string $name
+     * @return object
+     */
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
@@ -504,12 +504,12 @@ 
         return new \stdClass();
     }
     
-   /**
-    * Sends a JSON response with the correct headers.
-    *
-    * @param array|string $data
-    * @param bool $exit Whether to exit the script afterwards.
-    */
+    /**
+     * Sends a JSON response with the correct headers.
+     *
+     * @param array|string $data
+     * @param bool $exit Whether to exit the script afterwards.
+     */
     public static function sendJSON($data, bool $exit=true)
     {
         $payload = $data;
@@ -529,12 +529,12 @@ 
         }
     }
     
-   /**
-    * Sends HTML to the browser with the correct headers.
-    * 
-    * @param string $html
-    * @param bool $exit Whether to exit the script afterwards.
-    */
+    /**
+     * Sends HTML to the browser with the correct headers.
+     * 
+     * @param string $html
+     * @param bool $exit Whether to exit the script afterwards.
+     */
     public static function sendHTML(string $html, bool $exit=true)
     {
         header('Cache-Control: no-cache, must-revalidate');
@@ -549,16 +549,16 @@ 
         }
     }
     
-   /**
-    * Creates a new instance of the URL comparer, which can check 
-    * whether the specified URLs match, regardless of the order in 
-    * which the query parameters are, if any.
-    * 
-    * @param string $sourceURL
-    * @param string $targetURL
-    * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present)
-    * @return Request_URLComparer
-    */
+    /**
+     * Creates a new instance of the URL comparer, which can check 
+     * whether the specified URLs match, regardless of the order in 
+     * which the query parameters are, if any.
+     * 
+     * @param string $sourceURL
+     * @param string $targetURL
+     * @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
     {
         $comparer = new Request_URLComparer($this, $sourceURL, $targetURL);
@@ -567,10 +567,10 @@ 
         return $comparer;
     }
     
-   /**
-    * Retrieves the full URL that was used to access the current page.
-    * @return string
-    */
+    /**
+     * Retrieves the full URL that was used to access the current page.
+     * @return string
+     */
     public function getCurrentURL() : string
     {
         return $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];

Spacing +35 added lines, -35 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);
         }
         
@@ -143,9 +143,9 @@ 
         
         $exclude = array_merge($exclude, $this->getExcludeParams());
         
-        foreach($exclude as $name) 
+        foreach ($exclude as $name) 
         {
-            if(isset($vars[$name])) 
+            if (isset($vars[$name])) 
             {
                 unset($vars[$name]);
             }
@@ -156,9 +156,9 @@ 
         // remove the HTML_QuickForm2 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) 
+        foreach ($names as $name) 
         {
-            if(strstr($name, '_qf__')) 
+            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, '', '&');
+            $url .= '?'.http_build_query($params, '', '&');
         }
         
         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];
         }
         
@@ -300,7 +300,7 @@ 
     {
         static $accept;
         
-        if(!isset($accept)) {
+        if (!isset($accept)) {
             $accept = new Request_AcceptHeaders();
         }
         
@@ -319,7 +319,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -353,11 +353,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]);
         }
         
@@ -372,7 +372,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -388,10 +388,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);
         }
         
@@ -400,11 +400,11 @@ 
     
     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,
@@ -426,10 +426,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');
         }
         
@@ -448,24 +448,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();
         }
         
@@ -482,7 +482,7 @@ 
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -499,7 +499,7 @@ 
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
-        if(is_object($result)) {
+        if (is_object($result)) {
             return $result;
         }
         
@@ -512,10 +512,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);
         }
         
@@ -525,7 +525,7 @@ 
         
         echo $payload;
         
-        if($exit) 
+        if ($exit) 
         {
             exit;
         }
@@ -537,7 +537,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');
@@ -545,7 +545,7 @@ 
         
         echo $html;
         
-        if($exit)
+        if ($exit)
         {
             exit;
         }
@@ -561,7 +561,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);

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'];