Permalink
Commits on Jan 17, 2013
  1. Merge commit 'refs/pull/3468/head' of github.com:zendframework/zf2 in…

    …to hotfix/fix-variable
    Maks3w committed Jan 17, 2013
  2. Merge branch 'hotfix/3461'

    Backport #3461 to master
    weierophinney committed Jan 17, 2013
  3. [#3461] CS fixes

    - trailing whitespace
    weierophinney committed Jan 17, 2013
  4. Fix #3289: Variable changed

    danizord committed Jan 17, 2013
  5. stdClass with little 's'

    samsonasik committed Jan 17, 2013
Commits on Jan 16, 2013
  1. Fix issue with imports

    - An import of "use Zend\Session\Storage\StorageInterface as Storage" caused a
      subsequent, existing check of "instanceof Storage\StorageInterface" to thus
      fail. Removed all imports for classes in the same namespace to fix the issue.
    weierophinney committed Jan 16, 2013
  2. CS cleanup of PRG plugin

    - Created docblock for __invoke() method
    - Removed an else condition that would not be hit if the if condition is
      evaluated.
    weierophinney committed Jan 16, 2013
  3. Allow injecting session manager into PRG plugin

    - which allows creating the internally used Container with the specified
      session manager
    - neither FM and PRG should instantiate a SessionManager directly; they
      should use the default manager from the Container class
    weierophinney committed Jan 16, 2013
  4. Updated session manager to register_shutdown_function rather than a d…

    …estructor
    
    - Fixed an issue where an exception was not properly defined in use
    - Fixed a flash messenger test by clearing session storage on teardown
    - Removed a no longer valid test on sessionmanagertest
    
    Conflicts:
    	library/Zend/Session/Storage/SessionArrayStorage.php
    mwillbanks committed with weierophinney Jan 16, 2013
  5. Merge branch 'hotfix/3376'

    Backport #3436 to master
    weierophinney committed Jan 16, 2013
  6. [#3376] Better fix

    - The main point is that we ensure hasItems() internally calls
      internalHasItem(). As such, removing the multiple keys ensures we
      don't have issues with index order of mock objects. Test now passes on
      both 3.7.12 and 3.7.13, on all PHP versions used.
    weierophinney committed Jan 15, 2013
  7. Merge pull request #3437 from pdobrigkeit/feature/datetime_factory_fo…

    …rmat
    
    Feature/datetime factory format
    Maks3w committed Jan 16, 2013
  8. Fixed comment return val

    pdobrigkeit committed Jan 16, 2013
  9. Added Test

    pdobrigkeit committed Jan 16, 2013
Commits on Jan 15, 2013
  1. Fixed usage of Traverseable for $options.

    Did not want to duplicate the check done in Element, but rather used to already converted $this->options instead
    pdobrigkeit committed Jan 15, 2013
  2. Merge branch 'feature/datetime_factory_format' of github.com:pdobrigk…

    …eit/zf2 into feature/datetime_factory_format
    pdobrigkeit committed Jan 15, 2013
Commits on Jan 14, 2013
  1. Merge branch 'hotfix/3429'

    Close #3429
    Fixes #2628
    Fixes #3075
    Fixes #3108
    Fixes #3182
    weierophinney committed Jan 14, 2013
  2. Merge branch 'hotfix/session-savehandler-db-destruct' of git://github…

    ….com/mwillbanks/zf2 into hotfix/3429
    weierophinney committed Jan 14, 2013
  3. Merge branch 'hotfix/3424'

    Close #3424
    Fixes #3347
    weierophinney committed Jan 14, 2013
  4. [#3424] CS fixes

    - Trailing whitespace
    - whitespace following operators
    weierophinney committed Jan 14, 2013
  5. Merge branch 'hotfix/3348'

    Close #3423
    Fixes #3348
    weierophinney committed Jan 14, 2013
  6. [#3348] Fix CS issues

    - Trailing whitespace
    weierophinney committed Jan 14, 2013
  7. Merge branch 'hotfix/3415'

    Close #3415
    weierophinney committed Jan 14, 2013
  8. Merge branch 'hotfix/remove-singe-zend-namespace' of git://github.com…

    …/Maks3w/zf2 into hotfix/3415
    weierophinney committed Jan 14, 2013
  9. Merge branch 'hotfix/3410'

    Close #3410
    weierophinney committed Jan 14, 2013
  10. Merge branch 'hotfix/composer-provide-packages' of git://github.com/M…

    …aks3w/zf2 into hotfix/3410
    weierophinney committed Jan 14, 2013
  11. Merge branch 'hotfix/3396'

    Close #3396
    weierophinney committed Jan 14, 2013