1
0
Fork 0
Commit Graph

6813 Commits (2e55605bc597b07554a5df33dbfd0b28157322d6)

Author SHA1 Message Date
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
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
Jesse Donat 9f7ea6e2dc Updates docs 2016-08-18 15:09:16 -05:00
Jesse Donat 4de11a955a Adds --no-suggest to RequireCommand 2016-08-18 13:46:19 -05:00
Rob 0aec42521b Merge pull request #5604 from jcchavezs/add_no_suggest_option_to_docs
Adds --no-suggestion flag to the docummentation
2016-08-16 11:42:11 +02:00
José Carlos Chávez c28fe2b507 Adds --no-suggestion flag to the documentation for the install and update commands. 2016-08-16 11:18:19 +02: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
Rob f2fc70fd79 Merge pull request #5598 from jadb/patch-1
Fix support for testing exit code
2016-08-15 09:14:45 +02:00
Jad Bitar 8625efd551 Fix support for testing exit code
The `$sectionData` was being overwritten, causing its assertion 
(`$this->assertSame()`) to fail.
2016-08-15 00:30:20 -04:00
ianlet 5874132857 return https url of the repository given gitlab project is public 2016-08-11 23:00:18 -04:00
Rob a33b205561 Merge pull request #5582 from diegoholiveira/issue/5565
Modify the message for memory errors
2016-08-10 08:30:51 +02:00
Diego Oliveira c55fd9bd10 Modify the message for memory errors 2016-08-09 21:31:19 -03:00
Jordi Boggiano 034f1cf591 Merge pull request #5558 from nicolas-grekas/nocow
Add ClassLoader::$missingClasses to not trigger a COW
2016-07-28 13:34:05 +02:00
Nicolas Grekas dd67b01ac5 Add ClassLoader::$missingClasses to not trigger a COW 2016-07-28 10:35:44 +02:00
Jordi Boggiano 8e2f5e741c Merge pull request #5553 from alcohol/fix-basic-auth-gitutil
check for additional possible authentication failure strings in gitutil
2016-07-28 09:58:08 +02:00
Rob 7304ab6ff9 Merge pull request #5557 from tobiasbueschel/master
add link to LICENSE file & reformat Authors section in README.md
2016-07-28 08:54:19 +02:00
Tobias Büschel 1bc0f8e0e9 reformat author section 2016-07-27 18:01:27 -04:00
Tobias Büschel c28ee623ae add link to license file 2016-07-27 17:44:15 -04:00
Jordi Boggiano 4a4e5726dd Merge pull request #5544 from alcohol/update-readme
Update readme
2016-07-26 15:51:33 +02:00
Rob Bast 02455712cf check for additional possible output strings, fixes #5543 2016-07-26 11:46:51 +02:00
Frank van den Brink 4b0e40d482
Added minor-only option to only show packages with minor updates 2016-07-26 09:39:56 +02:00
Rob Bast a480e53234 simplify the readme, defer to documentation 2016-07-25 09:02:43 +02:00
Rob Bast 04605e4f90 update ccoc to v1.4 2016-07-25 09:00:49 +02:00