Merge https://github.com/tomfrompoland/Slim into hotfix-env-vars

sbechtel · Sep 5, 2011 · dc27979 · dc27979
2 parents 8f95dd9 + 3302141
commit dc27979
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/Http/CookieTest.php b/tests/Http/CookieTest.php
@@ -63,7 +63,7 @@ public function testNewCookie() {
         //Case C
         $this->assertEquals($hourFromNow, $c1->getExpires());
         //Case D
-        $this->assertEquals($hourFromNow, $c2->getExpires());
+        $this->assertGreaterThanOrEqual($hourFromNow, $c2->getExpires());
         //Case E
         $this->assertEquals('/foo', $c1->getPath());
         //Case F

diff --git a/tests/Http/RequestTest.php b/tests/Http/RequestTest.php
@@ -150,7 +150,10 @@ public function testRequestUriInSubDirectoryWitoutHtaccess(){
     public function testStripSlashesIfMagicQuotes() {
         $_GET['foo1'] = "bar\'d";
         $getData = Slim_Http_Request::stripSlashesIfMagicQuotes($_GET);
-        $this->assertEquals("bar'd", $getData['foo1']);
+				if(get_magic_quotes_gpc())
+					$this->assertEquals("bar'd", $getData['foo1']);
+				else
+					$this->assertEquals("bar\'d", $getData['foo1']);
     }
 
     /* TEST REQUEST METHODS */