1
0
Fork 0
Commit Graph

5143 Commits (5601f07bfadc2359c53f9fa92f96d5249120188d)

Author SHA1 Message Date
Jordi Boggiano 8ad6385ffb Merge remote-tracking branch 'fabpot/more-debug' 2016-11-06 18:18:52 +01:00
Jordi Boggiano f3af3da16f Add more comments in ConsoleIO, closes #5836 2016-11-06 18:16:45 +01:00
Jordi Boggiano 43903a3979 Merge branch '1.2' 2016-11-06 17:38:53 +01:00
Jordi Boggiano 027de2960b Merge pull request #5794 from andrewjt71/issue-5769
Issue 5769 dev mode varaible
2016-11-06 16:58:41 +01:00
Jordi Boggiano 9801d831ed Merge pull request #5852 from fabpot/io-fix
Remove usage of echo when executing Composer script
2016-11-06 16:49:08 +01:00
Jordi Boggiano d6499b7c4a Merge pull request #5748 from kassner/hgdriver-bitbucket
HgDriver does not identify bitbucket mercurial repos correctly
2016-11-06 12:36:13 +01:00
Fabien Potencier 103624d4ed Remove usage of echo when executing Composer script 2016-11-05 22:10:39 -07:00
Mark Ingman 98d2fcb4d8 Fixing local file VCS URLs with encoded characters
realpath() returns FALSE for paths with URL encoding like %20, and
decoded path needs file:/// reapplied.
2016-11-03 21:38:14 +00:00
Mark Ingman 98ba6d8bf4 Fixing empty VCS URL for file:/// paths with spaces
realpath() returns FALSE for fFile paths with URL encoding like %20 for
spaces.
2016-11-03 17:37:14 +00:00
Jordi Boggiano 208086d8e3 Merge remote-tracking branch 'channelgrabber/GitSpeedIncrease' 2016-11-03 12:08:28 +01:00
Jordi Boggiano a1e81c38f9 Merge branch '1.2' 2016-11-03 12:05:14 +01:00
Jordi Boggiano f320c67534 Avoid choking on non-string constraints, fixes #5807 2016-11-03 12:05:07 +01:00
Jordi Boggiano 66bb195233 Add zlib warning to diagnose command 2016-11-03 11:09:37 +01:00
Jordi Boggiano 9c8617cd33 Merge branch '1.2' 2016-11-03 11:05:42 +01:00
Jordi Boggiano 0f455be01c Add CI flag in UA header 2016-11-03 11:00:40 +01:00
Jordi Boggiano e38ebefc7e Update packagist default repo to be packagist.org 2016-11-03 11:00:40 +01:00
Jordi Boggiano f7475c6ff6 Merge pull request #5830 from fabpot/logic-refactoring
Refactor some common logic in Command classes
2016-11-03 10:58:19 +01:00
Jordi Boggiano 9cf93b0c88 Merge pull request #5824 from fabpot/small-refacto
Code simplification
2016-11-03 01:01:45 +01:00
Fabien Potencier 07cbb73184 fixed deprecated class usages 2016-10-31 06:57:17 -07:00
Fabien Potencier 5d742fd38b Fix POST_DEPENDENCIES_SOLVING trigger 2016-10-31 06:54:38 -07:00
Fabien Potencier 69740bbbee Refactor some common logic in Command classes 2016-10-30 14:50:44 -07:00
Fabien Potencier 57ec0d1815 added more information in the output 2016-10-29 11:37:23 -07:00
Fabien Potencier b823242ae3 Code simplification 2016-10-28 12:21:32 -07:00
Jordi Boggiano d4547fba06 Merge pull request #5804 from msiebeneicher/bugfix/fix_rename_usage_in_archive_manager_for_v1_2
fixed direct rename() usage for v1.2
2016-10-27 10:14:20 +02:00
Niels Keurentjes 6de7feeb86 Fix crash when listing root package without versions
When using certain parameters together in 'composer show', specifically '-s --outdated', the root package itself is inspected for its latest version. If the git repository it belongs to does not have any tags yet this would return FALSE, while the next call to printMeta requires a PackageInterface or NULL, causing a crash.

Refs #5808
2016-10-25 09:54:03 +02:00
Martin Hasoň 2b67a9044e Fix class in DocBlock 2016-10-24 12:31:27 +02:00
Richard Heelin 5dfd23668e Only update the git repo if the commit we want doesn't exist, speeds up update from source 2016-10-21 15:17:55 +01:00
msiebeneicher 800a4bf391 fixed direct rename() usage for v1.2 2016-10-21 13:57:02 +02:00
Andrew Taylor ce6a3c0dd7 Issue 5769 dev mode varaible 2016-10-18 22:56:32 +01:00
Nils Adermann 66efc9af86 Merge pull request #5785 from nicolas-grekas/perf
Enhance performance by removing count() from Solver's main loop
2016-10-14 16:31:13 +02:00
Nicolas Grekas daf84bea33 Enhance solver perf by removing count() 2016-10-14 15:56:18 +02:00
Nicolas Grekas bfbcf03a6b Fix ShowCommand 2016-10-14 13:18:15 +02:00
Jordi Boggiano 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
Jordi Boggiano 96bf605b31 Merge pull request #5779 from Koc/implode
Use implode instead of join
2016-10-12 16:44:00 +02:00
Nils Adermann ad41c324d3 GitHub integrations generate access tokens containing a dot 2016-10-12 11:36:01 +02:00
Konstantin.Myakshin dc70b40d34 Use implode instead of join 2016-10-11 16:52:29 +03:00
Jordi Boggiano 41c3307fc5 Merge branch '1.2' 2016-10-10 18:52:20 +02:00
Jordi Boggiano f23cdf59e3 Make remove command case insensitive, fixes #5754 2016-10-10 18:45:33 +02:00
Jordi Boggiano d1867d5859 Merge branch '1.2' 2016-10-10 18:21:22 +02:00
Jordi Boggiano 5ee22f25ba Rework JSON matching to use a properly recursive pattern, fixes #5771 2016-10-10 18:20:53 +02:00
Jordi Boggiano 6370efd1f1 Merge pull request #5776 from dunglas/remove_unused
Remove unused variable
2016-10-10 14:47:50 +02:00
Jordi Boggiano 183398fe5e Merge pull request #5717 from berlinger-rarents/fix/5584_anon_redirect_bitbucket
prevent (prompt for) bitbucket auth when it redirected
2016-10-10 14:11:24 +02:00
Jordi Boggiano c0e28a9043 Remove static/public method 2016-10-10 14:03:30 +02:00
Kévin Dunglas 3e3fd3c6b1
Remove unused variable 2016-10-09 22:40:30 +02:00
Jordi Boggiano c540dace8c Merge pull request #5765 from fabpot/remove-obsolete-code
removed obsolete code
2016-10-08 11:28:19 +02:00
Jordi Boggiano 4cd6eabdba Merge branch '1.2' 2016-10-08 11:27:52 +02:00
Fabien Potencier b502a35fc1 added missing var declaration 2016-10-07 11:38:36 -07:00
Fabien Potencier 2853e82400 removed obsolete code 2016-10-06 11:56:54 -07:00
Rob Bast 64317e1ff8
bring arraydumper in line with json schema spec and packagist 2016-10-04 13:15:09 +02:00
Nils Adermann 23d2e5600a Merge pull request #5738 from Toflar/reduce-hashing-calls
Reduce calls on Rule::getHash()
2016-10-04 12:20:39 +02:00
Yanick Witschi 7b5fe5c7d4 CS 2016-10-04 10:40:18 +02:00
Rafael Kassner 44634a689d HgDriver does not identify bitbucket mercurial repos correctly 2016-10-03 13:17:07 +02:00
Jordi Boggiano 1c34248022 Check that PHP_ZTS is defined 2016-10-01 13:03:15 +02:00
Jordi Boggiano 9b08ee48db Update platform package regex 2016-10-01 13:01:47 +02:00
David Zuelke 19126d76a6 unify php-* package description grammar 2016-09-30 23:12:13 +02:00
David Zuelke a26c03eef0 add php-zts virtual platform package 2016-09-30 23:12:13 +02:00
David Zuelke 0f68c01094 add php-debug virtual platform package 2016-09-30 23:12:13 +02:00
Yanick Witschi a9e88a27b3 CS 2016-09-30 17:40:28 +02:00
Yanick Witschi 4a769a785c Reduce calls on Rule::getHash() 2016-09-30 17:25:41 +02:00
Roel Arents 489a8f3d5a revert to simply making an exception (no acces_token) for bitbucket/user/repo/downloads URLs
[#5584]
2016-09-29 21:16:47 +02:00
berlinger-rarents 5123c5cf76 remove redundant truth check 2016-09-29 10:55:14 +02:00
Jordi Boggiano b6cc2c7b83 Merge pull request #5665 from radmiraal/default-strategy-from-environment
Allow setting default transport strategy for path repositories
2016-09-29 08:41:11 +02:00
Jordi Boggiano 0c4cae056f Simplify code 2016-09-29 08:40:03 +02:00
Jordi Boggiano 902a5c32db Add bug ref 2016-09-29 08:06:44 +02:00
AnrDaemon c774d41a9c Fix realpath() failing on Windows 2016-09-29 08:05:55 +02:00
berlinger-rarents 8845ea467a try bitbucket downloads first time without auth
also add tests for #5584
2016-09-28 19:08:24 +02:00
Rob Bast 710bb0d008
fix based on test, fixes #5724 2016-09-27 17:39:44 +02:00
Rob Bast e60eff5f2e
apply patch 2016-09-27 14:45:33 +02:00
berlinger-rarents 64fc8ffe3d prevent (prompt for) auth for bitbucket public downloads
#5584
2016-09-27 11:41:16 +02:00
berlinger-rarents a4e3e1b584 prevent (prompt for) bitbucket auth when it redirected
#5584
2016-09-26 19:47:10 +02:00
Rens Admiraal a294af3f16 Allow setting default transport strategy for path repositories
This change allows setting COMPOSER_MIRROR_PATH_REPOS to 1
in the environment to set the default strategy to 'mirror'.

This allows using 'mirror' during deployments while still symlinking
on a development machine. The default is still overwritten by the
options on the repository configuration.
2016-09-25 19:56:12 +02:00
Jordi Boggiano 3030dab90e Merge branch '1.2' 2016-09-23 16:37:54 +02:00
Ruslan Bekenev 8c1f889806 cut out "file://" from VCS download() method
this issue was happening due to realpath() function
that cannot work with "file://" path.
For local repositories it is valid url but not valid for realpath()
2016-09-23 16:37:32 +02:00
Jordi Boggiano 048a801fce Merge pull request #5698 from johnstevenson/restart2
Simplify XDebugHandler restart process
2016-09-23 16:35:12 +02:00
johnstevenson e9a97004c5 Simplify XdebugHandler restart process 2016-09-23 13:50:54 +01:00
Fabien Potencier e83f7c2929 Fix process timeout when set to 0 2016-09-21 11:48:10 +02:00
Fabien Potencier 2c77fd6801 Fix process timeout when set to 0 2016-09-20 18:25:05 -07:00
Jordi Boggiano b171c24101 Merge branch '1.2' 2016-09-19 18:47:48 +02:00
Jordi Boggiano 8e1b90bc08 Allow reading repo.0 in config command, fixes #5692 2016-09-19 18:47:44 +02:00
Jordi Boggiano 68861c48ed Merge branch '1.2' 2016-09-17 13:27:39 +02:00
Jordi Boggiano 64d29dc6dc Fix regex cleaning up repo URLs, fixes #5686 2016-09-17 13:27:29 +02:00
SpacePossum 2ae0800cd3 Remove useless concat. 2016-09-16 14:50:34 +02:00
Jordi Boggiano ec2660fe78 Fix regex escaping, fixes #5674 2016-09-13 16:18:05 +02:00
Jordi Boggiano 429ee5f8eb Merge branch '1.2' 2016-09-12 22:50:58 +02:00
Jordi Boggiano a2b3e89d56 Make sure php-ipv6 is recognized as a platform package as well 2016-09-12 22:49:44 +02:00
Kamran Ahmed 6990454e56 Minor refactoring - Early exit 2016-09-12 22:39:44 +05:00
Jordi Boggiano 2ffa1148a9 Merge branch '1.2' 2016-09-12 19:06:26 +02:00
Den Girnyk 71e0fba216 Pass devMode from RunScriptCommand to Script\Event 2016-09-12 17:20:51 +02:00
Jordi Boggiano 8de10dd159 Tweak logic in case of dirty state start-up, refs #5668 2016-09-12 16:58:30 +02:00
Jordi Boggiano be727a7a6b Merge remote-tracking branch 'alcohol/fix-5667' 2016-09-12 16:57:13 +02:00
Jordi Boggiano 285c4a1ac6 Merge branch '1.2' 2016-09-12 16:56:32 +02:00
Jordi Boggiano ff7daf0bd4 Fix handling of paths on windows when cwd is root of drive, fixes #5554 2016-09-12 16:56:04 +02:00
Rob Bast cd54fc8a30
better naming (clarity) 2016-09-12 16:22:39 +02:00
Rob Bast 81a34f0cc6
cleanup env that contains previous/old path 2016-09-12 16:20:49 +02:00
Rob Bast 547616e96b
tentative fix for #5667 2016-09-12 16:08:50 +02:00
Jordi Boggiano f78f6c963d Add note about rawurlencode, refs #5503 2016-09-12 14:27:11 +02:00
Calin Marian a888b082b0 Make urlEncodeAll private 2016-09-12 14:26:13 +02:00
Calin Marian 862a13a17e Urlencode Gitlab project names
Url encode all non alphanumeric characters in project name for GitLabDriver.

If the project name has "." characters in it, which is supported in Gitlab, the Gitlab API will 404 when requesting the branches or tags of the repository. This commit urlencodes all non alphanumeric characters in the project name in requests to the Gitlab API.
2016-09-12 14:26:07 +02:00
Jordi Boggiano 754d4fa1b2 Merge branch '1.2' 2016-09-12 11:52:17 +02:00
Jordi Boggiano a04256810e Change exit code to be 1/2 for warn/fail, refs #5601 2016-09-12 11:25:43 +02:00
Jordi Boggiano b29d810d63 Only treat errors as real failures, fixes #5601 2016-09-12 11:00:38 +02:00
Jordi Boggiano cfdeb61779 Avoid warning when testing for packagist over http 2016-09-12 11:00:10 +02:00
Jordi Boggiano 2d8251b7ad Fix handling of local binaries on windows, refs #5612 2016-09-10 12:51:53 +02:00
Jordi Boggiano f63f1ff95f Merge remote-tracking branch 'davidolrik/master' 2016-09-10 12:32:00 +02:00
Jordi Boggiano 9b42f16762 Merge pull request #5575 from admonkey/master
update help page on global for COMPOSER_HOME info
2016-09-10 12:17:45 +02:00
Jordi Boggiano cada55dde6 Merge pull request #5491 from moolex/support_gitlab_private_token
Support gitlab private-token for easier access via Gitlab API
2016-09-10 12:15:35 +02:00
Jordi Boggiano 994211523c Merge remote-tracking branch 'johnstevenson/restart' 2016-09-10 12:09:29 +02:00
Jordi Boggiano 8313e86877 Remove hash from composer.lock as content-hash has been out over a year and since 1.0.0-alpha11, refs #5653 2016-09-10 11:34:47 +02:00
johnstevenson 896d1d71f8 Use ConsoleOutput to determine color support 2016-09-06 14:57:18 +01:00
johnstevenson 4249bd1456 Code review fix and doc comment tweaks 2016-09-05 20:19:12 +01:00
johnstevenson e381abeec0 Simplify argv handling 2016-09-03 19:00:41 +01:00
johnstevenson fe861ac365 Ensure consistent eols in tmp ini 2016-09-03 18:51:26 +01:00
johnstevenson 89d6e6f0bd Fix Windows anniversary update change 2016-09-03 18:50:11 +01:00
Jordi Boggiano 3e010fc332 Merge pull request #5591 from ianlet/master
Use https url of the repository instead of ssh given gitlab project is public
2016-09-02 19:03:55 +02:00
Jordi Boggiano 165ff07146 Merge branch '1.2' 2016-09-02 19:00:31 +02:00
Matthew "Juniper" Barlett 09dad8a018 Clean up regex in InitCommand::parseAuthorString
Per comments:
- https://github.com/composer/composer/pull/5638#discussion_r76972844
- https://github.com/composer/composer/pull/5638#discussion_r76973941
2016-09-02 18:59:20 +02:00
Matthew "Juniper" Barlett ac41bb0615 Fix for issue #5631
- Add " ( and ) as valid characters in author name
- Add relavent unit tests
2016-09-02 18:59:10 +02:00
Jordi Boggiano 4861b74d3d Merge pull request #5569 from nicolas-grekas/clean-proc-output
Cleanup processes output handling
2016-09-02 18:52:16 +02:00
Nicolas Grekas f063d28a59 Cleanup processes output handling 2016-09-02 18:44:55 +02:00
Jordi Boggiano ed78253c58 Only update reference if there is actually a reference, fixes #5609 2016-09-02 18:43:44 +02:00
Jordi Boggiano d9d2d11949 Merge branch '1.2' 2016-08-30 15:25:26 +02:00
Nicolas Grekas c6b26c4e96 Make static inlining more selective 2016-08-30 15:25:17 +02:00
Jordi Boggiano edddae42db Revert default change from #5603 2016-08-30 15:20:20 +02:00
John Whitley 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
Jordi Boggiano f3af3ede40 Merge pull request #5552 from fvdb/add-minor-only-option
Added minor-only option to show command to only show packages with minor updates
2016-08-29 19:38:18 +02:00
Jordi Boggiano e29508f823 Merge pull request #5608 from donatj/no-suggest-require
Adds --no-suggest to RequireCommand
2016-08-29 13:31:09 +02:00
Jordi Boggiano 6f7389e911 Revert default change from #5603 2016-08-26 11:32:58 +02:00
Frank van den Brink e60a7216c6
Clarified minor-only option description 2016-08-26 10:47:10 +02:00
Frank van den Brink cb7377d2cb
Added minor-only option to show command to only show packages with minor updates 2016-08-26 10:34:09 +02:00
David Jack Wange Olrik 2c84be47c2 Add support for seamless execution of local binaries
Projects that add binaries to `vendor-bin` can now execute those via the same command as projects that consume them without installing them first.

In list overview local commands have a `(local)` tag to distinguish them from commands installed in `vendor-bin`.

Local binaries take precedence over `vendor-bin` which takes precedence over binaries in path.
2016-08-21 16:57:19 +02:00
Jesse Donat 4de11a955a Adds --no-suggest to RequireCommand 2016-08-18 13:46:19 -05:00
John Whitley 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
ianlet 5874132857 return https url of the repository given gitlab project is public 2016-08-11 23:00:18 -04:00
johnstevenson cfaa122ade Ensure colored output if restarted from a capable terminal 2016-08-10 19:14:48 +01:00
Diego Oliveira c55fd9bd10 Modify the message for memory errors 2016-08-09 21:31:19 -03:00
johnstevenson 586eb3bb41 Restart with xdebug disabled 2016-08-08 18:30:56 +01:00
Jeff Puckett 9e7d1a4f9e update help page on global for COMPOSER_HOME info
default installation directory for global packages
has changed since adding support for freedesktop.org standards
per confusion from http://stackoverflow.com/q/38703915/4233593
2016-08-04 16:26:37 -05:00
Nicolas Grekas dd67b01ac5 Add ClassLoader::$missingClasses to not trigger a COW 2016-07-28 10:35:44 +02:00
Rob Bast 02455712cf check for additional possible output strings, fixes #5543 2016-07-26 11:46:51 +02:00
Jordi Boggiano 3455380413 Patch Httpoxy vulnerability 2016-07-19 00:57:41 +02:00
Jordi Boggiano 2f3db8c397 Make it clear that a package is cloned from source, fixes #5489 2016-07-19 00:50:09 +02:00
Jordi Boggiano 685ff8699b Capture output 2016-07-12 17:19:15 +01:00
Jordi Boggiano a242f7e9ba Use process component instead of passthru, fixes #5501 2016-07-12 16:18:30 +01:00
Jordi Boggiano 7bcd336c95 Disable plugins across the board when --no-plugins is specified, fixes #5509 2016-07-12 16:14:26 +01:00
Richard Fussenegger 560f09cf3c Changed error suppression to Silencer 2016-07-07 08:25:46 +02:00
Richard Fussenegger 14224a1f02
Reduced to single requirement 2016-07-06 22:05:08 +02:00
Richard Fussenegger a155f4e7ea
Removed unused Silencer import 2016-07-06 19:00:44 +02:00
Richard Fussenegger 45e998c1d5
Reverted to initial version 2016-07-06 18:59:03 +02:00
moyo c4ac59601f Update related docs and config definitions 2016-07-06 16:25:18 +08:00
moyo 997a062ebd Support gitlab private-token (or personal-access-token) for easier access via gitlab API
Config example:

$HOME/.composer/auth.json

{
  "gitlab-token": {
    "gitlab.com": "YOUR-TOKEN-HERE"
  }
}

Gitlab API authentication doc: http://doc.gitlab.com/ce/api/README.html
2016-07-05 18:02:39 +08:00
Jordi Boggiano 334d0cce6b Make sure we do not clone from local mirror if mirroring failed 2016-07-02 23:52:10 +01:00
Jordi Boggiano 87fbf4a6cd Clean ups, refs #5485 2016-07-02 17:49:46 +01:00
Jordi Boggiano 8ffe224c0d Merge remote-tracking branch 'stefangr/fix_minor_bitbucket_oauth_issues' 2016-07-02 17:43:07 +01:00
Jordi Boggiano 4998ee27b3 Re-use mirror code from the git driver, refs #5384 2016-07-02 17:20:51 +01:00
Jordi Boggiano 55e90093a4 Merge remote-tracking branch 'marvil07/faster-git-clones-using-cache' 2016-07-02 16:43:19 +01:00
Jordi Boggiano 59596ff012 Make sure we do not overwrite binaries but only re-create missing ones, refs #5127 2016-07-02 16:35:09 +01:00
Jordi Boggiano 88d5b74c74 Merge remote-tracking branch 'j0k3r/re-install-binaries' 2016-07-02 16:15:33 +01:00
Jordi Boggiano e53119f806 Make use of pretty version for new references, refs #5328 2016-07-02 16:03:04 +01:00
Jordi Boggiano 44ddcf4da7 Merge remote-tracking branch 'slbmeh/feature/version-status' 2016-07-02 15:38:22 +01:00
Jordi Boggiano 98bf6d704e Undo addition of a bunch of Script methods to RootPackage[Interface], refs #5401 2016-07-02 15:27:45 +01:00
Jordi Boggiano a72ef947d4 Merge remote-tracking branch 'CupOfTea696/master' 2016-07-02 15:24:42 +01:00
Stefan Grootscholten 5a31c75289 Fix some of the remaining OAuth issues.
- Bitbucket will silently redirect to a login page when downloading a zip.
Added a check to see if the content-type is not text/html
- Make the path from Basic Authentication to OAuth as smooth as possible.
2016-07-02 15:10:33 +02:00
Jordi Boggiano 664ba44901 Merge pull request #5467 from bohwaz/fossil
Fossil VCS support for Composer
2016-06-26 15:27:40 +02:00
Jordi Boggiano 75074382de Merge branch '1.1' 2016-06-25 15:50:18 +01:00
Jordi Boggiano fd6455218e Avoid warnings in case cache dir is explicitly directed to /dev/null, fixes #5468 2016-06-25 15:49:52 +01:00
bohwaz 517a9b6f4c Fix fossil update 2016-06-25 13:09:02 +12:00
Jordi Boggiano ebae5dfd95 Undo downgrade before trying again if http seems unreliable, refs #2835 2016-06-24 14:58:32 +01:00
Pierre du Plessis f29b3e86ce Remove type parameter from RepositoryInterface
Fixes #5458

Remove the `$type` parameter from `RepositoryInterface` to alleviate the BC break for plugins.
2016-06-23 12:31:39 +02:00
bohwaz 5674262030 fix typo and bugs on Fossil support 2016-06-23 17:14:53 +12:00
bohwaz 0e26a07a74 Fix: use the right directory for repository file 2016-06-23 08:41:29 +12:00
bohwaz abcbef4a67 Add Fossil support to Composer 2016-06-23 08:41:00 +12:00
Jordi Boggiano 894b53c115 Merge pull request #5454 from pierredup/type-search
Added type option to search
2016-06-21 17:03:13 +02:00
Pierre du Plessis 6a557e45b8 Added --type option to search 2016-06-21 16:38:52 +02:00
Jordi Boggiano 1c4acf3583 Refactor code to use RemoteFilesystem facilities for header parsing, refs #5435 2016-06-21 11:32:39 +01:00
Jordi Boggiano f8c3ef4136 Merge remote-tracking branch 'dunlop-lello/master' 2016-06-21 11:27:45 +01:00
Jordi Boggiano efb24846cb Merge branch '1.1' 2016-06-21 11:01:40 +01:00
Jordi Boggiano f94d06ff0a Fix escaping 2016-06-21 11:01:35 +01:00
Jordi Boggiano 39c2c8c30a Add test for password escaping 2016-06-21 11:01:09 +01:00
Marco Villegas 44f94a7b83 Prevent duplicate file checking on git download. 2016-06-18 19:39:09 -05:00
Marco Villegas 75b88a13fe Use regex to capture git version. 2016-06-18 17:55:24 -05:00
Stefan Grootscholten 78fcb5a366 Add support section to composer data for bitbucket repositories. 2016-06-17 17:35:43 +02:00
Phil Lello 7a112b0395 Check headers for missing scopes before asking for new OAuth token
This patch stops the GitHub VCS driver prompting for a new access
token when a repository is deleted/hidden.

Specifically, it checks the X-OAuth-Scopes and X-Accepted-OAuth-Scopes
response headers to see if the scopes on the current request match
those needed by the API call. If they do, the 404 means that the repo
is deleted/hidden, and there's no point asking for a new OAuth token.
2016-06-16 07:40:54 +01:00
Stefan Grootscholten 1241e3e83c Simplify the if statement. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten 42f4d344a4 Fix the replacement of the credentials.
://username:password@domain
was replaced by ://://:***@domain
instead of ://username:***@domain or ://***:***@domain
2016-06-11 17:33:58 +02:00
Stefan Grootscholten ea11a95359 Provide fallback when using basic authentication.
When composer is configured to use bitbucket basic authentication (a bitbucket username and password), you get an error
when trying to install dependencies.
This commit prevent the install process to be aborted due to uncaught exceptions.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten 7716ef059b Add the access token as query string parameter. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten d9fd9fca6b Implement changes after review of stof.
Rename getContents to getContentsWithOAuthCredentials.
Make gitDriver a private property.
2016-06-11 17:33:58 +02:00
Stefan Grootscholten 1084a3927e Implement Bitbucket Util in GitBitbucketDriver. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten 307fd4023b Fetch composer.json using the oauth api. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten 6c8b0cc2c1 Change authentication for bitbucket to oauth. 2016-06-11 17:33:58 +02:00
Stefan Grootscholten 0e500d4c91 Make API URL available for external use. 2016-06-11 17:33:58 +02:00
Jordi Boggiano a8edaad381 Merge pull request #5335 from carlcraig/1.1
Update bitbucket oauth instructions
2016-06-11 17:00:13 +02:00
Jordi Boggiano 5a3d60c0cf Output warning for invalid-looking packagist config, fixes #5404 2016-06-11 15:48:44 +01:00
Jordi Boggiano 73d9a4717d Update list of ciphers /cc @cs278 2016-06-11 11:19:58 +01:00
Jordi Boggiano 08ef916bed Change default value 2016-06-06 11:22:06 +01:00
Jordi Boggiano 151ed2a0e5 Merge pull request #5392 from donatj/master
Adds --no-suggest to install and update commands
2016-06-06 11:18:24 +02:00
Steve Buzonas 576721946c show pretty version in both scenarios 2016-06-03 19:05:04 -04:00
Steve Buzonas 7b6e06c686 normalize version to provide consistent output from package version vs vcs version 2016-06-03 17:57:23 -04:00
Sven Wittevrongel ca6f7b365b revert 3ad5f1843b 2016-06-03 12:09:50 +01:00
Sven Wittevrongel b80c33ba5c type-hint array for setConfig & setScripts 2016-06-03 12:00:32 +01:00
Sven Wittevrongel 3ad5f1843b Remove getScript from CompletePackage (it is root-only) 2016-06-03 12:00:17 +01:00
Sven Wittevrongel cccfb2fb22 RootAliasPackage fix 2016-06-03 11:51:07 +01:00
Sven Wittevrongel d0b0d1ad24 RootPackage::getScripts 2016-06-02 14:33:26 +01:00
Sven Wittevrongel dec44e6ba9 getconfig in RootAliasPackage 2016-06-02 14:20:36 +01:00
Sven Wittevrongel 3905f275d6 RootPackage::getConfig 2016-06-02 14:02:11 +01:00
Steve Buzonas 64afdcc2aa remove var_dump 2016-06-01 21:47:19 -04:00
Jordi Boggiano 72c9fab976 Merge pull request #5394 from svengerlach/more-no-scripts
--no-scripts option for remove and require command
2016-06-01 23:34:08 +02:00
Michele Locati 0b08daff02
Simplify evaluation of PHP code 2016-06-01 12:32:06 +02:00
Sven Gerlach 4fd35baf1f Added --no-scripts InputOption for RemoveCommand 2016-06-01 12:30:42 +02:00
Sven Gerlach 28b88dd675 Added --no-scripts InputOption for RequireCommand 2016-06-01 12:28:00 +02:00
Michele Locati 759987da62
Strip out declare strict_types 2016-06-01 09:51:26 +02:00
Jesse Donat b108ed9484 Adds --no-suggest to UpdateCommand 2016-05-31 17:52:00 -05:00
Jesse Donat cbfd81dc99 Adds flag to allow suggestions to be skipped 2016-05-31 17:48:43 -05:00
Jordi Boggiano b81210d9f8 Use stronger language and link to faq, fixes #5382, closes #5383 2016-05-31 21:00:15 +01:00
Jordi Boggiano d1425ec008 Merge branch '1.1' 2016-05-31 19:51:30 +01:00
Jordi Boggiano c289776d94 Force-collapse multiple slashes into one, fixes #5387 2016-05-31 19:37:39 +01:00
Jordi Boggiano 43273c4366 Fix plugin bootstrapping to ignore SSL Exceptions, fixes #5388 2016-05-31 19:19:14 +01:00
Jeremy Benoist 4f7fbbc879 Introduce InstallerBinaryInterface
This is an interface for Installer which should support installing binary.
ATM there is only the `LibraryInstaller`.

It eases the check for supported method when installing binaries for all packages
2016-05-31 12:19:58 +02:00
Marco Villegas 7e91e9fd80 Use git cache path to mirror the repository before download to vendor target. 2016-05-29 12:36:19 -05:00
Marco Villegas 5bb0433a51 Provide a way to retirve git version from the related util class. 2016-05-29 12:36:19 -05:00
Luis Faceira 1d733ba21a GitDownloaderTest uses temp dir as composer home config
When creating a DownloaderMock a home config dir is
ensured to exist, so that no test fails for lack of it
that on a regular run would be set by the Factory
2016-05-29 12:36:19 -05:00
Luís Faceira 7b22b7a511 Use dissociate git option
Added the usage of dissociate so that the repos work properly
even if the cache gets deleted after the clone
2016-05-29 12:36:19 -05:00
Luís Faceira 5dd35c590e Escaped git --reference argument 2016-05-29 12:36:19 -05:00
Luís Faceira 292bd3f6a3 Use vcs dir as git reference, if existing, to speed up download
Also added home dir to default initial settings
2016-05-29 12:36:19 -05:00
Jordi Boggiano 04ae1584dc Add docs about package type to prompt, fixes #5378 2016-05-29 17:08:40 +01:00
Jordi Boggiano e2c3bc5e89 Merge branch '1.1' 2016-05-17 23:02:40 +01:00
Jordi Boggiano 3ac822d5e2 Fix access_token param being incorrectly added on github requests after a redirection, fixes #5099 2016-05-17 23:02:28 +01:00
Jordi Boggiano 9dc6490403 Override the config source with the local one as it should be 2016-05-17 22:28:20 +01:00
Jordi Boggiano 32a8a60695 Merge branch '1.1' 2016-05-17 14:08:17 +01:00
Jordi Boggiano 143db7a9f5 Fix degraded mode usage on packagist, fixes #5350 2016-05-17 14:08:14 +01:00
Jordi Boggiano 57ae6d97b6 Merge branch '1.1' 2016-05-17 12:06:36 +01:00
Metod 360cb4ac2a Fix for a fatal error when system temp dir is not available 2016-05-17 12:06:27 +01:00
Jordi Boggiano c47b302a3c Reset composer before loading the modified json, fixes #5346 2016-05-17 12:04:47 +01:00
Jordi Boggiano 32c3429c30 Merge pull request #5343 from localheinz/fix/unstable
Fix: Do not suggest to avoid exact version constraints for unstable package
2016-05-17 12:04:22 +01:00
Jordi Boggiano 301ea66371 Use silencer and check the function exists, refs #5317 2016-05-17 11:48:58 +01:00
Jordi Boggiano a7bbdcb794 Merge remote-tracking branch 'Fleshgrinder/ipv6-platform-requirement' 2016-05-17 11:45:41 +01:00
ReenExe 53fc30fe56 clear code 2016-05-17 13:34:54 +03:00
Andreas Möller bb0fb0eb26
Fix: Do not issue warning when using exact version constraint for unstable package 2016-05-17 09:25:08 +02:00
Tomáš Markacz c30dd16e32 add missing validation for rss chanel section in composer schema 2016-05-16 23:24:00 +02:00
Jordi Boggiano a4e8d858ba Merge branch '1.1' 2016-05-16 18:50:37 +01:00
Jordi Boggiano 206c3c52e0 Remove the error handler at the end of a run, fixes #5340 2016-05-16 18:49:38 +01:00
Jordi Boggiano 0cca4d1a44 Fix extension parsing to take the most usable data instead of just using 0 in case of parsing failure, fixes #5331, fixes #5264 2016-05-15 11:47:14 +01:00
Carl Craig e43912735b Update bitbucket oauth instructions 2016-05-14 13:07:25 +00:00
Richard Fussenegger b68921ce8f
Provide IPv6 requirement via ext 2016-05-14 09:53:59 +02:00
Steve Buzonas d0c009edf2 fix issue where path repositories would be matched oddly 2016-05-12 21:55:34 -04:00
Steve Buzonas 758e7cab53 fixed issue where detatched head would give null output 2016-05-12 21:35:25 -04:00
Steve Buzonas 89d2f58c05 use version parser in vcs downloader 2016-05-12 21:21:50 -04:00
Steve Buzonas 8d766c8eb2 cleaner implementation of status output with support for path repositories 2016-05-12 21:11:48 -04:00
Richard Fussenegger 132c37ab44
Added support for IPv6 requirement
I decided to add two additional PHP interpreter packages instead of an additional extension key. IPv6 support is part of PHP core (if enabled) and is not part of any optional extension.
2016-05-11 20:53:32 +02:00
Mathias Brodala d9909993b2 Add --prefer-stable and --prefer-lowest to "require" command
Fixes #5314
2016-05-11 17:45:41 +01:00
Jordi Boggiano d25b52a4d3 Merge branch '1.1' 2016-05-11 11:37:44 +01:00
Jordi Boggiano 8f0324f51e Fix platform dev reqs being required even in --no-dev installs 2016-05-11 11:35:30 +01:00
Lucas CHERIFI 7e34d9ab97 Typo fix ;-) 2016-05-10 21:45:39 +02:00
Jordi Boggiano 13f4d2afd3 Fix #refs handling, fixes #5291 2016-05-10 17:19:09 +01:00
Jordi Boggiano 72362a085a Fix #refs handling, fixes #5291 2016-05-10 17:17:08 +01:00
Jordi Boggiano 921af1c1b8 Merge branch '1.1' 2016-05-10 15:20:41 +01:00
Jordi Boggiano 5cb3564672 Fix archiving paths on windows 2016-05-10 14:40:46 +01:00
Jordi Boggiano d11eff27d0 Cache VCS driver after creation to avoid initializing it several times 2016-05-09 21:45:46 +01:00
Jordi Boggiano 8bfb2e8bc2 Add a getter to fetch the repo data from the outside of the github driver 2016-05-09 21:41:04 +01:00
Jordi Boggiano 0040498e25 Merge branch '1.1' 2016-05-09 10:31:09 +01:00
Jordi Boggiano 046c2d64a5 Fix ProcessExecutor url escaping 2016-05-09 10:31:03 +01:00
Jordi Boggiano 36e283be68 Merge branch '1.1' 2016-05-08 18:23:21 +01:00
Jordi Boggiano 9cb6c2322a Fix more git URL escaping 2016-05-08 18:23:14 +01:00
Jordi Boggiano a31d0826f0 Merge branch '1.1' 2016-05-08 17:22:30 +01:00
Jordi Boggiano e3ae45fa12 Replace username as well if it looks like a github oauth token 2016-05-08 17:22:25 +01:00
Jordi Boggiano 827d52cccf Merge branch '1.1' 2016-05-05 23:21:27 +01:00
Jordi Boggiano 71cbd8f7e6 Switch dir before loading plugins to make sure the correct composer.json is initialized, fixes #5290 2016-05-05 23:21:03 +01:00
Jordi Boggiano 9ecaec4cca Merge branch '1.1' 2016-05-05 14:57:13 +01:00
Jordi Boggiano d1a0502f92 Make sure we only replace complete paths to the base-dir/vendor-dir, not partial dir matches, fixes #5289 2016-05-05 14:57:07 +01:00
Jordi Boggiano b8974a3e13 Merge branch '1.1' 2016-05-05 14:10:14 +01:00
Jordi Boggiano 591cbcee12 Avoiding defining plugin commands using the local project plugins, refs #5277 2016-05-05 14:10:06 +01:00
Bilal Amarni 92207da83a add isProxyCommand() to BaseCommand 2016-05-05 13:56:44 +01:00
Jordi Boggiano aaf2c06e7b Add ScriptExecutionException for CLI scripts and avoid showing the full exception to users, fixes #5281 2016-05-05 13:26:26 +01:00
Stefan Grootscholten 9b654048ed Fix regex for bitbucket https URLs.
If the bitbucket URL has the .git extension, the compiling of the authUrl and sshUrl result in invalid URLs.
2016-05-01 11:41:48 +02:00
Stefan Grootscholten 591f68288b Provide a fallback to ssh for https bitbucket URLs.
When running in non-interactive mode, there is no way to ask for credentials.
If there are no credentials available, no attempt is made to execute the command.

This commit provides a fallback to SSH for non authenticated, non-interactive install/updates of bitbucket https URLs.
2016-05-01 11:27:16 +02:00
Jordi Boggiano 352e467f16 Always show abandoned packages in --outdated as they are outdated in a way 2016-04-29 17:17:55 +01:00
Jordi Boggiano 36665d791d Merge branch '1.0' 2016-04-29 16:03:14 +01:00
Jordi Boggiano c66639fe03 Fix content-length check to look at the last header received, fixes #5268 2016-04-29 16:03:05 +01:00
Jordi Boggiano 2bcd723b54 Fix regression in global command, fixes #5266 2016-04-29 15:31:32 +01:00
Kamran Ahmed 78a8a02978 Ignore the unfound packages 2016-04-29 15:25:14 +04:00
Jordi Boggiano 6146f7aded Take into account prefer-stable and dev packages when computing outdated, refs #5251 2016-04-28 22:38:38 +01:00
Jordi Boggiano 2a3b56e82c Fix constraint parsing bug in outdated, fixes #5251 2016-04-28 22:25:53 +01:00
Jordi Boggiano 4f2ae0a1d9 Clarify output when something is installed in the wrong version, refs #5259 2016-04-28 22:11:48 +01:00
Jordi Boggiano 65a4719251 Add output in why-not for when a package requires a platform package and it is not found, fixes #5259 2016-04-28 22:02:22 +01:00
Jordi Boggiano 40df5dddee Add secure-http:false option to disable the https default of gitlab driver when using ssh urls, fixes #5254 2016-04-28 21:39:13 +01:00
Jordi Boggiano ba909d8795 Avoid duplicate commands, and pass plugin to ctor args for capabilities, refs #3377 2016-04-28 21:12:26 +01:00
Jordi Boggiano 090295dbcb Adjust the CommandProvider to use plugin capabilities and test actual command creation, refs #3377 2016-04-28 20:37:54 +01:00
Jordi Boggiano 4319435154 Make sure the --no-plugin is documented as available everywhere and not redefined 2016-04-28 20:12:45 +01:00
Jordi Boggiano a9df4acd7d Merge remote-tracking branch 'jderusse/plugin-with-commands' 2016-04-28 20:11:33 +01:00
Jordi Boggiano 35fbf9bc14 Merge branch '1.0' 2016-04-28 19:54:11 +01:00
Jordi Boggiano fd5f90989f Add --all to oudated command and switch it to show only outdated by default, fixes #5253 2016-04-28 19:48:56 +01:00
Jordi Boggiano 135783299a Add support for editing top level properties and extra values, replaces #2415, fixes #1411, fixes #2384 2016-04-27 14:04:01 +01:00
Jordi Boggiano 3186b5eeca Avoid using the full pretty version for comparisons, fixes #5247 2016-04-26 20:19:54 +01:00
Jordi Boggiano 7def8cf6e5 Refactor to use ArrayInput instead of StringInput 2016-04-26 20:10:56 +01:00
Jordi Boggiano efa6210f33 Merge pull request #5245 from derekmarcotte/dm-fix-command-injection
fix command injection from the environment when run as root, issue #5244
2016-04-26 19:59:14 +01:00
Rob 608770856e Merge pull request #5243 from msarca/gitlab-bugfix
Gitlab driver bugfix
2016-04-26 01:01:22 +02:00
Derek Marcotte 3a03b51ae3 fix command injection from the environment when run as root 2016-04-25 15:08:09 -04:00
msarca 9f58c3d6e3 Fixed a bug that prevented interactive authentication to work properly 2016-04-25 21:55:23 +03:00
Jordi Boggiano a67b127a1a Add deprecation notice for the event type hint rewrites, refs #5238 2016-04-24 15:48:48 +01:00
Jordi Boggiano aabe21d84d Add --direct and --outdated flags to ShowCommand & OutdatedCommand, fixes #5240 2016-04-24 15:17:08 +01:00
Jordi Boggiano e85029da0c Merge branch '1.0' 2016-04-24 14:46:38 +01:00
Jordi Boggiano 5292f2b402 Replace only the targeted class, refs #5237 2016-04-24 14:46:27 +01:00
Jordi Boggiano 05fab170a7 Merge branch '1.0' 2016-04-24 14:41:02 +01:00
Jordi Boggiano f0d67923a5 Fix classmap generator over anonymous classes extending/implementing something, fixes #5239 2016-04-24 14:40:51 +01:00
Jordi Boggiano ec933398c4 Fix classname replacement in plugin updates, fixes #5237 2016-04-24 14:21:29 +01:00
Jordi Boggiano 17f23f5c43 Write abandoned warning on stderr to avoid breaking the flow of the list 2016-04-24 13:51:01 +01:00
Jordi Boggiano ac75680b1e Make sure the abandoned state is copied over even if the packages are installed already 2016-04-22 23:41:15 +01:00
Jordi Boggiano 6c94cb89d1 Fix outdated command on linux 2016-04-22 23:31:02 +01:00
Jordi Boggiano 313dd14f1e Add coloring to the colors 2016-04-22 23:12:29 +01:00
Jordi Boggiano 8771119374 Merge branch '1.0' 2016-04-22 23:00:13 +01:00
Jordi Boggiano 6ce8477d04 Fix parsing of stabilities with AND/OR ops and no stability flags 2016-04-22 22:59:55 +01:00
Jordi Boggiano c5f734dbf9 Merge remote-tracking branch 'barryvdh/show-latest' 2016-04-22 22:38:54 +01:00
Jordi Boggiano e7069dd5e8 Tweak colors in the output, make sure we load the proper version according to stability flags and add outdated command, refs #5028 2016-04-22 21:54:04 +01:00
Jordi Boggiano 9206c646a2 Merge remote-tracking branch 'barryvdh/show-outdated' 2016-04-22 20:57:37 +01:00
Jordi Boggiano 4c50136522 Avoid caching nulls, refs #5234 2016-04-22 20:55:07 +01:00
Jordi Boggiano 38c49b32cb Less regex escaping and removed $..$ match, refs #5184 2016-04-22 20:48:56 +01:00
Jordi Boggiano d8c94c2640 Merge remote-tracking branch 'curry684/home-expansion' 2016-04-22 20:37:05 +01:00
Jordi Boggiano aeafe2fe59 Add INIT event and bump plugin-api to 1.1.0, fixes #5232 2016-04-22 20:30:24 +01:00
Jordi Boggiano b6680b6f2a Fix why-not command to dig deeper when it is given a specific version it checks installed packages against that version's requirements 2016-04-21 22:16:05 +01:00
Jordi Boggiano f13e0f975f Add --no-secure-http flag to temporarily disable secure-http in create-project installation of the root package, fixes #5121 2016-04-21 21:11:33 +01:00
Jordi Boggiano 95e0347917 Merge branch '1.0' 2016-04-21 12:40:42 +01:00
Jordi Boggiano a5f86b6ea0 Fix all other instances of addcslashes that might have issues with $ signs in strings, refs #5221 2016-04-21 12:16:46 +01:00
Jordi Boggiano 47bba5bd14 Merge remote-tracking branch 'danieliancu/1.0' into 1.0 2016-04-21 12:01:36 +01:00
Jordi Boggiano ff46816e79 Add support for file:///c:/-style paths, refs #3338 2016-04-21 11:00:41 +01:00
Jordi Boggiano 766c45c047 Add support for local paths pointing directly at the .git folder instead of actual repo, refs #3338 2016-04-21 11:00:03 +01:00
Daniel Iancu 3bdb0ee5fd Fix addMainKey method of JsonManipulator with content having $n
This will store correctly passwords having a dolloar sign followed by a digit in the auth.json file.
If the content variable has "$n" (where n consists of digits) it will match as a replacement reference for preg_replace and thus it will get stripped because there's no such parenthesized pattern.
2016-04-20 22:34:39 +03:00
Jordi Boggiano 4de17cef6b Always resolve dev packages even when doing an update with --no-dev, fixes #5016 2016-04-20 12:34:04 +01:00
Jordi Boggiano 2062070be9 Warn users with secure-http disabled once per hostname they access insecurely to avoid bad URLs going by undetected, fixes #5008 2016-04-19 22:29:04 +01:00
Jordi Boggiano 11daebcb3a Merge pull request #5210 from Seldaek/fix_partial_updates_from_dirty_state
Fix partial updates from a dirty state and apply exactly the locked state
2016-04-19 20:07:52 +01:00
Jordi Boggiano 47ea9d8ddc Merge branch '1.0' 2016-04-19 20:04:19 +01:00
Jordi Boggiano c7c8335b8b Fix updating of dev refs if they are not whitelisted 2016-04-19 20:03:14 +01:00
Jordi Boggiano 31dcc0bdea Merge branch '1.0' 2016-04-19 15:44:38 +01:00
Jordi Boggiano 1bf711fe1f Guard against mbstring func_overload, fixes #5218 2016-04-19 15:44:13 +01:00
Jordi Boggiano 467ece15ed Skip regex engine when not necessary 2016-04-19 11:53:24 +01:00
Jordi Boggiano 21a9f21cc8 Add package filtering in show command, fixes #5212, closes #5215 2016-04-19 11:31:41 +01:00
Jordi Boggiano 89cfde051d Convert exception to a warning, refs #5205 2016-04-19 11:00:39 +01:00
Jordi Boggiano fa5c73f0d8 Merge remote-tracking branch 'curry684/issue-5186' 2016-04-19 10:57:45 +01:00
Jordi Boggiano fc33e0835e Merge branch '1.0' 2016-04-19 10:52:01 +01:00
Michael Aherne 830644f374 Observe COMPOSER environment variable in init command 2016-04-19 10:51:44 +01:00
Niels Keurentjes 43eb471ec2 Code cleanup and ensure checked file is unique. 2016-04-19 01:39:32 +02:00
Jordi Boggiano de5bfcb4c5 Fix partial updates from a dirty state and apply exactly the locked state, fixes #3468 2016-04-18 23:33:04 +01:00
Jordi Boggiano aed818fda2 Merge branch '1.0' 2016-04-18 23:31:56 +01:00
Jordi Boggiano feda2a283f Improve error reporting some more, fixes #4310 2016-04-18 23:03:00 +01:00
Jordi Boggiano 118d8fb52f Output composer/php/os version info in debug mode 2016-04-18 22:09:07 +01:00
Jordi Boggiano 30ef73f7b2 Merge branch '1.0' 2016-04-18 20:42:53 +01:00
David Zuelke d716c73333 fail download on content-length mismatch 2016-04-18 20:42:38 +01:00
Jordi Boggiano 27f216dba4 Merge pull request #5204 from peterrehm/update-channel
Show channel even if there is no new version on the current channel
2016-04-18 10:36:19 +01:00
Jordi Boggiano e3f957324d Merge branch '1.0' 2016-04-18 10:23:42 +01:00
Niels Keurentjes d5158d943f Exempt custom URLs from secure-http checks, refs #5173 2016-04-18 10:23:10 +01:00
Jordi Boggiano 73139a59bf Update origin remote URL when package URL changed and origin still uses the same url as the composer remote, fixes #3874 2016-04-18 10:10:12 +01:00
Jordi Boggiano 1a334b0f6f Merge branch '1.0' 2016-04-18 09:35:26 +01:00
Sami Jawhar 9d2db57f65 BinaryInstaller::generateWindowsProxyCode() now trims both single and double quotes from $binPath when creating windows .bat file. 2016-04-18 09:35:11 +01:00
Jordi Boggiano 6d20146d08 Normalize URL updates to point to the correct reference and always update URLs consistently, fixes #3849, fixes #4126 2016-04-18 09:34:23 +01:00
Tom Klingenberg 73d04bf28b Support empty directories with tar-files, closes #5206
- Report: #5206

- Ref: 8389b4b
2016-04-18 00:24:44 +02:00
Niels Keurentjes 28e9193e9e Check temp folder usability before runtime to prevent weird errors. 2016-04-16 21:01:10 +02:00
Peter Rehm bdd90a49c4 Show channel even if there is no new version on the current channel 2016-04-16 19:15:12 +02:00
Jordi Boggiano 76350676b5 Warn on exact/overly strict constraints, fixes #2746 2016-04-15 16:37:47 +01:00
Jordi Boggiano e4711326a4 Fix tests 2016-04-15 16:28:47 +01:00
Jordi Boggiano b31052fcde composer status now includes untracked files in git repos, fixes #2664 2016-04-15 16:22:16 +01:00
Jordi Boggiano 4f6693ad70 Fix regression in 0b44662087, fixes #5199 2016-04-15 15:37:00 +01:00
Jordi Boggiano 0b44662087 Disable static autoloader on HHVM, fixes #5192 2016-04-15 14:57:07 +01:00
Jordi Boggiano 74b3f6fc21 Merge branch '1.0' 2016-04-15 14:05:03 +01:00
Jordi Boggiano ff4e2ec219 Avoid lazy-loading composer-plugin-api 2016-04-15 14:04:44 +01:00
Jordi Boggiano dabad42cf9 Show channel used to perform self-update 2016-04-15 14:04:35 +01:00
Niels Keurentjes 4b5375f4c0 Need legacy patch for older hardcoded behaviour in handling HOME/USERPROFILE env variables. 2016-04-13 23:53:27 +02:00
Niels Keurentjes c9534d48c1 Made env variable parsing in path replacements generic across platforms and replaced old config.php implementation. 2016-04-13 02:02:50 +02:00
Niels Keurentjes f5422a441d Fixed Windows path separators and updated docs. 2016-04-12 23:51:28 +02:00
Niels Keurentjes 7e71b2bfbc Added support for expanding environment variables in paths, and tilde expansion on Windows. 2016-04-12 23:07:58 +02:00
Niels Keurentjes 23ad67b3be Implement support for tilde expansion, mainly for path repositories 2016-04-12 13:14:07 +02:00
Nicolas Grekas 40aca80bd9 Workaround https://bugs.php.net/68057 2016-04-12 09:32:54 +02:00
Jordi Boggiano d20d856aa8 Merge remote-tracking branch 'nicolas-grekas/php7-static' 2016-04-11 19:18:22 +01:00
Jordi Boggiano 60ce2324bc Add ability to call composer from scripts using @composer XXX, fixes #5153 2016-04-11 19:03:32 +01:00
Jordi Boggiano c45cc912ab Warn when referencing unknown scripts 2016-04-11 18:49:22 +01:00
Nicolas Grekas fd2f51cea8 Speedup autoloading on PHP 5.6 & 7.0+ using static arrays 2016-04-11 19:38:24 +02:00
Jordi Boggiano 6a287b9240 Merge branch '1.0' 2016-04-11 17:38:51 +01:00
Jordi Boggiano 765a958c42 Merge pull request #5137 from dzuelke/rfs_conlen
Fail download on content-length mismatch
2016-04-11 17:03:58 +01:00
Jordi Boggiano 1a5441f944 Add ca-bundle to build 2016-04-11 16:58:35 +01:00
Jordi Boggiano b1723644e0 Use extracted ca-bundle package 2016-04-11 16:33:29 +01:00
Jordi Boggiano d8840df4ac Minor tweak 2016-04-11 15:13:51 +01:00
Jordi Boggiano 1f0b01e70d Merge remote-tracking branch 'watermanio/strict-types' into 1.0 2016-04-11 15:11:46 +01:00
Jordi Boggiano 3b0a1c6f70 Run cs fixer and update config to latest master 2016-04-11 15:06:57 +01:00
Jordi Boggiano b9ce06f46b Minor tweaks, refs #5162 2016-04-11 14:47:03 +01:00
Jordi Boggiano da9b43dcc8 Merge remote-tracking branch 'curry684/code-quality' into 1.0 2016-04-11 14:39:37 +01:00
Jordi Boggiano 6df85163f4 Make use of global platform config if available, and improve error reporting, fixes #5165 2016-04-11 13:36:02 +01:00
Jordi Boggiano 279e2bda15 Merge remote-tracking branch 'dzuelke/unset_bitbucket' into 1.0 2016-04-11 13:20:13 +01:00
Jordi Boggiano ad5951218b Also trim trailing slashes in PathRepo, refs #5164 2016-04-11 13:11:46 +01:00
Jordi Boggiano b981c1e09d Merge remote-tracking branch 'cherbst/trim-trailing-slash-from-symlink-names' into 1.0 2016-04-11 13:11:23 +01:00
Jordi Boggiano e2056499cb Avoid open_basedir warnings on is_dir() calls when probing for CABundle 2016-04-11 08:45:25 +01:00
David Zuelke cf43244f85 fix config add/remove/unset/merge for bitbucket 2016-04-10 23:21:50 +02:00
Niels Keurentjes eb77c0b7f5 phpDoc cleanup, removed unused imports, variables and parameters. 2016-04-07 23:12:23 +02:00
Christoph Herbst cbfd83ba0e trim trailng slash from symlink names
symlink names are not allowed to contain
a trailing slash, so trim it.
2016-04-07 12:55:52 +02:00
Niels Keurentjes 818c3e707a Ton of phpDoc fixes. 2016-04-07 01:12:30 +02:00
Niels Keurentjes e6f21137ad Undefined or default return points fixed. 2016-04-07 00:52:50 +02:00
Andy Waterman d4207ff49f Strict type checks of null and bool 2016-04-06 20:55:53 +01:00
Jordi Boggiano 9f3b1fd062 Merge remote-tracking branch 'curry684/issue-5130' 2016-04-05 10:59:40 +01:00
Jordi Boggiano 997b5ef536 Merge pull request #5129 from hiqsol/get-global-composer
Added getter for global composer
2016-04-05 10:52:15 +01:00
Niels Keurentjes 63d3964ab5 Rollback installation of plugins if corrupted, fixes #5130 2016-04-04 23:08:18 +02:00
Tom Klingenberg 8389b4b829 Skip non-empty directories in zip generation
Empty dirs get archived (leafs).

Previously it seemed ok to skip all directories in zip generation.

References:

- Ref: 6066359944

- Issue: #4865 Keep empty folders after re-zip a module
2016-04-02 20:50:20 +02:00
Jordi Boggiano b2b4603215 Fix handling of http://foo/packages.json style repo URLs, fixes #5135 2016-04-02 14:49:26 +01:00
Jordi Boggiano 134ce134a2 Rename COMPOSER_DISABLE_ROOT_WARN to COMPOSER_ALLOW_SUPERUSER, refs #5119 2016-04-02 14:25:21 +01:00
Jordi Boggiano cb8587cdad Add COMPOSER_DISABLE_ROOT_WARN env var and skip root warning on self-update command as well, refs #5119 2016-04-01 12:31:07 +01:00
Jordi Boggiano c74e6df65d Fix strings being passed to an int arg, fixes 7.1 build 2016-04-01 11:52:19 +01:00
Jordi Boggiano 870dcece1f Merge pull request #5120 from Seldaek/improve-errors
Improve solver error reporting
2016-04-01 12:34:40 +02:00
Jordi Boggiano 5822b58c1f Avoid using realpath when generating classmap, speeds up generation and keeps paths local to project in case of symlinks/path repo 2016-04-01 11:32:04 +01:00
Jordi Boggiano dfd22c641d Bulletproof sudo clobbering, refs #5122 2016-04-01 01:24:31 +01:00
Jordi Boggiano 289ef7fbfb Merge remote-tracking branch 'curry684/issue-5119' 2016-04-01 01:22:44 +01:00
Jordi Boggiano fc57cc8d7e Remove changes in StreamContextFactory, refs #5055 2016-04-01 01:00:48 +01:00
Jordi Boggiano 2c9326bacb Merge remote-tracking branch 'wenkepaul/master' 2016-04-01 00:59:11 +01:00
David Zuelke 5dd4d69a6d fail download on content-length mismatch 2016-04-01 01:36:05 +02:00
Jordi Boggiano 623c0dcda7 Improve solver error reporting, fixes #5086, fixes #2575, fixes #2661 2016-04-01 00:18:36 +01:00
Andrii Vasyliev 5b759da174 add getter for global composer 2016-03-29 21:21:44 +00:00
Jeremy Benoist e9fc0e6548 Re-install binaries on update/install
Binaries are re-installed after an update/install (ie: removed and then installed)
2016-03-28 23:15:13 +02:00
Niels Keurentjes 49524bc4ba Centralize secure-http checking 2016-03-28 22:01:32 +02:00
Paul.Wenke 59ae2716aa Fixed typo in exception message for Bitbucket config command. 2016-03-28 09:13:58 -04:00
Niels Keurentjes a0070e724b Clobber any existing sudo leases before execution to prevent malicious code gaining root privileges. 2016-03-28 13:10:43 +02:00
Niels Keurentjes 557a55fbe5 Clobber sudo credentials to prevent careless privilege escalations. 2016-03-27 23:42:39 +02:00
Jordi Boggiano 37a1e12672 Mark failed downloads as failed instead of 100% complete, fixes #5111 2016-03-27 17:14:51 +01:00
Jordi Boggiano 95c263284a Merge pull request #5064 from Seldaek/update-channels
Add update channels support to self-update and diagnose
2016-03-27 14:49:09 +02:00
Jordi Boggiano 9af645ef50 Fix missing var ref, refs #5117 2016-03-27 13:25:07 +01:00
Jordi Boggiano 6a88d49ffb Add support for the new binary installer in PEAR installer, fixes #5117 2016-03-27 13:16:11 +01:00
vlakoff 47d196f37f Fix missing argument for getLastBackupVersion() 2016-03-27 00:25:17 +01:00
Jordi Boggiano f542b0f32d Only use Path if it is actually available, refs #5114 2016-03-26 09:49:28 +00:00
Jordi Boggiano 2f6b4c439d Merge remote-tracking branch 'mizunashi-mana/fix-issue-5045' 2016-03-26 09:48:18 +00:00
Jordi Boggiano e0fa2ed9c6 Merge remote-tracking branch 'vlakoff/clean-backups' 2016-03-26 09:27:44 +00:00
Jordi Boggiano 747af10483 Clarify required by root message, refs #5099 2016-03-26 09:24:58 +00:00
Jordi Boggiano 5f9d4a81a0 Merge remote-tracking branch 'curry684/moar-logging' 2016-03-26 08:49:14 +00:00
Jordi Boggiano ace88fa986 Rename LibraryBinariesHandler and reorganize constructor args, refs #5100 2016-03-26 08:44:54 +00:00
Jordi Boggiano 6527bb4166 Merge pull request #5100 from helhum/master
Extract binary installation and removal to own class
2016-03-26 09:39:51 +01:00
Jordi Boggiano 340d9789c8 Merge pull request #5095 from schlessera/schlessera-4451-relative-path
Make sure to use an absolute path for symlinking in PathDownloader.
2016-03-26 09:37:17 +01:00
nishiyama 8b221905ca fix path info 2016-03-25 20:04:43 +09:00
Niels Keurentjes 8e78ce9a43 Add extra logging before and after SAT solving 2016-03-24 23:19:40 +01:00
Jordi Boggiano edebbef98a Add test and fix for very large repos, moar possessive quantifiers, fixes #5104 2016-03-24 16:04:52 +00:00
Jordi Boggiano 2217f4e09e Add support for PREG_JIT_STACKLIMIT_ERROR, refs #5104 2016-03-24 16:00:44 +00:00
Helmut Hummel b1ec99faed Extract binary installation and removal to own class
The functionality to install binaries might be useful
for other installers.
Create API for that by extracting this functionality from
the LibraryInstaller class.
2016-03-23 21:39:58 +01:00
Alain Schlesser 4e9885e9bc Make sure to use an absolute path for symlinking in PathDownloader. Resolves #4451 2016-03-23 12:19:41 +01:00
Paul Wenke 9059d70ba0 Corrected username / access token parameters for $this->io->setAuthentication when read from git config. Grant type is now only set when requesting an access token. Removed bitbucket-domains and bitbucket-protocols from config. Fixed bitbucket typo in JsonConfigSource. Removed unecessary comments. Changed visibility of Composer/Util/Bitbucket properties to private. Added https to bitbucket url. Removed unused $note variable. 2016-03-20 15:56:58 -04:00
Jordi Boggiano cb971fcb0e Hijack pear.php.net from http to force https, refs #5071 2016-03-17 11:24:22 +00:00
Barry vd. Heuvel fd46c7e4ba Reduce line length 2016-03-16 11:04:37 +01:00
Barry vd. Heuvel 54d86ebfc9 Use latest package for deprecations, cache latest packages 2016-03-16 10:20:45 +01:00
Jon Dufresne 939955fb2c Prefer the first https:// PEAR mirror; avoid http://.
Fixes #5069
2016-03-15 14:58:55 -07:00
Barry vd. Heuvel 80be9a2c98 Add deprecated notice to show command 2016-03-15 20:46:00 +01:00
Barry vd. Heuvel ac606e4dc1 Add recommended version to show command 2016-03-15 20:21:11 +01:00
Jordi Boggiano 0db8bbfda3 Add update channels support to self-update and diagnose, fixes #4960 2016-03-15 14:13:08 +00:00
Jordi Boggiano 55b0ed8c8b Change installs into updates if there is no lock file, simplify some code, fixes #5034 2016-03-15 14:05:07 +00:00
Jordi Boggiano 653326e215 Merge pull request #5059 from alcohol/issue-4795-2
simplified existing test, added a new test - related to #4795
2016-03-15 10:56:48 +00:00
Jordi Boggiano 9580a76f0d Merge pull request #5049 from curry684/issue-5048
Make path repository options part of the dist reference hash
2016-03-15 10:38:26 +00:00
Rob Bast 8a19e8bd17 fix follow up issue to #4795 2016-03-15 11:17:58 +01:00
Niels Keurentjes fafac386b7 Ensure stat cache is cleared for junctions when using outside modifications. 2016-03-14 12:27:41 +01:00
Paul.Wenke b4d9d0fd0d Added BitbucketTest class. Added is_array and is_object check to http content before calling http_build_query. 2016-03-13 21:33:13 -04:00
Paul.Wenke 9ddf8c4d55 Fixed OAuth credentials issue for subsequent clone requests. 2016-03-13 16:57:23 -04:00
Niels Keurentjes d41bd2909b Make path repository options part of the dist reference hash, fixes #5048 2016-03-12 11:05:03 +01:00
Nicolas Grekas 08d48cb61a Prefer ZipArchive over unzip on Windows 2016-03-11 11:07:36 +01:00
Jordi Boggiano 8bf46768f3 Improve error reporting when loading artifact repos 2016-03-10 16:31:09 +00:00
Jordi Boggiano e8abc90b92 Merge pull request #5026 from curry684/issue-4392
Simulate dummy Composer when searching in uninitialized folder
2016-03-09 12:44:27 +01:00
Niels Keurentjes a2d2c4ddd5 Simulate dummy Composer when searching in uninitialized folder, fixes #4392 2016-03-08 23:52:44 +01:00
Niels Keurentjes fbbde23fb3 Improved error message when adding a package that is disallowed by PHP version, fixes #4686 2016-03-08 23:09:08 +01:00
vlakoff f7757c606d Move instruction to delete corrupted file 2016-03-08 13:10:11 +01:00
vlakoff 9532a0129c Correct error message to match actual behavior 2016-03-08 13:09:25 +01:00
vlakoff 93e08fd78e Also clean backups if no Composer update actually performed 2016-03-07 19:01:17 +01:00
vlakoff 496d29a793 Move code to new method cleanBackups() 2016-03-07 19:01:17 +01:00
vlakoff 4b79ca6ba2 Remove duplicate variable 2016-03-07 19:01:16 +01:00
Jordi Boggiano 4cc719cab3 Add support for SSL_CERT_DIR and openssl.capath, fixes #5017 2016-03-07 13:07:02 +00:00
Jordi Boggiano 8344c6d3d7 Merge pull request #4993 from hkdobrev/create-project-suggests
List project suggestions in create-project command
2016-03-07 14:01:16 +01:00
Paul Wenke d2c5479b2d Updated documentation and fixed formatting in Bitbucket Util. 2016-03-06 22:20:22 -05:00
Paul Wenke d5332a1b5c Developed bitbucket-oauth functionality. 2016-03-06 22:05:00 -05:00
Jordi Boggiano 3933a7f404 Add conflict detection in why-not, fixes #5013 2016-03-07 01:50:41 +00:00
Jordi Boggiano a15779cf53 Fix issue handling false children in why-not command 2016-03-07 00:45:02 +00:00
Haralan Dobrev cc389d6c1a List project suggestions in create-project command
Resolves https://github.com/composer/composer/issues/2752
2016-03-05 14:22:12 +02:00
Rick Guyer 2a35486d7d Check for --ignore-platform-reqs flag during create-project
During `create-project`, the installed PHP version was used to determine
the best root package install candidate, but failed to take into account
the `--ignore-platform-reqs` flag.
2016-03-04 12:50:59 -06:00
Jordi Boggiano 3cea62b6ed Merge pull request #5001 from curry684/issue-4999
Show -t incorrectly expanded self.version constraints. Fixes #4999
2016-03-04 15:39:36 +00:00
Jordi Boggiano bf283cee66 Merge pull request #5002 from barryvdh/change-remove-deps
Make remove with dependencies default
2016-03-04 15:31:37 +00:00
Niels Keurentjes 1017ab817f Corrected parameter handling. 2016-03-04 09:26:11 +01:00
Barry vd. Heuvel eae6d8017a Make remove with dependencies default 2016-03-04 08:53:22 +01:00
Niels Keurentjes a3b2628748 Show -t incorrectly expanded self.version constraints. Fixes #4999 2016-03-04 08:20:35 +01:00
Jordi Boggiano 02ed27b16b Add outdated lock and failure to parse deps to quiet output, fixes #4393 2016-03-03 12:21:49 +00:00
Jordi Boggiano e94066967c Add debugging info about proxy usage, refs #4332 2016-03-02 18:28:44 +00:00
Jordi Boggiano 8fc659fea3 Allow loading of transport-options in package repo, fixes #4991 2016-03-02 17:44:09 +00:00
Jordi Boggiano 6d1e8ebf90 Avoid warnings due to duplicate loading of auth files, fixes #4971 2016-03-02 14:10:21 +00:00
Jordi Boggiano 9d95456bb0 Fix bug in handling of special chars in proxy .bat files for binaries, fixes #4990 2016-03-02 14:07:30 +00:00
Jordi Boggiano 76450cc2a1 Merge pull request #4989 from naderman/t/fix-self-reference-transaction-root
Ignore self references when anlaysing independent root requirements
2016-03-02 13:26:18 +00:00
Jordi Boggiano 27e1c4358e Fix show/depends commands to display and abort when a circular dep was reached, fixes #4983 2016-03-02 13:24:07 +00:00
Jordi Boggiano b93b73e836 Rewrite git unpushed status checks, fixes #4987 2016-03-02 13:00:20 +00:00
Nils Adermann 4af74b54e0 Ignore self references when anlaysing independent root requirements
When creating a transaction we try to identify all requirements that are
not themselves required by any other package. If a package references
itself this should not mark it as being required by another package.
2016-03-02 13:03:26 +01:00
Jordi Boggiano 7e1a23eef7 Add missing use statements 2016-03-01 14:09:44 +00:00
Jordi Boggiano fea99bcb1b Clarify the fetch/push URL selection for github repos and various protocols, fix regression 2016-03-01 13:43:59 +00:00
Jordi Boggiano b080a73840 Fix broken test on windows, fixes #4973 2016-03-01 13:25:39 +00:00
Jordi Boggiano 6f42b9c865 Disable git, svn, http protocols for VCS downloaders, fixes #4968 2016-03-01 13:20:35 +00:00
Jordi Boggiano 4207a33ccf Fix escaping 2016-02-29 18:46:21 +00:00
Jordi Boggiano 8cfbe7023d CS fixes 2016-02-29 18:12:51 +00:00
Jordi Boggiano 4b0624a93a Fix regression in create-project 2016-02-29 18:09:56 +00:00
Jordi Boggiano bf1ddaa298 Fix method name for php5 2016-02-29 17:51:34 +00:00
Jordi Boggiano 1aec1c1fc8 Add --repository flag to init command, and rename --repository-url to --repository in create-project, fixes #4200, closes #4207, closes #2604, fixes #2920 2016-02-29 17:33:46 +00:00
Jordi Boggiano b6b2635f42 Merge pull request #4970 from barryvdh/list-installed-default
Change default behavior of show/list to --installed by default
2016-02-29 16:29:34 +00:00
Jordi Boggiano a0de19f74d Fix feedback, refs #3199 2016-02-29 15:32:49 +00:00
Jordi Boggiano d24ea66892 Merge remote-tracking branch 'fduch/console-select-support' 2016-02-29 15:24:28 +00:00
Jordi Boggiano c2d78e5ce0 Restore GC and add comments to clarify why we turn it off, fixes #3488, closes #3503 2016-02-29 15:05:11 +00:00
Jordi Boggiano 0ed5b541a9 Fix CS 2016-02-29 15:05:11 +00:00
Jordi Boggiano 6825c04a62 Merge pull request #4799 from balbuf/balbuf/honor-class-name
createPackage() method should use the $class argument it accepts
2016-02-29 14:53:20 +00:00
Jordi Boggiano 2ff19e4c62 Fix JsonConfigSource fallback on php5.3, refs #4972 2016-02-29 14:17:24 +00:00
Jordi Boggiano f2e2dd8f86 Merge pull request #4972 from curry684/code-quality
Code quality
2016-02-29 14:14:49 +00:00