Merge branch 'PHP-5.5'

* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis

diff --cc ext/standard/tests/file/disk_free_space_basic.phpt
index bff30d9043077263534e19a91cd1888678c6dd89,200e92ab43e84ac31ef519736b9e8a2a5b87e3bd..2904ff9a5bfe0ed7e18eb9dd512a5cb47611adba
--- 1/ext/standard/tests/file/disk_free_space_basic.phpt
--- 2/ext/standard/tests/file/disk_free_space_basic.phpt
+++ b/ext/standard/tests/file/disk_free_space_basic.phpt
@@@ -33,12 -37,10 +37,12 @@@ echo "\n Free Space after writing to a 
  $space2 =  disk_free_space($file_path.$dir); 
  var_dump( $space2 ); 
  
- if(getenv('TRAVIS') === 'true' || $space1 > $space2 )
+ if($space1 > $space2 )
    echo "\n Free Space Value Is Correct\n";
 -else
 +else {
    echo "\n Free Space Value Is Incorrect\n";
 +  var_dump($space1, $space2);
 +}
  
  echo "*** Testing with Binary Input ***\n";
  var_dump( disk_free_space(b"$file_path") );