From f592cf25dbfff17e48e026798e7a7cf3b9c92d66 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 00:58:13 +0200 Subject: [PATCH 1/8] Added loglevel attribute to the phpcs task. --- classes/phing/tasks/ext/PhpCSTask.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/phing/tasks/ext/PhpCSTask.php b/classes/phing/tasks/ext/PhpCSTask.php index d8e8b3d5a5..c0d76ab1c2 100644 --- a/classes/phing/tasks/ext/PhpCSTask.php +++ b/classes/phing/tasks/ext/PhpCSTask.php @@ -25,6 +25,8 @@ */ class PhpCSTask extends Task { + use LogLevelAware; + /** * A php source code filename or directory * @@ -123,7 +125,7 @@ public function main() $exe->setTaskName($this->getTaskName()); $exe->setExecutable($this->bin); $exe->setCheckreturn($this->checkreturn); - $exe->setLevel('info'); + $exe->setLevel($this->logLevel); $exe->setExecutable($toExecute->getExecutable()); $exe->createArg()->setLine(implode(' ', $toExecute->getArguments())); $exe->main(); From bfb689251598b112c6905ac1da91d4d20b1967e2 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 01:24:36 +0200 Subject: [PATCH 2/8] Update LogLevelAware.php --- classes/phing/tasks/system/element/LogLevelAware.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/phing/tasks/system/element/LogLevelAware.php b/classes/phing/tasks/system/element/LogLevelAware.php index 9d9c1a5b3a..2ea6f8915c 100644 --- a/classes/phing/tasks/system/element/LogLevelAware.php +++ b/classes/phing/tasks/system/element/LogLevelAware.php @@ -25,6 +25,7 @@ trait LogLevelAware { protected $logLevel = Project::MSG_VERBOSE; + protected $logLevelName = 'verbose'; /** * Set level of log messages generated (default = verbose) @@ -36,18 +37,23 @@ public function setLevel($level): void switch ($level) { case 'error': $this->logLevel = Project::MSG_ERR; + $this->logLevelName = 'error'; break; case 'warning': $this->logLevel = Project::MSG_WARN; + $this->logLevelName = 'warning'; break; case 'info': $this->logLevel = Project::MSG_INFO; + $this->logLevelName = 'info'; break; case 'verbose': $this->logLevel = Project::MSG_VERBOSE; + $this->logLevelName = 'verbose'; break; case 'debug': $this->logLevel = Project::MSG_DEBUG; + $this->logLevelName = 'debug'; break; default: throw new BuildException( From b82ceed3753f294d6b470ea805986a46e8a18536 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 01:25:09 +0200 Subject: [PATCH 3/8] Update PhpCSTask.php --- classes/phing/tasks/ext/PhpCSTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/phing/tasks/ext/PhpCSTask.php b/classes/phing/tasks/ext/PhpCSTask.php index c0d76ab1c2..4c154ce0bc 100644 --- a/classes/phing/tasks/ext/PhpCSTask.php +++ b/classes/phing/tasks/ext/PhpCSTask.php @@ -125,7 +125,7 @@ public function main() $exe->setTaskName($this->getTaskName()); $exe->setExecutable($this->bin); $exe->setCheckreturn($this->checkreturn); - $exe->setLevel($this->logLevel); + $exe->setLevel($this->logLevelName); $exe->setExecutable($toExecute->getExecutable()); $exe->createArg()->setLine(implode(' ', $toExecute->getArguments())); $exe->main(); From c4cdc61f5819f6fef96ef9464b99e8b311d33c96 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 02:29:34 +0200 Subject: [PATCH 4/8] Setted LogLevel to info as default --- classes/phing/tasks/ext/PhpCSTask.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/phing/tasks/ext/PhpCSTask.php b/classes/phing/tasks/ext/PhpCSTask.php index 4c154ce0bc..f7fd6e7b9f 100644 --- a/classes/phing/tasks/ext/PhpCSTask.php +++ b/classes/phing/tasks/ext/PhpCSTask.php @@ -27,6 +27,8 @@ class PhpCSTask extends Task { use LogLevelAware; + protected $logLevelName = 'info'; + /** * A php source code filename or directory * From 881e63fe9ba252429c6f69e996be467ee210322a Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 02:36:43 +0200 Subject: [PATCH 5/8] Update PhpCSTask.php --- classes/phing/tasks/ext/PhpCSTask.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/phing/tasks/ext/PhpCSTask.php b/classes/phing/tasks/ext/PhpCSTask.php index f7fd6e7b9f..1e7bf4d879 100644 --- a/classes/phing/tasks/ext/PhpCSTask.php +++ b/classes/phing/tasks/ext/PhpCSTask.php @@ -27,8 +27,6 @@ class PhpCSTask extends Task { use LogLevelAware; - protected $logLevelName = 'info'; - /** * A php source code filename or directory * @@ -54,6 +52,7 @@ class PhpCSTask extends Task public function __construct() { $this->cmd = new Commandline(); + $this->logLevelName = 'info'; parent::__construct(); } From bbcaefe8d32cbb23b1471c44d8fdeba649b4b857 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 12:52:35 +0200 Subject: [PATCH 6/8] Added documentation --- docs/guide/en/source/appendixes/optionaltasks.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/guide/en/source/appendixes/optionaltasks.xml b/docs/guide/en/source/appendixes/optionaltasks.xml index fb98aa7113..9fad68a5a4 100644 --- a/docs/guide/en/source/appendixes/optionaltasks.xml +++ b/docs/guide/en/source/appendixes/optionaltasks.xml @@ -8752,6 +8752,21 @@ Note that you can omit both startpoint and track attributes in this case false No + + level + String + Set the log level of generated messages. + Change this to verbose, + if you only want output in verbose mode for example. + Valid log levels are one of + debug, + info, + verbose, + warning or + error + info + No + From 4cf4f32c58ba57ee4648e87b1881ccfe976c9ff3 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 13:46:38 +0200 Subject: [PATCH 7/8] Update phing-grammar.rng --- etc/phing-grammar.rng | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/etc/phing-grammar.rng b/etc/phing-grammar.rng index e2eb9ffce7..cb4db4c234 100644 --- a/etc/phing-grammar.rng +++ b/etc/phing-grammar.rng @@ -5043,6 +5043,17 @@ + + + + error + warning + info + verbose + debug + + + From 5fbe2066f3b38aa10287a4f353e62444791b3e3e Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 28 Sep 2019 13:54:32 +0200 Subject: [PATCH 8/8] Update build.xml --- test/etc/tasks/ext/phpcs/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/etc/tasks/ext/phpcs/build.xml b/test/etc/tasks/ext/phpcs/build.xml index fd0bd3f906..72b97cc1ea 100644 --- a/test/etc/tasks/ext/phpcs/build.xml +++ b/test/etc/tasks/ext/phpcs/build.xml @@ -35,6 +35,6 @@ - +