composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 08:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

👌 peer review

Browse Source 
mostly coding convention,

thanks @molkobain
This commit is contained in:
bruno DA SILVA
2020-01-07 15:34:27 +01:00
parent 2043010aad
commit 838c4f123c
7 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-config/config.php
View File

@@ -43,11 +43,11 @@ function TestConfig($sContents, $oP)
{
/// 1- first check if there is no malicious code
$oiTopConfigValidator = new iTopConfigAstValidator();
$oiTopConfigValidator->validate($sContents);
$oiTopConfigValidator->Validate($sContents);
/// 2 - only after we are sure that there is no malicious cade, we can perform a syntax check!
$oiTopConfigValidator = new iTopConfigSyntaxValidator();
$oiTopConfigValidator->validate($sContents, true);
$oiTopConfigValidator->Validate($sContents, true);
}
/**

2
datamodels/2.x/itop-config/src/Validator/iTopConfigAstValidator.php
View File

@@ -21,7 +21,7 @@ class iTopConfigAstValidator
*
* @throws \Exception
*/
public function validate($sConfig)
public function Validate($sConfig)
{
$oParser = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);

8
datamodels/2.x/itop-config/src/Validator/iTopConfigSyntaxValidator.php
View File

@@ -7,12 +7,6 @@
namespace Combodo\iTop\Config\Validator;
use PhpParser\NodeTraverser;
use PhpParser\NodeVisitor;
use PhpParser\Parser;
use PhpParser\ParserFactory;
class iTopConfigSyntaxValidator
{
/**
@@ -21,7 +15,7 @@ class iTopConfigSyntaxValidator
* @param $sConfig
* @param $bAllowUnsecure
*/
public function validate($sConfig, $bAllowUnsecure)
public function Validate($sConfig, $bAllowUnsecure)
{
exec('php -v', $aOutput, $iReturnVar);
$bCanRunCli = ($iReturnVar == 0);