Tidying

.gitattributes

@@ -2,4 +2,4 @@ build/ export-ignore
 docs/ export-ignore
 tests/ export-ignore
 .travis.yml export-ignore
-phpunit.xml.dist export-ignore
+phpunit.xml.dist export-ignore

.gitignore

@@ -3,6 +3,5 @@ assets/brickrouge-responsive-uncompressed.css
 assets/brickrouge-uncompressed.css
 assets/brickrouge-uncompressed.js
 composer.lock
-composer.phar
 docs
-vendor
+vendor

.travis.yml

@@ -4,10 +4,12 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - hhvm
 
 matrix:
   allow_failures:
-    - php: 5.6
+    - php: hhvm
 
-install:
-  make vendor
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev

LICENSE

@@ -27,4 +27,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -114,18 +114,14 @@ PACKAGE_NAME = "Brickrouge"
 usage:
 	@echo "test:  Runs the test suite.\ndoc:   Creates the documentation.\nclean: Removes the documentation, the dependencies and the Composer files."
 
-composer.phar:
-	@echo "Installing composer..."
-	@curl -s https://getcomposer.org/installer | php
+vendor:
+	@composer install --dev
 
-vendor: composer.phar
-	@php composer.phar install --prefer-source --dev
-
-update: vendor
-	@php composer.phar update --prefer-source --dev
+update:
+	@composer update --dev
 
 autoload: vendor
-	@php composer.phar dump-autoload
+	@composer dump-autoload
 
 test: vendor
 	@phpunit
@@ -144,6 +140,5 @@ clean:
 	@rm -fR docs
 	@rm -fR vendor
 	@rm -f composer.lock
-	@rm -f composer.phar
 
-.PHONY: build watch
+.PHONY: build watch

README.md

@@ -517,16 +517,10 @@ and [icanboogie/errors](https://packagist.org/packages/icanboogie/errors).
 
 ## Installation
 
-The recommended way to install this package is through [composer](http://getcomposer.org/).
-Create a `composer.json` file and run `php composer.phar install` command to install it:
+The recommended way to install this package is through [composer](http://getcomposer.org/):
 
-```json
-{
-	"minimum-stability": "dev",
-	"require": {
-		"brickrouge/brickrouge": "2.x"
-	}
-}
+```
+$ composer require brickrouge/brickrouge:~2.1
 ```
 
 
@@ -538,7 +532,7 @@ Create a `composer.json` file and run `php composer.phar install` command to ins
 The package is [available on GitHub](https://github.com/Brickrouge/Brickrouge), its repository can
 be cloned with the following command line:
 
-	$ git clone git://github.com/Brickrouge/Brickrouge.git
+	$ git clone https://github.com/Brickrouge/Brickrouge.git
 
 
 
@@ -585,4 +579,4 @@ Brickrouge is licensed under the New BSD License - See the [LICENSE](LICENSE) fi
 [Searchbox]: http://brickrouge.org/docs/class-Brickrouge.Searchbox.html
 [Text]: http://brickrouge.org/docs/class-Brickrouge.Text.html
 
-[ICanBoogie]: http://icanboogie.org/
+[ICanBoogie]: http://icanboogie.org/

bootstrap.php

@@ -63,4 +63,4 @@
 if (!defined('Brickrouge\CHARSET'))
 {
 	define('Brickrouge\CHARSET', 'utf-8');
-}
+}