Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 17, 2012
  1. @weierophinney

    Updated Zend\Mvc to reference ModuleManager

    weierophinney authored
    - s/(Zend.Module)/\1Manager/
    - s/\/Manager/\/ModuleManager/
Commits on May 15, 2012
  1. @weierophinney

    Zend\Mvc\Application tests

    weierophinney authored
    - Created new set of assertions based on refactored functionality
    - Added and refactored original tests that tested workflow
      - 2 I am unable to get working against expectations due to how the
        scoped application controller works
  2. @weierophinney

    Cleanup in preparation for pull request

    weierophinney authored
    - Added docblocks to as many MVC files as possible
    - Added getServiceLocator() to ServiceLocatorAwareInterface
    - Removed all LocatorAware interfaces in favor of
      ServiceLocatorAwareInterfac
      - Refactored all classes using LocatorAware interfaces to use SLA
    - Updated ServiceManagerConfiguration to inject EventManagerAware
      classes
    - Refactored DispatchListener to remove goto usage
    - Refactored Application to move all event listener attachments into
      bootstrap()
    - Use "router" as base key for router configuration; simplifies
      RouteFactory, and allows configuring other aspects of router.
    - Small logic cleanups throughout
  3. @weierophinney

    New ViewManager class

    weierophinney authored
    - Created ViewManager class for managing creation and composition of various
      events and objects in the view layer
      - Registers a number of them as services when done
    - Application pulls ViewManager from service manager and attaches it to events
    - ViewManager has an onBootstrap listener that attaches to the bootstrap event
      at high (10000) priority
  4. @weierophinney
  5. @ralphschindler @weierophinney
Commits on May 7, 2012
  1. @weierophinney

    Merge branch 'di-renamed-interfaces' of https://github.com/prolic/zf2

    weierophinney authored
    …into feature/zen27-di
    
    Conflicts:
    	library/Zend/Mvc/Application.php
    	library/Zend/Mvc/ApplicationInterface.php
    	library/Zend/Mvc/Controller/ActionController.php
    	library/Zend/Mvc/Controller/Plugin/Forward.php
    	library/Zend/Mvc/Controller/RestfulController.php
  2. @weierophinney

    Merge branch 'patch-2' of https://github.com/Maks3w/zf2 into hotfix/m…

    weierophinney authored
    …vc-imports
    
    Conflicts:
    	library/Zend/Mvc/Application.php
  3. @weierophinney

    Merge branch 'stdlib-renamed-interfaces' of https://github.com/prolic…

    weierophinney authored
    …/zf2 into feature/zen27-stdlib
    
    Conflicts:
    	library/Zend/Mvc/ApplicationInterface.php
    	library/Zend/Mvc/Bootstrap.php
    	library/Zend/Mvc/Controller/ActionController.php
    	library/Zend/Mvc/Controller/RestfulController.php
    	library/Zend/Mvc/MvcEvent.php
    	library/Zend/Mvc/Router/Http/TreeRouteStack.php
    	library/Zend/Mvc/View/DefaultRenderingStrategy.php
    	library/Zend/Mvc/View/ExceptionStrategy.php
    	library/Zend/Mvc/View/RouteNotFoundStrategy.php
    	library/Zend/View/View.php
    	library/Zend/View/ViewEvent.php
    	tests/Zend/Mvc/Controller/TestAsset/UnlocatableEventfulController.php
  4. @weierophinney

    Merge branch 'eventmanager-renamed-interfaces' of https://github.com/…

    weierophinney authored
    …prolic/zf2 into feature/zen27-event_manager
    
    Conflicts:
    	library/Zend/EventManager/ProvidesEvents.php
    	library/Zend/Module/Manager.php
    	library/Zend/Mvc/Application.php
    	library/Zend/Mvc/Controller/ActionController.php
    	library/Zend/Session/ManagerInterface.php
    	library/Zend/Session/SessionManager.php
    	tests/Zend/Mvc/Controller/TestAsset/UnlocatableEventfulController.php
    	tests/Zend/Session/TestAsset/TestManager.php
  5. @weierophinney

    Merge branch 'mvc-renamed-interfaces' of https://github.com/prolic/zf2

    weierophinney authored
    …into feature/zen-27-mvc
    
    Conflicts:
    	library/Zend/Mvc/MvcEvent.php
Commits on May 6, 2012
  1. @prolic
Commits on May 5, 2012
  1. @Maks3w
Commits on Apr 23, 2012
  1. @weierophinney

    Better SharedEventManager usage

    weierophinney authored
    - Injects SharedEventManager as a shared DI instance
    - Initialization of event manager instances should happen in setEventManager(),
      not events() -- latter causes them to be overwritten or bypassed if an EM
      instance is injected
Commits on Apr 22, 2012
  1. @prolic

    [zen-27] Renamed interfaces in Zend\Stdlib, refactored: use Zend\Stdl…

    prolic authored
    …ib\DispatchableInterface => use Zend\Stdlib\DispatchableInterface as Dispatchable, Zend\Stdlib\RequestInterface => Zend\Stdlib\RequestInterface as Request, ...
Commits on Apr 21, 2012
  1. @prolic
  2. @prolic
  3. @prolic
Commits on Apr 3, 2012
  1. @rtuin

    Small docblock fix

    rtuin authored
Commits on Mar 29, 2012
  1. @weierophinney

    Merge branch 'feature/event-constants' of https://github.com/andriess…

    weierophinney authored
    …s/zf2 into feature/event-constants
    
    Conflicts:
    	library/Zend/Mvc/Application.php
Commits on Mar 23, 2012
  1. @weierophinney
Commits on Mar 22, 2012
Commits on Mar 20, 2012
  1. @Rovak
Commits on Mar 9, 2012
  1. @mpinkston
Commits on Mar 8, 2012
  1. @Thinkscape

    Refactor Zend\Stdlib\ArrayTools to ArrayUtils, add missing headers.

    Thinkscape authored
    - ArrayTools will now be called ArrayUtils after an anonymous vote (http://framework.zend.com/wiki/display/ZFDEV2/POLL+-+Array+class+name).
    - Add missing Zend Framework headers to ArrayUtils class file and tests.
Commits on Mar 6, 2012
  1. @Thinkscape

    Introduce Stdlib\ArrayTools, refactor other components to use it.

    Thinkscape authored
    - add Stdlib\ArrayTools which combines the following:
        - Stdlib\RecursiveArrayMerge
        - Stdlib\IteratorToArray
        - Stdlib\IsAssocArray
    - add ArrayTools array testing functionality:
        - ::isList()
        - ::isHashTable()
        - ::hasNumericKeys()
        - ::hasIntegerKeys()
        - ::hasStringKeys()
    - add more exhaustive unit tests for ArrayTools including edge-cases for different types of arrays
Commits on Feb 28, 2012
  1. @weierophinney

    [#1] Added ability to inject reason for triggering 404

    weierophinney authored
    - if displayNotFoundReason is enabled, will inject a "reason" variable
      into the 404 view model returned, with one of the following constant
      values:
      - Application::ERROR_CONTROLLER_CANNOT_DISPATCH (controller cannot
        dispatch the request)
      - Application::ERROR_CONTROLLER_NOT_FOUND (controller class does not
        exist)
      - Application::ERROR_CONTROLLER_INVALID (controller requested is not
        dispatchable)
      - Application::ERROR_ROUTER_NO_MATCH (routing returned no match, or no
        controller in the matches)
Commits on Feb 24, 2012
  1. Merge pull request #828 from weierophinney/hotfix/mvc-finish

    Pádraic Brady authored
    [ZF2-171] trigger 'finish' before returning response
  2. @weierophinney

    Reverting #794

    weierophinney authored
    - see #794 (comment)
      for details
  3. @weierophinney
  4. @weierophinney

    [ZF2-171] trigger 'finish' before returning response

    weierophinney authored
    - Identified two locations in run() where a response was being returned
      without triggering the "finish" event
Commits on Feb 16, 2012
  1. @weierophinney
Commits on Feb 14, 2012
  1. @weierophinney

    Ensure routing failure leads to early request completion

    weierophinney authored
    - Do not clone the event when triggering dispatch.error after routing failure
  2. @Danielss89

    Fix by @ocramius.

    Danielss89 authored
    Bootstrap.php:
    ->addTypePreference was meant to provide the locator in the
    locator itself and was not necessary.
    
    Application.php:
    Removed check if controller was instanceof locatorAware
    
    Need @ralphschindler review
Commits on Feb 13, 2012
  1. @weierophinney

    Fixes to make view layer work in functional testing

    weierophinney authored
    - MVC event must be assigned to a local property; otherwise, base view model
      does not persist
    - DefaultRenderingStrategy needs to pull the view model from the event, not the
      result
    - TemplatePathStack now checks for a file extension; if none found, appends
      ".phtml"
Something went wrong with that request. Please try again.