From 0f04030f269365182516ee80c46d1af62715de03 Mon Sep 17 00:00:00 2001 From: siad007 Date: Sat, 15 Feb 2020 23:46:09 +0100 Subject: [PATCH 1/2] Moved zendcodeanalyser task --- classes/phing/tasks/defaults.properties | 1 - .../phing/tasks/ext/ZendCodeAnalyzerTask.php | 199 ------------------ composer.json | 1 + composer.lock | 47 ++++- custom.task.properties | 1 + 5 files changed, 48 insertions(+), 201 deletions(-) delete mode 100644 classes/phing/tasks/ext/ZendCodeAnalyzerTask.php diff --git a/classes/phing/tasks/defaults.properties b/classes/phing/tasks/defaults.properties index 7aebea49ce..37cbdb7f2f 100644 --- a/classes/phing/tasks/defaults.properties +++ b/classes/phing/tasks/defaults.properties @@ -121,7 +121,6 @@ phpunitreport=phing.tasks.ext.phpunit.PHPUnitReportTask phplint=phing.tasks.ext.PhpLintTask xmllint=phing.tasks.ext.XmlLintTask analyze=phing.tasks.ext.ZendCodeAnalyzerTask -zendcodeanalyzer=phing.tasks.ext.ZendCodeAnalyzerTask jshint=phing.tasks.ext.JsHintTask jsllint=phing.tasks.ext.JslLintTask manifest=phing.tasks.ext.ManifestTask diff --git a/classes/phing/tasks/ext/ZendCodeAnalyzerTask.php b/classes/phing/tasks/ext/ZendCodeAnalyzerTask.php deleted file mode 100644 index 071702cd0a..0000000000 --- a/classes/phing/tasks/ext/ZendCodeAnalyzerTask.php +++ /dev/null @@ -1,199 +0,0 @@ -. - */ - -/** - * ZendCodeAnalyzerTask analyze PHP source code using the ZendCodeAnalyzer included in Zend Studio 5.1 - * - * Available warnings: - * zend-error - %s(line %d): %s - * oneline-comment - One-line comment ends with tag. - * bool-assign - Assignment seen where boolean expression is expected. Did you mean '==' instead of '='? - * bool-print - Print statement used when boolean expression is expected. - * bool-array - Array used when boolean expression is expected. - * bool-object - Object used when boolean expression is expected. - * call-time-ref - Call-time reference is deprecated. Define function as accepting parameter by reference instead. - * if-if-else - In if-if-else construction else relates to the closest if. Use braces to make the code clearer. - * define-params - define() requires two or three parameters. - * define-const - First parameter for define() should be string. Maybe you forgot quotes? - * break-var - Break/continue with variable is dangerous - break level can be out of scope. - * break-depth - Break/continue with depth more than current nesting level. - * var-once - Variable '%s' encountered only once. May be a typo? - * var-arg-unused - Function argument '%s' is never used. - * var-global-unused - Global variable '%s' is defined but never used. - * var-use-before-def - Variable '%s' is used before it was assigned. - * var-use-before-def-global - Global variable '%s' is used without being assigned. You are probably relying on register_globals feature of PHP. Note that this feature is off by default. - * var-no-global - PHP global variable '%s' is used as local. Maybe you wanted to define '%s' as global? - * var-value-unused - Value assigned to variable '%s' is never used - * var-ref-notmodified - Function parameter '%s' is passed by reference but never modified. Consider passing by value. - * return-empty-val - Function '%s' has both empty return and return with value. - * return-empty-used - Function '%s' has empty return but return value is used. - * return-noref - Function '%s' returns reference but the value is not assigned by reference. Maybe you meant '=&' instead of '='? - * return-end-used - Control reaches the end of function '%s'(file %s, line %d) but return value is used. - * sprintf-miss-args - Missing arguments for sprintf: format reqires %d arguments but %d are supplied. - * sprintf-extra-args - Extra arguments for sprintf: format reqires %d arguments but %d are supplied. - * unreach-code - Unreachable code in function '%s'. - * include-var - include/require with user-accessible variable can be dangerous. Consider using constant instead. - * non-object - Variable '%s' used as object, but has different type. - * bad-escape - Bad escape sequence: \%c, did you mean \\%c? - * empty-cond - Condition without a body - * expr-unused - Expression result is never used - * - * @author Knut Urdalen - * @package phing.tasks.ext - */ -class ZendCodeAnalyzerTask extends Task -{ - use FileSetAware; - - protected $analyzerPath = ""; // Path to ZendCodeAnalyzer binary - protected $file = ""; // the source file (from xml attribute) - protected $counter = 0; - protected $disable = []; - protected $enable = []; - - private $haltonwarning = false; - - /** - * File to be analyzed - * - * @param PhingFile $file - */ - public function setFile(PhingFile $file) - { - $this->file = $file; - } - - /** - * Path to ZendCodeAnalyzer binary - * - * @param string $analyzerPath - */ - public function setAnalyzerPath($analyzerPath) - { - $this->analyzerPath = $analyzerPath; - } - - /** - * Disable warning levels. Separate warning levels with ',' - * - * @param string $disable - */ - public function setDisable($disable) - { - $this->disable = explode(",", $disable); - } - - /** - * Enable warning levels. Separate warning levels with ',' - * - * @param string $enable - */ - public function setEnable($enable) - { - $this->enable = explode(",", $enable); - } - - /** - * Sets the haltonwarning flag - * - * @param boolean $value - */ - public function setHaltonwarning($value) - { - $this->haltonwarning = $value; - } - - /** - * Analyze against PhingFile or a FileSet - */ - public function main() - { - if (!isset($this->analyzerPath)) { - throw new BuildException("Missing attribute 'analyzerPath'"); - } - - if (!isset($this->file) and count($this->filesets) == 0) { - throw new BuildException("Missing either a nested fileset or attribute 'file' set"); - } - - if ($this->file instanceof PhingFile) { - $this->analyze($this->file->getPath()); - } else { // process filesets - $project = $this->getProject(); - - foreach ($this->filesets as $fs) { - $ds = $fs->getDirectoryScanner($project); - $files = $ds->getIncludedFiles(); - $dir = $fs->getDir($this->project)->getPath(); - - foreach ($files as $file) { - $this->analyze($dir . DIRECTORY_SEPARATOR . $file); - } - } - } - - $this->log("Number of findings: " . $this->counter, Project::MSG_INFO); - } - - /** - * Analyze file - * - * @param string $file - * @throws BuildException - * @return void - */ - protected function analyze($file) - { - if (file_exists($file)) { - if (is_readable($file)) { - // Construct shell command - $cmd = $this->analyzerPath . " "; - - foreach ($this->enable as $enable) { // Enable warning levels - $cmd .= " --enable $enable "; - } - - foreach ($this->disable as $disable) { // Disable warning levels - $cmd .= " --disable $disable "; - } - - $cmd .= "$file 2>&1"; - - // Execute command - $result = shell_exec($cmd); - $result = explode("\n", $result); - - for ($i = 2, $size = count($result); $i < ($size - 1); $i++) { - $this->counter++; - $this->log($result[$i], Project::MSG_WARN); - } - - $total = count($result) - 3; - - if ($total > 0 && $this->haltonwarning) { - throw new BuildException('zendcodeanalyzer detected ' . $total . ' warning' . ($total > 1 ? 's' : '') . ' in ' . $file); - } - } else { - throw new BuildException('Permission denied: ' . $file); - } - } else { - throw new BuildException('File not found: ' . $file); - } - } -} diff --git a/composer.json b/composer.json index 00eb86d90c..951035d379 100644 --- a/composer.json +++ b/composer.json @@ -39,6 +39,7 @@ "phing/task-phkpackage": "dev-master", "phing/task-ioncube": "dev-master", "phing/task-smarty": "dev-master", + "phing/task-zendcodeanalyser": "dev-master", "sebastian/version": "^2.0", "symfony/console": "^2.8 || ^3.1 || ^4.0 || ^5.0", "symfony/yaml": "^2.8 || ^3.1 || ^4.0 || ^5.0", diff --git a/composer.lock b/composer.lock index 2c60d84e98..8951ad2c6a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6d7df4793dfad57fec565da6822aff2e", + "content-hash": "e4b70173750597498b6e26416b0ee797", "packages": [ { "name": "mehr-als-nix/parallel", @@ -436,6 +436,50 @@ "description": "A task for generating output by using Smarty.", "time": "2020-02-15T21:30:17+00:00" }, + { + "name": "phing/task-zendcodeanalyser", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/phingofficial/task-zendcodeanalyser.git", + "reference": "9dde83ec8981c41b19dfa152a609ebe855300315" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phingofficial/task-zendcodeanalyser/zipball/9dde83ec8981c41b19dfa152a609ebe855300315", + "reference": "9dde83ec8981c41b19dfa152a609ebe855300315", + "shasum": "" + }, + "require": { + "php": ">= 7.1" + }, + "require-dev": { + "phing/phing": "3.0.x-dev" + }, + "type": "phing-extension", + "extra": { + "phing-custom-taskdefs": { + "zendcodeanalyser": "Phing\\Tasks\\Ext\\ZendCodeAnalyzerTask" + } + }, + "autoload": { + "psr-4": { + "Phing\\Tasks\\Ext\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-only" + ], + "authors": [ + { + "name": "Siad Ardroumli", + "email": "siad.ardroumli@gmail.com" + } + ], + "description": "The ZendCodeAnalyzerTask analyze PHP source files using the Zend Code Analyzer tool that ships with all versions of Zend Studio.", + "time": "2020-02-15T22:41:26+00:00" + }, { "name": "psr/container", "version": "1.0.0", @@ -4228,6 +4272,7 @@ "phing/task-phkpackage": 20, "phing/task-ioncube": 20, "phing/task-smarty": 20, + "phing/task-zendcodeanalyser": 20, "pear/net_growl": 20, "pear/versioncontrol_git": 20 }, diff --git a/custom.task.properties b/custom.task.properties index e1d8b7df4b..2b7647e669 100644 --- a/custom.task.properties +++ b/custom.task.properties @@ -33,3 +33,4 @@ phkpackage=Phing\Tasks\Ext\PhkPackageTask ioncubeencoder=Phing\Tasks\Ext\IoncubeEncoderTask ioncubelicense=Phing\Tasks\Ext\IoncubeLicenseTask smarty=Phing\Tasks\Ext\SmartyTask +zendcodeanalyser=Phing\Tasks\Ext\ZendCodeAnalyzerTask From 72263a330bd3763a599a7ac84fbbb3618db121a5 Mon Sep 17 00:00:00 2001 From: siad007 Date: Sun, 16 Feb 2020 00:00:43 +0100 Subject: [PATCH 2/2] removed alias --- classes/phing/tasks/defaults.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/phing/tasks/defaults.properties b/classes/phing/tasks/defaults.properties index 37cbdb7f2f..2a069c8d53 100644 --- a/classes/phing/tasks/defaults.properties +++ b/classes/phing/tasks/defaults.properties @@ -120,7 +120,6 @@ phpunit=phing.tasks.ext.phpunit.PHPUnitTask phpunitreport=phing.tasks.ext.phpunit.PHPUnitReportTask phplint=phing.tasks.ext.PhpLintTask xmllint=phing.tasks.ext.XmlLintTask -analyze=phing.tasks.ext.ZendCodeAnalyzerTask jshint=phing.tasks.ext.JsHintTask jsllint=phing.tasks.ext.JslLintTask manifest=phing.tasks.ext.ManifestTask