Julie/decor-6-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chapter hgroup + calming decor

Browse source
This commit is contained in:
Julie Blanc 2026-04-07 18:09:15 +02:00
parent 0545b131de
commit 94d14d70c1
370 changed files with 9583 additions and 1566 deletions
Download patch file Download diff file Expand all files Collapse all files

123
kirby/src/Cms/Responder.php
View file

@ -5,7 +5,7 @@ namespace Kirby\Cms;
use Kirby\Exception\InvalidArgumentException;
use Kirby\Filesystem\Mime;
use Kirby\Http\Response as HttpResponse;
use Kirby\Toolkit\A;
use Kirby\Http\VolatileHeaders;
use Kirby\Toolkit\Str;
use Stringable;
@ -66,10 +66,9 @@ class Responder implements Stringable
protected array $usesCookies = [];
/**
* Tracks headers that depend on the request
* and must not be persisted in the cache
* Volatile headers manager
*/
protected array $volatileHeaders = [];
protected VolatileHeaders|null $volatileHeaders = null;
/**
* Creates and sends the response
@ -244,7 +243,7 @@ class Responder implements Stringable
$this->type($response['type'] ?? null);
$this->usesAuth($response['usesAuth'] ?? null);
$this->usesCookies($response['usesCookies'] ?? null);
$this->volatileHeaders = $response['volatileHeaders'] ?? [];
$this->volatileHeaders($response['volatileHeaders'] ?? null);
}
/**
@ -325,7 +324,7 @@ class Responder implements Stringable
}
$this->headers = $headers;
$this->volatileHeaders = [];
$this->volatileHeaders([]);
return $this;
}
@ -405,13 +404,13 @@ class Responder implements Stringable
public function toCacheArray(): array
{
$response = $this->toArray();
$volatile = $this->collectVolatileHeaders();
$volatile = $this->volatileHeaders()->collect();
if ($volatile === []) {
return $response;
}
$response['headers'] = $this->stripVolatileHeaders($response['headers'], $volatile);
$response['headers'] = $this->volatileHeaders()->strip($response['headers'], $volatile);
return $response;
}
@ -465,114 +464,32 @@ class Responder implements Stringable
* can be subtracted before caching a response snapshot
*
* @since 5.2.0
* @deprecated 5.3.0 Use `::volatileHeaders()->mark($name, $values)` instead. Will be removed in Kirby 6.
*/
public function markVolatileHeader(string $name, array|null $values = null): void
{
$this->appendVolatileHeader($this->volatileHeaders, $name, $values);
$this->volatileHeaders()->mark($name, $values);
}
/**
* Collects volatile headers from both manual configuration
* and automatically injected CORS headers
* Setter and getter for the volatile headers manager
* @since 5.3.0
*/
protected function collectVolatileHeaders(): array
public function volatileHeaders(VolatileHeaders|array|null $headers = null): VolatileHeaders
{
$volatile = $this->volatileHeaders;
$corsHeaders = Cors::headers();
if ($corsHeaders === []) {
return $volatile;
if ($headers === null) {
return $this->volatileHeaders ??= new VolatileHeaders();
}
foreach ($corsHeaders as $name => $value) {
if ($name === 'Vary') {
$corsVaryValues = array_map('trim', explode(',', $value));
$this->appendVolatileHeader($volatile, 'Vary', $corsVaryValues);
continue;
}
$this->appendVolatileHeader($volatile, $name);
if ($headers instanceof VolatileHeaders) {
return $this->volatileHeaders = $headers;
}
return $volatile;
}
/**
* Strips request-dependent headers for safe caching
*/
protected function stripVolatileHeaders(array $headers, array $volatile): array
{
foreach ($volatile as $name => $values) {
if ($name === 'Vary' && is_array($values) === true) {
if (isset($headers['Vary']) === false) {
continue;
}
$current = $this->normalizeVaryValues($headers['Vary']);
$remaining = $this->removeVaryValues($current, $values);
if ($remaining === []) {
unset($headers['Vary']);
} else {
$headers['Vary'] = implode(', ', $remaining);
}
continue;
}
unset($headers[$name]);
$volatileHeaders = new VolatileHeaders();
foreach ($headers as $name => $values) {
$volatileHeaders->mark($name, $values);
}
return $headers;
}
/**
* Adds (parts of) a header to the provided volatile header list
*/
protected function appendVolatileHeader(array &$target, string $name, array|null $values = null): void
{
if ($values === null) {
$target[$name] = null;
return;
}
if (array_key_exists($name, $target) === true && $target[$name] === null) {
return;
}
$values = A::map($values, static fn ($value) => strtolower(trim($value)));
$values = A::filter($values, static fn ($value) => $value !== '');
if ($values === []) {
return;
}
$existingValues = $target[$name] ?? [];
$target[$name] = array_values(array_unique([...$existingValues, ...$values]));
}
/**
* Normalizes a comma-separated list of Vary values
* into a unique array without empty entries
*/
protected function normalizeVaryValues(string $value): array
{
$values = A::map(explode(',', $value), 'trim');
$values = A::filter($values, static fn ($entry) => $entry !== '');
return array_values(array_unique($values));
}
/**
* Returns the Vary values with the provided entries removed
*/
protected function removeVaryValues(array $values, array $remove): array
{
$removeLower = A::map($remove, 'strtolower');
return array_values(A::filter(
$values,
static fn ($value) => in_array(strtolower($value), $removeLower, true) === false
));
return $this->volatileHeaders = $volatileHeaders;
}
}