Skip to content

Commit

Permalink
Make some variables nullable
Browse files Browse the repository at this point in the history
  • Loading branch information
back-2-95 committed Dec 2, 2021
1 parent 52a64a7 commit ac75008
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
test: PHP := 8.0
test: vendor
@echo "Run composer test (all tests)"
@docker run --rm -it --volume $$PWD:/app druidfi/drupal:php-8.0 composer test
@docker run --rm -it --volume $$PWD:/app druidfi/drupal:php-$(PHP) composer test

test-%: PHP := 8.0
test-%: vendor
@echo "Run composer test-$*"
@docker run --rm -it --volume $$PWD:/app druidfi/drupal:php-8.0 composer test-$*
@docker run --rm -it --volume $$PWD:/app druidfi/drupal:php-$(PHP) composer test-$*

vendor:
composer install
10 changes: 5 additions & 5 deletions src/DrupalEnvDetector.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ class DrupalEnvDetector
];

private $app_env;
private array $config = [];
private array $config_directories = [];
private array $databases = [];
private $drupal_version = '';
private ?array $config = [];
private ?array $config_directories = [];
private ?array $databases = [];
private string $drupal_version = '';

/**
* @var EnvMappingAbstract
*/
private $omen;
private array $settings = [];
private ?array $settings = [];

public function __construct($settings_dir) {
global $config, $config_directories, $databases, $settings;
Expand Down

0 comments on commit ac75008

Please sign in to comment.