From 9f3b17888f3971f778b384ec10d75d242a07556b Mon Sep 17 00:00:00 2001 From: lambebr Date: Thu, 25 Aug 2022 11:33:06 +0200 Subject: [PATCH 1/4] Updated composer to support PHP 8 --- composer.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 19e1b77..070257c 100644 --- a/composer.json +++ b/composer.json @@ -12,18 +12,20 @@ ], "require": { - "php": "^7.2", + "php": "^7.2 || ^8.0", + "ext-json": "*", "symfony/http-kernel": "^4.4 || ^5.0", "symfony/dependency-injection": "^4.4 || ^5.0", "symfony/config": "^4.4 || ^5.0", "symfony/yaml": "^4.4 || ^5.0", "twig/twig": "^2.10 || ^3.0", - "laminas/laminas-json": "^3.1" + "laminas/laminas-json": "^3.3" }, "require-dev": { "symfony/phpunit-bridge": "^4.4 || ^5.0", "symfony/framework-bundle": "^4.4 || ^5.0", - "nyholm/symfony-bundle-test": "^1.6.1" + "nyholm/symfony-bundle-test": "^1.6.1", + "phpcompatibility/php-compatibility": "^9.3" }, "autoload": { "psr-4": { "Ob\\HighchartsBundle\\": "" } From 6ed8b22b3fb7b69a2748bf36d856de4f20e7c602 Mon Sep 17 00:00:00 2001 From: lambebr Date: Thu, 25 Aug 2022 11:33:25 +0200 Subject: [PATCH 2/4] Updated .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 193239d..7c0b8ce 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ composer.lock composer.phar php-cs-fixer.phar -vendor +vendor/ +.idea/ From 82856ac522747908f5d1239180a7f8e0ab0aeeeb Mon Sep 17 00:00:00 2001 From: lambebr Date: Thu, 25 Aug 2022 11:35:07 +0200 Subject: [PATCH 3/4] Fixed small bug in AbstractChart.php and cleaned up code everywhere --- DependencyInjection/ObHighchartsExtension.php | 3 +++ Highcharts/AbstractChart.php | 2 ++ Highcharts/ChartOption.php | 9 +++++---- Highcharts/Highchart.php | 5 ++--- Highcharts/Highstock.php | 5 ++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/DependencyInjection/ObHighchartsExtension.php b/DependencyInjection/ObHighchartsExtension.php index dd9a505..b61b054 100644 --- a/DependencyInjection/ObHighchartsExtension.php +++ b/DependencyInjection/ObHighchartsExtension.php @@ -2,6 +2,7 @@ namespace Ob\HighchartsBundle\DependencyInjection; +use Exception; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; use Symfony\Component\HttpKernel\DependencyInjection\Extension; @@ -16,6 +17,8 @@ class ObHighchartsExtension extends Extension { /** * {@inheritDoc} + * + * @throws Exception */ public function load(array $configs, ContainerBuilder $container) { diff --git a/Highcharts/AbstractChart.php b/Highcharts/AbstractChart.php index 71334d9..f400294 100644 --- a/Highcharts/AbstractChart.php +++ b/Highcharts/AbstractChart.php @@ -148,6 +148,8 @@ protected function renderEngine($engine) } elseif ($engine == 'jquery') { return "$(function () {"; } + + return ''; } /** diff --git a/Highcharts/ChartOption.php b/Highcharts/ChartOption.php index f68be84..49046f7 100644 --- a/Highcharts/ChartOption.php +++ b/Highcharts/ChartOption.php @@ -2,6 +2,8 @@ namespace Ob\HighchartsBundle\Highcharts; +use stdClass; + /** * This class is part of the Ob/HighchartsBundle * See Highcharts documentation at http://www.highcharts.com/ref/#chart @@ -16,7 +18,7 @@ class ChartOption public function __construct($name) { $this->option_name = $name; - $this->{$name} = new \stdClass(); + $this->{$name} = new stdClass(); } /** @@ -41,15 +43,14 @@ public function __call($name, $value) public function __get($name) { $option_name = $this->option_name; - $value = $this->{$option_name}->{$name}; - return $value; + return $this->{$option_name}->{$name}; } /** * @param string $name * - * @return mixed + * @return bool */ public function __isset($name) { diff --git a/Highcharts/Highchart.php b/Highcharts/Highchart.php index f7b4b4f..e1fa39d 100644 --- a/Highcharts/Highchart.php +++ b/Highcharts/Highchart.php @@ -29,10 +29,9 @@ public function __construct() */ public function render($engine = 'jquery') { - $chartJS = ""; - $chartJS .= $this->renderEngine($engine); + $chartJS = $this->renderEngine($engine); $chartJS .= $this->renderOptions(); - $chartJS .= "\n var " . (isset($this->chart->renderTo) ? $this->chart->renderTo : 'chart') . " = new Highcharts.Chart({\n"; + $chartJS .= "\n var " . ($this->chart->renderTo ?? 'chart') . " = new Highcharts.Chart({\n"; // Chart $chartJS .= $this->renderWithJavascriptCallback($this->chart->chart, "chart"); diff --git a/Highcharts/Highstock.php b/Highcharts/Highstock.php index 90f1aa2..bf6d1ae 100644 --- a/Highcharts/Highstock.php +++ b/Highcharts/Highstock.php @@ -18,10 +18,9 @@ class Highstock extends AbstractChart implements ChartInterface */ public function render($engine = 'jquery') { - $chartJS = ""; - $chartJS .= $this->renderEngine($engine); + $chartJS = $this->renderEngine($engine); $chartJS .= $this->renderOptions(); - $chartJS .= "\n var " . (isset($this->chart->renderTo) ? $this->chart->renderTo : 'chart') . " = new Highcharts.StockChart({\n"; + $chartJS .= "\n var " . ($this->chart->renderTo ?? 'chart') . " = new Highcharts.StockChart({\n"; // Chart Option $chartJS .= $this->renderWithJavascriptCallback($this->chart->chart, "chart"); From e5ac77b84173152ee4ba72e7b780e8d6532a2f5e Mon Sep 17 00:00:00 2001 From: lambebr Date: Thu, 25 Aug 2022 11:37:04 +0200 Subject: [PATCH 4/4] Composer.json: Branch alias for dev-master -> 2.0.x-dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 070257c..dca8e77 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "2.0.x-dev" } } }