X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Feditpage%2FTextConflictHelper.php;h=b5b74fbbaf533a6ffb5cb2a16b41b611392bdcb3;hb=81fee5a5e96fbd0a6cecad75028ef643e0459d98;hp=b447b18f94db341ede4ed5adcd68a490f5865851;hpb=92f9cb055173058c7c09ea746ba75109fbe0f7ec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/editpage/TextConflictHelper.php b/includes/editpage/TextConflictHelper.php
index b447b18f94..b5b74fbbaf 100644
--- a/includes/editpage/TextConflictHelper.php
+++ b/includes/editpage/TextConflictHelper.php
@@ -165,10 +165,9 @@ class TextConflictHelper {
 	/**
 	 * 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 );
 
@@ -246,7 +245,7 @@ class TextConflictHelper {
 	 * @param string $text
 	 * @return Content
 	 */
-	public function toEditContent( $text ) {
+	private function toEditContent( $text ) {
 		return ContentHandler::makeContent(
 			$text,
 			$this->title,