Skip to content
Permalink
Branch: master
Commits on Aug 14, 2019
  1. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 14, 2019
    * 3.4:
      Remove superfluous phpdoc tags
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. Fix return statements

    nicolas-grekas committed Aug 12, 2019
Commits on Aug 8, 2019
  1. 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
  2. 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
  3. Merge branch '4.4'

    nicolas-grekas committed Aug 8, 2019
    * 4.4:
      Remove unneeded phpdocs
  4. 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.
  5. minor #33018 remove some more useless phpdocs (Tobion)

    nicolas-grekas committed Aug 8, 2019
    This PR was merged into the 4.4 branch.
    
    Discussion
    ----------
    
    remove some more useless phpdocs
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 4.4
    | 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 | #...   <!-- #-prefixed issue number(s), if any -->
    | License       | MIT
    | Doc PR        | symfony/symfony-docs#... <!-- required for new features -->
    
    Fix some leftovers from #32974 and #32786
    
    Commits
    -------
    
    9be4d171e0 remove some more useless phpdocs
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
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 7, 2019
    * 3.4:
      [ProxyManagerBridge] Polyfill for unmaintained version
      SCA: dropped unused mocks, duplicate import and a function alias usage
      [Config] fix test
      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
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
Commits on Aug 1, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 1, 2019
    * 4.4:
      Fix assertInternalType deprecation in phpunit 9
      Micro-typo fix
      add parameter type declarations to private methods
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 1, 2019
    * 4.3:
      Fix assertInternalType deprecation in phpunit 9
      Micro-typo fix
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 1, 2019
    * 3.4:
      Fix assertInternalType deprecation in phpunit 9
      Micro-typo fix
You can’t perform that action at this time.