Mistralys / application-utils

src/Microtime.php

Spacing +13 added lines, -13 removed lines

@@ -114,9 +114,9 @@ 
      * @see Microtime::createFromString()
      * @see Microtime::createNow()
      */
-    public function __construct($datetime=self::DATETIME_NOW, ?DateTimeZone $timeZone=null)
+    public function __construct($datetime = self::DATETIME_NOW, ?DateTimeZone $timeZone = null)
     {
-        if($datetime instanceof Microtime_ParseResult)
+        if ($datetime instanceof Microtime_ParseResult)
         {
             $parsed = $datetime;
         }
@@ -148,9 +148,9 @@ 
      * @return Microtime_ParseResult
      * @throws Microtime_Exception
      */
-    private function parseDate($datetime, ?DateTimeZone $timeZone=null) : Microtime_ParseResult
+    private function parseDate($datetime, ?DateTimeZone $timeZone = null) : Microtime_ParseResult
     {
-        if($datetime instanceof Microtime)
+        if ($datetime instanceof Microtime)
         {
             return new Microtime_ParseResult(
                 $datetime->getISODate(),
@@ -158,7 +158,7 @@ 
             );
         }
 
-        if($datetime instanceof DateTime)
+        if ($datetime instanceof DateTime)
         {
             return new Microtime_ParseResult(
                 $datetime->format(self::FORMAT_ISO),
@@ -166,17 +166,17 @@ 
             );
         }
 
-        if($timeZone === null)
+        if ($timeZone === null)
         {
             $timeZone = new DateTimeZone(date_default_timezone_get());
         }
 
-        if(empty($datetime) || $datetime === self::DATETIME_NOW)
+        if (empty($datetime) || $datetime === self::DATETIME_NOW)
         {
             return self::parseNow($timeZone);
         }
 
-        if(is_string($datetime))
+        if (is_string($datetime))
         {
             return new Microtime_ParseResult(
                 $datetime,
@@ -203,7 +203,7 @@ 
     {
         $dateObj = DateTime::createFromFormat('0.u00 U', microtime(), new DateTimeZone('America/Denver'));
 
-        if($dateObj !== false)
+        if ($dateObj !== false)
         {
             $dateObj->setTimezone($timeZone);
 
@@ -227,9 +227,9 @@ 
      * @return Microtime
      * @throws Microtime_Exception
      */
-    public static function createNow(?DateTimeZone $timeZone=null) : Microtime
+    public static function createNow(?DateTimeZone $timeZone = null) : Microtime
     {
-        if($timeZone === null)
+        if ($timeZone === null)
         {
             $timeZone = new DateTimeZone(date_default_timezone_get());
         }
@@ -246,9 +246,9 @@ 
      * @return Microtime
      * @throws Microtime_Exception
      */
-    public static function createFromString(string $date, ?DateTimeZone $timeZone=null) : Microtime
+    public static function createFromString(string $date, ?DateTimeZone $timeZone = null) : Microtime
     {
-        if($timeZone === null)
+        if ($timeZone === null)
         {
             $timeZone = new DateTimeZone(date_default_timezone_get());
         }

Braces +2 added lines, -4 removed lines

@@ -119,8 +119,7 @@ 
         if($datetime instanceof Microtime_ParseResult)
         {
             $parsed = $datetime;
-        }
-        else
+        } else
         {
             $parsed = $this->parseDate($datetime, $timeZone);
         }
@@ -128,8 +127,7 @@ 
         try
         {
             parent::__construct($parsed->getDateTime(), $parsed->getTimeZone());
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new Microtime_Exception(
                 'Failed to create date from string.',

src/ConvertHelper/ThrowableInfo.php

Indentation +105 added lines, -105 removed lines

@@ -30,48 +30,48 @@ 
     const SERIALIZED_OPTIONS = 'options';
 
     /**
-    * @var Throwable
-    */
+     * @var Throwable
+     */
     protected $exception;
     
-   /**
-    * @var ConvertHelper_ThrowableInfo_Call[]
-    */
+    /**
+     * @var ConvertHelper_ThrowableInfo_Call[]
+     */
     protected $calls = array();
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $code = 0;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $message;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $callsCount = 0;
     
-   /**
-    * @var ConvertHelper_ThrowableInfo
-    */
+    /**
+     * @var ConvertHelper_ThrowableInfo
+     */
     protected $previous;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $referer = '';
     
-   /**
-    * @var Microtime
-    */
+    /**
+     * @var Microtime
+     */
     protected $date;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $context = self::CONTEXT_WEB;
 
     /**
@@ -125,16 +125,16 @@ 
         return isset($this->previous);
     }
     
-   /**
-    * Retrieves the information on the previous exception.
-    * 
-    * NOTE: Throws an exception if there is no previous 
-    * exception. Use hasPrevious() first to avoid this.
-    * 
-    * @throws ConvertHelper_Exception
-    * @return ConvertHelper_ThrowableInfo
-    * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
-    */
+    /**
+     * Retrieves the information on the previous exception.
+     * 
+     * NOTE: Throws an exception if there is no previous 
+     * exception. Use hasPrevious() first to avoid this.
+     * 
+     * @throws ConvertHelper_Exception
+     * @return ConvertHelper_ThrowableInfo
+     * @see ConvertHelper_ThrowableInfo::ERROR_NO_PREVIOUS_EXCEPTION
+     */
     public function getPrevious() : ConvertHelper_ThrowableInfo
     {
         if(isset($this->previous)) {
@@ -153,9 +153,9 @@ 
         return !empty($this->code);
     }
     
-   /**
-    * Improved text-only exception trace.
-    */
+    /**
+     * Improved text-only exception trace.
+     */
     public function toString() : string
     {
         $calls = $this->getCalls();
@@ -183,73 +183,73 @@ 
         return $string;
     }
     
-   /**
-    * Retrieves the URL of the page in which the exception
-    * was thrown, if applicable: in CLI context, this will
-    * return an empty string.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the URL of the page in which the exception
+     * was thrown, if applicable: in CLI context, this will
+     * return an empty string.
+     * 
+     * @return string
+     */
     public function getReferer() : string
     {
         return $this->referer;
     }
     
-   /**
-    * Whether the exception occurred in a command line context.
-    * @return bool
-    */
+    /**
+     * Whether the exception occurred in a command line context.
+     * @return bool
+     */
     public function isCommandLine() : bool
     {
         return $this->getContext() === self::CONTEXT_COMMAND_LINE;
     }
     
-   /**
-    * Whether the exception occurred during an http request.
-    * @return bool
-    */
+    /**
+     * Whether the exception occurred during an http request.
+     * @return bool
+     */
     public function isWebRequest() : bool
     {
         return $this->getContext() === self::CONTEXT_WEB;
     }
     
-   /**
-    * Retrieves the context identifier, i.e. if the exception
-    * occurred in a command line context or regular web request.
-    * 
-    * @return string
-    * 
-    * @see ConvertHelper_ThrowableInfo::isCommandLine()
-    * @see ConvertHelper_ThrowableInfo::isWebRequest()
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
-    * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
-    */
+    /**
+     * Retrieves the context identifier, i.e. if the exception
+     * occurred in a command line context or regular web request.
+     * 
+     * @return string
+     * 
+     * @see ConvertHelper_ThrowableInfo::isCommandLine()
+     * @see ConvertHelper_ThrowableInfo::isWebRequest()
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_COMMAND_LINE
+     * @see ConvertHelper_ThrowableInfo::CONTEXT_WEB
+     */
     public function getContext() : string
     {
         return $this->context;
     }
     
-   /**
-    * Retrieves the date of the exception, and approximate time:
-    * since exceptions do not store time, this is captured the 
-    * moment the ThrowableInfo is created.
-    * 
-    * @return Microtime
-    */
+    /**
+     * Retrieves the date of the exception, and approximate time:
+     * since exceptions do not store time, this is captured the 
+     * moment the ThrowableInfo is created.
+     * 
+     * @return Microtime
+     */
     public function getDate() : Microtime
     {
         return $this->date;
     }
     
-   /**
-    * Serializes all information on the exception to an
-    * associative array. This can be saved (file, database, 
-    * session...), and later be restored into a throwable
-    * info instance using the fromSerialized() method.
-    * 
-    * @return array<string,mixed>
-    * @see ConvertHelper_ThrowableInfo::fromSerialized()
-    */
+    /**
+     * Serializes all information on the exception to an
+     * associative array. This can be saved (file, database, 
+     * session...), and later be restored into a throwable
+     * info instance using the fromSerialized() method.
+     * 
+     * @return array<string,mixed>
+     * @see ConvertHelper_ThrowableInfo::fromSerialized()
+     */
     public function serialize() : array
     {
         $result = array(
@@ -276,24 +276,24 @@ 
         return $result;
     }
 
-   /**
-    * Sets the maximum folder depth to show in the 
-    * file paths, to avoid them being too long.
-    * 
-    * @param int $depth
-    * @return ConvertHelper_ThrowableInfo
-    */
+    /**
+     * Sets the maximum folder depth to show in the 
+     * file paths, to avoid them being too long.
+     * 
+     * @param int $depth
+     * @return ConvertHelper_ThrowableInfo
+     */
     public function setFolderDepth(int $depth) : ConvertHelper_ThrowableInfo
     {
         return $this->setOption('folder-depth', $depth);
     }
     
-   /**
-    * Retrieves the current folder depth option value.
-    * 
-    * @return int
-    * @see ConvertHelper_ThrowableInfo::setFolderDepth()
-    */
+    /**
+     * Retrieves the current folder depth option value.
+     * 
+     * @return int
+     * @see ConvertHelper_ThrowableInfo::setFolderDepth()
+     */
     public function getFolderDepth() : int
     {
         $depth = $this->getOption('folder-depth');
@@ -304,13 +304,13 @@ 
         return 2;
     }
     
-   /**
-    * Retrieves all function calls that led to the error,
-    * ordered from latest to earliest (the first one in
-    * the stack is actually the last call).
-    *
-    * @return ConvertHelper_ThrowableInfo_Call[]
-    */
+    /**
+     * Retrieves all function calls that led to the error,
+     * ordered from latest to earliest (the first one in
+     * the stack is actually the last call).
+     *
+     * @return ConvertHelper_ThrowableInfo_Call[]
+     */
     public function getCalls()
     {
         return $this->calls;
@@ -326,10 +326,10 @@ 
         return $this->calls[0];
     }
     
-   /**
-    * Returns the amount of function and method calls in the stack trace.
-    * @return int
-    */
+    /**
+     * Returns the amount of function and method calls in the stack trace.
+     * @return int
+     */
     public function countCalls() : int
     {
         return $this->callsCount;

Spacing +23 added lines, -23 removed lines

@@ -79,7 +79,7 @@ 
      */
     protected function __construct($subject)
     {
-        if(is_array($subject))
+        if (is_array($subject))
         {
             $this->parseSerialized($subject);
         }
@@ -137,7 +137,7 @@ 
     */
     public function getPrevious() : ConvertHelper_ThrowableInfo
     {
-        if(isset($this->previous)) {
+        if (isset($this->previous)) {
             return $this->previous;
         }
         
@@ -162,18 +162,18 @@ 
         
         $string = 'Exception';
         
-        if($this->hasCode()) {
+        if ($this->hasCode()) {
             $string .= ' #'.$this->code;
         }
         
         $string .= ': '.$this->getMessage().PHP_EOL;
         
-        foreach($calls as $call) 
+        foreach ($calls as $call) 
         {
             $string .= $call->toString().PHP_EOL;
         }
         
-        if($this->hasPrevious())
+        if ($this->hasPrevious())
         {
             $string .= PHP_EOL.PHP_EOL.
             'Previous error:'.PHP_EOL.PHP_EOL.
@@ -264,11 +264,11 @@ 
             self::SERIALIZED_PREVIOUS => null,
         );
         
-        if($this->hasPrevious()) {
-            $result[self::SERIALIZED_PREVIOUS] =  $this->previous->serialize();
+        if ($this->hasPrevious()) {
+            $result[self::SERIALIZED_PREVIOUS] = $this->previous->serialize();
         }
         
-        foreach($this->calls as $call)
+        foreach ($this->calls as $call)
         {
             $result[self::SERIALIZED_CALLS][] = $call->serialize();
         }
@@ -297,7 +297,7 @@ 
     public function getFolderDepth() : int
     {
         $depth = $this->getOption('folder-depth');
-        if(!empty($depth)) {
+        if (!empty($depth)) {
             return $depth;
         }
         
@@ -353,12 +353,12 @@ 
         
         $this->setOptions($serialized[self::SERIALIZED_OPTIONS]);
         
-        if(!empty($serialized[self::SERIALIZED_PREVIOUS]))
+        if (!empty($serialized[self::SERIALIZED_PREVIOUS]))
         {
             $this->previous = ConvertHelper_ThrowableInfo::fromSerialized($serialized[self::SERIALIZED_PREVIOUS]);
         }
         
-        foreach($serialized[self::SERIALIZED_CALLS] as $def)
+        foreach ($serialized[self::SERIALIZED_CALLS] as $def)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromSerialized($this, $def);
         }
@@ -371,7 +371,7 @@ 
 
         $code = $e->getCode();
 
-        if(is_integer($code))
+        if (is_integer($code))
         {
             $this->code = $code;
         }
@@ -380,16 +380,16 @@ 
             $this->message = 'Original error code: ['.$code.']. ';
         }
 
-        if(!isset($_REQUEST['REQUEST_URI'])) {
+        if (!isset($_REQUEST['REQUEST_URI'])) {
             $this->context = self::CONTEXT_COMMAND_LINE;
         }
         
         $previous = $e->getPrevious();
-        if(!empty($previous)) {
+        if (!empty($previous)) {
             $this->previous = ConvertHelper::throwable2info($previous);
         }
         
-        if(isset($_SERVER['REQUEST_URI'])) {
+        if (isset($_SERVER['REQUEST_URI'])) {
             $this->referer = $_SERVER['REQUEST_URI'];
         }
         
@@ -403,7 +403,7 @@ 
         
         $idx = 1;
         
-        foreach($trace as $entry)
+        foreach ($trace as $entry)
         {
             $this->calls[] = ConvertHelper_ThrowableInfo_Call::fromTrace($this, $idx, $entry);
             
@@ -438,7 +438,7 @@ 
      * @return string
      * @throws ConvertHelper_Exception
      */
-    public function renderErrorMessage(bool $withDeveloperInfo=false) : string
+    public function renderErrorMessage(bool $withDeveloperInfo = false) : string
     {
         $finalCall = $this->getFinalCall();
 
@@ -450,7 +450,7 @@ 
             ->t('Message:')
             ->add($this->getMessage());
 
-        if($withDeveloperInfo)
+        if ($withDeveloperInfo)
         {
             $message
             ->eol()
@@ -458,7 +458,7 @@ 
             ->add($finalCall->toString());
         }
 
-        if($withDeveloperInfo && $this->hasDetails())
+        if ($withDeveloperInfo && $this->hasDetails())
         {
             $message
                 ->t('Developer details:')
@@ -468,7 +468,7 @@ 
 
         $previous = $this->getPrevious();
 
-        if($previous !== null)
+        if ($previous !== null)
         {
             $message
                 ->eol()
@@ -483,7 +483,7 @@ 
 
     public function getDetails() : string
     {
-        if($this->exception instanceof BaseException)
+        if ($this->exception instanceof BaseException)
         {
             return $this->exception->getDetails();
         }
@@ -514,9 +514,9 @@ 
             self::SERIALIZED_CALLS => 'array'
         );
 
-        foreach($keys as $key => $type)
+        foreach ($keys as $key => $type)
         {
-            if(!isset($serialized[$key]) || gettype($serialized[$key]) !== $type)
+            if (!isset($serialized[$key]) || gettype($serialized[$key]) !== $type)
             {
                 throw $this->createTypeException($key, $type);
             }

Braces +2 added lines, -4 removed lines

@@ -82,8 +82,7 @@ 
         if(is_array($subject))
         {
             $this->parseSerialized($subject);
-        }
-        else
+        } else
         {
             $this->parseException($subject);
         }
@@ -374,8 +373,7 @@ 
         if(is_integer($code))
         {
             $this->code = $code;
-        }
-        else
+        } else
         {
             $this->message = 'Original error code: ['.$code.']. ';
         }