Merge pull request #487 from wmde/withVsBy

Partial revert of the With vs. By inconsistency

Author: Benestar

src/Statement/StatementByGuidMap.php

@@ -72,7 +72,7 @@ private function assertIsStatementGuid( $statementGuid ) {
 	 *
 	 * @return Statement|null
 	 */
-	public function getStatementWithGuid( $statementGuid ) {
+	public function getStatementByGuid( $statementGuid ) {
 		$this->assertIsStatementGuid( $statementGuid );
 
 		if ( array_key_exists( $statementGuid, $this->statements ) ) {

src/Statement/StatementList.php

@@ -123,6 +123,8 @@ public function removeStatementsWithGuid( $guid ) {
 	 * Statements that have a main snak already in the list are filtered out.
 	 * The last occurrences are retained.
 	 *
+	 * @since 1.0
+	 *
 	 * @return self
 	 */
 	public function getWithUniqueMainSnaks() {

tests/unit/Statement/StatementByGuidMapTest.php

@@ -56,28 +56,28 @@ public function nonStringProvider() {
 		);
 	}
 
-	public function testGivenGuidOfPresentStatement_getStatementWithGuidReturnsStatement() {
+	public function testGivenGuidOfPresentStatement_getStatementByGuidReturnsStatement() {
 		$statement = $this->newStatement( 1, 'some guid' );
 
 		$statements = new StatementByGuidMap( array( $statement ) );
 
-		$this->assertEquals( $statement, $statements->getStatementWithGuid( 'some guid' ) );
+		$this->assertEquals( $statement, $statements->getStatementByGuid( 'some guid' ) );
 	}
 
-	public function testGivenGuidOfNotPresentStatement_getStatementWithGuidReturnsNull() {
+	public function testGivenGuidOfNotPresentStatement_getStatementByGuidReturnsNull() {
 		$statements = new StatementByGuidMap();
 
-		$this->assertNull( $statements->getStatementWithGuid( 'some guid' ) );
+		$this->assertNull( $statements->getStatementByGuid( 'some guid' ) );
 	}
 
 	/**
 	 * @dataProvider nonStringProvider
 	 */
-	public function testGivenNonStringGuid_getStatementWithGuidThrowsException( $nonString ) {
+	public function testGivenNonStringGuid_getStatementByGuidThrowsException( $nonString ) {
 		$statements = new StatementByGuidMap();
 
 		$this->setExpectedException( 'InvalidArgumentException' );
-		$statements->getStatementWithGuid( $nonString );
+		$statements->getStatementByGuid( $nonString );
 	}
 
 	public function testGivenGuidOfPresentStatement_removeStatementWithGuidRemovesTheStatement() {
@@ -177,7 +177,7 @@ public function testGivenStatementWithPresentGuid_addStatementReplacesThePresent
 
 		$statements->addStatement( $statement2 );
 
-		$this->assertEquals( $statement2, $statements->getStatementWithGuid( 'some guid' ) );
+		$this->assertEquals( $statement2, $statements->getStatementByGuid( 'some guid' ) );
 	}
 
 	public function testToArray() {