From 4cbc0ef7515fa476e392d8c378fef9dd852a9f2b Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 7 Jun 2020 23:24:35 +0900 Subject: [PATCH 1/2] use php5friends/phpunit48 --- composer.json | 4 +- composer.lock | 340 ++++++++++++++++++++++++++------------------------ 2 files changed, 177 insertions(+), 167 deletions(-) diff --git a/composer.json b/composer.json index 8a7d55df83..d174b67f8d 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,9 @@ "captbaritone/mailcatcher-codeception-module": "1.2.1", "codeception/codeception": "*", "fzaninotto/faker": "^1.8", - "php-coveralls/php-coveralls": "^1.1" + "php-coveralls/php-coveralls": "^1.1", + "php5friends/codeception-phpunit48-wrapper": ">=6.0.20", + "php5friends/phpunit48": ">=4.8.41" }, "require": { "php": ">=5.4.16", diff --git a/composer.lock b/composer.lock index 09fab0599a..7dc6289bd8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7dfc3c1cae78c3105fe61fed0e23c9c8", + "content-hash": "769df9c0beb3fc3885ad2242a658148b", "packages": [ { "name": "bondas83/mdb2_driver_mysqli", @@ -256,18 +256,18 @@ "authors": [ { "name": "Greg Beaver", - "role": "Helper", - "email": "cellog@php.net" + "email": "cellog@php.net", + "role": "Helper" }, { "name": "Andrei Zmievski", - "role": "Lead", - "email": "andrei@php.net" + "email": "andrei@php.net", + "role": "Lead" }, { "name": "Stig Bakken", - "role": "Developer", - "email": "stig@php.net" + "email": "stig@php.net", + "role": "Developer" } ], "description": "More info available on: http://pear.php.net/package/Console_Getopt", @@ -313,18 +313,18 @@ "authors": [ { "name": "Chuck Hagenbuch", - "role": "Lead", - "email": "chuck@horde.org" + "email": "chuck@horde.org", + "role": "Lead" }, { "name": "Richard Heyes", - "role": "Developer", - "email": "richard@phpguru.org" + "email": "richard@phpguru.org", + "role": "Developer" }, { "name": "Aleksander Machniak", - "role": "Developer", - "email": "alec@alec.pl" + "email": "alec@alec.pl", + "role": "Developer" } ], "description": "Class that provides multiple interfaces for sending emails.", @@ -467,13 +467,13 @@ "authors": [ { "name": "Martin Jansen", - "role": "Lead", - "email": "mj@php.net" + "email": "mj@php.net", + "role": "Lead" }, { "name": "Olivier Vanhoucke", - "role": "Lead", - "email": "olivier@php.net" + "email": "olivier@php.net", + "role": "Lead" } ], "description": "More info available on: http://pear.php.net/package/Text_Password", @@ -515,23 +515,23 @@ "authors": [ { "name": "Stephan Schmidt", - "role": "Lead", - "email": "schst@php-tools.net" + "email": "schst@php-tools.net", + "role": "Lead" }, { "name": "Chuck Burgess", - "role": "Lead", - "email": "ashnazg@php.net" + "email": "ashnazg@php.net", + "role": "Lead" }, { "name": "Stig Sæther Bakken", - "role": "Developer", - "email": "stig@php.net" + "email": "stig@php.net", + "role": "Developer" }, { "name": "Tomas V.V.Cox", - "role": "Developer", - "email": "cox@php.net" + "email": "cox@php.net", + "role": "Developer" } ], "description": "XML parser", @@ -576,13 +576,13 @@ "authors": [ { "name": "Stephan Schmidt", - "role": "Lead", - "email": "schst@php-tools.net" + "email": "schst@php-tools.net", + "role": "Lead" }, { "name": "Chuck Burgess", - "role": "Lead", - "email": "ashnazg@php.net" + "email": "ashnazg@php.net", + "role": "Lead" } ], "description": "More info available on: http://pear.php.net/package/XML_Serializer", @@ -625,18 +625,18 @@ "authors": [ { "name": "Stephan Schmidt", - "role": "Lead", - "email": "schst@php-tools.net" + "email": "schst@php-tools.net", + "role": "Lead" }, { "name": "Chuck Burgess", - "role": "Lead", - "email": "ashnazg@php.net" + "email": "ashnazg@php.net", + "role": "Lead" }, { "name": "Davey Shafik", - "role": "Helper", - "email": "davey@php.net" + "email": "davey@php.net", + "role": "Helper" } ], "description": "Methods to work with XML documents", @@ -773,6 +773,7 @@ "fpdi", "pdf" ], + "abandoned": true, "time": "2015-10-12T15:37:35+00:00" }, { @@ -1063,52 +1064,6 @@ ], "time": "2018-03-31T22:30:43+00:00" }, - { - "name": "codeception/phpunit-wrapper", - "version": "6.0.10", - "source": { - "type": "git", - "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "7057e599d97b02b4efb009681a43b327dbce138a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7057e599d97b02b4efb009681a43b327dbce138a", - "reference": "7057e599d97b02b4efb009681a43b327dbce138a", - "shasum": "" - }, - "require": { - "phpunit/php-code-coverage": ">=2.2.4 <6.0", - "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0", - "sebastian/comparator": ">1.1 <3.0", - "sebastian/diff": ">=1.4 <4.0" - }, - "replace": { - "codeception/phpunit-wrapper": "*" - }, - "require-dev": { - "codeception/specify": "*", - "vlucas/phpdotenv": "^2.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Codeception\\PHPUnit\\": "src\\" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Davert", - "email": "davert.php@resend.cc" - } - ], - "description": "PHPUnit classes used by Codeception", - "time": "2018-06-20T20:08:14+00:00" - }, { "name": "codeception/stub", "version": "1.0.4", @@ -1201,12 +1156,12 @@ "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/facebook/php-webdriver.git", + "url": "https://github.com/php-webdriver/php-webdriver-archive.git", "reference": "b7186fb1bcfda956d237f59face250d06ef47253" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/b7186fb1bcfda956d237f59face250d06ef47253", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver-archive/zipball/b7186fb1bcfda956d237f59face250d06ef47253", "reference": "b7186fb1bcfda956d237f59face250d06ef47253", "shasum": "" }, @@ -1240,6 +1195,7 @@ "selenium", "webdriver" ], + "abandoned": "php-webdriver/webdriver", "time": "2016-08-10T00:44:08+00:00" }, { @@ -1559,6 +1515,7 @@ } ], "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.", + "abandoned": true, "time": "2018-07-31T13:22:33+00:00" }, { @@ -1609,6 +1566,7 @@ "Guzzle", "stream" ], + "abandoned": true, "time": "2014-10-12T19:18:40+00:00" }, { @@ -1672,6 +1630,127 @@ ], "time": "2017-12-06T23:17:56+00:00" }, + { + "name": "php5friends/codeception-phpunit48-wrapper", + "version": "6.0.20", + "source": { + "type": "git", + "url": "https://github.com/php5friends/codeception-phpunit48-wrapper.git", + "reference": "753483e2cfc51f3ba5e8c4247ee730ebb7e82485" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php5friends/codeception-phpunit48-wrapper/zipball/753483e2cfc51f3ba5e8c4247ee730ebb7e82485", + "reference": "753483e2cfc51f3ba5e8c4247ee730ebb7e82485", + "shasum": "" + }, + "require": { + "php5friends/phpunit48": ">=4.8.40", + "phpunit/php-code-coverage": ">=2.2.4 <6.0", + "sebastian/comparator": "~1.2.4", + "sebastian/diff": ">=1.4 <4.0" + }, + "replace": { + "codeception/phpunit-wrapper": "*" + }, + "require-dev": { + "codeception/specify": "*", + "vlucas/phpdotenv": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\PHPUnit\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Davert", + "email": "davert.php@resend.cc" + } + ], + "description": "PHPUnit48 classes used by Codeception", + "time": "2020-06-07T12:11:02+00:00" + }, + { + "name": "php5friends/phpunit48", + "version": "4.8.41", + "source": { + "type": "git", + "url": "https://github.com/php5friends/phpunit48.git", + "reference": "dd7ca37360bc036760146cd16d6071547b1e9e44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php5friends/phpunit48/zipball/dd7ca37360bc036760146cd16d6071547b1e9e44", + "reference": "dd7ca37360bc036760146cd16d6071547b1e9e44", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~2.1", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.2.4", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.1|~3.0" + }, + "replace": { + "phpunit/phpunit": "*" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.8.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2020-06-07T11:28:16+00:00" + }, { "name": "phpdocumentor/reflection-docblock", "version": "2.0.5", @@ -1833,8 +1912,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sb@sebastian-bergmann.de" + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -1881,8 +1960,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sb@sebastian-bergmann.de" + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", @@ -1923,8 +2002,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], "description": "Simple template engine.", @@ -1972,8 +2051,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sb@sebastian-bergmann.de" + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], "description": "Utility class for timing", @@ -2032,78 +2111,6 @@ ], "time": "2017-12-04T08:55:13+00:00" }, - { - "name": "phpunit/phpunit", - "version": "4.8.36", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "~2.1", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "~1.3", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.1|~3.0" - }, - "suggest": { - "phpunit/php-invoker": "~1.1" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.8.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "role": "lead", - "email": "sebastian@phpunit.de" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "time": "2017-06-21T08:07:12+00:00" - }, { "name": "phpunit/phpunit-mock-objects", "version": "2.3.8", @@ -2708,8 +2715,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", @@ -3449,5 +3456,6 @@ "platform-dev": [], "platform-overrides": { "php": "5.4.16" - } + }, + "plugin-api-version": "1.1.0" } From 9e124562874683057a4b980d18283d3df55c048c Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 7 Jun 2020 23:29:01 +0900 Subject: [PATCH 2/2] Add nightly --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1a5118557..4bd845e23e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,13 @@ services: - postgresql - xvfb php: - - 5.4 - - 5.5 - 5.6 - 7.0 - 7.1 - 7.2 - 7.3 - 7.4 + - nightly env: global: @@ -41,8 +40,6 @@ matrix: dist: trusty env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DBPORT=5432 DIST=trusty exclude: - - php: 5.4 - - php: 5.5 - php: 5.6 env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DBPORT=5432 COVERAGE=true - php: 7.0 @@ -53,13 +50,16 @@ matrix: env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DBPORT=5432 COVERAGE=true - php: 7.4 env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DBPORT=5432 COVERAGE=true + - php: nightly + env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DBPORT=5432 COVERAGE=true allow_failures: + - php: nightly # Use for coverage report - php: 7.3 env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres DBPORT=5432 COVERAGE=true before_install: - - if [[ $DIST = 'trusty' ]]; then sudo apt-get -y install google-chrome-stable --allow-unauthenticated ; fi + - if [[ $DIST = 'trusty' ]]; then sudo apt-get -y install dpkg google-chrome-stable --allow-unauthenticated ; fi before_script: - if [[ $DB = 'mysql' ]]; then mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION';" ; fi @@ -84,12 +84,12 @@ before_script: script: - mkdir -p reports/coverage - - if [ ! $COVERAGE ] ; then php data/vendor/bin/phpunit -c phpunit.xml.dist --exclude-group classloader ; fi - - if [ ! $COVERAGE ] ; then php data/vendor/bin/phpunit -c phpunit.xml.dist --group classloader ; fi + - if [ ! $COVERAGE ] ; then data/vendor/bin/phpunit -c phpunit.xml.dist --exclude-group classloader ; fi + - if [ ! $COVERAGE ] ; then data/vendor/bin/phpunit -c phpunit.xml.dist --group classloader ; fi - if [ $COVERAGE ] ; then phpdbg -qrr data/vendor/bin/phpunit -c phpunit.xml.dist --exclude-group classloader ; fi - if [ ! $COVERAGE ] ; then php data/vendor/bin/codecept run --env chrome --skip-group installer --steps ; fi - sed -e 's|http://|https://|g' -i.bak data/config/config.php - - if [ ! $COVERAGE ] ; then php data/vendor/bin/phpunit -c phpunit.xml.dist tests/class/SC_SessionFactoryTest.php ; fi + - if [ ! $COVERAGE ] ; then data/vendor/bin/phpunit -c phpunit.xml.dist tests/class/SC_SessionFactoryTest.php ; fi - rm ./data/config/config.php - if [ $DB = 'pgsql' ] ; then psql -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -c "DROP DATABASE ${DBNAME};"; psql -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -c "CREATE DATABASE ${DBNAME};" ; fi ## Travis の mysql はパスワードが空なのでスキップ