Permalink
Browse files

Merge branch '3.2/develop' into 3.3/develop

  • Loading branch information...
2 parents 4d17878 + 3c7fc8c commit cbf75f04ff0396077aae35c37c63ab19920280ec @shadowhand shadowhand committed Aug 27, 2012
Showing with 5 additions and 34 deletions.
  1. +1 −0 config/user_agents.php
  2. +0 −30 guide/kohana/security/deploying.md
  3. +1 −4 tests/kohana/FeedTest.php
  4. +3 −0 tests/kohana/FileTest.php
View
@@ -3,6 +3,7 @@
return array(
'platform' => array(
+ 'windows nt 6.2' => 'Windows 8',
'windows nt 6.1' => 'Windows 7',
'windows nt 6.0' => 'Windows Vista',
'windows nt 5.2' => 'Windows 2003',
@@ -29,33 +29,3 @@ There are a few things you'll want to do with your application before moving int
'profile' => Kohana::$environment !== Kohana::PRODUCTION,
'caching' => Kohana::$environment === Kohana::PRODUCTION,
));
-
-`index.php`:
-
- /**
- * Execute the main request using PATH_INFO. If no URI source is specified,
- * the URI will be automatically detected.
- */
- $request = Request::instance($_SERVER['PATH_INFO']);
-
- // Attempt to execute the response
- $request->execute();
-
- if ($request->send_headers()->response)
- {
- // Get the total memory and execution time
- $total = array(
- '{memory_usage}' => number_format((memory_get_peak_usage() - KOHANA_START_MEMORY) / 1024, 2).'KB',
- '{execution_time}' => number_format(microtime(TRUE) - KOHANA_START_TIME, 5).' seconds');
-
- // Insert the totals into the response
- $request->response = str_replace(array_keys($total), $total, $request->response);
- }
-
-
- /**
- * Display the request response.
- */
- echo $request->response;
-
-
@@ -40,10 +40,7 @@ public function provider_parse()
*/
public function test_parse($source, $expected)
{
- if ( ! $this->hasInternet())
- {
- $this->markTestSkipped('An internet connection is required for this test');
- }
+ $this->markTestSkipped('We don\'t go to the internet for tests.');
$this->assertEquals($expected, count(Feed::parse($source)));
}
@@ -40,6 +40,9 @@ public function provider_mime()
*/
public function test_mime($input)
{
+ $this->markTestSkipped(
+ 'This test doesn\'t do anything useful!'
+ );
$this->assertSame(1, preg_match('/^(?:application|audio|image|message|multipart|text|video)\/[a-z.+0-9-]+$/i', File::mime($input)));
}

0 comments on commit cbf75f0

Please sign in to comment.