Permalink
Commits on Dec 2, 2011
  1. @akrabat

    Merge pull request #646 from Freeaqingme/mergefix

    Revert "Merge remote-tracking branch 'dasprid/feature/router'"
    akrabat committed Dec 2, 2011
  2. @Freeaqingme

    Revert "Merge remote-tracking branch 'dasprid/feature/router'"

    This reverts commit b386d21, reversing
    changes made to dc5c7d6.
    Freeaqingme committed Dec 2, 2011
  3. @akrabat
  4. @akrabat
  5. @akrabat
Commits on Dec 1, 2011
  1. @DASPRiD
  2. @DASPRiD

    Merge pull request #639 from prolic/space4tabs

    Space4tabs
    DASPRiD committed Dec 1, 2011
Commits on Nov 30, 2011
  1. @DASPRiD
  2. @DASPRiD

    Finalized router tests

    DASPRiD committed Nov 30, 2011
  3. @DASPRiD

    Finalized router tests

    DASPRiD committed Nov 30, 2011
Commits on Nov 29, 2011
  1. @DASPRiD
  2. @DASPRiD
  3. @DASPRiD
  4. @mrclay

    Removes a PhpStorm warning. Before this change, the IDE could not tel…

    …l that _getCamelCaseFilter returned an invokable, and would mark as a potential error the 2nd line of _normalizeName where $filter is invoked.
    mrclay committed Nov 29, 2011
Commits on Nov 28, 2011
  1. replaced tabs with 4x space in Zend\Tool

    Sascha-Oliver Prolic committed Nov 28, 2011
  2. fixed doctype in StaticEventManager

    Sascha-Oliver Prolic committed Nov 28, 2011
  3. Added parent::__construct() call to Identical validator.

    Kyle Spraggs committed Nov 28, 2011
Commits on Nov 22, 2011
  1. @akrabat

    Merge branch 'hotfix/ZF-11835'

    akrabat committed Nov 22, 2011
  2. @akrabat
  3. @akrabat
  4. @weierophinney

    Better config testing

    - Pass $env to adapters that support it
    - For array version, test:
      - that we have an array or ArrayAccess
      - that we have a section matching $env
      - raise an exception if either is not true
    - Fixed tests that failed due to above changes to specify an application
      env
    weierophinney committed Nov 22, 2011
  5. @akrabat
  6. @akrabat
  7. @weierophinney

    Honor application env in globbed configs

    - Added a check to see if the application env exists in the loaded
      configuration; if so, resets the configuration to the env-specific
      configuration.
    weierophinney committed Nov 22, 2011
  8. @weierophinney

    processArray() now allows Traversables

    - __construct() previously tested for array|Traversable, and, if
      matched, passed the argument on to processArray(). However,
      processArray() had a typehint of array for its argument, leading to a
      catchable fatal error. Modified to do the check in processArray(),
      removing the typehint.
    weierophinney committed Nov 22, 2011
Commits on Nov 21, 2011
  1. @adamlundrigan
  2. @weierophinney

    Merge pull request #623 from adamlundrigan/hotfix/ZF-11896

    [ZF-11896] Zend_Http_Client
    weierophinney committed Nov 21, 2011
  3. @adamlundrigan

    [ZF-11896] Zend_Http_Client

    Remove unused variable from Zend_Http_Client_Adapter_Socket
    adamlundrigan committed Nov 21, 2011
  4. @weierophinney

    Merge branch 'patch-1' of https://github.com/jonnott/zf2 into hotfix/…

    …s3-get-objects-and-prefixes-by-bucket
    weierophinney committed Nov 21, 2011
  5. @weierophinney
  6. @weierophinney
  7. @weierophinney

    Merge branch 'ZF2-66' of https://github.com/FabioBatSilva/zf2 into ho…

    …tfix/dbtable-class_resolution
    weierophinney committed Nov 21, 2011
  8. @weierophinney

    CS cleanup of JSON server

    - explicit imports for all referenced classes/interfaces
    - docblock cleanup
    weierophinney committed Nov 21, 2011
  9. @weierophinney
  10. @jonnott