Commits on Apr 6, 2013
  1. @fabpot

    updated VERSION for 2.2.1

    fabpot committed Apr 6, 2013
  2. @fabpot

    Merge branch '2.1' into 2.2

    * 2.1:
      [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
      [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)
      [WebProfilerBundle] removed next pointer class in a template
    fabpot committed Apr 6, 2013
  3. @fabpot

    updated CHANGELOG for 2.2.1

    fabpot committed Apr 6, 2013
Commits on Apr 5, 2013
  1. @fabpot

    merged branch phc/2.1 (PR #7569)

    This PR was merged into the 2.1 branch.
    
    Discussion
    ----------
    
    [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | [no]
    | New feature?  | [no]
    | BC breaks?    | [no]
    | Deprecations? | [no]
    | Tests pass?   | [yes] I assume : only changed a comment word
    | License       | MIT
    
    Commits
    -------
    
    815eb61 [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
    fabpot committed Apr 5, 2013
  2. @fabpot

    [FrameworkBundle] fixed the discovery of the PHPUnit configuration fi…

    …le when using aggregate options like in -vc app/ (closes #7562)
    fabpot committed Apr 5, 2013
  3. @fabpot

    merged branch bamarni/patch-3 (PR #7544)

    This PR was merged into the 2.1 branch.
    
    Discussion
    ----------
    
    [WebProfilerBundle] removed next pointer class in a template
    
    It's not needed as there is nothing after the span here, eg. on a 404, see :
    http://awesomescreenshot.com/0d5149an51
    
    It displays "n/a ::".
    
    Commits
    -------
    
    b0ba9fd [WebProfilerBundle] removed next pointer class in a template
    fabpot committed Apr 5, 2013
Commits on Apr 2, 2013
  1. @bamarni
Commits on Apr 1, 2013
  1. @fabpot
  2. @fabpot

    merge branch '2.1' into 2.2

    * 2.1:
      fixed doc references (closes #7515)
      small changes
      [SecurityBundle] Fixed configuration exemple
      idAsIndex should be true with a smallint or bigint id field.
      Fixed long multibyte parameter logging in DbalLogger:startQuery
      Keep the file extension in the temporary copy and test that it exists (closes #7482)
      [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
    
    Conflicts:
    	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
    fabpot committed Apr 1, 2013
  3. @fabpot
  4. @fabpot

    merged branch sterrien/patch-4 (PR #7519)

    This PR was merged into the 2.1 branch.
    
    Discussion
    ----------
    
    [Form] [Doctrine] [EntityChoiceList] idAsIndex should be true with a smallint id field.
    
    When the id of an entity is a smallint, $this->idAsIndex should also be true.
    It was not the case.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: should
    License of the code: MIT
    
    Commits
    -------
    
    673fd9b  idAsIndex should be true with a smallint or bigint id field.
    fabpot committed Apr 1, 2013
  5. @fabpot

    merged branch lyrixx/fix-security-config (PR #7528)

    This PR was merged into the 2.1 branch.
    
    Discussion
    ----------
    
    [2.1][SecurityBundle] Fixed configuration exemple
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    2c7a99b [SecurityBundle] Fixed configuration exemple
    fabpot committed Apr 1, 2013
  6. @fabpot

    merged branch bamarni/minor-2.1 (PR #7533)

    This PR was merged into the 2.1 branch.
    
    Discussion
    ----------
    
    small changes
    
    Commits
    -------
    
    766e880 small changes
    fabpot committed Apr 1, 2013
  7. @fabpot

    merged branch TerjeBr/persistent-token-provider (PR #7534)

    This PR was merged into the 2.2 branch.
    
    Discussion
    ----------
    
    [Security/Http/RememberMe] PersistentTokenBasedRememberMeServices bugfix
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass? | yes
    | License       | MIT
    
    The database and debug layer cannot handle raw random strings. It may contain invalid ut8 characters and whatnot. So, in order to avoid a lot of database bugs, we must base64_encode the random strings.
    
    Commits
    -------
    
    751abe1 Doctrine cannot handle bare random non-utf8 strings
    fabpot committed Apr 1, 2013
  8. @fabpot

    merged branch webfactory/fix-finder-test-osx (PR #7536)

    This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7536).
    
    Discussion
    ----------
    
    Fix Finder tests on OS X
    
    ... where sys_get_temp_dir() does not return a realpath().
    
    Commits
    -------
    
    0ed8441 On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var.
    fabpot committed Apr 1, 2013
  9. @mpdude @fabpot

    On OS X, sys_get_tmp_dir() returns /var/private/..., which really is …

    …below /private/var.
    mpdude committed with fabpot Mar 31, 2013
Commits on Mar 31, 2013
  1. Doctrine cannot handle bare random non-utf8 strings

    Terje Br��ten committed Mar 31, 2013
  2. @bamarni

    small changes

    bamarni committed Mar 31, 2013
Commits on Mar 30, 2013
  1. @lyrixx

    [SecurityBundle] Fixed configuration exemple

    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    lyrixx committed Mar 30, 2013
Commits on Mar 29, 2013
  1. @sterrien
Commits on Mar 28, 2013
  1. @fabpot

    merged branch jmikola/2.2-propertyaccess-docs (PR #7511)

    This PR was merged into the 2.2 branch.
    
    Discussion
    ----------
    
    [PropertyAccess] Documentation cleanup
    
    | Q             | A
    | ------------- | ---
    | Fixed tickets | none
    | License       | MIT
    
    Resubmission of #7498
    
    Commits
    -------
    
    8aaa6ef [PropertyAccess] Remove trailing periods from doc blocks
    d78fec9 Fix param docs for PropertyAccessor read method
    fabpot committed Mar 28, 2013
  2. @jmikola

    [PropertyAccess] Remove trailing periods from doc blocks

    Periods were left in place for entries with multiple sentences/statements.
    jmikola committed Mar 27, 2013
  3. @jmikola
Commits on Mar 27, 2013
  1. @fabpot

    merged branch burci/doctrinebridge-dballogger-bug (PR #7497)

    This PR was merged into the 2.1 branch.
    
    Discussion
    ----------
    
    [2.1][2.2][2.3][Bridge][Doctrine] Fixing long multibyte parameter logging in DbalLogger:startQuery
    
    See #7484
    
    Commits
    -------
    
    64a1d39 Fixed long multibyte parameter logging in DbalLogger:startQuery
    fabpot committed Mar 27, 2013
  2. @burci
  3. @thewilkybarkid @fabpot
Commits on Mar 26, 2013
  1. @fabpot

    merged branch 77web/validator-translation-ja (PR #7478)

    This PR was merged into the 2.1 branch.
    
    Discussion
    ----------
    
    [Validator] [translation] updated Japanese translation for Validator component
    
    | Q             | A
    | ------------- | ---
    | Fixed tickets | N/A
    | License       | MIT
    
    I will also update translations for new messages available after 2.2 once this request is merged.
    
    Commits
    -------
    
    987aded [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
    fabpot committed Mar 26, 2013
  2. @fabpot

    Merge branch '2.1' into 2.2

    * 2.1:
      bumped Symfony version to 2.1.10-DEV
      updated VERSION for 2.1.9
      update CONTRIBUTORS for 2.1.9
      updated CHANGELOG for 2.1.9
      [FrameworkBundle] Reuse definition variable in FormPass
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Mar 26, 2013
  3. @fabpot
  4. @77web

    [Validator][translation][japanese]replaced period to japanese one

    [Validator][translation][japanese]fixed japanese translation to more practical one
    [Validator][translation][japanese]fixed message ordering to be consistent with other languages
    [Validator][translation][japanese]added new validation messages in japanese translation
    77web committed Mar 26, 2013
  5. @fabpot

    updated VERSION for 2.1.9

    fabpot committed Mar 26, 2013
  6. @fabpot

    update CONTRIBUTORS for 2.1.9

    fabpot committed Mar 26, 2013
  7. @fabpot

    updated CHANGELOG for 2.1.9

    fabpot committed Mar 26, 2013
  8. @fabpot