Add const DIRECTORY_SEPARATOR and fix whitespace issues

koriym · koriym · commit 9ceeb864c5f7 · 2024-11-26T19:42:19.000+09:00
Introduce the DIRECTORY_SEPARATOR constant in SurrogateKeys, UriTag, and DevEtagSetter to replace direct string usage. Additionally, correct whitespace inconsistencies in method calls involving sprintf and str_replace.
diff --git a/src/DevEtagSetter.php b/src/DevEtagSetter.php
@@ -14,6 +14,8 @@
 use function sprintf;
 use function str_replace;
 
+use const DIRECTORY_SEPARATOR;
+
 final class DevEtagSetter implements EtagSetterInterface
 {
     public function __construct(
@@ -26,7 +28,7 @@ public function __construct(
      */
     public function __invoke(ResourceObject $ro, int|null $time = null, HttpCache|null $httpCache = null)
     {
-        $ro->headers[Header::ETAG] =  sprintf('%s_%s', str_replace([':', DIRECTORY_SEPARATOR ], ['_', '_'], $ro->uri->path), http_build_query($ro->uri->query));
+        $ro->headers[Header::ETAG] =  sprintf('%s_%s', str_replace([':', DIRECTORY_SEPARATOR], ['_', '_'], $ro->uri->path), http_build_query($ro->uri->query));
         $ro->headers[Header::LAST_MODIFIED] = gmdate(DateTimeInterface::RFC7231, 0);
         $this->setCacheDependency($ro);
     }
diff --git a/src/SurrogateKeys.php b/src/SurrogateKeys.php
@@ -16,6 +16,8 @@
 use function sprintf;
 use function str_replace;
 
+use const DIRECTORY_SEPARATOR;
+
 final class SurrogateKeys
 {
     /** @var list<string> */
@@ -24,7 +26,7 @@ final class SurrogateKeys
 
     public function __construct(AbstractUri $uri)
     {
-        $uriKey = sprintf('%s_%s', str_replace(DIRECTORY_SEPARATOR , '_', $uri->path), http_build_query($uri->query));
+        $uriKey = sprintf('%s_%s', str_replace(DIRECTORY_SEPARATOR, '_', $uri->path), http_build_query($uri->query));
         $this->surrogateKeys = [$uriKey];
         $this->uriTag = new UriTag();
     }
diff --git a/src/UriTag.php b/src/UriTag.php
@@ -14,6 +14,8 @@
 use function str_replace;
 use function uri_template;
 
+use const DIRECTORY_SEPARATOR;
+
 final class UriTag implements UriTagInterface
 {
     /**
@@ -24,7 +26,7 @@ public function __invoke(AbstractUri $uri): string
         $query = $uri->query;
         ksort($query);
 
-        return str_replace(DIRECTORY_SEPARATOR , '_', sprintf('%s_%s', $uri->path, http_build_query($query)));
+        return str_replace(DIRECTORY_SEPARATOR, '_', sprintf('%s_%s', $uri->path, http_build_query($query)));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`use function sprintf;`
`15`	`15`	`use function str_replace;`
`16`	`16`
	`17`	`+use const DIRECTORY_SEPARATOR;`
	`18`	`+`
`17`	`19`	`final class DevEtagSetter implements EtagSetterInterface`
`18`	`20`	`{`
`19`	`21`	`public function __construct(`
`@@ -26,7 +28,7 @@ public function __construct(`
`26`	`28`	`*/`
`27`	`29`	`public function __invoke(ResourceObject $ro, int\|null $time = null, HttpCache\|null $httpCache = null)`
`28`	`30`	`{`
`29`		`- $ro->headers[Header::ETAG] = sprintf('%s_%s', str_replace([':', DIRECTORY_SEPARATOR ], ['_', '_'], $ro->uri->path), http_build_query($ro->uri->query));`
	`31`	`+ $ro->headers[Header::ETAG] = sprintf('%s_%s', str_replace([':', DIRECTORY_SEPARATOR], ['_', '_'], $ro->uri->path), http_build_query($ro->uri->query));`
`30`	`32`	`$ro->headers[Header::LAST_MODIFIED] = gmdate(DateTimeInterface::RFC7231, 0);`
`31`	`33`	`$this->setCacheDependency($ro);`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`use function sprintf;`
`17`	`17`	`use function str_replace;`
`18`	`18`
	`19`	`+use const DIRECTORY_SEPARATOR;`
	`20`	`+`
`19`	`21`	`final class SurrogateKeys`
`20`	`22`	`{`
`21`	`23`	`/** @var list<string> */`
`@@ -24,7 +26,7 @@ final class SurrogateKeys`
`24`	`26`
`25`	`27`	`public function __construct(AbstractUri $uri)`
`26`	`28`	`{`
`27`		`- $uriKey = sprintf('%s_%s', str_replace(DIRECTORY_SEPARATOR , '_', $uri->path), http_build_query($uri->query));`
	`29`	`+ $uriKey = sprintf('%s_%s', str_replace(DIRECTORY_SEPARATOR, '_', $uri->path), http_build_query($uri->query));`
`28`	`30`	`$this->surrogateKeys = [$uriKey];`
`29`	`31`	`$this->uriTag = new UriTag();`
`30`	`32`	`}`