Merge pull request #148 from wmde/aliaskiller

Benestar · Benestar · commit 8e0c2e14092b · 2014-08-20T20:42:41.000+02:00
Kill all the aliases!

Actually the aliases are still alive, they are only no longer used in this repository.
diff --git a/src/Snak/SnakList.php b/src/Snak/SnakList.php
@@ -25,7 +25,7 @@ class SnakList extends HashArray implements Snaks {
 	 * @return string
 	 */
 	public function getObjectType() {
-		return '\Wikibase\DataModel\Snak\Snak';
+		return 'Wikibase\DataModel\Snak\Snak';
 	}
 
 	/**
diff --git a/tests/unit/ByPropertyIdArrayTest.php b/tests/unit/ByPropertyIdArrayTest.php
@@ -52,7 +52,7 @@ public function testArrayObjectNotConstructedFromObject() {
 	 * @return ReflectionMethod
 	 */
 	protected static function getMethod( $methodName ) {
-		$class = new ReflectionClass( '\Wikibase\ByPropertyIdArray' );
+		$class = new ReflectionClass( 'Wikibase\DataModel\ByPropertyIdArray' );
 		$method = $class->getMethod( $methodName );
 		$method->setAccessible( true );
 		return $method;
diff --git a/tests/unit/Claim/ClaimTest.php b/tests/unit/Claim/ClaimTest.php
@@ -66,7 +66,7 @@ function( array $arguments ) {
 	public function testConstructor( Snak $snak, Snaks $qualifiers = null ) {
 		$claim = new Claim( $snak, $qualifiers );
 
-		$this->assertInstanceOf( '\Wikibase\Claim', $claim );
+		$this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claim', $claim );
 
 		$this->assertEquals( $snak, $claim->getMainSnak() );
 
diff --git a/tests/unit/Claim/StatementTest.php b/tests/unit/Claim/StatementTest.php
@@ -66,7 +66,7 @@ public function instanceProvider() {
 	 * @dataProvider instanceProvider
 	 */
 	public function testGetReferences( Statement $statement ) {
-		$this->assertInstanceOf( '\Wikibase\References', $statement->getReferences() );
+		$this->assertInstanceOf( 'Wikibase\DataModel\References', $statement->getReferences() );
 	}
 
 	/**
@@ -133,7 +133,7 @@ public function testStatementRankCompatibility() {
 	 * @dataProvider instanceProvider
 	 */
 	public function testIsClaim( Statement $statement ) {
-		$this->assertInstanceOf( '\Wikibase\Claim', $statement );
+		$this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claim', $statement );
 	}
 
 	/**
diff --git a/tests/unit/Entity/EntityTest.php b/tests/unit/Entity/EntityTest.php
@@ -444,7 +444,7 @@ public function testNewClaim( Entity $entity ) {
 		$claim = new Statement( $snak );
 		$claim->setGuid( 'q42$foobarbaz' );
 
-		$this->assertInstanceOf( '\Wikibase\Claim', $claim );
+		$this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claim', $claim );
 
 		$this->assertTrue( $snak->equals( $claim->getMainSnak() ) );
 
diff --git a/tests/unit/Entity/ItemTest.php b/tests/unit/Entity/ItemTest.php
@@ -10,9 +10,9 @@
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Claim\Claims;
 use Wikibase\DataModel\Claim\Statement;
+use Wikibase\DataModel\Entity\Diff\ItemDiff;
 use Wikibase\DataModel\Entity\EntityIdValue;
 use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Entity\Diff\ItemDiff;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\ItemIdSet;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/tests/unit/EntityDiffTest.php b/tests/unit/EntityDiffTest.php
@@ -118,7 +118,7 @@ public function testGetClaimsDiff( EntityDiff $entityDiff ) {
 			$this->assertTrue( $diffOp instanceof DiffOpAdd || $diffOp instanceof DiffOpRemove );
 
 			$claim = $diffOp instanceof DiffOpAdd ? $diffOp->getNewValue() : $diffOp->getOldValue();
-			$this->assertInstanceOf( '\Wikibase\Claim', $claim );
+			$this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claim', $claim );
 		}
 	}
 
diff --git a/tests/unit/HashArray/HashArrayWithDuplicatesTest.php b/tests/unit/HashArray/HashArrayWithDuplicatesTest.php
@@ -27,7 +27,7 @@ public function constructorProvider() {
 	}
 
 	public function getInstanceClass() {
-		return '\Wikibase\Test\HashArray\HashArrayWithDuplicates';
+		return 'Wikibase\Test\HashArray\HashArrayWithDuplicates';
 	}
 
 	public function elementInstancesProvider() {
diff --git a/tests/unit/HashArray/HashArrayWithoutDuplicatesTest.php b/tests/unit/HashArray/HashArrayWithoutDuplicatesTest.php
@@ -26,7 +26,7 @@ public function constructorProvider() {
 	}
 
 	public function getInstanceClass() {
-		return '\Wikibase\Test\HashArray\HashArrayWithoutDuplicates';
+		return 'Wikibase\Test\HashArray\HashArrayWithoutDuplicates';
 	}
 
 	public function elementInstancesProvider() {
@@ -128,5 +128,3 @@ public function __construct( $input = null ) {
 	}
 
 }
-
-
diff --git a/tests/unit/ReferenceTest.php b/tests/unit/ReferenceTest.php
@@ -86,7 +86,7 @@ public function instanceProvider() {
 	public function testConstructor( Snaks $snaks ) {
 		$omnomnomReference = new Reference( $snaks );
 
-		$this->assertInstanceOf( '\Wikibase\Reference', $omnomnomReference );
+		$this->assertInstanceOf( 'Wikibase\DataModel\Reference', $omnomnomReference );
 
 		$this->assertEquals( $snaks, $omnomnomReference->getSnaks() );
 	}
@@ -119,7 +119,7 @@ public function testGetHashIsTheSameForInstanceWithSameValue( Reference $referen
 	public function testGetSnaks( Reference $reference ) {
 		$snaks = $reference->getSnaks();
 
-		$this->assertInstanceOf( '\Wikibase\Snaks', $snaks );
+		$this->assertInstanceOf( 'Wikibase\DataModel\Snak\Snaks', $snaks );
 	}
 
 	/**
diff --git a/tests/unit/Snak/SnakListTest.php b/tests/unit/Snak/SnakListTest.php
@@ -33,7 +33,7 @@ class SnakListTest extends HashArrayTest {
 	 * @see GenericArrayObjectTest::getInstanceClass
 	 */
 	public function getInstanceClass() {
-		return '\Wikibase\SnakList';
+		return 'Wikibase\DataModel\Snak\SnakList';
 	}
 
 	/**
diff --git a/tests/unit/Snak/SnakTest.php b/tests/unit/Snak/SnakTest.php
@@ -70,7 +70,7 @@ public function testGetType( Snak $snak ) {
 	 * @param Snak $snak
 	 */
 	public function testGetPropertyId( Snak $snak ) {
-		$this->assertInstanceOf( '\Wikibase\EntityId', $snak->getPropertyId() );
+		$this->assertInstanceOf( 'Wikibase\DataModel\Entity\EntityId', $snak->getPropertyId() );
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class SnakList extends HashArray implements Snaks {`
`25`	`25`	`* @return string`
`26`	`26`	`*/`
`27`	`27`	`public function getObjectType() {`
`28`		`- return '\Wikibase\DataModel\Snak\Snak';`
	`28`	`+ return 'Wikibase\DataModel\Snak\Snak';`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function testGetClaimsDiff( EntityDiff $entityDiff ) {`
`118`	`118`	`$this->assertTrue( $diffOp instanceof DiffOpAdd \|\| $diffOp instanceof DiffOpRemove );`
`119`	`119`
`120`	`120`	`$claim = $diffOp instanceof DiffOpAdd ? $diffOp->getNewValue() : $diffOp->getOldValue();`
`121`		`- $this->assertInstanceOf( '\Wikibase\Claim', $claim );`
	`121`	`+ $this->assertInstanceOf( 'Wikibase\DataModel\Claim\Claim', $claim );`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function constructorProvider() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public function getInstanceClass() {`
`30`		`- return '\Wikibase\Test\HashArray\HashArrayWithDuplicates';`
	`30`	`+ return 'Wikibase\Test\HashArray\HashArrayWithDuplicates';`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function elementInstancesProvider() {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function constructorProvider() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public function getInstanceClass() {`
`29`		`- return '\Wikibase\Test\HashArray\HashArrayWithoutDuplicates';`
	`29`	`+ return 'Wikibase\Test\HashArray\HashArrayWithoutDuplicates';`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function elementInstancesProvider() {`
`@@ -128,5 +128,3 @@ public function __construct( $input = null ) {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`}`
`131`		`-`
`132`		`-`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function instanceProvider() {`
`86`	`86`	`public function testConstructor( Snaks $snaks ) {`
`87`	`87`	`$omnomnomReference = new Reference( $snaks );`
`88`	`88`
`89`		`- $this->assertInstanceOf( '\Wikibase\Reference', $omnomnomReference );`
	`89`	`+ $this->assertInstanceOf( 'Wikibase\DataModel\Reference', $omnomnomReference );`
`90`	`90`
`91`	`91`	`$this->assertEquals( $snaks, $omnomnomReference->getSnaks() );`
`92`	`92`	`}`
`@@ -119,7 +119,7 @@ public function testGetHashIsTheSameForInstanceWithSameValue( Reference $referen`
`119`	`119`	`public function testGetSnaks( Reference $reference ) {`
`120`	`120`	`$snaks = $reference->getSnaks();`
`121`	`121`
`122`		`- $this->assertInstanceOf( '\Wikibase\Snaks', $snaks );`
	`122`	`+ $this->assertInstanceOf( 'Wikibase\DataModel\Snak\Snaks', $snaks );`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`/**`