Skip to content

Commit

Permalink
Merge pull request #5150 from getkirby/release/3.9.4-rc.1
Browse files Browse the repository at this point in the history 
Update `filp/whoops` dependency
  • Loading branch information
@bastianallgeier
bastianallgeier authored Apr 14, 2023
2 parents ebf021b + 25402b7 commit 8174267
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 23 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"ext-openssl": "*",
"claviska/simpleimage": "4.0.2",
"composer/semver": "3.3.2",
"filp/whoops": "2.15.1",
"filp/whoops": "2.15.2",
"getkirby/composer-installer": "^1.2.1",
"laminas/laminas-escaper": "2.12.0",
"michelf/php-smartypants": "1.8.1",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock
View file

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

17 changes: 12 additions & 5 deletions vendor/composer/InstalledVersions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
{
foreach (self::getInstalled() as $installed) {
if (isset($installed['versions'][$packageName])) {
return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
}
}

Expand All @@ -119,7 +119,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
*/
public static function satisfies(VersionParser $parser, $packageName, $constraint)
{
$constraint = $parser->parseConstraints($constraint);
$constraint = $parser->parseConstraints((string) $constraint);
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));

return $provided->matches($constraint);
Expand Down Expand Up @@ -328,7 +328,9 @@ private static function getInstalled()
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
/** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
$required = require $vendorDir.'/composer/installed.php';
$installed[] = self::$installedByVendor[$vendorDir] = $required;
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
self::$installed = $installed[count($installed) - 1];
}
Expand All @@ -340,12 +342,17 @@ private static function getInstalled()
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
self::$installed = require __DIR__ . '/installed.php';
/** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
$required = require __DIR__ . '/installed.php';
self::$installed = $required;
} else {
self::$installed = array();
}
}
$installed[] = self::$installed;

if (self::$installed !== array()) {
$installed[] = self::$installed;
}

return $installed;
}
Expand Down
14 changes: 7 additions & 7 deletions vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,17 @@
},
{
"name": "filp/whoops",
"version": "2.15.1",
"version_normalized": "2.15.1.0",
"version": "2.15.2",
"version_normalized": "2.15.2.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "e864ac957acd66e1565f25efda61e37791a5db0b"
"reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/e864ac957acd66e1565f25efda61e37791a5db0b",
"reference": "e864ac957acd66e1565f25efda61e37791a5db0b",
"url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73",
"reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73",
"shasum": ""
},
"require": {
Expand All @@ -168,7 +168,7 @@
"symfony/var-dumper": "Pretty print complex values better with var-dumper available",
"whoops/soap": "Formats errors as SOAP responses"
},
"time": "2023-03-06T18:09:13+00:00",
"time": "2023-04-12T12:00:00+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -204,7 +204,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.15.1"
"source": "https://github.com/filp/whoops/tree/2.15.2"
},
"funding": [
{
Expand Down
6 changes: 3 additions & 3 deletions vendor/composer/installed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
'dev_requirement' => false,
),
'filp/whoops' => array(
'pretty_version' => '2.15.1',
'version' => '2.15.1.0',
'reference' => 'e864ac957acd66e1565f25efda61e37791a5db0b',
'pretty_version' => '2.15.2',
'version' => '2.15.2.0',
'reference' => 'aac9304c5ed61bf7b1b7a6064bf9806ab842ce73',
'type' => 'library',
'install_path' => __DIR__ . '/../filp/whoops',
'aliases' => array(),
Expand Down
1 change: 1 addition & 0 deletions vendor/filp/whoops/src/Whoops/Resources/views/frame_code.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
?>
<pre class="code-block line-numbers"
data-line="<?php echo $line ?>"
data-line-offset="<?php echo $start ?>"
data-start="<?php echo $start ?>"
><code class="language-php"><?php echo $tpl->escape($code) ?></code></pre>

Expand Down

0 comments on commit 8174267

Please sign in to comment.