feature #23262 Add scalar typehints/return types (chalasr, xabbuh)

fabpot · fabpot · commit 43cb7f00c2fa · 2017-09-03T09:17:01.000-07:00
This PR was merged into the 4.0-dev branch. Discussion ---------- Add scalar typehints/return types | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no (final, already breaks if doc not respected) | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony/symfony#23242 (comment) | License | MIT | Doc PR | n/a Commits ------- 7b1715b078 [Yaml] use scalar type hints where possible 6ce70e4bf9 Add scalar typehints/return types on final/internal/private code
diff --git a/Key.php b/Key.php
@@ -25,49 +25,32 @@ final class Key
     /**
      * @param string $resource
      */
-    public function __construct($resource)
+    public function __construct(string $resource)
     {
-        $this->resource = (string) $resource;
+        $this->resource = $resource;
     }
 
     public function __toString()
     {
         return $this->resource;
     }
 
-    /**
-     * @param string $stateKey
-     *
-     * @return bool
-     */
-    public function hasState($stateKey)
+    public function hasState(string $stateKey): bool
     {
         return isset($this->state[$stateKey]);
     }
 
-    /**
-     * @param string $stateKey
-     * @param mixed  $state
-     */
-    public function setState($stateKey, $state)
+    public function setState(string $stateKey, $state): void
     {
         $this->state[$stateKey] = $state;
     }
 
-    /**
-     * @param string $stateKey
-     */
-    public function removeState($stateKey)
+    public function removeState(string $stateKey): void
     {
         unset($this->state[$stateKey]);
     }
 
-    /**
-     * @param $stateKey
-     *
-     * @return mixed
-     */
-    public function getState($stateKey)
+    public function getState(string $stateKey)
     {
         return $this->state[$stateKey];
     }

Original file line number	Diff line number	Diff line change
`@@ -25,49 +25,32 @@ final class Key`
`25`	`25`	`/**`
`26`	`26`	`* @param string $resource`
`27`	`27`	`*/`
`28`		`- public function __construct($resource)`
	`28`	`+ public function __construct(string $resource)`
`29`	`29`	`{`
`30`		`- $this->resource = (string) $resource;`
	`30`	`+ $this->resource = $resource;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function __toString()`
`34`	`34`	`{`
`35`	`35`	`return $this->resource;`
`36`	`36`	`}`
`37`	`37`
`38`		`- /**`
`39`		`- * @param string $stateKey`
`40`		`- *`
`41`		`- * @return bool`
`42`		`- */`
`43`		`- public function hasState($stateKey)`
	`38`	`+ public function hasState(string $stateKey): bool`
`44`	`39`	`{`
`45`	`40`	`return isset($this->state[$stateKey]);`
`46`	`41`	`}`
`47`	`42`
`48`		`- /**`
`49`		`- * @param string $stateKey`
`50`		`- * @param mixed $state`
`51`		`- */`
`52`		`- public function setState($stateKey, $state)`
	`43`	`+ public function setState(string $stateKey, $state): void`
`53`	`44`	`{`
`54`	`45`	`$this->state[$stateKey] = $state;`
`55`	`46`	`}`
`56`	`47`
`57`		`- /**`
`58`		`- * @param string $stateKey`
`59`		`- */`
`60`		`- public function removeState($stateKey)`
	`48`	`+ public function removeState(string $stateKey): void`
`61`	`49`	`{`
`62`	`50`	`unset($this->state[$stateKey]);`
`63`	`51`	`}`
`64`	`52`
`65`		`- /**`
`66`		`- * @param $stateKey`
`67`		`- *`
`68`		`- * @return mixed`
`69`		`- */`
`70`		`- public function getState($stateKey)`
	`53`	`+ public function getState(string $stateKey)`
`71`	`54`	`{`
`72`	`55`	`return $this->state[$stateKey];`
`73`	`56`	`}`