Merge pull request #36 from DataValues/release031

Release 0.3.1
DataValues · Aug 14, 2015 · 5d9d4bf · 5d9d4bf
2 parents 7d59053 + b3d7108
commit 5d9d4bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Common.php b/Common.php
@@ -15,7 +15,7 @@
 	return 1;
 }
 
-define( 'DATAVALUES_COMMON_VERSION', '0.3.0' );
+define( 'DATAVALUES_COMMON_VERSION', '0.3.1' );
 
 if ( defined( 'MEDIAWIKI' ) ) {
 	$GLOBALS['wgExtensionCredits']['datavalues'][] = array(

diff --git a/README.md b/README.md
@@ -49,6 +49,10 @@ DataValues Common has been written by the Wikidata team, as [Wikimedia Germany]
 
 ## Release notes
 
+### 0.3.1 (2015-08-14)
+
+* The component can now be installed together with DataValues Interfaces 0.1.5
+
 ### 0.3.0 (2015-08-11)
 
 * Added `DispatchingValueParser`

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
 	"require": {
 		"php": ">=5.3.0",
 		"data-values/data-values": "~1.0|~0.1",
-		"data-values/interfaces": "~0.2.0"
+		"data-values/interfaces": "~0.2.0|^0.1.5"
 	},
 	"extra": {
 		"branch-alias": {

diff --git a/tests/ValueFormatters/StringFormatterTest.php b/tests/ValueFormatters/StringFormatterTest.php
@@ -17,6 +17,13 @@
  */
 class StringFormatterTest extends ValueFormatterTestBase {
 
+	/**
+	 * @deprecated since 0.2, just use getInstance.
+	 */
+	protected function getFormatterClass() {
+		throw new \LogicException( 'Should not be called, use getInstance' );
+	}
+
 	/**
 	 * @see ValueFormatterTestBase::getInstance
 	 *