refactor(phpstan): Various code improvements

classes/Config.php

@@ -16,7 +16,7 @@ class Config
     /**
      * Singleton instance.
      *
-     * @var Config
+     * @var Config|null
      */
     private static $instance;
 
@@ -133,13 +133,11 @@ class Config
      */
     public function __construct(array $options)
     {
-        if (isset($options) && is_array($options)) {
         foreach ($options as $option => $value) {
             if (isset($this->$option) && isset($value)) {
                 $this->$option = $value;
             }
         }
-        }
         $this->getEnv();
     }
 

classes/LocaleManager.php

@@ -24,7 +24,7 @@ class LocaleManager
     /**
      * Current locale.
      *
-     * @var Locale
+     * @var Locale|null
      */
     private $curLocale;
 
@@ -78,7 +78,7 @@ class LocaleManager
     /**
      * Get the current locale.
      *
-     * @return Locale
+     * @return Locale|null
      */
     public function getLocale()
     {

classes/LocaleMiddleware.php

@@ -37,7 +37,7 @@ class LocaleMiddleware
      *
      * @param array $proposedLocale Locale array created by AcceptLanguage::parse()
      *
-     * @return string Locale name if chosen, nothing otherwise
+     * @return Locale Locale if chosen, nothing otherwise
      */
     public function testLocale(array $proposedLocale)
     {
@@ -65,7 +65,7 @@ class LocaleMiddleware
     {
         $headers = $request->getHeader('Accept-Language');
         $curLocale = $this->localeManager->getLocale();
-        if (!isset($curLocale)) {
+        if (is_null($curLocale)) {
             if (isset($headers[0])) {
                 $this->localeManager->setLocale(
                     AcceptLanguage::detect([$this, 'testLocale'], new Locale('en_US'), $headers[0])

classes/PlaylistArchiveStream.php

@@ -186,7 +186,7 @@ class PlaylistArchiveStream extends TarArchive
     public function stream_read($count)
     {
         if (!$this->files[$this->curFile]['headersSent']) {
-            $urls = $this->download->getUrl($this->files[$this->curFile]['url'], $this->format);
+            $urls = $this->download->getURL($this->files[$this->curFile]['url'], $this->format);
             $response = $this->client->request('GET', $urls[0], ['stream' => true]);
 
             $contentLengthHeaders = $response->getHeader('Content-Length');

classes/VideoDownload.php

@@ -130,7 +130,7 @@ class VideoDownload
      * @param string $format   Format to use for the video
      * @param string $password Video password
      *
-     * @return object Decoded JSON
+     * @return stdClass Decoded JSON
      * */
     public function getJSON($url, $format = null, $password = null)
     {
@@ -214,7 +214,7 @@ class VideoDownload
     /**
      * Return arguments used to run rtmp for a specific video.
      *
-     * @param object $video Video object returned by youtube-dl
+     * @param stdClass $video Video object returned by youtube-dl
      *
      * @return array Arguments
      */
@@ -266,7 +266,7 @@ class VideoDownload
     /**
      * Get a process that runs avconv in order to convert a video.
      *
-     * @param object $video        Video object returned by youtube-dl
+     * @param stdClass $video        Video object returned by youtube-dl
      * @param int      $audioBitrate Audio bitrate of the converted file
      * @param string   $filetype     Filetype of the converted file
      * @param bool     $audioOnly    True to return an audio-only file
@@ -484,7 +484,7 @@ class VideoDownload
     /**
      * Get a Tar stream containing every video in the playlist piped through the server.
      *
-     * @param object $video  Video object returned by youtube-dl
+     * @param stdClass $video  Video object returned by youtube-dl
      * @param string   $format Requested format
      *
      * @throws Exception If the popen stream was not created correctly