<auto> merging hotfixes. re-added tests into repository.

This commit is contained in:
Taylor Otwell
2012-03-27 15:47:04 -05:00
parent 8b4c17a8b6
commit 9eabd73b64
79 changed files with 6418 additions and 0 deletions

0
tests/bundles/.gitignore vendored Normal file
View File

View File

@@ -0,0 +1,7 @@
<?php
return array(
'bundle' => 'dashboard',
);

View File

@@ -0,0 +1,10 @@
<?php
class Dashboard_Panel_Controller extends Controller {
public function action_index()
{
return 'Dashboard_Panel_Index';
}
}

View File

@@ -0,0 +1,7 @@
<?php namespace Dashboard;
/**
* This class is used for testing the auto-loading of classes
* that are mapped by namesapce.
*/
class Repository {}

View File

@@ -0,0 +1,8 @@
<?php
Route::get('dashboard', array('as' => 'dashboard', function()
{
//
}));
Route::controller('dashboard::panel');

View File

@@ -0,0 +1,6 @@
<?php
if (isset($_SERVER['bundle.dummy.routes']))
{
$_SERVER['bundle.dummy.routes']++;
}

View File

@@ -0,0 +1,3 @@
<?php
$_SERVER['bundle.dummy.start']++;