- 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, 13 insertions, 1 deletions

diff --git a/src/datasets/average.php b/src/datasets/average.php
index 33dfa71..0f4e4f1 100644
--- a/src/datasets/average.php
+++ b/src/datasets/average.php
@@ -96,11 +96,23 @@ class ezcGraphDataSetAveragePolynom extends ezcGraphDataSet
     {
         switch ( $propertyName ) {
             case 'polynomOrder':
+                if ( !is_numeric( $propertyValue ) ||
+                     ( $propertyValue < 0 ) )
+                {
+                    throw new ezcBaseValueException( $propertyName, $propertyValue, 'int > 0' );
+                }
+
                 $this->properties['polynomOrder'] = (int) $propertyValue;
                 $this->polynom = false;
                 break;
             case 'resolution':
-                $this->properties['resolution'] = max( 1, (int) $propertyValue );
+                if ( !is_numeric( $propertyValue ) ||
+                     ( $propertyValue < 1 ) )
+                {
+                    throw new ezcBaseValueException( $propertyName, $propertyValue, 'int > 1' );
+                }
+
+                $this->properties['resolution'] = (int) $propertyValue;
                 break;
             default:
                 parent::__set( $propertyName, $propertyValue );