Fix style issues pointed out by PHP_CodeSniffer

[tweeper.git] / src / Tweeper.php

diff --git a/src/Tweeper.php b/src/Tweeper.php
index 5b9f235..10e07e3 100644 (file)
--- a/src/Tweeper.php
+++ b/src/Tweeper.php
@@ -6,7 +6,7 @@ namespace Tweeper;
  * @file
  * Tweeper - a Twitter to RSS web scraper.
  *
  * @file
  * Tweeper - a Twitter to RSS web scraper.
  *

- * Copyright (C) 2013-2018  Antonio Ospite <ao2@ao2.it>
+ * Copyright (C) 2013-2020  Antonio Ospite <ao2@ao2.it>

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -159,16 +159,16 @@ class Tweeper {
    */
   private static function getUrlContents($url) {
     $ch = curl_init($url);
    */
   private static function getUrlContents($url) {
     $ch = curl_init($url);

-    curl_setopt_array($ch, array(
+    curl_setopt_array($ch, [

       CURLOPT_HEADER => FALSE,
       CURLOPT_CONNECTTIMEOUT => Tweeper::$maxConnectionTimeout,
       // Follow http redirects to get the real URL.
       CURLOPT_FOLLOWLOCATION => TRUE,
       CURLOPT_COOKIEFILE => "",
       CURLOPT_RETURNTRANSFER => TRUE,
       CURLOPT_HEADER => FALSE,
       CURLOPT_CONNECTTIMEOUT => Tweeper::$maxConnectionTimeout,
       // Follow http redirects to get the real URL.
       CURLOPT_FOLLOWLOCATION => TRUE,
       CURLOPT_COOKIEFILE => "",
       CURLOPT_RETURNTRANSFER => TRUE,

-      CURLOPT_HTTPHEADER => array('Accept-language: en'),
+      CURLOPT_HTTPHEADER => ['Accept-language: en'],

       CURLOPT_USERAGENT => Tweeper::$userAgent,
       CURLOPT_USERAGENT => Tweeper::$userAgent,

-    ));
+    ]);

     $contents = Tweeper::curlExec($ch);
     curl_close($ch);
 
     $contents = Tweeper::curlExec($ch);
     curl_close($ch);
 


@@ -180,7 +180,7 @@ class Tweeper {
    */
   private static function getUrlInfo($url) {
     $ch = curl_init($url);
    */
   private static function getUrlInfo($url) {
     $ch = curl_init($url);

-    curl_setopt_array($ch, array(
+    curl_setopt_array($ch, [

       CURLOPT_HEADER => TRUE,
       CURLOPT_NOBODY => TRUE,
       CURLOPT_CONNECTTIMEOUT => Tweeper::$maxConnectionTimeout,
       CURLOPT_HEADER => TRUE,
       CURLOPT_NOBODY => TRUE,
       CURLOPT_CONNECTTIMEOUT => Tweeper::$maxConnectionTimeout,


@@ -188,7 +188,7 @@ class Tweeper {
       CURLOPT_FOLLOWLOCATION => TRUE,
       CURLOPT_RETURNTRANSFER => TRUE,
       CURLOPT_USERAGENT => Tweeper::$userAgent,
       CURLOPT_FOLLOWLOCATION => TRUE,
       CURLOPT_RETURNTRANSFER => TRUE,
       CURLOPT_USERAGENT => Tweeper::$userAgent,

-    ));
+    ]);

 
     $ret = Tweeper::curlExec($ch);
     if (FALSE === $ret) {
 
     $ret = Tweeper::curlExec($ch);
     if (FALSE === $ret) {


@@ -209,7 +209,7 @@ class Tweeper {
    * Generate an RSS <enclosure/> element.
    */
   public static function generateEnclosure($url) {
    * Generate an RSS <enclosure/> element.
    */
   public static function generateEnclosure($url) {

-    $supported_content_types = array(
+    $supported_content_types = [

       "application/octet-stream",
       "application/ogg",
       "application/pdf",
       "application/octet-stream",
       "application/ogg",
       "application/pdf",


@@ -228,7 +228,7 @@ class Tweeper {
       "video/mp4",
       "video/mpeg",
       "video/ogg",
       "video/mp4",
       "video/mpeg",
       "video/ogg",

-    );
+    ];

 
     $url_info = Tweeper::getUrlInfo($url);
     if (FALSE === $url_info) {
 
     $url_info = Tweeper::getUrlInfo($url);
     if (FALSE === $url_info) {


@@ -310,13 +310,13 @@ class Tweeper {
 
     $encoder = new XmlEncoder();
     $normalizer = new ObjectNormalizer();
 
     $encoder = new XmlEncoder();
     $normalizer = new ObjectNormalizer();

-    $serializer = new Serializer(array($normalizer), array($encoder));
+    $serializer = new Serializer([$normalizer], [$encoder]);

 
 

-    $serializer_options = array(
+    $serializer_options = [

       'xml_encoding' => "UTF-8",
       'xml_format_output' => TRUE,
       'xml_root_node_name' => $root_node_name,
       'xml_encoding' => "UTF-8",
       'xml_format_output' => TRUE,
       'xml_root_node_name' => $root_node_name,

-    );
+    ];

 
     $xml_data = $serializer->serialize($data, 'xml', $serializer_options);
     if (!$xml_data) {
 
     $xml_data = $serializer->serialize($data, 'xml', $serializer_options);
     if (!$xml_data) {


@@ -375,7 +375,7 @@ class Tweeper {
     // If there is a host-specific method to get the XML data, use it!
     $get_xml_host_method = 'getXml' . Tweeper::toUpperCamelCase($host, '.');
     if (method_exists($this, $get_xml_host_method)) {
     // If there is a host-specific method to get the XML data, use it!
     $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));
+      $xml_data = call_user_func_array([$this, $get_xml_host_method], [$html]);

       $xmlDoc->loadXML($xml_data);
     }
     else {
       $xmlDoc->loadXML($xml_data);
     }
     else {


@@ -434,7 +434,7 @@ class Tweeper {
 
     if (TRUE === $validate_scheme) {
       $scheme = $url["scheme"];
 
     if (TRUE === $validate_scheme) {
       $scheme = $url["scheme"];

-      if (!in_array($scheme, array("http", "https"))) {
+      if (!in_array($scheme, ["http", "https"])) {

         trigger_error("unsupported scheme: $scheme", E_USER_WARNING);
         return NULL;
       }
         trigger_error("unsupported scheme: $scheme", E_USER_WARNING);
         return NULL;
       }


@@ -463,7 +463,7 @@ class Tweeper {
 
     $preprocess_html_host_method = 'preprocessHtml' . Tweeper::toUpperCamelCase($host, '.');
     if (method_exists($this, $preprocess_html_host_method)) {
 
     $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));
+      $html = call_user_func_array([$this, $preprocess_html_host_method], [$html]);

     }
 
     $xmlDoc = $this->htmlToXml($html, $host);
     }
 
     $xmlDoc = $this->htmlToXml($html, $host);