From 173e06278672d59067aabe1d47e89d7f708a7d8b Mon Sep 17 00:00:00 2001 From: Piotr Szymaszek Date: Sun, 5 Jun 2022 12:27:47 +0200 Subject: [PATCH 1/2] Allow PHP 8.1 --- .travis.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c0c662..bca4a57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: - php: 7.3 - php: 7.4 - php: 8.0 -# - php: 8.1 + - php: 8.1 env: - COVERAGE='--coverage --coverage-xml' XDEBUG_MODE=coverage diff --git a/composer.json b/composer.json index 2b83a08..5c0a6ec 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "psr-4": { "CpChart\\Test\\": "tests/" } }, "require": { - "php": "^5.4|^7.0|8.0.*", + "php": "^5.4|^7.0|^8.0", "ext-gd": "*" }, "require-dev" : { From a7b83616a8b67a68f79d36820401d6065d67c28f Mon Sep 17 00:00:00 2001 From: Piotr Szymaszek Date: Sun, 5 Jun 2022 12:39:09 +0200 Subject: [PATCH 2/2] CpChart\Test -> Test\CpChart --- composer.json | 2 +- constants.php | 4 +--- tests/unit/AreaTest.php | 2 +- tests/unit/BarCodeTest.php | 2 +- tests/unit/BarTest.php | 2 +- tests/unit/BestFitTest.php | 2 +- tests/unit/BubbleTest.php | 2 +- tests/unit/CacheTest.php | 2 +- tests/unit/FilledSplineTest.php | 2 +- tests/unit/FilledStepTest.php | 2 +- tests/unit/LineTest.php | 2 +- tests/unit/PieTest.php | 2 +- tests/unit/PlotTest.php | 2 +- tests/unit/PolarTest.php | 2 +- tests/unit/ProgressTest.php | 2 +- tests/unit/RadarTest.php | 2 +- tests/unit/ResourceTest.php | 2 +- tests/unit/ScatterTest.php | 2 +- tests/unit/SplineTest.php | 2 +- tests/unit/SplitPathTest.php | 2 +- tests/unit/SpringTest.php | 2 +- tests/unit/StackedAreaTest.php | 2 +- tests/unit/StackedBarTest.php | 2 +- tests/unit/StepTest.php | 2 +- tests/unit/StockTest.php | 2 +- tests/unit/SurfaceTest.php | 2 +- tests/unit/ZoneTest.php | 2 +- 27 files changed, 27 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 5c0a6ec..d2dc574 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "files": ["constants.php"] }, "autoload-dev": { - "psr-4": { "CpChart\\Test\\": "tests/" } + "psr-4": { "Test\\CpChart\\": "tests/" } }, "require": { "php": "^5.4|^7.0|^8.0", diff --git a/constants.php b/constants.php index 86a82c2..2aa41c6 100644 --- a/constants.php +++ b/constants.php @@ -3,9 +3,7 @@ /** * @filesource src/Resources/data/configuration.php * - * All the class constants moved into a single file for compatibility - * with the factory service class. This file is *required* for the library - * to function. + * All the class constants that were previously in class files are moved here into a single file. */ /** * pBubble diff --git a/tests/unit/AreaTest.php b/tests/unit/AreaTest.php index a5e8000..3403804 100644 --- a/tests/unit/AreaTest.php +++ b/tests/unit/AreaTest.php @@ -1,6 +1,6 @@