Mistralys / application-utils

src/IniHelper.php

Braces +1 added lines, -2 removed lines

@@ -163,8 +163,7 @@
             if($section->isDefault()) 
             {
                 $result = array_merge($result, $section->toArray());
-            } 
-            else 
+            } else 
             {
                 $result[$section->getName()] = $section->toArray();
             }

Spacing +12 added lines, -12 removed lines

@@ -39,12 +39,12 @@ 
     {
         $section = $this->addSection(self::SECTION_DEFAULT);
         
-        if(empty($iniString)) {
+        if (empty($iniString)) {
             return;
         }
         
         $eol = ConvertHelper::detectEOLCharacter($iniString);
-        if($eol !== null) {
+        if ($eol !== null) {
             $this->eol = $eol->getCharacter();
         }
         
@@ -54,7 +54,7 @@ 
         {
             $line = new INILine($value, $index);
             
-            if($line->isSection()) {
+            if ($line->isSection()) {
                 $section = $this->addSection($line->getSectionName());
             }
 
@@ -85,7 +85,7 @@ 
         $iniPath = FileHelper::requireFileExists($iniPath);
         
         $content = file_get_contents($iniPath);
-        if($content !== false) {
+        if ($content !== false) {
             return self::createFromString($content);
         }
         
@@ -130,7 +130,7 @@ 
     */
     public function addSection(string $name) : IniHelper_Section
     {
-        if(!isset($this->sections[$name])) {
+        if (!isset($this->sections[$name])) {
             $this->sections[$name] = new IniHelper_Section($this, $name);
         }
         
@@ -157,9 +157,9 @@ 
     {
         $result = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
-            if($section->isDefault()) 
+            if ($section->isDefault()) 
             {
                 $result = array_merge($result, $section->toArray());
             } 
@@ -199,7 +199,7 @@ 
     {
         $parts = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
             $parts[] = $section->toString();
         }
@@ -247,8 +247,8 @@ 
     */
     public function sectionExists(string $name) : bool
     {
-        foreach($this->sections as $section) {
-            if($section->getName() === $name) {
+        foreach ($this->sections as $section) {
+            if ($section->getName() === $name) {
                 return true;
             }
         }
@@ -277,7 +277,7 @@ 
     {
         $info = $this->parsePath($path);
         
-        if(!$this->sectionExists($info['section'])) {
+        if (!$this->sectionExists($info['section'])) {
             return array();
         }
         
@@ -292,7 +292,7 @@ 
     {
         $parts = explode($this->pathSeparator, $path);
         
-        if(count($parts) === 1)
+        if (count($parts) === 1)
         {
             return array(
                 'section' => self::SECTION_DEFAULT,

src/PaginationHelper.php

Braces +1 added lines, -2 removed lines

@@ -322,8 +322,7 @@
         if($this->current < 1)
         {
             $this->current = 1;
-        }
-        else if($this->current > $pages)
+        } else if($this->current > $pages)
         {
             $this->current = $pages;
         }

Spacing +14 added lines, -14 removed lines

@@ -113,7 +113,7 @@ 
     */
     public function getNextPage() : int
     {
-        if($this->next === 0) {
+        if ($this->next === 0) {
             return $this->last;
         }
         
@@ -137,7 +137,7 @@ 
     */
     public function getPreviousPage() : int
     {
-        if($this->prev === 0) {
+        if ($this->prev === 0) {
             return 1;
         }
         
@@ -182,7 +182,7 @@ 
         // adjust the adjacent value if it exceeds the
         // total amount of pages
         $adjacentTotal = ($adjacent * 2) + 1;
-        if($adjacentTotal > $this->last) 
+        if ($adjacentTotal > $this->last) 
         {
             $adjacent = (int)floor($this->last / 2);
         }
@@ -195,13 +195,13 @@ 
         $back = 0;
         $fwd = 0;
         
-        if($maxBack >= $adjacent) {
+        if ($maxBack >= $adjacent) {
             $back = $adjacent; 
         } else {
             $back = $maxBack;
         }
         
-        if($maxFwd >= $adjacent)  {
+        if ($maxFwd >= $adjacent) {
             $fwd = $adjacent;
         } else {
             $fwd = $maxFwd;
@@ -217,16 +217,16 @@ 
         $fwd += $backDiff;
         $back += $fwdDiff;
         
-        if($fwd > $maxFwd) { $fwd = $maxFwd; }
-        if($back > $maxBack) { $back = $maxBack; }
+        if ($fwd > $maxFwd) { $fwd = $maxFwd; }
+        if ($back > $maxBack) { $back = $maxBack; }
         
         // calculate the first and last page in the list
         $prev = $this->current - $back;
         $next = $this->current + $fwd;
         
         // failsafe so we stay within the bounds
-        if($prev < 1) { $prev = 1; }
-        if($next > $this->last) { $next = $this->last; }
+        if ($prev < 1) { $prev = 1; }
+        if ($next > $this->last) { $next = $this->last; }
         
         // create and return the page numbers list
         $numbers = range($prev, $next);
@@ -319,11 +319,11 @@ 
     {
         $pages = (int)ceil($this->total / $this->perPage);
         
-        if($this->current < 1)
+        if ($this->current < 1)
         {
             $this->current = 1;
         }
-        else if($this->current > $pages)
+        else if ($this->current > $pages)
         {
             $this->current = $pages;
         }
@@ -331,19 +331,19 @@ 
         $this->last = $pages;
         
         $nextPage = $this->current + 1;
-        if($nextPage <= $pages) {
+        if ($nextPage <= $pages) {
             $this->next = $nextPage;
         }
         
         $prevPage = $this->current - 1;
-        if($prevPage > 0) {
+        if ($prevPage > 0) {
             $this->prev = $prevPage;
         }
         
         $this->offsetStart = ($this->current - 1) * $this->perPage;
         
         $this->offsetEnd = $this->offsetStart + $this->perPage;
-        if($this->offsetEnd > ($this->total - 1)) {
+        if ($this->offsetEnd > ($this->total - 1)) {
             $this->offsetEnd = ($this->total - 1);
         }
     }

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

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.');
         }

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
         $this->url = $this->helper->getURL().'/'.$this->relativePath;
         
         $path = $this->helper->getPath();
-        if(!empty($relativePath)) {
+        if (!empty($relativePath)) {
             $path .= $this->helper->getSlash().$this->relativePath;
         }
         
@@ -30,7 +30,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(
@@ -138,7 +138,7 @@ 
     
     public function runAdd()
     {
-        if(!$this->isVersioned()) {
+        if (!$this->isVersioned()) {
             $this->createAdd()->execute();
             $this->clearCache();
         }
@@ -168,7 +168,7 @@ 
     */
     public function getInfo()
     {
-        if(!isset($this->cache['info'])) {
+        if (!isset($this->cache['info'])) {
             $this->cache['info'] = $this->helper->createInfo($this);
         }
         
@@ -186,12 +186,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();
         }
@@ -224,7 +224,7 @@ 
 
     public function requireIsFile() : SVNHelper_Target_File
     {
-        if($this instanceof SVNHelper_Target_File)
+        if ($this instanceof SVNHelper_Target_File)
         {
             return $this;
         }
@@ -238,7 +238,7 @@ 
 
     public function requireIsFolder() : SVNHelper_Target_Folder
     {
-        if($this instanceof SVNHelper_Target_Folder)
+        if ($this instanceof SVNHelper_Target_Folder)
         {
             return $this;
         }

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