Mistralys / application-utils

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

src/FileHelper/PathsReducer.php

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
      * @param string[] $paths
      * @throws FileHelper_Exception
      */
-    public function __construct(array $paths=array())
+    public function __construct(array $paths = array())
     {
         $this->addPaths($paths);
     }
@@ -49,7 +49,7 @@ 
      */
     public function addPaths(array $paths) : PathsReducer
     {
-        foreach($paths as $path) {
+        foreach ($paths as $path) {
             $this->addPath($path);
         }
 
@@ -66,7 +66,7 @@ 
     {
         $path = FileHelper::normalizePath($path);
 
-        if(!in_array($path, $this->paths, true)) {
+        if (!in_array($path, $this->paths, true)) {
             $this->paths[] = $path;
         }
 
@@ -83,11 +83,11 @@ 
     {
         $split = $this->splitPaths();
 
-        if(empty($split)) {
+        if (empty($split)) {
             return array();
         }
 
-        while($this->shiftPart($split) === true) {}
+        while ($this->shiftPart($split) === true) {}
 
         return $this->joinPaths($split);
     }
@@ -101,7 +101,7 @@ 
         $result = array();
 
         foreach ($split as $entry) {
-            if(!empty($entry)) {
+            if (!empty($entry)) {
                 $result[] = implode('/', $entry);
             }
         }
@@ -118,22 +118,22 @@ 
         $current = null;
         $result = array();
 
-        foreach($split as $entry)
+        foreach ($split as $entry)
         {
-            if(empty($entry)) {
+            if (empty($entry)) {
                 return false;
             }
 
             $part = array_shift($entry);
-            if(empty($entry)) {
+            if (empty($entry)) {
                 return false;
             }
 
-            if($current === null) {
+            if ($current === null) {
                 $current = $part;
             }
 
-            if($part !== $current) {
+            if ($part !== $current) {
                 return false;
             }
 
@@ -152,9 +152,9 @@ 
     {
         $split = array();
 
-        foreach($this->paths as $path) {
+        foreach ($this->paths as $path) {
             $entry = ConvertHelper::explodeTrim('/', $path);
-            if(!empty($entry)) {
+            if (!empty($entry)) {
                 $split[] = $entry;
             }
         }

src/FileHelper.php

Braces +1 added lines, -2 removed lines

@@ -516,8 +516,7 @@
         if(isset($options['relative-path']) && $options['relative-path'] === true) 
         {
             $finder->setPathmodeRelative();
-        } 
-        else if(isset($options['absolute-path']) && $options['absolute-path'] === true)
+        } else if(isset($options['absolute-path']) && $options['absolute-path'] === true)
         {
             $finder->setPathmodeAbsolute();
         }

Indentation +162 added lines, -162 removed lines

@@ -73,18 +73,18 @@ 
     public const ERROR_PATH_NOT_WRITABLE = 340039;
     public const ERROR_PATH_INVALID = 340040;
 
-   /**
-    * Opens a serialized file and returns the unserialized data.
-    *
-    * @param string|PathInfoInterface|SplFileInfo $file
-    * @throws FileHelper_Exception
-    * @return array<int|string,mixed>
-    * @see SerializedFile::parse()
-    * 
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
-    * @see FileHelper::ERROR_SERIALIZED_FILE_CANNOT_BE_READ
-    * @see FileHelper::ERROR_SERIALIZED_FILE_UNSERIALZE_FAILED
-    */
+    /**
+     * Opens a serialized file and returns the unserialized data.
+     *
+     * @param string|PathInfoInterface|SplFileInfo $file
+     * @throws FileHelper_Exception
+     * @return array<int|string,mixed>
+     * @see SerializedFile::parse()
+     * 
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
+     * @see FileHelper::ERROR_SERIALIZED_FILE_CANNOT_BE_READ
+     * @see FileHelper::ERROR_SERIALIZED_FILE_UNSERIALZE_FAILED
+     */
     public static function parseSerializedFile($file) : array
     {
         return SerializedFile::factory($file)->parse();
@@ -103,13 +103,13 @@ 
         return FolderTree::delete($rootFolder);
     }
     
-   /**
-    * Create a folder, if it does not exist yet.
-    *  
-    * @param string|PathInfoInterface $path
-    * @throws FileHelper_Exception
-    * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
-    */
+    /**
+     * Create a folder, if it does not exist yet.
+     *  
+     * @param string|PathInfoInterface $path
+     * @throws FileHelper_Exception
+     * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
+     */
     public static function createFolder($path) : FolderInfo
     {
         return self::getFolderInfo($path)->create();
@@ -138,36 +138,36 @@ 
         FolderTree::copy($source, $target);
     }
     
-   /**
-    * Copies a file to the target location. Includes checks
-    * for most error sources, like the source file not being
-    * readable. Automatically creates the target folder if it
-    * does not exist yet.
-    * 
-    * @param string|PathInfoInterface|SplFileInfo $sourcePath
-    * @param string|PathInfoInterface|SplFileInfo $targetPath
-    * @throws FileHelper_Exception
-    * 
-    * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
-    * @see FileHelper::ERROR_SOURCE_FILE_NOT_FOUND
-    * @see FileHelper::ERROR_SOURCE_FILE_NOT_READABLE
-    * @see FileHelper::ERROR_TARGET_COPY_FOLDER_NOT_WRITABLE
-    * @see FileHelper::ERROR_CANNOT_COPY_FILE
-    */
+    /**
+     * Copies a file to the target location. Includes checks
+     * for most error sources, like the source file not being
+     * readable. Automatically creates the target folder if it
+     * does not exist yet.
+     * 
+     * @param string|PathInfoInterface|SplFileInfo $sourcePath
+     * @param string|PathInfoInterface|SplFileInfo $targetPath
+     * @throws FileHelper_Exception
+     * 
+     * @see FileHelper::ERROR_CANNOT_CREATE_FOLDER
+     * @see FileHelper::ERROR_SOURCE_FILE_NOT_FOUND
+     * @see FileHelper::ERROR_SOURCE_FILE_NOT_READABLE
+     * @see FileHelper::ERROR_TARGET_COPY_FOLDER_NOT_WRITABLE
+     * @see FileHelper::ERROR_CANNOT_COPY_FILE
+     */
     public static function copyFile($sourcePath, $targetPath) : void
     {
         self::getFileInfo($sourcePath)->copyTo($targetPath);
     }
     
-   /**
-    * Deletes the target file. Ignored if it cannot be found,
-    * and throws an exception if it fails.
-    * 
-    * @param string|PathInfoInterface|SplFileInfo $filePath
-    * @throws FileHelper_Exception
-    * 
-    * @see FileHelper::ERROR_CANNOT_DELETE_FILE
-    */
+    /**
+     * Deletes the target file. Ignored if it cannot be found,
+     * and throws an exception if it fails.
+     * 
+     * @param string|PathInfoInterface|SplFileInfo $filePath
+     * @throws FileHelper_Exception
+     * 
+     * @see FileHelper::ERROR_CANNOT_DELETE_FILE
+     */
     public static function deleteFile($filePath) : void
     {
         self::getFileInfo($filePath)->delete();
@@ -288,7 +288,7 @@ 
      */
     public static function isPHPFile($filePath) : bool
     {
-    	return self::getExtension($filePath) === 'php';
+        return self::getExtension($filePath) === 'php';
     }
 
     /**
@@ -354,16 +354,16 @@ 
             ->parse();
     }
     
-   /**
-    * Corrects common formatting mistakes when users enter
-    * file names, like too many spaces, dots and the like.
-    * 
-    * NOTE: if the file name contains a path, the path is
-    * stripped, leaving only the file name.
-    * 
-    * @param string $name
-    * @return string
-    */
+    /**
+     * Corrects common formatting mistakes when users enter
+     * file names, like too many spaces, dots and the like.
+     * 
+     * NOTE: if the file name contains a path, the path is
+     * stripped, leaving only the file name.
+     * 
+     * @param string $name
+     * @return string
+     */
     public static function fixFileName(string $name) : string
     {
         return NameFixer::fixName($name);
@@ -423,23 +423,23 @@ 
         return self::findFiles($targetFolder, array('php'), $options);
     }
     
-   /**
-    * Finds files according to the specified options.
-    * 
-    * NOTE: This method only exists for backwards compatibility.
-    * Use the {@see FileHelper::createFileFinder()} method instead,
-    * which offers an object-oriented interface that is much easier
-    * to use.
-    *  
-    * @param string|PathInfoInterface|SplFileInfo $targetFolder
-    * @param string[] $extensions
-    * @param array<string,mixed> $options
-    * @throws FileHelper_Exception
-    * @return string[]
-    *
-    * @see FileHelper::createFileFinder()
-    * @deprecated Use the file finder instead.
-    */
+    /**
+     * Finds files according to the specified options.
+     * 
+     * NOTE: This method only exists for backwards compatibility.
+     * Use the {@see FileHelper::createFileFinder()} method instead,
+     * which offers an object-oriented interface that is much easier
+     * to use.
+     *  
+     * @param string|PathInfoInterface|SplFileInfo $targetFolder
+     * @param string[] $extensions
+     * @param array<string,mixed> $options
+     * @throws FileHelper_Exception
+     * @return string[]
+     *
+     * @see FileHelper::createFileFinder()
+     * @deprecated Use the file finder instead.
+     */
     public static function findFiles($targetFolder, array $extensions=array(), array $options=array()) : array
     {
         $finder = self::createFileFinder($targetFolder);
@@ -498,13 +498,13 @@ 
         return self::$unicodeHandling;
     }
     
-   /**
-    * Normalizes the slash style in a file or folder path,
-    * by replacing any anti-slashes with forward slashes.
-    * 
-    * @param string $path
-    * @return string
-    */
+    /**
+     * Normalizes the slash style in a file or folder path,
+     * by replacing any anti-slashes with forward slashes.
+     * 
+     * @param string $path
+     * @return string
+     */
     public static function normalizePath(string $path) : string
     {
         return str_replace(array('\\', '//'), array('/', '/'), $path);
@@ -629,70 +629,70 @@ 
             ->getPaths();
     }
 
-   /**
-    * Retrieves the maximum allowed upload file size, in bytes.
-    * Takes into account the PHP ini settings <code>post_max_size</code>
-    * and <code>upload_max_filesize</code>. Since these cannot
-    * be modified at runtime, they are the hard limits for uploads.
-    * 
-    * NOTE: Based on binary values, where 1KB = 1024 Bytes.
-    * 
-    * @return int Will return <code>-1</code> if no limit.
-    */
+    /**
+     * Retrieves the maximum allowed upload file size, in bytes.
+     * Takes into account the PHP ini settings <code>post_max_size</code>
+     * and <code>upload_max_filesize</code>. Since these cannot
+     * be modified at runtime, they are the hard limits for uploads.
+     * 
+     * NOTE: Based on binary values, where 1KB = 1024 Bytes.
+     * 
+     * @return int Will return <code>-1</code> if no limit.
+     */
     public static function getMaxUploadFilesize() : int
     {
         return UploadFileSizeInfo::getFileSize();
     }
    
-   /**
-    * Makes a path relative using a folder depth: will reduce the
-    * length of the path so that only the amount of folders defined
-    * in the <code>$depth</code> attribute are shown below the actual
-    * folder or file in the path.
-    *  
-    * @param string  $path The absolute or relative path
-    * @param int $depth The folder depth to reduce the path to
-    * @return string
-    */
+    /**
+     * Makes a path relative using a folder depth: will reduce the
+     * length of the path so that only the amount of folders defined
+     * in the <code>$depth</code> attribute are shown below the actual
+     * folder or file in the path.
+     *  
+     * @param string  $path The absolute or relative path
+     * @param int $depth The folder depth to reduce the path to
+     * @return string
+     */
     public static function relativizePathByDepth(string $path, int $depth=2) : string
     {
         return PathRelativizer::relativizeByDepth($path, $depth);
     }
     
-   /**
-    * Makes the specified path relative to another path,
-    * by removing one from the other if found. Also 
-    * normalizes the path to use forward slashes. 
-    * 
-    * Example:
-    * 
-    * <pre>
-    * relativizePath('c:\some\folder\to\file.txt', 'c:\some\folder');
-    * </pre>
-    * 
-    * Result: <code>to/file.txt</code>
-    * 
-    * @param string $path
-    * @param string $relativeTo
-    * @return string
-    */
+    /**
+     * Makes the specified path relative to another path,
+     * by removing one from the other if found. Also 
+     * normalizes the path to use forward slashes. 
+     * 
+     * Example:
+     * 
+     * <pre>
+     * relativizePath('c:\some\folder\to\file.txt', 'c:\some\folder');
+     * </pre>
+     * 
+     * Result: <code>to/file.txt</code>
+     * 
+     * @param string $path
+     * @param string $relativeTo
+     * @return string
+     */
     public static function relativizePath(string $path, string $relativeTo) : string
     {
         return PathRelativizer::relativize($path, $relativeTo);
     }
     
-   /**
-    * Checks that the target file exists, and throws an exception
-    * if it does not. 
-    * 
-    * @param string|SplFileInfo $path
-    * @param int|NULL $errorCode Optional custom error code
-    * @throws FileHelper_Exception
-    * @return string The real path to the file
-    * 
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
-    * @see FileHelper::ERROR_REAL_PATH_NOT_FOUND
-    */
+    /**
+     * Checks that the target file exists, and throws an exception
+     * if it does not. 
+     * 
+     * @param string|SplFileInfo $path
+     * @param int|NULL $errorCode Optional custom error code
+     * @throws FileHelper_Exception
+     * @return string The real path to the file
+     * 
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
+     * @see FileHelper::ERROR_REAL_PATH_NOT_FOUND
+     */
     public static function requireFileExists($path, ?int $errorCode=null) : string
     {
         return self::getPathInfo($path)
@@ -715,18 +715,18 @@ 
             ->getPath();
     }
     
-   /**
-    * Reads a specific line number from the target file and returns its
-    * contents, if the file has such a line. Does so with little memory
-    * usage, as the file is not read entirely into memory.
-    * 
-    * @param string|PathInfoInterface|SplFileInfo $path
-    * @param int $lineNumber Note: 1-based; the first line is number 1.
-    * @return string|NULL Will return null if the requested line does not exist.
-    * @throws FileHelper_Exception
-    * 
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
-    */
+    /**
+     * Reads a specific line number from the target file and returns its
+     * contents, if the file has such a line. Does so with little memory
+     * usage, as the file is not read entirely into memory.
+     * 
+     * @param string|PathInfoInterface|SplFileInfo $path
+     * @param int $lineNumber Note: 1-based; the first line is number 1.
+     * @return string|NULL Will return null if the requested line does not exist.
+     * @throws FileHelper_Exception
+     * 
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
+     */
     public static function getLineFromFile($path, int $lineNumber) : ?string
     {
         return self::getFileInfo($path)->getLine($lineNumber);
@@ -792,33 +792,33 @@ 
             ->getLines($amount);
     }
     
-   /**
-    * Reads all content from a file.
-    * 
-    * @param string|PathInfoInterface|SplFileInfo $filePath
-    * @throws FileHelper_Exception
-    * @return string
-    * 
-    * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
-    * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
-    */
+    /**
+     * Reads all content from a file.
+     * 
+     * @param string|PathInfoInterface|SplFileInfo $filePath
+     * @throws FileHelper_Exception
+     * @return string
+     * 
+     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
+     * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS
+     */
     public static function readContents($filePath) : string
     {
         return self::getFileInfo($filePath)->getContents();
     }
 
-   /**
-    * Ensures that the target path exists on disk, and is a folder.
-    * 
-    * @param string|PathInfoInterface|SplFileInfo $path
-    * @return string The real path, with normalized slashes.
-    * @throws FileHelper_Exception
-    * 
-    * @see FileHelper::normalizePath()
-    * 
-    * @see FileHelper::ERROR_FOLDER_DOES_NOT_EXIST
-    * @see FileHelper::ERROR_PATH_IS_NOT_A_FOLDER
-    */
+    /**
+     * Ensures that the target path exists on disk, and is a folder.
+     * 
+     * @param string|PathInfoInterface|SplFileInfo $path
+     * @return string The real path, with normalized slashes.
+     * @throws FileHelper_Exception
+     * 
+     * @see FileHelper::normalizePath()
+     * 
+     * @see FileHelper::ERROR_FOLDER_DOES_NOT_EXIST
+     * @see FileHelper::ERROR_PATH_IS_NOT_A_FOLDER
+     */
     public static function requireFolderExists($path) : string
     {
         return self::getFolderInfo($path)

Spacing +22 added lines, -22 removed lines

@@ -207,7 +207,7 @@ 
     public static function detectMimeType($fileName) : ?string
     {
         $ext = self::getExtension($fileName);
-        if(empty($ext)) {
+        if (empty($ext)) {
             return null;
         }
 
@@ -251,7 +251,7 @@ 
      * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
      * @see FileHelper::ERROR_UNKNOWN_FILE_MIME_TYPE
      */
-    public static function sendFile($filePath, ?string $fileName = null, bool $asAttachment=true) : void
+    public static function sendFile($filePath, ?string $fileName = null, bool $asAttachment = true) : void
     {
         self::getFileInfo($filePath)->getDownloader()->send($fileName, $asAttachment);
     }
@@ -268,7 +268,7 @@ 
      * @throws FileHelper_Exception
      * @see FileHelper::ERROR_CANNOT_OPEN_URL
      */
-    public static function downloadFile(string $url, int $timeout=0, bool $SSLEnabled=false) : string
+    public static function downloadFile(string $url, int $timeout = 0, bool $SSLEnabled = false) : string
     {
         return FileDownloader::factory($url)
             ->setTimeout($timeout)
@@ -323,7 +323,7 @@ 
     {
         $info = self::getPathInfo($pathOrDirIterator);
 
-        if($extension === true || $info instanceof FolderInfo)
+        if ($extension === true || $info instanceof FolderInfo)
         {
             return $info->getName();
         }
@@ -345,7 +345,7 @@ 
      * @see FileHelper::ERROR_CANNOT_FIND_JSON_FILE
      * @see FileHelper::ERROR_CANNOT_DECODE_JSON_FILE
      */
-    public static function parseJSONFile($file, string $targetEncoding='', $sourceEncoding=null) : array
+    public static function parseJSONFile($file, string $targetEncoding = '', $sourceEncoding = null) : array
     {
         return JSONFile::factory($file)
             ->setTargetEncoding($targetEncoding)
@@ -398,7 +398,7 @@ 
      * @throws FileHelper_Exception
      * @see FileHelper::createFileFinder()
      */
-    public static function findHTMLFiles($targetFolder, array $options=array()) : array
+    public static function findHTMLFiles($targetFolder, array $options = array()) : array
     {
         return self::findFiles($targetFolder, array('html'), $options);
     }
@@ -417,7 +417,7 @@ 
      * @throws FileHelper_Exception
      * @see FileHelper::createFileFinder()
      */
-    public static function findPHPFiles($targetFolder, array $options=array()) : array
+    public static function findPHPFiles($targetFolder, array $options = array()) : array
     {
         return self::findFiles($targetFolder, array('php'), $options);
     }
@@ -439,7 +439,7 @@ 
     * @see FileHelper::createFileFinder()
     * @deprecated Use the file finder instead.
     */
-    public static function findFiles($targetFolder, array $extensions=array(), array $options=array()) : array
+    public static function findFiles($targetFolder, array $extensions = array(), array $options = array()) : array
     {
         $finder = self::createFileFinder($targetFolder);
 
@@ -449,16 +449,16 @@ 
 
         $finder->setPathmodeStrip();
         
-        if(isset($options['relative-path']) && $options['relative-path'] === true) 
+        if (isset($options['relative-path']) && $options['relative-path'] === true) 
         {
             $finder->setPathmodeRelative();
         } 
-        else if(isset($options['absolute-path']) && $options['absolute-path'] === true)
+        else if (isset($options['absolute-path']) && $options['absolute-path'] === true)
         {
             $finder->setPathmodeAbsolute();
         }
         
-        if(isset($options['strip-extension'])) 
+        if (isset($options['strip-extension'])) 
         {
             $finder->stripExtensions();
         }
@@ -477,16 +477,16 @@ 
      * @return string
      * @throws FileHelper_Exception
      */
-    public static function removeExtension($filename, bool $keepPath=false) : string
+    public static function removeExtension($filename, bool $keepPath = false) : string
     {
         $path = self::getPathInfo($filename);
 
-        if($path instanceof FileInfo)
+        if ($path instanceof FileInfo)
         {
             return $path->removeExtension($keepPath);
         }
 
-        if($keepPath)
+        if ($keepPath)
         {
             return $filename;
         }
@@ -501,7 +501,7 @@ 
 
     public static function createUnicodeHandling() : UnicodeHandling
     {
-        if(!isset(self::$unicodeHandling))
+        if (!isset(self::$unicodeHandling))
         {
             self::$unicodeHandling = new UnicodeHandling();
         }
@@ -535,7 +535,7 @@ 
      * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
      * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
      */
-    public static function saveAsJSON($data, $file, bool $pretty=false) : JSONFile
+    public static function saveAsJSON($data, $file, bool $pretty = false) : JSONFile
     {
         return JSONFile::factory($file)->putData($data, $pretty);
     }
@@ -553,7 +553,7 @@ 
      * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE
      * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED
      */
-    public static function saveFile($filePath, string $content='') : FileInfo
+    public static function saveFile($filePath, string $content = '') : FileInfo
     {
         return self::getFileInfo($filePath)->putContents($content);
     }
@@ -665,7 +665,7 @@ 
     * @param int $depth The folder depth to reduce the path to
     * @return string
     */
-    public static function relativizePathByDepth(string $path, int $depth=2) : string
+    public static function relativizePathByDepth(string $path, int $depth = 2) : string
     {
         return PathRelativizer::relativizeByDepth($path, $depth);
     }
@@ -704,7 +704,7 @@ 
     * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
     * @see FileHelper::ERROR_REAL_PATH_NOT_FOUND
     */
-    public static function requireFileExists($path, ?int $errorCode=null) : string
+    public static function requireFileExists($path, ?int $errorCode = null) : string
     {
         return self::getPathInfo($path)
             ->requireIsFile()
@@ -718,7 +718,7 @@ 
      * @return string
      * @throws FileHelper_Exception
      */
-    public static function requireFileReadable($path, ?int $errorCode=null) : string
+    public static function requireFileReadable($path, ?int $errorCode = null) : string
     {
         return self::getPathInfo($path)
             ->requireIsFile()
@@ -796,7 +796,7 @@ 
      * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST
      * @see FileHelper::ERROR_CANNOT_OPEN_FILE_TO_READ_LINES
      */
-    public static function readLines($filePath, int $amount=0) : array
+    public static function readLines($filePath, int $amount = 0) : array
     {
         return self::getFileInfo($filePath)
             ->getLineReader()
@@ -846,7 +846,7 @@ 
      *
      * @throws FileHelper_Exception
      */
-    public static function createPathsReducer(array $paths=array()) : PathsReducer
+    public static function createPathsReducer(array $paths = array()) : PathsReducer
     {
         return new PathsReducer($paths);
     }

src/Traits/AttributableTrait.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
      * @param bool $enabled
      * @return $this
      */
-    public function prop(string $name, bool $enabled=true) : self
+    public function prop(string $name, bool $enabled = true) : self
     {
         $this->getAttributes()->prop($name, $enabled);
         return $this;

src/Traits/Classable.php

Indentation +17 added lines, -17 removed lines

@@ -25,9 +25,9 @@ 
  */
 trait Traits_Classable
 {
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected array $classes = array();
 
     public function hasClasses() : bool
@@ -82,30 +82,30 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves a list of all classes, if any.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all classes, if any.
+     * 
+     * @return string[]
+     */
     public function getClasses() : array
     {
         return $this->classes;
     }
     
-   /**
-    * Renders the class names list as space-separated string for use in an HTML tag.
-    * 
-    * @return string
-    */
+    /**
+     * Renders the class names list as space-separated string for use in an HTML tag.
+     * 
+     * @return string
+     */
     public function classesToString() : string
     {
         return implode(' ', $this->classes);
     }
     
-   /**
-    * Renders the "class" attribute string for inserting into an HTML tag.
-    * @return string
-    */
+    /**
+     * Renders the "class" attribute string for inserting into an HTML tag.
+     * @return string
+     */
     public function classesToAttribute() : string
     {
         if(!empty($this->classes))

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function addClass($name)
     {
-        if(!in_array($name, $this->classes, true)) {
+        if (!in_array($name, $this->classes, true)) {
             $this->classes[] = $name;
         }
         
@@ -54,7 +54,7 @@ 
      */
     public function addClasses(array $names) : self
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->addClass($name);
         }
         
@@ -74,7 +74,7 @@ 
     {
         $idx = array_search($name, $this->classes, true);
         
-        if($idx !== false) {
+        if ($idx !== false) {
             unset($this->classes[$idx]);
             sort($this->classes);
         }
@@ -108,7 +108,7 @@ 
     */
     public function classesToAttribute() : string
     {
-        if(!empty($this->classes))
+        if (!empty($this->classes))
         {
             return sprintf(
                 ' class="%s" ',

src/Traits/Optionable.php

Indentation +66 added lines, -66 removed lines

@@ -26,9 +26,9 @@ 
  */
 trait Traits_Optionable
 {
-   /**
-    * @var array<string,mixed>|NULL
-    */
+    /**
+     * @var array<string,mixed>|NULL
+     */
     protected ?array $options = null;
 
     /**
@@ -49,13 +49,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets a collection of options at once, from an
-    * associative array.
-    * 
-    * @param array<string,mixed> $options
-    * @return $this
-    */
+    /**
+     * Sets a collection of options at once, from an
+     * associative array.
+     * 
+     * @param array<string,mixed> $options
+     * @return $this
+     */
     public function setOptions(array $options) : self
     {
         foreach($options as $name => $value) {
@@ -65,16 +65,16 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves an option's value.
-    * 
-    * NOTE: Use the specialized type getters to ensure an option
-    * contains the expected type (for ex. getArrayOption()). 
-    * 
-    * @param string $name
-    * @param mixed $default The default value to return if the option does not exist.
-    * @return mixed
-    */
+    /**
+     * Retrieves an option's value.
+     * 
+     * NOTE: Use the specialized type getters to ensure an option
+     * contains the expected type (for ex. getArrayOption()). 
+     * 
+     * @param string $name
+     * @param mixed $default The default value to return if the option does not exist.
+     * @return mixed
+     */
     public function getOption(string $name, $default=null)
     {
         if(!isset($this->options))
@@ -85,16 +85,16 @@ 
         return $this->options[$name] ?? $default;
     }
     
-   /**
-    * Enforces that the option value is a string. Numbers are converted
-    * to string, strings are passed through, and all other types will 
-    * return the default value. The default value is also returned if
-    * the string is empty.
-    * 
-    * @param string $name
-    * @param string $default Used if the option does not exist, is invalid, or empty.
-    * @return string
-    */
+    /**
+     * Enforces that the option value is a string. Numbers are converted
+     * to string, strings are passed through, and all other types will 
+     * return the default value. The default value is also returned if
+     * the string is empty.
+     * 
+     * @param string $name
+     * @param string $default Used if the option does not exist, is invalid, or empty.
+     * @return string
+     */
     public function getStringOption(string $name, string $default='') : string
     {
         $value = $this->getOption($name, false);
@@ -126,15 +126,15 @@ 
         return $default;
     }
     
-   /**
-    * Treats the option value as an integer value: will return
-    * valid integer values (also from integer strings), or the
-    * default value otherwise.
-    * 
-    * @param string $name
-    * @param int $default
-    * @return int
-    */
+    /**
+     * Treats the option value as an integer value: will return
+     * valid integer values (also from integer strings), or the
+     * default value otherwise.
+     * 
+     * @param string $name
+     * @param int $default
+     * @return int
+     */
     public function getIntOption(string $name, int $default=0) : int
     {
         $value = $this->getOption($name);
@@ -145,14 +145,14 @@ 
         return $default;
     }
     
-   /**
-    * Treats an option as an array, and returns its value
-    * only if it contains an array - otherwise, an empty
-    * array is returned.
-    * 
-    * @param string $name
-    * @return array<int|string,mixed>
-    */
+    /**
+     * Treats an option as an array, and returns its value
+     * only if it contains an array - otherwise, an empty
+     * array is returned.
+     * 
+     * @param string $name
+     * @return array<int|string,mixed>
+     */
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
@@ -163,13 +163,13 @@ 
         return array();
     }
     
-   /**
-    * Checks whether the specified option exists - even
-    * if it has a NULL value.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Checks whether the specified option exists - even
+     * if it has a NULL value.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function hasOption(string $name) : bool
     {
         if(!isset($this->options)) {
@@ -179,11 +179,11 @@ 
         return array_key_exists($name, $this->options);
     }
     
-   /**
-    * Returns all options in one associative array.
-    *
-    * @return array<string,mixed>
-    */
+    /**
+     * Returns all options in one associative array.
+     *
+     * @return array<string,mixed>
+     */
     public function getOptions() : array
     {
         if(!isset($this->options)) {
@@ -193,13 +193,13 @@ 
         return $this->options;
     }
     
-   /**
-    * Checks whether the option's value is the one specified.
-    * 
-    * @param string $name
-    * @param mixed $value
-    * @return bool
-    */
+    /**
+     * Checks whether the option's value is the one specified.
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return bool
+     */
     public function isOption(string $name, $value) : bool
     {
         return $this->getOption($name) === $value;

Spacing +13 added lines, -13 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function setOption(string $name, $value) : self
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -58,7 +58,7 @@ 
     */
     public function setOptions(array $options) : self
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
         
@@ -75,9 +75,9 @@ 
     * @param mixed $default The default value to return if the option does not exist.
     * @return mixed
     */
-    public function getOption(string $name, $default=null)
+    public function getOption(string $name, $default = null)
     {
-        if(!isset($this->options))
+        if (!isset($this->options))
         {
             $this->options = $this->getDefaultOptions();
         }
@@ -95,11 +95,11 @@ 
     * @param string $default Used if the option does not exist, is invalid, or empty.
     * @return string
     */
-    public function getStringOption(string $name, string $default='') : string
+    public function getStringOption(string $name, string $default = '') : string
     {
         $value = $this->getOption($name, false);
         
-        if((is_string($value) || is_numeric($value)) && !empty($value)) {
+        if ((is_string($value) || is_numeric($value)) && !empty($value)) {
             return (string)$value;
         }
         
@@ -116,9 +116,9 @@ 
      * @param bool $default
      * @return bool
      */
-    public function getBoolOption(string $name, bool $default=false) : bool
+    public function getBoolOption(string $name, bool $default = false) : bool
     {
-        if($this->getOption($name) === true)
+        if ($this->getOption($name) === true)
         {
             return true;
         }
@@ -135,10 +135,10 @@ 
     * @param int $default
     * @return int
     */
-    public function getIntOption(string $name, int $default=0) : int
+    public function getIntOption(string $name, int $default = 0) : int
     {
         $value = $this->getOption($name);
-        if(ConvertHelper::isInteger($value)) {
+        if (ConvertHelper::isInteger($value)) {
             return (int)$value;
         }
         
@@ -156,7 +156,7 @@ 
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
-        if(is_array($val)) {
+        if (is_array($val)) {
             return $val;
         }
         
@@ -172,7 +172,7 @@ 
     */
     public function hasOption(string $name) : bool
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -186,7 +186,7 @@ 
     */
     public function getOptions() : array
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         

src/AttributeCollection/Filtering.php

Spacing +2 added lines, -2 removed lines

@@ -56,12 +56,12 @@
      */
     public static function value2string($value) : string
     {
-        if($value === true)
+        if ($value === true)
         {
             return 'true';
         }
 
-        if($value === false)
+        if ($value === false)
         {
             return 'false';
         }

src/Interfaces/AttributableInterface.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * @param bool $enabled
      * @return $this
      */
-    public function prop(string $name, bool $enabled=true) : self;
+    public function prop(string $name, bool $enabled = true) : self;
 
     /**
      * @param string $name

src/Interfaces/Optionable.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
      * @param mixed $default The default value to return if the option does not exist.
      * @return mixed
      */
-    public function getOption(string $name, $default=null);
+    public function getOption(string $name, $default = null);
 
     /**
      * @param string $name
@@ -53,11 +53,11 @@ 
      */
     public function getArrayOption(string $name) : array;
 
-    public function getIntOption(string $name, int $default=0) : int;
+    public function getIntOption(string $name, int $default = 0) : int;
 
-    public function getBoolOption(string $name, bool $default=false) : bool;
+    public function getBoolOption(string $name, bool $default = false) : bool;
 
-    public function getStringOption(string $name, string $default='') : string;
+    public function getStringOption(string $name, string $default = '') : string;
 
     /**
      * Sets a collection of options at once, from an