mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-04 01:45:15 +02:00
Code Issues Releases Wiki Activity

Prevent error if 'social_login' pref is not an array

Browse Source
This commit is contained in:
Nick Liu 2020-02-19 16:26:49 +01:00
parent 5edcee8ad0
commit 0bacc5903c
No known key found for this signature in database
GPG Key ID: 1167C5F9C9897637
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
e107_plugins/social/SocialLoginConfigManager.php
View File

@ -65,7 +65,7 @@ class SocialLoginConfigManager
*/
public function setProviderConfig($providerName, $options)
{
$config = $this->getSocialLoginConfig();
$config = $this->config->get(self::SOCIAL_LOGIN_PREF);
if (!is_array($config)) $this->config->set(self::SOCIAL_LOGIN_PREF, []);
self::array_unset_empty_recursive($options);
@ -182,7 +182,10 @@ class SocialLoginConfigManager
protected function getSocialLoginConfig()
{
return $this->config->get(self::SOCIAL_LOGIN_PREF);
$config = $this->config->get(self::SOCIAL_LOGIN_PREF);
if (!is_array($config)) $config = [];
return $config;
}
/**

14
e107_tests/tests/unit/plugins/social/SocialLoginConfigManagerTest.php
View File

@ -29,7 +29,7 @@ class SocialLoginConfigManagerTest extends \Codeception\Test\Unit
include_once(e_PLUGIN . "social/SocialLoginConfigManager.php");
$this->pref = $this->make('e_pref');
$this->pref->set('social_login', [
$this->pref->set(SocialLoginConfigManager::SOCIAL_LOGIN_PREF, [
'Twitter-OAuth1' => [
'enabled' => true,
'keys' => [
@ -120,6 +120,18 @@ class SocialLoginConfigManagerTest extends \Codeception\Test\Unit
$this->assertEquals(['enabled' => true], $result);
}
public function testSetProviderConfigOverwritesNonArray()
{
$this->pref->set(SocialLoginConfigManager::SOCIAL_LOGIN_PREF, 'bad string!');
$manager = new SocialLoginConfigManager($this->pref);
$expected = ['enabled' => true];
$manager->setProviderConfig('FirstProvider', $expected);
$result = $manager->getProviderConfig('FirstProvider');
$this->assertEquals($expected, $result);
}
public function testGetProviderConfig()
{
$result = $this->manager->getProviderConfig('Twitter');