From 64e9d74d5b19e27ab267bd1dd986e6101085c968 Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 18 Jul 2014 09:44:34 +0000 Subject: [PATCH] Use __construct git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8986 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/BlockParser.php | 12 +++--- lib/CachedMarkup.php | 20 ++++----- lib/DbSession/ADODB.php | 4 +- lib/DbSession/PDO.php | 4 +- lib/DbSession/SQL.php | 2 +- lib/DbSession/dba.php | 3 +- lib/HtmlParser.php | 4 +- lib/InlineParser.php | 14 +++---- lib/PageList.php | 44 ++++++++++---------- lib/RSSWriter091.php | 2 +- lib/RssWriter.php | 2 +- lib/RssWriter2.php | 2 +- lib/SemanticWeb.php | 4 +- lib/TextSearchQuery.php | 6 +-- lib/WikiDB/backend/ADODB.php | 4 +- lib/WikiDB/backend/PDO.php | 4 +- lib/WikiDB/backend/PDO_mysql.php | 5 +-- lib/WikiDB/backend/PearDB.php | 4 +- lib/WikiDB/backend/PearDB_ffpgsql.php | 4 +- lib/WikiDB/backend/PearDB_pgsql.php | 2 +- lib/WikiDB/backend/cvs.php | 14 +++---- lib/WikiDB/backend/dba.php | 2 +- lib/WikiDB/backend/dbaBase.php | Bin 33230 -> 33199 bytes lib/WikiDB/backend/dumb/BackLinkIter.php | 2 +- lib/WikiDB/backend/dumb/LinkSearchIter.php | 4 +- lib/WikiDB/backend/dumb/MostPopularIter.php | 2 +- lib/WikiDB/backend/dumb/MostRecentIter.php | 2 +- lib/WikiDB/backend/dumb/TextSearchIter.php | 4 +- lib/WikiDB/backend/dumb/WantedPagesIter.php | 2 +- lib/WikiDB/backend/file.php | 4 +- lib/WikiUser.php | 22 +++++----- lib/WysiwygEdit/FCKeditor.php | 2 +- lib/WysiwygEdit/Wikiwyg.php | 2 +- lib/WysiwygEdit/tinymce.php | 2 +- lib/XmlElement.php | 5 +-- lib/XmlRpcServer.php | 2 +- lib/diff.php | 6 +-- lib/diff3.php | 6 +-- lib/difflib.php | 13 +++--- lib/loadsave.php | 2 +- lib/main.php | 2 +- themes/Sidebar/themeinfo.php | 2 +- themes/blog/themeinfo.php | 2 +- 43 files changed, 120 insertions(+), 130 deletions(-) diff --git a/lib/BlockParser.php b/lib/BlockParser.php index a4f48a33a..73b75c50e 100644 --- a/lib/BlockParser.php +++ b/lib/BlockParser.php @@ -253,7 +253,7 @@ class BlockParser_Input class BlockParser_InputSubBlock extends BlockParser_Input { - function BlockParser_InputSubBlock(&$input, $prefix_re, $initial_prefix = false) + function __construct(&$input, $prefix_re, $initial_prefix = false) { $this->_input = &$input; $this->_prefix_pat = "/$prefix_re|\\s*\$/Ax"; @@ -486,8 +486,8 @@ class SubBlock extends ParsedBlock */ class TightSubBlock extends SubBlock { - function TightSubBlock(&$input, $indent_re, $initial_indent = false, - $tag = 'div', $attr = false) + function __construct(&$input, $indent_re, $initial_indent = false, + $tag = 'div', $attr = false) { $this->SubBlock($input, $indent_re, $initial_indent, $tag, $attr); @@ -611,7 +611,7 @@ class Block_dl extends Block_list { public $_tag = 'dl'; - function Block_dl() + function __construct() { $this->_re = '\ {0,4}\S.*(?XmlContent(); if (!is_array($defn)) @@ -817,7 +817,7 @@ class Block_table_dl extends Block_dl { public $_tag = 'dl-table'; // phony. - function Block_table_dl() + function __construct() { $this->_re = '\ {0,4} (?:\S.*)? (?_basepage = $basepage; $this->_buf = ''; @@ -354,7 +354,7 @@ class Cached_InlinedImage extends Cached_DynamicContent class Cached_WikiLink extends Cached_Link { - function Cached_WikiLink($page, $label = false, $anchor = false) + function __construct($page, $label = false, $anchor = false) { $this->_page = $page; /* ":DontStoreLink" */ @@ -442,7 +442,7 @@ class Cached_WikiLink extends Cached_Link class Cached_WikiLinkIfKnown extends Cached_WikiLink { - function Cached_WikiLinkIfKnown($moniker) + function __construct($moniker) { $this->_page = $moniker; } @@ -460,7 +460,7 @@ class Cached_WikiLinkIfKnown extends Cached_WikiLink class Cached_SpellCheck extends Cached_WikiLink { - function Cached_SpellCheck($word, $suggs) + function __construct($word, $suggs) { $this->_page = $word; $this->suggestions = $suggs; @@ -478,7 +478,7 @@ class Cached_SpellCheck extends Cached_WikiLink class Cached_PhpwikiURL extends Cached_DynamicContent { - function Cached_PhpwikiURL($url, $label) + function __construct($url, $label) { $this->_url = $url; if ($label) @@ -529,7 +529,7 @@ class Cached_PhpwikiURL extends Cached_DynamicContent class Cached_SemanticLink extends Cached_WikiLink { - function Cached_SemanticLink($url, $label = false) + function __construct($url, $label = false) { $this->_url = $url; if ($label && $label != $url) @@ -665,7 +665,7 @@ class Cached_SemanticLink extends Cached_WikiLink */ class Cached_SearchHighlight extends Cached_DynamicContent { - function Cached_SearchHighlight($word, $engine) + function __construct($word, $engine) { $this->_word = $word; $this->engine = $engine; @@ -682,7 +682,7 @@ class Cached_SearchHighlight extends Cached_DynamicContent class Cached_ExternalLink extends Cached_Link { - function Cached_ExternalLink($url, $label = false) + function __construct($url, $label = false) { $this->_url = $url; if ($label && $label != $url) @@ -728,7 +728,7 @@ class Cached_ExternalLink extends Cached_Link class Cached_InterwikiLink extends Cached_ExternalLink { - function Cached_InterwikiLink($link, $label = false) + function __construct($link, $label = false) { $this->_link = $link; if ($label) @@ -822,7 +822,7 @@ class Cached_UserLink extends Cached_WikiLink class Cached_PluginInvocation extends Cached_DynamicContent { - function Cached_PluginInvocation($pi) + function __construct($pi) { $this->_pi = $pi; $loader = $this->_getLoader(); diff --git a/lib/DbSession/ADODB.php b/lib/DbSession/ADODB.php index a551d9d5d..90665b517 100644 --- a/lib/DbSession/ADODB.php +++ b/lib/DbSession/ADODB.php @@ -29,9 +29,8 @@ class DbSession_ADODB { public $_backend_type = "ADODB"; - function DbSession_ADODB($dbh, $table) + function __construct($dbh, $table) { - $this->_dbh = $dbh; $this->_table = $table; @@ -43,7 +42,6 @@ class DbSession_ADODB array(&$this, 'write'), array(&$this, 'destroy'), array(&$this, 'gc')); - return $this; } function & _connect() diff --git a/lib/DbSession/PDO.php b/lib/DbSession/PDO.php index f3941b663..3eecff958 100644 --- a/lib/DbSession/PDO.php +++ b/lib/DbSession/PDO.php @@ -10,9 +10,8 @@ class DbSession_PDO { public $_backend_type = "PDO"; - function DbSession_PDO($dbh, $table) + function __construct($dbh, $table) { - $this->_dbh = $dbh; $this->_table = $table; @@ -24,7 +23,6 @@ class DbSession_PDO array(&$this, 'write'), array(&$this, 'destroy'), array(&$this, 'gc')); - return $this; } function & _connect() diff --git a/lib/DbSession/SQL.php b/lib/DbSession/SQL.php index efd3198e0..e970094da 100644 --- a/lib/DbSession/SQL.php +++ b/lib/DbSession/SQL.php @@ -15,7 +15,7 @@ class DbSession_SQL { public $_backend_type = "SQL"; - function DbSession_SQL(&$dbh, $table) + function __construct(&$dbh, $table) { $this->_dbh = $dbh; diff --git a/lib/DbSession/dba.php b/lib/DbSession/dba.php index 78116376d..04ed05c97 100644 --- a/lib/DbSession/dba.php +++ b/lib/DbSession/dba.php @@ -15,7 +15,7 @@ class DbSession_dba { public $_backend_type = "dba"; - function DbSession_dba(&$dbh, $table) + function __construct(&$dbh, $table) { $this->_dbh = $dbh; ini_set('session.save_handler', 'user'); @@ -26,7 +26,6 @@ class DbSession_dba array(&$this, 'write'), array(&$this, 'destroy'), array(&$this, 'gc')); - return $this; } function quote($str) diff --git a/lib/HtmlParser.php b/lib/HtmlParser.php index 6de2f4fa7..ce464f670 100644 --- a/lib/HtmlParser.php +++ b/lib/HtmlParser.php @@ -49,7 +49,7 @@ class HtmlParser * dialect: "PhpWiki2", "PhpWiki" * possible more dialects: MediaWiki, kwiki, c2 */ - function HtmlParser($dialect = "PhpWiki2", $encoding = '') + function __construct($dialect = "PhpWiki2", $encoding = '') { $classname = "HtmlParser_" . $dialect; if (class_exists($classname)) @@ -225,7 +225,7 @@ class HtmlParser class HtmlParser_PhpWiki2 extends HtmlParser { - function HtmlParser_PhpWiki2() + function __construct() { $this->_handlers = array('html' => '', diff --git a/lib/InlineParser.php b/lib/InlineParser.php index 28ebdb21f..cf33d512e 100644 --- a/lib/InlineParser.php +++ b/lib/InlineParser.php @@ -543,7 +543,7 @@ class Markup_bracketlink extends SimpleMarkup class Markup_spellcheck extends SimpleMarkup { - function Markup_spellcheck() + function __construct() { $this->suggestions = $GLOBALS['request']->getArg('suggestions'); } @@ -566,7 +566,7 @@ class Markup_spellcheck extends SimpleMarkup class Markup_searchhighlight extends SimpleMarkup { - function Markup_searchhighlight() + function __construct() { $result = $GLOBALS['request']->_searchhighlight; require_once 'lib/TextSearchQuery.php'; @@ -1214,7 +1214,7 @@ class Markup_html_entities extends SimpleMarkup { //public $_match_regexp = '(: \.\.\.|\-\-|\-\-\-|\(C\) )'; - function Markup_html_entities() + function __construct() { $this->_entities = array('...' => '…', '--' => '–', @@ -1414,9 +1414,9 @@ class InlineTransformer class LinkTransformer extends InlineTransformer { - function LinkTransformer() + function __construct() { - $this->InlineTransformer(array('escape', 'wikicreolebracketlink', 'bracketlink', 'url', + parent::__construct(array('escape', 'wikicreolebracketlink', 'bracketlink', 'url', 'semanticlink', 'interwiki', 'wikiword', )); } @@ -1424,9 +1424,9 @@ class LinkTransformer extends InlineTransformer class NowikiTransformer extends InlineTransformer { - function NowikiTransformer() + function __construct() { - $this->InlineTransformer + parent::__construct (array('linebreak', 'html_emphasis', 'html_abbr', 'plugin', 'plugin_wikicreole', 'isonumchars', 'isohexchars', /*'html_entities',*/ diff --git a/lib/PageList.php b/lib/PageList.php index 402bf2c25..813b0e883 100644 --- a/lib/PageList.php +++ b/lib/PageList.php @@ -171,9 +171,9 @@ class _PageList_Column_base class _PageList_Column extends _PageList_Column_base { - function _PageList_Column($field, $default_heading, $align = false) + function __construct($field, $default_heading, $align = false) { - $this->_PageList_Column_base($default_heading, $align); + parent::__construct($default_heading, $align); $this->_need_rev = substr($field, 0, 4) == 'rev:'; $this->_iscustom = substr($field, 0, 7) == 'custom:'; @@ -214,10 +214,10 @@ class _PageList_Column extends _PageList_Column_base */ class _PageList_Column_custom extends _PageList_Column { - function _PageList_Column_custom($params) + function __construct($params) { $this->_pagelist =& $params[3]; - $this->_PageList_Column($params[0], $params[1], $params[2]); + parent::__construct($params[0], $params[1], $params[2]); } } @@ -261,9 +261,9 @@ class _PageList_Column_size extends _PageList_Column class _PageList_Column_bool extends _PageList_Column { - function _PageList_Column_bool($field, $default_heading, $text = 'yes') + function __construct($field, $default_heading, $text = 'yes') { - $this->_PageList_Column($field, $default_heading, 'center'); + parent::__construct($field, $default_heading, 'center'); $this->_textIfTrue = $text; $this->_textIfFalse = new RawXml('—'); //mdash } @@ -278,7 +278,7 @@ class _PageList_Column_bool extends _PageList_Column class _PageList_Column_checkbox extends _PageList_Column { - function _PageList_Column_checkbox($field, $default_heading, $name = 'p') + function __construct($field, $default_heading, $name = 'p') { $this->_name = $name; $heading = HTML::input(array('type' => 'button', @@ -287,7 +287,7 @@ class _PageList_Column_checkbox extends _PageList_Column 'value' => $default_heading, 'onclick' => "flipAll(this.form)" )); - $this->_PageList_Column($field, $heading, 'center'); + parent::__construct($field, $heading, 'center'); } function _getValuePageList($pagelist, $page_handle, &$revision_handle) @@ -325,22 +325,22 @@ class _PageList_Column_checkbox extends _PageList_Column class _PageList_Column_time extends _PageList_Column { - function _PageList_Column_time($field, $default_heading) + function __construct($field, $default_heading) { - $this->_PageList_Column($field, $default_heading, 'right'); + parent::__construct($field, $default_heading, 'right'); global $WikiTheme; $this->WikiTheme = &$WikiTheme; } function _getValue($page_handle, &$revision_handle) { - $time = _PageList_Column::_getValue($page_handle, $revision_handle); + $time = parent::_getValue($page_handle, $revision_handle); return $this->WikiTheme->formatDateTime($time); } function _getSortableValue($page_handle, &$revision_handle) { - return _PageList_Column::_getValue($page_handle, $revision_handle); + return parent::_getValue($page_handle, $revision_handle); } } @@ -359,8 +359,8 @@ class _PageList_Column_version extends _PageList_Column // (PHP memory limit exceeded) class _PageList_Column_content extends _PageList_Column { - function _PageList_Column_content($field, $default_heading, $align = false, - $search = false, $hilight_re = false) + function __construct($field, $default_heading, $align = false, + $search = false, $hilight_re = false) { $this->_PageList_Column($field, $default_heading, $align); $this->bytes = 50; @@ -459,9 +459,9 @@ class _PageList_Column_content extends _PageList_Column class _PageList_Column_author extends _PageList_Column { - function _PageList_Column_author($field, $default_heading, $align = false) + function __construct($field, $default_heading, $align = false) { - _PageList_Column::_PageList_Column($field, $default_heading, $align); + parent::__construct($field, $default_heading, $align); $this->dbi =& $GLOBALS['request']->getDbh(); } @@ -493,7 +493,7 @@ class _PageList_Column_owner extends _PageList_Column_author function _getSortableValue($page_handle, &$revision_handle) { - return _PageList_Column::_getValue($page_handle, $revision_handle); + return parent::_getValue($page_handle, $revision_handle); } } @@ -595,7 +595,7 @@ class PageList public $_sortby = array(); public $_maxlen = 0; - function PageList($columns = false, $exclude = false, $options = false) + function __construct($columns = false, $exclude = false, $options = false) { // unique id per pagelist on each page. if (!isset($GLOBALS['request']->_pagelist)) @@ -1830,7 +1830,7 @@ class PageList_Selectable extends PageList { - function PageList_Selectable($columns = false, $exclude = '', $options = false) + function __construct($columns = false, $exclude = '', $options = false) { if ($columns) { if (!is_array($columns)) @@ -1840,7 +1840,7 @@ class PageList_Selectable } else { $columns = array('checkbox', 'pagename'); } - $this->PageList($columns, $exclude, $options); + parent::__construct($columns, $exclude, $options); } function addPageList($array) @@ -1861,7 +1861,7 @@ class PageList_Unselectable extends PageList { - function PageList_Unselectable($columns = false, $exclude = '', $options = false) + function __construct($columns = false, $exclude = '', $options = false) { if ($columns) { if (!is_array($columns)) @@ -1869,7 +1869,7 @@ class PageList_Unselectable } else { $columns = array('pagename'); } - $this->PageList($columns, $exclude, $options); + parent::__construct($columns, $exclude, $options); } function addPageList($array) diff --git a/lib/RSSWriter091.php b/lib/RSSWriter091.php index 8e92bb387..1d2f71c24 100644 --- a/lib/RSSWriter091.php +++ b/lib/RSSWriter091.php @@ -24,7 +24,7 @@ include_once 'lib/RssWriter.php'; class RSSWriter091 extends RSSWriter { - function RSSWriter091() + function __construct() { $this->XmlElement('rss', array('version' => "0.91")); $this->_items = array(); diff --git a/lib/RssWriter.php b/lib/RssWriter.php index 067f367ed..50daaaa94 100644 --- a/lib/RssWriter.php +++ b/lib/RssWriter.php @@ -11,7 +11,7 @@ */ class RssWriter extends XmlElement { - function RssWriter() + function __construct() { $this->XmlElement('rdf:RDF', array('xmlns' => "http://purl.org/rss/1.0/", diff --git a/lib/RssWriter2.php b/lib/RssWriter2.php index ecb2b23f9..28d63b788 100644 --- a/lib/RssWriter2.php +++ b/lib/RssWriter2.php @@ -17,7 +17,7 @@ include_once 'lib/RssWriter.php'; */ class RssWriter2 extends RssWriter { - function RssWriter2() + function __construct() { $this->XmlElement('rss', array('version' => "2.0")); diff --git a/lib/SemanticWeb.php b/lib/SemanticWeb.php index 8e144c844..35c1477c6 100644 --- a/lib/SemanticWeb.php +++ b/lib/SemanticWeb.php @@ -115,7 +115,7 @@ require_once 'lib/Units.php'; */ class RdfWriter extends RssWriter // in fact it should be rewritten to be other way round. { - function RdfWriter(&$request, &$pagelist) + function __construct(&$request, &$pagelist) { $this->_request =& $request; $this->_pagelist =& $pagelist; @@ -296,7 +296,7 @@ class SemanticAttributeSearchQuery * We need to detect units from the freetext query: * population > 1 million */ - function SemanticAttributeSearchQuery($search_query, $placeholders, $unit = '') + function __construct($search_query, $placeholders, $unit = '') { $this->NumericSearchQuery($search_query, $placeholders); $this->_units = new Units(); diff --git a/lib/TextSearchQuery.php b/lib/TextSearchQuery.php index 60afa67f4..68597f1c8 100644 --- a/lib/TextSearchQuery.php +++ b/lib/TextSearchQuery.php @@ -304,7 +304,7 @@ class NullTextSearchQuery extends TextSearchQuery * * @see TextSearchQuery */ - function NullTextSearchQuery() + function __construct() { } @@ -648,7 +648,7 @@ class TextSearchQuery_node_word public $op = "WORD"; public $_op = TSQ_TOK_WORD; - function TextSearchQuery_node_word($word) + function __construct($word) { $this->word = $word; } @@ -858,7 +858,7 @@ class TextSearchQuery_node_binop { public $_op = TSQ_TOK_BINOP; - function TextSearchQuery_node_binop($leaves) + function __construct($leaves) { $this->leaves = $leaves; } diff --git a/lib/WikiDB/backend/ADODB.php b/lib/WikiDB/backend/ADODB.php index 837685593..ac762f017 100644 --- a/lib/WikiDB/backend/ADODB.php +++ b/lib/WikiDB/backend/ADODB.php @@ -71,7 +71,7 @@ class WikiDB_backend_ADODB extends WikiDB_backend { - function WikiDB_backend_ADODB($dbparams) + function __construct($dbparams) { $parsed = parseDSN($dbparams['dsn']); $this->_dbparams = $dbparams; @@ -1329,7 +1329,7 @@ class WikiDB_backend_ADODB class WikiDB_backend_ADODB_generic_iter extends WikiDB_backend_iterator { - function WikiDB_backend_ADODB_generic_iter($backend, $query_result, $field_list = NULL) + function __construct($backend, $query_result, $field_list = NULL) { $this->_backend = &$backend; $this->_result = $query_result; diff --git a/lib/WikiDB/backend/PDO.php b/lib/WikiDB/backend/PDO.php index 82282400b..167020098 100644 --- a/lib/WikiDB/backend/PDO.php +++ b/lib/WikiDB/backend/PDO.php @@ -30,7 +30,7 @@ class WikiDB_backend_PDO extends WikiDB_backend { - function WikiDB_backend_PDO($dbparams) + function __construct($dbparams) { $this->_dbparams = $dbparams; if (strstr($dbparams['dsn'], "://")) { // pear DB syntax @@ -1326,7 +1326,7 @@ class WikiDB_backend_PDO class WikiDB_backend_PDO_generic_iter extends WikiDB_backend_iterator { - function WikiDB_backend_PDO_generic_iter($backend, $query_result, $field_list = NULL) + function __construct($backend, $query_result, $field_list = NULL) { $this->_backend = &$backend; $this->_result = $query_result; diff --git a/lib/WikiDB/backend/PDO_mysql.php b/lib/WikiDB/backend/PDO_mysql.php index 996c487f6..7208ba469 100644 --- a/lib/WikiDB/backend/PDO_mysql.php +++ b/lib/WikiDB/backend/PDO_mysql.php @@ -28,10 +28,9 @@ require_once 'lib/WikiDB/backend/PDO.php'; class WikiDB_backend_PDO_mysql extends WikiDB_backend_PDO { - function WikiDB_backend_PDO_mysql($dbparams) + function __construct($dbparams) { - - $this->WikiDB_backend_PDO($dbparams); + parent::__construct($dbparams); if (!empty($this->_serverinfo['version'])) { $arr = explode('.', $this->_serverinfo['version']); diff --git a/lib/WikiDB/backend/PearDB.php b/lib/WikiDB/backend/PearDB.php index bba015cd6..95b5588d6 100644 --- a/lib/WikiDB/backend/PearDB.php +++ b/lib/WikiDB/backend/PearDB.php @@ -7,7 +7,7 @@ class WikiDB_backend_PearDB { public $_dbh; - function WikiDB_backend_PearDB($dbparams) + function __construct($dbparams) { // Find and include PEAR's DB.php. maybe we should force our private version again... // if DB would have exported its version number, it would be easier. @@ -1214,7 +1214,7 @@ class WikiDB_backend_PearDB class WikiDB_backend_PearDB_generic_iter extends WikiDB_backend_iterator { - function WikiDB_backend_PearDB_generic_iter($backend, $query_result, $field_list = NULL) + function __construct($backend, $query_result, $field_list = NULL) { if (DB::isError($query_result)) { // This shouldn't happen, I thought. diff --git a/lib/WikiDB/backend/PearDB_ffpgsql.php b/lib/WikiDB/backend/PearDB_ffpgsql.php index ad47a3591..6a550f623 100644 --- a/lib/WikiDB/backend/PearDB_ffpgsql.php +++ b/lib/WikiDB/backend/PearDB_ffpgsql.php @@ -49,10 +49,10 @@ require_once 'lib/WikiDB/backend/PearDB_pgsql.php'; class WikiDB_backend_PearDB_ffpgsql extends WikiDB_backend_PearDB_pgsql { - function WikiDB_backend_PearDB_ffpgsql($dbparams) + function __construct($dbparams) { $dbparams['dsn'] = str_replace('ffpgsql:', 'pgsql:', $dbparams['dsn']); - parent::WikiDB_backend_PearDB_pgsql($dbparams); + parent::__construct($dbparams); $p = strlen(PAGE_PREFIX) + 1; $page_tbl = $this->_table_names['page_tbl']; diff --git a/lib/WikiDB/backend/PearDB_pgsql.php b/lib/WikiDB/backend/PearDB_pgsql.php index b5f63f223..7db5e0b15 100644 --- a/lib/WikiDB/backend/PearDB_pgsql.php +++ b/lib/WikiDB/backend/PearDB_pgsql.php @@ -17,7 +17,7 @@ Since 1.3.12 changed to use: class WikiDB_backend_PearDB_pgsql extends WikiDB_backend_PearDB { - function WikiDB_backend_PearDB_pgsql($dbparams) + function __construct($dbparams) { // The pgsql handler of (at least my version of) the PEAR::DB // library generates three warnings when a database is opened: diff --git a/lib/WikiDB/backend/cvs.php b/lib/WikiDB/backend/cvs.php index 1cc7a3b2b..448d72882 100644 --- a/lib/WikiDB/backend/cvs.php +++ b/lib/WikiDB/backend/cvs.php @@ -72,7 +72,7 @@ class WikiDB_backend_cvs * repository or assumed to exist. If on the other hand the parameter * already exists, then it is not overwritten. */ - function WikiDB_backend_cvs($dbparam) + function __construct($dbparam) { // setup all the instance values. $this->_docDir = $dbparam{CVS_DOC_DIR}; @@ -956,9 +956,9 @@ class Cvs_Backend_Full_Search_Iterator public $_searchString = ''; public $_docDir = ""; - function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(), - $searchString = "", - $documentDir = ".") + function __construct($arrayValue = array(), + $searchString = "", + $documentDir = ".") { $this->Cvs_Backend_Array_Iterator($arrayValue); $_searchString = $searchString; @@ -1002,10 +1002,10 @@ class Cvs_Backend_Title_Search_Iterator { public $_searchString = ''; - function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(), - $searchString = "") + function __construct($arrayValue = array(), + $searchString = "") { - $this->Cvs_Backend_Array_Iterator($arrayValue); + parent::__construct($arrayValue); $_searchString = $searchString; } diff --git a/lib/WikiDB/backend/dba.php b/lib/WikiDB/backend/dba.php index b02661c97..266e19467 100644 --- a/lib/WikiDB/backend/dba.php +++ b/lib/WikiDB/backend/dba.php @@ -6,7 +6,7 @@ require_once 'lib/DbaDatabase.php'; class WikiDB_backend_dba extends WikiDB_backend_dbaBase { - function WikiDB_backend_dba($dbparams) + function __construct($dbparams) { $directory = '/tmp'; $prefix = 'wiki_'; diff --git a/lib/WikiDB/backend/dbaBase.php b/lib/WikiDB/backend/dbaBase.php index 75c52e758d4c6727f554f54df848e80b5968f305..232493ca320eb6f68488396c17e46cadca6901be 100644 GIT binary patch delta 43 ncmX@t%(T9lX~PRv?)doR{Ji3lqSEA&&Hq^SBT)o=;+vEJjoA^w delta 35 qcmZ4A%yh1qX~PTF$y{k-leN6*MglqFlNBO4H|xbWDgglK;|tXQ diff --git a/lib/WikiDB/backend/dumb/BackLinkIter.php b/lib/WikiDB/backend/dumb/BackLinkIter.php index 5a93583ea..0d232e445 100644 --- a/lib/WikiDB/backend/dumb/BackLinkIter.php +++ b/lib/WikiDB/backend/dumb/BackLinkIter.php @@ -11,7 +11,7 @@ require_once 'lib/WikiDB/backend.php'; class WikiDB_backend_dumb_BackLinkIter extends WikiDB_backend_iterator { - function WikiDB_backend_dumb_BackLinkIter(&$backend, &$all_pages, $pagename) + function __construct(&$backend, &$all_pages, $pagename) { $this->_pages = $all_pages; $this->_backend = &$backend; diff --git a/lib/WikiDB/backend/dumb/LinkSearchIter.php b/lib/WikiDB/backend/dumb/LinkSearchIter.php index 9bff8ff55..e9bf3cc34 100644 --- a/lib/WikiDB/backend/dumb/LinkSearchIter.php +++ b/lib/WikiDB/backend/dumb/LinkSearchIter.php @@ -38,8 +38,8 @@ class WikiDB_backend_dumb_LinkSearchIter extends WikiDB_backend_iterator { - function WikiDB_backend_dumb_LinkSearchIter(&$backend, &$pageiter, $search, $linktype, - $relation = false, $options = array()) + function __construct(&$backend, &$pageiter, $search, $linktype, + $relation = false, $options = array()) { $this->_backend = &$backend; $this->_pages = $pageiter; diff --git a/lib/WikiDB/backend/dumb/MostPopularIter.php b/lib/WikiDB/backend/dumb/MostPopularIter.php index beb328c8f..cb9ad66f2 100644 --- a/lib/WikiDB/backend/dumb/MostPopularIter.php +++ b/lib/WikiDB/backend/dumb/MostPopularIter.php @@ -11,7 +11,7 @@ require_once 'lib/WikiDB/backend.php'; class WikiDB_backend_dumb_MostPopularIter extends WikiDB_backend_iterator { - function WikiDB_backend_dumb_MostPopularIter($backend, &$all_pages, $limit) + function __construct($backend, &$all_pages, $limit) { $this->_pages = array(); $pages = &$this->_pages; diff --git a/lib/WikiDB/backend/dumb/MostRecentIter.php b/lib/WikiDB/backend/dumb/MostRecentIter.php index 4138795de..84efbccd0 100644 --- a/lib/WikiDB/backend/dumb/MostRecentIter.php +++ b/lib/WikiDB/backend/dumb/MostRecentIter.php @@ -9,7 +9,7 @@ require_once 'lib/WikiDB/backend.php'; class WikiDB_backend_dumb_MostRecentIter extends WikiDB_backend_iterator { - function WikiDB_backend_dumb_MostRecentIter(&$backend, &$pages, $params) + function __construct(&$backend, &$pages, $params) { $limit = false; extract($params); diff --git a/lib/WikiDB/backend/dumb/TextSearchIter.php b/lib/WikiDB/backend/dumb/TextSearchIter.php index e8aa33376..4ea5601e9 100644 --- a/lib/WikiDB/backend/dumb/TextSearchIter.php +++ b/lib/WikiDB/backend/dumb/TextSearchIter.php @@ -2,8 +2,8 @@ class WikiDB_backend_dumb_TextSearchIter extends WikiDB_backend_iterator { - function WikiDB_backend_dumb_TextSearchIter(&$backend, &$pages, $search, $fulltext = false, - $options = array()) + function __construct(&$backend, &$pages, $search, $fulltext = false, + $options = array()) { $this->_backend = &$backend; $this->_pages = $pages; diff --git a/lib/WikiDB/backend/dumb/WantedPagesIter.php b/lib/WikiDB/backend/dumb/WantedPagesIter.php index 003d868af..fe9a1069f 100644 --- a/lib/WikiDB/backend/dumb/WantedPagesIter.php +++ b/lib/WikiDB/backend/dumb/WantedPagesIter.php @@ -8,7 +8,7 @@ class WikiDB_backend_dumb_WantedPagesIter extends WikiDB_backend_iterator { - function WikiDB_backend_dumb_WantedPagesIter(&$backend, &$all_pages, $exclude = '', $sortby = '', $limit = '') + function __construct(&$backend, &$all_pages, $exclude = '', $sortby = '', $limit = '') { $this->_allpages = $all_pages; $this->_allpages_array = $all_pages->asArray(); diff --git a/lib/WikiDB/backend/file.php b/lib/WikiDB/backend/file.php index c0c419b86..d0143c74e 100644 --- a/lib/WikiDB/backend/file.php +++ b/lib/WikiDB/backend/file.php @@ -53,7 +53,7 @@ class WikiDB_backend_file public $_page_version_data; // temporarily stores the versiondata (via _loadVersionData) public $_latest_versions; // temporarily stores the latest version-numbers (for every pagename) - function WikiDB_backend_file($dbparam) + function __construct($dbparam) { $this->data_dir = $dbparam['directory']; if (file_exists($this->data_dir) and is_file($this->data_dir)) @@ -728,7 +728,7 @@ class WikiDB_backend_file class WikiDB_backend_file_iter extends WikiDB_backend_iterator { - function WikiDB_backend_file_iter(&$backend, &$query_result, $options = array()) + function __construct(&$backend, &$query_result, $options = array()) { $this->_backend = &$backend; $this->_result = $query_result; diff --git a/lib/WikiUser.php b/lib/WikiUser.php index b33afe72e..ff8350df6 100644 --- a/lib/WikiUser.php +++ b/lib/WikiUser.php @@ -613,10 +613,9 @@ class _UserPreference class _UserPreference_numeric extends _UserPreference { - function _UserPreference_numeric($default, $minval = false, - $maxval = false) + function __construct($default, $minval = false, $maxval = false) { - $this->_UserPreference((double)$default); + parent::__construct((double)$default); $this->_minval = (double)$minval; $this->_maxval = (double)$maxval; } @@ -635,10 +634,9 @@ class _UserPreference_numeric class _UserPreference_int extends _UserPreference_numeric { - function _UserPreference_int($default, $minval = false, $maxval = false) + function __construct($default, $minval = false, $maxval = false) { - $this->_UserPreference_numeric((int)$default, (int)$minval, - (int)$maxval); + parent::__construct((int)$default, (int)$minval, (int)$maxval); } function sanify($value) @@ -650,9 +648,9 @@ class _UserPreference_int class _UserPreference_bool extends _UserPreference { - function _UserPreference_bool($default = false) + function __construct($default = false) { - $this->_UserPreference((bool)$default); + parent::__construct((bool)$default); } function sanify($value) @@ -680,9 +678,9 @@ class _UserPreference_bool class _UserPreference_language extends _UserPreference { - function _UserPreference_language($default = DEFAULT_LANGUAGE) + function __construct($default = DEFAULT_LANGUAGE) { - $this->_UserPreference($default); + parent::__construct($default); } // FIXME: check for valid locale @@ -700,9 +698,9 @@ class _UserPreference_language class _UserPreference_theme extends _UserPreference { - function _UserPreference_theme($default = THEME) + function __construct($default = THEME) { - $this->_UserPreference($default); + parent::__construct($default); } function sanify($value) diff --git a/lib/WysiwygEdit/FCKeditor.php b/lib/WysiwygEdit/FCKeditor.php index 0ad4ae68d..b7c7d92b8 100644 --- a/lib/WysiwygEdit/FCKeditor.php +++ b/lib/WysiwygEdit/FCKeditor.php @@ -18,7 +18,7 @@ require_once 'lib/WysiwygEdit.php'; class WysiwygEdit_FCKeditor extends WysiwygEdit { - function WysiwygEdit_FCKeditor() + function __construct() { global $LANG; $this->_transformer_tags = false; diff --git a/lib/WysiwygEdit/Wikiwyg.php b/lib/WysiwygEdit/Wikiwyg.php index 5ca66924e..dde83b3ce 100644 --- a/lib/WysiwygEdit/Wikiwyg.php +++ b/lib/WysiwygEdit/Wikiwyg.php @@ -18,7 +18,7 @@ require_once 'lib/WysiwygEdit.php'; class WysiwygEdit_Wikiwyg extends WysiwygEdit { - function WysiwygEdit_Wikiwyg() + function __construct() { global $request, $LANG; $this->_transformer_tags = false; diff --git a/lib/WysiwygEdit/tinymce.php b/lib/WysiwygEdit/tinymce.php index b94cfe50e..1f7b46f89 100644 --- a/lib/WysiwygEdit/tinymce.php +++ b/lib/WysiwygEdit/tinymce.php @@ -19,7 +19,7 @@ require_once 'lib/WysiwygEdit.php'; class WysiwygEdit_tinymce extends WysiwygEdit { - function WysiwygEdit_tinymce() + function __construct() { $this->_transformer_tags = false; $this->BasePath = DATA_PATH . '/themes/default/tiny_mce/'; diff --git a/lib/XmlElement.php b/lib/XmlElement.php index 00154f9e0..8b17f37b3 100644 --- a/lib/XmlElement.php +++ b/lib/XmlElement.php @@ -206,10 +206,9 @@ class XmlContent */ class XmlElement extends XmlContent { - function XmlElement($tagname /* , $attr_or_content , ...*/) + function __construct($tagname /* , $attr_or_content , ...*/) { - //FIXME: php5 incompatible - $this->XmlContent(); + parent::__construct(); $this->_init(func_get_args()); } diff --git a/lib/XmlRpcServer.php b/lib/XmlRpcServer.php index 029d4caae..c81670b2b 100644 --- a/lib/XmlRpcServer.php +++ b/lib/XmlRpcServer.php @@ -939,7 +939,7 @@ function pingBack($params) */ class XmlRpcServer extends xmlrpc_server { - function XmlRpcServer($request = false) + function __construct($request = false) { global $wiki_dmap; foreach ($wiki_dmap as $name => $val) { diff --git a/lib/diff.php b/lib/diff.php index 72d2c0c2d..31914feb6 100644 --- a/lib/diff.php +++ b/lib/diff.php @@ -70,7 +70,7 @@ class _HWLDF_WordAccumulator class WordLevelDiff extends MappedDiff { - function WordLevelDiff($orig_lines, $final_lines) + function __construct($orig_lines, $final_lines) { list ($orig_words, $orig_stripped) = $this->_split($orig_lines); list ($final_words, $final_stripped) = $this->_split($final_lines); @@ -129,9 +129,9 @@ class WordLevelDiff extends MappedDiff */ class HtmlUnifiedDiffFormatter extends UnifiedDiffFormatter { - function HtmlUnifiedDiffFormatter($context_lines = 4) + function __construct($context_lines = 4) { - $this->UnifiedDiffFormatter($context_lines); + parent::__construct($context_lines); } function _start_diff() diff --git a/lib/diff3.php b/lib/diff3.php index c8535222d..1f8e66960 100644 --- a/lib/diff3.php +++ b/lib/diff3.php @@ -44,7 +44,7 @@ class _Diff3_CopyBlock extends _Diff3_Block { public $type = 'copy'; - function _Diff3_CopyBlock($lines = false) + function __construct($lines = false) { $this->orig = $lines ? $lines : array(); $this->final1 = &$this->orig; @@ -64,7 +64,7 @@ class _Diff3_CopyBlock extends _Diff3_Block class _Diff3_BlockBuilder { - function _Diff3_BlockBuilder() + function __construct() { $this->_init(); } @@ -116,7 +116,7 @@ class _Diff3_BlockBuilder class Diff3 { - function Diff3($orig, $final1, $final2) + function __construct($orig, $final1, $final2) { $eng = new _DiffEngine; $this->ConflictingBlocks = 0; //Conflict counter diff --git a/lib/difflib.php b/lib/difflib.php index e0c1d06e7..d4e217d79 100644 --- a/lib/difflib.php +++ b/lib/difflib.php @@ -34,7 +34,7 @@ class _DiffOp_Copy extends _DiffOp { public $type = 'copy'; - function _DiffOp_Copy($orig, $final = false) + function __construct($orig, $final = false) { if (!is_array($final)) $final = $orig; @@ -52,7 +52,7 @@ class _DiffOp_Delete extends _DiffOp { public $type = 'delete'; - function _DiffOp_Delete($lines) + function __construct($lines) { $this->orig = $lines; $this->final = false; @@ -68,7 +68,7 @@ class _DiffOp_Add extends _DiffOp { public $type = 'add'; - function _DiffOp_Add($lines) + function __construct($lines) { $this->final = $lines; $this->orig = false; @@ -84,7 +84,7 @@ class _DiffOp_Change extends _DiffOp { public $type = 'change'; - function _DiffOp_Change($orig, $final) + function __construct($orig, $final) { $this->orig = $orig; $this->final = $final; @@ -670,7 +670,6 @@ class MappedDiff function __construct($from_lines, $to_lines, $mapped_from_lines, $mapped_to_lines) { - assert(sizeof($from_lines) == sizeof($mapped_from_lines)); assert(sizeof($to_lines) == sizeof($mapped_to_lines)); @@ -863,7 +862,7 @@ class DiffFormatter */ class UnifiedDiffFormatter extends DiffFormatter { - function UnifiedDiffFormatter($context_lines = 4) + function __construct($context_lines = 4) { $this->leading_context_lines = $context_lines; $this->trailing_context_lines = $context_lines; @@ -908,7 +907,7 @@ class UnifiedDiffFormatter extends DiffFormatter */ class BlockDiffFormatter extends DiffFormatter { - function BlockDiffFormatter($context_lines = 4) + function __construct($context_lines = 4) { $this->leading_context_lines = $context_lines; $this->trailing_context_lines = $context_lines; diff --git a/lib/loadsave.php b/lib/loadsave.php index 52c0728be..ddc9091c9 100644 --- a/lib/loadsave.php +++ b/lib/loadsave.php @@ -1363,7 +1363,7 @@ function LoadDir(&$request, $dirname, $files = false, $exclude = false) class LimitedFileSet extends FileSet { - function LimitedFileSet($dirname, $_include, $exclude) + function __construct($dirname, $_include, $exclude) { $this->_includefiles = $_include; $this->_exclude = $exclude; diff --git a/lib/main.php b/lib/main.php index 86c03c57d..cce4c6785 100644 --- a/lib/main.php +++ b/lib/main.php @@ -52,7 +52,7 @@ class WikiRequest extends Request { public $_dbi; - function WikiRequest() + function __construct() { $this->_dbi = WikiDB::open($GLOBALS['DBParams']); // first mysql request costs [958ms]! [670ms] is mysql_connect() diff --git a/themes/Sidebar/themeinfo.php b/themes/Sidebar/themeinfo.php index 5db22074e..b314e6491 100644 --- a/themes/Sidebar/themeinfo.php +++ b/themes/Sidebar/themeinfo.php @@ -34,7 +34,7 @@ require_once 'themes/MonoBook/themeinfo.php'; class WikiTheme_Sidebar extends WikiTheme_MonoBook { - function WikiTheme_Sidebar($theme_name = 'Sidebar') + function __construct($theme_name = 'Sidebar') { $this->WikiTheme($theme_name); //$this->calendarInit(true); diff --git a/themes/blog/themeinfo.php b/themes/blog/themeinfo.php index ea3c7e63b..4b1ba2d07 100644 --- a/themes/blog/themeinfo.php +++ b/themes/blog/themeinfo.php @@ -46,7 +46,7 @@ require_once 'lib/WikiTheme.php'; class WikiTheme_blog extends WikiTheme { - function WikiTheme_blog($theme_name = 'blog') + function __construct($theme_name = 'blog') { $this->WikiTheme($theme_name); $this->calendarInit(true); -- 2.45.0