1
0
Fork 0
Commit Graph

6068 Commits (017a9af672e0fde922133422fe1f60c194491924)

Author SHA1 Message Date
Niels Keurentjes 017a9af672 Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-07 14:45:15 +01:00
Jordi Boggiano 9a57de574d Merge pull request #4886 from curry684/issue-4885
Ensure exception is thrown when classmaps are requested for corrupted files
2016-02-06 15:53:14 +00:00
Jordi Boggiano 7e17fec3b8 Merge pull request #2585 from jaypea/ziparchiver
added ZipArchiver to actually compress zip files
2016-02-06 15:49:24 +00:00
Niels Keurentjes 0b55a0ca91 Can't use error_clear_last as it was introduced in PHP7. 2016-02-06 02:58:36 +01:00
Niels Keurentjes 6a53b1df42 Further reorganized messy checking code. 2016-02-06 02:40:16 +01:00
Niels Keurentjes bb08f76ad9 Use error_get_last to verify why php_strip_whitespace would return an empty string. 2016-02-06 02:32:08 +01:00
Niels Keurentjes 86fc85fe56 Add a comment explaining the use of @ instead of Silencer in this specific situation. 2016-02-06 02:04:48 +01:00
Niels Keurentjes c2d9960898 Ensure exception is thrown when classmaps are requested for corrupted or binary files. Refs #4885 2016-02-06 02:00:54 +01:00
Jordi Boggiano 101fca9071 Merge pull request #4837 from cs278/openssl-version-warning
Warning if OpenSSL does not support TLSv1.2
2016-02-05 22:46:05 +00:00
Jordi Boggiano 03a12ac2b9 Merge pull request #4881 from alcohol/issue-4319
"smarter" php version conflict message
2016-02-05 18:47:05 +00:00
Rob Bast 5db0f623b0 enable test again 2016-02-05 13:36:53 +01:00
Rob Bast baa84d9be1 adjust test and assertion to be more flexible 2016-02-05 13:34:21 +01:00
Rob Bast baabc612f6 adjust message, skip test
currently we have no way to put dynamic values or wildcards in EXPECT-OUTPUT
2016-02-05 13:21:30 +01:00
Rob Bast 94daeca57b add test and adjust rule error message 2016-02-05 11:59:05 +01:00
Niels Keurentjes 54c079b559 Fixed Windows detection based on #4873 and suppressed some console output in removeJunction. 2016-02-05 11:27:41 +01:00
Niels Keurentjes 582e4796a3 Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-05 11:24:30 +01:00
Jordi Boggiano 79ac2cac82 Merge pull request #4817 from alcohol/repro-4795
Bug #4795
2016-02-04 12:40:23 +00:00
Rob Bast df23153932 fix output 2016-02-04 12:45:55 +01:00
Jordi Boggiano 2e1cdccac0 Merge pull request #4875 from cs278/openssl-platform-version
Handle OpenSSL's many patch releases
2016-02-04 11:43:55 +00:00
Rob Bast be5719eb53 Merge remote-tracking branch 'upstream/master' into repro-4795
* upstream/master: (98 commits)
  Fallback to zlib extension to unpack gzip on non Windows systems
  Zip extension does not provide zlib support
  Unified all Windows tests throughout the code.
  Added Platform utility and unit test for it.
  Remove warnings for non-writable dirs, refs #3588
  [doc] add -H flag to sudo commands
  use full json content to determine reference, closes #4859
  typos
  Make sure COMPOSER_AUTH is also loaded in Config, refs #4546
  Use proper defaults for IO authentications
  Add verbosity input support to IOInterface
  Update SolverTest.php
  Update broken-deps-do-not-replace.test
  Update SolverProblemsException.php
  Cleaned up check+conversion that was no longer required.
  Cleaner notation for expected exceptions in fixtures.
  Introduced more generic, less invasive way to test for exceptions in fixtures, more in line with how phpunit works.
  Included unit test for circular root dependencies.
  Expanded InstallerTest to support expecting Exceptions by supplying "EXCEPTION" as "--EXPECT--"
  Clarified error message and added braces.
  ...
2016-02-04 12:43:37 +01:00
Jordi Boggiano 16215c1937 Merge pull request #4877 from cs278/zip-zlib-muddle
zlib suggest and fallback on non Windows
2016-02-04 11:15:49 +00:00
Jordi Boggiano 57e33fcad7 Merge pull request #4873 from curry684/platform-tests
Windows platform tests unified
2016-02-04 11:12:36 +00:00
Jordi Boggiano 644aa517d5 Merge pull request #4863 from alcohol/issues-4859
bugfix for issue #4859 - path repo does not update when composer.json is adjusted
2016-02-04 10:58:59 +00:00
Chris Smith e4877473cf Fallback to zlib extension to unpack gzip on non Windows systems 2016-02-04 00:49:56 +00:00
Chris Smith 8debdf8764 Zip extension does not provide zlib support 2016-02-04 00:34:01 +00:00
Chris Smith 0818a6ed54 Previous attempt would cause 0.9.8aa == 0.9.8b 2016-02-04 00:28:42 +00:00
Chris Smith f6f273c4b6 Improve OpenSSL library description 2016-02-04 00:28:42 +00:00
Chris Smith e9e2514b5e Handle OpenSSL version after 26 patch releases
e.g. https://github.com/openssl/openssl/blob/OpenSSL_0_9_8zh/crypto/opensslv.h#L33
2016-02-04 00:28:42 +00:00
Niels Keurentjes 0dab63e050 Unified all Windows tests throughout the code. 2016-02-03 22:39:16 +01:00
Niels Keurentjes f2a2b18367 Added Platform utility and unit test for it. 2016-02-03 22:25:43 +01:00
Jordi Boggiano 7117a5775f Merge remote-tracking branch 'origin/master' 2016-02-03 17:02:06 +00:00
Jordi Boggiano 8771eca527 Merge remote-tracking branch 'curry684/issue-4767' 2016-02-03 17:00:30 +00:00
Jordi Boggiano 3969799565 Merge pull request #4868 from bamarni/sudo-home-flag
[doc] add -H flag to sudo commands
2016-02-03 15:39:38 +00:00
Jordi Boggiano d93f7b8a10 Remove warnings for non-writable dirs, refs #3588 2016-02-03 14:57:32 +00:00
Bilal Amarni 8b4761ff14 [doc] add -H flag to sudo commands 2016-02-03 15:46:15 +01:00
Rob Bast 47aa87ea97 use full json content to determine reference, closes #4859 2016-02-03 13:25:10 +01:00
Niels Keurentjes b71c67239d Made NTFS junction detection more reliable and added unit tests for the junction functions. 2016-02-02 23:44:01 +01:00
Niels Keurentjes 1b1462317c Merge branch 'master' of https://github.com/composer/composer into pull-4690 2016-02-02 22:51:22 +01:00
Rob Bast 0e584aa980 resolve issue 2016-02-02 10:45:57 +01:00
Jordi Boggiano cff35071b6 Merge pull request #4849 from bamarni/typos
typos :)
2016-01-31 15:50:19 +00:00
Bilal Amarni cc75946ef2 typos 2016-01-29 17:13:44 +01:00
Jordi Boggiano 7c3e621102 Make sure COMPOSER_AUTH is also loaded in Config, refs #4546 2016-01-29 12:58:17 +00:00
Jordi Boggiano 2617ec5d28 Use proper defaults for IO authentications 2016-01-29 12:51:23 +00:00
Jordi Boggiano 49d7d65933 Add verbosity input support to IOInterface 2016-01-29 10:14:12 +00:00
Rob a9cb931896 Merge pull request #4847 from jeffersoncarpenter/master
Update Error Message In SolverProblemsException.php
2016-01-29 10:20:30 +01:00
Jefferson Carpenter b7845bb6c0 Update SolverTest.php 2016-01-28 20:13:44 -06:00
Jefferson Carpenter 087b901545 Update broken-deps-do-not-replace.test 2016-01-28 20:12:51 -06:00
Jefferson Carpenter 8d57c3e743 Update SolverProblemsException.php 2016-01-28 19:56:25 -06:00
Niels Keurentjes 358cb3f4fc Fixed exception text and some warnings. 2016-01-28 01:06:05 +01:00
Niels Keurentjes 5489586436 Fully implemented junctioning on Windows for path repositories. 2016-01-28 00:56:02 +01:00