Upgrade PHPstan (#1173)

* deps: upgrade phpstan

* fix phpstan errors

composer.json

@@ -63,7 +63,9 @@
         "mi-schi/phpmd-extension": "^4.2",
         "phpmd/phpmd": "^2.6",
         "phpspec/prophecy": "^1.19",
-        "phpstan/phpstan": "^0.12",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.9",
+        "phpstan/phpstan-doctrine": "^1.3",
         "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.3",
         "symfony/browser-kit": "^5.0",
@@ -94,7 +96,8 @@
         "sort-packages": true,
         "process-timeout": 0,
         "allow-plugins": {
-            "symfony/flex": true
+            "symfony/flex": true,
+            "phpstan/extension-installer": true
         }
     },
     "conflict": {

phpstan.neon

@@ -1,4 +1,4 @@
 parameters:
     inferPrivatePropertyTypeFromConstructor: true
-    excludes_analyse:
-        - %rootDir%/../../../src/Migrations/*
+    excludePaths:
+        - %rootDir%/../../../src/Migrations/*

src/Command/CleanupAlertCommand.php

@@ -5,7 +5,6 @@
 namespace App\Command;
 
 use App\DependencyInjection\CleanupAlert;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -15,13 +14,11 @@ class CleanupAlertCommand extends Command
 {
     protected static $defaultName = 'app:cleanupAlert';
 
-    private $logger;
     private $cleanupAlert;
 
-    public function __construct(LoggerInterface $logger, CleanupAlert $cleanupAlert)
+    public function __construct(CleanupAlert $cleanupAlert)
     {
         $this->cleanupAlert = $cleanupAlert;
-        $this->logger = $logger;
 
         parent::__construct();
     }

src/Controller/SlaveController.php

@@ -26,9 +26,6 @@
 
 class SlaveController extends AbstractController
 {
-    private $em = null;
-    private $logger = null;
-
     private $domainSlaveGroupCache = [];
     private $deviceSlaveGroupCache = [];
     private $domainProbeCache = [];

src/Entity/Alert.php

@@ -224,7 +224,7 @@ public function getLastseen()
     /**
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->alertRule->getName().' on '.$this->device->getName().' from '.$this->slaveGroup->getName();
     }

src/Entity/Device.php

@@ -66,6 +66,7 @@ class Device
     private $ip;
 
     /**
+     * @var  ArrayCollection<int, SlaveGroup>
      * @ORM\ManyToMany(targetEntity="SlaveGroup", inversedBy="devices", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="device_slavegroups",
      *      joinColumns={@ORM\JoinColumn(name="device_id", referencedColumnName="id", onDelete="CASCADE")},
@@ -78,6 +79,7 @@ class Device
     private $slavegroups;
 
     /**
+     * @var  ArrayCollection<int, Probe>
      * @ORM\ManyToMany(targetEntity="Probe", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="device_probes",
      *      joinColumns={@ORM\JoinColumn(name="device_id", referencedColumnName="id", onDelete="CASCADE")},
@@ -90,6 +92,7 @@ class Device
     private $probes;
 
     /**
+     * @var  ArrayCollection<int, AlertRule>
      * @ORM\ManyToMany(targetEntity="AlertRule", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="device_alert_rules",
      *      joinColumns={@ORM\JoinColumn(name="device_id", referencedColumnName="id", onDelete="CASCADE")},
@@ -102,6 +105,7 @@ class Device
     private $alertRules;
 
     /**
+     * @var  ArrayCollection<int, AlertDestination>
      * @ORM\ManyToMany(targetEntity="AlertDestination", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="device_alert_destinations",
      *      joinColumns={@ORM\JoinColumn(name="device_id", referencedColumnName="id", onDelete="CASCADE")},
@@ -113,6 +117,7 @@ class Device
     private $alertDestinations;
 
     /**
+     * @var  ArrayCollection<int, Alert>
      * @ORM\OneToMany(targetEntity="Alert", mappedBy="device", fetch="EXTRA_LAZY")
      */
     private $alerts;

src/Entity/Domain.php

@@ -61,6 +61,7 @@ class Domain
     private $name;
 
     /**
+     * @var  ArrayCollection<int, SlaveGroup>
      * @ORM\ManyToMany(targetEntity="SlaveGroup", inversedBy="domains", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="domain_slavegroups",
      *      joinColumns={@ORM\JoinColumn(name="domain_id", referencedColumnName="id", onDelete="CASCADE")},
@@ -72,6 +73,7 @@ class Domain
     private $slavegroups;
 
     /**
+     * @var  ArrayCollection<int, Probe>
      * @ORM\ManyToMany(targetEntity="Probe", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="domain_probes",
      *      joinColumns={@ORM\JoinColumn(name="domain_id", referencedColumnName="id", onDelete="CASCADE")},
@@ -83,6 +85,7 @@ class Domain
     private $probes;
 
     /**
+     * @var  ArrayCollection<int, AlertRule>
      * @ORM\ManyToMany(targetEntity="AlertRule", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="domain_alert_rules",
      *      joinColumns={@ORM\JoinColumn(name="domain_id", referencedColumnName="id", onDelete="CASCADE")},
@@ -94,6 +97,7 @@ class Domain
     private $alertRules;
 
     /**
+     * @var  ArrayCollection<int, AlertDestination>
      * @ORM\ManyToMany(targetEntity="AlertDestination", fetch="EXTRA_LAZY")
      * @ORM\JoinTable(name="domain_alert_destinations",
      *      joinColumns={@ORM\JoinColumn(name="domain_id", referencedColumnName="id", onDelete="CASCADE")},

src/Entity/Probe.php

@@ -64,7 +64,7 @@ class Probe
     private $samples;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @ORM\Column(name="arguments", type="text")
      */

src/Entity/SlaveGroup.php

@@ -38,17 +38,19 @@ class SlaveGroup
     private $name;
 
     /**
+     * @var ArrayCollection<int, Device>
      * @ORM\ManyToMany(targetEntity="Device", mappedBy="slavegroups")
      */
     private $devices;
 
     /**
+     * @var ArrayCollection<int, Domain>
      * @ORM\ManyToMany(targetEntity="Domain", mappedBy="slavegroups")
      */
     private $domains;
 
     /**
-     * @var ArrayCollection
+     * @var ArrayCollection<int, Slave>
      * @ORM\OneToMany(targetEntity="Slave", mappedBy="slavegroup")
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      * @ORM\OrderBy({"id" = "asc"})

src/Entity/StorageNode.php

@@ -36,6 +36,7 @@ class StorageNode
     private $status;
 
     /**
+     * @var ArrayCollection<int, Device>
      * @ORM\OneToMany(targetEntity="App\Entity\Device", mappedBy="storageNode")
      */
     private $devices;

src/EventSubscriber/MenuBuilderSubscriber.php

@@ -19,15 +19,13 @@ class MenuBuilderSubscriber implements EventSubscriberInterface
     private $domainRepository;
     private $slaveRepository;
     private $storageNodeRepository;
-    private $security;
 
-    public function __construct(DomainRepository $domainRepository, Security $security, AlertRepository $alertRepository, SlaveRepository $slaveRepository, StorageNodeRepository $storageNodeRepository)
+    public function __construct(DomainRepository $domainRepository, AlertRepository $alertRepository, SlaveRepository $slaveRepository, StorageNodeRepository $storageNodeRepository)
     {
         $this->alertRepository = $alertRepository;
         $this->domainRepository = $domainRepository;
         $this->slaveRepository = $slaveRepository;
         $this->storageNodeRepository = $storageNodeRepository;
-        $this->security = $security;
     }
 
     public static function getSubscribedEvents(): array