Changeset 1765

Show
Ignore:
Timestamp:
08/05/08 09:18:59 (4 months ago)
Author:
mikey
Message:

make use of net::stubbles::streams::stubDecodingInputStream and net::stubbles::streams::stubEncodingOutputStream

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • framework/trunk/src/main/php/net/stubbles/console/stubConsoleInputStream.php

    r1763 r1765  
    3939    { 
    4040        if (null === self::$in) { 
    41             self::$in = new self(); 
     41            self::$in      = new self(); 
     42            $inputEncoding = iconv_get_encoding('input_encoding'); 
     43            if ('UTF-8' !== $inputEncoding) { 
     44                stubClassLoader::load('net::stubbles::streams::stubDecodingInputStream'); 
     45                self::$in = new stubDecodingInputStream(self::$in, $inputEncoding); 
     46            } 
    4247        } 
    4348         

  • framework/trunk/src/main/php/net/stubbles/console/stubConsoleOutputStream.php

    r1763 r1765  
    4747    { 
    4848        if (null === self::$out) { 
    49             self::$out = new self(STDOUT); 
     49            self::$out      = new self(STDOUT); 
     50            $outputEncoding = iconv_get_encoding('output_encoding'); 
     51            if ('UTF-8' !== $outputEncoding) { 
     52                stubClassLoader::load('net::stubbles::streams::stubEncodingOutputStream'); 
     53                self::$out = new stubEncodingOutputStream(self::$out, $outputEncoding . '//IGNORE'); 
     54            } 
    5055        } 
    5156         
    …… 
    6166    { 
    6267        if (null === self::$err) { 
    63             self::$err = new self(STDERR); 
     68            self::$err      = new self(STDERR); 
     69            $outputEncoding = iconv_get_encoding('output_encoding'); 
     70            if ('UTF-8' !== $outputEncoding) { 
     71                stubClassLoader::load('net::stubbles::streams::stubEncodingOutputStream'); 
     72                self::$err = new stubEncodingOutputStream(self::$err, $outputEncoding . '//IGNORE'); 
     73            } 
    6474        } 
    6575