Merge pull request #26 from DataValues/release120

JeroenDeDauw · web-flow · commit f872b09fa421 · 2017-01-31T16:39:39.000+01:00
Release 1.2.0
diff --git a/README.md b/README.md
@@ -49,6 +49,11 @@ as [Wikimedia Germany](https://wikimedia.de) employee for the [Wikidata project]
 
 ## Release notes
 
+### 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`
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.1.x-dev"
+			"dev-master": "1.2.x-dev"
 		}
 	},
 	"scripts": {
diff --git a/src/Serializers/DataValueSerializer.php b/src/Serializers/DataValueSerializer.php
@@ -20,7 +20,7 @@ class DataValueSerializer implements DispatchableSerializer {
 	 * @param DataValue $object
 	 *
 	 * @throws UnsupportedObjectException
-	 * @return array|int|string|bool|float
+	 * @return array
 	 */
 	public function serialize( $object ) {
 		if ( $this->isSerializerFor( $object ) ) {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class DataValueSerializer implements DispatchableSerializer {`
`20`	`20`	`* @param DataValue $object`
`21`	`21`	`*`
`22`	`22`	`* @throws UnsupportedObjectException`
`23`		`- * @return array\|int\|string\|bool\|float`
	`23`	`+ * @return array`
`24`	`24`	`*/`
`25`	`25`	`public function serialize( $object ) {`
`26`	`26`	`if ( $this->isSerializerFor( $object ) ) {`