Skip to content
Permalink
Branch: master
Commits on Aug 13, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 13, 2019
    * 4.4:
      cs fix
      Fix return statements
      [TwigBridge] add missing dep
      Add type declarations to private DefaultChoiceListFactory methods
      Add false type to ChoiceListFactoryInterface::createView $label argument
      Update UPGRADE guide of 4.3 for EventDispatcher
      [SecurityBundle] display the correct class name on the deprecated notice
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 13, 2019
    * 4.3:
      cs fix
      Fix return statements
      [TwigBridge] add missing dep
      Add false type to ChoiceListFactoryInterface::createView $label argument
      Update UPGRADE guide of 4.3 for EventDispatcher
      [SecurityBundle] display the correct class name on the deprecated notice
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 13, 2019
    * 3.4:
      Fix return statements
      [TwigBridge] add missing dep
      Add false type to ChoiceListFactoryInterface::createView $label argument
  4. minor #33130 Fix return statements (nicolas-grekas)

    nicolas-grekas committed Aug 13, 2019
    This PR was merged into the 3.4 branch.
    
    Discussion
    ----------
    
    Fix return statements
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.4
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Discovered while working on #30323
    This will sync the code from 3.4 up to master, where adding return types will require these.
    
    Commits
    -------
    
    2bc05c83b4 Fix return statements
  5. Fix return statements

    nicolas-grekas committed Aug 12, 2019
Commits on Aug 12, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 12, 2019
    * 4.4:
      [WebLink] implement PSR-13 directly
Commits on Aug 10, 2019
  1. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 10, 2019
    * 3.4:
      cleanups
      Disable PHPUnit result cache on the CI
      [Translation] Highlight invalid translation status
  2. cleanups

    nicolas-grekas committed Aug 10, 2019
Commits on Aug 9, 2019
  1. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 9, 2019
    * 3.4:
      Bump minimal requirements
      Use PHPUnit 8.3 on Travis when possible
Commits on Aug 8, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 8, 2019
    * 4.4:
      Improve some URLs
      cleanup remaining param  and internal Intl FulLTransformer
      [HttpClient] fix data loss when streaming as a PHP resource
      Fix test compatibility with 4.x components
      [Cache] cs fix
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 8, 2019
    * 4.3:
      Improve some URLs
      Fix test compatibility with 4.x components
      [Cache] cs fix
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 8, 2019
    * 3.4:
      Improve some URLs
      Fix test compatibility with 4.x components
      [Cache] cs fix
  4. minor #32800 Improve some URLs (Arman-Hosseini)

    nicolas-grekas committed Aug 8, 2019
    This PR was squashed before being merged into the 3.4 branch (closes #32800).
    
    Discussion
    ----------
    
    Improve some URLs
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.4 <!-- see below -->
    | Bug fix?      | no
    | New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
    | BC breaks?    | no     <!-- see https://symfony.com/bc -->
    | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
    | Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
    | Fixed tickets | N/A   <!-- #-prefixed issue number(s), if any -->
    | License       | MIT
    | Doc PR        | N/A <!-- required for new features -->
    
    <!--
    Replace this notice by a short README for your feature/bugfix. This will help people
    understand your PR and can be used as a start for the documentation.
    
    Additionally (see https://symfony.com/roadmap):
     - Bug fixes must be submitted against the lowest maintained branch where they apply
       (lowest branches are regularly merged to upper ones so they get the fixes too).
     - Features and deprecations must be submitted against branch 4.4.
     - Legacy code removals go to the master branch.
    -->
    
    Commits
    -------
    
    fab17a4487 Improve some URLs
  5. Merge branch '4.4'

    nicolas-grekas committed Aug 8, 2019
    * 4.4:
      Fix compatibility with PHPUnit 8
      Disable phpunit typehint patch on 4.3 branch
      Fix deprecation on 4.3
  6. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 8, 2019
    * 4.3:
      Disable phpunit typehint patch on 4.3 branch
      Fix deprecation on 4.3
  7. Merge branch '4.4'

    nicolas-grekas committed Aug 8, 2019
    * 4.4:
      [Debug] Improve UPGRADE files
      remove wrongly added legacy group from test
      consistently throw NotSupportException
      [HttpKernel] Clarify error handler restoring process again
      [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt
      add missing conflict rule
      [Intl] fix nullable phpdocs and useless method visibility of internal class
      remove some more useless phpdocs
      Resilience against file_get_contents() race conditions.
      Turned return type annotations of private methods into php return types.
Commits on Aug 7, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 7, 2019
    * 4.4:
      fix merge
      Fix inconsistent return points.
      pass translation parameters to the trans filter
      [Mime] fixed wrong mimetype
      [ProxyManagerBridge] Polyfill for unmaintained version
      [HttpClient] Declare `$active` first to prevent weird issue
      Remove deprecated assertContains
      [HttpClient] fix tests
      SCA: dropped unused mocks, duplicate import and a function alias usage
      Added correct plural for box -> boxes
      [Config] fix test
      Fix remaining tests
      fix getName() when transport is null
      [Console] Check for ErrorHandler classes
      Improve fa (persian) translation
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 7, 2019
    * 4.3:
      Fix inconsistent return points.
      pass translation parameters to the trans filter
      [Mime] fixed wrong mimetype
      [ProxyManagerBridge] Polyfill for unmaintained version
      [HttpClient] Declare `$active` first to prevent weird issue
      Remove deprecated assertContains
      [HttpClient] fix tests
      SCA: dropped unused mocks, duplicate import and a function alias usage
      Added correct plural for box -> boxes
      [Config] fix test
      Fix remaining tests
      Improve fa (persian) translation
Commits on Aug 6, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 6, 2019
    * 4.4:
      bump phpunit-bridge cache-id
      removed unneeded phpdocs
      Use assertStringContainsString when needed
      Use assert assertContainsEquals when needed
      Use assertEqualsWithDelta when required
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 6, 2019
    * 4.3:
      bump phpunit-bridge cache-id
      Use assertStringContainsString when needed
      Use assert assertContainsEquals when needed
      Use assertEqualsWithDelta when required
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 6, 2019
    * 3.4:
      bump phpunit-bridge cache-id
      Use assertStringContainsString when needed
      Use assert assertContainsEquals when needed
      Use assertEqualsWithDelta when required
Commits on Aug 3, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 3, 2019
    * 4.4:
      Remove use of ForwardCompatTrait
      Remove deprecated methods assertArraySubset
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 3, 2019
    * 4.3:
      Remove use of ForwardCompatTrait
      Remove deprecated methods assertArraySubset
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 3, 2019
    * 3.4:
      Remove use of ForwardCompatTrait
      Remove deprecated methods assertArraySubset
Commits on Aug 2, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 2, 2019
    * 4.4:
      Fix tests
      Fix deprecated phpunit annotation
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 2, 2019
    * 4.3:
      Fix tests
      Fix deprecated phpunit annotation
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 2, 2019
    * 3.4:
      Fix tests
      Fix deprecated phpunit annotation
  4. Merge branch '4.4'

    nicolas-grekas committed Aug 2, 2019
    * 4.4:
      add parameter type declarations to private methods
Commits on Aug 1, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 1, 2019
    * 4.4:
      cs fix
      Replace calls to setExpectedException by Pollyfill
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 1, 2019
    * 4.3:
      cs fix
      Replace calls to setExpectedException by Pollyfill
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 1, 2019
    * 3.4:
      cs fix
      Replace calls to setExpectedException by Pollyfill
  4. Merge branch '4.4'

    nicolas-grekas committed Aug 1, 2019
    * 4.4:
      [Bridge/Twig] fix slow dep resolution on deps=low
      [ErrorRenderer] Add DebugCommand for easy debugging and testing
      [DoctrineBridge] Deprecated RegistryInterface
  5. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 1, 2019
    * 4.3:
      [Bridge/Twig] fix slow dep resolution on deps=low
Older
You can’t perform that action at this time.