spiral / framework

src/Cookies/src/Cookie.php

Spacing +10 added lines, -10 removed lines

@@ -116,7 +116,7 @@ 
         bool $secure = false,
         bool $httpOnly = true,
         ?string $sameSite = null
-    ) {
+    ){
         $this->name = $name;
         $this->value = $value;
         $this->lifetime = $lifetime;
@@ -221,30 +221,30 @@ 
      */
     public function createHeader(): string
     {
-        $header = [rawurlencode($this->name) . '=' . rawurlencode((string)$this->value)];
+        $header = [rawurlencode($this->name).'='.rawurlencode((string)$this->value)];
 
-        if ($this->lifetime !== null) {
-            $header[] = 'Expires=' . gmdate(DateTime::COOKIE, $this->getExpires());
+        if ($this->lifetime !== null){
+            $header[] = 'Expires='.gmdate(DateTime::COOKIE, $this->getExpires());
             $header[] = "Max-Age={$this->lifetime}";
         }
 
-        if (!empty($this->path)) {
+        if (!empty($this->path)){
             $header[] = "Path={$this->path}";
         }
 
-        if (!empty($this->domain)) {
+        if (!empty($this->domain)){
             $header[] = "Domain={$this->domain}";
         }
 
-        if ($this->secure) {
+        if ($this->secure){
             $header[] = 'Secure';
         }
 
-        if ($this->httpOnly) {
+        if ($this->httpOnly){
             $header[] = 'HttpOnly';
         }
 
-        if ($this->sameSite->get() !== null) {
+        if ($this->sameSite->get() !== null){
             $header[] = "SameSite={$this->sameSite->get()}";
         }
 
@@ -258,7 +258,7 @@ 
      */
     public function getExpires(): ?int
     {
-        if ($this->lifetime === null) {
+        if ($this->lifetime === null){
             return null;
         }
 

Braces +14 added lines, -7 removed lines

@@ -223,28 +223,34 @@ 
     {
         $header = [rawurlencode($this->name) . '=' . rawurlencode((string)$this->value)];
 
-        if ($this->lifetime !== null) {
+        if ($this->lifetime !== null)
+        {
             $header[] = 'Expires=' . gmdate(DateTime::COOKIE, $this->getExpires());
             $header[] = "Max-Age={$this->lifetime}";
         }
 
-        if (!empty($this->path)) {
+        if (!empty($this->path))
+        {
             $header[] = "Path={$this->path}";
         }
 
-        if (!empty($this->domain)) {
+        if (!empty($this->domain))
+        {
             $header[] = "Domain={$this->domain}";
         }
 
-        if ($this->secure) {
+        if ($this->secure)
+        {
             $header[] = 'Secure';
         }
 
-        if ($this->httpOnly) {
+        if ($this->httpOnly)
+        {
             $header[] = 'HttpOnly';
         }
 
-        if ($this->sameSite->get() !== null) {
+        if ($this->sameSite->get() !== null)
+        {
             $header[] = "SameSite={$this->sameSite->get()}";
         }
 
@@ -258,7 +264,8 @@ 
      */
     public function getExpires(): ?int
     {
-        if ($this->lifetime === null) {
+        if ($this->lifetime === null)
+        {
             return null;
         }
 

src/Cookies/src/Cookie/SameSite.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public const NONE   = 'None';
 
     private const VALUES  = [self::STRICT, self::LAX, self::NONE];
-    private const DEFAULT = self::LAX;
+    private const default = self::LAX;
 
     private ?string $sameSite = null;
 
@@ -36,6 +36,6 @@ 
             return null;
         }
 
-        return ($sameSite === self::NONE && !$secure) ? self::DEFAULT : $sameSite;
+        return ($sameSite === self::NONE && !$secure) ? self::default : $sameSite;
     }
 }

src/Session/src/Handler/FileHandler.php

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
     #[ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename){
+            if ($this->files->time($filename) < time() - $maxlifetime){
                 $this->files->delete($filename);
             }
         }

Braces +4 added lines, -2 removed lines

@@ -57,8 +57,10 @@
     #[ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename)
+        {
+            if ($this->files->time($filename) < time() - $maxlifetime)
+            {
                 $this->files->delete($filename);
             }
         }

src/Session/src/Session.php

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
         $this->clientSignature = $clientSignature;
         $this->lifetime = $lifetime;
 
-        if (!empty($id) && $this->validID($id)) {
+        if (!empty($id) && $this->validID($id)){
             $this->id = $id;
         }
     }
@@ -92,24 +92,24 @@ 
      */
     public function resume(): void
     {
-        if ($this->isStarted()) {
+        if ($this->isStarted()){
             return;
         }
 
-        if (!empty($this->id)) {
+        if (!empty($this->id)){
             session_id($this->id);
-        } else {
+        }else{
             // always new id
             session_id(session_create_id());
         }
 
-        try {
+        try{
             session_start(['use_cookies' => false]);
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new SessionException('Unable to start session', $e->getCode(), $e);
         }
 
-        if (empty($this->id)) {
+        if (empty($this->id)){
             //Sign newly created session
             $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature;
             $_SESSION[self::SESSION_CREATED] = time();
@@ -120,7 +120,7 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession()){
             $this->invalidateSession();
         }
     }
@@ -159,7 +159,7 @@ 
      */
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -174,7 +174,7 @@ 
      */
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -215,17 +215,17 @@ 
         if (
             !array_key_exists(self::CLIENT_SIGNATURE, $_SESSION)
             || !array_key_exists(self::SESSION_CREATED, $_SESSION)
-        ) {
+        ){
             //Missing session signature or timestamp!
             return false;
         }
 
-        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) {
+        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime){
             //Session expired
             return false;
         }
 
-        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) {
+        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)){
             //Signatures do not match
             return false;
         }

Braces +26 added lines, -12 removed lines

@@ -61,7 +61,8 @@ 
         $this->clientSignature = $clientSignature;
         $this->lifetime = $lifetime;
 
-        if (!empty($id) && $this->validID($id)) {
+        if (!empty($id) && $this->validID($id))
+        {
             $this->id = $id;
         }
     }
@@ -92,24 +93,32 @@ 
      */
     public function resume(): void
     {
-        if ($this->isStarted()) {
+        if ($this->isStarted())
+        {
             return;
         }
 
-        if (!empty($this->id)) {
+        if (!empty($this->id))
+        {
             session_id($this->id);
-        } else {
+        }
+        else
+        {
             // always new id
             session_id(session_create_id());
         }
 
-        try {
+        try
+        {
             session_start(['use_cookies' => false]);
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new SessionException('Unable to start session', $e->getCode(), $e);
         }
 
-        if (empty($this->id)) {
+        if (empty($this->id))
+        {
             //Sign newly created session
             $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature;
             $_SESSION[self::SESSION_CREATED] = time();
@@ -120,7 +129,8 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession())
+        {
             $this->invalidateSession();
         }
     }
@@ -159,7 +169,8 @@ 
      */
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -174,7 +185,8 @@ 
      */
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -220,12 +232,14 @@ 
             return false;
         }
 
-        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) {
+        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime)
+        {
             //Session expired
             return false;
         }
 
-        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) {
+        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature))
+        {
             //Signatures do not match
             return false;
         }

src/Session/src/SessionFactory.php

Spacing +4 added lines, -4 removed lines

@@ -36,15 +36,15 @@
 
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if (session_status() === PHP_SESSION_ACTIVE) {
+        if (session_status() === PHP_SESSION_ACTIVE){
             throw new MultipleSessionException('Unable to initiate session, session already started');
         }
 
         // Initiating proper session handler
-        if ($this->config->getHandler() !== null) {
-            try {
+        if ($this->config->getHandler() !== null){
+            try{
                 $handler = $this->config->getHandler()->resolve($this->factory);
-            } catch (Throwable | ContainerExceptionInterface $e) {
+            }catch (Throwable | ContainerExceptionInterface $e){
                 throw new SessionException($e->getMessage(), $e->getCode(), $e);
             }
 

Braces +9 added lines, -4 removed lines

@@ -36,15 +36,20 @@
 
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if (session_status() === PHP_SESSION_ACTIVE) {
+        if (session_status() === PHP_SESSION_ACTIVE)
+        {
             throw new MultipleSessionException('Unable to initiate session, session already started');
         }
 
         // Initiating proper session handler
-        if ($this->config->getHandler() !== null) {
-            try {
+        if ($this->config->getHandler() !== null)
+        {
+            try
+            {
                 $handler = $this->config->getHandler()->resolve($this->factory);
-            } catch (Throwable | ContainerExceptionInterface $e) {
+            }
+            catch (Throwable | ContainerExceptionInterface $e)
+            {
                 throw new SessionException($e->getMessage(), $e->getCode(), $e);
             }
 

src/Dumper/src/System.php

Spacing +6 added lines, -6 removed lines

@@ -25,12 +25,12 @@ 
      */
     public static function isCLI(): bool
     {
-        if (!empty(getenv('RR'))) {
+        if (!empty(getenv('RR'))){
             // Do not treat RoadRunner as CLI.
             return false;
         }
 
-        if (php_sapi_name() === 'cli') {
+        if (php_sapi_name() === 'cli'){
             return true;
         }
 
@@ -46,12 +46,12 @@ 
      */
     public static function isColorsSupported($stream = STDOUT): bool
     {
-        if ('Hyper' === getenv('TERM_PROGRAM')) {
+        if ('Hyper' === getenv('TERM_PROGRAM')){
             return true;
         }
 
-        try {
-            if (\DIRECTORY_SEPARATOR === '\\') {
+        try{
+            if (\DIRECTORY_SEPARATOR === '\\'){
                 return (
                         function_exists('sapi_windows_vt100_support')
                         && @sapi_windows_vt100_support($stream)
@@ -61,7 +61,7 @@ 
             }
 
             return @stream_isatty($stream);
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             return false;
         }
     }

Braces +13 added lines, -6 removed lines

@@ -25,12 +25,14 @@ 
      */
     public static function isCLI(): bool
     {
-        if (!empty(getenv('RR'))) {
+        if (!empty(getenv('RR')))
+        {
             // Do not treat RoadRunner as CLI.
             return false;
         }
 
-        if (php_sapi_name() === 'cli') {
+        if (php_sapi_name() === 'cli')
+        {
             return true;
         }
 
@@ -46,12 +48,15 @@ 
      */
     public static function isColorsSupported($stream = STDOUT): bool
     {
-        if ('Hyper' === getenv('TERM_PROGRAM')) {
+        if ('Hyper' === getenv('TERM_PROGRAM'))
+        {
             return true;
         }
 
-        try {
-            if (\DIRECTORY_SEPARATOR === '\\') {
+        try
+        {
+            if (\DIRECTORY_SEPARATOR === '\\')
+            {
                 return (
                         function_exists('sapi_windows_vt100_support')
                         && @sapi_windows_vt100_support($stream)
@@ -61,7 +66,9 @@ 
             }
 
             return @stream_isatty($stream);
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             return false;
         }
     }

src/Dumper/src/Dumper.php

Spacing +57 added lines, -57 removed lines

@@ -62,7 +62,7 @@ 
 
     public function __construct(LoggerInterface $logger = null)
     {
-        if ($logger !== null) {
+        if ($logger !== null){
             $this->setLogger($logger);
         }
     }
@@ -88,7 +88,7 @@ 
         $r = $this->getRenderer($target);
         $dump = $r->wrapContent($this->renderValue($r, $value));
 
-        switch ($target) {
+        switch ($target){
             case self::OUTPUT:
                 echo $dump;
                 break;
@@ -98,10 +98,10 @@ 
                 return $dump;
 
             case self::LOGGER:
-                if ($this->logger === null) {
+                if ($this->logger === null){
                     throw new DumperException('Unable to dump value to log, no associated LoggerInterface.');
                 }
-                $this->logger->debug((string) $dump);
+                $this->logger->debug((string)$dump);
                 break;
 
             case self::ERROR_LOG:
@@ -119,7 +119,7 @@ 
      */
     public function setRenderer(int $target, RendererInterface $renderer): Dumper
     {
-        if (!isset($this->targets[$target])) {
+        if (!isset($this->targets[$target])){
             throw new DumperException(sprintf('Undefined dump target %d', $target));
         }
 
@@ -136,19 +136,19 @@ 
      */
     private function getRenderer(int $target): RendererInterface
     {
-        if ($target == self::OUTPUT && System::isCLI()) {
-            if (System::isColorsSupported(STDOUT)) {
+        if ($target == self::OUTPUT && System::isCLI()){
+            if (System::isColorsSupported(STDOUT)){
                 $target = self::OUTPUT_CLI_COLORS;
-            } else {
+            }else{
                 $target = self::OUTPUT_CLI;
             }
         }
 
-        if (!isset($this->targets[$target])) {
+        if (!isset($this->targets[$target])){
             throw new DumperException(sprintf('Undefined dump target %d', $target));
         }
 
-        if (is_string($this->targets[$target])) {
+        if (is_string($this->targets[$target])){
             $this->targets[$target] = new $this->targets[$target]();
         }
 
@@ -171,32 +171,32 @@ 
         int $level = 0,
         bool $hideHeader = false
     ): string {
-        if (!$hideHeader && !empty($name)) {
-            $header = $r->indent($level) . $r->apply($name, 'name') . $r->apply(' = ', 'syntax', '=');
-        } else {
+        if (!$hideHeader && !empty($name)){
+            $header = $r->indent($level).$r->apply($name, 'name').$r->apply(' = ', 'syntax', '=');
+        }else{
             $header = $r->indent($level);
         }
 
-        if ($level > $this->maxLevel) {
+        if ($level > $this->maxLevel){
             //Renderer is not reference based, we can't dump too deep values
-            return $r->indent($level) . $r->apply('-too deep-', 'maxLevel') . "\n";
+            return $r->indent($level).$r->apply('-too deep-', 'maxLevel')."\n";
         }
 
         $type = strtolower(gettype($value));
 
-        if ($type === 'array') {
-            return $header . $this->renderArray($r, $value, $level, $hideHeader);
+        if ($type === 'array'){
+            return $header.$this->renderArray($r, $value, $level, $hideHeader);
         }
 
-        if ($type === 'object') {
-            return $header . $this->renderObject($r, $value, $level, $hideHeader);
+        if ($type === 'object'){
+            return $header.$this->renderObject($r, $value, $level, $hideHeader);
         }
 
-        if ($type === 'resource') {
+        if ($type === 'resource'){
             //No need to dump resource value
-            $element = get_resource_type($value) . ' resource ';
+            $element = get_resource_type($value).' resource ';
 
-            return $header . $r->apply($element, 'type', 'resource') . "\n";
+            return $header.$r->apply($element, 'type', 'resource')."\n";
         }
 
         //Value length
@@ -206,7 +206,7 @@ 
         $header .= $r->apply("{$type}({$length})", 'type', $type);
 
         $element = null;
-        switch ($type) {
+        switch ($type){
             case 'string':
                 $element = $r->escapeStrings() ? htmlspecialchars($value) : $value;
                 break;
@@ -216,31 +216,31 @@ 
                 break;
 
             default:
-                if ($value !== null) {
+                if ($value !== null){
                     //Not showing null value, type is enough
                     $element = var_export($value, true);
                 }
         }
 
         //Including value
-        return $header . ' ' . $r->apply($element, 'value', $type) . "\n";
+        return $header.' '.$r->apply($element, 'value', $type)."\n";
     }
 
     private function renderArray(RendererInterface $r, array $array, int $level, bool $hideHeader = false): string
     {
-        if (!$hideHeader) {
+        if (!$hideHeader){
             $count = count($array);
 
             //Array size and scope
-            $output = $r->apply("array({$count})", 'type', 'array') . "\n";
-            $output .= $r->indent($level) . $r->apply('[', 'syntax', '[') . "\n";
-        } else {
+            $output = $r->apply("array({$count})", 'type', 'array')."\n";
+            $output .= $r->indent($level).$r->apply('[', 'syntax', '[')."\n";
+        }else{
             $output = '';
         }
 
-        foreach ($array as $key => $value) {
-            if (!is_numeric($key)) {
-                if (is_string($key) && $r->escapeStrings()) {
+        foreach ($array as $key => $value){
+            if (!is_numeric($key)){
+                if (is_string($key) && $r->escapeStrings()){
                     $key = htmlspecialchars($key);
                 }
 
@@ -250,9 +250,9 @@ 
             $output .= $this->renderValue($r, $value, "[{$key}]", $level + 1);
         }
 
-        if (!$hideHeader) {
+        if (!$hideHeader){
             //Closing array scope
-            $output .= $r->indent($level) . $r->apply(']', 'syntax', ']') . "\n";
+            $output .= $r->indent($level).$r->apply(']', 'syntax', ']')."\n";
         }
 
         return $output;
@@ -269,47 +269,47 @@ 
         bool $hideHeader = false,
         string $class = ''
     ): string {
-        if (!$hideHeader) {
-            $type = ($class ?: get_class($value)) . ' object ';
+        if (!$hideHeader){
+            $type = ($class ?: get_class($value)).' object ';
 
-            $header = $r->apply($type, 'type', 'object') . "\n";
-            $header .= $r->indent($level) . $r->apply('(', 'syntax', '(') . "\n";
-        } else {
+            $header = $r->apply($type, 'type', 'object')."\n";
+            $header .= $r->indent($level).$r->apply('(', 'syntax', '(')."\n";
+        }else{
             $header = '';
         }
 
         //Let's use method specifically created for dumping
-        if (method_exists($value, '__debugInfo') || $value instanceof Closure) {
-            if ($value instanceof Closure) {
+        if (method_exists($value, '__debugInfo') || $value instanceof Closure){
+            if ($value instanceof Closure){
                 $debugInfo = $this->describeClosure($value);
-            } else {
+            }else{
                 $debugInfo = $value->__debugInfo();
             }
 
-            if (is_array($debugInfo)) {
+            if (is_array($debugInfo)){
                 //Pretty view
                 $debugInfo = (object)$debugInfo;
             }
 
-            if (is_object($debugInfo)) {
+            if (is_object($debugInfo)){
                 //We are not including syntax elements here
                 return $this->renderObject($r, $debugInfo, $level, false, get_class($value));
             }
 
             return $header
                 . $this->renderValue($r, $debugInfo, '', $level + (is_scalar($value)), true)
-                . $r->indent($level) . $r->apply(')', 'syntax', ')') . "\n";
+                . $r->indent($level).$r->apply(')', 'syntax', ')')."\n";
         }
 
         $refection = new ReflectionObject($value);
 
         $output = '';
-        foreach ($refection->getProperties() as $property) {
+        foreach ($refection->getProperties() as $property){
             $output .= $this->renderProperty($r, $value, $property, $level);
         }
 
         //Header, content, footer
-        return $header . $output . $r->indent($level) . $r->apply(')', 'syntax', ')') . "\n";
+        return $header.$output.$r->indent($level).$r->apply(')', 'syntax', ')')."\n";
     }
 
     /**
@@ -318,7 +318,7 @@ 
      */
     private function renderProperty(RendererInterface $r, $value, ReflectionProperty $p, int $level): string
     {
-        if ($p->isStatic()) {
+        if ($p->isStatic()){
             return '';
         }
 
@@ -326,7 +326,7 @@ 
             !($value instanceof stdClass)
             && is_string($p->getDocComment())
             && strpos($p->getDocComment(), '@internal') !== false
-        ) {
+        ){
             // Memory loop while reading doc comment for stdClass variables?
             // Report a PHP bug about treating comment INSIDE property declaration as doc comment.
             return '';
@@ -338,11 +338,11 @@ 
         //To read private and protected properties
         $p->setAccessible(true);
 
-        if ($value instanceof stdClass) {
+        if ($value instanceof stdClass){
             $name = $r->apply($p->getName(), 'dynamic');
-        } else {
+        }else{
             //Property name includes access level
-            $name = $p->getName() . $r->apply(':' . $access, 'access', $access);
+            $name = $p->getName().$r->apply(':'.$access, 'access', $access);
         }
 
         return $this->renderValue($r, $p->getValue($value), $name, $level + 1);
@@ -353,14 +353,14 @@ 
      */
     private function describeClosure(Closure $closure): array
     {
-        try {
+        try{
             $r = new ReflectionFunction($closure);
-        } catch (ReflectionException $e) {
+        }catch (ReflectionException $e){
             return ['closure' => 'unable to resolve'];
         }
 
         return [
-            'name' => $r->getName() . " (lines {$r->getStartLine()}:{$r->getEndLine()})",
+            'name' => $r->getName()." (lines {$r->getStartLine()}:{$r->getEndLine()})",
             'file' => $r->getFileName(),
             'this' => $r->getClosureThis(),
         ];
@@ -373,9 +373,9 @@ 
      */
     private function getAccess(ReflectionProperty $p): string
     {
-        if ($p->isPrivate()) {
+        if ($p->isPrivate()){
             return 'private';
-        } elseif ($p->isProtected()) {
+        } elseif ($p->isProtected()){
             return 'protected';
         }
 

Braces +84 added lines, -38 removed lines

@@ -62,7 +62,8 @@ 
 
     public function __construct(LoggerInterface $logger = null)
     {
-        if ($logger !== null) {
+        if ($logger !== null)
+        {
             $this->setLogger($logger);
         }
     }
@@ -88,7 +89,8 @@ 
         $r = $this->getRenderer($target);
         $dump = $r->wrapContent($this->renderValue($r, $value));
 
-        switch ($target) {
+        switch ($target)
+        {
             case self::OUTPUT:
                 echo $dump;
                 break;
@@ -98,7 +100,8 @@ 
                 return $dump;
 
             case self::LOGGER:
-                if ($this->logger === null) {
+                if ($this->logger === null)
+                {
                     throw new DumperException('Unable to dump value to log, no associated LoggerInterface.');
                 }
                 $this->logger->debug((string) $dump);
@@ -119,7 +122,8 @@ 
      */
     public function setRenderer(int $target, RendererInterface $renderer): Dumper
     {
-        if (!isset($this->targets[$target])) {
+        if (!isset($this->targets[$target]))
+        {
             throw new DumperException(sprintf('Undefined dump target %d', $target));
         }
 
@@ -136,19 +140,25 @@ 
      */
     private function getRenderer(int $target): RendererInterface
     {
-        if ($target == self::OUTPUT && System::isCLI()) {
-            if (System::isColorsSupported(STDOUT)) {
+        if ($target == self::OUTPUT && System::isCLI())
+        {
+            if (System::isColorsSupported(STDOUT))
+            {
                 $target = self::OUTPUT_CLI_COLORS;
-            } else {
+            }
+            else
+            {
                 $target = self::OUTPUT_CLI;
             }
         }
 
-        if (!isset($this->targets[$target])) {
+        if (!isset($this->targets[$target]))
+        {
             throw new DumperException(sprintf('Undefined dump target %d', $target));
         }
 
-        if (is_string($this->targets[$target])) {
+        if (is_string($this->targets[$target]))
+        {
             $this->targets[$target] = new $this->targets[$target]();
         }
 
@@ -171,28 +181,35 @@ 
         int $level = 0,
         bool $hideHeader = false
     ): string {
-        if (!$hideHeader && !empty($name)) {
+        if (!$hideHeader && !empty($name))
+        {
             $header = $r->indent($level) . $r->apply($name, 'name') . $r->apply(' = ', 'syntax', '=');
-        } else {
+        }
+        else
+        {
             $header = $r->indent($level);
         }
 
-        if ($level > $this->maxLevel) {
+        if ($level > $this->maxLevel)
+        {
             //Renderer is not reference based, we can't dump too deep values
             return $r->indent($level) . $r->apply('-too deep-', 'maxLevel') . "\n";
         }
 
         $type = strtolower(gettype($value));
 
-        if ($type === 'array') {
+        if ($type === 'array')
+        {
             return $header . $this->renderArray($r, $value, $level, $hideHeader);
         }
 
-        if ($type === 'object') {
+        if ($type === 'object')
+        {
             return $header . $this->renderObject($r, $value, $level, $hideHeader);
         }
 
-        if ($type === 'resource') {
+        if ($type === 'resource')
+        {
             //No need to dump resource value
             $element = get_resource_type($value) . ' resource ';
 
@@ -206,7 +223,8 @@ 
         $header .= $r->apply("{$type}({$length})", 'type', $type);
 
         $element = null;
-        switch ($type) {
+        switch ($type)
+        {
             case 'string':
                 $element = $r->escapeStrings() ? htmlspecialchars($value) : $value;
                 break;
@@ -216,7 +234,8 @@ 
                 break;
 
             default:
-                if ($value !== null) {
+                if ($value !== null)
+                {
                     //Not showing null value, type is enough
                     $element = var_export($value, true);
                 }
@@ -228,19 +247,25 @@ 
 
     private function renderArray(RendererInterface $r, array $array, int $level, bool $hideHeader = false): string
     {
-        if (!$hideHeader) {
+        if (!$hideHeader)
+        {
             $count = count($array);
 
             //Array size and scope
             $output = $r->apply("array({$count})", 'type', 'array') . "\n";
             $output .= $r->indent($level) . $r->apply('[', 'syntax', '[') . "\n";
-        } else {
+        }
+        else
+        {
             $output = '';
         }
 
-        foreach ($array as $key => $value) {
-            if (!is_numeric($key)) {
-                if (is_string($key) && $r->escapeStrings()) {
+        foreach ($array as $key => $value)
+        {
+            if (!is_numeric($key))
+            {
+                if (is_string($key) && $r->escapeStrings())
+                {
                     $key = htmlspecialchars($key);
                 }
 
@@ -250,7 +275,8 @@ 
             $output .= $this->renderValue($r, $value, "[{$key}]", $level + 1);
         }
 
-        if (!$hideHeader) {
+        if (!$hideHeader)
+        {
             //Closing array scope
             $output .= $r->indent($level) . $r->apply(']', 'syntax', ']') . "\n";
         }
@@ -269,29 +295,38 @@ 
         bool $hideHeader = false,
         string $class = ''
     ): string {
-        if (!$hideHeader) {
+        if (!$hideHeader)
+        {
             $type = ($class ?: get_class($value)) . ' object ';
 
             $header = $r->apply($type, 'type', 'object') . "\n";
             $header .= $r->indent($level) . $r->apply('(', 'syntax', '(') . "\n";
-        } else {
+        }
+        else
+        {
             $header = '';
         }
 
         //Let's use method specifically created for dumping
-        if (method_exists($value, '__debugInfo') || $value instanceof Closure) {
-            if ($value instanceof Closure) {
+        if (method_exists($value, '__debugInfo') || $value instanceof Closure)
+        {
+            if ($value instanceof Closure)
+            {
                 $debugInfo = $this->describeClosure($value);
-            } else {
+            }
+            else
+            {
                 $debugInfo = $value->__debugInfo();
             }
 
-            if (is_array($debugInfo)) {
+            if (is_array($debugInfo))
+            {
                 //Pretty view
                 $debugInfo = (object)$debugInfo;
             }
 
-            if (is_object($debugInfo)) {
+            if (is_object($debugInfo))
+            {
                 //We are not including syntax elements here
                 return $this->renderObject($r, $debugInfo, $level, false, get_class($value));
             }
@@ -304,7 +339,8 @@ 
         $refection = new ReflectionObject($value);
 
         $output = '';
-        foreach ($refection->getProperties() as $property) {
+        foreach ($refection->getProperties() as $property)
+        {
             $output .= $this->renderProperty($r, $value, $property, $level);
         }
 
@@ -318,7 +354,8 @@ 
      */
     private function renderProperty(RendererInterface $r, $value, ReflectionProperty $p, int $level): string
     {
-        if ($p->isStatic()) {
+        if ($p->isStatic())
+        {
             return '';
         }
 
@@ -338,9 +375,12 @@ 
         //To read private and protected properties
         $p->setAccessible(true);
 
-        if ($value instanceof stdClass) {
+        if ($value instanceof stdClass)
+        {
             $name = $r->apply($p->getName(), 'dynamic');
-        } else {
+        }
+        else
+        {
             //Property name includes access level
             $name = $p->getName() . $r->apply(':' . $access, 'access', $access);
         }
@@ -353,9 +393,12 @@ 
      */
     private function describeClosure(Closure $closure): array
     {
-        try {
+        try
+        {
             $r = new ReflectionFunction($closure);
-        } catch (ReflectionException $e) {
+        }
+        catch (ReflectionException $e)
+        {
             return ['closure' => 'unable to resolve'];
         }
 
@@ -373,9 +416,12 @@ 
      */
     private function getAccess(ReflectionProperty $p): string
     {
-        if ($p->isPrivate()) {
+        if ($p->isPrivate())
+        {
             return 'private';
-        } elseif ($p->isProtected()) {
+        }
+        elseif ($p->isProtected())
+        {
             return 'protected';
         }
 

src/Dumper/src/helpers.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 use Spiral\Core\ContainerScope;
 use Spiral\Debug\Dumper;
 
-if (!function_exists('dump')) {
+if (!function_exists('dump')){
     /**
      * Dump value.
      *
@@ -23,12 +23,12 @@ 
      */
     function dump($value, int $output = Dumper::OUTPUT): ?string
     {
-        if (!class_exists(ContainerScope::class)) {
+        if (!class_exists(ContainerScope::class)){
             return (new Dumper())->dump($value, $output);
         }
 
         $container = ContainerScope::getContainer();
-        if (is_null($container) || !$container->has(Dumper::class)) {
+        if (is_null($container) || !$container->has(Dumper::class)){
             $dumper = new Dumper();
 
             return $dumper->dump($value, $output);

Braces +6 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
 use Spiral\Core\ContainerScope;
 use Spiral\Debug\Dumper;
 
-if (!function_exists('dump')) {
+if (!function_exists('dump'))
+{
     /**
      * Dump value.
      *
@@ -23,12 +24,14 @@ 
      */
     function dump($value, int $output = Dumper::OUTPUT): ?string
     {
-        if (!class_exists(ContainerScope::class)) {
+        if (!class_exists(ContainerScope::class))
+        {
             return (new Dumper())->dump($value, $output);
         }
 
         $container = ContainerScope::getContainer();
-        if (is_null($container) || !$container->has(Dumper::class)) {
+        if (is_null($container) || !$container->has(Dumper::class))
+        {
             $dumper = new Dumper();
 
             return $dumper->dump($value, $output);

src/Dumper/src/Renderer/HtmlRenderer.php

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
     /**
      * Default coloring schema.
      */
-    public const DEFAULT = [
+    public const default = [
         'body'     => '<pre style="background-color: white; font-family: monospace;">%s</pre>',
         'element'  => '<span style="%s;">%s</span>',
         'indent'   => '&middot;    ',
@@ -99,9 +99,9 @@ 
     /**
      * Set of styles associated with different dumping properties.
      */
-    protected array $style = self::DEFAULT;
+    protected array $style = self::default;
 
-    public function __construct(array $style = self::DEFAULT)
+    public function __construct(array $style = self::default)
     {
         $this->style = $style;
     }