Merge branch 'deprecate-include-config-in-core' into 'dev'

Deprecate *_config() functions in core.

See merge request hubzilla/core!2114

2 files changed, 4 insertions, 18 deletions

diff --git a/tests/unit/Photo/PhotoGdTest.php b/tests/unit/Photo/PhotoGdTest.php
index 1324043c4..7ef07864c 100644
--- a/tests/unit/Photo/PhotoGdTest.php
+++ b/tests/unit/Photo/PhotoGdTest.php
@@ -130,21 +130,8 @@ class PhotoGdTest extends UnitTestCase {
 	 * Tests PhotoGd->imageString()
 	 */
 	public function testImagestringReturnsABinaryString() {
-		// Create a stub for global function get_config()
-		// get_config('system', 'png_quality')
-		// get_config('system', 'jpeg_quality');
-		$gc = $this->getFunctionMock('Zotlabs\Photo', 'get_config');
-		$gc->expects($this->once())->willReturnCallback(
-				function() {
-					switch($this->photoGd->getType()){
-						case 'image/png':
-							return 7;
-						case 'image/jpeg':
-						default:
-							return 70;
-					}
-				}
-		);
+		// Init config with a known value for the test
+		\Zotlabs\Lib\Config::Set('system', 'png_quality', 7);
 
 		$this->assertIsString($this->photoGd->imageString());
 	}
diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php
index 0a22b543a..c01e4f6a3 100644
--- a/tests/unit/Web/HttpSigTest.php
+++ b/tests/unit/Web/HttpSigTest.php
@@ -84,9 +84,8 @@ class HttpSigTest extends UnitTestCase {
 	}
 
 	function testDecrypt_sigheaderUseSitePrivateKey() {
-		// Create a stub for global function get_config() with expectation
-		$t = $this->getFunctionMock('Zotlabs\Web', 'get_config');
-		$t->expects($this->once())->willReturn('system.prvkey');
+		// Initialize config with a known value for test
+		\Zotlabs\Lib\Config::Set('system', 'prvkey', 'system.prvkey');
 
 		$header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
 		$result = [