projects
/
tweeper.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the Symfony Serializer component instead of the PEAR XML_Serializer
[tweeper.git]
/
tweeper.php
diff --git
a/tweeper.php
b/tweeper.php
index
f07382b
..
bed6350
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');
@@
-186,27
+190,31
@@
class Tweeper {
return NULL;
}
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;
}
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' => $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 NULL;
}
- return $
serializer->getSerializedData()
;
+ return $
xml_data
;
}
private function get_xml_instagram_com($html) {
}
private function get_xml_instagram_com($html) {
@@
-354,7
+362,7
@@
if (is_cli()) {
}
if (!isset($options['src_url'])) {
}
if (!isset($options['src_url'])) {
- fwrite($ERROR_STREAM, usage(
$argv
));
+ fwrite($ERROR_STREAM, usage(
is_cli() ? $argv : NULL
));
exit(1);
}
exit(1);
}