[ErrorHandler] fix on patching return types on Windows

nicolas-grekas · nicolas-grekas · commit 58e156912e1e · 2021-12-19T21:02:00.000+01:00
diff --git a/src/Symfony/Component/ErrorHandler/Internal/TentativeTypes.php b/src/Symfony/Component/ErrorHandler/Internal/TentativeTypes.php
@@ -30,7 +30,7 @@ class TentativeTypes
             'format' => 'string',
             'getTimezone' => 'DateTimeZone|false',
             'getOffset' => 'int',
-            'getTimestamp' => 'int|false',
+            'getTimestamp' => 'int',
             'diff' => 'DateInterval',
             '__wakeup' => 'void',
         ],
@@ -254,6 +254,7 @@ class TentativeTypes
             'isEquivalentTo' => 'bool',
             'isLenient' => 'bool',
             'isWeekend' => 'bool',
+            'roll' => 'bool',
             'isSet' => 'bool',
             'setTime' => 'bool',
             'setTimeZone' => 'bool',
diff --git a/src/Symfony/Component/ErrorHandler/Resources/bin/patch-type-declarations b/src/Symfony/Component/ErrorHandler/Resources/bin/patch-type-declarations
@@ -71,7 +71,7 @@ set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$dep
 
 $exclude = getenv('SYMFONY_PATCH_TYPE_EXCLUDE') ?: null;
 foreach ($loader->getClassMap() as $class => $file) {
-    if (false !== strpos($file = realpath($file), '/vendor/')) {
+    if (false !== strpos($file = realpath($file), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {
         continue;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$dep`
`71`	`71`
`72`	`72`	`$exclude = getenv('SYMFONY_PATCH_TYPE_EXCLUDE') ?: null;`
`73`	`73`	`foreach ($loader->getClassMap() as $class => $file) {`
`74`		`- if (false !== strpos($file = realpath($file), '/vendor/')) {`
	`74`	`+ if (false !== strpos($file = realpath($file), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {`
`75`	`75`	`continue;`
`76`	`76`	`}`
`77`	`77`