From 8c6333dec66222a5d83faabfc5af22d646986660 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Sun, 18 Nov 2012 20:55:50 +0000
Subject: removed prado customized tasks already existing in phing new ping
 targets: lint and lint-demos

---
 build.xml                                         |  75 ++++++++---
 buildscripts/phing/tasks/PhpLintTask.php          |  82 ------------
 buildscripts/phing/tasks/XmlLintTask.php          | 102 ---------------
 buildscripts/phing/tasks/ZendCodeAnalyzerTask.php | 151 ----------------------
 4 files changed, 58 insertions(+), 352 deletions(-)
 delete mode 100644 buildscripts/phing/tasks/PhpLintTask.php
 delete mode 100644 buildscripts/phing/tasks/XmlLintTask.php
 delete mode 100644 buildscripts/phing/tasks/ZendCodeAnalyzerTask.php

diff --git a/build.xml b/build.xml
index 794328e9..cd53f89d 100644
--- a/build.xml
+++ b/build.xml
@@ -135,7 +135,9 @@
     where &lt;target name&gt; can be one of the following:
 
     For all PRADO developers:
-    - test    : run unit tests (results are under /build/test-reports);
+    - test       : run unit tests (results are under /build/test-reports);
+    - lint       : run lint on framework
+    - lint-demos : run lint on demos
 
     For PRADO release manager:
     - dist    : create release files;
@@ -478,9 +480,10 @@ the PRADO distribution:
     <copy file="${build.src.dir}/HISTORY" tofile="${build.snapshot.dir}/changelog-latest.txt" />
   </target>
 
-<!--
   <taskdef name="phplint" classname="PhpLintTask" classpath="buildscripts/phing/tasks"/>
   <taskdef name="xmllint" classname="XmlLintTask" classpath="buildscripts/phing/tasks"/>
+  <taskdef name="jslint" classname="JslLintTask" classpath="buildscripts/phing/tasks"/>
+<!--
   <taskdef name="analyze" classname="ZendCodeAnalyzerTask" classpath="buildscripts/phing/tasks"/>
   <taskdef name="pear-package" classname="BuildPradoPEARPackageTask" classpath="buildscripts/phing/tasks"/>
 
@@ -557,34 +560,72 @@ the PRADO distribution:
     </if>
   </target>
 
-  <target name="lint" description="Check syntax of PHP source files">
-    <phplint>
-      <fileset refid="src"/>
+-->
+  <target name="lint" description="Check syntax of source files">
+    <echo>Checking php files..</echo>
+    <phplint deprecatedAsError="true" >
+      <fileset dir="framework">
+        <exclude name="**/.svn"/>
+        <exclude name="**/*.bak"/>
+        <exclude name="**/*~"/>
+        <include name="**/*.php"/>
+      </fileset>
     </phplint>
-  </target>
 
-  <target name="lint-demos" description="Check syntax of demo files and configuration files">
-    <echo>Validate application configuration</echo>
-    <xmllint schema="${application.xsd}">
-      <fileset dir="demos">
+    <echo>Checking js files..</echo>
+    <jsllint>
+      <fileset dir="framework">
         <exclude name="**/.svn"/>
-        <include name="**/application.xml"/>
+        <exclude name="**/*.bak"/>
+        <exclude name="**/*~"/>
+        <include name="**/*.js"/>
       </fileset>
-    </xmllint>
-    <echo>Validate page configuration</echo>
-    <xmllint schema="${config.xsd}">
-      <fileset dir="demos">
+    </jsllint>
+
+    <echo>Checking xml files..</echo>
+    <xmllint>
+      <fileset dir="framework">
         <exclude name="**/.svn"/>
-        <include name="**/config.xml"/>
+        <exclude name="**/*.bak"/>
+        <exclude name="**/*~"/>
+        <include name="**/*.xml"/>
       </fileset>
     </xmllint>
-    <phplint>
+  </target>
+
+  <target name="lint-demos" description="Check syntax of demo files">
+    <echo>Checking php files..</echo>
+    <phplint deprecatedAsError="true" >
       <fileset dir="demos">
         <exclude name="**/.svn"/>
+        <exclude name="**/*.bak"/>
+        <exclude name="**/*~"/>
         <include name="**/*.php"/>
       </fileset>
     </phplint>
+
+    <echo>Checking js files..</echo>
+    <jsllint>
+      <fileset dir="demos">
+        <exclude name="**/.svn"/>
+        <exclude name="**/*.bak"/>
+        <exclude name="**/*~"/>
+        <include name="**/*.js"/>
+      </fileset>
+    </jsllint>
+
+    <echo>Checking xml files..</echo>
+    <xmllint>
+      <fileset dir="demos">
+        <exclude name="**/.svn"/>
+        <exclude name="**/*.bak"/>
+        <exclude name="**/*~"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </xmllint>
   </target>
+
+<!--
   <target name="build-pear-package">
     <echo>Preparing files for PEAR package...</echo>
     <delete dir="${build.pear.dir}"/>
diff --git a/buildscripts/phing/tasks/PhpLintTask.php b/buildscripts/phing/tasks/PhpLintTask.php
deleted file mode 100644
index 37c19de1..00000000
--- a/buildscripts/phing/tasks/PhpLintTask.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-require_once 'phing/Task.php';
-
-/**
- * A PHP lint task. Checking syntax of one or more PHP source file.
- *
- * @author   Knut Urdalen <knut.urdalen@gmail.com>
- * @package  phing.tasks.ext
- */
-class PhpLintTask extends Task {
-
-  protected $file;  // the source file (from xml attribute)
-  protected $filesets = array(); // all fileset objects assigned to this task
-
-  /**
-   * File to be performed syntax check on
-   * @param PhingFile $file
-   */
-  public function setFile(PhingFile $file) {
-    $this->file = $file;
-  }
-  
-  /**
-   * Nested creator, creates a FileSet for this task
-   *
-   * @return FileSet The created fileset object
-   */
-  function createFileSet() {
-    $num = array_push($this->filesets, new FileSet());
-    return $this->filesets[$num-1];
-  }
-
-  /**
-   * Execute lint check against PhingFile or a FileSet
-   */
-  public function main() {
-    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->lint($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->lint($dir.DIRECTORY_SEPARATOR.$file);
-	}
-      }
-    }
-  }
-
-  /**
-   * Performs the actual syntax check
-   *
-   * @param string $file
-   * @return void
-   */
-  protected function lint($file) {
-    $command = 'php -l ';
-    if(file_exists($file)) {
-      if(is_readable($file)) {
-	$message = array();
-	exec($command.$file, $message);
-	if(!preg_match('/^No syntax errors detected/', $message[0])) {
-	  $this->log($message[1], PROJECT_MSG_ERR);
-	} else {
-	  $this->log($file.': No syntax errors detected', PROJECT_MSG_INFO);
-	}
-      } else {
-	throw new BuildException('Permission denied: '.$file);
-      }
-    } else {
-      throw new BuildException('File not found: '.$file);
-    }
-  }
-}
-
-?>
\ No newline at end of file
diff --git a/buildscripts/phing/tasks/XmlLintTask.php b/buildscripts/phing/tasks/XmlLintTask.php
deleted file mode 100644
index 0ed4f189..00000000
--- a/buildscripts/phing/tasks/XmlLintTask.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-require_once 'phing/Task.php';
-
-/**
- * A XML lint task. Checking syntax of one or more XML source file against an XML Schema using the DOM extension.
- *
- * @author   Knut Urdalen <knut.urdalen@gmail.com>
- * @package  phing.tasks.ext
- */
-class XmlLintTask extends Task {
-
-  protected $file;  // the source file (from xml attribute)
-  protected $schema; // the schema file (from xml attribute)
-  protected $filesets = array(); // all fileset objects assigned to this task
-
-  /**
-   * File to be performed syntax check on
-   * @param PhingFile $file
-   */
-  public function setFile(PhingFile $file) {
-    $this->file = $file;
-  }
-
-  public function setSchema(PhingFile $schema) {
-    $this->schema = $schema;
-  }
-  
-  /**
-   * Nested creator, creates a FileSet for this task
-   *
-   * @return FileSet The created fileset object
-   */
-  function createFileSet() {
-    $num = array_push($this->filesets, new FileSet());
-    return $this->filesets[$num-1];
-  }
-
-  /**
-   * Execute lint check against PhingFile or a FileSet
-   */
-  public function main() {
-    if(!isset($this->schema)) {
-      throw new BuildException("Missing attribute 'schema'");
-    }
-    $schema = $this->schema->getPath();
-    if(!file_exists($schema)) {
-      throw new BuildException("File not found: ".$schema);
-    }
-    if(!isset($this->file) and count($this->filesets) == 0) {
-      throw new BuildException("Missing either a nested fileset or attribute 'file' set");
-    }
-
-    set_error_handler(array($this, 'errorHandler'));
-    if($this->file instanceof PhingFile) {
-      $this->lint($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->lint($dir.DIRECTORY_SEPARATOR.$file);
-	}
-      }
-    }
-    restore_error_handler();
-  }
-
-  /**
-   * Performs validation
-   *
-   * @param string $file
-   * @return void
-   */
-  protected function lint($file) {
-    if(file_exists($file)) {
-      if(is_readable($file)) {
-	$dom = new DOMDocument();
-	$dom->load($file);
-	if($dom->schemaValidate($this->schema->getPath())) {
-	  $this->log($file.' validated', PROJECT_MSG_INFO);
-	} else {
-	  $this->log($file.' fails to validate (See messages above)', PROJECT_MSG_ERR);
-	}
-      } else {
-	throw new BuildException('Permission denied: '.$file);
-      }
-    } else {
-      throw new BuildException('File not found: '.$file);
-    }
-  }
-
-  public function errorHandler($level, $message, $file, $line, $context) {
-    $matches = array();
-    preg_match('/^.*\(\): (.*)$/', $message, $matches);
-    $this->log($matches[1], PROJECT_MSG_ERR);
-  }
-
-}
-
-?>
\ No newline at end of file
diff --git a/buildscripts/phing/tasks/ZendCodeAnalyzerTask.php b/buildscripts/phing/tasks/ZendCodeAnalyzerTask.php
deleted file mode 100644
index b6eafc02..00000000
--- a/buildscripts/phing/tasks/ZendCodeAnalyzerTask.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-require_once 'phing/Task.php';
-
-/**
- * ZendCodeAnalyzerTask analyze PHP source code using the ZendCodeAnalyzer included in Zend Studio 5.1
- * 
- * Available warnings:
- * 
- * zend-error                 var: Deprecated. Please use the public/private/protected modifiers
- * var-arg-unused             Function argument 'parser' is never used.
- * var-once                   Variable 'comment' encountered only once. May be a typo?
- * var-value-unused           Value assigned to variable 'args' is never used
- * return-empty-val           Function 'set_object' has both empty return and return with value.
- * if-if-else                 In if-if-else construction else relates to the closest if. Use braces to make the code clearer.
- * bool-assign                Assignment seen where boolean expression is expected. Did you mean '==' instead of '='?
- * var-use-before-def         Variable 'matches' is used before it was assigned.
- * empty-cond                 Condition without a body
- * var-ref-notmodified        Function parameter 'parser' is passed by reference but never modified. Consider passing by value.
- * include-var                include/require with user-accessible variable can be dangerous. Consider using constant instead.
- * expr-unused                Expression result is never used
- * bad-escape                 Bad escape sequence: \/, did you mean \\/?
- * var-use-before-def-global  Global variable 'argv' is used without being assigned. You are probably relying on register_globals feature of PHP. Note that this feature is off by default.
- * call-time-ref              Call-time reference is deprecated. Define function as accepting parameter by reference instead.
- * return-noref               Function 'loadlintschema' returns reference but the value is not assigned by reference. Maybe you meant '=&' instead of '='?
- * unreach-code               Unreachable code in function 'loginUser'.
- * var-global-unused          Global variable 'fixErrors' is defined but never used.
- * break-depth                Break/continue with depth more than current nesting level. 
- * 
- * @author   Knut Urdalen <knut.urdalen@gmail.com>
- * @package  phing.tasks.ext
- */
-class ZendCodeAnalyzerTask extends Task {
-
-	protected $analyzerPath = ""; // Path to ZendCodeAnalyzer binary
-  protected $file = "";  // the source file (from xml attribute)
-  protected $filesets = array(); // all fileset objects assigned to this task
-	protected $warnings = array();
-	protected $counter = 0;
-	protected $disable = array();
-	protected $enable = array();
-  
-  /**
-   * 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. Seperate warning levels with ','
-   *
-   * @param string $disable
-   */
-  public function setDisable($disable) {
-  	$this->disable = explode(",", $disable);
-  }
-  
-  /**
-   * Enable warning levels. Seperate warning levels with ','
-   *
-   * @param string $enable
-   */
-  public function setEnable($enable) {
-  	$this->enable = explode(",", $enable);
-  }
-  
-  /**
-   * Nested creator, creates a FileSet for this task
-   *
-   * @return FileSet The created fileset object
-   */
-  function createFileSet() {
-    $num = array_push($this->filesets, new FileSet());
-    return $this->filesets[$num-1];
-  }
-
-  /**
-   * 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
-   * @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);
-      	}
-      } else {
-      	throw new BuildException('Permission denied: '.$file);
-      }
-    } else {
-      throw new BuildException('File not found: '.$file);
-    }
-  }
-}
-
-?>
\ No newline at end of file
-- 
cgit v1.2.3