Updated PHPunit continuous integration action. Added static instance(…

…)` function to ChartOption class.
laurentmuller · Nov 24, 2024 · 7f095a3 · 7f095a3
1 parent 3eaf9bb
commit 7f095a3
Show file tree

Hide file tree

Showing 13 changed files with 132 additions and 121 deletions.
diff --git a/.github/workflows/php_unit.yaml b/.github/workflows/php_unit.yaml
@@ -23,9 +23,9 @@ jobs:
                 run: vendor/bin/phpunit --display-skipped --no-progress --coverage-clover ./clover.xml
 
             -   name: Upload coverage to Codecov
-                uses: codecov/codecov-action@v4.6.0
+                uses: codecov/codecov-action@v5
                 with:
                     token: ${{ secrets.CODECOV_TOKEN }}
                     slug: 'laurentmuller/HighchartsBundle'
                     disable_search: true
-                    file: ./clover.xml
+                    files: ./clover.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Updated `PHPunit` continuous integration action.
+- Added static `instance()` function to `ChartOption` class.
 - Added test for the `renderTo` property.
 - Updated `PHPStan` to version 2.0 and level to 10.
 - Removed separate `PHPUnit` tool.

diff --git a/composer.lock b/composer.lock
diff --git a/src/Highcharts/AbstractChart.php b/src/Highcharts/AbstractChart.php
@@ -94,20 +94,20 @@ abstract class AbstractChart implements ChartInterface
 
     public function __construct()
     {
-        $this->accessibility = new ChartOption('accessibility');
-        $this->chart = new ChartOption('chart');
-        $this->credits = new ChartOption('credits');
-        $this->exporting = new ChartOption('exporting');
-        $this->global = new ChartOption('global');
-        $this->lang = new ChartOption('lang');
-        $this->legend = new ChartOption('legend');
-        $this->plotOptions = new ChartOption('plotOptions');
-        $this->series = new ChartOption('series');
-        $this->subtitle = new ChartOption('subtitle');
-        $this->title = new ChartOption('title');
-        $this->tooltip = new ChartOption('tooltip');
-        $this->xAxis = new ChartOption('xAxis');
-        $this->yAxis = new ChartOption('yAxis');
+        $this->accessibility = ChartOption::instance('accessibility');
+        $this->chart = ChartOption::instance('chart');
+        $this->credits = ChartOption::instance('credits');
+        $this->exporting = ChartOption::instance('exporting');
+        $this->global = ChartOption::instance('global');
+        $this->lang = ChartOption::instance('lang');
+        $this->legend = ChartOption::instance('legend');
+        $this->plotOptions = ChartOption::instance('plotOptions');
+        $this->series = ChartOption::instance('series');
+        $this->subtitle = ChartOption::instance('subtitle');
+        $this->title = ChartOption::instance('title');
+        $this->tooltip = ChartOption::instance('tooltip');
+        $this->xAxis = ChartOption::instance('xAxis');
+        $this->yAxis = ChartOption::instance('yAxis');
     }
 
     public function __call(string $name, mixed $value): static

diff --git a/src/Highcharts/ChartOption.php b/src/Highcharts/ChartOption.php
@@ -89,6 +89,16 @@ public function hasData(): bool
         return [] !== $this->data;
     }
 
+    /**
+     * Create a new instance.
+     *
+     * @psalm-param non-empty-string $name
+     */
+    public static function instance(string $name): self
+    {
+        return new self($name);
+    }
+
     public function merge(array $data): self
     {
         $this->data = \array_merge_recursive($this->data, $data);

diff --git a/src/Highcharts/Highchart.php b/src/Highcharts/Highchart.php
@@ -41,10 +41,10 @@ class Highchart extends AbstractChart
     public function __construct()
     {
         parent::__construct();
-        $this->colorAxis = new ChartOption('colorAxis');
-        $this->drilldown = new ChartOption('drilldown');
-        $this->noData = new ChartOption('noData');
-        $this->pane = new ChartOption('pane');
+        $this->colorAxis = ChartOption::instance('colorAxis');
+        $this->drilldown = ChartOption::instance('drilldown');
+        $this->noData = ChartOption::instance('noData');
+        $this->pane = ChartOption::instance('pane');
     }
 
     protected function getChartClass(): string

diff --git a/src/Highcharts/Highstock.php b/src/Highcharts/Highstock.php
@@ -29,7 +29,7 @@ class Highstock extends AbstractChart
     public function __construct()
     {
         parent::__construct();
-        $this->rangeSelector = new ChartOption('rangeSelector');
+        $this->rangeSelector = ChartOption::instance('rangeSelector');
     }
 
     protected function getChartClass(): string

diff --git a/tests/Highcharts/ChartOptionTest.php b/tests/Highcharts/ChartOptionTest.php
@@ -129,6 +129,6 @@ public function testUnset(): void
 
     private function createOption(): ChartOption
     {
-        return new ChartOption('test');
+        return ChartOption::instance('test');
     }
 }
diff --git a/tests/Twig/TwigTest.php b/tests/Twig/TwigTest.php
@@ -76,7 +76,6 @@ public function testTwigMembers(): void
         $extension = new HighchartsExtension();
         self::assertCount(0, $extension->getFilters());
         self::assertCount(0, $extension->getNodeVisitors());
-        self::assertCount(2, $extension->getOperators());
         self::assertCount(0, $extension->getTests());
         self::assertCount(0, $extension->getTokenParsers());