Merge branch 'master' into php5

* master:
  Update Code Sniffer to version 1.5.6
This commit is contained in:
Andreas Fischer 2014-12-12 22:21:54 +01:00
commit 46075077ac

10
composer.lock generated
View File

@ -993,16 +993,16 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "1.5.5",
"version": "1.5.6",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "5d973e59cf58a0c847f298de84374c96b42b17b3"
"reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5d973e59cf58a0c847f298de84374c96b42b17b3",
"reference": "5d973e59cf58a0c847f298de84374c96b42b17b3",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6f3e42d311b882b25b4d409d23a289f4d3b803d5",
"reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5",
"shasum": ""
},
"require": {
@ -1064,7 +1064,7 @@
"phpcs",
"standards"
],
"time": "2014-09-25 03:33:46"
"time": "2014-12-04 22:32:15"
},
{
"name": "symfony/console",