Merge branch 'master' into feature/path-coverage

Author: sebastianbergmann

.travis.yml

@@ -8,7 +8,7 @@ php:
     - 5.6
 
 before_script:
-    - COMPOSER_ROOT_VERSION=dev-master composer install --dev --prefer-source
+    - COMPOSER_ROOT_VERSION=dev-master composer install --prefer-source
 
 script: vendor/bin/phpunit --configuration ./build/travis-ci.xml
 

src/CodeCoverage.php

@@ -710,15 +710,16 @@ private function getLinesToBeIgnored($filename)
 
         if (!isset($this->ignoredLines[$filename])) {
             $this->ignoredLines[$filename] = array();
-            $ignore                        = false;
-            $stop                          = false;
-            $lines                         = file($filename);
-            $numLines                      = count($lines);
 
             if ($this->disableIgnoredLines) {
                 return $this->ignoredLines[$filename];
             }
 
+            $ignore   = false;
+            $stop     = false;
+            $lines    = file($filename);
+            $numLines = count($lines);
+
             foreach ($lines as $index => $line) {
                 if (!trim($line)) {
                     $this->ignoredLines[$filename][] = $index + 1;

src/CodeCoverage/Driver/Xdebug.php

@@ -79,9 +79,7 @@ private function cleanup(array $data)
                 $data[$file] = array('lines' => $data[$file]);
             }
 
-            if (isset($data[$file]['lines'][0])) {
-                unset($data[$file]['lines'][0]);
-            }
+            unset($data[$file]['lines'][0]);
 
             if ($file != 'xdebug://debug-eval' && file_exists($file)) {
                 $numLines = $this->getNumberOfLinesInFile($file);