Skip to content

Commit

Permalink
Merge pull request #446 from scroach/master
Browse files Browse the repository at this point in the history
Fix nesting error when comparing objects
  • Loading branch information
ciaranmcnulty authored Dec 17, 2019
2 parents 7654657 + 7516ee6 commit c6a31f4
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/Prophecy/Argument/Token/ExactValueToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ public function scoreArgument($argument)
try {
$comparator->assertEquals($argument, $this->value);
return 10;
} catch (ComparisonFailure $failure) {}
} catch (ComparisonFailure $failure) {
return false;
}
}

// If either one is an object it should be castable to a string
Expand Down
96 changes: 96 additions & 0 deletions tests/Argument/Token/ExactValueTokenTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?php

namespace Tests\Prophecy\Argument\Token;

use PHPUnit\Framework\TestCase;
use Prophecy\Argument\Token\ExactValueToken;

class ExactValueTokenTest extends TestCase {
/**
* @test
* @see https://github.com/phpspec/prophecy/issues/268
* @see https://stackoverflow.com/a/19097159/2424814
*/
public function does_not_trigger_nesting_error() {
$child1 = new ChildClass('A', new ParentClass());
$child2 = new ChildClass('B', new ParentClass());

$exactValueToken = new ExactValueToken($child1);
self::assertEquals(false, $exactValueToken->scoreArgument($child2));
}

/**
* @test
*/
public function scores_10_for_objects_with_same_fields() {
$child1 = new ChildClass('A', new ParentClass());
$child2 = new ChildClass('A', new ParentClass());

$exactValueToken = new ExactValueToken($child1);
self::assertEquals(10, $exactValueToken->scoreArgument($child2));
}

/**
* @test
*/
public function scores_false_for_object_and_string() {
$child1 = new ChildClass('A', new ParentClass());

$exactValueToken = new ExactValueToken($child1);
self::assertEquals(false, $exactValueToken->scoreArgument("A"));
}

/**
* @test
*/
public function scores_false_for_object_and_int() {
$child1 = new ChildClass('A', new ParentClass());

$exactValueToken = new ExactValueToken($child1);
self::assertEquals(false, $exactValueToken->scoreArgument(100));
}

/**
* @test
*/
public function scores_false_for_object_and_stdclass() {
$child1 = new ChildClass('A', new ParentClass());

$exactValueToken = new ExactValueToken($child1);
self::assertEquals(false, $exactValueToken->scoreArgument(new \stdClass()));
}

/**
* @test
*/
public function scores_false_for_object_and_null() {
$child1 = new ChildClass('A', new ParentClass());

$exactValueToken = new ExactValueToken($child1);
self::assertEquals(false, $exactValueToken->scoreArgument(null));
}

}


class ParentClass {

public $children = array();

public function addChild($child) {
$this->children[] = $child;
}
}

class ChildClass {

public $parent = null;
public $name = null;

public function __construct($name, $parent) {
$this->name = $name;
$this->parent = $parent;
$this->parent->addChild($this);
}

}

0 comments on commit c6a31f4

Please sign in to comment.