084f6de24e
Merge remote-tracking branch 'trivago/add_exclude'
...
Conflicts:
doc/04-schema.md
src/Composer/Autoload/AutoloadGenerator.php
2015-10-30 00:00:44 +00:00
ef2856ef55
Take php version into account for create-project command version selection
2015-10-29 22:35:30 +00:00
c7ed232ef4
Merge pull request #4529 from jeroenseegers/warn-on-commit-reference
...
Generate a warning when a commit reference is used
2015-10-29 10:52:59 +01:00
32517d90d2
Escape angle brackets for commit message output
2015-10-29 09:01:28 +01:00
e0a6419992
When classmap authoratative is enabled, there should be no reason to load 3 files, and process them when autoloader will return false
2015-10-28 14:29:36 -06: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
6582c337d0
Fix typo
2015-10-28 00:06:21 +00:00
8e99cec3e7
Fix ref to findShortestPath
2015-10-28 00:04:33 +00:00
dc40bf9f51
Remove unused local variables from AliasPackage
2015-10-27 14:44:57 -06: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
193a072d3c
Clarify that the abstract constraint should not be relied upon anymore
2015-10-27 19:13:50 +00:00
2eb0af264b
Allow RootAliasPackage to override cached values
...
AliasPackage caches the values of 'requires', 'devRequires',
'conflicts', 'provides', 'replaces' locally to allow `self.version`
references to be properly updated to reference the alias. Plugins like
composer-merge-plugin that manipulate these settings at runtime need to
be able to change the values after alias construction.
2015-10-27 12:36:13 -06:00
1160b782c8
Deduplicate classmap creation and add support for loading classmaps on the fly for plugins & co
2015-10-27 17:47:25 +00:00
8cd6598d8d
Simplify php version fetching
2015-10-27 16:40:52 +00:00
125dc62fab
Make trigger error visible
2015-10-27 16:11:07 +00:00
615638c7c3
Simplify bin-compat by removing the nosymlink option, refs #3704
2015-10-27 15:36:12 +00:00
c9b51a5751
Merge remote-tracking branch 'kocsismate/feature-bin-compat'
2015-10-27 15:20:53 +00:00
ebe0c8d79c
Fix issue #3229 , refs #3184
2015-10-27 15:12:18 +00:00
90a90e22de
Merge remote-tracking branch 'Wirone/unixy-proxy'
...
Conflicts:
src/Composer/Installer/LibraryInstaller.php
2015-10-27 15:10:35 +00: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
279b5f0156
Drop irrelevant properties from composer_commit-ref.json
2015-10-27 14:20:45 +01:00
f3dc31839f
Refactor commit-ref validation
...
The require and require-dev arrays have been merged into one and no
longer user private methods/properties to collect warnings.
2015-10-27 13:59:29 +01:00
4f934d9282
Avoid sending install notifications in dry-run mode
2015-10-26 15:01:06 +00:00
3d9daea6a0
CS fixes
2015-10-25 15:19:15 +00:00
b05b52ff7e
InstallationManager: notifyInstalls: append authorization header for repository
2015-10-24 00:58:34 +02:00
73e73c90fb
Generate a warning when a commit reference is used
...
Closes #4485
2015-10-23 21:38:11 +02:00
f85d965732
Merge pull request #4501 from tw2113/master
...
add spacing consistency around phpdoc attributes
2015-10-19 12:04:38 +02:00
7f42fe4c10
Issue #4512 Set reference in path repository
2015-10-18 11:57:43 +02:00
ed23b1c4db
Issue #2384 allow 'prefer-stable' and 'minimum-stability' to be set via composer config command
2015-10-17 10:58:53 -04:00
a54f84f05f
Merge pull request #4479 from MakiCode/feature#4397
...
Added --file flag: Feature#4397
2015-10-13 14:09:04 +01:00
1c7016de45
remove dead code/class
2015-10-13 12:37:15 +02:00
1bf03e9621
fixed various docblocks and class properties in solver
2015-10-13 12:27:48 +02:00
b523fc0b7b
ran fixers
2015-10-13 11:35:51 +02:00
459a48ad5b
add spacing consistency around phpdoc attributes
2015-10-13 00:46:26 -05:00
1c0b9cd65f
Removed test for non-string file name check
2015-10-12 10:20:45 -05:00
fefc106ef6
Removed type check on ArchiveManager
2015-10-12 10:18:57 -05:00
22e93f110b
Fixed indentation
2015-10-07 15:52:58 -05:00
7005d89847
Fixed bug
2015-10-07 12:44:23 -05:00
63ede6c9dd
Fixed issues with PR
2015-10-07 12:42:19 -05:00
7a9eb02190
Merge pull request #4455 from samsaggace/config_archive
...
Enable command line configuration for archive-dir and archive-format
2015-10-07 12:05:33 +02:00
b6df8549cd
Merge remote-tracking branch 'parent/master'
...
Conflicts:
src/Composer/Factory.php
2015-10-05 09:52:52 +02: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
87b5af60a8
Almost finished adding --file option, need to add unit test
2015-10-02 09:09:09 -05:00
edf14dab15
Merge pull request #4469 from Soullivaneuh/patch-1
...
PackageInterface[] on RepositoryInterface php doc
2015-10-01 22:12:34 +02:00
790a941cba
Merge pull request #4470 from alcohol/fix-config-lookup
...
itteratively expand key and attempt to match
2015-10-01 14:48:22 +01:00
7bd0c5abdd
itteratively expand key and attempt to match
...
fixes #4459 (also)
2015-10-01 15:05:38 +02:00
4f4d236be3
PackageInterface[] on RepositoryInterface php doc
2015-10-01 14:54:45 +02:00
5ccaad92c1
Merge remote-tracking branch 'alcohol/weird-config-listing-issue'
2015-09-30 11:52:04 +01:00
2dbad30336
fixes #4459
2015-09-29 20:57:26 +02:00
3896a6c263
Enable cmdline configuration for archive-dir and archive-format
...
Examples of commands :
composer config --global archive-dir $HOME/.composer/repo
composer config --global archive-format zip
2015-09-28 13:22:38 +02:00
ce08582671
Fix CS
2015-09-28 10:53:24 +01:00
c41079192f
Merge pull request #4454 from alcohol/urlencode-urls-only
...
only urlencode $ if filename is not local
2015-09-28 10:38:16 +01:00
b219abe8f6
@seldaek damn your assignment in expression
2015-09-28 10:59:26 +02:00
e491b72a8c
only urlencode $ if filename is not local
2015-09-28 10:39:36 +02:00
1328d9c3b2
rename baseversionparser to semverversionparser
...
and fix docblock as per @stof request
2015-09-25 11:05:38 +02:00
89717fa593
implement old linkconstraintinterface for BC
2015-09-25 10:59:56 +02:00
0adcab7a19
compile phar with semver included
2015-09-24 16:49:10 +02:00
a1ad7fc435
fix classname clashing cause of existing class in current namespace
2015-09-24 16:48:46 +02:00
ddb1c1e052
these 2 use parseNameVersionPairs
2015-09-24 16:34:48 +02: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
9febf55f76
Store url relative again, fix 4439
2015-09-23 17:51:41 +02:00
c1e60a0abd
Ensure the bin directory exists before checking empty
...
Line 130 has similar logic so avoided doing the check withiin `isDirEmpty()`
2015-09-23 13:46:35 +01:00
41a87a3ae7
Adjust file path output, refs #4379
2015-09-23 00:41:24 +01:00
9b61b808ec
Merge remote-tracking branch 'javihgil/master'
2015-09-23 00:32:26 +01:00
80f1e4372a
Remove empty bin dir after all binaries have been removed from it, fixes #3451
2015-09-22 23:54:43 +01:00
9f2e562e48
Add --strict flag to validate command to treat warnings as failures as well, refs #3202
2015-09-20 19:44:55 +01:00
ae23979dfa
Add validation warning for prs-0/4 definitions without namespace prefix, refs #3202
2015-09-20 19:29:53 +01:00
e61b3a6370
Allow the validate command to validate dependencies with -A/--with-dependencies, refs #3202
2015-09-20 19:29:04 +01:00
ed95448523
URL-encode dollar signs to work around bad proxy failures
2015-09-20 18:26:23 +01:00
1e8d7255b7
Fix access to undefined var, refs #4422
2015-09-20 17:39:00 +01:00
8f44f9cc67
Merge pull request #4422 from dennisbirkholz/wildcard-repositories
...
Enable wildcards in path names for path repositories
2015-09-20 16:41:02 +01:00
8913ac2fff
Merge pull request #4362 from bd808/classmap-authoritative-cli
...
Add cli argument for classmap-authoritative
2015-09-20 16:00:21 +01:00
681e543793
Make check more obvious
2015-09-18 17:55:07 +02:00
6b1c9882dd
Replace tracking variable with direct package count check
2015-09-18 17:26:31 +02:00
9e67bc761b
Merge pull request #4131 from ammmze/artifact-follow-symlink
...
Follow symlinks when searching for artifacts
2015-09-18 15:32:06 +01:00
5736a59fe3
Merge pull request #4428 from webfactory/update-source-type-and-ref
...
Update source type and reference along with URLs
2015-09-18 15:02:05 +01:00
3c08318ea0
Add test
2015-09-18 15:31:54 +02:00
2fb7dd881a
Fix missing trailing / in repository paths
2015-09-18 15:03:15 +02:00
3ef222c920
Make repository path absolute (again)
2015-09-18 15:01:06 +02:00
973491b65d
Fix docblock, path names returned by glob() are not necessary absolute
2015-09-18 14:31:42 +02:00
19146d1cec
Docblock fix as suggested by @alcohol
2015-09-18 14:26:01 +02:00
f96ec35c1d
Merge pull request #4423 from dennisbirkholz/minor-changes
...
Fix check for flag in case RELATIVE_PATHS should be changed somehow
2015-09-18 13:10:05 +01:00
2db52ebeba
Also update source type and reference when changing URLs
2015-09-18 12:04:21 +02:00
0cbf679f21
Avoid failing to write the lock file if a lock file is present but corrupt/conflicted
2015-09-17 14:46:19 +01:00
f6d5d65bcd
Use shortest relative paths for symlinks
2015-09-16 10:06:32 +01:00
c06edd61e4
Fail if no repository was found
2015-09-15 18:28:17 +02:00
e4435790a4
Documentation
2015-09-15 17:39:55 +02:00
1d7fa565e6
Fix check for flag in case RELATIVE_PATHS should be changed somehow
2015-09-15 17:33:31 +02:00
4209fd2e4a
Store correct url for package, not original url containing wildcards.
2015-09-15 17:27:36 +02:00
323537ad0f
Allow wildcards in repository path names.
2015-09-15 16:41:07 +02:00
7267b2ed90
Merge pull request #4418 from olvlvl/olvlvl-optimize-getio
...
Optimized this->getIO()
2015-09-14 15:48:45 +01:00
d0a9550dea
Uses `realpath` to fix relative path issues
2015-09-14 15:20:06 +01:00
cc522c20bb
Optimized this->getIO()
2015-09-14 14:30:26 +02:00
a3f5f60359
Update output to have a coherent one
2015-09-14 10:18:55 +01:00
0e8c5fa62e
Store path from composer.json with the `path` repository to ensure lock file to be reused
2015-09-14 10:18:46 +01:00
66acee7feb
Add config.platform to the list of locked properties
2015-09-12 23:04:37 +01:00
74e56fd5c6
Merge remote-tracking branch 'szeber/master'
2015-09-12 22:53:27 +01:00
6508dc4322
Allow packages with only a dist ref to be force updated when the dist ref changes
2015-09-12 22:29:19 +01:00
89c6a68a76
Updates to path repository and path downloader, refs #4365
2015-09-12 22:28:03 +01:00
3a79313b63
Merge remote-tracking branch 'sroze/feature/path-repository'
2015-09-12 21:05:12 +01:00
afd98b74f1
Fix handling of www.github.com in GitHubDriver, fixes composer/packagist#572
2015-08-31 10:58:50 +01:00
dd7243fc01
Archive command shows created package path
2015-08-26 13:08:40 +02:00
6c16153302
Added repository tests
2015-08-25 22:06:48 +01:00
62630e5c69
Fix strict comparison of the content hash
2015-08-21 16:55:44 +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
71cb587611
Add autoloader cli options to `require` and `remove`
...
Update the `composer require` and `composer remove` commands to support
the `--optimize-autoloader` and `--classmap-authoritative` cli options
and associated configuration settings. All cli entry points that invoke
`Installer::run()` or `AutoloadGenerator::dump()` now have consistent
support for these autoloader optimization flags.
2015-08-19 22:18:54 -06:00
cc2b9cfca5
Add cli argument for classmap-authoritative
...
Add a `--classmap-authoritative (-a)` argument to `composer install`,
`composer update` and `composer dumpautoload`. This enables the same
authoritative classmap behavior as the existing `classmap-authoritative`
configuration setting. The option can be used for creating highly
optimized production autoloaders via `composer install --no-dev
--optimize-autoloader --classmap-authoritative` for projects where
multiple autoloaders are present and unnecessary `file_exists` calls
introduce performance issues.
Closes #4361
2015-08-19 22:18:54 -06:00
e873438dbd
Merge branch 'master' of github.com:composer/composer into 4254-remove-autoload_files.php-when-needed
2015-08-19 15:08:57 +08:00
154092ba1a
Added removing file 'include_path.php' (if it is empty).
2015-08-19 15:08:27 +08:00
4ab123291d
Add missing licence in VersionGuesser
2015-08-18 15:10:59 +01:00
623f31fcc4
Use version guesser to get local package version
2015-08-18 15:08:27 +01:00
5261a5fa03
Move version guessing in `VersionGuesser` class
2015-08-18 14:58:18 +01:00
ead68d3d49
Create the path repository and downloader
2015-08-18 14:40:48 +01:00
457bc20c34
Explicit comparison was removed.
2015-08-18 16:10:59 +08:00
cca42ff0be
Fixed indents: we should use spaces instead tabulation.
2015-08-18 15:29:22 +08:00
9859859f10
Add comment, fixes #4145
2015-08-17 15:57:00 +01:00
abfe54f334
Add missing PHPDoc
...
Conflicts:
src/Composer/Installer.php
2015-08-17 15:55:09 +01:00
6ce9d2e152
Remove useless variable, method return void!
2015-08-17 15:52:30 +01:00
4fa1cb2e9c
Removing file autoload_files.php was added ( #4254 )
2015-08-15 16:12:16 +08:00
3c5f3e6dc7
Warn if cache isnt writable as well
2015-08-14 13:30:42 +01:00
61dc752c78
Warn if cache directory cannot be created
...
closes #1161
2015-08-14 14:21:12 +02:00
593af4b1bf
add license file during autoload dumping
...
closes #4288
2015-08-14 12:00:21 +02:00
a979cc78ed
Suppress warnings on touch() failures of the vendor dir, refs #4070
2015-08-11 11:20:39 +01:00
cedbe7f1a0
Bump vcs verbosity output to very verbose, refs #4330
2015-08-10 12:58:58 +01:00
0457ec6fb3
Remove deadcode, fixes #4345 , fixes #4268
2015-08-10 12:42:51 +01:00
812523f1ab
Add more debug info on cache write failure, refs #4249
2015-08-10 10:07:48 +01:00
65bb8d99f4
Fix global switch regression on config command, fixes #4344
2015-08-10 08:35:31 +01:00
5a26b7c102
Merge pull request #4299 from webberwu/master
...
show change if package directory have changed to symbolic link
2015-08-10 01:17:02 +01:00
4824b4504e
Remove typo
2015-08-10 01:05:32 +01:00
33badac0a8
Include full error message in debug mode
2015-08-10 00:57:13 +01:00
b16c5fbeb9
Shorten ternary and reuse config file instead of the null argument to figure out path to auth.json
2015-08-10 00:56:55 +01:00
cdeb7621ba
Merge remote-tracking branch 'Tehem/issue-4302'
2015-08-10 00:52:39 +01:00
a782dab2cd
Merge remote-tracking branch 'iamluc/git-diff'
2015-08-09 23:26:55 +01:00
bd23ce672a
Merge pull request #4324 from MalteWunsch/getCanonicalPackages-with-different-versions
...
Improve documentation for WritableRepositoryInterface::getCanonicalPackages
2015-08-09 17:36:21 +01:00
d02ab54be1
Add a new option to view local modifications (git diff)
2015-08-09 17:30:32 +02:00
fbae6b1589
Revert "Merge pull request #3975 from marc-mabe/hotfix/3974"
...
This reverts commit bdb6ecb29e8a12e50a16
2015-08-04 10:34:54 +02:00
70ff00c9de
Reverted inadvertent API change, improved API documentation
2015-08-04 09:32:23 +02:00
9e592f19a1
Used shorthand version for ternary operator
2015-08-03 23:36:05 +02:00
767279b41a
getCanonicalPackages returns packages with same name in different versions
2015-08-03 18:28:04 +02:00
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
51ef7b5eef
instead of generic be more verbose about possible causes
2015-07-31 10:01:58 +02:00
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
9392adef79
Fixes #4302 allow COMPOSER env with config statements (overrides --file)
2015-07-28 00:01:01 +02:00
92530e374b
Merge remote-tracking branch 'upstream/master'
2015-07-26 12:33:39 +08:00
87c16073ec
Merge branch 'master' of https://github.com/composer/composer into feature-bin-compat
2015-07-22 15:54:20 +02:00
e8a6cb536b
Change detection of config/cache/data dirs
2015-07-22 10:38:12 +02:00
00c26791fa
Merge pull request #4264 from alcohol/use-composer-spdx
...
remove spdx files, introduce external library
2015-07-20 18:29:14 +01:00
bbf959ac34
Do not retry failures once degraded mode is already enabled
2015-07-20 17:44:03 +01:00
ff84b32097
Add degraded mode to try and bypass ipv6/gzip issues, refs #4142 , refs #4121
2015-07-20 17:33:53 +01:00
2553f5f7d4
throw error when file is loaded
2015-07-20 12:10:30 +02:00
56f0d82207
get resources dir from spdxlicenses
2015-07-20 11:42:20 +02:00
616585e0cc
spdxlicense extends spdxlicenses, add depr error
2015-07-16 13:21:18 +02:00
1f006a499e
updated compiler class to include spdx sources
2015-07-16 12:03:34 +02:00
5ae9e7fe22
remove spdx files, introduce external library
2015-07-16 11:42:12 +02:00
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
7e0db8aa46
Merge pull request #4239 from naderman/memory-rules
...
Reduce memory usage of Rule objects
2015-07-14 13:34:24 +01:00
cf1af58514
Use bitwise operators directly in rules instead of get/set Bitfield
2015-07-14 14:24:18 +02:00
ccaba0d2f7
Make static translation tables in version constraint private and use ===
2015-07-14 14:12:19 +02:00
c36d2a2e50
Merge pull request #4214 from legoktm/parse-links
...
Move VersionParser::parseLinks() to ArrayLoader::parseLinks()
2015-07-13 14:28:10 +01:00
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
acc11f63c5
Merge pull request #4234 from naderman/rule-hash-int-size
...
Reduce rule hash size
2015-07-12 16:25:14 +01:00
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
5828f6202d
Enhancement: Also validate lock file
2015-07-10 18:07:40 -04:00
de65199f31
Merge pull request #4117 from stof/patch-1
...
Optimize the regex detecting timestamps
2015-07-09 21:17:24 +02:00
956035e641
Remove the unnecessary return statements from setters
2015-07-09 19:40:03 +02:00
f535542fca
Use constants with names for bitfield offsets
2015-07-09 18:59:16 +02:00
329ab5cf41
Rename blob rule property to bitfield
2015-07-09 18:48:50 +02:00
961ea868ac
Use an integer bitfield for rule properties instead of a string binary blob
2015-07-09 18:26:31 +02:00
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
3fd4672382
VersionParser: Append elements directly instead of array_merge
2015-07-09 12:57:34 +02:00
c7e1f49e78
Rule hashes are only used in the rule set, so no need to store them
2015-07-08 19:11:59 +02:00
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
5b1b96b61e
Output the number of rules used in the solver for profiling purposes
2015-07-08 17:57:23 +02:00
e88df7429f
Remove a few hundred/thousand array_merge calls
2015-07-08 13:36:19 +02:00
8dd110e0a9
Remove unnecessary version comparison cache variable and store operators as int
2015-07-08 13:13:47 +02:00
07e1d227c9
Output the size of the pool after dependency resolution for users
2015-07-07 15:40:26 +02:00
22737e31a7
Merge pull request #4213 from legoktm/stabilities
...
Don't use BasePackage::$stabilities in VersionParser
2015-07-07 13:45:55 +02:00
a8d71be0ef
Add event name in verbose mode, refs #4123
2015-07-04 12:15:04 +01:00
852e4f4e26
Merge remote-tracking branch 'alcohol/output-script-command-in-verbose-mode'
2015-07-04 12:11:18 +01:00
0964c02acb
Use only one level of verbosity
2015-07-04 12:02:57 +01:00
5ba41514a9
Merge remote-tracking branch 'alcohol/add-suggests-command'
2015-07-04 11:58:58 +01: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
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
2438105e11
Merge pull request #4086 from legoktm/format-version
...
Move VersionParser::formatVersion() to BasePackage::getFullPrettyVersion()
2015-07-04 00:55:50 +01:00
e2b2f450dc
Merge pull request #4144 from staabm/patch-2
...
Dropped unnecessary break statements
2015-07-03 21:49:05 +01:00
9b3e8b963e
Merge pull request #4143 from staabm/patch-1
...
Dropped obsolete condition
2015-07-03 21:48:39 +01:00
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
4019f7bb44
Revert "apply a regex solution instead of tokenizer"
...
This reverts commit 33a7305e22c8d4e2ce38586855fd3d4b7b2af3dd.
2015-07-03 12:22:16 +02:00
b5d286e27b
apply a regex solution instead of tokenizer
2015-07-03 12:22:16 +02:00
e4118385a0
updated spdx related files
2015-07-03 12:22:16 +02:00
c5afb8f23a
Mark VersionParser::formatVersion() as deprecated
...
With 1753c275ff
2015-07-02 00:07:04 -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
8775c94895
Merge pull request #4196 from localheinz/fix/namespace
...
Fix: Import Symfony\Component\Finder\Finder
2015-07-01 10:29:53 +01:00
962f5a99ea
Fix: Import Symfony\Component\Finder\Finder
2015-06-30 21:03:59 -04:00
42b025776a
Move file identifier calculation to compile time
2015-06-30 09:22:51 -07:00
79f9158fb2
Merge pull request #4192 from localheinz/fix/import
...
Fix: Add missing imports
2015-06-30 15:38:46 +01:00
6a64041055
CS fixes
2015-06-30 15:38:32 +01:00
4d36622ada
Merge pull request #4191 from localheinz/fix/docblock
...
Fix: Docblock
2015-06-30 15:25:49 +01:00
70f5150893
Merge pull request #4190 from localheinz/fix/unused-private-property
...
Fix: Remove unused private property
2015-06-30 15:14:03 +01:00
4307031e9b
Merge pull request #4189 from localheinz/fix/unused-imports
...
Fix: Remove unused imports
2015-06-30 15:13:46 +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
b17ccbfa0d
Avoid invalid warnings when scanning the same file twice, fixes #4195 , fixes #4197
2015-06-30 13:27:28 +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
12ffe2b4d4
Fix: Add missing imports
2015-06-28 23:37:40 -04:00
e184118d76
Fix: Docblock
2015-06-28 23:28:45 -04:00
3854d2d457
Fix: Remove unused private property
2015-06-28 23:25:55 -04:00
eac5fbdee4
Fix: Remove unused imports
2015-06-28 23:20:54 -04:00
24c4322672
Use 5.3 compatible array syntax
2015-06-28 13:47:00 -07:00
868a872df2
Push the hash to $GLOBALS
2015-06-28 13:44:43 -07:00
61ed7a9547
Explicitly check if a file has already been required before requiring it
2015-06-27 14:05:59 -07:00
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
3dffdc8705
don't suggest packages already installed
2015-06-24 11:06:21 +02:00
fd34c5883a
added php script handler info as well
2015-06-24 09:21:36 +02:00
680082c5fe
output based purely on verbosity
2015-06-23 22:46:16 +02:00
33f78b2ccc
limit suggestions to optional list of packages
2015-06-23 22:46:16 +02:00
760eeb0b03
reworked suggests command
2015-06-23 22:46:16 +02:00
f1af16984e
[Command] Add suggests command
2015-06-23 21:04:20 +02:00
7d63eb5718
Merge remote-tracking branch 'parent/master'
...
Conflicts:
doc/04-schema.md
2015-06-23 14:19:12 +02:00
d0ff01698d
Fix outdated comment
2015-06-20 12:58:19 +01:00
d5bdf4be28
Update URLs for bitbucket as well
2015-06-19 23:23:48 +01:00
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
1ff2a02517
fix to download correct Bitbucket archive reference when using --prefer-dist
2015-06-19 15:07:16 +02:00
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
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
c8eca6f198
Remove pool usage from ArchiveCommand
2015-06-18 17:45:37 +01:00
801a7fcd0a
Add support for constraints and not just exact versions in RepositoryInterface::findPackage/s
2015-06-18 17:44:58 +01:00
049f84f21f
Remove unnecessary Pool usage in HomeCommand
2015-06-18 16:33:30 +01:00
75c501251d
Revert "Merge remote-tracking branch 'naderman/load-no-providers'"
...
This reverts commit 3e85f82373b025d0982b
2015-06-18 15:40:27 +02:00
74e7c5fe22
Merge remote-tracking branch 'legoktm/publish-name'
2015-06-18 11:40:48 +01:00
3e85f82373
Merge remote-tracking branch 'naderman/load-no-providers'
2015-06-18 11:32:37 +01:00
b025d0982b
Remove some state
2015-06-18 11:12:57 +01:00
25ab752ca6
Map archive command to the archive configuration
2015-06-17 20:53:09 +02:00
1eec4fdfa5
Add archive configuration default values
2015-06-17 20:53:09 +02:00
e73448ae1e
Add possessive quantifiers to avoid backtracking and fix segfault on large files, fixes #4153
2015-06-16 11:22:45 +01:00
9b50ca0161
Add the extra attribute to the content hash
2015-06-15 11:31:33 +02:00
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
94a924b702
Dropped unnecessary break statements
...
Next line breaks nevertheless
2015-06-14 10:16:45 +02:00
a4ad3c2146
Dropped obsolete condition
...
The conditional a few lines above already checks for `bytesMax > 0`
2015-06-14 10:13:18 +02:00
3e0219c438
Change the content hash to be only based on values that affect dependency resolution
2015-06-13 10:15:56 +02: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
89540c5690
Support bg colors and more clearing values in html output formatter
2015-06-12 17:23:18 +01:00
29dbc3835f
Fix html output formatter to work with latest symfony console
2015-06-12 17:10:19 +01:00
6c029a850c
Resolves #4138 : Removed *Test.php filtering from AutoloadGenerator->dump()
2015-06-12 10:52:55 -05:00
6d15ad08b6
Add http check even if openssl is present, refs #4084
2015-06-11 19:20:09 +01:00
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
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
c471edc488
Also downgrade provider access and others
2015-06-11 11:22:19 +01:00
38bc4e6a78
Added Ctrl+C support to create-project command for unix-like systems
2015-06-11 13:02:33 +03:00
5146085dc2
Follow symlinks when searching for artifacts
2015-06-10 11:46:08 -07:00
9223f4a208
show command by default
2015-06-09 14:02:51 +02:00
cbd61660ab
implemented verbose output
2015-06-09 09:02:43 +02:00
12c833864c
Revert converting `1.0.0` to `^1.0`.
2015-06-08 22:45:20 +01:00
8b28d4bc82
Optimisation: Composer repo version listings are index by package name
2015-06-08 18:50:15 +02:00
65243ca392
Move methods for PR readability and fix phpdoc
2015-06-08 18:45:03 +02:00
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
a014a2f803
Optimize the regex detecting timestamps
...
Using a possessive quantifier avoids useless backtracking.
2015-06-07 10:38:27 +02:00
7351136205
Merge pull request #4105 from gmsantosxl/master
...
Remove extra '/' when findShortestPath $from is a directory
2015-06-05 13:18:07 +01:00
dfbee6a532
cleaner solution
2015-06-05 13:04:56 +02:00
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
a060c536bb
Remove extra '/' when findShortestPath $from ends with '/'
2015-06-04 14:44:09 -03:00
84c9c30b63
Remove extra '/' when findShortestPath $from is a directory
2015-06-03 16:48:01 -03:00
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
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
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
ec00a4dbfa
Set the platform overrides first
2015-06-03 00:06:24 +01:00
a747b293b3
Merge remote-tracking branch 'upstream/master' into override_init_array
2015-06-03 00:04:19 +01:00
4fd9a3ceee
compare against correct format
2015-06-02 19:59:38 +01:00
994b1324bc
fix alignment
2015-06-02 19:58:21 +01:00
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
0f04f97088
Fixed failing testcase
2015-06-02 15:15:30 +02: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
46e0a506b9
Added another testcase + fix
2015-06-02 14:20:48 +02:00
a0ca1d4d96
Consider 0 as part of a version
2015-06-02 14:14:29 +02:00
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
0ec86be5e9
Merge remote-tracking branch 'origin/master'
2015-05-31 12:54:08 +01:00
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
ce0f617ee1
Merge pull request #4083 from nevvermind/php-dox
...
Added phpdocs + change to yoda comparison
2015-05-31 12:45:02 +01:00
1753c275ff
Handle deprecation notices softer
2015-05-31 12:26:57 +01:00
8e79a3766d
Added phpdocs + change to yoda comparison
2015-05-30 01:38:14 +01:00
b181822e90
Fix case where touch() fails due to incorrect ownership, fixes #4070
2015-05-28 15:26:56 +01:00
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
69210d5bc1
Move deprecation notice where it belongs, closes #4065
2015-05-25 14:29:26 +01:00
98b339e87a
Make --keep-vcs imply --prefer-source, closes #4063
2015-05-25 11:28:07 +01:00
e51ff60f59
[Pear] replaces "licence" to "license".
2015-05-08 06:42:59 -04:00
4d5d524704
Clear stat cache after a git failure as it might have modified the filesystem
2015-05-07 16:28:18 +01:00
52d290f5f2
trim token just in case and update tests
2015-05-07 00:37:08 +01:00
41f4451c20
take care of retry-auth-failure:false in case of 403 as well
2015-05-07 00:29:45 +01:00
e16d53893e
Remove password prompt for github tokens and require the user creates a token themselves
2015-05-07 00:29:20 +01:00
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
63e96a41f8
Add proper docblocks in composer repo
2015-05-05 20:30:57 +02:00
cfd0e44312
Move private function further down in pool
2015-05-05 20:28:22 +02:00
aa7d145dd0
PHP 5.3 compatible function invokation
2015-05-05 20:24:04 +02:00
29ca21f30e
PHP version checks tweaking
2015-05-05 20:18:24 +02:00
ec5416f03c
loadDev parameter is nonsense, properly load packages in create command
2015-05-05 19:58:03 +02:00
da02c53540
Update the composer repository whatprovides test to a loadrecursively test
2015-05-05 19:44:07 +02:00
b99c03ea04
Entirely remove whatProvides from Composer repository
2015-05-05 19:28:15 +02:00
090711b21c
Completely move loading of packages from composer repo to pool
2015-05-05 19:08:33 +02:00
13a3349603
Merge pull request #3967 from xi-ao/master
...
Fixed svn update command
2015-05-05 18:07:08 +01:00
2e99b9fdf5
Use https where possible
2015-05-04 19:37:57 +02:00
9b9ad9d0fe
Remove dead code paths and use exceptions instead of die
2015-05-04 17:34:41 +02:00
65f69c4227
Remove debug output
2015-05-04 17:28:03 +02:00
4d0db5add6
POC Implementation of loading only explicitly named package data
2015-05-04 17:25:55 +02:00
d426246b80
Update only github dist URLs, refs #3985
2015-05-01 16:26:59 +01:00
ab02867015
Use natural sort to sort packages, refs #3872
2015-05-01 16:16:02 +01:00
06fb00bfe5
Fix handling of platform packages to be future proof, refs #3872
2015-05-01 16:14:17 +01:00
081e26f4d7
Merge remote-tracking branch 'localheinz/feature/sort-packages'
2015-05-01 16:08:57 +01:00
b7c827c2e5
Use external lib for hidden cli prompting
2015-05-01 15:50:01 +01:00
2a48b0faa0
Make autoloader suffix a reproducible value as well, refs #3927
2015-05-01 14:32:32 +01:00
164dc2a097
Reuse prefix only if no prefix is defined
2015-05-01 14:23:20 +01:00
facdd8a503
Add phar-utils package to update timestamps after the build is done, refs #3927
2015-05-01 13:50:16 +01:00
ebffb3c179
Move improvements towards reproducible builds, refs #3927
2015-05-01 11:54:55 +01:00
92785ac677
Make builds more reproducible, refs #3927
2015-05-01 11:21:44 +01:00
6199488644
Merge pull request #3989 from WyriHaximus/master
...
Replaced <error> with <warning> for abandoned package messages
2015-05-01 10:17:30 +01:00
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
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
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
9455c49053
fixes #3974 : Autoloader have to distinguish between files and directories
2015-04-30 19:17:19 +02:00
8a12e50a16
Merge pull request #3983 from alcohol/upgrade-dialoghelper
...
Upgrade DialogHelper to QuestionHelper
2015-04-30 17:10:26 +01:00
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
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
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
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
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
b4ed331168
The Solver Request no longer depends on the Pool
2015-04-30 17:24:24 +02:00
acd1486406
Mark method as @private
2015-04-30 12:35:25 +02:00
e810a7913e
Space after ? (so it doesnt glue answer to ?)
2015-04-30 12:29:19 +02:00
0fbc00f3fb
Switch to QuestionHelper
2015-04-30 12:23:13 +02:00
290fafa156
Docs and whitespace
2015-04-30 12:22:54 +02:00
bef46a17dc
Moved method
2015-04-30 12:22:09 +02:00
3dae4cd517
Switch to QuestionHelper
2015-04-30 12:20:32 +02:00
00fcd63c04
Remove redundant helper
2015-04-30 12:17:56 +02:00
e7c044d4b2
Remove dead code
2015-04-30 12:17:14 +02:00
fb5394ce70
Use constants directly
2015-04-30 12:17:13 +02:00
7279c25839
Switched to QuestionHelper
2015-04-30 12:17:13 +02:00
ee4044efcd
Adjusted interface to reflect values from Console
2015-04-30 12:17:13 +02:00
d6620195e5
Prioritize repository over package versions in the default policy, fixes #3509
2015-04-30 10:43:04 +01: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
fa398e14c7
Fix indent detection in json files when an empty line starts the object
2015-04-29 22:42:57 +01:00
32a479a1e7
Fix subkey manipulation when the main key does not exist yet
2015-04-29 22:42:41 +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
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
fd7e28b8b4
Restore special handling of conflict/provide/replace
2015-04-29 20:57:00 +01:00
b02bdb4c7a
[alias] RootAliasPackage manages the requirements correctly
2015-04-29 20:56:58 +01:00
a811142ff2
Merge pull request #3978 from marc-mabe/hotfix/3976
...
fixes #3976 : drop ext/ctype dependency
2015-04-29 20:38:10 +01:00
Jordi Boggiano