Merge pull request #342 from basdenooijer/develop

Several small fixes

.travis.yml

@@ -6,7 +6,7 @@ php:
   - 5.4
   - 5.3
   - hhvm
-  - hhvm-nightly
+  - nightly
 
 env:
   - SYMFONY_VERSION=2.1.*
@@ -16,7 +16,7 @@ env:
   - SYMFONY_VERSION=2.5.*
 
 before_script:
-  - bash -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != 'hhvm-nightly' ] && [ $TRAVIS_PHP_VERSION != '5.3' ]; then printf '\n\n\n\n' | pecl install pecl_http-1.7.6; fi"
+  - bash -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '5.3' ]; then printf '\n\n\n\n' | pecl install pecl_http-1.7.6; fi"
   - composer require --prefer-source --dev symfony/event-dispatcher:${SYMFONY_VERSION}
 
 script: vendor/bin/phpunit -c phpunit.xml.travis -v
@@ -27,4 +27,4 @@ matrix:
   allow_failures:
       - php: 5.3
       - php: hhvm
-      - php: hhvm-nightly
+      - php: nightly
\ No newline at end of file

library/Solarium/QueryType/Select/Query/Component/Facet/Interval.php

@@ -45,7 +45,7 @@ use Solarium\QueryType\Select\Query\Component\FacetSet;
  *
  * @link http://wiki.apache.org/solr/SimpleFacetParameters#Interval_Faceting
  */
-class Interval extends Facet
+class Interval extends AbstractFacet
 {
 
     /**

tests/Solarium/Tests/QueryType/Update/Query/Command/AddTest.php

@@ -64,6 +64,12 @@ class AddTest extends \PHPUnit_Framework_TestCase
 
     public function testAddDocumentWithInvalidDocument()
     {
+        // Starting from PHP7 typehints are checked by PHP and handled using a TypeException. For versions 5.x Solarium
+        // needs to do this, so only test for those versions.
+        if (version_compare(PHP_VERSION, '6.0.0') >= 0) {
+            $this->markTestSkipped('Typehint handling check not needed, built into current PHP version');
+        }
+
         try {
             $doc = new \StdClass();
             $this->command->addDocument($doc);