Skip to content

Fix failing test #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 5, 2024
Merged

Fix failing test #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10bc466
Fix failing test
swissspidy Apr 5, 2024
ad3df0c
Fix unrelated PHPCS issue
swissspidy Apr 5, 2024
5c3216b
Fix typo
swissspidy Apr 5, 2024
d767bbd
Fix incorrect docblock
swissspidy Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions features/package-install.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,9 +1063,9 @@ Feature: Install WP-CLI packages

When I try `wp package install https://example.com/non-existent-zip-asdfasdf.zip`
Then the return code should be 1
And STDERR should be:
And STDERR should contain:
"""
Error: Couldn't download package from 'https://example.com/non-existent-zip-asdfasdf.zip' (HTTP code 404).
Error: Couldn't download package from 'https://example.com/non-existent-zip-asdfasdf.zip'
"""
And STDOUT should be empty

Expand Down
4 changes: 2 additions & 2 deletions src/Package_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ private function check_github_package_name( $package_name, $version = '', $insec
* to false.
*/
private function check_git_package_name( $package_name, $url = '', $version = '', $insecure = false ) {
if ( $url && ( strpos( $url, '://gitlab.com/' ) !== false ) || ( strpos( $url, 'git@gitlab.com:' ) !== false ) ) {
if ( $url && ( ( strpos( $url, '://gitlab.com/' ) !== false ) || ( strpos( $url, 'git@gitlab.com:' ) !== false ) ) ) {
$matches = [];
preg_match( '#gitlab.com[:/](.*?)\.git#', $url, $matches );
return $this->check_gitlab_package_name( $matches[1], $version, $insecure );
Expand All @@ -1178,7 +1178,7 @@ private function check_git_package_name( $package_name, $url = '', $version = ''
/**
* Checks that `$package_name` matches the name in composer.json at GitLab.com, and return corrected value if not.
*
* @param string $package_name Package name to check.
* @param string $project_name Package name to check.
* @param string $version Optional. Package version. Defaults to empty string.
* @param bool $insecure Optional. Whether to insecurely retry downloads that failed TLS handshake. Defaults
* to false.
Expand Down