Merge branch 'release/2.7.0'

.php_cs

@@ -0,0 +1,6 @@
+<?php
+
+$config = new Symfony\CS\Config\Config();
+$config->getFinder()->in(__DIR__)->exclude('bin');
+
+return $config;

.travis.yml

@@ -1,12 +1,16 @@
 language: php
+
+before_script:
+  - curl http://cs.sensiolabs.org/get/php-cs-fixer.phar -o php-cs-fixer.phar
+
+script:
+  - phpunit
+  - if [[ `php -r "echo version_compare(PHP_VERSION, '5.3.6', '>=');"` ]]; then php php-cs-fixer.phar --dry-run -v fix .; fi
+
 php:
   - 5.2
   - 5.3
   - 5.4
   - 5.5
   - 5.6
   - hhvm
-
-matrix:
-  allow_failures:
-    - php: hhvm # See https://github.com/facebook/hhvm/pull/1860

CONTRIBUTING.md

@@ -5,13 +5,15 @@
 
  1. [Fork the repo on GitHub](https://github.com/bobthecow/mustache.php).
 
- 2. Run the test suite. We only take pull requests with passing tests, and it's great to know that you have a clean slate. Make sure you have PHPUnit 3.5+, then run `phpunit` from the project directory.
+ 2. Update submodules: `git submodule update --init`
 
- 3. Add tests for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, add a test!
+ 3. Run the test suite. We only take pull requests with passing tests, and it's great to know that you have a clean slate. Make sure you have PHPUnit 3.5+, then run `phpunit` from the project directory.
 
- 4. Make the tests pass.
+ 4. Add tests for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, add a test!
 
- 5. Push your fork to GitHub and submit a pull request against the `dev` branch.
+ 5. Make the tests pass.
+
+ 6. Push your fork to GitHub and submit a pull request against the `dev` branch.
 
 
 ### You can do some things to increase the chance that your pull request is accepted the first time:

bin/build_bootstrap.php

@@ -95,10 +95,10 @@ class SymfonyClassCollectionLoader
     /**
      * Loads a list of classes and caches them in one big file.
      *
-     * @param array   $classes    An array of classes to load
-     * @param string  $cacheDir   A cache directory
-     * @param string  $name       The cache name prefix
-     * @param string  $extension  File extension of the resulting file
+     * @param array  $classes   An array of classes to load
+     * @param string $cacheDir  A cache directory
+     * @param string $name      The cache name prefix
+     * @param string $extension File extension of the resulting file
      *
      * @throws InvalidArgumentException When class can't be loaded
      */