minor #32761 [Yaml] add some missing type declarations (xabbuh)

fabpot · fabpot · commit d8797c44616f · 2019-07-27T08:05:44.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [Yaml] add some missing type declarations | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- f2a4a19 add some missing type declarations
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -54,10 +54,8 @@ public function getSnippet()
 
     /**
      * Sets the snippet of code near the error.
-     *
-     * @param string $snippet The code snippet
      */
-    public function setSnippet($snippet)
+    public function setSnippet(string $snippet)
     {
         $this->snippet = $snippet;
 
@@ -78,10 +76,8 @@ public function getParsedFile()
 
     /**
      * Sets the filename where the error occurred.
-     *
-     * @param string $parsedFile The filename
      */
-    public function setParsedFile($parsedFile)
+    public function setParsedFile(string $parsedFile)
     {
         $this->parsedFile = $parsedFile;
 
@@ -100,10 +96,8 @@ public function getParsedLine()
 
     /**
      * Sets the line where the error occurred.
-     *
-     * @param int $parsedLine The file line
      */
-    public function setParsedLine($parsedLine)
+    public function setParsedLine(int $parsedLine)
     {
         $this->parsedLine = $parsedLine;
 
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -34,12 +34,7 @@ class Inline
     private static $objectForMap = false;
     private static $constantSupport = false;
 
-    /**
-     * @param int         $flags
-     * @param int|null    $parsedLineNumber
-     * @param string|null $parsedFilename
-     */
-    public static function initialize($flags, $parsedLineNumber = null, $parsedFilename = null)
+    public static function initialize(int $flags, int $parsedLineNumber = null, string $parsedFilename = null)
     {
         self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags);
         self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags);
@@ -704,7 +699,7 @@ public static function evaluateBinaryScalar(string $scalar): string
         return base64_decode($parsedBinaryData, true);
     }
 
-    private static function isBinaryString(string $value)
+    private static function isBinaryString(string $value): bool
     {
         return !preg_match('//u', $value) || preg_match('/[^\x00\x07-\x0d\x1B\x20-\xff]/', $value);
     }

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,7 @@ class Inline`
`34`	`34`	`private static $objectForMap = false;`
`35`	`35`	`private static $constantSupport = false;`
`36`	`36`
`37`		`- /**`
`38`		`- * @param int $flags`
`39`		`- * @param int\|null $parsedLineNumber`
`40`		`- * @param string\|null $parsedFilename`
`41`		`- */`
`42`		`- public static function initialize($flags, $parsedLineNumber = null, $parsedFilename = null)`
	`37`	`+ public static function initialize(int $flags, int $parsedLineNumber = null, string $parsedFilename = null)`
`43`	`38`	`{`
`44`	`39`	`self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags);`
`45`	`40`	`self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags);`
`@@ -704,7 +699,7 @@ public static function evaluateBinaryScalar(string $scalar): string`
`704`	`699`	`return base64_decode($parsedBinaryData, true);`
`705`	`700`	`}`
`706`	`701`
`707`		`- private static function isBinaryString(string $value)`
	`702`	`+ private static function isBinaryString(string $value): bool`
`708`	`703`	`{`
`709`	`704`	`return !preg_match('//u', $value) \|\| preg_match('/[^\x00\x07-\x0d\x1B\x20-\xff]/', $value);`
`710`	`705`	`}`