From 2b7f3b3452e3af46621053a0791d5b47c2c59824 Mon Sep 17 00:00:00 2001 From: Dominik Pfennig <dominik@suma-ev.de> Date: Thu, 2 Jun 2016 11:23:09 +0200 Subject: [PATCH] =?UTF-8?q?Type=20Deklarationen=20f=C3=BCr=20String=20entf?= =?UTF-8?q?ernt,=20da=20dies=20in=20anderen=20php=20Versionen=20Fehler=20v?= =?UTF-8?q?erursacht=20hat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetaGer.php | 14 +++++++------- app/Models/Result.php | 8 ++++---- app/Models/Searchengine.php | 8 ++++---- app/Models/parserSkripte/Allesklar.php | 2 +- app/Models/parserSkripte/BASE.php | 2 +- app/Models/parserSkripte/Bing.php | 2 +- app/Models/parserSkripte/Dmoznebel.php | 2 +- app/Models/parserSkripte/Dmoznebel_int.php | 2 +- app/Models/parserSkripte/Ebay.php | 2 +- app/Models/parserSkripte/Exalead.php | 2 +- app/Models/parserSkripte/Fastbot.php | 2 +- app/Models/parserSkripte/Goyax.php | 2 +- app/Models/parserSkripte/Mg_hochsch_de.php | 2 +- app/Models/parserSkripte/Minisucher.php | 2 +- app/Models/parserSkripte/Mnogosearch.php | 2 +- app/Models/parserSkripte/Nebel.php | 2 +- app/Models/parserSkripte/Onenewspage.php | 2 +- app/Models/parserSkripte/Onenewspagegermany.php | 2 +- app/Models/parserSkripte/Onenewspagevideo.php | 2 +- app/Models/parserSkripte/Opencrawlastronomie.php | 2 +- app/Models/parserSkripte/Opencrawlregengergie.php | 2 +- app/Models/parserSkripte/Opencrawltauchen.php | 2 +- app/Models/parserSkripte/Overture.php | 2 +- app/Models/parserSkripte/OvertureAds.php | 2 +- app/Models/parserSkripte/Qip.php | 2 +- app/Models/parserSkripte/Qualigo.php | 2 +- app/Models/parserSkripte/Similar_product.php | 2 +- app/Models/parserSkripte/Similar_product_ads.php | 2 +- app/Models/parserSkripte/Suchticker.php | 2 +- app/Models/parserSkripte/Tuhh.php | 2 +- app/Models/parserSkripte/Wikipedia.php | 2 +- app/Models/parserSkripte/Witch.php | 2 +- app/Models/parserSkripte/Yacy.php | 2 +- app/Models/parserSkripte/Yacyunih.php | 2 +- app/Models/parserSkripte/Yandex.php | 2 +- app/Models/parserSkripte/Zeitde.php | 2 +- 36 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/MetaGer.php b/app/MetaGer.php index 44f1dacc6..3c8984a5f 100644 --- a/app/MetaGer.php +++ b/app/MetaGer.php @@ -599,7 +599,7 @@ class MetaGer { return $this->stopWords; } - public function getHostCount(String $host) + public function getHostCount($host) { if(isset($this->addedHosts[$host])) { @@ -609,7 +609,7 @@ class MetaGer return 0; } } - public function addHostCount(String $host) + public function addHostCount($host) { $hash = md5($host); if(isset($this->addedHosts[$hash])) @@ -624,7 +624,7 @@ class MetaGer { return $this->site; } - public function addLink(String $link) + public function addLink($link) { $hash = md5($link); if(isset($this->addedLinks[$hash])) @@ -638,7 +638,7 @@ class MetaGer } } - public function generateSearchLink(String $fokus) + public function generateSearchLink($fokus) { $requestData = $this->request->except('page'); $requestData['focus'] = $fokus; @@ -654,7 +654,7 @@ class MetaGer return $link; } - public function generateSiteSearchLink(String $host) + public function generateSiteSearchLink($host) { $host = urlencode($host); $requestData = $this->request->except('page'); @@ -664,7 +664,7 @@ class MetaGer return $link; } - public function generateRemovedHostLink (String $host) + public function generateRemovedHostLink ($host) { $host = urlencode($host); $requestData = $this->request->except('page'); @@ -673,7 +673,7 @@ class MetaGer return $link; } - public function generateRemovedDomainLink (String $domain) + public function generateRemovedDomainLink ($domain) { $domain = urlencode($domain); $requestData = $this->request->except('page'); diff --git a/app/Models/Result.php b/app/Models/Result.php index 22a530e6f..ab4878d4e 100644 --- a/app/Models/Result.php +++ b/app/Models/Result.php @@ -193,7 +193,7 @@ class Result } } - private function getStrippedHost (String $link) + private function getStrippedHost ($link) { if(strpos($link, "http") !== 0) $link = "http://" . $link; @@ -201,7 +201,7 @@ class Result $link = preg_replace("/^www\./si", "", $link); return $link; } - private function getStrippedLink (String $link) + private function getStrippedLink ($link) { if(strpos($link, "http") !== 0) $link = "http://" . $link; @@ -210,7 +210,7 @@ class Result return $host . $path; } - private function getStrippedDomain (String $link) + private function getStrippedDomain ($link) { if(preg_match("/([^\.]*\.[^\.]*)$/si", $link, $match)) { @@ -221,7 +221,7 @@ class Result } } - private function generateProxyLink (String $link) + private function generateProxyLink ($link) { if(!$link) return ""; diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php index 5d0ba02af..23f0bda09 100644 --- a/app/Models/Searchengine.php +++ b/app/Models/Searchengine.php @@ -73,7 +73,7 @@ abstract class Searchengine } - public abstract function loadResults(String $result); + public abstract function loadResults($result); private function writeRequest () { @@ -168,7 +168,7 @@ abstract class Searchengine return $fp; } - private function setStatistic(String $key, float $val) + private function setStatistic($key, float $val) { $oldVal = floatval(Redis::hget($this->name, $key)) * $this->uses; @@ -177,7 +177,7 @@ abstract class Searchengine $this->$key = $newVal; } - public function disable(string $sumaFile, string $message) + public function disable($sumaFile, $message) { Log::info($message); $xml = simplexml_load_file($sumaFile); @@ -185,7 +185,7 @@ abstract class Searchengine $xml->saveXML($sumaFile); } - public function enable(string $sumaFile, string $message) + public function enable($sumaFile, $message) { Log::info($message); $xml = simplexml_load_file($sumaFile); diff --git a/app/Models/parserSkripte/Allesklar.php b/app/Models/parserSkripte/Allesklar.php index c3c9126db..da5de2635 100644 --- a/app/Models/parserSkripte/Allesklar.php +++ b/app/Models/parserSkripte/Allesklar.php @@ -13,7 +13,7 @@ class Allesklar extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $crawler = new Crawler(utf8_decode($result)); $crawler = $crawler diff --git a/app/Models/parserSkripte/BASE.php b/app/Models/parserSkripte/BASE.php index 1b6826ef8..3b28155f4 100644 --- a/app/Models/parserSkripte/BASE.php +++ b/app/Models/parserSkripte/BASE.php @@ -12,7 +12,7 @@ class BASE extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $title = ""; diff --git a/app/Models/parserSkripte/Bing.php b/app/Models/parserSkripte/Bing.php index ff08849b5..872aa4b66 100644 --- a/app/Models/parserSkripte/Bing.php +++ b/app/Models/parserSkripte/Bing.php @@ -13,7 +13,7 @@ class Bing extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $crawler = new Crawler($result); diff --git a/app/Models/parserSkripte/Dmoznebel.php b/app/Models/parserSkripte/Dmoznebel.php index 892cab3b2..c2113e8c7 100644 --- a/app/Models/parserSkripte/Dmoznebel.php +++ b/app/Models/parserSkripte/Dmoznebel.php @@ -12,7 +12,7 @@ class Dmoznebel extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $title = ""; diff --git a/app/Models/parserSkripte/Dmoznebel_int.php b/app/Models/parserSkripte/Dmoznebel_int.php index 183fcf7e0..231ca8ceb 100644 --- a/app/Models/parserSkripte/Dmoznebel_int.php +++ b/app/Models/parserSkripte/Dmoznebel_int.php @@ -12,7 +12,7 @@ class Dmoznebel_int extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $title = ""; diff --git a/app/Models/parserSkripte/Ebay.php b/app/Models/parserSkripte/Ebay.php index 2e75da08e..313f69626 100644 --- a/app/Models/parserSkripte/Ebay.php +++ b/app/Models/parserSkripte/Ebay.php @@ -12,7 +12,7 @@ class Ebay extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { try { $content = simplexml_load_string($result); diff --git a/app/Models/parserSkripte/Exalead.php b/app/Models/parserSkripte/Exalead.php index ee2530684..66c34fc5a 100644 --- a/app/Models/parserSkripte/Exalead.php +++ b/app/Models/parserSkripte/Exalead.php @@ -12,7 +12,7 @@ class Exalead extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $title = ""; diff --git a/app/Models/parserSkripte/Fastbot.php b/app/Models/parserSkripte/Fastbot.php index 7acc801e2..6e9dc3b4d 100644 --- a/app/Models/parserSkripte/Fastbot.php +++ b/app/Models/parserSkripte/Fastbot.php @@ -17,7 +17,7 @@ class Fastbot extends Searchengine } } - public function loadResults (String $result) + public function loadResults ($result) { $result = utf8_encode($result); $counter = 0; diff --git a/app/Models/parserSkripte/Goyax.php b/app/Models/parserSkripte/Goyax.php index a29cfb68a..d93ccdbcd 100644 --- a/app/Models/parserSkripte/Goyax.php +++ b/app/Models/parserSkripte/Goyax.php @@ -12,7 +12,7 @@ class Goyax extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { die($result); $results = trim($result); diff --git a/app/Models/parserSkripte/Mg_hochsch_de.php b/app/Models/parserSkripte/Mg_hochsch_de.php index ad14ed2dc..8573d31b6 100644 --- a/app/Models/parserSkripte/Mg_hochsch_de.php +++ b/app/Models/parserSkripte/Mg_hochsch_de.php @@ -12,7 +12,7 @@ class Mg_hochsch_de extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { die($result); $results = trim($result); diff --git a/app/Models/parserSkripte/Minisucher.php b/app/Models/parserSkripte/Minisucher.php index b229c7809..80dda6efc 100644 --- a/app/Models/parserSkripte/Minisucher.php +++ b/app/Models/parserSkripte/Minisucher.php @@ -12,7 +12,7 @@ class Minisucher extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $content) + public function loadResults ($content) { $content = simplexml_load_string($content); if(!$content) diff --git a/app/Models/parserSkripte/Mnogosearch.php b/app/Models/parserSkripte/Mnogosearch.php index d6473c821..cd78a95a3 100644 --- a/app/Models/parserSkripte/Mnogosearch.php +++ b/app/Models/parserSkripte/Mnogosearch.php @@ -13,7 +13,7 @@ class Mnogosearch extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $counter = 0; $crawler = new Crawler($result); diff --git a/app/Models/parserSkripte/Nebel.php b/app/Models/parserSkripte/Nebel.php index c85e2d47a..a03356504 100644 --- a/app/Models/parserSkripte/Nebel.php +++ b/app/Models/parserSkripte/Nebel.php @@ -12,7 +12,7 @@ class Nebel extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $results = trim($result); foreach( explode("\n", $results) as $result ) diff --git a/app/Models/parserSkripte/Onenewspage.php b/app/Models/parserSkripte/Onenewspage.php index be848f04f..24e9e1da2 100644 --- a/app/Models/parserSkripte/Onenewspage.php +++ b/app/Models/parserSkripte/Onenewspage.php @@ -12,7 +12,7 @@ class Onenewspage extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $results = trim($result); diff --git a/app/Models/parserSkripte/Onenewspagegermany.php b/app/Models/parserSkripte/Onenewspagegermany.php index c1b786507..5783538d6 100644 --- a/app/Models/parserSkripte/Onenewspagegermany.php +++ b/app/Models/parserSkripte/Onenewspagegermany.php @@ -13,7 +13,7 @@ class Onenewspagegermany extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $counter = 0; foreach( explode("\n", $result) as $line ) diff --git a/app/Models/parserSkripte/Onenewspagevideo.php b/app/Models/parserSkripte/Onenewspagevideo.php index 9632f3443..b7e33ad31 100644 --- a/app/Models/parserSkripte/Onenewspagevideo.php +++ b/app/Models/parserSkripte/Onenewspagevideo.php @@ -12,7 +12,7 @@ class Onenewspagevideo extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $results = trim($result); foreach( explode("\n", $results) as $result ) diff --git a/app/Models/parserSkripte/Opencrawlastronomie.php b/app/Models/parserSkripte/Opencrawlastronomie.php index 81723dd36..5d886cf60 100644 --- a/app/Models/parserSkripte/Opencrawlastronomie.php +++ b/app/Models/parserSkripte/Opencrawlastronomie.php @@ -12,7 +12,7 @@ class Opencrawlastronomie extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { try { $content = simplexml_load_string($result); diff --git a/app/Models/parserSkripte/Opencrawlregengergie.php b/app/Models/parserSkripte/Opencrawlregengergie.php index 7d5e7d406..156c7a92f 100644 --- a/app/Models/parserSkripte/Opencrawlregengergie.php +++ b/app/Models/parserSkripte/Opencrawlregengergie.php @@ -12,7 +12,7 @@ class Opencrawlregengergie extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { try { $content = simplexml_load_string($result); diff --git a/app/Models/parserSkripte/Opencrawltauchen.php b/app/Models/parserSkripte/Opencrawltauchen.php index fef862485..0237f60eb 100644 --- a/app/Models/parserSkripte/Opencrawltauchen.php +++ b/app/Models/parserSkripte/Opencrawltauchen.php @@ -12,7 +12,7 @@ class Opencrawltauchen extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { try { $content = simplexml_load_string($result); diff --git a/app/Models/parserSkripte/Overture.php b/app/Models/parserSkripte/Overture.php index 917f4e1bf..2aa36de78 100644 --- a/app/Models/parserSkripte/Overture.php +++ b/app/Models/parserSkripte/Overture.php @@ -13,7 +13,7 @@ class Overture extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $result = preg_replace("/\r\n/si", "", $result); try { diff --git a/app/Models/parserSkripte/OvertureAds.php b/app/Models/parserSkripte/OvertureAds.php index 51b5d7806..f28f74dde 100644 --- a/app/Models/parserSkripte/OvertureAds.php +++ b/app/Models/parserSkripte/OvertureAds.php @@ -12,7 +12,7 @@ class OvertureAds extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $result = preg_replace("/\r\n/si", "", $result); try { diff --git a/app/Models/parserSkripte/Qip.php b/app/Models/parserSkripte/Qip.php index cbf1f5159..b01d98b6a 100644 --- a/app/Models/parserSkripte/Qip.php +++ b/app/Models/parserSkripte/Qip.php @@ -12,7 +12,7 @@ class Qip extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { die($result); $results = trim($result); diff --git a/app/Models/parserSkripte/Qualigo.php b/app/Models/parserSkripte/Qualigo.php index 650da88f9..597f6ec80 100644 --- a/app/Models/parserSkripte/Qualigo.php +++ b/app/Models/parserSkripte/Qualigo.php @@ -12,7 +12,7 @@ class Qualigo extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $results) + public function loadResults ($results) { try { $content = simplexml_load_string($results); diff --git a/app/Models/parserSkripte/Similar_product.php b/app/Models/parserSkripte/Similar_product.php index 056a9520d..afd4cf042 100644 --- a/app/Models/parserSkripte/Similar_product.php +++ b/app/Models/parserSkripte/Similar_product.php @@ -12,7 +12,7 @@ class Similar_product extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $results = json_decode($result); diff --git a/app/Models/parserSkripte/Similar_product_ads.php b/app/Models/parserSkripte/Similar_product_ads.php index ee96bd0ce..8db3b4882 100644 --- a/app/Models/parserSkripte/Similar_product_ads.php +++ b/app/Models/parserSkripte/Similar_product_ads.php @@ -18,7 +18,7 @@ class Similar_product_ads extends Searchengine } } - public function loadResults (String $results) + public function loadResults ($results) { $results = json_decode($result); diff --git a/app/Models/parserSkripte/Suchticker.php b/app/Models/parserSkripte/Suchticker.php index c9e178fc0..8d9b66ed6 100644 --- a/app/Models/parserSkripte/Suchticker.php +++ b/app/Models/parserSkripte/Suchticker.php @@ -12,7 +12,7 @@ class Suchticker extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $results = trim($result); diff --git a/app/Models/parserSkripte/Tuhh.php b/app/Models/parserSkripte/Tuhh.php index 502e02739..e5614fb73 100644 --- a/app/Models/parserSkripte/Tuhh.php +++ b/app/Models/parserSkripte/Tuhh.php @@ -12,7 +12,7 @@ class Tuhh extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { try { $content = simplexml_load_string($result); diff --git a/app/Models/parserSkripte/Wikipedia.php b/app/Models/parserSkripte/Wikipedia.php index 90ade6d72..dc52f01f1 100644 --- a/app/Models/parserSkripte/Wikipedia.php +++ b/app/Models/parserSkripte/Wikipedia.php @@ -12,7 +12,7 @@ class Wikipedia extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $result = utf8_decode($result); $counter = 0; diff --git a/app/Models/parserSkripte/Witch.php b/app/Models/parserSkripte/Witch.php index f0675dbdd..3ed1771f7 100644 --- a/app/Models/parserSkripte/Witch.php +++ b/app/Models/parserSkripte/Witch.php @@ -12,7 +12,7 @@ class Witch extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $result = html_entity_decode(trim(utf8_encode($result))); diff --git a/app/Models/parserSkripte/Yacy.php b/app/Models/parserSkripte/Yacy.php index 404c116ba..ee82cff41 100644 --- a/app/Models/parserSkripte/Yacy.php +++ b/app/Models/parserSkripte/Yacy.php @@ -12,7 +12,7 @@ class Yacy extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { # die($result); diff --git a/app/Models/parserSkripte/Yacyunih.php b/app/Models/parserSkripte/Yacyunih.php index cd9242a05..e9532d8f7 100644 --- a/app/Models/parserSkripte/Yacyunih.php +++ b/app/Models/parserSkripte/Yacyunih.php @@ -12,7 +12,7 @@ class Yacyunih extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { try { $content = simplexml_load_string($result); diff --git a/app/Models/parserSkripte/Yandex.php b/app/Models/parserSkripte/Yandex.php index 0f2bc6b73..92b7754f8 100644 --- a/app/Models/parserSkripte/Yandex.php +++ b/app/Models/parserSkripte/Yandex.php @@ -12,7 +12,7 @@ class Yandex extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $title = ""; diff --git a/app/Models/parserSkripte/Zeitde.php b/app/Models/parserSkripte/Zeitde.php index 6426b9120..756a6b241 100644 --- a/app/Models/parserSkripte/Zeitde.php +++ b/app/Models/parserSkripte/Zeitde.php @@ -12,7 +12,7 @@ class Zeitde extends Searchengine parent::__construct($engine, $metager); } - public function loadResults (String $result) + public function loadResults ($result) { $results = json_decode($result); -- GitLab