public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code
5,646 Commits
3 Branches
208 Tags
53 MiB
Commit Graph

5646 Commits (27d51642c8d4522ad65eef35b5a5b13ecd96b34e)

Author SHA1 Message Date
Jordi Boggiano 2238692250 Merge pull request #4329 from emersonthis/patch-1 
Clarified instructions
 2015-08-09 15:08:50 +01:00
emersonthis 5508bb8725 Clarified instructions 2015-08-04 16:54:43 -04:00
Jordi Boggiano c83650f299 Merge pull request #4327 from nicolas-grekas/revert-pr-3975 
Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
 2015-08-04 14:59:03 +01:00
Nicolas Grekas fbae6b1589 Revert "Merge pull request #3975 from marc-mabe/hotfix/3974" 
This reverts commit bdb6ecb29e, reversing
changes made to 8a12e50a16.
 2015-08-04 10:34:54 +02:00
Malte Wunsch 70ff00c9de Reverted inadvertent API change, improved API documentation 2015-08-04 09:32:23 +02:00
Tehem 9e592f19a1 Used shorthand version for ternary operator 2015-08-03 23:36:05 +02:00
Malte Wunsch 767279b41a getCanonicalPackages returns packages with same name in different versions 2015-08-03 18:28:04 +02:00
Jordi Boggiano 06feb19b2c Merge pull request #4169 from remicollet/patch-1 
Set this test as slow
 2015-08-02 12:10:47 +01:00
Thomas Marcon b35e762354 Updated configFile parsing to first look into -f parameter, then COMPOSER environment variable, then default to composer.json 2015-07-31 12:01:49 +02:00
Nils Adermann bd2d7eba05 Merge pull request #4321 from alcohol/4319-fix-php-platform-version-error 
make sure php version errors are less misleading
 2015-07-31 10:06:09 +02:00
Rob Bast 51ef7b5eef instead of generic be more verbose about possible causes 2015-07-31 10:01:58 +02:00
Rob Bast 77f1d5945f make sure php version errors are less misleading 
* determine conflicting version in problem using pool package
* hide version in rule to keep it generic rather than possibly misleading

fixes #4319
 2015-07-31 09:58:34 +02:00
Jordi Boggiano a67eaf04c7 Merge pull request #4316 from alcohol/1508-simplify-tests 
closes #1508 - updated tests
 2015-07-30 13:14:55 +01:00
Rob Bast ef37b86c81 closes #1508 - updated tests 2015-07-30 13:37:12 +02:00
Tehem 9392adef79 Fixes #4302 allow COMPOSER env with config statements (overrides --file) 2015-07-28 00:01:01 +02:00
Webber Wu 92530e374b Merge remote-tracking branch 'upstream/master' 2015-07-26 12:33:39 +08:00
Kocsis Máté 87c16073ec Merge branch 'master' of https://github.com/composer/composer into feature-bin-compat 2015-07-22 15:54:20 +02:00
Jordi Boggiano c6cc6dd607 Advise the use of absolute paths, fixes #4259 2015-07-21 14:46:38 +01:00
Jordi Boggiano 00c26791fa Merge pull request #4264 from alcohol/use-composer-spdx 
remove spdx files, introduce external library
 2015-07-20 18:29:14 +01:00
Jordi Boggiano b260a9972f Timeouts are not necessarily cause for alarm 2015-07-20 17:50:56 +01:00
Jordi Boggiano dafa9efa8f Remove whitespace 2015-07-20 17:50:34 +01:00
Jordi Boggiano bbf959ac34 Do not retry failures once degraded mode is already enabled 2015-07-20 17:44:03 +01:00
Jordi Boggiano ff84b32097 Add degraded mode to try and bypass ipv6/gzip issues, refs #4142, refs #4121 2015-07-20 17:33:53 +01:00
Rob Bast 2553f5f7d4 throw error when file is loaded 2015-07-20 12:10:30 +02:00
Rob Bast 56f0d82207 get resources dir from spdxlicenses 2015-07-20 11:42:20 +02:00
Rob Bast ab08e4be62 update spdx-licenses to 1.1.0 
includes latest licenses and exceptions list
 2015-07-17 08:19:33 +02:00
Rob Bast 616585e0cc spdxlicense extends spdxlicenses, add depr error 2015-07-16 13:21:18 +02:00
Rob Bast bb1e1b0160 update lock file 2015-07-16 12:03:35 +02:00
Remi Collet 9b9cbfe111 fix for changes in justinrainbow/json-schema 1.4.4 2015-07-16 12:03:35 +02:00
Remi Collet c014e0882f ignore this test with 'jsonc' 2015-07-16 12:03:35 +02:00
Rob Bast 1f006a499e updated compiler class to include spdx sources 2015-07-16 12:03:34 +02:00
Nils Adermann 417516098e Document that lock file name uses COMPOSER env var 2015-07-16 11:51:31 +02:00
Rob Bast 5ae9e7fe22 remove spdx files, introduce external library 2015-07-16 11:42:12 +02:00
Jordi Boggiano 92faf1c7a8 Merge pull request #4228 from naderman/memory-version-constraint 
Remove unnecessary version comparison cache variable and store operator as int
 2015-07-14 13:37:15 +01:00
Jordi Boggiano 7e0db8aa46 Merge pull request #4239 from naderman/memory-rules 
Reduce memory usage of Rule objects
 2015-07-14 13:34:24 +01:00
Nils Adermann cf1af58514 Use bitwise operators directly in rules instead of get/set Bitfield 2015-07-14 14:24:18 +02:00
Nils Adermann ccaba0d2f7 Make static translation tables in version constraint private and use === 2015-07-14 14:12:19 +02:00
Jordi Boggiano c36d2a2e50 Merge pull request #4214 from legoktm/parse-links 
Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
 2015-07-13 14:28:10 +01:00
Jordi Boggiano 42bfe9c56a Merge pull request #4219 from localheinz/feature/strict-mode 
Enhancement: Also validate if lock file is up to date
 2015-07-12 16:39:36 +01:00
Jordi Boggiano acc11f63c5 Merge pull request #4234 from naderman/rule-hash-int-size 
Reduce rule hash size
 2015-07-12 16:25:14 +01:00
Jordi Boggiano efb9f13248 Merge pull request #4229 from naderman/memory-version-array-merge 
VersionParser: remove a few hundred/thousand array_merge calls
 2015-07-12 16:14:16 +01:00
Andreas Möller 5828f6202d Enhancement: Also validate lock file 2015-07-10 18:07:40 -04:00
Nils Adermann de65199f31 Merge pull request #4117 from stof/patch-1 
Optimize the regex detecting timestamps
 2015-07-09 21:17:24 +02:00
Nils Adermann 956035e641 Remove the unnecessary return statements from setters 2015-07-09 19:40:03 +02:00
Nils Adermann f535542fca Use constants with names for bitfield offsets 2015-07-09 18:59:16 +02:00
Nils Adermann 329ab5cf41 Rename blob rule property to bitfield 2015-07-09 18:48:50 +02:00
Nils Adermann 961ea868ac Use an integer bitfield for rule properties instead of a string binary blob 2015-07-09 18:26:31 +02:00
Nils Adermann 6e81f63635 Reduce memory footprint of rules by storing data in blob 
Not declaring the job property saves significant amounts of memory as
most rules leave it as null
 2015-07-09 17:23:45 +02:00
Nils Adermann 39e6f51bef Clarify --no-check-publish in docs 2015-07-09 13:04:41 +02:00
Nils Adermann 984c0afddf Merge pull request #4230 from localheinz/fix/validate 
Fix: Update docs for validate command
 2015-07-09 13:03:35 +02:00