From d8823bc7dc80b167e6d6a8c6aa1cf697dd85e0e2 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Mon, 30 Jan 2017 11:55:13 +0100 Subject: [PATCH] Use JetBrains PHPStorm stubs from packagist (#264) * Use JetBrains PHPStorm stubs from packagist * Fix path --- composer.json | 20 +------------------- src/ComposerScripts.php | 4 ++-- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index d6ea39c..7974540 100644 --- a/composer.json +++ b/composer.json @@ -36,27 +36,9 @@ "webmozart/path-util": "^2.3", "webmozart/glob": "^4.1", "sabre/uri": "^2.0", - "JetBrains/phpstorm-stubs": "dev-master", + "jetbrains/phpstorm-stubs": "dev-master", "composer/composer": "^1.3" }, - "repositories": [ - { - "type": "package", - "package": { - "name": "JetBrains/phpstorm-stubs", - "version": "dev-master", - "dist": { - "url": "https://github.com/JetBrains/phpstorm-stubs/archive/master.zip", - "type": "zip" - }, - "source": { - "url": "https://github.com/JetBrains/phpstorm-stubs", - "type": "git", - "reference": "master" - } - } - } - ], "minimum-stability": "dev", "prefer-stable": true, "autoload": { diff --git a/src/ComposerScripts.php b/src/ComposerScripts.php index d9e11ab..c84a176 100644 --- a/src/ComposerScripts.php +++ b/src/ComposerScripts.php @@ -33,14 +33,14 @@ class ComposerScripts $definitionResolver = new DefinitionResolver($index); $stubsLocation = null; - foreach ([__DIR__ . '/../../../JetBrains/phpstorm-stubs', __DIR__ . '/../vendor/JetBrains/phpstorm-stubs'] as $dir) { + foreach ([__DIR__ . '/../../../jetbrains/phpstorm-stubs', __DIR__ . '/../vendor/jetbrains/phpstorm-stubs'] as $dir) { if (file_exists($dir)) { $stubsLocation = Path::canonicalize($dir); break; } } if (!$stubsLocation) { - throw new \Exception('JetBrains/phpstorm-stubs package not found'); + throw new \Exception('jetbrains/phpstorm-stubs package not found'); } $uris = yield $finder->find("$stubsLocation/**/*.php");