dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editpage: Make TextConflictHelper::toEditContent private
[lhc/web/wiklou.git]
/
includes
/
editpage
/
TextConflictHelper.php
diff --git
a/includes/editpage/TextConflictHelper.php
b/includes/editpage/TextConflictHelper.php
index
b447b18
..
b5b74fb
100644
(file)
--- a/
includes/editpage/TextConflictHelper.php
+++ b/
includes/editpage/TextConflictHelper.php
@@
-165,10
+165,9
@@
class TextConflictHelper {
/**
* HTML to build the textbox1 on edit conflicts
*
/**
* HTML to build the textbox1 on edit conflicts
*
- * @param mixed[]|null $customAttribs
- * @return string HTML
+ * @param array $customAttribs
*/
*/
- public function getEditConflictMainTextBox( $customAttribs = [] ) {
+ public function getEditConflictMainTextBox(
array
$customAttribs = [] ) {
$builder = new TextboxBuilder();
$classes = $builder->getTextboxProtectionCSSClasses( $this->title );
$builder = new TextboxBuilder();
$classes = $builder->getTextboxProtectionCSSClasses( $this->title );
@@
-246,7
+245,7
@@
class TextConflictHelper {
* @param string $text
* @return Content
*/
* @param string $text
* @return Content
*/
- p
ublic
function toEditContent( $text ) {
+ p
rivate
function toEditContent( $text ) {
return ContentHandler::makeContent(
$text,
$this->title,
return ContentHandler::makeContent(
$text,
$this->title,