1
0
Fork 0
Commit Graph

5226 Commits (35ebb8b93fb8e93bf4b2af55b3f11aea1a3934e6)

Author SHA1 Message Date
闫兴茂 e4bb306dfc Fix for CI 2017-12-19 22:32:10 +08:00
闫兴茂 1c0a494c72 Update findBestVersionForPackage method to support return package name 2017-12-19 22:17:24 +08:00
Gabriel Caruso 50045a7536 Add no_useless_else in phpcs 2017-12-19 09:20:29 -02:00
Jordi Boggiano c8aea719b1 CS fixes 2017-12-18 16:02:48 +01:00
Jordi Boggiano f31b820b09
Merge pull request #6911 from johnstevenson/cygdrive
Fix shell proxy to allow user-defined cygdrive
2017-12-18 13:40:56 +01:00
Jordi Boggiano 847ebed6e6
Merge pull request #6913 from mbrodala/scripts-description-toplevel
Move "scripts-description" to toplevel
2017-12-18 13:39:46 +01:00
Jordi Boggiano b32c7b3d16
Remove BC warning as this was never released 2017-12-18 13:39:20 +01:00
Jordi Boggiano 3e1b0c88d7 Merge branch '1.5' 2017-12-18 11:13:19 +01:00
Christian Mayer 512188d212 Filter macOS .DS_Store files when detecting github archives, fixes #6784, closes #6785 2017-12-18 11:11:35 +01:00
Mathias Brodala 8424235fac Rename to "scripts-descriptions" 2017-12-18 10:47:01 +01:00
Jordi Boggiano 00f6c0a44a Fix issue when requiring multiple packages once without and once with explicit version, fixes #6859 2017-12-18 10:35:44 +01:00
Mathias Brodala 80d0c2029b Move "scripts-description" to toplevel
Fixes #6881
2017-12-18 10:14:24 +01:00
闫兴茂 354bd7f7e2 Update parse name version parirs name to lower 2017-12-18 14:55:03 +08:00
johnstevenson 3511edc9e8 Fix shell proxy to allow user-defined cygdrive 2017-12-17 19:29:44 +00:00
Jordi Boggiano 0a9abeef88 Merge branch '1.5' 2017-12-17 15:05:08 +01:00
Jordi Boggiano 8bc02d1aed
Merge pull request #6904 from brettsantore/doc-update
clarify optionality of package in require command
2017-12-17 15:02:18 +01:00
Jordi Boggiano 4c8c574b6c Fix regex, refs #6895 2017-12-17 14:02:55 +01:00
Renoir Boulanger 9f723ba381 Support GitLab repositories w/ port over HTTPs
When we have self-hosted GitLab, over HTTPs, on a different port.

rel composer/composer#6894
2017-12-17 13:59:08 +01:00
Alessandro Lai fc6c12bd0a Fix pretty version guessing when non-dev branch 2017-12-17 13:49:15 +01:00
Jordi Boggiano a55d9ce7b0
Merge pull request #6875 from OskarStark/strategy
output used strategy
2017-12-17 12:56:09 +01:00
Jordi Boggiano b110f86aa0 Merge branch '1.5' 2017-12-16 22:42:30 +01:00
Jordi Boggiano 7d57f84b7d
Merge pull request #6879 from OskarStark/output
highlight previous composer version
2017-12-16 22:08:47 +01:00
Tom Rochette c3b6c0c85e Make sure exitCode is defined in the show command. 2017-12-16 22:08:10 +01:00
Gabriel Caruso 32a409a3ee Clean elses 2017-12-16 04:23:48 -02:00
Brett Santore 449ecf098d clarify optionality of package in require command 2017-12-14 11:44:54 -05:00
Oskar Stark 8b90037d7b highlight previous composer version 2017-12-07 10:12:21 +01:00
Oskar Stark e85bcc882c output used strategy 2017-12-07 10:08:34 +01:00
Jordi Boggiano ed20b3b4f6
Fix OutputFormatter creation with Symfony 4, fixes #6871 2017-12-07 09:21:26 +01:00
Jordi Boggiano 6bb3ab1868 Tweak help/description 2017-12-01 17:03:42 +01:00
Jordi Boggiano b579884e15 Tweak check-platform-reqs command to check all constraints and output more information about what requires failed, refs #6709 2017-12-01 17:00:15 +01:00
Jordi Boggiano edf561d602 Merge remote-tracking branch 'swumao/master' 2017-12-01 15:43:31 +01:00
Jordi Boggiano b2f283cbd2
Merge pull request #6696 from legoktm/sort-installed
Sort vendor/composer/installed.json deterministically
2017-12-01 15:27:55 +01:00
Jordi Boggiano 224d272a0e Merge branch '1.5' 2017-12-01 14:30:56 +01:00
Jordi Boggiano 3976d9f242 Fix require command picking of specific versions, fixes #6859 2017-12-01 14:30:51 +01:00
Jordi Boggiano 755482ddb1 Merge branch '1.5' 2017-12-01 11:01:35 +01:00
Jordi Boggiano a928ffa4ee Fix require command when specifying non-stable versions, fixes #6859 2017-12-01 10:55:20 +01:00
Jordi Boggiano 6a08755c25 Merge branch '1.5' 2017-11-30 17:08:38 +01:00
Pedro de Carvalho f569833f5a move $length variable outsite foreach (#6828)
the `foreach` over the `prefixDirsPsr4[$search]` won't affect `$length`. 

It's used for the offset of `$logicalPathPsr4`.
2017-11-30 16:29:30 +01:00
Niels Keurentjes eab705d057 Reword exception text to evoke somewhat less panic
Refs https://github.com/composer/composer/issues/5196#issuecomment-346754244

Signature mismatch could indicate MitM, or just a CDN issue which is rather more likely.
2017-11-30 15:57:12 +01:00
Jordi Boggiano 5960f715f0 Add warning in show command if no dependencies are installed but the root package has dependencies, fixes #6820 2017-11-30 15:55:57 +01:00
Markus Staab ecb26c7b75 support COMPOSER env var in validate command (#6834)
* support COMPOSER env var in validate command
2017-11-30 15:39:00 +01:00
Jordi Boggiano 6256e17149 Merge branch '1.5' 2017-11-30 15:19:19 +01:00
Jordi Boggiano 5ba6d7d436 Fix pretty guessed versions to show nicely on numeric branches, refs #6845 2017-11-30 15:19:11 +01:00
Alessandro Lai 3cf31da414 Fix root package not having a pretty version when detecting from VCS, fixes #6845, closes #6847 2017-11-30 15:07:08 +01:00
Jordi Boggiano 40f4f6bf86 Fix docblock 2017-11-30 15:05:27 +01:00
Jordi Boggiano 94a1f16c96 Fix scheme in public gitlab URLs, refs #6683 2017-11-30 10:52:33 +01:00
Jordi Boggiano eab826b00b Merge branch '1.5' 2017-11-29 16:37:49 +01:00
Jordi Boggiano b52fd60873 Always follow redirects in userland as we need to check if we have authentication every time for the new domain 2017-11-29 16:37:45 +01:00
Jordi Boggiano b59dd23bb4 Merge branch '1.5' 2017-11-29 15:58:44 +01:00
Jordi Boggiano 743153e862 Tweak so that we allow authentication for domains we redirect to, refs #6717 2017-11-29 15:56:45 +01:00
Maarten Balliauw 128e424c90 Avoid sending Authorization header to another domain on redirect, fixes #6716 2017-11-29 15:32:32 +01:00
Jordi Boggiano 0de1e21233 Make create-project install dependencies following optimize-autoloader config setting, fixes #6722 2017-11-29 15:05:19 +01:00
Jordi Boggiano e5d07fde6b
Merge pull request #6743 from zachflower/feature/init_defaults
Composer init default values
2017-11-29 14:47:54 +01:00
Jordi Boggiano fedef55362 Merge remote-tracking branch 'arjank/abandoned_package_warning' 2017-11-29 14:16:10 +01:00
Jordi Boggiano 535e7262e4 Fix php5.3 2017-11-29 11:49:19 +01:00
Jordi Boggiano a1e292d84d Let users open the homepage of the current package by doing composer home without argument, fixes #6748 2017-11-29 11:08:08 +01:00
Jordi Boggiano 5130d02208 Update to latest ca-bundle 2017-11-29 10:41:53 +01:00
Jordi Boggiano ec63c213f8 Allow unsetting the whole platform config key 2017-11-29 10:33:44 +01:00
Jordi Boggiano 9850621c6b
Merge pull request #6788 from GawainLynch/symfony-4
Symfony 4
2017-11-28 18:30:31 +01:00
Jordi Boggiano 0b3bc4ccb9 Merge branch '1.5' 2017-11-28 18:09:36 +01:00
johnstevenson b0922b95af Report multiple inis in php.ini specific messages
Where systems use multiple ini files it is perhaps more useful to
suggest running `php --ini` to see their locations, rather than showing
the loaded php.ini (if one exists).
2017-11-28 18:09:08 +01:00
Jordi Boggiano a691a179e5 Merge remote-tracking branch 'naderman/improve-not-found-error' into 1.5 2017-11-28 18:00:09 +01:00
Jordi Boggiano 3c76e36e2c Fix regex, refs #6735 2017-11-28 18:00:05 +01:00
gregory 8a136d18e5 Correctly extract username/password from URL 2017-11-28 16:59:18 +01:00
Jordi Boggiano 065b662d5b Merge remote-tracking branch 'naderman/t/no-package-potential-issue' into 1.5 2017-11-28 16:39:31 +01:00
Jordi Boggiano b4df2c9517 Avoid reverting the composer.json in case of a composer require/remove failure that is unrelated to the Solver
Fixes #6821 and adds a different fix to #3464 which is getting reverted
2017-11-28 16:38:29 +01:00
Jordi Boggiano 4c4f516ea2 Make sure binaries are recreated before POST-hooks fire 2017-11-28 16:07:28 +01:00
Jordi Boggiano 17ec4c17b0 Set COMPOSER_DEV_MODE for all events and not just POST hooks 2017-11-28 16:04:50 +01:00
Nils Adermann f40f95b269 Add a note that a user could have forgotten to add a custom repo if package not found 2017-11-16 10:15:37 +01:00
Zachary Flower a59f7399bf Use environment variables to define default values instead 2017-11-13 13:20:19 -07:00
Zachary Flower 8d6f8a6f42 Reverse new config-file changes 2017-11-13 12:58:07 -07:00
Nils Adermann 685bc08c0a Improve the error on init/require if a package could not be found 2017-11-09 13:04:07 +01:00
Robert Lu e768e297cd fetch tag,commit form local but not ref 2017-11-07 13:54:52 +08:00
Robert Lu 0ad985122d Don't fetch when ref already on local 2017-11-07 13:54:52 +08:00
Gawain Lynch f96e0e033b
Use Terminal class for dimensions post Symfony 3.2 2017-11-06 16:30:43 +01:00
Gawain Lynch 157075b996
Migrate ConsoleIO::select to use QuestionHelper and ChoiceQuestion 2017-11-06 16:29:55 +01:00
Gawain Lynch 8b42aed060
Create a local escapeArgument() for Symfony 4 compatibility. 2017-11-06 16:28:50 +01:00
Jordi Boggiano bfed974ae9 Merge branch '1.5' 2017-11-03 23:23:28 +01:00
Jordi Boggiano fc9f8c2007 Fix tests 2017-11-03 23:23:22 +01:00
Jordi Boggiano 26a50b3762 Merge branch '1.5' 2017-11-03 19:53:36 +01:00
johnstevenson b1aed48e1a Fix bug setting COMPOSER_ORIGINAL_INIS
This variable stores the loaded ini file and any additional scanned ini
files, separated by a path-separator. The loaded ini file should always
be present, even if it is an empty value. Unfortunately I removed any
empty value to parse the ini files, then used the truncated list to set
the variable.

This bug surfaced on docker php images. These do not have a specific
php.ini but store all their settings in the location(s) configured at
build time using --with-config-file-scan-dir.
2017-11-03 19:52:44 +01:00
Jordi Boggiano 14dc4b20df
Merge pull request #6746 from renanbr/diagnose-with-php-bin-info
add php version and binary to the dignose command
2017-11-03 19:52:21 +01:00
Jordi Boggiano 4ab34c22fa
Merge pull request #6740 from croensch/master
also support NO_PROXY
2017-11-03 19:50:28 +01:00
Mihai Plasoianu 02b57ff4a2 Return non-zero exit code with --strict and single package 2017-11-03 19:48:59 +01:00
Jérôme Vasseur 71c2ecbace Fix platform package detection in VersionParser 2017-11-03 19:48:52 +01:00
Jordi Boggiano 11f1e03739 CS tweaks 2017-11-03 19:44:44 +01:00
Minh-Quan TRAN 007ca5ff6a workaround for gitlab installation with relative url
Signed-off-by: Minh-Quan TRAN <account@itscaro.me>
2017-11-03 19:42:54 +01:00
Jordi Boggiano ba53a2d0e6 CS fixes 2017-11-03 17:20:26 +01:00
Jordi Boggiano 41a9357d4b Merge remote-tracking branch 'thom8/script_help' 2017-11-03 17:19:36 +01:00
Jordi Boggiano 7c7c91344a Avoid some error paths, refs #6678 2017-11-03 16:32:35 +01:00
Jordi Boggiano b94d55d1a9 Merge remote-tracking branch 'lulco/search-similar-package' 2017-11-03 16:28:34 +01:00
Jordi Boggiano 9a99e86ebc Rename NonRoot to Transitive, refs #6674 2017-11-03 14:35:04 +01:00
Jordi Boggiano 9df22654c3 Merge remote-tracking branch 'grasmash/issue-6661-whitelist-all-deps' 2017-11-03 14:20:38 +01:00
Renan de Lima f1fb969a3a add php version and binary to the dignose command 2017-10-15 12:48:34 +02:00
Zachary Flower 9ed0a2d35f Use default configs, where applicable, in init 2017-10-13 22:39:08 -06:00
Zachary Flower 6ce11697ec Load default config in with other configs 2017-10-13 22:38:35 -06:00
Zachary Flower 9c109dfea1 Add default config source to Config class 2017-10-13 22:38:05 -06:00
croensch bd6168ef85 fix pull 6740
wrongly copied the check, either must be in not-empty
2017-10-13 09:49:04 +02:00
croensch 6da92e98ac also support NO_PROXY
since WINDOWS can only have one case and that is usually upperase
2017-10-12 16:35:05 +02:00
Arjan a03efa2fda Composer init - abandoned package warning
Added warning for abandoned packages in case more than one package is found for require / require-dev in composer init.
2017-10-07 16:45:15 +02:00
闫兴茂 fb306b6eb7 Update [] to array synax 2017-09-27 17:32:46 +08:00
闫兴茂 f83883b2f6 Add command check-platform-reqs 2017-09-27 17:20:51 +08:00
Kunal Mehta 2a38417653 Sort vendor/composer/installed.json deterministically
Just like composer.lock, sort installed.json in order of the package
names. This makes it easier to review diffs when this file is changed.
2017-09-19 18:26:38 -07:00
Jordi Boggiano c0eb32669a Remove comment 2017-09-12 09:24:28 +02:00
Thom Toogood bf880ad5e0 Allow custom script descriptions. 2017-09-12 13:17:08 +10:00
Michal Lulco c409f96353 Removed unused uses 2017-09-11 21:32:05 +02:00
Michal Lulco 1efe02f2e1 Search similar package when package could not be found 2017-09-11 21:29:00 +02:00
Matthew Grasmick 776977f597 Fixing method name. 2017-09-11 13:53:56 -04:00
Vladimir Reznichenko c8615358cb SCA with PHP Inspections (EA Extended) 2017-09-11 19:40:43 +02:00
Matthew Grasmick 11db6f90c2 Cleaning up comments 2017-09-11 12:56:51 -04:00
Matthew Grasmick 2e9e7ddd99 Updating docs. 2017-09-11 12:43:32 -04:00
Matthew Grasmick 3826e51caa Renaming some methods and props. 2017-09-11 12:38:54 -04:00
Matthew Grasmick 2e4afaa941 Not skipping root packages. 2017-09-11 12:30:48 -04:00
Matthew Grasmick 6db92eae92 Trying to fix update behavior. 2017-09-11 12:27:20 -04:00
Matthew Grasmick ad465aa769 Updating var names. 2017-09-11 11:47:33 -04:00
Matthew Grasmick 0e192ced69 Adding `update-with-all-dependencies` option. 2017-09-11 11:19:24 -04:00
Matthew Grasmick f29e98cdf9 Fixes #6661: Allow a given package and its dependencies (including siblings) to be updated. 2017-09-11 11:16:15 -04:00
Jordi Boggiano 92458596ea Merge branch '1.5' 2017-09-11 16:23:25 +02:00
Jordi Boggiano 69ecb2403e Add upgrade alias to update, fixes #6649 2017-09-11 16:13:33 +02:00
Jordi Boggiano dae575c197 Merge branch '1.5' 2017-09-11 16:09:36 +02:00
Jordi Boggiano 802849d52c Wording tweaks 2017-09-11 16:09:30 +02:00
Deamon 5b29b7c8e3 delete last coma if deleting last element before end of file 2017-09-11 16:07:07 +02:00
Jordi Boggiano 4853661934 Merge branch '1.5' 2017-09-11 16:02:55 +02:00
Jordi Boggiano 1682d7d454 Fix path repo version parsing to follow COMPOSER_ROOT_VERSION when the git repo is shared with the root package, fixes #6625 2017-09-11 16:02:48 +02:00
Jordi Boggiano a53f2ce7c7 Merge branch '1.5' 2017-09-11 15:45:50 +02:00
Jordi Boggiano f71baa5e0c Try fixing 404s gitlab handling when unauthenticated, refs #6669 2017-09-11 14:41:33 +02:00
Jordi Boggiano 54fd2fd4af Merge branch '1.5' 2017-09-11 13:02:18 +02:00
Jordi Boggiano 56964a9377 Check for new work dir with both parameters, refs #6651 2017-09-11 13:01:28 +02:00
Ayesh Karunaratne eb078b432f Prevent automatic parent directory composer.json discovery if working-dir parameter is set 2017-09-11 12:55:56 +02:00
Jordi Boggiano 3a4604ebbc Merge remote-tracking branch 'swumao/master' 2017-09-11 12:46:39 +02:00
Jordi Boggiano a8df30c09b Merge branch '1.5' 2017-09-11 12:16:16 +02:00
Jordi Boggiano 8b61315b14 Normalize URL as symfony Filesystem::mirror does a straight str_replace on realUrl vs actual iteratee path without normalization and our aRchivableFilesFinder does normalize the path, refs #6667 2017-09-11 11:26:33 +02:00
Gawain Lynch b859bbcdcf Pass a VCS filtered iterator to mirror 2017-09-11 11:02:58 +02:00
Mikk Tendermann 2a89d37651 fix gitlab not telling visibilty if user is not logged in 2017-09-11 10:37:32 +02:00
Abyr Valg 37addea447 Make composer see installed dev packages 2017-09-11 10:20:48 +02:00
Fedir Kryvytskyi dc509b236f Fixed error, when composer.phar was broken, if it compiled inside folder, that has /composer in path 2017-09-11 10:08:24 +02:00
Michal Lulco 84fed794d7 Trying to find package with similar name when package could not be found 2017-09-09 18:46:41 +02:00
Jordi Boggiano 1e6854455c Merge pull request #6644 from codekandis/feature/util-filesystem-copy-separation
Introduces a new method `copy()`.
2017-09-09 12:57:28 +02:00
Jordi Boggiano 97b22ad387 Merge pull request #6608 from kthbit/local-fossil
Teach FossilDriver to work with local fossil repository files
2017-09-09 12:22:25 +02:00
闫兴茂 277f05754d Add default sort for show --tree option 2017-09-07 14:17:04 +08:00
Christian Ramelow 39d8104897 Introduces a new method `copy()`.
Some packages, e. g. `tm/tooly-composer-script`, are using the composer classes to e. g. create symlinks or perform other file operations. While there's only a `copyThenRemove()` method this commit introduces a new `copy()` method. `copy()` behaves the same as the copy part of `copyThenRemove()` did with one exception: it returns `true` on success and `false` on failure. Copying a directory may lead to a `false`, while the whole directory or some of its files couldn't been copied. To ensure backwards compatibility `copyThenRemove()` calls `copy()` now. This commit also adds the necessary tests.
2017-08-31 20:19:43 +02:00
Jordi Boggiano d9885d5b3b Merge branch '1.5' 2017-08-21 09:16:59 +02:00
Jordi Boggiano 9fd4f22ba2 Also ignore dir change prompt in list command 2017-08-21 09:16:54 +02:00
Jordi Boggiano d932b17c08 Merge branch '1.5' 2017-08-21 09:14:15 +02:00
Jordi Boggiano d352cc97f7 Do not prompt for dir change on create-project, fixes #6617 2017-08-21 09:13:08 +02:00
Jordi Boggiano 79360da184 Merge branch '1.5' 2017-08-18 14:05:07 +02:00
Jordi Boggiano a144b5e7ed Fix GitLab endless loop thanks to API bug, fixes #6615 2017-08-18 14:04:53 +02:00
kthbit 1a30e3fbc1 Don't update local checkout directory if url is pointing to it. Only update the checkout directory if it is controlled by composer. 2017-08-14 10:56:02 -05:00
kthbit 927d3dda89 Teach FossilDriver to work with urls pointing to local repository.fossil files, and not just the local checkout directories. 2017-08-12 11:31:57 -05:00
kthbit 72a66ad9d2 Do not assume we are on Linux and have head, tail, and awk commands available. Instead, parse the output in PHP. 2017-08-12 08:50:12 -05:00