1
0
Fork 0
Commit Graph

7580 Commits (f1fb969a3ad0638d8be21d477c8fca6e4ac8e46f)

Author SHA1 Message Date
Jordi Boggiano cc9234562d Merge pull request #6475 from NamelessCoder/featurebranches
Add support for feature-branches setting
2017-06-15 15:49:10 +02:00
Jordi Boggiano 1d9434af45 Merge pull request #6095 from teolaz/teolaz1990-doc-patch
Teolaz1990 doc patch
2017-06-15 14:44:46 +02:00
Li Chuangbo 1f4882a3e6 Revert "Fixed an issue when a phar file is used in "files" option in composer.json"
This reverts commit 41e91f3064.

The commit 41e91f3 in current codebase generates absolute path in
autoload_static.php for phar file.

Also according to http://php.net/manual/en/phar.using.intro.php, the `phar://`
prefix is not needed.
2017-06-15 14:38:04 +02:00
Rob 28acea07d5 Merge pull request #6461 from Tezd/lock-file-time-inconsistency
Lock file package time inconsistency
2017-06-15 10:45:50 +02:00
Jordi Boggiano 91e755f9bc Merge pull request #6478 from mbrodala/patch-1
Fix typo in docs
2017-06-13 14:55:58 +02:00
Mathias Brodala 112ff7b61d Fix typo in docs
Fixes a typo from #6477
2017-06-13 14:52:52 +02:00
Jordi Boggiano 6294113400 Merge pull request #6477 from joking777/patch-2
Example of disabling packagist.org globally
2017-06-13 14:26:54 +02:00
Michael King e7d2682204 Example of disabling packagist.org globally
Obviously this is not a common use case, but it is good for isolated networks. As far as I could tell, this was not documented, but I figured it out by looking through the code.
2017-06-13 08:06:13 -04:00
Claus Due 965f1f42d1 Add support for feature-branches setting
A negative list of non-feature-branches names
is already supported - this patch adds a list of
branches names which *will* be considered as
feature branches.

Allows changing the currently hardcoded set of
expected feature branch names, from:

* master|trunk|default|develop

To any set of names or patterns that you desire.
2017-06-11 19:02:51 +02:00
Sergey Shcherbin 292882f0d0 Fix for time format in GitBitbucketDriver test 2017-06-07 22:29:15 +03:00
Sergey Shcherbin 676156e2db Changed date time format to RFC_3399 in VcsDriver 2017-06-07 20:51:59 +03:00
Jordi Boggiano 9aadbe2728 Minor wording tweak
Closes https://github.com/composer/getcomposer.org/issues/113
2017-06-06 15:49:06 +02:00
Sergey Shcherbin c890d660cd Changed date format to DATE_RFC3399 for packages with git/hg repositories 2017-06-01 20:48:03 +03:00
Rob 27ee47def7 Merge pull request #6459 from schultyy/patch-1
Test PHP 5.3 on Precise
2017-05-31 16:05:54 +02:00
Jan Schulte ccd94068c0 Test PHP 5.3 on Precise 2017-05-31 15:39:38 +02:00
Rob Bast 512f11729b
use trusty (precise dropped hhvm support) 2017-05-31 13:25:35 +02:00
AjiYakin 03c560ce05 Warn identical names w/ different capitalization for unzip
Warn about identical names with different capitalization on unzip archive
extract failure (Not a directory)

Issue #5938
2017-05-30 12:38:46 +07:00
Jordi Boggiano cb3d2e83a3 Merge pull request #6451 from Dargmuesli/master
Remove Deprecated Licenses
2017-05-26 10:02:46 +02:00
Jonas Thelemann f3aa1885bb Remove Deprecated Licenses
These licenses are deprecated in spdx spec v2 (https://spdx.org/licenses/).
2017-05-25 23:33:20 +02:00
Jordi Boggiano a3f2b7bb92 Tweak variable name 2017-05-24 13:26:07 +02:00
Nils Adermann b1110df873 Merge pull request #6371 from balbuf/balbuf/move-all-plugins
Move all plugins and their dependencies to the front
2017-05-24 13:23:09 +02:00
Stephen Beemsterboer 06bb6c7530 Move plugins with no dependencies to the front, followed by plugins with their dependencies 2017-05-23 20:28:32 -04:00
Stephen Beemsterboer 4cda7e0a44 Take into account a package's "provide" and "replace" fields
A package can satisfy a require by its "provide" or "replace" fields,
so this leverages the getNames() method which returns these alternate
names as well.
2017-05-23 19:17:18 -04:00
Jordi Boggiano 1a488bce01 Base64 encode debug output to avoid dumping binary and push it to the end of the line 2017-05-23 09:31:29 +02:00
Jordi Boggiano 771ea8bffe Merge pull request #6435 from remicollet/issue-deps
Issue deps
2017-05-22 09:43:56 +02:00
Remi Collet 741c8d63fb fix test for Symfony 3.2 2017-05-22 08:16:45 +02:00
Remi Collet 95d82f6fde fix test for json-schema 5.2 2017-05-22 08:01:51 +02:00
Jordi Boggiano 221d80d1e1 Merge branch '1.4' 2017-05-21 17:16:46 +02:00
Jordi Boggiano d7b2e42fa9 Do not split repo names on dots, fixes #6424 2017-05-21 17:15:27 +02:00
Jordi Boggiano 2eb69cd679 Always recommend using global config to store auth tokens 2017-05-21 16:45:14 +02:00
Matt Isenhower 4dc8748e68 Update GitLab personal access token URL and the token config command 2017-05-21 16:40:07 +02:00
Jordi Boggiano 0723654362 Merge branch '1.4' 2017-05-21 16:25:16 +02:00
Jordi Boggiano d0e780a8eb Allow php_uname to be disabled, fixes composer/getcomposer.org#112 2017-05-21 16:24:35 +02:00
Jordi Boggiano d2e1fb0a6f Merge pull request #6431 from hason/cs
Fix CS
2017-05-21 16:06:45 +02:00
Jordi Boggiano e5d883f6f7 Merge pull request #6428 from njbooher/patch-1
Fix grammar and match form of similar questions
2017-05-19 15:31:54 +02:00
Martin Hasoň 88ec172bd8 Fix CS 2017-05-19 15:14:47 +02:00
Jordi Boggiano 810e8bed9f Merge pull request #6430 from hason/github_repository
Fix PHP 5.3 compatibility
2017-05-19 14:29:54 +02:00
Nick Booher 222440c7f2 Rename how-do-i-install-composer-programmatically.md to how-to-install-composer-programmatically.md 2017-05-19 06:17:38 -05:00
Martin Hasoň d1ba698291 Fix PHP 5.3 compatibility 2017-05-19 12:36:19 +02:00
Jordi Boggiano 92f7543222 Merge pull request #6429 from hason/github_repository
Register github repository type
2017-05-19 12:20:18 +02:00
Martin Hasoň 3c5bfcf1e9 Register github repository type 2017-05-19 11:40:42 +02:00
Nick Booher c79d4b6a9f Fix grammar and match form of similar questions 2017-05-18 14:15:27 -05:00
Jordi Boggiano 5efa503e4e Merge branch '1.4' 2017-05-17 08:22:16 +02:00
Jordi Boggiano 9ae434cefe Update changelog 2017-05-17 00:03:54 +02:00
Jordi Boggiano a6627d55b7 Fix build 2017-05-16 23:50:15 +02:00
Jordi Boggiano ce56fc4ab6 Merge pull request #6381 from deeky666/pass-vsc-driver-options
Forward GitLab driver options to remote filesystem
2017-05-16 23:36:30 +02:00
Jordi Boggiano a86f1a8969 Merge pull request #6377 from CupOfTea696/feature/init-command-skip-interactive-require-if-set-by-option
Auto-skip interactive require when set by option.
2017-05-16 23:26:26 +02:00
Jordi Boggiano c917c52f81 Message tweak, refs #6341 2017-05-16 22:45:47 +02:00
AjiYakin 8858b27ced Warn identical names w/ different capitalization - extract zip archive
Warn about identical names with different capitalization on zip archive
extract failure (Not a directory)

Issue #5938
2017-05-16 22:43:04 +02:00
Jordi Boggiano ff61ecd484 Allow accessing the ArchiveManager via the Composer object, fixes #6411 2017-05-16 22:20:49 +02:00