[PhpUnitBridge] Fix some errors when using serialized deprecations #33820
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I just renamed test methods that were tied to methods that no longer exists ( |
|
@greg0ire Excuse me, I'm currently running out of time and I have to get back into the context. But I'm going to look at this as soon as I can 😊 |
|
I reviewed and tested the changes, it looks good to me. Although there is a problem, the tests don't pass. The changes on the type "self" determination makes the type "self" difficult to test. |
l-vo
reviewed
Oct 20, 2019
| public function providerGetTypeDetectsSelf(): array | ||
| { | ||
| return [ | ||
| 'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', ''], |
There was a problem hiding this comment.
Don't pass anymore. A way to test it:
foreach (get_declared_classes() as $class) {
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
$r = new \ReflectionClass($class);
$v = \dirname(\dirname($r->getFileName()));
if (file_exists($v.'/composer/installed.json')) {
$loader = require $v.'/autoload.php';
$reflection = new \ReflectionClass($loader);
$prop = $reflection->getProperty('prefixDirsPsr4');
$prop->setAccessible(true);
$currentValue = $prop->getValue($loader);
$currentValue['Symfony\\Bridge\\PhpUnit\\'] = [realpath(__DIR__.'/../..')];
$prop->setValue($loader, $currentValue);
}
}
}
return [
'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', __FILE__],
//...
];There was a problem hiding this comment.
Cannot say I understand but I applied this change 😅
There was a problem hiding this comment.
It's just change composer loader psr4 paths which are used to determine "self" type :)
| '', | ||
| ], | ||
| 'serialized_trace_with_not_from_vendors_triggering_file' => [ | ||
| Deprecation::TYPE_SELF, |
There was a problem hiding this comment.
Hum it will depend from where tests are launched. I think we can remove this data provided.
| 'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', ''], | ||
| 'nonexistent_file' => [Deprecation::TYPE_UNDETERMINED, '', 'MyClass1', 'dummy_vendor_path'], | ||
| 'serialized_trace_without_triggering_file' => [ | ||
| Deprecation::TYPE_SELF, |
There was a problem hiding this comment.
it will depend from where tests are launched. I think we can remove this data provided.
|
@l-vo I applied your suggestions, please review again :) |
2 tasks
d918862 to
056d598
Compare
|
Thank you @greg0ire. |
nicolas-grekas
added a commit
that referenced
this pull request
Feb 4, 2020
…ecations (l-vo) This PR was submitted for the 4.3 branch but it was squashed and merged into the 4.4 branch instead. Discussion ---------- [PhpUnitBridge] Fix some errors when using serialized deprecations | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | n/a | License | MIT | Doc PR | n/a This PR attempts to fix conflicts that arose in #31478 Creating as a draft for now as I think having separate test methods no longer make sense (`isSelf()` and `isIndirect()` have been replaced with `getType()`). @l-vo please review and confirm I did not loose anything valuable from your original contribution. Commits ------- 056d598 [PhpUnitBridge] Fix some errors when using serialized deprecations
greg0ire
added a commit
to greg0ire/symfony
that referenced
this pull request
Feb 5, 2020
I failed to apply perfectly this comment: symfony#33820 (comment) It should fix one failing test in the bridge.
greg0ire
added a commit
to greg0ire/symfony
that referenced
this pull request
Feb 5, 2020
I failed to apply this comment perfectly: symfony#33820 (comment) It should fix one failing test in the bridge.
nicolas-grekas
added a commit
that referenced
this pull request
Feb 5, 2020
This PR was merged into the 4.4 branch. Discussion ---------- [PHPunit bridge] Provide current file as file path I failed to apply perfectly this comment: #33820 (comment) It should fix one failing test in the bridge. | Q | A | ------------- | --- | Branch? |4.4 | Bug fix? | not for the end user | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a <!-- Replace this notice by a short README for your feature/bugfix. This will help people understand your PR and can be used as a start for the documentation. Additionally (see https://symfony.com/roadmap): - Always add tests and ensure they pass. - Never break backward compatibility (see https://symfony.com/bc). - Bug fixes must be submitted against the lowest maintained branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too.) - Features and deprecations must be submitted against branch master. --> Commits ------- d5302cb Provide current file as file path
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR attempts to fix conflicts that arose in #31478
Creating as a draft for now as I think having separate test methods no longer make sense (
isSelf()andisIndirect()have been replaced withgetType()). @l-vo please review and confirm I did not loose anything valuable from your original contribution.