backported all related changes up to 3229 to branch/3.2

1 files changed, 61 insertions, 19 deletions

diff --git a/build.xml b/build.xml
index cac1e8d9..cd53f89d 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,8 @@
 <!--  <taskdef name="prado-pear" classname="PradoPearTask" classpath="buildscripts/phing/tasks"/>-->

   <taskdef name="prado-quickstart-index" classname="QuickstartIndexTask" classpath="buildscripts/phing/tasks"/>

   <taskdef name="prado-api-index" classname="ManualIndexTask" classpath="buildscripts/phing/tasks"/>

-<!--  <taskdef name="prado-test" classname="PradoTestTask" classpath="buildscripts/phing/tasks"/>-->

+  <taskdef name="prado-test" classname="PradoTestTask" classpath="buildscripts/phing/tasks"/>

+  <taskdef name="phpunitreporttask" classname="PhpUnitReportTask" classpath="buildscripts/phing/tasks"/>

   <taskdef name="compact-package" classname="PradoPackageTask" classpath="buildscripts/phing/tasks"/>

   <taskdef name="prado-quickstart-docs" classname="PradoQuickStartDocs" classpath="buildscripts/phing/tasks" />

 

@@ -134,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;

@@ -460,7 +463,7 @@ the PRADO distribution:
       </batchtest>

       <formatter type="xml" todir="${build.test.dir}" outfile="unit-tests.xml"/>

     </prado-test>

-    <phpunit2report infile="${build.test.dir}/unit-tests.xml" format="frames" styledir="buildscripts/phing/style" todir="${build.test.dir}"/>

+    <phpunitreporttask infile="${build.test.dir}/unit-tests.xml" format="frames" todir="${build.test.dir}"/>

   </target>

 

   <target name="snapshot" depends="rebuild">

@@ -477,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"/>

 

@@ -556,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}"/>