Skip to content

Commit eeaca72

Browse files
authored
Update to phpstan:^0.11 (#28)
* Update to phpstan:^0.11 * Fix .json * Fix new check failure
1 parent 882c473 commit eeaca72

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
],
1111
"require": {
1212
"php": "^7.1",
13-
"phpstan/phpstan": "^0.10.6",
13+
"phpstan/phpstan": "^0.11",
1414
"symfony/yaml": "~3.4.5|^4.2",
1515
"webflo/drupal-finder": "^1.1"
1616
},
1717
"require-dev": {
18-
"phpstan/phpstan-strict-rules": "^0.10.1",
18+
"phpstan/phpstan-strict-rules": "^0.11",
1919
"squizlabs/php_codesniffer": "^3.3",
2020
"phpunit/phpunit": "^7.5"
2121
},
@@ -32,7 +32,7 @@
3232
},
3333
"extra": {
3434
"branch-alias": {
35-
"dev-master": "0.11-dev"
35+
"dev-master": "0.12-dev"
3636
}
3737
}
3838
}

src/DependencyInjection/DrupalExtension.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ public function loadConfiguration(): void
5858
$builder = $this->getContainerBuilder();
5959
$builder->parameters['drupalRoot'] = $this->drupalRoot;
6060

61+
/** @var array */
6162
$config = Helpers::merge($this->config, $this->defaultConfig);
6263

6364
$this->modules = $config['modules'] ?? [];
6465
$this->themes = $config['themes'] ?? [];
6566

66-
$builder->parameters['drupal']['entityTypeStorageMapping'] = $config['entityTypeStorageMapping'];
67+
$builder->parameters['drupal']['entityTypeStorageMapping'] = $config['entityTypeStorageMapping'] ?? [];
6768

6869
$builder = $this->getContainerBuilder();
6970
foreach ($builder->getDefinitions() as $definition) {

0 commit comments

Comments
 (0)