Skip to content

Commit

Permalink
Revert "Updated system tracking to latest kohana/core3.2/develop"
Browse files Browse the repository at this point in the history 
This reverts commit fe45ac9.
  • Loading branch information
@kiall
kiall committed Jul 2, 2011
1 parent 6b574b0 commit b045d16
Show file tree
Hide file tree
Showing 6 changed files with 240 additions and 40 deletions.
9 changes: 2 additions & 7 deletions application/bootstrap.php
View file
Expand Up @@ -93,25 +93,20 @@
*/
Kohana::$config->attach(new Config_File);

Kohana::$expose = TRUE;

/**
* Enable modules. Modules are referenced by a relative or absolute path.
*/
Kohana::modules(array(
// 'auth' => MODPATH.'auth', // Basic authentication
'cache' => '../kohana-cache', // Caching with multiple backends
// 'cache' => MODPATH.'cache', // Caching with multiple backends
// 'codebench' => MODPATH.'codebench', // Benchmarking tool
// 'database' => MODPATH.'database', // Database access
// 'image' => MODPATH.'image', // Image manipulation
// 'orm' => MODPATH.'orm', // Object Relationship Mapping
'unittest' => '../kohana-unittest', // Unit testing
// 'unittest' => MODPATH.'unittest', // Unit testing
// 'userguide' => MODPATH.'userguide', // User guide and API documentation
));

// Kohana::$expose = TRUE;
// Request_Client_External::$client = 'Request_Client_Stream';

/**
* Set the routes. Each route must have a minimum of a name, a URI and a set of
* defaults for the URI.
Expand Down
1 change: 1 addition & 0 deletions application/cache/.gitignore
View file
@@ -0,0 +1 @@
[^.]*
9 changes: 1 addition & 8 deletions application/classes/controller/welcome.php
View file
Expand Up @@ -4,14 +4,7 @@ class Controller_Welcome extends Controller {

public function action_index()
{
$this->response->body('Hello world!')
->headers('cache-control', HTTP_Header::create_cache_control(
array(
'max-age' => 15,
'public'
)
));
$this->response->body('hello, world!');
}


} // End Welcome
26 changes: 2 additions & 24 deletions index.php
View file
@@ -1,13 +1,5 @@
<?php

// -- XHPROF enable ------------------------------------------------------------
if ($xhprof = extension_loaded('xhprof'))
{
include_once '/usr/local/lib/php/xhprof_lib/utils/xhprof_lib.php';
include_once '/usr/local/lib/php/xhprof_lib/utils/xhprof_runs.php';
xhprof_enable(XHPROF_FLAGS_CPU + XHPROF_FLAGS_MEMORY);
}

/**
* The directory in which your application specific resources are located.
* The application directory must contain the bootstrap.php file.
Expand All @@ -29,7 +21,7 @@
*
* @see http://kohanaframework.org/guide/about.install#system
*/
$system = '../kohana-core';
$system = 'system';

/**
* The default extension of resource files. If you change this, all resources
Expand Down Expand Up @@ -113,21 +105,7 @@
* Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
* If no source is specified, the URI will be automatically detected.
*/
echo Request::factory(TRUE, new HTTP_Cache(array('cache' => Cache::instance('apc'))))
echo Request::factory()
->execute()
->send_headers()
->body();

// -- XHPROF disable -----------------------------------------------------------
if ($xhprof)
{
$profiler_namespace = 'kohana'; // namespace for your application
$xhprof_data = xhprof_disable();
$xhprof_runs = new XHProfRuns_Default();
$run_id = $xhprof_runs->save_run($xhprof_data, $profiler_namespace);

// url to the XHProf UI libraries (change the host name and path)
$profiler_url = 'http://xhprof.development/index.php?run='.$run_id.'&source='.
$profiler_namespace;
echo '<a href="'. $profiler_url .'" target="_blank">Profiler output</a>';
}
233 changes: 233 additions & 0 deletions install.php
View file
@@ -0,0 +1,233 @@
<?php

// Sanity check, install should only be checked from index.php
defined('SYSPATH') or exit('Install tests must be loaded from within index.php!');

if (version_compare(PHP_VERSION, '5.3', '<'))
{
// Clear out the cache to prevent errors. This typically happens on Windows/FastCGI.
clearstatcache();
}
else
{
// Clearing the realpath() cache is only possible PHP 5.3+
clearstatcache(TRUE);
}

?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>

<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Kohana Installation</title>

<style type="text/css">
body { width: 42em; margin: 0 auto; font-family: sans-serif; background: #fff; font-size: 1em; }
h1 { letter-spacing: -0.04em; }
h1 + p { margin: 0 0 2em; color: #333; font-size: 90%; font-style: italic; }
code { font-family: monaco, monospace; }
table { border-collapse: collapse; width: 100%; }
table th,
table td { padding: 0.4em; text-align: left; vertical-align: top; }
table th { width: 12em; font-weight: normal; }
table tr:nth-child(odd) { background: #eee; }
table td.pass { color: #191; }
table td.fail { color: #911; }
#results { padding: 0.8em; color: #fff; font-size: 1.5em; }
#results.pass { background: #191; }
#results.fail { background: #911; }
</style>

</head>
<body>

<h1>Environment Tests</h1>

<p>
The following tests have been run to determine if <a href="http://kohanaframework.org/">Kohana</a> will work in your environment.
If any of the tests have failed, consult the <a href="http://kohanaframework.org/guide/about.install">documentation</a>
for more information on how to correct the problem.
</p>

<?php $failed = FALSE ?>

<table cellspacing="0">
<tr>
<th>PHP Version</th>
<?php if (version_compare(PHP_VERSION, '5.2.3', '>=')): ?>
<td class="pass"><?php echo PHP_VERSION ?></td>
<?php else: $failed = TRUE ?>
<td class="fail">Kohana requires PHP 5.2.3 or newer, this version is <?php echo PHP_VERSION ?>.</td>
<?php endif ?>
</tr>
<tr>
<th>System Directory</th>
<?php if (is_dir(SYSPATH) AND is_file(SYSPATH.'classes/kohana'.EXT)): ?>
<td class="pass"><?php echo SYSPATH ?></td>
<?php else: $failed = TRUE ?>
<td class="fail">The configured <code>system</code> directory does not exist or does not contain required files.</td>
<?php endif ?>
</tr>
<tr>
<th>Application Directory</th>
<?php if (is_dir(APPPATH) AND is_file(APPPATH.'bootstrap'.EXT)): ?>
<td class="pass"><?php echo APPPATH ?></td>
<?php else: $failed = TRUE ?>
<td class="fail">The configured <code>application</code> directory does not exist or does not contain required files.</td>
<?php endif ?>
</tr>
<tr>
<th>Cache Directory</th>
<?php if (is_dir(APPPATH) AND is_dir(APPPATH.'cache') AND is_writable(APPPATH.'cache')): ?>
<td class="pass"><?php echo APPPATH.'cache/' ?></td>
<?php else: $failed = TRUE ?>
<td class="fail">The <code><?php echo APPPATH.'cache/' ?></code> directory is not writable.</td>
<?php endif ?>
</tr>
<tr>
<th>Logs Directory</th>
<?php if (is_dir(APPPATH) AND is_dir(APPPATH.'logs') AND is_writable(APPPATH.'logs')): ?>
<td class="pass"><?php echo APPPATH.'logs/' ?></td>
<?php else: $failed = TRUE ?>
<td class="fail">The <code><?php echo APPPATH.'logs/' ?></code> directory is not writable.</td>
<?php endif ?>
</tr>
<tr>
<th>PCRE UTF-8</th>
<?php if ( ! @preg_match('/^.$/u', 'ñ')): $failed = TRUE ?>
<td class="fail"><a href="http://php.net/pcre">PCRE</a> has not been compiled with UTF-8 support.</td>
<?php elseif ( ! @preg_match('/^\pL$/u', 'ñ')): $failed = TRUE ?>
<td class="fail"><a href="http://php.net/pcre">PCRE</a> has not been compiled with Unicode property support.</td>
<?php else: ?>
<td class="pass">Pass</td>
<?php endif ?>
</tr>
<tr>
<th>SPL Enabled</th>
<?php if (function_exists('spl_autoload_register')): ?>
<td class="pass">Pass</td>
<?php else: $failed = TRUE ?>
<td class="fail">PHP <a href="http://www.php.net/spl">SPL</a> is either not loaded or not compiled in.</td>
<?php endif ?>
</tr>
<tr>
<th>Reflection Enabled</th>
<?php if (class_exists('ReflectionClass')): ?>
<td class="pass">Pass</td>
<?php else: $failed = TRUE ?>
<td class="fail">PHP <a href="http://www.php.net/reflection">reflection</a> is either not loaded or not compiled in.</td>
<?php endif ?>
</tr>
<tr>
<th>Filters Enabled</th>
<?php if (function_exists('filter_list')): ?>
<td class="pass">Pass</td>
<?php else: $failed = TRUE ?>
<td class="fail">The <a href="http://www.php.net/filter">filter</a> extension is either not loaded or not compiled in.</td>
<?php endif ?>
</tr>
<tr>
<th>Iconv Extension Loaded</th>
<?php if (extension_loaded('iconv')): ?>
<td class="pass">Pass</td>
<?php else: $failed = TRUE ?>
<td class="fail">The <a href="http://php.net/iconv">iconv</a> extension is not loaded.</td>
<?php endif ?>
</tr>
<?php if (extension_loaded('mbstring')): ?>
<tr>
<th>Mbstring Not Overloaded</th>
<?php if (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING): $failed = TRUE ?>
<td class="fail">The <a href="http://php.net/mbstring">mbstring</a> extension is overloading PHP's native string functions.</td>
<?php else: ?>
<td class="pass">Pass</td>
<?php endif ?>
</tr>
<?php endif ?>
<tr>
<th>Character Type (CTYPE) Extension</th>
<?php if ( ! function_exists('ctype_digit')): $failed = TRUE ?>
<td class="fail">The <a href="http://php.net/ctype">ctype</a> extension is not enabled.</td>
<?php else: ?>
<td class="pass">Pass</td>
<?php endif ?>
</tr>
<tr>
<th>URI Determination</th>
<?php if (isset($_SERVER['REQUEST_URI']) OR isset($_SERVER['PHP_SELF']) OR isset($_SERVER['PATH_INFO'])): ?>
<td class="pass">Pass</td>
<?php else: $failed = TRUE ?>
<td class="fail">Neither <code>$_SERVER['REQUEST_URI']</code>, <code>$_SERVER['PHP_SELF']</code>, or <code>$_SERVER['PATH_INFO']</code> is available.</td>
<?php endif ?>
</tr>
</table>

<?php if ($failed === TRUE): ?>
<p id="results" class="fail">✘ Kohana may not work correctly with your environment.</p>
<?php else: ?>
<p id="results" class="pass">✔ Your environment passed all requirements.<br />
Remove or rename the <code>install<?php echo EXT ?></code> file now.</p>
<?php endif ?>

<h1>Optional Tests</h1>

<p>
The following extensions are not required to run the Kohana core, but if enabled can provide access to additional classes.
</p>

<table cellspacing="0">
<tr>
<th>PECL HTTP Enabled</th>
<?php if (extension_loaded('http')): ?>
<td class="pass">Pass</td>
<?php else: ?>
<td class="fail">Kohana can use the <a href="http://php.net/http">http</a> extension for the Request_Client_External class.</td>
<?php endif ?>
</tr>
<tr>
<th>cURL Enabled</th>
<?php if (extension_loaded('curl')): ?>
<td class="pass">Pass</td>
<?php else: ?>
<td class="fail">Kohana can use the <a href="http://php.net/curl">cURL</a> extension for the Request_Client_External class.</td>
<?php endif ?>
</tr>
<tr>
<th>mcrypt Enabled</th>
<?php if (extension_loaded('mcrypt')): ?>
<td class="pass">Pass</td>
<?php else: ?>
<td class="fail">Kohana requires <a href="http://php.net/mcrypt">mcrypt</a> for the Encrypt class.</td>
<?php endif ?>
</tr>
<tr>
<th>GD Enabled</th>
<?php if (function_exists('gd_info')): ?>
<td class="pass">Pass</td>
<?php else: ?>
<td class="fail">Kohana requires <a href="http://php.net/gd">GD</a> v2 for the Image class.</td>
<?php endif ?>
</tr>
<tr>
<th>MySQL Enabled</th>
<?php if (function_exists('mysql_connect')): ?>
<td class="pass">Pass</td>
<?php else: ?>
<td class="fail">Kohana can use the <a href="http://php.net/mysql">MySQL</a> extension to support MySQL databases.</td>
<?php endif ?>
</tr>
<tr>
<th>PDO Enabled</th>
<?php if (class_exists('PDO')): ?>
<td class="pass">Pass</td>
<?php else: ?>
<td class="fail">Kohana can use <a href="http://php.net/pdo">PDO</a> to support additional databases.</td>
<?php endif ?>
</tr>
</table>

</body>
</html>
2 changes: 1 addition & 1 deletion system
Submodule system updated 13 files
+1 −4 classes/kohana/core.php
+0 −3 classes/kohana/http/cache.php
+8 −1 classes/kohana/request/client/internal.php
+2 −31 classes/kohana/session.php
+0 −8 classes/kohana/session/cookie.php
+0 −11 classes/kohana/session/exception.php
+0 −14 classes/kohana/session/native.php
+1 −1 classes/kohana/url.php
+0 −9 classes/session/exception.php
+1 −42 tests/kohana/CoreTest.php
+4 −1 tests/kohana/RequestTest.php
+1 −1 tests/kohana/URLTest.php
+38 −54 tests/kohana/request/client/CacheTest.php

0 comments on commit b045d16

Please sign in to comment.