Mistralys / application-utils

src/SVNHelper/Command/Commit.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
             )
         );
         
-        if($result->isError()) {
+        if ($result->isError()) {
             $this->throwExceptionUnexpected($result);
         }
         

src/SVNHelper/Command/Info.php

Indentation +6 added lines, -6 removed lines

@@ -44,12 +44,12 @@
         return $result;
     }
     
-   /**
-    * Whether the file or folder has already been committed
-    * and has no pending changes.
-    * 
-    * @return boolean
-    */
+    /**
+     * Whether the file or folder has already been committed
+     * and has no pending changes.
+     * 
+     * @return boolean
+     */
     public function isCommitted()
     {
         $status = $this->target->getStatus();

Spacing +6 added lines, -6 removed lines

@@ -14,9 +14,9 @@ 
 
         $this->params = array();
         
-        if($result->isError()) {
+        if ($result->isError()) {
             // this error code means the target exists, but is not versioned yet
-            if(!$result->hasErrorCode('200009')) {
+            if (!$result->hasErrorCode('200009')) {
                 $this->throwExceptionUnexpected($result);
             }
 
@@ -29,15 +29,15 @@ 
         
         $lines = $result->getOutput();
         
-        foreach($lines as $line) 
+        foreach ($lines as $line) 
         {
-            if(!strstr($line, ':')) {
+            if (!strstr($line, ':')) {
                 continue;
             }
             
             $pos = strpos($line, ':');
             $name = str_replace(' ', '-', substr($line, 0, $pos));
-            $value = trim(substr($line, $pos+1));
+            $value = trim(substr($line, $pos + 1));
             $this->params[$name] = $value;
         }
         
@@ -89,7 +89,7 @@ 
     {
         $this->execute();
         
-        if(isset($this->params[$name])) {
+        if (isset($this->params[$name])) {
             return $this->params[$name];
         }
         

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/Call.php

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;
         }

Indentation +56 added lines, -56 removed lines

@@ -10,45 +10,45 @@ 
     const TYPE_METHOD_CALL = 'method';
     const TYPE_SCRIPT_START = 'start';
     
-   /**
-    * @var ConvertHelper_ThrowableInfo
-    */
+    /**
+     * @var ConvertHelper_ThrowableInfo
+     */
     protected $info;
     
-   /**
-    * @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;
 
     /**
@@ -79,10 +79,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;
@@ -93,18 +93,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;
@@ -244,31 +244,31 @@ 
         return implode(', ', $tokens); 
     }
     
-   /**
-    * Retrieves the type of call: typically 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: typically 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<string,mixed>
-    */
+    /**
+     * 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<string,mixed>
+     */
     public function serialize() : array
     {
         $result = array(

Spacing +17 added lines, -17 removed lines

@@ -59,7 +59,7 @@ 
     {
         $this->info = $info;
         
-        if(isset($data['serialized'])) 
+        if (isset($data['serialized'])) 
         {
             $this->parseSerialized($data['serialized']);
         }
@@ -69,11 +69,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;
         }
@@ -132,7 +132,7 @@ 
     
     public function getFileName() : string
     {
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             return basename($this->file);
         }
         
@@ -141,7 +141,7 @@ 
     
     public function getFileRelative() : string
     {
-        if($this->hasFile()) {
+        if ($this->hasFile()) {
             return FileHelper::relativizePathByDepth($this->file, $this->info->getFolderDepth());
         }
         
@@ -171,7 +171,7 @@ 
         $this->class = $data['class'];
         $this->position = $data['position'];
         
-        foreach($data['arguments'] as $arg)
+        foreach ($data['arguments'] as $arg)
         {
             $this->args[] = VariableInfo::fromSerialized($arg);
         }
@@ -182,29 +182,29 @@ 
      */
     protected function parseTrace(array $trace) : void
     {
-        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);
             }
@@ -219,13 +219,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().')';
         }
         
@@ -236,7 +236,7 @@ 
     {
         $tokens = array();
         
-        foreach($this->args as $arg) 
+        foreach ($this->args as $arg) 
         {
             $tokens[] = $arg->toString();
         }
@@ -281,7 +281,7 @@ 
             'arguments' => array()
         );
         
-        foreach($this->args as $argument)
+        foreach ($this->args as $argument)
         {
             $result['arguments'][] = $argument->serialize();
         }

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/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;
         }
         

src/VariableInfo.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         if(is_array($serialized))
         {
             $this->parseSerialized($serialized);
-        }
-        else
+        } else
         {
             $this->parseValue($value);
         }

Indentation +31 added lines, -31 removed lines

@@ -37,19 +37,19 @@ 
 
     const ERROR_INVALID_SERIALIZED_DATA = 56301;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $string;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
 
     /**
@@ -106,15 +106,15 @@ 
         return new VariableInfo(null, $serialized);
     }
     
-   /**
-    * Parses a previously serialized data set to restore the 
-    * variable information from it.
-    * 
-    * @param array $serialized
-    * @throws BaseException
-    * 
-    * @see VariableInfo::ERROR_INVALID_SERIALIZED_DATA
-    */
+    /**
+     * Parses a previously serialized data set to restore the 
+     * variable information from it.
+     * 
+     * @param array $serialized
+     * @throws BaseException
+     * 
+     * @see VariableInfo::ERROR_INVALID_SERIALIZED_DATA
+     */
     protected function parseSerialized(array $serialized) : void
     {
         if(!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options']))
@@ -156,12 +156,12 @@ 
         return $this->value;
     }
     
-   /**
-    * The variable type - this is the same string that
-    * is returned by the PHP function `gettype`.
-    * 
-    * @return string
-    */
+    /**
+     * The variable type - this is the same string that
+     * is returned by the PHP function `gettype`.
+     * 
+     * @return string
+     */
     public function getType() : string
     {
         return $this->type;
@@ -175,13 +175,13 @@ 
         );
     }
     
-   /**
-    * Whether to prepend the variable type before the value, 
-    * like the var_dump function. Example: <code>string "Some text"</code>.
-    * 
-    * @param bool $enable
-    * @return VariableInfo
-    */
+    /**
+     * Whether to prepend the variable type before the value, 
+     * like the var_dump function. Example: <code>string "Some text"</code>.
+     * 
+     * @param bool $enable
+     * @return VariableInfo
+     */
     public function enableType(bool $enable=true) : VariableInfo
     {
         return $this->setOption('prepend-type', $enable);

Spacing +8 added lines, -8 removed lines

@@ -67,9 +67,9 @@ 
      * @param array|null $serialized
      * @throws BaseException
      */
-    public function __construct($value, ?array $serialized=null)
+    public function __construct($value, ?array $serialized = null)
     {
-        if(is_array($serialized))
+        if (is_array($serialized))
         {
             $this->parseSerialized($serialized);
         }
@@ -117,7 +117,7 @@ 
     */
     protected function parseSerialized(array $serialized) : void
     {
-        if(!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options']))
+        if (!isset($serialized['string']) || !isset($serialized['type']) || !isset($serialized['options']))
         {
             throw new BaseException(
                 'Invalid variable info serialized data.',
@@ -139,12 +139,12 @@ 
         
         // Gettype will return a string like "Resource(closed)" when
         // working with a resource that has already been closed.
-        if(strstr($this->type, 'resource'))
+        if (strstr($this->type, 'resource'))
         {
             $this->type = self::TYPE_RESOURCE;
         }
 
-        if(in_array($this->type, $this->callableTypes) && is_callable($value)) {
+        if (in_array($this->type, $this->callableTypes) && is_callable($value)) {
             $this->type = self::TYPE_CALLABLE;
         }
         
@@ -182,7 +182,7 @@ 
     * @param bool $enable
     * @return VariableInfo
     */
-    public function enableType(bool $enable=true) : VariableInfo
+    public function enableType(bool $enable = true) : VariableInfo
     {
         return $this->setOption('prepend-type', $enable);
     }
@@ -191,9 +191,9 @@ 
     {
         $converted = $this->string;
         
-        if($this->getOption('prepend-type') === true && !$this->isNull())
+        if ($this->getOption('prepend-type') === true && !$this->isNull())
         {
-            if($this->isString())
+            if ($this->isString())
             {
                 $converted = '"'.$converted.'"';
             }