1
0
Fork 0
Commit Graph

4396 Commits (3e727850ffd1cdec4acdd483824b65c645c84d57)

Author SHA1 Message Date
Jordi Boggiano 03567dfde7 Merge remote-tracking branch 'WARrior-Alex/master' 2014-03-31 14:57:40 +02:00
Alex Romanenko 5078d7c4fb Fix space in password for git auth 2014-03-31 09:39:58 +04:00
Haralan Dobrev aa1745ce2a Specify how ~ constraints handle pre-releases
The "next significant release" a.k.a as the tilde version constraint
would not install a pre-release (alpha, beta, RC) which is not in the same
version namespace.

But in the examples so far it was shown as `~1.2` equals `>=1.2,<2.0` which
would actually install `2.0-beta.1`, because it the pre-release is before
the `2.0` release.

See https://github.com/composer/getcomposer.org/issues/64
2014-03-30 23:33:30 +03:00
Jordi Boggiano 321bd3e1f7 Merge pull request #2855 from karptonite/patchambiguous
Bugfix: Don't show Ambiguous class resolution warning when not ambiguous
2014-03-30 19:55:37 +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 3e8a767f8a Attempt using bash on windows if it is available, fixes #2831 2014-03-29 17:26:43 +01:00
Jordi Boggiano 07b8fe8109 Refactor code so it works cross-platform, refs #2825 2014-03-29 14:16:13 +01:00
Jordi Boggiano 01bf61fede Merge remote-tracking branch 'sebbrandt87/master' 2014-03-29 14:10:46 +01:00
Sebastian Brandt f633ab503e Update SvnDownloader.php 2014-03-28 16:27:00 +01:00
Jordi Boggiano 8e2b1c3e24 Merge pull request #2838 from timroberson/issue-2826
Add auth for private, non-GitHub repos (#2826)
2014-03-28 14:32:06 +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 d038276a31 Merge pull request #6 from clarkstuth/master
Removing dead code segment.
2014-03-25 10:49:28 -05:00
Clark Stuth 8dc6a13a1c Removing dead code segment. 2014-03-25 10:48:38 -05:00
Clark Stuth bee3070014 Merge pull request #5 from clarkstuth/master
composer/composer pull request changes
2014-03-25 10:04:32 -05:00
Clark Stuth a12c4e2a17 Removed getWindowsFlag and setWindowsFlag methods from Perforce object. 2014-03-25 08:30:44 -05:00
Jordi Boggiano b09fb521d2 Fix headers array, fixes #2821 2014-03-25 11:44:16 +01:00
Clark Stuth dd1fd0e306 fixed perforce to reference labels instead of invalid tags 2014-03-24 15:19:35 -05:00
Tim Roberson 1f70148884 Change elseif to if. 2014-03-24 11:03:44 -04:00
Clark Stuth a392e9a32c Merge pull request #4 from clarkstuth/master
removing dead code lines and excess comments.   Looks good - @clarkstuth
2014-03-24 09:46:28 -05:00
Clark Stuth 3a3661a0b3 removing dead code lines and excess comments 2014-03-24 09:43:45 -05:00
Jan Brecka b94838169d show warning only instead of throwing exception 2014-03-24 14:34:02 +01:00
Tim Roberson db1e4b7574 Add auth for private, non-GitHub repos (#2826) 2014-03-24 09:01:35 -04:00
Jordi Boggiano 45fe0124f2 Merge pull request #2837 from drscre/patch-1
Bug in RunScriptCommand::execute()
2014-03-24 11:51:54 +01:00
drscre b75beda99c Bug in RunScriptCommand::execute()
When checking for known command in commandEvents and scriptEvent '&&' should be used instead of '||'
2014-03-24 13:26:04 +03: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 fc9e1d0cff CS fixes, refs #2823 2014-03-24 00:31:08 +01:00
Jordi Boggiano a6531f6fd3 Merge remote-tracking branch 'fredemmott/hh-support' 2014-03-24 00:28:08 +01:00
Jordi Boggiano c96dedd19c Merge pull request #2268 from schmkr/svnDriver-trunkPath-improvements
Improved the handling of trunkPath
2014-03-23 23:22:39 +01:00
Jordi Boggiano e221757197 Update code to latest EventDispatcher, refs #2722 2014-03-23 23:05:03 +01:00
Sandy Pleyte b9efdd8348 Separated the scripts events in 2 arrays because they need to be called by different dispatchers. 2014-03-23 23:03:03 +01:00
Sandy Pleyte 2618e9a4f1 Fixed some docblocks 2014-03-23 23:02:56 +01:00
Sandy Pleyte fd4fb80d1e Fix for #2557, added missing run-scripts 2014-03-23 23:02:49 +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 bdd225a550 Merge pull request #3 from clarkstuth/master
Fixing perforce driver/downloader bugs
2014-03-21 14:04:55 -05:00
Clark Stuth 051aec83ef Merge branch 'master' of https://github.com/clarkstuth/composer 2014-03-21 14:02:01 -05: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
Clark Stuth 15b8c6f1c3 Fixing perforce dev-master stored reference bug. 2014-03-21 13:42:00 -05:00
Jan Brecka a41370b021 fix plural in exception message 2014-03-21 14:26:54 +01: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
Clark Stuth c1a8b4645c Fixing delete client workspace bug. 2014-03-19 13:58:41 -05:00