bug #24864 Have weak_vendors ignore deprecations from outside (greg0ire)

nicolas-grekas · nicolas-grekas · commit f33382da34ef · 2018-01-21T19:49:14.000+01:00
This PR was merged into the 3.3 branch. Discussion ---------- Have weak_vendors ignore deprecations from outside phar:// and eval() can execute code that may or may not come from the vendors. | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | not yet | Fixed tickets | #24853 | License | MIT I haven't managed to get the phar test to pass yet, but before I do, is it ok for me to commit a test phar in Symfony? I'm thinking trust issues? Although the phar is almost plain text. ~~Next, I'm stuck because it looks like symfony does not know how to load classes anymore... should I somehow load `vendor/autoload.php` from the phar or something like that?~~ solved, had nothing to do with that. Commits ------- 9ce0ae2 Have weak_vendors ignore deprecations from outside
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -75,9 +75,12 @@ public static function register($mode = 0)
                     }
                 }
             }
-            $path = realpath($path) ?: $path;
+            $realPath = realpath($path);
+            if (false === $realPath && '-' !== $path && 'Standard input code' !== $path) {
+                return true;
+            }
             foreach ($vendors as $vendor) {
-                if (0 === strpos($path, $vendor) && false !== strpbrk(substr($path, strlen($vendor), 1), '/'.DIRECTORY_SEPARATOR)) {
+                if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, strlen($vendor), 1), '/'.DIRECTORY_SEPARATOR)) {
                     return true;
                 }
             }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecation.phar b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecation.phar
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecation/deprecation.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/deprecation/deprecation.php
@@ -0,0 +1,3 @@
+<?php
+
+@trigger_error('I come from… afar! :D', E_USER_DEPRECATED);
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_phar.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_phar.php
@@ -0,0 +1,4 @@
+<?php
+
+$phar = new Phar(__DIR__.DIRECTORY_SEPARATOR.'deprecation.phar', 0, 'deprecation.phar');
+$phar->buildFromDirectory(__DIR__.DIRECTORY_SEPARATOR.'deprecation');
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Test DeprecationErrorHandler in weak vendors mode on eval()'d deprecation
+--FILE--
+<?php
+
+putenv('SYMFONY_DEPRECATIONS_HELPER=weak_vendors');
+putenv('ANSICON');
+putenv('ConEmuANSI');
+putenv('TERM');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = dirname($vendor);
+}
+define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
+require PHPUNIT_COMPOSER_INSTALL;
+require_once __DIR__.'/../../bootstrap.php';
+eval("@trigger_error('who knows where I come from?', E_USER_DEPRECATED);")
+
+?>
+--EXPECTF--
+
+Other deprecation notices (1)
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Test DeprecationErrorHandler in weak vendors mode on eval()'d deprecation
+The phar can be regenerated by running php src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/generate_phar.php
+--FILE--
+<?php
+
+putenv('SYMFONY_DEPRECATIONS_HELPER=weak_vendors');
+putenv('ANSICON');
+putenv('ConEmuANSI');
+putenv('TERM');
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = dirname($vendor);
+}
+define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
+require PHPUNIT_COMPOSER_INSTALL;
+require_once __DIR__.'/../../bootstrap.php';
+\Phar::loadPhar(__DIR__.'/deprecation.phar', 'deprecation.phar');
+include 'phar://deprecation.phar/deprecation.php';
+
+?>
+--EXPECTF--
+
+Other deprecation notices (1)

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,12 @@ public static function register($mode = 0)`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`- $path = realpath($path) ?: $path;`
	`78`	`+ $realPath = realpath($path);`
	`79`	`+ if (false === $realPath && '-' !== $path && 'Standard input code' !== $path) {`
	`80`	`+ return true;`
	`81`	`+ }`
`79`	`82`	`foreach ($vendors as $vendor) {`
`80`		`- if (0 === strpos($path, $vendor) && false !== strpbrk(substr($path, strlen($vendor), 1), '/'.DIRECTORY_SEPARATOR)) {`
	`83`	`+ if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, strlen($vendor), 1), '/'.DIRECTORY_SEPARATOR)) {`
`81`	`84`	`return true;`
`82`	`85`	`}`
`83`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+@trigger_error('I come from… afar! :D', E_USER_DEPRECATED);`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php
++
 +$phar = new Phar(__DIR__.DIRECTORY_SEPARATOR.'deprecation.phar', 0, 'deprecation.phar');
 +$phar->buildFromDirectory(__DIR__.DIRECTORY_SEPARATOR.'deprecation');