Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on May 9, 2012
Commits on May 8, 2012
  1. @ralphschindler

    Zend\Di\Di added a method to inject dependencies into existing object…

    ralphschindler authored
    … Refactored internal methods of Zend\Di\Di to localize call_user_func* calls and changed signature of resolveMethodParameters()
  2. @weierophinney

    Merge branch 'hotfix/http-client' of https://github.com/Maks3w/zf2 in…

    weierophinney authored
    …to hotfix/http-client-tests
  3. @weierophinney
  4. @weierophinney
  5. @weierophinney

    FileGenerator tests

    weierophinney authored
    - Added constructor
    - Added setOptions() to AbstractGenerator
    - Fixed fromArray in ClassGenerator and FileGenerator
    - Fixed most failing tests
    - Marked FileGeneratorTest::testFromReflection as incomplete, as some
      scanner capabilities do not work, making reflection not work as
      expected
  6. @akrabat
  7. @ralphschindler

    Merge branch 'master' into feature/db-story-35

    ralphschindler authored
    Conflicts:
    	library/Zend/Db/Sql/Exception/RuntimeException.php
  8. @ralphschindler
  9. @weierophinney

    Fixed ClassGenerator tests and implementation

    weierophinney authored
    - setProperty() and setMethod() reverted to allow both strings and
      objects
    - constructor fixed to ensure all provided arguments are passed on to
      the appropriate setters
    - tests for string generation fixed to follow constructor signature
  10. @weierophinney

    Merge branch 'hotfix/codegenerator-clean' of https://github.com/Maks3…

    weierophinney authored
    …w/zf2 into hotfix/code-generator-cleanup
    
    Conflicts:
    	library/Zend/CodeGenerator/Exception.php
  11. @weierophinney
  12. @Maks3w

    [Locale] Make $tag argument optional

    Maks3w authored
    As Locale:clearCache($tag) depends on AbstractLocale:clearCache($tag) and this one have the argument as optional then the first should be optional too.
Commits on May 7, 2012
  1. @Maks3w

    [Http] Fix broken Client

    Maks3w authored
  2. @Maks3w
  3. @Maks3w
  4. @Maks3w
  5. @Maks3w
  6. @Maks3w
  7. @weierophinney
  8. @weierophinney

    Merge branch 'cache_plugin_priority' of https://github.com/marc-mabe/zf2

    weierophinney authored
     into feature/cache-plugin-priority
  9. @weierophinney
  10. @weierophinney
  11. @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
  12. @weierophinney
  13. @weierophinney
  14. @weierophinney
  15. @weierophinney

    [#1144] Fixed failing JSON server test

    weierophinney authored
    - flag to overwrite existing methods was mis-named in the json server
  16. @weierophinney

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

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

    Merge branch 'hotfix/ZF-11114' of https://github.com/adamlundrigan/zf2

    weierophinney authored
    …into hotfix/zf-11114
    
    Conflicts:
    	library/Zend/Cloud/StorageService/Adapter/S3.php
  18. @weierophinney
  19. @weierophinney
  20. @weierophinney
  21. @weierophinney

    [#1136] Fix query expectations

    weierophinney authored
    - If request has no query method, return null
    - Test should look for null, not a route match
Something went wrong with that request. Please try again.