summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2023-04-09 21:29:16 +0300
committerAndrew Dolgov <[email protected]>2023-04-09 21:29:16 +0300
commitd7c070b22bc187db45b20937a85fbf01d652ee7c (patch)
tree4e08641e7019c435176f7954fc2eefcd99e5f08a
parentc1b3c99667c743d63317748d6338647eaf213184 (diff)
make phpstan happy
-rw-r--r--backend.php6
-rw-r--r--classes/tracer.php6
2 files changed, 9 insertions, 3 deletions
diff --git a/backend.php b/backend.php
index 9fa30db38..8b3a3e061 100644
--- a/backend.php
+++ b/backend.php
@@ -52,6 +52,7 @@
header("Content-Type: text/json");
print Errors::to_json(Errors::E_UNAUTHORIZED);
+ $scope->getSpan()->setTag('error', Errors::E_UNAUTHORIZED);
$scope->close();
return;
}
@@ -60,6 +61,8 @@
if (Config::is_migration_needed()) {
print Errors::to_json(Errors::E_SCHEMA_MISMATCH);
+
+ $scope->getSpan()->setTag('error', Errors::E_SCHEMA_MISMATCH);
$scope->close();
return;
}
@@ -122,11 +125,14 @@
user_error("Refusing to invoke method $method of handler $op which starts with underscore.", E_USER_WARNING);
header("Content-Type: text/json");
print Errors::to_json(Errors::E_UNAUTHORIZED);
+
+ $scope->getSpan()->setTag('error', Errors::E_UNAUTHORIZED);
$scope->close();
return;
}
if ($override) {
+ /** @var Plugin|IHandler|ICatchall $handler */
$handler = $override;
} else {
$reflection = new ReflectionClass($op);
diff --git a/classes/tracer.php b/classes/tracer.php
index 1326f4344..eb3c58113 100644
--- a/classes/tracer.php
+++ b/classes/tracer.php
@@ -37,7 +37,7 @@ class Tracer {
/**
* @param string $name
- * @param array<mixed> $options
+ * @param array<string>|array<string, array<string, mixed>> $options
* @param array<string> $args
* @return Scope
*/
@@ -51,12 +51,12 @@ class Tracer {
/**
* @param string $name
- * @param array<string> $options
+ * @param array<string>|array<string, array<string, mixed>> $options
* @param array<string> $args
* @return Scope
*/
public static function start(string $name, array $options = [], array $args = []) : Scope {
- return self::get_instance()->_start($name, $options);
+ return self::get_instance()->_start($name, $options, $args);
}
public static function get_instance() : Tracer {