Fix TRAC-1016.

sebastianbergmann · Mar 8, 2010 · e8411e5 · e8411e5
1 parent eca3212
commit e8411e5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/PHPUnit/Util/Getopt.php b/PHPUnit/Util/Getopt.php
@@ -76,7 +76,7 @@ public static function getopt(array $args, $short_options, $long_options = NULL)
             sort($long_options);
         }
 
-        if (isset($args[0]{0}) && $args[0]{0} != '-') {
+        if (isset($args[0][0]) && $args[0][0] != '-') {
             array_shift($args);
         }
 
@@ -93,13 +93,13 @@ public static function getopt(array $args, $short_options, $long_options = NULL)
                 break;
             }
 
-            if ($arg{0} != '-' ||
-                (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
+            if ($arg[0] != '-' ||
+                (strlen($arg) > 1 && $arg[1] == '-' && !$long_options)) {
                 $non_opts = array_merge($non_opts, array_slice($args, $i));
                 break;
             }
 
-            elseif (strlen($arg) > 1 && $arg{1} == '-') {
+            elseif (strlen($arg) > 1 && $arg[1] == '-') {
                 self::parseLongOption(
                   substr($arg, 2), $long_options, $opts, $args
                 );
@@ -120,18 +120,18 @@ protected static function parseShortOption($arg, $short_options, &$opts, &$args)
         $argLen = strlen($arg);
 
         for ($i = 0; $i < $argLen; $i++) {
-            $opt     = $arg{$i};
+            $opt     = $arg[$i];
             $opt_arg = NULL;
 
             if (($spec = strstr($short_options, $opt)) === FALSE ||
-                $arg{$i} == ':') {
+                $arg[$i] == ':') {
                 throw new PHPUnit_Framework_Exception(
                   "unrecognized option -- $opt"
                 );
             }
 
-            if (strlen($spec) > 1 && $spec{1} == ':') {
-                if (strlen($spec) > 2 && $spec{2} == ':') {
+            if (strlen($spec) > 1 && $spec[1] == ':') {
+                if (strlen($spec) > 2 && $spec[2] == ':') {
                     if ($i + 1 < $argLen) {
                         $opts[] = array($opt, substr($arg, $i + 1));
                         break;
@@ -180,7 +180,7 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args)
 
             $opt_rest = substr($long_opt, $opt_len);
 
-            if ($opt_rest != '' && $opt{0} != '=' && $i + 1 < $count &&
+            if ($opt_rest != '' && $opt[0] != '=' && $i + 1 < $count &&
                 $opt == substr($long_options[$i+1], 0, $opt_len)) {
                 throw new PHPUnit_Framework_Exception(
                   "option --$opt is ambiguous"

diff --git a/PHPUnit/Util/Test.php b/PHPUnit/Util/Test.php
@@ -300,7 +300,7 @@ private static function resolveCoversToReflectionObjects($coveredElement)
         if (strpos($coveredElement, '::') !== FALSE) {
             list($className, $methodName) = explode('::', $coveredElement);
 
-            if ($methodName{0} == '<') {
+            if ($methodName[0] == '<') {
                 $classes = array($className);
 
                 foreach ($classes as $className)
@@ -318,7 +318,7 @@ private static function resolveCoversToReflectionObjects($coveredElement)
 
                     $class   = new ReflectionClass($className);
                     $methods = $class->getMethods();
-                    $inverse = isset($methodName{1}) && $methodName{1} == '!';
+                    $inverse = isset($methodName[1]) && $methodName[1] == '!';
 
                     if (strpos($methodName, 'protected')) {
                         $visibility = 'isProtected';

diff --git a/README.markdown b/README.markdown
@@ -3,6 +3,11 @@ PHPUnit 3.4
 
 This is the list of changes for the PHPUnit 3.4 release series.
 
+PHPUnit 3.4.12
+--------------
+
+* Fixed TRAC-1016: Usage of `{}` to access string offsets is deprecated.
+
 PHPUnit 3.4.11
 --------------