fix parameter type annotations

m-vo · Jul 9, 2020 · 40272d1 · 40272d1
1 parent 013cbab
commit 40272d1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/core-bundle/src/Resources/contao/library/Contao/Config.php b/core-bundle/src/Resources/contao/library/Contao/Config.php
@@ -373,8 +373,8 @@ public static function get($strKey)
 	/**
 	 * Temporarily set a configuration value
 	 *
-	 * @param string $strKey   The short key
-	 * @param string $varValue The configuration value
+	 * @param string     $strKey   The short key
+	 * @param mixed|null $varValue The configuration value
 	 */
 	public static function set($strKey, $varValue)
 	{

diff --git a/core-bundle/src/Resources/contao/library/Contao/Image.php b/core-bundle/src/Resources/contao/library/Contao/Image.php
@@ -227,7 +227,7 @@ public function getImportantPart()
 	/**
 	 * Set the target height
 	 *
-	 * @param integer $targetHeight The target height
+	 * @param integer|float $targetHeight The target height
 	 *
 	 * @return $this The image object
 	 */
@@ -251,7 +251,7 @@ public function getTargetHeight()
 	/**
 	 * Set the target width
 	 *
-	 * @param integer $targetWidth The target width
+	 * @param integer|float $targetWidth The target width
 	 *
 	 * @return $this The image object
 	 */

diff --git a/core-bundle/src/Resources/contao/library/Contao/Picture.php b/core-bundle/src/Resources/contao/library/Contao/Picture.php
@@ -64,7 +64,7 @@ class Picture
 	/**
 	 * The image size items collection
 	 *
-	 * @var ImageSizeItemModel[]|Collection
+	 * @var array<ImageSizeItemModel|object>|Collection
 	 */
 	protected $imageSizeItems = array();
 
@@ -194,7 +194,7 @@ public function setImageSize($imageSize)
 	/**
 	 * Set the image size items collection
 	 *
-	 * @param ImageSizeItemModel[]|Collection $imageSizeItems The image size items collection
+	 * @param array<ImageSizeItemModel|object>|Collection $imageSizeItems The image size items collection
 	 *
 	 * @return $this The picture object
 	 */

diff --git a/core-bundle/src/Resources/contao/library/Contao/System.php b/core-bundle/src/Resources/contao/library/Contao/System.php
@@ -347,9 +347,9 @@ public static function getReferer($blnEncodeAmpersands=false, $strTable=null)
 	/**
 	 * Load a set of language files
 	 *
-	 * @param string  $strName     The table name
-	 * @param boolean $strLanguage An optional language code
-	 * @param boolean $blnNoCache  If true, the cache will be bypassed
+	 * @param string      $strName     The table name
+	 * @param string|null $strLanguage An optional language code
+	 * @param boolean     $blnNoCache  If true, the cache will be bypassed
 	 */
 	public static function loadLanguageFile($strName, $strLanguage=null, $blnNoCache=false)
 	{

diff --git a/core-bundle/src/Routing/RouteProvider.php b/core-bundle/src/Routing/RouteProvider.php
@@ -15,7 +15,6 @@
 use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\CoreBundle\Exception\NoRootPageFoundException;
 use Contao\CoreBundle\Framework\ContaoFramework;
-use Contao\Model;
 use Contao\Model\Collection;
 use Contao\PageModel;
 use Contao\System;
@@ -458,7 +457,7 @@ static function (Route $a, Route $b) use ($languages, $routes) {
     }
 
     /**
-     * @return array<Model>
+     * @return array<PageModel>
      */
     private function findPages(array $candidates): array
     {
@@ -491,11 +490,12 @@ private function findPages(array $candidates): array
             return [];
         }
 
+        /** @var array<PageModel> */
         return $pages->getModels();
     }
 
     /**
-     * @return array<Model>
+     * @return array<PageModel>
      */
     private function findRootPages(string $httpHost): array
     {
@@ -523,12 +523,14 @@ private function findRootPages(string $httpHost): array
         $pages = $pageModel->findBy(["(tl_page.type='root' AND (tl_page.dns=? OR tl_page.dns=''))"], $httpHost);
 
         if ($pages instanceof Collection) {
+            /** @var array<PageModel> $rootPages */
             $rootPages = $pages->getModels();
         }
 
         $pages = $pageModel->findBy(["tl_page.alias='index' OR tl_page.alias='/'"], null);
 
         if ($pages instanceof Collection) {
+            /** @var array<PageModel> $indexPages */
             $indexPages = $pages->getModels();
         }