Merge pull request #549 from wmde/rel420

addshore · addshore · commit f4f60f607cc5 · 2015-08-26T20:50:43.000+02:00
4.2.0 release
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,8 +1,11 @@
 # Wikibase DataModel release notes
 
-## Version 4.2 (dev)
+## Version 4.2 (2015-08-26)
 
 * Added `EntityRedirect`
+* Added `EntityIdParser` and `EntityIdParsingException`
+* Added `BasicEntityIdParser`
+* Added `DispatchingEntityIdParser`
 * Removed no longer needed dependency on `diff/diff`
 
 ## Version 4.1 (2015-08-04)
diff --git a/WikibaseDataModel.php b/WikibaseDataModel.php
@@ -12,7 +12,7 @@
 	return 1;
 }
 
-define( 'WIKIBASE_DATAMODEL_VERSION', '4.0.0' );
+define( 'WIKIBASE_DATAMODEL_VERSION', '4.2.0' );
 
 if ( defined( 'MEDIAWIKI' ) ) {
 	call_user_func( function() {
diff --git a/src/Entity/EntityIdParser.php b/src/Entity/EntityIdParser.php
@@ -13,8 +13,6 @@
 interface EntityIdParser {
 
 	/**
-	 * @since 1.0
-	 *
 	 * @param string $idSerialization
 	 *
 	 * @return EntityId

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`return 1;`
`13`	`13`	`}`
`14`	`14`
`15`		`-define( 'WIKIBASE_DATAMODEL_VERSION', '4.0.0' );`
	`15`	`+define( 'WIKIBASE_DATAMODEL_VERSION', '4.2.0' );`
`16`	`16`
`17`	`17`	`if ( defined( 'MEDIAWIKI' ) ) {`
`18`	`18`	`call_user_func( function() {`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`interface EntityIdParser {`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * @since 1.0`
`17`		`- *`
`18`	`16`	`* @param string $idSerialization`
`19`	`17`	`*`
`20`	`18`	`* @return EntityId`