Mistralys / application-utils

src/SVNHelper/Command.php

Indentation +24 added lines, -24 removed lines

@@ -21,18 +21,18 @@ 
     public const SVN_ERROR_TYPE_WARNING = 'warning';
     
     /**
-    * @var SVNHelper
-    */
+     * @var SVNHelper
+     */
     protected $helper;
     
-   /**
-    * @var SVNHelper_Target
-    */
+    /**
+     * @var SVNHelper_Target
+     */
     protected $target;
     
-   /**
-    * @var SVNHelper_CommandResult|NULL
-    */
+    /**
+     * @var SVNHelper_CommandResult|NULL
+     */
     protected ?SVNHelper_CommandResult $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;
@@ -100,15 +100,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);
@@ -195,10 +195,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;
         }
@@ -67,7 +67,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(
@@ -83,7 +83,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();
@@ -91,7 +91,7 @@ 
         
         $cmd = 'svn '.$mode.' '.$path.' ';
         
-        foreach($params as $param) {
+        foreach ($params as $param) {
             $cmd .= '--'.$param.' ';
         }
         
@@ -109,7 +109,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);
         
@@ -124,7 +124,7 @@ 
         exec($cmd, $output);
         
         $lines = array();
-        foreach($output as $line) {
+        foreach ($output as $line) {
             $lines[] = mb_strtolower(trim(utf8_encode($line)));
         }
         
@@ -136,7 +136,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));
@@ -157,20 +157,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;
                         }
 
@@ -183,7 +183,7 @@ 
         
         $result = new SVNHelper_CommandResult($this, $cmd, $lines, $errorMessages);
         
-        if($result->isError()) {
+        if ($result->isError()) {
             $this->log(sprintf('[%s] | Command returned errors.', $relative));
         } 
         
@@ -206,7 +206,7 @@ 
     
     protected function throwExceptionUnexpected(SVNHelper_CommandResult $result)
     {
-        if($result->isConnectionFailed()) {
+        if ($result->isConnectionFailed()) {
             $this->throwException(
                 t('Could not connect to the remote SVN repository'), 
                 '', 
@@ -215,7 +215,7 @@ 
             );
         }
         
-        if($result->hasConflicts()) {
+        if ($result->hasConflicts()) {
             $this->throwException(
                 t('SVN command reported conflicts'), 
                 '', 
@@ -224,7 +224,7 @@ 
             );
         }
         
-        if($result->hasLocks()) {
+        if ($result->hasLocks()) {
             $this->throwException(
                 t('The target SVN folder or file is locked.'), 
                 '', 
@@ -241,7 +241,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>'.
@@ -256,7 +256,7 @@ 
         '</p>'.
         '<ul>';
             $errors = $result->getErrorMessages();
-            foreach($errors as $error) {
+            foreach ($errors as $error) {
                 $body .= 
                 '<li>'.
                     $error.

src/SVNHelper/CommandError.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
     public function hasAnyErrorCode(array $codes) : bool
     {
         $items = array();
-        foreach($codes as $code) {
+        foreach ($codes as $code) {
             $items[] = $this->filterCode($code);
         }
         

src/FileHelper/FolderFinder.php

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function __construct($path)
     {
-        if($path instanceof FolderInfo)
+        if ($path instanceof FolderInfo)
         {
             $this->folder = $path;
         }
@@ -46,7 +46,7 @@ 
         );
     }
 
-    public function makeRecursive(bool $recursive=true) : self
+    public function makeRecursive(bool $recursive = true) : self
     {
         return $this->setOption(self::OPTION_RECURSIVE, $recursive);
     }
@@ -76,7 +76,7 @@ 
 
         $result = array();
 
-        foreach($this->folders as $folder)
+        foreach ($this->folders as $folder)
         {
             $result[] = $this->resolvePath($folder);
         }
@@ -96,7 +96,7 @@ 
 
     private function resolvePath(FolderInfo $folder) : string
     {
-        if(!$this->isPathModeAbsolute())
+        if (!$this->isPathModeAbsolute())
         {
             return $folder->getRelativeTo($this->folder);
         }
@@ -117,9 +117,9 @@ 
     {
         $d = new DirectoryIterator($folder->getPath());
 
-        foreach($d as $item)
+        foreach ($d as $item)
         {
-            if($item->isDir() && !$item->isDot())
+            if ($item->isDir() && !$item->isDot())
             {
                 $this->processFolder(FileHelper::getFolderInfo($item->getPathname()));
             }
@@ -140,7 +140,7 @@ 
     {
         $this->folders[] = $folder;
 
-        if($this->isRecursive())
+        if ($this->isRecursive())
         {
             $this->scanFolder($folder);
         }

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
         if($path instanceof FolderInfo)
         {
             $this->folder = $path;
-        }
-        else
+        } else
         {
             $this->folder = FileHelper::getFolderInfo(FileHelper::getPathInfo($path)->getPath());
         }

src/FileHelper/CLICommandChecker.php

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
     {
         $os = $this->getOS();
 
-        if(isset(self::$osCommands[$os]))
+        if (isset(self::$osCommands[$os]))
         {
             return self::$osCommands[$os];
         }
@@ -83,7 +83,7 @@ 
      */
     public function exists(string $command) : bool
     {
-        if(isset(self::$checked[$command]))
+        if (isset(self::$checked[$command]))
         {
             return self::$checked[$command];
         }
@@ -114,7 +114,7 @@ 
             $pipes
         );
 
-        if($process === false)
+        if ($process === false)
         {
             return '';
         }
@@ -126,7 +126,7 @@ 
 
         proc_close($process);
 
-        if($stdout === false)
+        if ($stdout === false)
         {
             return '';
         }

src/FileHelper/FileInfo.php

Braces +1 added lines, -2 removed lines

@@ -255,8 +255,7 @@
         if($this->exists())
         {
             $this->requireWritable();
-        }
-        else
+        } else
         {
             FolderInfo::factory(dirname($this->path))
                 ->create()

Spacing +17 added lines, -17 removed lines

@@ -50,7 +50,7 @@ 
      */
     public static function factory($path) : FileInfo
     {
-        if($path instanceof self) {
+        if ($path instanceof self) {
             return $path;
         }
 
@@ -67,12 +67,12 @@ 
         $pathString = AbstractPathInfo::type2string($path);
         $key = $pathString.';'.static::class;
 
-        if(!isset(self::$infoCache[$key]))
+        if (!isset(self::$infoCache[$key]))
         {
             $class = static::class;
             $instance = new $class($pathString);
 
-            if(!$instance instanceof self) {
+            if (!$instance instanceof self) {
                 throw new FileHelper_Exception(
                     'Invalid class'
                 );
@@ -106,7 +106,7 @@ 
     {
         parent::__construct($path);
 
-        if(!self::is_file($this->path))
+        if (!self::is_file($this->path))
         {
             throw new FileHelper_Exception(
                 'Not a file path',
@@ -120,7 +120,7 @@ 
     {
         $path = trim($path);
 
-        if(empty($path))
+        if (empty($path))
         {
             return false;
         }
@@ -128,9 +128,9 @@ 
         return is_file($path) || pathinfo($path, PATHINFO_EXTENSION) !== '';
     }
 
-    public function removeExtension(bool $keepPath=false) : string
+    public function removeExtension(bool $keepPath = false) : string
     {
-        if(!$keepPath)
+        if (!$keepPath)
         {
             return (string)pathinfo($this->getName(), PATHINFO_FILENAME);
         }
@@ -155,11 +155,11 @@ 
         return $this->removeExtension();
     }
 
-    public function getExtension(bool $lowercase=true) : string
+    public function getExtension(bool $lowercase = true) : string
     {
         $ext = (string)pathinfo($this->path, PATHINFO_EXTENSION);
 
-        if($lowercase)
+        if ($lowercase)
         {
             $ext = mb_strtolower($ext);
         }
@@ -180,12 +180,12 @@ 
      */
     public function delete() : FileInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             return $this;
         }
 
-        if(unlink($this->path))
+        if (unlink($this->path))
         {
             return $this;
         }
@@ -212,7 +212,7 @@ 
     {
         $target = $this->checkCopyPrerequisites($targetPath);
 
-        if(copy($this->path, (string)$target))
+        if (copy($this->path, (string)$target))
         {
             return $target;
         }
@@ -264,7 +264,7 @@ 
      */
     public function getLineReader() : LineReader
     {
-        if($this->lineReader === null)
+        if ($this->lineReader === null)
         {
             $this->lineReader = new LineReader($this);
         }
@@ -283,7 +283,7 @@ 
 
         $result = file_get_contents($this->getPath());
 
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
 
@@ -305,7 +305,7 @@ 
      */
     public function putContents(string $content) : FileInfo
     {
-        if($this->exists())
+        if ($this->exists())
         {
             $this->requireWritable();
         }
@@ -316,7 +316,7 @@ 
                 ->requireWritable();
         }
 
-        if(file_put_contents($this->path, $content) !== false)
+        if (file_put_contents($this->path, $content) !== false)
         {
             return $this;
         }
@@ -346,7 +346,7 @@ 
      */
     private function createFolder() : FileInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             FolderInfo::factory($this->getFolderPath())
                 ->create()

src/FileHelper/UnicodeHandling.php

Spacing +12 added lines, -12 removed lines

@@ -27,12 +27,12 @@ 
     /**
      * @var array<string,string>|NULL
      */
-    protected static ?array $utfBoms = null;
+    protected static ? array $utfBoms = null;
 
     /**
      * @var string[]|NULL
      */
-    protected static ?array $encodings = null;
+    protected static ? array $encodings = null;
 
     public function __construct()
     {
@@ -70,9 +70,9 @@ 
 
         fclose($fp);
 
-        foreach(self::$utfBoms as $bom => $value)
+        foreach (self::$utfBoms as $bom => $value)
         {
-            if(mb_strpos($text, $value) === 0)
+            if (mb_strpos($text, $value) === 0)
             {
                 return $bom;
             }
@@ -83,23 +83,23 @@ 
 
     private function initBOMs() : void
     {
-        if(isset(self::$utfBoms))
+        if (isset(self::$utfBoms))
         {
             return;
         }
 
         self::$utfBoms = array(
-            'UTF32-BE' => chr(0x00) . chr(0x00) . chr(0xFE) . chr(0xFF),
-            'UTF32-LE' => chr(0xFF) . chr(0xFE) . chr(0x00) . chr(0x00),
-            'UTF16-BE' => chr(0xFE) . chr(0xFF),
-            'UTF16-LE' => chr(0xFF) . chr(0xFE),
-            'UTF8' => chr(0xEF) . chr(0xBB) . chr(0xBF)
+            'UTF32-BE' => chr(0x00).chr(0x00).chr(0xFE).chr(0xFF),
+            'UTF32-LE' => chr(0xFF).chr(0xFE).chr(0x00).chr(0x00),
+            'UTF16-BE' => chr(0xFE).chr(0xFF),
+            'UTF16-LE' => chr(0xFF).chr(0xFE),
+            'UTF8' => chr(0xEF).chr(0xBB).chr(0xBF)
         );
     }
 
     private function initEncodings() : void
     {
-        if(isset(self::$encodings))
+        if (isset(self::$encodings))
         {
             return;
         }
@@ -108,7 +108,7 @@ 
 
         self::$encodings = array();
 
-        foreach($encodings as $string)
+        foreach ($encodings as $string)
         {
             $withHyphen = str_replace('UTF', 'UTF-', $string);
 

src/FileHelper/FileInfo/FileSender.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
         $this->file = $info;
     }
 
-    public function send(?string $fileName = null, bool $asAttachment=true) : void
+    public function send(?string $fileName = null, bool $asAttachment = true) : void
     {
         $this->file
             ->requireExists()
@@ -53,7 +53,7 @@ 
     {
         header("Cache-Control: public", true);
         header("Content-Description: File Transfer", true);
-        header("Content-Type: " . $this->detectMime(), true);
+        header("Content-Type: ".$this->detectMime(), true);
 
         header(sprintf(
             "Content-Disposition: %s; filename=%s",
@@ -69,7 +69,7 @@ 
 
     private function resolveDisposition(bool $asAttachment) : string
     {
-        if($asAttachment)
+        if ($asAttachment)
         {
             return 'attachment';
         }

src/FileHelper/FileInfo/LineReader.php

Spacing +12 added lines, -12 removed lines

@@ -47,15 +47,15 @@ 
 
         $file = new SplFileObject($this->file->getPath());
 
-        if($file->eof()) {
+        if ($file->eof()) {
             return '';
         }
 
-        $targetLine = $lineNumber-1;
+        $targetLine = $lineNumber - 1;
 
         $file->seek($targetLine);
 
-        if($file->key() !== $targetLine)
+        if ($file->key() !== $targetLine)
         {
             return null;
         }
@@ -76,7 +76,7 @@ 
         $number = $spl->key();
 
         // if seeking to the end the cursor is still at 0, there are no lines.
-        if($number === 0)
+        if ($number === 0)
         {
             // since it's a very small file, to get reliable results,
             // we read its contents and use that to determine what
@@ -84,13 +84,13 @@ 
             // that this is not practical to solve with the SplFileObject.
             $content = file_get_contents($path);
 
-            if(empty($content)) {
+            if (empty($content)) {
                 return 0;
             }
         }
 
         // return the line number we were able to reach + 1 (key is zero-based)
-        return $number+1;
+        return $number + 1;
     }
 
     /**
@@ -98,13 +98,13 @@ 
      * @return string[]
      * @throws FileHelper_Exception
      */
-    public function getLines(int $amount=0) : array
+    public function getLines(int $amount = 0) : array
     {
         $this->file->requireExists();
 
         $fn = fopen($this->file->getPath(), 'rb');
 
-        if($fn === false)
+        if ($fn === false)
         {
             throw new FileHelper_Exception(
                 'Could not open file for reading.',
@@ -120,19 +120,19 @@ 
         $counter = 0;
         $first = true;
 
-        while(!feof($fn))
+        while (!feof($fn))
         {
             $counter++;
 
             $line = fgets($fn);
 
             // can happen with zero length files
-            if($line === false) {
+            if ($line === false) {
                 continue;
             }
 
             // the first line may contain a unicode BOM marker.
-            if($first)
+            if ($first)
             {
                 $line = ConvertHelper::stripUTFBom($line);
                 $first = false;
@@ -140,7 +140,7 @@ 
 
             $result[] = $line;
 
-            if($amount > 0 && $counter === $amount) {
+            if ($amount > 0 && $counter === $amount) {
                 break;
             }
         }

src/FileHelper/FileInfo/NameFixer.php

Spacing +2 added lines, -2 removed lines

@@ -49,13 +49,13 @@
 
         $name = str_replace(array_keys($replaces), array_values($replaces), $name);
 
-        while(strpos($name, '  ') !== false) {
+        while (strpos($name, '  ') !== false) {
             $name = str_replace('  ', ' ', $name);
         }
 
         $name = str_replace(array_keys($replaces), array_values($replaces), $name);
 
-        while(strpos($name, '..') !== false) {
+        while (strpos($name, '..') !== false) {
             $name = str_replace('..', '.', $name);
         }