[PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\ #18726
Conversation
|
/cc @nicolas-grekas |
| $count = 0; | ||
| $ns = preg_replace('/(^|\\\\)Tests\\\\/', '$1', $mockedNs[0], 1, $count); | ||
| if (1 === $count) { | ||
| $mockedNs[] = $ns; |
There was a problem hiding this comment.
imho we should simply additionally check if the namespace starts with Tests\:
if (false !== strpos($class, '\\Tests\\')) {
// ...
} elseif (0 === strpos('Tests\\')) {
$mockedNs[] = substr($class, 6);
}There was a problem hiding this comment.
Using regex seems more extensible to me, even though it might not be as readable...
There was a problem hiding this comment.
I'd favor readability here, thus @xabbuh proposal
|
@nicolas-grekas: Addressed @xabbuh's comment. |
| $testNs = substr($class, 0, strrpos($class, '\\')); | ||
| $mockedNs = array($testNs); | ||
| if (false !== ($pos = strpos($testNs, '\\Tests\\'))) { | ||
| $mockedNs[] = substr_replace($testNs, '\\', $pos, 7); |
There was a problem hiding this comment.
this changes the semantic a bit (only the first \Tests\ is replaced now). Let's be safe and keep the code asis for this first part...
There was a problem hiding this comment.
Wouldn't that actually have been a bug? Or was that the intended behaviour?
There was a problem hiding this comment.
not a bug (nor really planned but we shouldn't change now)
4b00e01 to
310eaa5
Compare
|
I believe Travis failure is unrelated. |
| $ns = str_replace('\\Tests\\', '\\', $class); | ||
| $mockedNs[] = substr($ns, 0, strrpos($ns, '\\')); | ||
| } elseif (0 === strpos($class, 'Tests\\')) { | ||
| $mockedNs[] = substr($class, 6, strrpos($class, '\\')); |
There was a problem hiding this comment.
Must be:
$mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);|
Status: Needs Review |
|
👍 Status: Reviewed |
|
feature on 3.2 isn't it? |
If so, then we need to address this issue in symfony-standard, because it does not work as expected out of the box. |
|
there is no deps bewteen the bridge and sfstd, so no need to change, just use the newest bridge to run the tests |
That means bumping the version of the PhpUnit Bridge in symfony-standard 2.8+? |
|
Thank you @teohhanhui. |
…egin with Tests\\ (teohhanhui) This PR was submitted for the 2.8 branch but it was merged into the 3.2-dev branch instead (closes #18726). Discussion ---------- [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\ | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes? | New feature? | no | BC breaks? | no? | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | symfony/symfony-docs#6546 See symfony/symfony-standard#969 Commits ------- 2630c13 [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\
See symfony/symfony-standard#969