Merge pull request #59 from loveOSS/fix/timeout-validation

mickaelandrieu · web-flow · commit caeb7e4ab2f8 · 2021-09-04T15:17:51.000+02:00
Fixed misleading timeout
diff --git a/src/Systems/MainSystem.php b/src/Systems/MainSystem.php
@@ -97,8 +97,11 @@ private static function validate(array $settings): bool
 
     private static function validateTimeout(int $timeout): bool
     {
+        // @doc https://www.php.net/manual/info.configuration.php the timeout is in seconds
         $maxExecutionTime = ini_get('max_execution_time');
+        
+        $timeoutInSeconds = (int) ($timeout / 1000);
 
-        return (0 === (int) $maxExecutionTime) || ($maxExecutionTime >= $timeout);
+        return (0 === (int) $maxExecutionTime) || ($maxExecutionTime >= $timeoutInSeconds);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,11 @@ private static function validate(array $settings): bool`
`97`	`97`
`98`	`98`	`private static function validateTimeout(int $timeout): bool`
`99`	`99`	`{`
	`100`	`+ // @doc https://www.php.net/manual/info.configuration.php the timeout is in seconds`
`100`	`101`	`$maxExecutionTime = ini_get('max_execution_time');`
	`102`	`+`
	`103`	`+ $timeoutInSeconds = (int) ($timeout / 1000);`
`101`	`104`
`102`		`- return (0 === (int) $maxExecutionTime) \|\| ($maxExecutionTime >= $timeout);`
	`105`	`+ return (0 === (int) $maxExecutionTime) \|\| ($maxExecutionTime >= $timeoutInSeconds);`
`103`	`106`	`}`
`104`	`107`	`}`