Merged fixes from 1.2.2 branch

README

@@ -55,7 +55,9 @@ If you want to hack PHPTAL (don't forget to send me patches), you will require:
         pear channel-discover pear.phing.info
         pear install phing/phing
 
-  - PHPUnit to run tests
+  - PHPUnit 3.4 to run tests
 
         pear channel-discover pear.phpunit.de
+		pear channel-discover pear.symfony-project.com
+		pear channel-discover components.ez.no
         pear install phpunit/PHPUnit

build.xml

@@ -30,10 +30,7 @@
 
   <target name="main" if="version" depends="versioncheck">
     <phingcall target="test"/>
-    <phingcall target="build"/>
-    <phingcall target="pear-package"/>
     <phingcall target="tar"/>
-    <phingcall target="tar-pear"/>
   </target>
 
   <target name="doc">
@@ -189,7 +186,7 @@ PHPTAL compiles templates to PHP for best performance and supports selective cac
     </pearpkg2>
   </target>
 
-  <target name="tar" depends="pear-package,build">
+  <target name="tar" depends="build">
     <property name="tarfile" value="${build.base.dir}/${pkgname}.tar.gz"/>
     <delete file="${tarfile}"/>
     <tar destfile="${tarfile}">
@@ -206,7 +203,7 @@ PHPTAL compiles templates to PHP for best performance and supports selective cac
     <exec command="find '${build.src.dir}' -name \*.php \! -exec egrep -q '^\?>$' {} \; -exec sh -c 'printf >>'{}' &quot;\n?>\n&quot;' \;"/>
   </target>
 
-  <target name="tar-pear" depends="tar">
+  <target name="tar-pear" depends="pear-package,tar">
     <phingcall target="pearify"/>
     <property name="tarfilepear" value="${build.base.dir}/${pkgname}-pear.tar.gz"/>
     <delete file="${tarfilepear}"/>

phpunit.xml

@@ -1,4 +1,13 @@
-<phpunit
+<!--
+
+This is PHPUnit configuration file. Install PHPUnit:
+
+http://www.phpunit.de/manual/3.5/en/installation.html
+
+and run "phpunit" command in this directory. It will run all tests,
+ensuring that your copy of PHPTAL works correctly.
+
+--><phpunit
     bootstrap="./tests/config.php"
     backupGlobals="false"
     backupStaticAttributes="false"

tools/phptal_lint.php

@@ -1,5 +1,22 @@
 #!/usr/bin/env php
 <?php
+/**
+ * This is lint tool for checking corectness of template syntax.
+ * 
+ * You can run it on all your templates after upgrade of PHPTAL to check
+ * for potential incompatibilities.
+ * 
+ * Another good idea is to use it as SVN hook to ensure that you
+ * commit only good templates to your repository.
+ * 
+ * See more:
+ * http://phptal.org/wiki/doku.php/lint
+ * 
+ * or run
+ * 
+ * ./phptal_lint.php -h
+ * 
+ */
 
 $lint = new PHPTAL_Lint_CLI();
 $lint->main();