From 45c42a6fe7dbcfeb9ec71b49472e00b2be6abe64 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 21 Aug 2017 23:25:39 +0200
Subject: [PATCH] Fix pChart issue with custom colors palette with PHP 7.1 -
 Bump pChart version to 3.0.4

---
 composer.json                                  |  2 +-
 main/gradebook/lib/fe/flatviewtable.class.php  |  6 +++---
 main/gradebook/lib/fe/gradebooktable.class.php |  6 +++---
 main/inc/lib/myspace.lib.php                   |  6 +++---
 main/inc/lib/tracking.lib.php                  |  6 +++---
 main/palettes/pchart/default.color             | 18 +++++++++---------
 .../block_evaluation_graph.class.php           |  6 +++---
 .../block_student_graph.class.php              |  6 +++---
 .../block_teacher_graph.class.php              |  6 +++---
 9 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/composer.json b/composer.json
index d84b56bdcf..f029aff7fa 100755
--- a/composer.json
+++ b/composer.json
@@ -81,7 +81,7 @@
         "zendframework/zend-soap": "2.5.1|~2.6",
 
         "ezyang/htmlpurifier": "4.6.0",
-        "szymach/c-pchart": "2.0.4",
+        "szymach/c-pchart": "3.0.4",
         "aferrandini/phpqrcode": "1.0.1",
         "mpdf/mpdf": "6.1.*",
         "studio-42/elfinder": "2.1.*",
diff --git a/main/gradebook/lib/fe/flatviewtable.class.php b/main/gradebook/lib/fe/flatviewtable.class.php
index d78b11ae42..0d162819a5 100755
--- a/main/gradebook/lib/fe/flatviewtable.class.php
+++ b/main/gradebook/lib/fe/flatviewtable.class.php
@@ -3,9 +3,9 @@
 
 set_time_limit(0);
 
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 
 /**
  * Class FlatViewTable
diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
index f2a2d47271..703cddd69b 100755
--- a/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -2,9 +2,9 @@
 /* For licensing terms, see license.txt */
 
 use ChamiloSession as Session;
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 
 /**
  * GradebookTable Class
diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php
index ac977bdff4..84dad77537 100644
--- a/main/inc/lib/myspace.lib.php
+++ b/main/inc/lib/myspace.lib.php
@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 
 /**
  * Class MySpace
diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index c308e72137..cdb014fe67 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -2,9 +2,9 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
-use CpChart\Chart\Cache as pCache;
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
+use CpChart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
 use Chamilo\UserBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Session;
diff --git a/main/palettes/pchart/default.color b/main/palettes/pchart/default.color
index 22b0c935ba..3ccd2a4d44 100644
--- a/main/palettes/pchart/default.color
+++ b/main/palettes/pchart/default.color
@@ -1,9 +1,9 @@
-186, 206, 151, 1
-210, 148, 147, 1
-148, 170, 208, 1
-221, 133, 61, 1
-65, 153, 176, 1
-114, 88, 144, 1
-138, 166, 78, 1
-171, 70, 67, 1
-69, 115, 168, 1
+186,206,151,100
+210,148,147,100
+148,170,208,100
+221,133,61,100
+65,153,176,100
+114,88,144,100
+138,166,78,100
+171,70,67,100
+69,115,168,100
diff --git a/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php b/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
index 39f58c2e39..64af16a700 100755
--- a/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
+++ b/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
-use CpChart\Chart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
+use CpChart\Cache as pCache;
 
 /**
  * Class BlockEvaluationGraph
diff --git a/plugin/dashboard/block_student_graph/block_student_graph.class.php b/plugin/dashboard/block_student_graph/block_student_graph.class.php
index fcde1f3dcb..ebea9e82e3 100755
--- a/plugin/dashboard/block_student_graph/block_student_graph.class.php
+++ b/plugin/dashboard/block_student_graph/block_student_graph.class.php
@@ -9,9 +9,9 @@
  * @author Julio Montoya <gugli100@gmail.com>
  */
 
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
-use CpChart\Chart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
+use CpChart\Cache as pCache;
 
 /**
  * This class is used like controller for student graph block plugin,
diff --git a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
index b1f7c5303a..56c0314625 100755
--- a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
+++ b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
@@ -10,9 +10,9 @@
  * required files for getting data
  */
 
-use CpChart\Chart\Data as pData;
-use CpChart\Chart\Image as pImage;
-use CpChart\Chart\Cache as pCache;
+use CpChart\Data as pData;
+use CpChart\Image as pImage;
+use CpChart\Cache as pCache;
 
 /**
  * This class is used like controller for teacher graph block plugin,