Require and use laravel-essentials

Author: codebarista

bootstrap/helpers.php

@@ -8,20 +8,3 @@ function codebarista_path(string $path = ''): string
         return App::joinPaths(dirname(__DIR__), $path);
     }
 }
-
-if (! function_exists('pngcrush')) {
-    function pngcrush(string $image): bool
-    {
-        $format = 'pngcrush -d %s -q -rem alla %s > /dev/null 2>&1';
-        $dir = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR);
-        $name = basename($image);
-
-        $command = sprintf($format, $dir, escapeshellarg($image));
-
-        if (exec($command) !== false) {
-            return rename($dir.DIRECTORY_SEPARATOR.$name, $image);
-        }
-
-        return false;
-    }
-}

composer.json

@@ -14,6 +14,7 @@
         }
     ],
     "require": {
+        "codebarista/laravel-essentials": "^1.2",
         "laravel/framework": "^10.0|^11.0"
     },
     "require-dev": {
@@ -34,6 +35,9 @@
             "Codebarista\\LaravelEcharts\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "./vendor/bin/pest"
+    },
     "extra": {
         "laravel": {
             "providers": [

src/Actions/StoreChartImage.php

@@ -4,13 +4,15 @@
 
 use Codebarista\LaravelEcharts\Enums\MimeTypes;
 use Codebarista\LaravelEcharts\Exceptions\StoreChartImageException;
-use Codebarista\LaravelEcharts\Makeable;
+use Codebarista\LaravelEssentials\Traits\Makeable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Str;
 use Throwable;
 
+use function crush_png;
+
 class StoreChartImage
 {
     use Makeable;
@@ -103,7 +105,7 @@ public function handle(array $option): string
             new StoreChartImageException($process->errorOutput()));
 
         if ($this->optimize && $this->mimeType === MimeTypes::PNG) {
-            pngcrush($this->fullPath);
+            crush_png($this->fullPath);
         }
 
         return $this->fullPath;

src/EchartsServiceProvider.php

@@ -3,16 +3,12 @@
 namespace Codebarista\LaravelEcharts;
 
 use Codebarista\LaravelEcharts\Console\Commands\NodeEcharts;
-use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 
 class EchartsServiceProvider extends ServiceProvider
 {
     private const string CONFIG = __DIR__.'/../config/echarts.php';
 
-    /**
-     * Register any application services.
-     */
     public function register(): void
     {
         $this->mergeConfigFrom(self::CONFIG, 'echarts');
@@ -22,35 +18,12 @@ public function register(): void
         ]);
     }
 
-    /**
-     * Bootstrap any application services.
-     */
     public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
                 self::CONFIG => $this->app->configPath('echarts.php'),
             ], 'config');
         }
-
-        $this->macros();
-    }
-
-    /**
-     * Register the package's macros
-     */
-    protected function macros(): void
-    {
-        Arr::macro('toJson', static function (array $value, bool $pretty = false): string {
-            $flags = JSON_THROW_ON_ERROR
-                | JSON_UNESCAPED_SLASHES
-                | JSON_NUMERIC_CHECK;
-
-            if ($pretty === true) {
-                $flags |= JSON_PRETTY_PRINT;
-            }
-
-            return json_encode($value, $flags);
-        });
     }
 }

src/Makeable.php

@@ -1,8 +1,7 @@
 <?php
 
 it('has the callable helpers', function () {
-    expect('codebarista_path')->toBeCallable()
-        ->and('pngcrush')->toBeCallable();
+    expect('codebarista_path')->toBeCallable();
 });
 
 it('resolves the tools path', function () {

tests/Feature/HelpersTest.php

@@ -6,13 +6,15 @@
 
 use Codebarista\LaravelEcharts\Actions\StoreChartImage;
 use Codebarista\LaravelEcharts\EchartsServiceProvider;
+use Codebarista\LaravelEssentials\EssentialsServiceProvider;
 use Orchestra\Testbench\TestCase;
 
 abstract class PackageTestCase extends TestCase
 {
     protected function getPackageProviders($app): array
     {
         return [
+            EssentialsServiceProvider::class,
             EchartsServiceProvider::class,
         ];
     }

tests/PackageTestCase.php

@@ -1,14 +1,14 @@
 {
     "name": "laravel-echarts",
     "type": "module",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Create images from echarts",
     "main": "render.js",
     "license": "MIT",
     "dependencies": {
-        "canvas": "^2.11.2",
-        "echarts": "^5.4.3",
-        "lodash": "^4.17.21",
-        "yargs": "^17.7.2"
+        "canvas": "^2.11",
+        "echarts": "^5.4",
+        "lodash": "^4.17",
+        "yargs": "^17.7"
     }
 }