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

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Timothy Warren 2018-01-10 16:28:37 -05:00
parent 98283e27d8 fb8db698a6
commit f205ba8cff
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/CodeIgniter/Sniffs/WhiteSpace/ElseOnNewLineSniff.php
View File

@ -71,7 +71,7 @@ class ElseOnNewLineSniff implements Sniff
$previous_non_blank_token = $tokens[$previous_non_blank_token_ptr];
if ($previous_non_blank_token['line'] === $else_token['line']) {
$error = '"' . $else_token['content'] . '" should be on a new line.';
$phpcsFile->addError($error, $stackPtr);
$phpcsFile->addError($error, $stackPtr, 123423);
}
}//end process()

4
composer.json
View File

@ -41,9 +41,9 @@
"robmorgan/phinx": "^0.9.1",
"sebastian/phpcpd": "^3.0",
"spatie/phpunit-snapshot-assertions": "^1.2.0",
"squizlabs/php_codesniffer": "^3.0.0@beta",
"squizlabs/php_codesniffer": "^3.2.2",
"symfony/var-dumper": "^4.0.1",
"theseer/phpdox": "^0.10.1",
"theseer/phpdox": "^0.11.0",
"filp/whoops": "^2.1"
},
"scripts": {

4
phpdoc.dist.xml
View File

@ -12,7 +12,7 @@
</transformations>
<files>
<directory>src</directory>
<!-- <directory>vendor/aviat/ion/src</directory>
<directory>vendor/container-interop/container-interop/src</directory> -->
<directory>vendor/aviat/ion/src</directory>
<directory>vendor/container-interop/container-interop/src</directory>
</files>
</phpdoc>

13
src/Command/SyncKitsuWithMal.php
View File

@ -50,7 +50,7 @@ class SyncKitsuWithMal extends BaseCommand {
protected $malModel;
/**
* Run the image conversion script
* Run the Kitsu <=> MAL sync script
*
* @param array $args
* @param array $options
@ -121,7 +121,6 @@ class SyncKitsuWithMal extends BaseCommand {
if ( ! empty($data['updateKitsu']))
{
// print_r($data['updateKitsu']);
$count = count($data['updateKitsu']);
$this->echoBox("Updating {$count} outdated Kitsu {$type} list items");
$this->updateKitsuListItems($data['updateKitsu'], 'update', $type);
@ -483,17 +482,17 @@ class SyncKitsuWithMal extends BaseCommand {
foreach($responses as $key => $response)
{
$id = $itemsToUpdate[$key]['id'];
$responseData = Json::decode($response);
$responseObject = Json::decode($response);
if ( ! array_key_exists('errors', $responseObject))
$id = $itemsToUpdate[$key]['mal_id'];
if ( ! array_key_exists('errors', $responseData));
{
$verb = ($action === 'update') ? 'updated' : 'created';
$this->echoBox("Successfully {$verb} Kitsu {$type} list item with id: {$id}");
}
else
{
dump($responseObject);
dump($responseData);
$verb = ($action === 'update') ? 'update' : 'create';
$this->echoBox("Failed to {$verb} Kitsu {$type} list item with id: {$id}");
}
@ -539,4 +538,4 @@ class SyncKitsuWithMal extends BaseCommand {
}
}
}
}
}