1
0
Fork 0
Commit Graph

3623 Commits (e4435790a4055c58f60200c34b527f649455b311)

Author SHA1 Message Date
Kunal Mehta 99dab8aebd Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
Working towards #3545.

formatVersion() does not belong in VersionParser since it depends upon a
Package object, and is creating a more complete pretty formatted
version, not parsing anything.

The new getFullPrettyVersion() method can be seen as an extension to
getPrettyVersion(), and is located in BasePackage as a result.

Callers to VersionParser::formatVersion() were not updated in this
commit to demonstrate that no functionality was changed in this
refactor. They will be updated in a follow up commit.
2015-07-01 23:54:08 -07:00
Jordi Boggiano 8775c94895 Merge pull request #4196 from localheinz/fix/namespace
Fix: Import Symfony\Component\Finder\Finder
2015-07-01 10:29:53 +01:00
Andreas Möller 962f5a99ea Fix: Import Symfony\Component\Finder\Finder 2015-06-30 21:03:59 -04:00
Jordi Boggiano 79f9158fb2 Merge pull request #4192 from localheinz/fix/import
Fix: Add missing imports
2015-06-30 15:38:46 +01:00
Jordi Boggiano 6a64041055 CS fixes 2015-06-30 15:38:32 +01:00
Jordi Boggiano 4d36622ada Merge pull request #4191 from localheinz/fix/docblock
Fix: Docblock
2015-06-30 15:25:49 +01:00
Jordi Boggiano 70f5150893 Merge pull request #4190 from localheinz/fix/unused-private-property
Fix: Remove unused private property
2015-06-30 15:14:03 +01:00
Jordi Boggiano 4307031e9b Merge pull request #4189 from localheinz/fix/unused-imports
Fix: Remove unused imports
2015-06-30 15:13:46 +01:00
Jordi Boggiano a8e004c7e7 Merge pull request #4199 from sminnee/version-comparison-docs
>=2.3.0 now includes pre-releases, added docs for this and -stable suffix Fixes #4080.
2015-06-30 14:32:20 +01:00
Jordi Boggiano b17ccbfa0d Avoid invalid warnings when scanning the same file twice, fixes #4195, fixes #4197 2015-06-30 13:27:28 +01:00
Sam Minnee 2cd698874f Include pre-releases in >=2.3.0 comparison. Fixes #4080.
This is a change to the >=2.3.0 comparison. Without this change, such a
comparison will exclude pre-release versions.

The rationale is that this makes the comparison more consistent with
<2.3.0 (which excludes all pre-releases) and ~2.3.0 (which includes
pre-releases).
2015-06-30 13:10:20 +01:00
Rob Bast 0298cdc60d change delimiter to curly braces 2015-06-30 13:52:47 +02:00
Andreas Möller 12ffe2b4d4 Fix: Add missing imports 2015-06-28 23:37:40 -04:00
Andreas Möller e184118d76 Fix: Docblock 2015-06-28 23:28:45 -04:00
Andreas Möller 3854d2d457 Fix: Remove unused private property 2015-06-28 23:25:55 -04:00
Andreas Möller eac5fbdee4 Fix: Remove unused imports 2015-06-28 23:20:54 -04:00
Jordi Boggiano 943107cfe7 Load most specific namespaces always, and dependents before dependencies when building classmaps
This also adds notifications of duplicate classes
2015-06-26 14:40:26 +01:00
Rob Bast 3dffdc8705 don't suggest packages already installed 2015-06-24 11:06:21 +02:00
Rob Bast fd34c5883a added php script handler info as well 2015-06-24 09:21:36 +02:00
Rob Bast 680082c5fe output based purely on verbosity 2015-06-23 22:46:16 +02:00
Rob Bast 33f78b2ccc limit suggestions to optional list of packages 2015-06-23 22:46:16 +02:00
Rob Bast 760eeb0b03 reworked suggests command 2015-06-23 22:46:16 +02:00
Gusakov Nikita f1af16984e [Command] Add suggests command 2015-06-23 21:04:20 +02:00
Jordi Boggiano d0ff01698d Fix outdated comment 2015-06-20 12:58:19 +01:00
Jordi Boggiano d5bdf4be28 Update URLs for bitbucket as well 2015-06-19 23:23:48 +01:00
Jordi Boggiano ee1e2c6f15 Merge pull request #4167 from wimvds/fix-bitbucket-references
download correct Bitbucket archive reference when using --prefer-dist
2015-06-19 18:54:18 +01:00
Wim Vandersmissen 1ff2a02517 fix to download correct Bitbucket archive reference when using --prefer-dist 2015-06-19 15:07:16 +02:00
Jordi Boggiano e727ed4d73 --keep-vcs should only imply prefer source for the root package in create-project, refs #4063 2015-06-19 12:59:57 +01:00
Jordi Boggiano a943827371 Show that no version was found in composer show/license if root package is auto-versioned, fixes #4158 2015-06-18 23:47:17 +01:00
Jordi Boggiano c8eca6f198 Remove pool usage from ArchiveCommand 2015-06-18 17:45:37 +01:00
Jordi Boggiano 801a7fcd0a Add support for constraints and not just exact versions in RepositoryInterface::findPackage/s 2015-06-18 17:44:58 +01:00
Jordi Boggiano 049f84f21f Remove unnecessary Pool usage in HomeCommand 2015-06-18 16:33:30 +01:00
Nils Adermann 75c501251d Revert "Merge remote-tracking branch 'naderman/load-no-providers'"
This reverts commit 3e85f82373, reversing
changes made to b025d0982b.
2015-06-18 15:40:27 +02:00
Jordi Boggiano 74e7c5fe22 Merge remote-tracking branch 'legoktm/publish-name' 2015-06-18 11:40:48 +01:00
Jordi Boggiano 3e85f82373 Merge remote-tracking branch 'naderman/load-no-providers' 2015-06-18 11:32:37 +01:00
Jordi Boggiano b025d0982b Remove some state 2015-06-18 11:12:57 +01:00
Thibault Jamet 25ab752ca6 Map archive command to the archive configuration 2015-06-17 20:53:09 +02:00
Thibault Jamet 1eec4fdfa5 Add archive configuration default values 2015-06-17 20:53:09 +02:00
Jordi Boggiano e73448ae1e Add possessive quantifiers to avoid backtracking and fix segfault on large files, fixes #4153 2015-06-16 11:22:45 +01:00
Zsolt Szeberenyi 9b50ca0161 Add the extra attribute to the content hash 2015-06-15 11:31:33 +02:00
Jordi Boggiano 8e9659bd83 Merge pull request #4139 from elazar/feature/tests-in-classmap
Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump()
2015-06-14 10:10:46 +01:00
Markus Staab 94a924b702 Dropped unnecessary break statements
Next line breaks nevertheless
2015-06-14 10:16:45 +02:00
Markus Staab a4ad3c2146 Dropped obsolete condition
The conditional a few lines above already checks for `bytesMax > 0`
2015-06-14 10:13:18 +02:00
Zsolt Szeberenyi 3e0219c438 Change the content hash to be only based on values that affect dependency resolution 2015-06-13 10:15:56 +02:00
Zsolt Szeberenyi 50b560fe4c Add the hash of the parsed content of the composer.json to the lock file, and use it to verify the json is not changed 2015-06-12 22:24:31 +02:00
Jordi Boggiano 89540c5690 Support bg colors and more clearing values in html output formatter 2015-06-12 17:23:18 +01:00
Jordi Boggiano 29dbc3835f Fix html output formatter to work with latest symfony console 2015-06-12 17:10:19 +01:00
elazar 6c029a850c Resolves #4138: Removed *Test.php filtering from AutoloadGenerator->dump() 2015-06-12 10:52:55 -05:00
Jordi Boggiano 6d15ad08b6 Add http check even if openssl is present, refs #4084 2015-06-11 19:20:09 +01:00
Jordi Boggiano 24168d9d5c Merge pull request #4133 from benbor/added-ctrl-c
Added Ctrl+C support to create-project command for unix-like systems
2015-06-11 18:32:31 +01:00
Barys Biankouski a59c46f781 [create-project] If process terminated with SIGINT then 130 IMO will be returned. Remove unused variable 2015-06-11 19:50:52 +03:00
Jordi Boggiano c471edc488 Also downgrade provider access and others 2015-06-11 11:22:19 +01:00
Barys Biankouski 38bc4e6a78 Added Ctrl+C support to create-project command for unix-like systems 2015-06-11 13:02:33 +03:00
Rob Bast 9223f4a208 show command by default 2015-06-09 14:02:51 +02:00
Rob Bast cbd61660ab implemented verbose output 2015-06-09 09:02:43 +02:00
nevvermind 12c833864c Revert converting `1.0.0` to `^1.0`. 2015-06-08 22:45:20 +01:00
Nils Adermann 8b28d4bc82 Optimisation: Composer repo version listings are index by package name 2015-06-08 18:50:15 +02:00
Nils Adermann 65243ca392 Move methods for PR readability and fix phpdoc 2015-06-08 18:45:03 +02:00
Kunal Mehta 49bd1d773b Make an invalid package name a publish error, not warning
Since invalid names will prevent publishing to packagist, they should
be considered publish errors. If people do not plan on submitting their
package to packagist, they can use the --no-check-publish flag to turn
it into a normal warning again.
2015-06-07 17:44:56 -07:00
Christophe Coevoet a014a2f803 Optimize the regex detecting timestamps
Using a possessive quantifier avoids useless backtracking.
2015-06-07 10:38:27 +02:00
Jordi Boggiano 7351136205 Merge pull request #4105 from gmsantosxl/master
Remove extra '/' when findShortestPath $from is a directory
2015-06-05 13:18:07 +01:00
Rob Bast dfbee6a532 cleaner solution 2015-06-05 13:04:56 +02:00
Rob Bast 7a50225389 disable path if no composer available, fixes #4101
gracefully remove the option and continue, after informing the user
2015-06-05 13:00:04 +02:00
gmsantosxl a060c536bb Remove extra '/' when findShortestPath $from ends with '/' 2015-06-04 14:44:09 -03:00
gmsantosxl 84c9c30b63 Remove extra '/' when findShortestPath $from is a directory 2015-06-03 16:48:01 -03:00
Jordi Boggiano cdcc99e73d Merge pull request #4088 from nevvermind/override_init_array
Fix "Invalid argument supplied for foreach()" on a new PlaformRepository obj
2015-06-03 11:40:44 +01:00
Jordi Boggiano 17c2a8019e Merge pull request #4089 from nevvermind/plugin-api-versions
Make plugins have actual constraints instead of fixed versions
2015-06-03 11:37:52 +01:00
Rob Bast b957d1c4a6 load xml as string from local file, fixes #3942
If the entity loader is disabled on a system, loading files, even from
the local file system, is considered as external to the running php
process, and thus not allowed by the libxml extension. Reading the file
contents and loading the xml as a string is a valid alternative however.
2015-06-03 09:52:36 +02:00
nevvermind ec00a4dbfa Set the platform overrides first 2015-06-03 00:06:24 +01:00
nevvermind a747b293b3 Merge remote-tracking branch 'upstream/master' into override_init_array 2015-06-03 00:04:19 +01:00
nevvermind 4fd9a3ceee compare against correct format 2015-06-02 19:59:38 +01:00
nevvermind 994b1324bc fix alignment 2015-06-02 19:58:21 +01:00
nevvermind 3032f0a538 Refactor based on code review
- Move the version api getter to the PluginManager And make it such that it can be mocked, but not pollute the public interface. That means "protected" visibility.
- The plugin api version constant should still be used throughout the code.
- Use different fixtures class names
- Use regex possessive quantifiers for performance
- Use full words for readability
2015-06-02 17:40:32 +01:00
Rob Bast 0f04f97088 Fixed failing testcase 2015-06-02 15:15:30 +02:00
nevvermind eb2aa14830 Make plugins have actual constraints instead of fixed versions
Instead of developing plugins against a single, fixed Plugin API version - `"composer-plugin-api": "1.0.0"`, this change will allow plugin developers to use versions like `"composer-plugin-api": "~1.1"` or `"composer-plugin-api": ">=2.1 <3.0"`, aka actual Composer-compatible constraints.

Only the "1.0", "1.0.0" and "1.0.0" Plugin API versions will be regarded as BC versions, and internally converted to "^1.0"; every other declared version string will be kept as it is.

Because of this new constraint flexibility, plugin version mismatches will be skipped, which means those plugin will NOT be registered to the system. Previously, a mismatch triggered a warning, but plugins were still registered.
2015-06-02 14:10:09 +01:00
Rob Bast 46e0a506b9 Added another testcase + fix 2015-06-02 14:20:48 +02:00
Rob Bast a0ca1d4d96 Consider 0 as part of a version 2015-06-02 14:14:29 +02:00
nevvermind 8c0d4857ef Fix "Invalid argument supplied for foreach()" on a new PlaformRepository obj
This happens on "new PlatformRepository(array($somePackage))".
The parent constructor calls "\Composer\Repository\ArrayRepository::addPackage()",
which, on a brand new repo object, further calls "\Composer\Repository\PlatformRepository::initialize()"
and finally this iterates over a NULLd "$this->overrides", triggering the error.
2015-05-31 15:44:12 +01:00
Jordi Boggiano 0ec86be5e9 Merge remote-tracking branch 'origin/master' 2015-05-31 12:54:08 +01:00
Jordi Boggiano 0081964428 Merge remote-tracking branch 'colinodell/fix-tag-ambiguity'
Conflicts:
	src/Composer/Downloader/GitDownloader.php
	tests/Composer/Test/Downloader/GitDownloaderTest.php
2015-05-31 12:52:27 +01:00
Jordi Boggiano ce0f617ee1 Merge pull request #4083 from nevvermind/php-dox
Added phpdocs + change to yoda comparison
2015-05-31 12:45:02 +01:00
Jordi Boggiano 1753c275ff Handle deprecation notices softer 2015-05-31 12:26:57 +01:00
nevvermind 8e79a3766d Added phpdocs + change to yoda comparison 2015-05-30 01:38:14 +01:00
Jordi Boggiano b181822e90 Fix case where touch() fails due to incorrect ownership, fixes #4070 2015-05-28 15:26:56 +01:00
Rob Bast 95dbb6d9db add docs to support section in composer schema, closes #4055
Note that this does not yet add this attribute @ packagist though
2015-05-28 13:15:56 +02:00
Jordi Boggiano 69210d5bc1 Move deprecation notice where it belongs, closes #4065 2015-05-25 14:29:26 +01:00
Jordi Boggiano 98b339e87a Make --keep-vcs imply --prefer-source, closes #4063 2015-05-25 11:28:07 +01:00
Hugo Hamon e51ff60f59 [Pear] replaces "licence" to "license". 2015-05-08 06:42:59 -04:00
Jordi Boggiano 4d5d524704 Clear stat cache after a git failure as it might have modified the filesystem 2015-05-07 16:28:18 +01:00
Jordi Boggiano 52d290f5f2 trim token just in case and update tests 2015-05-07 00:37:08 +01:00
Jordi Boggiano 41f4451c20 take care of retry-auth-failure:false in case of 403 as well 2015-05-07 00:29:45 +01:00
Jordi Boggiano e16d53893e Remove password prompt for github tokens and require the user creates a token themselves 2015-05-07 00:29:20 +01:00
Jordi Boggiano 48d8cc6465 Avoid errors when invoking composer global config and there is no global composer.json yet, refs #4002 2015-05-06 11:48:45 +01:00
Nils Adermann 63e96a41f8 Add proper docblocks in composer repo 2015-05-05 20:30:57 +02:00
Nils Adermann cfd0e44312 Move private function further down in pool 2015-05-05 20:28:22 +02:00
Nils Adermann aa7d145dd0 PHP 5.3 compatible function invokation 2015-05-05 20:24:04 +02:00
Possum 29ca21f30e PHP version checks tweaking 2015-05-05 20:18:24 +02:00
Nils Adermann ec5416f03c loadDev parameter is nonsense, properly load packages in create command 2015-05-05 19:58:03 +02:00
Nils Adermann da02c53540 Update the composer repository whatprovides test to a loadrecursively test 2015-05-05 19:44:07 +02:00
Nils Adermann b99c03ea04 Entirely remove whatProvides from Composer repository 2015-05-05 19:28:15 +02:00
Nils Adermann 090711b21c Completely move loading of packages from composer repo to pool 2015-05-05 19:08:33 +02:00
Jordi Boggiano 13a3349603 Merge pull request #3967 from xi-ao/master
Fixed svn update command
2015-05-05 18:07:08 +01:00
Possum 2e99b9fdf5 Use https where possible 2015-05-04 19:37:57 +02:00
Nils Adermann 9b9ad9d0fe Remove dead code paths and use exceptions instead of die 2015-05-04 17:34:41 +02:00
Nils Adermann 65f69c4227 Remove debug output 2015-05-04 17:28:03 +02:00
Nils Adermann 4d0db5add6 POC Implementation of loading only explicitly named package data 2015-05-04 17:25:55 +02:00
Jordi Boggiano d426246b80 Update only github dist URLs, refs #3985 2015-05-01 16:26:59 +01:00
Jordi Boggiano ab02867015 Use natural sort to sort packages, refs #3872 2015-05-01 16:16:02 +01:00
Jordi Boggiano 06fb00bfe5 Fix handling of platform packages to be future proof, refs #3872 2015-05-01 16:14:17 +01:00
Jordi Boggiano 081e26f4d7 Merge remote-tracking branch 'localheinz/feature/sort-packages' 2015-05-01 16:08:57 +01:00
Jordi Boggiano b7c827c2e5 Use external lib for hidden cli prompting 2015-05-01 15:50:01 +01:00
Jordi Boggiano 2a48b0faa0 Make autoloader suffix a reproducible value as well, refs #3927 2015-05-01 14:32:32 +01:00
Jordi Boggiano 164dc2a097 Reuse prefix only if no prefix is defined 2015-05-01 14:23:20 +01:00
Jordi Boggiano facdd8a503 Add phar-utils package to update timestamps after the build is done, refs #3927 2015-05-01 13:50:16 +01:00
Jordi Boggiano ebffb3c179 Move improvements towards reproducible builds, refs #3927 2015-05-01 11:54:55 +01:00
Jordi Boggiano 92785ac677 Make builds more reproducible, refs #3927 2015-05-01 11:21:44 +01:00
Jordi Boggiano 6199488644 Merge pull request #3989 from WyriHaximus/master
Replaced <error> with <warning> for abandoned package messages
2015-05-01 10:17:30 +01:00
Cees-Jan Kiewiet c9d9b5085a Replaced <error> with <warning> for abandoned package as it reflects the intention of this feature better 2015-04-30 23:34:26 +02:00
Daum aa4afbf49f Updated AuthHelper to pass a null for maximum attempts to the IOInterface instead of false so an exception is not thrown by Symfony Question class. 2015-04-30 15:30:01 -04:00
Jordi Boggiano bdb6ecb29e Merge pull request #3975 from marc-mabe/hotfix/3974
fixes #3974: Autoloader have to distinguish between files and directories
2015-04-30 18:26:28 +01:00
Marc Bennewitz 9455c49053 fixes #3974: Autoloader have to distinguish between files and directories 2015-04-30 19:17:19 +02:00
Jordi Boggiano 8a12e50a16 Merge pull request #3983 from alcohol/upgrade-dialoghelper
Upgrade DialogHelper to QuestionHelper
2015-04-30 17:10:26 +01:00
Jordi Boggiano 8daebe8926 Merge pull request #3962 from joshdifabio/travis-cache-fix
Fix Travis cache issue (~/.composer/cache changes on every build)
2015-04-30 17:08:26 +01:00
Nils Adermann 258fdcb44d Merge pull request #3986 from Seldaek/partial-update-keep-lock
Partial updates should not corrupt the lock if the installed repo is not up to date with it
2015-04-30 17:54:58 +02:00
Nils Adermann cb44f209f8 Merge pull request #3985 from Seldaek/update-urls
Check if package URLs are up to date after composer update is done
2015-04-30 17:48:43 +02:00
Jordi Boggiano 137c551247 Check if package URLs are up to date after an update op is done, fixes #3214 2015-04-30 16:41:28 +01:00
Jordi Boggiano 4507805508 Partial updates should not corrupt the lock if the installed repo is not up to date with it, fixes #3439, closes #3553 2015-04-30 16:39:08 +01:00
Nils Adermann b4ed331168 The Solver Request no longer depends on the Pool 2015-04-30 17:24:24 +02:00
Rob Bast acd1486406 Mark method as @private 2015-04-30 12:35:25 +02:00
Rob Bast e810a7913e Space after ? (so it doesnt glue answer to ?) 2015-04-30 12:29:19 +02:00
Rob Bast 0fbc00f3fb Switch to QuestionHelper 2015-04-30 12:23:13 +02:00
Rob Bast 290fafa156 Docs and whitespace 2015-04-30 12:22:54 +02:00
Rob Bast bef46a17dc Moved method 2015-04-30 12:22:09 +02:00
Rob Bast 3dae4cd517 Switch to QuestionHelper 2015-04-30 12:20:32 +02:00
Rob Bast 00fcd63c04 Remove redundant helper 2015-04-30 12:17:56 +02:00
Rob Bast e7c044d4b2 Remove dead code 2015-04-30 12:17:14 +02:00
Rob Bast fb5394ce70 Use constants directly 2015-04-30 12:17:13 +02:00
Rob Bast 7279c25839 Switched to QuestionHelper 2015-04-30 12:17:13 +02:00
Rob Bast ee4044efcd Adjusted interface to reflect values from Console 2015-04-30 12:17:13 +02:00
Jordi Boggiano d6620195e5 Prioritize repository over package versions in the default policy, fixes #3509 2015-04-30 10:43:04 +01:00
Jordi Boggiano 4ce0adb23c Use the caret operator for all require operations 2015-04-29 23:53:40 +01:00
Jordi Boggiano 43c1caad0d Merge remote-tracking branch 'Seldaek/caret-op-for-semver'
Conflicts:
	tests/Composer/Test/Package/Version/VersionSelectorTest.php
2015-04-29 23:49:27 +01:00
Jordi Boggiano fa398e14c7 Fix indent detection in json files when an empty line starts the object 2015-04-29 22:42:57 +01:00
Jordi Boggiano 32a479a1e7 Fix subkey manipulation when the main key does not exist yet 2015-04-29 22:42:41 +01:00
Jordi Boggiano a57c51e8d7 Finalize platform override feature
- Added tests, docs
- Persist to lock file
- Add support in config command
- Added to json schema
2015-04-29 22:38:07 +01:00
Jordi Boggiano 80b0a35a68 Merge remote-tracking branch 'HuffAndPuff/ignore-platform'
Conflicts:
	src/Composer/Config.php
	src/Composer/Repository/PlatformRepository.php
2015-04-29 21:03:51 +01:00
Jordi Boggiano fd7e28b8b4 Restore special handling of conflict/provide/replace 2015-04-29 20:57:00 +01:00
Vadim Tyukov b02bdb4c7a [alias] RootAliasPackage manages the requirements correctly 2015-04-29 20:56:58 +01:00
Jordi Boggiano a811142ff2 Merge pull request #3978 from marc-mabe/hotfix/3976
fixes #3976: drop ext/ctype dependency
2015-04-29 20:38:10 +01:00
Marc Bennewitz ff1ce78e6b fixes #3976: drop ext/ctype dependency 2015-04-29 21:19:15 +02:00