Merge remote-tracking branch 'origin/1.1' into merge-1.1

Conflicts:
	CHANGELOG.md

Author: dbu

.travis.yml

@@ -4,10 +4,21 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
   - hhvm
 
+env:
+  - PACKAGE_VERSION=high
+
+matrix:
+  include:
+    - php: 5.3.3
+      env: PACKAGE_VERSION=low
+
 before_script:
-  - composer install --prefer-source --dev
+  - composer selfupdate
+  - if [[ "$PACKAGE_VERSION" == "high" ]]; then composer update --prefer-source; fi
+  - if [[ "$PACKAGE_VERSION" == "low" ]]; then composer update --prefer-lowest --prefer-source; fi
 
 script: phpunit -c tests/phpunit.xml.dist
 

CHANGELOG.md

@@ -5,8 +5,8 @@ Changelog
 -----
 
 * **2014-10-24**: Fixed SQL2 handling, notably precedency when generating SQL2 and parsing of literals.
-* **2014-10-05** Added PathHelper::getLocalNodeName
-* **2014-09-01** Added PathHelper::relativizePath
+* **2014-10-05**: Added PathHelper::getLocalNodeName
+* **2014-09-01**: Added PathHelper::relativizePath
 
 1.1.1
 -----

composer.json

@@ -27,9 +27,9 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.3.3",
         "phpcr/phpcr": "~2.1.0",
-        "symfony/console": "~2.0"
+        "symfony/console": "2.*,>=2.0.5"
     },
     "autoload": {
         "psr-0": {