jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368375 )

Change subject: Wikibase: "data-values/serialization": "1.2.1"
......................................................................


Wikibase: "data-values/serialization": "1.2.1"

Change-Id: I6858c3d66a74d70332750e8e742b21b78f213d99
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
A data-values/serialization/.gitignore
A data-values/serialization/.scrutinizer.yml
A data-values/serialization/.travis.yml
A data-values/serialization/COPYING
A data-values/serialization/README.md
A data-values/serialization/composer.json
A data-values/serialization/phpcs.xml
A data-values/serialization/phpunit.xml.dist
A data-values/serialization/src/Deserializers/DataValueDeserializer.php
A data-values/serialization/src/Serializers/DataValueSerializer.php
A data-values/serialization/tests/Deserializers/DataValueDeserializerTest.php
A data-values/serialization/tests/Serializers/DataValueSerializerTest.php
A data-values/serialization/tests/bootstrap.php
20 files changed, 1,245 insertions(+), 5 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 0bf3228..203b4a9 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,7 @@
                "data-values/common": "0.4.0",
                "data-values/data-values": "1.1.0",
                "data-values/interfaces": "0.2.5",
+               "data-values/serialization": "1.2.1",
                "diff/diff": "2.2.0",
                "firebase/php-jwt": "4.0.0",
                "james-heinrich/getid3": "1.9.14",
diff --git a/composer.lock b/composer.lock
index 96a6f44..fc54823 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
         "This file is @generated automatically"
     ],
-    "content-hash": "a4da54567aeb232233426bdab2fe8202",
+    "content-hash": "d37ff51a1d73c5c83d0f0272c1cd13f3",
     "packages": [
         {
             "name": "composer/semver",
@@ -282,6 +282,64 @@
             "time": "2017-08-09T15:18:46+00:00"
         },
         {
+            "name": "data-values/serialization",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DataValues/Serialization.git";,
+                "reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806"
+            },
+            "dist": {
+                "type": "zip",
+                "url": 
"https://api.github.com/repos/DataValues/Serialization/zipball/2e81e60e413f1578fbaddb9dd2fbcc8236825806";,
+                "reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806",
+                "shasum": ""
+            },
+            "require": {
+                "data-values/data-values": "~1.0|~0.1",
+                "php": ">=5.5.9",
+                "serialization/serialization": "~3.0"
+            },
+            "require-dev": {
+                "mediawiki/mediawiki-codesniffer": ">=0.4 <0.8",
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DataValues\\Serializers\\": "src/Serializers",
+                    "DataValues\\Deserializers\\": "src/Deserializers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/";,
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Jeroen De Dauw",
+                    "email": "jeroended...@gmail.com",
+                    "homepage": "http://jeroendedauw.com";,
+                    "role": "Developer"
+                }
+            ],
+            "description": "Serializers and deserializers for DataValue 
implementations",
+            "homepage": "https://github.com/DataValues/Serialization";,
+            "keywords": [
+                "datavalues",
+                "deserializers",
+                "serialization",
+                "serializers",
+                "wikidata"
+            ],
+            "time": "2017-06-26T07:24:35+00:00"
+        },
+        {
             "name": "diff/diff",
             "version": "2.2.0",
             "source": {
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index bf88aa0..46869c1 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -76,10 +76,12 @@
     'DataValues\\BooleanValue' => $vendorDir . 
'/data-values/data-values/src/DataValues/BooleanValue.php',
     'DataValues\\DataValue' => $vendorDir . 
'/data-values/data-values/src/DataValues/DataValue.php',
     'DataValues\\DataValueObject' => $vendorDir . 
'/data-values/data-values/src/DataValues/DataValueObject.php',
+    'DataValues\\Deserializers\\DataValueDeserializer' => $vendorDir . 
'/data-values/serialization/src/Deserializers/DataValueDeserializer.php',
     'DataValues\\IllegalValueException' => $vendorDir . 
'/data-values/data-values/src/DataValues/IllegalValueException.php',
     'DataValues\\MonolingualTextValue' => $vendorDir . 
'/data-values/common/src/DataValues/MonolingualTextValue.php',
     'DataValues\\MultilingualTextValue' => $vendorDir . 
'/data-values/common/src/DataValues/MultilingualTextValue.php',
     'DataValues\\NumberValue' => $vendorDir . 
'/data-values/data-values/src/DataValues/NumberValue.php',
+    'DataValues\\Serializers\\DataValueSerializer' => $vendorDir . 
'/data-values/serialization/src/Serializers/DataValueSerializer.php',
     'DataValues\\StringValue' => $vendorDir . 
'/data-values/data-values/src/DataValues/StringValue.php',
     'DataValues\\Tests\\DataValueTest' => $vendorDir . 
'/data-values/data-values/tests/phpunit/DataValueTest.php',
     'DataValues\\UnDeserializableValue' => $vendorDir . 
'/data-values/data-values/src/DataValues/UnDeserializableValue.php',
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
index b190456..c13f76b 100644
--- a/composer/autoload_files.php
+++ b/composer/autoload_files.php
@@ -7,13 +7,13 @@
 
 return array(
     'a24b5daa493ecb5e767c7d1592a8da36' => $vendorDir . 
'/mediawiki/at-ease/src/Functions.php',
-    'd1715cacc3c23b16a030645514266a76' => $vendorDir . 
'/data-values/interfaces/Interfaces.php',
     '7cb394c3af2b1ae832979b0368e0da62' => $vendorDir . 
'/data-values/data-values/DataValues.php',
+    'f4c767faab43077fd89ff7cf99ffb4b8' => $vendorDir . 
'/serialization/serialization/Serialization.php',
+    'd1715cacc3c23b16a030645514266a76' => $vendorDir . 
'/data-values/interfaces/Interfaces.php',
     'c3f7f0e81464740a933532e81fa26cc7' => $vendorDir . 
'/wikimedia/base-convert/src/Functions.php',
     'c50606d667a3fde2b80a955639479d3d' => $vendorDir . 
'/wikimedia/timestamp/src/defines.php',
     '04c6c5c2f7095ccf6c481d3e53e1776f' => $vendorDir . 
'/mustangostang/spyc/Spyc.php',
     'd55c27a601de788b19a09b7d057d07ae' => $vendorDir . 
'/wikimedia/relpath/src/RelPath.php',
-    'f4c767faab43077fd89ff7cf99ffb4b8' => $vendorDir . 
'/serialization/serialization/Serialization.php',
     '3ef87127dc6892a0a78f223558a0b940' => $vendorDir . '/diff/diff/Diff.php',
     '90559502573a0d473dc66fde5c0ff7e2' => $vendorDir . 
'/data-values/common/Common.php',
 );
diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
index f2e4b41..a4fffb5 100644
--- a/composer/autoload_psr4.php
+++ b/composer/autoload_psr4.php
@@ -26,6 +26,8 @@
     'Elastica\\' => array($vendorDir . '/ruflin/elastica/lib/Elastica'),
     'Diff\\' => array($vendorDir . '/diff/diff/src'),
     'Deserializers\\' => array($vendorDir . 
'/serialization/serialization/src/Deserializers'),
+    'DataValues\\Serializers\\' => array($vendorDir . 
'/data-values/serialization/src/Serializers'),
+    'DataValues\\Deserializers\\' => array($vendorDir . 
'/data-values/serialization/src/Deserializers'),
     'DataValues\\' => array($vendorDir . '/data-values/common/src/DataValues'),
     'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
     'CLDRPluralRuleParser\\' => array($vendorDir . 
'/wikimedia/cldr-plural-rule-parser/src'),
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 042ee2d..1f17501 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -8,13 +8,13 @@
 {
     public static $files = array (
         'a24b5daa493ecb5e767c7d1592a8da36' => __DIR__ . '/..' . 
'/mediawiki/at-ease/src/Functions.php',
-        'd1715cacc3c23b16a030645514266a76' => __DIR__ . '/..' . 
'/data-values/interfaces/Interfaces.php',
         '7cb394c3af2b1ae832979b0368e0da62' => __DIR__ . '/..' . 
'/data-values/data-values/DataValues.php',
+        'f4c767faab43077fd89ff7cf99ffb4b8' => __DIR__ . '/..' . 
'/serialization/serialization/Serialization.php',
+        'd1715cacc3c23b16a030645514266a76' => __DIR__ . '/..' . 
'/data-values/interfaces/Interfaces.php',
         'c3f7f0e81464740a933532e81fa26cc7' => __DIR__ . '/..' . 
'/wikimedia/base-convert/src/Functions.php',
         'c50606d667a3fde2b80a955639479d3d' => __DIR__ . '/..' . 
'/wikimedia/timestamp/src/defines.php',
         '04c6c5c2f7095ccf6c481d3e53e1776f' => __DIR__ . '/..' . 
'/mustangostang/spyc/Spyc.php',
         'd55c27a601de788b19a09b7d057d07ae' => __DIR__ . '/..' . 
'/wikimedia/relpath/src/RelPath.php',
-        'f4c767faab43077fd89ff7cf99ffb4b8' => __DIR__ . '/..' . 
'/serialization/serialization/Serialization.php',
         '3ef87127dc6892a0a78f223558a0b940' => __DIR__ . '/..' . 
'/diff/diff/Diff.php',
         '90559502573a0d473dc66fde5c0ff7e2' => __DIR__ . '/..' . 
'/data-values/common/Common.php',
     );
@@ -72,6 +72,8 @@
         array (
             'Diff\\' => 5,
             'Deserializers\\' => 14,
+            'DataValues\\Serializers\\' => 23,
+            'DataValues\\Deserializers\\' => 25,
             'DataValues\\' => 11,
         ),
         'C' => 
@@ -163,6 +165,14 @@
         'Deserializers\\' => 
         array (
             0 => __DIR__ . '/..' . 
'/serialization/serialization/src/Deserializers',
+        ),
+        'DataValues\\Serializers\\' => 
+        array (
+            0 => __DIR__ . '/..' . 
'/data-values/serialization/src/Serializers',
+        ),
+        'DataValues\\Deserializers\\' => 
+        array (
+            0 => __DIR__ . '/..' . 
'/data-values/serialization/src/Deserializers',
         ),
         'DataValues\\' => 
         array (
@@ -327,10 +337,12 @@
         'DataValues\\BooleanValue' => __DIR__ . '/..' . 
'/data-values/data-values/src/DataValues/BooleanValue.php',
         'DataValues\\DataValue' => __DIR__ . '/..' . 
'/data-values/data-values/src/DataValues/DataValue.php',
         'DataValues\\DataValueObject' => __DIR__ . '/..' . 
'/data-values/data-values/src/DataValues/DataValueObject.php',
+        'DataValues\\Deserializers\\DataValueDeserializer' => __DIR__ . '/..' 
. '/data-values/serialization/src/Deserializers/DataValueDeserializer.php',
         'DataValues\\IllegalValueException' => __DIR__ . '/..' . 
'/data-values/data-values/src/DataValues/IllegalValueException.php',
         'DataValues\\MonolingualTextValue' => __DIR__ . '/..' . 
'/data-values/common/src/DataValues/MonolingualTextValue.php',
         'DataValues\\MultilingualTextValue' => __DIR__ . '/..' . 
'/data-values/common/src/DataValues/MultilingualTextValue.php',
         'DataValues\\NumberValue' => __DIR__ . '/..' . 
'/data-values/data-values/src/DataValues/NumberValue.php',
+        'DataValues\\Serializers\\DataValueSerializer' => __DIR__ . '/..' . 
'/data-values/serialization/src/Serializers/DataValueSerializer.php',
         'DataValues\\StringValue' => __DIR__ . '/..' . 
'/data-values/data-values/src/DataValues/StringValue.php',
         'DataValues\\Tests\\DataValueTest' => __DIR__ . '/..' . 
'/data-values/data-values/tests/phpunit/DataValueTest.php',
         'DataValues\\UnDeserializableValue' => __DIR__ . '/..' . 
'/data-values/data-values/src/DataValues/UnDeserializableValue.php',
diff --git a/composer/installed.json b/composer/installed.json
index 9658540..ed91f0e 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2707,5 +2707,65 @@
             "valuevalidators",
             "wikidata"
         ]
+    },
+    {
+        "name": "data-values/serialization",
+        "version": "1.2.1",
+        "version_normalized": "1.2.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/DataValues/Serialization.git";,
+            "reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806"
+        },
+        "dist": {
+            "type": "zip",
+            "url": 
"https://api.github.com/repos/DataValues/Serialization/zipball/2e81e60e413f1578fbaddb9dd2fbcc8236825806";,
+            "reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806",
+            "shasum": ""
+        },
+        "require": {
+            "data-values/data-values": "~1.0|~0.1",
+            "php": ">=5.5.9",
+            "serialization/serialization": "~3.0"
+        },
+        "require-dev": {
+            "mediawiki/mediawiki-codesniffer": ">=0.4 <0.8",
+            "phpunit/phpunit": "~4.8"
+        },
+        "time": "2017-06-26T07:24:35+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.2.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "DataValues\\Serializers\\": "src/Serializers",
+                "DataValues\\Deserializers\\": "src/Deserializers"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/";,
+        "license": [
+            "GPL-2.0+"
+        ],
+        "authors": [
+            {
+                "name": "Jeroen De Dauw",
+                "email": "jeroended...@gmail.com",
+                "homepage": "http://jeroendedauw.com";,
+                "role": "Developer"
+            }
+        ],
+        "description": "Serializers and deserializers for DataValue 
implementations",
+        "homepage": "https://github.com/DataValues/Serialization";,
+        "keywords": [
+            "datavalues",
+            "deserializers",
+            "serialization",
+            "serializers",
+            "wikidata"
+        ]
     }
 ]
diff --git a/data-values/serialization/.gitignore 
b/data-values/serialization/.gitignore
new file mode 100644
index 0000000..577795c
--- /dev/null
+++ b/data-values/serialization/.gitignore
@@ -0,0 +1,12 @@
+*~
+*.kate-swp
+*.swp
+
+!.*
+
+.idea/
+build/
+vendor/
+
+composer.phar
+composer.lock
\ No newline at end of file
diff --git a/data-values/serialization/.scrutinizer.yml 
b/data-values/serialization/.scrutinizer.yml
new file mode 100644
index 0000000..d6c0c6b
--- /dev/null
+++ b/data-values/serialization/.scrutinizer.yml
@@ -0,0 +1,13 @@
+build: true
+inherit: true
+
+tools:
+    php_code_coverage: true
+    php_code_sniffer: true
+    php_cpd: true
+    php_cs_fixer: true
+    php_loc: true
+    php_mess_detector: true
+    php_pdepend: true
+    php_analyzer: true
+    sensiolabs_security_checker: true
diff --git a/data-values/serialization/.travis.yml 
b/data-values/serialization/.travis.yml
new file mode 100644
index 0000000..387600d
--- /dev/null
+++ b/data-values/serialization/.travis.yml
@@ -0,0 +1,19 @@
+language: php
+
+dist: trusty
+
+php:
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - hhvm
+
+before_script:
+  - composer install --prefer-source
+
+script: composer test
+
+cache:
+  directories:
+    - $HOME/.composer/cache
diff --git a/data-values/serialization/COPYING 
b/data-values/serialization/COPYING
new file mode 100644
index 0000000..ebba08a
--- /dev/null
+++ b/data-values/serialization/COPYING
@@ -0,0 +1,347 @@
+The license text below "----" applies to all files within this distribution, 
other
+than those that are in a directory which contains files named "LICENSE" or
+"COPYING", or a subdirectory thereof. For those files, the license text 
contained in
+said file overrides any license information contained in directories of 
smaller depth.
+Alternative licenses are typically used for software that is provided by 
external
+parties, and merely packaged with this software for convenience.
+----
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/data-values/serialization/README.md 
b/data-values/serialization/README.md
new file mode 100644
index 0000000..03a2a58
--- /dev/null
+++ b/data-values/serialization/README.md
@@ -0,0 +1,101 @@
+# DataValues Serialization
+
+Serializers and deserializers for DataValue implementations.
+
+It is part of the [DataValues set of libraries](https://github.com/DataValues).
+
+[![Build 
Status](https://secure.travis-ci.org/DataValues/Serialization.png?branch=master)](http://travis-ci.org/DataValues/Serialization)
+[![Code 
Coverage](https://scrutinizer-ci.com/g/DataValues/Serialization/badges/coverage.png?s=3e52443ffbf18b98804feb7c02ba4416f3f986cb)](https://scrutinizer-ci.com/g/DataValues/Serialization/)
+[![Scrutinizer Quality 
Score](https://scrutinizer-ci.com/g/DataValues/Serialization/badges/quality-score.png?s=818787ea88853bbfb76dc226eb4ab755729141c5)](https://scrutinizer-ci.com/g/DataValues/Serialization/)
+[![Dependency 
Status](https://www.versioneye.com/php/data-values:serialization/badge.png)](https://www.versioneye.com/php/data-values:serialization)
+
+On [Packagist](https://packagist.org/packages/data-values/serialization):
+[![Latest Stable 
Version](https://poser.pugx.org/data-values/serialization/version.png)](https://packagist.org/packages/data-values/serialization)
+[![Download 
count](https://poser.pugx.org/data-values/serialization/d/total.png)](https://packagist.org/packages/data-values/serialization)
+
+## Installation
+
+The recommended way to use this library is via 
[Composer](http://getcomposer.org/).
+
+### Composer
+
+To add this package as a local, per-project dependency to your project, simply 
add a
+dependency on `data-values/serialization` to your project's `composer.json` 
file.
+Here is a minimal example of a `composer.json` file that just defines a 
dependency on
+version 1.0 of this package:
+
+    {
+        "require": {
+            "data-values/serialization": "1.0.*"
+        }
+    }
+
+### Manual
+
+Get the code of this package, either via git, or some other means. Also get 
all dependencies.
+You can find a list of the dependencies in the "require" section of the 
composer.json file.
+Then take care of autoloading the classes defined in the src directory.
+
+## Tests
+
+This library comes with a set up PHPUnit tests that cover all non-trivial 
code. You can run these
+tests using the PHPUnit configuration file found in the root directory. The 
tests can also be run
+via TravisCI, as a TravisCI configuration file is also provided in the root 
directory.
+
+## Authors
+
+DataValues Serialization has been written by [Jeroen De 
Dauw](https://github.com/JeroenDeDauw),
+as [Wikimedia Germany](https://wikimedia.de) employee for the [Wikidata 
project](https://wikidata.org/).
+
+## Release notes
+
+### 1.2.1 (2017-06-26)
+
+* Fixed `DataValueDeserializer` not always turning internal 
`InvalidArgumentException` into
+  `DeserializationException`, as documented.
+* Raised required PHP version from 5.3 to 5.5.9.
+
+### 1.2.0 (2017-01-31)
+
+* Improved error reporting in the `DataValueDeserializer` constructor.
+* Added a basic PHPCS rule set, can be run with `composer phpcs`.
+
+### 1.1.0 (2016-05-24)
+
+* Added support for builder functions to `DataValueDeserializer`
+
+### 1.0.3 (2015-08-05)
+
+* Removed duplicate catch clause
+* Removed `composer update` from the PHPUnit bootstrap file
+
+### 1.0.2 (2014-10-10)
+
+* Made component installable together with DataValues 1.x
+
+### 1.0.1 (2014-09-09)
+
+* Handle IllegalValueException in DataValueDeserializer
+
+### 1.0.0 (2014-03-05)
+
+* Switched usage of the Serialization component from version ~2.1 to version 
~3.0.
+* Switched from PSR-0 based autoloading to PSR-4 based autoloading
+* Made PHPUnit bootstrap file compatible with Windows
+
+### 0.1.0 (2013-12-05)
+
+Initial release with these features:
+
+* DataValues\Serializers\DataValueSerializer - Adapter that fits the toArray 
method of DataValue
+objects to the Serializer interface. This allows users to move to using the 
Serializer interface
+and remove their exposure to how serialization of DataValues is implemented.
+* DataValues\Deserializers\DataValueDeserializer - Adapter that fits the 
newFromArray method of
+DataValues objects to the Deserializer interface. This allows users to remove 
the knowledge they
+have of how deserialization is implemented and break their dependency on 
DataValueFactory.
+
+## Links
+
+* [DataValues Serialization on 
Packagist](https://packagist.org/packages/data-values/serialization)
+* [DataValues Serialization on 
TravisCI](https://travis-ci.org/DataValues/Serialization)
+* [DataValues Serialization on 
ScrutinizerCI](https://scrutinizer-ci.com/g/DataValues/Serialization/)
diff --git a/data-values/serialization/composer.json 
b/data-values/serialization/composer.json
new file mode 100644
index 0000000..c37c270
--- /dev/null
+++ b/data-values/serialization/composer.json
@@ -0,0 +1,55 @@
+{
+       "name": "data-values/serialization",
+       "type": "library",
+       "description": "Serializers and deserializers for DataValue 
implementations",
+       "keywords": [
+               "datavalues",
+               "wikidata",
+               "serialization",
+               "serializers",
+               "deserializers"
+       ],
+       "homepage": "https://github.com/DataValues/Serialization";,
+       "license": "GPL-2.0+",
+       "authors": [
+               {
+                       "name": "Jeroen De Dauw",
+                       "email": "jeroended...@gmail.com",
+                       "homepage": "http://jeroendedauw.com";,
+                       "role": "Developer"
+               }
+       ],
+       "support": {
+               "irc": "irc://irc.freenode.net/wikidata"
+       },
+       "require": {
+               "php": ">=5.5.9",
+               "data-values/data-values": "~1.0|~0.1",
+               "serialization/serialization": "~3.0"
+       },
+       "require-dev": {
+               "mediawiki/mediawiki-codesniffer": ">=0.4 <0.8",
+               "phpunit/phpunit": "~4.8"
+       },
+       "autoload": {
+               "psr-4": {
+                       "DataValues\\Serializers\\": "src/Serializers",
+                       "DataValues\\Deserializers\\": "src/Deserializers"
+               }
+       },
+       "extra": {
+               "branch-alias": {
+                       "dev-master": "1.2.x-dev"
+               }
+       },
+       "scripts": {
+               "test": [
+                       "@validate --no-interaction",
+                       "@phpcs",
+                       "phpunit"
+               ],
+               "phpcs": [
+                       "phpcs src/* tests/* --standard=phpcs.xml -sp"
+               ]
+       }
+}
diff --git a/data-values/serialization/phpcs.xml 
b/data-values/serialization/phpcs.xml
new file mode 100644
index 0000000..a01fdf1
--- /dev/null
+++ b/data-values/serialization/phpcs.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<ruleset name="DataValuesSerialization">
+       <!-- See 
https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
 -->
+       <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+               <exclude name="Generic.Arrays.DisallowLongArraySyntax" />
+       </rule>
+
+       <rule ref="Generic.ControlStructures" />
+       <rule ref="Generic.Files.LineLength">
+               <properties>
+                       <property name="lineLimit" value="113" />
+               </properties>
+       </rule>
+       <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
+
+       <rule ref="PSR1" />
+       <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
+               <!-- Exclude test methods like 
"testGivenInvalidInput_methodThrowsException". -->
+               <exclude-pattern>tests*Test*\.php</exclude-pattern>
+       </rule>
+
+       <rule ref="PSR2.Files" />
+
+       <rule ref="Squiz.Classes.DuplicateProperty" />
+       <rule ref="Squiz.Classes.SelfMemberReference" />
+       <rule ref="Squiz.ControlStructures.ControlSignature" />
+       <rule ref="Squiz.Functions.FunctionDuplicateArgument" />
+       <rule ref="Squiz.Functions.GlobalFunction" />
+       <rule ref="Squiz.Scope" />
+       <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+               <properties>
+                       <property name="spacing" value="1" />
+               </properties>
+       </rule>
+       <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+               <properties>
+                       <property name="ignoreNewlines" value="true" />
+               </properties>
+       </rule>
+
+       <arg name="extensions" value="php" />
+       <arg name="encoding" value="utf8" />
+</ruleset>
diff --git a/data-values/serialization/phpunit.xml.dist 
b/data-values/serialization/phpunit.xml.dist
new file mode 100644
index 0000000..2eaf91d
--- /dev/null
+++ b/data-values/serialization/phpunit.xml.dist
@@ -0,0 +1,24 @@
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="tests/bootstrap.php"
+         cacheTokens="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         verbose="true">
+    <testsuites>
+        <testsuite name="DataValuesSerialization">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git 
a/data-values/serialization/src/Deserializers/DataValueDeserializer.php 
b/data-values/serialization/src/Deserializers/DataValueDeserializer.php
new file mode 100644
index 0000000..bc104cd
--- /dev/null
+++ b/data-values/serialization/src/Deserializers/DataValueDeserializer.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace DataValues\Deserializers;
+
+use DataValues\DataValue;
+use Deserializers\DispatchableDeserializer;
+use Deserializers\Exceptions\DeserializationException;
+use Deserializers\Exceptions\MissingAttributeException;
+use Deserializers\Exceptions\MissingTypeException;
+use Deserializers\Exceptions\UnsupportedTypeException;
+use InvalidArgumentException;
+use RuntimeException;
+
+/**
+ * @since 0.1
+ *
+ * @license GPL-2.0+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ * @author Thiemo M├Ąttig
+ */
+class DataValueDeserializer implements DispatchableDeserializer {
+
+       const TYPE_KEY = 'type';
+       const VALUE_KEY = 'value';
+
+       /**
+        * @var array Associative array mapping data type IDs to either 
callables returning new
+        *  DataValue objects, or full qualified DataValue class names.
+        */
+       private $builders;
+
+       private $serialization;
+
+       /**
+        * @since 0.1, callables are supported since 1.1
+        *
+        * @param array $builders Associative array mapping data type IDs to 
either callables, or full
+        *  qualified class names. Callables must accept a single value as 
specified by the
+        *  corresponding DataValue::getArrayValue, and return a new DataValue 
object. DataValue classes
+        *  given via class name must implement a static newFromArray method 
doing the same.
+        */
+       public function __construct( array $builders = array() ) {
+               $this->assertAreDataValueClasses( $builders );
+               $this->builders = $builders;
+       }
+
+       private function assertAreDataValueClasses( array $builders ) {
+               foreach ( $builders as $type => $builder ) {
+                       if ( !is_string( $type )
+                               || ( !is_callable( $builder ) && 
!$this->isDataValueClass( $builder ) )
+                       ) {
+                               $message = '$builders must map data types to 
callables or class names';
+                               if ( is_string( $builder ) ) {
+                                       $message .= ". '$builder' is not a 
DataValue class.";
+                               }
+                               throw new InvalidArgumentException( $message );
+                       }
+               }
+       }
+
+       private function isDataValueClass( $class ) {
+               return is_string( $class )
+                       && class_exists( $class )
+                       && in_array( DataValue::class, class_implements( $class 
) );
+       }
+
+       /**
+        * @see DispatchableDeserializer::isDeserializerFor
+        *
+        * @param mixed $serialization
+        *
+        * @return bool
+        */
+       public function isDeserializerFor( $serialization ) {
+               $this->serialization = $serialization;
+
+               try {
+                       $this->assertCanDeserialize();
+                       return true;
+               } catch ( RuntimeException $ex ) {
+                       return false;
+               }
+       }
+
+       /**
+        * @see Deserializer::deserialize
+        *
+        * @param array $serialization
+        *
+        * @throws DeserializationException
+        * @return DataValue
+        */
+       public function deserialize( $serialization ) {
+               $this->serialization = $serialization;
+
+               $this->assertCanDeserialize();
+               return $this->getDeserialization();
+       }
+
+       private function assertCanDeserialize() {
+               $this->assertHasSupportedType();
+               $this->assertHasValue();
+       }
+
+       private function assertHasSupportedType() {
+               if ( !is_array( $this->serialization ) || !array_key_exists( 
self::TYPE_KEY, $this->serialization ) ) {
+                       throw new MissingTypeException();
+               }
+
+               if ( !$this->hasSupportedType() ) {
+                       throw new UnsupportedTypeException( $this->getType() );
+               }
+       }
+
+       private function assertHasValue() {
+               if ( !array_key_exists( self::VALUE_KEY, $this->serialization ) 
) {
+                       throw new MissingAttributeException( self::VALUE_KEY );
+               }
+       }
+
+       private function hasSupportedType() {
+               return array_key_exists( $this->getType(), $this->builders );
+       }
+
+       private function getType() {
+               return $this->serialization[self::TYPE_KEY];
+       }
+
+       /**
+        * @throws DeserializationException
+        * @return DataValue
+        */
+       private function getDeserialization() {
+               $builder = $this->builders[$this->getType()];
+
+               try {
+                       if ( is_callable( $builder ) ) {
+                               return $builder( $this->getValue() );
+                       }
+
+                       /** @var DataValue $builder */
+                       return $builder::newFromArray( $this->getValue() );
+               } catch ( InvalidArgumentException $ex ) {
+                       throw new DeserializationException( $ex->getMessage(), 
$ex );
+               }
+       }
+
+       private function getValue() {
+               return $this->serialization[self::VALUE_KEY];
+       }
+
+}
diff --git a/data-values/serialization/src/Serializers/DataValueSerializer.php 
b/data-values/serialization/src/Serializers/DataValueSerializer.php
new file mode 100644
index 0000000..ce40108
--- /dev/null
+++ b/data-values/serialization/src/Serializers/DataValueSerializer.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace DataValues\Serializers;
+
+use DataValues\DataValue;
+use Serializers\DispatchableSerializer;
+use Serializers\Exceptions\UnsupportedObjectException;
+
+/**
+ * @since 0.1
+ *
+ * @license GPL-2.0+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class DataValueSerializer implements DispatchableSerializer {
+
+       /**
+        * @see Serializer::serialize
+        *
+        * @param DataValue $object
+        *
+        * @throws UnsupportedObjectException
+        * @return array
+        */
+       public function serialize( $object ) {
+               if ( $this->isSerializerFor( $object ) ) {
+                       return $this->getSerializedDataValue( $object );
+               }
+
+               throw new UnsupportedObjectException(
+                       $object,
+                       'DataValueSerializer can only serialize DataValue 
objects'
+               );
+       }
+
+       protected function getSerializedDataValue( DataValue $dataValue ) {
+               return $dataValue->toArray();
+       }
+
+       /**
+        * @see DispatchableSerializer::isSerializerFor
+        *
+        * @param mixed $object
+        *
+        * @return bool
+        */
+       public function isSerializerFor( $object ) {
+               return is_object( $object ) && $object instanceof DataValue;
+       }
+
+}
diff --git 
a/data-values/serialization/tests/Deserializers/DataValueDeserializerTest.php 
b/data-values/serialization/tests/Deserializers/DataValueDeserializerTest.php
new file mode 100644
index 0000000..1fd4528
--- /dev/null
+++ 
b/data-values/serialization/tests/Deserializers/DataValueDeserializerTest.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Tests\DataValues\Deserializers;
+
+use DataValues\BooleanValue;
+use DataValues\DataValue;
+use DataValues\Deserializers\DataValueDeserializer;
+use DataValues\NumberValue;
+use DataValues\StringValue;
+use Deserializers\Exceptions\DeserializationException;
+use Deserializers\Exceptions\MissingAttributeException;
+use Deserializers\Exceptions\MissingTypeException;
+use Deserializers\Exceptions\UnsupportedTypeException;
+use InvalidArgumentException;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @covers DataValues\Deserializers\DataValueDeserializer
+ *
+ * @license GPL-2.0+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class DataValueDeserializerTest extends PHPUnit_Framework_TestCase {
+
+       public function testGivenEmptyArray_isDeserializerForReturnsFalse() {
+               $deserializer = $this->newDeserializer();
+               $this->assertFalse( $deserializer->isDeserializerFor( array() ) 
);
+       }
+
+       private function newDeserializer() {
+               return new DataValueDeserializer( array(
+                       'boolean' => function( $bool ) {
+                               return new BooleanValue( $bool );
+                       },
+                       'number' => NumberValue::class,
+                       'string' => StringValue::class,
+               ) );
+       }
+
+       /**
+        * @dataProvider notAnArrayProvider
+        */
+       public function testGivenNonArray_isDeserializerForReturnsFalse( 
$notAnArray ) {
+               $deserializer = $this->newDeserializer();
+               $this->assertFalse( $deserializer->isDeserializerFor( 
$notAnArray ) );
+       }
+
+       public function notAnArrayProvider() {
+               return array(
+                       array( null ),
+                       array( 0 ),
+                       array( true ),
+                       array( (object)array() ),
+                       array( 'foo' ),
+               );
+       }
+
+       /**
+        * @dataProvider notADataValuesListProvider
+        */
+       public function testGivenNonDataValues_constructorThrowsException( 
array $invalidDVList ) {
+               $this->setExpectedException( InvalidArgumentException::class );
+
+               new DataValueDeserializer( $invalidDVList );
+       }
+
+       public function notADataValuesListProvider() {
+               return array(
+                       array(
+                               array(
+                                       'foo',
+                                       null,
+                                       array(),
+                                       true,
+                                       42,
+                               )
+                       ),
+                       array(
+                               array(
+                                       'string' => 'foo',
+                               )
+                       ),
+                       array(
+                               array(
+                                       'string' => StringValue::class,
+                                       'number' => 42,
+                               )
+                       ),
+                       array(
+                               array(
+                                       'string' => StringValue::class,
+                                       'object' => 'stdClass',
+                               )
+                       )
+               );
+       }
+
+       public function 
testGivenSerializationNoType_deserializeThrowsException() {
+               $deserializer = $this->newDeserializer();
+
+               $this->setExpectedException( MissingTypeException::class );
+               $deserializer->deserialize( array() );
+       }
+
+       public function 
testGivenSerializationWithUnknownType_deserializeThrowsException() {
+               $deserializer = $this->newDeserializer();
+
+               $this->setExpectedException( UnsupportedTypeException::class );
+               $deserializer->deserialize(
+                       array(
+                               'type' => 'ohi'
+                       )
+               );
+       }
+
+       public function 
testGivenSerializationWithNoValue_deserializeThrowsException() {
+               $deserializer = $this->newDeserializer();
+
+               $this->setExpectedException( MissingAttributeException::class );
+               $deserializer->deserialize(
+                       array(
+                               'type' => 'number'
+                       )
+               );
+       }
+
+       /**
+        * @dataProvider invalidDataValueSerializationProvider
+        */
+       public function testGivenInvalidDataValue_deserializeThrowsException( 
$invalidSerialization ) {
+               $deserializer = $this->newDeserializer();
+
+               $this->setExpectedException( DeserializationException::class );
+               $deserializer->deserialize( $invalidSerialization );
+       }
+
+       public function invalidDataValueSerializationProvider() {
+               return [
+                       [ 'foo' ],
+                       [ null ],
+                       [ [] ],
+                       [ [ 'hax' ] ],
+                       [ [ 'type' => 'hax' ] ],
+                       [ [ 'type' => 'number', 'value' => [] ] ],
+                       [ [ 'type' => 'boolean', 'value' => 'not a boolean' ] ],
+               ];
+       }
+
+       public function 
testInvalidValueSerialization_throwsDeserializationException() {
+               $serialization = array(
+                       'value' => array( 0, 0 ),
+                       'type' => 'string',
+                       'error' => 'omg an error!'
+               );
+
+               $deserializer = $this->newDeserializer();
+               $this->setExpectedException( DeserializationException::class );
+               $deserializer->deserialize( $serialization );
+       }
+
+       /**
+        * @dataProvider dataValueSerializationProvider
+        */
+       public function 
testGivenDataValueSerialization_isDeserializerForReturnsTrue( $dvSerialization 
) {
+               $deserializer = $this->newDeserializer();
+               $this->assertTrue( $deserializer->isDeserializerFor( 
$dvSerialization ) );
+       }
+
+       public function dataValueSerializationProvider() {
+               $boolean = new BooleanValue( false );
+               $string = new StringValue( 'foo bar baz' );
+               $number = new NumberValue( 42 );
+
+               return array(
+                       array( $boolean->toArray(), 'boolean' ),
+                       array( $string->toArray(), 'string' ),
+                       array( $number->toArray(), 'number' ),
+               );
+       }
+
+       /**
+        * @dataProvider dataValueSerializationProvider
+        */
+       public function 
testGivenDataValueSerialization_deserializeReturnsDataValue( $dvSerialization, 
$expectedType ) {
+               $deserializer = $this->newDeserializer();
+
+               $dataValue = $deserializer->deserialize( $dvSerialization );
+
+               $this->assertInstanceOf( DataValue::class, $dataValue );
+               $this->assertEquals( $expectedType, $dataValue->getType() );
+       }
+
+}
diff --git 
a/data-values/serialization/tests/Serializers/DataValueSerializerTest.php 
b/data-values/serialization/tests/Serializers/DataValueSerializerTest.php
new file mode 100644
index 0000000..fe3acfa
--- /dev/null
+++ b/data-values/serialization/tests/Serializers/DataValueSerializerTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\DataValues\Serializers;
+
+use DataValues\DataValue;
+use DataValues\NumberValue;
+use DataValues\Serializers\DataValueSerializer;
+use DataValues\StringValue;
+use PHPUnit_Framework_TestCase;
+use Serializers\Exceptions\SerializationException;
+
+/**
+ * @covers DataValues\Serializers\DataValueSerializer
+ *
+ * @license GPL-2.0+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class DataValueSerializerTest extends PHPUnit_Framework_TestCase {
+
+       /**
+        * @dataProvider notADataValueProvider
+        */
+       public function testGivenNonDataValue_IsSerializerForReturnsFalse( 
$notAnObject ) {
+               $serializer = new DataValueSerializer();
+
+               $this->assertFalse( $serializer->isSerializerFor( $notAnObject 
) );
+       }
+
+       public function notADataValueProvider() {
+               return array(
+                       array( 0 ),
+                       array( null ),
+                       array( '' ),
+                       array( array() ),
+                       array( true ),
+                       array( 4.2 ),
+                       array( (object)array() ),
+                       array( new \Exception() ),
+               );
+       }
+
+       /**
+        * @dataProvider dataValueProvider
+        */
+       public function testGivenDataValue_IsSerializerForReturnsTrue( 
DataValue $dataValue ) {
+               $serializer = new DataValueSerializer();
+
+               $this->assertTrue( $serializer->isSerializerFor( $dataValue ) );
+       }
+
+       public function dataValueProvider() {
+               return array(
+                       array( new StringValue( 'foo' ) ),
+                       array( new NumberValue( 42 ) ),
+               );
+       }
+
+       /**
+        * @dataProvider notADataValueProvider
+        */
+       public function testWhenGivenNonDataValue_SerializeThrowsException( 
$notAnObject ) {
+               $serializer = new DataValueSerializer();
+
+               $this->setExpectedException( SerializationException::class );
+               $serializer->serialize( $notAnObject );
+       }
+
+       public function testWhenGivenDataValue_SerializeCallsToArray() {
+               $returnValue = 'expected return value';
+
+               $serializer = new DataValueSerializer();
+
+               $dataValue = $this->getMock( DataValue::class );
+               $dataValue->expects( $this->once() )
+                       ->method( 'toArray' )
+                       ->will( $this->returnValue( $returnValue ) );
+
+               $this->assertEquals( $returnValue, $serializer->serialize( 
$dataValue ) );
+       }
+
+}
diff --git a/data-values/serialization/tests/bootstrap.php 
b/data-values/serialization/tests/bootstrap.php
new file mode 100644
index 0000000..ac82d46
--- /dev/null
+++ b/data-values/serialization/tests/bootstrap.php
@@ -0,0 +1,14 @@
+<?php
+
+if ( PHP_SAPI !== 'cli' ) {
+       die( 'Not an entry point' );
+}
+
+error_reporting( E_ALL | E_STRICT );
+ini_set( 'display_errors', 1 );
+
+if ( !is_readable( __DIR__ . '/../vendor/autoload.php' ) ) {
+       die( 'You need to install this package with Composer before you can run 
the tests' );
+}
+
+require_once __DIR__ . '/../vendor/autoload.php';

-- 
To view, visit https://gerrit.wikimedia.org/r/368375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6858c3d66a74d70332750e8e742b21b78f213d99
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to