Upgrade szymach/c-pchart from v2.0 to 3.0 to support PHP8.1 (#18260)

* Use szymach/c-pchart v3.0

* Fix some moved imports

* Change path to fonts so they're excluded from final package

* Don't remove default font

* More path fixes

* removes unneeded use statement

Co-authored-by: Stefan Giehl <stefan@matomo.org>

6 files changed, 30 insertions, 28 deletions

diff --git a/composer.json b/composer.json
index 05b846c715..b1d89ddfe2 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
         "symfony/monolog-bridge": "~2.6.0",
         "symfony/polyfill-iconv": "^1.20",
         "symfony/polyfill-mbstring": "^1.20",
-        "szymach/c-pchart": "^2.0",
+        "szymach/c-pchart": "^3.0",
         "tecnickcom/tcpdf": "~6.0",
         "tedivm/jshrink": "~v1.4.0",
         "twig/twig": "^3.0",
diff --git a/composer.lock b/composer.lock
index c69bb0f69c..b2e67d4373 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "21bbe6eaffe95524a3cc128e05470994",
+    "content-hash": "3d3172d5f6ea1e5b7c6bbeb9309c065e",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -2072,31 +2072,34 @@
         },
         {
             "name": "szymach/c-pchart",
-            "version": "v2.0.12",
+            "version": "v3.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/szymach/c-pchart.git",
-                "reference": "f5fad68b303f65225db1a3d3f4bb58aea7a418b4"
+                "reference": "daf0912e0bd9069508a87a4419e4735a34e09698"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/szymach/c-pchart/zipball/f5fad68b303f65225db1a3d3f4bb58aea7a418b4",
-                "reference": "f5fad68b303f65225db1a3d3f4bb58aea7a418b4",
+                "url": "https://api.github.com/repos/szymach/c-pchart/zipball/daf0912e0bd9069508a87a4419e4735a34e09698",
+                "reference": "daf0912e0bd9069508a87a4419e4735a34e09698",
                 "shasum": ""
             },
             "require": {
                 "ext-gd": "*",
-                "php": ">=5.4"
+                "php": "^5.4|^7.0|^8.0"
             },
             "require-dev": {
-                "codeception/codeception": "^2.3",
-                "phpunit/phpunit": "^4.8|6.1",
-                "squizlabs/php_codesniffer": "^2.8|3.0"
+                "codeception/codeception": "^4.1.22",
+                "codeception/module-asserts": "^1.3",
+                "codeception/module-filesystem": "^1.0",
+                "phpunit/phpunit": "^5.7|^9.5",
+                "squizlabs/php_codesniffer": "^3.4"
             },
-            "type": "project",
+            "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0.x-dev",
+                    "2.0": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -2104,7 +2107,7 @@
                     "CpChart\\": "src/"
                 },
                 "files": [
-                    "src/Resources/data/constants.php"
+                    "constants.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2123,7 +2126,7 @@
                     "role": "Developer of the CpChart wrapper package"
                 }
             ],
-            "description": "Port of \"pChart\" library into PHP 5",
+            "description": "Port of \"pChart\" library into PHP 5+",
             "homepage": "https://github.com/szymach/c-pchart",
             "keywords": [
                 "CpChart",
@@ -2134,9 +2137,9 @@
             ],
             "support": {
                 "issues": "https://github.com/szymach/c-pchart/issues",
-                "source": "https://github.com/szymach/c-pchart/tree/2.0"
+                "source": "https://github.com/szymach/c-pchart/tree/v3.0.10"
             },
-            "time": "2019-07-26T22:48:01+00:00"
+            "time": "2021-09-25T16:34:55+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
index ecfe18f4eb..4e71b7acfd 100644
--- a/plugins/ImageGraph/StaticGraph.php
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -9,8 +9,8 @@
 
 namespace Piwik\Plugins\ImageGraph;
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use Piwik\Container\StaticContainer;
 use Piwik\NumberFormatter;
 use Piwik\Piwik;
diff --git a/plugins/ImageGraph/StaticGraph/Exception.php b/plugins/ImageGraph/StaticGraph/Exception.php
index a9c5ef060d..17976106d6 100644
--- a/plugins/ImageGraph/StaticGraph/Exception.php
+++ b/plugins/ImageGraph/StaticGraph/Exception.php
@@ -8,7 +8,7 @@
  */
 namespace Piwik\Plugins\ImageGraph\StaticGraph;
 
-use CpChart\Chart\Data;
+use CpChart\Data;
 use Piwik\Plugins\ImageGraph\StaticGraph;
 
 /**
diff --git a/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php
index c963c71921..d8df4e19d9 100644
--- a/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php
+++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Plugins\PrivacyManager\tests\Integration;
 
-use CpChart\Chart\Data;
 use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 2fce4bb392..4015133ca9 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -880,14 +880,14 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase
             'vendor/tecnickcom/tcpdf/fonts/times*',
             'vendor/tecnickcom/tcpdf/fonts/uni2cid*',
 
-            'vendor/szymach/c-pchart/src/Resources/fonts/advent_light*',
-            'vendor/szymach/c-pchart/src/Resources/fonts/Bedizen*',
-            'vendor/szymach/c-pchart/src/Resources/fonts/calibri*',
-            'vendor/szymach/c-pchart/src/Resources/fonts/Forgotte*',
-            'vendor/szymach/c-pchart/src/Resources/fonts/MankSans*',
-            'vendor/szymach/c-pchart/src/Resources/fonts/pf_arma_five*',
-            'vendor/szymach/c-pchart/src/Resources/fonts/Silkscreen*',
-            'vendor/szymach/c-pchart/src/Resources/fonts/verdana*',
+            'vendor/szymach/c-pchart/resources/fonts/advent_light*',
+            'vendor/szymach/c-pchart/resources/fonts/Bedizen*',
+            'vendor/szymach/c-pchart/resources/fonts/calibri*',
+            'vendor/szymach/c-pchart/resources/fonts/Forgotte*',
+            'vendor/szymach/c-pchart/resources/fonts/MankSans*',
+            'vendor/szymach/c-pchart/resources/fonts/pf_arma_five*',
+            'vendor/szymach/c-pchart/resources/fonts/Silkscreen*',
+            'vendor/szymach/c-pchart/resources/fonts/verdana*',
 
             'package-lock.json',