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.0
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.3.3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 22, 2021

  1. Reapply the change to allow to set the composer binary path 

    This change was somehow changed back during the renaming of the file
I think. So this is just restoring the change.
    @Taluu
    Taluu committed Jun 22, 2021
    Copy the full SHA
    279ffbf View commit details

  2. Merge branch '4.4' into 5.2 

    * 4.4:
  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
    f73f749 View commit details

  3. Merge branch '5.2' into 5.3 

    * 5.2:
  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
    d7d3193 View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 bin/simple-phpunit.php
14 changes: 8 additions & 6 deletions bin/simple-phpunit.php
View file
Original file line number Diff line number Diff line change
@@ -147,12 +147,14 @@
putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
}

$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')
|| ($COMPOSER = rtrim((string) ('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar 2> NUL`) : `which composer.phar 2> /dev/null`)))
|| ($COMPOSER = rtrim((string) ('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer 2> NUL`) : `which composer 2> /dev/null`)))
|| file_exists($COMPOSER = rtrim((string) ('\\' === \DIRECTORY_SEPARATOR ? `git rev-parse --show-toplevel 2> NUL` : `git rev-parse --show-toplevel 2> /dev/null`)).\DIRECTORY_SEPARATOR.'composer.phar')
? ('#!/usr/bin/env php' === file_get_contents($COMPOSER, false, null, 0, 18) ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang
: 'composer';
if (false === $COMPOSER = getenv('COMPOSER_BINARY')) {
$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')
|| ($COMPOSER = rtrim((string) ('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar 2> NUL`) : `which composer.phar 2> /dev/null`)))
|| ($COMPOSER = rtrim((string) ('\\' === \DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer 2> NUL`) : `which composer 2> /dev/null`)))
|| file_exists($COMPOSER = rtrim((string) ('\\' === \DIRECTORY_SEPARATOR ? `git rev-parse --show-toplevel 2> NUL` : `git rev-parse --show-toplevel 2> /dev/null`)).\DIRECTORY_SEPARATOR.'composer.phar')
? ('#!/usr/bin/env php' === file_get_contents($COMPOSER, false, null, 0, 18) ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang
: 'composer';
}

$prevCacheDir = getenv('COMPOSER_CACHE_DIR');
if ($prevCacheDir) {