Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit 8fa1f6d

Browse files
committed
Merge branch 'hotfix/234' into develop
Forward port #234
2 parents 5e5793e + 227fcfc commit 8fa1f6d

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ All notable changes to this project will be documented in this file, in reverse
4848
of `Zend\Form\ElementFactory`. Allowed values are: array, Traversable or null.
4949
If invalid value provided exception will be thrown.
5050

51+
- [#234](https://github.com/zendframework/zend-form/pull/234) registers `Search` and `Tel` form elements
52+
within `Zend\Form\FormElementManager` plugin manager.
53+
5154
## 2.14.1 - 2019-02-26
5255

5356
### Added

src/FormElementManager/FormElementManagerV2Polyfill.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link http://github.com/zendframework/zend-form for the canonical source repository
4-
* @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
4+
* @copyright Copyright (c) 2005-2019 Zend Technologies USA Inc. (http://www.zend.com)
55
* @license http://framework.zend.com/license/new-bsd New BSD License
66
*/
77

@@ -59,8 +59,10 @@ class FormElementManagerV2Polyfill extends AbstractPluginManager
5959
'password' => Element\Password::class,
6060
'radio' => Element\Radio::class,
6161
'range' => Element\Range::class,
62+
'search' => Element\Search::class,
6263
'select' => Element\Select::class,
6364
'submit' => Element\Submit::class,
65+
'tel' => Element\Tel::class,
6466
'text' => Element\Text::class,
6567
'textarea' => Element\Textarea::class,
6668
'time' => Element\Time::class,
@@ -99,8 +101,10 @@ class FormElementManagerV2Polyfill extends AbstractPluginManager
99101
Element\Password::class => ElementFactory::class,
100102
Element\Radio::class => ElementFactory::class,
101103
Element\Range::class => ElementFactory::class,
104+
Element\Search::class => ElementFactory::class,
102105
Element\Select::class => ElementFactory::class,
103106
Element\Submit::class => ElementFactory::class,
107+
Element\Tel::class => ElementFactory::class,
104108
Element\Text::class => ElementFactory::class,
105109
Element\Textarea::class => ElementFactory::class,
106110
Element\Time::class => ElementFactory::class,
@@ -134,8 +138,10 @@ class FormElementManagerV2Polyfill extends AbstractPluginManager
134138
'zendformelementpassword' => ElementFactory::class,
135139
'zendformelementradio' => ElementFactory::class,
136140
'zendformelementrange' => ElementFactory::class,
141+
'zendformelementsearch' => ElementFactory::class,
137142
'zendformelementselect' => ElementFactory::class,
138143
'zendformelementsubmit' => ElementFactory::class,
144+
'zendformelementtel' => ElementFactory::class,
139145
'zendformelementtext' => ElementFactory::class,
140146
'zendformelementtextarea' => ElementFactory::class,
141147
'zendformelementtime' => ElementFactory::class,

src/FormElementManager/FormElementManagerV3Polyfill.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link http://github.com/zendframework/zend-form for the canonical source repository
4-
* @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
4+
* @copyright Copyright (c) 2005-2019 Zend Technologies USA Inc. (http://www.zend.com)
55
* @license http://framework.zend.com/license/new-bsd New BSD License
66
*/
77

@@ -91,10 +91,14 @@ class FormElementManagerV3Polyfill extends AbstractPluginManager
9191
'Radio' => Element\Radio::class,
9292
'range' => Element\Range::class,
9393
'Range' => Element\Range::class,
94+
'search' => Element\Search::class,
95+
'Search' => Element\Search::class,
9496
'select' => Element\Select::class,
9597
'Select' => Element\Select::class,
9698
'submit' => Element\Submit::class,
9799
'Submit' => Element\Submit::class,
100+
'tel' => Element\Tel::class,
101+
'Tel' => Element\Tel::class,
98102
'text' => Element\Text::class,
99103
'Text' => Element\Text::class,
100104
'textarea' => Element\Textarea::class,
@@ -138,8 +142,10 @@ class FormElementManagerV3Polyfill extends AbstractPluginManager
138142
Element\Password::class => ElementFactory::class,
139143
Element\Radio::class => ElementFactory::class,
140144
Element\Range::class => ElementFactory::class,
145+
Element\Search::class => ElementFactory::class,
141146
Element\Select::class => ElementFactory::class,
142147
Element\Submit::class => ElementFactory::class,
148+
Element\Tel::class => ElementFactory::class,
143149
Element\Text::class => ElementFactory::class,
144150
Element\Textarea::class => ElementFactory::class,
145151
Element\Time::class => ElementFactory::class,
@@ -173,8 +179,10 @@ class FormElementManagerV3Polyfill extends AbstractPluginManager
173179
'zendformelementpassword' => ElementFactory::class,
174180
'zendformelementradio' => ElementFactory::class,
175181
'zendformelementrange' => ElementFactory::class,
182+
'zendformelementsearch' => ElementFactory::class,
176183
'zendformelementselect' => ElementFactory::class,
177184
'zendformelementsubmit' => ElementFactory::class,
185+
'zendformelementtel' => ElementFactory::class,
178186
'zendformelementtext' => ElementFactory::class,
179187
'zendformelementtextarea' => ElementFactory::class,
180188
'zendformelementtime' => ElementFactory::class,

0 commit comments

Comments
 (0)