Skip to content

Commit 704608d

Browse files
Merge branch '7.4' into 8.0
* 7.4: skip legacy extractor test with symfony/property-info 8.0+ chore: heredoc indentation as of PHP 7.3 [Actions] remove dead code from integration-test We can always revisit later if needed.From 2021 its there and not in use
2 parents c22de55 + 982ab24 commit 704608d

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

bin/simple-phpunit.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -285,30 +285,30 @@
285285
file_put_contents($alteredFile, $alteredCode);
286286

287287
file_put_contents('phpunit', <<<'EOPHP'
288-
<?php
288+
<?php
289289
290-
define('PHPUNIT_COMPOSER_INSTALL', __DIR__.'/vendor/autoload.php');
291-
require PHPUNIT_COMPOSER_INSTALL;
290+
define('PHPUNIT_COMPOSER_INSTALL', __DIR__.'/vendor/autoload.php');
291+
require PHPUNIT_COMPOSER_INSTALL;
292292
293-
if (!class_exists(\SymfonyExcludeListPhpunit::class, false)) {
294-
class SymfonyExcludeListPhpunit {}
295-
}
296-
if (method_exists(\PHPUnit\Util\ExcludeList::class, 'addDirectory')) {
297-
(new PHPUnit\Util\Excludelist())->getExcludedDirectories();
298-
PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListPhpunit::class))->getFileName()));
299-
class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListSimplePhpunit::class))->getFileName()));
300-
} elseif (method_exists(\PHPUnit\Util\Blacklist::class, 'addDirectory')) {
301-
(new PHPUnit\Util\BlackList())->getBlacklistedDirectories();
302-
PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListPhpunit::class))->getFileName()));
303-
class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListSimplePhpunit::class))->getFileName()));
304-
} else {
305-
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListPhpunit'] = 1;
306-
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListSimplePhpunit'] = 1;
307-
}
293+
if (!class_exists(\SymfonyExcludeListPhpunit::class, false)) {
294+
class SymfonyExcludeListPhpunit {}
295+
}
296+
if (method_exists(\PHPUnit\Util\ExcludeList::class, 'addDirectory')) {
297+
(new PHPUnit\Util\Excludelist())->getExcludedDirectories();
298+
PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListPhpunit::class))->getFileName()));
299+
class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListSimplePhpunit::class))->getFileName()));
300+
} elseif (method_exists(\PHPUnit\Util\Blacklist::class, 'addDirectory')) {
301+
(new PHPUnit\Util\BlackList())->getBlacklistedDirectories();
302+
PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListPhpunit::class))->getFileName()));
303+
class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListSimplePhpunit::class))->getFileName()));
304+
} else {
305+
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListPhpunit'] = 1;
306+
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListSimplePhpunit'] = 1;
307+
}
308308
309-
Symfony\Bridge\PhpUnit\TextUI\Command::main();
309+
Symfony\Bridge\PhpUnit\TextUI\Command::main();
310310

311-
EOPHP
311+
EOPHP
312312
);
313313
}
314314

0 commit comments

Comments
 (0)