965f1f42d1
Add support for feature-branches setting
...
A negative list of non-feature-branches names
is already supported - this patch adds a list of
branches names which *will* be considered as
feature branches.
Allows changing the currently hardcoded set of
expected feature branch names, from:
* master|trunk|default|develop
To any set of names or patterns that you desire.
2017-06-11 19:02:51 +02:00
d834fcfac5
Change commitHash to match real life examples
2017-04-03 12:00:31 +01:00
c0f5a64e81
Use long array sysntax for PHP 5.3 compatibility
2017-03-31 17:09:04 +02:00
c2fe198ebc
Re-add unit test for FETCH_HEAD parsing
2017-03-31 15:37:39 +02:00
313e6b914d
Fix Git branch parsing for detached HEAD on a commit
...
Current versions of Git output the commit hash as detached HEAD instead
of FETCH_HEAD. The VersionGuesser should be able to handle commit hashes
as well as FETCH_HEAD to detect the correct branch of a commit.
2017-03-31 15:02:50 +02:00
843877cd6d
Fix hg version guessing, fixes #6236 , fixes #6235
2017-03-08 17:12:13 +01:00
04b1ddb79f
VersionGuesser test for HG
2017-03-08 16:10:12 +01:00
122e422682
CS fixes
2017-03-08 15:16:44 +01:00
dac51c7f4b
Add ignore filters option to archive command
2017-01-11 16:21:44 -06:00
ab70601700
Skip git-related tests if no git found.
2016-12-22 20:14:57 +03:00
e54c7478ee
Attempt at fixing support for git 2.11, refs #5942
2016-12-07 01:02:55 +01:00
873f17261c
try to fix test instead of guarding implementation
2016-12-01 14:03:20 +01:00
d9328ed5ae
Merge pull request #5753 from alcohol/use-rfc3339-in-arraydumper
...
bring arraydumper in line with json schema spec and packagist
2016-10-12 16:51:59 +02:00
4cd6eabdba
Merge branch '1.2'
2016-10-08 11:27:52 +02:00
a45ae5f585
fix test
2016-10-04 13:23:25 +02:00
9f2bd34c87
test copied from #5724
2016-09-27 17:39:44 +02:00
6ec8b2bfd6
Update locker tests
2016-09-10 11:41:07 +02:00
edddae42db
Revert default change from #5603
2016-08-30 15:20:20 +02:00
4479b8a690
Squashed commit of the following:
...
commit 3994b556dcffcde7b1801c8bc712f3127e8f8e7c
Author: John Whitley <john.whitley@berea.eu>
Date: Tue Aug 16 09:02:53 2016 +0100
https://github.com/composer/composer/issues/5600
This alters the default flag for loadOptions in
\Composer\Package\Loader\ArrayLoader to true; and alters the assumption
of the test to reflect this change.
**Rationale**
The `\Composer\Package\Loader\ArrayLoader` test (defined in
tests/Composer/Test/Package/Loader/ArrayLoaderTest.php) assumed that a
new `\Composer\Package\Loader\ArrayLoader` instance would be always
created with the optional flag loadOptions set to true.
```php
$this->loader = new \Composer\Package\Loader\ArrayLoader(null, true);
```
This change alters the general case to reflect the default assumption as
defined in the test.
commit b75fc4ad7238bc50f724bd29446ccbc33e82c34c
Author: John Whitley <john.whitley@berea.eu>
Date: Mon Aug 15 16:55:27 2016 +0100
Altered the test for ArrayLoader to use the default loadConfig flag, and to test the true and false states for the loadConfig flag
2016-08-30 15:20:15 +02:00
6f7389e911
Revert default change from #5603
2016-08-26 11:32:58 +02:00
c51c1b3047
Squashed commit of the following:
...
commit 3994b556dcffcde7b1801c8bc712f3127e8f8e7c
Author: John Whitley <john.whitley@berea.eu>
Date: Tue Aug 16 09:02:53 2016 +0100
https://github.com/composer/composer/issues/5600
This alters the default flag for loadOptions in
\Composer\Package\Loader\ArrayLoader to true; and alters the assumption
of the test to reflect this change.
**Rationale**
The `\Composer\Package\Loader\ArrayLoader` test (defined in
tests/Composer/Test/Package/Loader/ArrayLoaderTest.php) assumed that a
new `\Composer\Package\Loader\ArrayLoader` instance would be always
created with the optional flag loadOptions set to true.
```php
$this->loader = new \Composer\Package\Loader\ArrayLoader(null, true);
```
This change alters the general case to reflect the default assumption as
defined in the test.
commit b75fc4ad7238bc50f724bd29446ccbc33e82c34c
Author: John Whitley <john.whitley@berea.eu>
Date: Mon Aug 15 16:55:27 2016 +0100
Altered the test for ArrayLoader to use the default loadConfig flag, and to test the true and false states for the loadConfig flag
2016-08-16 09:16:37 +01:00
57ae6d97b6
Merge branch '1.1'
2016-05-17 12:06:36 +01:00
a3b49ae44f
Enhancement: Assert that no warning is issued when using exact version constraint for unstable package
2016-05-17 09:25:04 +02:00
c30dd16e32
add missing validation for rss chanel section in composer schema
2016-05-16 23:24:00 +02:00
6146f7aded
Take into account prefer-stable and dev packages when computing outdated, refs #5251
2016-04-28 22:38:38 +01:00
8771119374
Merge branch '1.0'
2016-04-22 23:00:13 +01:00
6ce8477d04
Fix parsing of stabilities with AND/OR ops and no stability flags
2016-04-22 22:59:55 +01:00
76350676b5
Warn on exact/overly strict constraints, fixes #2746
2016-04-15 16:37:47 +01:00
2dcd76aa43
Fix test suite
2016-02-25 14:24:27 +00:00
bad80878bc
Merge remote-tracking branch 'sashman/master'
2016-02-25 13:55:49 +00:00
a245c4618b
php-cs-fixer
2016-02-25 11:04:44 +01:00
582e361a88
Fixing array accessing
2016-02-22 21:47:33 +00:00
f6899e5c38
#4828 Using version guesser to pull out the commit has for git repositories. The return value is now an array with version and commit values.
2016-02-22 21:19:01 +00:00
4600deac68
fix #4925
2016-02-17 10:06:10 +01:00
7e17fec3b8
Merge pull request #2585 from jaypea/ziparchiver
...
added ZipArchiver to actually compress zip files
2016-02-06 15:49:24 +00:00
adf3b956d0
try to use unique test directories
...
any tests that use the filesystem should have their own unique directory, as we run our test suite in parallel and
cleanup of tests (removing directories) should not interfere with currently running tests
2016-01-26 09:41:21 +01:00
966a982738
CS fixes
2015-11-21 19:28:10 +00:00
4b269f4ded
Follow stability option in create-project to select the best possible version, refs #4563
2015-11-14 15:04:04 +00:00
735d4a692e
Fix validating array loader tests
2015-10-30 20:40:09 +00:00
599ad77167
Merge pull request #4542 from bd808/feature/support-merge-plugin
...
Allow easier manipulation of RootAliasPackage
2015-10-28 03:45:57 +00:00
06c44ce998
Add setters used by composer-merge-plugin to RootPackageInterface
...
Extend RootPackageInterface with setter functions used by
composer-merge-plugin and implement them for RootAliasPackage. This will
allow composer-merge-plugin and similar code that manipulates the root
package at runtime to ignore the difference between a RootPackage and
a RootAliasPackage.
2015-10-27 14:43:29 -06:00
82349bcb2a
Fix support for extracting stability flags in multi-constraints, fixes #4440
2015-10-27 14:59:48 +00:00
507415e404
Make VersionSelector prefer stable by default and allow specifying a PHP version that must be matched, fixes #4318
2015-10-27 14:43:04 +00:00
3d9daea6a0
CS fixes
2015-10-25 15:19:15 +00:00
1c0b9cd65f
Removed test for non-string file name check
2015-10-12 10:20:45 -05:00
63ede6c9dd
Fixed issues with PR
2015-10-07 12:42:19 -05:00
0d00338bdb
Added better messages and fixed bugs
2015-10-04 20:03:06 -05:00
906c1c2e66
Added check for filename in archive manager and added test
2015-10-04 19:53:07 -05:00
ce08582671
Fix CS
2015-09-28 10:53:24 +01:00
a1427d7fd6
replace all occurences in code and comments
2015-09-24 16:32:36 +02:00
1ccfc8eb96
add semver, deprecated existing classes
2015-09-24 16:28:28 +02:00
74e56fd5c6
Merge remote-tracking branch 'szeber/master'
2015-09-12 22:53:27 +01:00
89c6a68a76
Updates to path repository and path downloader, refs #4365
2015-09-12 22:28:03 +01:00
bb81e3721a
Move the `proc_open` test in setUp
2015-08-25 09:19:10 +01:00
d7a94bda1b
Change short array syntax to long for 5.3 compatibility
2015-08-21 16:57:31 +12:00
bfb83f1fb7
Add name and version to the relevant fields, move content hash checking to the Locker
2015-08-21 16:54:28 +12:00
dfccb686ce
Replace usage of brackets by legacy array notation
2015-08-18 15:16:15 +01:00
5261a5fa03
Move version guessing in `VersionGuesser` class
2015-08-18 14:58:18 +01:00
ef37b86c81
closes #1508 - updated tests
2015-07-30 13:37:12 +02:00
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
f634c6946d
Update callers of VersionParser::formatVersion()
...
Tests were moved to BasePackageTest.
2015-07-02 00:06:56 -07:00
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
6a64041055
CS fixes
2015-06-30 15:38:32 +01:00
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
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
0298cdc60d
change delimiter to curly braces
2015-06-30 13:52:47 +02:00
e698636af4
added test to reproduce #4183
2015-06-29 09:42:40 +02:00
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
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
12c833864c
Revert converting `1.0.0` to `^1.0`.
2015-06-08 22:45:20 +01:00
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
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
89885140d3
Created a failing test case
2015-06-02 15:04:58 +02:00
46e0a506b9
Added another testcase + fix
2015-06-02 14:20:48 +02:00
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
2e99b9fdf5
Use https where possible
2015-05-04 19:37:57 +02:00
4ce0adb23c
Use the caret operator for all require operations
2015-04-29 23:53:40 +01:00
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
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
0b4a9235f4
CS fixes
2015-02-24 14:22:54 +00:00
e5ede671d2
Config Git repository user
...
One can’t assume a Git user is already setup for the tests.
2015-02-16 11:55:56 -04:00
53925295c3
Merge pull request #3699 from trivago/non_feature_branches
...
added non-feature-branches
2015-02-14 15:44:45 +00:00
abc9d60fcc
added non-feature-branches to handle non-numeric branches matching configured patterns not been handled as feature branches
2015-02-02 14:36:50 +01:00
cd38d1e096
Tweaks to also support 1.0-dev style aliases, refs #3480
2015-01-20 10:26:10 +00:00
7bb85ff21e
Support aliases for numeric branches. Fixes #3461
2015-01-20 17:42:01 +13:00
267af928df
Add a failing testcase for stability flags in complex constraints
...
Refs #3570
2014-12-22 12:27:56 +01:00
e821ac2772
Persist prefer-lowest in composer.lock
2014-12-14 10:29:41 +01:00
d4523119ea
Use caret operator for 0.x releases when guessing versions, fixes #3518
2014-12-08 17:05:50 +00:00
06e96a78e2
Update ranges for 0.N versions, refs #3518
2014-12-08 17:04:59 +00:00
9438f3a58f
Use better semver ranges for 0.x versions, fixes #3518
2014-12-08 16:57:27 +00:00
92f4c1fb35
Allow and ignore semver build metadata, fixes #2422
2014-12-08 15:52:32 +00:00
f363f9d370
Add support for caret (^) operator
2014-12-08 15:39:52 +00:00
ebab9db27a
Add support for hyphen ranges
2014-12-08 13:44:42 +00:00
69ef80124f
Add support for capital X in 3.X and || for OR
2014-12-08 12:59:01 +00:00
4c713978e9
Add more tests and validate that there is only one comma
2014-12-07 18:07:30 +00:00
ca168d478b
Spaces are now equivalent to comma in constraints and mean AND
2014-12-07 18:07:29 +00:00
029f709300
Fix parsing stability suffixes in multi constraints, fixes #1732
2014-12-07 17:46:04 +00:00
6f4be698a5
Merge pull request #3325 from rdohms/implementing-abandoned-packages
...
Abandoned Package Warnings
2014-11-20 13:09:18 +01:00
94926218e8
CS fixes
2014-10-17 18:57:27 +01:00
95d49ce638
Add additional test for beta without dash separator support, fixes #3331
2014-10-06 12:42:19 +01:00
346133d2a1
PR Review
...
- reverted comma removal
- made getReplacementPackage consistent
- removed abandoned flag if false
2014-10-03 15:12:16 +02:00
d6d087d348
Support for Abandoned in Packages
...
Added parsing for abandoned property into the CompletePackage Object.
2014-10-02 23:53:21 +02:00
e6165e6495
Tweak rules to allow guessing based on branch aliases and avoid greedy constraints on alpha/beta/RC packages, refs #3096
2014-09-23 15:19:23 +01:00
cf75ec7763
Merge remote-tracking branch 'weaverryan/require-version-select'
2014-09-22 17:48:13 +01:00
6c6a623229
Fix invalid version format
2014-09-22 11:58:26 +02:00
895e62e859
Refactoring selection of the "recommended" version (e.g ~1.2) and adding some tests
...
This also modifies the behavior slightly (from a recommendation by seldaek) to always
propose the minor version of the recommendation (e.g. ~1.2 instead of ~1.2.1).
2014-09-12 11:26:51 -04:00
aea2e901a9
Extracting logic into a new class related to selecting the latest version
...
Also refactored InitCommand slightly so that you can use this "latest version"
functionality when searching for a package as well.
2014-09-12 11:26:51 -04:00
d47d9eb253
remember prefer-stable setting in composer.lock
2014-07-07 21:20:46 +02:00
ac497feaba
CS fixes
2014-06-10 16:13:12 +02:00
64ac32fca9
Merge pull request #2785 from Firehed/master
...
Add @generated annotation to lockfile (ref PR 2210)
2014-05-24 22:57:50 +02:00
32cd883daa
Rename options to transport-options, refs #2189
2014-05-07 18:25:28 +02:00
31092843fd
Only load options when they come from the lock file, not from standard metadata, refs #2189
2014-05-07 18:12:26 +02:00
016a016455
Merge remote-tracking branch 'lcobucci/master'
...
Conflicts:
src/Composer/Downloader/FileDownloader.php
2014-05-07 18:02:46 +02:00
e7b82cdd88
Only check in require and for non-platform packages, add flag to make this warning optional, refs #2320
2014-04-09 15:37:50 +02:00
e0004d0656
Merge remote-tracking branch 'stof/validate_unbound_constraints'
2014-04-09 14:51:14 +02:00
634d1aba63
Add @generated annotation to lockfile readme, giving a hint for linters and other static analysis tools
2014-03-06 10:15:59 -08:00
3e161e8ea9
Updated the regexp and added an other test case for sub dirs
2014-02-28 16:30:55 +01:00
1d51e54a31
Updated the regexp and added more test cases.
2014-02-28 11:43:28 +01:00
21109ada22
Fix for #2739 (and #1755 ), added support for directory excludes in the .gitignore file like /directory or directory/
2014-02-27 15:17:15 +01:00
a4a9d0f0e4
[Archiver] Rules in GitExcludeFilter are too broad
2014-01-30 23:34:28 +00:00
d57e2b9ffb
added ZipArchiver to actually compress zip files
2014-01-13 17:14:12 +01:00
b23742e30c
Merge remote-tracking branch 'donquixote/feature/psr4-complete'
2014-01-03 14:56:36 +01:00
0f2c0ab389
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/Composer/Downloader/FileDownloader.php
2013-12-29 00:37:08 +00:00
2f4df9d459
Fixed typos
2013-12-27 11:51:01 +00:00
e4bbd83f13
expected message in ValidatingArrayLoaderTest should also contain psr-4 as allowed key.
2013-12-22 19:03:23 +01:00
80499bb024
Detect ~> misuse and suggest fix, fixes #2476
2013-12-06 13:32:19 +01:00
ca7cb68dd5
Check exclude from downloaded composer.json
2013-12-05 16:03:48 +01:00
6cc95c43e3
Add a warning for unbound constraints in the validating loader
...
Closes #2165
2013-10-12 02:29:16 +02:00
11a0d16ccc
CS fixes
2013-10-11 20:12:45 -03:00
38917c2047
Add parallel build to travis script
2013-09-25 10:23:48 +02:00
8630aab93f
Package options must be a non mandatory array and should be loaded when
...
exists
2013-08-19 04:40:08 -03:00
28d0e08785
Package options should be dumped if exists
2013-08-19 04:39:13 -03:00
0044c75ca0
Fix detection of tags when the current tag is not a valid version
2013-08-12 10:27:25 +02:00
8b293633ae
Merge remote-tracking branch 'simensen/non-dev-version'
...
Conflicts:
src/Composer/Package/Loader/RootPackageLoader.php
tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
2013-08-12 02:39:52 +02:00
f59f443fce
CS fixes and one more test for safety, fixes #1855
2013-08-12 02:22:32 +02:00
533512879e
Merge remote-tracking branch 'sminnee/fix-tilde-constraint-stabililty'
2013-08-12 02:17:00 +02:00
bd345c3b43
Add IO to proc executor in a few more places to get more debug info out
2013-08-10 02:44:11 +02:00
af1f5a3423
Merge pull request #2091 from jaypea/archivemanager
...
cleanup temporary download location when archiving
2013-08-05 06:26:02 -07:00
d740f50277
Fix parsing of inferred stability flags that are more stable than the min stability
2013-07-28 19:40:37 +02:00
c6db86e444
cleanup temporary download location when archiving
2013-07-17 13:28:15 +02:00
8d0b7f278e
CS fixes
2013-06-13 13:28:24 +02:00
e848c76cbc
Only compare branches as versions in the policy to sort packages, but not in the solver, fixes #1817
2013-05-23 18:12:54 +02:00
215556df7c
Use --tags to get non-annotated tags as well.
2013-05-21 09:59:41 -05:00
f9fe39e624
Fixed the existing test and added a new one for git tag version guessing.
2013-05-21 06:14:34 -05:00
324ef0f9bb
Fixed upper bound of wildcard matches.
...
Follow-on from 95b4348afa
2013-05-20 19:10:04 +12:00
95b4348afa
Fixed lower bound of tilde and wildcard matches.
...
The lower bound of ~1.2 and 1.2.* style version requirements now uses >= 1.2.0.0-dev instead of
> 1.1.9999999.9999999. This is more straightforward to read, and behaves equivalently.
2013-05-20 19:03:21 +12:00
34a21516c8
Fix tilde constraints without a stability suffix to work like wildcard constraints.
...
With this fix, a tilde constraint such as ~3.1 won't match unstable versions of 3.1,
but a wildcard constraint such as 3.1.* would. This seems like a confusing
inconsistency, and so I have corrected it.
2013-05-13 11:04:15 +12:00
9d948eb795
Merge branch 'disjunctive'
2013-05-04 10:48:14 +02:00
faa419cc0e
Merge remote-tracking branch 'hason/alias'
2013-04-28 12:54:59 +02:00
0cccafbe81
Add disjunctive multi-constraints with |, refs #643 , fixes #1342
2013-04-27 15:20:35 +02:00
Claus Due