Jelajahi Sumber

ZF-10208: replace calls of chr([number]) without a variable argument by a direct string

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22653 44c647ce-9c0f-0410-b52a-842ac1e357ba
mabe 15 tahun lalu
induk
melakukan
148bb1043a

+ 2 - 2
library/Zend/Crypt/Math/BigInteger/Bcmath.php

@@ -166,14 +166,14 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In
         $cmp = bccomp($operand, 0);
         $return = '';
         if ($cmp == 0) {
-            return (chr(0));
+            return "\0";
         }
         while (bccomp($operand, 0) > 0) {
             $return = chr(bcmod($operand, 256)) . $return;
             $operand = bcdiv($operand, 256);
         }
         if (ord($return[0]) > 127) {
-            $return = chr(0) . $return;
+            $return = "\0" . $return;
         }
         return $return;
     }

+ 5 - 5
library/Zend/Json/Decoder.php

@@ -367,19 +367,19 @@ class Zend_Json_Decoder
                                 $result .= '/';
                                 break;
                             case 'b' :
-                                $result .= chr(8);
+                                $result .= "\x08";
                                 break;
                             case 'f' :
-                                $result .= chr(12);
+                                $result .= "\x0c";
                                 break;
                             case 'n' :
-                                $result .= chr(10);
+                                $result .= "\x0a";
                                 break;
                             case 'r' :
-                                $result .= chr(13);
+                                $result .= "\x0d";
                                 break;
                             case 't' :
-                                $result .= chr(9);
+                                $result .= "\x09";
                                 break;
                             case '\'' :
                                 $result .= '\'';

+ 1 - 1
library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php

@@ -94,7 +94,7 @@ class Zend_Mail_Protocol_Smtp_Auth_Crammd5 extends Zend_Mail_Protocol_Smtp
         if (strlen($key) > 64) {
             $key = pack('H32', md5($key));
         } elseif (strlen($key) < 64) {
-            $key = str_pad($key, $block, chr(0));
+            $key = str_pad($key, $block, "\0");
         }
 
         $k_ipad = substr($key, 0, 64) ^ str_repeat(chr(0x36), 64);

+ 1 - 1
library/Zend/Mail/Protocol/Smtp/Auth/Plain.php

@@ -89,7 +89,7 @@ class Zend_Mail_Protocol_Smtp_Auth_Plain extends Zend_Mail_Protocol_Smtp
 
         $this->_send('AUTH PLAIN');
         $this->_expect(334);
-        $this->_send(base64_encode(chr(0) . $this->_username . chr(0) . $this->_password));
+        $this->_send(base64_encode("\0" . $this->_username . "\0" . $this->_password));
         $this->_expect(235);
         $this->_auth = true;
     }

+ 4 - 4
library/Zend/OpenId.php

@@ -585,7 +585,7 @@ class Zend_OpenId
         } else if (extension_loaded('bcmath')) {
             $cmp = bccomp($bn, 0);
             if ($cmp == 0) {
-                return (chr(0));
+                return "\0";
             } else if ($cmp < 0) {
                 require_once "Zend/OpenId/Exception.php";
                 throw new Zend_OpenId_Exception(
@@ -598,7 +598,7 @@ class Zend_OpenId
                 $bn = bcdiv($bn, 256);
             }
             if (ord($bin[0]) > 127) {
-                $bin = chr(0) . $bin;
+                $bin = "\0" . $bin;
             }
             return $bin;
         }
@@ -693,7 +693,7 @@ class Zend_OpenId
         if (function_exists('openssl_dh_compute_key')) {
             $ret = openssl_dh_compute_key($pub_key, $dh);
             if (ord($ret[0]) > 127) {
-                $ret = chr(0) . $ret;
+                $ret = "\0" . $ret;
             }
             return $ret;
         } else if (extension_loaded('gmp')) {
@@ -729,7 +729,7 @@ class Zend_OpenId
     static public function btwoc($str)
     {
         if (ord($str[0]) > 127) {
-            return chr(0) . $str;
+            return "\0" . $str;
         }
         return $str;
     }

+ 1 - 1
library/Zend/Pdf.php

@@ -1223,7 +1223,7 @@ class Zend_Pdf
                         if (extension_loaded('mbstring') === true) {
                             $detected = mb_detect_encoding($value);
                             if ($detected !== 'ASCII') {
-                                $value = chr(254) . chr(255) . mb_convert_encoding($value, 'UTF-16', $detected);
+                                $value = "\xfe\xff" . mb_convert_encoding($value, 'UTF-16', $detected);
                             }
                         }
                         $docInfo->$key = new Zend_Pdf_Element_String((string)$value);

+ 1 - 1
library/Zend/Pdf/FileParser/Image/Png.php

@@ -312,7 +312,7 @@ class Zend_Pdf_FileParser_Image_Png extends Zend_Pdf_FileParser_Image
                   */
 
                   $tmpData = $this->readBytes($chunkLength);
-                  if(($trnsIdx = strpos($tmpData, chr(0))) !== false) {
+                  if(($trnsIdx = strpos($tmpData, "\0")) !== false) {
                        $this->_transparencyData = array($trnsIdx, $trnsIdx);
                   }
 

+ 1 - 1
library/Zend/Pdf/Filter/Ascii85.php

@@ -78,7 +78,7 @@ class Zend_Pdf_Filter_Ascii85 implements Zend_Pdf_Filter_Interface
 
             //0 pad the rest
             for ($j = $n;$j < 4;$j++) {
-                $chunk .= chr(0);
+                $chunk .= "\0";
             }
 
             $b = unpack("N", $chunk);

+ 1 - 1
library/Zend/Pdf/Resource/Image/Png.php

@@ -167,7 +167,7 @@ class Zend_Pdf_Resource_Image_Png extends Zend_Pdf_Resource_Image
 
                         case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_INDEXED:
                             //Find the first transparent color in the index, we will mask that. (This is a bit of a hack. This should be a SMask and mask all entries values).
-                            if(($trnsIdx = strpos($trnsData, chr(0))) !== false) {
+                            if(($trnsIdx = strpos($trnsData, "\0")) !== false) {
                                 $transparencyData = array(new Zend_Pdf_Element_Numeric($trnsIdx),
                                                           new Zend_Pdf_Element_Numeric($trnsIdx));
                             }

+ 2 - 2
library/Zend/Translate/Adapter/Gettext.php

@@ -111,7 +111,7 @@ class Zend_Translate_Adapter_Gettext extends Zend_Translate_Adapter {
             if ($origtemp[$count * 2 + 1] != 0) {
                 fseek($this->_file, $origtemp[$count * 2 + 2]);
                 $original = @fread($this->_file, $origtemp[$count * 2 + 1]);
-                $original = explode(chr(00), $original);
+                $original = explode("\0", $original);
             } else {
                 $original[0] = '';
             }
@@ -119,7 +119,7 @@ class Zend_Translate_Adapter_Gettext extends Zend_Translate_Adapter {
             if ($transtemp[$count * 2 + 1] != 0) {
                 fseek($this->_file, $transtemp[$count * 2 + 2]);
                 $translate = fread($this->_file, $transtemp[$count * 2 + 1]);
-                $translate = explode(chr(00), $translate);
+                $translate = explode("\0", $translate);
                 if ((count($original) > 1) && (count($translate) > 1)) {
                     $this->_data[$locale][$original[0]] = $translate;
                     array_shift($original);