Mistralys / application-utils

src/OperationResult/Collection.php

Spacing +25 added lines, -25 removed lines

@@ -31,27 +31,27 @@ 
     */
     protected $results = array();
     
-    public function makeError(string $message, int $code=0) : OperationResult
+    public function makeError(string $message, int $code = 0) : OperationResult
     {
         return $this->add('makeError', $message, $code);
     }
     
-    public function makeSuccess(string $message, int $code=0) : OperationResult
+    public function makeSuccess(string $message, int $code = 0) : OperationResult
     {
         return $this->add('makeSuccess', $message, $code);
     }
 
-    public function makeWarning(string $message, int $code=0) : OperationResult
+    public function makeWarning(string $message, int $code = 0) : OperationResult
     {
         return $this->add('makeWarning', $message, $code);
     }
     
-    public function makeNotice(string $message, int $code=0) : OperationResult
+    public function makeNotice(string $message, int $code = 0) : OperationResult
     {
         return $this->add('makeNotice', $message, $code);
     }
     
-    protected function add(string $method, string $message, int $code=0) : OperationResult
+    protected function add(string $method, string $message, int $code = 0) : OperationResult
     {
         $result = new OperationResult($this->subject);
         $result->$method($message, $code);
@@ -63,7 +63,7 @@ 
     
     public function addResult(OperationResult $result) : OperationResult_Collection
     {
-        if($result instanceof OperationResult_Collection)
+        if ($result instanceof OperationResult_Collection)
         {
             return $this->importCollection($result);
         }
@@ -75,7 +75,7 @@ 
     {
         $results = $collection->getResults();
         
-        foreach($results as $result)
+        foreach ($results as $result)
         {
             $this->addResult($result);
         }
@@ -111,9 +111,9 @@ 
     
     public function isValid() : bool
     {
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
-            if(!$result->isValid())
+            if (!$result->isValid())
             {
                 return false;
             }
@@ -124,9 +124,9 @@ 
     
     public function hasCode() : bool
     {
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
-            if($result->hasCode())
+            if ($result->hasCode())
             {
                 return true;
             }
@@ -137,9 +137,9 @@ 
     
     public function getCode() : int
     {
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
-            if($result->hasCode())
+            if ($result->hasCode())
             {
                 return $result->getCode();
             }
@@ -148,13 +148,13 @@ 
         return 0;
     }
     
-    public function getMessage(string $type='') : string
+    public function getMessage(string $type = '') : string
     {
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
             $msg = $result->getMessage($type);
             
-            if(!empty($msg))
+            if (!empty($msg))
             {
                 return $msg;
             }
@@ -165,9 +165,9 @@ 
     
     public function containsCode(int $code) : bool
     {
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
-            if($result->getCode() === $code)
+            if ($result->getCode() === $code)
             {
                 return true;
             }
@@ -200,9 +200,9 @@ 
     {
         $amount = 0;
         
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
-            if($result->isType($type))
+            if ($result->isType($type))
             {
                 $amount++;
             }
@@ -240,9 +240,9 @@ 
     {
         $results = array();
         
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
-            if($result->isType($type))
+            if ($result->isType($type))
             {
                 $results[] = $result;
             }
@@ -253,9 +253,9 @@ 
     
     public function isType(string $type) : bool
     {
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
-            if($result->isType($type))
+            if ($result->isType($type))
             {
                 return true;
             }
@@ -271,7 +271,7 @@ 
         $lines[] = 'Collection #'.$this->getID();
         $lines[] = 'Subject: '.get_class($this->subject);
         
-        foreach($this->results as $result)
+        foreach ($this->results as $result)
         {
             $lines[] = ' - '.$result->getType().' #'.$result->getCode().' "'.$result->getMessage($result->getType()).'"';
         }

src/Traits/Classable.php

Spacing +4 added lines, -4 removed lines

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

src/Request.php

Spacing +31 added lines, -31 removed lines

@@ -90,11 +90,11 @@ 
     public function getParam($name, $default = null)
     {
         $value = $default;
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             $value = $_REQUEST[$name];
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             $value = $this->knownParams[$name]->validate($value);
         }
         
@@ -185,13 +185,13 @@ 
      * @param string $dispatcher Relative path to script to use for the URL. Append trailing slash if needed.
      * @return string
      */
-    public function buildURL($params = array(), string $dispatcher='')
+    public function buildURL($params = array(), string $dispatcher = '')
     {
-        $url = rtrim($this->getBaseURL(), '/') . '/' . $dispatcher;
+        $url = rtrim($this->getBaseURL(), '/').'/'.$dispatcher;
         
         // append any leftover parameters to the end of the URL
         if (!empty($params)) {
-            $url .= '?' . http_build_query($params, '', '&');
+            $url .= '?'.http_build_query($params, '', '&');
         }
         
         return $url;
@@ -222,7 +222,7 @@ 
      */
     public function registerParam($name)
     {
-        if(!isset($this->knownParams[$name])) {
+        if (!isset($this->knownParams[$name])) {
             $param = new Request_Param($this, $name);
             $this->knownParams[$name] = $param;
         }
@@ -239,7 +239,7 @@ 
     */
     public function getRegisteredParam(string $name) : Request_Param
     {
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             return $this->knownParams[$name];
         }
         
@@ -299,7 +299,7 @@ 
     {
         static $accept;
         
-        if(!isset($accept)) {
+        if (!isset($accept)) {
             $accept = new Request_AcceptHeaders();
         }
         
@@ -318,7 +318,7 @@ 
     {
         $_REQUEST[$name] = $value;
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -352,11 +352,11 @@ 
     */
     public function removeParam(string $name) : Request
     {
-        if(isset($_REQUEST[$name])) {
+        if (isset($_REQUEST[$name])) {
             unset($_REQUEST[$name]);
         }
         
-        if(isset($this->knownParams[$name])) {
+        if (isset($this->knownParams[$name])) {
             unset($this->knownParams[$name]);
         }
         
@@ -371,7 +371,7 @@ 
     */
     public function removeParams(array $names) : Request
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->removeParam($name);
         }
         
@@ -387,10 +387,10 @@ 
      * @param string $name
      * @return bool
      */
-    public function getBool($name, $default=false)
+    public function getBool($name, $default = false)
     {
         $value = $this->getParam($name, $default);
-        if(ConvertHelper::isBoolean($value)) {
+        if (ConvertHelper::isBoolean($value)) {
             return ConvertHelper::string2bool($value);
         }
         
@@ -399,11 +399,11 @@ 
     
     public function validate()
     {
-        foreach($this->knownParams as $param) 
+        foreach ($this->knownParams as $param) 
         {
             $name = $param->getName();
             
-            if($param->isRequired() && !$this->hasParam($name)) 
+            if ($param->isRequired() && !$this->hasParam($name)) 
             {
                 throw new Request_Exception(
                     'Missing request parameter '.$name,
@@ -425,10 +425,10 @@ 
      * @param mixed $default
      * @return string
      */
-    public function getFilteredParam($name, $default=null)
+    public function getFilteredParam($name, $default = null)
     {
         $val = $this->getParam($name, $default);
-        if(is_string($val)) {
+        if (is_string($val)) {
             $val = htmlspecialchars(trim(strip_tags($val)), ENT_QUOTES, 'UTF-8');
         }
         
@@ -447,24 +447,24 @@ 
     * @see Request::getJSONAssoc()
     * @see Request::getJSONObject()
     */
-    public function getJSON(string $name, bool $assoc=true)
+    public function getJSON(string $name, bool $assoc = true)
     {
         $value = $this->getParam($name);
         
-        if(!empty($value) && is_string($value)) 
+        if (!empty($value) && is_string($value)) 
         {
             $data = json_decode($value, $assoc);
             
-            if($assoc && is_array($data)) {
+            if ($assoc && is_array($data)) {
                 return $data;
             }
             
-            if(is_object($data)) {
+            if (is_object($data)) {
                 return $data;
             }
         }
         
-        if($assoc) {
+        if ($assoc) {
             return array();
         }
         
@@ -481,7 +481,7 @@ 
     public function getJSONAssoc(string $name) : array
     {
         $result = $this->getJSON($name);
-        if(is_array($result)) {
+        if (is_array($result)) {
             return $result;
         }
         
@@ -498,7 +498,7 @@ 
     public function getJSONObject(string $name) : object
     {
         $result = $this->getJSON($name, false);
-        if(is_object($result)) {
+        if (is_object($result)) {
             return $result;
         }
         
@@ -511,10 +511,10 @@ 
     * @param array|string $data
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendJSON($data, bool $exit=true)
+    public static function sendJSON($data, bool $exit = true)
     {
         $payload = $data;
-        if(!is_string($payload)) {
+        if (!is_string($payload)) {
             $payload = json_encode($payload);
         }
         
@@ -524,7 +524,7 @@ 
         
         echo $payload;
         
-        if($exit) 
+        if ($exit) 
         {
             exit;
         }
@@ -536,7 +536,7 @@ 
     * @param string $html
     * @param bool $exit Whether to exit the script afterwards.
     */
-    public static function sendHTML(string $html, bool $exit=true)
+    public static function sendHTML(string $html, bool $exit = true)
     {
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -544,7 +544,7 @@ 
         
         echo $html;
         
-        if($exit)
+        if ($exit)
         {
             exit;
         }
@@ -560,7 +560,7 @@ 
     * @param array $limitParams Whether to limit the comparison to these specific parameter names (if present)
     * @return Request_URLComparer
     */
-    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams=array()) : Request_URLComparer
+    public function createURLComparer(string $sourceURL, string $targetURL, array $limitParams = array()) : Request_URLComparer
     {
         $comparer = new Request_URLComparer($this, $sourceURL, $targetURL);
         $comparer->addLimitParams($limitParams);

src/Request/RefreshParams/Exclude/Callback.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     
     public function __construct($callback)
     {
-        if(!is_callable($callback))
+        if (!is_callable($callback))
         {
             throw new Request_Exception(
                 'Invalid exclusion callback',

src/Request/RefreshParams.php

Spacing +11 added lines, -11 removed lines

@@ -48,7 +48,7 @@ 
     * @param bool $exclude
     * @return Request_RefreshParams
     */
-    public function setExcludeSessionName(bool $exclude=true) : Request_RefreshParams
+    public function setExcludeSessionName(bool $exclude = true) : Request_RefreshParams
     {
         $this->setOption('exclude-session-name', $exclude);
         return $this;
@@ -70,7 +70,7 @@ 
     
     public function excludeParamByName(string $paramName) : Request_RefreshParams
     {
-        if($paramName !== '')
+        if ($paramName !== '')
         {
             $this->excludes[] = new Request_RefreshParams_Exclude_Name($paramName);
         }
@@ -107,7 +107,7 @@ 
     */
     public function excludeParamsByName(array $paramNames) : Request_RefreshParams
     {
-        foreach($paramNames as $name)
+        foreach ($paramNames as $name)
         {
             $this->excludeParamByName((string)$name);
         }
@@ -139,7 +139,7 @@ 
     */
     public function overrideParams(array $params) : Request_RefreshParams
     {
-        foreach($params as $name => $value)
+        foreach ($params as $name => $value)
         {
             $this->overrideParam((string)$name, $value);
         }
@@ -173,7 +173,7 @@ 
     */
     private function autoExcludeSessionName(array &$excludes) : void
     {
-        if($this->getBoolOption('exclude-session-name'))
+        if ($this->getBoolOption('exclude-session-name'))
         {
             $excludes[] = new Request_RefreshParams_Exclude_Name(session_name());
         }
@@ -187,7 +187,7 @@ 
     */
     private function autoExcludeQuickform(array &$excludes) : void
     {
-        if($this->getBoolOption('exclude-quickform-submitter'))
+        if ($this->getBoolOption('exclude-quickform-submitter'))
         {
             $excludes[] = new Request_RefreshParams_Exclude_Callback(function(string $paramName)
             {
@@ -209,7 +209,7 @@ 
         // Note: using this loop instead of array_merge,
         // because array_merge has weird behavior when
         // using numeric keys.
-        foreach($this->overrides as $name => $val)
+        foreach ($this->overrides as $name => $val)
         {
             $params[$name] = $val;
         }
@@ -227,11 +227,11 @@ 
     {
         $result = array();
         
-        foreach($params as $name => $value)
+        foreach ($params as $name => $value)
         {
             $name = (string)$name;
             
-            if(!$this->isExcluded($name, $value))
+            if (!$this->isExcluded($name, $value))
             {
                 $result[$name] = $value;
             }
@@ -252,9 +252,9 @@ 
     {
         $excludes = $this->resolveExcludes();
         
-        foreach($excludes as $exclude)
+        foreach ($excludes as $exclude)
         {
-            if($exclude->isExcluded($paramName, $paramValue))
+            if ($exclude->isExcluded($paramName, $paramValue))
             {
                 return true;
             }

src/RequestHelper.php

Spacing +12 added lines, -12 removed lines

@@ -241,7 +241,7 @@ 
 
         $output = curl_exec($ch);
 
-        if(isset($this->logfilePointer))
+        if (isset($this->logfilePointer))
         {
             fclose($this->logfilePointer);
         }
@@ -253,7 +253,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)
         {
             $curlCode = curl_errno($ch);
             
@@ -289,7 +289,7 @@ 
     {
         $ch = curl_init();
         
-        if(!is_resource($ch))
+        if (!is_resource($ch))
         {
             throw new RequestHelper_Exception(
                 'Could not initialize a new cURL instance.',
@@ -299,7 +299,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());
@@ -312,18 +312,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());
@@ -338,14 +338,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.',
@@ -375,7 +375,7 @@ 
         
         $this->setHeader('Expect', '');
         
-        foreach($this->headers as $name => $value) {
+        foreach ($this->headers as $name => $value) {
             $result[] = $name.': '.$value;
         }
         
@@ -392,7 +392,7 @@ 
     {
         $response = $this->getResponse();
         
-        if($response !== null) {
+        if ($response !== null) {
             return $response->getHeaders();
         }
 
@@ -428,7 +428,7 @@ 
     */
     public function getHeader(string $name) : string
     {
-        if(isset($this->headers[$name]))
+        if (isset($this->headers[$name]))
         {
             return $this->headers[$name];
         }

src/XMLHelper.php

Spacing +14 added lines, -14 removed lines

@@ -243,7 +243,7 @@ 
 
         if (!empty($text)) {
             $fragment = $this->dom->createDocumentFragment();
-            if(!@$fragment->appendXML($text)) {
+            if (!@$fragment->appendXML($text)) {
                 throw new XMLHelper_Exception(
                     'Cannot append XML fragment',
                     sprintf(
@@ -285,7 +285,7 @@ 
     * @param array<string,mixed> $attributes
     * @return DOMNode
     */
-    public function createRoot(string $name, array $attributes=array())
+    public function createRoot(string $name, array $attributes = array())
     {
         $root = $this->dom->appendChild($this->dom->createElement($name));
         $this->addAttributes($root, $attributes);
@@ -311,8 +311,8 @@ 
         $string = str_replace('&lt;', 'LT_ESCAPE', $string);
         $string = str_replace('&gt;', 'GT_ESCAPE', $string);
 
-        $string = str_replace('&nbsp;',' ',  $string);
-        $string = str_replace('&','&amp;',  $string);
+        $string = str_replace('&nbsp;', ' ', $string);
+        $string = str_replace('&', '&amp;', $string);
 
         return $string;
     }
@@ -331,9 +331,9 @@ 
     */
     public static function downloadXML(string $xml, string $filename = 'download.xml') : void
     {
-        if(!headers_sent() && !self::$simulation) 
+        if (!headers_sent() && !self::$simulation) 
         {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
         }
         
         echo $xml;
@@ -347,12 +347,12 @@ 
     */
     public static function displayXML(string $xml) : void
     {
-        if(!headers_sent() && !self::$simulation) 
+        if (!headers_sent() && !self::$simulation) 
         {
             header('Content-Type:text/xml; charset=utf-8');
         }
         
-        if(self::$simulation) 
+        if (self::$simulation) 
         {
             $xml = '<pre>'.htmlspecialchars($xml).'</pre>';
         }
@@ -370,16 +370,16 @@ 
      * @param array<string,string> $customInfo Associative array with name => value pairs for custom tags to add to the output xml
      * @see buildErrorXML()
      */
-    public static function displayErrorXML($code, string $message, string $title, array $customInfo=array())
+    public static function displayErrorXML($code, string $message, string $title, array $customInfo = array())
     {
-        if(!headers_sent() && !self::$simulation) {
-            header('HTTP/1.1 400 Bad Request: ' . $title, true, 400);
+        if (!headers_sent() && !self::$simulation) {
+            header('HTTP/1.1 400 Bad Request: '.$title, true, 400);
         }
 
         self::displayXML(self::buildErrorXML($code, $message, $title, $customInfo));
     }
     
-    public static function setSimulation(bool $simulate=true) : void
+    public static function setSimulation(bool $simulate = true) : void
     {
         self::$simulation = $simulate;
     }
@@ -428,7 +428,7 @@ 
     * @param array<string,string> $customInfo
     * @return string
     */
-    public static function buildErrorXML($code, string $message, string $title, array $customInfo=array())
+    public static function buildErrorXML($code, string $message, string $title, array $customInfo = array())
     {
         $xml = new DOMDocument('1.0', 'UTF-8');
         $xml->formatOutput = true;
@@ -442,7 +442,7 @@ 
         $helper->addTextTag($root, 'title', $title);
         $helper->addTextTag($root, 'request_uri', $_SERVER['REQUEST_URI']);
         
-        foreach($customInfo as $name => $value) {
+        foreach ($customInfo as $name => $value) {
             $helper->addTextTag($root, $name, $value);
         }
 

src/Highlighter.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
     */
     public static function json($subject) : string
     {
-        if(!is_string($subject))
+        if (!is_string($subject))
         {
             $subject = json_encode($subject, JSON_PRETTY_PRINT);
         }
@@ -125,9 +125,9 @@ 
     * @param bool $formatSource Whether to format the source with indentation to make it readable.
     * @return string
     */
-    public static function xml(string $xml, bool $formatSource=false) : string
+    public static function xml(string $xml, bool $formatSource = false) : string
     {
-        if($formatSource)
+        if ($formatSource)
         {
             $dom = new DOMDocument();
             $dom->preserveWhiteSpace = false;
@@ -148,9 +148,9 @@ 
     * @param bool $formatSource
     * @return string
     */
-    public static function html(string $html, bool $formatSource=false) : string
+    public static function html(string $html, bool $formatSource = false) : string
     {
-        if($formatSource)
+        if ($formatSource)
         {
             $dom = new DOMDocument();
             $dom->preserveWhiteSpace = false;

src/ConvertHelper/TimeConverter.php

Spacing +10 added lines, -10 removed lines

@@ -48,7 +48,7 @@ 
     */
     private function initUnits() : void
     {
-        if(isset(self::$units))
+        if (isset(self::$units))
         {
             return;
         }
@@ -90,12 +90,12 @@ 
     public function toString() : string
     {
         // specifically handle zero
-        if($this->seconds <= 0) 
+        if ($this->seconds <= 0) 
         {
-            return '0 ' . t('seconds');
+            return '0 '.t('seconds');
         }
         
-        if($this->seconds < 1) 
+        if ($this->seconds < 1) 
         {
             return t('less than a second');
         }
@@ -104,12 +104,12 @@ 
 
         $last = array_pop($tokens);
         
-        if(empty($tokens)) 
+        if (empty($tokens)) 
         {
             return $last;
         }
         
-        return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last;
+        return implode(', ', $tokens).' '.t('and').' '.$last;
     }
     
    /**
@@ -122,18 +122,18 @@ 
         $seconds = $this->seconds;
         $tokens = array();
         
-        foreach(self::$units as $def)
+        foreach (self::$units as $def)
         {
             $unitValue = intval($seconds / $def['value']);
             
-            if($unitValue <= 0)
+            if ($unitValue <= 0)
             {
                 continue;
             }
             
-            $item = strval($unitValue) . ' ';
+            $item = strval($unitValue).' ';
             
-            if(abs($unitValue) > 1)
+            if (abs($unitValue) > 1)
             {
                 $item .= $def['plural'];
             }