make phpstan happy, run phpstan on all files on task startupprotected/opentelemetry

2 files changed, 15 insertions, 10 deletions

diff --git a/classes/tracer.php b/classes/tracer.php
index e8f6a0378..0e72e7976 100644
--- a/classes/tracer.php
+++ b/classes/tracer.php
@@ -1,25 +1,25 @@
 <?php
 
-use OpenTelemetry\Contrib\Otlp\OtlpHttpTransportFactory;
-use OpenTelemetry\Contrib\Otlp\SpanExporter;
-use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
-use OpenTelemetry\SDK\Trace\TracerProvider;
+
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\API\Trace\SpanKind;
-use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;
-
-use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
-use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\Contrib\Otlp\OtlpHttpTransportFactory;
+use OpenTelemetry\Contrib\Otlp\SpanExporter;
 use OpenTelemetry\SDK\Common\Attribute\Attributes;
-use OpenTelemetry\SemConv\ResourceAttributes;
+use OpenTelemetry\SDK\Resource\ResourceInfo;
+use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
 use OpenTelemetry\SDK\Trace\Sampler\AlwaysOnSampler;
 use OpenTelemetry\SDK\Trace\Sampler\ParentBased;
-
+use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;
+use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
+use OpenTelemetry\SDK\Trace\TracerProvider;
+use OpenTelemetry\SemConv\ResourceAttributes;
 
 class Tracer {
 	/** @var Tracer $instance */
 	private static $instance;
 
+	/** @var OpenTelemetry\SDK\Trace\TracerProviderInterface $tracerProvider */
 	private $tracerProvider;
 
 	/** @var OpenTelemetry\API\Trace\TracerInterface $tracer */
@@ -56,6 +56,7 @@ class Tracer {
 			->setSpanKind(SpanKind::KIND_SERVER)
 			->setAttribute('php.request', json_encode($_REQUEST))
 			->setAttribute('php.server', json_encode($_SERVER))
+			->setAttribute('php.session', json_encode($_SESSION))
 			->startSpan();
 
 		$scope = $span->activate();
diff --git a/utils/phpstan-watcher.sh b/utils/phpstan-watcher.sh
index 70eb1d9ab..1972df049 100644
--- a/utils/phpstan-watcher.sh
+++ b/utils/phpstan-watcher.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+docker run --rm -v $(pwd):/app -v /tmp/phpstan-8.1:/tmp/phpstan \
+	--workdir /app registry.fakecake.org/ci/php8.2-alpine:3.18 php82 -d memory_limit=-1 ./vendor/bin/phpstan --memory-limit=2G --error-format=raw analyze .
+echo All done, RC=$?.
+
 while true; do
 	inotifywait . -e close_write -r -t 300 | grep -q .php && \
 		(