-
-
Notifications
You must be signed in to change notification settings - Fork 495
[symfony/phpunit-bridge] Disable deprecations helper on 7.3 #1425
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[symfony/phpunit-bridge] Disable deprecations helper on 7.3 #1425
Conversation
Thanks for the PR 😍 How to test these changes in your application
Diff between recipe versionsIn order to help with the review stage, I'm in charge of computing the diff between the various versions of patched recipes. symfony/phpunit-bridge3.3 vs 4.1diff --git a/symfony/phpunit-bridge/3.3/.env.test b/symfony/phpunit-bridge/4.1/.env.test
index 24a43c0..9e7162f 100644
--- a/symfony/phpunit-bridge/3.3/.env.test
+++ b/symfony/phpunit-bridge/4.1/.env.test
@@ -2,3 +2,5 @@
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
+PANTHER_APP_ENV=panther
+PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
diff --git a/symfony/phpunit-bridge/3.3/bin/phpunit b/symfony/phpunit-bridge/4.1/bin/phpunit
index 0b79fd4..63dae24 100755
--- a/symfony/phpunit-bridge/3.3/bin/phpunit
+++ b/symfony/phpunit-bridge/4.1/bin/phpunit
@@ -6,12 +6,6 @@ if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-php
exit(1);
}
-if (false === getenv('SYMFONY_PHPUNIT_VERSION')) {
- putenv('SYMFONY_PHPUNIT_VERSION=6.5');
-}
-if (false === getenv('SYMFONY_PHPUNIT_REMOVE')) {
- putenv('SYMFONY_PHPUNIT_REMOVE=symfony/yaml');
-}
if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
}
diff --git a/symfony/phpunit-bridge/3.3/phpunit.xml.dist b/symfony/phpunit-bridge/4.1/phpunit.xml.dist
index 294a559..d81f0c3 100644
--- a/symfony/phpunit-bridge/3.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/4.1/phpunit.xml.dist
@@ -8,10 +8,11 @@
bootstrap="tests/bootstrap.php"
>
<php>
- <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
+ <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
</php>
<testsuites>
@@ -21,8 +22,8 @@
</testsuites>
<filter>
- <whitelist>
- <directory>src</directory>
+ <whitelist processUncoveredFilesFromWhitelist="true">
+ <directory suffix=".php">src</directory>
</whitelist>
</filter>
4.1 vs 4.3diff --git a/symfony/phpunit-bridge/4.1/bin/phpunit b/symfony/phpunit-bridge/4.3/bin/phpunit
index 63dae24..4d1ed05 100755
--- a/symfony/phpunit-bridge/4.1/bin/phpunit
+++ b/symfony/phpunit-bridge/4.3/bin/phpunit
@@ -1,8 +1,8 @@
#!/usr/bin/env php
<?php
-if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
- echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+ echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
exit(1);
}
@@ -10,4 +10,4 @@ if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
}
-require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
diff --git a/symfony/phpunit-bridge/4.1/phpunit.xml.dist b/symfony/phpunit-bridge/4.3/phpunit.xml.dist
index d81f0c3..5766779 100644
--- a/symfony/phpunit-bridge/4.1/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/4.3/phpunit.xml.dist
@@ -8,6 +8,7 @@
bootstrap="tests/bootstrap.php"
>
<php>
+ <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" /> 4.3 vs 5.1diff --git a/symfony/phpunit-bridge/4.3/phpunit.xml.dist b/symfony/phpunit-bridge/5.1/phpunit.xml.dist
index 5766779..40593c6 100644
--- a/symfony/phpunit-bridge/4.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/5.1/phpunit.xml.dist
@@ -8,12 +8,11 @@
bootstrap="tests/bootstrap.php"
>
<php>
- <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
- <server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
</php>
<testsuites>
@@ -31,4 +30,9 @@
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
</listeners>
+
+ <!-- Uncomment when adding extensions
+ <extensions>
+ </extensions>
+ -->
</phpunit> 5.1 vs 5.3diff --git a/symfony/phpunit-bridge/5.1/bin/phpunit b/symfony/phpunit-bridge/5.3/bin/phpunit
index 4d1ed05..692bacc 100755
--- a/symfony/phpunit-bridge/5.1/bin/phpunit
+++ b/symfony/phpunit-bridge/5.3/bin/phpunit
@@ -1,13 +1,23 @@
#!/usr/bin/env php
<?php
-if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
- echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
- exit(1);
+if (!ini_get('date.timezone')) {
+ ini_set('date.timezone', 'UTC');
}
-if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
- putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
-}
+if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
+ if (PHP_VERSION_ID >= 80000) {
+ require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
+ } else {
+ define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
+ require PHPUNIT_COMPOSER_INSTALL;
+ PHPUnit\TextUI\Command::main();
+ }
+} else {
+ if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+ echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+ exit(1);
+ }
-require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
+ require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
+}
diff --git a/symfony/phpunit-bridge/5.1/manifest.json b/symfony/phpunit-bridge/5.3/manifest.json
index a2ed0cb..724e481 100644
--- a/symfony/phpunit-bridge/5.1/manifest.json
+++ b/symfony/phpunit-bridge/5.3/manifest.json
@@ -6,9 +6,11 @@
"tests/": "tests/"
},
"gitignore": [
- ".phpunit",
".phpunit.result.cache",
"/phpunit.xml"
],
+ "conflict": {
+ "symfony/framework-bundle": "<5.4"
+ },
"aliases": ["simple-phpunit"]
}
diff --git a/symfony/phpunit-bridge/5.1/phpunit.xml.dist b/symfony/phpunit-bridge/5.3/phpunit.xml.dist
index 40593c6..23ea5cf 100644
--- a/symfony/phpunit-bridge/5.1/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/5.3/phpunit.xml.dist
@@ -2,17 +2,19 @@
<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="tests/bootstrap.php"
+ convertDeprecationsToExceptions="false"
>
<php>
+ <ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
- <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
</php>
<testsuites>
@@ -21,11 +23,11 @@
</testsuite>
</testsuites>
- <filter>
- <whitelist processUncoveredFilesFromWhitelist="true">
+ <coverage processUncoveredFiles="true">
+ <include>
<directory suffix=".php">src</directory>
- </whitelist>
- </filter>
+ </include>
+ </coverage>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
diff --git a/symfony/phpunit-bridge/5.1/post-install.txt b/symfony/phpunit-bridge/5.3/post-install.txt
index 2db39ab..e9da2a6 100644
--- a/symfony/phpunit-bridge/5.1/post-install.txt
+++ b/symfony/phpunit-bridge/5.3/post-install.txt
@@ -1,2 +1,3 @@
* Write test cases in the tests/ folder
- * Run php bin/phpunit
+ * Use MakerBundle's make:test command as a shortcut!
+ * Run the tests with php bin/phpunit
diff --git a/symfony/phpunit-bridge/5.1/tests/bootstrap.php b/symfony/phpunit-bridge/5.3/tests/bootstrap.php
index 3181151..47a5855 100644
--- a/symfony/phpunit-bridge/5.1/tests/bootstrap.php
+++ b/symfony/phpunit-bridge/5.3/tests/bootstrap.php
@@ -4,9 +4,7 @@ use Symfony\Component\Dotenv\Dotenv;
require dirname(__DIR__).'/vendor/autoload.php';
-if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
- require dirname(__DIR__).'/config/bootstrap.php';
-} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+if (method_exists(Dotenv::class, 'bootEnv')) {
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
}
5.3 vs 6.3diff --git a/symfony/phpunit-bridge/5.3/manifest.json b/symfony/phpunit-bridge/6.3/manifest.json
index 724e481..485aa5c 100644
--- a/symfony/phpunit-bridge/5.3/manifest.json
+++ b/symfony/phpunit-bridge/6.3/manifest.json
@@ -10,6 +10,7 @@
"/phpunit.xml"
],
"conflict": {
+ "phpunit/phpunit": "<9.6",
"symfony/framework-bundle": "<5.4"
},
"aliases": ["simple-phpunit"]
diff --git a/symfony/phpunit-bridge/5.3/phpunit.xml.dist b/symfony/phpunit-bridge/6.3/phpunit.xml.dist
index 23ea5cf..c76a655 100644
--- a/symfony/phpunit-bridge/5.3/phpunit.xml.dist
+++ b/symfony/phpunit-bridge/6.3/phpunit.xml.dist
@@ -14,7 +14,7 @@
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
- <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
+ <server name="SYMFONY_PHPUNIT_VERSION" value="9.6" />
</php>
<testsuites>
@@ -33,8 +33,6 @@
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
</listeners>
- <!-- Uncomment when adding extensions
<extensions>
</extensions>
- -->
</phpunit> 6.3 vs 7.3diff --git a/symfony/phpunit-bridge/6.3/.env.test b/symfony/phpunit-bridge/6.3/.env.test
deleted file mode 100644
index 9e7162f..0000000
--- a/symfony/phpunit-bridge/6.3/.env.test
+++ /dev/null
@@ -1,6 +0,0 @@
-# define your env variables for the test env here
-KERNEL_CLASS='App\Kernel'
-APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
diff --git a/symfony/phpunit-bridge/6.3/bin/phpunit b/symfony/phpunit-bridge/6.3/bin/phpunit
deleted file mode 100755
index 692bacc..0000000
--- a/symfony/phpunit-bridge/6.3/bin/phpunit
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (!ini_get('date.timezone')) {
- ini_set('date.timezone', 'UTC');
-}
-
-if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
- if (PHP_VERSION_ID >= 80000) {
- require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
- } else {
- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
- require PHPUNIT_COMPOSER_INSTALL;
- PHPUnit\TextUI\Command::main();
- }
-} else {
- if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
- echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
- exit(1);
- }
-
- require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
-}
diff --git a/symfony/phpunit-bridge/6.3/manifest.json b/symfony/phpunit-bridge/7.3/manifest.json
index 485aa5c..c7ff996 100644
--- a/symfony/phpunit-bridge/6.3/manifest.json
+++ b/symfony/phpunit-bridge/7.3/manifest.json
@@ -1,16 +1,22 @@
{
- "copy-from-recipe": {
- ".env.test": ".env.test",
- "bin/": "%BIN_DIR%/",
- "phpunit.xml.dist": "phpunit.xml.dist",
- "tests/": "tests/"
- },
- "gitignore": [
- ".phpunit.result.cache",
- "/phpunit.xml"
+ "add-lines": [
+ {
+ "file": "phpunit.dist.xml",
+ "content": " <server name=\"SYMFONY_DEPRECATIONS_HELPER\" value=\"disabled\" />",
+ "position": "after_target",
+ "target": "<php>",
+ "warn_if_missing": true
+ },
+ {
+ "file": "phpunit.dist.xml",
+ "content": " <bootstrap class=\"Symfony\\Bridge\\PhpUnit\\SymfonyExtension\">\n <parameter name=\"clock-mock-namespaces\" value=\"App\" />\n <parameter name=\"dns-mock-namespaces\" value=\"App\" />\n </bootstrap>",
+ "position": "after_target",
+ "target": "<extensions>",
+ "warn_if_missing": true
+ }
],
"conflict": {
- "phpunit/phpunit": "<9.6",
+ "phpunit/phpunit": "<10.0",
"symfony/framework-bundle": "<5.4"
},
"aliases": ["simple-phpunit"]
diff --git a/symfony/phpunit-bridge/6.3/phpunit.xml.dist b/symfony/phpunit-bridge/6.3/phpunit.xml.dist
deleted file mode 100644
index c76a655..0000000
--- a/symfony/phpunit-bridge/6.3/phpunit.xml.dist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
- backupGlobals="false"
- colors="true"
- bootstrap="tests/bootstrap.php"
- convertDeprecationsToExceptions="false"
->
- <php>
- <ini name="display_errors" value="1" />
- <ini name="error_reporting" value="-1" />
- <server name="APP_ENV" value="test" force="true" />
- <server name="SHELL_VERBOSITY" value="-1" />
- <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
- <server name="SYMFONY_PHPUNIT_VERSION" value="9.6" />
- </php>
-
- <testsuites>
- <testsuite name="Project Test Suite">
- <directory>tests</directory>
- </testsuite>
- </testsuites>
-
- <coverage processUncoveredFiles="true">
- <include>
- <directory suffix=".php">src</directory>
- </include>
- </coverage>
-
- <listeners>
- <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
- </listeners>
-
- <extensions>
- </extensions>
-</phpunit>
diff --git a/symfony/phpunit-bridge/6.3/post-install.txt b/symfony/phpunit-bridge/6.3/post-install.txt
deleted file mode 100644
index e9da2a6..0000000
--- a/symfony/phpunit-bridge/6.3/post-install.txt
+++ /dev/null
@@ -1,3 +0,0 @@
- * Write test cases in the tests/ folder
- * Use MakerBundle's make:test command as a shortcut!
- * Run the tests with php bin/phpunit
diff --git a/symfony/phpunit-bridge/6.3/tests/bootstrap.php b/symfony/phpunit-bridge/6.3/tests/bootstrap.php
deleted file mode 100644
index 47a5855..0000000
--- a/symfony/phpunit-bridge/6.3/tests/bootstrap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-use Symfony\Component\Dotenv\Dotenv;
-
-require dirname(__DIR__).'/vendor/autoload.php';
-
-if (method_exists(Dotenv::class, 'bootEnv')) {
- (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
-}
-
-if ($_SERVER['APP_DEBUG']) {
- umask(0000);
-} |
Hi! Rather than putting this code in a recipe (and thus userland), I would prefer if we could add a check in the Do you think such a check would be possible? |
@wouterj Please take a look at symfony/symfony#60645 |
This PR was merged into the 7.2 branch. Discussion ---------- [PhpUnitBridge] Skip bootstrap for PHPUnit >=10 | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix symfony/recipes#1425 (comment) | License | MIT As suggested by `@wouterj`, this will skip the bootstrap file that is automatically [required by the bridge's `composer.json`](https://github.com/symfony/symfony/blob/158dff8106151b943fad16f85bcf8b70b7bb1178/src/Symfony/Bridge/PhpUnit/composer.json#L32). I'm not sure whether to skip the entire file or only the part that registers the `DeprecationErrorHandler`. Commits ------- 36974c3 [PhpUnitBridge] Skip bootstrap for PHPUnit >=10
Closing as symfony/symfony#60645 was merged. |
As mentioned in #1401, the plan is to replace the deprecation reporting capabilities of PhpunitBridge with PHPUnit 11's built-in deprecation feature. Because the
DeprecationErrorHandler
is registered in a file required by the bridge'scomposer.json
, it is automatically enabled as soon as the package is required.This PR proposes disabling the helper for Symfony >= 7.3.
@wouterj Any thoughts on this?