Merge pull request #46 from cmen/dropping_support_old_versions

Dropping support for old versions (Sf 3, PHP 5 & 7.0)
cmen · Nov 15, 2020 · 8bc2b9a · 8bc2b9a
2 parents fe99878 + 1127dd1
commit 8bc2b9a
Show file tree

Hide file tree

Showing 210 changed files with 802 additions and 2,320 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,13 +10,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Install PHP dependencies
         run: composer install --prefer-dist --no-progress --no-suggest
 
       - name: Run PHP CS Fixer
-        run: vendor/bin/php-cs-fixer fix --diff --dry-run --verbose --stop-on-violation
+        run: ./vendor/bin/php-cs-fixer fix --diff --dry-run --verbose --stop-on-violation
 
   code_analyze:
     runs-on: [ubuntu-latest]
@@ -25,37 +25,37 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Install PHP dependencies
         run: composer install --prefer-dist --no-progress --no-suggest
 
       - name: Run PHPStan
-        run: vendor/bin/phpstan analyse --level max
+        run: ./vendor/bin/phpstan analyse --level max
 
   tests:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.1', '7.2', '7.3', '7.4']
 
     runs-on: ${{ matrix.operating-system }}
 
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v1
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: xml, dom, mbstring
+          coverage: xdebug
 
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v1
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extension-csv: xml, dom, mbstring
-        coverage: none
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-    - name: Remove PHPStan (Not compatible with PHP < 7.1) and install PHP dependencies
-      run: composer remove phpstan/phpstan --dev
+      - name: Install PHP dependencies
+        run: composer install --prefer-dist --no-progress --no-suggest
 
-    - name: Run test suite
-      run: vendor/bin/phpunit
+      - name: Run test suite
+        run: ./vendor/bin/phpunit
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -7,9 +7,6 @@
 
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('cmen_google_charts');

diff --git a/GoogleCharts/Chart.php b/GoogleCharts/Chart.php
@@ -37,10 +37,8 @@ public function __construct()
 
     /**
      * Returns chart's name.
-     *
-     * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         if (null === $this->elementID) {
             return '';
@@ -51,61 +49,51 @@ public function getName()
 
     /**
      * Returns data chart's name.
-     *
-     * @return string
      */
-    public function getDataName()
+    public function getDataName(): string
     {
         return 'data'.ucfirst($this->getName());
     }
 
     /**
      * Returns options chart's name.
-     *
-     * @return string
      */
-    public function getOptionsName()
+    public function getOptionsName(): string
     {
         return 'options'.ucfirst($this->getName());
     }
 
     /**
      * Returns the chart type.
-     *
-     * @return string
      */
-    abstract public function getType();
+    abstract public function getType(): string;
 
     /**
      * Returns library used by chart.
-     *
-     * @return string
      */
-    public function getLibrary()
+    public function getLibrary(): string
     {
         return 'visualization';
     }
 
     /**
      * Returns the chart package.
-     *
-     * @return string
      */
-    abstract public function getPackage();
+    abstract public function getPackage(): string;
 
     /**
      * Returns available event types.
      *
      * @return string[]
      */
-    abstract public function getAvailableEventTypes();
+    abstract public function getAvailableEventTypes(): array;
 
     /**
      * Returns the instance options.
      *
      * @return ChartOptionsInterface
      */
-    abstract public function getOptions();
+    abstract public function getOptions()/* : ChartOptionsInterface */;
 
     /**
      * Sets the instance Options.
@@ -114,40 +102,29 @@ abstract public function getOptions();
      *
      * @return $this
      */
-    abstract public function setOptions($options);
+    abstract public function setOptions(/* ChartOptionsInterface */$options)/* : Chart */;
 
     /**
-     * @param string $elementID
-     *
      * @return $this
      */
-    public function setElementID($elementID)
+    public function setElementID(string $elementID)
     {
         $this->elementID = $elementID;
 
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
-    public function getElementID()
+    public function getElementID(): ?string
     {
         return $this->elementID;
     }
 
-    /**
-     * @return Data
-     */
-    public function getData()
+    public function getData(): Data
     {
         return $this->data;
     }
 
-    /**
-     * @return Events
-     */
-    public function getEvents()
+    public function getEvents(): Events
     {
         return $this->events;
     }

diff --git a/GoogleCharts/Charts/AnnotationChart.php b/GoogleCharts/Charts/AnnotationChart.php
@@ -23,17 +23,17 @@ public function __construct()
         $this->options = new AnnotationChartOptions();
     }
 
-    public function getType()
+    public function getType(): string
     {
         return 'AnnotationChart';
     }
 
-    public function getPackage()
+    public function getPackage(): string
     {
         return 'annotationchart';
     }
 
-    public function getAvailableEventTypes()
+    public function getAvailableEventTypes(): array
     {
         return [
             EventType::RANGE_CHANGE,
@@ -42,20 +42,15 @@ public function getAvailableEventTypes()
         ];
     }
 
-    /**
-     * @return AnnotationChartOptions
-     */
-    public function getOptions()
+    public function getOptions(): AnnotationChartOptions
     {
         return $this->options;
     }
 
     /**
      * @param AnnotationChartOptions $options
-     *
-     * @return AnnotationChart
      */
-    public function setOptions($options)
+    public function setOptions(/* AnnotationChartOptions */$options): AnnotationChart
     {
         $this->options = $options;
 

diff --git a/GoogleCharts/Charts/AreaChart.php b/GoogleCharts/Charts/AreaChart.php
@@ -23,17 +23,17 @@ public function __construct()
         $this->options = new AreaChartOptions();
     }
 
-    public function getType()
+    public function getType(): string
     {
         return 'AreaChart';
     }
 
-    public function getPackage()
+    public function getPackage(): string
     {
         return 'corechart';
     }
 
-    public function getAvailableEventTypes()
+    public function getAvailableEventTypes(): array
     {
         return [
             EventType::ANIMATION_FINISH,
@@ -46,20 +46,15 @@ public function getAvailableEventTypes()
         ];
     }
 
-    /**
-     * @return AreaChartOptions
-     */
-    public function getOptions()
+    public function getOptions(): AreaChartOptions
     {
         return $this->options;
     }
 
     /**
      * @param AreaChartOptions $options
-     *
-     * @return AreaChart
      */
-    public function setOptions($options)
+    public function setOptions(/* AreaChartOptions */$options): AreaChart
     {
         $this->options = $options;
 

diff --git a/GoogleCharts/Charts/BarChart.php b/GoogleCharts/Charts/BarChart.php
@@ -23,17 +23,17 @@ public function __construct()
         $this->options = new BarChartOptions();
     }
 
-    public function getType()
+    public function getType(): string
     {
         return 'BarChart';
     }
 
-    public function getPackage()
+    public function getPackage(): string
     {
         return 'corechart';
     }
 
-    public function getAvailableEventTypes()
+    public function getAvailableEventTypes(): array
     {
         return [
             EventType::ANIMATION_FINISH,
@@ -46,10 +46,7 @@ public function getAvailableEventTypes()
         ];
     }
 
-    /**
-     * @return BarChartOptions
-     */
-    public function getOptions()
+    public function getOptions()/* : BarChartOptions */
     {
         return $this->options;
     }
@@ -59,7 +56,7 @@ public function getOptions()
      *
      * @return BarChart
      */
-    public function setOptions($options)
+    public function setOptions(/* BarChartOptions */$options)/* : BarChart */
     {
         $this->options = $options;
 

diff --git a/GoogleCharts/Charts/BubbleChart.php b/GoogleCharts/Charts/BubbleChart.php
@@ -23,17 +23,17 @@ public function __construct()
         $this->options = new BubbleChartOptions();
     }
 
-    public function getType()
+    public function getType(): string
     {
         return 'BubbleChart';
     }
 
-    public function getPackage()
+    public function getPackage(): string
     {
         return 'corechart';
     }
 
-    public function getAvailableEventTypes()
+    public function getAvailableEventTypes(): array
     {
         return [
             EventType::ANIMATION_FINISH,
@@ -46,20 +46,15 @@ public function getAvailableEventTypes()
         ];
     }
 
-    /**
-     * @return BubbleChartOptions
-     */
-    public function getOptions()
+    public function getOptions(): BubbleChartOptions
     {
         return $this->options;
     }
 
     /**
      * @param BubbleChartOptions $options
-     *
-     * @return BubbleChart
      */
-    public function setOptions($options)
+    public function setOptions(/* BubbleChartOptions */$options): BubbleChart
     {
         $this->options = $options;