diff --git a/.travis.yml b/.travis.yml index 62f82e2c..d913cc55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ install: - composer install --ignore-platform-reqs php: - - 7.3 - 7.4 - nightly @@ -12,13 +11,6 @@ script: - mkdir -p build/logs - php vendor/bin/phpunit -c build -#after_script: -# - CODECLIMATE_REPO_TOKEN=2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058 vendor/bin/test-reporter - matrix: allow_failures: - php: nightly - -#addons: -# code_climate: -# repo_token: 2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e18a7bc4..52ddbd71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## Version 5 +* Updated PHP requirement to 7.4 + ## Version 4.2 * Updated dependencies * Updated PHP requirement to 7.3 diff --git a/Jenkinsfile b/Jenkinsfile index 7fb02a70..c94da53f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,18 +10,6 @@ pipeline { sh 'php composer.phar install --ignore-platform-reqs' } } - stage('PHP 7.3') { - agent { - docker { - image 'php:7.3-alpine' - args '-u root --privileged' - } - } - steps { - sh 'apk add --no-cache git' - sh 'php ./vendor/bin/phpunit --colors=never' - } - } stage('PHP 7.4') { agent { docker { diff --git a/composer.json b/composer.json index 0e45c808..b166b893 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "config": { "lock": false, "platform": { - "php": "7.3" + "php": "7.4" } }, "require": { @@ -50,7 +50,7 @@ "laminas/laminas-httphandlerrunner": "^1.0", "maximebf/consolekit": "^1.0", "monolog/monolog": "^2.0.1", - "php": "^7.3", + "php": "^7.4 || ^8", "psr/container": "~1.0", "psr/http-message": "~1.0", "psr/log": "~1.0", @@ -60,14 +60,14 @@ "consolidation/robo": "^2.0.0", "filp/whoops": "^2.1", "pdepend/pdepend": "^2.2", - "phploc/phploc": "^5.0", + "phploc/phploc": "^6.0.2", "phpmd/phpmd": "^2.8", "phpstan/phpstan": "^0.12.0", - "phpunit/phpunit": "^8.4.3", + "phpunit/phpunit": "^9.1.1", "roave/security-advisories": "dev-master", "robmorgan/phinx": "^0.10.6", - "sebastian/phpcpd": "^4.1.0", - "spatie/phpunit-snapshot-assertions": "^2.2.1", + "sebastian/phpcpd": "^5.0.2", + "spatie/phpunit-snapshot-assertions": "^4.1.0", "squizlabs/php_codesniffer": "^3.2.2", "symfony/var-dumper": "^5", "theseer/phpdox": "*" diff --git a/src/AnimeClient/constants.php b/src/AnimeClient/constants.php index 3a54a8b0..108d8e5c 100644 --- a/src/AnimeClient/constants.php +++ b/src/AnimeClient/constants.php @@ -24,7 +24,7 @@ const ERROR_MESSAGE_METHOD = 'errorPage'; const NOT_FOUND_METHOD = 'notFound'; const SESSION_SEGMENT = 'Aviat\AnimeClient\Auth'; const SRC_DIR = __DIR__; -const USER_AGENT = "Tim's Anime Client/4.2"; +const USER_AGENT = "Tim's Anime Client/5"; // Regex patterns const ALPHA_SLUG_PATTERN = '[a-z_]+'; diff --git a/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml index 87effff0..7e670c63 100644 --- a/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml +++ b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml @@ -1,5 +1,60 @@ -- null -- null -- null -- null -- null +- + empty: false + id: '15084773' + mal_id: '26769' + chapters: { read: 67, total: '-' } + volumes: { read: '-', total: '-' } + manga: { empty: false, genres: [Comedy, Romance, School, 'Slice of Life', Thriller], id: '20286', image: 'https://media.kitsu.io/manga/poster_images/20286/small.jpg?1434293999', slug: bokura-wa-minna-kawaisou, title: 'Bokura wa Minna Kawaisou', titles: { }, type: Manga, url: 'https://kitsu.io/manga/bokura-wa-minna-kawaisou' } + reading_status: current + notes: '' + rereading: false + reread: 0 + user_rating: 9 +- + empty: false + id: '15085607' + mal_id: '16' + chapters: { read: 17, total: 120 } + volumes: { read: '-', total: 14 } + manga: { empty: false, genres: [Comedy, Ecchi, Harem, Romance, Sports], id: '47', image: 'https://media.kitsu.io/manga/poster_images/47/small.jpg?1434249493', slug: love-hina, title: 'Love Hina', titles: { }, type: Manga, url: 'https://kitsu.io/manga/love-hina' } + reading_status: current + notes: '' + rereading: false + reread: 0 + user_rating: 7 +- + empty: false + id: '15084529' + mal_id: '35003' + chapters: { read: 16, total: '-' } + volumes: { read: '-', total: '-' } + manga: { empty: false, genres: [Comedy, Ecchi, 'Gender Bender', Romance, School, Sports, Supernatural], id: '11777', image: 'https://media.kitsu.io/manga/poster_images/11777/small.jpg?1438784325', slug: yamada-kun-to-7-nin-no-majo, title: 'Yamada-kun to 7-nin no Majo', titles: ['Yamada-kun and the Seven Witches'], type: Manga, url: 'https://kitsu.io/manga/yamada-kun-to-7-nin-no-majo' } + reading_status: current + notes: '' + rereading: false + reread: 0 + user_rating: 9 +- + empty: false + id: '15312827' + mal_id: '78523' + chapters: { read: 68, total: '-' } + volumes: { read: '-', total: '-' } + manga: { empty: false, genres: [Romance, School, 'Slice of Life'], id: '27175', image: 'https://media.kitsu.io/manga/poster_images/27175/small.jpg?1464379411', slug: relife, title: ReLIFE, titles: { }, type: Manga, url: 'https://kitsu.io/manga/relife' } + reading_status: current + notes: '' + rereading: false + reread: 0 + user_rating: '-' +- + empty: false + id: '15084769' + mal_id: '60815' + chapters: { read: 43, total: '-' } + volumes: { read: '-', total: '-' } + manga: { empty: false, genres: [Comedy, School, 'Slice of Life'], id: '25491', image: 'https://media.kitsu.io/manga/poster_images/25491/small.jpg?1434305043', slug: joshikausei, title: Joshikausei, titles: { }, type: Manga, url: 'https://kitsu.io/manga/joshikausei' } + reading_status: current + notes: '' + rereading: false + reread: 0 + user_rating: 8 diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.txt new file mode 100644 index 00000000..e7e95073 --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.txt new file mode 100644 index 00000000..4e55b5db --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.txt new file mode 100644 index 00000000..fbd9a6fe --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.txt new file mode 100644 index 00000000..2e5d0bc9 --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.txt new file mode 100644 index 00000000..83b6602a --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.txt @@ -0,0 +1 @@ +placeholder.png \ No newline at end of file diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.txt new file mode 100644 index 00000000..dc0fa1ea --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.txt @@ -0,0 +1 @@ +should exist \ No newline at end of file diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.txt new file mode 100644 index 00000000..fe80c67d --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.txt @@ -0,0 +1 @@ +Example text \ No newline at end of file diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.txt b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.txt new file mode 100644 index 00000000..f3241b60 --- /dev/null +++ b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__1.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__1.txt new file mode 100644 index 00000000..5fad8486 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__1.txt @@ -0,0 +1,2 @@ + + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__10.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__10.txt new file mode 100644 index 00000000..d8a5b82b --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__10.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__11.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__11.txt new file mode 100644 index 00000000..d9cd9f23 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__11.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__12.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__12.txt new file mode 100644 index 00000000..b67ece0b --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__12.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__13.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__13.txt new file mode 100644 index 00000000..217e1070 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__13.txt @@ -0,0 +1,5 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__14.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__14.txt new file mode 100644 index 00000000..9cc61252 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__14.txt @@ -0,0 +1,2 @@ + + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__15.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__15.txt new file mode 100644 index 00000000..d5908280 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__15.txt @@ -0,0 +1,2 @@ + + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__16.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__16.txt new file mode 100644 index 00000000..6845605d --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__16.txt @@ -0,0 +1,4 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__17.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__17.txt new file mode 100644 index 00000000..8562b0c1 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__17.txt @@ -0,0 +1,8 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__18.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__18.txt new file mode 100644 index 00000000..8ee72966 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__18.txt @@ -0,0 +1,8 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__19.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__19.txt new file mode 100644 index 00000000..cd9981ba --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__19.txt @@ -0,0 +1,5 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__2.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__2.txt new file mode 100644 index 00000000..9e04d906 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__2.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__20.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__20.txt new file mode 100644 index 00000000..d713594d --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__20.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__21.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__21.txt new file mode 100644 index 00000000..db4b90ec --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__21.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__22.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__22.txt new file mode 100644 index 00000000..de84dffa --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__22.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__23.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__23.txt new file mode 100644 index 00000000..25da8325 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__23.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__24.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__24.txt new file mode 100644 index 00000000..a3d30e0d --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__24.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__25.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__25.txt new file mode 100644 index 00000000..a3631d99 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__25.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__3.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__3.txt new file mode 100644 index 00000000..c6d07c96 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__3.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__4.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__4.txt new file mode 100644 index 00000000..d620ee08 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__4.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__5.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__5.txt new file mode 100644 index 00000000..b211273f --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__5.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__6.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__6.txt new file mode 100644 index 00000000..93f193dc --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__6.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__7.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__7.txt new file mode 100644 index 00000000..ef90ca7e --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__7.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__8.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__8.txt new file mode 100644 index 00000000..ddc0efb8 --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__8.txt @@ -0,0 +1 @@ + diff --git a/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__9.txt b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__9.txt new file mode 100644 index 00000000..4753279d --- /dev/null +++ b/tests/AnimeClient/__snapshots__/FormGeneratorTest__testGeneration__9.txt @@ -0,0 +1,6 @@ +