Merge pull request #9 from nextras/latte-tags

Latte tags

Author: hrach

.phpstan.neon

@@ -1,10 +1,3 @@
 includes:
 	- vendor/phpstan/phpstan-nette/extension.neon
 	- vendor/phpstan/phpstan-nette/rules.neon
-
-parameters:
-	ignoreErrors:
-		-
-			# https://github.com/phpstan/phpstan/issues/2063
-			message: '/^Ternary operator condition is always true\.$/'
-			path: %currentWorkingDirectory%/src/LatteMacros/BaseInputMacros.php

composer.json

@@ -11,8 +11,8 @@
 		}
 	],
 	"require": {
-		"php": ">=7.1",
-		"latte/latte": "^2.5 || ^3.0",
+		"php": ">=8.0",
+		"latte/latte": "^3.0",
 		"nette/forms": "^3.0",
 		"nette/utils": "^3.0"
 	},
@@ -21,13 +21,13 @@
 		"nette/bootstrap": "^3.0",
 		"nette/di": "^3.0",
 		"nette/robot-loader": "^3.0",
-		"phpstan/phpstan": "0.12.99",
-		"phpstan/phpstan-nette": "0.12.21",
+		"phpstan/phpstan": "~1.8",
+		"phpstan/phpstan-nette": "~1.0",
 		"tracy/tracy": "^2.5"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.0-dev"
+			"dev-master": "2.0-dev"
 		}
 	},
 	"config": {

readme.md

@@ -9,11 +9,11 @@ This package provides rendering helpers Nette Forms.
 
 Form renderers:
 - *Bs3Renderer* - renderer for Bootstrap 3 with horizontal mode only;
-- *Bs4Renderer* - renderer for Bootstrap 4 with support for horizontal, vertial and inline mode;
-- *Bs5Renderer* - renderer for Bootstrap 5 with support for horizontal, vertial and inline mode;
+- *Bs4Renderer* - renderer for Bootstrap 4 with support for horizontal, vertical and inline mode;
+- *Bs5Renderer* - renderer for Bootstrap 5 with support for horizontal, vertical and inline mode;
 
-Latte Macros renderers (only for Latte 2):
-- *Bs3InputMacros* - modifies Form Macros to add Bootstrap 3 classes automatically;
+Latte Tags renderers:
+- *Bs3FormsExtension* - modifies Form Tags to add Bootstrap 3 classes automatically;
 
 ### Installation
 
@@ -23,12 +23,12 @@ The best way to install is using [Composer](http://getcomposer.org/):
 $ composer require nextras/forms-rendering
 ```
 
-Register Bs3InputMacros using Nette DI config (only for Latte 2):
+Register Bs3FormsExtension using Nette DI config:
 
 ```yaml
 latte:
-    macros:
-        - Nextras\FormsRendering\LatteMacros\Bs3InputMacros::install
+    extensions:
+        - Nextras\FormsRendering\LatteTags\Bs3\Bs3FormsExtension
 ```
 
 ### Documentation

src/LatteMacros/BaseInputMacros.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+/**
+ * This file is part of the Nextras community extensions of Nette Framework
+ *
+ * @license    MIT
+ * @link       https://github.com/nextras/forms-rendering
+ */
+
+namespace Nextras\FormsRendering\LatteTags\Bs3;
+
+use Latte\Extension;
+
+
+class Bs3FormsExtension extends Extension
+{
+	public function getTags(): array
+	{
+		return [
+			'label' => [Bs3LabelNode::class, 'create'],
+			'input' => [Bs3InputNode::class, 'create'],
+		];
+	}
+}

src/LatteTags/Bs3/Bs3FormsExtension.php

@@ -7,27 +7,17 @@
  * @link       https://github.com/nextras/forms-rendering
  */
 
-namespace Nextras\FormsRendering\LatteMacros;
+namespace Nextras\FormsRendering\LatteTags\Bs3;
 
 use Nette\Forms\Controls\BaseControl;
 use Nette\Forms\Controls\CheckboxList;
 use Nette\Forms\Controls\RadioList;
 use Nette\Utils\Html;
-use Nextras;
+use Nextras\FormsRendering\LatteTags\InputNode as BaseInputNode;
 
 
-class Bs3InputMacros extends BaseInputMacros
+class Bs3InputNode extends BaseInputNode
 {
-	public static function label(Html $label, BaseControl $control, bool $isSubItem): Html
-	{
-		if ($label->getName() === 'label' && !$isSubItem) {
-			$label->addClass('control-label');
-		}
-
-		return $label;
-	}
-
-
 	public static function input(Html $input, BaseControl $control, bool $isSubItem): Html
 	{
 		static $inputControls = ['radio', 'checkbox', 'file', 'hidden', 'range', 'image', 'submit', 'reset'];

src/LatteMacros/Bs3InputMacros.php src/LatteTags/Bs3/Bs3InputNode.phpsrc/LatteMacros/Bs3InputMacros.php renamed to src/LatteTags/Bs3/Bs3InputNode.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+/**
+ * This file is part of the Nextras community extensions of Nette Framework
+ *
+ * @license    MIT
+ * @link       https://github.com/nextras/forms-rendering
+ */
+
+namespace Nextras\FormsRendering\LatteTags\Bs3;
+
+use Nette\Forms\Controls\BaseControl;
+use Nette\Utils\Html;
+use Nextras\FormsRendering\LatteTags\LabelNode as BaseLabelNode;
+
+
+class Bs3LabelNode extends BaseLabelNode
+{
+	public static function label(Html $label, BaseControl $control, bool $isSubItem): Html
+	{
+		if ($label->getName() === 'label' && !$isSubItem) {
+			$label->addClass('control-label');
+		}
+		return $label;
+	}
+}

src/LatteTags/Bs3/Bs3LabelNode.php

@@ -0,0 +1,43 @@
+<?php declare(strict_types = 1);
+
+/**
+ * This file is part of the Nextras community extensions of Nette Framework
+ *
+ * @license    MIT
+ * @link       https://github.com/nextras/forms-rendering
+ */
+
+namespace Nextras\FormsRendering\LatteTags;
+
+use Latte\Compiler\Nodes\Php\Scalar\StringNode;
+use Latte\Compiler\PrintContext;
+use Nette\Bridges\FormsLatte\Nodes\InputNode as NetteInputNode;
+use Nette\Forms\Controls\BaseControl;
+use Nette\Utils\Html;
+
+
+abstract class InputNode extends NetteInputNode
+{
+	public function print(PrintContext $context): string
+	{
+		$class = get_class();
+		return $context->format(
+			($this->name instanceof StringNode
+				? '$ʟ_input = end($this->global->formsStack)[%node]; echo ' . $class . '::input($ʟ_input->'
+				: '$ʟ_input = is_object($ʟ_tmp = %node) ? $ʟ_tmp : end($this->global->formsStack)[$ʟ_tmp]; echo ' . $class . '::input($ʟ_input->')
+			. ($this->part ? ('getControlPart(%node)') : 'getControl()')
+			. ($this->attributes->items ? '->addAttributes(%2.node)' : '')
+			. ' %3.line, $ʟ_input, %2.var);',
+			$this->name,
+			$this->part,
+			$this->attributes,
+			$this->position,
+		);
+	}
+
+
+	public static function input(Html $input, BaseControl $control, bool $isSubItem): Html
+	{
+		return $input;
+	}
+}

src/LatteTags/InputNode.php

@@ -0,0 +1,45 @@
+<?php declare(strict_types = 1);
+
+/**
+ * This file is part of the Nextras community extensions of Nette Framework
+ *
+ * @license    MIT
+ * @link       https://github.com/nextras/forms-rendering
+ */
+
+namespace Nextras\FormsRendering\LatteTags;
+
+use Latte\Compiler\Nodes\Php\Scalar\StringNode;
+use Latte\Compiler\PrintContext;
+use Nette\Bridges\FormsLatte\Nodes\LabelNode as NetteLabelNode;
+use Nette\Forms\Controls\BaseControl;
+use Nette\Utils\Html;
+
+
+abstract class LabelNode extends NetteLabelNode
+{
+	public function print(PrintContext $context): string
+	{
+		return $context->format(
+			($this->name instanceof StringNode
+				? 'if ($ʟ_label = end($this->global->formsStack)[%node]->'
+				: '$ʟ_input = is_object($ʟ_tmp = %node) ? $ʟ_tmp : end($this->global->formsStack)[$ʟ_tmp]; if ($ʟ_label = $ʟ_input->')
+			. ($this->part ? ('getLabelPart(%node)') : 'getLabel()')
+			. ') echo ' . get_class() . '::label($ʟ_label'
+			. ($this->attributes->items ? '->addAttributes(%2.node)' : '')
+			. ($this->void ? ' %3.line, $ʟ_label, %2.var);' : '->startTag() %3.line, $ʟ_label, %2.var); %4.node if ($ʟ_label) echo $ʟ_label->endTag() %5.line;'),
+			$this->name,
+			$this->part,
+			$this->attributes,
+			$this->position,
+			$this->content,
+			$this->endLine
+		);
+	}
+
+
+	public static function label(Html $label, BaseControl $control, bool $isSubItem): Html
+	{
+		return $label;
+	}
+}