[191] r383@phpspec (orig r191): padraic.brady | 2008-01-11 09:41:28 -0700

[nor...@domain51.com]

Revision

191

Author

phpspec

Date

2008-01-11 09:43:19 -0700 (Fri, 11 Jan 2008)

Log Message

 r383@phpspec (orig r191):  padraic.brady | 2008-01-11 09:41:28 -0700
 Merged r187 into trunk

Modified Paths

• trunk/build/build.xml
• trunk/src/PHPSpec/Specification.php

Property Changed

• /

Diff

Property changes:

Name: svk:merge
   - d6e91ea2-e33a-0410-98df-1d493bd67c58:/:190
   + d6e91ea2-e33a-0410-98df-1d493bd67c58:/:191

Modified: trunk/build/build.xml (190 => 191)

--- trunk/build/build.xml	2008-01-11 16:39:18 UTC (rev 190)
+++ trunk/build/build.xml	2008-01-11 16:43:19 UTC (rev 191)
@@ -44,7 +44,7 @@
     <property name="spec.src.default" value="${project.basedir}/.." />
     <property name="spec.src.classpath" value="/src" />
     <property name="spec.name" value="PHPSpec" />
-    <property name="spec.version" value="0.2.2" /> <!-- VERSION FOR EDITING -->
+    <property name="spec.version" value="0.2.3" /> <!-- VERSION FOR EDITING -->
     <property name="spec.stability" value="stable" />
     <property name="spec.svn.baseurl" value="http://phpspec.googlecode.com/svn/" />
     <property name="spec.svn.url" value="${svn.url}/trunk" />
@@ -216,6 +216,12 @@
                 <install as="phpspec.bat" name="scripts/phpspec.bat" />
             </release>
 
+			<changelog version="0.2.3" date="2008-01-11" license="LGPL">
+                * Patched a Predicate issue courtesy KUBO Atsuhiro
+				* Reminder to self that no regression testing coupled with
+				  a busy day equals a bad time to make a release!
+            </changelog>
+
 			<changelog version="0.2.2" date="2008-01-11" license="LGPL">
                 * Patched a Predicate issue courtesy of Takagi Masahiro
 				  and Kubo

Modified: trunk/src/PHPSpec/Specification.php (190 => 191)

--- trunk/src/PHPSpec/Specification.php	2008-01-11 16:39:18 UTC (rev 190)
+++ trunk/src/PHPSpec/Specification.php	2008-01-11 16:43:19 UTC (rev 191)
@@ -132,7 +132,7 @@
         }
 
         // check for any predicate style matching
-        $result = preg_match("/^((?:be|have)A?n?)(.*)/", $method, $matches);
+        $result = preg_match("/^((?:be|have)(?:A|An)?)(.*)/", $method, $matches);
         if ($result && empty($args) && $this instanceof PHPSpec_Specification_Object) {
             $predicate = $matches[1];
             $predicateSuffix = $matches[2];