Skip to content

Update to comply with Kohana 3.3 API #6

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.

Sign up for GitHub

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

Open
Braynid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to comply with Kohana 3.3 API #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions classes/controller/devtools.php → classes/Controller/Devtools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php defined('SYSPATH') or die('No direct script access.');

class Controller_devtools extends Controller {
class Controller_Devtools extends Controller {

public $template;

Expand Down Expand Up @@ -43,7 +43,7 @@ public function action_routetest()
if ( ! $url)
{
// Try to find a config file
$url = Kohana::config('route-test');
$url = Kohana::$config->load('route-test');
}
$this->template->content = View::factory('devtools/route-test',array(
// Get all the tests
Expand Down
0 classes/devtools/route.php → classes/Devtools/Route.php
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion classes/devtools/route/tester.php → classes/Devtools/Route/Tester.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static function create_tests($tests)
// Test each route, and save the route and params if it matches
foreach (Route::all() as $route)
{
if ($current->params = $route->matches($current->url))
if ($current->params = $route->matches(Request::factory($current->url)))
{
$current->route = Route::name($route);
$current->params = array_merge(array('route'=>$current->route),$current->params);
Expand Down
0 classes/route.php → classes/Route.php
View file
Open in desktop
File renamed without changes.
0 classes/route/tester.php → classes/Route/Tester.php
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion views/devtools/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

try
{
echo Debug::dump(Kohana::config($name));
echo Debug::dump(Kohana::$config->load($name));
}
catch (exception $e)
{
Expand Down
14 changes: 7 additions & 7 deletions views/devtools/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@
<div id="menu">
<h2>devtools<br /><small> by bluehawk</small></h3>
<ul>
<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'info')),'Kohana info',array('class'=>($action=='info'?'active':''))) ?></li>
<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'extension')),'Transparent extension',array('class'=>($action=='extension'?'active':''))) ?></li>
<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'routetest')),'Route tester',array('class'=>($action=='routetest'?'active':''))) ?></li>
<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'routes')),'Route dump',array('class'=>($action=='routes'?'active':''))) ?></li>
<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'config')),'Config dump',array('class'=>($action=='config'?'active':''))) ?></li>
<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'message')),'Message dump',array('class'=>($action=='message'?'active':''))) ?></li>
<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'i18n')),'i18n dump',array('class'=>($action=='i18n'?'active':''))) ?></li>
<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'info')),'Kohana info',array('class'=>($action=='info'?'active':''))) ?></li>
<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'extension')),'Transparent extension',array('class'=>($action=='extension'?'active':''))) ?></li>
<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'routetest')),'Route tester',array('class'=>($action=='routetest'?'active':''))) ?></li>
<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'routes')),'Route dump',array('class'=>($action=='routes'?'active':''))) ?></li>
<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'config')),'Config dump',array('class'=>($action=='config'?'active':''))) ?></li>
<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'message')),'Message dump',array('class'=>($action=='message'?'active':''))) ?></li>
<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'i18n')),'i18n dump',array('class'=>($action=='i18n'?'active':''))) ?></li>
</ul>
</div>

Expand Down