Skip to content

Commit 2b7b0eb

Browse files
committed
Use With instead of By for consistency in this class
1 parent 440a46a commit 2b7b0eb

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/Statement/StatementList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public function isEmpty() {
293293
*
294294
* @return Statement|null The first statement with the given GUID or null if not found.
295295
*/
296-
public function getFirstStatementByGuid( $statementGuid ) {
296+
public function getFirstStatementWithGuid( $statementGuid ) {
297297
foreach ( $this->statements as $statement ) {
298298
if ( $statement->getGuid() === $statementGuid ) {
299299
return $statement;

tests/unit/Statement/StatementListTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -567,46 +567,46 @@ public function testWhenNoPreferredStatements_getBestStatementsReturnsOnlyNormal
567567
);
568568
}
569569

570-
public function testGivenNotPresentStatement_getFirstStatementByGuidReturnsNull() {
570+
public function testGivenNotPresentStatement_getFirstStatementWithGuidReturnsNull() {
571571
$statements = new StatementList();
572572

573-
$this->assertNull( $statements->getFirstStatementByGuid( 'kittens' ) );
573+
$this->assertNull( $statements->getFirstStatementWithGuid( 'kittens' ) );
574574
}
575575

576-
public function testGivenPresentStatement_getFirstStatementByGuidReturnsStatement() {
576+
public function testGivenPresentStatement_getFirstStatementWithGuidReturnsStatement() {
577577
$statement1 = $this->getStatement( 1, 'guid1' );
578578
$statement2 = $this->getStatement( 2, 'guid2' );
579579
$statement3 = $this->getStatement( 3, 'guid3' );
580580
$statements = new StatementList( $statement1, $statement2, $statement3 );
581581

582-
$actual = $statements->getFirstStatementByGuid( 'guid2' );
582+
$actual = $statements->getFirstStatementWithGuid( 'guid2' );
583583
$this->assertSame( $statement2, $actual );
584584
}
585585

586-
public function testGivenDoublyPresentStatement_getFirstStatementByGuidReturnsFirstMatch() {
586+
public function testGivenDoublyPresentStatement_getFirstStatementWithGuidReturnsFirstMatch() {
587587
$statement1 = $this->getStatement( 1, 'guid1' );
588588
$statement2 = $this->getStatement( 2, 'guid2' );
589589
$statement3 = $this->getStatement( 3, 'guid3' );
590590
$statement4 = $this->getStatement( 2, 'guid2' );
591591
$statements = new StatementList( $statement1, $statement2, $statement3, $statement4 );
592592

593-
$actual = $statements->getFirstStatementByGuid( 'guid2' );
593+
$actual = $statements->getFirstStatementWithGuid( 'guid2' );
594594
$this->assertSame( $statement2, $actual );
595595
}
596596

597-
public function testGivenStatementsWithNoGuid_getFirstStatementByGuidReturnsFirstMatch() {
597+
public function testGivenStatementsWithNoGuid_getFirstStatementWithGuidReturnsFirstMatch() {
598598
$statement1 = $this->getStatement( 1, null );
599599
$statement2 = $this->getStatement( 2, null );
600600
$statements = new StatementList( $statement1, $statement2 );
601601

602-
$actual = $statements->getFirstStatementByGuid( null );
602+
$actual = $statements->getFirstStatementWithGuid( null );
603603
$this->assertSame( $statement1, $actual );
604604
}
605605

606-
public function testGivenInvalidGuid_getFirstStatementByGuidReturnsNull() {
606+
public function testGivenInvalidGuid_getFirstStatementWithGuidReturnsNull() {
607607
$statements = new StatementList();
608608

609-
$this->assertNull( $statements->getFirstStatementByGuid( false ) );
609+
$this->assertNull( $statements->getFirstStatementWithGuid( false ) );
610610
}
611611

612612
}

0 commit comments

Comments
 (0)