[208] r417@phpspec (orig r208): padraic.brady | 2008-02-02 17:47:50 -0700

[nor...@domain51.com]

Revision

208

Author

phpspec

Date

2008-02-02 17:48:21 -0700 (Sat, 02 Feb 2008)

Log Message

 r417@phpspec (orig r208):  padraic.brady | 2008-02-02 17:47:50 -0700
 * Resolution of conflicts from merge from branches/zend @r189

Modified Paths

• trunk/CREDITS
• trunk/specs/_modules/Default/controllers/PhpspecController.php
• trunk/src/PHPSpec/Context/Zend.php

Property Changed

• /

Diff

Property changes:

Name: svk:merge
   - d6e91ea2-e33a-0410-98df-1d493bd67c58:/:207
   + d6e91ea2-e33a-0410-98df-1d493bd67c58:/:208

Modified: trunk/CREDITS (207 => 208)

--- trunk/CREDITS	2008-02-03 00:37:24 UTC (rev 207)
+++ trunk/CREDITS	2008-02-03 00:48:21 UTC (rev 208)
@@ -20,6 +20,7 @@
 Harley Bussell (HTML Runner and Reporter submission)
 Kubo Atsuhiro (3 bugs with resolving patches on 08 January 2008)
 Takagi Masahiro (manual inaccuracy patched on 08 January 2008)
+Modmac (HTML Reporter on 26 December 2008)
 
 Others
 ======

Modified: trunk/specs/_modules/Default/controllers/PhpspecController.php (207 => 208)

--- trunk/specs/_modules/Default/controllers/PhpspecController.php	2008-02-03 00:37:24 UTC (rev 207)
+++ trunk/specs/_modules/Default/controllers/PhpspecController.php	2008-02-03 00:48:21 UTC (rev 208)
@@ -8,6 +8,6 @@
     {
         $this->getResponse()->setBody(
             $this->getRequest()->text
-        )
+        );
     }
 }
\ No newline at end of file

Modified: trunk/src/PHPSpec/Context/Zend.php (207 => 208)

--- trunk/src/PHPSpec/Context/Zend.php	2008-02-03 00:37:24 UTC (rev 207)
+++ trunk/src/PHPSpec/Context/Zend.php	2008-02-03 00:48:21 UTC (rev 208)
@@ -128,8 +128,8 @@
     }
 
     public function get($actionName, array $getArray = null, array $paramArray = null)
-    {
-        if (!empty($getArray)) {
+    {
+        if (!empty($getArray)) {
         	$_GET = $getArray;
         }
         $this->_response = $this->_makeRequest($actionName, $paramArray);
@@ -156,10 +156,10 @@
     }
 
     public function response()
-    {
+    {
         if (!isset($this->_response)) {
         	throw new PHPSpec_Exception('No response has been retrieved yet;
-        	make a get or post request first');
+        	make a get or post request first');
         }
         return $this->_response;
     }
@@ -228,5 +228,5 @@
         $controllerClassName = substr(get_class($this), 8);
         $this->_controller = substr($controllerClassName, 0, strlen($controllerClassName)-10);
     }
-
+
 }
\ No newline at end of file