1
0
Fork 0
Commit Graph

6963 Commits (8cf9733001d2bc6f063c09de3cd9371f29268911)

Author SHA1 Message Date
Rob 8cf9733001 Merge pull request #5810 from hason/doc
Fix class in DocBlock
2016-10-24 13:10:31 +02:00
Martin Hasoň 2b67a9044e Fix class in DocBlock 2016-10-24 12:31:27 +02: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
Jordi Boggiano 88f09919ce Merge pull request #5784 from nicolas-grekas/fix
Fix ShowCommand
2016-10-14 16:16:27 +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 aa051ba4f0 Update deps 2016-10-12 16:57:43 +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 ce2d33de9f Merge pull request #5781 from jyggen/feature/json-schema-v4
Upgrade json-schema to allow v4
2016-10-12 16:48:05 +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
Jordi Boggiano edb05d1385 Merge pull request #5782 from naderman/t/github-integration
GitHub integrations generate access tokens containing a dot
2016-10-12 11:38:19 +02:00
Nils Adermann ad41c324d3 GitHub integrations generate access tokens containing a dot 2016-10-12 11:36:01 +02:00
Jonas Stendahl bc549c34a6
Upgrade json-schema to allow v4 2016-10-11 17:15:17 +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 092dec9596 Add failing test for #5771 2016-10-10 18:12:24 +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 33cbe6195e Merge pull request #5775 from tomasfejfar/docs/repository-object-format
Clarify allowed format for repositories key
2016-10-10 14:45:49 +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 af519de0de Merge pull request #5752 from alcohol/amend-composer-repository-schema
changes based on feedback from @stof in #5739
2016-10-10 14:05:22 +02:00
Jordi Boggiano c0e28a9043 Remove static/public method 2016-10-10 14:03:30 +02:00
Rob e1d1a73cad Update 04-schema.md
Wrap line-length and modify phrasing
2016-10-10 10:10:06 +02:00
Kévin Dunglas 3e3fd3c6b1
Remove unused variable 2016-10-09 22:40:30 +02:00
Tomáš Fejfar dbc5d3a83f Clarify allowed format for repositories key
Using JSON object should be discouraged as there is no explicit order
of keys in JSON object. Even though it's deterministic in current PHP
version, it may change any time. As stated on http://json.org/:
"An object is an unordered set of name/value pairs. An object begins
with { (left brace) and ends with } (right brace). Each name is
followed by : (colon) and the name/value pairs are separated
by , (comma)."

Fixes #2802.
2016-10-09 22:24:14 +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
Jordi Boggiano fd891d2e78 Merge pull request #5758 from stof/clean_test_namespace
Fix namespace for tests for consistency
2016-10-08 10:06:14 +02:00
Jordi Boggiano ca1168478b Remove expander blocks in issue template 2016-10-08 09:59:18 +02:00
Jordi Boggiano 823a673b12 Merge pull request #5770 from fabpot/var-decl-missing
added missing var declaration
2016-10-08 09:55:45 +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
Christophe Coevoet d5810c8a36 Fix namespace for tests for consistency 2016-10-05 10:45:22 +02:00
Rob Bast a45ae5f585
fix test 2016-10-04 13:23:25 +02:00
Rob Bast 62a890df5c
add dist/source to package definition 2016-10-04 13:20:37 +02:00
Rob Bast 64317e1ff8
bring arraydumper in line with json schema spec and packagist 2016-10-04 13:15:09 +02:00
Rob Bast 585773a3cc
changes based on feedback from @stof in #5739 2016-10-04 13:05:06 +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
Jordi Boggiano d0206233f3 Merge pull request #5739 from alcohol/composer-repository-json-schema
[wip] composer repository json schema
2016-10-04 11:34:49 +02:00
Rob Bast 9437122acc
composer repository json schema 2016-10-04 11:34:28 +02:00
Yanick Witschi 7b5fe5c7d4 CS 2016-10-04 10:40:18 +02:00
Jordi Boggiano af41a814b5 Merge pull request #5747 from alcohol/remove-includes-from-docs
remove 'includes' references from docs
2016-10-03 19:50:51 +02:00
Rob Bast 7377db32ae
remove 'includes' references from docs
Relates to #5739 - we do not want to mention attributes/properties that
are considered legacy and/or deprecated.

Also reflowed some lines.
2016-10-03 10:14:57 +02:00
Jordi Boggiano 32e3464e02 Merge pull request #5740 from dzuelke/platform_zts_debug
Add php-debug and php-zts virtual platform packages
2016-10-01 14:08:16 +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