Mistralys / application-utils

src/functions.php

Spacing +5 added lines, -5 removed lines

@@ -16,9 +16,9 @@ 
  * @param mixed $value
  * @return \AppUtils\NumberInfo
  */
-function parseNumber($value, $forceNew=false)
+function parseNumber($value, $forceNew = false)
 {
-    if($value instanceof NumberInfo && $forceNew !== true) {
+    if ($value instanceof NumberInfo && $forceNew !== true) {
         return $value;
     }
     
@@ -99,7 +99,7 @@ 
     $args = func_get_args();
     
     // is the localization package installed?
-    if(class_exists('\AppLocalize\Localization')) 
+    if (class_exists('\AppLocalize\Localization')) 
     {
         return call_user_func_array('\AppLocalize\t', $args);
     }
@@ -117,7 +117,7 @@ 
  */
 function requireCURL() : void
 {
-    if(function_exists('curl_init')) {
+    if (function_exists('curl_init')) {
         return;
     }
     
@@ -135,7 +135,7 @@ 
  */
 function init()
 {
-    if(!class_exists('\AppLocalize\Localization')) {
+    if (!class_exists('\AppLocalize\Localization')) {
         return;
     }
     

src/URLInfo.php

Indentation +154 added lines, -154 removed lines

@@ -39,42 +39,42 @@ 
     const TYPE_PHONE = 'phone';
     const TYPE_URL = 'url';
     
-   /**
-    * The original URL that was passed to the constructor.
-    * @var string
-    */
+    /**
+     * The original URL that was passed to the constructor.
+     * @var string
+     */
     protected $rawURL;
 
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $info;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $excludedParams = array();
     
-   /**
-    * @var bool
-    * @see URLInfo::setParamExclusion()
-    */
+    /**
+     * @var bool
+     * @see URLInfo::setParamExclusion()
+     */
     protected $paramExclusion = false;
     
-   /**
-    * @var array
-    * @see URLInfo::getTypeLabel()
-    */
+    /**
+     * @var array
+     * @see URLInfo::getTypeLabel()
+     */
     protected static $typeLabels;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $highlightExcluded = false;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $infoKeys = array(
         'scheme',
         'host',
@@ -86,19 +86,19 @@ 
         'fragment'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $url;
     
-   /**
-    * @var URLInfo_Parser
-    */
+    /**
+     * @var URLInfo_Parser
+     */
     protected $parser;
     
-   /**
-    * @var URLInfo_Normalizer
-    */
+    /**
+     * @var URLInfo_Normalizer
+     */
     protected $normalizer;
     
     public function __construct(string $url)
@@ -110,13 +110,13 @@ 
         $this->info = $this->parser->getInfo();
     }
     
-   /**
-    * Filters an URL: removes control characters and the
-    * like to have a clean URL to work with.
-    * 
-    * @param string $url
-    * @return string
-    */
+    /**
+     * Filters an URL: removes control characters and the
+     * like to have a clean URL to work with.
+     * 
+     * @param string $url
+     * @return string
+     */
     public static function filterURL(string $url)
     {
         return URLInfo_Filter::filter($url);
@@ -146,12 +146,12 @@ 
         return $this->info['type'] === self::TYPE_PHONE;
     }
     
-   /**
-    * Whether the URL is a regular URL, not one of the 
-    * other types like a phone number or email address.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the URL is a regular URL, not one of the 
+     * other types like a phone number or email address.
+     * 
+     * @return bool
+     */
     public function isURL() : bool
     {
         $host = $this->getHost();
@@ -163,20 +163,20 @@ 
         return $this->parser->isValid();
     }
     
-   /**
-    * Retrieves the host name, or an empty string if none is present.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the host name, or an empty string if none is present.
+     * 
+     * @return string
+     */
     public function getHost() : string
     {
         return $this->getInfoKey('host');
     }
     
-   /**
-    * Retrieves the path, or an empty string if none is present.
-    * @return string
-    */
+    /**
+     * Retrieves the path, or an empty string if none is present.
+     * @return string
+     */
     public function getPath() : string
     {
         return $this->getInfoKey('path');
@@ -192,10 +192,10 @@ 
         return $this->getInfoKey('scheme');
     }
     
-   /**
-    * Retrieves the port specified in the URL, or -1 if none is preseent.
-    * @return int
-    */
+    /**
+     * Retrieves the port specified in the URL, or -1 if none is preseent.
+     * @return int
+     */
     public function getPort() : int
     {
         $port = $this->getInfoKey('port');
@@ -207,13 +207,13 @@ 
         return -1;
     }
     
-   /**
-    * Retrieves the raw query string, or an empty string if none is present.
-    * 
-    * @return string
-    * 
-    * @see URLInfo::getParams()
-    */
+    /**
+     * Retrieves the raw query string, or an empty string if none is present.
+     * 
+     * @return string
+     * 
+     * @see URLInfo::getParams()
+     */
     public function getQuery() : string
     {
         return $this->getInfoKey('query');
@@ -229,20 +229,20 @@ 
         return $this->getInfoKey('pass');
     }
     
-   /**
-    * Whether the URL contains a port number.
-    * @return bool
-    */
+    /**
+     * Whether the URL contains a port number.
+     * @return bool
+     */
     public function hasPort() : bool
     {
         return $this->getPort() !== -1;
     }
     
-   /**
-    * Alias for the hasParams() method.
-    * @return bool
-    * @see URLInfo::hasParams()
-    */
+    /**
+     * Alias for the hasParams() method.
+     * @return bool
+     * @see URLInfo::hasParams()
+     */
     public function hasQuery() : bool
     {
         return $this->hasParams();
@@ -300,25 +300,25 @@ 
         return $this->normalizer->normalize();
     }
     
-   /**
-    * Creates a hash of the URL, which can be used for comparisons.
-    * Since any parameters in the URL's query are sorted alphabetically,
-    * the same links with a different parameter order will have the 
-    * same hash.
-    * 
-    * @return string
-    */
+    /**
+     * Creates a hash of the URL, which can be used for comparisons.
+     * Since any parameters in the URL's query are sorted alphabetically,
+     * the same links with a different parameter order will have the 
+     * same hash.
+     * 
+     * @return string
+     */
     public function getHash()
     {
         return \AppUtils\ConvertHelper::string2shortHash($this->getNormalized());
     }
 
-   /**
-    * Highlights the URL using HTML tags with specific highlighting
-    * class names.
-    * 
-    * @return string Will return an empty string if the URL is not valid.
-    */
+    /**
+     * Highlights the URL using HTML tags with specific highlighting
+     * class names.
+     * 
+     * @return string Will return an empty string if the URL is not valid.
+     */
     public function getHighlighted() : string
     {
         if(!$this->isValid()) {
@@ -352,15 +352,15 @@ 
         return count($params);
     }
     
-   /**
-    * Retrieves all parameters specified in the url,
-    * if any, as an associative array. 
-    * 
-    * NOTE: Ignores parameters that have been added
-    * to the excluded parameters list.
-    *
-    * @return array
-    */
+    /**
+     * Retrieves all parameters specified in the url,
+     * if any, as an associative array. 
+     * 
+     * NOTE: Ignores parameters that have been added
+     * to the excluded parameters list.
+     *
+     * @return array
+     */
     public function getParams() : array
     {
         if(!$this->paramExclusion || empty($this->excludedParams)) {
@@ -378,22 +378,22 @@ 
         return $keep;
     }
     
-   /**
-    * Retrieves the names of all parameters present in the URL, if any.
-    * @return string[]
-    */
+    /**
+     * Retrieves the names of all parameters present in the URL, if any.
+     * @return string[]
+     */
     public function getParamNames() : array
     {
         $params = $this->getParams();
         return array_keys($params);
     }
     
-   /**
-    * Retrieves a specific parameter value from the URL.
-    * 
-    * @param string $name
-    * @return string The parameter value, or an empty string if it does not exist.
-    */
+    /**
+     * Retrieves a specific parameter value from the URL.
+     * 
+     * @param string $name
+     * @return string The parameter value, or an empty string if it does not exist.
+     */
     public function getParam(string $name) : string
     {
         if(isset($this->info['params'][$name])) {
@@ -403,16 +403,16 @@ 
         return '';
     }
     
-   /**
-    * Excludes an URL parameter entirely if present:
-    * the parser will act as if the parameter was not
-    * even present in the source URL, effectively
-    * stripping it.
-    *
-    * @param string $name
-    * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
-    * @return URLInfo
-    */
+    /**
+     * Excludes an URL parameter entirely if present:
+     * the parser will act as if the parameter was not
+     * even present in the source URL, effectively
+     * stripping it.
+     *
+     * @param string $name
+     * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
+     * @return URLInfo
+     */
     public function excludeParam(string $name, string $reason) : URLInfo
     {
         if(!isset($this->excludedParams[$name]))
@@ -465,25 +465,25 @@ 
         return self::$typeLabels[$this->getType()];
     }
 
-   /**
-    * Whether excluded parameters should be highlighted in
-    * a different color in the URL when using the
-    * {@link URLInfo::getHighlighted()} method.
-    *
-    * @param bool $highlight
-    * @return URLInfo
-    */
+    /**
+     * Whether excluded parameters should be highlighted in
+     * a different color in the URL when using the
+     * {@link URLInfo::getHighlighted()} method.
+     *
+     * @param bool $highlight
+     * @return URLInfo
+     */
     public function setHighlightExcluded(bool $highlight=true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
         return $this;
     }
     
-   /**
-    * Returns an array with all relevant URL information.
-    * 
-    * @return array
-    */
+    /**
+     * Returns an array with all relevant URL information.
+     * 
+     * @return array
+     */
     public function toArray() : array
     {
         return array(
@@ -527,24 +527,24 @@ 
         return $this;
     }
     
-   /**
-    * Whether the parameter exclusion mode is enabled:
-    * In this case, if any parameters have been added to the
-    * exclusion list, all relevant methods will exclude these.
-    *
-    * @return bool
-    */
+    /**
+     * Whether the parameter exclusion mode is enabled:
+     * In this case, if any parameters have been added to the
+     * exclusion list, all relevant methods will exclude these.
+     *
+     * @return bool
+     */
     public function isParamExclusionEnabled() : bool
     {
         return $this->paramExclusion;
     }
     
-   /**
-    * Checks whether the link contains any parameters that
-    * are on the list of excluded parameters.
-    *
-    * @return bool
-    */
+    /**
+     * Checks whether the link contains any parameters that
+     * are on the list of excluded parameters.
+     *
+     * @return bool
+     */
     public function containsExcludedParams() : bool
     {
         if(empty($this->excludedParams)) {
@@ -612,16 +612,16 @@ 
         return $this->highlightExcluded;
     }
     
-   /**
-    * Checks if the URL exists, i.e. can be connected to. Will return
-    * true if the returned HTTP status code is `200` or `302`.
-    * 
-    * NOTE: If the target URL requires HTTP authentication, the username
-    * and password should be integrated into the URL.
-    * 
-    * @return bool
-    * @throws BaseException
-    */
+    /**
+     * Checks if the URL exists, i.e. can be connected to. Will return
+     * true if the returned HTTP status code is `200` or `302`.
+     * 
+     * NOTE: If the target URL requires HTTP authentication, the username
+     * and password should be integrated into the URL.
+     * 
+     * @return bool
+     * @throws BaseException
+     */
     public function tryConnect() : bool
     {
         requireCURL();

Spacing +21 added lines, -21 removed lines

@@ -200,7 +200,7 @@ 
     {
         $port = $this->getInfoKey('port');
         
-        if(!empty($port)) {
+        if (!empty($port)) {
             return (int)$port;
         }
         
@@ -280,7 +280,7 @@ 
     
     protected function getInfoKey(string $name) : string
     {
-        if(isset($this->info[$name])) {
+        if (isset($this->info[$name])) {
             return (string)$this->info[$name];
         }
         
@@ -289,11 +289,11 @@ 
 
     public function getNormalized() : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
-        if(!isset($this->normalizer)) {
+        if (!isset($this->normalizer)) {
             $this->normalizer = new URLInfo_Normalizer($this);
         }
         
@@ -321,7 +321,7 @@ 
     */
     public function getHighlighted() : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
@@ -363,14 +363,14 @@ 
     */
     public function getParams() : array
     {
-        if(!$this->paramExclusion || empty($this->excludedParams)) {
+        if (!$this->paramExclusion || empty($this->excludedParams)) {
             return $this->info['params'];
         }
         
         $keep = array();
-        foreach($this->info['params'] as $name => $value) 
+        foreach ($this->info['params'] as $name => $value) 
         {
-            if(!isset($this->excludedParams[$name])) {
+            if (!isset($this->excludedParams[$name])) {
                 $keep[$name] = $value;
             }
         }
@@ -396,7 +396,7 @@ 
     */
     public function getParam(string $name) : string
     {
-        if(isset($this->info['params'][$name])) {
+        if (isset($this->info['params'][$name])) {
             return $this->info['params'][$name];
         }
         
@@ -415,7 +415,7 @@ 
     */
     public function excludeParam(string $name, string $reason) : URLInfo
     {
-        if(!isset($this->excludedParams[$name]))
+        if (!isset($this->excludedParams[$name]))
         {
             $this->excludedParams[$name] = $reason;
             $this->setParamExclusion();
@@ -441,7 +441,7 @@ 
     
     public function getTypeLabel() : string
     {
-        if(!isset(self::$typeLabels))
+        if (!isset(self::$typeLabels))
         {
             self::$typeLabels = array(
                 self::TYPE_EMAIL => t('Email'),
@@ -453,7 +453,7 @@ 
         
         $type = $this->getType();
         
-        if(!isset(self::$typeLabels[$type]))
+        if (!isset(self::$typeLabels[$type]))
         {
             throw new BaseException(
                 sprintf('Unknown URL type label for type [%s].', $type),
@@ -473,7 +473,7 @@ 
     * @param bool $highlight
     * @return URLInfo
     */
-    public function setHighlightExcluded(bool $highlight=true) : URLInfo
+    public function setHighlightExcluded(bool $highlight = true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
         return $this;
@@ -521,7 +521,7 @@ 
      * @see URLInfo::isParamExclusionEnabled()
      * @see URLInfo::setHighlightExcluded()
      */
-    public function setParamExclusion(bool $enabled=true) : URLInfo
+    public function setParamExclusion(bool $enabled = true) : URLInfo
     {
         $this->paramExclusion = $enabled;
         return $this;
@@ -547,13 +547,13 @@ 
     */
     public function containsExcludedParams() : bool
     {
-        if(empty($this->excludedParams)) {
+        if (empty($this->excludedParams)) {
             return false;
         }
         
         $names = array_keys($this->info['params']);
-        foreach($names as $name) {
-            if(isset($this->excludedParams[$name])) {
+        foreach ($names as $name) {
+            if (isset($this->excludedParams[$name])) {
                 return true;
             }
         }
@@ -569,7 +569,7 @@ 
 
     public function offsetSet($offset, $value) 
     {
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             $this->info[$offset] = $value;
         }
     }
@@ -586,11 +586,11 @@ 
     
     public function offsetGet($offset) 
     {
-        if($offset === 'port') {
+        if ($offset === 'port') {
             return $this->getPort();
         }
         
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             return $this->getInfoKey($offset);
         }
         
@@ -627,7 +627,7 @@ 
         requireCURL();
         
         $ch = curl_init();
-        if($ch === false)
+        if ($ch === false)
         {
             throw new BaseException(
                 'Could not initialize a new cURL instance.',

src/FileHelper/FileFinder.php

Indentation +137 added lines, -137 removed lines

@@ -33,24 +33,24 @@ 
     
     const PATH_MODE_STRIP = 'strip';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $path;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $found;
     
-   /**
-    * The path must exist when the class is instantiated: its
-    * real path will be determined to work with.
-    * 
-    * @param string $path The absolute path to the target folder.
-    * @throws FileHelper_Exception
-    * @see FileHelper_FileFinder::ERROR_PATH_DOES_NOT_EXIST
-    */
+    /**
+     * The path must exist when the class is instantiated: its
+     * real path will be determined to work with.
+     * 
+     * @param string $path The absolute path to the target folder.
+     * @throws FileHelper_Exception
+     * @see FileHelper_FileFinder::ERROR_PATH_DOES_NOT_EXIST
+     */
     public function __construct(string $path)
     {
         $real = realpath($path);
@@ -82,66 +82,66 @@ 
         );
     }
     
-   /**
-    * Enables extension stripping, to return file names without extension.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * Enables extension stripping, to return file names without extension.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function stripExtensions() : FileHelper_FileFinder
     {
         return $this->setOption('strip-extensions', true);
     }
     
-   /**
-    * Enables recursing into subfolders.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * Enables recursing into subfolders.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function makeRecursive() : FileHelper_FileFinder
     {
         return $this->setOption('recursive', true);
     }
     
-   /**
-    * Retrieves all extensions that were added to
-    * the include list.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves all extensions that were added to
+     * the include list.
+     * 
+     * @return array
+     */
     public function getIncludeExtensions() : array
     {
         return $this->getArrayOption('include-extensions');
     }
     
-   /**
-    * Includes a single extension in the file search: only
-    * files with this extension will be used in the results.
-    * 
-    * NOTE: Included extensions take precedence before excluded
-    * extensions. If any excluded extensions are specified, they
-    * will be ignored.
-    * 
-    * @param string $extension Extension name, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::includeExtensions()
-    */
+    /**
+     * Includes a single extension in the file search: only
+     * files with this extension will be used in the results.
+     * 
+     * NOTE: Included extensions take precedence before excluded
+     * extensions. If any excluded extensions are specified, they
+     * will be ignored.
+     * 
+     * @param string $extension Extension name, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::includeExtensions()
+     */
     public function includeExtension(string $extension) : FileHelper_FileFinder
     {
         return $this->includeExtensions(array($extension));
     }
     
-   /**
-    * Includes several extensions in the file search: only
-    * files with these extensions wil be used in the results.
-    * 
-    * NOTE: Included extensions take precedence before excluded
-    * extensions. If any excluded extensions are specified, they
-    * will be ignored.
-    * 
-    * @param array $extensions Extension names, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::includeExtension()
-    */
+    /**
+     * Includes several extensions in the file search: only
+     * files with these extensions wil be used in the results.
+     * 
+     * NOTE: Included extensions take precedence before excluded
+     * extensions. If any excluded extensions are specified, they
+     * will be ignored.
+     * 
+     * @param array $extensions Extension names, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::includeExtension()
+     */
     public function includeExtensions(array $extensions) : FileHelper_FileFinder
     {
         $items = $this->getIncludeExtensions();
@@ -152,37 +152,37 @@ 
         return $this;
     }
 
-   /**
-    * Retrieves a list of all extensions currently set as 
-    * excluded from the search.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves a list of all extensions currently set as 
+     * excluded from the search.
+     * 
+     * @return array
+     */
     public function getExcludeExtensions() : array
     {
         return $this->getArrayOption('exclude-extensions');
     }
     
-   /**
-    * Excludes a single extension from the search.
-    * 
-    * @param string $extension Extension name, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::excludeExtensions()
-    */
+    /**
+     * Excludes a single extension from the search.
+     * 
+     * @param string $extension Extension name, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::excludeExtensions()
+     */
     public function excludeExtension(string $extension) : FileHelper_FileFinder
     {
         return $this->excludeExtensions(array($extension));
     }
 
-   /**
-    * Add several extensions to the list of extensions to
-    * exclude from the file search.
-    *  
-    * @param array $extensions Extension names, without dot (`php` for example).
-    * @return FileHelper_FileFinder
-    * @see FileHelper_FileFinder::excludeExtension()
-    */
+    /**
+     * Add several extensions to the list of extensions to
+     * exclude from the file search.
+     *  
+     * @param array $extensions Extension names, without dot (`php` for example).
+     * @return FileHelper_FileFinder
+     * @see FileHelper_FileFinder::excludeExtension()
+     */
     public function excludeExtensions(array $extensions) : FileHelper_FileFinder
     {
         $items = $this->getExcludeExtensions();
@@ -193,52 +193,52 @@ 
         return $this;
     }
     
-   /**
-    * In this mode, the entire path to the file will be stripped,
-    * leaving only the file name in the files list.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * In this mode, the entire path to the file will be stripped,
+     * leaving only the file name in the files list.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function setPathmodeStrip() : FileHelper_FileFinder
     {
         return $this->setPathmode(self::PATH_MODE_STRIP);
     }
     
-   /**
-    * In this mode, only the path relative to the source folder
-    * will be included in the files list.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * In this mode, only the path relative to the source folder
+     * will be included in the files list.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function setPathmodeRelative() : FileHelper_FileFinder
     {
         return $this->setPathmode(self::PATH_MODE_RELATIVE);
     }
     
-   /**
-    * In this mode, the full, absolute paths to the files will
-    * be included in the files list.
-    * 
-    * @return FileHelper_FileFinder
-    */
+    /**
+     * In this mode, the full, absolute paths to the files will
+     * be included in the files list.
+     * 
+     * @return FileHelper_FileFinder
+     */
     public function setPathmodeAbsolute() : FileHelper_FileFinder
     {
         return $this->setPathmode(self::PATH_MODE_ABSOLUTE);
     }
     
-   /**
-    * This sets a character or string to replace the slashes
-    * in the paths with. 
-    * 
-    * This is used for example in the `getPHPClassNames()` 
-    * method, to return files from subfolders as class names
-    * using the "_" character:
-    * 
-    * Subfolder/To/File.php => Subfolder_To_File.php
-    * 
-    * @param string $character
-    * @return \AppUtils\FileHelper_FileFinder
-    */
+    /**
+     * This sets a character or string to replace the slashes
+     * in the paths with. 
+     * 
+     * This is used for example in the `getPHPClassNames()` 
+     * method, to return files from subfolders as class names
+     * using the "_" character:
+     * 
+     * Subfolder/To/File.php => Subfolder_To_File.php
+     * 
+     * @param string $character
+     * @return \AppUtils\FileHelper_FileFinder
+     */
     public function setSlashReplacement(string $character) : FileHelper_FileFinder
     {
         return $this->setOption('slash-replacement', $character);
@@ -249,12 +249,12 @@ 
         return $this->setOption('pathmode', $mode);
     }
     
-   /**
-    * Retrieves a list of all matching file names/paths,
-    * depending on the selected options.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves a list of all matching file names/paths,
+     * depending on the selected options.
+     * 
+     * @return array
+     */
     public function getAll() : array
     {
         $this->find($this->path, true);
@@ -262,24 +262,24 @@ 
         return $this->found;
     }
     
-   /**
-    * Retrieves only PHP files. Can be combined with other
-    * options like enabling recursion into subfolders.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves only PHP files. Can be combined with other
+     * options like enabling recursion into subfolders.
+     * 
+     * @return array
+     */
     public function getPHPFiles() : array
     {
         $this->includeExtensions(array('php'));
         return $this->getAll();
     }
     
-   /**
-    * Generates PHP class names from file paths: it replaces
-    * slashes with underscores, and removes file extensions.
-    * 
-    * @return array An array of PHP file names without extension.
-    */
+    /**
+     * Generates PHP class names from file paths: it replaces
+     * slashes with underscores, and removes file extensions.
+     * 
+     * @return array An array of PHP file names without extension.
+     */
     public function getPHPClassNames() : array
     {
         $this->includeExtensions(array('php'));
@@ -350,13 +350,13 @@ 
         return $path;
     }
     
-   /**
-    * Checks whether the specified extension is allowed 
-    * with the current settings.
-    * 
-    * @param string $extension
-    * @return bool
-    */
+    /**
+     * Checks whether the specified extension is allowed 
+     * with the current settings.
+     * 
+     * @param string $extension
+     * @return bool
+     */
     protected function filterExclusion(string $extension) : bool
     {
         $include = $this->getOption('include-extensions');
@@ -378,12 +378,12 @@ 
         return true;
     }
     
-   /**
-    * Adjusts the path according to the selected path mode.
-    * 
-    * @param string $path
-    * @return string
-    */
+    /**
+     * Adjusts the path according to the selected path mode.
+     * 
+     * @param string $path
+     * @return string
+     */
     protected function filterPath(string $path) : string
     {
         switch($this->getStringOption('pathmode'))

Spacing +17 added lines, -17 removed lines

@@ -7,7 +7,7 @@ 
  * @see FileHelper_FileFinder
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace AppUtils;
 
@@ -55,7 +55,7 @@ 
     {
         $real = realpath($path);
         
-        if($real === false) 
+        if ($real === false) 
         {
             throw new FileHelper_Exception(
                 'Target path does not exist',
@@ -290,22 +290,22 @@ 
         return $this->getAll();
     }
     
-    protected function find(string $path, bool $isRoot=false) : void
+    protected function find(string $path, bool $isRoot = false) : void
     {
-        if($isRoot) {
+        if ($isRoot) {
             $this->found = array();
         }
         
         $recursive = $this->getBoolOption('recursive');
         
         $d = new \DirectoryIterator($path);
-        foreach($d as $item)
+        foreach ($d as $item)
         {
             $pathname = $item->getPathname();
             
-            if($item->isDir())
+            if ($item->isDir())
             {
-                if($recursive && !$item->isDot()) {
+                if ($recursive && !$item->isDot()) {
                     $this->find($pathname);
                 }
                 
@@ -314,7 +314,7 @@ 
             
             $file = $this->filterFile($pathname);
             
-            if($file !== null) 
+            if ($file !== null) 
             {
                 $this->found[] = $file;
             }
@@ -327,23 +327,23 @@ 
         
         $extension = FileHelper::getExtension($path);
         
-        if(!$this->filterExclusion($extension)) {
+        if (!$this->filterExclusion($extension)) {
             return null;
         }
         
         $path = $this->filterPath($path);
         
-        if($this->getOption('strip-extensions') === true)
+        if ($this->getOption('strip-extensions') === true)
         {
             $path = str_replace('.'.$extension, '', $path);
         }
         
-        if($path === '') {
+        if ($path === '') {
             return null;
         }
         
         $replace = $this->getOption('slash-replacement');
-        if(!empty($replace)) {
+        if (!empty($replace)) {
             $path = str_replace('/', $replace, $path);
         }
         
@@ -362,15 +362,15 @@ 
         $include = $this->getOption('include-extensions');
         $exclude = $this->getOption('exclude-extensions');
         
-        if(!empty($include))
+        if (!empty($include))
         {
-            if(!in_array($extension, $include)) {
+            if (!in_array($extension, $include)) {
                 return false;
             }
         }
-        else if(!empty($exclude))
+        else if (!empty($exclude))
         {
-            if(in_array($extension, $exclude)) {
+            if (in_array($extension, $exclude)) {
                 return false;
             }
         }
@@ -386,7 +386,7 @@ 
     */
     protected function filterPath(string $path) : string
     {
-        switch($this->getStringOption('pathmode'))
+        switch ($this->getStringOption('pathmode'))
         {
             case self::PATH_MODE_STRIP:
                 return basename($path);

Braces +1 added lines, -2 removed lines

@@ -367,8 +367,7 @@
             if(!in_array($extension, $include)) {
                 return false;
             }
-        }
-        else if(!empty($exclude))
+        } else if(!empty($exclude))
         {
             if(in_array($extension, $exclude)) {
                 return false;

src/Request/URLComparer.php

Indentation +24 added lines, -24 removed lines

@@ -23,44 +23,44 @@
  */
 class Request_URLComparer
 {
-   /**
-    * @var Request
-    */
+    /**
+     * @var Request
+     */
     protected $request;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $sourceURL;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $targetURL;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $limitParams = array();
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $isMatch = false;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $ignoreFragment = true;
 
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     protected $sourceInfo;
     
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     protected $targetInfo;
     
     public function __construct(Request $request, string $sourceURL, string $targetURL)

Spacing +12 added lines, -12 removed lines

@@ -79,7 +79,7 @@ 
     
     public function addLimitParam(string $name) : Request_URLComparer
     {
-        if(!in_array($name, $this->limitParams)) {
+        if (!in_array($name, $this->limitParams)) {
             $this->limitParams[] = $name;
         }
         
@@ -88,14 +88,14 @@ 
     
     public function addLimitParams(array $names) : Request_URLComparer
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->addLimitParam($name);
         }
         
         return $this;
     }
     
-    public function setIgnoreFragment(bool $ignore=true) : Request_URLComparer
+    public function setIgnoreFragment(bool $ignore = true) : Request_URLComparer
     {
         $this->ignoreFragment = $ignore;
         return $this;
@@ -121,13 +121,13 @@ 
             'query' 
         );
         
-        if(!$this->ignoreFragment) {
+        if (!$this->ignoreFragment) {
             $keys[] = 'fragment';
         }
         
-        foreach($keys as $key)
+        foreach ($keys as $key)
         {
-            if(!$this->compareKey($key)) {
+            if (!$this->compareKey($key)) {
                 return false;
             }
         }
@@ -142,7 +142,7 @@ 
         
         $filter = 'filter_'.$key;
         
-        if(method_exists($this, $filter)) 
+        if (method_exists($this, $filter)) 
         {
             $sVal = $this->$filter($sVal);
             $tVal = $this->$filter($tVal);
@@ -154,7 +154,7 @@ 
     protected function filter_path(string $path) : string
     {
         // fix double slashes in URLs
-        while(stristr($path, '//')) {
+        while (stristr($path, '//')) {
             $path = str_replace('//', '/', $path);
         }
         
@@ -163,7 +163,7 @@ 
     
     protected function filter_query(string $query) : string
     {
-        if(empty($query)) {
+        if (empty($query)) {
             return '';
         }
         
@@ -178,15 +178,15 @@ 
     
     protected function limitParams(array $params) : array
     {
-        if(empty($this->limitParams)) {
+        if (empty($this->limitParams)) {
             return $params;
         }
         
         $keep = array();
         
-        foreach($this->limitParams as $name)
+        foreach ($this->limitParams as $name)
         {
-            if(isset($params[$name])) {
+            if (isset($params[$name])) {
                 $keep[$name] = $params[$name];
             }
         }