From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 26 Jul 2018 18:46:06 +0000 (+0000)
Subject: Merge "Update jetbrains/phpstorm-stubs"
X-Git-Tag: 1.34.0-rc.0~4653
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=b8308397fc6f70da129618f17d283b82435ee95e;p=lhc%2Fweb%2Fwiklou.git

Merge "Update jetbrains/phpstorm-stubs"
---

b8308397fc6f70da129618f17d283b82435ee95e
diff --cc composer.json
index bf9d1eb955,1a07c1eebf..dbc59a203b
--- a/composer.json
+++ b/composer.json
@@@ -56,12 -56,12 +56,12 @@@
  	},
  	"require-dev": {
  		"cache/integration-tests": "0.16.0",
 -		"composer/spdx-licenses": "1.3.0",
 +		"composer/spdx-licenses": "1.4.0",
  		"hamcrest/hamcrest-php": "^2.0",
  		"jakub-onderka/php-parallel-lint": "0.9.2",
- 		"jetbrains/phpstorm-stubs": "dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
+ 		"jetbrains/phpstorm-stubs": "dev-master#38ff1a581b297f7901e961b8c923862ea80c3b96",
  		"justinrainbow/json-schema": "~5.2",
 -		"mediawiki/mediawiki-codesniffer": "20.0.0",
 +		"mediawiki/mediawiki-codesniffer": "21.0.0",
  		"monolog/monolog": "~1.22.1",
  		"nikic/php-parser": "3.1.3",
  		"seld/jsonlint": "1.7.1",