Mistralys / application-utils

src/SVNHelper/Target.php

Indentation +45 added lines, -45 removed lines

@@ -76,10 +76,10 @@ 
         return $this instanceof SVNHelper_Target_Folder;
     }
     
-   /**
-    * Runs an update of the file or folder.
-    * @return SVNHelper_Command_Update
-    */
+    /**
+     * Runs an update of the file or folder.
+     * @return SVNHelper_Command_Update
+     */
     public function runUpdate()
     {
         $cmd = $this->createUpdate();
@@ -88,55 +88,55 @@ 
         return $cmd;
     }
     
-   /**
-    * Creates an update command instance for the target file or folder.
-    * @return SVNHelper_Command_Update
-    */
+    /**
+     * Creates an update command instance for the target file or folder.
+     * @return SVNHelper_Command_Update
+     */
     public function createUpdate()
     {
         return $this->helper->createUpdate($this);
     }
     
-   /**
-    * Creates a status command instance for the target file or folder.
-    * @return SVNHelper_Command_Status
-    */
+    /**
+     * Creates a status command instance for the target file or folder.
+     * @return SVNHelper_Command_Status
+     */
     public function createStatus()
     {
         return $this->helper->createStatus($this);
     }
     
-   /**
-    * Creates an info command instance for the target file or folder.
-    * @return SVNHelper_Command_Info
-    */
+    /**
+     * Creates an info command instance for the target file or folder.
+     * @return SVNHelper_Command_Info
+     */
     public function createInfo()
     {
         return $this->helper->createInfo($this);
     }
     
-   /**
-    * Creates a commit command instance for the target file or folder.
-    * @param string $message
-    * @return SVNHelper_Command_Commit
-    */
+    /**
+     * Creates a commit command instance for the target file or folder.
+     * @param string $message
+     * @return SVNHelper_Command_Commit
+     */
     public function createCommit($message)
     {
         return $this->helper->createCommit($this, $message);
     }
 
-   /**
-    * Creates an add command instance for the target file or folder.
-    * @return SVNHelper_Command_Add
-    */
+    /**
+     * Creates an add command instance for the target file or folder.
+     * @return SVNHelper_Command_Add
+     */
     public function createAdd()
     {
         return $this->helper->createAdd($this);
     }
     
-   /**
-    * @return SVNHelper_Command_Status
-    */
+    /**
+     * @return SVNHelper_Command_Status
+     */
     public function getStatus()
     {
         $cmd = $this->createStatus();
@@ -154,10 +154,10 @@ 
         return $this;
     }
     
-   /**
-    * Whether the target is versioned or needs to be added.
-    * @return boolean
-    */
+    /**
+     * Whether the target is versioned or needs to be added.
+     * @return boolean
+     */
     public function isVersioned()
     {
         return $this->getInfo()->isVersioned();
@@ -170,10 +170,10 @@ 
         $this->cache = array();
     }
     
-   /**
-    * Retrieves information on the target.
-    * @return SVNHelper_Command_Info
-    */
+    /**
+     * Retrieves information on the target.
+     * @return SVNHelper_Command_Info
+     */
     public function getInfo()
     {
         if(!isset($this->cache['info'])) {
@@ -183,15 +183,15 @@ 
         return $this->cache['info'];
     }
     
-   /**
-    * Commits the target file or folder. If it has
-    * not been added to the repository yet, it is 
-    * added automatically beforehand. If it does
-    * not need to be committed, no changes are made.
-    * 
-    * @param string $message
-    * @return SVNHelper_Target
-    */
+    /**
+     * Commits the target file or folder. If it has
+     * not been added to the repository yet, it is 
+     * added automatically beforehand. If it does
+     * not need to be committed, no changes are made.
+     * 
+     * @param string $message
+     * @return SVNHelper_Target
+     */
     public function runCommit($message)
     {
         if(!$this->isVersioned()) {

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
         $this->url = $this->helper->getURL().'/'.$this->relativePath;
         
         $path = $this->helper->getPath();
-        if(!empty($relativePath)) {
+        if (!empty($relativePath)) {
             $path .= $this->helper->getSlash().$this->relativePath;
         }
         
@@ -38,7 +38,7 @@ 
         // this is relevant).
         $this->path = realpath($path);
         
-        if(!$this->path || !file_exists($this->path)) {
+        if (!$this->path || !file_exists($this->path)) {
             throw new SVNHelper_Exception(
                 'File not found',
                 sprintf(
@@ -146,7 +146,7 @@ 
     
     public function runAdd()
     {
-        if(!$this->isVersioned()) {
+        if (!$this->isVersioned()) {
             $this->createAdd()->execute();
             $this->clearCache();
         }
@@ -176,7 +176,7 @@ 
     */
     public function getInfo()
     {
-        if(!isset($this->cache['info'])) {
+        if (!isset($this->cache['info'])) {
             $this->cache['info'] = $this->helper->createInfo($this);
         }
         
@@ -194,12 +194,12 @@ 
     */
     public function runCommit($message)
     {
-        if(!$this->isVersioned()) {
+        if (!$this->isVersioned()) {
             $this->log('Adding the unversioned file.');
             $this->runAdd();
         }
         
-        if(!$this->isCommitted()) {
+        if (!$this->isCommitted()) {
             $this->createCommit($message)->execute();
             $this->clearCache();
         }

Braces +1 added lines, -2 removed lines

@@ -202,8 +202,7 @@
         if(!$this->isCommitted()) {
             $this->createCommit($message)->execute();
             $this->clearCache();
-        }
-        else 
+        } else 
         {
             $this->log('Already committed, nothing to do.');
         }

src/SVNHelper/CommandException.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     protected $result;
     
-    public function __construct($message, $details, $code, SVNHelper_CommandResult $result, $previous=null)
+    public function __construct($message, $details, $code, SVNHelper_CommandResult $result, $previous = null)
     {
         parent::__construct($message, $details, $code, $previous);
         $this->result = $result;

src/SVNHelper/Command.php

Indentation +24 added lines, -24 removed lines

@@ -21,18 +21,18 @@ 
     const SVN_ERROR_TYPE_WARNING = 'warning';
     
     /**
-    * @var SVNHelper
-    */
+     * @var SVNHelper
+     */
     protected $helper;
     
-   /**
-    * @var SVNHelper_Target
-    */
+    /**
+     * @var SVNHelper_Target
+     */
     protected $target;
     
-   /**
-    * @var SVNHelper_CommandResult
-    */
+    /**
+     * @var SVNHelper_CommandResult
+     */
     protected $result;
     
     public function __construct(SVNHelper $helper, SVNHelper_Target $target)
@@ -41,9 +41,9 @@ 
         $this->target = $target;
     }
     
-   /**
-    * @return SVNHelper
-    */
+    /**
+     * @return SVNHelper
+     */
     public function getSVN()
     {
         return $this->helper;
@@ -99,15 +99,15 @@ 
         return $cmd;
     }
 
-   /**
-    * Executes the specified command, and returns a result
-    * instance to read the results.
-    * 
-    * @param string $mode The command mode, e.g. commit / update...
-    * @param string $path The path to apply the command to
-    * @param array $params
-    * @return SVNHelper_CommandResult
-    */
+    /**
+     * Executes the specified command, and returns a result
+     * instance to read the results.
+     * 
+     * @param string $mode The command mode, e.g. commit / update...
+     * @param string $path The path to apply the command to
+     * @param array $params
+     * @return SVNHelper_CommandResult
+     */
     protected function execCommand($mode, $path=null, $params=array())
     {
         $relative = $this->helper->relativizePath($path);
@@ -194,10 +194,10 @@ 
         return $this->result;
     }
     
-   /**
-    * Retrieves the type of command, e.g. "Commit"
-    * @return string
-    */
+    /**
+     * Retrieves the type of command, e.g. "Commit"
+     * @return string
+     */
     public function getType()
     {
         return str_replace('SVNHelper_Command_', '', get_class($this));   

Spacing +17 added lines, -17 removed lines

@@ -56,7 +56,7 @@ 
     
     public function execute()
     {
-        if(isset($this->result)) {
+        if (isset($this->result)) {
             return $this->result;
         }
         
@@ -66,7 +66,7 @@ 
         putenv('LC_ALL='.$locale);
         
         $this->result = $this->_execute();
-        if(!$this->result instanceof SVNHelper_CommandResult) {
+        if (!$this->result instanceof SVNHelper_CommandResult) {
             throw new SVNHelper_Exception(
                 'Not a valid SVN command result',
                 sprintf(
@@ -82,7 +82,7 @@ 
     
     abstract protected function _execute();
 
-    protected function buildCommand($mode, $path=null, $params=array())
+    protected function buildCommand($mode, $path = null, $params = array())
     {
         $params[] = 'non-interactive';
         $params[] = 'username '.$this->helper->getAuthUser();
@@ -90,7 +90,7 @@ 
         
         $cmd = 'svn '.$mode.' '.$path.' ';
         
-        foreach($params as $param) {
+        foreach ($params as $param) {
             $cmd .= '--'.$param.' ';
         }
         
@@ -108,7 +108,7 @@ 
     * @param array $params
     * @return SVNHelper_CommandResult
     */
-    protected function execCommand($mode, $path=null, $params=array())
+    protected function execCommand($mode, $path = null, $params = array())
     {
         $relative = $this->helper->relativizePath($path);
         
@@ -123,7 +123,7 @@ 
         exec($cmd, $output);
         
         $lines = array();
-        foreach($output as $line) {
+        foreach ($output as $line) {
             $lines[] = mb_strtolower(trim(utf8_encode($line)));
         }
         
@@ -135,7 +135,7 @@ 
         //
         // Can happen for example when the path is not under version
         // control.
-        if(isset($lines[0]) && substr($lines[0], 0, 7) == 'skipped')
+        if (isset($lines[0]) && substr($lines[0], 0, 7) == 'skipped')
         {
             $tokens = explode('--', $lines[0]);
             $message = trim(array_pop($tokens));
@@ -156,20 +156,20 @@ 
         // svn: w123456: warning message
         else
         {
-            foreach($lines as $line) 
+            foreach ($lines as $line) 
             {
-                if(strstr($line, 'svn:')) 
+                if (strstr($line, 'svn:')) 
                 {
                     $result = array();
                     preg_match_all('/svn:[ ]*(e|warning:[ ]*w)([0-9]+):(.*)/', $line, $result, PREG_PATTERN_ORDER);
                     
-                    if(isset($result[1]) && isset($result[1][0])) 
+                    if (isset($result[1]) && isset($result[1][0])) 
                     {
                         $message = trim($result[3][0]);
                         $code = trim($result[2][0]);
                         $type = self::SVN_ERROR_TYPE_ERROR;
                         
-                        if($result[1][0] != 'e') {
+                        if ($result[1][0] != 'e') {
                             $type = self::SVN_ERROR_TYPE_WARNING;
                         }
 
@@ -182,7 +182,7 @@ 
         
         $result = new SVNHelper_CommandResult($this, $cmd, $lines, $errorMessages);
         
-        if($result->isError()) {
+        if ($result->isError()) {
             $this->log(sprintf('[%s] | Command returned errors.', $relative));
         } 
         
@@ -205,7 +205,7 @@ 
     
     protected function throwExceptionUnexpected(SVNHelper_CommandResult $result)
     {
-        if($result->isConnectionFailed()) {
+        if ($result->isConnectionFailed()) {
             $this->throwException(
                 t('Could not connect to the remote SVN repository'), 
                 '', 
@@ -214,7 +214,7 @@ 
             );
         }
         
-        if($result->hasConflicts()) {
+        if ($result->hasConflicts()) {
             $this->throwException(
                 t('SVN command reported conflicts'), 
                 '', 
@@ -223,7 +223,7 @@ 
             );
         }
         
-        if($result->hasLocks()) {
+        if ($result->hasLocks()) {
             $this->throwException(
                 t('The target SVN folder or file is locked.'), 
                 '', 
@@ -240,7 +240,7 @@ 
         );
     }
     
-    protected function throwException($message, $details, $code, SVNHelper_CommandResult $result, $previous=null)
+    protected function throwException($message, $details, $code, SVNHelper_CommandResult $result, $previous = null)
     {
         $body = 
         '<p>'.
@@ -255,7 +255,7 @@ 
         '</p>'.
         '<ul>';
             $errors = $result->getErrorMessages();
-            foreach($errors as $error) {
+            foreach ($errors as $error) {
                 $body .= 
                 '<li>'.
                     $error.

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 string $asString
-    * @return string|string[]
-    */
+    /**
+     * Retrieves all error messages.
+     * 
+     * @param string $asString
+     * @return string|string[]
+     */
     public function getErrorMessages($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 string $asString
     * @return string|string[]
     */
-    public function getErrorMessages($asString=false)
+    public function getErrorMessages($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/SVNHelper/Command/Add.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     {
         $result = $this->execCommand('add', $this->target->getPath());
 
-        if($result->isError()) {
+        if ($result->isError()) {
             throw new SVNHelper_Exception(
                 'Could not add target path',
                 sprintf(
@@ -27,7 +27,7 @@ 
         }
         
         $line = $result->getFirstLine();
-        if(substr($line, 0, 1) != 'a') {
+        if (substr($line, 0, 1) != 'a') {
             throw new SVNHelper_Exception(
                 'Unexpected result for adding a path',
                 sprintf(

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;