PHP 8.5 Compatibility

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+ php: [ '8.2', '8.3', '8.4', '8.5' ]
 
  steps:
  - uses: actions/checkout@master

Makefile

@@ -1,14 +1,8 @@
 .PHONY: tests
 
 tests: vendor
-	php -d zend.assertions=1 -d assert.exception=1 vendor/bin/peridot ./specs
+	php vendor/bin/pest
 
-vendor: composer.json composer.phar
-php composer.phar install
+vendor: composer.json
+	composer install
 	touch vendor
-
-composer.phar:
-	php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-	php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
-	php composer-setup.php
-	php -r "unlink('composer-setup.php');"

composer.json

@@ -9,14 +9,14 @@
  "auto-wiring"
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.2",
  "psr/container": "^2.0",
  "technically/null-container": "^2.0",
- "technically/callable-reflection": "^0.4.2"
+ "technically/callable-reflection": "^0.5.0"
  },
  "require-dev": {
- "peridot-php/peridot": "^1.19",
- "technically/array-container": "^2.0"
+ "technically/array-container": "^2.0",
+ "pestphp/pest": "^2.0 || ^3.0 || ^4.0"
  },
  "license": "MIT",
  "authors": [
@@ -33,7 +33,12 @@
  },
  "autoload-dev": {
  "psr-4": {
- "Technically\\DependencyResolver\\Specs\\": "specs"
+ "Technically\\DependencyResolver\\Tests\\": "tests"
+ }
+ },
+ "config": {
+ "allow-plugins": {
+ "pestphp/pest-plugin": true
  }
  }
 }

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ colors="true"
+>
+ <testsuites>
+ <testsuite name="Test Suite">
+ <directory suffix=".spec.php">./tests</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory>src</directory>
+ </include>
+ </source>
+</phpunit>

src/Contracts/DependencyResolver.php

@@ -17,8 +17,9 @@ interface DependencyResolver
  * It can be either found in the container or constructed on the fly,
  * recursively auto-resolving the required parameters.
  *
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If the class does not exist.
  * @throws ContainerExceptionInterface If an error occurs while retrieving the existing entry from the container.
@@ -33,9 +34,10 @@ public function resolve(string $className): mixed;
  * Even if the container already has the instance bound,
  * it will still be instantiated.
  *
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument

src/DependencyResolver.php

@@ -25,8 +25,9 @@ public function __construct(?ContainerInterface $container = null)
  }
 
  /**
- * @param class-string $className
- * @return mixed
+ * @template T
+ * @param class-string<T> $className
+ * @return T
  *
  * @throws InvalidArgumentException If class does not exist.
  * @throws ContainerExceptionInterface If error occurs while retrieving the existing entry from the container.
@@ -47,9 +48,10 @@ public function resolve(string $className): mixed
  }
 
  /**
- * @param class-string $className
+ * @template T
+ * @param class-string<T> $className
  * @param array<string,mixed> $bindings
- * @return mixed
+ * @return T
  *
  * @throws ClassCannotBeInstantiated
  * @throws CannotAutowireDependencyArgument
@@ -125,7 +127,6 @@ private function resolveParameters(array $parameters, array $bindings = []): arr
  }
 
  /**
- * @param ParameterReflection $parameter
  * @return mixed|null
  *
  * @throws CannotAutowireArgument
@@ -136,7 +137,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  if ($type->isClassRequirement() && $this->container->has($class = $type->getClassRequirement())) {
  try {
  return $this->container->get($class);
- } catch (ContainerExceptionInterface $exception) {
+ } catch (ContainerExceptionInterface) {
  throw new CannotAutowireArgument($parameter->getName());
  }
  }
@@ -155,7 +156,7 @@ private function resolveParameter(ParameterReflection $parameter): mixed
  $class = $type->getClassRequirement();
  try {
  return $this->construct($class);
- } catch (DependencyResolutionException $exception) {
+ } catch (DependencyResolutionException) {
  // try another one
  }
  }

src/Exceptions/CannotAutowireArgument.php

@@ -15,7 +15,7 @@ final class CannotAutowireArgument extends DependencyResolutionException
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $argumentName, Throwable $previous = null)
+ public function __construct(string $argumentName, Throwable | null $previous = null)
  {
  $this->argumentName = $argumentName;
 

src/Exceptions/CannotAutowireDependencyArgument.php

@@ -21,12 +21,12 @@ final class CannotAutowireDependencyArgument extends DependencyResolutionExcepti
  * @param string $argumentName
  * @param Throwable|null $previous
  */
- public function __construct(string $dependencyName, string $argumentName, Throwable $previous = null)
+ public function __construct(string $dependencyName, string $argumentName, Throwable | null $previous = null)
  {
  $this->dependencyName = $dependencyName;
  $this->argumentName = $argumentName;
 
- parent::__construct("Could not autowire argument `{$argumentName}` for `${dependencyName}`.", 0, $previous);
+ parent::__construct("Could not autowire argument `{$argumentName}` for `{$dependencyName}`.", 0, $previous);
  }
 
  /**

src/Exceptions/ClassCannotBeInstantiated.php

@@ -13,7 +13,7 @@ public function __construct(string $className)
  {
  $this->className = $className;
 
- parent::__construct("Class (${className}) cannot be instantiated.");
+ parent::__construct("Class ({$className}) cannot be instantiated.");
  }
 
  /**

specs/DependencyResolver.spec.php → tests/DependencyResolver.spec.php

@@ -6,6 +6,6 @@
  it('should instantiate', function () {
  $resolver = new DependencyResolver();
 
-assert($resolver instanceof DependencyResolver);
+expect($resolver)->toBeInstanceOf(DependencyResolver::class);
  });
 });

specs/DependencyResolver::call.spec.php → tests/DependencyResolver::call.spec.php

@@ -3,9 +3,9 @@
 use Psr\Container\ContainerInterface;
 use Technically\ArrayContainer\ArrayContainer;
 use Technically\DependencyResolver\DependencyResolver;
-use Technically\DependencyResolver\Specs\Fixtures\MyInstanceMethodService;
-use Technically\DependencyResolver\Specs\Fixtures\MyInvokableService;
-use Technically\DependencyResolver\Specs\Fixtures\MyStaticMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInstanceMethodService;
+use Technically\DependencyResolver\Tests\Fixtures\MyInvokableService;
+use Technically\DependencyResolver\Tests\Fixtures\MyStaticMethodService;
 use Technically\NullContainer\NullContainer;
 
 describe('DependencyResolver::call()', function () {
@@ -16,23 +16,23 @@
 
  $value = $resolver->call('my_global_function', ['value' => $resolver]);
 
-assert($value === true);
+expect($value)->toBeTrue();
  });
 
  it('should call Closures resolving dependencies', function () {
  $container = new ArrayContainer();
  $resolver = new DependencyResolver($container);
  $container->set(DependencyResolver::class, $resolver);
 
- [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, int $else = null) {
+ [$r, $m, $n] = $resolver->call(function (DependencyResolver $resolver, string $message, ?int $else = null) {
  return [$resolver, $message, $else];
  }, [
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method array resolving dependencies', function () {
@@ -44,9 +44,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call static method string resolving dependencies', function () {
@@ -58,9 +58,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call instance methods resolving dependencies', function () {
@@ -72,9 +72,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should call invokable objects resolving dependencies', function () {
@@ -86,9 +86,9 @@
  'message' => 'Hello'
  ]);
 
-assert($r === $resolver);
-assert($m === 'Hello');
-assert($n === null);
+expect($r)->toBe($resolver);
+expect($m)->toBe('Hello');
+expect($n)->toBeNull();
  });
 
  it('should resolve typed variadic parameters', function () {
@@ -100,8 +100,8 @@
  return $containers;
  });
 
-assert(is_array($ret));
-assert(count($ret) === 1);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
  });
 
  it('should call function by passing variadic parameter value explicitly', function () {
@@ -117,8 +117,8 @@
  'containers' => [$null],
  ]);
 
-assert(is_array($ret));
-assert(count($ret) === 1);
-assert($ret === [$null]);
+expect($ret)->toBeArray();
+expect($ret)->toHaveCount(1);
+expect($ret)->toBe([$null]);
  });
 });