Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 8 additions & 11 deletions 8.1/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions 8.1/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -1158,29 +1158,29 @@
},
{
"name": "google/protobuf",
"version": "v4.33.4",
"version_normalized": "4.33.4.0",
"version": "v4.33.6",
"version_normalized": "4.33.6.0",
"source": {
"type": "git",
"url": "https://github.com/protocolbuffers/protobuf-php.git",
"reference": "22d28025cda0d223a2e48c2e16c5284ecc9f5402"
"reference": "84b008c23915ed94536737eae46f41ba3bccfe67"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/22d28025cda0d223a2e48c2e16c5284ecc9f5402",
"reference": "22d28025cda0d223a2e48c2e16c5284ecc9f5402",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/84b008c23915ed94536737eae46f41ba3bccfe67",
"reference": "84b008c23915ed94536737eae46f41ba3bccfe67",
"shasum": ""
},
"require": {
"php": ">=8.1.0"
},
"require-dev": {
"phpunit/phpunit": ">=5.0.0 <8.5.27"
"phpunit/phpunit": ">=10.5.62 <11.0.0"
},
"suggest": {
"ext-bcmath": "Need to support JSON deserialization"
},
"time": "2026-01-12T17:58:43+00:00",
"time": "2026-03-18T17:32:05+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -1199,7 +1199,7 @@
"proto"
],
"support": {
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.33.4"
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.33.6"
},
"install-path": "../google/protobuf"
},
Expand Down Expand Up @@ -2190,17 +2190,17 @@
},
{
"name": "league/commonmark",
"version": "2.8.0",
"version_normalized": "2.8.0.0",
"version": "2.8.2",
"version_normalized": "2.8.2.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "4efa10c1e56488e658d10adf7b7b7dcd19940bfb"
"reference": "59fb075d2101740c337c7216e3f32b36c204218b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/4efa10c1e56488e658d10adf7b7b7dcd19940bfb",
"reference": "4efa10c1e56488e658d10adf7b7b7dcd19940bfb",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/59fb075d2101740c337c7216e3f32b36c204218b",
"reference": "59fb075d2101740c337c7216e3f32b36c204218b",
"shasum": ""
},
"require": {
Expand All @@ -2225,16 +2225,16 @@
"phpstan/phpstan": "^1.8.2",
"phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
"scrutinizer/ocular": "^1.8.1",
"symfony/finder": "^5.3 | ^6.0 | ^7.0",
"symfony/process": "^5.4 | ^6.0 | ^7.0",
"symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
"symfony/finder": "^5.3 | ^6.0 | ^7.0 || ^8.0",
"symfony/process": "^5.4 | ^6.0 | ^7.0 || ^8.0",
"symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0 || ^8.0",
"unleashedtech/php-coding-standard": "^3.1.1",
"vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0"
},
"suggest": {
"symfony/yaml": "v2.3+ required if using the Front Matter extension"
},
"time": "2025-11-26T21:48:24+00:00",
"time": "2026-03-19T13:16:38+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -8161,23 +8161,23 @@
},
{
"name": "symfony/process",
"version": "v6.4.31",
"version_normalized": "6.4.31.0",
"version": "v6.4.33",
"version_normalized": "6.4.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "8541b7308fca001320e90bca8a73a28aa5604a6e"
"reference": "c46e854e79b52d07666e43924a20cb6dc546644e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/8541b7308fca001320e90bca8a73a28aa5604a6e",
"reference": "8541b7308fca001320e90bca8a73a28aa5604a6e",
"url": "https://api.github.com/repos/symfony/process/zipball/c46e854e79b52d07666e43924a20cb6dc546644e",
"reference": "c46e854e79b52d07666e43924a20cb6dc546644e",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
"time": "2025-12-15T19:26:35+00:00",
"time": "2026-01-23T16:02:12+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down Expand Up @@ -8205,7 +8205,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v6.4.31"
"source": "https://github.com/symfony/process/tree/v6.4.33"
},
"funding": [
{
Expand Down
18 changes: 9 additions & 9 deletions 8.1/vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@
'dev_requirement' => false,
),
'google/protobuf' => array(
'pretty_version' => 'v4.33.4',
'version' => '4.33.4.0',
'reference' => '22d28025cda0d223a2e48c2e16c5284ecc9f5402',
'pretty_version' => 'v4.33.6',
'version' => '4.33.6.0',
'reference' => '84b008c23915ed94536737eae46f41ba3bccfe67',
'type' => 'library',
'install_path' => __DIR__ . '/../google/protobuf',
'aliases' => array(),
Expand Down Expand Up @@ -554,9 +554,9 @@
'dev_requirement' => false,
),
'league/commonmark' => array(
'pretty_version' => '2.8.0',
'version' => '2.8.0.0',
'reference' => '4efa10c1e56488e658d10adf7b7b7dcd19940bfb',
'pretty_version' => '2.8.2',
'version' => '2.8.2.0',
'reference' => '59fb075d2101740c337c7216e3f32b36c204218b',
'type' => 'library',
'install_path' => __DIR__ . '/../league/commonmark',
'aliases' => array(),
Expand Down Expand Up @@ -1402,9 +1402,9 @@
'dev_requirement' => false,
),
'symfony/process' => array(
'pretty_version' => 'v6.4.31',
'version' => '6.4.31.0',
'reference' => '8541b7308fca001320e90bca8a73a28aa5604a6e',
'pretty_version' => 'v6.4.33',
'version' => '6.4.33.0',
'reference' => 'c46e854e79b52d07666e43924a20cb6dc546644e',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/process',
'aliases' => array(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ public function readTag()
public function readRaw($size, &$buffer)
{
$current_buffer_size = 0;
if ($this->bufferSize() < $size) {
// size (varint) read from the wire could be negative.
if ($size < 0 || $this->bufferSize() < $size) {
return \false;
}
if ($size === 0) {
Expand Down Expand Up @@ -293,7 +294,7 @@ public function popLimit($byte_limit)
public function incrementRecursionDepthAndPushLimit($byte_limit, &$old_limit, &$recursion_budget)
{
$old_limit = $this->pushLimit($byte_limit);
$recursion_limit = --$this->recursion_limit;
$recursion_budget = --$this->recursion_budget;
}
public function decrementRecursionDepthAndPopLimit($byte_limit)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static function writeVarintToArray($value, &$buffer, $trim = \false)
$low = $value;
}
while ($low >= 0x80 || $low < 0 || $high != 0) {
$buffer[$current] = chr($low | 0x80);
$buffer[$current] = chr(($low | 0x80) & 0xff);
$value = $value >> 7 & ~(0x7f << (\PHP_INT_SIZE << 3) - 7);
$carry = ($high & 0x7f) << (\PHP_INT_SIZE << 3) - 7;
$high = $high >> 7 & ~(0x7f << (\PHP_INT_SIZE << 3) - 7);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function getFullName()
public function addField($field)
{
$this->field[$field->getNumber()] = $field;
$this->json_to_field[$field->getJsonName()] = $field;
$this->json_to_field[$field->getJsonName() ?? ''] = $field;
$this->name_to_field[$field->getName()] = $field;
$this->index_to_field[] = $field;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public function addDescriptor($descriptor)
$this->proto_to_class[$descriptor->getFullName()] = $descriptor->getClass();
$this->unique_descs[$descriptor->getFullName()] = $descriptor;
$this->class_to_desc[$descriptor->getClass()] = $descriptor;
$this->class_to_desc[$descriptor->getLegacyClass()] = $descriptor;
$this->class_to_desc[$descriptor->getPreviouslyUnreservedClass()] = $descriptor;
$this->class_to_desc[$descriptor->getLegacyClass() ?? ''] = $descriptor;
$this->class_to_desc[$descriptor->getPreviouslyUnreservedClass() ?? ''] = $descriptor;
foreach ($descriptor->getNestedType() as $nested_type) {
$this->addDescriptor($nested_type);
}
Expand All @@ -75,7 +75,7 @@ public function addEnumDescriptor($descriptor)
{
$this->proto_to_class[$descriptor->getFullName()] = $descriptor->getClass();
$this->class_to_enum_desc[$descriptor->getClass()] = $descriptor;
$this->class_to_enum_desc[$descriptor->getLegacyClass()] = $descriptor;
$this->class_to_enum_desc[$descriptor->getLegacyClass() ?? ''] = $descriptor;
}
public function getDescriptorByClassName($klass)
{
Expand Down
6 changes: 5 additions & 1 deletion 8.1/vendor/laminas/laminas-diactoros/src/Uri.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,11 @@ public function withScheme(string $scheme): UriInterface
* {@inheritdoc}
*/
#[Override]
public function withUserInfo(string $user, #[SensitiveParameter] ?string $password = null): UriInterface
public function withUserInfo(
string $user,
#[SensitiveParameter]
?string $password = null
): UriInterface
{
$info = $this->filterUserInfoPart($user);
if (null !== $password) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function render(Node $node, ChildNodeRendererInterface $childRenderer): ?
if (\count($tags) === 0) {
return $rendered;
}
$regex = \sprintf('/<(\/?(?:%s)[ \/>])/i', \implode('|', \array_map('preg_quote', $tags)));
$regex = \sprintf('/<(\/?(?:%s)[\s\/>])/i', \implode('|', \array_map('preg_quote', $tags)));
// Match these types of tags: <title> </title> <title x="sdf"> <title/> <title />
return \preg_replace($regex, '&lt;$1', $rendered);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,40 @@
class DomainFilteringAdapter implements EmbedAdapterInterface
{
private EmbedAdapterInterface $decorated;
/** @psalm-var non-empty-string */
private string $regex;
/** @var string[] */
private array $allowedDomains;
/**
* @param string[] $allowedDomains
*/
public function __construct(EmbedAdapterInterface $decorated, array $allowedDomains)
{
$this->decorated = $decorated;
$this->regex = self::createRegex($allowedDomains);
$this->allowedDomains = \array_map('strtolower', $allowedDomains);
}
/**
* {@inheritDoc}
*/
public function updateEmbeds(array $embeds): void
{
$this->decorated->updateEmbeds(\array_values(\array_filter($embeds, function (Embed $embed): bool {
return \preg_match($this->regex, $embed->getUrl()) === 1;
})));
$this->decorated->updateEmbeds(\array_values(\array_filter($embeds, [$this, 'isAllowed'])));
}
/**
* @param string[] $allowedDomains
*
* @psalm-return non-empty-string
*/
private static function createRegex(array $allowedDomains): string
private function isAllowed(Embed $embed): bool
{
$allowedDomains = \array_map('preg_quote', $allowedDomains);
return '/^(?:https?:\/\/)?(?:[^.]+\.)*(' . \implode('|', $allowedDomains) . ')/';
$url = $embed->getUrl();
$scheme = \parse_url($url, \PHP_URL_SCHEME);
if ($scheme === null || $scheme === \false) {
// Bare domain (no scheme) - assume https:// so parse_url can extract the host
$url = 'https://' . $url;
} elseif (\strtolower($scheme) !== 'http' && \strtolower($scheme) !== 'https') {
return \false;
}
$host = \parse_url($url, \PHP_URL_HOST);
$host = \strtolower(\rtrim((string) $host, '.'));
foreach ($this->allowedDomains as $domain) {
if ($host === $domain || \str_ends_with($host, '.' . $domain)) {
return \true;
}
}
return \false;
}
}
2 changes: 1 addition & 1 deletion 8.1/vendor/league/commonmark/src/Util/UrlEncoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static function unescapeAndEncode(string $uri): string
continue;
}
}
if (\ord($code) < 128) {
if (\strlen($code) === 1 && \ord($code) < 128) {
$result .= self::ENCODE_CACHE[\ord($code)];
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion 8.1/vendor/mongodb/mongodb/src/ClientBulkWrite.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
use MongoDB\Driver\BulkWriteCommand;
use MongoDB\Driver\Manager;
use MongoDB\Exception\InvalidArgumentException;
use Odigos\NoDiscard;
use NoDiscard;
use stdClass;
use function is_array;
use function is_bool;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use Odigos\Monolog\Logger;
use Psr\Log\LogLevel;
use Odigos\Monolog\LogRecord;
use Odigos\NoDiscard;
use NoDiscard;
/**
* Used for testing purposes.
*
Expand Down
Loading
Loading