Merge branch 'master' into master

.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":{"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_bar_charts":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_pie_chart":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_heatmap_chart":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_create_an_area_chart":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_horizontal_bar_chart":0.001,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_stacked_bar_chart":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::larapex_can_render_line_charts":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_polar_chart":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_pie_charts_by_default":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_donut_chart":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_can_render_radial_bar_charts":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Feature\\ChartsTest::it_tests_larapex_charts_can_render_radar_chart":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Unit\\ChartsTest::it_tests_larapex_charts_can_load_script_correctly":0.019,"ArielMejiaDev\\LarapexCharts\\Tests\\Unit\\ChartsTest::it_tests_larapex_charts_can_change_default_config_colors":0.001,"ArielMejiaDev\\LarapexCharts\\Tests\\Unit\\ChartsTest::it_tests_larapex_chart_cdn_returns_a_correct_url":0,"ArielMejiaDev\\LarapexCharts\\Tests\\Unit\\ChartsTest::it_tests_larapex_charts_install_add_chart_stubs":0.04}}

README.md

@@ -40,7 +40,7 @@ $chart = (new LarapexChart)->setTitle('Posts')
 Remember to import the Facade to your controller with 
 
 ```php
-use ArielMejiaDev\LarapexCharts\Facades\LarapexChart
+use ArielMejiaDev\LarapexCharts\Facades\LarapexChart;
 ```
 
 Or importing the LarapexChart class:
@@ -89,7 +89,7 @@ $chart = (new LarapexChart)->setType('area')
         ]);
 ```
 
-You can create a variety of charts including: Line, Area, Bar, Horizantal Bar, Heatmap, pie, donut and Radialbar.
+You can create a variety of charts including: Line, Area, Bar, Horizontal Bar, Heatmap, pie, donut and Radialbar.
 
 ## More examples
 

build/report.junit.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="/Users/arielmejia/Developer/Packages/larapex-charts/phpunit.xml.dist" tests="16" assertions="66" errors="0" failures="0" skipped="0" time="0.064587">
+    <testsuite name="Larapex Charts Test Suite" tests="16" assertions="66" errors="0" failures="0" skipped="0" time="0.064587">
+      <testsuite name="ArielMejiaDev\LarapexCharts\Tests\Unit\ChartsTest" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Unit/ChartsTest.php" tests="4" assertions="33" errors="0" failures="0" skipped="0" time="0.060374">
+        <testcase name="it_tests_larapex_charts_can_load_script_correctly" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Unit/ChartsTest.php" line="43" class="ArielMejiaDev\LarapexCharts\Tests\Unit\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Unit.ChartsTest" assertions="1" time="0.019106"/>
+        <testcase name="it_tests_larapex_chart_cdn_returns_a_correct_url" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Unit/ChartsTest.php" line="64" class="ArielMejiaDev\LarapexCharts\Tests\Unit\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Unit.ChartsTest" assertions="1" time="0.000098"/>
+        <testcase name="it_tests_larapex_charts_can_change_default_config_colors" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Unit/ChartsTest.php" line="55" class="ArielMejiaDev\LarapexCharts\Tests\Unit\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Unit.ChartsTest" assertions="1" time="0.001184"/>
+        <testcase name="it_tests_larapex_charts_install_add_chart_stubs" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Unit/ChartsTest.php" line="10" class="ArielMejiaDev\LarapexCharts\Tests\Unit\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Unit.ChartsTest" assertions="30" time="0.039986"/>
+      </testsuite>
+      <testsuite name="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" tests="12" assertions="33" errors="0" failures="0" skipped="0" time="0.004213">
+        <testcase name="it_tests_larapex_charts_can_render_horizontal_bar_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="186" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="4" time="0.001080"/>
+        <testcase name="it_tests_larapex_charts_can_render_pie_charts_by_default" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="12" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="2" time="0.000288"/>
+        <testcase name="it_tests_larapex_charts_can_render_stacked_bar_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="158" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="4" time="0.000186"/>
+        <testcase name="it_tests_larapex_charts_can_render_radar_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="239" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="3" time="0.000436"/>
+        <testcase name="it_tests_larapex_charts_can_render_heatmap_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="215" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="3" time="0.000263"/>
+        <testcase name="it_tests_larapex_charts_can_create_an_area_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="95" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="3" time="0.000184"/>
+        <testcase name="it_tests_larapex_can_render_radial_bar_charts" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="47" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="2" time="0.000473"/>
+        <testcase name="it_tests_larapex_charts_can_render_polar_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="59" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="2" time="0.000315"/>
+        <testcase name="it_tests_larapex_charts_can_render_donut_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="35" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="2" time="0.000261"/>
+        <testcase name="it_tests_larapex_charts_can_render_bar_charts" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="120" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="3" time="0.000198"/>
+        <testcase name="it_tests_larapex_charts_can_render_pie_chart" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="21" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="2" time="0.000259"/>
+        <testcase name="larapex_can_render_line_charts" file="/Users/arielmejia/Developer/Packages/larapex-charts/tests/Feature/ChartsTest.php" line="71" class="ArielMejiaDev\LarapexCharts\Tests\Feature\ChartsTest" classname="ArielMejiaDev.LarapexCharts.Tests.Feature.ChartsTest" assertions="3" time="0.000270"/>
+      </testsuite>
+    </testsuite>
+  </testsuite>
+</testsuites>

composer.json

@@ -17,13 +17,14 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/support": "^8.0|^9.0",
+        "php": "^8.0|^8.2",
+        "illuminate/support": "^9.0|^10.0",
         "ext-json": "*"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0",
-        "phpunit/phpunit": "^9.0"
+        "orchestra/testbench": "^7.0|^8.0",
+        "phpunit/phpunit": "^9.0|^10.0",
+        "nunomaduro/collision": "^7.5"
     },
     "autoload": {
         "psr-4": {

config/larapex-charts.php

@@ -11,7 +11,7 @@
     |
     */
 
-    'font_family' => 'Nunito',
+    'font_family' => 'Helvetica, Arial, sans-serif',
 
     'font_color' => '#373d3f',
 

phpunit.xml.dist

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Larapex Charts Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
+</phpunit>

phpunit.xml.dist.bak

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+        backupGlobals="false"
+        bootstrap="vendor/autoload.php"
+        colors="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        executionOrder="random"
+        failOnWarning="true"
+        failOnRisky="true"
+        failOnEmptyTestSuite="true"
+        beStrictAboutOutputDuringTests="true"
+        cacheDirectory=".phpunit.cache"
+        backupStaticProperties="false"
+>
+    <testsuites>
+        <testsuite name="Larapex Charts Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="build/report.junit.xml"/>
+    </logging>
+</phpunit>

stubs/Console/Commands/ChartMakeCommand.php → src/Console/ChartMakeCommand.php

@@ -1,13 +1,16 @@
 <?php
 
-namespace App\Console\Commands;
+namespace ArielMejiaDev\LarapexCharts\Console;
 
+use ArielMejiaDev\LarapexCharts\Traits\WithModelStub;
 use Illuminate\Console\GeneratorCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
 class ChartMakeCommand extends GeneratorCommand
 {
+    use WithModelStub;
+
     protected $chartTypes = [
         'Pie Chart' => 'PieChart',
         'Donut Chart' => 'DonutChart',
@@ -76,7 +79,9 @@ protected function getStub(): string
             $directory = 'Json';
         }
 
-        return base_path("stubs/charts/{$directory}/{$this->selectedChart}.stub");
+        $stub = "{$directory}/{$this->selectedChart}.stub";
+
+        return $this->resolveStubPath($stub);
     }
 
     /**