Skip to content

Fixed a few more php 8 issues #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 10, 2023
Merged

Fixed a few more php 8 issues #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4820ada
PHP 8.0 > Class name must be a valid object or a string in case the c…
thirsch Dec 13, 2022
c55d53c
PHP 8.0 > Fix undefined array key
thirsch Dec 13, 2022
8b81a56
PHP 8.1 > Fix some more null on string parameter
thirsch Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/config/sfViewConfigHandler.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ protected function addHtmlHead($viewName = '')

foreach ($this->mergeConfigValue('metas', $viewName) as $name => $content)
{
$data[] = sprintf(" \$response->addMeta('%s', '%s', false, false);", $name, str_replace('\'', '\\\'', preg_replace('/&(?=\w+;)/', '&', htmlspecialchars($content, ENT_QUOTES, sfConfig::get('sf_charset')))));
$data[] = sprintf(" \$response->addMeta('%s', '%s', false, false);", $name, str_replace('\'', '\\\'', preg_replace('/&(?=\w+;)/', '&', htmlspecialchars((string) $content, ENT_QUOTES, sfConfig::get('sf_charset')))));
}

return implode("\n", $data)."\n";
Expand Down
5 changes: 4 additions & 1 deletion lib/controller/sfController.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,10 @@ protected function getController($moduleName, $controllerName, $extension)
$classSuffix = ucfirst(strtolower($extension));
if (!isset($this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix]))
{
$this->controllerExists($moduleName, $controllerName, $extension, true);
if (!$this->controllerExists($moduleName, $controllerName, $extension, true))
{
return null;
}
}

$class = $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix];
Expand Down
3 changes: 2 additions & 1 deletion lib/escaper/sfOutputEscaperArrayDecorator.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ public function offsetExists($offset)
#[\ReturnTypeWillChange]
public function offsetGet($offset)
{
return sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
$value = isset($this->value[$offset]) ? $this->value[$offset] : null;
return sfOutputEscaper::escape($this->escapingMethod, $value);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/request/sfWebRequest.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public function getContentType($trim = true)
{
$contentType = $this->getHttpHeader('Content-Type', null);

if ($trim && false !== $pos = strpos($contentType, ';'))
if ($trim && false !== $pos = strpos((string) $contentType, ';'))
{
$contentType = substr($contentType, 0, $pos);
}
Expand Down
3 changes: 2 additions & 1 deletion lib/response/sfWebResponse.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@ public function sendHttpHeaders()
// cookies
foreach ($this->cookies as $cookie)
{
setrawcookie($cookie['name'], $cookie['value'], $cookie['expire'], $cookie['path'], $cookie['domain'], $cookie['secure'], $cookie['httpOnly']);
$expire = isset($cookie['expire']) ? $cookie['expire'] : 0;
setrawcookie($cookie['name'], $cookie['value'], $expire, $cookie['path'], $cookie['domain'], $cookie['secure'], $cookie['httpOnly']);

if ($this->options['logging'])
{
Expand Down