Merge pull request #139 in ZP/z-push from...

Merge pull request #139 in ZP/z-push from bugfix/ZP-825-composer-replacenullchar-filter-can to develop

* commit '9c478cd5':
  ZP-825 Rename ReplaceNullCharFilter classname, register filter in WBXMLEncoder before it is being used.

src/lib/wbxml/replacenullcharfilter.php

@@ -41,7 +41,7 @@
 * Consult LICENSE file for details
 ************************************************/
 
-class replace_nullchar_filter extends php_user_filter {
+class ReplaceNullcharFilter extends php_user_filter {
 
     /**
      * This method is called whenever data is read from or written to the attached stream.
@@ -66,5 +66,3 @@ class replace_nullchar_filter extends php_user_filter {
         return PSFS_PASS_ON;
     }
 }
-
-stream_filter_register('replacenullchar', 'replace_nullchar_filter');
\ No newline at end of file

src/lib/wbxml/wbxmlencoder.php

@@ -194,6 +194,7 @@ class WBXMLEncoder extends WBXMLDefs {
      */
     public function contentStream($stream, $asBase64 = false) {
         if (!$asBase64) {
+            stream_filter_register('replacenullchar', 'ReplaceNullcharFilter');
             $rnc_filter = stream_filter_append($stream, 'replacenullchar');
         }
 

src/vendor/composer/autoload_classmap.php

@@ -54,6 +54,7 @@ return array(
     'PingTracking' => $baseDir . '/lib/core/pingtracking.php',
     'Provisioning' => $baseDir . '/lib/request/provisioning.php',
     'ProvisioningRequiredException' => $baseDir . '/lib/exceptions/provisioningrequiredexception.php',
+    'ReplaceNullcharFilter' => $baseDir . '/lib/wbxml/replacenullcharfilter.php',
     'Request' => $baseDir . '/lib/request/request.php',
     'RequestProcessor' => $baseDir . '/lib/request/requestprocessor.php',
     'ResolveRecipients' => $baseDir . '/lib/request/resolverecipients.php',
@@ -129,6 +130,5 @@ return array(
     'iCalComponent' => $baseDir . '/include/iCalendar.php',
     'iCalProp' => $baseDir . '/include/iCalendar.php',
     'iCalendar' => $baseDir . '/include/iCalendar.php',
-    'replace_nullchar_filter' => $baseDir . '/lib/wbxml/replacenullcharfilter.php',
     'rtf' => $baseDir . '/include/z_RTF.php',
 );