Merge branch 'master' of github.com:XaminProject/handlebars.php

.travis.yml

@@ -2,3 +2,6 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
+before_script: composer install
+script: "./vendor/bin/phpunit && ./vendor/bin/phpcs -n src/"

composer.json

@@ -20,7 +20,8 @@
 
     },
     "require-dev": {
-        "phpunit/phpunit": "3.8.*"
+        "phpunit/phpunit": "3.7.*",
+        "squizlabs/php_codesniffer": "1.*"
     },
     "autoload": {
         "psr-0": {

src/Handlebars/Autoloader.php

@@ -88,7 +88,7 @@ class Autoloader
         $file = sprintf('%s/%s.php', $this->_baseDir, str_replace('\\', '/', $class));
 
         if (is_file($file)) {
-            require $file;
+            include $file;
         }
     }
 

tests/bootstrap.php

@@ -1,4 +1,4 @@
 <?php
 include __DIR__ . "/../src/Handlebars/Autoloader.php";
 $base = __DIR__ . "/../src";
-$loader = new \Handlebars\Autoloader(realpath($base));
+$loader = \Handlebars\Autoloader::register();