Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Hydrator aware interface #4016

Closed
wants to merge 370 commits into from
@ghunti

Hi.

I've created a HydratorAwareInterface, that mimics the behaviour of the InputFilterAwareInterface.

This way we can avoid setting the hydrator on the form every time, we just make the object that we bind to the form aware of its own hydrator (with a simple getter and setter).

The patch uses the object hydrator if the form doesn't have one hydrator already, and this might be one of the points were you for sure have a better understanding if this is correct or not.

Thanks,

weierophinney and others added some commits
@weierophinney weierophinney Merge branch 'hotfix/3767' into develop
Forward port #3767
d883690
@stephanoff stephanoff Added abstract service factory to provide multiple loggers
configuration.

Change-Id: Ibd9309bf42c8992376849a1c5bbae05cd82e4c13
a99b8c0
@stephanoff stephanoff Added ability to configure MvcEvent listeners.
Change-Id: I568ec78485724be3ec68c0b754d9af95b3ea1b03
f7bed11
@stephanoff stephanoff Added form abstract factory.
Change-Id: I071cf7b8e41d3f7f06f942650dc6f8a3d2215cba
4b7300f
@stephanoff stephanoff Remove redundant "else" statement and redundant condition in factory
method.

Change-Id: I4a3bb387e4f63c5aa70519923ad3680c8ae5e5b0
b0bc944
@stephanoff stephanoff Remove redundant "else" statement and redundant condition in factory
method.

Change-Id: Idf4802f8735a2333d927f5c6989e124c048e7854
56972fd
@stephanoff stephanoff Merged listeners with default set of listeners.
Change-Id: I382bc52191f3202b47ecd7910a2ffb4108c7e78e
ddde86b
@stephanoff stephanoff Added test for custom application listeners.
Change-Id: Ib47b1604675e5beef8945b57df9dfb28ddef3ffd
fb0dfc0
@stephanoff stephanoff Fixed typo in application's default listeners.
Change-Id: Ifb6241ff0d3799dbefdd9bd160e7f14c3ab68bf8
d96aa9b
@stephanoff stephanoff Added test case for logger abstract service factory.
Change-Id: Ibd0e492df076b801cb91078753bfe40bf77f63c0
79ed445
@davidwindell davidwindell Added CollectionInputFilter 3efb065
@davidwindell davidwindell Added tests 884e778
@stephanoff stephanoff Added injection of FormElementManager.
Change-Id: Ia85eab01106afa54e8156dadb9fece15d73e9ae8
b33c9b2
@stephanoff stephanoff Fixed coding style.
Minor improvements in abstract factory methods.

Change-Id: Ic6d1de0efede8780ff6d50126b98b50dee5fa5fb
7825b71
@stephanoff stephanoff Minor improvement in bootstrap method listeners merge.
Change-Id: Ib79a1e12bf93f53f44765ac2add526c3ccecfa6f
366e395
@blanchonvincent blanchonvincent Add module loader helper ff400af
@blanchonvincent blanchonvincent Add tests on the module loader helper 8b63488
@blanchonvincent blanchonvincent Make class as tool, move the location b9ca0e4
@blanchonvincent blanchonvincent Fix the tests with the new class 727de20
@stephanoff stephanoff Updated test for custom application listener.
Change-Id: I32e556441e7ba46367b1a1a7485ab00e0cdcd6df
ae18b80
@stephanoff stephanoff Added test case for FormAbstractServiceFactory
Change-Id: I93522febd9f4c61286a2bce36bf3a1333a54e1ae
b77557a
@blanchonvincent blanchonvincent Add tests and minor fixes 38e1e46
@blanchonvincent blanchonvincent Improve config creation f1f7fa8
@Maks3w Maks3w Forward port #3860 02d88ee
@Maks3w Maks3w Forward port #3953 372c7c8
@Maks3w Maks3w Forward port #3894 b38c1d2
@Maks3w Maks3w Forward port #3887 e568d8b
@Maks3w Maks3w Forward port #3830 9d62a26
@Maks3w Maks3w Forward port #3883 a9c87ac
@Maks3w Maks3w Forward port #3841 47297fd
@weierophinney weierophinney Merge branch 'hotfix/3827' into develop
Forward port #3827
1221f0c
@neeckeloo neeckeloo Add removeMethod method 1ee254c
@neeckeloo neeckeloo Add unit test 4a69836
@weierophinney weierophinney Merge branch 'hotfix/yaml-dev-version' into develop
Fixes for symfony/yaml autoloading
8d8826f
@basz basz first stab at localized date validation 56c0dd0
@Freeaqingme Freeaqingme Merge branch 'weierophinney-hotfix/polyfill-via-class-alias' into dev…
…elop

PR #3966
1d812e5
@SocalNick SocalNick Deprecating the Placeholder singleton registry 8c6e463
@Freeaqingme Freeaqingme Merge branch 'bramstroker-master' into develop 10664bc
@basz basz Rewriten into a generic DateTime validator and a preconfigured Date a…
…nd Time validator
10de465
@weierophinney weierophinney Merge branch 'hotfix/phpunit' into develop
PHPUnit upgrade fixes dependency issues
99784df
@weierophinney weierophinney Merge branch 'hotfix/3984' into develop
Forward port #3984
fb4d979
@ezimuel ezimuel Merge branch 'bramstroker-master' into develop eee5e43
@SocalNick SocalNick Missed on place that the placeholder registry is unset f00ba19
@robertboloc robertboloc added possibility to maintain original file extension using rename up…
…load filter
fe4d1a2
@blanchonvincent blanchonvincent Move loading module by name in an other method 2055fb5
@stephanoff stephanoff Minor improvement in validation of configuration.
Change-Id: I8e342727e72db510a45b885ddb293ceef4590510
49afaf4
@iquabius iquabius Fix for issue #2459 b1b5a16
@weierophinney weierophinney Merge branch 'master' of git://github.com/tommyseus/zf2 into feature/…
…3646
52e9c4f
@weierophinney weierophinney Merge branch 'feature/3646' into develop
Close #3646
cf16f24
@weierophinney weierophinney Merge branch 'features/enable-manual-module-instance' of git://github…
….com/blanchonvincent/zf2 into feature/3814
ef15f0e
@weierophinney weierophinney [#3814] CS fixes
- trailing whitespace
4ab3275
@weierophinney weierophinney Merge branch 'feature/3814' into develop
Close #3814
203ee6b
@weierophinney weierophinney Merge branch 'hotfix/3840' into develop
Forward port #3840
39ee993
@weierophinney weierophinney Merge branch 'hotfix/3842' into develop
Forward port #3842
53768a3
@weierophinney weierophinney Merge branch 'hotfix/3867' into develop
Forward port #3867
79c1f31
@weierophinney weierophinney Merge branch 'hotfix/3868' into develop
Forward port #3868
778cabc
@weierophinney weierophinney Merge branch 'hotfix/3869' into develop
Forward port #3869
bfedd0e
@weierophinney weierophinney Merge branch 'hotfix/3871' into develop
Forward port #3871
9b1f67e
@weierophinney weierophinney Merge branch 'hotfix/3873' into develop
Forward port #3873
4f195c9
@weierophinney weierophinney Merge pull request #3878 from moura137/feature/AdapterPaginator
Created an adapter Zend Paginator instance using TableGateway
969a275
@weierophinney weierophinney [#3878] CS fixes
- linefeed, trailing spaces
0fc1501
@weierophinney weierophinney Merge branch 'feature/3878' into develop
Close #3878
Fixes #3802
727fb9b
@weierophinney weierophinney Merge branch 'hotfix/3885' into develop
Forward port #3885
322e236
@weierophinney weierophinney Merge branch 'hotfix/3886' into develop
Forward port #3886
fae14a1
@weierophinney weierophinney Merge branch 'hotfix/3888' into develop
Forward port #3888
9f428f0
@weierophinney weierophinney Merge pull request #3896 from Freeaqingme/classmapGenIgnores
Added ability to ignore namespaces to classmap generator
f43111d
@weierophinney weierophinney Merge branch 'hotfix/3896' into develop
Close #3896
fb6c93b
@weierophinney weierophinney Merge branch 'hotfix/3916' into develop
Forward port #3916
f7c6acf
@weierophinney weierophinney Merge branch 'hotfix/3917' into develop
Forward port #3917
4d2d89e
@weierophinney weierophinney Merge branch 'hotfix/3907' into develop
Forward port #3907
27e71d4
@weierophinney weierophinney Merge pull request #3922 from mwillbanks/hotfix/disable-automatic-ina…
…rray-validator

Added the ability to disable the getValidator input specification on Select Elements
692bc74
@weierophinney weierophinney [#3922] CS fixes
- trailing whitespace
052728c
@weierophinney weierophinney Merge branch 'hotfix/3922' into develop
Close #3922
5da8ff7
@weierophinney weierophinney Merge branch 'hotfix/3925' into develop
Forward port #3925
6d773dc
@weierophinney weierophinney Merge pull request #3930 from stephanoff/develop-logger
Added abstract service factory for logger component to provide several loggers for application.
d53d1e7
@weierophinney weierophinney Merge branch 'feature/3930' into develop
Close #3930
e8e1398
@weierophinney weierophinney Merge pull request #3931 from stephanoff/develop-application
Added ability to configure MvcEvent listeners.
8334ed7
@weierophinney weierophinney [#3931] Moved default listeners to class property 0d13bb5
@weierophinney weierophinney [#3931] CS fixes
- trailing whitespace
4f0f855
@weierophinney weierophinney Merge branch 'feature/3931' into develop
Close #3931
cb5d698
@weierophinney weierophinney Merge pull request #3932 from stephanoff/develop-form
Added form abstract factory
5614346
@weierophinney weierophinney Merge branch 'feature/3932' into develop
Close #3932
eb46fd7
@weierophinney weierophinney Merge branch 'hotfix/3936' into develop
Forward port #3936
5972526
@weierophinney weierophinney Merge branch 'hotfix/3946' into develop
Forward port #3946
ae771de
@weierophinney weierophinney Merge branch 'hotfix/3947' into develop
Forward port #3947
cdef678
@weierophinney weierophinney Merge branch 'hotfix/3948' into develop
Forward port #3948
cf8e335
@blanchonvincent blanchonvincent Add the cache directory for the tests 6b54568
@blanchonvincent blanchonvincent Move the gitignore to keep the cache folder a26ca78
@weierophinney weierophinney Merge branch 'hotfix/3960' into develop
Forward port #3960
dfe1dd4
@blanchonvincent blanchonvincent Remove hardcode with tests cache directory and use temporary directory fd1b3ba
@iquabius iquabius removed unnecessary semicolon d0a9ec0
@DASPRiD DASPRiD Deprecate Zend\Stdlib\DateTime and use \DateTime constructor internal…
…ly instead
08ce3f0
Matthias Tylkowski extend HeadMeta view helper to allow microdata 81d4f08
Matthias Tylkowski added tests and fixed typos ec6d59f
@weierophinney weierophinney Merge pull request #3942 from blanchonvincent/feature/zend-test-load-…
…module

Feature/zend test load module
694b3e3
@weierophinney weierophinney [#3942] Clear cache files
- Clears module cache files on setup and teardown
35e077e
@weierophinney weierophinney [#3942] CS fixes
- trailing whitespace, braces
b319113
@weierophinney weierophinney Merge branch 'feature/3942' into develop
Close #3942
35b513b
@weierophinney weierophinney Merge pull request #3951 from DASPRiD/removal/stdlib-datetime
Deprecate Zend\Stdlib\DateTime and use \DateTime constructor internally instead
a45de6e
@weierophinney weierophinney [#3951] Add error handler for deprecation warning
- Added an error handler to catch the deprecation warning now emitted by
  Zend\Stdlib\DateTime
ed4c2bd
@weierophinney weierophinney Merge branch 'feature/3951' into develop
Close #3951
53534f2
@weierophinney weierophinney Merge branch 'hotfix/3964' into develop
Forward port #3964
babe00b
@weierophinney weierophinney Merge pull request #3965 from neeckeloo/add-method-in-class-generator
Add removeMethod method in ClassGenerator
3be3d07
@weierophinney weierophinney Merge branch 'feature/3965' into develop
Close #3965
c7456ed
@weierophinney weierophinney Merge branch 'hotfix/3968' into develop
Forward port #3968
5c3ed3f
@weierophinney weierophinney Merge branch 'hotfix/3993' into develop
Forward port #3993
0423763
@weierophinney weierophinney Merge branch 'hotfix/3973' into develop
Forward port #3973
22a9977
@weierophinney weierophinney Merge pull request #3979 from SocalNick/zf3978
Fixes #3978
dc6aa0d
@weierophinney weierophinney Merge branch 'feature/3979' into develop
Close #3979
Fixes #3978
1473c22
@weierophinney weierophinney Merge branch 'hotfix/3980' into develop
Forward port #3980
bda2e66
@weierophinney weierophinney Merge branch 'hotfix/3981' into develop
Forward port #3981
d318d95
@weierophinney weierophinney Merge branch 'hotfix/3982' into develop
Forward port #3982
814dddd
@weierophinney weierophinney Merge pull request #3990 from robertboloc/feature-rename-upload-maint…
…ain-extension

Zend\Filter\File\RenameUpload - Added possibility to maintain original file extension
ab14a18
@weierophinney weierophinney [#3990] CS fixes
- elseif clause
49007d3
@weierophinney weierophinney Merge branch 'feature/3990' into develop
Close #3990
13648f3
@weierophinney weierophinney Merge branch 'hotfix/3991' into develop
Forward port #3991
db84699
@weierophinney weierophinney Merge pull request #3996 from wryck7/hotfix/2459
Fix for issue #2459
9c8946b
@weierophinney weierophinney Merge branch 'feature/3996' into develop
Close #3996
Fixes #2459
6c405a9
@weierophinney weierophinney Merge branch 'hotfix/3997' into develop
Forward port #3997
182393d
@weierophinney weierophinney Merge branch 'hotfix/4001' into develop
Forward port #4001
9e58048
@weierophinney weierophinney Merge branch 'hotfix/4005' into develop
Forward port #4005
b7139a6
@weierophinney weierophinney Merge branch 'hotfix/4007' into develop
Forward port #4007
1c5d816
@weierophinney weierophinney Merge branch 'hotfix/4009' into develop
Forward port #4009
25b16a4
@weierophinney weierophinney Merge pull request #4011 from tylkomat/issue3751
extend HeadMeta view helper to allow microdata #3751
22e9ae6
@weierophinney weierophinney [#4011] CS fixes
- Replace tabs with spaces
- Remove unnecessary annotations
- Fix other CS/consistency issues as found
f3c0f33
@weierophinney weierophinney [#4011] CS fixes
- indentation, trailing spaces
0d7eb02
@weierophinney weierophinney Merge branch 'feature/4011' into develop
Close #4011
Fixes #3751
3b46ff0
@weierophinney weierophinney Merge branch 'hotfix/3987' into develop
Forward port #3987
e84e4e9
@weierophinney weierophinney Merge branch 'hotfix/3950' into develop
Forward port #3950
e799c31
@weierophinney weierophinney Merge branch 'hotfix/4010' into develop
Forward port #4010
3659323
@ghunti ghunti Create a HydratorAwareInterface. Use the Fieldset object hydrator if …
…its able to provide one
3e9aaf6
@iquabius iquabius changed exception to type hinting 7bcd59a
@davidwindell davidwindell Further feedback a2a7712
@ralphschindler ralphschindler Port #3988 to develop
Merge branch 'Mech7-unit-test-preparestatement' into develop
b7a090a
@ralphschindler ralphschindler Forward Port #3957
Merge branch 'tux-rampage-hotfix/pdo-oci-platform' into develop
67aa813
@ralphschindler ralphschindler Forward Port #3921
Merge branch 'tux-rampage-hotfix/select-columns-with-table-alias' into develop
b81e1be
@weierophinney weierophinney Merge branch 'security/2.1.4' into develop
Conflicts:
	README.md
	library/Zend/Version/Version.php
fabc60d
@weierophinney weierophinney Merge branch 'version/bump' into develop
"merge" version bump from master

Conflicts:
	README.md
	library/Zend/Version/Version.php
4c2c6de
@francisdaigle francisdaigle Merged Source/Master dbfae36
@francisdaigle francisdaigle Merged Source/Master 5950a07
@francisdaigle francisdaigle Refactored ACL. Fixed tests. c701f88
@weierophinney weierophinney Merge branch 'hotfix/4026' into develop
Forward port #4026
c7b34ab
@weierophinney weierophinney Merge branch 'hotfix/mvc-query-notices' into develop
Fix test "failures" in MVC
809d58f
@francisdaigle francisdaigle Remove "nbproject" directory 14f3e80
@francisdaigle francisdaigle Refactored ACL. Fixed tests 09e2a44
@ossinkine ossinkine Refactoring InputTest and FileInputTest f14d3fa
@ossinkine ossinkine ArrayInput added
Filter and validate each element of an array
2129a78
@weierophinney weierophinney Merge branch 'hotfix/4027' into develop
Forward port #4027
cc0daf4
@weierophinney weierophinney Merge branch 'hotfix/4037' into develop
Forward port #4037
0433db6
@piteer1 piteer1 Corrected 'supportedDatatypes' array, added some tests 9c9f80a
@spiffyjr spiffyjr Moved ext-intl to suggest instead of require to avoid silent fallback. 5c5d650
@EvanDotPro EvanDotPro Merge branch 'hotfix/4031' into develop
Close #4031
2ed41e9
JustInVTime Refactored #3490. Split DbTable into 2 different (CallbackCheck and C…
…redentialTreatment) adapters
d392e6e
@DASPRiD DASPRiD Merge branch 'hotfix/4013' into develop
Forward port #4013
8103b37
Ryan Mauger Merge branch 'hotfix/4053' into develop
Close #4053

* hotfix/4053:
  Implement better text domain merging support
33da31d
@basz basz Removes convinience Date and Time classes. Adds internal reusable for…
…matter instance that invalidates when not changeable properties are changed within the DateTime Validator
d4267fd
@basz basz cs and api documentation e8bcdfd
@basz basz some more tests 7f75391
@basz basz review changes + dateFormat and timeFormat now dateType and timeType …
…which is more consistent with IntlDateFormatter
d4bfef2
Vladislav Bakin Fixed issue #3064
regex delimiters added
d0fceea
@piteer1 piteer1 Corrected bug with setPersistentId function, added and removed some R…
…edis Storage tests
23d8070
@davidwindell davidwindell Added check for DateTime value 90b0456
@davidwindell davidwindell Update tests for Exception bef553b
@davidwindell davidwindell Implement feedback 744cab1
@davidwindell davidwindell Fix array_fill error 52c079a
@mwillbanks mwillbanks Merge branch 'hotfix/4085' into develop
Forward port #4085
b4b687f
@samsonasik samsonasik fix php dockblock : boolean should be bool dd1a97b
@samsonasik samsonasik fix (bool) casting : space and use (bool) instead of (boolean) to cast 9b929a0
@bakura10 bakura10 Allow to set creation options 284b7ea
@bakura10 bakura10 Add test 971186e
@weierophinney weierophinney Merge pull request #3632 from davidwindell/zf3617
New DateTimeFormatter Filter (#3617)
cdfd752
@weierophinney weierophinney [#3632] throw previous exception
- Incorporate feedback from @marc-mabe
- Also: use $e as exception (for consistency)
794ab09
@weierophinney weierophinney Merge branch 'feature/3632' into develop
Close #3632
096bbb3
@weierophinney weierophinney Merge pull request #3693 from francisdaigle/develop
[WIP] Add RBAC support for navigation helper.
046adc6
@weierophinney weierophinney [#3693] CS fixes
- Docblock additions/edits
- Logic workflow
5920073
@weierophinney weierophinney [#3693] CS fixes
- trailing whitespace
- EOF endings
e5545d2
@weierophinney weierophinney Merge branch 'feature/3693' into develop
Close #3693
0a237e0
@weierophinney weierophinney Merge pull request #3844 from wryck7/fix-identical-validator
Added new option to fix a little issue originated from last PR

Conflicts:
	tests/ZendTest/Validator/IdenticalTest.php
b642d83
@Ocramius Ocramius Adding trait and tests for the aggregate listener detach logic ae2c013
@weierophinney weierophinney [#3844] Remove tests no longer present in develop
- Two tests were present on master but removed in develop -- and brought
  back in during merge. Removed.
a1512a7
@weierophinney weierophinney Merge branch 'feature/3844' into develop
Close #3844
9c848db
@weierophinney weierophinney Merge pull request #3879 from davidwindell/feature-collection-input-f…
…ilter

Feature CollectionInputFilter
b88d191
@weierophinney weierophinney Merge branch 'feature/3879' into develop
Close #3879
7bee01c
@weierophinney weierophinney Merge pull request #3969 from basz/feature/i18n-date-validator
Stab at localized date validation
c5e034d
@Ocramius Ocramius Reverting the naming from 'callbacks' to 'listeners' for callback han…
…dlers in aggregates
311c8a7
@weierophinney weierophinney [#3969] Remove global qualifier
- Class was already imported
6f5d790
@weierophinney weierophinney [#3969] CS fixes
- trailing whitespace
d9e51f9
@weierophinney weierophinney Merge branch 'feature/3969' into develop
Close #3969
0368f3d
@weierophinney weierophinney Merge branch 'hotfix/3983' into develop
Forward port #3983
d665ce5
@piteer1 piteer1 Added test of get/set database on RedisOptions 25503e6
@weierophinney weierophinney Merge pull request #3876 from Ocramius/feature/abstract-aggregate-lis…
…tener

Implementing and re-utilizing an abstract aggregate listener
127bef9
@weierophinney weierophinney [#3876] CS fixes
- EOF ending
182ea60
@weierophinney weierophinney Merge branch 'feature/3876' into develop
Close #3876
fcae124
JustInVTime Removed '_' prefixes from non public API function names d225925
@weierophinney weierophinney Fix failing unit tests
- Addition of #3893 into develop broke test assumptions in #3879
  Basically, an empty string indicates a value was passed;
  one input, while it was marked as not required, was not marked as
  allow empty, and thus a validator that checked for string length
  failed. Changing the input to allow empty made the tests pass again.
- The question is: if a value is not marked as required, but has an
  empty string passed, should we pass it to the validator?
e6801de
@weierophinney weierophinney Fix failing tests in Zend\InputFilter
- Cleaned up BaseInputFilterTest to use a data provider; makes isolating failing
  cases simpler.
- Rewrote logic in validateInputs() to capture discrete use cases; more verbose,
  but easier to determine what is happening.
- Made executive decision: non-required input that is empty is valid.
b11af3f
@bakura10 bakura10 Simplfy condition d23f02c
@weierophinney weierophinney Merge pull request #3709 from piteer1/redis-cache-storage
[WIP] Redis cache storage
e786950
@weierophinney weierophinney Merge branch 'feature/3709' into develop
Close #3709
bbd5dab
@weierophinney weierophinney Merge pull request #3490 from youngguns-nl/zf-3371
Added support for callable credential validator

Conflicts:
	library/Zend/Authentication/Adapter/DbTable.php
6207fe2
@weierophinney weierophinney Merge branch 'feature/3490' into develop
Close #3490
41bc48e
@ralphschindler ralphschindler Forward #4019
Merge branch 'antonycox-master' into develop
3ae232e
@ralphschindler ralphschindler Forward #4022
Merge branch 'wryck7-hotfix/3685' into develop
764f7cf
@weierophinney weierophinney Merge branch 'hotfix/4014' into develop
Forward port #4014
e2024fa
@weierophinney

Very nice!

Can you write up a test for the fieldset that demonstrates that the hydrator will be pulled from the composed object, please? I can then merge.

Thanks!

weierophinney and others added some commits
@weierophinney weierophinney Merge pull request #4033 from ossinkine/array-input
ArrayInput
bb2ad44
@weierophinney weierophinney Merge branch 'feature/4033' into develop
Close #4033
4515394
@weierophinney weierophinney Merge branch 'hotfix/4035' into develop
Forward port #4035
70ec691
@weierophinney weierophinney Merge branch 'hotfix/4047' into develop
Forward port #4047
0500c84
@weierophinney weierophinney Merge pull request #4048 from spiffyjr/hotfix/i18n-composer
Moved ext-intl to suggest instead of require to avoid silent fallback.

Conflicts:
	library/Zend/I18n/composer.json
cf1b215
@weierophinney weierophinney Merge branch 'hotfix/4048' into develop
Close #4048
4a9105b
@weierophinney weierophinney Merge branch 'hotfix/4049' into develop
Conflicts:
	tests/ZendTest/ModuleManager/TestAsset/SubModule/Sub/Module.php
ccf8fce
@ralphschindler ralphschindler PR #4073
Merge branch 'develop' of git://github.com/mixkorshun/zf2 into mixkorshun-develop
8e78945
@ralphschindler ralphschindler PR #4073
Merge branch 'mixkorshun-develop' into develop
5c8f6fb
@ghost

Would this work if one fieldset as a zf2 hydrator, another fieldset a Doctrine2 hydrator, and those 2 fieldsets are used in a same form ?

weierophinney and others added some commits
@weierophinney weierophinney Merge branch 'hotfix/4002' into develop
Forward port #4002
a3e2856
@weierophinney weierophinney Merge branch 'hotfix/4020' into develop
Forward port #4020
cddd5d4
@weierophinney weierophinney Merge branch 'hotfix/4061' into develop
Forward port #4061
ebe4686
@weierophinney weierophinney Merge branch 'hotfix/4063' into develop
Forward port #4063
7e9b767
@weierophinney weierophinney Merge branch 'hotfix/4064' into develop
Forward port #4064
a8ffa31
@weierophinney weierophinney Merge branch 'hotfix/4055' into develop
Forward port #4055
616a49e
@weierophinney weierophinney Merge branch 'hotfix/4066' into develop
Forward port #4066
e86925f
@weierophinney weierophinney Merge branch 'hotfix/4074' into develop
Forward port #4074
bb753b9
@weierophinney weierophinney Merge branch 'hotfix/4079' into develop
Forward port #4079
1a8bb06
@weierophinney weierophinney Merge branch 'hotfix/4084' into develop
Forward port #4084
cb00eec
@weierophinney weierophinney Merge branch 'hotfix/4089' into develop
Forward port #4089
9ee4ca9
@weierophinney weierophinney Merge branch 'hotfix/4095' into develop
Forward port #4095
7a89d73
@weierophinney weierophinney Merge branch 'hotfix/4077' into develop
Forward port #4077
f945ee8
@weierophinney weierophinney Merge pull request #4098 from samsonasik/fix/docblock.bool
fix php docblock : boolean should be bool

Conflicts:
	library/Zend/Filter/File/RenameUpload.php
	library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
	library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
	library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
	library/Zend/Mvc/Router/SimpleRouteStack.php
4e83632
@weierophinney weierophinney [#4098] CS fixes
- linefeed
c4363bf
@weierophinney weierophinney Merge branch 'hotfix/4098' into develop
Close #4098
6bf5f98
@weierophinney weierophinney Merge pull request #4099 from samsonasik/fix/cast.bool
fix (bool) casting : add space and use (bool) instead of (boolean) to cast
b0a30a2
@weierophinney weierophinney Merge branch 'hotfix/4099' into develop
Close #4099
b129dfb
@weierophinney weierophinney Merge branch 'hotfix/4102' into develop
Forward port #4102
91e1f13
@bakura10 bakura10 Update doc block 491f6b0
@weierophinney weierophinney Merge branch 'hotfix/4111' into develop
Forward port #4111
67ca1a1
@bakura10 bakura10 Add interface 528a244
@weierophinney weierophinney Merge branch 'hotfix/4117' into develop
Forward port #4117

Conflicts:
	tests/ZendTest/InputFilter/FactoryTest.php
41b800a
@weierophinney weierophinney Merge pull request #4104 from bakura10/option-factory
Allow to change option creations for plugin manager
41ac41f
@bakura10 bakura10 Add interface e5c40f8
@weierophinney weierophinney Merge pull request #4104 from bakura10/option-factory
Allow to change option creations for plugin manager
6d10cf5
@weierophinney weierophinney Merge branch 'feature/4104' into develop
Close #4104
307d36c
@weierophinney weierophinney Merge branch 'hotfix/4118' into develop
Forward port #4118
4d4205d
@weierophinney weierophinney Merge branch 'hotfix/4119' into develop
Forward port #4119
f8f36f7
@weierophinney weierophinney Merge branch 'hotfix/4123' into develop
Forward port #4123
f3fe4a5
@weierophinney weierophinney Merge branch 'hotfix/4129' into develop
Forward port #4129
a0075aa
@weierophinney weierophinney Merge branch 'hotfix/4135' into develop
Forward port #4135
5ac1d53
@weierophinney weierophinney Merge branch 'hotfix/4138' into develop
Forward port #4138
abd8be6
@ralphschindler ralphschindler Forward #4087
Merge branch 'Mech7-fix-db-resource' into develop
c8eb316
@akrabat akrabat Merge branch 'hotfix/4147' into develop
Forward port #4147
876a18f
@ghunti ghunti Merge remote-tracking branch 'origin/hydrator_aware_interface' into h…
…ydrator_aware_interface
162956e
@ghunti ghunti Unit test for HydratorAwareInterface b576cde
@ghunti

@weierophinney It seems that i've made something on my local branch that broken this all up.
What should i do? Open a new pull request? Anyway, I've added the unit tests for the new Interface on commit ghunti/zf2@b576cde.

Sorry for all the mess

@ghunti

@mpalourdio I'm not an expert, not i know very well how forms operate on the backend. I've just tried to mimic the InputFIlterAwareInterface without breaking current hydrator + form behavior.

Can you help me with an example?
Thanks

@ghost

I don't have an precise example to provide you, and i don't even know if it's really possible. But imagine you have a form that is populated with 2 fieldsets. One fieldset is hydrated with the standard zf2 hydrator, and the other is hydrated by the doctrine hydrator from a doctrine entity. I was just wonderind if your interface could merge the 2 fieldsets each populated with a distinct hydrator. Maybe @weierophinney could best guide you with this particular case.

@macnibblet

@ghunti When working on new features you must work in a new branch, else when you create a PR and update your master/develop it get filled with other peoples commits. So create a new branch and cherry-pick the commits you need and create a new pull request.

@ghunti ghunti referenced this pull request
Merged

Hydrator aware interface #4170

@ghunti

Created a new pull request with the relevant commits on #4170

@ghunti ghunti closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.