@@ -30,12 +30,12 @@ discard block |
||
30 | 30 | public function fromURL(string $url, InternetDomainParserInterface $domainParser): ExternPage |
31 | 31 | { |
32 | 32 | if (!HttpUtil::isHttpURL($url)) { |
33 | - throw new Exception('string is not an URL ' . $url); |
|
33 | + throw new Exception('string is not an URL '.$url); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | $html = $this->getHTML($url, true); |
37 | 37 | if (empty($html)) { |
38 | - throw new DomainException('No HTML from requested URL ' . $url); |
|
38 | + throw new DomainException('No HTML from requested URL '.$url); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | return new ExternPage($url, $html, new TagParser(), $domainParser, $this->log); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | // idn_to_ascii('teßt.com',IDNA_NONTRANSITIONAL_TO_ASCII,INTL_IDNA_VARIANT_UTS46) |
55 | 55 | // checkdnsrr($string, "A") // check DNS record |
56 | 56 | if (!HttpUtil::isHttpURL($url)) { |
57 | - throw new DomainException('URL not compatible : ' . $url); |
|
57 | + throw new DomainException('URL not compatible : '.$url); |
|
58 | 58 | } |
59 | 59 | $response = $this->client->get($url, [ |
60 | 60 | 'timeout' => 20, |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | ]); |
66 | 66 | |
67 | 67 | if (200 !== $response->getStatusCode()) { |
68 | - $this->log->error('[z49] HTTP error ' . $response->getStatusCode() . ' ' . $response->getReasonPhrase()); |
|
68 | + $this->log->error('[z49] HTTP error '.$response->getStatusCode().' '.$response->getReasonPhrase()); |
|
69 | 69 | |
70 | 70 | return null; |
71 | 71 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | */ |
19 | 19 | class ExternHttpErrorLogic |
20 | 20 | { |
21 | - public const LOG_REQUEST_ERROR = __DIR__ . '/../../Application/resources/external_request_error.log'; |
|
21 | + public const LOG_REQUEST_ERROR = __DIR__.'/../../Application/resources/external_request_error.log'; |
|
22 | 22 | protected const LOOSE = true; |
23 | 23 | |
24 | 24 | public function __construct( |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | return $url; |
41 | 41 | } |
42 | 42 | if (preg_match('#400 Bad Request#i', $errorMessage)) { |
43 | - $this->log->warning('400 Bad Request : ' . $url); |
|
43 | + $this->log->warning('400 Bad Request : '.$url); |
|
44 | 44 | |
45 | 45 | return $url; |
46 | 46 | } |
47 | 47 | if (preg_match('#(403 Forbidden|403 Access Forbidden)#i', $errorMessage)) { |
48 | - $this->log->warning('403 Forbidden : ' . $url); |
|
48 | + $this->log->warning('403 Forbidden : '.$url); |
|
49 | 49 | |
50 | 50 | return $url; |
51 | 51 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | return $url; |
59 | 59 | } |
60 | 60 | if (preg_match('#401 (Unauthorized|Authorization Required)#i', $errorMessage)) { |
61 | - $this->log->notice('401 Unauthorized : skip ' . $url); |
|
61 | + $this->log->notice('401 Unauthorized : skip '.$url); |
|
62 | 62 | |
63 | 63 | return $url; |
64 | 64 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | // "URL rejected: No host part in the URL (see https://curl.haxx.se/libcurl/c/libcurl-errors.html) |
99 | 99 | // "cURL error 28: Connection timed out after 20005 milliseconds (see https://curl.haxx.se/libcurl/c/libcurl-errors.html) |
100 | 100 | //"cURL error 28: Connection timed out after 20005 milliseconds (see https://curl.haxx.se/libcurl/c/libcurl-errors.html) |
101 | - $this->log->notice('erreur non gérée sur extractWebData: "' . $errorMessage . "\" URL: " . $url); |
|
101 | + $this->log->notice('erreur non gérée sur extractWebData: "'.$errorMessage."\" URL: ".$url); |
|
102 | 102 | |
103 | 103 | //file_put_contents(self::LOG_REQUEST_ERROR, $this->domain."\n", FILE_APPEND); |
104 | 104 |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $webarchive = $this->archiver->searchWebarchive($url); |
44 | 44 | if ($webarchive instanceof WebarchiveDTO) { |
45 | 45 | $this->log->notice(' |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | return null; |
87 | 87 | } |
88 | 88 | |
89 | - public function get(string|UriInterface $uri, array $options = []): ResponseInterface |
|
89 | + public function get(string | UriInterface $uri, array $options = []): ResponseInterface |
|
90 | 90 | { |
91 | 91 | if (isset($options['allow_redirects']) && $options['allow_redirects'] !== false) { |
92 | 92 | $this->maxRedirects = self::DEFAULT_MAX_REDIRECTS; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | /** |
99 | 99 | * todo : add redirect http referer |
100 | 100 | */ |
101 | - private function getRecursive(UriInterface|string $uri, array $options, int $loop = 0): ResponseInterface |
|
101 | + private function getRecursive(UriInterface | string $uri, array $options, int $loop = 0): ResponseInterface |
|
102 | 102 | { |
103 | 103 | $response = $this->client->get($uri, $options); |
104 | 104 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | if ($response->getStatusCode() >= 300 && $response->getStatusCode() < 400) { |
107 | 107 | $redirectUri = $response->getHeader('location')[0] ?? null; |
108 | 108 | if ($loop >= $this->maxRedirects || !$redirectUri) { |
109 | - throw new Exception('TorClientAdapter::get Error too many redirects ' . $response->getStatusCode()); |
|
109 | + throw new Exception('TorClientAdapter::get Error too many redirects '.$response->getStatusCode()); |
|
110 | 110 | } |
111 | 111 | $loop++; |
112 | 112 | return $this->getRecursive($redirectUri, $options, $loop); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | // Error 4xx 5xx |
116 | 116 | if ($response->getStatusCode() >= 400) { |
117 | - throw new Exception($response->getStatusCode() . ' ' . $response->getReasonPhrase()); |
|
117 | + throw new Exception($response->getStatusCode().' '.$response->getReasonPhrase()); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | return $response; |
@@ -48,16 +48,16 @@ discard block |
||
48 | 48 | return new WebarchiveDTO( |
49 | 49 | self::ARCHIVER_NAME, |
50 | 50 | $url, |
51 | - (string)$archiveData['longformurl'], |
|
51 | + (string) $archiveData['longformurl'], |
|
52 | 52 | $archiveData['timestamp'] |
53 | - ? DateTimeImmutable::createFromFormat('U', (string)$archiveData['timestamp']) |
|
53 | + ? DateTimeImmutable::createFromFormat('U', (string) $archiveData['timestamp']) |
|
54 | 54 | : null |
55 | 55 | ); |
56 | 56 | } |
57 | 57 | |
58 | 58 | protected function requestWikiwixApi(string $url): array |
59 | 59 | { |
60 | - $response = $this->externHttpClient->get(self::API_URL . urlencode($url), [ |
|
60 | + $response = $this->externHttpClient->get(self::API_URL.urlencode($url), [ |
|
61 | 61 | 'timeout' => 20, |
62 | 62 | 'allow_redirects' => true, |
63 | 63 | 'headers' => ['User-Agent' => getenv('USER_AGENT')], |
@@ -75,8 +75,8 @@ discard block |
||
75 | 75 | $data = json_decode($jsonString, true) ?? []; |
76 | 76 | |
77 | 77 | // check wikiwix archive status |
78 | - if (empty($data['status']) || (int)$data['status'] !== 200) { |
|
79 | - $this->log->debug('WikiwixAdapter incorrect response: ' . $jsonString); |
|
78 | + if (empty($data['status']) || (int) $data['status'] !== 200) { |
|
79 | + $this->log->debug('WikiwixAdapter incorrect response: '.$jsonString); |
|
80 | 80 | |
81 | 81 | return []; |
82 | 82 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | ); |
41 | 41 | } |
42 | 42 | |
43 | - public function get(string|UriInterface $uri, array $options = []): ResponseInterface |
|
43 | + public function get(string | UriInterface $uri, array $options = []): ResponseInterface |
|
44 | 44 | { |
45 | 45 | return $this->client->get($uri, $options); |
46 | 46 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $summary = new Summary('test'); |
35 | 35 | |
36 | 36 | $torEnabled = true; |
37 | -echo "TOR enabled : ".($torEnabled ? "oui" : "non"). "\n"; |
|
37 | +echo "TOR enabled : ".($torEnabled ? "oui" : "non")."\n"; |
|
38 | 38 | |
39 | 39 | $trans = new ExternRefTransformer( |
40 | 40 | new ExternMapper($logger), |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | // Attention : pas de post-processing (sanitize title, etc.) |
50 | 50 | $result = $trans->process($url, $summary); |
51 | 51 | } catch (Exception $e) { |
52 | - $result = "EXCEPTION ". $e->getMessage().$e->getFile().$e->getLine(); |
|
52 | + $result = "EXCEPTION ".$e->getMessage().$e->getFile().$e->getLine(); |
|
53 | 53 | } |
54 | 54 | |
55 | -echo '>>> '. $result."\n"; |
|
55 | +echo '>>> '.$result."\n"; |
|
56 | 56 | |
57 | 57 | |
58 | 58 |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public const SLEEP_AFTER_EDITION = 5; // sec |
33 | 33 | public const MINUTES_DELAY_AFTER_LAST_HUMAN_EDIT = 10; // minutes |
34 | 34 | public const CHECK_EDIT_CONFLICT = true; |
35 | - public const ARTICLE_ANALYZED_FILENAME = __DIR__ . '/../resources/article_externRef_edited.txt'; |
|
35 | + public const ARTICLE_ANALYZED_FILENAME = __DIR__.'/../resources/article_externRef_edited.txt'; |
|
36 | 36 | public const SKIP_ADQ = false; |
37 | 37 | public const SKIP_LASTEDIT_BY_BOT = false; |
38 | 38 | public const CITATION_NUMBER_ON_FIRE = 15; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | try { |
61 | 61 | $result = $this->transformer->process($refContent, $this->summary); |
62 | 62 | } catch (Throwable $e) { |
63 | - $this->log->critical('Error patate34 '. $e->getMessage() . " " . $e->getFile() . ":" . $e->getLine()); |
|
63 | + $this->log->critical('Error patate34 '.$e->getMessage()." ".$e->getFile().":".$e->getLine()); |
|
64 | 64 | // TODO : parse $e->message -> variable process, taskName, botflag... |
65 | 65 | |
66 | 66 | return $refContent; |
@@ -131,10 +131,10 @@ discard block |
||
131 | 131 | $prefixSummary = ($this->summary->isBotFlag()) ? 'bot ' : ''; |
132 | 132 | $suffix = ''; |
133 | 133 | if (isset($this->summary->memo['count article'])) { |
134 | - $suffix .= ' ' . $this->summary->memo['count article'] . 'x {article}'; |
|
134 | + $suffix .= ' '.$this->summary->memo['count article'].'x {article}'; |
|
135 | 135 | } |
136 | 136 | if (isset($this->summary->memo['count lien web'])) { |
137 | - $suffix .= ' ' . $this->summary->memo['count lien web'] . 'x {lien web}'; |
|
137 | + $suffix .= ' '.$this->summary->memo['count lien web'].'x {lien web}'; |
|
138 | 138 | } |
139 | 139 | if (isset($this->summary->memo['presse'])) { |
140 | 140 | $suffix .= ' |
@@ -14,6 +14,6 @@ |
||
14 | 14 | |
15 | 15 | interface HttpClientInterface |
16 | 16 | { |
17 | - public function get(string|UriInterface $uri, array $options = []): ResponseInterface; |
|
17 | + public function get(string | UriInterface $uri, array $options = []): ResponseInterface; |
|
18 | 18 | public function request($method, $uri, array $options = []): ResponseInterface; |
19 | 19 | } |
20 | 20 | \ No newline at end of file |