Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300906
Change subject: Relax private access control
......................................................................
Relax private access control
There's almost never an excuse for "private" access--plus the combination of
"private static" is setting off lint warnings.
Change-Id: Ibf33654af8cdc68c56ac25b3429ab7f72dfe7353
---
M Core/Configuration.php
M Core/DataFiles/CsvReader.php
M Core/Logging/LogContextHandler.php
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/06/300906/1
diff --git a/Core/Configuration.php b/Core/Configuration.php
index 815006a..51ec293 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -322,7 +322,7 @@
* @param string $myRoot Internal recursion state: parent node path so
far,
* or empty string to begin.
*/
- private static function treeMerge( &$base, $graft, $myRoot = '' ) {
+ protected static function treeMerge( &$base, $graft, $myRoot = '' ) {
foreach ( $graft as $graftNodeName => $graftNodeValue ) {
$node = ($myRoot ? "{$myRoot}/{$graftNodeName}" :
$graftNodeName);
diff --git a/Core/DataFiles/CsvReader.php b/Core/DataFiles/CsvReader.php
index 8f3f963..9c026ed 100644
--- a/Core/DataFiles/CsvReader.php
+++ b/Core/DataFiles/CsvReader.php
@@ -24,7 +24,7 @@
/**
* @var string Delimiter for the csv file.
*/
- private $delimiter = null;
+ protected $delimiter = null;
/**
* Create an iterative CSV file reader.
diff --git a/Core/Logging/LogContextHandler.php
b/Core/Logging/LogContextHandler.php
index 50fc794..5d04579 100644
--- a/Core/Logging/LogContextHandler.php
+++ b/Core/Logging/LogContextHandler.php
@@ -6,13 +6,13 @@
class LogContextHandler {
/** @var [LogEvent[]] Stack of LogEvent arrays holding all log lines
for a context */
- private $contextData = array( array() );
+ protected $contextData = array( array() );
/** @var string[] Stack of strings holding context names */
- private $contextNames;
+ protected $contextNames;
/** @var ILogStream[] */
- private $logStreams;
+ protected $logStreams;
public function __construct( $rootName, $logStreams ) {
$this->contextNames = array( $rootName );
--
To view, visit https://gerrit.wikimedia.org/r/300906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf33654af8cdc68c56ac25b3429ab7f72dfe7353
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
