1
0
Fork 0
Commit Graph

7159 Commits (b1fee3035f9cb83b0a718cd7e4347ae820777452)

Author SHA1 Message Date
Jordi Boggiano 6816acbe27 Merge remote-tracking branch 'johnstevenson/xdebug-#5995' into 1.3 2016-12-28 17:44:45 +01:00
Jordi Boggiano 8764876cad Avoid loading xdebug platform package twice, fixes #5995 2016-12-28 17:38:45 +01:00
Jordi Boggiano c5dcedd0db Hide warning when xdebug is explicitly allowed 2016-12-28 17:34:27 +01:00
Jordi Boggiano d68362e66f Merge remote-tracking branch 'johnstevenson/xdebug-docs' into 1.3 2016-12-28 16:50:46 +01:00
johnstevenson 25ff290e4c Document COMPOSER_DISABLE_XDEBUG_WARN variable 2016-12-28 15:22:00 +00:00
johnstevenson d57a89d5af Update xdebug troubleshooting, fixes #5997 2016-12-28 12:13:23 +00:00
johnstevenson 2b8ad7dc2a Clear xdebug version if restart fails, fixes #5995 2016-12-27 18:46:21 +00:00
Stefan Grootscholten d80d266201 Fix dist download from bitbucket.
URL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
results in the following $pathParts:
array(5) {
  [0]=>
  string(0) ""
  [1]=>
  string(5) "ariya"
  [2]=>
  string(9) "phantomjs"
  [3]=>
  string(9) "downloads"
  [4]=>
  string(36) "phantomjs-2.1.1-linux-x86_64.tar.bz2"
}

A dist download URL is like:
https://bitbucket.org/user/repo/get/[git-hash].zip
array(5) {
  [0]=>
  string(0) ""
  [1]=>
  string(4) "user"
  [2]=>
  string(4) "repo"
  [3]=>
  string(3) "get"
  [4]=>
  string(14) "[git-hash].zip"
}
2016-12-24 21:10:12 +01:00
Jordi Boggiano 2782d37a15 Merge pull request #5992 from AnrDaemon/fix-git-skips-proper
Properly skip GitDownloaderTest if git is not available
2016-12-24 01:47:04 +01:00
AnrDaemon 1d2a949e3e Properly fix git excludes.
Mindless copy-paste never gets old. Sorry. This is fixed proper this time.
2016-12-24 03:19:50 +03:00
Jordi Boggiano 9042147674 Merge pull request #5931 from Jean85/patch-1
[Documentation] Update troubleshooting article
2016-12-24 01:08:39 +01:00
Jordi Boggiano 113b446e1f Prepare 1.3 release 2016-12-24 00:46:54 +01:00
Jordi Boggiano 97ccea1abb Merge pull request #5991 from AnrDaemon/fix-getcwd-inconsistency
Fix __DIR__/getcwd() inconsistency.
2016-12-24 00:35:51 +01:00
AnrDaemon 810e70d234 Fix __DIR__/getcwd() inconsistency. 2016-12-23 21:57:00 +03:00
Jordi Boggiano 4896d16817 Merge pull request #5990 from AnrDaemon/fix-git-skips
Skip git-related tests if no git found.
2016-12-23 15:04:36 +01:00
Jordi Boggiano df5fd3ba09 Cache executable finder calls 2016-12-23 15:01:05 +01:00
AnrDaemon ab70601700 Skip git-related tests if no git found. 2016-12-22 20:14:57 +03:00
Jordi Boggiano 324c31f4a7 Merge pull request #5984 from composer/revert-5974-allow-parent-path-repository
Revert "Allow use of parent directories in PathDownloader when not mirroring the path"
2016-12-20 17:27:36 +01:00
Jordi Boggiano fcbc1044e0 Revert "Allow use of parent directories in PathDownloader when not mirroring the path" 2016-12-20 17:27:24 +01:00
Jordi Boggiano b2efcb1078 Update dist/source mirrors as well when updating a package's URL 2016-12-20 13:55:25 +01:00
Jordi Boggiano 51cfe3ba73 Fix whitespace in selfupdate output, fixes #5980 2016-12-19 15:37:30 +01:00
Jordi Boggiano a78d800a24 Merge pull request #5974 from cweagans/allow-parent-path-repository
Allow use of parent directories in PathDownloader when not mirroring the path
2016-12-19 10:37:09 +01:00
Jordi Boggiano 1464146629 Explicitly cast possible-null to string 2016-12-19 10:31:57 +01:00
Jordi Boggiano 1bc8b702ca Fix handling of annotated tags and prefer them over lightweight tags, fixes #5555 2016-12-18 14:50:55 +01:00
Jordi Boggiano 01885777f3 Fix case insensitivity of remove command, fixes #5973 2016-12-18 12:48:17 +01:00
Jordi Boggiano d735524eb1 Merge pull request #5971 from johnstevenson/xdebug-version
Set xdebug version in environment, fixes #5967
2016-12-18 12:18:03 +01:00
Jordi Boggiano da097aa6fc Clarify PATH modification, refs #5970 2016-12-18 11:39:05 +01:00
Cameron Eagans 1cda8e1ef0 Allow use of parent directories in PathDownloader when not mirroring the path 2016-12-16 18:11:06 -07:00
johnstevenson 3928f1f3be Set xdebug version in environment, fixes #5967 2016-12-15 21:20:41 +00:00
Jordi Boggiano b1156ed376 Update date 2016-12-11 17:12:58 +01:00
Jordi Boggiano a1b468ea50 Fix git shortening, it is sunday.. 2016-12-11 17:04:24 +01:00
Jordi Boggiano da2352caaa Prepare 1.3.0-rc 2016-12-11 17:01:49 +01:00
Jordi Boggiano 98c5f825e0 Fix tests and regression in @ref script handling 2016-12-11 16:37:55 +01:00
Jordi Boggiano 58b94b66e5 Shorten git hashes to 10chars to avoid long lines, refs #5946 2016-12-11 16:29:20 +01:00
Jordi Boggiano 4d77ffcb4a Merge branch 'simplify-output' 2016-12-11 16:24:01 +01:00
Jordi Boggiano b0000617cc Support @php prefix for scripts to reuse the current PHP interpreter, fixes #5957 2016-12-11 16:17:34 +01:00
Jordi Boggiano 9b0ddcd9dd Merge pull request #5954 from Golodnyi/master
Not actual parameters
2016-12-11 16:16:52 +01:00
Jordi Boggiano 9d3e3ca486 Fix edge case in bitbucket driver 2016-12-09 18:05:17 +01:00
golodnyi 64f3079c53 rollback changes, since the implementation of the method "search" in the class "ComposerRepository" has parameter "type " 2016-12-08 22:53:03 +07:00
golodnyi 1cced223d8 Not actual parameters 2016-12-08 22:04:38 +07:00
Jordi Boggiano 4d082f77b8 Simplify composer output to take less lines 2016-12-07 01:09:06 +01:00
Jordi Boggiano e54c7478ee Attempt at fixing support for git 2.11, refs #5942 2016-12-07 01:02:55 +01:00
Jordi Boggiano 1dcb2b5758 Merge remote-tracking branch 'nicolas-grekas/apcu' 2016-12-07 00:21:13 +01:00
Jordi Boggiano d5d710421c Update dependencies 2016-12-06 23:54:00 +01:00
Jordi Boggiano 3c1300bcaf Allow disabling execution of operations and lock writing independently from dryRun, closes #5787 2016-12-06 23:54:00 +01:00
Jordi Boggiano cd21d7e7d4 Merge pull request #5897 from baptistedonaux/patch-1
Permanent swap file tutorial proposed
2016-12-06 22:44:11 +01:00
Jordi Boggiano 47beefe94c Merge branch '1.2' 2016-12-06 22:03:07 +01:00
Jordi Boggiano 021facff7a Update changelog for 1.2.4 2016-12-06 22:00:44 +01:00
Jordi Boggiano 9ee17ef6ff Fix handling of partial package listings containing replaces/provides 2016-12-06 21:56:09 +01:00
Alessandro Lai 7b966f9355 Remove reference to COMPOSER_IGNORE_XDEBUG_WARN 2016-12-06 17:48:23 +01:00