Strings: add base64UrlEncode() and base64UrlDecode()

.github/workflows/coding-style.yml

@@ -7,10 +7,10 @@ jobs:
         name: Nette Code Checker
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
@@ -21,7 +21,7 @@ jobs:
         name: Nette Coding Standard
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
                   php-version: 8.0

.github/workflows/static-analysis.yml

@@ -7,10 +7,10 @@ jobs:
         name: PHPStan
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

.github/workflows/tests.yml

@@ -8,13 +8,13 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest, windows-latest]
-                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+                php: ['8.0', '8.1', '8.2']
 
             fail-fast: false
 
         name: PHP ${{ matrix.php }} tests on ${{ matrix.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
@@ -24,7 +24,7 @@ jobs:
             - run: composer install --no-progress --prefer-dist
             - run: vendor/bin/tester tests -s -C
             - if: failure()
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v3
               with:
                   name: output
                   path: tests/**/output
@@ -34,10 +34,10 @@ jobs:
         name: Code Coverage
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   extensions: iconv, json, mbstring, xml, gd, intl, tokenizer
                   coverage: none
 

composer.json

@@ -15,11 +15,11 @@
 		}
 	],
 	"require": {
-		"php": ">=7.2 <8.3"
+		"php": ">=8.0 <8.3"
 	},
 	"require-dev": {
-		"nette/tester": "~2.0",
-		"tracy/tracy": "^2.3",
+		"nette/tester": "^2.4",
+		"tracy/tracy": "^2.8",
 		"phpstan/phpstan": "^1.0"
 	},
 	"conflict": {
@@ -44,7 +44,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.2-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

ncs.php

@@ -11,4 +11,6 @@
 	// use function in Arrays.php, Callback.php, Html.php, Strings.php
 	'single_import_per_statement' => false,
 	'ordered_imports' => false,
+	// Reflection.php
+	'Nette/statement_indentation' => false,
 ];

ncs.xml

@@ -1,18 +1,13 @@
 <?xml version="1.0"?>
 <ruleset name="Custom" namespace="Nette">
-	<rule ref="$presets/php72.xml"/>
-
-	<!-- bug in SlevomatCodingStandard -->
-	<rule ref="SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator">
-		<severity>0</severity>
-	</rule>
+	<rule ref="$presets/php80.xml"/>
 
 	<!-- bug in FunctionSpacingSniff -->
 	<exclude-pattern>./tests/Utils/Reflection.getDeclaringMethod.alias.phpt</exclude-pattern>
 	<exclude-pattern>./tests/Utils/Reflection.getDeclaringMethod.insteadof.phpt</exclude-pattern>
 
 	<!-- use function in Arrays.php, Callback.php, Html.php, Strings.php -->
 	<rule ref="SlevomatCodingStandard.Namespaces.MultipleUsesPerLine.MultipleUsesPerLine">
-		<severity>0</severity>
+		<exclude-pattern>./src/*/*.php</exclude-pattern>
 	</rule>
 </ruleset>

readme.md

@@ -39,6 +39,7 @@ The recommended way to install is via Composer:
 composer require nette/utils
 ```
 
+- Nette Utils 4.0 is compatible with PHP 8.0 to 8.2
 - Nette Utils 3.2 is compatible with PHP 7.2 to 8.2
 - Nette Utils 3.1 is compatible with PHP 7.1 to 8.0
 - Nette Utils 3.0 is compatible with PHP 7.1 to 8.0

src/Iterators/CachingIterator.php

@@ -28,8 +28,7 @@ class CachingIterator extends \CachingIterator implements \Countable
 {
 	use Nette\SmartObject;
 
-	/** @var int */
-	private $counter = 0;
+	private int $counter = 0;
 
 
 	public function __construct($iterator)
@@ -48,7 +47,7 @@ public function __construct($iterator)
 		} elseif ($iterator instanceof \Traversable) {
 			$iterator = new \IteratorIterator($iterator);
 		} else {
-			throw new Nette\InvalidArgumentException(sprintf('Invalid argument passed to %s; array or Traversable expected, %s given.', self::class, is_object($iterator) ? get_class($iterator) : gettype($iterator)));
+			throw new Nette\InvalidArgumentException(sprintf('Invalid argument passed to %s; array or Traversable expected, %s given.', self::class, is_object($iterator) ? $iterator::class : gettype($iterator)));
 		}
 
 		parent::__construct($iterator, 0);
@@ -148,19 +147,17 @@ public function rewind(): void
 
 	/**
 	 * Returns the next key.
-	 * @return mixed
 	 */
-	public function getNextKey()
+	public function getNextKey(): mixed
 	{
 		return $this->getInnerIterator()->key();
 	}
 
 
 	/**
 	 * Returns the next element.
-	 * @return mixed
 	 */
-	public function getNextValue()
+	public function getNextValue(): mixed
 	{
 		return $this->getInnerIterator()->current();
 	}

src/Iterators/Mapper.php

@@ -27,8 +27,7 @@ public function __construct(\Traversable $iterator, callable $callback)
 	}
 
 
-	#[\ReturnTypeWillChange]
-	public function current()
+	public function current(): mixed
 	{
 		return ($this->callback)(parent::current(), parent::key());
 	}

src/SmartObject.php

@@ -24,7 +24,7 @@ trait SmartObject
 	/**
 	 * @throws MemberAccessException
 	 */
-	public function __call(string $name, array $args)
+	public function __call(string $name, array $args): mixed
 	{
 		$class = static::class;
 
@@ -37,26 +37,27 @@ public function __call(string $name, array $args)
 			} elseif ($handlers !== null) {
 				throw new UnexpectedValueException("Property $class::$$name must be iterable or null, " . gettype($handlers) . ' given.');
 			}
-		} else {
-			ObjectHelpers::strictCall($class, $name);
+
+			return null;
 		}
+
+		ObjectHelpers::strictCall($class, $name);
 	}
 
 
 	/**
 	 * @throws MemberAccessException
 	 */
-	public static function __callStatic(string $name, array $args)
+	public static function __callStatic(string $name, array $args): mixed
 	{
 		ObjectHelpers::strictStaticCall(static::class, $name);
 	}
 
 
 	/**
-	 * @return mixed
 	 * @throws MemberAccessException if the property is not defined.
 	 */
-	public function &__get(string $name)
+	public function &__get(string $name): mixed
 	{
 		$class = static::class;
 
@@ -87,11 +88,9 @@ public function &__get(string $name)
 
 
 	/**
-	 * @param  mixed  $value
-	 * @return void
 	 * @throws MemberAccessException if the property is not defined or is read-only
 	 */
-	public function __set(string $name, $value)
+	public function __set(string $name, mixed $value): void
 	{
 		$class = static::class;
 
@@ -121,10 +120,9 @@ public function __set(string $name, $value)
 
 
 	/**
-	 * @return void
 	 * @throws MemberAccessException
 	 */
-	public function __unset(string $name)
+	public function __unset(string $name): void
 	{
 		$class = static::class;
 		if (!ObjectHelpers::hasProperty($class, $name)) {

src/StaticClass.php

@@ -27,10 +27,9 @@ final public function __construct()
 
 	/**
 	 * Call to undefined static method.
-	 * @return void
 	 * @throws MemberAccessException
 	 */
-	public static function __callStatic(string $name, array $args)
+	public static function __callStatic(string $name, array $args): mixed
 	{
 		Utils\ObjectHelpers::strictStaticCall(static::class, $name);
 	}

src/Translator.php

@@ -17,10 +17,8 @@ interface Translator
 {
 	/**
 	 * Translates the given string.
-	 * @param  mixed  $message
-	 * @param  mixed  ...$parameters
 	 */
-	function translate($message, ...$parameters): string;
+	function translate(string|\Stringable $message, mixed ...$parameters): string|\Stringable;
 }