From 3bc8c9468a9fd517c9f769f5fcb141ed5495f3df Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Fri, 1 Nov 2019 18:06:38 +0100 Subject: [PATCH] phpcs: Always use long array syntax Most of the code in RSS-Bridge uses the long array syntax. This commit adds a check to enforce using this syntax over the short array syntax. All failures have been fixed. --- bridges/AmazonPriceTrackerBridge.php | 8 ++++---- bridges/AppleMusicBridge.php | 20 ++++++++++---------- bridges/AtmoNouvelleAquitaineBridge.php | 2 +- bridges/BingSearchBridge.php | 2 +- bridges/CNETFranceBridge.php | 4 ++-- bridges/CachetBridge.php | 6 +++--- bridges/ContainerLinuxReleasesBridge.php | 18 +++++++++--------- bridges/DribbbleBridge.php | 6 +++--- bridges/EconomistBridge.php | 2 +- bridges/ElloBridge.php | 4 ++-- bridges/FB2Bridge.php | 8 ++++++-- bridges/HDWallpapersBridge.php | 2 +- bridges/InstagramBridge.php | 6 +++--- bridges/LeBonCoinBridge.php | 8 ++++---- bridges/N26Bridge.php | 2 +- bridges/PinterestBridge.php | 2 +- bridges/RevolutBridge.php | 6 +++--- bridges/RoadAndTrackBridge.php | 2 +- bridges/XenForoBridge.php | 12 ++++++------ lib/contents.php | 4 ++-- phpcs.xml | 2 ++ 21 files changed, 66 insertions(+), 60 deletions(-) diff --git a/bridges/AmazonPriceTrackerBridge.php b/bridges/AmazonPriceTrackerBridge.php index 6fa11c91..950178a7 100644 --- a/bridges/AmazonPriceTrackerBridge.php +++ b/bridges/AmazonPriceTrackerBridge.php @@ -134,11 +134,11 @@ EOT; // data-asin="B00WTHJ5SU" data-asin-price="14.99" data-asin-shipping="0" // data-asin-currency-code="USD" data-substitute-count="-1" ... /> if ($asinData) { - return [ + return array( 'price' => $asinData->getAttribute('data-asin-price'), 'currency' => $asinData->getAttribute('data-asin-currency-code'), 'shipping' => $asinData->getAttribute('data-asin-shipping') - ]; + ); } return false; @@ -150,11 +150,11 @@ EOT; preg_match('/^\s*([A-Z]{3}|£|\$)\s?([\d.,]+)\s*$/', $priceDiv->plaintext, $matches); if (count($matches) === 3) { - return [ + return array( 'price' => $matches[2], 'currency' => $matches[1], 'shipping' => '0' - ]; + ); } return false; diff --git a/bridges/AppleMusicBridge.php b/bridges/AppleMusicBridge.php index 5a4f40a4..30119777 100644 --- a/bridges/AppleMusicBridge.php +++ b/bridges/AppleMusicBridge.php @@ -5,19 +5,19 @@ class AppleMusicBridge extends BridgeAbstract { const URI = 'https://www.apple.com'; const DESCRIPTION = 'Fetches the latest releases from an artist'; const MAINTAINER = 'Limero'; - const PARAMETERS = [[ - 'url' => [ + const PARAMETERS = array(array( + 'url' => array( 'name' => 'Artist URL', 'exampleValue' => 'https://itunes.apple.com/us/artist/dunderpatrullen/329796274', 'required' => true, - ], - 'imgSize' => [ + ), + 'imgSize' => array( 'name' => 'Image size for thumbnails (in px)', 'type' => 'number', 'defaultValue' => 512, 'required' => true, - ] - ]]; + ) + )); const CACHE_TIMEOUT = 21600; // 6 hours public function collectData() { @@ -36,12 +36,12 @@ class AppleMusicBridge extends BridgeAbstract { // Loop through each object foreach ($json->included as $obj) { if ($obj->type === 'lockup/album') { - $this->items[] = [ + $this->items[] = array( 'title' => $obj->attributes->artistName . ' - ' . $obj->attributes->name, 'uri' => $obj->attributes->url, 'timestamp' => $obj->attributes->releaseDate, 'enclosures' => $obj->relationships->artwork->data->id, - ]; + ); } elseif ($obj->type === 'image') { $images[$obj->id] = $obj->attributes->url; } @@ -49,9 +49,9 @@ class AppleMusicBridge extends BridgeAbstract { // Add the images to each item foreach ($this->items as &$item) { - $item['enclosures'] = [ + $item['enclosures'] = array( str_replace('{w}x{h}bb.{f}', $imgSize . 'x0w.jpg', $images[$item['enclosures']]), - ]; + ); } // Sort the order to put the latest albums first diff --git a/bridges/AtmoNouvelleAquitaineBridge.php b/bridges/AtmoNouvelleAquitaineBridge.php index 2ded81a0..d395fa78 100644 --- a/bridges/AtmoNouvelleAquitaineBridge.php +++ b/bridges/AtmoNouvelleAquitaineBridge.php @@ -77,7 +77,7 @@ class AtmoNouvelleAquitaineBridge extends BridgeAbstract { private function getLegendIndexes() { $rawIndexes = $this->dom->find('.prevision-legend .prevision-legend-label'); - $indexes = []; + $indexes = array(); for ($i = 0; $i < count($rawIndexes); $i++) { if ($rawIndexes[$i]->hasAttribute('data-color')) { $indexes[$rawIndexes[$i]->getAttribute('data-color')] = $rawIndexes[$i]->innertext; diff --git a/bridges/BingSearchBridge.php b/bridges/BingSearchBridge.php index eb8a5fc9..357feb6c 100644 --- a/bridges/BingSearchBridge.php +++ b/bridges/BingSearchBridge.php @@ -92,7 +92,7 @@ class BingSearchBridge extends BridgeAbstract or returnServerError('Could not request ' . self::NAME); $sizeKey = $this->getInput('image_size'); - $items = []; + $items = array(); foreach ($html->find('a.iusc') as $element) { $data = json_decode(htmlspecialchars_decode($element->getAttribute('m')), true); diff --git a/bridges/CNETFranceBridge.php b/bridges/CNETFranceBridge.php index 222c8b9a..d005fd1f 100644 --- a/bridges/CNETFranceBridge.php +++ b/bridges/CNETFranceBridge.php @@ -23,8 +23,8 @@ class CNETFranceBridge extends FeedExpander ) ); - private $bannedTitle = []; - private $bannedURL = []; + private $bannedTitle = array(); + private $bannedURL = array(); public function collectData() { diff --git a/bridges/CachetBridge.php b/bridges/CachetBridge.php index a60b8f73..75b18017 100644 --- a/bridges/CachetBridge.php +++ b/bridges/CachetBridge.php @@ -22,7 +22,7 @@ class CachetBridge extends BridgeAbstract { ); const CACHE_TIMEOUT = 300; - private $componentCache = []; + private $componentCache = array(); public function getURI() { return $this->getInput('host') === null ? 'https://cachethq.io/' : $this->getInput('host'); @@ -114,13 +114,13 @@ class CachetBridge extends BridgeAbstract { $uidOrig = $permalink . $incident->created_at; $uid = hash('sha512', $uidOrig); $timestamp = strtotime($incident->created_at); - $categories = []; + $categories = array(); $categories[] = $incident->human_status; if ($componentName !== '') { $categories[] = $componentName; } - $item = []; + $item = array(); $item['uri'] = $permalink; $item['title'] = $title; $item['timestamp'] = $timestamp; diff --git a/bridges/ContainerLinuxReleasesBridge.php b/bridges/ContainerLinuxReleasesBridge.php index d2f63256..d459b0fc 100644 --- a/bridges/ContainerLinuxReleasesBridge.php +++ b/bridges/ContainerLinuxReleasesBridge.php @@ -10,20 +10,20 @@ class ContainerLinuxReleasesBridge extends BridgeAbstract { const BETA = 'beta'; const ALPHA = 'alpha'; - const PARAMETERS = [ - [ - 'channel' => [ + const PARAMETERS = array( + array( + 'channel' => array( 'name' => 'Release Channel', 'type' => 'list', 'defaultValue' => self::STABLE, - 'values' => [ + 'values' => array( 'Stable' => self::STABLE, 'Beta' => self::BETA, 'Alpha' => self::ALPHA, - ], - ] - ] - ]; + ), + ) + ) + ); private function getReleaseFeed($jsonUrl) { $json = getContents($jsonUrl) @@ -39,7 +39,7 @@ class ContainerLinuxReleasesBridge extends BridgeAbstract { $data = $this->getReleaseFeed($this->getJsonUri()); foreach ($data as $releaseVersion => $release) { - $item = []; + $item = array(); $item['uri'] = "https://coreos.com/releases/#$releaseVersion"; $item['title'] = $releaseVersion; diff --git a/bridges/DribbbleBridge.php b/bridges/DribbbleBridge.php index 5058da63..b1193c90 100644 --- a/bridges/DribbbleBridge.php +++ b/bridges/DribbbleBridge.php @@ -19,7 +19,7 @@ favicon-63b2904a073c89b52b19aa08cebc16a154bcf83fee8ecc6439968b1e6db569c7.ico'; $json = $this->loadEmbeddedJsonData($html); foreach($html->find('li[id^="screenshot-"]') as $shot) { - $item = []; + $item = array(); $additional_data = $this->findJsonForShot($shot, $json); if ($additional_data === null) { @@ -38,14 +38,14 @@ favicon-63b2904a073c89b52b19aa08cebc16a154bcf83fee8ecc6439968b1e6db569c7.ico'; $preview_path = $shot->find('picture source', 0)->attr['srcset']; $item['content'] .= $this->getImageTag($preview_path, $item['title']); - $item['enclosures'] = [$this->getFullSizeImagePath($preview_path)]; + $item['enclosures'] = array($this->getFullSizeImagePath($preview_path)); $this->items[] = $item; } } private function loadEmbeddedJsonData($html){ - $json = []; + $json = array(); $scripts = $html->find('script'); foreach($scripts as $script) { diff --git a/bridges/EconomistBridge.php b/bridges/EconomistBridge.php index 1256be45..94121ac3 100644 --- a/bridges/EconomistBridge.php +++ b/bridges/EconomistBridge.php @@ -40,7 +40,7 @@ class EconomistBridge extends BridgeAbstract { if ($nextprev) $nextprev->outertext = ''; - $section = [ $article->find('h3[itemprop="articleSection"]', 0)->plaintext ]; + $section = array( $article->find('h3[itemprop="articleSection"]', 0)->plaintext ); $item = array(); $item['title'] = $header->find('span', 0)->innertext . ': ' diff --git a/bridges/ElloBridge.php b/bridges/ElloBridge.php index 3de167ef..8bcfa922 100644 --- a/bridges/ElloBridge.php +++ b/bridges/ElloBridge.php @@ -95,7 +95,7 @@ class ElloBridge extends BridgeAbstract { private function getEnclosures($post, $postData) { - $assets = []; + $assets = array(); foreach($post->links->assets as $asset) { foreach($postData->linked->assets as $assetLink) { if($asset == $assetLink->id) { @@ -124,7 +124,7 @@ class ElloBridge extends BridgeAbstract { $cacheFac->setWorkingDir(PATH_LIB_CACHES); $cache = $cacheFac->create(Configuration::getConfig('cache', 'type')); $cache->setScope(get_called_class()); - $cache->setKey(['key']); + $cache->setKey(array('key')); $key = $cache->loadData(); if($key == null) { diff --git a/bridges/FB2Bridge.php b/bridges/FB2Bridge.php index 356f0e67..77ae271e 100644 --- a/bridges/FB2Bridge.php +++ b/bridges/FB2Bridge.php @@ -112,7 +112,7 @@ EOD //Decode images $imagecleaned = preg_replace_callback('/]* style="[^"]*url\(\'(.*?)\'\).*?><\/i>/m', function ($matches) { - return ""; + return ""; }, $content); $content = str_get_html($imagecleaned); @@ -164,7 +164,11 @@ EOD $content = preg_replace('//m', '', $content); //Remove the double section tags - $content = str_replace(['
', '
'], ['
', '
'], $content); + $content = str_replace( + array('
', '
'), + array('
', '
'), + $content + ); //Move the section tag link upper, if it is down $content = str_get_html($content); diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php index 17798293..16c08e75 100644 --- a/bridges/HDWallpapersBridge.php +++ b/bridges/HDWallpapersBridge.php @@ -72,7 +72,7 @@ class HDWallpapersBridge extends BridgeAbstract { public function getName(){ if(!is_null($this->getInput('c')) && !is_null($this->getInput('r'))) { return 'HDWallpapers - ' - . str_replace(['__', '_'], [' & ', ' '], $this->getInput('c')) + . str_replace(array('__', '_'), array(' & ', ' '), $this->getInput('c')) . ' [' . $this->getInput('r') . ']'; diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php index 6fe49439..fe712b86 100644 --- a/bridges/InstagramBridge.php +++ b/bridges/InstagramBridge.php @@ -58,7 +58,7 @@ class InstagramBridge extends BridgeAbstract { $cacheFac->setWorkingDir(PATH_LIB_CACHES); $cache = $cacheFac->create(Configuration::getConfig('cache', 'type')); $cache->setScope(get_called_class()); - $cache->setKey([$username]); + $cache->setKey(array($username)); $key = $cache->loadData(); if($key == null) { @@ -178,7 +178,7 @@ class InstagramBridge extends BridgeAbstract { $caption = ''; } - $enclosures = [$mediaInfo->display_url]; + $enclosures = array($mediaInfo->display_url); $content = '' . $caption . ''; foreach($mediaInfo->edge_sidecar_to_children->edges as $media) { @@ -189,7 +189,7 @@ class InstagramBridge extends BridgeAbstract { } } - return [$content, $enclosures]; + return array($content, $enclosures); } diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php index 519fc917..fc1432e3 100644 --- a/bridges/LeBonCoinBridge.php +++ b/bridges/LeBonCoinBridge.php @@ -431,11 +431,11 @@ class LeBonCoinBridge extends BridgeAbstract { ); if($this->getInput('region') != '') { - $requestJson->filters->location['regions'] = [$this->getInput('region')]; + $requestJson->filters->location['regions'] = array($this->getInput('region')); } if($this->getInput('department') != '') { - $requestJson->filters->location['departments'] = [$this->getInput('department')]; + $requestJson->filters->location['departments'] = array($this->getInput('department')); } if($this->getInput('cities') != '') { @@ -467,7 +467,7 @@ class LeBonCoinBridge extends BridgeAbstract { } if($this->getInput('estate') != '') { - $requestJson->filters->enums['real_estate_type'] = [$this->getInput('estate')]; + $requestJson->filters->enums['real_estate_type'] = array($this->getInput('estate')); } if($this->getInput('roomsmin') != '' @@ -526,7 +526,7 @@ class LeBonCoinBridge extends BridgeAbstract { } if($this->getInput('fuel') != '') { - $requestJson->filters->enums['fuel'] = [$this->getInput('fuel')]; + $requestJson->filters->enums['fuel'] = array($this->getInput('fuel')); } $requestJson->limit = 30; diff --git a/bridges/N26Bridge.php b/bridges/N26Bridge.php index 3b8c0e64..ac43756b 100644 --- a/bridges/N26Bridge.php +++ b/bridges/N26Bridge.php @@ -19,7 +19,7 @@ class N26Bridge extends BridgeAbstract or returnServerError('Error while downloading the website content'); foreach($html->find('div[class="ag ah ai aj bs bt dx ea fo gx ie if ih ii ij ik s"]') as $article) { - $item = []; + $item = array(); $item['uri'] = self::URI . $article->find('h2 a', 0)->href; $item['title'] = $article->find('h2 a', 0)->plaintext; diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php index 3e518634..48c0cfca 100644 --- a/bridges/PinterestBridge.php +++ b/bridges/PinterestBridge.php @@ -30,7 +30,7 @@ class PinterestBridge extends FeedExpander { private function fixLowRes() { - $newitems = []; + $newitems = array(); $pattern = '/https\:\/\/i\.pinimg\.com\/[a-zA-Z0-9]*x\//'; foreach($this->items as $item) { diff --git a/bridges/RevolutBridge.php b/bridges/RevolutBridge.php index 7e820993..04ca3770 100644 --- a/bridges/RevolutBridge.php +++ b/bridges/RevolutBridge.php @@ -18,13 +18,13 @@ class RevolutBridge extends BridgeAbstract { $articles = array_slice($articleOverview->find('url'), 0, 15); foreach($articles as $article) { - $item = []; + $item = array(); $item['uri'] = $article->find('loc', 0)->plaintext; $item['timestamp'] = $article->find('lastmod', 0)->plaintext; - $item['enclosures'] = [ + $item['enclosures'] = array( $article->find('image:loc', 0)->plaintext - ]; + ); $fullArticle = getSimpleHTMLDOMCached($item['uri']) or returnServerError('Error while downloading the full article'); diff --git a/bridges/RoadAndTrackBridge.php b/bridges/RoadAndTrackBridge.php index b3f0acc0..22ec8b52 100644 --- a/bridges/RoadAndTrackBridge.php +++ b/bridges/RoadAndTrackBridge.php @@ -25,7 +25,7 @@ class RoadAndTrackBridge extends BridgeAbstract { private function fixImages($content) { - $enclosures = []; + $enclosures = array(); foreach($content->find('img') as $image) { $image->src = explode('?', $image->getAttribute('data-src'))[0]; $enclosures[] = $image->src; diff --git a/bridges/XenForoBridge.php b/bridges/XenForoBridge.php index 983654e1..7e210ee8 100644 --- a/bridges/XenForoBridge.php +++ b/bridges/XenForoBridge.php @@ -395,7 +395,7 @@ class XenForoBridge extends BridgeAbstract { */ private function fixDate($date, $lang = 'en-US') { - $mnamesen = [ + $mnamesen = array( 'January', 'Feburary', 'March', @@ -408,7 +408,7 @@ class XenForoBridge extends BridgeAbstract { 'October', 'November', 'December' - ]; + ); switch($lang) { case 'en-US': // example: Jun 9, 2018 at 11:46 PM @@ -418,7 +418,7 @@ class XenForoBridge extends BridgeAbstract { case 'de-DE': // example: 19 Juli 2018 um 19:27 Uhr - $mnamesde = [ + $mnamesde = array( 'Januar', 'Februar', 'März', @@ -431,9 +431,9 @@ class XenForoBridge extends BridgeAbstract { 'Oktober', 'November', 'Dezember' - ]; + ); - $mnamesdeshort = [ + $mnamesdeshort = array( 'Jan.', 'Feb.', 'Mär.', @@ -446,7 +446,7 @@ class XenForoBridge extends BridgeAbstract { 'Okt.', 'Nov.', 'Dez.' - ]; + ); $date = str_ireplace($mnamesde, $mnamesen, $date); $date = str_ireplace($mnamesdeshort, $mnamesen, $date); diff --git a/lib/contents.php b/lib/contents.php index abe33f08..b1e31285 100644 --- a/lib/contents.php +++ b/lib/contents.php @@ -53,7 +53,7 @@ function getContents($url, $header = array(), $opts = array(), $returnHeader = f $cache->setScope('server'); $cache->purgeCache(86400); // 24 hours (forced) - $params = [$url]; + $params = array($url); $cache->setKey($params); $retVal = array( @@ -304,7 +304,7 @@ function getSimpleHTMLDOMCached($url, $cache->setScope('pages'); $cache->purgeCache(86400); // 24 hours (forced) - $params = [$url]; + $params = array($url); $cache->setKey($params); // Determine if cached file is within duration diff --git a/phpcs.xml b/phpcs.xml index 74c7a020..d45b6d10 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -100,4 +100,6 @@ + +