1
0
Fork 0
Commit Graph

631 Commits (caf26ac37c09c6b99ba14db39bb45b7b87cab0e5)

Author SHA1 Message Date
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
John Kary 06eb4027a7 Make test less brittle
Shouldn't really care about whether the IO is touched.
That's the test knowing too much about the implementation.
2012-10-07 09:46:44 -05:00
John Kary 88650f9333 Add test for intermixing PHP callables and CLI commands in a single event's script stack
Wrapped execution of the PHP callable in its own method in order to mock/test it
2012-10-06 22:37:52 -05:00
John Kary 5aa3762c09 Expand tests for valid CLI command from script 2012-10-06 21:54:52 -05: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
John Kary be90496952 Add ability to call CLI-based commands from an event 2012-10-05 23:37:26 -05: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
Zbigniew Czapran 80c2736021 in VersionParser only truncate the version if hash 2012-08-30 22:01:21 +01:00
Jordi Boggiano 5a247ca9a5 Fix regression in updating dev packages to latest ref, fixes #1030 2012-08-27 12:03:07 +02:00
Christophe Coevoet 66b83a39d2 Removed a PHP notice when dumping the autoloader
This occured when the root package has a target-dir but does not have
configure a PSR-0 autoloader.
Fixes #1028
2012-08-24 23:25:14 +02:00
Jordi Boggiano c97720c607 Fix picking of new dev packages for updates to latest source ref 2012-08-24 12:06:29 +02:00
Jordi Boggiano d6de4a0036 Rename Package interfaces to reduce BC issues 2012-08-24 02:29:31 +02:00
Jordi Boggiano f08c748658 Fix tests, fix handling of branches with slashes in GitDriver, fixes #935 2012-08-24 02:06:25 +02:00
Jordi Boggiano 4b18be75d7 Add test for fancy branch names, refs #935 2012-08-24 00:43:40 +02:00
Nils Adermann de6bb0409b Merge pull request #1008 from mheleniak/master
output info before fetching composer repos
2012-08-19 11:26:34 -07:00
Jordi Boggiano 521bbe6556 CS fixes 2012-08-18 16:22:15 +02:00
Jordi Boggiano 2af2c27168 Add regression test for files autoload in root package, fixes #880 2012-08-18 14:58:55 +02:00
Mateusz Heleniak ac746ee5b0 fixed unit tests 2012-08-17 19:36:46 +03:00
Jordi Boggiano a2171e2ed1 Expose LibraryInstallerTest properties to child classes 2012-08-16 11:22:30 +02:00
Jordi Boggiano 44d7d4a38e Make PSR0 scanning optional 2012-08-14 20:28:49 +02:00
Jordi Boggiano 48c46ce3b6 Automatically generate classmaps for all PSR-0 packages to speed things up, fixes #541, fixes #127 2012-08-14 19:55:30 +02:00
Jordi Boggiano 4f0ad98905 Always include the ClassLoader since autoload_real is included only once, refs #963 2012-08-14 19:13:39 +02:00
Jordi Boggiano 30fdf379aa Minor consistency tweaks 2012-08-14 19:05:34 +02:00
Jordi Boggiano 034b46bdf6 Merge remote-tracking branch 'vicb/autoload_files' 2012-08-14 18:27:39 +02:00
Jordi Boggiano c463216726 Restore test for full hash display in create project 2012-08-14 01:23:43 +02:00
Jordi Boggiano 5818d51af0 Refactor functional tests to fit existing tests better 2012-08-14 01:16:40 +02:00
Jordi Boggiano 5c0e4e5d72 Merge remote-tracking branch 'schmittjoh/functionalTests' 2012-08-13 23:45:37 +02:00
Jordi Boggiano fe15c6a827 Make dev version matches preserve the proper case, fixes #935 2012-08-11 18:34:01 +02:00
Sebastiaan Stok 9270904765 fixed issue #992 - branch name not properly escaped 2012-08-10 11:43:37 +02:00
Victor Berchet d2dc73e361 [Autoload] Set $vendorDir et $baseDir in ComposerAutoloaderInitTargetDir::getLoader() 2012-08-06 11:33:17 +02:00
Victor Berchet 4c82c35dbc [Autoload] Generate the autoloader_real file in the target directory 2012-08-06 10:56:57 +02:00
Pascal Borreli 87bac43b9e [InstallerTest] Fixed return status was always 0 2012-08-05 05:55:54 +00:00
Victor Berchet 2c065416eb [Autoload] generate an autoload_real.php file 2012-08-01 10:12:46 +02:00
Victor Berchet 963fedc9a5 [Autoload] remove closures because of a bug in APC
https://bugs.php.net/bug.php?id=52144
https://bugs.php.net/bug.php?id=61576
2012-07-31 20:17:39 +02:00
Taylor Otwell 8cf43868da update tests for new expectations. 2012-07-27 09:13:39 -05:00
Jordi Boggiano 6fb5d26474 Revert "Add test and some fixes to allow absolute paths, refs #869"
This reverts commit a2a2f4af59.
2012-07-18 18:40:17 +02:00
Jordi Boggiano a2a2f4af59 Add test and some fixes to allow absolute paths, refs #869 2012-07-18 18:31:22 +02:00
Jordi Boggiano c65af3e3a1 Add ValidatingArrayLoader and more validation for the validate command 2012-07-18 17:20:56 +02:00
Nils Adermann 84dd1fc1bf Merge pull request #898 from Seldaek/providefix
Fix hijacking possibility via provide bug
2012-07-17 12:27:18 -07:00
Jordi Boggiano 354b82bb8c Fix git checkouts of custom branches, fixes #889 2012-07-15 21:31:29 +02:00
Kirill chEbba Chebunin c62d4179b3 Remove unnecessary use statement from ArrayDumperTet 2012-07-14 16:01:55 +04:00
Kirill chEbba Chebunin 75d756f665 Add getSupport method to the PackageInterface. 2012-07-14 15:51:45 +04:00
Jordi Boggiano d87b8d3493 Merge pull request #886 from palex-fpt/pear-binaries
Pear binaries
2012-07-13 12:46:46 -07:00
Nils Adermann 560c3254d4 Correctly treat dev versions for other types of comparisons and add tests 2012-07-11 20:49:53 +02:00
Jordi Boggiano 2f7130200a Prevent seeing dev versions as equal when they are not, fixes #848 2012-07-11 20:25:22 +02:00
Jordi Boggiano d4aab7d5b6 Fix solver test 2012-07-11 19:37:02 +02:00
Jordi Boggiano 2d19cf2a00 Fix hijacking possibility via provide bug 2012-07-11 19:31:30 +02:00
Jordi Boggiano 37ef2037cf Add test case to ensure replace does not allow hijacking packages 2012-07-11 13:01:16 +02:00
Jordi Boggiano eb283b34e4 Revert "Fix git checkouts of custom branches, fixes #889"
This reverts commit cbf27bb422.
2012-07-10 19:27:17 +02:00
Jordi Boggiano cbf27bb422 Fix git checkouts of custom branches, fixes #889 2012-07-10 19:02:36 +02:00
Alexey Prilipko 75d3d57117 Version parser stability regexp update 2012-07-10 21:50:58 +11:00
Sylvain Filteau 51404659ef Change the order of the include paths
Composer installed libraries should have precedence over other libraries in the
system (like PEAR installed libraries).

Made composer prepend it's include_path configuration instead of appending it.
2012-07-06 14:17:27 -04:00
Jordi Boggiano 6573fd3f77 Add hint in solver exceptions as to what may be wrong 2012-07-04 15:57:51 +02:00
Jordi Boggiano 175d1939b5 Fix tests 2012-07-04 14:28:15 +02:00
Jordi Boggiano e6f7150196 Change default minimum-stability to "stable", fixes #744 2012-07-04 14:22:09 +02:00
Jordi Boggiano db16f68fbf Tweak exception messages 2012-07-03 14:21:10 +02:00
Robert Schönthal e96e06946f fixed json file tests 2012-07-03 12:37:58 +02:00
Robert Schönthal c517ac6404 fixed issue #347 added file to json validation exception 2012-07-03 12:37:58 +02:00
Alexey Prilipko 22aef0124e Revert Locker change, ignore PEAR packages whose version cannot be parsed. 2012-07-03 19:18:58 +11:00
Alexey Prilipko ac3cebc633 Update PEAR Package Extractor to use 'task:replace', 'phprelease' commands and install role='script' files
Add PearInstaller
Change PEAR packages type from 'library' to 'pear-library' and dist type from 'pear' to 'file'
Remove PearDownloader
Refactor Channel Installer
2012-07-03 19:18:58 +11:00
Alexey Prilipko f2853c842b Review fixes 2012-07-03 19:11:57 +11:00
Alexey Prilipko e173f11b37 Add PEAR channel reader & Update PearRepository to use it. 2012-07-03 19:11:57 +11:00
Alexey Prilipko ee2834a169 Add Mock for RemoteFileSystem 2012-07-03 19:11:57 +11:00
Jordi Boggiano 2ede0a3b54 Merge remote-tracking branch 'naderman/fix-duplicate-alias' 2012-07-01 19:07:14 +02:00
Nils Adermann d84273ee34 Merge pull request #833 from Seldaek/installmgr_cleanup
Use the config object to define the vendor dir and not the installation manager
2012-07-01 10:04:09 -07:00
Nils Adermann 11e67bdf52 Merge pull request #832 from Seldaek/instinterface
Expose the whole composer context to the custom installers
2012-07-01 09:58:05 -07:00
Nils Adermann 297bc914fc Merge pull request #859 from Seldaek/whitelist_fix
Fix update whitelist behavior, fixes #782
2012-07-01 09:55:58 -07:00
Nils Adermann 9346d4a501 Make the InstallationManagerMock behave like the real class on alias install 2012-07-01 18:41:58 +02:00
Nils Adermann 3c7fbe9264 Add a test which verifies that aliases do not get duplicated on update 2012-07-01 18:28:33 +02:00
Nils Adermann 050439a0d3 Add support for defining assertions on expected lock files to integration tests 2012-07-01 18:27:16 +02:00
Jordi Boggiano 5c30fcb777 Fix update whitelist behavior, fixes #782 2012-07-01 18:03:01 +02:00
Nils Adermann 0da71001e3 Add test for updating an aliased package to a non-aliased one 2012-07-01 17:41:16 +02:00
Johannes M. Schmitt b65f0e89e3 added test case for #851 2012-06-29 16:44:02 +02:00
Johannes M. Schmitt 263a54e631 added functional test suite 2012-06-29 16:41:50 +02:00
Jordi Boggiano 656feda837 Revert previous change, use GIT_ASKPASS env var instead 2012-06-27 18:28:49 +02:00
Jordi Boggiano cb7e86d538 Rename tests/phpunit.xml.dist for clarity 2012-06-25 18:59:41 +02:00
Jordi Boggiano adaa788955 Require file autoloads after the autoloader is registered 2012-06-25 11:39:51 +02:00
Jordi Boggiano b876dcbafb Use the config object to define the vendor dir and not the installation manager 2012-06-24 21:58:51 +02:00
Jordi Boggiano a4c829749e Expose the whole composer context to the custom installers, fixes #672 2012-06-24 20:11:17 +02:00
Jordi Boggiano ffecd39d33 Refactor repositories handling in config/factory/loader, fixes #828, fixes #826 2012-06-24 13:06:13 +02:00
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