Added Macroable, various edits

Author: vedmant

src/Debugbar/ShortcodesCollector.php

@@ -5,12 +5,15 @@
 use DebugBar\DataCollector\DataCollector;
 use DebugBar\DataCollector\Renderable;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Traits\Macroable;
 
 /**
  * Collects info about shortcodes
  */
 class ShortcodesCollector extends DataCollector implements Renderable
 {
+    use Macroable;
+
     /**
      * @var array Shortcodes list
      */

src/Facades/Shortcodes.php

@@ -3,14 +3,17 @@
 namespace Vedmant\LaravelShortcodes\Facades;
 
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\HtmlString;
 use Vedmant\LaravelShortcodes\ShortcodesManager;
 
 /**
  * @method static mixed global(string $key, $value = null, $default = null)
+ * @method static mixed|ShortcodesManager shared($key = null, $value = null, $default = null)
  * @method static ShortcodesManager add($name, $callable = null)
  * @method static ShortcodesManager remove($name)
- * @method static ShortcodesManager render($content)
- * @method static mixed|ShortcodesManager shared($key = null, $value = null, $default = null)
+ * @method static array registered()
+ * @method static array rendered()
+ * @method static HtmlString render($content)
  *
  * @see \Vedmant\LaravelShortcodes\ShortcodesManager
  */

src/LaravelShortcodesServiceProvider.php

@@ -16,10 +16,7 @@ class LaravelShortcodesServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // $this->loadTranslationsFrom(__DIR__.'/../lang', 'shortcodes');
         $this->loadViewsFrom(__DIR__ . '/../views', 'shortcodes');
-        // $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
-        // $this->loadRoutesFrom(__DIR__.'/routes.php');
 
         // Publishing is only necessary when using the CLI.
         if ($this->app->runningInConsole()) {
@@ -98,21 +95,6 @@ protected function bootForConsole()
             __DIR__ . '/../config/shortcodes.php' => config_path('shortcodes.php'),
         ], 'shortcodes.config');
 
-        // Publishing the views.
-        /*$this->publishes([
-            __DIR__.'/../resources/views' => base_path('resources/views/vendor/shortcodes'),
-        ], 'shortcodes.views');*/
-
-        // Publishing assets.
-        /*$this->publishes([
-            __DIR__.'/../resources/assets' => public_path('vendor/vedmant'),
-        ], 'shortcodes.views');*/
-
-        // Publishing the translation files.
-        /*$this->publishes([
-            __DIR__.'/../resources/lang' => resource_path('lang/vendor/vedmant'),
-        ], 'shortcodes.views');*/
-
         // Registering package commands.
         $this->commands([
             MakeShortcodeCommand::class,

src/Shortcode.php

@@ -4,10 +4,13 @@
 
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Traits\Macroable;
 use Throwable;
 
 abstract class Shortcode implements ShortcodeContract
 {
+    use Macroable;
+
     /**
      * @var Application Application
      */