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

[svn at limb-project.com]

Author: pachanga
Date: 2007-06-11 13:39:42 +0400 (Mon, 11 Jun 2007)
New Revision: 5985
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5985

Modified:
   3.x/trunk/limb/net/src/lmbHttpRequest.class.php
   3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php
Log:
-- files are part of request again, i.e you can get it with generic get() call

Modified: 3.x/trunk/limb/net/src/lmbHttpRequest.class.php
===================================================================
--- 3.x/trunk/limb/net/src/lmbHttpRequest.class.php	2007-06-11 09:16:12 UTC (rev 5984)
+++ 3.x/trunk/limb/net/src/lmbHttpRequest.class.php	2007-06-11 09:39:42 UTC (rev 5985)
@@ -1,22 +1,22 @@
 <?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 lmb_require('limb/core/src/lmbSet.class.php');
 lmb_require('limb/core/src/lmbArrayHelper.class.php');
 lmb_require('limb/net/src/lmbUri.class.php');
-lmb_require('limb/net/src/lmbUploadedFilesParser.class.php');
-
+lmb_require('limb/net/src/lmbUploadedFilesParser.class.php');
+
 /**
  * class lmbHttpRequest.
  *
  * @package net
  * @version $Id$
- */
+ */
 class lmbHttpRequest extends lmbSet
 {
   protected $uri;
@@ -53,7 +53,7 @@
       $this->cookies = $this->_stripHttpSlashes($this->cookies);
     }
 
-    $this->request = lmbArrayHelper :: arrayMerge($this->get, $this->post);
+    $this->request = lmbArrayHelper :: arrayMerge($this->get, $this->post, $this->files);
 
     foreach($this->request as $k => $v)
       $this->set($k, $v);

Modified: 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php	2007-06-11 09:16:12 UTC (rev 5984)
+++ 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php	2007-06-11 09:39:42 UTC (rev 5985)
@@ -1,10 +1,10 @@
 <?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 lmb_require('limb/net/src/lmbHttpRequest.class.php');
 lmb_require('limb/net/src/lmbUri.class.php');
@@ -125,8 +125,8 @@
     $this->assertEqual($request->getFiles(), $expected);
     $this->assertEqual($request->getFiles('form'), $expected['form']);
 
-    //files are not returned with get
-    $this->assertNull($request->get('form'));
+    //files ARE returned with raw get
+    $this->assertEqual($request->get('form'), $expected['form']);
   }
 
   function testGetFilesMultipartException()