[limb-svn] r5794 - in 3.x/trunk/limb/net: src tests/cases

[svn at limb-project.com]

Author: pachanga
Date: 2007-05-03 17:04:09 +0400 (Thu, 03 May 2007)
New Revision: 5794
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5794

Modified:
   3.x/trunk/limb/net/src/lmbHttpRequest.class.php
   3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php
Log:
-- lmbHttpRequest doesn't put files in general container with GET,POST data

Modified: 3.x/trunk/limb/net/src/lmbHttpRequest.class.php
===================================================================
--- 3.x/trunk/limb/net/src/lmbHttpRequest.class.php	2007-05-03 11:06:44 UTC (rev 5793)
+++ 3.x/trunk/limb/net/src/lmbHttpRequest.class.php	2007-05-03 13:04:09 UTC (rev 5794)
@@ -54,10 +54,6 @@
 
     foreach($this->request as $k => $v)
       $this->set($k, $v);
-
-    //uploaded files shouldn't be attributes of request!?
-    foreach($this->files as $k => $v)
-      $this->set($k, $v);
   }
 
   protected function _parseUploadedFiles($files)
@@ -78,9 +74,12 @@
     return $result;
   }
 
-  function hasAttribute($name)//rename later
+  /**
+   * @deprecated
+   */
+  function hasAttribute($name)
   {
-    return isset($this->properties[$name]);
+    return $this->has($name);
   }
 
   function getFiles($key = null)

Modified: 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php	2007-05-03 11:06:44 UTC (rev 5793)
+++ 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php	2007-05-03 13:04:09 UTC (rev 5794)
@@ -121,8 +121,8 @@
     $this->assertEqual($request->getFiles(), $expected);
     $this->assertEqual($request->getFiles('form'), $expected['form']);
 
-    //remove this feature!!!
-    $this->assertEqual($request->get('form'), $expected['form']);
+    //files are not returned with get
+    $this->assertNull($request->get('form'));
   }
 
   function testToString()