Mistralys / application-utils

src/RequestHelper/Exception.php

Indentation +8 added lines, -8 removed lines

@@ -22,9 +22,9 @@ 
  */
 class RequestHelper_Exception extends BaseException
 {
-   /**
-    * @var RequestHelper_Response|NULL
-    */
+    /**
+     * @var RequestHelper_Response|NULL
+     */
     protected $response = null;
  
     public function setResponse(RequestHelper_Response $response)
@@ -32,11 +32,11 @@ 
         $this->response = $response;
     }
     
-   /**
-    * Retrieves the related response instance, if available.
-    * 
-    * @return RequestHelper_Response|NULL
-    */
+    /**
+     * Retrieves the related response instance, if available.
+     * 
+     * @return RequestHelper_Response|NULL
+     */
     public function getResponse() : ?RequestHelper_Response
     {
         return $this->response;

src/URLInfo/Normalizer.php

Indentation +11 added lines, -11 removed lines

@@ -32,23 +32,23 @@
         $this->info = $info;
     }
     
-   /**
-    * Enables the authentication information in the URL,
-    * if a username and password are present.
-    * 
-    * @param bool $enable Whether to turn it on or off.
-    * @return URLInfo_Normalizer
-    */
+    /**
+     * Enables the authentication information in the URL,
+     * if a username and password are present.
+     * 
+     * @param bool $enable Whether to turn it on or off.
+     * @return URLInfo_Normalizer
+     */
     public function enableAuth(bool $enable=true) : URLInfo_Normalizer
     {
         $this->auth = $enable;
         return $this;
     }
     
-   /**
-    * Retrieves the normalized URL.
-    * @return string
-    */
+    /**
+     * Retrieves the normalized URL.
+     * @return string
+     */
     public function normalize() : string
     {
         $method = 'normalize_'.$this->info->getType();

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
     * @param bool $enable Whether to turn it on or off.
     * @return URLInfo_Normalizer
     */
-    public function enableAuth(bool $enable=true) : URLInfo_Normalizer
+    public function enableAuth(bool $enable = true) : URLInfo_Normalizer
     {
         $this->auth = $enable;
         return $this;
@@ -86,48 +86,48 @@ 
     
     protected function renderAuth(string $normalized) : string
     {
-        if(!$this->info->hasUsername() || !$this->auth) {
+        if (!$this->info->hasUsername() || !$this->auth) {
             return $normalized;
         }
          
-        return $normalized . urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@';
+        return $normalized.urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@';
     }
     
     protected function renderPort(string $normalized) : string
     {
-        if(!$this->info->hasPort()) {
+        if (!$this->info->hasPort()) {
             return $normalized;
         }
         
-        return $normalized . ':'.$this->info->getPort();
+        return $normalized.':'.$this->info->getPort();
     }
     
     protected function renderPath(string $normalized) : string
     {
-        if(!$this->info->hasPath()) {
+        if (!$this->info->hasPath()) {
             return $normalized; 
         }
         
-        return $normalized . $this->info->getPath();
+        return $normalized.$this->info->getPath();
     }
     
     protected function renderParams(string $normalized) : string
     {
         $params = $this->info->getParams();
         
-        if(empty($params)) {
+        if (empty($params)) {
             return $normalized;
         }
         
-        return $normalized . '?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986);
+        return $normalized.'?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986);
     }
     
     protected function renderFragment(string $normalized) : string
     {
-        if(!$this->info->hasFragment()) {
+        if (!$this->info->hasFragment()) {
             return $normalized;
         }
         
-        return $normalized . '#'.$this->info->getFragment();
+        return $normalized.'#'.$this->info->getFragment();
     }
 }

src/RequestHelper.php

Braces +1 added lines, -2 removed lines

@@ -216,8 +216,7 @@
                 curl_errno($ch),
                 curl_error($ch)
             );
-        }
-        else
+        } else
         {
             $this->response->setBody((string)$output);
         }

Indentation +115 added lines, -115 removed lines

@@ -39,66 +39,66 @@ 
     
     const ERROR_CANNOT_OPEN_LOGFILE = 17904;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $eol = "\r\n";
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $mimeBoundary;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $data = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $destination;
 
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $headers = array();
     
-   /**
-    * Whether to verify SSL certificates.
-    * @var bool
-    */
+    /**
+     * Whether to verify SSL certificates.
+     * @var bool
+     */
     protected $verifySSL = true;
     
-   /**
-    * @var RequestHelper_Boundaries
-    */
+    /**
+     * @var RequestHelper_Boundaries
+     */
     protected $boundaries;
     
-   /**
-    * @var RequestHelper_Response|NULL
-    */
+    /**
+     * @var RequestHelper_Response|NULL
+     */
     protected $response;
 
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $timeout = 30;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $logfile = '';
 
-   /**
-    * @var resource|NULL
-    */
+    /**
+     * @var resource|NULL
+     */
     protected $logfilePointer = null;
     
-   /**
-    * Creates a new request helper to send POST data to the specified destination URL.
-    * @param string $destinationURL
-    */
+    /**
+     * Creates a new request helper to send POST data to the specified destination URL.
+     * @param string $destinationURL
+     */
     public function __construct(string $destinationURL)
     {
         $this->destination = $destinationURL;
@@ -130,13 +130,13 @@ 
         return $this;
     }
     
-   /**
-    * Enables verbose logging of the CURL request, which
-    * is then redirected to the target file.
-    * 
-    * @param string $targetFile
-    * @return RequestHelper
-    */
+    /**
+     * Enables verbose logging of the CURL request, which
+     * is then redirected to the target file.
+     * 
+     * @param string $targetFile
+     * @return RequestHelper
+     */
     public function enableLogging(string $targetFile) : RequestHelper
     {
         $this->logfile = $targetFile;
@@ -144,15 +144,15 @@ 
         return $this;
     }
 
-   /**
-    * Adds a file to be sent with the request.
-    *
-    * @param string $varName The variable name to send the file in
-    * @param string $fileName The name of the file as it should be received at the destination
-    * @param string $content The raw content of the file
-    * @param string $contentType The content type, use the constants to specify this
-    * @param string $encoding The encoding of the file, use the constants to specify this
-    */
+    /**
+     * Adds a file to be sent with the request.
+     *
+     * @param string $varName The variable name to send the file in
+     * @param string $fileName The name of the file as it should be received at the destination
+     * @param string $content The raw content of the file
+     * @param string $contentType The content type, use the constants to specify this
+     * @param string $encoding The encoding of the file, use the constants to specify this
+     */
     public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper
     {
         $this->boundaries->addFile($varName, $fileName, $content, $contentType, $encoding);
@@ -160,13 +160,13 @@ 
         return $this;
     }
     
-   /**
-    * Adds arbitrary content.
-    * 
-    * @param string $varName The variable name to send the content in.
-    * @param string $content
-    * @param string $contentType
-    */
+    /**
+     * Adds arbitrary content.
+     * 
+     * @param string $varName The variable name to send the content in.
+     * @param string $content
+     * @param string $contentType
+     */
     public function addContent(string $varName, string $content, string $contentType) : RequestHelper
     {
         $this->boundaries->addContent($varName, $content, $contentType);
@@ -188,13 +188,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets an HTTP header to include in the request.
-    * 
-    * @param string $name
-    * @param string $value
-    * @return RequestHelper
-    */
+    /**
+     * Sets an HTTP header to include in the request.
+     * 
+     * @param string $name
+     * @param string $value
+     * @return RequestHelper
+     */
     public function setHeader(string $name, string $value) : RequestHelper
     {
         $this->headers[$name] = $value;
@@ -202,36 +202,36 @@ 
         return $this;
     }
     
-   /**
-    * Disables SSL certificate checking.
-    * 
-    * @return RequestHelper
-    */
+    /**
+     * Disables SSL certificate checking.
+     * 
+     * @return RequestHelper
+     */
     public function disableSSLChecks() : RequestHelper
     {
         $this->verifySSL = false;
         return $this;
     }
    
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $contentLength = 0;
 
-   /**
-    * Sends the POST request to the destination, and returns
-    * the response text.
-    *
-    * The response object is stored internally, so after calling
-    * this method it may be retrieved at any moment using the
-    * {@link getResponse()} method.
-    *
-    * @return string
-    * @see RequestHelper::getResponse()
-    * @throws RequestHelper_Exception
-    * 
-    * @see RequestHelper::ERROR_REQUEST_FAILED
-    */
+    /**
+     * Sends the POST request to the destination, and returns
+     * the response text.
+     *
+     * The response object is stored internally, so after calling
+     * this method it may be retrieved at any moment using the
+     * {@link getResponse()} method.
+     *
+     * @return string
+     * @see RequestHelper::getResponse()
+     * @throws RequestHelper_Exception
+     * 
+     * @see RequestHelper::ERROR_REQUEST_FAILED
+     */
     public function send() : string
     {
         $info = parseURL($this->destination);
@@ -274,14 +274,14 @@ 
         return $this->data;
     }
     
-   /**
-    * Creates a new CURL resource configured according to the
-    * request's settings.
-    * 
-    * @param URLInfo $url
-    * @throws RequestHelper_Exception
-    * @return resource
-    */
+    /**
+     * Creates a new CURL resource configured according to the
+     * request's settings.
+     * 
+     * @param URLInfo $url
+     * @throws RequestHelper_Exception
+     * @return resource
+     */
     protected function createCURL(URLInfo $url)
     {
         $ch = curl_init();
@@ -329,10 +329,10 @@ 
         return $ch;
     }
     
-   /**
-    * @param resource $ch
-    * @return bool Whether logging is enabled.
-    */
+    /**
+     * @param resource $ch
+     * @return bool Whether logging is enabled.
+     */
     protected function configureLogging($ch) : bool
     {
         if(empty($this->logfile))
@@ -359,13 +359,13 @@ 
         return true;
     }
 
-   /**
-    * Compiles the associative headers array into
-    * the format understood by CURL, namely an indexed
-    * array with one header string per entry.
-    * 
-    * @return array
-    */
+    /**
+     * Compiles the associative headers array into
+     * the format understood by CURL, namely an indexed
+     * array with one header string per entry.
+     * 
+     * @return array
+     */
     protected function renderHeaders() : array
     {
         $result = array();
@@ -379,12 +379,12 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves the raw response header, in the form of an indexed
-    * array containing all response header lines.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves the raw response header, in the form of an indexed
+     * array containing all response header lines.
+     * 
+     * @return array
+     */
     public function getResponseHeader() : array
     {
         $response = $this->getResponse();

Spacing +11 added lines, -11 removed lines

@@ -240,7 +240,7 @@ 
 
         $output = curl_exec($ch);
 
-        if(isset($this->logfilePointer))
+        if (isset($this->logfilePointer))
         {
             fclose($this->logfilePointer);
         }
@@ -252,7 +252,7 @@ 
         // CURL will complain about an empty response when the 
         // server sends a 100-continue code. That should not be
         // regarded as an error.
-        if($output === false && $this->response->getCode() !== 100)
+        if ($output === false && $this->response->getCode() !== 100)
         {
             $this->response->setError(
                 curl_errno($ch),
@@ -286,7 +286,7 @@ 
     {
         $ch = curl_init();
         
-        if(!is_resource($ch))
+        if (!is_resource($ch))
         {
             throw new RequestHelper_Exception(
                 'Could not initialize a new cURL instance.',
@@ -296,7 +296,7 @@ 
         }
 
         $this->setHeader('Content-Length', (string)$this->boundaries->getContentLength());
-        $this->setHeader('Content-Type', 'multipart/form-data; boundary=' . $this->mimeBoundary);
+        $this->setHeader('Content-Type', 'multipart/form-data; boundary='.$this->mimeBoundary);
 
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_URL, $url->getNormalizedWithoutAuth());
@@ -309,18 +309,18 @@ 
         
         $loggingEnabled = $this->configureLogging($ch);
         
-        if(!$loggingEnabled) 
+        if (!$loggingEnabled) 
         {
             curl_setopt($ch, CURLINFO_HEADER_OUT, true);
         }
         
-        if($this->verifySSL)
+        if ($this->verifySSL)
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         }
         
-        if($url->hasUsername())
+        if ($url->hasUsername())
         {
             curl_setopt($ch, CURLOPT_USERNAME, $url->getUsername());
             curl_setopt($ch, CURLOPT_PASSWORD, $url->getPassword());
@@ -335,14 +335,14 @@ 
     */
     protected function configureLogging($ch) : bool
     {
-        if(empty($this->logfile))
+        if (empty($this->logfile))
         {
             return false;
         }
         
         $res = fopen($this->logfile, 'w+');
         
-        if($res === false)
+        if ($res === false)
         {
             throw new RequestHelper_Exception(
                 'Cannot open logfile for writing.',
@@ -372,7 +372,7 @@ 
         
         $this->setHeader('Expect', '');
         
-        foreach($this->headers as $name => $value) {
+        foreach ($this->headers as $name => $value) {
             $result[] = $name.': '.$value;
         }
         
@@ -389,7 +389,7 @@ 
     {
         $response = $this->getResponse();
         
-        if($response !== null) {
+        if ($response !== null) {
             return $response->getHeaders();
         }
 

src/Traits/Classable.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
     
     public function addClass(string $name)
     {
-        if(!in_array($name, $this->classes)) {
+        if (!in_array($name, $this->classes)) {
             $this->classes[] = $name;
         }
         
@@ -38,7 +38,7 @@ 
     
     public function addClasses(array $names)
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->addClass($name);
         }
         
@@ -54,7 +54,7 @@ 
     {
         $idx = array_search($name, $this->classes);
         
-        if($idx !== false) {
+        if ($idx !== false) {
             unset($this->classes[$idx]);
             sort($this->classes);
         }

Indentation +22 added lines, -22 removed lines

@@ -87,37 +87,37 @@
  */
 interface Interface_Classable
 {
-   /**
-    * @param string $name
-    * @return $this
-    */
+    /**
+     * @param string $name
+     * @return $this
+     */
     public function addClass(string $name);
 
-   /**
-    * @param array $names
-    * @return $this
-    */
+    /**
+     * @param array $names
+     * @return $this
+     */
     public function addClasses(array $names);
     
-   /**
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * @param string $name
+     * @return bool
+     */
     public function hasClass(string $name) : bool;
     
-   /**
-    * @param string $name
-    * @return $this
-    */
+    /**
+     * @param string $name
+     * @return $this
+     */
     public function removeClass(string $name);
     
-   /**
-    * @return array
-    */
+    /**
+     * @return array
+     */
     public function getClasses() : array;
     
-   /**
-    * @return string
-    */
+    /**
+     * @return string
+     */
     public function classesToString() : string;
 }

src/ConvertHelper/StorageSizeEnum.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
     */
     protected static function init() : void
     {
-        if(!empty(self::$sizes)) {
+        if (!empty(self::$sizes)) {
             return;
         }
         
@@ -62,7 +62,7 @@ 
         
         self::addSize('b', 1, 1, t('B'), t('Byte'), t('Bytes'));
         
-        if(class_exists('AppLocalize\Localization')) 
+        if (class_exists('AppLocalize\Localization')) 
         {
             \AppLocalize\Localization::onLocaleChanged(array(self::class, 'handle_localeChanged'));
         }
@@ -131,7 +131,7 @@ 
         
         $name = strtolower($name);
         
-        if(isset(self::$sizes[$name])) {
+        if (isset(self::$sizes[$name])) {
             return self::$sizes[$name];
         }
         
@@ -173,9 +173,9 @@ 
         
         $result = array();
         
-        foreach(self::$sizes as $size)
+        foreach (self::$sizes as $size)
         {
-            if($size->getBase() === $base) {
+            if ($size->getBase() === $base) {
                 $result[] = $size;
             }
         }

Indentation +54 added lines, -54 removed lines

@@ -31,17 +31,17 @@ 
     
     const BASE_2 = 1024;
     
-   /**
-    * @var ConvertHelper_StorageSizeEnum_Size[]
-    */
+    /**
+     * @var ConvertHelper_StorageSizeEnum_Size[]
+     */
     protected static $sizes = array();
     
-   /**
-    * Initializes the supported unit notations, and
-    * how they are supposed to be calculated.
-    *
-    * @see ConvertHelper_SizeNotation::parseSize()
-    */
+    /**
+     * Initializes the supported unit notations, and
+     * how they are supposed to be calculated.
+     *
+     * @see ConvertHelper_SizeNotation::parseSize()
+     */
     protected static function init() : void
     {
         if(!empty(self::$sizes)) {
@@ -68,28 +68,28 @@ 
         }
     }
     
-   /**
-    * Called whenever the application locale is changed,
-    * to reset the size definitions so the labels get 
-    * translated to the new locale.
-    */
+    /**
+     * Called whenever the application locale is changed,
+     * to reset the size definitions so the labels get 
+     * translated to the new locale.
+     */
     public static function handle_localeChanged() : void
     {
         self::$sizes = array();
     }
     
-   /**
-    * Adds a storage size to the internal collection.
-    * 
-    * @param string $name The lowercase size name, e.g. "kb", "mib"
-    * @param int $base This defines how many bytes there are in a kilobyte, to differentiate with the two common way to calculate sizes: base 10 or base 2. See the Wikipedia link for more details.
-    * @param int $exponent The multiplier of the base to get the byte value
-    * @param string $suffix The localized short suffix, e.g. "KB", "MiB"
-    * @param string $singular The localized singular label of the size, e.g. "Kilobyte".
-    * @param string $plural The localized plural label of the size, e.g. "Kilobytes".
-    * 
-    * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
-    */
+    /**
+     * Adds a storage size to the internal collection.
+     * 
+     * @param string $name The lowercase size name, e.g. "kb", "mib"
+     * @param int $base This defines how many bytes there are in a kilobyte, to differentiate with the two common way to calculate sizes: base 10 or base 2. See the Wikipedia link for more details.
+     * @param int $exponent The multiplier of the base to get the byte value
+     * @param string $suffix The localized short suffix, e.g. "KB", "MiB"
+     * @param string $singular The localized singular label of the size, e.g. "Kilobyte".
+     * @param string $plural The localized plural label of the size, e.g. "Kilobytes".
+     * 
+     * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
+     */
     protected static function addSize(string $name, int $base, int $exponent, string $suffix, string $singular, string $plural) : void
     {
         self::$sizes[$name] = new ConvertHelper_StorageSizeEnum_Size(
@@ -102,11 +102,11 @@ 
         );
     }
     
-   /**
-    * Retrieves all known sizes.
-    * 
-    * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
-    */
+    /**
+     * Retrieves all known sizes.
+     * 
+     * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
+     */
     public static function getSizes() : array
     {
         self::init();
@@ -114,15 +114,15 @@ 
         return self::$sizes;
     }
     
-   /**
-    * Retrieves a size definition instance by its name.
-    * 
-    * @param string $name Case insensitive. For example "kb", "MiB"...
-    * @throws ConvertHelper_Exception
-    * @return ConvertHelper_StorageSizeEnum_Size
-    * 
-    * @see ConvertHelper_StorageSizeEnum::ERROR_UNKNOWN_UNIT_NAME
-    */
+    /**
+     * Retrieves a size definition instance by its name.
+     * 
+     * @param string $name Case insensitive. For example "kb", "MiB"...
+     * @throws ConvertHelper_Exception
+     * @return ConvertHelper_StorageSizeEnum_Size
+     * 
+     * @see ConvertHelper_StorageSizeEnum::ERROR_UNKNOWN_UNIT_NAME
+     */
     public static function getSizeByName(string $name) : ConvertHelper_StorageSizeEnum_Size
     {
         self::init();
@@ -144,10 +144,10 @@ 
         );
     }
     
-   /**
-    * Retrieves a list of all size names, e.g. "mb", "kib" (lowercase).
-    * @return array
-    */
+    /**
+     * Retrieves a list of all size names, e.g. "mb", "kib" (lowercase).
+     * @return array
+     */
     public static function getSizeNames() : array
     {
         self::init();
@@ -155,16 +155,16 @@ 
         return array_keys(self::$sizes);
     }
    
-   /**
-    * Retrieves all available storage sizes for the specified
-    * base value.
-    * 
-    * @param int $base
-    * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
-    * 
-    * @see ConvertHelper_StorageSizeEnum::BASE_10
-    * @see ConvertHelper_StorageSizeEnum::BASE_2
-    */
+    /**
+     * Retrieves all available storage sizes for the specified
+     * base value.
+     * 
+     * @param int $base
+     * @return \AppUtils\ConvertHelper_StorageSizeEnum_Size[]
+     * 
+     * @see ConvertHelper_StorageSizeEnum::BASE_10
+     * @see ConvertHelper_StorageSizeEnum::BASE_2
+     */
     public static function getSizesByBase(int $base) : array
     {
         self::init();

src/ConvertHelper/TabsNormalizer.php

Indentation +45 added lines, -45 removed lines

@@ -20,43 +20,43 @@ 
  */
 class ConvertHelper_TabsNormalizer
 {
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $max = 0;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $min = PHP_INT_MAX;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $tabs2spaces = false;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $lines = array();
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $eol = '';
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $tabSize = 4;
     
-   /**
-    * Whether to enable or disable the conversion
-    * of tabs to spaces.
-    * 
-    * @param bool $enable
-    * @return ConvertHelper_TabsNormalizer
-    */
+    /**
+     * Whether to enable or disable the conversion
+     * of tabs to spaces.
+     * 
+     * @param bool $enable
+     * @return ConvertHelper_TabsNormalizer
+     */
     public function convertTabsToSpaces(bool $enable=true) : ConvertHelper_TabsNormalizer
     {
         $this->tabs2spaces = $enable;
@@ -64,13 +64,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets the size of a tab, in spaces. Used to convert tabs
-    * from spaces and the other way around. Defaults to 4.
-    * 
-    * @param int $amountSpaces
-    * @return ConvertHelper_TabsNormalizer
-    */
+    /**
+     * Sets the size of a tab, in spaces. Used to convert tabs
+     * from spaces and the other way around. Defaults to 4.
+     * 
+     * @param int $amountSpaces
+     * @return ConvertHelper_TabsNormalizer
+     */
     public function setTabSize(int $amountSpaces) : ConvertHelper_TabsNormalizer
     {
         $this->tabSize = $amountSpaces;
@@ -78,15 +78,15 @@ 
         return $this;
     }
     
-   /**
-    * Normalizes tabs in the specified string by indenting everything
-    * back to the minimum tab distance. With the second parameter,
-    * tabs can optionally be converted to spaces as well (recommended
-    * for HTML output).
-    *
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Normalizes tabs in the specified string by indenting everything
+     * back to the minimum tab distance. With the second parameter,
+     * tabs can optionally be converted to spaces as well (recommended
+     * for HTML output).
+     *
+     * @param string $string
+     * @return string
+     */
     public function normalize(string $string) : string
     {
         $this->splitLines($string);
@@ -143,10 +143,10 @@ 
         return implode($this->eol, $converted);
     }
     
-   /**
-    * Finds out the minimum and maximum amount of 
-    * tabs in the string.
-    */
+    /**
+     * Finds out the minimum and maximum amount of 
+     * tabs in the string.
+     */
     protected function countOccurrences() : void
     {
         foreach($this->lines as $line) 

Spacing +10 added lines, -10 removed lines

@@ -57,7 +57,7 @@ 
     * @param bool $enable
     * @return ConvertHelper_TabsNormalizer
     */
-    public function convertTabsToSpaces(bool $enable=true) : ConvertHelper_TabsNormalizer
+    public function convertTabsToSpaces(bool $enable = true) : ConvertHelper_TabsNormalizer
     {
         $this->tabs2spaces = $enable;
         
@@ -94,7 +94,7 @@ 
         
         $result = $this->_normalize();
         
-        if($this->tabs2spaces) 
+        if ($this->tabs2spaces) 
         {
             $result = ConvertHelper::tabs2spaces($result, $this->tabSize);
         }
@@ -108,7 +108,7 @@ 
     {
         $eol = ConvertHelper::detectEOLCharacter($string);
         
-        if($eol !== null) 
+        if ($eol !== null) 
         {
             $this->eol = $eol->getCharacter();
         }
@@ -126,15 +126,15 @@ 
     {
         $converted = array();
         
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             $amount = substr_count($line, "\t") - $this->min;
             
             $line = trim($line, "\n\r\t");
             
-            if($amount >= 1) 
+            if ($amount >= 1) 
             {
-                $line = str_repeat("\t", $amount) . $line;
+                $line = str_repeat("\t", $amount).$line;
             }
             
             $converted[] = $line;
@@ -149,23 +149,23 @@ 
     */
     protected function countOccurrences() : void
     {
-        foreach($this->lines as $line) 
+        foreach ($this->lines as $line) 
         {
             $amount = substr_count($line, "\t");
             
-            if($amount > $this->max) 
+            if ($amount > $this->max) 
             {
                 $this->max = $amount;
                 continue;
             }
             
-            if($amount > 0 && $amount < $this->min) 
+            if ($amount > 0 && $amount < $this->min) 
             {
                 $this->min = $amount;
             }
         }
         
-        if($this->min === PHP_INT_MAX) {
+        if ($this->min === PHP_INT_MAX) {
             $this->min = 0;
         }
     }

src/ConvertHelper/HiddenConverter.php

Indentation +18 added lines, -18 removed lines

@@ -69,9 +69,9 @@ 
         )
     );
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $selected = array();
     
     public function convert(string $string) : string
@@ -81,16 +81,16 @@ 
         return str_replace(array_keys($chars), array_values($chars), $string);
     }
     
-   /**
-    * Selects a character set to replace. Can be called
-    * several times to add additional sets to the collection.
-    * 
-    * @param string $type See the <code>CHAR_XXX</code> constants.
-    * @return ConvertHelper_HiddenConverter
-    * 
-    * @see ConvertHelper_HiddenConverter::CHARS_CONTROL
-    * @see ConvertHelper_HiddenConverter::CHARS_WHITESPACE
-    */
+    /**
+     * Selects a character set to replace. Can be called
+     * several times to add additional sets to the collection.
+     * 
+     * @param string $type See the <code>CHAR_XXX</code> constants.
+     * @return ConvertHelper_HiddenConverter
+     * 
+     * @see ConvertHelper_HiddenConverter::CHARS_CONTROL
+     * @see ConvertHelper_HiddenConverter::CHARS_WHITESPACE
+     */
     public function selectCharacters(string $type) : ConvertHelper_HiddenConverter
     {
         if(!in_array($type, $this->selected)) {
@@ -100,11 +100,11 @@ 
         return $this;
     }
     
-   /**
-    * Resolves the list of characters to make visible.
-    * 
-    * @return array
-    */
+    /**
+     * Resolves the list of characters to make visible.
+     * 
+     * @return array
+     */
     protected function resolveSelection() : array
     {
         $selected = $this->selected;

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
     */
     public function selectCharacters(string $type) : ConvertHelper_HiddenConverter
     {
-        if(!in_array($type, $this->selected)) {
+        if (!in_array($type, $this->selected)) {
             $this->selected[] = $type;
         }
         
@@ -109,7 +109,7 @@ 
     {
         $selected = $this->selected;
         
-        if(empty($this->selected)) 
+        if (empty($this->selected)) 
         {
             $selected = array(
                 self::CHARS_WHITESPACE,
@@ -119,9 +119,9 @@ 
         
         $result = array();
         
-        foreach($selected as $type) 
+        foreach ($selected as $type) 
         {
-            if(isset($this->characters[$type])) 
+            if (isset($this->characters[$type])) 
             {
                 $result = array_merge($result, $this->characters[$type]);
             }

src/Request/Param.php

Spacing +15 added lines, -15 removed lines

@@ -126,9 +126,9 @@ 
     * @param array $args
     * @return Request_Param
     */
-    public function setCallback($callback, array $args=array()) : Request_Param
+    public function setCallback($callback, array $args = array()) : Request_Param
     {
-        if(!is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new Request_Exception(
                 'Not a valid callback',
                 'The specified callback is not a valid callable entity.',
@@ -159,22 +159,22 @@ 
         // first off, apply filtering
         $value = $this->filter($value);
         
-        if($this->valueType === self::VALUE_TYPE_LIST)
+        if ($this->valueType === self::VALUE_TYPE_LIST)
         {
-            if(!is_array($value))
+            if (!is_array($value))
             {
                 $value = explode(',', $value);
             }
             
             $keep = array();
             
-            foreach($value as $subval)
+            foreach ($value as $subval)
             {
                 $subval = $this->filter($subval);
                 
                 $subval = $this->applyValidations($subval, true);
 
-                if($subval !== null) {
+                if ($subval !== null) {
                     $keep[] = $subval;
                 }
             }
@@ -195,11 +195,11 @@ 
     * @param mixed $value
     * @return mixed
     */
-    protected function applyValidations($value, bool $subval=false)
+    protected function applyValidations($value, bool $subval = false)
     {
         // go through all enqueued validations in turn, each time
         // replacing the value with the adjusted, validated value.
-        foreach($this->validations as $validateDef)
+        foreach ($this->validations as $validateDef)
         {
             $value = $this->validateType($value, $validateDef['type'], $validateDef['params'], $subval);
         }
@@ -222,7 +222,7 @@ 
     {
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Request_Exception(
                 'Unknown validation type.',
@@ -376,7 +376,7 @@ 
     {
         $args = func_get_args(); // cannot be used as function parameter in some PHP versions
         
-        if(is_array($args[0])) 
+        if (is_array($args[0])) 
         {
             $args = $args[0];
         }
@@ -521,10 +521,10 @@ 
     * @param mixed $default
     * @return mixed
     */
-    public function get($default=null)
+    public function get($default = null)
     {
         $value = $this->request->getParam($this->paramName);
-        if($value !== null && $value !== '') {
+        if ($value !== null && $value !== '') {
             return $value;
         }
 
@@ -543,7 +543,7 @@ 
     {
         $total = count($this->filters);
         for ($i = 0; $i < $total; $i++) {
-            $method = 'applyFilter_' . $this->filters[$i]['type'];
+            $method = 'applyFilter_'.$this->filters[$i]['type'];
             $value = $this->$method($value, $this->filters[$i]['params']);
         }
 
@@ -700,7 +700,7 @@ 
     * @param bool $stripEmptyEntries Remove empty entries from the array?
     * @return \AppUtils\Request_Param
     */
-    public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param
+    public function addCommaSeparatedFilter(bool $trimEntries = true, bool $stripEmptyEntries = true) : Request_Param
     {
         $this->setArray();
         
@@ -713,7 +713,7 @@ 
         );
     }
     
-    protected function addClassFilter(string $name, array $params=array()) : Request_Param
+    protected function addClassFilter(string $name, array $params = array()) : Request_Param
     {
         return $this->addFilter(
             self::FILTER_TYPE_CLASS,

Indentation +154 added lines, -154 removed lines

@@ -114,18 +114,18 @@ 
         }
     }
     
-   /**
-    * Adds a callback as a validation method. The callback gets the
-    * value to validate as first parameter, and any additional 
-    * parameters passed here get appended to that.
-    * 
-    * The callback must return boolean true or false depending on
-    * whether the value is valid.
-    * 
-    * @param callable $callback
-    * @param array $args
-    * @return Request_Param
-    */
+    /**
+     * Adds a callback as a validation method. The callback gets the
+     * value to validate as first parameter, and any additional 
+     * parameters passed here get appended to that.
+     * 
+     * The callback must return boolean true or false depending on
+     * whether the value is valid.
+     * 
+     * @param callable $callback
+     * @param array $args
+     * @return Request_Param
+     */
     public function setCallback($callback, array $args=array()) : Request_Param
     {
         if(!is_callable($callback)) {
@@ -189,12 +189,12 @@ 
         return $value;
     }
     
-   /**
-    * Runs the value through all validations that were added.
-    * 
-    * @param mixed $value
-    * @return mixed
-    */
+    /**
+     * Runs the value through all validations that were added.
+     * 
+     * @param mixed $value
+     * @return mixed
+     */
     protected function applyValidations($value, bool $subval=false)
     {
         // go through all enqueued validations in turn, each time
@@ -207,17 +207,17 @@ 
         return $value;
     }
     
-   /**
-    * Validates the specified value using the validation type. Returns
-    * the validated value. 
-    * 
-    * @param mixed $value
-    * @param string $type
-    * @param array $params
-    * @param bool $subval Whether this is a subvalue in a list
-    * @throws Request_Exception
-    * @return mixed
-    */
+    /**
+     * Validates the specified value using the validation type. Returns
+     * the validated value. 
+     * 
+     * @param mixed $value
+     * @param string $type
+     * @param array $params
+     * @param bool $subval Whether this is a subvalue in a list
+     * @throws Request_Exception
+     * @return mixed
+     */
     protected function validateType($value, string $type, array $params, bool $subval)
     {
         $class = '\AppUtils\Request_Param_Validator_'.ucfirst($type);
@@ -286,13 +286,13 @@ 
     
     protected $valueType = self::VALUE_TYPE_STRING;
 
-   /**
-    * Sets the variable to contain a comma-separated list of integer IDs.
-    * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
-    * <code>145</code>.
-    * 
-    * @return Request_Param
-    */
+    /**
+     * Sets the variable to contain a comma-separated list of integer IDs.
+     * Example: <code>145,248,4556</code>. A single ID is also allowed, e.g.
+     * <code>145</code>.
+     * 
+     * @return Request_Param
+     */
     public function setIDList()
     {
         $this->valueType = self::VALUE_TYPE_LIST;
@@ -302,13 +302,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets the variable to be an alias, as defined by the
-    * {@link RegexHelper::REGEX_ALIAS} regular expression.
-    * 
-    * @return Request_Param
-    * @see RegexHelper::REGEX_ALIAS
-    */
+    /**
+     * Sets the variable to be an alias, as defined by the
+     * {@link RegexHelper::REGEX_ALIAS} regular expression.
+     * 
+     * @return Request_Param
+     * @see RegexHelper::REGEX_ALIAS
+     */
     public function setAlias()
     {
         return $this->setRegex(RegexHelper::REGEX_ALIAS);
@@ -349,12 +349,12 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_ALPHA);
     }
     
-   /**
-    * Sets the parameter value as a string containing lowercase
-    * and/or uppercase letters, as well as numbers.
-    * 
-    * @return Request_Param
-    */
+    /**
+     * Sets the parameter value as a string containing lowercase
+     * and/or uppercase letters, as well as numbers.
+     * 
+     * @return Request_Param
+     */
     public function setAlnum()
     {
         return $this->setValidation(self::VALIDATION_TYPE_ALNUM);   
@@ -387,17 +387,17 @@ 
         );
     }
     
-   /**
-    * Only available for array values: the parameter must be
-    * an array value, and the array may only contain values 
-    * specified in the values array.
-    * 
-    * Submitted values that are not in the allowed list of
-    * values are stripped from the value.
-    *  
-    * @param array $values List of allowed values
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Only available for array values: the parameter must be
+     * an array value, and the array may only contain values 
+     * specified in the values array.
+     * 
+     * Submitted values that are not in the allowed list of
+     * values are stripped from the value.
+     *  
+     * @param array $values List of allowed values
+     * @return \AppUtils\Request_Param
+     */
     public function setValuesList(array $values)
     {
         $this->setArray();
@@ -410,11 +410,11 @@ 
         );
     }
     
-   /**
-    * Whether the parameter is a list of values.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the parameter is a list of values.
+     * 
+     * @return bool
+     */
     public function isList() : bool
     {
         return $this->valueType === self::VALUE_TYPE_LIST;
@@ -425,53 +425,53 @@ 
         return $this->setValidation(self::VALIDATION_TYPE_ARRAY);
     }
     
-   /**
-    * Specifies that a JSON-encoded string is expected.
-    * 
-    * NOTE: Numbers or quoted strings are technically valid
-    * JSON, but are not accepted, because it is assumed
-    * at least an array or object are expected.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Specifies that a JSON-encoded string is expected.
+     * 
+     * NOTE: Numbers or quoted strings are technically valid
+     * JSON, but are not accepted, because it is assumed
+     * at least an array or object are expected.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function setJSON() : Request_Param
     {
         return $this->setValidation(self::VALIDATION_TYPE_JSON, array('arrays' => true));
     }
     
-   /**
-    * Like {@link Request_Param::setJSON()}, but accepts
-    * only JSON objects. Arrays will not be accepted.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Like {@link Request_Param::setJSON()}, but accepts
+     * only JSON objects. Arrays will not be accepted.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function setJSONObject() : Request_Param
     {
         return $this->setValidation(self::VALIDATION_TYPE_JSON, array('arrays' => false));
     }
     
-   /**
-    * The parameter is a string boolean representation. This means
-    * it can be any of the following: "yes", "true", "no", "false".
-    * The value is automatically converted to a boolean when retrieving
-    * the parameter.
-    * 
-    * @return Request_Param
-    */
+    /**
+     * The parameter is a string boolean representation. This means
+     * it can be any of the following: "yes", "true", "no", "false".
+     * The value is automatically converted to a boolean when retrieving
+     * the parameter.
+     * 
+     * @return Request_Param
+     */
     public function setBoolean() : Request_Param
     {
         return $this->addClassFilter('Boolean');
     }
     
-   /**
-    * Validates the request parameter as an MD5 string,
-    * so that only values resembling md5 values are accepted.
-    * 
-    * NOTE: This can only guarantee the format, not whether
-    * it is an actual valid hash of something.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Validates the request parameter as an MD5 string,
+     * so that only values resembling md5 values are accepted.
+     * 
+     * NOTE: This can only guarantee the format, not whether
+     * it is an actual valid hash of something.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function setMD5() : Request_Param
     {
         return $this->setRegex(RegexHelper::REGEX_MD5);
@@ -513,14 +513,14 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the value of the request parameter,
-    * applying all filters (if any) and validation
-    * (if any).
-    * 
-    * @param mixed $default
-    * @return mixed
-    */
+    /**
+     * Retrieves the value of the request parameter,
+     * applying all filters (if any) and validation
+     * (if any).
+     * 
+     * @param mixed $default
+     * @return mixed
+     */
     public function get($default=null)
     {
         $value = $this->request->getParam($this->paramName);
@@ -531,14 +531,14 @@ 
         return $this->validate($default);
     }
 
-   /**
-    * Filters the specified value by going through all available
-    * filters, if any. If none have been set, the value is simply
-    * passed through.
-    *
-    * @param mixed $value
-    * @return mixed
-    */
+    /**
+     * Filters the specified value by going through all available
+     * filters, if any. If none have been set, the value is simply
+     * passed through.
+     *
+     * @param mixed $value
+     * @return mixed
+     */
     protected function filter($value)
     {
         $total = count($this->filters);
@@ -608,12 +608,12 @@ 
         return $this;
     }
     
-   /**
-    * Adds a filter that trims whitespace from the request
-    * parameter using the PHP <code>trim</code> function.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that trims whitespace from the request
+     * parameter using the PHP <code>trim</code> function.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addFilterTrim() : Request_Param
     {
         // to guarantee we only work with strings
@@ -622,13 +622,13 @@ 
         return $this->addCallbackFilter('trim');
     }
 
-   /**
-    * Converts the value to a string, even if it is not
-    * a string value. Complex types like arrays and objects
-    * are converted to an empty string.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Converts the value to a string, even if it is not
+     * a string value. Complex types like arrays and objects
+     * are converted to an empty string.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addStringFilter() : Request_Param
     {
         return $this->addClassFilter('String');
@@ -678,12 +678,12 @@ 
         return $this->addCallbackFilter('strip_tags', array($allowedTags));
     }
     
-   /**
-    * Adds a filter that strips all whitespace from the
-    * request parameter, from spaces to tabs and newlines.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that strips all whitespace from the
+     * request parameter, from spaces to tabs and newlines.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addStripWhitespaceFilter() : Request_Param
     {
         // to ensure we only work with strings.
@@ -692,14 +692,14 @@ 
         return $this->addClassFilter('StripWhitespace');
     }   
     
-   /**
-    * Adds a filter that transforms comma separated values
-    * into an array of values.
-    * 
-    * @param bool $trimEntries Trim whitespace from each entry?
-    * @param bool $stripEmptyEntries Remove empty entries from the array?
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that transforms comma separated values
+     * into an array of values.
+     * 
+     * @param bool $trimEntries Trim whitespace from each entry?
+     * @param bool $stripEmptyEntries Remove empty entries from the array?
+     * @return \AppUtils\Request_Param
+     */
     public function addCommaSeparatedFilter(bool $trimEntries=true, bool $stripEmptyEntries=true) : Request_Param
     {
         $this->setArray();
@@ -724,12 +724,12 @@ 
         );
     }
     
-   /**
-    * Adds a filter that encodes all HTML special characters
-    * using the PHP <code>htmlspecialchars</code> function.
-    * 
-    * @return \AppUtils\Request_Param
-    */
+    /**
+     * Adds a filter that encodes all HTML special characters
+     * using the PHP <code>htmlspecialchars</code> function.
+     * 
+     * @return \AppUtils\Request_Param
+     */
     public function addHTMLSpecialcharsFilter() : Request_Param
     {
         return $this->addCallbackFilter('htmlspecialchars', array(ENT_QUOTES, 'UTF-8'));
@@ -742,14 +742,14 @@ 
     
     protected $required = false;
     
-   /**
-    * Marks this request parameter as required. To use this feature,
-    * you have to call the request's {@link Request::validate()}
-    * method.
-    * 
-    * @return Request_Param
-    * @see Request::validate()
-    */
+    /**
+     * Marks this request parameter as required. To use this feature,
+     * you have to call the request's {@link Request::validate()}
+     * method.
+     * 
+     * @return Request_Param
+     * @see Request::validate()
+     */
     public function makeRequired() : Request_Param
     {
         $this->required = true;

src/Request/Param/Validator.php

Indentation +6 added lines, -6 removed lines

@@ -27,14 +27,14 @@
      */
     protected $param;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $value;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $isSubvalue = false;
     
     public function __construct(Request_Param $param, bool $subval)