@@ -1,28 +1,33 @@

 language: php

 php:

-  - 5.2

-  - 5.3

-  - 5.4

-  - 5.5

-  - 5.6

-  - hhvm

-  - nightly

+    - 5.2

+    - 5.3

+    - 5.4

+    - 5.5

+    - 5.6

+    - hhvm

+    - nightly

 allow_failures:

     - php: nightly

 env:

-  - TWIG_EXT=no

-  - TWIG_EXT=yes

+    - TWIG_EXT=no

+    - TWIG_EXT=yes

 before_script:

-  - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && sudo make install"; fi

-  - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi

+    - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && sudo make install"; fi

+    - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi

+    - if [ ${TRAVIS_PHP_VERSION:0:3} == "5.2" ]; then sed -i.bak "s|vendor/autoload.php|test/bootstrap.php|" phpunit.xml.dist; fi

+

+install:

+    # Composer is not available on PHP 5.2

+    - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer install; fi

 matrix:

-  exclude:

-    - php: hhvm

-      env: TWIG_EXT=yes

-    - php: nightly

-      env: TWIG_EXT=yes

+    exclude:

+        - php: hhvm

+          env: TWIG_EXT=yes

+        - php: nightly

+          env: TWIG_EXT=yes

@@ -29,6 +29,10 @@

     "require": {

         "php": ">=5.2.7"

     },

+    "require-dev": {

+        "symfony/phpunit-bridge": "~2.7",

+        "symfony/debug": "~2.7"

+    },

     "autoload": {

         "psr-0" : {

             "Twig_" : "lib/"

@@ -9,7 +9,7 @@

          processIsolation="false"

          stopOnFailure="false"

          syntaxCheck="false"

-         bootstrap="test/bootstrap.php"

+         bootstrap="vendor/autoload.php"

 >

   <testsuites>

     <testsuite name="Twig Test Suite">