tweeper: fix style issues found by Coder Sniffer

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index a9fce9b..293595f 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -18,7 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * 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');
 
 
 date_default_timezone_set('UTC');
 


@@ -178,39 +182,44 @@ class Tweeper {
     return $xsltProcessor;
   }
 
     return $xsltProcessor;
   }
 

-  private function json_to_xml($html, $json_match_expr, $rootName) {
-    // pre-process, convert json to XML
-    $ret = preg_match($json_match_expr, $html, $matches);
-    if ($ret !== 1) {
-      trigger_error("Cannot match expression: $json_match_expr\n", E_USER_ERROR);
-      return NULL;
-    }
-
-    $data = json_decode($matches[1]);
+  private function json_to_xml($json, $root_node_name) {
+    // 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($json, $assoc = true);

     if (!$data) {
       return NULL;
     }
 
     if (!$data) {
       return NULL;
     }
 

+    $encoder = new XmlEncoder();
+    $normalizer = new ObjectNormalizer();
+    $serializer = new Serializer(array($normalizer), array($encoder));
+

     $serializer_options = array (
     $serializer_options = array (

-      'addDecl' => TRUE,
-      'encoding' => "UTF-8",
-      'indent' => '  ',
-      'rootName' => $rootName,
+      'xml_encoding' => "UTF-8",
+      'xml_format_output' => TRUE,
+      'xml_root_node_name' => $root_node_name,

     );
 
     );
 

-    $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 NULL;
     }
 

-    return $serializer->getSerializedData();
+    return $xml_data;

   }
 
   private function get_xml_instagram_com($html) {
   }
 
   private function get_xml_instagram_com($html) {

-    return $this->json_to_xml($html, '/window._sharedData = (.*);/', 'instagram');
+    // extract the json data from the html code
+    $json_match_expr = '/window._sharedData = (.*);/';
+    $ret = preg_match($json_match_expr, $html, $matches);
+    if ($ret !== 1) {
+      trigger_error("Cannot match expression: $json_match_expr\n", E_USER_ERROR);
+      return NULL;
+    }
+
+    return $this->json_to_xml($matches[1], 'instagram');

   }
 
   private function preprocess_html_facebook_com($html) {
   }
 
   private function preprocess_html_facebook_com($html) {