Merge pull request #60 from JonathanO/master

Made configuration more like Jackson.

Author: JonathanO

lib/Weasel/JsonMarshaller/Config/Deserialization/Feature.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * @author Jonathan Oddy <[email protected]>
+ * @copyright Copyright (c) 2012, Moo Print Ltd.
+ * @license ISC
+ */
+namespace Weasel\JsonMarshaller\Config\Deserialization;
+
+/**
+ * Features for config general mapper behaviour.
+ * These are the keys to be passed to the mapper configure() method.
+ */
+interface Feature {
+    /**
+     * bool. When true,  throw an exception (UnknownPropertyException) on encountering an unknown property in the JSON and
+     * there's no AnySetter configured (or ignoreUnknown isn't set.) Default: false.
+     */
+    const FAIL_ON_UNKNOWN_PROPERTIES = "deserialization::fail_on_unknown";
+    /**
+     * bool. When true trigger an E_USER_WARNING on encountering an unknown property in the JSON and there's no AnySetter
+     * configured (or ignoreUnknown isn't set.) Default: true.
+     */
+    const WARN_ON_UNKNOWN_PROPERTIES = "deserialization::warn_on_unknown";
+
+    /**
+     * bool. When true apply strict type checking. JSON types encountered are expected to match the PHP types we're
+     * going to deserialize to. If they don't, throw an exception. Default true.
+     */
+    const STRICT_TYPES = "deserialization::strict_types";
+
+}

lib/Weasel/JsonMarshaller/Exception/BadConfigurationException.php

@@ -7,7 +7,7 @@
 
 namespace Weasel\JsonMarshaller\Exception;
 
-class BadConfigurationException extends \Exception
+class BadConfigurationException extends JsonMarshallerException
 {
 
 } 

lib/Weasel/JsonMarshaller/Exception/UnknownPropertyException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Weasel\JsonMarshaller\Exception;
+
+
+class UnknownPropertyException extends JsonMarshallerException {
+
+}

lib/Weasel/JsonMarshaller/JsonMapper.php

@@ -16,6 +16,7 @@
 use Weasel\JsonMarshaller\Exception\BadConfigurationException;
 use Weasel\JsonMarshaller\Exception\InvalidTypeException;
 use InvalidArgumentException;
+use Weasel\JsonMarshaller\Exception\UnknownPropertyException;
 use Weasel\JsonMarshaller\Types;
 use Weasel\JsonMarshaller\Types\JsonType;
 use Weasel\JsonMarshaller\Types\OldTypeWrapper;
@@ -36,9 +37,9 @@ class JsonMapper
     protected $typeHandlers = array();
 
     /**
-     * @var bool Should we use strict mode unless told otherwise.
+     * @var array Configuration parameters.
      */
-    protected $strict = true;
+    protected $mapperConfig = array();
 
     /**
      * Setup a JsonMapper from a config provider
@@ -49,7 +50,28 @@ public function __construct(JsonConfigProvider $configProvider, $strict = true)
     {
         $this->configProvider = $configProvider;
         $this->_registerBuiltInTypes();
-        $this->strict = $strict;
+        if (isset($strict)) {
+            // Legacy way to configure strict mode.
+            $this->configure(Config\Deserialization\Feature::STRICT_TYPES, $strict);
+        }
+    }
+
+    /**
+     * @param string $key One of the Config\*\Feature:: constants.
+     * @param mixed $value Appropriate value for the config option. See their documentation.
+     */
+    public function configure($key, $value)
+    {
+        $this->mapperConfig[$key] = $value;
+    }
+
+    protected function getConfigOption($key, $default, $permitsNull = false)
+    {
+        if (($permitsNull && array_key_exists($key, $this->mapperConfig)) || isset($this->mapperConfig[$key])) {
+            return $this->mapperConfig[$key];
+        } else {
+            return $default;
+        }
     }
 
     /**
@@ -82,7 +104,7 @@ public function readString($string, $type, $strict = null)
             throw new InvalidArgumentException("Unable to decode JSON: $string");
         }
         if ($strict === null) {
-            $strict = $this->strict;
+            $strict = $this->getConfigOption(Config\Deserialization\Feature::STRICT_TYPES, true);
         }
         return $this->_decodeValue($decoded, $this->_parseTypeString($type), $strict);
     }
@@ -475,7 +497,12 @@ protected function _decodeClass($array, $class, $strict)
                 $object->$method($key, $value);
             } elseif (!$deconfig->ignoreUnknown) {
                 if (!isset($canIgnoreProperties[$key])) {
-                    trigger_error("Unknown property: $key", E_USER_WARNING);
+                    if ($this->getConfigOption(Config\Deserialization\Feature::WARN_ON_UNKNOWN_PROPERTIES, true)) {
+                        trigger_error("Unknown property $key on $class", E_USER_WARNING);
+                    }
+                    if ($this->getConfigOption(Config\Deserialization\Feature::FAIL_ON_UNKNOWN_PROPERTIES, false)) {
+                        throw new UnknownPropertyException("Unknown property $key on $class");
+                    }
                 }
             }
         }