Nette 3

Author: mabar

.docs/README.md

@@ -26,43 +26,34 @@ extensions:
     curl: Contributte\Http\DI\CurlExtension
 ```
 
-Extension registers by automatic [`Contributte\Http\Curl\CurlClient`](https://github.com/contributte/http/blob/master/src/Curl/CurlClient.php) as a service.
+Extension registers [`Contributte\Http\Curl\CurlClient`](https://github.com/contributte/http/blob/master/src/Curl/CurlClient.php) as a service.
 
 ## SAPI
 
 Every modern PHP application needs sometimes to run a few console commands. Let's say sending newsletter campaigns. There is
 a tiny problem, there is no request/URL in console/SAPI (Server API) mode. Don't worry, just use our fake request -
 `SapiRequestExtension`.
 
-The easiest way is to register extension without any parameters.
-
 ```yaml
 extensions:
     sapi: Contributte\Http\DI\SapiRequestExtension
 ```
 
-Alternatively, you can pass directly URL address.
-
-```yaml
-extensions:
-    sapi: Contributte\Http\DI\SapiRequestExtension(https://contributte.org)
-```
-
 List of all options:
 
 ```yaml
 sapi:
     url: https://contributte.org
     # other params
-    query: NULL
-    post: NULL
-    files: NULL
-    cookies: NULL
-    headers: NULL
-    method: NULL
-    remoteAddress: NULL
-    remoteHost: NULL
-    rawBodyCallback: NULL
+    query: null
+    post: null
+    files: null
+    cookies: null
+    headers: null
+    method: null
+    remoteAddress: null
+    remoteHost: null
+    rawBodyCallback: null
 ```
 
 ## Basic Authentication

README.md

@@ -25,11 +25,12 @@ Extra contribution to [`nette/http`](https://github.com/nette/http).
 
 ## Versions
 
-| State       | Version | Branch   | PHP      |
-|-------------|---------|----------|----------|
-| dev         | `^0.3`  | `master` | `>= 7.1` |
-| stable      | `^0.2`  | `master` | `>= 7.1` |
-| stable      | `^0.1`  | `master` | `>= 5.6` |
+| State       | Version | Branch   | Nette | PHP     |
+|-------------|---------|----------|-------|---------|
+| dev         | `^0.4`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.3`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.2`  | `master` | 2.4   | `>=7.1` |
+| stable      | `^0.1`  | `master` | 2.4   | `>=5.6` |
 
 ## Maintainers
 

composer.json

@@ -19,11 +19,11 @@
     }
   ],
   "require": {
-    "php": ">= 7.1",
-    "nette/http": "~2.4.9"
+    "php": "^7.2",
+    "nette/http": "~3.0.1"
   },
   "require-dev": {
-    "nette/di": "~2.4.13",
+    "nette/di": "~3.0.0",
     "ninjify/nunjuck": "^0.2.0",
     "ninjify/qa": "^0.8.0",
     "phpstan/extension-installer": "^1.0",
@@ -34,8 +34,7 @@
     "tracy/tracy": "~2.5.1"
   },
   "conflict": {
-    "nette/di": "<2.4.13",
-    "nette/utils": "<2.5.2"
+    "nette/di": "<3.0.0"
   },
   "suggest": {
     "nette/di": "to use CompilerExtensions"
@@ -52,7 +51,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.3.x-dev"
+      "dev-master": "0.4.x-dev"
     }
   }
 }

src/DI/BasicAuthExtension.php

@@ -3,66 +3,59 @@
 namespace Contributte\Http\DI;
 
 use Contributte\Http\Auth\BasicAuthenticator;
-use LogicException;
 use Nette\DI\CompilerExtension;
 use Nette\Http\IRequest;
 use Nette\Http\IResponse;
 use Nette\PhpGenerator\ClassType;
-use Nette\Utils\Validators;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
+use stdClass;
 
+/**
+ * @property-read stdClass $config
+ */
 class BasicAuthExtension extends CompilerExtension
 {
 
-	/** @var mixed[] */
-	private $defaults = [
-		'enabled' => false,
-		'title' => 'Restrict zone',
-		'users' => [],
-	];
+	public function getConfigSchema(): Schema
+	{
+		return Expect::structure([
+			'enabled' => Expect::bool(false),
+			'title' => Expect::string('Restricted zone'),
+			'users' => Expect::arrayOf(Expect::structure([
+				'password' => Expect::string()->required(),
+				'unsecured' => Expect::bool(false),
+			]))->min(1),
+		]);
+	}
 
-	/**
-	 * Register services
-	 */
 	public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
-		$config = $this->validateConfig($this->defaults);
-
-		Validators::assertField($config, 'enabled', 'bool');
-		Validators::assertField($config, 'users', 'array');
+		$config = $this->config;
 
 		// Skip if its disabled
-		if ($config['enabled'] !== true) return;
-
-		// Throws if there's no user
-		if ($config['users'] === []) throw new LogicException('You have to define any user or disable extension');
+		if (!$config->enabled) {
+			return;
+		}
 
 		$def = $builder->addDefinition($this->prefix('authenticator'))
 			->setType(BasicAuthenticator::class)
-			->setArguments([$config['title']]);
+			->setArguments([$config->title]);
 
-		foreach ($config['users'] as $user => $values) {
-			if (is_string($values)) {
-				trigger_error('Usage of `$username => $password` is deprecated, use `$username => ["password" => $password]` instead', E_USER_DEPRECATED);
-				$password = $values;
-				$unsecured = true;
-			} else {
-				$password = $values['password'];
-				$unsecured = $values['unsecured'] ?? false;
-			}
-			$def->addSetup('addUser', [$user, $password, $unsecured]);
+		foreach ($config->users as $user => $values) {
+			$def->addSetup('addUser', [$user, $values->password, $values->unsecured]);
 		}
 	}
 
-	/**
-	 * Decorate initialize
-	 */
 	public function afterCompile(ClassType $class): void
 	{
-		$config = $this->validateConfig($this->defaults);
+		$config = $this->config;
 
-		// Skip if its disabled or no user defined
-		if ($config['enabled'] !== true || $config['users'] === []) return;
+		// Skip if its disabled
+		if (!$config->enabled) {
+			return;
+		}
 
 		$initialize = $class->methods['initialize'];
 		$initialize->addBody('$this->getService(?)->authenticate($this->getByType(?), $this->getByType(?));', [

src/DI/CurlExtension.php

@@ -8,9 +8,6 @@
 class CurlExtension extends CompilerExtension
 {
 
-	/**
-	 * Register services
-	 */
 	public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();

src/DI/SapiRequestExtension.php

@@ -3,42 +3,42 @@
 namespace Contributte\Http\DI;
 
 use Nette\DI\CompilerExtension;
-use Nette\DI\Statement;
+use Nette\DI\Definitions\Statement;
+use Nette\DI\ServiceDefinition;
 use Nette\Http\Request;
 use Nette\Http\UrlScript;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
 use RuntimeException;
+use stdClass;
 
+/**
+ * @property-read stdClass $config
+ */
 class SapiRequestExtension extends CompilerExtension
 {
 
-	/** @var mixed[] */
-	private $defaults = [
-		'url' => null,
-		'query' => null,
-		'post' => null,
-		'files' => null,
-		'cookies' => null,
-		'headers' => null,
-		'method' => null,
-		'remoteAddress' => null,
-		'remoteHost' => null,
-		'rawBodyCallback' => null,
-	];
-
-	public function __construct(?string $url = null)
+	public function getConfigSchema(): Schema
 	{
-		if ($url !== null) {
-			$this->defaults['url'] = $url;
-		}
+		return Expect::structure([
+			'url' => Expect::string()->required(),
+			'post' => Expect::array(),
+			'files' => Expect::array(),
+			'cookies' => Expect::array(),
+			'headers' => Expect::array(),
+			'method' => Expect::string(),
+			'remoteAddress' => Expect::string(),
+			'remoteHost' => Expect::string(),
+			'rawBodyCallback' => Expect::mixed(),
+		]);
 	}
 
-	/**
-	 * Decorate services
-	 */
 	public function beforeCompile(): void
 	{
 		// Breaks at other mode then CLI
-		if (PHP_SAPI !== 'cli') return;
+		if (PHP_SAPI !== 'cli') {
+			return;
+		}
 
 		$builder = $this->getContainerBuilder();
 
@@ -47,20 +47,22 @@ public function beforeCompile(): void
 			throw new RuntimeException('Service http.request is needed');
 		}
 
-		$config = $this->validateConfig($this->defaults);
-		$builder->getDefinition('http.request')
-			->setFactory(Request::class, [
-				new Statement(UrlScript::class, [$config['url']]),
-				$config['query'],
-				$config['post'],
-				$config['files'],
-				$config['cookies'],
-				$config['headers'],
-				$config['method'],
-				$config['remoteAddress'],
-				$config['remoteHost'],
-				$config['rawBodyCallback'],
-			]);
+		$requestDefinition = $builder->getDefinition('http.request');
+
+		assert($requestDefinition instanceof ServiceDefinition);
+
+		$config = $this->config;
+		$requestDefinition->setFactory(Request::class, [
+			new Statement(UrlScript::class, [$config->url]),
+			$config->post,
+			$config->files,
+			$config->cookies,
+			$config->headers,
+			$config->method,
+			$config->remoteAddress,
+			$config->remoteHost,
+			$config->rawBodyCallback,
+		]);
 	}
 
 }

tests/cases/DI/BasicAuthExtension.phpt

@@ -14,9 +14,9 @@ use Tester\FileMock;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(function (): void {
+test(static function (): void {
 	$loader = new ContainerLoader(TEMP_DIR, true);
-	$class = $loader->load(function (Compiler $compiler): void {
+	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('auth', new BasicAuthExtension());
 		$compiler->loadConfig(FileMock::create('
 		auth:

tests/cases/DI/CurlExtension.phpt

@@ -14,9 +14,9 @@ use Tester\Assert;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(function (): void {
+test(static function (): void {
 	$loader = new ContainerLoader(TEMP_DIR, true);
-	$class = $loader->load(function (Compiler $compiler): void {
+	$class = $loader->load(static function (Compiler $compiler): void {
 		$compiler->addExtension('curl', new CurlExtension());
 	}, 1);
 

tests/cases/DI/SapiRequestExtension.phpt

@@ -14,11 +14,16 @@ use Tester\Assert;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(function (): void {
+test(static function (): void {
 	$loader = new ContainerLoader(TEMP_DIR, true);
-	$class = $loader->load(function (Compiler $compiler): void {
+	$class = $loader->load(static function (Compiler $compiler): void {
+		$compiler->addConfig([
+			'sapi' => [
+				'url' => 'https://contributte.org',
+			],
+		]);
 		$compiler->addExtension('http', new HttpExtension(true));
-		$compiler->addExtension('sapi', new SapiRequestExtension('https://contributte.org'));
+		$compiler->addExtension('sapi', new SapiRequestExtension());
 	}, 1);
 
 	/** @var Container $container */

tests/cases/Url.phpt

@@ -9,7 +9,7 @@ use Tester\Assert;
 
 require_once __DIR__ . '/../bootstrap.php';
 
-test(function (): void {
+test(static function (): void {
 	$url = new Url('https://github.com');
 	Assert::equal('https://github.com/', (string) $url);