X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/6529870c449d426d645115d3f35191c4b2023340..84dc8897a796b91632cee1e0d736f811978022f6:/tweeper.php?ds=sidebyside

diff --git a/tweeper.php b/tweeper.php
index a9fce9b..bed6350 100644
--- a/tweeper.php
+++ b/tweeper.php
@@ -18,7 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once 'XML/Serializer.php';
+require_once 'Symfony/Component/Serializer/autoload.php';
+
+use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 
 date_default_timezone_set('UTC');
 
@@ -186,27 +190,31 @@ class Tweeper {
       return NULL;
     }
 
-    $data = json_decode($matches[1]);
+    // Apparenty the ObjectNormalizer used afterwards is not able to handle
+    // the stdClass object created by json_decode() with the default setting
+    // $assoc = false; so use $assoc = true 
+    $data = json_decode($matches[1], $assoc = true);
     if (!$data) {
       return NULL;
     }
 
+    $encoder = new XmlEncoder();
+    $normalizer = new ObjectNormalizer();
+    $serializer = new Serializer(array($normalizer), array($encoder));
+
     $serializer_options = array (
-      'addDecl' => TRUE,
-      'encoding' => "UTF-8",
-      'indent' => '  ',
-      'rootName' => $rootName,
+      'xml_encoding' => "UTF-8",
+      'xml_format_output' => TRUE,
+      'xml_root_node_name' => $rootName,
     );
 
-    $serializer = new XML_Serializer($serializer_options);
-
-    $status = $serializer->serialize($data);
-    if (PEAR::isError($status)) {
-      trigger_error($status->getMessage(), E_USER_ERROR);
+    $xml_data = $serializer->serialize($data, 'xml', $serializer_options);
+    if (!$xml_data) {
+      trigger_error("Cannot serialize data", E_USER_ERROR);
       return NULL;
     }
 
-    return $serializer->getSerializedData();
+    return $xml_data;
   }
 
   private function get_xml_instagram_com($html) {