This repository has been archived by the owner on Feb 6, 2020. It is now read-only.
ASSIST - Rebase of current develop to (master with #242 applied) #251
Conversation
This file contains 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
requested name 'foo'.
aliases and factories. Added test to show that invokables override delegators and delegators. Added a test to show that preconfigured invokables are ignored. Fixed that problems.
combination of alias and factory, which has changed.
assertObjectHasProperty/assertObjectNotHasProperty
preconfiguration by child class.
reference parameter. getFactory was replaced by createObjectThroughFactory. Adjusted delegator creation accordingly.
…gets-applied Apply PR zendframework#242 to zend-master
Also updates test exception message expectations to match changes in class.
- Adds parameter and return value annotations - Make line lengths similar - Use verbiage consistent with other exceptions - Fixes test exception expectation messages to match
- Edits comment strings for grammar, spelling, punctuation, formatting, and content. - Adds missing `@throws` annotations. - Reverses several conditionals to make exceptions conditional vs the hot path. - Edits exception messages.
Signed-off-by: Jefersson Nathan <[email protected]>
internal state changes.
scenarios with sharedByDefault === false. Test unreveals possible bug in delegator handling.
There was an error in the testcase `testAbstractFactoryShouldBeCheckedForResolvedAliasesInsteadOfAliasName` where the returnValueMap of phpunit was used wrong. This caused a false positive. The test was returning an array which is interpreted as `TRUE`. I discovered this when I added the `testResolvedAliasFromAbstractFactory`, which should do the opposite form the earlier mentioned testcase. Beside that I found a way that the servicemanager was returning `null` instead of returning false when the last fallback on abstract factories failed.
…ualsTo` for strings
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 branch is a manual rebase of current develop onto current master with PR #242 applied.
It delivers a reference on how the develop should look like when rebased to master after #242 application.
This PR was created to assist the integration of PR #242 to master (can be done automatically) and develop.
This PR can not automatically be merged to develop (it can be automatically merged with master, but that is not the point here).
I had to do some more than just selecting which side (theirs or mine) to use. There were several cases where neither was right and several where both were right.
I had to commit some additional work afterwards, because #242's implementation was not completely the same as #221's, which is already part of develop. I also removed several PHP-5.6-isms.
I hope, this can provide some help. If I can do more, please let me know. If you wanted to apply the fixes of #242 to master, I'd offer to rebase this branch to current develop, so this could be accepted in order to introduce #242 to develop.
This PR passes all tests locally.