From 8ae0551fa5ffe69d313d06b65729890c8d00d549 Mon Sep 17 00:00:00 2001
From: KoolPHPSupport <support@koolphp.net>
Date: Mon, 19 Mar 2018 14:31:29 +0700
Subject: [PATCH] v2.42.0

Enhancement: Change namespace ::class to use classname in string so that
KoolReport is compatible with PHP 5.4
Fixed: PdoDataSource: Fix charset issue with PostgreSQL
---
 composer.json                            | 2 +-
 koolreport/CHANGELOG.md                  | 8 ++++++--
 koolreport/composer.json                 | 4 ++--
 koolreport/core/Widget.php               | 4 ++--
 koolreport/datasources/PdoDataSource.php | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 55e8ed0..909e3e5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "koolphp/koolreport",
-    "version":"2.41.3",
+    "version":"2.42.0",
     "description": "An Open Source PHP Reporting Framework for easier and faster report delivery.",
     "keywords": ["php reporting framework","php reporting tools","data processing","data visualization","charts and graphs"],
     "homepage": "https://www.koolreport.com",
diff --git a/koolreport/CHANGELOG.md b/koolreport/CHANGELOG.md
index deefd61..c6a08f1 100644
--- a/koolreport/CHANGELOG.md
+++ b/koolreport/CHANGELOG.md
@@ -1,11 +1,15 @@
-# Version 2.33.1
+# Version 2.42.0
+    1. Change namespace `::class` to use classname in string so that `KoolReport` is compatible with PHP 5.4
+    2. `PdoDataSource`: Fix `charset` issue with `PostgreSQL`
+
+# Version 2.41.3
     1. Adding `AccumulativeColumn` to generate accumulative column.
     2. Fix Group process for not counting records correctly.
     3. Enhance the `autoload` of KoolReport
     4. A bundle of small fixes
 
 # Version 2.32.8
-    1. Revert back to previous parambinding of PDODataSource
+    1. Revert back to previous param binding of PDODataSource
 
 
 # Version 2.31.7
diff --git a/koolreport/composer.json b/koolreport/composer.json
index a863409..19c6769 100644
--- a/koolreport/composer.json
+++ b/koolreport/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "KoolReport",
-    "version":"2.41.3",
+    "version":"2.42.0",
     "description": "An Open Source PHP Reporting Framework for easier and faster report delivery",
     "keywords": ["php reporting framework","php reporting tools","data reporting","charts and graphs"],
     "homepage": "https://www.koolreport.com",
@@ -12,4 +12,4 @@
             "homepage": "https://www.koolphp.net"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/koolreport/core/Widget.php b/koolreport/core/Widget.php
index 0b950a9..11ecdb6 100644
--- a/koolreport/core/Widget.php
+++ b/koolreport/core/Widget.php
@@ -243,11 +243,11 @@ protected function useDataSource($scope=null)
 					));
 				}
 			}
-			else if(is_a($dataSource,DataStore::class))
+			else if(is_a($dataSource,'koolreport\core\DataStore'))
 			{
 				$this->dataStore = $dataSource;
 			}
-			else if(is_a($dataSource,DataSource::class)||is_a($dataSource,Process::class))
+			else if(is_a($dataSource,'koolreport\core\DataSource')||is_a($dataSource,'koolreport\core\Process'))
 			{
 				$this->dataStore = $this->onFurtherProcessRequest($dataSource)->pipe(new DataStore($this->getReport()));
 			}
diff --git a/koolreport/datasources/PdoDataSource.php b/koolreport/datasources/PdoDataSource.php
index 5c6c405..412a2fb 100644
--- a/koolreport/datasources/PdoDataSource.php
+++ b/koolreport/datasources/PdoDataSource.php
@@ -42,7 +42,7 @@ protected function onInit()
 		}
 		if($charset)
 		{
-			$this->connection->exec("set names $charset");
+			$this->connection->exec("set names '$charset'");
 		}
 	}