"wikibase/wikibase-codesniffer": "~1.1.0"

addshore · addshore · commit f53d9debb1ad · 2020-01-24T18:12:14.000+01:00
All fixes were auto fixes
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
 		"ockcyp/covers-validator": "~0.5.0",
 		"phpmd/phpmd": "~2.6",
 		"phpunit/phpunit": "~5.7",
-		"wikibase/wikibase-codesniffer": "~1.0.0"
+		"wikibase/wikibase-codesniffer": "~1.1.0"
 	},
 	"autoload": {
 		"psr-4": {
diff --git a/tests/unit/Entity/EntityIdTest.php b/tests/unit/Entity/EntityIdTest.php
@@ -2,8 +2,8 @@
 
 namespace Wikibase\DataModel\Tests\Entity;
 
-use ReflectionClass;
 use InvalidArgumentException;
+use ReflectionClass;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -82,7 +82,7 @@ public function testSerializationStability() {
 	 * @dataProvider instanceProvider
 	 */
 	public function testReturnTypeOfToString( EntityId $id ) {
-		$this->assertInternalType( 'string', $id->__toString() );
+		$this->assertIsString( $id->__toString() );
 	}
 
 	public function testIsForeign() {
diff --git a/tests/unit/Entity/EntityIdValueTest.php b/tests/unit/Entity/EntityIdValueTest.php
@@ -76,7 +76,7 @@ public function testGetValue( EntityIdValue $id ) {
 	 * @dataProvider instanceProvider
 	 */
 	public function testGetSortKey( EntityIdValue $id ) {
-		$this->assertInternalType( 'string', $id->getSortKey() );
+		$this->assertIsString( $id->getSortKey() );
 	}
 
 	public function provideGetArrayValue() {
diff --git a/tests/unit/Entity/ItemIdSetTest.php b/tests/unit/Entity/ItemIdSetTest.php
@@ -40,7 +40,7 @@ public function serializationsProvider() {
 
 	public function testGivenEmptySet_countReturnsZero() {
 		$set = new ItemIdSet();
-		$this->assertEquals( 0, $set->count() );
+		$this->assertSame( 0, $set->count() );
 	}
 
 	public function testGivenSetWithTwoItems_countReturnsTwo() {
diff --git a/tests/unit/Entity/ItemIdTest.php b/tests/unit/Entity/ItemIdTest.php
@@ -2,8 +2,8 @@
 
 namespace Wikibase\DataModel\Tests\Entity;
 
-use Wikibase\DataModel\Entity\ItemId;
 use InvalidArgumentException;
+use Wikibase\DataModel\Entity\ItemId;
 
 /**
  * @covers \Wikibase\DataModel\Entity\ItemId
diff --git a/tests/unit/Entity/ItemTest.php b/tests/unit/Entity/ItemTest.php
@@ -571,7 +571,7 @@ public function testCopyRetainsLabels() {
 	public function testSerialize( Item $entity ) {
 		$string = serialize( $entity );
 
-		$this->assertInternalType( 'string', $string );
+		$this->assertIsString( $string );
 
 		$instance = unserialize( $string );
 
diff --git a/tests/unit/Entity/PropertyIdTest.php b/tests/unit/Entity/PropertyIdTest.php
@@ -2,8 +2,8 @@
 
 namespace Wikibase\DataModel\Tests\Entity;
 
-use Wikibase\DataModel\Entity\PropertyId;
 use InvalidArgumentException;
+use Wikibase\DataModel\Entity\PropertyId;
 
 /**
  * @covers \Wikibase\DataModel\Entity\PropertyId
diff --git a/tests/unit/Entity/PropertyTest.php b/tests/unit/Entity/PropertyTest.php
@@ -445,7 +445,7 @@ public function testCopyRetainsLabels() {
 	public function testSerialize( Property $entity ) {
 		$string = serialize( $entity );
 
-		$this->assertInternalType( 'string', $string );
+		$this->assertIsString( $string );
 
 		$instance = unserialize( $string );
 
diff --git a/tests/unit/ReferenceListTest.php b/tests/unit/ReferenceListTest.php
@@ -348,7 +348,7 @@ public function testEquals( ReferenceList $array ) {
 	 * @dataProvider instanceProvider
 	 */
 	public function testGetValueHashReturnsString( ReferenceList $array ) {
-		$this->assertInternalType( 'string', $array->getValueHash() );
+		$this->assertIsString( $array->getValueHash() );
 	}
 
 	/**
diff --git a/tests/unit/ReferenceTest.php b/tests/unit/ReferenceTest.php
@@ -85,7 +85,7 @@ public function testConstructor( SnakList $snaks ) {
 	 * @dataProvider instanceProvider
 	 */
 	public function testGetHashReturnsString( Reference $reference ) {
-		$this->assertInternalType( 'string', $reference->getHash() );
+		$this->assertIsString( $reference->getHash() );
 	}
 
 	/**
diff --git a/tests/unit/Snak/PropertyNoValueSnakTest.php b/tests/unit/Snak/PropertyNoValueSnakTest.php
@@ -64,7 +64,7 @@ public function testGetPropertyId() {
 	public function testGetHash() {
 		$snak = new PropertyNoValueSnak( new PropertyId( 'P1' ) );
 		$hash = $snak->getHash();
-		$this->assertInternalType( 'string', $hash );
+		$this->assertIsString( $hash );
 		$this->assertEquals( 40, strlen( $hash ) );
 	}
 
diff --git a/tests/unit/Snak/PropertySomeValueSnakTest.php b/tests/unit/Snak/PropertySomeValueSnakTest.php
@@ -64,7 +64,7 @@ public function testGetPropertyId() {
 	public function testGetHash() {
 		$snak = new PropertySomeValueSnak( new PropertyId( 'P1' ) );
 		$hash = $snak->getHash();
-		$this->assertInternalType( 'string', $hash );
+		$this->assertIsString( $hash );
 		$this->assertEquals( 40, strlen( $hash ) );
 	}
 
diff --git a/tests/unit/Snak/PropertyValueSnakTest.php b/tests/unit/Snak/PropertyValueSnakTest.php
@@ -75,7 +75,7 @@ public function testGetPropertyId() {
 	public function testGetHash() {
 		$snak = new PropertyValueSnak( new PropertyId( 'P1' ), new StringValue( 'a' ) );
 		$hash = $snak->getHash();
-		$this->assertInternalType( 'string', $hash );
+		$this->assertIsString( $hash );
 		$this->assertEquals( 40, strlen( $hash ) );
 	}
 
diff --git a/tests/unit/Snak/SnakListTest.php b/tests/unit/Snak/SnakListTest.php
@@ -355,7 +355,7 @@ public function testGetHash() {
 		$snakList = new SnakList( [ new PropertyNoValueSnak( 1 ) ] );
 		$hash = $snakList->getHash();
 
-		$this->assertInternalType( 'string', $hash, 'must be a string' );
+		$this->assertIsString( $hash, 'must be a string' );
 		$this->assertNotSame( '', $hash, 'must not be empty' );
 		$this->assertSame( $hash, $snakList->getHash(), 'second call must return the same hash' );
 
diff --git a/tests/unit/Snak/SnakTest.php b/tests/unit/Snak/SnakTest.php
@@ -62,7 +62,7 @@ public function snakProvider() {
 	 * @param Snak $snak
 	 */
 	public function testGetType( Snak $snak ) {
-		$this->assertInternalType( 'string', $snak->getType() );
+		$this->assertIsString( $snak->getType() );
 	}
 
 	/**
@@ -79,7 +79,7 @@ public function testGetPropertyId( Snak $snak ) {
 	 */
 	public function testSerialize( Snak $snak ) {
 		$serialization = serialize( $snak );
-		$this->assertInternalType( 'string', $serialization );
+		$this->assertIsString( $serialization );
 
 		$newInstance = unserialize( $serialization );
 		$this->assertInstanceOf( get_class( $snak ), $newInstance );
@@ -95,7 +95,7 @@ public function testSerialize( Snak $snak ) {
 	 */
 	public function testGetHash( Snak $snak ) {
 		$hash = $snak->getHash();
-		$this->assertInternalType( 'string', $hash );
+		$this->assertIsString( $hash );
 		$this->assertEquals( $hash, $snak->getHash() );
 	}
 
diff --git a/tests/unit/Statement/StatementGuidTest.php b/tests/unit/Statement/StatementGuidTest.php
@@ -3,9 +3,9 @@
 namespace Wikibase\DataModel\Tests\Statement;
 
 use InvalidArgumentException;
-use Wikibase\DataModel\Statement\StatementGuid;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Statement\StatementGuid;
 
 /**
  * @covers \Wikibase\DataModel\Statement\StatementGuid
diff --git a/tests/unit/Statement/StatementTest.php b/tests/unit/Statement/StatementTest.php
@@ -233,7 +233,7 @@ public function testAddNewReferenceWithAnArrayOfSnaks( Statement $statement ) {
 	 */
 	public function testGetRank( Statement $statement ) {
 		$rank = $statement->getRank();
-		$this->assertInternalType( 'integer', $rank );
+		$this->assertIsInt( $rank );
 
 		$ranks = [ Statement::RANK_DEPRECATED, Statement::RANK_NORMAL, Statement::RANK_PREFERRED ];
 		$this->assertTrue( in_array( $rank, $ranks ), true );

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function testGetValue( EntityIdValue $id ) {`
`76`	`76`	`* @dataProvider instanceProvider`
`77`	`77`	`*/`
`78`	`78`	`public function testGetSortKey( EntityIdValue $id ) {`
`79`		`- $this->assertInternalType( 'string', $id->getSortKey() );`
	`79`	`+ $this->assertIsString( $id->getSortKey() );`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public function provideGetArrayValue() {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function serializationsProvider() {`
`40`	`40`
`41`	`41`	`public function testGivenEmptySet_countReturnsZero() {`
`42`	`42`	`$set = new ItemIdSet();`
`43`		`- $this->assertEquals( 0, $set->count() );`
	`43`	`+ $this->assertSame( 0, $set->count() );`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function testGivenSetWithTwoItems_countReturnsTwo() {`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ public function testEquals( ReferenceList $array ) {`
`348`	`348`	`* @dataProvider instanceProvider`
`349`	`349`	`*/`
`350`	`350`	`public function testGetValueHashReturnsString( ReferenceList $array ) {`
`351`		`- $this->assertInternalType( 'string', $array->getValueHash() );`
	`351`	`+ $this->assertIsString( $array->getValueHash() );`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testConstructor( SnakList $snaks ) {`
`85`	`85`	`* @dataProvider instanceProvider`
`86`	`86`	`*/`
`87`	`87`	`public function testGetHashReturnsString( Reference $reference ) {`
`88`		`- $this->assertInternalType( 'string', $reference->getHash() );`
	`88`	`+ $this->assertIsString( $reference->getHash() );`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`