Fix code inspections

Martin1982 · Mar 3, 2022 · 8bb01f5 · 8bb01f5
1 parent 18e9994
commit 8bb01f5
Show file tree

Hide file tree

Showing 71 changed files with 264 additions and 279 deletions.
diff --git a/Broadcaster/AbstractSchedulerCommands.php b/Broadcaster/AbstractSchedulerCommands.php
@@ -25,24 +25,24 @@ abstract class AbstractSchedulerCommands implements SchedulerCommandsInterface
      *
      * @var string|null
      */
-    protected $kernelEnvironment;
+    protected ?string $kernelEnvironment;
 
     /**
      * Directory to store FFMpeg logs
      *
      * @var string
      */
-    protected $logDirectoryFFMpeg = '';
+    protected string $logDirectoryFFMpeg = '';
 
     /**
      * @var bool Can the input be looped
      */
-    protected $looping = false;
+    protected bool $looping = false;
 
     /**
      * @var string
      */
-    protected $rootDir;
+    protected string $rootDir;
 
     /**
      * SchedulerCommands constructor.
@@ -60,7 +60,7 @@ public function __construct(Kernel $kernel)
      *
      * @throws \Exception
      */
-    public function startProcess($input, $output, $metadata): string
+    public function startProcess(string $input, string $output, array $metadata): string
     {
         $meta = '';
         $metadata['env'] = $this->getKernelEnvironment();
@@ -76,7 +76,7 @@ public function startProcess($input, $output, $metadata): string
      * {@inheritdoc}
      * @throws LiveBroadcastException
      */
-    public function stopProcess($pid): string
+    public function stopProcess(int $pid): string
     {
         throw new LiveBroadcastException('stopProcess Cannot be called on the abstract class');
     }
@@ -93,7 +93,7 @@ public function getRunningProcesses(): array
     /**
      * {@inheritdoc}
      */
-    public function getProcessId($processString): ?int
+    public function getProcessId(string $processString): ?int
     {
         $pid = [];
         preg_match('/^\s*([\d]+)/', $processString, $pid);
@@ -107,7 +107,7 @@ public function getProcessId($processString): ?int
     /**
      * {@inheritdoc}
      */
-    public function getBroadcastId($processString): ?int
+    public function getBroadcastId(string $processString): ?int
     {
         $value = $this->getMetadataValue($processString, self::METADATA_BROADCAST);
 
@@ -117,7 +117,7 @@ public function getBroadcastId($processString): ?int
     /**
      * {@inheritdoc}
      */
-    public function getChannelId($processString): ?int
+    public function getChannelId(string $processString): ?int
     {
         $value = $this->getMetadataValue($processString, self::METADATA_CHANNEL);
 
@@ -127,7 +127,7 @@ public function getChannelId($processString): ?int
     /**
      * {@inheritdoc}
      */
-    public function getEnvironment($processString): ?string
+    public function getEnvironment(string $processString): ?string
     {
         return $this->getMetadataValue($processString, self::METADATA_ENVIRONMENT);
     }
@@ -143,9 +143,9 @@ public function getKernelEnvironment(): ?string
     /**
      * @param string $directory
      */
-    public function setFFMpegLogDirectory($directory): void
+    public function setFFMpegLogDirectory(string $directory): void
     {
-        if (null === $directory || !is_writable($directory)) {
+        if (!is_writable($directory)) {
             return;
         }
 
@@ -155,9 +155,9 @@ public function setFFMpegLogDirectory($directory): void
     /**
      * @param bool $looping
      */
-    public function setLooping($looping): void
+    public function setLooping(bool $looping): void
     {
-        $this->looping = (bool) $looping;
+        $this->looping = $looping;
     }
 
     /**
@@ -179,7 +179,7 @@ public function isLooping(): bool
      *
      * @throws \Exception
      */
-    protected function execStreamCommand($input, $output, $meta): string
+    protected function execStreamCommand(string $input, string $output, string $meta): string
     {
         $logFile = '/dev/null';
         $loop = '';
@@ -205,7 +205,7 @@ protected function execStreamCommand($input, $output, $meta): string
      *
      * @return array
      */
-    protected function readMetadata($processString): array
+    protected function readMetadata(string $processString): array
     {
         $metadata = [];
         $processMetadata = [];
@@ -227,7 +227,7 @@ protected function readMetadata($processString): array
      *
      * @return mixed
      */
-    private function getMetadataValue($processString, $metadataKey)
+    private function getMetadataValue(string $processString, string $metadataKey)
     {
         $metadata = $this->readMetadata($processString);
 

diff --git a/Broadcaster/Linux/SchedulerCommands.php b/Broadcaster/Linux/SchedulerCommands.php
@@ -17,7 +17,7 @@ class SchedulerCommands extends AbstractSchedulerCommands
     /**
      * {@inheritdoc}
      */
-    public function stopProcess($pid): string
+    public function stopProcess(int $pid): string
     {
         return exec(sprintf('kill %d', $pid));
     }

diff --git a/Broadcaster/RunningBroadcast.php b/Broadcaster/RunningBroadcast.php
@@ -18,22 +18,22 @@ class RunningBroadcast
     /**
      * @var int
      */
-    private $broadcastId;
+    private int $broadcastId;
 
     /**
      * @var int
      */
-    private $processId;
+    private int $processId;
 
     /**
      * @var int
      */
-    private $channelId;
+    private int $channelId;
 
     /**
      * @var string
      */
-    private $environment;
+    private string $environment;
 
     /**
      * RunningBroadcast constructor.
@@ -43,12 +43,12 @@ class RunningBroadcast
      * @param int    $channelId
      * @param string $environment
      */
-    public function __construct($broadcastId, $processId, $channelId, $environment)
+    public function __construct(int $broadcastId, int $processId, int $channelId, string $environment)
     {
-        $this->broadcastId = (int) $broadcastId;
-        $this->processId = (int) $processId;
-        $this->channelId = (int) $channelId;
-        $this->environment = (string) $environment;
+        $this->broadcastId = $broadcastId;
+        $this->processId = $processId;
+        $this->channelId = $channelId;
+        $this->environment = $environment;
     }
 
     /**
@@ -99,7 +99,7 @@ public function isBroadcasting(LiveBroadcast $broadcast, AbstractChannel $channe
      *
      * @return bool
      */
-    public function isValid($kernelEnvironment): bool
+    public function isValid(string $kernelEnvironment): bool
     {
         return ($kernelEnvironment === $this->getEnvironment()) &&
             ($this->getProcessId() !== 0) &&

diff --git a/Broadcaster/Scheduler.php b/Broadcaster/Scheduler.php
@@ -24,27 +24,27 @@ class Scheduler
     /**
      * @var ChannelValidatorService
      */
-    protected $validator;
+    protected ChannelValidatorService $validator;
 
     /**
      * @var BroadcastStarter
      */
-    protected $starter;
+    protected BroadcastStarter $starter;
 
     /**
      * @var BroadcastManager
      */
-    protected $broadcastManager;
+    protected BroadcastManager $broadcastManager;
 
     /**
      * @var SchedulerCommandsInterface
      */
-    protected $schedulerCommands;
+    protected SchedulerCommandsInterface $schedulerCommands;
 
     /**
      * @var LoggerInterface
      */
-    protected $logger;
+    protected LoggerInterface $logger;
 
     /**
      * Scheduler constructor
@@ -211,7 +211,7 @@ protected function getRunningBroadcasts(): array
     }
 
     /**
-     * Send end signals to channels where broadcasts ended
+     * Send end signals to the channels where broadcasts ended
      *
      * @throws LiveBroadcastException
      * @throws \Exception

diff --git a/Broadcaster/SchedulerCommandsDetector.php b/Broadcaster/SchedulerCommandsDetector.php
@@ -25,7 +25,7 @@ class SchedulerCommandsDetector
      *
      * @return SchedulerCommandsInterface
      */
-    public static function createSchedulerCommands(Kernel $kernel, $ffmpegLogDirectory = null): SchedulerCommandsInterface
+    public static function createSchedulerCommands(Kernel $kernel, ?string $ffmpegLogDirectory = null): SchedulerCommandsInterface
     {
         $osCode = strtoupper(substr(PHP_OS, 0, 3));
 

diff --git a/Broadcaster/SchedulerCommandsInterface.php b/Broadcaster/SchedulerCommandsInterface.php
@@ -19,14 +19,14 @@ interface SchedulerCommandsInterface
      *
      * @return string
      */
-    public function startProcess($input, $output, $metadata): string;
+    public function startProcess(string $input, string $output, array $metadata): string;
 
     /**
      * @param int $pid
      *
      * @return string
      */
-    public function stopProcess($pid): string;
+    public function stopProcess(int $pid): string;
 
     /**
      * @return array
@@ -38,28 +38,28 @@ public function getRunningProcesses(): array;
      *
      * @return int|null
      */
-    public function getProcessId($processString): ?int;
+    public function getProcessId(string $processString): ?int;
 
     /**
      * @param string $processString
      *
      * @return int|null
      */
-    public function getBroadcastId($processString): ?int;
+    public function getBroadcastId(string $processString): ?int;
 
     /**
      * @param string $processString
      *
      * @return int|null
      */
-    public function getChannelId($processString): ?int;
+    public function getChannelId(string $processString): ?int;
 
     /**
      * @param string $processString
      *
      * @return string|null
      */
-    public function getEnvironment($processString): ?string;
+    public function getEnvironment(string $processString): ?string;
 
     /**
      * @return string|null
@@ -69,10 +69,10 @@ public function getKernelEnvironment(): ?string;
     /**
      * @param string $directory
      */
-    public function setFFMpegLogDirectory($directory);
+    public function setFFMpegLogDirectory(string $directory);
 
     /**
      * @param bool $looping
      */
-    public function setLooping($looping);
+    public function setLooping(bool $looping);
 }
diff --git a/Broadcaster/Windows/SchedulerCommands.php b/Broadcaster/Windows/SchedulerCommands.php
@@ -17,7 +17,7 @@ class SchedulerCommands extends AbstractSchedulerCommands
     /**
      * {@inheritdoc}
      */
-    public function stopProcess($pid): string
+    public function stopProcess(int $pid): string
     {
         return exec(sprintf('START /B TASKKILL /PID %d /T', $pid));
     }
@@ -41,7 +41,7 @@ public function getRunningProcesses(): array
      *
      * @return string
      */
-    protected function execStreamCommand($input, $output, $meta): string
+    protected function execStreamCommand(string $input, string $output, string $meta): string
     {
         $loop = '';
 

diff --git a/Entity/Channel/AbstractChannel.php b/Entity/Channel/AbstractChannel.php
@@ -30,7 +30,7 @@ abstract class AbstractChannel
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    protected $channelId;
+    protected ?int $channelId = null;
 
     /**
      * @var string|null
@@ -39,14 +39,14 @@ abstract class AbstractChannel
      *
      * @Assert\NotBlank
      */
-    protected $channelName;
+    protected ?string $channelName = null;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="is_healthy", type="boolean", options={"default": 0})
      */
-    protected $isHealthy = false;
+    protected bool $isHealthy = false;
 
     /**
      * @return int|null
@@ -65,11 +65,11 @@ public function getChannelName(): ?string
     }
 
     /**
-     * @param string $channelName
+     * @param string|null $channelName
      *
      * @return $this
      */
-    public function setChannelName($channelName): self
+    public function setChannelName(?string $channelName): self
     {
         $this->channelName = $channelName;
 
@@ -107,7 +107,7 @@ public static function isEntityConfigured($configuration): bool
             return true;
         }
 
-        return true;
+        return false;
     }
 
     /**