Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part
php · May 3, 2013 · 67d83de · 67d83de
2 parents eff60f9 + 8c3b8f3
commit 67d83de
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/ext/snmp/tests/snmp-object.phpt b/ext/snmp/tests/snmp-object.phpt
@@ -90,12 +90,6 @@ array_shift($z);
 var_dump(key($z));
 array_shift($z);
 var_dump(key($z));
-array_shift($z);
-var_dump(key($z));
-array_shift($z);
-var_dump(key($z));
-array_shift($z);
-var_dump(key($z));
 var_dump($session->close());
 
 echo "SNMPv3 (default security settings)\n";
@@ -211,9 +205,6 @@ string(3) "2.0"
 string(3) "3.0"
 string(3) "4.0"
 string(3) "5.0"
-string(3) "6.0"
-string(3) "7.0"
-string(3) "8.0"
 bool(true)
 SNMPv3 (default security settings)
 string(%d) "%S"