1
0
Fork 0
Commit Graph

904 Commits (cb32c480be2ea96df1fad5e3096e0b63fdae7255)

Author SHA1 Message Date
Pádraic Brady bf01a55e53 Patch RFS test to set private fileUrl property and pass 2014-02-28 18:46:49 +00:00
Pádraic Brady 81b86acc53 Merge branch 'master' of github.com:composer/composer into tls-config
Conflicts:
	src/Composer/Util/RemoteFilesystem.php
2014-02-27 17:56:32 +00: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
Pádraic Brady 30c6aa3183 Merge branch 'master' of github.com:composer/composer into tls-config 2014-02-25 18:49:33 +00:00
Pádraic Brady a2bf14e381 Make disableTls a core RemoteFilesystem option - per method invites human error 2014-02-24 19:15:54 +00: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
Pádraic Brady bdad4f2b0c Small test fix to RemoteFilesystemMock 2014-02-23 14:51:03 +00:00
Pádraic Brady 2648064e5a Some typos/corrections 2014-02-23 14:15:24 +00:00
Pádraic Brady 1e1e713329 Added test for RemoteFilesystem TLS options setup 2014-02-23 13:33:29 +00:00
Pádraic Brady 7e30c67827 Add config.json default config option for "disable-tls" (FALSE by default) 2014-02-23 10:20:48 +00: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
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
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
Zbigniew a4a9d0f0e4 [Archiver] Rules in GitExcludeFilter are too broad 2014-01-30 23:34:28 +00:00
Zbigniew 94635c0d14 [tests] Unit tests for JsonValidationException class 2014-01-30 17:39:13 +00:00
Jordi Boggiano 99f5b5a238 Fix backtracking issue in json manipulations, fixes #2583 2014-01-12 21:13:00 +01:00
Jordi Boggiano 3c5000ad7f CS tweaks and cleanups, allow "" to set fallback dirs, refs #2459 2014-01-03 16:31:23 +01:00
Jordi Boggiano b23742e30c Merge remote-tracking branch 'donquixote/feature/psr4-complete' 2014-01-03 14:56:36 +01:00
Pascal Borreli 2f4df9d459 Fixed typos 2013-12-27 11:51:01 +00:00
Andreas Hennings 0a4b18ce86 More interesting generator tests for PSR-4. 2013-12-22 19:58:27 +01:00
Andreas Hennings bda2bcac13 Fix indentation of assignment in AutoloadGeneratorTest 2013-12-22 19:39:09 +01:00
Andreas Hennings 8966376f40 Verify generation of autoload_psr4.php even if empty. 2013-12-22 19:38:11 +01:00
Andreas Hennings e4bbd83f13 expected message in ValidatingArrayLoaderTest should also contain psr-4 as allowed key. 2013-12-22 19:03:23 +01:00
Jordi Boggiano 80499bb024 Detect ~> misuse and suggest fix, fixes #2476 2013-12-06 13:32:19 +01:00