Merge pull request #26 from OpenBuildings/kohana-3.3.5

Support Kohana 3.3.5

.travis.yml

@@ -4,22 +4,36 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+branches:
+  only:
+    - master
+
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 notifications:
   email: false
   slack:
     secure: dUHUpv7ct2DoeMREPz+FV3S2a4H78Dre59C7G3/N7AhSJeRcpoEuf0OSfDUvda+2+uXZK1jbD3isuYYda0JtQkEA0i90YCjiX5LqgDZ4axwxR7WqD9CBTaDs9CaQhia477MseZ7am0eBdaa9TTfcbNSU+9cD8Zd8U1R/876brWM=
 
-install:
+before_install:
   - composer selfupdate
+
+install:
   - composer install --no-interaction
 
 before_script:
   - mkdir -p build/logs
   - mysql -e 'create database `test-jam-tart`;'
 
 script:
-  - phpunit --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar

classes/Kohana/Jam/Form/Tart/General.php

@@ -351,7 +351,15 @@ public function remoteselect($name, array $options = array(), array $attributes
 			$h('span', array('id' => $options['container'], 'class' => 'remoteselect-container'), function($h, $self) use ($current, $model, $options) {
 				if ($current)
 				{
-					$h->add(Request::factory(strtr($options['url'], array('{{model}}' => $model, '{{id}}' => Jam_Form::list_id($current))))->execute());
+					$url = strtr($options['url'], array('{{model}}' => $model, '{{id}}' => Jam_Form::list_id($current)));
+					$split_uri = explode('?', $url);
+					$uri = array_shift($split_uri);
+					$query = array();
+					if ($split_uri)
+					{
+						parse_str($split_uri[0], $query);
+					}
+					$h->add(Request::factory($uri)->query($query)->execute());
 				}
 			});
 

composer.json

@@ -21,6 +21,7 @@
 	"require-dev": {
 		"twbs/bootstrap": "2.3.*",
 		"openbuildings/kohana-test-bootsrap": "0.1.*",
-		"openbuildings/jam-auth": "~0.3.2"
+		"openbuildings/jam-auth": "~0.3.2",
+		"phpunit/phpunit": "~4.1.0"
 	}
 }