1
0
Fork 0
Commit Graph

500 Commits (b3077bc4bc880dffe022e1847d456cffee98d937)

Author SHA1 Message Date
Jordi Boggiano 488e794c9b Merge repos instead of replacing 2012-06-23 13:04:23 +02:00
Jordi Boggiano 3ac11b932c Expose default repositories in system config file 2012-06-23 12:55:05 +02:00
Jordi Boggiano 4a6ae454c2 Merge remote-tracking branch 'dpb587/multiple-repos'
Conflicts:
	src/Composer/Factory.php
	src/Composer/Package/Loader/RootPackageLoader.php
	tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
2012-06-23 12:09:31 +02:00
Jordi Boggiano 66e9dcddf4 CS fixes 2012-06-23 11:58:18 +02:00
Jordi Boggiano 4fcc114f97 Merge pull request #808 from palex-fpt/not-equal-operator
Add '<>' operator to Version Parser
2012-06-22 07:00:18 -07:00
Jordi Boggiano ccc6fa3714 Merge pull request #775 from palex-fpt/PR-746
PEAR Packages extraction based on package.xml format
2012-06-22 06:15:38 -07:00
Nils Adermann a756f7f880 Merge pull request #798 from cs278/dev-hash-detached-head
Ensure composer works with a detached head
2012-06-20 16:18:55 -07:00
Nils Adermann cb27a1f308 Merge pull request #812 from Seldaek/recover-refs
Recover to an older commit if a locked reference is not found
2012-06-20 16:18:02 -07:00
Nils Adermann cc7632489d Make problem report messages more readable
Added pretty strings to constraints
2012-06-20 19:06:36 +02:00
Jordi Boggiano 73a865bf2a Fix tests 2012-06-20 12:05:18 +02:00
Jordi Boggiano 4bbb168d44 Remove BC code 2012-06-19 23:06:40 +02:00
Alexey Prilipko 9f08764e9a Add '!=' handling to VersionConstraint::matchSpecific 2012-06-20 00:29:28 +11:00
Alexey Prilipko e130386612 Add '<>' operator for Version Parser 2012-06-19 12:11:11 +11:00
Jordi Boggiano a06ebdd8ef Add caching to svn metadata 2012-06-18 15:38:47 +02:00
Alexey Prilipko a88265a497 Update PearPackageExtractor for package.xml 2.1 support 2012-06-15 12:30:08 +11:00
Grégoire Pineau f4e9dd4fb8 Fixed PSR rules 2012-06-14 12:10:01 +02:00
Chris Smith 5e4b2fcc8d Test for detached heads yielding an invalid version 2012-06-14 11:03:26 +01:00
Chris Smith 97955a6ace Mock ProcessExecutor 2012-06-14 10:52:23 +01:00
Jordi Boggiano 021f7bc2be Merge remote-tracking branch 'naderman/solver-refactor' 2012-06-11 15:13:46 +02:00
Jordi Boggiano 1df9c62583 Cosmetic fixes to autoload generation 2012-06-11 14:15:08 +02:00
Nils Adermann 8a9c51c83e Merge remote-tracking branch 'github-beberlei/AutoloadFunctions' 2012-06-11 12:49:12 +02:00
Nils Adermann a08c2a0b9f Corrected altered error message in test 2012-06-07 11:07:09 +02:00
Alexey Prilipko 71ac073ebe Add 'include-path' option to PEAR packages 2012-06-06 13:00:35 +11:00
Alexey Prilipko 5c16889c48 Update PearDownloader to use PEAR extractor 2012-06-06 12:54:50 +11:00
Alexey Prilipko 01a49ea49e Add PEAR package extractor that honours package.xml formats 2012-06-06 12:52:13 +11:00
Nils Adermann 67fde90666 Correctly sort operations within transactions using DFS
Fixes #655
2012-06-05 01:06:35 +02:00
Nils Adermann a7f1605cdf Add test for correct sorting when force installing deps 2012-06-04 23:30:55 +02:00
Nils Adermann 26e051cb76 Decisions are now encapsulated in a separate object 2012-06-04 23:19:32 +02:00
Benjamin Eberlei 5c5e962b5a Add Files Autoloading key. This is a necessary feature to allow purely or partly functional libraries to be "autoloadable" by composer by calling require_once on every file in the "autoload"."files" list. 2012-06-02 18:18:33 +02:00
Jordi Boggiano b4622885de Fix tests with openssl disabled 2012-05-31 16:03:25 +02:00
Jordi Boggiano 5bfbff867c Root requires are not taken into account in locked installs, fixes #669 2012-05-28 18:57:59 +02:00
Nils Adermann c7250917e8 Skip dependency packages required in composer.json in update whitelist 2012-05-28 12:06:43 +02:00
Nils Adermann dfe366152c Add an update whitelist test for a dependency specified in composer.json 2012-05-28 11:55:16 +02:00
Nils Adermann 90c515522a Change whitelist integration test to check it doesn't update unrelated packages 2012-05-28 01:25:34 +02:00
Jordi Boggiano 734317b812 Add test and fix update whitelist feature 2012-05-28 00:11:47 +02:00
Jordi Boggiano 43150b88a2 Refactor integration tests to accept any run command 2012-05-28 00:11:18 +02:00
Jordi Boggiano f5e0918104 Add JsonManipulator class for doing raw manipulation of json strings 2012-05-26 14:44:24 +02:00
Jordi Boggiano 1127cd5c8a Merge pull request #735 from ajshort/composer-installer-multiple
Support multiple installers in a composer-installer package.
2012-05-25 01:53:31 -07:00
Andrew Short e0a1d9ef58 Support multiple installers in a composer-installer package. 2012-05-25 18:28:53 +10:00
Nils Adermann 41215a0e47 Require first version of a root package alias, rather than alias
This makes sure that the alias will always be installed, even if it isn't
technically needed.
2012-05-24 23:29:08 +02:00
Jordi Boggiano 9857145830 Add failing test when aliasing a feature to an aliased version 2012-05-24 20:53:13 +02:00
Jordi Boggiano d853337616 Show output when test fails to resolve 2012-05-23 11:07:04 +02:00
Jordi Boggiano d3cec0399a CS fixes & do not replace the exception since that removes the stack trace 2012-05-22 13:16:56 +02:00
Jordi Boggiano b68eb3317b Merge remote-tracking branch 'OfficineSoftware/master' 2012-05-22 12:59:12 +02:00
Jordi Boggiano 1bd4ccbd54 php-cs-fixer magic 2012-05-22 12:07:08 +02:00
Jordi Boggiano 4ea9b33a6c Merge remote-tracking branch 'naderman/solver-refactor' 2012-05-22 11:04:12 +02:00
Nils Adermann 81de780533 Merge pull request #702 from Seldaek/specify-refs
Specify commit/refs for dev requirements
2012-05-20 07:01:42 -07:00
Nils Adermann c869566868 Make ruleHash a protected member of rules 2012-05-20 15:57:38 +02:00
Nils Adermann dd527a4049 Remove weak rules
Since we no longer have suggest/recommend rules and no longer use any update
or feature rules so packages are removed by default, we do not need weak rules
anymore.
2012-05-19 21:49:48 +02:00
Nils Adermann 451bab1c2c Get rid of Literal object / literal id mix, use literals only to save memory 2012-05-19 20:38:56 +02:00
Martin Hasoň c8d110aa72 Imporoved exception message for GitDownloader (various protocols for github) 2012-05-18 14:41:57 +02:00
Jordi Boggiano c10eb66ac4 Ignore references when parsing dev versions 2012-05-17 04:07:15 +02:00
Jordi Boggiano ba29b4bf94 Added references for dev versions, fixes #599
dev-<branch> and <n.m>.x-dev versions can now have a #<reference> appended
to them. This reference being a git/hg commit hash, or svn revision.
2012-05-17 04:07:14 +02:00
Andrea Turso 3a31b59473 Minor changes to the EventDispatcherTest
- Removed Exception class import
 - Added FQN at L60
 - Added documentation
 - Added @group event-dispatcher
2012-05-16 16:55:24 +01:00
Andrea Turso f626ccbcee Wrapped the listener invocation a try/catch block that catches any
exception and throws a \RuntimeException.
Added a test case for the EventDispatcher.

Note:
In order to test the doDispatch method I had to use a stub EventDispatcher
with a getListeners that returned a preconfigured array. IMHO there should
be a way to inject the listeners into the EventDispatcher.
2012-05-15 21:25:18 +01:00
Jordi Boggiano 1a255420b0 Ignore aliases in autoload generator 2012-05-14 14:02:02 +02:00
Jordi Boggiano 5e8418a4f5 Add test for aliases and overrides between repos 2012-05-13 22:43:07 +02:00
Jordi Boggiano 46972fbc22 Add handling for alias operations 2012-05-13 22:36:48 +02:00
Jordi Boggiano f7d5df2764 Prevent backtracking issues with long tests 2012-05-13 22:36:32 +02:00
Jordi Boggiano cd4cceaf7b Merge pull request #682 from ktomk/patch-1
Cont. code simplification & better tests.
2012-05-13 13:32:09 -07:00
Jordi Boggiano 4505df29df Add functional tests for the installer, fixes #580 2012-05-13 21:42:43 +02:00
Tom Klingenberg 58a8ff80e3 Cont. code simplification & better tests. 2012-05-13 12:59:04 +02:00
Nils Adermann 7c7cac61b6 Merge remote-tracking branch 'github-seldaek/stability'
* github-seldaek/stability:
  Add stability docs
  Add test for Pool handling and refactor a couple things
  Add support for stabilities in lock file
  Infer stability flags for requirements that have an explicit version required of a lower stability
  Add InstalledArrayRepository to make sure the root package is not purged by the Pool because of a lower stability
  Basic handling of stability flags
  Add list of stabilities to base package
  Add minimum-stability flag on root package to filter packages by stability
  Add CompositeRepo::getRepositories
  Add package stability
2012-05-12 18:28:32 +02:00
Jordi Boggiano fd38971777 Fix CS & simplify code 2012-05-12 17:10:28 +02:00
Tom Klingenberg 74ca58bcb6 Use of SPDX license identifiers. 2012-05-12 10:50:48 +02:00
Jordi Boggiano 453b9a616b Add test for Pool handling and refactor a couple things 2012-05-11 17:21:02 +02:00
Jordi Boggiano 0936670213 Add support for stabilities in lock file 2012-05-11 17:20:10 +02:00
Jordi Boggiano ef28f3b067 Basic handling of stability flags 2012-05-09 19:10:06 +02:00
Jordi Boggiano 70a3c68f73 Add package stability 2012-05-09 19:10:01 +02:00
Nils Adermann 655588a5e0 Merge pull request #659 from Seldaek/github_https_fallback
Github https fallback
2012-05-09 09:57:04 -07:00
Nils Adermann 0c1944a9d0 Let the solver handle aliases instead of the installer 2012-05-09 15:15:39 +02:00
Nils Adermann 15f43571b9 Rules of type feature are no longer needed 2012-05-08 19:26:50 +02:00
Nils Adermann c37e126e14 Installed packages are now always removed unless otherwise requested
This means that an update request must always be accompanied by an install
request, otherwise the package might be removed rather than updated.
2012-05-08 19:25:58 +02:00
Nils Adermann 5daeacf0ac We won't implement choice rules, you need to edit composer.json to choose 2012-05-08 19:25:38 +02:00
Jordi Boggiano a9fe883827 Use https fallback for github private repos if ssh protocol fails and we can ask the user's password 2012-05-06 17:19:30 +02:00
Jordi Boggiano 7bfe031768 VcsDrivers now send proper originUrl for authentication 2012-05-06 17:18:26 +02:00
Jordi Boggiano c754f96677 Removed last password/username from IOInterface 2012-05-06 17:17:36 +02:00
Jordi Boggiano 6967ec16b3 Add slow tests to slow group, excluded by default except for travis 2012-05-06 15:10:13 +02:00
Bastian Hofmann 6d5d3af297 coding standard compliance 2012-05-06 14:55:08 +02:00
Bastian Hofmann 4b3fc2b5fa Merge branch 'master' of git://github.com/composer/composer
Conflicts:
	src/Composer/Repository/PearRepository.php
2012-05-06 14:42:13 +02:00
Bastian Hofmann 7501009d74 added tests for PearRepository 2012-05-06 14:40:47 +02:00
Jordi Boggiano 072f4397a0 Fix default options handling in StreamContextFactory 2012-05-06 13:50:18 +02:00
Maxim Chernyshev 5294cb222c Precious community feedback-based refactoring 2012-05-02 17:21:58 +08:00
Maxim Chernyshev 37476eb61f Fixed indentation 2012-05-02 09:30:27 +08:00
Maxim Chernyshev 8918551f29 Simplified proxy port determination and passed tests 2012-05-02 09:22:59 +08:00
Maxim Chernyshev 2ca50a1ef3 Merged in upstream 2012-05-02 08:36:05 +08:00
Maxim Chernyshev 419a1cedf0 Proxy credentials are now passed as part of HTTP headers 2012-05-02 08:26:27 +08:00
Michael Cullum 2653ece028 Adding author role to ArrayLoader Test 2012-05-01 16:03:45 +02:00
Jordi Boggiano f7440076fa Revert "Merge remote-tracking branch 'naderman/remove-packages-by-default'"
This reverts commit 2988152602, reversing
changes made to adb4188e12.
2012-04-29 22:21:58 +02:00
Jordi Boggiano a30e6109bf Fix 5.4.0 interop in formatting of empty array/objects 2012-04-29 21:04:18 +02:00
Jordi Boggiano b3164de813 Fix tests 2012-04-29 20:43:56 +02:00
Jordi Boggiano 115dc407fa Merge remote-tracking branch 'GromNaN/git-dir' 2012-04-29 18:53:01 +02:00
Jordi Boggiano 2988152602 Merge remote-tracking branch 'naderman/remove-packages-by-default' 2012-04-29 18:16:22 +02:00
Jordi Boggiano 7b2d3ff6a2 Refactor InstallerTest to be a bit more future proof 2012-04-29 17:29:06 +02:00
Jordi Boggiano 63c6c6d875 Cache the version parser used in TestCase 2012-04-29 17:28:35 +02:00
Jordi Boggiano bd50ad32f0 Refactor InstallationManagerMock 2012-04-29 17:27:37 +02:00
Jordi Boggiano 2dffa612a3 Merge remote-tracking branch 'igorw/root-install-twice' 2012-04-29 17:02:41 +02:00
Nils Adermann f4d5568937 Rules of type feature are no longer needed 2012-04-27 18:28:51 +02:00
Nils Adermann 2cb2cde096 Installed packages are now always removed unless otherwise requested
This means that an update request must always be accompanied by an install
request, otherwise the package might be removed rather than updated.
2012-04-27 18:13:37 +02:00
Nils Adermann 0e537b9c93 We won't implement choice rules, you need to edit composer.json to choose 2012-04-27 17:46:13 +02:00
Igor Wiedler 0995933183 Do not install root package as a vendor if some dependency requires it, closes #480
Also add some tests for the installer.
2012-04-27 12:29:11 +02:00
Jordi Boggiano ed8aa8322a Do not prevent updates if untracked files are present 2012-04-27 11:23:34 +02:00
Jordi Boggiano 0e9f88a3da Fix DownloadManagerTest creating directories on disk 2012-04-27 11:21:58 +02:00
Jerome Tamarelle 610f15a768 Fix unit tests for VcsRepository 2012-04-27 11:03:57 +02:00
Danny Berger e7ba0c38a8 Add default http(s) ports to proxy configuration if they are missing. 2012-04-26 21:38:12 -04:00
Danny Berger 8d6d155153 Add internal support for multiple default composer repositories. 2012-04-26 20:41:45 -04:00
Nils Adermann 540f9a09b2 Merge pull request #606 from Seldaek/aliasprio
Fix priority of aliases when mixing root package aliases with branch-alias ones, fixes #576
2012-04-25 08:35:53 -07:00
Jordi Boggiano aff7745231 Fix target-dir autoloader 2012-04-23 10:56:46 +02:00
Jordi Boggiano 15ab5868a3 Move composer metafiles back in a composer dir, except autoload.php 2012-04-22 22:18:19 +02:00
Jordi Boggiano 06fb1b8083 Fix priority of aliases when mixing root package aliases with branch-alias ones, fixes #576 2012-04-20 22:10:58 +02:00
Jordi Boggiano 51711c2f73 Fix multi-prefix handling 2012-04-19 22:08:24 +02:00
Jordi Boggiano 66135538c1 Allow root packages packages with target-dir to be autoloaded, fixes #139 2012-04-19 22:06:38 +02:00
Jordi Boggiano 244a7fd37b Add missing test fixture 2012-04-19 20:04:38 +02:00
Jordi Boggiano b999d18365 Improve include_paths generation, fixes #596 2012-04-19 10:51:57 +02:00
Jordi Boggiano 5ceae7fb1f Fix tests 2012-04-18 18:46:26 +02:00
Jordi Boggiano ef300ca56a Fix tests 2012-04-18 01:06:23 +02:00
Jordi Boggiano 047fa0b553 Add a composer remote that is used by composer so it does not take over the origin one anymore 2012-04-17 20:02:19 +02:00
Jordi Boggiano a1306091f2 Fix locking behavior with --dev 2012-04-15 19:05:50 +02:00
Jordi Boggiano d1f66073ca Update depends command 2012-04-14 23:53:12 +02:00
Jordi Boggiano 89e095b4b5 Handle --dev installs/updates 2012-04-14 23:38:10 +02:00
Jordi Boggiano e922404f19 Update/add tests 2012-04-14 23:38:06 +02:00
Jordi Boggiano 595182aec0 Add/fix tests 2012-04-13 02:47:55 +02:00
Jordi Boggiano 8654c43c62 Fix version parser regression, fixes #550 2012-04-09 16:00:02 +02:00
Jordi Boggiano 3c07b4338a Rename include-paths to include-path, add deprecated warnings, only generate file if it is needed 2012-04-08 17:42:57 +02:00
Jordi Boggiano 91614af365 Merge remote-tracking branch 'CHH/feature/include-paths' 2012-04-08 17:22:51 +02:00
Jordi Boggiano f604ca5762 Allow .x in version constraints as alias for .* 2012-04-08 17:02:43 +02:00
Jordi Boggiano 96c9bf80cc Add test 2012-04-08 17:02:43 +02:00
Jordi Boggiano 6f8031ac90 Fix error reporting for missing git process 2012-04-06 13:28:47 +02:00
Jordi Boggiano 6aaa523c0d Fix tests 2012-04-05 23:03:02 +02:00
Jordi Boggiano a3fa19a716 Avoid escaping too early to prevent issues 2012-04-04 17:13:57 +02:00
Jordi Boggiano 13a2bc6ff0 Revert "Fix push url hack"
This reverts commit 269537e466.
2012-04-04 17:11:10 +02:00
Jordi Boggiano 269537e466 Fix push url hack 2012-04-04 16:57:18 +02:00
Christoph Hochstrasser af52c8118e Some tests for include path setting 2012-04-04 15:27:12 +02:00
Jordi Boggiano 1cdae66f8f Fix up git downloader and git driver commands 2012-04-04 09:09:27 +02:00
Jordi Boggiano afa14124f3 Make sure we fetch origin with tags before checking out a new version 2012-04-03 19:50:25 +02:00
Jordi Boggiano 91890545f9 Fix test 2012-04-03 00:38:38 +02:00
Nils Adermann abe5d84c7e Merge pull request #521 from naderman/fix-learn-first-literal
Rule literals are sorted, so first literal added is not first retrieved
2012-04-01 13:46:38 -07:00
Nils Adermann a16aa68c1d Rule literals are sorted, so first literal added is not first retrieved
Fixes #477
2012-04-01 22:26:44 +02:00
Jordi Boggiano 2d9739bd05 Add support for files in classmap autoload config, fixes #463 2012-04-01 20:23:47 +02:00
Jordi Boggiano 6d5b4d606c Add warning in verbose mode if drivers can not be used because of missing openssl 2012-04-01 18:52:53 +02:00
Jordi Boggiano beb4cbcd2b Add test for ZipDownloader 2012-03-29 15:34:57 +02:00
Jordi Boggiano ac8ac6e9b2 Fix tests depending on remote sites 2012-03-29 15:09:01 +02:00
Jordi Boggiano 30cfb69739 Add support for mapping a namespace prefix onto many dirs in the autoload config 2012-03-28 17:09:33 +02:00
Jordi Boggiano b9f770177b Fix tests 2012-03-26 13:25:45 +02:00
Jordi Boggiano 7cb79bb1c9 Fix typo & tests 2012-03-26 01:56:24 +02:00
Jordi Boggiano 5a7abfd84f Remove code duplication in Svn classes 2012-03-25 00:29:14 +01:00
Jordi Boggiano cd2e5bf2e0 Make SvnDriver::supports less greedy and more realistic 2012-03-24 23:21:46 +01:00
Jordi Boggiano 8fb9c4bf3b Svn related coding style/consistency fixes and minor improvements 2012-03-24 23:07:10 +01:00
Jordi Boggiano 6c2b78a669 Merge remote-tracking branch 'till/svn-auth-reloaded' 2012-03-24 22:34:14 +01:00
Jordi Boggiano ab55490254 Merge remote-tracking branch 'hason/metapackage' 2012-03-24 18:14:05 +01:00