Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 107865cd814a · 2023-07-25T17:42:22.000+02:00
* 6.4:
  fix typo
  Add types to private and internal properties
  [Workflow] Cleaning code
  [Scheduler] Fix NPE in debug:scheduler command
diff --git a/Matcher/Dumper/CompiledUrlMatcherTrait.php b/Matcher/Dumper/CompiledUrlMatcherTrait.php
@@ -30,11 +30,7 @@ trait CompiledUrlMatcherTrait
     private array $staticRoutes = [];
     private array $regexpList = [];
     private array $dynamicRoutes = [];
-
-    /**
-     * @var callable|null
-     */
-    private $checkCondition;
+    private ?\Closure $checkCondition;
 
     public function match(string $pathinfo): array
     {
diff --git a/Matcher/UrlMatcher.php b/Matcher/UrlMatcher.php
@@ -240,7 +240,7 @@ protected function mergeDefaults(array $params, array $defaults): array
 
     protected function getExpressionLanguage(): ExpressionLanguage
     {
-        if (null === $this->expressionLanguage) {
+        if (!isset($this->expressionLanguage)) {
             if (!class_exists(ExpressionLanguage::class)) {
                 throw new \LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".');
             }
diff --git a/RouteCollection.php b/RouteCollection.php
@@ -37,7 +37,7 @@ class RouteCollection implements \IteratorAggregate, \Countable
     /**
      * @var array<string, Alias>
      */
-    private $aliases = [];
+    private array $aliases = [];
 
     /**
      * @var array<string, ResourceInterface>

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ protected function mergeDefaults(array $params, array $defaults): array`
`240`	`240`
`241`	`241`	`protected function getExpressionLanguage(): ExpressionLanguage`
`242`	`242`	`{`
`243`		`- if (null === $this->expressionLanguage) {`
	`243`	`+ if (!isset($this->expressionLanguage)) {`
`244`	`244`	`if (!class_exists(ExpressionLanguage::class)) {`
`245`	`245`	`throw new \LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".');`
`246`	`246`	`}`