makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2023-05-29 20:39:08 +02:00
commit 442430002c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/phpbb/attachment/upload.php
View file

@ -46,6 +46,9 @@ class upload
/** @var dispatcher */ /** @var dispatcher */
protected $phpbb_dispatcher; protected $phpbb_dispatcher;
/** @var string */
protected $phpbb_root_path;
/** @var plupload Plupload */ /** @var plupload Plupload */
protected $plupload; protected $plupload;

4
phpBB/phpbb/config/config.php
View file

@ -50,6 +50,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
* @param string $key The configuration option's name. * @param string $key The configuration option's name.
* @return bool Whether the configuration option exists. * @return bool Whether the configuration option exists.
*/ */
#[\ReturnTypeWillChange]
public function offsetExists($key) public function offsetExists($key)
{ {
return isset($this->config[$key]); return isset($this->config[$key]);
@ -61,6 +62,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
* @param string $key The configuration option's name. * @param string $key The configuration option's name.
* @return int|string The configuration value * @return int|string The configuration value
*/ */
#[\ReturnTypeWillChange]
public function offsetGet($key) public function offsetGet($key)
{ {
return (isset($this->config[$key])) ? $this->config[$key] : ''; return (isset($this->config[$key])) ? $this->config[$key] : '';
@ -75,6 +77,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
* @param string $key The configuration option's name. * @param string $key The configuration option's name.
* @param string $value The temporary value. * @param string $value The temporary value.
*/ */
#[\ReturnTypeWillChange]
public function offsetSet($key, $value) public function offsetSet($key, $value)
{ {
$this->config[$key] = $value; $this->config[$key] = $value;
@ -85,6 +88,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
* *
* @param string $key The configuration option's name. * @param string $key The configuration option's name.
*/ */
#[\ReturnTypeWillChange]
public function offsetUnset($key) public function offsetUnset($key)
{ {
trigger_error('Config values have to be deleted explicitly with the \phpbb\config\config::delete($key) method.', E_USER_ERROR); trigger_error('Config values have to be deleted explicitly with the \phpbb\config\config::delete($key) method.', E_USER_ERROR);

1
phpBB/phpbb/datetime.php
View file

@ -57,6 +57,7 @@ class datetime extends \DateTime
* @param boolean $force_absolute Force output of a non relative date * @param boolean $force_absolute Force output of a non relative date
* @return string Formatted date time * @return string Formatted date time
*/ */
#[\ReturnTypeWillChange]
public function format($format = '', $force_absolute = false) public function format($format = '', $force_absolute = false)
{ {
$format = $format ? $format : $this->user->date_format; $format = $format ? $format : $this->user->date_format;

4
phpBB/phpbb/event/data.php
View file

@ -44,21 +44,25 @@ class data extends Event implements \ArrayAccess
return array_intersect_key($this->data, array_flip($keys)); return array_intersect_key($this->data, array_flip($keys));
} }
#[\ReturnTypeWillChange]
public function offsetExists($offset) public function offsetExists($offset)
{ {
return isset($this->data[$offset]); return isset($this->data[$offset]);
} }
#[\ReturnTypeWillChange]
public function offsetGet($offset) public function offsetGet($offset)
{ {
return isset($this->data[$offset]) ? $this->data[$offset] : null; return isset($this->data[$offset]) ? $this->data[$offset] : null;
} }
#[\ReturnTypeWillChange]
public function offsetSet($offset, $value) public function offsetSet($offset, $value)
{ {
$this->data[$offset] = $value; $this->data[$offset] = $value;
} }
#[\ReturnTypeWillChange]
public function offsetUnset($offset) public function offsetUnset($offset)
{ {
unset($this->data[$offset]); unset($this->data[$offset]);