1
0
Fork 0
Commit Graph

1011 Commits (ca168d478bd7a52491e5f3f1384ee4ee0b1a5fe5)

Author SHA1 Message Date
Jordi Boggiano 7b4fcd93d3 Merge remote-tracking branch 'webfactory/issue-2698'
Conflicts:
	src/Composer/Repository/ArtifactRepository.php
2014-07-19 21:35:51 +02:00
Jordi Boggiano 4f0d7e4739 Merge remote-tracking branch 'dzuelke/prefer-stable-lock' 2014-07-19 19:38:00 +02:00
Jordi Boggiano d5294ef91b Update repo url from github and handle trailing slashes, refs composer/packagist#354 refs composer/packagist#423 2014-07-19 18:40:01 +02:00
David Zuelke d47d9eb253 remember prefer-stable setting in composer.lock 2014-07-07 21:20:46 +02:00
Jordi Boggiano 449f8165ef Allow $HOME and ~ usage in all *-dir config values, fixes #3060 2014-06-29 14:47:43 +02:00
Jordi Boggiano 8881cec174 Simplify version ranges (hopefully includes hhvm), refs #3049 2014-06-29 12:27:27 +02:00
Jordi Boggiano 3874a11238 Update json test 2014-06-22 11:01:05 +02:00
Jordi Boggiano ac497feaba CS fixes 2014-06-10 16:13:12 +02:00
Jordi Boggiano 08e34858d6 Fix code to use hostname only, refs #3026 2014-06-05 11:14:29 +02:00
Jordi Boggiano 89ec322929 Merge remote-tracking branch 'benja-M-1/feature/svn-auth-from-auth-json' 2014-06-05 11:08:19 +02:00
Jordi Boggiano c0f9a00125 Merge remote-tracking branch 'jakoch/patch-6' 2014-06-05 10:57:43 +02:00
Jordi Boggiano 959cc4d63c Add info about conf file loading to debug output 2014-05-31 16:50:33 +02:00
Benjamin Grandfond a21b0f82db Allow SVN to connect with credentials provided with the auth.json file 2014-05-30 17:14:43 +02:00
Jordi Boggiano 7131607ad1 Fix regression in handling github-oauth settings in auth.json 2014-05-27 16:26:24 +02:00
Mátyás Somfai 2ed0bfc1ba added tests for not updating packages referenced by specific commit hash 2014-05-27 14:23:31 +02:00
Jordi Boggiano 90d1b6e08a Rename basic-auth to http-basic, add docs/schema/config support, add local auth file support, add storage to auth.json, add store-auths config option, refs #1862 2014-05-27 13:50:47 +02:00
Jordi Boggiano 64ac32fca9 Merge pull request #2785 from Firehed/master
Add @generated annotation to lockfile (ref PR 2210)
2014-05-24 22:57:50 +02:00
Jordi Boggiano e23665be59 Fix replacers being picked if whatProvide was called before building the package whitelist, fixes #2991, fixes #2962 2014-05-23 15:22:53 +02:00
Jordi Boggiano 97873a27af Update perforce code 2014-05-07 19:34:41 +02:00
Jordi Boggiano 77163f66fc Add support for mirrors in composer repos 2014-05-07 19:34:35 +02:00
Jordi Boggiano 32cd883daa Rename options to transport-options, refs #2189 2014-05-07 18:25:28 +02:00
Jordi Boggiano 31092843fd Only load options when they come from the lock file, not from standard metadata, refs #2189 2014-05-07 18:12:26 +02:00
Jordi Boggiano 016a016455 Merge remote-tracking branch 'lcobucci/master'
Conflicts:
	src/Composer/Downloader/FileDownloader.php
2014-05-07 18:02:46 +02:00
jakoch a0e5ead9b0 removed unused variables $baseDir and $vendorDir from "autoloader_real.php" generated by AutoloadGenerator. adjusted tests accordingly. 2014-05-02 17:42:31 +02:00
Fabien Potencier 12421dd6b7 fixed class map generator when using a heredoc with spaces 2014-04-28 15:21:22 +02:00
Jordi Boggiano 49d4054e51 Handle files with no php at all, fixes #2910 2014-04-14 12:47:47 +02:00
Jordi Boggiano b437c1cc05 Support github auth directly in the RemoteFilesystem class 2014-04-11 14:29:17 +02:00
Jordi Boggiano 4392be4d29 Fix some more inconsistencies in json manipulation 2014-04-10 16:11:43 +02:00
Jordi Boggiano d742ffca4f Fix removal of missing keys 2014-04-10 15:55:05 +02:00
Denis Sokolov 836534067b Avoid ambiguity warning for example directories as well
In particular, PEAR repositories use a classmap and example directories trigger
multiple false positive warnings.
2014-04-10 21:03:35 +09:00
Denis Sokolov 65b9cca7b5 Fix ClassMapGenerator unambiguousReference test coverage
Without this fix the test only covers having files in "test", the "fixture"
portion it is not covered at all, because all fixtures in phpunit tests
are already in "test" directory
2014-04-10 21:03:26 +09:00
Jordi Boggiano e7b82cdd88 Only check in require and for non-platform packages, add flag to make this warning optional, refs #2320 2014-04-09 15:37:50 +02:00
Jordi Boggiano e0004d0656 Merge remote-tracking branch 'stof/validate_unbound_constraints' 2014-04-09 14:51:14 +02:00
Jordi Boggiano d99212da52 Fix integration tests 2014-04-07 11:10:57 +02:00
Jordi Boggiano 0902305196 Fix classmap generator warnings and tests 2014-04-01 14:38:31 +02:00
Jordi Boggiano 8974a1ac92 Ignore ambiguous classes in tests/fixtures dirs, fixes #2858 2014-03-31 21:36:48 +02:00
Daniel Karp e3be04c443 Don't show Ambiguous class resolution warning if class when not ambiguous
if a class or interface is defined twice in the same class, this should not produce a warning
2014-03-30 12:53:15 -04:00
Jordi Boggiano 7daf876d70 Fix test because the order of filesystem iteration is non deterministic 2014-03-29 18:10:32 +01:00
Jordi Boggiano 781c97fa9b Refactor to avoid global static state 2014-03-29 17:46:55 +01:00
Jordi Boggiano c3ab09750d Merge remote-tracking branch 'johnikx/ambiguous-reference-warning' 2014-03-29 17:29:55 +01:00
Jordi Boggiano f233383de8 Merge pull request #2834 from vuhl/master
Fixing perforce driver/downloader bugs
2014-03-26 18:28:52 +01:00
Clark Stuth a12c4e2a17 Removed getWindowsFlag and setWindowsFlag methods from Perforce object. 2014-03-25 08:30:44 -05:00
Clark Stuth dd1fd0e306 fixed perforce to reference labels instead of invalid tags 2014-03-24 15:19:35 -05:00
Jan Brecka b94838169d show warning only instead of throwing exception 2014-03-24 14:34:02 +01:00
Jan Brecka de09c5e371 remove duplicity 2014-03-24 10:35:44 +01:00
Jan Brecka 5763685e69 use statement 2014-03-24 10:30:50 +01:00
Jordi Boggiano 808e65f7de Merge pull request #2769 from sndpl/issue/2739
Fix for #2739 (and #1755), added support for directory excludes in the gitignore file
2014-03-23 22:01:39 +01:00
Clark Stuth 2651cbc5fe Fixing perforce dev-master stored reference bug. 2014-03-21 13:51:18 -05:00
Clark Stuth 8fc1961463 Fixing delete client workspace bug. 2014-03-21 13:51:18 -05:00
Clark Stuth c11105dd60 Fixing bug not cleaning up workspaces. 2014-03-21 13:51:18 -05:00
Clark Stuth 492539101c got all unit tests passing 2014-03-21 13:51:18 -05:00
Clark Stuth 24dd42267f almost all unit tests passing after IOInterface dependency refactor. no longer passing IOInterface into any Perforce methods 2014-03-21 13:51:18 -05:00
Clark Stuth 0f7b078d6c added new dependency to Perforce object, updating some tests. 2014-03-21 13:51:18 -05:00
Jan Brecka ea7717c8e5 improve exception message 2014-03-20 14:24:42 +01:00
Jan Brecka 13b57112a9 Throw RuntimeException when ambiguous reference was found. 2014-03-20 13:37:05 +01:00
Christian Flothmann 2241328934 fix "replace-alias.test" test 2014-03-12 16:35:04 +01:00
Christophe Coevoet b639005f29 Added a failing test for #2626 2014-03-12 15:10:25 +01:00
Eric Stern 634d1aba63 Add @generated annotation to lockfile readme, giving a hint for linters and other static analysis tools 2014-03-06 10:15:59 -08:00
Jordi Boggiano 604a65cc31 Fix indenting, refs #2788 2014-03-06 10:26:16 +01:00
Sylvain Filteau 92e283973f Skip test requiring mbstring when it's not installed 2014-03-05 20:30:09 -05:00
Jordi Boggiano 790a25c348 Adjust dump command, add another test, update docs, refs #1344 2014-03-01 21:21:00 +01:00
Jordi Boggiano 023ff131aa Merge remote-tracking branch 'bamarni/autoload-dev' 2014-03-01 20:28:31 +01:00
Jordi Boggiano 1f2d8908f3 Merge remote-tracking branch 'olvlvl/fix_issue_2598' 2014-03-01 19:56:33 +01:00
Sandy Pleyte 3e161e8ea9 Updated the regexp and added an other test case for sub dirs 2014-02-28 16:30:55 +01:00
Sandy Pleyte 1d51e54a31 Updated the regexp and added more test cases. 2014-02-28 11:43:28 +01:00
Bilal Amarni db91454a13 added an autoload-dev section 2014-02-28 00:27:03 +01:00
Sandy Pleyte 21109ada22 Fix for #2739 (and #1755), added support for directory excludes in the .gitignore file like /directory or directory/ 2014-02-27 15:17:15 +01:00
Jordi Boggiano 0d4c2bb7d7 Fix github test 2014-02-26 17:38:58 +01:00
Jordi Boggiano 5067d76dbc Adjust test suite 2014-02-26 16:01:31 +01:00
Nils Adermann 1ccf4b0fc3 Correct the tests for dist urls for github 2014-02-24 19:51:03 +01:00
Nils Adermann 5ed18d9aa2 Fail over from source to dist and vice versa when downloads fail
Any RuntimeException descendent will be caught and cause another
download attempt using either source or dist depending on what was
attempted first.
2014-02-24 18:40:33 +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 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 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
Olivier Laviale 40e484ed38 Fixed an issue that would lead to scattered autoloading files 2014-02-20 23:18:48 +01: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 3a2815b778 Added extra unit test from the example in the ticket. 2014-02-19 14:17:23 +01:00
Matthias Pigulla beff1f5cc1 This should create relative/absolute dist URLs depending on the way (relative/absolute) the artifact directory path was given. 2014-02-18 23:28:45 +01: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 9d2d828b70 Merge remote-tracking branch 'h4cc/master' 2014-02-13 12:47:01 +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
Nicolas Grekas 00a6f8e38d dedicated scope isolation function for autoload_real 2014-02-06 11:53:42 +01:00
Julius Beckmann ed5da804dd Fixed handling of Metapackages in DownloadManager.
The "getDownloaderForInstalledPackage" returns null for "metapackage" and the download(), update() and remove() methods did not handle this return value correctly.
2014-02-06 10:50:06 +01:00
Nils Adermann aef0483cc9 Merge pull request #2667 from nicolas-grekas/master
scope isolation for user includes
2014-02-05 18:24:55 +01:00
Nicolas Grekas 6d7b9afc4b scope isolation for user includes 2014-02-05 17:33:06 +01:00
Jordi Boggiano 75cd91657a Merge remote-tracking branch 'jeromemacias/fix_psr4_classmap_generator' 2014-02-05 09:53:49 +01:00
Andreas Hennings fcf8e7f515 Random docblock improvements in AutoloadGeneratorTest. 2014-02-04 12:35:50 +01:00
Andreas Hennings 6a9fd1dd60 rename \$package to \$mainPackage in AutoloadGeneratorTest::testOverrideVendorsAutoloading() for clarity. 2014-02-04 12:35:50 +01:00
Andreas Hennings bb26152de2 docblock comments on properties in AutoloadGeneratorTest 2014-02-04 12:35:50 +01:00
Andreas Hennings cab6943df0 AutoloadGeneratorTest::testOverrideVendorsAutoloading() - break autoload definitions to multiple lines. 2014-02-04 12:35:50 +01:00
Andreas Hennings 084c11ef51 AutoloadGeneratorTest::testMainPackageAutoloadingWithTargetDir() - Remove PSR-4 from the package in target-dir test, since it is incompatible with target-dir. 2014-02-04 12:35:50 +01:00
Jérôme Macias 01cd990995 Fix PSR-4 autoload classmap generator 2014-02-03 16:53:56 +01:00