Merge branch '4.4' into 5.3

derrabus · derrabus · commit fcbc2b81d559 · 2021-11-04T17:37:19.000+01:00
* 4.4:
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS
diff --git a/Loader/AnnotationDirectoryLoader.php b/Loader/AnnotationDirectoryLoader.php
@@ -54,7 +54,7 @@ function (\SplFileInfo $current) {
         });
 
         foreach ($files as $file) {
-            if (!$file->isFile() ||  !str_ends_with($file->getFilename(), '.php')) {
+            if (!$file->isFile() || !str_ends_with($file->getFilename(), '.php')) {
                 continue;
             }
 
diff --git a/RouteCompiler.php b/RouteCompiler.php
@@ -155,7 +155,7 @@ private static function compilePattern(Route $route, string $pattern, bool $isHo
 
             if ($isSeparator && $precedingText !== $precedingChar) {
                 $tokens[] = ['text', substr($precedingText, 0, -\strlen($precedingChar))];
-            } elseif (!$isSeparator && \strlen($precedingText) > 0) {
+            } elseif (!$isSeparator && '' !== $precedingText) {
                 $tokens[] = ['text', $precedingText];
             }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ function (\SplFileInfo $current) {`
`54`	`54`	`});`
`55`	`55`
`56`	`56`	`foreach ($files as $file) {`
`57`		`- if (!$file->isFile() \|\| !str_ends_with($file->getFilename(), '.php')) {`
	`57`	`+ if (!$file->isFile() \|\| !str_ends_with($file->getFilename(), '.php')) {`
`58`	`58`	`continue;`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private static function compilePattern(Route $route, string $pattern, bool $isHo`
`155`	`155`
`156`	`156`	`if ($isSeparator && $precedingText !== $precedingChar) {`
`157`	`157`	`$tokens[] = ['text', substr($precedingText, 0, -\strlen($precedingChar))];`
`158`		`- } elseif (!$isSeparator && \strlen($precedingText) > 0) {`
	`158`	`+ } elseif (!$isSeparator && '' !== $precedingText) {`
`159`	`159`	`$tokens[] = ['text', $precedingText];`
`160`	`160`	`}`
`161`	`161`