Skip to content

Commit 5de379d

Browse files
committed
Fix more deprecation warnings on PHP 8.5
Fixes #249
1 parent 7aef5f4 commit 5de379d

File tree

5 files changed

+15
-20
lines changed

5 files changed

+15
-20
lines changed

src/Bundles/Fatdown.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,6 @@ public static function getParser(): \s9e\TextFormatter\Parser
122122
*/
123123
public static function getRenderer(): \s9e\TextFormatter\Renderer
124124
{
125-
return unserialize('O:42:"s9e\\TextFormatter\\Bundles\\Fatdown\\Renderer":2:{s:19:"enableQuickRenderer";b:1;s:9:"' . "\0" . '*' . "\0" . 'params";a:2:{s:16:"MEDIAEMBED_THEME";s:0:"";s:18:"TASKLISTS_EDITABLE";s:0:"";}}');
125+
return unserialize('O:42:"s9e\\TextFormatter\\Bundles\\Fatdown\\Renderer":2:{s:19:"enableQuickRenderer";b:1;s:6:"params";a:2:{s:16:"MEDIAEMBED_THEME";s:0:"";s:18:"TASKLISTS_EDITABLE";s:0:"";}}');
126126
}
127127
}

src/Bundles/Forum.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,6 @@ public static function getParser(): \s9e\TextFormatter\Parser
364364
*/
365365
public static function getRenderer(): \s9e\TextFormatter\Renderer
366366
{
367-
return unserialize('O:40:"s9e\\TextFormatter\\Bundles\\Forum\\Renderer":2:{s:19:"enableQuickRenderer";b:1;s:9:"' . "\0" . '*' . "\0" . 'params";a:5:{s:6:"L_HIDE";s:4:"Hide";s:6:"L_SHOW";s:4:"Show";s:9:"L_SPOILER";s:7:"Spoiler";s:7:"L_WROTE";s:6:"wrote:";s:16:"MEDIAEMBED_THEME";s:0:"";}}');
367+
return unserialize('O:40:"s9e\\TextFormatter\\Bundles\\Forum\\Renderer":2:{s:19:"enableQuickRenderer";b:1;s:6:"params";a:5:{s:6:"L_HIDE";s:4:"Hide";s:6:"L_SHOW";s:4:"Show";s:9:"L_SPOILER";s:7:"Spoiler";s:7:"L_WROTE";s:6:"wrote:";s:16:"MEDIAEMBED_THEME";s:0:"";}}');
368368
}
369369
}

src/Bundles/MediaPack.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,6 @@ public static function getParser(): \s9e\TextFormatter\Parser
130130
*/
131131
public static function getRenderer(): \s9e\TextFormatter\Renderer
132132
{
133-
return unserialize('O:44:"s9e\\TextFormatter\\Bundles\\MediaPack\\Renderer":2:{s:19:"enableQuickRenderer";b:1;s:9:"' . "\0" . '*' . "\0" . 'params";a:1:{s:16:"MEDIAEMBED_THEME";s:0:"";}}');
133+
return unserialize('O:44:"s9e\\TextFormatter\\Bundles\\MediaPack\\Renderer":2:{s:19:"enableQuickRenderer";b:1;s:6:"params";a:1:{s:16:"MEDIAEMBED_THEME";s:0:"";}}');
134134
}
135135
}

src/Renderers/PHP.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,12 @@ abstract class PHP extends Renderer
6363
*/
6464
abstract protected function renderNode(DOMNode $node);
6565

66-
public function __sleep()
66+
public function __serialize(): array
6767
{
68-
return ['enableQuickRenderer', 'params'];
68+
return [
69+
'enableQuickRenderer' => $this->enableQuickRenderer,
70+
'params' => $this->params
71+
];
6972
}
7073

7174
/**

src/Renderers/XSLT.php

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ public function __construct($stylesheet)
4444
}
4545
}
4646

47-
/**
48-
* Serializer
49-
*
50-
* @return string[] List of properties to serialize
51-
*/
52-
public function __sleep()
47+
public function __serialize(): array
5348
{
5449
$props = get_object_vars($this);
5550
unset($props['proc']);
@@ -59,18 +54,15 @@ public function __sleep()
5954
unset($props['reloadParams']);
6055
}
6156

62-
return array_keys($props);
57+
return $props;
6358
}
6459

65-
/**
66-
* Unserialize helper
67-
*
68-
* Will reload parameters if they were changed between generation and serialization
69-
*
70-
* @return void
71-
*/
72-
public function __wakeup()
60+
public function __unserialize(array $data): void
7361
{
62+
foreach ($data as $k => $v)
63+
{
64+
$this->$k = $v;
65+
}
7466
if (!empty($this->reloadParams))
7567
{
7668
$this->setParameters($this->params);

0 commit comments

Comments
 (0)