mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-24 20:13:14 +01:00
Code Issues Projects Releases Wiki Activity

MDL-80591 phpunit: Coding style cleanup both CLI scripts

Browse Source 
While the init.php was cleaned up not long ago, let's
re-review it (small detail only) and proceed to, also,
clean up the util.php one.

Note that both will raise an error about missing MOODLE_INTERNAL
check, but that's expected, they are CLI scripts, independent
from Moodle's bootstrap, so they don't have config.php required
either.
This commit is contained in:
Eloy Lafuente (stronk7) 2024-01-13 18:46:45 +01:00
parent 5f31b37e1d
commit 9f10626533
No known key found for this signature in database
GPG Key ID: 53487A05E6228820
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/tool/phpunit/cli/init.php
View File

@ -1,5 +1,5 @@
<?php
// This file is part of Moodle - http://moodle.org/
// This file is part of Moodle - https://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@ -12,18 +12,18 @@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
// along with Moodle. If not, see <https://www.gnu.org/licenses/>.
/**
* All in one init script - PHP version.
*
* @package tool_phpunit
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
if (isset($_SERVER['REMOTE_ADDR'])) {
die; // no access from web!
die; // No access from web!
}
// Force OPcache reset if used, we do not want any stale caches
@ -99,10 +99,7 @@ if ($code != 0) {
chdir(__DIR__);
$output = null;
exec("php util.php --diag", $output, $code);
if ($code == 0) {
// everything is ready
} else if ($code == PHPUNIT_EXITCODE_INSTALL) {
if ($code == PHPUNIT_EXITCODE_INSTALL) {
passthru("php util.php --install", $code);
if ($code != 0) {
exit($code);
@ -115,7 +112,7 @@ if ($code == 0) {
exit($code);
}
} else {
} else if ($code != 0) {
echo implode("\n", $output)."\n";
exit($code);
}

37
admin/tool/phpunit/cli/util.php
View File

@ -1,5 +1,5 @@
<?php
// This file is part of Moodle - http://moodle.org/
// This file is part of Moodle - https://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@ -12,7 +12,7 @@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
// along with Moodle. If not, see <https://www.gnu.org/licenses/>.
/**
* PHPUnit related utilities.
@ -21,11 +21,11 @@
*
* @package tool_phpunit
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
if (isset($_SERVER['REMOTE_ADDR'])) {
die; // no access from web!
die; // No access from web!
}
define('IGNORE_COMPONENT_CACHE', true);
@ -34,9 +34,9 @@ require_once(__DIR__.'/../../../../lib/clilib.php');
require_once(__DIR__.'/../../../../lib/phpunit/bootstraplib.php');
require_once(__DIR__.'/../../../../lib/testing/lib.php');
// now get cli options
// Now get cli options.
list($options, $unrecognized) = cli_get_params(
array(
[
'drop' => false,
'install' => false,
'buildconfig' => false,
@ -44,10 +44,10 @@ list($options, $unrecognized) = cli_get_params(
'diag' => false,
'run' => false,
'help' => false,
),
array(
'h' => 'help'
)
],
[
'h' => 'help',
]
);
// Basic check to see if phpunit is installed.
@ -57,7 +57,7 @@ if (!file_exists(__DIR__.'/../../../../vendor/phpunit/phpunit/composer.json') ||
phpunit_bootstrap_error(PHPUNIT_EXITCODE_PHPUNITMISSING);
}
if ($options['install'] or $options['drop']) {
if ($options['install'] || $options['drop']) {
define('CACHE_DISABLE_ALL', true);
}
@ -65,7 +65,7 @@ if ($options['run']) {
unset($options);
unset($unrecognized);
foreach ($_SERVER['argv'] as $k=>$v) {
foreach ($_SERVER['argv'] as $k => $v) {
if (strpos($v, '--run') === 0) {
unset($_SERVER['argv'][$k]);
$_SERVER['argc'] = $_SERVER['argc'] - 1;
@ -81,7 +81,7 @@ define('PHPUNIT_UTIL', true);
require(__DIR__.'/../../../../vendor/autoload.php');
require(__DIR__ . '/../../../../lib/phpunit/bootstrap.php');
// from now on this is a regular moodle CLI_SCRIPT
// From now on this is a regular moodle CLI_SCRIPT.
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/upgradelib.php');
@ -99,7 +99,7 @@ $install = $options['install'];
$buildconfig = $options['buildconfig'];
$buildcomponentconfigs = $options['buildcomponentconfigs'];
if ($options['help'] or (!$drop and !$install and !$buildconfig and !$buildcomponentconfigs and !$diag)) {
if ($options['help'] || (!$drop && !$install && !$buildconfig && !$buildcomponentconfigs && !$diag)) {
$help = "Various PHPUnit utility functions
Options:
@ -131,7 +131,10 @@ if ($diag) {
if (phpunit_util::build_config_file()) {
exit(0);
} else {
phpunit_bootstrap_error(PHPUNIT_EXITCODE_CONFIGWARNING, 'Can not create main /phpunit.xml configuration file, verify dirroot permissions');
phpunit_bootstrap_error(
PHPUNIT_EXITCODE_CONFIGWARNING,
'Can not create main /phpunit.xml configuration file, verify dirroot permissions'
);
}
} else if ($buildcomponentconfigs) {
@ -139,10 +142,10 @@ if ($diag) {
exit(0);
} else if ($drop) {
// make sure tests do not run in parallel
// Make sure tests do not run in parallel.
test_lock::acquire('phpunit');
phpunit_util::drop_site(true);
// note: we must stop here because $CFG is messed up and we can not reinstall, sorry
// Note: we must stop here because $CFG is messed up and we can not reinstall, sorry.
exit(0);
} else if ($install) {