Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 1, 2015
  1. @samsonasik @Ocramius

    Happy new year 2015

    samsonasik authored Ocramius committed
Commits on Jan 2, 2014
  1. @ralphschindler

    Back-port of copyright changes to master

    ralphschindler authored
    Diff based on PR #5654 (git diff a961e19..fd935cf), applied skipping unmatched files
Commits on Jan 21, 2013
  1. @weierophinney

    Removed all @category, @package, and @subpackage annotations

    weierophinney authored
    - Per #2743, and following on #2953 and discussion on the ML
    - Also removes empty docblocks, and empty lines at the end of docblocks
    - Library only; phpdoc is never run on tests anyways, and did not want to
      potentially create breakage due to test expectations that relied on
      annotations. At this time, all tests pass.
Commits on Jan 1, 2013
  1. @samsonasik
Commits on Jul 13, 2012
  1. @Ocramius
Commits on Jul 12, 2012
  1. @Ocramius
Commits on Jul 11, 2012
  1. @weierophinney
Commits on Jul 9, 2012
  1. @Ocramius
  2. @Maks3w

    [CS][Library] Set File Header

    Maks3w authored
    http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards#CodingStandards-Files
    
    The following script replaces the content between PHP open tag and namespace declaration.
    
    for COMPONENT in $(ls -d *)
    do
        for FILE in $(find $COMPONENT -name "*.php")
        do
            BLOCK="\/\*\*\n \* Zend Framework \(http:\/\/framework\.zend\.com\/\)\n \*\n \* \@link      http:\/\/github\.com\/zendframework\/zf2 for the canonical source repository\n \* \@copyright Copyright \(c\) 2005-2012 Zend Technologies USA Inc\. \(http:\/\/www\.zend\.com\)\n \* \@license   http:\/\/framework\.zend\.com\/license\/new-bsd New BSD License\n \* \@package   Zend_$COMPONENT\n \*\/"
            perl -0777 -i -pe "s/(<\?php(\s*.*)*\nn)/<?php\n$BLOCK\n\nn/" $FILE
        done
    done
Commits on Jul 5, 2012
  1. @Ocramius
  2. @Ocramius

    Documenting code for GeneratorInstance, allowing string callbacks in …

    Ocramius authored
    …DependencyInjectorProxy, fixing instance name when an instance is generated via callback
  3. @Ocramius

    Fixing DependencyInjectorProxy to avoid executing resolveAndCallInjec…

    Ocramius authored
    …tionMethodForInstance on non-proxy instancesAlso, allowing override of usage of get_class in Zend\Di\Di. This allows more flexibility when extending it
  4. @Ocramius
Commits on Jun 25, 2012
  1. @prolic

    Fixed phpdoc and CS in Zend\Di

    prolic authored
Commits on May 30, 2012
  1. @Maks3w

    [Di] Minor changes

    Maks3w authored
Commits on Feb 22, 2012
  1. @weierophinney

    Merge branch 'zendStudioDLTKProblems' of https://github.com/marc-mabe…

    weierophinney authored
    …/zf2 into hotfix/coding-standards
    
    Conflicts:
    	library/Zend/Mvc/Controller/ActionController.php
    	library/Zend/Mvc/Controller/RestfulController.php
Commits on Feb 13, 2012
  1. @RWOverdijk
Commits on Feb 12, 2012
  1. @marc-mabe
Commits on Oct 6, 2011
  1. @weierophinney

    Merge remote-tracking branch 'ralph/refactor/code' into feature/code-…

    weierophinney authored
    …component
    
    Conflicts:
    	library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php
  2. @weierophinney

    Merge remote-tracking branch 'ralph/refactor/code' into feature/code-…

    weierophinney authored
    …component
    
    Conflicts:
    	library/Zend/CodeGenerator/Php/PhpClass.php
    	library/Zend/Di/DependencyInjection.php
    	library/Zend/Di/Di.php
    	tests/Zend/CodeGenerator/Php/PhpClassTest.php
    	tests/Zend/Di/Definition/BuilderDefinitionTest.php
  3. @ralphschindler @EvanDotPro

    Zend\Di

    ralphschindler authored EvanDotPro committed
    - InstanceManager alias of alias support by Evan Coury
    
    Conflicts:
    
    	library/Zend/Di/InstanceManager.php
    	tests/Zend/Di/InstanceManagerTest.php
  4. @EvanDotPro

    Revert "Zend\Di"

    EvanDotPro authored
    This reverts commit e784615.
    
    I'm going to replay the history on top of Ralph's changes to better retain the
    history.
  5. @ralphschindler

    Zend\Di

    ralphschindler authored
    - InstanceManager alias of alias support by Evan Coury
  6. @ralphschindler

    Zend\Di & Zend\Code Refactorings.

    ralphschindler authored
    - Annotations for Zend\Code infrastructure
    - Di Definition refactoring (moved methods into definition)
    - Ability to inject objects by configuration
    - Console information about definition
Commits on Sep 22, 2011
  1. @weierophinney

    Brought ServiceLocator\Generator up-to-date with latest DI container

    weierophinney authored
    - Required updating Proxy's get() and newInstance() methods
    - Required updating DI configuration in GeneratorTest class to follow
      new schema
Commits on Jun 14, 2011
  1. @weierophinney

    Remove resolveMethodParameters from Proxy

    weierophinney authored
    - Removed resolveMethodParameters method from DependencyInjectorProxy;
      unnecessary.
  2. @weierophinney

    Refactored ServiceLocator generation

    weierophinney authored
    - Added back tests for ServiceLocator\Generator
      - Refactored to use BuilderDefinition
    - Added DI Proxy for usage by ServiceLocator\Generator
      - Creates GeneratorInstance objects, which can then be used to build the
        requested SL container
Something went wrong with that request. Please try again.