Skip to content
Permalink
Branch: master
Commits on Aug 13, 2019
  1. 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
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. minor #33000 Fix deprecations on 4.3 (jderusse)

    nicolas-grekas committed Aug 8, 2019
    This PR was merged into the 4.3 branch.
    
    Discussion
    ----------
    
    Fix deprecations on 4.3
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 4.3
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #32844
    | License       | MIT
    | Doc PR        | NA
    
    Fix deprecations in branch 4.3
    note: remaining deprecation `assertStringContainsString` will be fixed in #32977
    
    * [ ] fix tests in branch 3.4 in #32981
    
    Commits
    -------
    
    8fd16a6bee Fix deprecation on 4.3
  4. Merge branch '4.4'

    nicolas-grekas committed Aug 8, 2019
    * 4.4:
      Remove unneeded phpdocs
  5. 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
  3. Merge branch '3.4' into 4.3

    nicolas-grekas committed Aug 7, 2019
    * 3.4:
      Fix inconsistent return points.
      Fix remaining tests
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 5, 2019
  1. Merge branch '4.4'

    nicolas-grekas committed Aug 5, 2019
    * 4.4:
      Minor fixes
      [Mailer] fixed dispatcher not available in Mailer
      [HttpClient] Minor fixes
      Use namespaced Phpunit classes
      Add polyfill for PhpUnit namespace
      [Messenger] Fixed ConsumeMessagesCommand configuration
      [Form] remove leftover int child phpdoc
      Support DateTimeInterface in IntlDateFormatter::format
      [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke
      [Yaml] Removed unused $nullAsTilde property
      [Security] add support for opportunistic password migrations
      [Lock] Legacy test should implement legacy interface
      fixed phpdocs
      Use PHPunit assertion
      [Intl] Order alpha2 to alpha3 mapping + phpdoc fixes
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
  4. minor #32889 [PhpUnitBridge] Remove use of ForwardCompatTrait (jderusse)

    nicolas-grekas committed Aug 3, 2019
    This PR was merged into the 3.4 branch.
    
    Discussion
    ----------
    
    [PhpUnitBridge] Remove use of ForwardCompatTrait
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.4
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #32844
    | License       | MIT
    | Doc PR        | NA
    
    With #32882 the ForwardCompatibilityTrait is injected in TestCase which now act as a true polyfill
    
    Commits
    -------
    
    ac6242f36b Remove use of ForwardCompatTrait
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 merge
  2. Merge branch '4.3' into 4.4

    nicolas-grekas committed Aug 1, 2019
    * 4.3:
      fix merge
  3. fix merge

    nicolas-grekas committed Aug 1, 2019
  4. Merge branch '4.4'

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

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

    nicolas-grekas committed Aug 1, 2019
    * 3.4:
      cs fix
      Replace calls to setExpectedException by Pollyfill
  7. 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
You can’t perform that action at this time.