1
0
Fork 0
Commit Graph

531 Commits (da8dc584447c28d794572ad1b5845536c9e60623)

Author SHA1 Message Date
Jordi Boggiano 573e4b2a7c Merge branch 'newrepo' 2012-10-21 14:18:00 +02:00
Jordi Boggiano a59a5c4581 Merge remote-tracking branch 'simensen/sem-version-support' 2012-10-19 13:55:47 +02:00
Jordi Boggiano 44c271a477 Merge remote-tracking branch 'simensen/less-than-dev' 2012-10-19 13:43:03 +02:00
Jordi Boggiano ed9fcc5074 Fix tests 2012-10-19 12:25:53 +02:00
Jordi Boggiano 0a3097c569 Merge remote-tracking branch 'bboer/feature/svn-alternative-structures'
Conflicts:
	src/Composer/Repository/Vcs/GitHubDriver.php
2012-10-19 12:19:19 +02:00
Jordi Boggiano e0ce22f7cc Fix tests 2012-10-18 18:43:31 +02:00
Jordi Boggiano e79e7dcd8d Merge remote-tracking branch 'hason/classgenerator' 2012-10-17 17:19:23 +02:00
Jordi Boggiano f752b29fc6 Always make sure we are on the right branch 2012-10-17 17:15:49 +02:00
Martin Hasoň 1ff1b8ac1f Sorted generated classmap 2012-10-17 12:00:45 +02:00
Martin Hasoň c63f0d9642 Preserved original position of package if required packages are before this 2012-10-17 10:50:53 +02:00
Jordi Boggiano 3068f29b4f Checkout branch by name when the current reference matches the branch tip, fixes #1164 2012-10-17 10:49:54 +02:00
Martin Hasoň e75abcbb41 Fixed order of packages in the classmap autoloader 2012-10-17 01:40:15 +02:00
Martin Hasoň b683aeb586 Fix expected values in tests for autoloader generator 2012-10-17 01:00:11 +02:00
Jordi Boggiano beb9a5bd72 Code optimizations: avoid loops in match() 2012-10-14 16:35:32 +02:00
Jordi Boggiano 18492a1f84 Remove Pool::getMaxId and the solver's reliance on it 2012-10-12 18:45:41 +02:00
Jordi Boggiano ff2f9de128 Fix tests 2012-10-11 21:25:13 +02:00
Jordi Boggiano fb4183d5ad Fix tests 2012-10-08 20:05:42 +02:00
Beau Simensen 081ead1635 Version Parsing: Consider <x.y.z to be <x.y.z-dev
> Consider `<x.y.z` to be `<x.y.z-dev.` Because in 99%
> of the cases that's what the intent is. Could be
> overriden with `<x.y.z-stable`.

- @Seldaek

refs #643
2012-10-08 10:44:37 -07:00
Jordi Boggiano 5cb9a6ead7 Write in the json directly without reformatting the whole file - skip validation since that is not really the job of the config command 2012-10-07 19:18:22 +02:00
Beau Simensen 96a76eeffc Semantic Version Parsing: ~version
Implemented `~` according to #643 and used the following versions
as a test case as defined by @Seldaek:

 * "~1.2.3.4" = ">=1.2.3.4 <1.2.4.0-dev"
 * "~1.2.3" = ">=1.2.3 <1.3.0-dev"
 * "~1.2" = ">=1.2.0 <2.0.0-dev"
 * "~1" = ">=1.0.0 <2.0.0-dev"

Refs #643
2012-10-06 07:49:11 -07:00
Jordi Boggiano 62bb5b339b Allow parsing of stability modifiers combined with multi-constraints 2012-10-05 19:05:39 +02:00
Jordi Boggiano b3077bc4bc Merge pull request #1177 from sandermarechal/stream-context
Allow setting stream context options
2012-10-04 09:18:08 -07:00
Sander Marechal 11b5b5944d Improved argument order 2012-10-03 18:51:42 +02:00
Sander Marechal 748c4764ba Unittest for stream options 2012-10-03 15:09:47 +02:00
Jordi Boggiano 4998bab944 Show warning if the svn binary is missing 2012-10-03 11:14:37 +02:00
Jordi Boggiano 027037bb9f Fix dist urls for lock files and hardcoded references 2012-09-27 20:23:51 +02:00
Jordi Boggiano 5b1782970f Fix test for new lock format 2012-09-27 18:44:53 +02:00
Jordi Boggiano a9afa8bc1f Merge remote-tracking branch 'mheleniak/prefer_dist' and fix dists
Conflicts:
	src/Composer/Installer.php
	src/Composer/Package/Locker.php
2012-09-27 18:36:55 +02:00
Martin Hasoň 29034ea3e0 Added support for the root package in the array dumper 2012-09-19 23:08:37 +02:00
Jordi Boggiano 8d7e5cdda5 Fix target-dir with multiple slashes too 2012-09-19 11:25:49 +02:00
Jordi Boggiano a9195eb05f Add a couple test cases 2012-09-18 18:32:24 +02:00
Jordi Boggiano f377e9ca87 Fix possible vendor-dir "evasion" via target-dir 2012-09-18 18:30:11 +02:00
Jordi Boggiano ebc9c73008 Merge remote-tracking branch 'TheFootballSocialClub/loader-singleton' 2012-09-18 10:52:03 +02:00
Jordi Boggiano 418e876e8a Use only the locked repository when possible for better performance 2012-09-14 17:42:12 +02:00
Jordi Boggiano 83239aa338 Update lock file to contain the complete package info, fixes #890 2012-09-14 16:43:56 +02:00
Adrien Brault fd58c24a9f ComposerAutoloaderInitXXX::getLoader behaves like a ClassLoader singleton
Calling ComposerAutoloaderInit::getLoader twice when a package requires a .php file containing functions, lead to the functions to be declared twice, and cause an error.

In my case, using behat + symfony2extension + assetic, the error that occured:

PHP Fatal error:  Cannot redeclare assetic_init() (previously declared in vendor/kriswallsmith/assetic/src/functions.php:20) in /vendor/kriswallsmith/assetic/src/functions.php on line 26

Fatal error: Cannot redeclare assetic_init() (previously declared in /vendor/kriswallsmith/assetic/src/functions.php:20) in /vendor/kriswallsmith/assetic/src/functions.php on line 26
2012-09-14 11:21:34 +02:00
Jordi Boggiano 056dc5d690 Move config to all VcsDownloaders, enforce array for github-protocols 2012-09-08 00:45:25 +02:00
Jordi Boggiano 5b419c76ca Fix tests 2012-09-08 00:43:51 +02:00
Jordi Boggiano 122f66098e Merge remote-tracking branch 'hason/git_config' 2012-09-07 23:46:46 +02:00
Martin Hasoň 3b6bd761ec Set protocols for github in composer config file 2012-09-07 15:08:34 +02:00
Filip Procházka 9d8db4e148 AutoloadGenerator: respect dependencies, when requiring files 2012-09-06 15:07:07 +02:00
Christophe Coevoet 9e372b1d8b Simplified the code 2012-09-05 22:56:59 +02:00
Christophe Coevoet f181dc84e2 Added tests for the suggestions
The test about replaced packages is failing because of #752.
2012-09-05 20:54:00 +02:00
Jordi Boggiano d5916ce731 Fix test 2012-09-04 20:24:05 +02:00
Jordi Boggiano 0932f65a17 Return 7 chars and not 6 for short git hashes, formatting fixes 2012-09-04 16:27:22 +02:00
Jordi Boggiano 338730b19b Merge remote-tracking branch 'zczapran/issue/1043_wrong_output_for_versions_when_updating' 2012-09-04 16:22:29 +02:00
Jordi Boggiano e01a9c564d Fix parsing of stability for lowercased RC versions 2012-09-04 15:59:44 +02:00
Mateusz Heleniak d0829adfee added test case 2012-09-01 00:30:48 +02:00
bboer 00361e0087 Fixed tests 2012-08-31 08:12:20 +02:00
Zbigniew Czapran 730f206cea removed unneccesary PackageMock and trailing whitespaces 2012-08-30 23:44:54 +01:00