@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | ->where('wife_name.n_type', '<>', '_MARNM'); |
| 127 | 127 | }); |
| 128 | 128 | |
| 129 | - $field = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')"); |
|
| 129 | + $field = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')"); |
|
| 130 | 130 | |
| 131 | 131 | $this->whereTrees($query, 'f_file', $trees); |
| 132 | 132 | $this->whereSearch($query, $field, $search); |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | * @param Expression<string>|string $column |
| 1069 | 1069 | * @param array<string> $search_terms |
| 1070 | 1070 | */ |
| 1071 | - private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void |
|
| 1071 | + private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void |
|
| 1072 | 1072 | { |
| 1073 | 1073 | foreach ($search_terms as $search_term) { |
| 1074 | 1074 | $query->where($column, DB::iLike(), '%' . addcslashes($search_term, '\\%_') . '%'); |
@@ -323,7 +323,7 @@ |
||
| 323 | 323 | { |
| 324 | 324 | return Registry::cache()->file()->remember('whois-asn-' . $asn, function () use ($asn): array { |
| 325 | 325 | $ranges = $this->network_service->findIpRangesForAsn($asn); |
| 326 | - $mapper = static fn (string $range): RangeInterface|null => Factory::parseRangeString($range); |
|
| 326 | + $mapper = static fn (string $range): RangeInterface | null => Factory::parseRangeString($range); |
|
| 327 | 327 | $ranges = array_map($mapper, $ranges); |
| 328 | 328 | |
| 329 | 329 | return array_filter($ranges); |
@@ -57,52 +57,52 @@ |
||
| 57 | 57 | * Instead, the list from version 1.26 is copied here. |
| 58 | 58 | */ |
| 59 | 59 | public const array AI_ROBOTS = [ |
| 60 | - 'AI2Bot', |
|
| 61 | - 'Ai2Bot-Dolma', |
|
| 62 | - 'Amazonbot', |
|
| 63 | - 'anthropic-ai', |
|
| 64 | - 'Applebot', |
|
| 65 | - 'Applebot-Extended', |
|
| 66 | - 'Brightbot 1.0', |
|
| 67 | - 'Bytespider', |
|
| 68 | - 'CCBot', |
|
| 69 | - 'ChatGPT-User', |
|
| 70 | - 'Claude-Web', |
|
| 71 | - 'ClaudeBot', |
|
| 72 | - 'cohere-ai', |
|
| 73 | - 'cohere-training-data-crawler', |
|
| 74 | - 'Crawlspace', |
|
| 75 | - 'Diffbot', |
|
| 76 | - 'DuckAssistBot', |
|
| 77 | - 'FacebookBot', |
|
| 78 | - 'FriendlyCrawler', |
|
| 79 | - 'Google-Extended', |
|
| 80 | - 'GoogleOther', |
|
| 81 | - 'GoogleOther-Image', |
|
| 82 | - 'GoogleOther-Video', |
|
| 83 | - 'GPTBot', |
|
| 84 | - 'iaskspider/2.0', |
|
| 85 | - 'ICC-Crawler', |
|
| 86 | - 'ImagesiftBot', |
|
| 87 | - 'img2dataset', |
|
| 88 | - 'ISSCyberRiskCrawler', |
|
| 89 | - 'Kangaroo Bot', |
|
| 90 | - 'meta-externalagent', |
|
| 91 | - 'meta-externalfetcher', |
|
| 92 | - 'OAI-SearchBot', |
|
| 93 | - 'omgili', |
|
| 94 | - 'omgilibot', |
|
| 95 | - 'PanguBot', |
|
| 96 | - 'PerplexityBot', |
|
| 97 | - 'PetalBot', |
|
| 98 | - 'Scrapy', |
|
| 99 | - 'SemrushBot-OCOB', |
|
| 100 | - 'SemrushBot-SWA', |
|
| 101 | - 'Sidetrade indexer bot', |
|
| 102 | - 'Timpibot', |
|
| 103 | - 'VelenPublicWebCrawler', |
|
| 104 | - 'Webzio-Extended', |
|
| 105 | - 'YouBot', |
|
| 60 | + 'AI2Bot', |
|
| 61 | + 'Ai2Bot-Dolma', |
|
| 62 | + 'Amazonbot', |
|
| 63 | + 'anthropic-ai', |
|
| 64 | + 'Applebot', |
|
| 65 | + 'Applebot-Extended', |
|
| 66 | + 'Brightbot 1.0', |
|
| 67 | + 'Bytespider', |
|
| 68 | + 'CCBot', |
|
| 69 | + 'ChatGPT-User', |
|
| 70 | + 'Claude-Web', |
|
| 71 | + 'ClaudeBot', |
|
| 72 | + 'cohere-ai', |
|
| 73 | + 'cohere-training-data-crawler', |
|
| 74 | + 'Crawlspace', |
|
| 75 | + 'Diffbot', |
|
| 76 | + 'DuckAssistBot', |
|
| 77 | + 'FacebookBot', |
|
| 78 | + 'FriendlyCrawler', |
|
| 79 | + 'Google-Extended', |
|
| 80 | + 'GoogleOther', |
|
| 81 | + 'GoogleOther-Image', |
|
| 82 | + 'GoogleOther-Video', |
|
| 83 | + 'GPTBot', |
|
| 84 | + 'iaskspider/2.0', |
|
| 85 | + 'ICC-Crawler', |
|
| 86 | + 'ImagesiftBot', |
|
| 87 | + 'img2dataset', |
|
| 88 | + 'ISSCyberRiskCrawler', |
|
| 89 | + 'Kangaroo Bot', |
|
| 90 | + 'meta-externalagent', |
|
| 91 | + 'meta-externalfetcher', |
|
| 92 | + 'OAI-SearchBot', |
|
| 93 | + 'omgili', |
|
| 94 | + 'omgilibot', |
|
| 95 | + 'PanguBot', |
|
| 96 | + 'PerplexityBot', |
|
| 97 | + 'PetalBot', |
|
| 98 | + 'Scrapy', |
|
| 99 | + 'SemrushBot-OCOB', |
|
| 100 | + 'SemrushBot-SWA', |
|
| 101 | + 'Sidetrade indexer bot', |
|
| 102 | + 'Timpibot', |
|
| 103 | + 'VelenPublicWebCrawler', |
|
| 104 | + 'Webzio-Extended', |
|
| 105 | + 'YouBot', |
|
| 106 | 106 | ]; |
| 107 | 107 | |
| 108 | 108 | // Other bad robots - SEO optimisers, advertisers, etc. This list is shared with robots.txt. |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | ->flatten(); |
| 116 | 116 | |
| 117 | 117 | // Don't show family meta-data tags |
| 118 | - $exclude_facts = new Collection(['FAM:CHAN', 'FAM:_UID', 'FAM:UID', 'FAM:SUBM']); |
|
| 118 | + $exclude_facts = new Collection(['FAM:CHAN', 'FAM:_UID', 'FAM:UID', 'FAM:SUBM']); |
|
| 119 | 119 | // Don't show tags that are shown in tabs or sidebars |
| 120 | 120 | $exclude_facts = $exclude_facts->merge($sidebar_facts)->merge($tab_facts); |
| 121 | 121 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | string $line_endings, |
| 108 | 108 | string $filename, |
| 109 | 109 | string $format, |
| 110 | - Collection|null $records = null |
|
| 110 | + Collection | null $records = null |
|
| 111 | 111 | ): ResponseInterface { |
| 112 | 112 | $access_level = self::ACCESS_LEVELS[$privacy]; |
| 113 | 113 | |
@@ -177,9 +177,9 @@ discard block |
||
| 177 | 177 | string $encoding = UTF8::NAME, |
| 178 | 178 | int $access_level = Auth::PRIV_HIDE, |
| 179 | 179 | string $line_endings = 'CRLF', |
| 180 | - Collection|null $records = null, |
|
| 181 | - ZipArchive|FilesystemOperator|null $zip_filesystem = null, |
|
| 182 | - string|null $media_path = null |
|
| 180 | + Collection | null $records = null, |
|
| 181 | + ZipArchive | FilesystemOperator | null $zip_filesystem = null, |
|
| 182 | + string | null $media_path = null |
|
| 183 | 183 | ) { |
| 184 | 184 | $stream = fopen('php://memory', 'wb+'); |
| 185 | 185 | |