Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Kohana 3.3.5 #26

Merged
merged 5 commits into from
Jul 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion classes/Kohana/Jam/Form/Tart/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
});

Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Loading