1
0
Fork 0
Commit Graph

6546 Commits (761d6a549c229befce49863bf3d282b4a35bbbbe)

Author SHA1 Message Date
Rob f85d965732 Merge pull request #4501 from tw2113/master
add spacing consistency around phpdoc attributes
2015-10-19 12:04:38 +02:00
Rob af13868714 Merge pull request #4514 from sneako/master
Issue #2384 allow 'prefer-stable' and 'minimum-stability' to be set
2015-10-19 12:03:14 +02:00
Joel Wurtz 7f42fe4c10 Issue #4512 Set reference in path repository 2015-10-18 11:57:43 +02:00
npiderman ed23b1c4db Issue #2384 allow 'prefer-stable' and 'minimum-stability' to be set via composer config command 2015-10-17 10:58:53 -04:00
Jordi Boggiano a54f84f05f Merge pull request #4479 from MakiCode/feature#4397
Added --file flag: Feature#4397
2015-10-13 14:09:04 +01:00
Jordi Boggiano d901101286 Merge pull request #4504 from alcohol/remove-debug-solver
remove dead code/class: DebugSolver
2015-10-13 11:52:44 +01:00
Rob Bast 1c7016de45 remove dead code/class 2015-10-13 12:37:15 +02:00
Jordi Boggiano 1b7979eee9 Merge pull request #4500 from remicollet/issue-phpunit
allow to use PHPUnit 5
2015-10-13 11:32:15 +01:00
Jordi Boggiano 2a8ea0bcc9 Merge pull request #4502 from alcohol/cs-fixes
php-cs-fixer
2015-10-13 11:30:45 +01:00
Rob Bast 1bf03e9621 fixed various docblocks and class properties in solver 2015-10-13 12:27:48 +02:00
Rob Bast b523fc0b7b ran fixers 2015-10-13 11:35:51 +02:00
Rob Bast 7ab192a209 added some rules we follow but dont check yet 2015-10-13 11:33:40 +02:00
Michael Beckwith 459a48ad5b add spacing consistency around phpdoc attributes 2015-10-13 00:46:26 -05:00
Remi Collet c684c50192 allow to use PHPUnit 5 2015-10-12 18:43:58 +02:00
MakiCode 1c0b9cd65f Removed test for non-string file name check 2015-10-12 10:20:45 -05:00
MakiCode fefc106ef6 Removed type check on ArchiveManager 2015-10-12 10:18:57 -05:00
MakiCode 22e93f110b Fixed indentation 2015-10-07 15:52:58 -05:00
MakiCode 7005d89847 Fixed bug 2015-10-07 12:44:23 -05:00
MakiCode 63ede6c9dd Fixed issues with PR 2015-10-07 12:42:19 -05:00
Rob 7a9eb02190 Merge pull request #4455 from samsaggace/config_archive
Enable command line configuration for archive-dir and archive-format
2015-10-07 12:05:33 +02:00
Nicolas Toniazzi b6df8549cd Merge remote-tracking branch 'parent/master'
Conflicts:
	src/Composer/Factory.php
2015-10-05 09:52:52 +02:00
MakiCode 0d00338bdb Added better messages and fixed bugs 2015-10-04 20:03:06 -05:00
MakiCode 906c1c2e66 Added check for filename in archive manager and added test 2015-10-04 19:53:07 -05:00
Rob fcce52b169 Merge pull request #4475 from 3onyc/fix-typo
Typo: prefering -> preferring
2015-10-04 00:10:34 +02:00
3onyc 8cacb16cce Typo: prefering -> preferring 2015-10-03 22:40:55 +02:00
Kocsis Máté 1bfb4faac6 Removed unnecessary type in the JSON schema 2015-10-02 20:29:52 +02:00
MakiCode 87b5af60a8 Almost finished adding --file option, need to add unit test 2015-10-02 09:09:09 -05:00
Rob edf14dab15 Merge pull request #4469 from Soullivaneuh/patch-1
PackageInterface[] on RepositoryInterface php doc
2015-10-01 22:12:34 +02:00
Jordi Boggiano 790a941cba Merge pull request #4470 from alcohol/fix-config-lookup
itteratively expand key and attempt to match
2015-10-01 14:48:22 +01:00
Rob Bast 7bd0c5abdd itteratively expand key and attempt to match
fixes #4459 (also)
2015-10-01 15:05:38 +02:00
Sullivan SENECHAL 4f4d236be3 PackageInterface[] on RepositoryInterface php doc 2015-10-01 14:54:45 +02:00
Jordi Boggiano 5ccaad92c1 Merge remote-tracking branch 'alcohol/weird-config-listing-issue' 2015-09-30 11:52:04 +01:00
Rob Bast 2dbad30336 fixes #4459 2015-09-29 20:57:26 +02:00
Sebastien Chemin 13f6ae1820 Fix archive-dir documentation example
Use an example of archive-dir configuration
2015-09-28 13:33:35 +02:00
Sebastien Chemin 3896a6c263 Enable cmdline configuration for archive-dir and archive-format
Examples of commands :
composer config --global  archive-dir $HOME/.composer/repo
composer config --global  archive-format zip
2015-09-28 13:22:38 +02:00
Jordi Boggiano ce08582671 Fix CS 2015-09-28 10:53:24 +01:00
Jordi Boggiano 96a8bc6c5b Update fixer config for latest master 2015-09-28 10:51:28 +01:00
Jordi Boggiano c41079192f Merge pull request #4454 from alcohol/urlencode-urls-only
only urlencode $ if filename is not local
2015-09-28 10:38:16 +01:00
Rob Bast b219abe8f6 @seldaek damn your assignment in expression 2015-09-28 10:59:26 +02:00
Rob Bast e491b72a8c only urlencode $ if filename is not local 2015-09-28 10:39:36 +02:00
Rob Bast 1328d9c3b2 rename baseversionparser to semverversionparser
and fix docblock as per @stof request
2015-09-25 11:05:38 +02:00
Rob Bast 89717fa593 implement old linkconstraintinterface for BC 2015-09-25 10:59:56 +02:00
Rob Bast 0adcab7a19 compile phar with semver included 2015-09-24 16:49:10 +02:00
Rob Bast a1ad7fc435 fix classname clashing cause of existing class in current namespace 2015-09-24 16:48:46 +02:00
Rob Bast 3a289ed5c3 regenerate lock with latest composer 2015-09-24 16:35:54 +02:00
Rob Bast ddb1c1e052 these 2 use parseNameVersionPairs 2015-09-24 16:34:48 +02:00
Rob Bast a1427d7fd6 replace all occurences in code and comments 2015-09-24 16:32:36 +02:00
Rob Bast 1ccfc8eb96 add semver, deprecated existing classes 2015-09-24 16:28:28 +02:00
Jordi Boggiano 15face5432 Merge pull request #4444 from dennisbirkholz/fix-4439
Fix #4439
2015-09-23 18:46:25 +01:00
Dennis Birkholz 3febbc2cbf Test case to verify relative paths remain relative 2015-09-23 18:15:43 +02:00