← All changes
|
vendor/composer/installers/src/Composer/Installers/GravInstaller.php
+5
-6
1.10
→
trunk
View file →
| @@ -1,9 +1,11 @@ | ||
| 1 | 1 | <?php |
| 2 | + | |
| 2 | 3 | namespace Composer\Installers; |
| 3 | 4 | |
| 4 | 5 | class GravInstaller extends BaseInstaller |
| 5 | 6 | { |
| 7 | + /** @var array<string, string> */ | |
| 6 | 8 | protected $locations = array( |
| 7 | 9 | 'plugin' => 'user/plugins/{$name}/', |
| 8 | 10 | 'theme' => 'user/themes/{$name}/', |
| 9 | 11 | ); |
| @@ -9,19 +11,16 @@ | ||
| 9 | 11 | ); |
| 10 | 12 | |
| 11 | 13 | /** |
| 12 | 14 | * Format package name |
| 13 | - * | |
| 14 | - * @param array $vars | |
| 15 | - * | |
| 16 | - * @return array | |
| 17 | 15 | */ |
| 18 | - public function inflectPackageVars($vars) | |
| 16 | + public function inflectPackageVars(array $vars): array | |
| 19 | 17 | { |
| 20 | 18 | $restrictedWords = implode('|', array_keys($this->locations)); |
| 21 | 19 | |
| 22 | 20 | $vars['name'] = strtolower($vars['name']); |
| 23 | - $vars['name'] = preg_replace('/^(?:grav-)?(?:(?:'.$restrictedWords.')-)?(.*?)(?:-(?:'.$restrictedWords.'))?$/ui', | |
| 21 | + $vars['name'] = $this->pregReplace( | |
| 22 | + '/^(?:grav-)?(?:(?:'.$restrictedWords.')-)?(.*?)(?:-(?:'.$restrictedWords.'))?$/ui', | |
| 24 | 23 | '$1', |
| 25 | 24 | $vars['name'] |
| 26 | 25 | ); |
| 27 | 26 | |