Merge pull request #698 from wmde/noNewFromNumber

Avoid calling EntityId::newFromNumber when not needed

Author: manicki

tests/unit/ByPropertyIdArrayTest.php

@@ -211,14 +211,14 @@ public function testGetByNotSetIdThrowsException() {
 
 		$this->setExpectedException( 'OutOfBoundsException' );
 
-		$indexedArray->getByPropertyId( PropertyId::newFromNumber( 9000 ) );
+		$indexedArray->getByPropertyId( new PropertyId( 'P9000' ) );
 	}
 
 	public function testNotBuildExceptionIsThrownForByPropertyId() {
 		$indexedArray = new ByPropertyIdArray();
 
 		$this->setExpectedException( 'RuntimeException' );
-		$indexedArray->getByPropertyId( PropertyId::newFromNumber( 9000 ) );
+		$indexedArray->getByPropertyId( new PropertyId( 'P9000' ) );
 	}
 
 	public function testNotBuildExceptionIsThrownForGetPropertyIds() {

tests/unit/Entity/EntityIdTest.php

@@ -4,7 +4,6 @@
 
 use ReflectionClass;
 use InvalidArgumentException;
-use RuntimeException;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;

tests/unit/Statement/StatementListTest.php

@@ -42,7 +42,7 @@ private function getStatement( $propertyId, $guid, $rank = Statement::RANK_NORMA
 
 		$statement->expects( $this->any() )
 			->method( 'getPropertyId' )
-			->will( $this->returnValue( PropertyId::newFromNumber( $propertyId ) ) );
+			->will( $this->returnValue( new PropertyId( 'P' . $propertyId ) ) );
 
 		$statement->expects( $this->any() )
 			->method( 'getRank' )