public
Description: My mirror of phpspec
Homepage: http://www.phpspec.org/
Clone URL: git://github.com/tedkulp/phpspec.git
* Resolution of conflicts from merge from branches/zend @r189

git-svn-id: http://phpspec.googlecode.com/svn/trunk@208 
d6e91ea2-e33a-0410-98df-1d493bd67c58
padraic.brady (author)
Sat Feb 02 16:47:50 -0800 2008
commit  a374adaedfb185a3305ece9a9099d75e9b21614c
tree    c5ce5ea1f18108a2ac2636a330ad4f56963d3124
parent  0e429e950e32fd23be80cb5493eaa53c8b0ef4b0
...
20
21
22
 
23
24
25
...
20
21
22
23
24
25
26
0
@@ -20,6 +20,7 @@ Bug Fixes/Patches
0
 Harley Bussell (HTML Runner and Reporter submission)
0
 Kubo Atsuhiro (3 bugs with resolving patches on 08 January 2008)
0
 Takagi Masahiro (manual inaccuracy patched on 08 January 2008)
0
+Modmac (HTML Reporter on 26 December 2008)
0
 
0
 Others
0
 ======
...
8
9
10
11
 
12
13
14
...
8
9
10
 
11
12
13
14
0
@@ -8,6 +8,6 @@ class PhpspecController extends Zend_Controller_Action
0
     {
0
         $this->getResponse()->setBody(
0
             $this->getRequest()->text
0
- )
0
+ );
0
     }
0
 }
0
\ No newline at end of file
...
128
129
130
131
132
 
 
133
134
135
...
156
157
158
159
 
160
161
162
 
163
164
165
...
228
229
230
231
 
232
233
...
128
129
130
 
 
131
132
133
134
135
...
156
157
158
 
159
160
161
 
162
163
164
165
...
228
229
230
 
231
232
233
0
@@ -128,8 +128,8 @@ class PHPSpec_Context_Zend extends PHPSpec_Context
0
     }
0
 
0
     public function get($actionName, array $getArray = null, array $paramArray = null)
0
- {
0
- if (!empty($getArray)) {
0
+ {
0
+ if (!empty($getArray)) {
0
           $_GET = $getArray;
0
         }
0
         $this->_response = $this->_makeRequest($actionName, $paramArray);
0
@@ -156,10 +156,10 @@ class PHPSpec_Context_Zend extends PHPSpec_Context
0
     }
0
 
0
     public function response()
0
- {
0
+ {
0
         if (!isset($this->_response)) {
0
           throw new PHPSpec_Exception('No response has been retrieved yet;
0
- make a get or post request first');
0
+ make a get or post request first');
0
         }
0
         return $this->_response;
0
     }
0
@@ -228,5 +228,5 @@ class PHPSpec_Context_Zend extends PHPSpec_Context
0
         $controllerClassName = substr(get_class($this), 8);
0
         $this->_controller = substr($controllerClassName, 0, strlen($controllerClassName)-10);
0
     }
0
-
0
+
0
 }
0
\ No newline at end of file

Comments

    No one has commented yet.