mirror_php/php-debugbar
1
0
Fork 0
mirror of https://github.com/maximebf/php-debugbar.git synced 2025-01-17 05:18:32 +01:00
Code Issues Releases Wiki Activity

Dont use null where string is expected (#489)

Browse Source 
Quickfix for PHP 8.1 compatibility
This commit is contained in:
Sem Schilder 2021-12-12 12:55:31 +01:00 committed by GitHub
parent 14bdc78c0c
commit 12a1eef59b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/DebugBar/JavascriptRenderer.php
View File

@ -719,8 +719,8 @@ class JavascriptRenderer
} }
foreach ($additionalAssets as $assets) { foreach ($additionalAssets as $assets) {
$basePath = isset($assets['base_path']) ? $assets['base_path'] : null; $basePath = isset($assets['base_path']) ? $assets['base_path'] : '';
$baseUrl = isset($assets['base_url']) ? $assets['base_url'] : null; $baseUrl = isset($assets['base_url']) ? $assets['base_url'] : '';
$root = $this->getRelativeRoot($relativeTo, $root = $this->getRelativeRoot($relativeTo,
$this->makeUriRelativeTo($basePath, $this->basePath), $this->makeUriRelativeTo($basePath, $this->basePath),
$this->makeUriRelativeTo($baseUrl, $this->baseUrl)); $this->makeUriRelativeTo($baseUrl, $this->baseUrl));
@ -746,7 +746,7 @@ class JavascriptRenderer
$cssFiles = array_unique($cssFiles); $cssFiles = array_unique($cssFiles);
$jsFiles = array_unique($jsFiles); $jsFiles = array_unique($jsFiles);
return $this->filterAssetArray(array($cssFiles, $jsFiles, $inlineCss, $inlineJs, $inlineHead), $type); return $this->filterAssetArray(array($cssFiles, $jsFiles, $inlineCss, $inlineJs, $inlineHead), $type ?? '');
} }
/** /**
@ -802,7 +802,7 @@ class JavascriptRenderer
* @param string $type 'css', 'js', 'inline_css', 'inline_js', 'inline_head', or null for all * @param string $type 'css', 'js', 'inline_css', 'inline_js', 'inline_head', or null for all
* @return array * @return array
*/ */
protected function filterAssetArray($array, $type = null) protected function filterAssetArray($array, $type = '')
{ {
$types = array('css', 'js', 'inline_css', 'inline_js', 'inline_head'); $types = array('css', 'js', 'inline_css', 'inline_js', 'inline_head');
$typeIndex = array_search(strtolower($type), $types); $typeIndex = array_search(strtolower($type), $types);