Removed dependency on webchemistry/forms, added travis, refactoring

Author: AntikCz

.gitignore

@@ -1,2 +1,2 @@
-tests/temp/log
-tests/temp/cache
+vendor
+composer.lock

.travis.yml

@@ -0,0 +1,22 @@
+language: php
+
+os:
+  - linux
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: 7.0
+    - php: hhvm
+
+install:
+    - composer self-update
+    - composer install
+
+script: php vendor/codeception/codeception/codecept run

README.md

@@ -1,6 +1,7 @@
-# Rozšíření pro WebChemistry\Forms\Form
+# Form wizard for nette/forms
+[![Build Status](https://travis-ci.org/WebChemistry/Forms-Wizard.svg?branch=master)](https://travis-ci.org/WebChemistry/Forms-Wizard)
 
-## Instalace
+## Installation
 
 **Composer**
 ```
@@ -11,10 +12,12 @@ composer require webchemistry/forms-wizard
 
 ```yaml
 extensions:
-    - WebChemistry\Forms\Controls\DI\WizardExtension
+    - WebChemistry\Forms\Controls\DI\WizardExtension ## Autoregistration of macros
 ```
 
-## Komponenta
+# Usage
+
+## Component
 
 ```php
 class Wizard extends WebChemistry\Forms\Wizard\Component {
@@ -26,10 +29,10 @@ class Wizard extends WebChemistry\Forms\Wizard\Component {
     protected function createStep1() {
         $form = $this->getForm();
 
-        $form->addText('name', 'Uživatelské jméno')
+        $form->addText('name', 'User name')
             ->setRequired();
 
-        $form->addSubmit(self::NEXT_SUBMIT_NAME, 'Další');
+        $form->addSubmit(self::NEXT_SUBMIT_NAME, 'Next');
 
         return $form;
     }
@@ -40,20 +43,48 @@ class Wizard extends WebChemistry\Forms\Wizard\Component {
         $form->addText('email', 'Email')
             ->setRequired();
 
-        $form->addSubmit(self::PREV_SUBMIT_NAME, 'Zpět');
-        $form->addSubmit(self::FINISH_SUBMIT_NAME, 'Registrovat');
+        $form->addSubmit(self::PREV_SUBMIT_NAME, 'Back');
+        $form->addSubmit(self::FINISH_SUBMIT_NAME, 'Register');
 
         return $form;
     }
 }
 ```
 
-## Šablona
+```yaml
+services:
+    - Wizard
+```
+
+## Presenter
+
+```php
+
+class HomepagePresenter extends Nette\Application\UI\Presenter {
+
+    /** @var Wizard */
+    private $wizard;
+
+    public function __construct(Wizard $wizard) {
+        $this->wizard = $wizard;
+    }
+
+    protected function createComponentWizard() {
+        return $this->wizard;
+    }
+
+}
+
+```
+
+## Template
 
 ```html
 <div n:wizard="wizard">
     <ul n:if="!$wizard->isSuccess()">
-        <li n:foreach="$wizard->steps as $step" n:class="$wizard->isDisabled($step) ? disabled, $wizard->isActive($step) ? active"><a n:tag-if="$wizard->useLink($step)" n:href="changeStep! $step">{$step}</a></li>
+        <li n:foreach="$wizard->steps as $step" n:class="$wizard->isDisabled($step) ? disabled, $wizard->isActive($step) ? active">
+            <a n:tag-if="$wizard->useLink($step)" n:href="changeStep! $step">{$step}</a>
+        </li>
     </ul>
 
     {step 1}
@@ -65,7 +96,7 @@ class Wizard extends WebChemistry\Forms\Wizard\Component {
     {/step}
 
     {step success}
-        Úspěšně jste se registroval/a.
+        Registration was successful
     {/step}
 </div>
 ```

composer.json

@@ -1,10 +1,17 @@
 {
   "name": "webchemistry/forms-wizard",
   "type": "library",
-  "description": "Component for WebChemistry\\Forms\\Form",
+  "description": "Wizard component for nette/forms",
   "keywords": ["nette", "webchemistry", "forms", "wizard"],
   "require": {
-    "webchemistry/forms": "~1.0@dev"
+    "nette/forms": "^2.3",
+    "nette/http": "^2.3"
+  },
+  "require-dev": {
+    "latte/latte": "^2.3",
+    "codeception/codeception": "^2.1",
+    "nette/application": "^2.3",
+    "kdyby/fake-session": "^2.0"
   },
   "autoload": {
     "classmap": ["src/"]

src/Facade.php

@@ -2,11 +2,11 @@
 
 namespace WebChemistry\Forms\Controls\Wizard;
 
-use Nette;
+use Nette\Object;
 use WebChemistry\Forms\Controls\IWizard;
-use WebChemistry\Forms\Form;
+use Nette\Forms\Form;
 
-class Facade extends Nette\Object {
+class Facade extends Object {
 
 	/** @var IWizard */
 	private $wizard;
@@ -55,24 +55,12 @@ public function isSuccess() {
 	 * @return int
 	 */
 	public function getTotalSteps() {
-		if ($this->steps !== NULL) {
-			return $this->steps;
+		if ($this->steps === NULL) {
+			for ($iterator = 1;$this->wizard->getComponent('step' . $iterator, FALSE);$iterator++);
+			$this->steps = $iterator - 1;
 		}
 
-		$isEnd = FALSE;
-		$iterator = 1;
-
-		while (!$isEnd) {
-			$component = $this->wizard->getComponent('step' . $iterator, FALSE);
-
-			if ($component) {
-				$iterator++;
-			} else {
-				$isEnd = TRUE;
-			}
-		}
-
-		return $this->steps = $iterator - 1;
+		return $this->steps;
 	}
 
 	/**

src/Macros.php

@@ -11,13 +11,22 @@
 
 class Macros extends MacroSet {
 
+	/**
+	 * @param Engine $latte
+	 */
 	public static function install(Engine $latte) {
 		$me = new self($latte->getCompiler());
 
 		$me->addMacro('wizard', array($me, 'wizardStart'), array($me, 'wizardEnd'));
 		$me->addMacro('step', array($me, 'stepStart'), '}');
 	}
 
+	/**
+	 * @param MacroNode $node
+	 * @param PhpWriter $writer
+	 * @return string
+	 * @throws CompileException
+	 */
 	public function wizardStart(MacroNode $node, PhpWriter $writer) {
 		$words = $node->tokenizer->fetchWords();
 		if (!$words) {
@@ -37,6 +46,12 @@ public function wizardStart(MacroNode $node, PhpWriter $writer) {
 		. '$wizard = new WebChemistry\Forms\Controls\Wizard\Facade($_l->tmp);';
 	}
 
+	/**
+	 * @param MacroNode $node
+	 * @param PhpWriter $writer
+	 * @return string
+	 * @throws CompileException
+	 */
 	public function stepStart(MacroNode $node, PhpWriter $writer) {
 		$word = $node->tokenizer->fetchWord();
 		if (!is_numeric($word) && !in_array($word, array('success', '"success"', "'success'"))) {