From: Antonio Ospite Date: Tue, 17 May 2016 21:07:57 +0000 (+0200) Subject: tweeper.php: use lowerCamel case for methods names X-Git-Tag: v0.6~38 X-Git-Url: https://git.ao2.it/tweeper.git/commitdiff_plain/c133c5d67b7d4130b8ec5aec3b972a865d4705ff?ds=sidebyside tweeper.php: use lowerCamel case for methods names --- diff --git a/tweeper.php b/tweeper.php index f712c87..7630e0a 100644 --- a/tweeper.php +++ b/tweeper.php @@ -67,7 +67,7 @@ class Tweeper { /** * Get the contents from a URL. */ - private static function get_contents($url) { + private static function getContents($url) { $ch = curl_init($url); curl_setopt_array($ch, array( CURLOPT_HEADER => FALSE, @@ -88,7 +88,7 @@ class Tweeper { /** * Get the headers from a URL. */ - private static function get_info($url) { + private static function getInfo($url) { $ch = curl_init($url); curl_setopt_array($ch, array( CURLOPT_HEADER => TRUE, @@ -133,7 +133,7 @@ class Tweeper { // See http://sourceforge.net/p/feedvalidator/bugs/72/ $http_url = preg_replace("/^https/", "http", $url); - $url_info = Tweeper::get_info($http_url); + $url_info = Tweeper::getInfo($http_url); $supported = in_array($url_info['content_type'], $supported_content_types); if (!$supported) { @@ -155,7 +155,7 @@ class Tweeper { /** * Mimic the message from libxml.c::php_libxml_ctx_error_level() */ - private function log_xml_error($error) { + private function logXmlError($error) { $output = ""; switch ($error->level) { @@ -189,14 +189,14 @@ class Tweeper { /** * Load a stylesheet if the web site is supported. */ - private function load_stylesheet($host) { + private function loadStylesheet($host) { $stylesheet = "file://" . __DIR__ . "/rss_converter_" . $host . ".xsl"; if (FALSE === file_exists($stylesheet)) { trigger_error("Conversion to RSS not supported for $host ($stylesheet not found)", E_USER_ERROR); return NULL; } - $stylesheet_contents = $this->get_contents($stylesheet); + $stylesheet_contents = $this->getContents($stylesheet); $xslDoc = new DOMDocument(); $xslDoc->loadXML($stylesheet_contents); @@ -212,7 +212,7 @@ class Tweeper { /** * Convert json to xml. */ - private function json_to_xml($json, $root_node_name) { + private function jsonToXml($json, $root_node_name) { // Apparently 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. @@ -252,7 +252,7 @@ class Tweeper { return NULL; } - return $this->json_to_xml($matches[1], 'instagram'); + return $this->jsonToXml($matches[1], 'instagram'); } /** @@ -267,7 +267,7 @@ class Tweeper { /** * Convert the HTML retrieved from the site to XML. */ - private function html_to_xml($html, $host) { + private function htmlToXml($html, $host) { $xmlDoc = new DOMDocument(); // Handle warnings and errors when loading invalid HTML. @@ -284,7 +284,7 @@ class Tweeper { } foreach (libxml_get_errors() as $xml_error) { - $this->log_xml_error($xml_error); + $this->logXmlError($xml_error); } libxml_clear_errors(); libxml_use_internal_errors($xml_errors_value); @@ -305,12 +305,12 @@ class Tweeper { // Strip the leading www. to be more forgiving on input URLs. $host = preg_replace('/^www\./', '', $url["host"]); - $xsltProcessor = $this->load_stylesheet($host); + $xsltProcessor = $this->loadStylesheet($host); if (NULL === $xsltProcessor) { return NULL; } - $html = $this->get_contents($src_url); + $html = $this->getContents($src_url); if (FALSE === $html) { return NULL; } @@ -320,7 +320,7 @@ class Tweeper { $html = call_user_func_array(array($this, $preprocess_html_host_method), array($html)); } - $xmlDoc = $this->html_to_xml($html, $host); + $xmlDoc = $this->htmlToXml($html, $host); if (NULL === $xmlDoc) { return NULL; }