From ed30d3e106784902a054b61ad34be91c69931f93 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 20 Mar 2019 14:37:43 +0100 Subject: [PATCH] Update return type declarations on adult postprocessing classes --- Blacklight/processing/adult/ADE.php | 2 +- Blacklight/processing/adult/ADM.php | 10 +++++----- Blacklight/processing/adult/AEBN.php | 10 +++++----- Blacklight/processing/adult/Hotmovies.php | 4 ++-- Changelog | 1 + 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Blacklight/processing/adult/ADE.php b/Blacklight/processing/adult/ADE.php index 84f97c6b0..4487c4fad 100755 --- a/Blacklight/processing/adult/ADE.php +++ b/Blacklight/processing/adult/ADE.php @@ -60,7 +60,7 @@ class ADE extends AdultMovies { $this->_response = getRawHtml(self::ADE.$this->_trailers.$this->_directUrl); $this->_html->loadHtml($this->_response); - if (preg_match("/(\"|')(?P[^\"']+.swf)(\"|')/i", $this->_response, $matches)) { + if (preg_match("/([\"|'])(?P[^\"']+.swf)([\"|'])/i", $this->_response, $matches)) { $this->_res['trailers']['url'] = self::ADE.trim(trim($matches['swf']), '"'); if (preg_match( '#(?:streamID:\s\")(?P[0-9A-Z]+)(?:\")#', diff --git a/Blacklight/processing/adult/ADM.php b/Blacklight/processing/adult/ADM.php index 3fdac5b1b..8483a28aa 100755 --- a/Blacklight/processing/adult/ADM.php +++ b/Blacklight/processing/adult/ADM.php @@ -89,7 +89,7 @@ class ADM extends AdultMovies * * @return array */ - protected function synopsis() + protected function synopsis(): array { $this->_res['synopsis'] = 'N/A'; foreach ($this->_html->find('h3') as $heading) { @@ -109,7 +109,7 @@ class ADM extends AdultMovies * * @return array */ - protected function productInfo($extras = false) + protected function productInfo($extras = false): array { foreach ($this->_html->find('ul.list-unstyled li') as $li) { $category = explode(':', $li->plaintext); @@ -132,7 +132,7 @@ class ADM extends AdultMovies * Gets the cast members. * @return array */ - protected function cast() + protected function cast(): array { $cast = []; foreach ($this->_html->find('h3') as $heading) { @@ -156,7 +156,7 @@ class ADM extends AdultMovies * Gets categories. * @return array */ - protected function genres() + protected function genres(): array { $genres = []; foreach ($this->_html->find('ul.list-unstyled') as $li) { @@ -179,7 +179,7 @@ class ADM extends AdultMovies * * @return bool - true if search = 100% */ - public function processSite($movie) + public function processSite($movie): bool { $result = false; if (! empty($movie)) { diff --git a/Blacklight/processing/adult/AEBN.php b/Blacklight/processing/adult/AEBN.php index eb6a8d0b4..1c67f7f65 100755 --- a/Blacklight/processing/adult/AEBN.php +++ b/Blacklight/processing/adult/AEBN.php @@ -82,7 +82,7 @@ class AEBN extends AdultMovies * * @return array */ - protected function covers() + protected function covers(): array { $ret = $this->_html->find('div#md-boxCover, img[itemprop=thumbnailUrl]', 1); if ($ret !== false) { @@ -102,7 +102,7 @@ class AEBN extends AdultMovies * * @return array */ - protected function genres() + protected function genres(): array { if ($ret = $this->_html->findOne('div.md-detailsCategories')) { foreach ($ret->find('a[itemprop=genre]') as $genre) { @@ -121,7 +121,7 @@ class AEBN extends AdultMovies * * @return array */ - protected function cast() + protected function cast(): array { $this->_res = false; $ret = $this->_html->findOne('div.starsFull'); @@ -150,7 +150,7 @@ class AEBN extends AdultMovies * * @return array */ - protected function productInfo($extras = false) + protected function productInfo($extras = false): array { if ($ret = $this->_html->find('div#md-detailsLeft', 0)) { foreach ($ret->find('div') as $div) { @@ -178,7 +178,7 @@ class AEBN extends AdultMovies * * @return array */ - protected function synopsis() + protected function synopsis(): array { if ($ret = $this->_html->findOne('span[itemprop=about]')) { if ($ret === null) { diff --git a/Blacklight/processing/adult/Hotmovies.php b/Blacklight/processing/adult/Hotmovies.php index c14396620..11d23a069 100755 --- a/Blacklight/processing/adult/Hotmovies.php +++ b/Blacklight/processing/adult/Hotmovies.php @@ -145,7 +145,7 @@ class Hotmovies extends AdultMovies * * @return array */ - protected function cast() + protected function cast(): array { $cast = []; if ($this->_html->find('.stars bottom_margin')) { @@ -165,7 +165,7 @@ class Hotmovies extends AdultMovies * * @return array */ - protected function genres() + protected function genres(): array { $genres = []; if ($ret = $this->_html->findOne('div.categories')) { diff --git a/Changelog b/Changelog index de47bb212..d0359174b 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-03-20 DariusIII + * Chg: Update return type declarations on adult postprocessing classes * Chg: Update dariusiii/rarinfo (v2.7.4 => v2.7.4.1) * Chg: Update dariusiii/rarinfo (v2.7.3 => v2.7.4) * Chg: Update PPA class, simplify unrar location setting load