Skip to content

Commit 299e530

Browse files
author
Jonathon Hill
committed
Use single quotes
1 parent 562ac79 commit 299e530

22 files changed

+194
-194
lines changed

src/CacheControl.php

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,56 @@
88

99
class CacheControl
1010
{
11-
private const EXPIRED = "Thu, 19 Nov 1981 08:52:00 GMT";
11+
private const EXPIRED = 'Thu, 19 Nov 1981 08:52:00 GMT';
1212

1313
public static function createHeaders(
14-
string $limiter = "nocache",
14+
string $limiter = 'nocache',
1515
int $maxAge = null,
1616
int $lastModified = null
1717
): array {
1818
switch ($limiter) {
19-
case "public":
19+
case 'public':
2020
return [
21-
"Expires" => self::getExpirationTimestamp($maxAge),
22-
"Cache-Control" => "public, max-age=" . $maxAge,
23-
"Last-Modified" => self::getLastModifiedTimestamp($lastModified),
21+
'Expires' => self::getExpirationTimestamp($maxAge),
22+
'Cache-Control' => 'public, max-age=' . $maxAge,
23+
'Last-Modified' => self::getLastModifiedTimestamp($lastModified),
2424
];
25-
case "private_no_expire":
25+
case 'private_no_expire':
2626
return [
27-
"Cache-Control" => "private, max-age={$maxAge}, pre-check={$maxAge}",
28-
"Last-Modified" => self::getLastModifiedTimestamp($lastModified),
27+
'Cache-Control' => "private, max-age={$maxAge}, pre-check={$maxAge}",
28+
'Last-Modified' => self::getLastModifiedTimestamp($lastModified),
2929
];
30-
case "private":
30+
case 'private':
3131
return [
32-
"Expires" => self::EXPIRED,
33-
"Cache-Control" => "private, max-age={$maxAge}, pre-check={$maxAge}",
34-
"Last-Modified" => self::getLastModifiedTimestamp($lastModified),
32+
'Expires' => self::EXPIRED,
33+
'Cache-Control' => "private, max-age={$maxAge}, pre-check={$maxAge}",
34+
'Last-Modified' => self::getLastModifiedTimestamp($lastModified),
3535
];
36-
case "nocache":
36+
case 'nocache':
3737
return [
38-
"Expires" => self::EXPIRED,
39-
"Cache-Control" => "no-store, no-cache, must-revalidate, " .
40-
"post-check=0, pre-check=0",
41-
"Pragma" => "no-cache",
38+
'Expires' => self::EXPIRED,
39+
'Cache-Control' => 'no-store, no-cache, must-revalidate, ' .
40+
'post-check=0, pre-check=0',
41+
'Pragma' => 'no-cache',
4242
];
4343
default:
44-
throw new InvalidArgumentException("Invalid cache limiter: " . $limiter);
44+
throw new InvalidArgumentException('Invalid cache limiter: ' . $limiter);
4545
}
4646
}
4747

4848
private static function getExpirationTimestamp(int $maxAge = null): string
4949
{
5050
if (is_null($maxAge)) {
51-
throw new InvalidArgumentException("\$maxAge is required");
51+
throw new InvalidArgumentException('$maxAge is required');
5252
}
53-
return gmdate("D, d M Y H:i:s T", time() + $maxAge); // RFC2616
53+
return gmdate('D, d M Y H:i:s T', time() + $maxAge); // RFC2616
5454
}
5555

5656
private static function getLastModifiedTimestamp(int $lastModified = null): string
5757
{
5858
if (is_null($lastModified)) {
59-
throw new InvalidArgumentException("\$lastModified is required");
59+
throw new InvalidArgumentException('$lastModified is required');
6060
}
61-
return gmdate("D, d M Y H:i:s T", $lastModified); // RFC2616
61+
return gmdate('D, d M Y H:i:s T', $lastModified); // RFC2616
6262
}
6363
}

src/Config.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getSerializeHandler(): SerializerInterface
5252
return $this->serialize_handler ?? SerializerFactory::php();
5353
}
5454

55-
protected string $name = "PHPSESSID";
55+
protected string $name = 'PHPSESSID';
5656

5757
public function setName(string $name): self
5858
{
@@ -104,7 +104,7 @@ public function getGcMaxLifetime(): int
104104
return $this->gc_maxlifetime;
105105
}
106106

107-
protected string $sid_prefix = "";
107+
protected string $sid_prefix = '';
108108

109109
public function setSidPrefix(string $sid_prefix): self
110110
{
@@ -123,7 +123,7 @@ public function setSidLength(int $sid_length): self
123123
{
124124
if ($sid_length < 22 || $sid_length > 256) {
125125
throw new InvalidArgumentException(
126-
"\$sid_length must be at least 22 and not greater than 256"
126+
'$sid_length must be at least 22 and not greater than 256'
127127
);
128128
}
129129

@@ -142,7 +142,7 @@ public function setSidBitsPerCharacter(int $sid_bits_per_character): self
142142
{
143143
if ($sid_bits_per_character < 4 || $sid_bits_per_character > 6) {
144144
throw new InvalidArgumentException(
145-
"\$sid_bits_per_character must be at least 4 and not greater than than 6"
145+
'$sid_bits_per_character must be at least 4 and not greater than than 6'
146146
);
147147
}
148148

@@ -199,7 +199,7 @@ public function getCookieLifetime(): int
199199
return $this->cookie_lifetime;
200200
}
201201

202-
protected string $cookie_path = "/";
202+
protected string $cookie_path = '/';
203203

204204
public function setCookiePath(string $cookie_path): self
205205
{
@@ -212,7 +212,7 @@ public function getCookiePath(): string
212212
return $this->cookie_path;
213213
}
214214

215-
protected string $cookie_domain = "";
215+
protected string $cookie_domain = '';
216216

217217
public function setCookieDomain(string $cookie_domain): self
218218
{
@@ -251,7 +251,7 @@ public function getCookieHttpOnly(): bool
251251
return $this->cookie_httponly;
252252
}
253253

254-
protected string $cookie_samesite = "";
254+
protected string $cookie_samesite = '';
255255

256256
public function setCookieSameSite(string $cookie_samesite): self
257257
{
@@ -264,7 +264,7 @@ public function getCookieSameSite(): string
264264
return $this->cookie_samesite;
265265
}
266266

267-
protected string $cache_limiter = "nocache";
267+
protected string $cache_limiter = 'nocache';
268268

269269
public function setCacheLimiter(string $cache_limiter): self
270270
{

src/ExtraConfig.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function getCookieLifetime(): int
1818
return $this->cookie_lifetime;
1919
}
2020

21-
protected string $cookie_path = "/";
21+
protected string $cookie_path = '/';
2222

2323
public function setCookiePath(string $cookie_path)
2424
{
@@ -30,7 +30,7 @@ public function getCookiePath(): string
3030
return $this->cookie_path;
3131
}
3232

33-
protected string $cookie_domain = "";
33+
protected string $cookie_domain = '';
3434

3535
public function setCookieDomain(string $cookie_domain)
3636
{
@@ -102,7 +102,7 @@ public function getUseOnlyCookies(): bool
102102
return $this->use_only_cookies;
103103
}
104104

105-
protected string $cache_limiter = "nocache";
105+
protected string $cache_limiter = 'nocache';
106106

107107
public function setCacheLimiter(string $cache_limiter)
108108
{

src/Factory.php

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,72 +12,72 @@ public function configFromArray(array $settings): Config
1212
{
1313
$config = new Config();
1414

15-
if (isset($settings["save_path"])) {
16-
$config->setSavePath($settings["save_path"]);
15+
if (isset($settings['save_path'])) {
16+
$config->setSavePath($settings['save_path']);
1717
}
1818

19-
if (isset($settings["save_handler"])) {
20-
$config->setSaveHandler($settings["save_handler"]);
19+
if (isset($settings['save_handler'])) {
20+
$config->setSaveHandler($settings['save_handler']);
2121
}
2222

23-
if (isset($settings["serialize_handler"])) {
23+
if (isset($settings['serialize_handler'])) {
2424
$config->setSerializeHandler(
25-
Serializers\Factory::auto($settings["serialize_handler"])
25+
Serializers\Factory::auto($settings['serialize_handler'])
2626
);
2727
}
2828

29-
if (isset($settings["name"])) {
30-
$config->setName($settings["name"]);
29+
if (isset($settings['name'])) {
30+
$config->setName($settings['name']);
3131
}
3232

33-
if (isset($settings["cookie_lifetime"])) {
34-
$config->setCookieLifetime((int) $settings["cookie_lifetime"]);
33+
if (isset($settings['cookie_lifetime'])) {
34+
$config->setCookieLifetime((int) $settings['cookie_lifetime']);
3535
}
36-
if (isset($settings["cookie_path"])) {
37-
$config->setCookiePath($settings["cookie_path"]);
36+
if (isset($settings['cookie_path'])) {
37+
$config->setCookiePath($settings['cookie_path']);
3838
}
39-
if (isset($settings["cookie_domain"])) {
40-
$config->setCookieDomain($settings["cookie_domain"]);
39+
if (isset($settings['cookie_domain'])) {
40+
$config->setCookieDomain($settings['cookie_domain']);
4141
}
42-
if (isset($settings["cookie_secure"])) {
43-
$config->setCookieSecure((bool) $settings["cookie_secure"]);
42+
if (isset($settings['cookie_secure'])) {
43+
$config->setCookieSecure((bool) $settings['cookie_secure']);
4444
}
45-
if (isset($settings["cookie_httponly"])) {
46-
$config->setCookieHttpOnly((bool) $settings["cookie_httponly"]);
45+
if (isset($settings['cookie_httponly'])) {
46+
$config->setCookieHttpOnly((bool) $settings['cookie_httponly']);
4747
}
48-
if (isset($settings["cookie_samesite"])) {
49-
$config->setCookieSameSite($settings["cookie_samesite"]);
48+
if (isset($settings['cookie_samesite'])) {
49+
$config->setCookieSameSite($settings['cookie_samesite']);
5050
}
5151

52-
if (isset($settings["cache_limiter"])) {
53-
$config->setCacheLimiter($settings["cache_limiter"]);
52+
if (isset($settings['cache_limiter'])) {
53+
$config->setCacheLimiter($settings['cache_limiter']);
5454
}
55-
if (isset($settings["cache_expire"])) {
56-
$config->setCacheExpire((int) $settings["cache_expire"]);
55+
if (isset($settings['cache_expire'])) {
56+
$config->setCacheExpire((int) $settings['cache_expire']);
5757
}
5858

59-
if (isset($settings["gc_probability"])) {
60-
$config->setGcProbability((int) $settings["gc_probability"]);
59+
if (isset($settings['gc_probability'])) {
60+
$config->setGcProbability((int) $settings['gc_probability']);
6161
}
6262

63-
if (isset($settings["gc_divisor"])) {
64-
$config->setGcDivisor((int) $settings["gc_divisor"]);
63+
if (isset($settings['gc_divisor'])) {
64+
$config->setGcDivisor((int) $settings['gc_divisor']);
6565
}
6666

67-
if (isset($settings["gc_maxlifetime"])) {
68-
$config->setGcMaxLifetime((int) $settings["gc_maxlifetime"]);
67+
if (isset($settings['gc_maxlifetime'])) {
68+
$config->setGcMaxLifetime((int) $settings['gc_maxlifetime']);
6969
}
7070

71-
if (isset($settings["sid_length"])) {
72-
$config->setSidLength((int) $settings["sid_length"]);
71+
if (isset($settings['sid_length'])) {
72+
$config->setSidLength((int) $settings['sid_length']);
7373
}
7474

75-
if (isset($settings["sid_bits_per_character"])) {
76-
$config->setSidBitsPerCharacter((int) $settings["sid_bits_per_character"]);
75+
if (isset($settings['sid_bits_per_character'])) {
76+
$config->setSidBitsPerCharacter((int) $settings['sid_bits_per_character']);
7777
}
7878

79-
if (isset($settings["lazy_write"])) {
80-
$config->setLazyWrite((bool) $settings["lazy_write"]);
79+
if (isset($settings['lazy_write'])) {
80+
$config->setLazyWrite((bool) $settings['lazy_write']);
8181
}
8282

8383
return $config;
@@ -88,29 +88,29 @@ public function configFromSystem(): Config
8888
$config = new Config();
8989

9090
$config->setSerializeHandler(
91-
Serializers\Factory::auto(ini_get("session.serialize_handler"))
91+
Serializers\Factory::auto(ini_get('session.serialize_handler'))
9292
);
9393

94-
$config->setName(ini_get("session.name"));
94+
$config->setName(ini_get('session.name'));
9595

96-
$config->setCookieLifetime((int) ini_get("session.cookie_lifetime"));
97-
$config->setCookiePath(ini_get("session.cookie_path"));
98-
$config->setCookieDomain(ini_get("session.cookie_domain"));
99-
$config->setCookieSecure((bool) ini_get("session.cookie_secure"));
100-
$config->setCookieHttpOnly((bool) ini_get("session.cookie_httponly"));
101-
$config->setCookieSameSite(ini_get("session.cookie_samesite"));
96+
$config->setCookieLifetime((int) ini_get('session.cookie_lifetime'));
97+
$config->setCookiePath(ini_get('session.cookie_path'));
98+
$config->setCookieDomain(ini_get('session.cookie_domain'));
99+
$config->setCookieSecure((bool) ini_get('session.cookie_secure'));
100+
$config->setCookieHttpOnly((bool) ini_get('session.cookie_httponly'));
101+
$config->setCookieSameSite(ini_get('session.cookie_samesite'));
102102

103-
$config->setCacheLimiter(ini_get("session.cache_limiter"));
104-
$config->setCacheExpire((int) ini_get("session.cache_expire"));
103+
$config->setCacheLimiter(ini_get('session.cache_limiter'));
104+
$config->setCacheExpire((int) ini_get('session.cache_expire'));
105105

106-
$config->setGcProbability((int) ini_get("session.gc_probability"));
107-
$config->setGcDivisor((int) ini_get("session.gc_divisor"));
108-
$config->setGcMaxLifetime((int) ini_get("session.gc_maxlifetime"));
106+
$config->setGcProbability((int) ini_get('session.gc_probability'));
107+
$config->setGcDivisor((int) ini_get('session.gc_divisor'));
108+
$config->setGcMaxLifetime((int) ini_get('session.gc_maxlifetime'));
109109

110-
$config->setSidLength((int) ini_get("session.sid_length"));
111-
$config->setSidBitsPerCharacter((int) ini_get("session.sid_bits_per_character"));
110+
$config->setSidLength((int) ini_get('session.sid_length'));
111+
$config->setSidBitsPerCharacter((int) ini_get('session.sid_bits_per_character'));
112112

113-
$config->setLazyWrite((bool) ini_get("session.lazy_write"));
113+
$config->setLazyWrite((bool) ini_get('session.lazy_write'));
114114

115115
return $config;
116116
}

0 commit comments

Comments
 (0)