- Throw ezcBaseValueExceptions instead of typecasting

- Do range checks instead of converting numbers using min and max
- Extended testcases to test for ezcBaseValueExceptions

1 files changed, 16 insertions, 4 deletions

diff --git a/src/options/chart.php b/src/options/chart.php
index 4d6139d..ae9bd9f 100644
--- a/src/options/chart.php
+++ b/src/options/chart.php
@@ -23,8 +23,8 @@ class ezcGraphChartOptions extends ezcBaseOptions
 {
     public function __construct( array $options = array() )
     {
-        $this->properties['width'] = false;
-        $this->properties['height'] = false;
+        $this->properties['width'] = null;
+        $this->properties['height'] = null;
         $this->properties['font'] = new ezcGraphFontOptions();
 
         parent::__construct( $options );
@@ -44,10 +44,22 @@ class ezcGraphChartOptions extends ezcBaseOptions
         switch ( $propertyName )
         {
             case 'width':
-                $this->properties['width'] = max( 1, (int) $propertyValue );
+                if ( !is_numeric( $propertyValue ) ||
+                     ( $propertyValue < 1 ) ) 
+                {
+                    throw new ezcBaseValueException( $propertyName, $propertyValue, 'int >= 1' );
+                }
+
+                $this->properties['width'] = (int) $propertyValue;
                 break;
             case 'height':
-                $this->properties['height'] = max( 1, (int) $propertyValue );
+                if ( !is_numeric( $propertyValue ) ||
+                     ( $propertyValue < 1 ) ) 
+                {
+                    throw new ezcBaseValueException( $propertyName, $propertyValue, 'int >= 1' );
+                }
+
+                $this->properties['height'] = (int) $propertyValue;
                 break;
             case 'font':
                 $this->properties['font']->path = $propertyValue;