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 +14 added lines, -14 removed lines

@@ -35,12 +35,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();
         }
         
@@ -48,11 +48,11 @@ 
         
         $total = count($lines);
         
-        for($i=0; $i < $total; $i++) 
+        for ($i = 0; $i < $total; $i++) 
         {
             $line = new IniHelper_Line($lines[$i], $i);
             
-            if($line->isSection()) {
+            if ($line->isSection()) {
                 $section = $this->addSection($line->getSectionName());
             }
 
@@ -82,7 +82,7 @@ 
         $iniPath = FileHelper::requireFileExists($iniPath);
         
         $content = file_get_contents($iniPath);
-        if($content !== false) {
+        if ($content !== false) {
             return self::createFromString($content);
         }
         
@@ -127,7 +127,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);
         }
         
@@ -142,7 +142,7 @@ 
     */
     public function getSection(string $name) : ?IniHelper_Section
     {
-        if(isset($this->sections[$name])) {
+        if (isset($this->sections[$name])) {
             return $this->sections[$name];
         }
         
@@ -158,9 +158,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());
             } 
@@ -200,7 +200,7 @@ 
     {
         $parts = array();
         
-        foreach($this->sections as $section)
+        foreach ($this->sections as $section)
         {
             $parts[] = $section->toString();
         }
@@ -243,8 +243,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;
             }
         }
@@ -273,7 +273,7 @@ 
     {
         $path = $this->parsePath($path);
         
-        if(!$this->sectionExists($path['section'])) {
+        if (!$this->sectionExists($path['section'])) {
             return array();
         }
         
@@ -284,7 +284,7 @@ 
     {
         $path = explode($this->pathSeparator, $path);
         
-        if(count($path) === 1)
+        if (count($path) === 1)
         {
             return array(
                 'section' => self::SECTION_DEFAULT,

src/JSHelper.php

Braces +2 added lines, -4 removed lines

@@ -159,8 +159,7 @@ 
             if($hash === true) 
             { 
                 $hash = 'true'; 
-            } 
-            else if($hash === false) 
+            } else if($hash === false) 
             { 
                 $hash = 'false'; 
             }
@@ -184,8 +183,7 @@ 
                 if($string === false) 
                 {
                     $string = '';
-                } 
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
+                } else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
                 {
                     $string = mb_substr($string, 1, mb_strlen($string)-2);
                     $string = "'".str_replace("'", "\'", $string)."'";

Spacing +22 added lines, -22 removed lines

@@ -95,20 +95,20 @@ 
         $quoteStyle = array_shift($params);
         $method = array_shift($params);
         
-        $call = $method . '(';
+        $call = $method.'(';
         
         $total = count($params);
-        if($total > 0) {
-            for($i=0; $i < $total; $i++) 
+        if ($total > 0) {
+            for ($i = 0; $i < $total; $i++) 
             {
                 $call .= self::phpVariable2JS($params[$i], $quoteStyle);
-                if($i < ($total-1)) {
+                if ($i < ($total - 1)) {
                     $call .= ',';
                 }
             }
         }
         
-        return $call . ');';
+        return $call.');';
     }
 
    /**
@@ -132,7 +132,7 @@ 
     */
     public static function buildVariable(string $varName, $varValue) : string
     {
-        return $varName . "=" . self::phpVariable2JS($varValue) . ';';
+        return $varName."=".self::phpVariable2JS($varValue).';';
     }
     
    /**
@@ -144,7 +144,7 @@ 
     * @param int $quoteStyle The quote style to use for strings
     * @return string
     */
-    public static function phpVariable2JS($variable, int $quoteStyle=self::QUOTE_STYLE_DOUBLE) : string
+    public static function phpVariable2JS($variable, int $quoteStyle = self::QUOTE_STYLE_DOUBLE) : string
     {
         // after much profiling, this variant of the method offers
         // the best performance. Repeat scalar values are cached 
@@ -152,22 +152,22 @@ 
         
         $type = gettype($variable);
         $hash = null;
-        if(is_scalar($variable) === true) 
+        if (is_scalar($variable) === true) 
         {
             $hash = $variable;
         
-            if($hash === true) 
+            if ($hash === true) 
             { 
                 $hash = 'true'; 
             } 
-            else if($hash === false) 
+            else if ($hash === false) 
             { 
                 $hash = 'false'; 
             }
             
             $hash .= '-'.$quoteStyle.'-'.$type;
             
-            if(isset(self::$variableCache[$hash])) {
+            if (isset(self::$variableCache[$hash])) {
                 return self::$variableCache[$hash];
             }
         }
@@ -175,19 +175,19 @@ 
         $result = 'null';
 
         // one gettype call is better than a strict if-else.
-        switch($type) 
+        switch ($type) 
         {
             case 'double':
             case 'string':
                 $string = json_encode($variable);
                 
-                if($string === false) 
+                if ($string === false) 
                 {
                     $string = '';
                 } 
-                else if($quoteStyle === self::QUOTE_STYLE_SINGLE) 
+                else if ($quoteStyle === self::QUOTE_STYLE_SINGLE) 
                 {
-                    $string = mb_substr($string, 1, mb_strlen($string)-2);
+                    $string = mb_substr($string, 1, mb_strlen($string) - 2);
                     $string = "'".str_replace("'", "\'", $string)."'";
                 }
                 
@@ -195,7 +195,7 @@ 
                 break;
                 
             case 'boolean':
-                if($variable === true) {
+                if ($variable === true) {
                     $result = 'true';
                 } else {
                     $result = 'false';
@@ -213,7 +213,7 @@ 
         }
 
         // cache cacheable values
-        if($hash !== null) 
+        if ($hash !== null) 
         {
             self::$variableCache[$hash] = $result;
         }
@@ -245,7 +245,7 @@ 
     {
         self::$elementCounter++;
 
-        return self::$idPrefix . self::$elementCounter;
+        return self::$idPrefix.self::$elementCounter;
     }
     
    /**
@@ -319,7 +319,7 @@ 
      * @see JSHelper::JS_REGEX_OBJECT
      * @see JSHelper::JS_REGEX_JSON
      */
-    public static function buildRegexStatement(string $regex, string $statementType=self::JS_REGEX_OBJECT) : string
+    public static function buildRegexStatement(string $regex, string $statementType = self::JS_REGEX_OBJECT) : string
     {
         $regex = trim($regex);
         $separator = substr($regex, 0, 1);
@@ -327,7 +327,7 @@ 
         array_shift($parts);
         
         $modifiers = array_pop($parts);
-        if($modifiers == $separator) {
+        if ($modifiers == $separator) {
             $modifiers = '';
         }
         
@@ -343,7 +343,7 @@ 
         // convert the anchors that are not supported in js regexes
         $format = str_replace(array('\\A', '\\Z', '\\z'), array('^', '$', ''), $format);
         
-        if($statementType==self::JS_REGEX_JSON)
+        if ($statementType == self::JS_REGEX_JSON)
         {
             return ConvertHelper::var2json(array(
                 'format' => $format,
@@ -351,7 +351,7 @@ 
             ));
         }
         
-        if(!empty($modifiers)) {
+        if (!empty($modifiers)) {
             return sprintf(
                 'new RegExp(%s, %s)',
                 ConvertHelper::var2json($format),

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

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

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.