From: Antonio Ospite Date: Tue, 17 May 2016 22:05:22 +0000 (+0200) Subject: tweeper.php: fix naming conventions for the get_xml_ and preprocess_html_ funcs X-Git-Tag: v0.6~33 X-Git-Url: https://git.ao2.it/tweeper.git/commitdiff_plain/88d4252117c451770a3a7b01322d8f34075b6379?ds=inline tweeper.php: fix naming conventions for the get_xml_ and preprocess_html_ funcs --- diff --git a/tweeper.php b/tweeper.php index f1a4ba9..f7d619e 100644 --- a/tweeper.php +++ b/tweeper.php @@ -65,6 +65,15 @@ class Tweeper { } /** + * Convert string to UpperCamelCase. + */ + public static function toUpperCamelCase($str, $delim = ' ') { + $str_upper = ucwords($str, $delim); + $str_camel_case = str_replace($delim, '', $str_upper); + return $str_camel_case; + } + + /** * Get the contents from a URL. */ private static function getUrlContents($url) { @@ -243,7 +252,7 @@ class Tweeper { /** * Convert the Instagram content to XML. */ - private function get_xml_instagram_com($html) { + private function getXmlInstagramCom($html) { // Extract the json data from the html code. $json_match_expr = '/window._sharedData = (.*);/'; $ret = preg_match($json_match_expr, $html, $matches); @@ -258,7 +267,7 @@ class Tweeper { /** * Make the Facebook HTML processable. */ - private function preprocess_html_facebook_com($html) { + private function preprocessHtmlFacebookCom($html) { $html = str_replace('', '', $html); return $html; @@ -274,7 +283,7 @@ class Tweeper { $xml_errors_value = libxml_use_internal_errors(TRUE); // If there is a host-specific method to get the xml data, use it! - $get_xml_host_method = 'get_xml_' . str_replace(".", "_", $host); + $get_xml_host_method = 'getXml' . Tweeper::toUpperCamelCase($host, '.'); if (method_exists($this, $get_xml_host_method)) { $xml_data = call_user_func_array(array($this, $get_xml_host_method), array($html)); $xmlDoc->loadXML($xml_data); @@ -315,7 +324,7 @@ class Tweeper { return NULL; } - $preprocess_html_host_method = 'preprocess_html_' . str_replace(".", "_", $host); + $preprocess_html_host_method = 'preprocessHtml' . Tweeper::toUpperCamelCase($host, '.'); if (method_exists($this, $preprocess_html_host_method)) { $html = call_user_func_array(array($this, $preprocess_html_host_method), array($html)); }