Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[11063] trunk/lib
|
From: <var...@us...> - 2023-07-18 14:38:01
|
Revision: 11063
http://sourceforge.net/p/phpwiki/code/11063
Author: vargenau
Date: 2023-07-18 14:37:58 +0000 (Tue, 18 Jul 2023)
Log Message:
-----------
PHP7: less strict typing
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/Template.php
trunk/lib/editpage.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2023-07-18 14:36:37 UTC (rev 11062)
+++ trunk/lib/PageList.php 2023-07-18 14:37:58 UTC (rev 11063)
@@ -85,7 +85,7 @@
}
// old-style heading
- public function heading(): HTML
+ public function heading()
{
global $request;
// allow sorting?
@@ -110,7 +110,7 @@
// new grid-style sortable heading
// TODO: via activeui.js ? (fast dhtml sorting)
- public function button_heading($pagelist, $colNum): HTML
+ public function button_heading($pagelist, $colNum)
{
global $WikiTheme, $request;
// allow sorting?
@@ -209,7 +209,7 @@
* @param WikiDB_PageRevision $revision_handle
* @return mixed
*/
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
if ($this->_need_rev) {
if (!$revision_handle) {
@@ -227,7 +227,7 @@
* @param WikiDB_PageRevision $revision_handle
* @return int|string
*/
- public function _getSortableValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getSortableValue($page_handle, $revision_handle)
{
$val = $this->_getValue($page_handle, $revision_handle);
if ($this->_field == 'hits') {
@@ -256,7 +256,7 @@
class _PageList_Column_size extends _PageList_Column
{
- public function format($pagelist, $page_handle, $revision_handle): HTML
+ public function format($pagelist, $page_handle, $revision_handle)
{
return HTML::td(
$this->_tdattr,
@@ -264,7 +264,7 @@
);
}
- public function _getValuePageList($pagelist, $page_handle, $revision_handle): FormattedText
+ public function _getValuePageList($pagelist, $page_handle, $revision_handle)
{
if (!$revision_handle or (!$revision_handle->_data['%content']
or $revision_handle->_data['%content'] === true)
@@ -280,7 +280,7 @@
return $size;
}
- public function _getSortableValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getSortableValue($page_handle, $revision_handle)
{
if (!$revision_handle) {
$revision_handle = $page_handle->getCurrentRevision();
@@ -305,7 +305,7 @@
$this->_textIfFalse = new RawXml('—'); //mdash
}
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
//FIXME: check if $this is available in the parent (->need_rev)
$val = parent::_getValue($page_handle, $revision_handle);
@@ -327,7 +327,7 @@
parent::__construct($field, $heading, 'center');
}
- public function _getValuePageList($pagelist, $page_handle, $revision_handle): HTML
+ public function _getValuePageList($pagelist, $page_handle, $revision_handle)
{
$pagename = $page_handle->getName();
$selected = !empty($pagelist->_selected[$pagename]);
@@ -346,7 +346,7 @@
}
}
- public function format($pagelist, $page_handle, $revision_handle): HTML
+ public function format($pagelist, $page_handle, $revision_handle)
{
return HTML::td(
$this->_tdattr,
@@ -355,7 +355,7 @@
}
// don't sort this javascript button
- public function button_heading($pagelist, $colNum): HTML
+ public function button_heading($pagelist, $colNum)
{
$s = HTML($this->_heading);
return HTML::th(array('class' => 'gridbutton'), $s);
@@ -371,13 +371,13 @@
$this->WikiTheme = &$WikiTheme;
}
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
$time = parent::_getValue($page_handle, $revision_handle);
return $this->WikiTheme->formatDateTime($time);
}
- public function _getSortableValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -385,7 +385,7 @@
class _PageList_Column_version extends _PageList_Column
{
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
if (!$revision_handle) {
$revision_handle = $page_handle->getCurrentRevision();
@@ -425,7 +425,7 @@
}
}
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
if (!$revision_handle or (!$revision_handle->_data['%content']
or $revision_handle->_data['%content'] === true)
@@ -510,7 +510,7 @@
);
}
- public function _getSortableValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getSortableValue($page_handle, $revision_handle)
{
if (is_object($page_handle) and !empty($page_handle->score)) {
return $page_handle->score;
@@ -535,7 +535,7 @@
$this->dbi =& $request->getDbh();
}
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
$author = parent::_getValue($page_handle, $revision_handle);
if ($this->dbi->isWikiPage($author)) {
@@ -545,7 +545,7 @@
}
}
- public function _getSortableValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -553,7 +553,7 @@
class _PageList_Column_owner extends _PageList_Column_author
{
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
$author = $page_handle->getOwner();
if ($this->dbi->isWikiPage($author)) {
@@ -563,7 +563,7 @@
}
}
- public function _getSortableValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -571,7 +571,7 @@
class _PageList_Column_creator extends _PageList_Column_author
{
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
$author = $page_handle->getCreator();
if ($this->dbi->isWikiPage($author)) {
@@ -581,7 +581,7 @@
}
}
- public function _getSortableValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -598,7 +598,7 @@
$this->dbi = &$request->getDbh();
}
- public function _getValue($page_handle, $revision_handle): XmlContent
+ public function _getValue($page_handle, $revision_handle)
{
if ($this->dbi->isWikiPage($page_handle->getName())) {
return WikiLink($page_handle);
@@ -623,7 +623,7 @@
class _PageList_Column_perm extends _PageList_Column
{
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
$perm_array = pagePermissions($page_handle->_pagename);
return pagePermissionsSimpleFormat(
@@ -636,7 +636,7 @@
class _PageList_Column_acl extends _PageList_Column
{
- public function _getValue(WikiDB_Page $page_handle, WikiDB_PageRevision $revision_handle)
+ public function _getValue($page_handle, $revision_handle)
{
$perm_tree = pagePermissions($page_handle->_pagename);
@@ -1738,7 +1738,7 @@
}
// make a table given the caption
- public function _generateTable($caption = ''): HTML
+ public function _generateTable($caption = '')
{
if (count($this->_sortby) > 0) {
$this->sortPages();
@@ -2010,7 +2010,7 @@
// comma=1
// Condense list without a href links: "Page1, Page2, ..."
// FIXME: only unique list entries, esp. with nopage
- private function generateCommaListAsString(): XmlContent
+ private function generateCommaListAsString()
{
if (defined($this->_options['commasep'])) {
$separator = $this->_options['commasep'];
@@ -2031,7 +2031,7 @@
// Future: 1 = reserved for plain string (see above)
// 2 and more => HTML link specialization?
// FIXME: only unique list entries, esp. with nopage
- private function generateCommaList(): XmlContent
+ private function generateCommaList()
{
if (defined($this->_options['commasep'])) {
$separator = HTML::raw($this->_options['commasep']);
@@ -2049,7 +2049,7 @@
return $html;
}
- public function _emptyList($caption): XmlContent
+ public function _emptyList($caption)
{
$html = HTML();
if ($caption) {
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2023-07-18 14:36:37 UTC (rev 11062)
+++ trunk/lib/Template.php 2023-07-18 14:37:58 UTC (rev 11063)
@@ -37,7 +37,7 @@
* @param WikiRequest $request
* @param array $args
*/
- public function __construct(string $name, &$request, array $args = array())
+ public function __construct(string $name, &$request, $args = array())
{
global $WikiTheme;
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2023-07-18 14:36:37 UTC (rev 11062)
+++ trunk/lib/editpage.php 2023-07-18 14:37:58 UTC (rev 11063)
@@ -57,7 +57,7 @@
/**
* @param WikiRequest $request
*/
- public function __construct(WikiRequest &$request)
+ public function __construct(&$request)
{
$this->request = &$request;
@@ -123,7 +123,7 @@
}
}
- public function editPage(): ?bool
+ public function editPage()
{
$saveFailed = false;
$tokens = &$this->tokens;
@@ -540,7 +540,7 @@
/** Header of the Anti Spam message
*/
- private function getSpamMessage(): XmlContent
+ private function getSpamMessage()
{
return
HTML(
@@ -554,7 +554,7 @@
);
}
- protected function getPreview(): TransformedText
+ protected function getPreview()
{
require_once 'lib/PageType.php';
$this->_content = $this->getContent();
@@ -561,7 +561,7 @@
return new TransformedText($this->page, $this->_content, $this->meta);
}
- protected function getConvertedPreview(): TransformedText
+ protected function getConvertedPreview()
{
require_once 'lib/PageType.php';
$this->_content = $this->getContent();
@@ -568,7 +568,7 @@
return new TransformedText($this->page, $this->_content, $this->meta);
}
- private function getDiff(): XmlContent
+ private function getDiff()
{
require_once 'lib/diff.php';
$html = HTML();
@@ -611,7 +611,7 @@
}
}
- protected function getLockedMessage(): XmlContent
+ protected function getLockedMessage()
{
return
HTML(
@@ -627,7 +627,7 @@
return $this->page->get('moderation');
}
- private function getModeratedMessage(): XmlContent
+ private function getModeratedMessage()
{
return
HTML(
@@ -640,7 +640,7 @@
);
}
- protected function getConflictMessage($unresolved = false): XmlContent
+ protected function getConflictMessage($unresolved = false)
{
/*
xgettext only knows about c/c++ line-continuation strings
@@ -1255,7 +1255,7 @@
class LoadFileConflictPageEditor extends PageEditor
{
- public function editPage($saveFailed = true): ?bool
+ public function editPage($saveFailed = true)
{
$tokens = &$this->tokens;
@@ -1371,7 +1371,7 @@
return true;
}
- protected function getConflictMessage($unresolved = false): XmlContent
+ protected function getConflictMessage($unresolved = false)
{
return HTML(HTML::p(
fmt(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
