spiral / framework

src/Dumper/src/Dumper.php

Spacing +57 added lines, -57 removed lines

@@ -57,7 +57,7 @@ 
 
     public function __construct(LoggerInterface $logger = null)
     {
-        if ($logger !== null) {
+        if ($logger !== null){
             $this->setLogger($logger);
         }
     }
@@ -83,7 +83,7 @@ 
         $r = $this->getRenderer($target);
         $dump = $r->wrapContent($this->renderValue($r, $value));
 
-        switch ($target) {
+        switch ($target){
             case self::OUTPUT:
                 echo $dump;
                 break;
@@ -93,10 +93,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:
@@ -114,7 +114,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));
         }
 
@@ -131,19 +131,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]();
         }
 
@@ -166,32 +166,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
@@ -201,7 +201,7 @@ 
         $header .= $r->apply("{$type}({$length})", 'type', $type);
 
         $element = null;
-        switch ($type) {
+        switch ($type){
             case 'string':
                 $element = $r->escapeStrings() ? htmlspecialchars($value) : $value;
                 break;
@@ -211,31 +211,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);
                 }
 
@@ -245,9 +245,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;
@@ -264,47 +264,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";
     }
 
     /**
@@ -313,7 +313,7 @@ 
      */
     private function renderProperty(RendererInterface $r, $value, \ReflectionProperty $p, int $level): string
     {
-        if ($p->isStatic()) {
+        if ($p->isStatic()){
             return '';
         }
 
@@ -321,7 +321,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 '';
@@ -333,11 +333,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);
@@ -348,14 +348,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(),
         ];
@@ -368,9 +368,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

@@ -57,7 +57,8 @@ 
 
     public function __construct(LoggerInterface $logger = null)
     {
-        if ($logger !== null) {
+        if ($logger !== null)
+        {
             $this->setLogger($logger);
         }
     }
@@ -83,7 +84,8 @@ 
         $r = $this->getRenderer($target);
         $dump = $r->wrapContent($this->renderValue($r, $value));
 
-        switch ($target) {
+        switch ($target)
+        {
             case self::OUTPUT:
                 echo $dump;
                 break;
@@ -93,7 +95,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);
@@ -114,7 +117,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));
         }
 
@@ -131,19 +135,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]();
         }
 
@@ -166,28 +176,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 ';
 
@@ -201,7 +218,8 @@ 
         $header .= $r->apply("{$type}({$length})", 'type', $type);
 
         $element = null;
-        switch ($type) {
+        switch ($type)
+        {
             case 'string':
                 $element = $r->escapeStrings() ? htmlspecialchars($value) : $value;
                 break;
@@ -211,7 +229,8 @@ 
                 break;
 
             default:
-                if ($value !== null) {
+                if ($value !== null)
+                {
                     //Not showing null value, type is enough
                     $element = var_export($value, true);
                 }
@@ -223,19 +242,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);
                 }
 
@@ -245,7 +270,8 @@ 
             $output .= $this->renderValue($r, $value, "[{$key}]", $level + 1);
         }
 
-        if (!$hideHeader) {
+        if (!$hideHeader)
+        {
             //Closing array scope
             $output .= $r->indent($level) . $r->apply(']', 'syntax', ']') . "\n";
         }
@@ -264,29 +290,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));
             }
@@ -299,7 +334,8 @@ 
         $refection = new \ReflectionObject($value);
 
         $output = '';
-        foreach ($refection->getProperties() as $property) {
+        foreach ($refection->getProperties() as $property)
+        {
             $output .= $this->renderProperty($r, $value, $property, $level);
         }
 
@@ -313,7 +349,8 @@ 
      */
     private function renderProperty(RendererInterface $r, $value, \ReflectionProperty $p, int $level): string
     {
-        if ($p->isStatic()) {
+        if ($p->isStatic())
+        {
             return '';
         }
 
@@ -333,9 +370,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);
         }
@@ -348,9 +388,12 @@ 
      */
     private function describeClosure(\Closure $closure): array
     {
-        try {
+        try
+        {
             $r = new \ReflectionFunction($closure);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return ['closure' => 'unable to resolve'];
         }
 
@@ -368,9 +411,12 @@ 
      */
     private function getAccess(\ReflectionProperty $p): string
     {
-        if ($p->isPrivate()) {
+        if ($p->isPrivate())
+        {
             return 'private';
-        } elseif ($p->isProtected()) {
+        }
+        elseif ($p->isProtected())
+        {
             return 'protected';
         }