Phpstan: Fix deprecated function param types (#2858)

Icinga · Feb 5, 2024 · c653696 · c653696
2 parents 35c6086 + 9cccd90
commit c653696
Show file tree

Hide file tree

Showing 65 changed files with 132 additions and 121 deletions.
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
@@ -370,7 +370,7 @@ public function diffAction()
 
         $configs = $db->enumDeployedConfigs();
         foreach (array($leftSum, $rightSum) as $sum) {
-            if (! array_key_exists($sum, $configs)) {
+            if ($sum && ! array_key_exists($sum, $configs)) {
                 $configs[$sum] = substr($sum, 0, 7);
             }
         }

diff --git a/application/controllers/ImportsourcesController.php b/application/controllers/ImportsourcesController.php
@@ -30,7 +30,7 @@ public function indexAction()
         }
 
         $this->addTitle($this->translate('Import source'))
-            ->setAutoRefreshInterval(10)
+            ->setAutorefreshInterval(10)
             ->addAddLink(
                 $this->translate('Add a new Import Source'),
                 'director/importsource/add'

diff --git a/application/controllers/JobsController.php b/application/controllers/JobsController.php
@@ -11,7 +11,7 @@ class JobsController extends ActionController
     public function indexAction()
     {
         $this->addTitle($this->translate('Jobs'))
-            ->setAutoRefreshInterval(10)
+            ->setAutorefreshInterval(10)
             ->addAddLink($this->translate('Add a new Job'), 'director/job/add')
             ->tabs(new ImportTabs())->activate('jobs');
 

diff --git a/application/controllers/SchemaController.php b/application/controllers/SchemaController.php
@@ -62,7 +62,7 @@ protected function loadSchema($type)
         return file_get_contents(
             sprintf(
                 '%s/schema/%s.sql',
-                $this->Module()->getBasedir(),
+                $this->Module()->getBaseDir(),
                 $type
             )
         );

diff --git a/application/controllers/SelfServiceController.php b/application/controllers/SelfServiceController.php
@@ -194,7 +194,7 @@ protected function makePowerShellBoolean($value)
         } else {
             throw new ProgrammingError(
                 'Expected boolean value, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
     }
@@ -275,7 +275,7 @@ protected function shipPowershellParams()
             // PluginsUrl => framework_plugins_url
         ];
         $username = $settings->get('self-service/icinga_service_user');
-        if ($username !== null && strlen($username) > 0) {
+        if ($username) {
             $params['icinga_service_user'] = $username;
         }
 
@@ -404,7 +404,7 @@ protected function addStringSettingsToParams(Settings $settings, array $keys, ar
     {
         foreach ($keys as $key) {
             $value = $settings->get("self-service/$key");
-            if (strlen($value)) {
+            if ($value) {
                 $params[$key] = $value;
             }
         }

diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php
@@ -48,7 +48,7 @@ class SyncruleController extends ActionController
      */
     public function indexAction()
     {
-        $this->setAutoRefreshInterval(10);
+        $this->setAutorefreshInterval(10);
         $rule = $this->requireSyncRule();
         $this->tabs(new SyncRuleTabs($rule))->activate('show');
         $ruleName = $rule->get('rule_name');
@@ -642,7 +642,7 @@ public function addpropertyAction()
      */
     public function historyAction()
     {
-        $this->setAutoRefreshInterval(30);
+        $this->setAutorefreshInterval(30);
         $rule = $this->requireSyncRule();
         $this->tabs(new SyncRuleTabs($rule))->activate('history');
         $this->addTitle($this->translate('Sync history') . ': ' . $rule->get('rule_name'));

diff --git a/application/controllers/SyncrulesController.php b/application/controllers/SyncrulesController.php
@@ -23,7 +23,7 @@ public function indexAction()
         }
 
         $this->addTitle($this->translate('Sync rule'))
-            ->setAutoRefreshInterval(10)
+            ->setAutorefreshInterval(10)
             ->addAddLink(
                 $this->translate('Add a new Sync Rule'),
                 'director/syncrule/add'

diff --git a/application/forms/IcingaTemplateChoiceForm.php b/application/forms/IcingaTemplateChoiceForm.php
@@ -19,7 +19,7 @@ public function optionallyLoad($name)
     {
         if ($name !== null) {
             /** @var IcingaTemplateChoice $class - cheating IDE */
-            $class = $this->getObjectClassName();
+            $class = $this->getObjectClassname();
             $this->setObject($class::load($name, $this->getDb()));
         }
 
@@ -133,7 +133,7 @@ protected function setObjectSuccessUrl()
         /** @var IcingaTemplateChoice $object */
         $object = $this->object();
         $this->setSuccessUrl(
-            'director/templatechoice/' . $object->getObjectshortTableName(),
+            'director/templatechoice/' . $object->getObjectShortTableName(),
             $object->getUrlParams()
         );
     }

diff --git a/application/forms/SyncCheckForm.php b/application/forms/SyncCheckForm.php
@@ -55,7 +55,7 @@ public function onSuccess()
             } elseif ($sum['modify'] > 1) {
             }
             */
-            $html = '<pre>' . print_r($sum, 1) . '</pre>';
+            $html = '<pre>' . print_r($sum, true) . '</pre>';
 
             $this->addHtml($html);
         } elseif ($this->rule->get('sync_state') === 'in-sync') {

diff --git a/application/views/helpers/FormDataFilter.php b/application/views/helpers/FormDataFilter.php
@@ -44,14 +44,16 @@ public function formDataFilter($name, $value = null, $attribs = null)
     {
         $info = $this->_getInfo($name, $value, $attribs);
         extract($info); // id, name, value, attribs, options, listsep, disable
-        if (array_key_exists('columns', $attribs)) {
-            $this->setColumns($attribs['columns']);
-            unset($attribs['columns']);
-        }
+        if ($attribs) {
+            if (array_key_exists('columns', $attribs)) {
+                $this->setColumns($attribs['columns']);
+                unset($attribs['columns']);
+            }
 
-        if (array_key_exists('suggestionContext', $attribs)) {
-            $this->setSuggestionContext($attribs['suggestionContext']);
-            unset($attribs['suggestionContext']);
+            if (array_key_exists('suggestionContext', $attribs)) {
+                $this->setSuggestionContext($attribs['suggestionContext']);
+                unset($attribs['suggestionContext']);
+            }
         }
 
         // TODO: check for columns in attribs, preserve & remove them from the

diff --git a/library/Director/Cli/Command.php b/library/Director/Cli/Command.php
@@ -82,9 +82,9 @@ protected function raiseLimits()
     {
         MemoryLimit::raiseTo('1024M');
 
-        ini_set('max_execution_time', 0);
+        ini_set('max_execution_time', '0');
         if (version_compare(PHP_VERSION, '7.0.0') < 0) {
-            ini_set('zend.enable_gc', 0);
+            ini_set('zend.enable_gc', '0');
         }
 
         return $this;

diff --git a/library/Director/Cli/ObjectCommand.php b/library/Director/Cli/ObjectCommand.php
@@ -428,7 +428,7 @@ protected function readFromStdin()
         }
 
         $stdin = file_get_contents('php://stdin');
-        if (strlen($stdin) === 0) {
+        if (! $stdin) {
             return null;
         }
 

diff --git a/library/Director/Core/CoreApi.php b/library/Director/Core/CoreApi.php
@@ -569,7 +569,7 @@ public function getHostObjects()
             'icon_image_alt'        => 'icon_image_alt',
         ];
 
-        if (version_compare($this->getVersion(), '2.8.0', '>=')) {
+        if (version_compare($this->getVersion() ?? '', '2.8.0', '>=')) {
             $params['flapping_threshold_high'] = 'flapping_threshold_high';
             $params['flapping_threshold_low'] = 'flapping_threshold_low';
         }

diff --git a/library/Director/Core/LegacyDeploymentApi.php b/library/Director/Core/LegacyDeploymentApi.php
@@ -128,6 +128,10 @@ public function getActiveStageName()
         if (file_exists($path)) {
             if (is_link($path)) {
                 $linkTarget = readlink($path);
+                if (! $linkTarget) {
+                    throw new IcingaException('Failed to read symlink');
+                }
+
                 $linkTargetDir = dirname($linkTarget);
                 $linkTargetName = basename($linkTarget);
 
@@ -165,7 +169,7 @@ public function listPackageStages($packageName)
         $this->assertDeploymentPath();
 
         $dh = @opendir($this->deploymentPath);
-        if ($dh === null) {
+        if ($dh === false) {
             throw new IcingaException('Can not list contents of %s', $this->deploymentPath);
         }
 
@@ -279,7 +283,7 @@ protected function deployStage($stage, $files)
                 $this->mkdir(dirname($fullPath), true);
 
                 $fh = @fopen($fullPath, 'w');
-                if ($fh === null) {
+                if ($fh === false) {
                     throw new IcingaException('Could not open file "%s" for writing.', $fullPath);
                 }
                 chmod($fullPath, $this->file_mode);
@@ -334,7 +338,7 @@ protected function activateStage($stage)
     protected function listDirectoryContents($path, $depth = 0)
     {
         $dh = @opendir($path);
-        if ($dh === null) {
+        if ($dh === false) {
             throw new IcingaException('Can not list contents of %s', $path);
         }
 

diff --git a/library/Director/Core/RestApiClient.php b/library/Director/Core/RestApiClient.php
@@ -206,14 +206,14 @@ public function delete($url, $body = null)
     }
 
     /**
-     * @return resource
+     * @throws RuntimeException
      */
     protected function curl()
     {
         if ($this->curl === null) {
             $this->curl = curl_init(sprintf('https://%s:%d', $this->peer, $this->port));
             if (! $this->curl) {
-                throw new RuntimeException('CURL INIT ERROR: ' . curl_error($this->curl));
+                throw new RuntimeException('CURL INIT FAILED');
             }
         }
 
@@ -260,13 +260,11 @@ protected function processReadBuffer($offset, $pos)
 
     public function disconnect()
     {
-        if ($this->curl !== null) {
-            if (is_resource($this->curl)) {
-                @curl_close($this->curl);
-            }
-
-            $this->curl = null;
+        if ($this->curl) {
+            @curl_close($this->curl);
         }
+
+        $this->curl = null;
     }
 
     public function __destruct()

diff --git a/library/Director/Core/RestApiResponse.php b/library/Director/Core/RestApiResponse.php
@@ -113,7 +113,7 @@ protected function parseJsonResult($json)
                     throw new IcingaException('API request failed: ' . $result->status);
                 }
             } else {
-                throw new IcingaException('API request failed: ' . var_export($result, 1));
+                throw new IcingaException('API request failed: ' . var_export($result, true));
             }
         }
 

diff --git a/library/Director/CustomVariable/CustomVariable.php b/library/Director/CustomVariable/CustomVariable.php
@@ -236,7 +236,7 @@ public static function create($key, $value)
             // TODO: check for specific class/stdClass/interface?
             return new CustomVariableDictionary($key, $value);
         } else {
-            throw new LogicException(sprintf('WTF (%s): %s', $key, var_export($value, 1)));
+            throw new LogicException(sprintf('WTF (%s): %s', $key, var_export($value, true)));
         }
     }
 

diff --git a/library/Director/CustomVariable/CustomVariableBoolean.php b/library/Director/CustomVariable/CustomVariableBoolean.php
@@ -31,7 +31,7 @@ public function setValue($value)
         if (! is_bool($value)) {
             throw new ProgrammingError(
                 'Expected a boolean, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
 

diff --git a/library/Director/CustomVariable/CustomVariableNull.php b/library/Director/CustomVariable/CustomVariableNull.php
@@ -31,7 +31,7 @@ public function setValue($value)
         if (! is_null($value)) {
             throw new ProgrammingError(
                 'Null can only be null, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
 

diff --git a/library/Director/CustomVariable/CustomVariableNumber.php b/library/Director/CustomVariable/CustomVariableNumber.php
@@ -47,7 +47,7 @@ public function setValue($value)
         if (! is_int($value) && ! is_float($value)) {
             throw new ProgrammingError(
                 'Expected a number, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
 

diff --git a/library/Director/Daemon/BackgroundDaemon.php b/library/Director/Daemon/BackgroundDaemon.php
@@ -104,7 +104,7 @@ protected function initializeProcessDetails($systemd)
             try {
                 $uuid = \bin2hex(Uuid::uuid4()->getBytes());
             } catch (Exception $e) {
-                $uuid = 'deadc0de' . \substr(\md5(\getmypid()), 0, 24);
+                $uuid = 'deadc0de' . substr(md5((string) getmypid()), 0, 24);
             }
         }
         $processDetails = new DaemonProcessDetails($uuid);

diff --git a/library/Director/Data/Db/DbDataFormatter.php b/library/Director/Data/Db/DbDataFormatter.php
@@ -20,7 +20,7 @@ public static function normalizeBoolean($value): ?string
 
         throw new InvalidArgumentException(sprintf(
             'Got invalid boolean: %s',
-            var_export($value, 1)
+            var_export($value, true)
         ));
     }
 

diff --git a/library/Director/Data/Db/DbObject.php b/library/Director/Data/Db/DbObject.php
@@ -984,7 +984,7 @@ public function store(DbConnection $db = null)
                 $this->table,
                 $this->getLogId(),
                 $e->getMessage(),
-                var_export($this->getProperties(), 1) // TODO: Remove properties
+                var_export($this->getProperties(), true) // TODO: Remove properties
             ));
         }
 

diff --git a/library/Director/Data/PropertyMangler.php b/library/Director/Data/PropertyMangler.php
@@ -19,7 +19,7 @@ public static function appendToArrayProperties(IcingaObject $object, $properties
                 throw new InvalidArgumentException(sprintf(
                     'I can only append to arrays, %s is %s',
                     $key,
-                    var_export($current, 1)
+                    var_export($current, true)
                 ));
             }
 
@@ -52,7 +52,7 @@ public static function removeProperties(IcingaObject $object, $properties)
                 throw new InvalidArgumentException(sprintf(
                     'I can only remove strings or from arrays, %s is %s',
                     $key,
-                    var_export($current, 1)
+                    var_export($current, true)
                 ));
             }
         }

diff --git a/library/Director/Db/Branch/Branch.php b/library/Director/Db/Branch/Branch.php
@@ -45,7 +45,7 @@ public static function fromDbRow(stdClass $row)
             $row->uuid = stream_get_contents($row->uuid);
         }
         if (strlen($row->uuid) !== 16) {
-            throw new RuntimeException('Valid UUID expected, got ' . var_export($row->uuid, 1));
+            throw new RuntimeException('Valid UUID expected, got ' . var_export($row->uuid, true));
         }
         $self->branchUuid = Uuid::fromBytes(Db\DbUtil::binaryResult($row->uuid));
         $self->name = $row->branch_name;

diff --git a/library/Director/Db/IcingaObjectFilterHelper.php b/library/Director/Db/IcingaObjectFilterHelper.php
@@ -31,7 +31,7 @@ public static function wantId($id)
             throw new InvalidArgumentException(sprintf(
                 'Numeric ID or IcingaObject expected, got %s',
                 // TODO: just type/class info?
-                var_export($id, 1)
+                var_export($id, true)
             ));
         }
     }

diff --git a/library/Director/Db/Migrations.php b/library/Director/Db/Migrations.php
@@ -90,7 +90,7 @@ public function getPendingMigrations()
     public function applyPendingMigrations()
     {
         // Ensure we have enough time to migrate
-        ini_set('max_execution_time', 0);
+        ini_set('max_execution_time', '0');
 
         foreach ($this->getPendingMigrations() as $migration) {
             $migration->apply($this->connection);

diff --git a/library/Director/DirectorObject/Automation/BasketSnapshot.php b/library/Director/DirectorObject/Automation/BasketSnapshot.php
@@ -410,7 +410,7 @@ public function getJsonDump()
                     try {
                         JsonString::encode($object);
                     } catch (JsonEncodeException $singleError) {
-                        $dump = var_export($object, 1);
+                        $dump = var_export($object, true);
                         if (function_exists('iconv')) {
                             $dump = iconv('UTF-8', 'UTF-8//IGNORE', $dump);
                         }

diff --git a/library/Director/DirectorObject/ObjectPurgeHelper.php b/library/Director/DirectorObject/ObjectPurgeHelper.php
@@ -44,11 +44,11 @@ public function purge(array $keep, $class, $objectType = null)
                 // TODO: this is object-specific and to be found in the ::import() function!
                 unset($properties['fields']);
                 $object = $class::fromPlainObject($properties);
-            } elseif (\get_class($object) !== $class) {
+            } elseif (get_class($object) !== $class) {
                 throw new InvalidArgumentException(
                     'Can keep only matching objects, expected "%s", got "%s',
                     $class,
-                    \get_class($keep)
+                    get_class($object)
                 );
             }
             $key = [];

diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php
@@ -448,9 +448,9 @@ protected function generateFromDb()
         $start = microtime(true);
 
         MemoryLimit::raiseTo('1024M');
-        ini_set('max_execution_time', 0);
+        ini_set('max_execution_time', '0');
         // Workaround for https://bugs.php.net/bug.php?id=68606 or similar
-        ini_set('zend.enable_gc', 0);
+        ini_set('zend.enable_gc', '0');
 
         if (! $this->connection->isPgsql() && $this->db->quote("1\0") !== '\'1\\0\'') {
             throw new RuntimeException(