diff --git a/.gitignore b/.gitignore
index 154553d2..627f0f4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ build
/doc/temp/
/docs/
/tools/phpunit
+/tools/jsonlint
+/tools/phpdoc
+/tools/phpdoc.php
+/tools/validate-json
diff --git a/COPYING b/LICENSE
similarity index 100%
rename from COPYING
rename to LICENSE
diff --git a/Makefile b/Makefile
index af8fa2c0..5f9393ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,12 @@
.PHONY: all
-all::
- phing
+all::test docs doc
test::
- phing test
-
-tar::
- phing tar
+ tools/phpunit
docs::
- phing doc
+ tools/phpdoc -d classes -t docs -p
doc::
$(MAKE) $(MFLAGS) -C doc
diff --git a/README.md b/README.md
index 9a5f0c29..d6873796 100644
--- a/README.md
+++ b/README.md
@@ -1,64 +1,51 @@
# PHPTAL - Template Attribute Language for PHP
-Master: [](http://travis-ci.org/pornel/PHPTAL)
+[](https://packagist.org/packages/phptal/phptal)
+[](LICENSE)
+[](https://travis-ci.org/phptal/PHPTAL)
+[](https://scrutinizer-ci.com/g/phptal/PHPTAL/)
-Usage requirements
-==================
+Requirements
+============
To use PHPTAL in your projects, you will only require PHP 5.1.2 or later.
-If you want to use the builtin internationalisation system (I18N) the gettext extension must be compiled into PHP (`--with-gettext`).
+If you want to use the builtin internationalisation system (I18N), the php-gettext extension must be installed or compiled into PHP (`--with-gettext`).
+
+Composer install (recommended)
+==============================
+You can install this package by using [Composer](http://getcomposer.org).
+Link to Packagist: https://packagist.org/packages/phptal/phptal
-Non-PEAR install
-================
+```sh
+composer require phptal/phptal
+```
-To run you only need PHPTAL.php and files in PHPTAL directory. Other files are for unit tests and PEAR installer.
+Manual install
+==============
-Get the latest PHPTAL package from http://phptal.org.
+Get the latest PHPTAL tarball from https://github.com/phptal/PHPTAL/releases
tar zxvf PHPTAL-X.X.X.tar.gz
mv PHPTAL-X.X.X/PHPTAL* /path/to/your/php/include/path/
+Changelog
+=========
-PEAR Install
-============
-
-Get the latest PHPTAL package from http://phptal.org.
-
-Then run:
-
- pear install PHPTAL-X.X.X.tar.gz
-
-
+[Please see the projects releases page](https://github.com/phptal/PHPTAL/releases)
Getting the latest development version
======================================
-You can checkout the latest development version using:
-
- svn co https://svn.motion-twin.com/phptal/trunk phptal
-
-
-
-PHPTAL development requirements
-===============================
-
-If you want to hack PHPTAL (don't forget to send me patches), you will require:
-
- - The PHPTAL development package
- - PEAR (to easily install other tools)
- http://pear.php.net
-
- - Phing to run maintainance tasks
+You can find the latest development version on github:
- pear channel-discover pear.phing.info
- pear install phing/phing
+ https://github.com/phptal/PHPTAL
- - PHPUnit 3.4 to run tests
+Addition development requirements (optional)
+============================================
- pear channel-discover pear.phpunit.de
- pear channel-discover pear.symfony-project.com
- pear channel-discover components.ez.no
- pear install phpunit/PHPUnit
+If you would like to generate the offical html/text handbook by calling
+`make doc`, you will need to install the `xmlto` package. Please use
+your operating systems package manager to install it.
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 097625b9..00000000
--- a/build.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Version
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/composer.json b/composer.json
index 61e2f45f..ceaee61a 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,9 @@
"php": ">=5.1.2"
},
"require-dev": {
- "phpunit/phpunit": "~3.7.0"
+ "php": ">=5.3.3",
+ "phpunit/phpunit": "~4.8",
+ "phpdocumentor/phpdocumentor": "~2.8"
},
"autoload": {
"psr-0": {
diff --git a/tests/run-tests.php b/tests/run-tests.php
deleted file mode 100644
index 3207a211..00000000
--- a/tests/run-tests.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- * @author Kornel Lesiński
- * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version SVN: $Id$
- * @link http://phptal.org/
- */
-
-require_once 'PHPUnit/Autoload.php';
-
-chdir(dirname(__FILE__));
-
-require_once "./config.php";
-
-if (isset($argv) && count($argv) >= 2) {
- array_shift($argv);
- foreach ($argv as $entry) {
- echo "-> running standalone test units $entry\n";
- try
- {
- $suite = createTestSuiteForFile($entry);
- $runner = new PHPUnit_TextUI_TestRunner();
- $runner->doRun($suite);
- }
- catch(Exception $e)
- {
- echo "Exception during execution of $entry: ".$e->getMessage()."\n\n";
- }
-
- }
- exit(0);
-}
-
-$alltests = new PHPUnit_Framework_TestSuite();
-foreach (new DirectoryIterator( dirname(__FILE__) ) as $f) {
- if ($f->isDot() || !$f->isFile()) continue;
-
- if (preg_match('/(.*?Test).php$/', $f->getFileName())) {
- $alltests->addTestSuite(createTestSuiteForFile($f->getPathName()));
- }
-}
-
-
-$runner = new PHPUnit_TextUI_TestRunner();
-$runner->doRun($alltests);
-
-function createTestSuiteForFile($path)
-{
- require_once $path;
- $classname = basename($path, '.php');
- if (version_compare(PHP_VERSION, '5.3', '>=') && __NAMESPACE__) {
- $classname = __NAMESPACE__ . '\\' . $classname;
- }
- return new PHPUnit_Framework_TestSuite($classname);
-}
-