From 47b9d7ba7aa656c3d54aac8be93df9b5356c12d1 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Thu, 5 Dec 2019 16:59:24 -0500 Subject: [PATCH] Update dependencies --- .travis.yml | 3 +-- CHANGELOG.md | 9 +++++++-- Jenkinsfile | 22 ---------------------- README.md | 2 +- RoboFile.php | 22 ++-------------------- build/docker_install.sh | 12 ------------ build/header_comment.txt | 4 ++-- composer.json | 18 +++++++++--------- src/constants.php | 2 +- 9 files changed, 23 insertions(+), 71 deletions(-) delete mode 100644 build/docker_install.sh diff --git a/.travis.yml b/.travis.yml index 391585d3..6e71487a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ install: - composer install --ignore-platform-reqs php: - - 7.1 - 7.2 - 7.3 + - 7.4 - nightly script: @@ -19,7 +19,6 @@ after_script: matrix: allow_failures: - php: nightly - - php: hhvm addons: code_climate: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3583d3e3..6712d975 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,18 @@ # Changelog +## Version 4.2 +* Updated dependencies +* Updated PHP requirement to 7.2 + ## Version 4.1 +* Added optional dark theme * Removed MAL integration, added Anilist Integration * Now uses WebP cache images when the browser supports it * Replaces JS minifier with pre-minified scripts (Removes the need for one caching folder, too) * Updated console command to sync Kitsu and Anilist data (Kitsu can sync MAL, and MAL's API broke, so MAL sync was removed) * Added page to update settings without having to edit config files * Defaulted to secure (HTTPS) urls -* Updated Character pages to show voice actors +* Updated Character pages to show voice actors * Added People pages, showing which works they contributed to, and in what role ## Version 4 @@ -15,7 +20,7 @@ * Added streaming links to list entries from the Kitsu API * Added simple integration with MyAnimeList, so an update can cross-post to both Kitsu and MyAnimeList (anime and manga) * Added console command to sync Kitsu and MyAnimeList data -* Added character pages +* Added character pages ## Version 3 * Converted user configuration to toml files diff --git a/Jenkinsfile b/Jenkinsfile index 899eaac6..659e497b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,22 +1,6 @@ pipeline { agent none stages { - stage('PHP 7.1') { - agent { - docker { - image 'php:7.1-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' - } - } stage('PHP 7.2') { agent { docker { @@ -25,8 +9,6 @@ pipeline { } } 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' @@ -41,8 +23,6 @@ pipeline { } } 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' @@ -57,8 +37,6 @@ pipeline { } } 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' diff --git a/README.md b/README.md index 2629142b..a70a6cd8 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Update your anime/manga list on Kitsu.io and MyAnimeList.net ### Requirements -* PHP 7.2+ +* PHP 7.1+ * PDO SQLite or PDO PostgreSQL (For collection tab) * GD extension for caching images diff --git a/RoboFile.php b/RoboFile.php index 3e2140c3..310dcb0d 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -1,5 +1,5 @@ lint(); - - $this->_run(['phpunit']); - } - /** - * Watches for file updates, and automatically runs appropriate actions - */ - public function watch() - { - $this->taskWatch() - ->monitor('composer.json', function() { - $this->taskComposerUpdate()->run(); - }) - ->monitor('src', function () { - $this->taskExec('test')->run(); - }) - ->monitor('tests', function () { - $this->taskExec('test')->run(); - }) - ->run(); + $this->_run(['phpunit']); } /** diff --git a/build/docker_install.sh b/build/docker_install.sh deleted file mode 100644 index 73163966..00000000 --- a/build/docker_install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# We need to install dependencies only for Docker -[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 - -set -xe - -# Install git (the php image doesn't have it) which is required by composer -# echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories -apk --update add --no-cache \ - curl \ - git diff --git a/build/header_comment.txt b/build/header_comment.txt index 43a9aed0..70638604 100644 --- a/build/header_comment.txt +++ b/build/header_comment.txt @@ -7,9 +7,9 @@ * * @package HummingbirdAnimeClient * @author Timothy J. Warren - * @copyright 2015 - 2018 Timothy J. Warren + * @copyright 2015 - 2019 Timothy J. Warren * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @version 4.1 + * @version 4.5 * @link https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient */ diff --git a/composer.json b/composer.json index f94fdf6b..ba97daed 100644 --- a/composer.json +++ b/composer.json @@ -23,33 +23,33 @@ "aura/router": "^3.0", "aura/session": "^2.0", "aviat/banker": "^2.0.0", - "aviat/ion": "^2.4.1", + "aviat/ion": "^3.0.0", "ext-iconv": "*", "ext-json": "*", "ext-gd":"*", "ext-pdo": "*", "maximebf/consolekit": "^1.0", - "monolog/monolog": "^1.0", + "monolog/monolog": "^2.0.1", + "php": "^7.2", "psr/http-message": "~1.0", "psr/log": "~1.0", "yosymfony/toml": "^1.0", "zendframework/zend-diactoros": "^2.0.0" }, "require-dev": { - "consolidation/robo": "~1.0", + "consolidation/robo": "^2.0.0", "filp/whoops": "^2.1", - "henrikbjorn/lurker": "^1.1.0", "pdepend/pdepend": "^2.2", - "phploc/phploc": "^4.0", + "phploc/phploc": "^5.0", "phpmd/phpmd": "^2.4", - "phpstan/phpstan": "^0.10.5", - "phpunit/phpunit": "^7.4.3", + "phpstan/phpstan": "^0.12.0", + "phpunit/phpunit": "^8.4.3", "roave/security-advisories": "dev-master", "robmorgan/phinx": "^0.10.6", "sebastian/phpcpd": "^4.1.0", - "spatie/phpunit-snapshot-assertions": "^1.2.0", + "spatie/phpunit-snapshot-assertions": "^3.1.0", "squizlabs/php_codesniffer": "^3.2.2", - "symfony/var-dumper": "^4.0.1", + "symfony/var-dumper": "^4.4.1", "theseer/phpdox": "*" }, "scripts": { diff --git a/src/constants.php b/src/constants.php index 3b1f3216..4083fb7d 100644 --- a/src/constants.php +++ b/src/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.1"; +const USER_AGENT = "Tim's Anime Client/4.2"; // Regex patterns const ALPHA_SLUG_PATTERN = '[a-z_]+';