[Process] Fix: Method can also return null #29702
Merged
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
9 tasks
fabpot
approved these changes
Dec 28, 2018
|
Thank you @localheinz. |
fabpot
added a commit
that referenced
this pull request
Dec 28, 2018
This PR was merged into the 3.4 branch. Discussion ---------- [Process] Fix: Method can also return null | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This PR * [x] adjusts a DocBlock and also provides a corresponding test that asserts that `ExecutableFinder::find()` may return `null` Commits ------- a7755f8 Fix: Method can also return null
|
Thank you, @fabpot! |
xabbuh
reviewed
Jan 2, 2019
| @@ -46,7 +46,7 @@ public function addSuffix($suffix) | ||
| * @param string $default The default to return if no executable is found | ||
| * @param array $extraDirs Additional dirs to check into | ||
| * | ||
| * @return string The executable path or default value | ||
| * @return string|null The executable path or default value |
There was a problem hiding this comment.
If I don't miss anything, this can only happen when $default is returned. We may have wanted to fix the param for this argument too then. ;)
There was a problem hiding this comment.
Do you mean
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
index ad2c76ab60..90cafa34e3 100644
--- a/src/Symfony/Component/Process/ExecutableFinder.php
+++ b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -42,9 +42,9 @@ class ExecutableFinder
/**
* Finds an executable by name.
*
- * @param string $name The executable name (without the extension)
- * @param string $default The default to return if no executable is found
- * @param array $extraDirs Additional dirs to check into
+ * @param string $name The executable name (without the extension)
+ * @param string|null $default The default to return if no executable is found
+ * @param array $extraDirs Additional dirs to check into
*
* @return string|null The executable path or default value
*/?
There was a problem hiding this comment.
Adjusted with #29752!
1 task
fabpot
added a commit
that referenced
this pull request
Jan 3, 2019
This PR was merged into the 3.4 branch. Discussion ---------- [Process] Fix: Adjust DocBlock | Q | A | ------------- | --- | Branch? | `3.4` | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This PR * [x] adjusts a DocBlock Follows #29702 (comment). Commits ------- f8be46b Fix: Adjust DocBlock
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
ExecutableFinder::find()may returnnull