Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/phpunit-bridge
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.3.14
Choose a base ref
...
head repository: symfony/phpunit-bridge
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.4.0
Choose a head ref
  • 17 commits
  • 2 files changed
  • 2 contributors

Commits on May 19, 2021

  1. Allow Symfony 6

    @derrabus
    derrabus committed May 19, 2021
    Copy the full SHA
    95e8b02 View commit details

Commits on May 26, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  Fix CS in README files
  Fix markdown
  [HttpKernel] Fixes tests for PHP7.4+
  [Filesystem] fix readlink for Windows
    @nicolas-grekas
    nicolas-grekas committed May 26, 2021
    Copy the full SHA
    3337a5b View commit details

Commits on May 27, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  [VarDumper] fix tests
  [Intl] fix bad merge
  Remove notice about reverted behavior
  [PhpUnitBridge] fix PHP version check
  keep container.service_subscriber tag on the decorated definition
    @nicolas-grekas
    nicolas-grekas committed May 27, 2021
    Copy the full SHA
    0c53746 View commit details

Commits on Jun 22, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  Implement fluent interface on RememberMeBadge::disable()
  Reapply the change to allow to set the composer binary path
  [DependencyInjection] throw proper exception when decorating a synthetic service
  [WebLink] Sync type with parent interface
  [WebLink] fix types on Link::withAttribute()
  [ErrorHandler][DebugClassLoader] Do not check Phake mocks classes
    @derrabus
    derrabus committed Jun 22, 2021
    Copy the full SHA
    ae0c00b View commit details

Commits on Jun 30, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  CS fix
  CS fix
  CS fixes
  Bump Symfony version to 5.3.4
  Update VERSION for 5.3.3
  Update CHANGELOG for 5.3.3
  Bump Symfony version to 5.2.12
  Update VERSION for 5.2.11
  Update CHANGELOG for 5.2.11
  Bump Symfony version to 4.4.27
  Update VERSION for 4.4.26
  Update CONTRIBUTORS for 4.4.26
  Update CHANGELOG for 4.4.26
    @nicolas-grekas
    nicolas-grekas committed Jun 30, 2021
    Copy the full SHA
    d5d4901 View commit details

Commits on Jul 2, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  [PhpUnitBridge] Fix deprecation handler with PHPUnit 10
  Revert CI workaround for masterminds/html5
    @derrabus
    derrabus committed Jul 2, 2021
    Copy the full SHA
    e50aa7b View commit details

Commits on Jul 3, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  Backport type fixes
  fix annot
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [GHA] restore phpunit-bridge job
  rethrow caught exception
  [Form] better form doc types to support static analysis
    @nicolas-grekas
    nicolas-grekas committed Jul 3, 2021
    Copy the full SHA
    bd59ac7 View commit details

Commits on Jul 15, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  [Validator] Backport type fixes
  [HttpFoundation] fix FileBag under PHP 8.1
  Fix composer resolution on windows
    @derrabus
    derrabus committed Jul 15, 2021
    Copy the full SHA
    f1c6fc0 View commit details

Commits on Aug 17, 2021

  1. Cleanup more @return annotations

    @nicolas-grekas
    nicolas-grekas committed Aug 17, 2021
    Copy the full SHA
    2ae854f View commit details

Commits on Aug 27, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  Cast ini_get to an integer to match expected type
  Add no-interaction for SYMFONY_PHPUNIT_REMOVE
  Add no-interaction for SYMFONY_PHPUNIT_REQUIRE on prophecy
  Remove indices in messenger table on MySQL to prevent deadlocks while removing messages when running multiple consumers
    @derrabus
    derrabus committed Aug 27, 2021
    Copy the full SHA
    d768afa View commit details

Commits on Sep 14, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  Track unsilenced deprecation only for userland
  [Security Core], [Validator Component]
    @nicolas-grekas
    nicolas-grekas committed Sep 14, 2021
    Copy the full SHA
    b8c23e9 View commit details

Commits on Sep 30, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  [PHPUnitBridge] Fix skipping triggering file override on 5.3
  Do not override correct triggering file for return type deprecations
  [HttpClient] accept headers when CURLE_RECV_ERROR is received before the content
  Use PHPUnit 9.5 on PHP 8.1
  [Serializer] Attributes that extends the serializer`s annotations do not ignore by the serialization process
    @nicolas-grekas
    nicolas-grekas committed Sep 30, 2021
    Copy the full SHA
    37a4d73 View commit details

Commits on Oct 27, 2021

  1. Use try/finally to restore error handlers 

    Signed-off-by: Alexander M. Turek <me@derrabus.de>
    @derrabus
    derrabus committed Oct 27, 2021
    Copy the full SHA
    9093fa6 View commit details

Commits on Oct 28, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3: (24 commits)
  [TwigBundle] fix auto-enabling assets/expression/routing/yaml/workflow extensions
  [PhpUnitBridge] fix symlink to bridge in docker by making its path relative
  [Dotenv] Duplicate $_SERVER values in $_ENV if they don't exist
  Add polish translations (#43725)
  [String] Add PLURAL_MAP "zombies" -- fix #43789
  [Validator] Update validators.bs.xlf
  [Messenger] Fix `TraceableMessageBus` implementation so it can compute caller even when used within a callback
  [Validator] Add the missing translations for Russian (ru)
  [Validator] Added missing translations for Latvian (lv)
  [Validator] Added missing translations
  [Validator] Add missing translations for Vietnamese (VI)
  Add missing translations for Lithuanian (lt)
  [Validator] Add missing translations for Italian (it) #43722
  Add missing translations for Ukrainian
  Add missing translations for Bulgarian
  Add missing translations for Dutch (nl)
  Update validators.es.xlf
  update zh_TW translation
  [Validator] Added Danish translations
  added missing translations for Serbian Latin (sr_Latn) #43734
  ...
    @derrabus
    derrabus committed Oct 28, 2021
    Copy the full SHA
    7e3cd47 View commit details

Commits on Nov 12, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  Fix tests on PHP 8.1
  [Cache] Fix memory leak
  [DependencyInjection] fix inlining when non-shared services are involved
  [DoctrineBridge] add support for the JSON type
  [PHPUnitBridge] Fix Uncaught ValueError
  [FrameworkBundle] fix registering late resettable services
  [Validator] Missing translations for Greek (el)
  translate for japanese 101,102,103
  [HttpClient] Curl http client has to reinit curl multi handle on reset
  [Validator] Add Swedish translation for issue #43737
    @nicolas-grekas
    nicolas-grekas committed Nov 12, 2021
    Copy the full SHA
    0f925f6 View commit details

Commits on Nov 23, 2021

  1. Allow v3 contracts where possible

    @derrabus
    derrabus committed Nov 23, 2021
    Copy the full SHA
    abc162a View commit details

Commits on Nov 29, 2021

  1. Merge branch '5.3' into 5.4 

    * 5.3:
  [Security] Do not overwrite already stored tokens for REMOTE_USER authentication
  [Validator] Fix validation for single level domains
  Fix redundant type casts
  Increased the reserved memory from 10k to 32k
  [DoctrineBridge] Add DbalLoggerTest to group legacy
  Leverage DBAL's getNativeConnection() method
  Fix idempotency of LocoProvider write method
    @nicolas-grekas
    nicolas-grekas committed Nov 29, 2021
    Copy the full SHA
    59bbd98 View commit details
Showing with 8 additions and 5 deletions.
  1. +6 −3 DeprecationErrorHandler/Deprecation.php
  2. +2 −2 composer.json
9 changes: 6 additions & 3 deletions DeprecationErrorHandler/Deprecation.php
View file
Original file line number Diff line number Diff line change
@@ -102,8 +102,11 @@ public function __construct($message, array $trace, $file)
}

set_error_handler(function () {});
$parsedMsg = unserialize($this->message);
restore_error_handler();
try {
$parsedMsg = unserialize($this->message);
} finally {
restore_error_handler();
}
if ($parsedMsg && isset($parsedMsg['deprecation'])) {
$this->message = $parsedMsg['deprecation'];
$this->originClass = $parsedMsg['class'];
@@ -310,7 +313,7 @@ private function getPackage($path)
}

/**
* @return string[] an array of paths
* @return string[]
*/
private static function getVendors()
{
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -19,10 +19,10 @@
"php": ">=7.1.3 EVEN ON LATEST SYMFONY VERSIONS TO ALLOW USING",
"php": "THIS BRIDGE WHEN TESTING LOWEST SYMFONY VERSIONS.",
"php": ">=7.1.3",
"symfony/deprecation-contracts": "^2.1"
"symfony/deprecation-contracts": "^2.1|^3"
},
"require-dev": {
"symfony/error-handler": "^4.4|^5.0"
"symfony/error-handler": "^4.4|^5.0|^6.0"
},
"suggest": {
"symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"