X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=acf2d2553256aa87f94a975ed16587156bc20b3a;hb=29c25bb31c4b558a245f1b0c80a934b8b949ca55;hp=79b343eb3b13730472f24e02f4fc8c8b6ee7e287;hpb=3bbda79f1f09649bc4d036f2810117df46166f9c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 79b343eb3b..acf2d25532 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -50,7 +50,7 @@ class OutputPage extends ContextSource {
 	/** @var array */
 	protected $mLinktags = [];
 
-	/** @var bool */
+	/** @var string|bool */
 	protected $mCanonicalUrl = false;
 
 	/**
@@ -332,7 +332,7 @@ class OutputPage extends ContextSource {
 	 * a OutputPage tied to that context.
 	 * @param IContextSource $context
 	 */
-	function __construct( IContextSource $context ) {
+	public function __construct( IContextSource $context ) {
 		$this->setContext( $context );
 	}
 
@@ -385,8 +385,8 @@ class OutputPage extends ContextSource {
 	 * @param string $name Name of the meta tag
 	 * @param string $val Value of the meta tag
 	 */
-	function addMeta( $name, $val ) {
-		array_push( $this->mMetatags, [ $name, $val ] );
+	public function addMeta( $name, $val ) {
+		$this->mMetatags[] = [ $name, $val ];
 	}
 
 	/**
@@ -406,8 +406,8 @@ class OutputPage extends ContextSource {
 	 *
 	 * @param array $linkarr Associative array of attributes.
 	 */
-	function addLink( array $linkarr ) {
-		array_push( $this->mLinktags, $linkarr );
+	public function addLink( array $linkarr ) {
+		$this->mLinktags[] = $linkarr;
 	}
 
 	/**
@@ -425,7 +425,7 @@ class OutputPage extends ContextSource {
 	 * in preference to addLink(), to avoid duplicate link tags.
 	 * @param string $url
 	 */
-	function setCanonicalUrl( $url ) {
+	public function setCanonicalUrl( $url ) {
 		$this->mCanonicalUrl = $url;
 	}
 
@@ -447,7 +447,7 @@ class OutputPage extends ContextSource {
 	 *
 	 * @param string $script Raw HTML
 	 */
-	function addScript( $script ) {
+	public function addScript( $script ) {
 		$this->mScripts .= $script;
 	}
 
@@ -621,7 +621,7 @@ class OutputPage extends ContextSource {
 	 *
 	 * @return array
 	 */
-	function getHeadItemsArray() {
+	public function getHeadItemsArray() {
 		return $this->mHeadItems;
 	}
 
@@ -1955,7 +1955,7 @@ class OutputPage extends ContextSource {
 	 * @param ParserOutput $parserOutput
 	 * @param array $poOptions Options to ParserOutput::getText()
 	 */
-	function addParserOutput( ParserOutput $parserOutput, $poOptions = [] ) {
+	public function addParserOutput( ParserOutput $parserOutput, $poOptions = [] ) {
 		$this->addParserOutputMetadata( $parserOutput );
 		$this->addParserOutputText( $parserOutput, $poOptions );
 	}
@@ -2147,7 +2147,7 @@ class OutputPage extends ContextSource {
 	}
 
 	/**
-	 * Get TTL in [$minTTL,$maxTTL] in pass it to lowerCdnMaxage()
+	 * Get TTL in [$minTTL,$maxTTL] and pass it to lowerCdnMaxage()
 	 *
 	 * This sets and returns $minTTL if $mtime is false or null. Otherwise,
 	 * the TTL is higher the older the $mtime timestamp is. Essentially, the
@@ -2163,10 +2163,10 @@ class OutputPage extends ContextSource {
 		$maxTTL = $maxTTL ?: $this->getConfig()->get( 'CdnMaxAge' );
 
 		if ( $mtime === null || $mtime === false ) {
-			return $minTTL; // entity does not exist
+			return; // entity does not exist
 		}
 
-		$age = MWTimestamp::time() - wfTimestamp( TS_UNIX, $mtime );
+		$age = MWTimestamp::time() - (int)wfTimestamp( TS_UNIX, $mtime );
 		$adaptiveTTL = max( 0.9 * $age, $minTTL );
 		$adaptiveTTL = min( $adaptiveTTL, $maxTTL );
 
@@ -2189,7 +2189,7 @@ class OutputPage extends ContextSource {
 	 *
 	 * @return array
 	 */
-	function getCacheVaryCookies() {
+	public function getCacheVaryCookies() {
 		if ( self::$cacheVaryCookies === null ) {
 			$config = $this->getConfig();
 			self::$cacheVaryCookies = array_values( array_unique( array_merge(
@@ -2210,7 +2210,7 @@ class OutputPage extends ContextSource {
 	 *
 	 * @return bool
 	 */
-	function haveCacheVaryCookies() {
+	public function haveCacheVaryCookies() {
 		$request = $this->getRequest();
 		foreach ( $this->getCacheVaryCookies() as $cookieName ) {
 			if ( $request->getCookie( $cookieName, '', '' ) !== '' ) {
@@ -2270,7 +2270,7 @@ class OutputPage extends ContextSource {
 	/**
 	 * Return a Link: header. Based on the values of $mLinkHeader.
 	 *
-	 * @return string
+	 * @return string|false
 	 */
 	public function getLinkHeader() {
 		if ( !$this->mLinkHeader ) {
@@ -2602,7 +2602,7 @@ class OutputPage extends ContextSource {
 	 * and optionally an custom HTML title (content of the "<title>" tag).
 	 *
 	 * @param string|Message $pageTitle Will be passed directly to setPageTitle()
-	 * @param string|Message $htmlTitle Will be passed directly to setHTMLTitle();
+	 * @param string|Message|false $htmlTitle Will be passed directly to setHTMLTitle();
 	 *                   optional, if not passed the "<title>" attribute will be
 	 *                   based on $pageTitle
 	 */
@@ -3283,7 +3283,7 @@ class OutputPage extends ContextSource {
 			$vars['wgUserId'] = $user->getId();
 			$vars['wgUserEditCount'] = $user->getEditCount();
 			$userReg = $user->getRegistration();
-			$vars['wgUserRegistration'] = $userReg ? wfTimestamp( TS_UNIX, $userReg ) * 1000 : null;
+			$vars['wgUserRegistration'] = $userReg ? (int)wfTimestamp( TS_UNIX, $userReg ) * 1000 : null;
 			// Get the revision ID of the oldest new message on the user's talk
 			// page. This can be used for constructing new message alerts on
 			// the client side.