@@ -46,7 +46,6 @@ require_once 'phing/tasks/ext/HeaderTask.php'; * @author Mehdi Kabab <pioupioum|at|gmail|dot|com> * @version 1.0 * @package phing.tasks.ext - * @todo Manage encoding */ class HeaderPhpTask extends HeaderTask { @@ -66,7 +65,7 @@ class HeaderPhpTask extends HeaderTask while (list($k, $v) = each($content)) { - $pos = strpos($v, '<?php'); + $pos = mb_strpos($v, '<?php', $this->getToEncoding()); if (false !== $pos) { @@ -94,7 +93,9 @@ class HeaderPhpTask extends HeaderTask **/ protected function _concat($header, $content) { - return '<?php' . $this->getEol() . $header . $this->getEol() . $content; + $phpTag = mb_convert_encoding('<?php' . $this->getEol(), $this->getToEncoding(), 'UTF-8'); + + return $phpTag . parent::_concat($header, $content); } } src/HeaderPhpTask.php @@ -43,7 +43,6 @@ require_once 'phing/system/io/PhingFile.php'; * @author Mehdi Kabab <pioupioum|at|gmail|dot|com> * @version 1.0 * @package phing.tasks.ext - * @todo Manage encoding */ class HeaderTask extends Task { @@ -72,6 +71,20 @@ class HeaderTask extends Task protected $_verbosity = Project::MSG_VERBOSE; /** + * Encoding of header file. + * + * @var string + **/ + protected $_encoding = 'UTF-8'; + + /** + * Encoding of input file(s). + * + * @var string + **/ + protected $_destEncoding = 'UTF-8'; + + /** * What to do when it goes pear-shaped. * * @var boolean @@ -137,6 +150,54 @@ class HeaderTask extends Task } /** + * Specifies the encoding for the header file. + * + * @param string $encode The name of the charset used to encode + * @return void + * @access public + **/ + public function setEncoding($encoding) + { + $this->_encoding = (string) $encoding; + } + + /** + * Get the encoding of the header file. + * + * @param void + * @return string + * @access public + **/ + public function getEncoding() + { + return $this->_encoding; + } + + /** + * Specifies the encoding for the input file(s). + * + * @param string $encode The name of the charset used to encode + * @return void + * @access public + **/ + public function setToEncoding($encoding) + { + $this->_destEncoding = (string) $encoding; + } + + /** + * Get the encoding of the input file(s). + * + * @param void + * @return string + * @access public + **/ + public function getToEncoding() + { + return $this->_destEncoding; + } + + /** * Set whether to fail when errors are encountered. * * Stop the build process if true. If false, note errors to the output @@ -446,6 +507,8 @@ class HeaderTask extends Task } } + $header = mb_convert_encoding($header, $this->_destEncoding, $this->_encoding); + return $header . $this->getEol() . $content; } src/HeaderTask.php 425911ea6cb65394d7207ad2a098adcf0d9f10a5 Mehdi Kabab pioupioum@gmail.com http://github.com/piouPiouM/phing-header/commit/90f52688a4d5208afbdc018b4ad2841625e8c768 90f52688a4d5208afbdc018b4ad2841625e8c768 2008-09-06T04:14:36-07:00 2008-09-06T04:14:36-07:00 Added support of encoding. * Added support of encoding attribute (default: UTF-8) * Added support of toencoding attribute (default: UTF-8) 4923ea2f01b4c1cf745ca40127b40434b713ac5e Mehdi Kabab pioupioum@gmail.com