diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65d5b3c..3d3daf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
Common and useful classes, methods, exceptions etc.
+# 0.1.4
+
+1. Phing > update configuration
+
# 0.1.3
1. Tests > refactoring & minor improvements
diff --git a/VERSION b/VERSION
index b1e80bb..845639e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/build.xml b/build.xml
index d65367b..a4a2a95 100644
--- a/build.xml
+++ b/build.xml
@@ -14,7 +14,7 @@
+ description="Builds everything and runs all tests"/>
@@ -24,23 +24,5 @@
-
-
diff --git a/phing/app.xml b/phing/app.xml
index 23852ba..464a2f1 100644
--- a/phing/app.xml
+++ b/phing/app.xml
@@ -1,5 +1,5 @@
-
+
@@ -11,50 +11,119 @@
+
+
+
+ description="Builds the application"/>
+ depends="app:clean, app:composer, app:vendors, app:composer-validate, app:checkout"
+ description="Prepares app to build."/>
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -63,36 +132,76 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
diff --git a/phing/filesets.xml b/phing/filesets.xml
new file mode 100644
index 0000000..13dcb7f
--- /dev/null
+++ b/phing/filesets.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phing/properties.dist b/phing/properties.dist
index dc0463c..5d0307e 100644
--- a/phing/properties.dist
+++ b/phing/properties.dist
@@ -9,7 +9,7 @@
# not special chars. This way you can create pseudo-namespaces
#
# You can refer to values of other properties by enclosing their keys in "${}".
-# Example: dir.js = ${dir.web}/js
+# Example: dir.js = ${dir.public}/js
#
# Everything behind the equal sign is the value, you do
# not have to enclose strings: text=This is some text, Your OS is ${php.os}
@@ -22,10 +22,6 @@
#
env = dev
-# Install assets using symlinks
-#
-assets.installWithSymlink = true
-
# Clear cache with the "warmup" option
#
# The cache:clear command should always be called with the --no-warmup option. Warmup should be done via the cache:warmup command.
@@ -45,7 +41,6 @@ composer.download_command = php -r "eval('?>'.file_get_contents('https://getcomp
# Path to composer executable or composer.phar file
#
composer.path = composer.phar
-#composer.path = /usr/local/bin/composer
# Path to php executable used by composer
#
@@ -55,52 +50,49 @@ composer.php = php
#
composer.self-update = false
-# Validate the composer.json file
-#
-composer.validate = false
-
# --------------------------------------------------------------------------------
# Directories
# --------------------------------------------------------------------------------
# System directories
#
-dir.data = ${project.basedir}/data
dir.src = ${project.basedir}/src
+dir.var = ${project.basedir}/tests/Resources/var
+dir.cache = ${dir.var}/cache
+dir.logs = ${dir.var}/log
+dir.sessions = ${dir.var}/sessions
+dir.data = ${project.basedir}/data
dir.tests = ${project.basedir}/tests
-# --------------------------------------------------------------------------------
# Build directories
-# --------------------------------------------------------------------------------
-
+#
dir.build = ${project.basedir}/build
dir.reports = ${dir.build}/logs
dir.reports.pdepend = ${dir.reports}/pdepend
-dir.reports.coverage = ${dir.reports}/phpunit_coverage
-#
-# Disabled, because unnecessary right now
-# phpdocumentor/phpdocumentor cannot be installed via Composer
-#
-# Meritoo
-# 2017-02-22
-#
-#dir.docs = ${dir.build}/docs
-#dir.docs.phpdoc2 = ${dir.docs}/phpdoc2
-# --------------------------------------------------------------------------------
# Data directories
-# --------------------------------------------------------------------------------
-
+#
+dir.data.tests = ${dir.data}/tests
dir.data.temporary = ${dir.data}/tmp
+# Docker directories
+#
+dir.docker = ${project.basedir}/docker
+dir.docker.data = ${dir.docker}/data/db
+dir.docker.logs = ${dir.docker}/logs/nginx
+
# --------------------------------------------------------------------------------
# Testing
# --------------------------------------------------------------------------------
+# Path of the PHP Coding Standards Fixer (http://cs.sensiolabs.org)
+#
+tests.cs_fixer.path = ./vendor/bin/php-cs-fixer
+
+# Test database path
+#
+tests.database = ${dir.data.temporary}/database.sqlite
+
# Path of the framework used to run unit tests
#
tests.framework.path = ./vendor/bin/phpunit --verbose --no-coverage --testdox
-
-# Path of the PHP Coding Standards Fixer (http://cs.sensiolabs.org)
-#
-phpCsFixer.path = ./vendor/bin/php-cs-fixer
diff --git a/phing/tests.xml b/phing/tests.xml
index edd288b..6eba11b 100644
--- a/phing/tests.xml
+++ b/phing/tests.xml
@@ -62,8 +62,8 @@
-->
@@ -212,7 +212,7 @@
-
+
diff --git a/tests/Resources/var/cache/.gitkeep b/tests/Resources/var/cache/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/tests/Resources/var/log/.gitkeep b/tests/Resources/var/log/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/tests/Resources/var/sessions/.gitkeep b/tests/Resources/var/sessions/.gitkeep
new file mode 100644
index 0000000..e69de29