1
0
Fork 0
Commit Graph

7192 Commits (d835983b15f030ef9e699f8ece470840fac92f52)

Author SHA1 Message Date
Jordi Boggiano f0f932fca4 Fix classmap test on windows 2016-09-10 12:52:23 +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 70ccac6ba2 Merge pull request #5532 from zomberg/class_map_generator_test
Added test for 'dump' method of ClassMapGenerator class
2016-09-10 12:28:36 +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 6ec8b2bfd6 Update locker tests 2016-09-10 11:41:07 +02:00
Jordi Boggiano 788f32ac93 Allow running test suite with osx tar, fixes #5662 2016-09-10 11:38:52 +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
Jordi Boggiano 0f2e89534d Merge pull request #5657 from alcohol/update-issue-template
update github issue template
2016-09-08 12:35:48 +02:00
Rob Bast 3784558f11
update github issue template 2016-09-08 12:17:51 +02:00
johnstevenson 0256f62b3b Fix and rationalize tests 2016-09-06 20:17:18 +01:00
johnstevenson 589b1d6fa2 Fix hhvm not running tests in a separate process 2016-09-06 16:35:56 +01: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
Jordi Boggiano 909dbf5731 Merge branch '1.2' 2016-09-05 10:58:20 +02:00
Jordi Boggiano c16ca1ccbe Update deps, refs #5646 2016-09-05 10:57:50 +02:00
Jordi Boggiano 2e55605bc5 Add gitattributes for yml files 2016-09-04 14:24:55 +02:00
Jordi Boggiano 356bebcdcd Merge pull request #5634 from TomasVotruba/patch-1
appveyor.yml: use one type of indentation
2016-09-04 14:24:10 +02: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
Rob 054f5305b7 Merge pull request #5640 from yaman-jain/master
JSON standard do not allow trailing comma
2016-09-02 15:32:46 +02:00
Yaman Jain 66950f0354 JSON standard do not allow trailing comma 2016-09-02 17:33:06 +05:30
Jordi Boggiano 3d09c17b48 Merge branch '1.2' 2016-08-30 18:12:39 +02:00
Jordi Boggiano 90b99ea5c2 Update semver dep 2016-08-30 18:12:35 +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 92c8a45bda Merge branch '1.2' 2016-08-30 15:20:53 +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
Tomáš Votruba 237ec4dced appveyor.yml: use one type of indentation
2 spaces as in `travis.yml` and in the beginning of this file:

```
platform:
  - x86
  - x64
```

To make this united.
2016-08-29 15:15:58 +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
Jordi Boggiano d2b164cba3 Merge remote-tracking branch 'john-whitley/master' 2016-08-26 11:31:17 +02:00
Frank van den Brink d5dbe5743a
Fixed typo in --minor-only option documentation 2016-08-26 11:14:08 +02:00
Frank van den Brink 12cee0b927
Added --minor-only option to documentation 2016-08-26 11:12:27 +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
Frank van den Brink 79d1a050e3
Merge branch 'master' of github.com:fvdb/composer into add-minor-only-option 2016-08-26 10:33:10 +02:00
Frank van den Brink 28851ecdca
Revert "Added minor-only option to only show packages with minor updates"
This reverts commit 4b0e40d482.
2016-08-26 10:32:57 +02:00