wiki.techinc.nl/includes/parser/ParserFactory.php
Tim Starling 47a1619027 Remove terminating line breaks from debug messages
A terminating line break has not been required in wfDebug() since 2014,
however no migration was done. Some of these line breaks found their way
into LoggerInterface::debug() calls, where they mess up the formatting
of the debug log.

So, remove terminating line breaks from wfDebug() and
LoggerInterface::debug() calls.

Also:
* Fix the stripping of leading line breaks from the log header emitted
  by Setup.php. This feature, accidentally broken in 2014, allows
  requests to be distinguished in the log file.
* Avoid using the global variable $self.
* Move the logging of the client IP back to Setup.php. It was moved to
  WebRequest in the hopes that it would not always be needed, however
  $wgRequest->getIP() is now called unconditionally a few lines up in
  Setup.php. This means that it is put in its proper place after the
  "start request" message.
* Wrap the log header code in a closure so that variables like $name do
  not leak into global scope.
* In Linker.php, remove a few instances of an unnecessary second
  parameter to wfDebug().

Change-Id: I96651d3044a95b9d210b51cb8368edc76bebbb9e
2020-06-03 12:01:16 +10:00

148 lines
4 KiB
PHP

<?php
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* @ingroup Parser
*/
use MediaWiki\BadFileLookup;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Linker\LinkRendererFactory;
use MediaWiki\SpecialPage\SpecialPageFactory;
use Psr\Log\LoggerInterface;
/**
* @since 1.32
*/
class ParserFactory {
/** @var ServiceOptions */
private $svcOptions;
/** @var MagicWordFactory */
private $magicWordFactory;
/** @var Language */
private $contLang;
/** @var string */
private $urlProtocols;
/** @var SpecialPageFactory */
private $specialPageFactory;
/** @var LinkRendererFactory */
private $linkRendererFactory;
/** @var NamespaceInfo */
private $nsInfo;
/** @var LoggerInterface */
private $logger;
/** @var BadFileLookup */
private $badFileLookup;
/** @var LanguageConverterFactory */
private $languageConverterFactory;
/**
* Track calls to Parser constructor to aid in deprecation of direct
* Parser invocation. This is temporary: it will be removed once the
* deprecation notice period is over and the underlying method calls
* are refactored.
* @internal
* @var int
*/
public static $inParserFactory = 0;
/** @var HookContainer */
private $hookContainer;
/**
* @param ServiceOptions $svcOptions
* @param MagicWordFactory $magicWordFactory
* @param Language $contLang Content language
* @param string $urlProtocols As returned from wfUrlProtocols()
* @param SpecialPageFactory $spFactory
* @param LinkRendererFactory $linkRendererFactory
* @param NamespaceInfo $nsInfo
* @param LoggerInterface $logger
* @param BadFileLookup $badFileLookup
* @param LanguageConverterFactory $languageConverterFactory
* @param HookContainer $hookContainer
* @since 1.32
*/
public function __construct(
ServiceOptions $svcOptions,
MagicWordFactory $magicWordFactory,
Language $contLang,
string $urlProtocols,
SpecialPageFactory $spFactory,
LinkRendererFactory $linkRendererFactory,
NamespaceInfo $nsInfo,
LoggerInterface $logger,
BadFileLookup $badFileLookup,
LanguageConverterFactory $languageConverterFactory,
HookContainer $hookContainer
) {
$svcOptions->assertRequiredOptions( Parser::CONSTRUCTOR_OPTIONS );
wfDebug( __CLASS__ . ": using default preprocessor" );
$this->svcOptions = $svcOptions;
$this->magicWordFactory = $magicWordFactory;
$this->contLang = $contLang;
$this->urlProtocols = $urlProtocols;
$this->specialPageFactory = $spFactory;
$this->linkRendererFactory = $linkRendererFactory;
$this->nsInfo = $nsInfo;
$this->logger = $logger;
$this->badFileLookup = $badFileLookup;
$this->languageConverterFactory = $languageConverterFactory;
$this->hookContainer = $hookContainer;
}
/**
* Creates a new parser
*
* @return Parser
* @since 1.32
*/
public function create() : Parser {
self::$inParserFactory++;
try {
return new Parser(
$this->svcOptions,
$this->magicWordFactory,
$this->contLang,
$this,
$this->urlProtocols,
$this->specialPageFactory,
$this->linkRendererFactory,
$this->nsInfo,
$this->logger,
$this->badFileLookup,
$this->languageConverterFactory,
$this->hookContainer
);
} finally {
self::$inParserFactory--;
}
}
}