1
0
Fork 0
Commit Graph

4041 Commits (aa74818fe00c5f5eb57c1c38b807e9e2950c670c)

Author SHA1 Message Date
Nils Adermann aa74818fe0 Handle array candidates in whatProvides 2014-02-21 16:53:59 +01:00
Nils Adermann eb5c785dcd Remove superfluous string casts 2014-02-21 14:22:38 +01:00
Nils Adermann 33e872d7d3 Merge pull request #2733 from naderman/limit-replace-provide
Whitelist packages with names matching those specified before generating rules
2014-02-21 13:46:50 +01:00
Nils Adermann 5b80144ad0 Resolve job packages after whitelist generation 2014-02-21 13:41:21 +01:00
Nils Adermann bc7008270f Properly limit to name matches only if necessary 2014-02-21 13:15:54 +01:00
Nils Adermann ec12b8a675 Add tests for the changes in #2690 2014-02-21 13:15:07 +01:00
Nils Adermann 3148ffd355 Whitelist packages with names matching those specified before generating rules
Addresses #2690 doesn't do any performance optimisations yet which we
could do now
2014-02-21 12:25:15 +01:00
Jordi Boggiano eb3384445b Merge pull request #2188 from Danack/GetRootComposerJson
Find root composer.json in zip artifact more reliably.
2014-02-21 11:33:01 +01:00
Danack 20a7dcd02c Added explanation of why loop continues. 2014-02-21 09:54:42 +00:00
Danack e4d4a7ae17 Added comment for generating files. 2014-02-21 09:49:12 +00:00
Danack 24aba5b51f Moved file back to correct location. (+1 squashed commit)
Squashed commits:
[eec32aa] Updated detection to only allow composer.josn in root or first level dir.
2014-02-21 09:46:12 +00:00
Danack bc76e0014b Moved tests that are expected to work into their own directory.
Added test for composer.json in incorrect directory.
2014-02-20 17:30:51 +00:00
Jordi Boggiano 0df9c803a5 Merge pull request #2718 from sndpl/issue/2613
Fix for #2613
2014-02-20 17:27:31 +01:00
Sandy Pleyte d788ee7d99 Fixed docblock 2014-02-20 17:18:52 +01:00
Sandy Pleyte 6bdcd9266c Fixed #2601, the callback functions expect param 1 to be a reference to the $config 2014-02-20 17:18:44 +01:00
Jordi Boggiano 60bf5633ea Wording tweaks, refs #2728 2014-02-20 17:14:42 +01:00
Jordi Boggiano 7ac1f1265e Merge remote-tracking branch 'sndpl/issue/2494' 2014-02-20 17:12:59 +01:00
Sandy Pleyte 40095d980c Fix for #2494, don't retrieve svn log when the references don't contain a reference number. 2014-02-20 16:26:34 +01:00
Jordi Boggiano bbda0434e5 Merge pull request #2584 from Cinderella-Man/version-setter
Package version setter
2014-02-20 15:16:32 +01:00
Jordi Boggiano 41afc8324e Workaround for json schema bug, fixes #2726 2014-02-19 17:21:54 +01:00
Sandy Pleyte 3a2815b778 Added extra unit test from the example in the ticket. 2014-02-19 14:17:23 +01:00
Jordi Boggiano 17ff267505 Update vendors 2014-02-19 13:30:58 +01:00
Jordi Boggiano a782802e62 Merge pull request #2723 from jmalloc/update-json-schema
Updated json-schema version requirement to allow newer versions.
2014-02-19 11:17:46 +01:00
Jordi Boggiano 432ace33d4 Clean up svn environment to fix OSX issues, fixes #2708, refs #2146 2014-02-19 10:55:00 +01:00
James Harris 9ac4ab1b85 Updated json-schema version requirement to allow newer versions. 2014-02-19 11:05:05 +10:00
Jordi Boggiano 5d4900e79d Add --no-checkout flag to avoid checking out the default branch first, fixes #2717 2014-02-18 13:28:46 +01:00
Sandy Pleyte f92f2f45a9 Fix for #2613, when using php < 5.4 there was an unnecessary backslash before each utf-8 char. The problem was that the regexp matched all utf-8 encoded chars (included the ones that where escaped). The new regexp uses the lookbehind feature to check if the backslash isn't prefixed with an other backslash. 2014-02-18 09:01:12 +01:00
Sandy Pleyte 7a902ed96d Fix for #2613, when using php < 5.4 there was an unnecessary backslash before each utf-8 char. The problem was that the regexp matched all utf-8 encoded chars (included the ones that where escaped). The new regexp uses the lookbehind feature to check if the backslash isn't prefixed with an other backslash. 2014-02-17 13:54:35 +01:00
Jordi Boggiano 9896abeb38 Doc tweaks, refs #2682 2014-02-13 16:23:53 +01:00
Jordi Boggiano 245461d8ed Merge pull request #2682 from gena01/ssh-support-in-github-protocols
Adding ssh protocol support to "github-protocols".
2014-02-13 16:05:58 +01:00
Jordi Boggiano 93da24b45a Merge pull request #2695 from guillaumelecerf/fix_cache_gc_with_cachedir_devnull
Fix Cache::gc() when COMPOSER_CACHE_DIR=/dev/null
2014-02-13 15:59:07 +01:00
Jordi Boggiano 3f4e0d22c5 Merge pull request #2691 from dave1010/docs-patch
Fix some PHP doc blocks
2014-02-13 14:57:35 +01:00
Jordi Boggiano f44aa64a2b Update deps to sf 2.4.2 2014-02-13 14:40:42 +01:00
Jordi Boggiano a25596698b Update short project description (creds to @briandoll) 2014-02-13 14:40:13 +01:00
Jordi Boggiano e19da1435e Update docs for the new flag 2014-02-13 14:37:11 +01:00
Jordi Boggiano 91df245be0 Merge pull request #2688 from slbmeh/master
add allowing require to update dep chain, fixes composer/composer#2668
2014-02-13 14:32:36 +01:00
Jordi Boggiano e03057156c CS fixes 2014-02-13 12:48:12 +01:00
Jordi Boggiano 9d2d828b70 Merge remote-tracking branch 'h4cc/master' 2014-02-13 12:47:01 +01:00
Guillaume LECERF 44fd75ef38 Fix Cache::gc() when COMPOSER_CACHE_DIR=/dev/null
If we set COMPOSER_CACHE_DIR=/dev/null, and the garbage collector
is triggered, we end up with the following error :

The "/dev/null/" directory does not exist.

This is because the Cache::gc() function does not check for Cache::enabled
and instanciates a Finder unconditionnaly.

Fix this by adding a check on Cache::enabled.
2014-02-12 15:01:21 +01:00
Dave Hulbert 81aa3a850c Fix some PHP doc blocks 2014-02-11 10:09:30 +00:00
Steve Buzonas 3ad47b5d2c add allowing require to update dep chain, fixes composer/composer#2668 2014-02-10 15:30:46 -05:00
Gennady Feldman ac78eaa027 Adding ssh protocol support to github-protocols. 2014-02-07 11:11:36 -05:00
Nils Adermann 7343198817 Merge pull request #2681 from trivago/svn_fix
fixed svn tags directory handling
2014-02-07 10:59:35 +01:00
René Kerner 0f95e531b8 * fixed svn tag directory handling 2014-02-07 10:41:40 +01:00
Nils Adermann b7a9ea4187 Merge branch 'svn-root-detection'
* svn-root-detection:
  Reformat code to follow coding style
  * added svn handling for tags, trunk, branches in root packages
2014-02-06 23:07:47 +01:00
Nils Adermann f2c48788b8 Reformat code to follow coding style 2014-02-06 23:06:48 +01:00
Jordi Boggiano b5dd537422 Merge pull request #2648 from zczapran/unit_tests_for_jsonvalidationexception
[tests] Unit tests for JsonValidationException class
2014-02-06 21:39:32 +01:00
Jordi Boggiano f72066de90 Merge pull request #2649 from zczapran/bugfix/git_exclude_filter_rules_too_broad
[Archiver] Rules in GitExcludeFilter are too broad
2014-02-06 21:38:47 +01:00
Jordi Boggiano c7d5da89c8 Fix doc note 2014-02-06 21:15:30 +01:00
Jordi Boggiano c98b0402d8 Merge pull request #2673 from nicolas-grekas/master
dedicated scope isolation function for autoload_real
2014-02-06 12:11:42 +01:00