From 2f43c7f1be13038884707cc604370619dd8ef328 Mon Sep 17 00:00:00 2001
From: Andrii Vasyliev <sol@hiqdev.com>
Date: Sun, 17 Jan 2016 15:44:55 +0000
Subject: [PATCH] improved `before_install` section

---
 .hidev/commits.md                        | 2 ++
 .travis.yml                              | 4 +++-
 src/controllers/TravisYamlController.php | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.hidev/commits.md b/.hidev/commits.md
index 26def32..8afae29 100644
--- a/.hidev/commits.md
+++ b/.hidev/commits.md
@@ -3,6 +3,8 @@ hiqdev/hidev-travis commits history
 
 ## Under development
 
+    - 5b3fa56 2016-01-17 improved `before_install` section (sol@hiqdev.com)
+    - 74e506a 2016-01-17 + `travis` default goal to imitate running on Travis (sol@hiqdev.com)
 - Fixed `before_install` section
     - 9fd04b8 2016-01-17 improved `before_install` section (sol@hiqdev.com)
 
diff --git a/.travis.yml b/.travis.yml
index 675fa46..04f2e4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,11 @@ cache:
         - $HOME/.composer/cache
 before_install:
     - 'composer self-update'
+    - 'composer --version'
+    - './vendor/bin/hidev --version'
+    - './vendor/bin/hidev travis/install'
 sudo: false
 install:
-    - 'travis_retry composer install --no-interaction'
     - './vendor/bin/hidev travis/install'
 script:
     - './vendor/bin/hidev travis/script'
diff --git a/src/controllers/TravisYamlController.php b/src/controllers/TravisYamlController.php
index f1bd5d6..99a7184 100644
--- a/src/controllers/TravisYamlController.php
+++ b/src/controllers/TravisYamlController.php
@@ -43,7 +43,7 @@ public function detectBin()
 
     public function getBeforeInstall()
     {
-        $commands = array_unique($this->get('before_install'));
+        $commands = array_values(array_unique($this->get('before_install')));
         if ($this->bin === './hidev.phar') {
             $commands[] = 'wget http://hiqdev.com/hidev/hidev.phar -O hidev.phar && chmod a+x hidev.phar';
         }
@@ -51,6 +51,7 @@ public function getBeforeInstall()
             $commands[] = 'travis_retry composer install --no-interaction';
         }
         $commands[] = $this->getBin() . ' --version';
+        $commands[] = $this->getBin() . ' travis/before_install';
 
         return $commands;
     }