Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 13:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shorten "PConfiguration" to "PConfig" again, since the Wrapper is gone

Browse source
This commit is contained in:
nupplaPhil 2020-01-19 22:23:44 +01:00
parent cb80108957
commit d5a473abda
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
41 changed files with 219 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/src/Core/Config/Cache/ConfigCacheTest.php
View file

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Core\Config\Cache;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache;
use Friendica\Test\MockedTest;
use ParagonIE\HiddenString\HiddenString;
@ -29,7 +29,7 @@ class ConfigCacheTest extends MockedTest
];
}
private function assertConfigValues($data, ConfigCache $configCache)
private function assertConfigValues($data, Cache $configCache)
{
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
@ -44,7 +44,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testLoadConfigArray($data)
{
$configCache = new ConfigCache();
$configCache = new Cache();
$configCache->load($data);
$this->assertConfigValues($data, $configCache);
@ -63,7 +63,7 @@ class ConfigCacheTest extends MockedTest
]
];
$configCache = new ConfigCache();
$configCache = new Cache();
$configCache->load($data);
$configCache->load($override);
@ -81,7 +81,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testLoadConfigArrayWrong()
{
$configCache = new ConfigCache();
$configCache = new Cache();
// empty dataset
$configCache->load([]);
@ -102,7 +102,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testGetAll($data)
{
$configCache = new ConfigCache();
$configCache = new Cache();
$configCache->load($data);
$all = $configCache->getAll();
@ -117,7 +117,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testSetGet($data)
{
$configCache = new ConfigCache();
$configCache = new Cache();
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
@ -133,7 +133,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testGetEmpty()
{
$configCache = new ConfigCache();
$configCache = new Cache();
$this->assertNull($configCache->get('something', 'value'));
}
@ -143,7 +143,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testGetCat()
{
$configCache = new ConfigCache([
$configCache = new Cache([
'system' => [
'key1' => 'value1',
'key2' => 'value2',
@ -171,7 +171,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testDelete($data)
{
$configCache = new ConfigCache($data);
$configCache = new Cache($data);
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
@ -188,7 +188,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testKeyDiffWithResult($data)
{
$configCache = new ConfigCache($data);
$configCache = new Cache($data);
$diffConfig = [
'fakeCat' => [
@ -205,7 +205,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testKeyDiffWithoutResult($data)
{
$configCache = new ConfigCache($data);
$configCache = new Cache($data);
$diffConfig = $configCache->getAll();
@ -217,7 +217,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testPasswordHide()
{
$configCache = new ConfigCache([
$configCache = new Cache([
'database' => [
'password' => 'supersecure',
'username' => 'notsecured',
@ -234,7 +234,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testPasswordShow()
{
$configCache = new ConfigCache([
$configCache = new Cache([
'database' => [
'password' => 'supersecure',
'username' => 'notsecured',
@ -251,7 +251,7 @@ class ConfigCacheTest extends MockedTest
*/
public function testEmptyPassword()
{
$configCache = new ConfigCache([
$configCache = new Cache([
'database' => [
'password' => '',
'username' => '',
@ -265,7 +265,7 @@ class ConfigCacheTest extends MockedTest
public function testWrongTypePassword()
{
$configCache = new ConfigCache([
$configCache = new Cache([
'database' => [
'password' => new \stdClass(),
'username' => '',
@ -275,7 +275,7 @@ class ConfigCacheTest extends MockedTest
$this->assertNotEmpty($configCache->get('database', 'password'));
$this->assertEmpty($configCache->get('database', 'username'));
$configCache = new ConfigCache([
$configCache = new Cache([
'database' => [
'password' => 23,
'username' => '',

28
tests/src/Core/Config/Cache/PConfigCacheTest.php
View file

@ -2,7 +2,7 @@
namespace Friendica\Test\src\Core\Config\Cache;
use Friendica\Core\Config\Cache\PConfigCache;
use Friendica\Core\PConfig\Cache;
use Friendica\Test\MockedTest;
class PConfigCacheTest extends MockedTest
@ -28,7 +28,7 @@ class PConfigCacheTest extends MockedTest
];
}
private function assertConfigValues($data, PConfigCache $configCache, $uid)
private function assertConfigValues($data, Cache $configCache, $uid)
{
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
@ -44,7 +44,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testSetGet($data)
{
$configCache = new PConfigCache();
$configCache = new Cache();
$uid = 345;
foreach ($data as $cat => $values) {
@ -62,7 +62,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testGetCat()
{
$configCache = new PConfigCache();
$configCache = new Cache();
$uid = 345;
$configCache->load($uid, [
@ -94,7 +94,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testDelete($data)
{
$configCache = new PConfigCache();
$configCache = new Cache();
$uid = 345;
foreach ($data as $cat => $values) {
@ -119,7 +119,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testKeyDiffWithResult($data)
{
$configCache = new PConfigCache();
$configCache = new Cache();
$diffConfig = [
'fakeCat' => [
@ -137,7 +137,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testKeyDiffWithoutResult($data)
{
$configCache = new PConfigCache();
$configCache = new Cache();
$configCache->load(1, $data);
@ -151,7 +151,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testPasswordHide()
{
$configCache = new PConfigCache();
$configCache = new Cache();
$configCache->load(1, [
'database' => [
@ -170,7 +170,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testPasswordShow()
{
$configCache = new PConfigCache(false);
$configCache = new Cache(false);
$configCache->load(1, [
'database' => [
@ -189,7 +189,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testEmptyPassword()
{
$configCache = new PConfigCache();
$configCache = new Cache();
$configCache->load(1, [
'database' => [
@ -204,7 +204,7 @@ class PConfigCacheTest extends MockedTest
public function testWrongTypePassword()
{
$configCache = new PConfigCache();
$configCache = new Cache();
$configCache->load(1, [
'database' => [
@ -216,7 +216,7 @@ class PConfigCacheTest extends MockedTest
$this->assertNotEmpty($configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username'));
$configCache = new PConfigCache();
$configCache = new Cache();
$configCache->load(1, [
'database' => [
@ -234,7 +234,7 @@ class PConfigCacheTest extends MockedTest
*/
public function testTwoUid()
{
$configCache = new PConfigCache();
$configCache = new Cache();
$configCache->load(1, [
'cat1' => [
@ -265,7 +265,7 @@ class PConfigCacheTest extends MockedTest
// bad UID!
$uid = null;
$configCache = new PConfigCache();
$configCache = new Cache();
$this->assertNull($configCache->get($uid, 'cat1', 'cat2'));