Mistralys / application-utils

src/SVNHelper.php

Spacing +18 added lines, -18 removed lines

@@ -65,7 +65,7 @@ 
     {
         $this->isWindows = substr(PHP_OS, 0, 3) == 'WIN';
         
-        if($this->isWindows) {
+        if ($this->isWindows) {
             $this->normalize['from'] = '/';
             $this->normalize['to'] = '\\';
         }
@@ -80,7 +80,7 @@ 
         //
         // NOTE: In case of symlinks, this resolves the symlink to its source (WIN/NIX)
         $realPath = realpath($this->sourcePath);
-        if(!is_dir($realPath)) {
+        if (!is_dir($realPath)) {
             throw new SVNHelper_Exception(
                 'Local repository path does not exist',
                 sprintf(
@@ -98,7 +98,7 @@ 
         $result = array();
         preg_match_all('%([^:]+):(.+)@(https|http|svn)://(.+)%sm', $repURL, $result, PREG_PATTERN_ORDER);
         
-        if(!isset($result[1]) || !isset($result[1][0])) {
+        if (!isset($result[1]) || !isset($result[1][0])) {
             throw new SVNHelper_Exception(
                 'Invalid SVN repository URL',
                 'The SVN URL must have the following format: [username:password@http://domain.com/path/to/rep].',
@@ -131,18 +131,18 @@ 
     * @throws SVNHelper_Exception
     * @return string
     */
-    public function normalizePath($path, $relativize=false)
+    public function normalizePath($path, $relativize = false)
     {
-        if(empty($path)) {
+        if (empty($path)) {
             return '';
         }
         
-        if($relativize) 
+        if ($relativize) 
         {
             $path = $this->normalizePath($path);
 
             // path is absolute, and does not match the realpath or the source path?
-            if(strstr($path, ':'.$this->getSlash()) && (!stristr($path, $this->path) && !stristr($path, $this->sourcePath))) {
+            if (strstr($path, ':'.$this->getSlash()) && (!stristr($path, $this->path) && !stristr($path, $this->sourcePath))) {
                 throw new SVNHelper_Exception(
                     'Cannot relativize path outside of repository',
                     sprintf(
@@ -223,14 +223,14 @@ 
     */
     protected function filterPath($path)
     {
-        if(empty($path)) {
+        if (empty($path)) {
             return '';
         }
         
         $path = $this->getPath().'/'.$this->relativizePath($path);
         
         $real = realpath($path);
-        if($real !== false) {
+        if ($real !== false) {
             return $real;
         }
         
@@ -257,13 +257,13 @@ 
         $key = $type.':'.$relativePath;
         
         $relativePath = $this->normalizePath($relativePath, true);
-        if(isset($this->targets[$key])) {
+        if (isset($this->targets[$key])) {
             return $this->targets[$key];
         }
 
         $target = null;
         
-        switch($type)
+        switch ($type)
         {
             case 'File':
                 $target = new SVNHelper_Target_File($this, $relativePath);
@@ -396,7 +396,7 @@ 
     */
     public function addFolder($path)
     {
-        if(is_dir($path)) {
+        if (is_dir($path)) {
             return $this->getFolder($path);
         }
         
@@ -404,12 +404,12 @@ 
         $tokens = explode($this->getSlash(), $path);
         
         $target = $this->path;
-        foreach($tokens as $folder) 
+        foreach ($tokens as $folder) 
         {
             $target .= $this->getSlash().$folder;
-            if(file_exists($target)) 
+            if (file_exists($target)) 
             {
-                if(!is_dir($target)) {
+                if (!is_dir($target)) {
                     throw new SVNHelper_Exception(
                         'Target folder is a file',
                         sprintf(
@@ -423,7 +423,7 @@ 
                 continue;
             }
             
-            if(!mkdir($target, 0777)) {
+            if (!mkdir($target, 0777)) {
                 throw new SVNHelper_Exception(
                     'Cannot create folder',
                     sprintf(
@@ -453,7 +453,7 @@ 
     */
     public static function setLogCallback($callback)
     {
-        if(!is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new SVNHelper_Exception(
                 'Not a valid logging callback',
                 'The specified argument is not callable.',
@@ -466,7 +466,7 @@ 
     
     public static function log($message)
     {
-        if(isset(self::$logCallback)) {
+        if (isset(self::$logCallback)) {
             call_user_func(self::$logCallback, 'SVNHelper | '.$message);
         }
     }

src/SVNHelper/Exception.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
     
     protected $logging = true;
     
-    public function __construct($message, $details=null, $code=null, $previous=null)
+    public function __construct($message, $details = null, $code = null, $previous = null)
     {
         parent::__construct($message, $details, $code, $previous);
         
@@ -31,17 +31,17 @@ 
     
     public function __destruct()
     {
-        if(!$this->logging) {
+        if (!$this->logging) {
             return;
         }
         
         $loggers = SVNHelper::getExceptionLoggers();
         
-        if(empty($loggers)) {
+        if (empty($loggers)) {
             return;
         }
         
-        foreach($loggers as $callback) {
+        foreach ($loggers as $callback) {
             call_user_func($callback, $this);
         }
     }

src/SVNHelper/CommandError.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
     public function hasAnyErrorCode($codes)
     {
         $items = array();
-        foreach($codes as $code) {
+        foreach ($codes as $code) {
             $items[] = ltrim($code, 'e');
         }
         

src/SVNHelper/Target.php

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

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

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

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