Changeset 93103 in spip-zone

Timestamp:

Nov 23, 2015, 12:16:41 PM (5 years ago)

Author:

marcimat@…

Message:

Compat PHP7 lib HTML Sax

Location:

_core_/plugins/safehtml/lib/safehtml/classes

Files:

• HTMLSax3.php (modified) (4 diffs)
• HTMLSax3/Decorators.php (modified) (7 diffs)

_core_/plugins/safehtml/lib/safehtml/classes/HTMLSax3.php

@@ -45 +45 @@
  var $State = array();
 
- function XML_HTMLSax3_StateParser (& $htmlsax) {
+ function __construct(& $htmlsax) {
   $this->htmlsax = & $htmlsax;
 
@@ -154 +154 @@
 
 class XML_HTMLSax3_StateParser_Lt430 extends XML_HTMLSax3_StateParser {
- function XML_HTMLSax3_StateParser_Lt430(& $htmlsax) {
+ function __construct(& $htmlsax) {
   parent::XML_HTMLSax3_StateParser($htmlsax);
   $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
@@ -186 +186 @@
 
 class XML_HTMLSax3_StateParser_Gtet430 extends XML_HTMLSax3_StateParser {
- function XML_HTMLSax3_StateParser_Gtet430(& $htmlsax) {
+ function __construct(& $htmlsax) {
   parent::XML_HTMLSax3_StateParser($htmlsax);
   $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
@@ -220 +220 @@
  var $state_parser;
 
- function XML_HTMLSax3() {
+ function __construct() {
   if (version_compare(phpversion(), '4.3', 'ge')) {
    $this->state_parser = new XML_HTMLSax3_StateParser_Gtet430($this);

_core_/plugins/safehtml/lib/safehtml/classes/HTMLSax3/Decorators.php

@@ -3 +3 @@
  var $orig_obj;
  var $orig_method;
- function XML_HTMLSax3_Trim(&$orig_obj, $orig_method) {
+ function __construct(&$orig_obj, $orig_method) {
   $this->orig_obj =& $orig_obj;
   $this->orig_method = $orig_method;
@@ -18 +18 @@
  var $orig_open_method;
  var $orig_close_method;
- function XML_HTMLSax3_CaseFolding(&$orig_obj, $orig_open_method, $orig_close_method) {
+ function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
   $this->orig_obj =& $orig_obj;
   $this->orig_open_method = $orig_open_method;
@@ -33 +33 @@
  var $orig_obj;
  var $orig_method;
- function XML_HTMLSax3_LineFeed(&$orig_obj, $orig_method) {
+ function __construct(&$orig_obj, $orig_method) {
   $this->orig_obj =& $orig_obj;
   $this->orig_method = $orig_method;
@@ -47 +47 @@
  var $orig_obj;
  var $orig_method;
- function XML_HTMLSax3_Tab(&$orig_obj, $orig_method) {
+ function __construct(&$orig_obj, $orig_method) {
   $this->orig_obj =& $orig_obj;
   $this->orig_method = $orig_method;
@@ -61 +61 @@
  var $orig_obj;
  var $orig_method;
- function XML_HTMLSax3_Entities_Parsed(&$orig_obj, $orig_method) {
+ function __construct(&$orig_obj, $orig_method) {
   $this->orig_obj =& $orig_obj;
   $this->orig_method = $orig_method;
@@ -82 +82 @@
  var $orig_obj;
  var $orig_method;
- function XML_HTMLSax3_Entities_Unparsed(&$orig_obj, $orig_method) {
+ function __construct(&$orig_obj, $orig_method) {
   $this->orig_obj =& $orig_obj;
   $this->orig_method = $orig_method;
@@ -97 +97 @@
  var $orig_obj;
  var $orig_method;
- function XML_HTMLSax3_Escape_Stripper(&$orig_obj, $orig_method) {
+ function __construct(&$orig_obj, $orig_method) {
   $this->orig_obj =& $orig_obj;
   $this->orig_method = $orig_method;