From d254389a4b7d423c5b41c3e691fb4f057c247dda Mon Sep 17 00:00:00 2001 From: gggeek Date: Sun, 13 Dec 2020 21:55:58 +0000 Subject: [PATCH] improve code coverage for demo files --- .travis.yml | 2 +- demo/client/_append.php | 7 +++++ demo/client/{_bootstrap.php => _prepend.php} | 11 ++++++++ demo/client/agesort.php | 4 +-- demo/client/getstatename.php | 4 +-- demo/client/introspect.php | 4 +-- demo/client/mail.php | 4 +-- demo/client/proxy.php | 4 ++- demo/client/which.php | 4 +-- demo/client/wrap.php | 4 +-- demo/server/_append.php | 7 +++++ demo/server/_bootstrap.php | 18 ------------ demo/server/_prepend.php | 29 ++++++++++++++++++++ demo/server/discuss.php | 4 ++- demo/server/proxy.php | 4 ++- demo/server/server.php | 19 ++----------- 16 files changed, 78 insertions(+), 51 deletions(-) create mode 100644 demo/client/_append.php rename demo/client/{_bootstrap.php => _prepend.php} (59%) create mode 100644 demo/server/_append.php delete mode 100644 demo/server/_bootstrap.php create mode 100644 demo/server/_prepend.php diff --git a/.travis.yml b/.travis.yml index 722eeba..9d1f3c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ after_failure: after_script: # Upload code-coverage to Scrutinizer - - if [ -f coverage.clover ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover && echo 'code coverage uploaded to Scrutinizer'; fi + - if [ -f coverage.clover ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi # Upload code-coverage CodeClimate - disabled as it does not support php 8 atm #- if [ -f coverage.clover ]; then CODECLIMATE_REPO_TOKEN=7fa6ee01e345090e059e5e42f3bfbcc8692feb8340396382dd76390a3019ac13 ./vendor/bin/test-reporter --coverage-report=coverage.clover; fi diff --git a/demo/client/_append.php b/demo/client/_append.php new file mode 100644 index 0000000..da249b3 --- /dev/null +++ b/demo/client/_append.php @@ -0,0 +1,7 @@ + + xmlrpc - Agesort demo

Agesort demo

@@ -62,4 +62,4 @@ if (!$resp->faultCode()) { ?> - + diff --git a/demo/client/getstatename.php b/demo/client/getstatename.php index 304bf25..a83d907 100644 --- a/demo/client/getstatename.php +++ b/demo/client/getstatename.php @@ -1,4 +1,4 @@ - + xmlrpc - Getstatename demo

Getstatename demo

@@ -39,4 +39,4 @@ print " - + diff --git a/demo/client/proxy.php b/demo/client/proxy.php index 88be2f1..cdbddc2 100644 --- a/demo/client/proxy.php +++ b/demo/client/proxy.php @@ -1,4 +1,4 @@ - + xmlrpc - Proxy demo

proxy demo

@@ -55,3 +55,5 @@ $proxy = new PhpXmlRpcProxy(new \PhpXmlRpc\Client(XMLRPCSERVER)); $stateName = $proxy->getStateName($stateNo); echo "State $stateNo is ".htmlspecialchars($stateName); + +require_once __DIR__ . "/_append.php"; diff --git a/demo/client/which.php b/demo/client/which.php index 6664e2f..1c1ba36 100644 --- a/demo/client/which.php +++ b/demo/client/which.php @@ -1,4 +1,4 @@ - + xmlrpc - Which toolkit demo

Which toolkit demo

@@ -26,4 +26,4 @@ if (!$resp->faultCode()) { } ?> - + diff --git a/demo/client/wrap.php b/demo/client/wrap.php index 88d6a8d..4e3db40 100644 --- a/demo/client/wrap.php +++ b/demo/client/wrap.php @@ -1,4 +1,4 @@ - + xmlrpc - Webservice wrappper demo

Webservice wrappper demo

@@ -49,4 +49,4 @@ if ($resp->faultCode()) { } ?> - + diff --git a/demo/server/_append.php b/demo/server/_append.php new file mode 100644 index 0000000..da249b3 --- /dev/null +++ b/demo/server/_append.php @@ -0,0 +1,7 @@ + $getComments_doc, ), )); + +require_once __DIR__ . "/_append.php"; diff --git a/demo/server/proxy.php b/demo/server/proxy.php index 812584f..c501d60 100644 --- a/demo/server/proxy.php +++ b/demo/server/proxy.php @@ -9,7 +9,7 @@ * @license code licensed under the BSD License: see file license.txt */ -require_once __DIR__ . "/_bootstrap.php"; +require_once __DIR__ . "/_prepend.php"; /** * Forward an xmlrpc request to another server, and return to client the response received. @@ -87,3 +87,5 @@ $server = new PhpXmlRpc\Server( ), ) ); + +require_once __DIR__ . "/_append.php"; diff --git a/demo/server/server.php b/demo/server/server.php index 2c48b73..7f60ac1 100644 --- a/demo/server/server.php +++ b/demo/server/server.php @@ -9,18 +9,7 @@ * Please do not copy this file verbatim into your production server. **/ -require_once __DIR__ . "/_bootstrap.php"; - -// Out-of-band information: let the client manipulate the server operations. -// We do this to help the testsuite script: do not reproduce in production! -if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { - $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage'; - if (!is_dir($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'])) { - mkdir($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY']); - } - - include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; -} +require_once __DIR__ . "/_prepend.php"; use PhpXmlRpc\Value; @@ -987,8 +976,4 @@ if (isset($_GET['FORCE_AUTH'])) { $s->service(); // That should do all we need! -// Out-of-band information: let the client manipulate the server operations. -// We do this to help the testsuite script: do not reproduce in production! -if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { - include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; -} +require_once __DIR__ . "/_append.php"; -- 2.43.0

Agesort demo

Getstatename demo

Introspect demo

Mail demo

proxy demo

Which toolkit demo

Webservice wrappper demo