public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code
12,531 Commits
3 Branches
206 Tags
52 MiB
Commit Graph

420 Commits (39110978231e3e1fcdefd2d684e845ef8ef0b51d)

Author SHA1 Message Date
Jordi Boggiano 9a5c5aec35
Bump semver to latest 2021-06-01 15:03:38 +02:00
Jordi Boggiano 991985792d
Merge branch '2.0' 2021-05-20 14:16:52 +02:00
Jérémy Derussé 68f86be726
Allow Symfony 6.0 (#9896) 2021-05-20 09:42:21 +02:00
Jordi Boggiano aa2e7c387a
Update deps 2021-05-17 15:09:03 +02:00
Jordi Boggiano cd682f90a6
Update xdebug-handler to latest 2021-04-27 13:10:36 +02:00
John Stevenson c3b76a8532
Upgrade to xdebug-handler 2 (#9832) 
This adds support for Xdebug3 modes and changes the default behaviour
from always restarting if Xdebug is loaded, to only restarting if Xdebug
is active.

Xdebug is considered active if it is loaded, and for Xdebug3, if it is
running in a mode other than `xdebug.mode=off`.
 2021-04-13 09:59:06 +02:00
Jordi Boggiano a4eb2d4096
Merge branch '2.0' 2021-04-07 15:58:25 +02:00
Jordi Boggiano ddc3693725
Switch to composer/metadata-minifier, fixes #9727 2021-04-07 15:56:34 +02:00
Jordi Boggiano 80c24864b6
Fix lock hash for master branch 2021-02-23 20:21:55 +01:00
Jordi Boggiano bab210777e
Update deps 2021-01-27 15:01:26 +01:00
Jordi Boggiano dc759a69b5
Update deps 2021-01-12 15:30:49 +01:00
Jordi Boggiano 29f4c0b92a
Merge branch '1.10' 2020-12-03 17:17:25 +01:00
Jordi Boggiano 8b71199443
Update deps 2020-12-03 17:15:50 +01:00
Jordi Boggiano b21ee81c99
Update lock file 2020-11-27 21:31:08 +01:00
Jordi Boggiano 59b7246523
Update semver to latest 2020-11-13 14:51:16 +01:00
Jordi Boggiano e1ead6027f
Update xdebug-handler to latest to fix tty detection 2020-11-13 09:06:50 +01:00
Jordi Boggiano cfb3b85454
Update semver to latest 2020-11-12 12:59:48 +01:00
Jordi Boggiano 07352eafa8
Update jsonlint 2020-11-12 10:41:06 +01:00
Jordi Boggiano fa3f1d5050
Update xdebug-handler 2020-10-24 14:58:27 +02:00
Jordi Boggiano 98d92a8694
Update deps 2020-10-24 10:37:21 +02:00
Jordi Boggiano 3fe0ae0442
Update semver to latest 2020-10-14 13:06:09 +02:00
Jordi Boggiano 03b8c3db3f
Merge branch '1.10' 2020-10-08 14:38:41 +02:00
Jordi Boggiano 2c6a9aba32
Update to latest semver 2020-10-08 14:29:20 +02:00
Jordi Boggiano 0408207e35
Merge branch '1.10' 2020-09-09 11:49:04 +02:00
Jordi Boggiano 44508319d1
Update semver and changelog 2020-09-09 11:46:28 +02:00
Jordi Boggiano 348964f2ed
Merge branch '1.10' 2020-09-08 23:03:29 +02:00
Jordi Boggiano a5f5838873
Update semver to latest 2020-09-08 22:57:43 +02:00
Jordi Boggiano e11d19c255
Update deps 2020-09-08 16:45:52 +02:00
Jordi Boggiano bce1e77c45
Bump dependencies 2020-09-08 16:33:57 +02:00
Jordi Boggiano 2646f09c2e
Update lock 2020-08-23 15:19:32 +02:00
Jordi Boggiano e5ba99cf67
Merge branch '1.10' 2020-08-23 15:18:48 +02:00
Jordi Boggiano 45246aca22
Update deps, fixes #9125 2020-08-23 15:06:23 +02:00
Jordi Boggiano c3028c02d9
Merge branch '1.10' 2020-07-17 13:18:02 +02:00
Jordi Boggiano ff7f9dcf2d
Update deps 2020-07-17 13:00:41 +02:00
Jordi Boggiano 662d6d8351
Update lock file 2020-06-05 14:38:31 +02:00
johnstevenson 26c7234a0d Update xdebug-handler to 1.4.2 2020-06-04 12:43:37 +01:00
Jordi Boggiano 29761cf78d
Update lock 2020-06-03 14:56:59 +02:00
Jordi Boggiano 2490a857cb
Bump phpunit-bridge version 2020-06-03 10:24:27 +02:00
Jordi Boggiano 50ab8a7b5f
Merge branch '1.10' 2020-06-03 10:06:38 +02:00
Jordi Boggiano 547763ab67
Update changelog 2020-06-03 10:03:43 +02:00
Jordi Boggiano d8ada9e585
Merge branch '1.10' 2020-05-27 22:09:13 +02:00
Jordi Boggiano f7abfc9d7f
Update deps 2020-05-27 22:07:55 +02:00
Jordi Boggiano 0a3d87512d
Update deps 2020-05-27 21:57:40 +02:00
Jordi Boggiano 863e7076ba
Bump to use composer/semver 3.x 2020-05-26 19:18:34 +02:00
Jordi Boggiano c7fb15faf4
Update to MatchAllConstraint 2020-05-21 16:12:41 +02:00
Jordi Boggiano 4e1f8cf89d
Build tweaks 2020-05-20 16:20:54 +02:00
Jordi Boggiano 0a4df6c3b4
Bump PHPUnitBridge to higher release as it still supports php 5.3 2020-05-20 09:52:49 +02:00
Jordi Boggiano 45d3e133a4
Avoid checking for unbounded constraints in platform checks 2020-05-19 17:15:08 +02:00
Jordi Boggiano a40e6157de
Update deps 2020-05-19 16:40:45 +02:00
Jordi Boggiano 7d87688032
Fix 5.3 build 2020-05-06 10:22:44 +02:00
Jordi Boggiano ebefcdbd7e
Update to latest semver, refs #8783 2020-05-06 10:00:50 +02:00
Jordi Boggiano 21aeef1365
Allow php 8 tests to run, require latest semver dev 2020-05-04 14:33:58 +02:00
Jordi Boggiano 11cd3e0a28
Update lock file 2020-04-30 15:21:55 +02:00
Jordi Boggiano 62cd332a57
Go back to stable composer/semver 2020-04-21 15:30:46 +02:00
Jordi Boggiano af18c2bd7d
Update semver, fix poolbuilder usage and optimize creation of filtering nameConstraints 2020-04-21 14:50:11 +02:00
Yanick Witschi e23710f92d
Implemented php version check in autoload.php (#8546) 2020-04-21 08:59:36 +02:00
Jordi Boggiano eeca9f68ad
Merge branch '1.10' 2020-04-08 10:34:45 +02:00
Jordi Boggiano ff3f055439
Update deps 2020-04-08 10:33:15 +02:00
Jordi Boggiano 7b273e2e25
Update deps 2020-04-07 14:14:05 +02:00
Jordi Boggiano a7a975ec1c
Alias dev-master/trunk/default to 9999999-dev instead of normalizing the version to that, fixes #8323 2020-03-11 15:04:18 +01:00
Jordi Boggiano d63eb8179e
Merge branch 'master' into 2.0 2020-03-10 14:05:33 +01:00
Jordi Boggiano 414bc18088
Update deps 2020-03-10 13:56:10 +01:00
johnstevenson 887f8cda08 Update xdebug-handler to 1.4.1 2020-03-01 12:56:24 +00:00
Jordi Boggiano 2e82e34fe0
Merge branch 'master' into 2.0 2020-02-14 17:03:29 +01:00
Jordi Boggiano ee2252c6ac
Add lint check after phar is built 
The initial 1.10.0-RC build (593b8dfb29)
had what looks like a bit flip of one > into a :, causing a parse error as $foo->bar became $foo-:bar in some class.

This is quite unpleasant and easy to miss as it requires including the file in question before the error is spotted.

It was quite lucky I ran a composer install with the new phar right after to do something else and spotted the error.

Linting all files covers this problem mostly, at least for the PHP files.
 2020-02-14 16:36:14 +01:00
Jordi Boggiano bc002ae1fb
Merge branch 'master' into 2.0 2020-02-14 15:42:17 +01:00
Jordi Boggiano c49a81cf17
Update deps 2020-02-14 15:11:21 +01:00
Jordi Boggiano 45ecbae8f5
Merge branch 'master' into 2.0 2020-02-07 22:20:51 +01:00
Ion Bazan 8d3c1f4a71 downgrade PHPUnit Bridge to 3.4 (fail-fast when passthru fails) 2020-02-07 16:17:18 +08:00
Ion Bazan a2137d5263 use Symfony PHPUnit Bridge 2020-02-07 12:22:22 +08:00
Jordi Boggiano 23359f2db6
Merge branch 'master' into 2.0 2020-01-13 13:35:52 +01:00
Jordi Boggiano c5e61f3466
Merge branch '1.9' 2020-01-13 13:18:58 +01:00
Jordi Boggiano c5873e11f2
Update deps 2020-01-13 13:17:32 +01:00
Jordi Boggiano f05e78aa9e
Merge pull request #8417 from johnstevenson/xdebug-handler-1.4.0 
Update xdebug-handler to 1.4.0
 2019-12-07 21:17:56 +01:00
Jordi Boggiano 88b051c96b
Merge branch 'master' into 2.0 
Update deps
 2019-11-23 12:27:41 +01:00
KyleKatarn b09fef659b
Update composer.lock 2019-11-16 17:58:39 +01:00
johnstevenson 7de68bebe6 Update xdebug-handler to 1.4.0 2019-11-06 17:14:14 +00:00
Jordi Boggiano 4e4c38795a
Merge branch '1.9' 2019-11-01 17:29:20 +01:00
Jordi Boggiano 1c012b74a6
Update dependencies 2019-11-01 17:20:09 +01:00
Jordi Boggiano bc2a1d762a
Merge branch 'master' into 2.0 2019-10-30 08:54:44 +01:00
Jordi Boggiano f753c15664
Update deps 2019-10-06 22:15:11 +02:00
Jordi Boggiano b60e44c1dc
Update deps 2019-08-02 20:41:50 +02:00
Nils Adermann d2fa1e1319 Merge branch 'master' into 2.0 
* master: (48 commits)
  SVN: hide passwords for debug output
  Free $solver asap
  fixes #8179
  [minor] Fixed a typo in the CHANGELOG.md.
  Update deps
  Update changelog
  Revert "Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET" Revert "Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151"
  Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151
  Fix display of HHVM warning appearing when HHVM is not in use, fixes #8138
  Read classmap-authoritative and apcu-autoloader from project config when installing via create-project, fixes #8155
  Use possessive quantifiers
  Update xdebug-handler to 1.3.3
  fixes #8159
  Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET
  flag should come before script name
  use full command name, not abbreviated/alias
  modify text
  Document the alternatives to disable the default script timeout
  Anchor pattern
  Fix URL resolution for Composer repositories
  ...
 2019-06-27 14:08:00 +02:00
Jordi Boggiano 76da8d792e
Update deps 2019-06-11 15:08:33 +02:00
Jordi Boggiano fbb964888d
Merge branch '1.8' 2019-06-07 13:12:21 +02:00
johnstevenson 9d79c69199 Update xdebug-handler to 1.3.3 2019-06-04 09:21:38 +02:00
Markus Staab c35a3c1c07 update composer.lock 2019-05-02 09:35:13 +02:00
Jordi Boggiano 3785255e09
Merge branch '1.8' 2019-04-09 17:47:21 +02:00
Jordi Boggiano de0251953d
Update composer deps 2019-04-09 17:46:33 +02:00
Jordi Boggiano 0317199507
Merge branch 'master' into 2.0 2019-04-01 18:03:34 +02:00
Jordi Boggiano 4441be1a05
Update deps 2019-03-19 18:31:12 +01:00
Jordi Boggiano 9c32808782 Merge branch 'master' into 2.0 2019-01-30 08:33:13 +01:00
Jordi Boggiano f42d4d9ede Merge branch '1.8' 2019-01-29 15:02:53 +01:00
johnstevenson 909d1c430e Update xdebug-handler, fixes #7921 2019-01-28 20:52:02 +00:00
Jordi Boggiano 0b928b2a42 Merge branch 'master' into 2.0 2019-01-28 14:33:10 +01:00
Jordi Boggiano 4fdebb1b69 Merge branch '1.8' 2019-01-28 14:31:31 +01:00
Jordi Boggiano c5cc178375 Update to latest CA bundle 2019-01-28 14:31:16 +01:00
Jordi Boggiano ea978ee7f8 Update react/promise requirement 2019-01-18 08:46:46 +01:00
Jordi Boggiano e753bf08b1 Minor tweaks 2019-01-14 17:29:24 +01:00
Jordi Boggiano 56805ecafe Add HttpDownloader to wrap/replace RemoteFilesystem with a new curl multi implementation 2019-01-14 17:29:23 +01:00
Christopher Hertel 894b3da970 updating lock file hash 2018-12-26 21:21:45 +01:00
Jordi Boggiano 6ed7215fed Merge remote-tracking branch 'origin/1.7' 2018-11-30 08:53:44 +01:00
johnstevenson ab165cfcd6 Update xdebug-handler, fixes #7807 2018-11-29 14:25:01 +00:00
Jordi Boggiano 17fd933fd5 Update dependencies 2018-11-27 12:22:32 +01:00
Jordi Boggiano 2528654c53 Merge branch '1.7' 2018-10-31 18:13:39 +01:00
Jordi Boggiano 470d351926 Update ca-bundle 2018-10-31 16:13:37 +01:00
Jordi Boggiano 9c4df4d482 Update deps 2018-09-10 14:06:28 +02:00
Jordi Boggiano 92dc2cd9ad Merge branch '1.7' 2018-09-05 00:29:03 +02:00
johnstevenson 2023690c7d Update xdebug-handler, fixes #7596 2018-09-01 11:26:03 +01:00
Jordi Boggiano d100620987 Merge branch '1.7' 2018-08-25 18:49:56 +02:00
Jordi Boggiano 3b587eed21 Update xdebug-handler to latest, fixes #7436 2018-08-25 18:48:56 +02:00
Jordi Boggiano c46f9f061a Update deps 2018-08-22 09:43:30 +02:00
Jordi Boggiano b8e8cc2516 Update xdebug-handler, fixes #7517 2018-08-16 15:18:40 +02:00
Jordi Boggiano 1e6ceea0f9 Update to latest CA bundle 2018-08-10 08:52:30 +02:00
Jordi Boggiano 02d56da414 Update deps 2018-07-24 13:45:41 +02:00
Jordi Boggiano 00fdb5555c Update lock file 2018-07-20 13:48:39 +02:00
Helmut Hummel b99798068d Use symfony/console for hidden questions 
Fixes: #7337
 2018-05-14 17:05:36 +02:00
Jordi Boggiano 03fb68009c Merge branch '1.6' 2018-04-13 15:44:15 +02:00
Jordi Boggiano 38866ba310 Merge remote-tracking branch 'johnstevenson/external-xdebug' 2018-04-13 15:38:27 +02:00
Jordi Boggiano 0704cd5142 Revert symfony/console to 2.8.37 
Workaround for issues caused by https://github.com/symfony/symfony/pull/26609

Fixes #7264
 2018-04-13 15:26:34 +02:00
Jordi Boggiano 2bd34c0534 Merge branch '1.6' 2018-04-12 17:01:00 +02:00
Jordi Boggiano 7afd1a9385 Update dependencies 2018-04-12 15:54:55 +02:00
johnstevenson 30e9ede1e3 Update to 1.1.0 release 2018-04-11 17:19:13 +01:00
johnstevenson ed97c2116c Use external XdebugHandler library 2018-03-08 19:20:16 +00:00
Jordi Boggiano 9f34ee9892 Merge branch '1.6' 2018-01-31 16:23:09 +01:00
Jordi Boggiano 9b3ab4896d Update SPDX licenses to 1.3.0, fixes #7039 2018-01-31 14:20:29 +01:00
Jordi Boggiano 8c7b13e9be Update content hash 2018-01-04 14:38:40 +01:00
Jordi Boggiano 5e223dae61 Update jsonlint dep 2018-01-04 14:27:50 +01:00
Jordi Boggiano 5cd0fef7ff Upgrade to SPDX License 3.0 and handle deprecations more gracefully, fixes #6951 2018-01-04 10:42:46 +01:00
Jordi Boggiano d30d5b36ed Update deps 2017-12-18 17:34:34 +01:00
Gabriel Caruso afc9a7643e Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase 2017-11-30 13:44:43 -02:00
Jordi Boggiano 36c131cf33 Update deps 2017-11-29 15:58:36 +01:00
Jordi Boggiano 5130d02208 Update to latest ca-bundle 2017-11-29 10:41:53 +01:00
Jordi Boggiano 6c1da86437 Update deps 2017-09-11 17:04:05 +02:00
Jordi Boggiano 0745216c57 Bump cabundle 2017-09-11 16:58:55 +02:00
Jordi Boggiano 9f743a6fe8 Update dependencies 2017-08-08 10:24:23 +02:00
Jordi Boggiano 00a6b7c794 Merge branch '1.4' 2017-03-24 09:35:16 +01:00
Jordi Boggiano 3347ad7020 Bump cli-prompt to 1.0.3 2017-03-24 09:22:47 +01:00
Jordi Boggiano 5b63ce3ef3 Update lock hash 2017-03-10 09:58:02 +01:00
Jordi Boggiano a5ed32982d Update deps 2017-03-08 17:51:11 +01:00
Jordi Boggiano 7d5d884669 Update to latest jsonlint 2017-03-06 17:51:44 +01:00
Jordi Boggiano 406bb606c3 Update to latest CA-bundle 2017-03-06 13:10:49 +01:00
Jordi Boggiano e8903746e8 Allow json-schema v5 too, fixes #6163 2017-03-06 12:47:05 +01:00
Jordi Boggiano ab73b6e42a Update deps 2017-03-06 12:41:53 +01:00
Jordi Boggiano 87b68e8c2f Merge pull request #6013 from stof/repository_schema 
Implement schema validation for repositories
 2016-12-31 16:42:14 +01:00
Plamen Garkov ab4322148f adding "fatal: unable to access" to authFalures 2016-12-31 16:29:12 +01:00
Christophe Coevoet 6daa2afdd3 Fix the handling of references in JSON schemas when validating 
References must be resolved when loading the schema, otherwise they will fail
when using them.
The easiest way is actually to let the JsonSchema library load the file itself.
 2016-12-29 17:29:54 +01:00
Jordi Boggiano d5d710421c Update dependencies 2016-12-06 23:54:00 +01:00
Jordi Boggiano eb40287691 Bump symfony deps to 2.7 and update all deps, closes #5840, closes #5831 2016-11-03 11:18:22 +01:00
Jordi Boggiano aa051ba4f0 Update deps 2016-10-12 16:57:43 +02:00
Jonas Stendahl bc549c34a6
Upgrade json-schema to allow v4 2016-10-11 17:15:17 +02:00
Jordi Boggiano 20ee689bb4 Upgrade json-schema to allow v3 and upgrade other deps 2016-09-14 18:06:37 +02:00
Jordi Boggiano c16ca1ccbe Update deps, refs #5646 2016-09-05 10:57:50 +02:00
Jordi Boggiano 90b99ea5c2 Update semver dep 2016-08-30 18:12:35 +02:00
Jordi Boggiano ef0d6f6e4c Update deps 2016-07-19 01:27:54 +02:00
Jordi Boggiano 866820f334 Update deps 2016-07-02 18:33:47 +01:00
Jordi Boggiano 0715ad961b Update deps 2016-06-27 15:13:21 +01:00
Jordi Boggiano 02628acf26 Merge branch '1.1' 2016-06-02 10:22:15 +01:00
Jordi Boggiano cb71873aa1 Update semver dep, fixes #5397 2016-06-02 10:22:07 +01:00
Jordi Boggiano 06c45623d7 Update json-schema & other deps, fixes #5374 2016-05-26 17:11:16 +01:00
Jordi Boggiano 921af1c1b8 Merge branch '1.1' 2016-05-10 15:20:41 +01:00
Jordi Boggiano 4b0d368af5 Update deps 2016-05-10 15:19:35 +01:00
Jordi Boggiano fea56cb69c Update deps 2016-05-05 14:25:20 +01:00
Jordi Boggiano b018292357 Update deps, fixes #5209 2016-04-18 10:34:38 +01:00
Jordi Boggiano 81df1b6cb0 Update cabundle dep 2016-04-11 19:02:57 +01:00
Jordi Boggiano 1557f46e07 Update deps 2016-04-11 16:51:17 +01:00
Rob Bast 5f6d7b26e9 update composer/semver 2016-02-25 23:35:19 +01:00
Jordi Boggiano ef288bf949 Update deps 2016-02-17 15:53:18 +00:00
Chris Smith 8debdf8764 Zip extension does not provide zlib support 2016-02-04 00:34:01 +00:00
Jordi Boggiano a2fc502c20 Update dependencies 2016-01-18 12:41:09 +00:00
Jordi Boggiano 48420a2411 Update deps and bump json-schema requirement, fixes #4756 2016-01-09 16:52:06 +00:00
Jordi Boggiano c9501a4cc1 Update dependencies, fixes #4706 2015-12-16 18:51:41 +00:00
Jordi Boggiano e87190e3da Detect duplicate keys in composer.json, fixes #4620 2015-11-21 02:35:00 +00:00
Jordi Boggiano 6f21bd425a Update deps 2015-11-10 11:56:06 +00:00
Rob Bast 07da489245 update semver and spdx 2015-11-05 11:24:43 +01:00
Jordi Boggiano 32ec1a756f Bump dependencies and allow symfony3 2015-10-28 04:44:12 +00:00
Jordi Boggiano 742c1d6691 Switch to psr-4, closes #4531 2015-10-28 03:17:26 +00:00
Jordi Boggiano e093b9d594 Update deps, refs #4427 2015-10-28 02:44:08 +00:00
Rob Bast 3a289ed5c3 regenerate lock with latest composer 2015-09-24 16:35:54 +02:00
Rob Bast 1ccfc8eb96 add semver, deprecated existing classes 2015-09-24 16:28:28 +02:00
Jordi Boggiano 66acee7feb Add config.platform to the list of locked properties 2015-09-12 23:04:37 +01:00
Jordi Boggiano 1215e194ed Update deps 2015-09-12 22:31:24 +01:00
Samuel ROZE ead68d3d49 Create the path repository and downloader 2015-08-18 14:40:48 +01:00
Jordi Boggiano 3d962879a8 Update deps 2015-08-14 14:55:08 +01:00
Rob Bast ab08e4be62 update spdx-licenses to 1.1.0 
includes latest licenses and exceptions list
 2015-07-17 08:19:33 +02:00
Rob Bast bb1e1b0160 update lock file 2015-07-16 12:03:35 +02:00
Rob Bast 1f006a499e updated compiler class to include spdx sources 2015-07-16 12:03:34 +02:00
Rob Bast 5ae9e7fe22 remove spdx files, introduce external library 2015-07-16 11:42:12 +02:00
Jordi Boggiano a6d23dcec8 Update deps 2015-06-11 11:22:17 +01:00
Jordi Boggiano 8825ed9a59 Update lockfile hash 2015-05-06 15:26:48 +01:00
Jordi Boggiano 7d8209ef85 Bump lock hash 2015-05-01 15:58:29 +01:00
Jordi Boggiano b7c827c2e5 Use external lib for hidden cli prompting 2015-05-01 15:50:01 +01:00
Jordi Boggiano 96a44622a8 Update phar utils lib 2015-05-01 13:53:49 +01:00
Jordi Boggiano facdd8a503 Add phar-utils package to update timestamps after the build is done, refs #3927 2015-05-01 13:50:16 +01:00
Jordi Boggiano e2b183136c Workaround for https://github.com/facebook/hhvm/issues/5170 2015-04-29 23:22:51 +01:00
Jordi Boggiano e10539751c Update deps and add platform definition to prevent regressions on php dep 2015-04-29 22:47:00 +01:00
Jordi Boggiano ddd6ea1c2f Update deps 2015-03-24 00:12:43 +00:00
Jordi Boggiano c2f2ddfa5c Merge remote-tracking branch 'GromNaN/prophecy' 
Conflicts:
	composer.lock
 2015-02-25 12:03:58 +00:00
Jérôme Tamarelle 9c58fd725f Update deps 2015-02-21 11:08:47 +01:00
Rob Bast 85182cf7e1 Update dependency version constraint 2015-02-20 13:57:16 +01:00