Add scalar typehints/return types on final/internal/private code

Robin Chalas · Robin Chalas · commit 6b9c45ea0a08 · 2017-08-31T22:46:21.000+02:00
diff --git a/Data/Provider/LanguageDataProvider.php b/Data/Provider/LanguageDataProvider.php
@@ -41,7 +41,7 @@ class LanguageDataProvider
      * @param BundleEntryReaderInterface $reader The reader for reading the .res
      *                                           files.
      */
-    public function __construct($path, BundleEntryReaderInterface $reader)
+    public function __construct(string $path, BundleEntryReaderInterface $reader)
     {
         $this->path = $path;
         $this->reader = $reader;
diff --git a/DateFormatter/DateFormat/AmPmTransformer.php b/DateFormatter/DateFormat/AmPmTransformer.php
@@ -23,23 +23,23 @@ class AmPmTransformer extends Transformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         return $dateTime->format('A');
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return 'AM|PM';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'marker' => $matched,
diff --git a/DateFormatter/DateFormat/DayOfWeekTransformer.php b/DateFormatter/DateFormat/DayOfWeekTransformer.php
@@ -23,7 +23,7 @@ class DayOfWeekTransformer extends Transformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $dayOfWeek = $dateTime->format('l');
         switch ($length) {
@@ -41,7 +41,7 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         switch ($length) {
             case 4:
@@ -58,7 +58,7 @@ public function getReverseMatchingRegExp($length)
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array();
     }
diff --git a/DateFormatter/DateFormat/DayOfYearTransformer.php b/DateFormatter/DateFormat/DayOfYearTransformer.php
@@ -23,7 +23,7 @@ class DayOfYearTransformer extends Transformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $dayOfYear = $dateTime->format('z') + 1;
 
@@ -33,15 +33,15 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return '\d{'.$length.'}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array();
     }
diff --git a/DateFormatter/DateFormat/DayTransformer.php b/DateFormatter/DateFormat/DayTransformer.php
@@ -23,23 +23,23 @@ class DayTransformer extends Transformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         return $this->padLeft($dateTime->format('j'), $length);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'day' => (int) $matched,
diff --git a/DateFormatter/DateFormat/Hour1200Transformer.php b/DateFormatter/DateFormat/Hour1200Transformer.php
@@ -23,7 +23,7 @@ class Hour1200Transformer extends HourTransformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $hourOfDay = $dateTime->format('g');
         $hourOfDay = '12' == $hourOfDay ? '0' : $hourOfDay;
@@ -34,7 +34,7 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function normalizeHour($hour, $marker = null)
+    public function normalizeHour(int $hour, string $marker = null): int
     {
         if ('PM' === $marker) {
             $hour += 12;
@@ -46,15 +46,15 @@ public function normalizeHour($hour, $marker = null)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return '\d{1,2}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'hour' => (int) $matched,
diff --git a/DateFormatter/DateFormat/Hour1201Transformer.php b/DateFormatter/DateFormat/Hour1201Transformer.php
@@ -23,15 +23,15 @@ class Hour1201Transformer extends HourTransformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         return $this->padLeft($dateTime->format('g'), $length);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function normalizeHour($hour, $marker = null)
+    public function normalizeHour(int $hour, string $marker = null): int
     {
         if ('PM' !== $marker && 12 === $hour) {
             $hour = 0;
@@ -46,15 +46,15 @@ public function normalizeHour($hour, $marker = null)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return '\d{1,2}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'hour' => (int) $matched,
diff --git a/DateFormatter/DateFormat/Hour2400Transformer.php b/DateFormatter/DateFormat/Hour2400Transformer.php
@@ -23,15 +23,15 @@ class Hour2400Transformer extends HourTransformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         return $this->padLeft($dateTime->format('G'), $length);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function normalizeHour($hour, $marker = null)
+    public function normalizeHour(int $hour, string $marker = null): int
     {
         if ('AM' == $marker) {
             $hour = 0;
@@ -45,15 +45,15 @@ public function normalizeHour($hour, $marker = null)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return '\d{1,2}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'hour' => (int) $matched,
diff --git a/DateFormatter/DateFormat/Hour2401Transformer.php b/DateFormatter/DateFormat/Hour2401Transformer.php
@@ -23,7 +23,7 @@ class Hour2401Transformer extends HourTransformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $hourOfDay = $dateTime->format('G');
         $hourOfDay = ('0' == $hourOfDay) ? '24' : $hourOfDay;
@@ -34,7 +34,7 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function normalizeHour($hour, $marker = null)
+    public function normalizeHour(int $hour, string $marker = null): int
     {
         if ((null === $marker && 24 === $hour) || 'AM' == $marker) {
             $hour = 0;
@@ -48,15 +48,15 @@ public function normalizeHour($hour, $marker = null)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return '\d{1,2}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'hour' => (int) $matched,
diff --git a/DateFormatter/DateFormat/HourTransformer.php b/DateFormatter/DateFormat/HourTransformer.php
@@ -28,5 +28,5 @@ abstract class HourTransformer extends Transformer
      *
      * @return int The normalized hour value
      */
-    abstract public function normalizeHour($hour, $marker = null);
+    abstract public function normalizeHour(int $hour, string $marker = null): int;
 }
diff --git a/DateFormatter/DateFormat/MinuteTransformer.php b/DateFormatter/DateFormat/MinuteTransformer.php
@@ -23,7 +23,7 @@ class MinuteTransformer extends Transformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $minuteOfHour = (int) $dateTime->format('i');
 
@@ -33,15 +33,15 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'minute' => (int) $matched,
diff --git a/DateFormatter/DateFormat/MonthTransformer.php b/DateFormatter/DateFormat/MonthTransformer.php
@@ -77,7 +77,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $matchLengthMap = array(
             1 => 'n',
@@ -100,7 +100,7 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         switch ($length) {
             case 1:
@@ -126,7 +126,7 @@ public function getReverseMatchingRegExp($length)
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         if (!is_numeric($matched)) {
             if (3 === $length) {
diff --git a/DateFormatter/DateFormat/QuarterTransformer.php b/DateFormatter/DateFormat/QuarterTransformer.php
@@ -23,7 +23,7 @@ class QuarterTransformer extends Transformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $month = (int) $dateTime->format('n');
         $quarter = (int) floor(($month - 1) / 3) + 1;
@@ -43,7 +43,7 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         switch ($length) {
             case 1:
@@ -59,7 +59,7 @@ public function getReverseMatchingRegExp($length)
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array();
     }
diff --git a/DateFormatter/DateFormat/SecondTransformer.php b/DateFormatter/DateFormat/SecondTransformer.php
@@ -23,7 +23,7 @@ class SecondTransformer extends Transformer
     /**
      * {@inheritdoc}
      */
-    public function format(\DateTime $dateTime, $length)
+    public function format(\DateTime $dateTime, int $length): string
     {
         $secondOfMinute = (int) $dateTime->format('s');
 
@@ -33,15 +33,15 @@ public function format(\DateTime $dateTime, $length)
     /**
      * {@inheritdoc}
      */
-    public function getReverseMatchingRegExp($length)
+    public function getReverseMatchingRegExp(int $length): string
     {
         return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extractDateOptions($matched, $length)
+    public function extractDateOptions(string $matched, int $length): array
     {
         return array(
             'second' => (int) $matched,
diff --git a/DateFormatter/DateFormat/TimezoneTransformer.php b/DateFormatter/DateFormat/TimezoneTransformer.php
diff --git a/DateFormatter/DateFormat/Transformer.php b/DateFormatter/DateFormat/Transformer.php
diff --git a/DateFormatter/DateFormat/YearTransformer.php b/DateFormatter/DateFormat/YearTransformer.php
diff --git a/Locale.php b/Locale.php
diff --git a/ResourceBundle/LanguageBundle.php b/ResourceBundle/LanguageBundle.php

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class LanguageDataProvider`
`41`	`41`	`* @param BundleEntryReaderInterface $reader The reader for reading the .res`
`42`	`42`	`* files.`
`43`	`43`	`*/`
`44`		`- public function __construct($path, BundleEntryReaderInterface $reader)`
	`44`	`+ public function __construct(string $path, BundleEntryReaderInterface $reader)`
`45`	`45`	`{`
`46`	`46`	`$this->path = $path;`
`47`	`47`	`$this->reader = $reader;`
Original file line number	Diff line number	Diff line change
`@@ -23,23 +23,23 @@ class AmPmTransformer extends Transformer`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function format(\DateTime $dateTime, $length)`
	`26`	`+ public function format(\DateTime $dateTime, int $length): string`
`27`	`27`	`{`
`28`	`28`	`return $dateTime->format('A');`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* {@inheritdoc}`
`33`	`33`	`*/`
`34`		`- public function getReverseMatchingRegExp($length)`
	`34`	`+ public function getReverseMatchingRegExp(int $length): string`
`35`	`35`	`{`
`36`	`36`	`return 'AM\|PM';`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* {@inheritdoc}`
`41`	`41`	`*/`
`42`		`- public function extractDateOptions($matched, $length)`
	`42`	`+ public function extractDateOptions(string $matched, int $length): array`
`43`	`43`	`{`
`44`	`44`	`return array(`
`45`	`45`	`'marker' => $matched,`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class DayOfYearTransformer extends Transformer`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function format(\DateTime $dateTime, $length)`
	`26`	`+ public function format(\DateTime $dateTime, int $length): string`
`27`	`27`	`{`
`28`	`28`	`$dayOfYear = $dateTime->format('z') + 1;`
`29`	`29`
`@@ -33,15 +33,15 @@ public function format(\DateTime $dateTime, $length)`
`33`	`33`	`/**`
`34`	`34`	`* {@inheritdoc}`
`35`	`35`	`*/`
`36`		`- public function getReverseMatchingRegExp($length)`
	`36`	`+ public function getReverseMatchingRegExp(int $length): string`
`37`	`37`	`{`
`38`	`38`	`return '\d{'.$length.'}';`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* {@inheritdoc}`
`43`	`43`	`*/`
`44`		`- public function extractDateOptions($matched, $length)`
	`44`	`+ public function extractDateOptions(string $matched, int $length): array`
`45`	`45`	`{`
`46`	`46`	`return array();`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,23 +23,23 @@ class DayTransformer extends Transformer`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function format(\DateTime $dateTime, $length)`
	`26`	`+ public function format(\DateTime $dateTime, int $length): string`
`27`	`27`	`{`
`28`	`28`	`return $this->padLeft($dateTime->format('j'), $length);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* {@inheritdoc}`
`33`	`33`	`*/`
`34`		`- public function getReverseMatchingRegExp($length)`
	`34`	`+ public function getReverseMatchingRegExp(int $length): string`
`35`	`35`	`{`
`36`	`36`	`return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* {@inheritdoc}`
`41`	`41`	`*/`
`42`		`- public function extractDateOptions($matched, $length)`
	`42`	`+ public function extractDateOptions(string $matched, int $length): array`
`43`	`43`	`{`
`44`	`44`	`return array(`
`45`	`45`	`'day' => (int) $matched,`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ class Hour1201Transformer extends HourTransformer`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function format(\DateTime $dateTime, $length)`
	`26`	`+ public function format(\DateTime $dateTime, int $length): string`
`27`	`27`	`{`
`28`	`28`	`return $this->padLeft($dateTime->format('g'), $length);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* {@inheritdoc}`
`33`	`33`	`*/`
`34`		`- public function normalizeHour($hour, $marker = null)`
	`34`	`+ public function normalizeHour(int $hour, string $marker = null): int`
`35`	`35`	`{`
`36`	`36`	`if ('PM' !== $marker && 12 === $hour) {`
`37`	`37`	`$hour = 0;`
`@@ -46,15 +46,15 @@ public function normalizeHour($hour, $marker = null)`
`46`	`46`	`/**`
`47`	`47`	`* {@inheritdoc}`
`48`	`48`	`*/`
`49`		`- public function getReverseMatchingRegExp($length)`
	`49`	`+ public function getReverseMatchingRegExp(int $length): string`
`50`	`50`	`{`
`51`	`51`	`return '\d{1,2}';`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`	`55`	`* {@inheritdoc}`
`56`	`56`	`*/`
`57`		`- public function extractDateOptions($matched, $length)`
	`57`	`+ public function extractDateOptions(string $matched, int $length): array`
`58`	`58`	`{`
`59`	`59`	`return array(`
`60`	`60`	`'hour' => (int) $matched,`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ class Hour2400Transformer extends HourTransformer`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function format(\DateTime $dateTime, $length)`
	`26`	`+ public function format(\DateTime $dateTime, int $length): string`
`27`	`27`	`{`
`28`	`28`	`return $this->padLeft($dateTime->format('G'), $length);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* {@inheritdoc}`
`33`	`33`	`*/`
`34`		`- public function normalizeHour($hour, $marker = null)`
	`34`	`+ public function normalizeHour(int $hour, string $marker = null): int`
`35`	`35`	`{`
`36`	`36`	`if ('AM' == $marker) {`
`37`	`37`	`$hour = 0;`
`@@ -45,15 +45,15 @@ public function normalizeHour($hour, $marker = null)`
`45`	`45`	`/**`
`46`	`46`	`* {@inheritdoc}`
`47`	`47`	`*/`
`48`		`- public function getReverseMatchingRegExp($length)`
	`48`	`+ public function getReverseMatchingRegExp(int $length): string`
`49`	`49`	`{`
`50`	`50`	`return '\d{1,2}';`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`54`	`54`	`* {@inheritdoc}`
`55`	`55`	`*/`
`56`		`- public function extractDateOptions($matched, $length)`
	`56`	`+ public function extractDateOptions(string $matched, int $length): array`
`57`	`57`	`{`
`58`	`58`	`return array(`
`59`	`59`	`'hour' => (int) $matched,`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ abstract class HourTransformer extends Transformer`
`28`	`28`	`*`
`29`	`29`	`* @return int The normalized hour value`
`30`	`30`	`*/`
`31`		`- abstract public function normalizeHour($hour, $marker = null);`
	`31`	`+ abstract public function normalizeHour(int $hour, string $marker = null): int;`
`32`	`32`	`}`