1
0
Fork 0
Commit Graph

1239 Commits (a25492d1b9890b39f2b33de0d1c05bd7f36c0f50)

Author SHA1 Message Date
Jordi Boggiano c36d2a2e50 Merge pull request #4214 from legoktm/parse-links
Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
2015-07-13 14:28:10 +01:00
Nils Adermann 6e81f63635 Reduce memory footprint of rules by storing data in blob
Not declaring the job property saves significant amounts of memory as
most rules leave it as null
2015-07-09 17:23:45 +02:00
Nils Adermann b869fa9662 Correct rule hash test 2015-07-08 19:36:13 +02:00
Jordi Boggiano d79427f1a7 Fix tests 2015-07-04 12:22:58 +01:00
Jordi Boggiano 852e4f4e26 Merge remote-tracking branch 'alcohol/output-script-command-in-verbose-mode' 2015-07-04 12:11:18 +01:00
Kunal Mehta 14d1f0f3f6 Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
Working towards #3545.

parseLinks is a wrapper around VersionParser::parseConstraints() that
creates Link objects, and better belongs in ArrayLoader.
2015-07-03 19:35:54 -07:00
Jordi Boggiano 2438105e11 Merge pull request #4086 from legoktm/format-version
Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
2015-07-04 00:55:50 +01:00
Rob Bast 4019f7bb44 Revert "apply a regex solution instead of tokenizer"
This reverts commit 33a7305e22c8d4e2ce38586855fd3d4b7b2af3dd.
2015-07-03 12:22:16 +02:00
Rob Bast b5d286e27b apply a regex solution instead of tokenizer 2015-07-03 12:22:16 +02:00
Rob Bast e4118385a0 updated spdx related files 2015-07-03 12:22:16 +02:00
Kunal Mehta f634c6946d Update callers of VersionParser::formatVersion()
Tests were moved to BasePackageTest.
2015-07-02 00:06:56 -07:00
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 6a64041055 CS fixes 2015-06-30 15:38:32 +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
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
Rob Bast e698636af4 added test to reproduce #4183 2015-06-29 09:42:40 +02:00
Rob Bast fd34c5883a added php script handler info as well 2015-06-24 09:21:36 +02:00
Remi Collet c350bceeea Set this test as slow 2015-06-21 07:46:08 +02: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 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
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 3e85f82373 Merge remote-tracking branch 'naderman/load-no-providers' 2015-06-18 11:32:37 +01:00
Jordi Boggiano b2173d28fc Fix 5.3.3 build 2015-06-16 11:43:55 +01: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
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
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
Rob Bast 9223f4a208 show command by default 2015-06-09 14:02:51 +02:00
Rob Bast 222ee004e0 modified test case 2015-06-09 09:02:32 +02:00
nevvermind 12c833864c Revert converting `1.0.0` to `^1.0`. 2015-06-08 22:45:20 +01:00
Nils Adermann e25b86c129 Fix composer repo test to match what composer repos send 2015-06-08 18:57:56 +02:00
gmsantosxl 84c9c30b63 Remove extra '/' when findShortestPath $from is a directory 2015-06-03 16:48:01 -03: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 d59115d7fa make unit tests assume a disabled entity loader 2015-06-03 10:19:40 +02: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
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 89885140d3 Created a failing test case 2015-06-02 15:04:58 +02:00
Rob Bast 46e0a506b9 Added another testcase + fix 2015-06-02 14:20:48 +02:00
Rob Bast a256f3dfca Added one failing testcase and one successful
Demonstrates that it handles x.y.z properly as long as z !== 0
2015-06-02 14:03:45 +02: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 27aac31970 Fix tests for autocrlf=true checkouts, fixes #4049 2015-05-28 14:43:52 +01:00
Jordi Boggiano 52d290f5f2 trim token just in case and update tests 2015-05-07 00:37:08 +01:00
Nils Adermann 67f10c1601 PHP 5.3 this/that compatibility 2015-05-05 20:32:05 +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
Jordi Boggiano 21e92b869e Merge pull request #4000 from SpacePossum/json_testing
On Json tests failures show more test failure details
2015-05-05 17:41:44 +01:00
Possum d7f7418243 some more test failure details 2015-05-05 18:13:16 +02:00
Jordi Boggiano e8572ca6f9 Merge pull request #3998 from SpacePossum/use_https
Use HTTPS where possible
2015-05-05 16:42:33 +01:00
Jordi Boggiano 0e0cb62fb8 Add test for replace 2015-05-05 11:07:11 +01:00
Possum 2e99b9fdf5 Use https where possible 2015-05-04 19:37:57 +02:00
Nils Adermann 709943aca5 ComposerRepository works differently now, so comment out test until replaced 2015-05-04 17:30:53 +02:00
Jordi Boggiano ab02867015 Use natural sort to sort packages, refs #3872 2015-05-01 16:16:02 +01:00
Jordi Boggiano 081e26f4d7 Merge remote-tracking branch 'localheinz/feature/sort-packages' 2015-05-01 16:08:57 +01:00
Jordi Boggiano 414cf70008 Fix phar build test 2015-05-01 14:48:47 +01:00
Jordi Boggiano ebffb3c179 Move improvements towards reproducible builds, refs #3927 2015-05-01 11:54:55 +01:00
Jordi Boggiano d93406a668 Merge pull request #3956 from nevvermind/use-phpunit-preconditions
Use PHPUnit pre-conditions
2015-05-01 10:50:17 +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
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
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 8cc6e4f67d Fixed two camelcase names 2015-04-30 12:17:13 +02:00
Rob Bast 1213d368f6 Updated tests for new QuestionHelper flow 2015-04-30 12:16:33 +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 00ca2a91a3 Fix typo 2015-04-30 00:08:45 +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 a5dfaafa02 Add a fixture for the schema validation 2015-04-29 23:45:30 +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
Andrew Berry 5b7c5cf41e Fix missing semicolons. 2015-04-23 12:56:11 -04:00
Andrew Berry 59e14ff098 Fix test classes with invalid PHP. 2015-04-23 12:45:27 -04:00
Adrian Dragus 7834dacb88 Forgot to remove the actual calls 2015-04-21 01:26:09 +01:00
Adrian Dragus 96ff1c5014 Use PHPUnit pre-conditions
See https://phpunit.de/manual/current/en/incomplete-and-skipped-tests.html#incomplete-and-skipped-tests.requires.tables.api
2015-04-21 01:15:28 +01:00
Rob Bast b99d9465c1 Added testcase 2015-04-20 13:09:18 +02:00
Jordi Boggiano e50b5fe990 Merge pull request #3853 from hakre/fix/git-checkout
Git Checkout Branch / File Differentiation
2015-04-15 02:46:16 +01:00
Jordi Boggiano 46924cf5f5 Merge pull request #3854 from hakre/fix/symlink-missing
Prevent fatal error on missing symlink() function in tests
2015-04-15 02:43:13 +01:00
Jordi Boggiano 6b3178b169 Merge remote-tracking branch 'isoroku/fix-misspellings'
Conflicts:
	doc/articles/handling-private-packages-with-satis.md
2015-04-15 02:21:44 +01:00
Jordi Boggiano d0695b2a6d Merge pull request #3784 from slbmeh/feature/update-rm-tests
Use data provider in RepositoryManager tests
2015-04-15 01:36:01 +01:00
jakoch 74a077dd3d updated spdx-license handling to include metadata
issue https://github.com/composer/composer/issues/3744

summary of changes
- replaced bin script "fetch-spdx-identifiers" by "update-spdx-licenses"
- "update-spdx-licenses" uses "Composer/Util/SpdxLicensesUpdater" to update "spdx-licenses.json" file with license identifier, fullname and osi-approved-status
- dropped "spdx-identifiers.json" (identifiers only)
- dropped "SpdxLicenseIdentifier", it's just "SpdxLicense" now
- modified "ShowCommand" to output the license with metadata and removed some unused method arguments (cleanup)
2015-03-29 22:46:38 +02:00
msiebeneicher 7522a33079 Merge branch 'master' of https://github.com/composer/composer into add_exclude
# By Jordi Boggiano (30) and others
# Via Jordi Boggiano (37) and Morgan Campbell (1)
* 'master' of https://github.com/composer/composer: (83 commits)
  Update 01-basic-usage.md
  Revert 331425bcb3 as well, fixes #3612
  Revert "Disable overwrites when no-ansi is present, fixes #3612"
  Update deps
  Use justinrainbow/json-schema 1.4
  Improved wording
  Fix docs basic-auth => http-basic
  Add test for Generics class
  Single variable for traits and enums
  Use HHVM_VERSION instead of HPHP_VERSION
  Add support for using classmap to autoload Hack enums
  Re-use existing autoloader suffix if available, fixes #3701
  Report Travis CI build success early
  Test on HHVM nightly releases. Allow to fail.
  Make parseJson safer
  Use get home from Config instead of factory
  Fix env override regression, fixes #3820
  [create-project] Used no progress value for dependencies
  Add docBlock and fix CS
  Fix output of first line of progress when output is not decorated, refs #3818
  ...
2015-03-25 16:27:23 +01:00
Andreas Möller 32538a21a2 Enhancement: Sort packages by importance, then alphabetically 2015-03-25 14:10:20 +01:00
Jordi Boggiano 66b73ea456 Revert "Disable overwrites when no-ansi is present, fixes #3612"
This reverts commit e0d36e19eb.

Conflicts:
	src/Composer/IO/ConsoleIO.php
2015-03-24 01:31:53 +00:00
isoroku e0657b60a2 Fix misspellings 2015-03-20 14:23:24 +00:00
hakre 03b634d114 Prevent fatal error on missing symlink() function in tests
The testsuite didn't run through for me because the php symlink() function
was missing.

It is only available on Windows Visa/Server 2008 or higher.

This commit fixes the issue by checking if the method exists, and if not,
marks the test as skipped because of a non-matching precondition.
2015-03-19 14:42:13 +01:00
hakre 7077803aa4 Git Checkout Branch / File Differentiation
This fixes a minor inaccuracy issue when creating git checkout commands
for branches.

The git checkout command used within `GitDownloader::updateToCommit()`
does not use the "`--`" sequence to separate branch from file parameters.

This leads to an inaccuary as git tries as well the branch name as file
name. If the non-existent branch is actually the name of a file, the file
is checked out. If the non-existent branch is not the name of a file, an
error message is given:

> error: pathspec 'non-existent-branch' did not match any file(s) known to
git.

Both cases are not expected for the program flow in
`GitDownloader::updateToCommit()`.

The only thing that is expected is a non-existent branch to fail to
checkout - but with a different error message:

> // reference was not found (prints "fatal: reference is not a tree:
 $ref")

This can be easily fixed by adding the missing separator when constructing
the command which is applied with this commit.
2015-03-19 12:50:06 +01:00
Fred Emmott 23d5e30fbc Add test for Generics class
Already worked, just adding a test.
2015-03-09 11:29:04 -07:00
Fred Emmott cb1ea889d6 Use HHVM_VERSION instead of HPHP_VERSION 2015-03-09 10:02:10 -07:00
Fred Emmott 33ea86573e Add support for using classmap to autoload Hack enums
fixes composer/composer#3823

Ran tests with both PHP5.5.9-1ubuntu4.5 and HHVM 3.6. Test fails on HHVM only
if I back out the ClassMapGenerator.php change.
2015-03-09 09:38:02 -07:00
Jordi Boggiano b80038804f Fix env override regression, fixes #3820 2015-03-06 16:21:40 +00:00