Minor fixes

Author: raveren

.github/img/simple-mode.png

@@ -1,17 +1,9 @@
 {
   "name": "php-sage/sage",
   "description": "☯ Insightful PHP debugging assistant.",
-  "keywords": [
-    "sage",
-    "php",
-    "debug",
-    "dump",
-    "var_dup",
-    "debug_backtrace",
-    "json_decode"
-  ],
+  "keywords": ["sage", "php", "dumper", "debug", "dump", "var_dup", "debug_backtrace", "json_decode"],
   "type": "library",
-  "homepage": "https://github.com/phpsage/sage",
+  "homepage": "https://github.com/php-sage/sage",
   "license": "MIT",
   "authors": [
     {
@@ -20,7 +12,7 @@
     },
     {
       "name": "Contributors",
-      "homepage": "https://github.com/phpsage/sage/contributors"
+      "homepage": "https://github.com/php-sage/sage/contributors"
     }
   ],
   "require": {

composer.json

@@ -102,7 +102,7 @@ public static function decorateTrace($traceData)
 
             if (! empty($step['object'])) {
                 $output .= self::_colorize(
-                    '    ' . self::_char('─', 27) . ' Callee object ' . self::_char('─', 34),
+                    '    ' . str_repeat('─', 27) . ' Callee object ' . str_repeat('─', 34),
                     'title'
                 );
 
@@ -120,7 +120,7 @@ public static function decorateTrace($traceData)
             }
 
             if ($stepNo !== $lastStep) {
-                $output .= self::_colorize(self::_char('─', 80), 'title');
+                $output .= self::_colorize(str_repeat('─', 80), 'title');
             }
         }
 
@@ -175,45 +175,29 @@ private static function _colorize($text, $type, $nlAfter = true)
         }
     }
 
-    private static function _char($char, $repeat = null)
-    {
-        return $repeat ? str_repeat($char, $repeat) : $char;
-    }
-
     private static function _title($text)
     {
         $escaped          = SageHelper::decodeStr($text);
         $lengthDifference = strlen($escaped) - strlen($text);
 
         return
-            self::_colorize(
-                self::_char('┌') . self::_char('─', 78) . self::_char('┐') . PHP_EOL
-                . self::_char('│'),
-                'title',
-                false
-            )
-
+            self::_colorize('┌' . str_repeat('─', 78) . '┐' . PHP_EOL . '│', 'title', false)
             . self::_colorize(str_pad($escaped, 78 + $lengthDifference, ' ', STR_PAD_BOTH), 'title', false)
-
-            . self::_colorize(
-                self::_char('│') . PHP_EOL
-                . self::_char('└') . self::_char('─', 78) . self::_char('┘'),
-                'title'
-            );
+            . self::_colorize('│' . PHP_EOL . '└' . str_repeat('─', 78) . '┘', 'title');
     }
 
     public static function wrapStart()
     {
         if (Sage::enabled() === Sage::MODE_PLAIN) {
-            return '<pre class="-_sage">';
+            return '<pre class="_sage">';
         }
 
         return '';
     }
 
     public static function wrapEnd($callee, $miniTrace, $prevCaller)
     {
-        $lastLine = self::_colorize(self::_char("═", 80), 'title');
+        $lastLine = self::_colorize(str_repeat('═', 80), 'title');
         $lastChar = Sage::enabled() === Sage::MODE_PLAIN ? '</pre>' : '';
 
         if (! Sage::$displayCalledFrom) {
@@ -251,11 +235,7 @@ private static function _drawHeader(SageVariableData $varData)
         }
 
         if ($varData->value !== null && $varData->value !== '') {
-            $output .= ' ' . self::_colorize(
-                    $varData->value, // escape shell
-                    'value',
-                    false
-                );
+            $output .= ' ' . self::_colorize($varData->value, 'value', false);
         }
 
         return ltrim($output);
@@ -280,7 +260,7 @@ function_exists('sapi_windows_vt100_support')
         }
 
         return Sage::enabled() === Sage::MODE_PLAIN
-            ? '<style>.-_sage i{color:#d00;font-style:normal}.-_sage u{color:#030;text-decoration:none;font-weight:bold}</style>'
+            ? '<style>._sage i{color:#d00;font-style:normal}._sage u{color:#030;text-decoration:none;font-weight:bold}</style>'
             : '';
     }
 }

decorators/SageDecoratorsPlain.php

@@ -270,8 +270,8 @@ public static function init()
         }
 
         return
-            '<script class="-_sage-js">' . file_get_contents($baseDir . 'sage.js') . '</script>'
-            . '<style class="-_sage-css">' . file_get_contents($cssFile) . "</style>\n";
+            '<script class="_sage-js">' . file_get_contents($baseDir . 'sage.js') . '</script>'
+            . '<style class="_sage-css">' . file_get_contents($cssFile) . "</style>\n";
     }
 
     private static function decorateAlternativeView($alternative)

decorators/SageDecoratorsRich.php

@@ -2,6 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         cacheResult="false"
          colors="true"
 >
     <testsuites>

phpunit.xml

@@ -157,8 +157,8 @@ if (typeof _sageInitialized === 'undefined') {
                     + _sage.tag('head')
                     + '<title>Sage ☯ (' + new Date().toISOString() + ')</title>'
                     + _sage.tag('meta charset="utf-8"')
-                    + document.getElementsByClassName('-_sage-js')[0].outerHTML
-                    + document.getElementsByClassName('-_sage-css')[0].outerHTML
+                    + document.getElementsByClassName('_sage-js')[0].outerHTML
+                    + document.getElementsByClassName('_sage-css')[0].outerHTML
                     + _sage.tag('/head')
                     + _sage.tag('body')
                     + '<input style="width: 100%" placeholder="Take some notes!">'
@@ -430,4 +430,4 @@ function clg(i) {
     const l = arguments.length;
     let o = 0;
     while (o < l) console.log(arguments[o++])
-}
+}

resources/base.js

@@ -0,0 +1,16 @@
+<?php
+
+uses()
+    ->beforeEach(function() {
+        Sage::$returnOutput      = true;
+        Sage::$expandedByDefault = true;
+    })
+    ->in('all')
+;
+
+function assertSageSnapshot($sageOutput)
+{
+    Spatie\Snapshots\assertMatchesHtmlSnapshot(
+        '<meta charset="utf-8">' . $sageOutput
+    );
+}