added PHP 8 typehints

Author: dg

src/Utils/Finder.php

@@ -51,9 +51,8 @@ class Finder implements \IteratorAggregate, \Countable
 	/**
 	 * Begins search for files and directories matching mask.
 	 * @param  string|string[]  $masks
-	 * @return static
 	 */
-	public static function find(...$masks): self
+	public static function find(...$masks): static
 	{
 		$masks = $masks && is_array($masks[0]) ? $masks[0] : $masks;
 		return (new static)->select($masks, 'isDir')->select($masks, 'isFile');
@@ -63,9 +62,8 @@ public static function find(...$masks): self
 	/**
 	 * Begins search for files matching mask.
 	 * @param  string|string[]  $masks
-	 * @return static
 	 */
-	public static function findFiles(...$masks): self
+	public static function findFiles(...$masks): static
 	{
 		$masks = $masks && is_array($masks[0]) ? $masks[0] : $masks;
 		return (new static)->select($masks, 'isFile');
@@ -75,9 +73,8 @@ public static function findFiles(...$masks): self
 	/**
 	 * Begins search for directories matching mask.
 	 * @param  string|string[]  $masks
-	 * @return static
 	 */
-	public static function findDirectories(...$masks): self
+	public static function findDirectories(...$masks): static
 	{
 		$masks = $masks && is_array($masks[0]) ? $masks[0] : $masks;
 		return (new static)->select($masks, 'isDir');
@@ -86,9 +83,8 @@ public static function findDirectories(...$masks): self
 
 	/**
 	 * Creates filtering group by mask & type selector.
-	 * @return static
 	 */
-	private function select(array $masks, string $type): self
+	private function select(array $masks, string $type): static
 	{
 		$this->cursor = &$this->groups[];
 		$pattern = self::buildPattern($masks);
@@ -102,9 +98,8 @@ private function select(array $masks, string $type): self
 	/**
 	 * Searches in the given folder(s).
 	 * @param  string|string[]  $paths
-	 * @return static
 	 */
-	public function in(...$paths): self
+	public function in(...$paths): static
 	{
 		$this->maxDepth = 0;
 		return $this->from(...$paths);
@@ -114,9 +109,8 @@ public function in(...$paths): self
 	/**
 	 * Searches recursively from the given folder(s).
 	 * @param  string|string[]  $paths
-	 * @return static
 	 */
-	public function from(...$paths): self
+	public function from(...$paths): static
 	{
 		if ($this->paths) {
 			throw new Nette\InvalidStateException('Directory to search has already been specified.');
@@ -130,9 +124,8 @@ public function from(...$paths): self
 
 	/**
 	 * Shows folder content prior to the folder.
-	 * @return static
 	 */
-	public function childFirst(): self
+	public function childFirst(): static
 	{
 		$this->order = RecursiveIteratorIterator::CHILD_FIRST;
 		return $this;
@@ -257,9 +250,8 @@ private function buildIterator(string $path): \Iterator
 	 * Restricts the search using mask.
 	 * Excludes directories from recursive traversing.
 	 * @param  string|string[]  $masks
-	 * @return static
 	 */
-	public function exclude(...$masks): self
+	public function exclude(...$masks): static
 	{
 		$masks = $masks && is_array($masks[0]) ? $masks[0] : $masks;
 		$pattern = self::buildPattern($masks);
@@ -274,9 +266,8 @@ public function exclude(...$masks): self
 	/**
 	 * Restricts the search using callback.
 	 * @param  callable  $callback  function (RecursiveDirectoryIterator $file): bool
-	 * @return static
 	 */
-	public function filter(callable $callback): self
+	public function filter(callable $callback): static
 	{
 		$this->cursor[] = $callback;
 		return $this;
@@ -285,9 +276,8 @@ public function filter(callable $callback): self
 
 	/**
 	 * Limits recursion level.
-	 * @return static
 	 */
-	public function limitDepth(int $depth): self
+	public function limitDepth(int $depth): static
 	{
 		$this->maxDepth = $depth;
 		return $this;
@@ -297,9 +287,8 @@ public function limitDepth(int $depth): self
 	/**
 	 * Restricts the search by size.
 	 * @param  string  $operator  "[operator] [size] [unit]" example: >=10kB
-	 * @return static
 	 */
-	public function size(string $operator, int $size = null): self
+	public function size(string $operator, int $size = null): static
 	{
 		if (func_num_args() === 1) { // in $operator is predicate
 			if (!preg_match('#^(?:([=<>!]=?|<>)\s*)?((?:\d*\.)?\d+)\s*(K|M|G|)B?$#Di', $operator, $matches)) {
@@ -319,10 +308,8 @@ public function size(string $operator, int $size = null): self
 	/**
 	 * Restricts the search by modified time.
 	 * @param  string  $operator  "[operator] [date]" example: >1978-01-23
-	 * @param  string|int|\DateTimeInterface  $date
-	 * @return static
 	 */
-	public function date(string $operator, $date = null): self
+	public function date(string $operator, string|int|\DateTimeInterface $date = null): static
 	{
 		if (func_num_args() === 1) { // in $operator is predicate
 			if (!preg_match('#^(?:([=<>!]=?|<>)\s*)?(.+)$#Di', $operator, $matches)) {
@@ -368,7 +355,7 @@ public static function compare($l, string $operator, $r): bool
 	/********************* extension methods ****************d*g**/
 
 
-	public function __call(string $name, array $args)
+	public function __call(string $name, array $args): mixed
 	{
 		return isset(self::$extMethods[$name])
 			? (self::$extMethods[$name])($this, ...$args)