Skip to content
Commits on Feb 3, 2016
  1. @fabpot

    bug #17658 [FrameworkBundle] fix assets and templating tests (xabbuh)

    fabpot committed
    This PR was merged into the 3.0 branch.
    
    Discussion
    ----------
    
    [FrameworkBundle] fix assets and templating tests
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #17506
    | License       | MIT
    | Doc PR        |
    
    Now that the `assets` section is automatically enabled when `templating`
    is enabled (see #17506), the `templating.helper.assets` will also be
    present as soon as the `templating` section is activated.
    
    Commits
    -------
    
    293df5d [FrameworkBundle] fix assets and templating tests
  2. @xabbuh

    [FrameworkBundle] fix assets and templating tests

    xabbuh committed
    Now that the `assets` section is automatically enabled when `templating`
    is enabled (see #17506), the `templating.helper.assets` will also be
    present as soon as the `templating` section is activated.
  3. @xabbuh
  4. @nicolas-grekas

    feature #17654 [Cache] Don't clone, serialize (nicolas-grekas)

    nicolas-grekas committed
    This PR was merged into the 3.1-dev branch.
    
    Discussion
    ----------
    
    [Cache] Don't clone, serialize
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Cloning is not required by PSR-6, adds overhead and doesn't prevent any mistake for nested objects. Let's simplify.
    ArrayCache in turn should store serialized by default, so that data is deep-cloned. But since this can cause a perf issue for some, I propose to add a constructor flag to disable serializing. WDYT?
    
    Commits
    -------
    
    8605417 [Cache] Don't clone, serialize
  5. @nicolas-grekas
  6. @nicolas-grekas

    minor #17653 changed operator from and to && (fabpot)

    nicolas-grekas committed
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    changed operator from and to &&
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    c718401 changed operator from and to &&
  7. @nicolas-grekas

    minor #17655 [travis] Add some comments (nicolas-grekas)

    nicolas-grekas committed
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [travis] Add some comments
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    13ae323 [travis] Add some comments
Commits on Feb 2, 2016
  1. @xabbuh
  2. @nicolas-grekas
  3. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8:
  4. @fabpot

    Merge branch '2.7' into 2.8

    fabpot committed
    * 2.7:
      backport GlobTest from 2.7 branch
      [FrameworkBundle] Remove unused code in test
      [2.3] Fixed an undefined variable in Glob::toRegex
      simplified a test
      fix container cache key generation
      [Form] fix option name in changelog
      [Translation] Add resources from fallback locale
      [DependencyInjection] enforce tags to have a name
      [YAML] Refine the return value of Yaml::parse()
  5. @fabpot

    changed operator from and to &&

    fabpot committed
  6. @fabpot

    minor #17652 [DependencyInjection] Remove unused parameter (dunglas)

    fabpot committed
    This PR was squashed before being merged into the 3.0 branch (closes #17652).
    
    Discussion
    ----------
    
    [DependencyInjection] Remove unused parameter
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    1a58639 [DependencyInjection] Remove unused parameter
  7. @dunglas @fabpot
  8. @nicolas-grekas

    Merge branch '2.8' into 3.0

    nicolas-grekas committed
    * 2.8:
      [Process] Fix transient tests for incremental outputs
      [Console] Add missing `@require` annotation in test
      Fix merge
      [appveyor] Fix failure reporting
      [#17634] move DebugBundle license file
      backport GlobTest from 2.7 branch
      Move licenses according to new best practices
      [FrameworkBundle] Remove unused code in test
      [2.3] Fixed an undefined variable in Glob::toRegex
      simplified a test
      fix container cache key generation
      [Form] fix option name in upgrade file
      [Form] fix option name in changelog
      [Translation] Add resources from fallback locale
      [DependencyInjection] enforce tags to have a name
      [YAML] Refine the return value of Yaml::parse()
    
    Conflicts:
    	UPGRADE-2.8.md
  9. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas committed
    * 2.7:
      [Process] Fix transient tests for incremental outputs
  10. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas committed
    * 2.3:
      [Process] Fix transient tests for incremental outputs
    
    Conflicts:
    	src/Symfony/Component/Process/Tests/ProcessTest.php
  11. @nicolas-grekas

    minor #17650 [Process] Fix transient tests for incremental outputs (n…

    nicolas-grekas committed
    …icolas-grekas)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Process] Fix transient tests for incremental outputs
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #15617
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    90455df [Process] Fix transient tests for incremental outputs
  12. @nicolas-grekas
  13. @dunglas

    feature #16947 [FrameworkBundle] PropertyInfo: register the Serialize…

    dunglas committed
    …rExtractor (dunglas)
    
    This PR was squashed before being merged into the 3.1-dev branch (closes #16947).
    
    Discussion
    ----------
    
    [FrameworkBundle] PropertyInfo: register the SerializerExtractor
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    4422103 [FrameworkBundle] PropertyInfo: register the SerializerExtractor
  14. @dunglas
  15. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas committed
    * 2.7:
      [Console] Add missing `@require` annotation in test
      Fix merge
      [appveyor] Fix failure reporting
      [#17634] move DebugBundle license file
      backport GlobTest from 2.7 branch
      Move licenses according to new best practices
      [FrameworkBundle] Remove unused code in test
      [2.3] Fixed an undefined variable in Glob::toRegex
      simplified a test
      fix container cache key generation
      [Form] fix option name in changelog
      [Translation] Add resources from fallback locale
      [DependencyInjection] enforce tags to have a name
      [YAML] Refine the return value of Yaml::parse()
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
  16. @nicolas-grekas
Commits on Feb 1, 2016
  1. @nicolas-grekas

    Fix merge

    nicolas-grekas committed
  2. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas committed
    * 2.3:
      [appveyor] Fix failure reporting
  3. @nicolas-grekas

    minor #17639 [appveyor] Fix failure reporting (nicolas-grekas)

    nicolas-grekas committed
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [appveyor] Fix failure reporting
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #17464
    | License       | MIT
    | Doc PR        | -
    
    Status: needs work
    
    Commits
    -------
    
    b58f483 [appveyor] Fix failure reporting
  4. @nicolas-grekas
  5. @xabbuh
  6. @xabbuh

    Merge branch '2.3' into 2.7

    xabbuh committed
    * 2.3:
      Move licenses according to new best practices
  7. @xabbuh

    minor #17634 Move licenses according to new best practices (dunglas)

    xabbuh committed
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Move licenses according to new best practices
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | n/a
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    aab5dec Move licenses according to new best practices
  8. @fabpot

    minor #17588 [Security] [Ldap] [Easy-Pick] Limit ldap component versi…

    fabpot committed
    …on for branch 3.0 (csarrazi)
    
    This PR was merged into the 3.0 branch.
    
    Discussion
    ----------
    
    [Security] [Ldap] [Easy-Pick] Limit ldap component version for branch 3.0
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | no
    | License       | MIT
    | Doc PR        | no
    
    As the Ldap component will introduce BC changes for version 3.1 of Symfony, this PR limits the version to use in composer dependencies. This way, we can ensure that running composer update won't try to install the 3.1 Ldap component with version 2.8 or 3.0 of the Security component, Security Core component and SecurityBundle.
    
    The required version will be changed in PR #17577, so version 3.1 of Symfony actually uses only version `3.1` onwards of the Ldap component.
    
    Commits
    -------
    
    1391311 Limit Ldap component version for the 3.0 branch
  9. @csarrazi
  10. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      backport GlobTest from 2.7 branch
      [2.3] Fixed an undefined variable in Glob::toRegex
  11. @fabpot

    minor #17633 [FrameworkBundle] Remove unused code in test (dunglas)

    fabpot committed
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [FrameworkBundle] Remove unused code in test
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    8780e26 [FrameworkBundle] Remove unused code in test
  12. @fabpot

    minor #17638 [Finder] backport GlobTest from 2.7 branch (xabbuh)

    fabpot committed
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Finder] backport GlobTest from 2.7 branch
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    ceaeb43 backport GlobTest from 2.7 branch
Something went wrong with that request. Please try again.