Align with Contributte library standards

- Use contributte/tester ^0.3.0 and contributte/phpstan ^0.2.0
- Update phpstan.neon with phpVersion and scanDirectories
- Update Makefile with GITHUB_ACTION conditional logic for CI/CD
- Use reusable workflows from contributte/.github
- Update tests to use Contributte\Tester\Environment
- Fix deprecated Authenticator constants (use new PascalCase names)
- Update ruleset.xml with modern array syntax
- Add test descriptions per new Nette Tester requirements

Author: claude

.github/workflows/codesniffer.yml

@@ -1,34 +1,17 @@
-name: Code Sniffer
+name: Codesniffer
 
 on:
-  push:
-    branches:
-      - "master"
   pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
   workflow_dispatch:
+  push:
+    branches:
+      - "**"
+  schedule:
+    - cron: "0 10 * * 1"
 
 jobs:
   codesniffer:
-    name: Code Sniffer
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          extensions: json
-          tools: composer
-
-      - name: Install dependencies
-        run: composer update --no-interaction --no-progress --prefer-dist --prefer-stable
-
-      - name: Run Code Sniffer
-        run: make cs
+    name: "Codesniffer"
+    uses: contributte/.github/.github/workflows/codesniffer.yml@master
+    with:
+      php: 8.2

.github/workflows/coverage.yml

@@ -1,34 +1,17 @@
 name: PHPStan
 
 on:
-  push:
-    branches:
-      - "master"
   pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
   workflow_dispatch:
+  push:
+    branches:
+      - "**"
+  schedule:
+    - cron: "0 10 * * 1"
 
 jobs:
   phpstan:
-    name: PHPStan
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          extensions: json
-          tools: composer
-
-      - name: Install dependencies
-        run: composer update --no-interaction --no-progress --prefer-dist --prefer-stable
-
-      - name: Run PHPStan
-        run: make phpstan
+    name: "PHPStan"
+    uses: contributte/.github/.github/workflows/phpstan.yml@master
+    with:
+      php: 8.2

.github/workflows/phpstan.yml

@@ -1,51 +1,36 @@
 name: Tests
 
 on:
+  pull_request:
+  workflow_dispatch:
   push:
     branches:
-      - "master"
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
+      - "**"
   schedule:
-    - cron: "0 8 * * 1"
-  workflow_dispatch:
+    - cron: "0 10 * * 1"
 
 jobs:
-  tests:
-    name: Tests
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version:
-          - 8.2
-          - 8.3
-          - 8.4
-        composer-args:
-          - ""
-        include:
-          - php-version: 8.2
-            composer-args: "--prefer-lowest"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: json
-          tools: composer
+  test84:
+    name: "Tests PHP 8.4"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: 8.4
 
-      - name: Validate Composer
-        run: composer validate --strict
+  test83:
+    name: "Tests PHP 8.3"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: 8.3
 
-      - name: Install dependencies
-        run: composer update --no-interaction --no-progress --prefer-dist --prefer-stable ${{ matrix.composer-args }}
+  test82:
+    name: "Tests PHP 8.2"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: 8.2
 
-      - name: Run tests
-        run: make tests
+  testlowest:
+    name: "Tests PHP 8.2 Lowest"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: 8.2
+      composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest"

.github/workflows/tests.yml

@@ -6,7 +6,11 @@ install:
 qa: phpstan cs
 
 cs:
+ifdef GITHUB_ACTION
+	vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 -q --report=checkstyle src tests | cs2pr
+else
 	vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 -nsp src tests
+endif
 
 csf:
 	vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 -nsp src tests
@@ -18,4 +22,8 @@ tests:
 	vendor/bin/tester -s -p php --colors 1 -C tests/Cases
 
 coverage:
+ifdef GITHUB_ACTION
 	vendor/bin/tester -s -p php --colors 1 -C --coverage ./coverage.xml --coverage-src ./src tests/Cases
+else
+	vendor/bin/tester -s -p php --colors 1 -C --coverage ./coverage.html --coverage-src ./src tests/Cases
+endif

Makefile

@@ -14,7 +14,7 @@
   "homepage": "https://github.com/contributte/security",
   "authors": [
     {
-      "name": "Milan Felix Sulc",
+      "name": "Milan Felix Šulc",
       "homepage": "https://f3l1x.io"
     }
   ],
@@ -23,10 +23,10 @@
     "nette/security": "^3.2"
   },
   "require-dev": {
-    "contributte/qa": "^0.4",
-    "contributte/phpstan": "^0.1",
-    "nette/tester": "^2.5",
-    "mockery/mockery": "^1.6"
+    "contributte/phpstan": "^0.2.0",
+    "contributte/qa": "^0.4.0",
+    "contributte/tester": "^0.3.0",
+    "mockery/mockery": "^1.6.12"
   },
   "suggest": {
     "nette/di": "to use SecurityExtension [CompilerExtension]"
@@ -38,7 +38,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\Contributte\\Security\\": "tests"
+      "Tests\\": "tests"
     }
   },
   "minimum-stability": "dev",

composer.json

@@ -3,6 +3,11 @@ includes:
 
 parameters:
 	level: 9
+	phpVersion: 80200
+	scanDirectories:
+		- src
+	fileExtensions:
+		- php
 	paths:
 		- src
 		- .docs

phpstan.neon

@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<ruleset>
+<ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
 	<!-- Contributte Coding Standard -->
 	<rule ref="./vendor/contributte/qa/ruleset-8.2.xml"/>
 
 	<!-- Specific rules -->
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
 		<properties>
-			<property name="rootNamespaces" type="array" value="
-				src=>Contributte\Security,
-				tests=>Tests\Contributte\Security
-			"/>
+			<property name="rootNamespaces" type="array">
+				<element key="src" value="Contributte\Security"/>
+				<element key="tests" value="Tests"/>
+			</property>
 		</properties>
 	</rule>
 

ruleset.xml

@@ -26,7 +26,7 @@ public function setIdentity(IIdentity $identity): void
 	public function authenticate(string $username, string $password): IIdentity
 	{
 		if ($this->pass === false) {
-			throw new AuthenticationException('Cannot login', Authenticator::FAILURE);
+			throw new AuthenticationException('Cannot login', Authenticator::Failure);
 		}
 
 		if ($this->identity !== null) {

src/Auth/DebugAuthenticator.php

@@ -28,9 +28,13 @@ public function __construct(
 				throw new InvalidArgumentException(sprintf('Missing parameter `password` for user `%s`', $username));
 			}
 
+			if (!is_string($values['password'])) {
+				throw new InvalidArgumentException(sprintf('Password for user `%s` must be a string', $username));
+			}
+
 			$this->list[$username] = [
 				'password' => $values['password'],
-				'unsecured' => $values['unsecured'] ?? false,
+				'unsecured' => (bool) ($values['unsecured'] ?? false),
 				'identity' => $this->createIdentity($username, $values),
 			];
 		}
@@ -39,7 +43,7 @@ public function __construct(
 	public function authenticate(string $username, string $password): IIdentity
 	{
 		if (!isset($this->list[$username])) {
-			throw new AuthenticationException(sprintf('User `%s` not found', $username), Authenticator::IDENTITY_NOT_FOUND);
+			throw new AuthenticationException(sprintf('User `%s` not found', $username), Authenticator::IdentityNotFound);
 		}
 
 		$user = $this->list[$username];
@@ -48,7 +52,7 @@ public function authenticate(string $username, string $password): IIdentity
 			($user['unsecured'] === true && !hash_equals($password, $user['password'])) ||
 			($user['unsecured'] === false && !$this->passwords->verify($password, $user['password']))
 		) {
-			throw new AuthenticationException('Invalid password', Authenticator::INVALID_CREDENTIAL);
+			throw new AuthenticationException('Invalid password', Authenticator::InvalidCredential);
 		}
 
 		return $user['identity'];
@@ -69,11 +73,11 @@ private function createIdentity(string $username, array $values): IIdentity
 			return $identity;
 		}
 
-		if (is_array($values['identity'])) {
+		if (is_array($identity)) {
 			return new SimpleIdentity(
-				$identity['id'] ?? $username,
-				$identity['roles'] ?? null,
-				$identity['date'] ?? null
+				isset($identity['id']) && (is_string($identity['id']) || is_int($identity['id'])) ? $identity['id'] : $username,
+				isset($identity['roles']) && is_array($identity['roles']) ? $identity['roles'] : null,
+				isset($identity['data']) && is_array($identity['data']) ? $identity['data'] : null
 			);
 		}