Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Timothy Warren 2019-10-08 20:25:24 -04:00
commit 808b704383
5 changed files with 46 additions and 8 deletions

View File

@ -7,7 +7,6 @@ php:
- 7.1 - 7.1
- 7.2 - 7.2
- 7.3 - 7.3
- hhvm
- nightly - nightly
script: script:

24
Jenkinsfile vendored
View File

@ -4,8 +4,8 @@ pipeline {
stage('PHP 7.1') { stage('PHP 7.1') {
agent { agent {
docker { docker {
image 'php:7.1-alpine' image 'php:7.1-alpine'
args '-u root --privileged' args '-u root --privileged'
} }
} }
steps { steps {
@ -20,8 +20,8 @@ pipeline {
stage('PHP 7.2') { stage('PHP 7.2') {
agent { agent {
docker { docker {
image 'php:7.2-alpine' image 'php:7.2-alpine'
args '-u root --privileged' args '-u root --privileged'
} }
} }
steps { steps {
@ -33,5 +33,21 @@ pipeline {
sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never' sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
} }
} }
stage('PHP 7.3') {
agent {
docker {
image 'php:7.3-alpine'
args '-u root --privileged'
}
}
steps {
sh 'chmod +x ./build/docker_install.sh'
sh 'sh build/docker_install.sh'
sh 'apk add --no-cache php7-phpdbg'
sh 'curl -sS https://getcomposer.org/installer | php'
sh 'php composer.phar install --ignore-platform-reqs'
sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
}
}
} }
} }

View File

@ -269,11 +269,21 @@ final class Model
*/ */
private function getMediaIdFromMalId(string $malId, string $type = 'ANIME'): ?string private function getMediaIdFromMalId(string $malId, string $type = 'ANIME'): ?string
{ {
if ($malId === '')
{
return NULL;
}
$info = $this->runQuery('MediaIdByMalId', [ $info = $this->runQuery('MediaIdByMalId', [
'id' => $malId, 'id' => $malId,
'type' => mb_strtoupper($type), 'type' => mb_strtoupper($type),
]); ]);
if (array_key_exists('errors', $info))
{
return NULL;
}
return (string)$info['data']['Media']['id']; return (string)$info['data']['Media']['id'];
} }
} }

View File

@ -187,7 +187,7 @@ class Anime extends API {
$requester = new ParallelAPIRequest(); $requester = new ParallelAPIRequest();
$requester->addRequest($this->kitsuModel->incrementListItem($data), 'kitsu'); $requester->addRequest($this->kitsuModel->incrementListItem($data), 'kitsu');
if ($this->anilistEnabled && $data['mal_id'] !== null) if (( ! empty($data['mal_id'])) && $this->anilistEnabled)
{ {
$requester->addRequest($this->anilistModel->incrementListItem($data, 'ANIME'), 'anilist'); $requester->addRequest($this->anilistModel->incrementListItem($data, 'ANIME'), 'anilist');
} }
@ -214,7 +214,7 @@ class Anime extends API {
$requester = new ParallelAPIRequest(); $requester = new ParallelAPIRequest();
$requester->addRequest($this->kitsuModel->updateListItem($data), 'kitsu'); $requester->addRequest($this->kitsuModel->updateListItem($data), 'kitsu');
if ($this->anilistEnabled && $data['mal_id'] !== null) if (( ! empty($data['mal_id'])) && $this->anilistEnabled)
{ {
$requester->addRequest($this->anilistModel->updateListItem($data, 'ANIME'), 'anilist'); $requester->addRequest($this->anilistModel->updateListItem($data, 'ANIME'), 'anilist');
} }

View File

@ -17,8 +17,10 @@
namespace Aviat\AnimeClient\Types; namespace Aviat\AnimeClient\Types;
use ArrayAccess; use ArrayAccess;
use ArrayObject;
use Countable;
abstract class AbstractType implements ArrayAccess { abstract class AbstractType implements ArrayAccess, Countable {
/** /**
* Populate values for un-serializing data * Populate values for un-serializing data
* *
@ -164,6 +166,17 @@ abstract class AbstractType implements ArrayAccess {
} }
} }
/**
* Implementing Countable
*
* @return int
*/
public function count(): int
{
$keys = array_keys($this->toArray());
return count($keys);
}
/** /**
* Recursively cast properties to an array * Recursively cast properties to an array
* *