enforce type hints

contao · Apr 20, 2022 · d0d73f1 · d0d73f1
1 parent 8e74730
commit d0d73f1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 37 deletions.
diff --git a/core-bundle/src/Resources/contao/library/Contao/System.php b/core-bundle/src/Resources/contao/library/Contao/System.php
@@ -125,9 +125,9 @@ protected function __construct()
 	 *
 	 * @param string $strKey The property name
 	 *
-	 * @return mixed|null The property value or null
+	 * @return mixed The property value or null
 	 */
-	public function __get($strKey)
+	public function __get(string $strKey): mixed
 	{
 		if (!isset($this->arrObjects[$strKey]))
 		{

diff --git a/core-bundle/src/Resources/contao/library/Contao/Template.php b/core-bundle/src/Resources/contao/library/Contao/Template.php
@@ -132,7 +132,7 @@ public function __construct($strTemplate='', $strContentType='text/html')
 	 * @param string $strKey   The property name
 	 * @param mixed  $varValue The property value
 	 */
-	public function __set($strKey, $varValue)
+	public function __set(string $strKey, mixed $varValue): void
 	{
 		$this->arrData[$strKey] = $varValue;
 	}
@@ -144,7 +144,7 @@ public function __set($strKey, $varValue)
 	 *
 	 * @return mixed The property value
 	 */
-	public function __get($strKey)
+	public function __get(string $strKey): mixed
 	{
 		if (isset($this->arrData[$strKey]))
 		{
@@ -186,7 +186,7 @@ public function __call($strKey, $arrParams)
 	 *
 	 * @return boolean True if the property is set
 	 */
-	public function __isset($strKey)
+	public function __isset(string $strKey): bool
 	{
 		return isset($this->arrData[$strKey]);
 	}
@@ -196,7 +196,7 @@ public function __isset($strKey)
 	 *
 	 * @param array $arrData The data array
 	 */
-	public function setData($arrData)
+	public function setData(array $arrData): void
 	{
 		$this->arrData = $arrData;
 	}
@@ -206,7 +206,7 @@ public function setData($arrData)
 	 *
 	 * @return array The data array
 	 */
-	public function getData()
+	public function getData(): array
 	{
 		return $this->arrData;
 	}
@@ -216,7 +216,7 @@ public function getData()
 	 *
 	 * @param string $strTemplate The template name
 	 */
-	public function setName($strTemplate)
+	public function setName(string $strTemplate): void
 	{
 		$this->strTemplate = $strTemplate;
 	}
@@ -226,7 +226,7 @@ public function setName($strTemplate)
 	 *
 	 * @return string The template name
 	 */
-	public function getName()
+	public function getName(): string
 	{
 		return $this->strTemplate;
 	}

diff --git a/core-bundle/src/Twig/FragmentTemplate.php b/core-bundle/src/Twig/FragmentTemplate.php
@@ -41,29 +41,17 @@ public function __construct(private string $templateName, private \Closure $onGe
         // Do not call parent constructor
     }
 
-    /**
-     * @param string $key
-     * @param mixed  $value
-     */
-    public function __set(/* string */ $key, $value): void
+    public function __set(string $key, mixed $value): void
     {
         $this->set($key, $value);
     }
 
-    /**
-     * @param string $key
-     *
-     * @return mixed
-     */
-    public function __get(/* string */ $key)
+    public function __get(string $key): mixed
     {
         return $this->get($key);
     }
 
-    /**
-     * @param string $key
-     */
-    public function __isset(/* string */ $key): bool
+    public function __isset(string $key): bool
     {
         return $this->has($key);
     }
@@ -73,18 +61,12 @@ public function __call($strKey, $arrParams): never
         self::throwOnAccess();
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function set(string $key, $value): void
+    public function set(string $key, mixed $value): void
     {
         $this->context[$key] = $value;
     }
 
-    /**
-     * @return mixed
-     */
-    public function get(string $key)
+    public function get(string $key): mixed
     {
         return $this->context[$key] ?? throw new \RuntimeException(sprintf('Key "%s" does not exist.', $key));
     }
@@ -97,7 +79,7 @@ public function has(string $key): bool
     /**
      * @param array<string, mixed> $data
      */
-    public function setData(/* array */ $data): void
+    public function setData(array $data): void
     {
         $this->context = $data;
     }
@@ -110,10 +92,7 @@ public function getData(): array
         return $this->context;
     }
 
-    /**
-     * @param string $name
-     */
-    public function setName(/* string */ $name): void
+    public function setName(string $name): void
     {
         $this->templateName = $name;
     }