Changeset 47735 for trunk/src/wp-includes/class-snoopy.php

Timestamp:

05/01/2020 07:05:04 PM (4 years ago)

Author:

desrosj

Message:

General: Fix various issues flagged by the PHPCompatibilityWP PHPCS ruleset.

As part of the continued effort to improve PHP compatibility, the following improvments are being made:

• Removing deprecated PHP safe_mode checks not found in bundled external libraries.
• Change the remaining while loops using each() to foreach loops.
• Prevent false positives from being flagged for the sodium_compat library being caused by loading this in a non-standard way.
• Add inline comments to not flag deprecated PHP directives in the getID3 library.

Props desrosj, earnjam, dryanpress.
See #49922.

File:

• trunk/src/wp-includes/class-snoopy.php (modified) (11 diffs)

trunk/src/wp-includes/class-snoopy.php

@@ -184 +184 @@
                         $this->_frameurls = array();
 
-                        while(list(,$frameurl) = each($frameurls))
+                        foreach ( $frameurls as $frameurl )
                         {
                             if($this->_framedepth < $this->maxframes)
@@ -244 +244 @@
                     $this->_frameurls = array();
 
-                    while(list(,$frameurl) = each($frameurls))
+                    foreach ( $frameurls as $frameurl )
                     {
                         if($this->_framedepth < $this->maxframes)
@@ -342 +342 @@
                         $this->_frameurls = array();
 
-                        while(list(,$frameurl) = each($frameurls))
+                        foreach ( $frameurls as $frameurl )
                         {
                             if($this->_framedepth < $this->maxframes)
@@ -409 +409 @@
                     $this->_frameurls = array();
 
-                    while(list(,$frameurl) = each($frameurls))
+                    foreach ( $frameurls as $frameurl )
                     {
                         if($this->_framedepth < $this->maxframes)
@@ -630 +630 @@
         // catenate the non-empty matches from the conditional subpattern
 
-        while(list($key,$val) = each($links[2]))
+        foreach ( $links[2] as $key => $val )
         {
             if(!empty($val))
@@ -636 +636 @@
         }
 
-        while(list($key,$val) = each($links[3]))
+        foreach ( $links[3] as $key => $val )
         {
             if(!empty($val))
@@ -822 +822 @@
             if(!is_array($this->rawheaders))
                 $this->rawheaders = (array)$this->rawheaders;
-            while(list($headerKey,$headerVal) = each($this->rawheaders))
+            foreach ( $this->rawheaders as $headerKey => $headerVal )
                 $headers .= $headerKey.": ".$headerVal."\r\n";
         }
@@ -986 +986 @@
             if(!is_array($this->rawheaders))
                 $this->rawheaders = (array)$this->rawheaders;
-            while(list($headerKey,$headerVal) = each($this->rawheaders))
+            foreach ( $this->rawheaders as $headerKey => $headerVal )
                 $headers[] = $headerKey.": ".$headerVal;
         }
@@ -1205 +1205 @@
             case "application/x-www-form-urlencoded":
                 reset($formvars);
-                while(list($key,$val) = each($formvars)) {
+                foreach ( $formvars as $key => $val ) {
                     if (is_array($val) || is_object($val)) {
-                        while (list($cur_key, $cur_val) = each($val)) {
+                        foreach ( $val as $cur_key => $cur_val ) {
                             $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
                         }
@@ -1219 +1219 @@
 
                 reset($formvars);
-                while(list($key,$val) = each($formvars)) {
+                foreach ( $formvars as $key => $val ) {
                     if (is_array($val) || is_object($val)) {
-                        while (list($cur_key, $cur_val) = each($val)) {
+                        foreach ( $val as $cur_key => $cur_val ) {
                             $postdata .= "--".$this->_mime_boundary."\r\n";
                             $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
@@ -1234 +1234 @@
 
                 reset($formfiles);
-                while (list($field_name, $file_names) = each($formfiles)) {
+                foreach ( $formfiles as $field_name => $file_names ) {
                     settype($file_names, "array");
-                    while (list(, $file_name) = each($file_names)) {
+                    foreach ( $file_names as $file_name ) {
                         if (!is_readable($file_name)) continue;