gistfile1.txt

[Xerkus@xerkus-laptop zf2 (master)]$ git request-pull origin/master zendframework zendframework/master
The following changes since commit ef6320a48cfe3dbdf28421a78f007e2b304c9fc7:

  Merge branch 'hotfix/2889' (2012-11-05 09:18:52 -0600)

are available in the git repository at:


  https://github.com/zendframework/zf2.git master

for you to fetch changes up to 18bce16cdda7c0bb4d95e5d51d014f7ffc66475a:

  Merge branch 'hotfix/2615' (2012-11-07 15:22:43 -0600)

----------------------------------------------------------------

Bas Kamer (7):
      Add a controller plugin to create an appropiate View type based on the request accept header
      cs + api doc + tweak
      removed early return within priortized loop for clarity + added detection is now cached
      better detection + matched against addition
      return an instance not a string
      adding a basic but functional unittest setup (needs actual tests)
      cs-fix

BilgeXA (1):
      Security fix

Dolf Schimmel (Freeaqingme) (4):
      Refactored Basz's code a little. Added docblocks + unit tests
      Throw exception in acceptant viewmodelselector if matched View Model could not be found.
      viewModelSelector s/acceptant/acceptable/ includes file names
      AcceptableViewModelSelector - Incorporated PR Feedback

Matthew Weier O'Phinney (7):
      Merge branch 'master' of git://github.com/BilgeXA/zf2 into hotfix/2615
      [#2410] Revised tests
      [#2410] Remove Accept detection from feed strategy
      [#2410][#2615] Update readme
      [#2410][#2615] s/model/viewModel/
      [#2615] Test shuffling
      Merge branch 'hotfix/2615'

 README.md                                          |  48 +++-
 library/Zend/Http/Header/AbstractAccept.php        |  14 +-
 .../FieldValuePart/AbstractFieldValuePart.php      |  28 ++
 .../Plugin/AcceptableViewModelSelector.php         | 288 +++++++++++++++++++++
 library/Zend/Mvc/Controller/PluginManager.php      |  15 +-
 library/Zend/View/Strategy/FeedStrategy.php        |  30 +--
 library/Zend/View/Strategy/JsonStrategy.php        |  33 +--
 tests/ZendTest/Http/Header/AcceptTest.php          |  32 +++
 .../Plugin/AcceptableViewModelSelectorTest.php     | 201 ++++++++++++++
 tests/ZendTest/View/Strategy/FeedStrategyTest.php  |  28 +-
 tests/ZendTest/View/Strategy/JsonStrategyTest.php  |  45 ++--
 11 files changed, 651 insertions(+), 111 deletions(-)
 create mode 100644 library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
 create mode 100644 tests/ZendTest/Mvc/Controller/Plugin/AcceptableViewModelSelectorTest.php