Removed hacky switch/case, migrated to if/else and early return statements #5860
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
|
@guilhermeblanco @Ocramius I have no idea why it is done |
|
|
||
| default: | ||
| throw new \InvalidArgumentException("Invalid argument: " . $conn); | ||
| if (is_array($conn)) { |
There was a problem hiding this comment.
Can you segregate this entire block into its own private static method?
|
@Ocramius it's better? |
| protected static function createConnection($conn, Configuration $config, EventManager $eventManager = null) | ||
| { | ||
| if (is_array($conn)) { | ||
| $conn = DriverManager::getConnection( |
|
@Ocramius now? |
| return DriverManager::getConnection( | ||
| $conn, $config, ($eventManager ?: new EventManager()) | ||
| ); | ||
| } elseif ( ! $conn instanceof Connection) { |
There was a problem hiding this comment.
else not needed, since you return early
| } | ||
|
|
||
| return new EntityManager($conn, $config, $conn->getEventManager()); | ||
| return $connection; |
There was a problem hiding this comment.
Checking whether $conn->getEventManager() === $eventManager is still required (sorry, previous comment may have been misleading)
Ocramius
changed the title
|
@peter-gribanov thanks! |
Ocramius
added a commit
that referenced
this pull request
Jun 19, 2016
Partially reverting #5860 due to type juggling horrors
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.
No description provided.