Jordi Boggiano
bd23ce672a
Merge pull request #4324 from MalteWunsch/getCanonicalPackages-with-different-versions
...
Improve documentation for WritableRepositoryInterface::getCanonicalPackages
2015-08-09 17:36:21 +01:00
iamluc
d02ab54be1
Add a new option to view local modifications (git diff)
2015-08-09 17:30:32 +02:00
Nicolas Grekas
fbae6b1589
Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
...
This reverts commit bdb6ecb29e
, reversing
changes made to 8a12e50a16
.
2015-08-04 10:34:54 +02:00
Malte Wunsch
70ff00c9de
Reverted inadvertent API change, improved API documentation
2015-08-04 09:32:23 +02:00
Tehem
9e592f19a1
Used shorthand version for ternary operator
2015-08-03 23:36:05 +02:00
Malte Wunsch
767279b41a
getCanonicalPackages returns packages with same name in different versions
2015-08-03 18:28:04 +02:00
Thomas Marcon
b35e762354
Updated configFile parsing to first look into -f parameter, then COMPOSER environment variable, then default to composer.json
2015-07-31 12:01:49 +02:00
Rob Bast
51ef7b5eef
instead of generic be more verbose about possible causes
2015-07-31 10:01:58 +02:00
Rob Bast
77f1d5945f
make sure php version errors are less misleading
...
* determine conflicting version in problem using pool package
* hide version in rule to keep it generic rather than possibly misleading
fixes #4319
2015-07-31 09:58:34 +02:00
Tehem
9392adef79
Fixes #4302 allow COMPOSER env with config statements (overrides --file)
2015-07-28 00:01:01 +02:00
Webber Wu
92530e374b
Merge remote-tracking branch 'upstream/master'
2015-07-26 12:33:39 +08:00
Kocsis Máté
87c16073ec
Merge branch 'master' of https://github.com/composer/composer into feature-bin-compat
2015-07-22 15:54:20 +02:00
Jordi Boggiano
00c26791fa
Merge pull request #4264 from alcohol/use-composer-spdx
...
remove spdx files, introduce external library
2015-07-20 18:29:14 +01:00
Jordi Boggiano
bbf959ac34
Do not retry failures once degraded mode is already enabled
2015-07-20 17:44:03 +01:00
Jordi Boggiano
ff84b32097
Add degraded mode to try and bypass ipv6/gzip issues, refs #4142 , refs #4121
2015-07-20 17:33:53 +01:00
Rob Bast
2553f5f7d4
throw error when file is loaded
2015-07-20 12:10:30 +02:00
Rob Bast
56f0d82207
get resources dir from spdxlicenses
2015-07-20 11:42:20 +02:00
Rob Bast
616585e0cc
spdxlicense extends spdxlicenses, add depr error
2015-07-16 13:21:18 +02:00
Rob Bast
1f006a499e
updated compiler class to include spdx sources
2015-07-16 12:03:34 +02:00
Rob Bast
5ae9e7fe22
remove spdx files, introduce external library
2015-07-16 11:42:12 +02:00
Jordi Boggiano
92faf1c7a8
Merge pull request #4228 from naderman/memory-version-constraint
...
Remove unnecessary version comparison cache variable and store operator as int
2015-07-14 13:37:15 +01:00
Jordi Boggiano
7e0db8aa46
Merge pull request #4239 from naderman/memory-rules
...
Reduce memory usage of Rule objects
2015-07-14 13:34:24 +01:00
Nils Adermann
cf1af58514
Use bitwise operators directly in rules instead of get/set Bitfield
2015-07-14 14:24:18 +02:00
Nils Adermann
ccaba0d2f7
Make static translation tables in version constraint private and use ===
2015-07-14 14:12:19 +02:00
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
Jordi Boggiano
42bfe9c56a
Merge pull request #4219 from localheinz/feature/strict-mode
...
Enhancement: Also validate if lock file is up to date
2015-07-12 16:39:36 +01:00
Jordi Boggiano
acc11f63c5
Merge pull request #4234 from naderman/rule-hash-int-size
...
Reduce rule hash size
2015-07-12 16:25:14 +01:00
Jordi Boggiano
efb9f13248
Merge pull request #4229 from naderman/memory-version-array-merge
...
VersionParser: remove a few hundred/thousand array_merge calls
2015-07-12 16:14:16 +01:00
Andreas Möller
5828f6202d
Enhancement: Also validate lock file
2015-07-10 18:07:40 -04:00
Nils Adermann
de65199f31
Merge pull request #4117 from stof/patch-1
...
Optimize the regex detecting timestamps
2015-07-09 21:17:24 +02:00
Nils Adermann
956035e641
Remove the unnecessary return statements from setters
2015-07-09 19:40:03 +02:00
Nils Adermann
f535542fca
Use constants with names for bitfield offsets
2015-07-09 18:59:16 +02:00
Nils Adermann
329ab5cf41
Rename blob rule property to bitfield
2015-07-09 18:48:50 +02:00
Nils Adermann
961ea868ac
Use an integer bitfield for rule properties instead of a string binary blob
2015-07-09 18:26:31 +02: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
3fd4672382
VersionParser: Append elements directly instead of array_merge
2015-07-09 12:57:34 +02:00
Nils Adermann
c7e1f49e78
Rule hashes are only used in the rule set, so no need to store them
2015-07-08 19:11:59 +02:00
Nils Adermann
15d572da4c
Use 4 byte integer from raw md5 instead of 5 hex representation chars
...
The hash is necessary as comparisons are significantly too slow
otherwise. The old hash function used substr on the hexadecimal
representation of the md5 hash, rather than the raw binary output. This
wastes a significant amount of memory, as each byte can only be used to
store up to 4 bit of information. The new hash has 32bit instead of
20bit and uses only a 4 byte integer instead of a 5 byte string.
2015-07-08 19:11:58 +02:00
Nils Adermann
5b1b96b61e
Output the number of rules used in the solver for profiling purposes
2015-07-08 17:57:23 +02:00
Nils Adermann
e88df7429f
Remove a few hundred/thousand array_merge calls
2015-07-08 13:36:19 +02:00
Nils Adermann
8dd110e0a9
Remove unnecessary version comparison cache variable and store operators as int
2015-07-08 13:13:47 +02:00
Nils Adermann
07e1d227c9
Output the size of the pool after dependency resolution for users
2015-07-07 15:40:26 +02:00
Nils Adermann
22737e31a7
Merge pull request #4213 from legoktm/stabilities
...
Don't use BasePackage::$stabilities in VersionParser
2015-07-07 13:45:55 +02:00
Jordi Boggiano
a8d71be0ef
Add event name in verbose mode, refs #4123
2015-07-04 12:15:04 +01:00
Jordi Boggiano
852e4f4e26
Merge remote-tracking branch 'alcohol/output-script-command-in-verbose-mode'
2015-07-04 12:11:18 +01:00
Jordi Boggiano
0964c02acb
Use only one level of verbosity
2015-07-04 12:02:57 +01:00
Jordi Boggiano
5ba41514a9
Merge remote-tracking branch 'alcohol/add-suggests-command'
2015-07-04 11:58:58 +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
Kunal Mehta
0ad9e98a59
Don't use BasePackage::$stabilities in VersionParser
...
Working towards #3545 .
This adds VersionParser::$stabilities, which is an array of the
supported stability levels. This adds a little bit of duplication,
however we were already hardcoding the various stabilities in regular
expressions and functions like parseStability().
2015-07-03 17:54:30 -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
Jordi Boggiano
e2b2f450dc
Merge pull request #4144 from staabm/patch-2
...
Dropped unnecessary break statements
2015-07-03 21:49:05 +01:00
Jordi Boggiano
9b3e8b963e
Merge pull request #4143 from staabm/patch-1
...
Dropped obsolete condition
2015-07-03 21:48:39 +01:00
Jordi Boggiano
01a9c3a0ce
Merge pull request #4208 from alcohol/update-spdx-updater
...
Updated SPDX related files in light of 2.0 release of SPDX specification
2015-07-03 11:54:16 +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
c5afb8f23a
Mark VersionParser::formatVersion() as deprecated
...
With 1753c275ff
, this will be handled nicely.
2015-07-02 00:07:04 -07: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
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
Jonathan Eskew
42b025776a
Move file identifier calculation to compile time
2015-06-30 09:22:51 -07: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
Jonathan Eskew
24c4322672
Use 5.3 compatible array syntax
2015-06-28 13:47:00 -07:00
Jonathan Eskew
868a872df2
Push the hash to $GLOBALS
2015-06-28 13:44:43 -07:00
Jonathan Eskew
61ed7a9547
Explicitly check if a file has already been required before requiring it
2015-06-27 14:05:59 -07: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
Branden Cash
5146085dc2
Follow symlinks when searching for artifacts
2015-06-10 11:46:08 -07: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
Markus Staab
c9bdf3a07a
added the actual phpversion into the error message when phpversion doesn satisfy the requirement
2015-04-29 18:21:18 +02:00
Anael Ollier
27074083cc
Replaced join() by implode()
2015-04-28 13:23:00 +02:00
Anael Ollier
2f82ed7035
Fixed the fix :)
2015-04-28 11:19:29 +02:00
Anael Ollier
b2efb95f33
Fixed svn update command (fails before attempting to use authentication provided in auth.json)
2015-04-27 15:26:32 +02:00
Jordi Boggiano
1cb427ff5c
Force http1.1 protocol
2015-04-26 22:18:04 +01:00
Josh Di Fabio
051b7bd44b
Touch access time only when reading from cache
2015-04-23 16:08:03 +01:00
Jordi Boggiano
2e73811211
Fix process timeout not being initialized correctly when loading a config without creating a full composer instance, closes #3952 , fixes #3946
2015-04-21 21:02:17 +01:00
Jordi Boggiano
35a9b5dbf9
Merge pull request #3953 from alcohol/allow-numeric-author-name
...
Allow numeric author name
2015-04-21 20:47:49 +01:00
Evan Mattson
ec9eb2b799
update init type question
2015-04-21 13:19:18 -04:00
Evan Mattson
5ed001765f
allow package type to be set with init command
2015-04-21 13:19:18 -04:00
Rob Bast
c7d387f599
Allow numeric characters
2015-04-20 13:09:25 +02:00
Jordi Boggiano
a32c919145
Return null instead of false
2015-04-18 19:11:12 +01:00
Jordi Boggiano
921b3a0eba
Fix regression with non-SPDX licenses in show command, refs #3885
2015-04-15 19:27:04 +01:00
Jordi Boggiano
99694a0381
Merge pull request #3940 from phansys/ticket_3859
...
[bugfix] Fixed undefined var in DiagnoseCommand::execute().
2015-04-15 19:14:17 +01:00
Jordi Boggiano
4aa431025b
Merge pull request #3845 from vlakoff/empty-composer.json
...
Avoid parser error if composer.json existing but empty
2015-04-15 02:51:00 +01:00
Jordi Boggiano
ec6d727af8
Add comment about --, refs #3853
2015-04-15 02:48:10 +01: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
Javier Spagnoletti
294185d1d3
[bugfix] Fixed undefined var in DiagnoseCommand::execute().
2015-04-14 22:36:54 -03:00
Jordi Boggiano
05e08889ed
Add BC method for old usage, refs #3857
2015-04-15 02:23:46 +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
dbfd47eeca
CS fixes
2015-04-15 01:22:19 +01:00
Jordi Boggiano
3a06e6f036
Merge pull request #3885 from jakoch/patch-spdx
...
updated spdx-license handling to include metadata
2015-04-14 23:37:03 +01:00
Jordi Boggiano
66dc66c283
Merge pull request #3929 from phansys/ticket_3859
...
[bugfix] Fix for #3859
2015-04-14 23:30:15 +01:00
Jordi Boggiano
5fbd4ee0c9
Merge pull request #3923 from mathielen/patch-1
...
Silence symlink() error
2015-04-14 23:12:02 +01:00
Jordi Boggiano
f41c1217f5
Merge pull request #3913 from hannesvdvreken/patch-2
...
Remove unused variable
2015-04-14 23:10:39 +01:00
Jordi Boggiano
e0ddc25db4
Merge pull request #3911 from hannesvdvreken/patch-1
...
Unused variable
2015-04-14 23:10:17 +01:00
Roshan Gautam
98bc4e4483
Gitlab:Use proper fallbacks if archive download is failing
2015-04-13 21:22:41 +00:00
Javier Spagnoletti
5b2a7e6bad
[bugfix] Updated ```DiagnoseCommand::execute()``` and ```DiagnoseCommand::getGithubRateLimit()```
...
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #3859
| Doc PR | none
Fixes #3859 .
2015-04-11 21:05:17 -03:00
Roshan Gautam
7bf886b3ba
Remove two factor authentication
2015-04-11 17:56:11 +00:00
Roshan Gautam
4d5e5b3fb5
Remove parasite
2015-04-11 14:16:08 +00:00
Roshan Gautam
f870396568
Add oauth2 support for gitlab
2015-04-10 21:45:24 +00:00
Markus Thielen
bd802407a8
Silence symlink() error
...
If not silenced it gives "symlink(): Operation not supported" on my ubuntu system with mounted cifs share.
2015-04-09 09:45:50 +02:00
Rob Bast
117b7ea033
Fixes #3900
2015-04-08 15:43:30 +02:00
Hannes Van De Vreken
b85cb7df82
Remove unused variable
2015-04-07 10:36:11 +02:00
Hannes Van De Vreken
d017fa4a1d
Unused variable
2015-04-06 11:58:12 +02:00
Frederik Bosch
951b07eabc
Fix #3903
2015-04-04 12:38:12 +02:00
Kocsis Máté
f385518e1a
Fixed merge conflict
2015-03-30 22:38:16 +02:00
Kocsis Máté
985c49d47c
Removed unnecessary cwd
2015-03-30 22:27:13 +02:00
Kocsis Máté
258408524f
Converted Symlink utility to UTF-8
2015-03-30 20:03:25 +02:00
Kocsis Máté
38c26ae26b
Added Symlink utility class
2015-03-30 20:00:12 +02: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
Frederik Bosch
79490f662e
Revert #3813 , implement differently
...
Fix #3830
2015-03-28 20:48:19 +01: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
c5cd184767
Revert 331425bcb3
as well, fixes #3612
2015-03-24 01:36:30 +00: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
Stanislav Khromov
6c35dd6b2d
Improved wording
...
All other verbs use are in the form of "doing something", ie Installing, Downloading. "connection" is the odd one out.
2015-03-23 19:36:16 +01:00
Jordi Boggiano
ab3622dff1
Merge pull request #3365 from WouterJ/patch-1
...
Updated validator
2015-03-23 11:56:30 +00:00
isoroku
e0657b60a2
Fix misspellings
2015-03-20 14:23:24 +00: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
vlakoff
d5ab072ec1
Optimize check for empty file
2015-03-17 15:52:44 +01:00
vlakoff
3a68534d20
Fix parser error if composer.json existing but empty
2015-03-14 15:26:53 +01:00
Fred Emmott
bdf51ab16d
Single variable for traits and enums
2015-03-09 10:05:12 -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
b296e654eb
Re-use existing autoloader suffix if available, fixes #3701
2015-03-09 11:13:01 +00:00
Jordi Boggiano
9f9cff558e
Merge pull request #3825 from fonsecas72/ppp
...
Use get home from Config instead of factory
2015-03-08 18:02:57 +00:00
Hugo Fonseca
e79d067690
Make parseJson safer
2015-03-07 19:01:54 +00:00
Hugo Fonseca
c41a187b62
Use get home from Config instead of factory
2015-03-07 13:00:21 +00:00
Jordi Boggiano
b80038804f
Fix env override regression, fixes #3820
2015-03-06 16:21:40 +00:00
Francis Besset
4f57fafb8d
[create-project] Used no progress value for dependencies
2015-03-06 14:09:50 +01:00
Hugo Fonseca
1bb871dca8
Add docBlock and fix CS
2015-03-05 22:01:09 +00:00
Jordi Boggiano
3470cef1f1
Merge pull request #3818 from Hellov/master
...
Duplicate download progress
2015-03-05 14:44:34 +00:00
Jordi Boggiano
331425bcb3
Fix output of first line of progress when output is not decorated, refs #3818
2015-03-05 14:44:15 +00:00
Jordi Boggiano
ad40cdc3fe
Fix overwriteError behavior, fixes #3817
2015-03-05 14:40:29 +00:00
Jordi Boggiano
d9b5c884ba
Detect and warn JSON encoding failures, refs #3786
2015-03-05 14:24:43 +00:00
Hello
ef0191ee6a
Duplicate download progress
2015-03-05 16:27:27 +03:00
Jérôme Tamarelle
c1edfbb65c
Add tests on GitLabDriver
...
Add an interactive prompt for gitlab token
Update doc for gitlab-domains
Add tests on GitLabDriver::supports
Update doc + CS
Optimize branch detection + fix typos
Fix test on GitLab support as it depends on SSL
Remove useless method + fix repository URL containing .git
2015-03-04 00:08:44 +01:00
Jérôme Tamarelle
802b57417a
Pass GitLab credential by HTTP header instead of query string to improve security
2015-03-04 00:08:42 +01:00
Jérôme Tamarelle
48fc2eafa0
Add gitlab.com as default GitLab domain
2015-03-04 00:08:42 +01:00
Jerome TAMARELLE
5fece6ae83
Use Gitlab blob API to retreive composer.json files
...
Store missing composer.json into the cache
[GitLab] Reduce API calls by caching
Download ZIP archives from gitlab + fix repo URL
Fix cached commit objects
2015-03-04 00:08:39 +01:00
Henrik Bjørnskov
782c6303bc
Initial GitLab Driver
...
This is a proof of concept, and mostly done to gather feedback on the
structure of the driver and to see if this is something that Composer
should include in core.
Various review changes based on Stof comments.
* Remove cleanup() as it is implemented by the abstract class.
* Remove wrong comment in getReferences
* Implement getSource (as GitHubDriver does)
* Finish phpDocs for methods.
2015-03-04 00:08:30 +01:00
Nicolas Grekas
be22a87d9c
Run processes with predictable LANGUAGE=C
2015-03-03 13:10:41 +01:00
Jordi Boggiano
eadc167b12
Fix BC layer for events
2015-03-02 18:20:22 +00:00
Jordi Boggiano
82b7fdf4c1
Add BC for Script\Event instances, fixes #3811
2015-03-02 17:02:20 +00:00
Jordi Boggiano
b098a2fdde
Fix clear cache when a dir does not exist, fixes #3810
2015-03-02 16:40:05 +00:00
Kunal Mehta
05e196893b
Add --no-check-publish option to "composer validate"
...
This is useful when you want to use composer to manage dependencies, but
don't actually want your project to be installable as a composer package.
Any issues that would prevent publishing are still shown, but as a warning
instead of an error.
2015-02-28 12:59:43 -08:00
Jordi Boggiano
d5feea83b6
Sync up diagnose command with the installer
2015-02-28 20:20:22 +00:00
Jordi Boggiano
45b1f356c2
Add debug output when a plugin is loaded
2015-02-27 14:31:27 +00:00
Jordi Boggiano
4d665f59b0
Create lock if we only have platform dependencies
2015-02-27 12:20:42 +00:00
Jordi Boggiano
e5985a9b55
Merge pull request #3778 from edhgoose/patch-1
...
Fix reference to getIO as per #3777
2015-02-25 19:44:34 +00:00
Jordi Boggiano
2eb69f120e
Move check to follow the previous code change
2015-02-25 19:30:51 +00:00
Jordi Boggiano
0c775e997e
Fallback to https directly if ssh proto is disabled on github private repos, fixes #2786
2015-02-25 18:47:31 +00:00
Edward Hartwell Goose
bcb5e479b7
Fix reference to getIO as per #3777
2015-02-25 18:41:13 +00:00
Jordi Boggiano
e0ce559838
Merge remote-tracking branch 'alcohol/write-errors-to-stderr'
...
Conflicts:
src/Composer/Command/LicensesCommand.php
2015-02-25 18:02:49 +00:00
Jordi Boggiano
c573ae5781
Add missing LICENSE files from dependencies, fixes #3776
2015-02-25 17:48:01 +00:00
Jordi Boggiano
182cfbc249
Merge remote-tracking branch 'SofHad/licenses'
...
Conflicts:
src/Composer/Command/LicensesCommand.php
2015-02-25 17:30:34 +00:00