Nette 3

Author: mabar

README.md

@@ -18,9 +18,11 @@ Settings manager
 
 ## Version
 
-| State       | Version | Branch   | PHP    |
-|-------------|---------|----------|--------|
-| stable      | `^0.1`  | `master` | `^7.2` |
+| State       | Version | Branch   | Nette | PHP     |
+|-------------|---------|----------|-------|---------|
+| dev         | `^0.3`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.2`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.1`  | `master` | 2.4   | `^7.2`  |
 
 ## Maintainers
 

composer.json

@@ -12,9 +12,9 @@
   ],
   "require": {
     "php": "^7.2",
-    "nette/application": "~2.4.13",
-    "nette/di": "~2.4.15",
-    "nette/forms": "~2.4.9"
+    "nette/application": "~3.0.0",
+    "nette/di": "~3.0.0",
+    "nette/forms": "~3.0.0"
   },
   "require-dev": {
     "mockery/mockery": "^1.2",
@@ -26,6 +26,9 @@
     "phpstan/phpstan-strict-rules": "^0.11",
     "phpunit/phpunit": "^8.1"
   },
+  "conflict": {
+    "nette/di": "<=3.0.0-RC"
+  },
   "autoload": {
     "psr-4": {
       "Tlapnet\\Settus\\": "src"
@@ -43,7 +46,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-develop": "0.1.x-dev"
+      "dev-develop": "0.3.x-dev"
     }
   }
 }

src/Component/SettingsControl.php

@@ -29,7 +29,6 @@ class SettingsControl extends Control
 
 	public function __construct(SettingsSection $section)
 	{
-		parent::__construct();
 		$this->section = $section;
 	}
 

src/Component/SettingsForm.php

@@ -22,35 +22,35 @@ public function __construct(array $items)
 			$value = $item->getValue();
 
 			$this->addSubmit('save_' . $key, 'Save')
-				->setAttribute('class', 'btn btn-sm btn-primary');
+				->setHtmlAttribute('class', 'btn btn-sm btn-primary');
 
 			$this->addSubmit('reset_' . $key, 'Reset')
-				->setAttribute('class', 'btn btn-sm btn-danger');
+				->setHtmlAttribute('class', 'btn btn-sm btn-danger');
 
 			if ($type === SettingsItemControl::TYPE_CHECKBOX) {
 				$this->addCheckbox('value_' . $key)
-					->setAttribute('class', 'form-control form-control-sm mr-2')
+					->setHtmlAttribute('class', 'form-control form-control-sm mr-2')
 					->setDefaultValue($value);
 			} elseif ($type === SettingsItemControl::TYPE_PASSWORD) {
 				$this->addPassword('value_' . $key)
-					->setAttribute('class', 'form-control form-control-sm mr-2')
+					->setHtmlAttribute('class', 'form-control form-control-sm mr-2')
 					->setDefaultValue($value);
 			} elseif ($type === SettingsItemControl::TYPE_SELECT) {
 				$this->addSelect('value_' . $key, null, $control->getMeta()['items'] ?? [])
-					->setAttribute('class', 'form-control form-control-sm mr-2')
+					->setHtmlAttribute('class', 'form-control form-control-sm mr-2')
 					->setDefaultValue($value);
 			} else {
 				$this->addText('value_' . $key)
-					->setAttribute('class', 'form-control form-control-sm mr-2')
+					->setHtmlAttribute('class', 'form-control form-control-sm mr-2')
 					->setDefaultValue($value);
 			}
 		}
 
 		$this->addSubmit('saveAll', 'Save all')
-			->setAttribute('class', 'btn btn-sm btn-primary');
+			->setHtmlAttribute('class', 'btn btn-sm btn-primary');
 
 		$this->addSubmit('resetAll', 'Reset all')
-			->setAttribute('class', 'btn btn-sm btn-danger');
+			->setHtmlAttribute('class', 'btn btn-sm btn-danger');
 	}
 
 }

src/DI/SettusExtension.php

@@ -3,30 +3,40 @@
 namespace Tlapnet\Settus\DI;
 
 use Nette\DI\CompilerExtension;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
+use stdClass;
 use Tlapnet\Settus\Component\ISettingsControlFactory;
 use Tlapnet\Settus\Component\SettingsControl;
 use Tlapnet\Settus\SettingsManager;
 
+/**
+ * @property-read stdClass $config
+ */
 class SettusExtension extends CompilerExtension
 {
 
-	/** @var mixed[] */
-	private $defaults = [
-		'managerClass' => SettingsManager::class,
-		'sections' => [],
-	];
+	public function getConfigSchema(): Schema
+	{
+		return Expect::structure([
+			'managerClass' => Expect::string(SettingsManager::class),
+			'sections' => Expect::array(),
+		]);
+	}
 
 	public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
-		$config = $this->validateConfig($this->defaults);
+		$config = $this->config;
 
 		$builder->addDefinition($this->prefix('settingsManager'))
-			->setFactory($config['managerClass'], [$config['sections']]);
+			->setFactory($config->managerClass, [$config->sections]);
 
-		$builder->addDefinition($this->prefix('settingsControl'))
-			->setType(SettingsControl::class)
+		$settingsControlFactoryDefinition = $builder->addFactoryDefinition($this->prefix('settingsControl'))
 			->setImplement(ISettingsControlFactory::class);
+
+		$settingsControlFactoryDefinition->getResultDefinition()
+			->setType(SettingsControl::class);
 	}
 
 }