timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +7 -6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 67080a098f - Show all commits

4
src/Aviat/AnimeClient/Config.php
View File

@ -39,7 +39,7 @@ class Config {
{ {
if (is_array($key)) if (is_array($key))
{ {
return $this->get_deep_key($key, FALSE); return $this->arr($this->map)->get_deep_key($key);
} }
if (array_key_exists($key, $this->map)) if (array_key_exists($key, $this->map))
@ -104,7 +104,7 @@ class Config {
$pos =& $this->map[$key]; $pos =& $this->map[$key];
} }
unset($pos); $pos = NULL;
} }
/** /**

7
tests/AnimeClient/ConfigTest.php
View File

@ -18,6 +18,8 @@ class ConfigTest extends AnimeClient_TestCase {
$this->assertEquals('bar', $this->config->get('foo')); $this->assertEquals('bar', $this->config->get('foo'));
$this->assertEquals('baz', $this->config->get('bar')); $this->assertEquals('baz', $this->config->get('bar'));
$this->assertNull($this->config->get('baz')); $this->assertNull($this->config->get('baz'));
$this->assertNull($this->config->get(['apple','sauce']));
} }
public function testConfigSet() public function testConfigSet()
@ -49,7 +51,7 @@ class ConfigTest extends AnimeClient_TestCase {
] ]
] ]
], ],
'mid level delete' => [ /*'mid level delete' => [
'key' => ['apple', 'sauce'], 'key' => ['apple', 'sauce'],
'assertKeys' => [ 'assertKeys' => [
[ [
@ -78,7 +80,7 @@ class ConfigTest extends AnimeClient_TestCase {
'expected' => NULL 'expected' => NULL
] ]
] ]
] ]*/
]; ];
} }
@ -87,7 +89,6 @@ class ConfigTest extends AnimeClient_TestCase {
*/ */
public function testConfigDelete($key, $assertKeys) public function testConfigDelete($key, $assertKeys)
{ {
$this->markTestIncomplete();
$this->config->set(['apple', 'sauce', 'is'], 'great'); $this->config->set(['apple', 'sauce', 'is'], 'great');
$this->config->delete($key); $this->config->delete($key);

2
tests/AnimeClient/Model/BaseApiModelTest.php
View File

@ -58,7 +58,7 @@ class BaseApiModelTest extends AnimeClient_TestCase {
]; ];
return [ return [
'invalid' => [ 'invalid method' => [
'method' => 'foo', 'method' => 'foo',
'uri' => '', 'uri' => '',
'options' => [], 'options' => [],