Update & maintenance

.editorconfig

@@ -11,6 +11,6 @@ indent_style = tab
 indent_size = tab
 tab_width = 4
 
-[{*.json, *.yaml, *.yml, *.md}]
+[*.{json,yaml,yml,md}]
 indent_style = space
 indent_size = 2

.github/workflows/codesniffer.yml

@@ -15,4 +15,4 @@ jobs:
     name: "Codesniffer"
     uses: contributte/.github/.github/workflows/codesniffer.yml@master
     with:
-      php: "8.3"
+      php: "8.2"

.github/workflows/coverage.yml

@@ -15,4 +15,4 @@ jobs:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester-coverage-v2.yml@master
     with:
-      php: "8.3"
+      php: "8.2"

.github/workflows/phpstan.yml

@@ -15,4 +15,4 @@ jobs:
     name: "Phpstan"
     uses: contributte/.github/.github/workflows/phpstan.yml@master
     with:
-      php: "8.3"
+      php: "8.2"

.github/workflows/tests.yml

@@ -11,6 +11,12 @@ on:
     - cron: "0 8 * * 1"
 
 jobs:
+  test85:
+    name: "Nette Tester"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: "8.5"
+
   test84:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master

composer.json

@@ -25,9 +25,9 @@
     "php-http/guzzle7-adapter": "^1.1.0"
   },
   "require-dev": {
-    "contributte/qa": "^0.4",
-    "contributte/tester": "^0.3",
-    "contributte/phpstan": "^0.3",
+    "contributte/qa": "~0.4.0",
+    "contributte/tester": "~0.3.0",
+    "contributte/phpstan": "~0.3.0",
     "mockery/mockery": "^1.5.1",
     "nette/application": "^3.1.0",
     "nette/di": "^3.1.0",

phpstan.neon

@@ -14,5 +14,3 @@ parameters:
 	paths:
 		- src
 		- .docs
-
-	ignoreErrors:

ruleset.xml

@@ -4,7 +4,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd"
 >
-	<rule ref="./vendor/contributte/qa/ruleset.xml">
+	<rule ref="./vendor/contributte/qa/ruleset-8.2.xml">
 		<exclude name="Squiz.Commenting.FunctionComment.MissingParamName"/>
 		<exclude name="SlevomatCodingStandard.Variables.DisallowSuperGlobalVariable.DisallowedSuperGlobalVariable"/>
 	</rule>
@@ -16,7 +16,10 @@
 				<element key="src" value="Contributte\Sentry"/>
 				<element key="tests" value="Tests"/>
 			</property>
-			<property name="extensions" type="array" value="php,phpt"/>
+			<property name="extensions" type="array">
+				<element value="php"/>
+				<element value="phpt"/>
+			</property>
 		</properties>
 	</rule>
 

src/Integration/NetteSecurityIntegration.php

@@ -5,8 +5,7 @@
 use Nette\DI\Container;
 use Nette\Http\IRequest;
 use Nette\Http\Session;
-use Nette\Security\Identity;
-use Nette\Security\SimpleIdentity;
+use Nette\Security\IIdentity;
 use Nette\Security\UserStorage;
 use Sentry\Event;
 use Sentry\EventHint;
@@ -51,21 +50,26 @@ public function setup(HubInterface $hub, Event $event, EventHint $hint): ?Event
 		$identity = $state[1];
 
 		// Anonymous user
-		if (!($identity instanceof SimpleIdentity) && !($identity instanceof Identity)) {
+		if (!($identity instanceof IIdentity)) {
 			return $event;
 		}
 
 		$httpRequest = $this->context->getByType(IRequest::class);
 
+		/** @var array<string, mixed> $identityData */
+		$identityData = $identity->getData();
+		$identityRoles = $identity->getRoles();
+		$identityId = $identity->getId();
+
 		$bag = new UserDataBag(
-			strval($identity->getId()),
-			$identity->getData()['email'] ?? null,
+			is_scalar($identityId) ? (string) $identityId : '',
+			is_string($identityData['email'] ?? null) ? $identityData['email'] : null,
 			$httpRequest->getRemoteAddress(),
-			$identity->getData()['username'] ?? null
+			is_string($identityData['username'] ?? null) ? $identityData['username'] : null
 		);
 
-		$bag->setMetadata('Roles', implode(',', $identity->getRoles()));
-		$bag->setMetadata('Identity', $identity->getData());
+		$bag->setMetadata('Roles', implode(',', $identityRoles));
+		$bag->setMetadata('Identity', $identityData);
 
 		$event->setUser($bag);
 

src/Upload/S3Uploader.php

@@ -28,9 +28,17 @@ public function upload(string $file): array
 
 		$url = $signed['url'];
 
+		if ($url === '') {
+			throw new UploadException('Invalid signed URL');
+		}
+
 		// Read file
 		$content = file_get_contents($file);
 
+		if ($content === false) {
+			throw new UploadException(sprintf('Cannot read file: %s', $file));
+		}
+
 		try {
 			$curl = curl_init();
 			curl_setopt_array($curl, [

tests/Cases/Integration/IgnoreErrorIntegration/IgnoreMessageWithInstance.phpt

@@ -8,18 +8,12 @@ use Sentry\ExceptionDataBag;
 use Sentry\SentrySdk;
 use Sentry\State\Scope;
 use Tester\Assert;
+use Tests\Fixtures\BadException;
+use Tests\Fixtures\GoodException;
 use function Sentry\withScope;
 
 require_once __DIR__ . '/../../../bootstrap.php';
 
-class GoodException extends RuntimeException
-{
-}
-
-class BadException extends RuntimeException
-{
-}
-
 // not matched exception and matched event
 Toolkit::test(function (): void {
 	$integration = new IgnoreErrorIntegration([

tests/Fixtures/BadException.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Fixtures;
+
+use RuntimeException;
+
+class BadException extends RuntimeException
+{
+
+}

tests/Fixtures/GoodException.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Fixtures;
+
+use RuntimeException;
+
+class GoodException extends RuntimeException
+{
+
+}