Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/313608
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
bde092f Don't return a reference to object, that means nothing
e88fe9e Remove Configuration::setDefaultConfig()
d71fc11 Add required gross_currency to PP refunds
Change-Id: I8fbdff77535ade2cc263ee9f8b464afdea437792
---
D Tests/TestingConfiguration.php
1 file changed, 0 insertions(+), 51 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/08/313608/1
diff --git a/Tests/TestingConfiguration.php b/Tests/TestingConfiguration.php
deleted file mode 100644
index 6e447a8..0000000
--- a/Tests/TestingConfiguration.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<<<<<<< HEAD (8ff195 Merge branch 'master' into deployment)
-=======
-<?php
-
-namespace SmashPig\Tests;
-
-use ReflectionClass;
-use SmashPig\Core\Configuration;
-
-/**
- * Do trixy things with Configuration
- */
-class TestingConfiguration extends Configuration {
- /**
- * Set default search path to skip actual installed configuration like
/etc
- *
- * @implements Configuration::getDefaultSearchPath
- */
- public function getDefaultSearchPath() {
- $searchPath = array(
- __DIR__ . "/../SmashPig.yaml",
- );
- return $searchPath;
- }
-
- public static function installTestConfiguration( $pathOverrides =
array() ) {
- // Late static binding so that a subclass creates one of itself
- $singleton = static::createForViewWithOverrideFile( 'default',
$pathOverrides );
- Configuration::$defaultObj = $singleton;
- return $singleton;
- }
-
- public static function loadConfigWithFileOverrides( $paths ) {
- $config = static::installTestConfiguration( $paths );
- return $config;
- }
-
- public static function loadConfigWithLiteralOverrides( $data ) {
- $config = static::installTestConfiguration();
- $config->override( $data );
- return $config;
- }
-
- public static function tearDownConfiguration() {
- $konfig = new ReflectionClass( 'SmashPig\Core\Configuration' );
- $defaultConfig = $konfig->getProperty( 'defaultObj' );
- $defaultConfig->setAccessible( true );
- $defaultConfig->setValue( null );
- }
-}
->>>>>>> BRANCH (d71fc1 Add required gross_currency to PP refunds)
--
To view, visit https://gerrit.wikimedia.org/r/313608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fbdff77535ade2cc263ee9f8b464afdea437792
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
