[PHP-CVS] cvs: phpruntests /src/testcase/sections/outputsections rtExpectFSection.php

[Zoe Slattery]

zoe             Sun Jul  5 14:28:27 2009 UTC

  Modified files:              
    /phpruntests/src/testcase/sections/outputsections   
                                                        rtExpectFSection.php 
  Log:
  Added the binary string check for compatibility with run-tests
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php
diff -u 
phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php:1.4 
phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php:1.5
--- phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php:1.4   
Mon May 25 12:12:47 2009
+++ phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php       
Sun Jul  5 14:28:26 2009
@@ -1,7 +1,7 @@
 <?php
 /**
  * rtExpectFSection
- * 
+ *
  * Class for handling EXPECTF sections
  *
  * @category  Testing
@@ -25,8 +25,8 @@
      *
      */
     protected function createPattern()
-    {  
-       
+    {
+         
         $this->expectedPattern = 
$this->expectfEmbeddedRegex($this->expectedPattern);
         $this->expectedPattern = $this->expectfUnicodeSubstitutions 
($this->expectedPattern);
         $this->expectedPattern = 
$this->expectfRegexSubstitutions($this->expectedPattern);
@@ -56,6 +56,14 @@
         $string
         );
 
+        $string = str_replace(
+        array('%binary_string_optional%'),
+        version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' : 'binary 
string',
+        $string
+        );
+
+
+
         return $string;
     }
 
@@ -80,9 +88,9 @@
 
         return $string;
     }
-    
+
     /*
-     * Deal with embedded regular expressions between %r tags. 
+     * Deal with embedded regular expressions between %r tags.
      * @param string
      * @return string
      */
@@ -90,7 +98,7 @@
         $temp = "";
         $r = "%r";
         $startOffset = 0;
-        
+
         $length = strlen($string);
         while($startOffset < $length) {
             $start = strpos($string, $r, $startOffset);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php