tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various: some little fixes

This commit is contained in:
Thomas Gelf 2019-09-11 22:26:23 +02:00
parent 300e716d52
commit 0e0bc3fb5d
9 changed files with 13 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
application/clicommands/TestCommand.php
View File

@ -1,246 +0,0 @@
<?php
namespace Icinga\Module\Director\Clicommands;
use Icinga\Application\Logger;
use Icinga\Cli\Command;
use Icinga\Module\Director\Test\TestSuiteLint;
use Icinga\Module\Director\Test\TestSuiteStyle;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
class TestCommand extends Command
{
/**
* Default arguments and options for PHP_CodeSniffer
*
* @var array
*/
protected $phpcsDefaultParams = array(
'-p',
'--standard=PSR2',
'--extensions=php',
'--encoding=utf-8'
);
public function lintAction()
{
$test = new TestSuiteLint();
$test->run();
if ($test->hasFailures()) {
Logger::error('Lint check failed');
exit(1);
} else {
Logger::info('Lint check succeeded');
exit(0);
}
}
/**
* Run all unit-test suites
*
* This command runs the unit- and regression-tests of icingaweb and installed modules.
*
* USAGE
*
* icingacli test php unit [options]
*
* OPTIONS
*
* --verbose Be more verbose.
* --build Enable reporting.
* --include Pattern to use for including files/test cases.
*
* EXAMPLES
*
* icingacli test php unit --verbose
* icingacli test php unit --build
* icingacli test php unit --include=*SpecialTest
*/
public function phpAction()
{
$basedir = $this->getBaseDir();
$build = $this->params->shift('build');
$include = $this->params->shift('include');
$phpUnit = exec('which phpunit');
if (!file_exists($phpUnit)) {
$this->fail('PHPUnit not found. Please install PHPUnit to be able to run the unit-test suites.');
}
$options = array(
'--bootstrap' => $basedir . '/test/bootstrap.php'
);
if ($this->isVerbose) {
$options[] = '--verbose --testdox';
}
if ($build) {
$reportPath = $this->setupAndReturnReportDirectory();
$options[] = '--verbose';
$options[] = '--log-junit';
$options[] = $reportPath . '/phpunit_results.xml';
$options[] = '--coverage-html';
$options[] = $reportPath . '/php_html_coverage';
}
if ($include !== null) {
$options[] = '--filter';
$options[] = $include;
}
chdir(realpath(__DIR__ . '/../..'));
$command = $phpUnit . ' ' . join(' ', array_merge($options, $this->params->getAllStandalone()));
if ($this->isVerbose) {
$res = `$command`;
foreach (preg_split('/\n/', $res) as $line) {
if (preg_match('~\s+\[([x\s])\]\s~', $line, $m)) {
if ($m[1] === 'x') {
echo $this->screen->colorize($line, 'green') . "\n";
} else {
echo $this->screen->colorize($line, 'red') . "\n";
}
} else {
echo $line . "\n";
}
}
} else {
passthru($command);
}
}
/**
* Run code-style checks
*
* This command checks whether icingaweb and installed modules match the PSR-2 coding standard.
*
* USAGE
*
* icingacli test php style [options]
*
* OPTIONS
*
* --verbose Be more verbose.
* --build Enable reporting.
* --include Include only specific files. (Can be supplied multiple times.)
* --exclude Pattern to use for excluding files. (Can be supplied multiple times.)
*
* EXAMPLES
*
* icingacli test php style --verbose
* icingacli test php style --build
* icingacli test php style --include=path/to/your/file
* icingacli test php style --exclude=*someFile* --exclude=someOtherFile*
*/
public function styleAction()
{
// passthru(
// 'phpcs -p --standard=PSR2 --extensions=php --encoding=utf-8 -w -s
// --report-checkstyle=/tmp/style/bla library/Director/ application/
// run.php configuration.php'
// );
$test = new TestSuiteStyle();
$test->run();
return;
// TODO: obsolete:
if ($test->hasFailures()) {
$this->fail('Lint check failed');
} else {
Logger::info('Lint check succeeded');
}
$out = TestRunner::newTempFile();
$check = array(
'library/Director/',
'application/',
'configuration.php',
'run.php',
);
$cmd = sprintf(
"phpcs -p --standard=PSR2 --extensions=php --encoding=utf-8 -w -s --report-checkstyle=%s '%s'",
$out,
implode("' '", $check)
);
// TODO: Debug only:
`$cmd`;
echo $cmd . "\n";
echo $out ."\n";
echo file_get_contents($out);
unlink($out);
exit;
$build = $this->params->shift('build');
$include = (array) $this->params->shift('include', array());
$exclude = (array) $this->params->shift('exclude', array());
$phpcs = exec('which phpcs');
if (!file_exists($phpcs)) {
$this->fail(
'PHP_CodeSniffer not found. Please install PHP_CodeSniffer to be able to run code style tests.'
);
}
$options = array();
if ($this->isVerbose) {
$options[] = '-v';
}
if ($build) {
$options[] = '--report-checkstyle=' . $this->setupAndReturnReportDirectory();
}
if (!empty($exclude)) {
$options[] = '--ignore=' . join(',', $exclude);
}
$arguments = array_filter(
array_map(
function ($p) {
return realpath($p);
},
$include
)
);
if (empty($arguments)) {
$arguments = array(
realpath(__DIR__ . '/../../../../application'),
realpath(__DIR__ . '/../../../../library/Icinga')
);
}
chdir(realpath(__DIR__ . '/../..'));
passthru(
$phpcs . ' ' . join(
' ',
array_merge(
$options,
$this->phpcsDefaultParams,
$arguments,
$this->params->getAllStandalone()
)
)
);
}
protected function getBaseDir()
{
return dirname(dirname(__DIR__));
}
/**
* Setup the directory where to put report files and return its path
*
* @return string
*/
protected function setupAndReturnReportDirectory()
{
$path = '/tmp/test-devel';
if (!is_dir($path) && !@mkdir($path, 0755, true)) {
$this->fail("Could not create directory: $path");
}
return $path;
}
}

2
application/controllers/SyncruleController.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Director\Controllers;
use gipfl\IcingaWeb2\Widget\UnorderedList;
use Icinga\Module\Director\Web\Widget\UnorderedList;
use Icinga\Module\Director\ConfigDiff;
use Icinga\Module\Director\Db\Cache\PrefetchCache;
use Icinga\Module\Director\DirectorObject\Automation\ExportInterface;

1
application/forms/IcingaAddServiceForm.php
View File

@ -2,6 +2,7 @@
namespace Icinga\Module\Director\Forms;
use gipfl\IcingaWeb2\Link;
use Icinga\Module\Director\Web\Form\DirectorObjectForm;
use Icinga\Module\Director\Objects\IcingaHost;
use Icinga\Module\Director\Objects\IcingaService;

7
library/Director/Objects/IcingaObject.php
View File

@ -2359,12 +2359,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
);
}
$str = sprintf(
"define %s {\n$name",
$type,
$name
);
$str = "define $type {\n$name";
if ($this->isTemplate()) {
$str .= c1::renderKeyValue('register', '0');
}

4
library/Director/Objects/IcingaObjectField.php
View File

@ -11,9 +11,7 @@ abstract class IcingaObjectField extends DbObject
*
* @param Filter|string $filter
*
* @throws ProgrammingError
*
* @return self
* @return $this
* @codingStandardsIgnoreStart
*/
protected function setVar_filter($value)

2
library/Director/Objects/IcingaServiceSetAssignment.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Director\Objects;
class IcingaServiceAssignment extends IcingaObject
class IcingaServiceSetAssignment extends IcingaObject
{
protected $table = 'icinga_service_set_assignment';

2
library/Director/Web/Controller/TemplateController.php
View File

@ -12,11 +12,11 @@ use Icinga\Module\Director\Web\Table\ObjectsTable;
use Icinga\Module\Director\Web\Table\TemplatesTable;
use Icinga\Module\Director\Web\Table\TemplateUsageTable;
use Icinga\Module\Director\Web\Tabs\ObjectTabs;
use Icinga\Module\Director\Web\Widget\UnorderedList;
use ipl\Html\FormattedString;
use ipl\Html\Html;
use gipfl\IcingaWeb2\Link;
use gipfl\IcingaWeb2\CompatController;
use gipfl\IcingaWeb2\Widget\UnorderedList;
abstract class TemplateController extends CompatController
{

10
test/php/library/Director/PropertyModifier/PropertyModifierArrayElementByPositionTest.php
View File

@ -32,7 +32,7 @@ class PropertyModifierArrayElementByPositionTest extends BaseTestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testGettingFirstFailsForEmptyArray()
{
@ -61,7 +61,7 @@ class PropertyModifierArrayElementByPositionTest extends BaseTestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testGettingLastFailsForEmptyArray()
{
@ -90,7 +90,7 @@ class PropertyModifierArrayElementByPositionTest extends BaseTestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testGettingSpecificFailsForEmptyArray()
{
@ -103,7 +103,7 @@ class PropertyModifierArrayElementByPositionTest extends BaseTestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testGettingSpecificFailsForMissingValue()
{
@ -116,7 +116,7 @@ class PropertyModifierArrayElementByPositionTest extends BaseTestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testFailsForStrings()
{

4
test/php/library/Director/PropertyModifier/PropertyModifierParseURLTest.php
View File

@ -51,7 +51,7 @@ class PropertyModifierParseURLTest extends BaseTestCase
}
/**
* @expectedException Icinga\Exception\InvalidPropertyException
* @expectedException \Icinga\Exception\InvalidPropertyException
*/
public function testMissingComponentThrowsExceptionOnfailureFail()
{
@ -88,7 +88,7 @@ class PropertyModifierParseURLTest extends BaseTestCase
}
/**
* @expectedException Icinga\Exception\InvalidPropertyException
* @expectedException \Icinga\Exception\InvalidPropertyException
*/
public function testInvalidUrlThrowsExceptionOnfailureFail()
{