Merge pull request '[Composer] Change gofabian/negotiation-middleware dependency requirement to support PHP 8.2' (#96) from MrPetovan/friendica-directory:bug/php-8 into stable

Reviewed-on: #96

composer.json

@@ -23,9 +23,10 @@
         "byjg/migration": "^4.0",
         "byjg/uri": "^1.0.4",
         "gettext/gettext": "^4.6",
-        "gofabian/negotiation-middleware": "^0.1.3",
+        "gofabian/negotiation-middleware": "dev-master",
         "guzzlehttp/guzzle": "^6.5",
         "laminas/laminas-escaper": "^2.6",
+        "laminas/laminas-zendframework-bridge": "^1.4",
         "masterminds/html5": "^2.3",
         "monolog/monolog": "^1.17",
         "mrpetovan/net_ping": "^1.2",
@@ -55,7 +56,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.1.0"
+            "php": "7.3.0"
         },
         "process-timeout" : 0,
         "autoloader-suffix": "FriendicaDirectory",

src/classes/Controllers/Api/Photo.php

@@ -14,12 +14,18 @@ class Photo
 	 * @var \Atlas\Pdo\Connection
 	 */
 	private $atlas;
+	/**
+	 * @var string
+	 */
+	private $defaultProfilePictureSmallPath;
 
 	public function __construct(
-		\Atlas\Pdo\Connection $atlas
+		\Atlas\Pdo\Connection $atlas,
+		string $defaultProfilePictureSmallPath
 	)
 	{
 		$this->atlas = $atlas;
+		$this->defaultProfilePictureSmallPath = $defaultProfilePictureSmallPath;
 	}
 
 	public function render(Request $request, Response $response, array $args): Response
@@ -30,7 +36,7 @@ class Photo
 		);
 
 		if (!$data) {
-			$data = file_get_contents('public/images/default-profile-sm.jpg');
+			$data = file_get_contents($this->defaultProfilePictureSmallPath);
 		}
 
 		//Try and cache our result.

src/classes/Pollers/Server.php

@@ -290,6 +290,9 @@ class Server
 			} else {
 				$this->logger->info('SSL-verified URL probe failed with error code: ' . $e->getCode());
 			}
+		} catch (\InvalidArgumentException $e) {
+			$this->logger->error('Invalid argument provided to HTTP client', ['base_url' => $base_url, 'exception' => $e]);
+			return ['data' => false, 'time' => 0, 'curl_info' => [], 'ssl_state' => null];
 		}
 
 		$probe_end = microtime(true);

src/classes/Routes/Http/Photo.php

@@ -10,7 +10,8 @@ class Photo extends BaseRoute
 	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response
 	{
 		return (new \Friendica\Directory\Controllers\Api\Photo(
-			$this->container->atlas
+			$this->container->atlas,
+			$this->container->get('defaultProfilePictureSmallPath')
 		))->render($request, $response, $args);
 	}
 }

src/classes/Utils/L10n.php

@@ -165,12 +165,12 @@ class L10n
 				$foundLang = $language;
 			}
 			if (strtolower($key) == strtolower(str_replace('-', '_', $locale))) {
-				$foundLocale = true;
+				$foundLocale = $language;
 				break;
 			}
 		}
 
-		return $foundLocale ? $language : $foundLang ?: $locale;
+		return $foundLocale ?: $foundLang ?: $locale;
 	}
 
 	/**

src/dependencies.php

@@ -99,6 +99,8 @@ $container['http'] = function (ContainerInterface $c): GuzzleHttp\ClientInterfac
 	return new GuzzleHttp\Client(['timeout' => 20, 'headers' => ['User-Agent' => 'FriendicaDirectory/' . trim($version) . ' ' . \GuzzleHttp\default_user_agent()]]);
 };
 
+$container['defaultProfilePictureSmallPath'] = __DIR__ . '/../public/assets/images/default-profile-sm.jpg';
+
 // Internal Dependency Injection
 
 $container[\Friendica\Directory\Models\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Models\Profile {