Permalink
Switch branches/tags
Nothing to show
Commits on May 9, 2012
  1. [brikou] removed unneeded files

    committed May 9, 2012
Commits on May 8, 2012
  1. Zend\Di\Di added a method to inject dependencies into existing object…

    … Refactored internal methods of Zend\Di\Di to localize call_user_func* calls and changed signature of resolveMethodParameters()
    ralphschindler committed May 8, 2012
  2. Merge branch 'hotfix/http-client' of https://github.com/Maks3w/zf2 in…

    …to hotfix/http-client-tests
    weierophinney committed May 8, 2012
  3. FileGenerator tests

    - 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
    weierophinney committed May 8, 2012
  4. Merge branch 'master' into feature/db-story-35

    Conflicts:
    	library/Zend/Db/Sql/Exception/RuntimeException.php
    ralphschindler committed May 8, 2012
  5. For Select.php, added type information when limit and offset populate…

    … the parameter container set
    ralphschindler committed May 8, 2012
  6. Fixed ClassGenerator tests and implementation

    - 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
    weierophinney committed May 8, 2012
  7. Merge branch 'hotfix/codegenerator-clean' of https://github.com/Maks3…

    …w/zf2 into hotfix/code-generator-cleanup
    
    Conflicts:
    	library/Zend/CodeGenerator/Exception.php
    weierophinney committed May 8, 2012
  8. Merge branch 'hotfix/locale-tests' of https://github.com/Maks3w/zf2 i…

    …nto hotfix/locale-tests
    weierophinney committed May 8, 2012
  9. [Locale] Make $tag argument optional

    As Locale:clearCache($tag) depends on AbstractLocale:clearCache($tag) and this one have the argument as optional then the first should be optional too.
    Maks3w committed May 8, 2012
Commits on May 7, 2012
  1. [Http] Fix broken Client

    Maks3w committed May 7, 2012
  2. Merge branch 'cache_plugin_priority' of https://github.com/marc-mabe/zf2

     into feature/cache-plugin-priority
    weierophinney committed May 7, 2012
  3. Merge branch 'hotfix-remove-codegenerator' of https://github.com/prol…

    …ic/zf2 into hotfix/codegenerator-removal
    weierophinney committed May 7, 2012
  4. Merge branch 'di-renamed-interfaces' of https://github.com/prolic/zf2

    …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
    weierophinney committed May 7, 2012
  5. [#1144] Fixed failing JSON server test

    - flag to overwrite existing methods was mis-named in the json server
    weierophinney committed May 7, 2012
  6. Merge branch 'patch-2' of https://github.com/Maks3w/zf2 into hotfix/m…

    …vc-imports
    
    Conflicts:
    	library/Zend/Mvc/Application.php
    weierophinney committed May 7, 2012
  7. Merge branch 'hotfix/ZF-11114' of https://github.com/adamlundrigan/zf2

    …into hotfix/zf-11114
    
    Conflicts:
    	library/Zend/Cloud/StorageService/Adapter/S3.php
    weierophinney committed May 7, 2012
  8. [#1136] Fix query expectations

    - If request has no query method, return null
    - Test should look for null, not a route match
    weierophinney committed May 7, 2012