Fix phpstan's Variable might not be defined error and add #[\Return…

…TypeWillChange] to iterator methods
Icinga · Jun 21, 2023 · c0c9c6d · c0c9c6d
1 parent 4ab8345
commit c0c9c6d
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 1 deletion.
diff --git a/application/forms/Command/Object/ProcessCheckResultForm.php b/application/forms/Command/Object/ProcessCheckResultForm.php
@@ -65,6 +65,7 @@ protected function assembleElements()
 
  $decorator = new IcingaFormDecorator();
 
+ $object = null;
  foreach ($this->getObjects() as $object) {
  /** @var Model $object */
  // Nasty, but as getObjects() returns everything but an object with a real

diff --git a/application/forms/RedisConfigForm.php b/application/forms/RedisConfigForm.php
@@ -355,6 +355,7 @@ public function onSuccess()
  ));
 
  $useTls = $this->getElement('redis_tls')->isChecked();
+ $pem = null;
  foreach (['ca', 'cert', 'key'] as $name) {
  $textarea = $this->getElement('redis_' . $name . '_pem');
  if ($useTls && $textarea !== null && ($pem = $textarea->getValue())) {

diff --git a/library/Icingadb/Common/CommandActions.php b/library/Icingadb/Common/CommandActions.php
@@ -239,6 +239,7 @@ public function sendCustomNotificationAction()
  public function toggleFeaturesAction()
  {
  $commandObjects = $this->getCommandTargets();
+ $form = null;
  if (count($commandObjects) > 1) {
  $this->isGrantedOnCommandTargets('i/am-only-used/to-establish/the-object-auth-cache');
  $form = new ToggleObjectFeaturesForm($this->getFeatureStatus());

diff --git a/library/Icingadb/Compat/UrlMigrator.php b/library/Icingadb/Compat/UrlMigrator.php
@@ -114,6 +114,7 @@ protected function rewrite(Filter\Rule $filter, array $legacyColumns, Filter\Cha
  if ($filter instanceof Filter\Condition) {
  $column = $filter->getColumn();
 
+ $modelPath = null;
  if (isset($legacyColumns[$column])) {
  if ($legacyColumns[$column] === self::DROP) {
  return false;

diff --git a/library/Icingadb/Data/CsvResultSet.php b/library/Icingadb/Data/CsvResultSet.php
@@ -14,6 +14,7 @@ class CsvResultSet extends ResultSet
 {
  protected $isCacheDisabled = true;
 
+ #[\ReturnTypeWillChange]
  public function current()
  {
  return $this->extractKeysAndValues(parent::current());

diff --git a/library/Icingadb/Data/JsonResultSet.php b/library/Icingadb/Data/JsonResultSet.php
@@ -15,6 +15,7 @@ class JsonResultSet extends ResultSet
 {
  protected $isCacheDisabled = true;
 
+ #[\ReturnTypeWillChange]
  public function current()
  {
  return $this->createObject(parent::current());

diff --git a/library/Icingadb/Hook/CustomVarRendererHook.php b/library/Icingadb/Hook/CustomVarRendererHook.php
@@ -73,7 +73,7 @@ final public static function prepareForObject(Model $object): Closure
  }
  }
 
- return function (string $key, $value) use ($hooks, $object) {
+ return function (string $key, $value) use ($hooks) {
  $newKey = $key;
  $newValue = $value;
  $group = null;

diff --git a/library/Icingadb/Redis/VolatileStateResults.php b/library/Icingadb/Redis/VolatileStateResults.php
@@ -51,6 +51,7 @@ public function isRedisUnavailable(): bool
  return $this->redis === null;
  }
 
+ #[ReturnTypeWillChange]
  public function current()
  {
  if ($this->redis && ! $this->updatesApplied && ! $this->isCacheDisabled) {

diff --git a/library/Icingadb/Web/Control/ViewModeSwitcher.php b/library/Icingadb/Web/Control/ViewModeSwitcher.php
@@ -197,6 +197,8 @@ protected function assemble()
  */
  protected function getTitle(string $viewMode): string
  {
+ $active = null;
+ $inactive = null;
  switch ($viewMode) {
  case 'minimal':
  $active = t('Minimal view active');

diff --git a/library/Icingadb/Widget/Detail/DowntimeCard.php b/library/Icingadb/Widget/Detail/DowntimeCard.php
@@ -21,6 +21,10 @@ class DowntimeCard extends BaseHtmlElement
 
  protected $tag = 'div';
 
+ protected $start;
+
+ protected $end;
+
  public function __construct(Downtime $downtime)
  {
  $this->downtime = $downtime;

diff --git a/library/Icingadb/Widget/Detail/ObjectDetail.php b/library/Icingadb/Widget/Detail/ObjectDetail.php
@@ -547,6 +547,7 @@ protected function getUsersAndUsergroups(): array
  );
  }
 
+ $userQuery = null;
  if ($this->isPermittedRoute('users')) {
  $userQuery = User::on($this->getDb());
  $userQuery->filter($objectFilter);