Merge pull request #406 from wmde/masterAsOf2015-03-13

Merge master into 3.0.x-dev

Author: JeroenDeDauw

.travis.yml

@@ -8,6 +8,10 @@ php:
   - hhvm
   - hhvm-nightly
 
+matrix:
+  allow_failures:
+    - php: hhvm-nightly
+
 before_script: composer install --prefer-source
 
 sudo: false

README.md

@@ -11,7 +11,7 @@
 [![Latest Unstable Version](https://poser.pugx.org/wikibase/data-model/v/unstable.svg)](//packagist.org/packages/wikibase/data-model)
 
 **Wikibase DataModel** is the canonical PHP implementation of the
-[Data Model](https://meta.wikimedia.org/wiki/Wikidata/Data_model)
+[Data Model](https://www.mediawiki.org/wiki/Wikibase/DataModel)
 at the heart of the [Wikibase software](http://wikiba.se/).
 
 It is primarily used by the Wikibase MediaWiki extensions, though

RELEASE-NOTES.md

@@ -10,9 +10,12 @@
 	* Removed `ClaimList`
 	* Removed `ClaimListAccess`
 
-## Version 2.6.0 (dev)
+## Version 2.6.0 (2015-03-08)
 
+* Added `Reference::isEmpty`
 * Empty strings are now detected as invalid in the `SiteLink` constructor
+* Empty References are now ignored when added to `ReferenceList`
+* The `ReferenceList` constructor now throws an `InvalidArgumentException` when getting a non-iterable input
 * The `SnakList` constructor now throws an `InvalidArgumentException` when getting a non-iterable input
 * The `AliasGroup::equals` and `Term::equals` methods no longer incorrectly return true for fallback objects
 

composer.json

@@ -44,16 +44,16 @@
 		}
 	},
 	"scripts": {
-		"ci": [
-			"composer test",
-			"composer cs"
-		],
 		"test": [
 			"composer validate --no-interaction",
 			"phpunit"
 		],
 		"cs": [
-			"phpcs src/* tests/* --standard=phpcs.xml --extensions=php -sp"
+			"vendor/bin/phpcs src/* tests/* --standard=phpcs.xml --extensions=php -sp"
+		],
+		"ci": [
+			"composer test",
+			"composer cs"
 		]
 	}
 }

src/Entity/DispatchingEntityIdParser.php

@@ -39,13 +39,19 @@ public function __construct( array $idBuilders ) {
 	public function parse( $idSerialization ) {
 		$this->assertIdIsString( $idSerialization );
 
+		if ( empty( $this->idBuilders ) ) {
+			throw new EntityIdParsingException( 'No id builders are configured' );
+		}
+
 		foreach ( $this->idBuilders as $idPattern => $idBuilder ) {
 			if ( preg_match( $idPattern, $idSerialization ) ) {
 				return $this->buildId( $idBuilder, $idSerialization );
 			}
 		}
 
-		throw $this->newInvalidIdException( $idSerialization );
+		throw new EntityIdParsingException(
+			"The serialization \"$idSerialization\" is not recognized by the configured id builders"
+		);
 	}
 
 	/**
@@ -55,7 +61,7 @@ public function parse( $idSerialization ) {
 	 */
 	private function assertIdIsString( $idSerialization ) {
 		if ( !is_string( $idSerialization ) ) {
-			throw new EntityIdParsingException( '$idSerialization must be a string; got ' . gettype( $idSerialization ) );
+			throw new EntityIdParsingException( '$idSerialization must be a string' );
 		}
 	}
 
@@ -69,21 +75,10 @@ private function assertIdIsString( $idSerialization ) {
 	private function buildId( $idBuilder, $idSerialization ) {
 		try {
 			return call_user_func( $idBuilder, $idSerialization );
+		} catch ( InvalidArgumentException $ex ) {
+			// Should not happen, but if it does, re-throw the original message
+			throw new EntityIdParsingException( $ex->getMessage() );
 		}
-		catch ( InvalidArgumentException $ex ) {
-			throw $this->newInvalidIdException( $idSerialization );
-		}
-	}
-
-	/**
-	 * @param string $idSerialization
-	 *
-	 * @return EntityIdParsingException
-	 */
-	private function newInvalidIdException( $idSerialization ) {
-		return new EntityIdParsingException(
-			'The provided id serialization "' . $idSerialization . '" is not valid'
-		);
 	}
 
 }

src/Entity/EntityIdValue.php

@@ -42,10 +42,10 @@ public function serialize() {
 	 * though cannot be removed until we ditch the "numeric id" part
 	 * from the serialization.
 	 *
-	 * @return double Numeric id as a whole number. Can not be int because of 32-bit PHP.
+	 * @return float Numeric id as a whole number. Can not be int because of 32-bit PHP.
 	 */
 	protected function getNumericId() {
-		return doubleval( substr( $this->entityId->getSerialization(), 1 ) );
+		return floatval( substr( $this->entityId->getSerialization(), 1 ) );
 	}
 
 	/**

src/Entity/Item.php

@@ -238,7 +238,7 @@ public function clear() {
 	}
 
 	/**
-	 * @deprecated since 1.0, use getStatements instead
+	 * @deprecated since 1.0, use getStatements()->addStatement() instead.
 	 *
 	 * @param Claim $statement This needs to be a Statement as of 1.0
 	 *
@@ -273,7 +273,7 @@ public function setStatements( StatementList $statements ) {
 	}
 
 	/**
-	 * @deprecated since 1.0, use getStatements instead
+	 * @deprecated since 1.0, use getStatements()->toArray() instead.
 	 *
 	 * @return Statement[]
 	 */
@@ -291,7 +291,7 @@ public function setClaims( Claims $claims ) {
 	}
 
 	/**
-	 * @deprecated since 1.0, use getStatements instead
+	 * @deprecated since 1.0, use getStatements()->isEmpty() instead.
 	 *
 	 * @return bool
 	 */

src/Entity/Property.php

@@ -206,7 +206,7 @@ public function setStatements( StatementList $statements ) {
 	}
 
 	/**
-	 * @deprecated since 1.0, use getStatements instead
+	 * @deprecated since 1.0, use getStatements()->toArray() instead.
 	 *
 	 * @return Statement[]
 	 */
@@ -224,7 +224,7 @@ public function setClaims( Claims $claims ) {
 	}
 
 	/**
-	 * @deprecated since 1.0, use getStatements instead
+	 * @deprecated since 1.0, use getStatements()->isEmpty() instead.
 	 *
 	 * @return bool
 	 */
@@ -244,7 +244,7 @@ public function newClaim( Snak $mainSnak ) {
 	}
 
 	/**
-	 * @deprecated since 1.0, use getStatements instead
+	 * @deprecated since 1.0, use getStatements()->addStatement() instead.
 	 *
 	 * @param Claim $statement This needs to be a Statement as of 1.0
 	 *

src/Reference.php

@@ -67,6 +67,15 @@ public function count() {
 		return count( $this->snaks );
 	}
 
+	/**
+	 * @since 2.6
+	 *
+	 * @return bool
+	 */
+	public function isEmpty() {
+		return $this->snaks->isEmpty();
+	}
+
 	/**
 	 * @see Hashable::getHash
 	 *

src/ReferenceList.php

@@ -4,6 +4,7 @@
 
 use Hashable;
 use InvalidArgumentException;
+use Traversable;
 use Wikibase\DataModel\Snak\Snak;
 use Wikibase\DataModel\Snak\SnakList;
 
@@ -21,9 +22,33 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  * @author H. Snater < mediawiki@snater.com >
+ * @author Thiemo Mättig
  */
 class ReferenceList extends HashableObjectStorage {
 
+	/**
+	 * @param Reference[]|Traversable|null $references
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct( $references = null ) {
+		if ( $references === null ) {
+			return;
+		}
+
+		if ( !is_array( $references ) && !( $references instanceof Traversable ) ) {
+			throw new InvalidArgumentException( '$references must be an array or an instance of Traversable' );
+		}
+
+		foreach ( $references as $reference ) {
+			if ( !( $reference instanceof Reference ) ) {
+				throw new InvalidArgumentException( 'Every element in $references must be an instance of Reference' );
+			}
+
+			$this->addReference( $reference );
+		}
+	}
+
 	/**
 	 * Adds the provided reference to the list.
 	 *
@@ -45,6 +70,17 @@ public function addReference( Reference $reference, $index = null ) {
 		}
 	}
 
+	/**
+	 * @see SplObjectStorage::attach
+	 * @param Reference $reference
+	 * @param mixed $data
+	 */
+	public function attach( $reference, $data = null ) {
+		if ( !$reference->isEmpty() ) {
+			parent::attach( $reference, $data );
+		}
+	}
+
 	// @codingStandardsIgnoreStart
 	/**
 	 * @since 1.1