Merge branch '7.0' into 7.1

derrabus · derrabus · commit cec867ec244b · 2023-11-26T08:02:38.000+01:00
* 7.0:
  Remove obsolete PHP version checks
diff --git a/src/Symfony/Component/Clock/DatePoint.php b/src/Symfony/Component/Clock/DatePoint.php
@@ -45,16 +45,6 @@ public function __construct(string $datetime = 'now', \DateTimeZone $timezone =
             $now = $now->setTimezone($timezone);
         }
 
-        if (\PHP_VERSION_ID < 80200) {
-            $now = (array) $now;
-            $this->date = $now['date'];
-            $this->timezone_type = $now['timezone_type'];
-            $this->timezone = $now['timezone'];
-            $this->__wakeup();
-
-            return;
-        }
-
         $this->__unserialize((array) $now);
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -242,7 +242,7 @@ private function checkController(Request $request, callable $controller): callab
 
             if (str_contains($name, '{closure}')) {
                 $name = $class = \Closure::class;
-            } elseif ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
+            } elseif ($class = $r->getClosureCalledClass()) {
                 $class = $class->name;
                 $name = $class.'::'.$name;
             }
diff --git a/src/Symfony/Component/Workflow/DataCollector/WorkflowDataCollector.php b/src/Symfony/Component/Workflow/DataCollector/WorkflowDataCollector.php
@@ -173,7 +173,7 @@ private function summarizeListener(callable $callable, string $eventName = null,
             $r = new \ReflectionFunction($callable);
             if (str_contains($r->name, '{closure}')) {
                 $title = (string) $r;
-            } elseif ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
+            } elseif ($class = $r->getClosureCalledClass()) {
                 $title = $class->name.'::'.$r->name.'()';
             } else {
                 $title = $r->name;

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ private function checkController(Request $request, callable $controller): callab`
`242`	`242`
`243`	`243`	`if (str_contains($name, '{closure}')) {`
`244`	`244`	`$name = $class = \Closure::class;`
`245`		`- } elseif ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {`
	`245`	`+ } elseif ($class = $r->getClosureCalledClass()) {`
`246`	`246`	`$class = $class->name;`
`247`	`247`	`$name = $class.'::'.$name;`
`248`	`248`	`}`