Mistralys / application-utils

src/SVNHelper/Command/Update.php

Indentation +12 added lines, -12 removed lines

@@ -28,17 +28,17 @@ 
         return $result;
     }
     
-   /**
-    * @var SVNHelper_Command_Update_Status[]
-    */
+    /**
+     * @var SVNHelper_Command_Update_Status[]
+     */
     protected $stati;
     
     protected $revision;
     
-   /**
-    * Parses the command output to find out which files have been modified, and how.
-    * @param SVNHelper_CommandResult $result
-    */
+    /**
+     * Parses the command output to find out which files have been modified, and how.
+     * @param SVNHelper_CommandResult $result
+     */
     protected function parseResult(SVNHelper_CommandResult $result)
     {
         $this->stati = array();
@@ -119,11 +119,11 @@ 
         return $this->getByStatus('a');
     }
     
-   /**
-    * Whether there were files with the specified status code.
-    * @param string $status
-    * @return boolean
-    */
+    /**
+     * Whether there were files with the specified status code.
+     * @param string $status
+     * @return boolean
+     */
     protected function hasStatus($status)
     {
         $this->execute();

Spacing +8 added lines, -8 removed lines

@@ -10,13 +10,13 @@ 
     {
         $result = $this->execCommand('update', $this->target->getPath());
         
-        if($result->isError()) {
+        if ($result->isError()) {
             $this->throwExceptionUnexpected($result);
         }
         
         $this->parseResult($result);
         
-        if(!isset($this->revision)) {
+        if (!isset($this->revision)) {
             $this->throwException(
                 'No update revision returned',
                 'The command did not return the expected last line with "at revision x".',
@@ -45,7 +45,7 @@ 
         
         $lines = $result->getLines();
         
-        foreach($lines as $line) 
+        foreach ($lines as $line) 
         {
             $result = array();
             preg_match_all('/\A(a|c|d|u)[ ]+(.+)/si', $line, $result, PREG_PATTERN_ORDER);
@@ -53,13 +53,13 @@ 
             // is this a file update status line? It looks like this:
             // a    c:\path\to\file.ext
             // ^ status code
-            if(isset($result[0]) && isset($result[1][0]) && !empty($result[1][0])) 
+            if (isset($result[0]) && isset($result[1][0]) && !empty($result[1][0])) 
             {
                 $status = $result[1][0];
                 $path = $result[2][0];
                 $obj = new SVNHelper_Command_Update_Status($this, $status, $path);
                 
-                if(!isset($this->stati[$status])) {
+                if (!isset($this->stati[$status])) {
                     $this->stati[$status] = array();
                 }
                 
@@ -69,9 +69,9 @@ 
             }
             
             // the revision line, "updated to revision X" or "at revision X"
-            if(strstr($line, 'revision ')) {
+            if (strstr($line, 'revision ')) {
                 preg_match('/(at revision|to revision) ([0-9]+)/si', $line, $result);
-                if(isset($result[2])) {
+                if (isset($result[2])) {
                     $this->revision = $result[2];
                 }
                 continue;
@@ -135,7 +135,7 @@ 
     {
         $this->execute();
         
-        if(isset($this->stati[$status])) {
+        if (isset($this->stati[$status])) {
             return $this->stati[$status];
         }
         

src/SVNHelper/Command/Status.php

Indentation +8 added lines, -8 removed lines

@@ -24,10 +24,10 @@ 
     
     const STATUS_FILETYPE_CHANGE = 'filetype-change';
     
-   /**
-    * @var array
-    * @see http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.status.html
-    */
+    /**
+     * @var array
+     * @see http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.status.html
+     */
     protected static $knownStati = array(
         'a' => self::STATUS_ADD,
         'd' => self::STATUS_DELETE,
@@ -40,9 +40,9 @@ 
         '~' => self::STATUS_FILETYPE_CHANGE,
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $status;
     
     protected function _execute()
@@ -65,7 +65,7 @@ 
             
             $svnStatusCode = strtolower(substr($lines[0], 0, 1));
             if(isset(self::$knownStati[$svnStatusCode])) {
-               $this->status = self::$knownStati[$svnStatusCode];
+                $this->status = self::$knownStati[$svnStatusCode];
             }
         }
         

Spacing +3 added lines, -3 removed lines

@@ -49,13 +49,13 @@ 
     {
         $result = $this->execCommand('status', $this->target->getPath(), array('depth empty'));
         
-        if($result->isError()) {
+        if ($result->isError()) {
             $this->throwExceptionUnexpected($result);
         }
 
         $lines = $result->getOutput();
         
-        if(empty($lines)) 
+        if (empty($lines)) 
         {
             $this->status = self::STATUS_NOT_MODIFIED;
         }
@@ -64,7 +64,7 @@ 
             $this->status = self::STATUS_UNKNOWN;
             
             $svnStatusCode = strtolower(substr($lines[0], 0, 1));
-            if(isset(self::$knownStati[$svnStatusCode])) {
+            if (isset(self::$knownStati[$svnStatusCode])) {
                $this->status = self::$knownStati[$svnStatusCode];
             }
         }

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
         if(empty($lines)) 
         {
             $this->status = self::STATUS_NOT_MODIFIED;
-        }
-        else 
+        } else 
         {
             $this->status = self::STATUS_UNKNOWN;
             

src/ConvertHelper/ThrowableInfo.php

Indentation +84 added lines, -84 removed lines

@@ -14,49 +14,49 @@ 
     const CONTEXT_COMMAND_LINE = 'cli';
     const CONTEXT_WEB = 'web';
     
-   /**
-    * @var \Throwable
-    */
+    /**
+     * @var \Throwable
+     */
     protected $exception;
     
-   /**
-    * @var ConvertHelper_ThrowableInfo_Call[]
-    */
+    /**
+     * @var ConvertHelper_ThrowableInfo_Call[]
+     */
     protected $calls = array();
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $code;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $message;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $callsCount = 0;
     
-   /**
-    * @var ConvertHelper_ThrowableInfo
-    */
+    /**
+     * @var ConvertHelper_ThrowableInfo
+     */
     protected $previous;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $referer = '';
     
-   /**
-    * @var \DateTime
-    */
+    /**
+     * @var \DateTime
+     */
     protected $date;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $context = self::CONTEXT_WEB;
     
     protected function __construct($subject)
@@ -103,16 +103,16 @@ 
         return isset($this->previous);
     }
     
-   /**
-    * Retrieves the information on the previous exception.
-    * 
-    * NOTE: Throws an exception if there is no previous 
-    * exception. Use hasPrevious() first to avoid this.
-    * 
-    * @throws ConvertHelper_Exception
-    * @return ConvertHelper_ThrowableInfo
-    * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
-    */
+    /**
+     * Retrieves the information on the previous exception.
+     * 
+     * NOTE: Throws an exception if there is no previous 
+     * exception. Use hasPrevious() first to avoid this.
+     * 
+     * @throws ConvertHelper_Exception
+     * @return ConvertHelper_ThrowableInfo
+     * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
+     */
     public function getPrevious() : ConvertHelper_ThrowableInfo
     {
         if(isset($this->previous)) {
@@ -131,9 +131,9 @@ 
         return !empty($this->code);
     }
     
-   /**
-    * Improved textonly exception trace.
-    */
+    /**
+     * Improved textonly exception trace.
+     */
     public function toString() : string
     {
         $calls = $this->getCalls();
@@ -161,59 +161,59 @@ 
         return $string;
     }
     
-   /**
-    * Retrieves the URL of the page in which the exception
-    * was thrown, if applicable: in CLI context, this will
-    * return an empty string.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the URL of the page in which the exception
+     * was thrown, if applicable: in CLI context, this will
+     * return an empty string.
+     * 
+     * @return string
+     */
     public function getReferer() : string
     {
         return $this->referer;
     }
     
-   /**
-    * Whether the exception occurred in a command line context.
-    * @return bool
-    */
+    /**
+     * Whether the exception occurred in a command line context.
+     * @return bool
+     */
     public function isCommandLine() : bool
     {
         return $this->getContext() === self::CONTEXT_COMMAND_LINE;
     }
     
-   /**
-    * Whether the exception occurred during an http request.
-    * @return bool
-    */
+    /**
+     * Whether the exception occurred during an http request.
+     * @return bool
+     */
     public function isWebRequest() : bool
     {
         return $this->getContext() === self::CONTEXT_WEB;
     }
     
-   /**
-    * Retrieves the context identifier, i.e. if the exception
-    * occurred in a command line context or regular web request.
-    * 
-    * @return string
-    * 
-    * @see ConvertHelper_ThrowableInfo::isCommandLine()
-    * @see ConvertHelper_ThrowableInfo::isWebRequest()
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
-    */
+    /**
+     * Retrieves the context identifier, i.e. if the exception
+     * occurred in a command line context or regular web request.
+     * 
+     * @return string
+     * 
+     * @see ConvertHelper_ThrowableInfo::isCommandLine()
+     * @see ConvertHelper_ThrowableInfo::isWebRequest()
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
+     */
     public function getContext() : string
     {
         return $this->context;
     }
     
-   /**
-    * Retrieves the date of the exception, and approximate time:
-    * since exceptions do not store time, this is captured the 
-    * moment the ThrowableInfo is created.
-    * 
-    * @return \DateTime
-    */
+    /**
+     * Retrieves the date of the exception, and approximate time:
+     * since exceptions do not store time, this is captured the 
+     * moment the ThrowableInfo is created.
+     * 
+     * @return \DateTime
+     */
     public function getDate() : \DateTime
     {
         return $this->date;
@@ -245,13 +245,13 @@ 
         return $result;
     }
 
-   /**
-    * Sets the maximum folder depth to show in the 
-    * file paths, to avoid them being too long.
-    * 
-    * @param int $depth
-    * @return ConvertHelper_ThrowableInfo
-    */
+    /**
+     * Sets the maximum folder depth to show in the 
+     * file paths, to avoid them being too long.
+     * 
+     * @param int $depth
+     * @return ConvertHelper_ThrowableInfo
+     */
     public function setFolderDepth(int $depth) : ConvertHelper_ThrowableInfo
     {
         return $this->setOption('folder-depth', $depth);
@@ -262,10 +262,10 @@ 
         return $this->getOption('folder-depth');
     }
     
-   /**
-    * Retrieves all function calls that led to the error.
-    * @return ConvertHelper_ThrowableInfo_Call[]
-    */
+    /**
+     * Retrieves all function calls that led to the error.
+     * @return ConvertHelper_ThrowableInfo_Call[]
+     */
     public function getCalls()
     {
         return $this->calls;

Spacing +14 added lines, -14 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -64,8 +64,7 @@
         if(is_array($subject))
         {
             $this->parseSerialized($subject);
-        }
-        else
+        } else
         {
             $this->parseException($subject);
         }

src/ConvertHelper/ThrowableInfo/Call.php

Indentation +59 added lines, -59 removed lines

@@ -12,50 +12,50 @@ 
     
     const TYPE_SCRIPT_START = 'start';
     
-   /**
-    * @var ConvertHelper_ThrowableInfo
-    */
+    /**
+     * @var ConvertHelper_ThrowableInfo
+     */
     protected $info;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $trace;
     
-   /**
-    * @var VariableInfo[]
-    */
+    /**
+     * @var VariableInfo[]
+     */
     protected $args = array();
     
-   /**
-    * The source file, if any
-    * @var string
-    */
+    /**
+     * The source file, if any
+     * @var string
+     */
     protected $file = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $class = '';
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $line = 0;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $position = 1;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $function = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type = self::TYPE_SCRIPT_START;
     
     protected function __construct(ConvertHelper_ThrowableInfo $info, array $data)
@@ -82,10 +82,10 @@ 
         }
     }
     
-   /**
-    * 1-based position of the call in the calls list.
-    * @return int
-    */
+    /**
+     * 1-based position of the call in the calls list.
+     * @return int
+     */
     public function getPosition() : int
     {
         return $this->position;
@@ -96,18 +96,18 @@ 
         return $this->line;
     }
     
-   /**
-    * Whether the call had any arguments.
-    * @return bool
-    */
+    /**
+     * Whether the call had any arguments.
+     * @return bool
+     */
     public function hasArguments() : bool
     {
         return !empty($this->args);
     }
     
-   /**
-    * @return VariableInfo[]
-    */
+    /**
+     * @return VariableInfo[]
+     */
     public function getArguments()
     {
         return $this->args;
@@ -240,31 +240,31 @@ 
         return implode(', ', $tokens); 
     }
     
-   /**
-    * Retrieves the type of call: typcially a function 
-    * call, or a method call of an object. Note that the
-    * first call in a script does not have either.
-    * 
-    * @return string
-    * 
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
-    * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
-    * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
-    * @see ConvertHelper_ThrowableInfo_Call::hasClass()
-    */
+    /**
+     * Retrieves the type of call: typcially a function 
+     * call, or a method call of an object. Note that the
+     * first call in a script does not have either.
+     * 
+     * @return string
+     * 
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_FUNCTION_CALL
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_METHOD_CALL
+     * @see ConvertHelper_ThrowableInfo_Call::TYPE_SCRIPT_START
+     * @see ConvertHelper_ThrowableInfo_Call::hasFunction()
+     * @see ConvertHelper_ThrowableInfo_Call::hasClass()
+     */
     public function getType() : string
     {
         return $this->type;
     }
      
-   /**
-    * Serializes the call to an array, with all
-    * necessary information. Can be used to restore
-    * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
-    * 
-    * @return array
-    */
+    /**
+     * Serializes the call to an array, with all
+     * necessary information. Can be used to restore
+     * the call later using {@link ConvertHelper_ThrowableInfo_Call::fromSerialized()}.
+     * 
+     * @return array
+     */
     public function serialize() : array
     {
         $result = array(

Spacing +17 added lines, -17 removed lines

@@ -62,7 +62,7 @@ 
     {
         $this->info = $info;
         
-        if(isset($data['serialized'])) 
+        if (isset($data['serialized'])) 
         {
             $this->parseSerialized($data['serialized']);
         }
@@ -72,11 +72,11 @@ 
             $this->position = $data['position'];
         }
         
-        if($this->hasClass()) 
+        if ($this->hasClass()) 
         {
             $this->type = self::TYPE_METHOD_CALL;
         }
-        else if($this->hasFunction()) 
+        else if ($this->hasFunction()) 
         {
             $this->type = self::TYPE_FUNCTION_CALL;
         }
@@ -135,7 +135,7 @@ 
     
     public function getFileName() : string
     {
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             return basename($this->file);
         }
         
@@ -144,7 +144,7 @@ 
     
     public function getFileRelative() : string
     {
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             return FileHelper::relativizePathByDepth($this->file, $this->info->getFolderDepth());
         }
         
@@ -170,7 +170,7 @@ 
         $this->class = $data['class'];
         $this->position = $data['position'];
         
-        foreach($data['arguments'] as $arg)
+        foreach ($data['arguments'] as $arg)
         {
             $this->args[] = VariableInfo::fromSerialized($arg);
         }
@@ -178,29 +178,29 @@ 
     
     protected function parseTrace(array $trace)
     {
-        if(isset($trace['line']))
+        if (isset($trace['line']))
         {
             $this->line = intval($trace['line']);
         }
         
-        if(isset($trace['function'])) 
+        if (isset($trace['function'])) 
         {
             $this->function = $trace['function'];
         }
         
-        if(isset($trace['file']))
+        if (isset($trace['file']))
         {
             $this->file = FileHelper::normalizePath($trace['file']);
         }
         
-        if(isset($trace['class'])) 
+        if (isset($trace['class'])) 
         {
             $this->class = $trace['class'];
         }
      
-        if(isset($trace['args']) && !empty($trace['args']))
+        if (isset($trace['args']) && !empty($trace['args']))
         {
-            foreach($trace['args'] as $arg) 
+            foreach ($trace['args'] as $arg) 
             {
                 $this->args[] = parseVariable($arg);
             }
@@ -215,13 +215,13 @@ 
         
         $tokens[] = '#'.sprintf('%0'.$padLength.'d', $this->getPosition()).' ';
         
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             $tokens[] = $this->getFileRelative().':'.$this->getLine();
         }
         
-        if($this->hasClass()) {
+        if ($this->hasClass()) {
             $tokens[] = $this->getClass().'::'.$this->getFunction().'('.$this->argumentsToString().')';
-        } else if($this->hasFunction()) {
+        } else if ($this->hasFunction()) {
             $tokens[] = $this->getFunction().'('.$this->argumentsToString().')';
         }
         
@@ -232,7 +232,7 @@ 
     {
         $tokens = array();
         
-        foreach($this->args as $arg) 
+        foreach ($this->args as $arg) 
         {
             $tokens[] = $arg->toString();
         }
@@ -277,7 +277,7 @@ 
             'arguments' => array()
         );
         
-        foreach($this->args as $argument)
+        foreach ($this->args as $argument)
         {
             $result['arguments'][] = $argument->serialize();
         }

Braces +2 added lines, -4 removed lines

@@ -65,8 +65,7 @@ 
         if(isset($data['serialized'])) 
         {
             $this->parseSerialized($data['serialized']);
-        }
-        else
+        } else
         {
             $this->parseTrace($data['trace']);
             $this->position = $data['position'];
@@ -75,8 +74,7 @@ 
         if($this->hasClass()) 
         {
             $this->type = self::TYPE_METHOD_CALL;
-        }
-        else if($this->hasFunction()) 
+        } else if($this->hasFunction()) 
         {
             $this->type = self::TYPE_FUNCTION_CALL;
         }

src/ConvertHelper/StringMatch.php

Indentation +8 added lines, -8 removed lines

@@ -33,19 +33,19 @@
         $this->match = $matchedString;
     }
     
-   /**
-    * The zero-based start position of the string in the haystack.
-    * @return int
-    */
+    /**
+     * The zero-based start position of the string in the haystack.
+     * @return int
+     */
     public function getPosition() : int
     {
         return $this->position;
     }
     
-   /**
-    * The exact string that was matched, respecting the case as found in needle.
-    * @return string
-    */
+    /**
+     * The exact string that was matched, respecting the case as found in needle.
+     * @return string
+     */
     public function getMatchedString() : string
     {
         return $this->match;

src/ConvertHelper/EOL.php

Indentation +32 added lines, -32 removed lines

@@ -25,19 +25,19 @@ 
     const TYPE_LF = 'LF';
     const TYPE_CR = 'CR';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $char;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $description;
     
     public function __construct(string $char, string $type, string $description)
@@ -47,44 +47,44 @@ 
         $this->description = $description;
     }
     
-   /**
-    * The actual EOL character.
-    * @return string
-    */
+    /**
+     * The actual EOL character.
+     * @return string
+     */
     public function getCharacter() : string
     {
         return $this->char;
     }
     
-   /**
-    * Checks if the encoding matches the specified encoding string.
-    * 
-    * @param string $encoding
-    * @return bool
-    */
+    /**
+     * Checks if the encoding matches the specified encoding string.
+     * 
+     * @param string $encoding
+     * @return bool
+     */
     public function isEncoding(string $encoding) : bool
     {
         return $this->encoding === $encoding;
     }
 
-   /**
-    * A more detailed, human readable description of the character.
-    * @return string
-    */
+    /**
+     * A more detailed, human readable description of the character.
+     * @return string
+     */
     public function getDescription() : string
     {
         return $this->description;
     }
     
-   /**
-    * The EOL character type, e.g. "CR+LF", "CR"...
-    * @return string
-    * 
-    * @see ConvertHelper_EOL::TYPE_CR
-    * @see ConvertHelper_EOL::TYPE_CRLF
-    * @see ConvertHelper_EOL::TYPE_LF
-    * @see ConvertHelper_EOL::TYPE_LFCR
-    */
+    /**
+     * The EOL character type, e.g. "CR+LF", "CR"...
+     * @return string
+     * 
+     * @see ConvertHelper_EOL::TYPE_CR
+     * @see ConvertHelper_EOL::TYPE_CRLF
+     * @see ConvertHelper_EOL::TYPE_LF
+     * @see ConvertHelper_EOL::TYPE_LFCR
+     */
     public function getType() : string
     {
         return $this->type;

src/Request.php

Indentation +68 added lines, -68 removed lines

@@ -194,13 +194,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])) {
@@ -217,13 +217,13 @@ 
         );
     }
     
-   /**
-    * 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]);
@@ -352,14 +352,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])) {
@@ -373,12 +373,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) {
@@ -443,18 +443,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);
@@ -479,25 +479,25 @@ 
         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
     {
         return $this->getJSON($name);
     }
     
-   /**
-    * 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 getJSONObject(string $name) : object
     {
         return $this->getJSON($name, false);
@@ -531,16 +531,16 @@ 
         exit;
     }
     
-   /**
-    * 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);
@@ -549,10 +549,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 +30 added lines, -30 removed lines

@@ -74,11 +74,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);
         }
         
@@ -115,8 +115,8 @@ 
     
     public function getRefreshParams($params = array(), $exclude = array())
     {
-        if(empty($params)) { $params = array(); }
-        if(empty($exclude)) { $exclude = array(); }
+        if (empty($params)) { $params = array(); }
+        if (empty($exclude)) { $exclude = array(); }
         
         $vars = $_REQUEST;
 
@@ -136,8 +136,8 @@ 
         // remove the quickform form variable if present, to 
         // avoid redirect loops when using the refresh URL in
         // a page in which a form has been submitted.
-        foreach($names as $name) {
-            if(strstr($name, '_qf__')) {
+        foreach ($names as $name) {
+            if (strstr($name, '_qf__')) {
                 unset($vars[$name]);
                 break;
             }
@@ -164,13 +164,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(), $dispatcher=null)
+    public function buildURL($params = array(), $dispatcher = null)
     {
-        $url = rtrim(APP_URL, '/') . '/' . $dispatcher;
+        $url = rtrim(APP_URL, '/').'/'.$dispatcher;
         
         // append any leftover parameters to the end of the URL
         if (!empty($params)) {
-            $url .= '?' . http_build_query($params, null, '&');
+            $url .= '?'.http_build_query($params, null, '&');
         }
         
         return $url;
@@ -186,7 +186,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;
         }
@@ -203,7 +203,7 @@ 
     */
     public function getRegisteredParam(string $name) : Request_Param
     {
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             return $this->knownParams[$name];
         }
         
@@ -270,12 +270,12 @@ 
             {
                 $entry['type'] = $matches[1];
                 
-                if(isset($matches[2]) && !empty($matches[2])) 
+                if (isset($matches[2]) && !empty($matches[2])) 
                 {
                     $params = ConvertHelper::parseQueryString($matches[2]);
                     $entry['params'] = $params;
                      
-                    if(isset($params['q'])) {
+                    if (isset($params['q'])) {
                         $entry['quality'] = (double)$params['q'];
                     }
                 }
@@ -328,7 +328,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -362,11 +362,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]);
         }
         
@@ -381,7 +381,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -397,10 +397,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);
         }
         
@@ -409,9 +409,9 @@ 
     
     public function validate()
     {
-        foreach($this->knownParams as $param) {
+        foreach ($this->knownParams as $param) {
             $name = $param->getName();
-            if($param->isRequired() && !$this->hasParam($name)) {
+            if ($param->isRequired() && !$this->hasParam($name)) {
                 throw new Request_Exception(
                     'Missing request parameter '.$name,
                     sprintf(
@@ -433,10 +433,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');
         }
         
@@ -455,24 +455,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();
         }
         
@@ -511,7 +511,7 @@ 
     public static function sendJSON($data)
     {
         $payload = $data;
-        if(!is_string($payload)) {
+        if (!is_string($payload)) {
             $payload = json_encode($payload);
         }
         
@@ -541,7 +541,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);

Braces +1 added lines, -2 removed lines

@@ -279,8 +279,7 @@
                         $entry['quality'] = (double)$params['q'];
                     }
                 }
-            }
-            else
+            } else
             {
                 $entry['type'] = $term;
             }

src/XMLHelper/SimpleXML/Error.php

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 {
     protected $xml;
     
-   /**
-    * @var  \LibXMLError
-    */
+    /**
+     * @var  \LibXMLError
+     */
     protected $nativeError;
     
     public function __construct(XMLHelper_SimpleXML $xml, \LibXMLError $nativeError)

src/XMLHelper/Converter.php

Indentation +41 added lines, -41 removed lines

@@ -41,14 +41,14 @@ 
 {
     const ERROR_FAILED_CONVERTING_TO_JSON = 37901;
     
-   /**
-    * @var \SimpleXMLElement
-    */
+    /**
+     * @var \SimpleXMLElement
+     */
     protected $xml;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $json;
     
     protected function __construct(\SimpleXMLElement $element)
@@ -56,24 +56,24 @@ 
         $this->xml = $element;
     }
     
-   /**
-    * Factory method: creates a converter from an XML file on disk.
-    * 
-    * @param string $path
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an XML file on disk.
+     * 
+     * @param string $path
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromFile(string $path)
     {
         $xmlString = file_get_contents($path);
         return self::fromString($xmlString);
     }
  
-   /**
-    * Factory method: creates a converter from an XML string.
-    * 
-    * @param string $xmlString
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an XML string.
+     * 
+     * @param string $xmlString
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromString(string $xmlString)
     {
         $element = new \SimpleXMLElement($xmlString);
@@ -81,36 +81,36 @@ 
         return self::fromElement($element);
     }
     
-   /**
-    * Factory method: creates a converter from an existing SimpleXMLElement instance.
-    * 
-    * @param \SimpleXMLElement $element
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an existing SimpleXMLElement instance.
+     * 
+     * @param \SimpleXMLElement $element
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromElement(\SimpleXMLElement $element)
     {
         $obj = new XMLHelper_Converter($element);
         return $obj;
     }
 
-   /**
-    * Factory method: creates a converter from an existing SimpleXMLElement instance.
-    *
-    * @param \DOMElement $element
-    * @return \AppUtils\XMLHelper_Converter
-    */
+    /**
+     * Factory method: creates a converter from an existing SimpleXMLElement instance.
+     *
+     * @param \DOMElement $element
+     * @return \AppUtils\XMLHelper_Converter
+     */
     public static function fromDOMElement(\DOMElement $element)
     {
         $obj = new XMLHelper_Converter(simplexml_import_dom($element));
         return $obj;
     }
     
-   /**
-    * Converts the XML to JSON.
-    * 
-    * @throws XMLHelper_Exception
-    * @return string
-    */
+    /**
+     * Converts the XML to JSON.
+     * 
+     * @throws XMLHelper_Exception
+     * @return string
+     */
     public function toJSON() : string
     {
         if(isset($this->json)) {
@@ -138,11 +138,11 @@ 
         );
     }
     
-   /**
-    * Converts the XML to an associative array.
-    * @return array
-    * @throws XMLHelper_Exception
-    */
+    /**
+     * Converts the XML to an associative array.
+     * @return array
+     * @throws XMLHelper_Exception
+     */
     public function toArray() : array 
     {
         $json = $this->toJSON();

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
     */
     public function toJSON() : string
     {
-        if(isset($this->json)) {
+        if (isset($this->json)) {
             return $this->json;
         }
         
@@ -123,7 +123,7 @@ 
         
         unset($this->xml);
         
-        if($this->json !== false) {
+        if ($this->json !== false) {
             return $this->json;
         }