- Fixed: #9583 (Data typecasting should only be done in axis)

3 files changed, 25 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9909ba8..59a0c4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1.0 - [date]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Fixed issue #9583: Data typecasting should only be done in axis
+
 1.0beta2 - Monday 20 November 2006
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/src/datasets/array.php b/src/datasets/array.php
index 28a7cb9..50a794d 100644
--- a/src/datasets/array.php
+++ b/src/datasets/array.php
@@ -38,7 +38,7 @@ class ezcGraphArrayDataSet extends ezcGraphDataSet
     {
         foreach ( $data as $key => $value )
         {
-            $this->data[$key] = (float) $value;
+            $this->data[$key] = $value;
         }
     }
 }
diff --git a/tests/dataset_test.php b/tests/dataset_test.php
index fc7827d..143a31c 100644
--- a/tests/dataset_test.php
+++ b/tests/dataset_test.php
@@ -53,11 +53,28 @@ class ezcGraphDataSetTest extends ezcTestCase
         $data = $this->getAttribute( $chart->data['example'], 'data' );
 
         $this->assertSame( 
-            54.,
+            54,
             $data['monkey']
         );
         $this->assertSame( 
-            37.,
+            37,
+            $data['2001']
+        );
+    }
+
+    public function testDataSetStringContent()
+    {
+        $chart = new ezcGraphPieChart();
+        $chart->data['example'] = new ezcGraphArrayDataSet( array( 'monkey' => 'alive', 2001 => 'year' ) );
+
+        $data = $this->getAttribute( $chart->data['example'], 'data' );
+
+        $this->assertSame( 
+            'alive',
+            $data['monkey']
+        );
+        $this->assertSame( 
+            'year',
             $data['2001']
         );
     }