Ensure DeprecationErrorHandler::collectDeprecations() is triggered if…

… SYMFONY_DEPRECATIONS_SERIALIZE is set
symfony · alexpott · Oct 24, 2017 · Oct 26, 2017 · Oct 26, 2017 · f337a667a639764df1e42ab21d0f0d28b27fd1f4
commit f337a667a639764df1e42ab21d0f0d28b27fd1f4
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -262,6 +262,7 @@ public function endTest($test, $time)
        if ($this->runsInSeparateProcess) {
            $deprecations = file_get_contents($this->runsInSeparateProcess);
            unlink($this->runsInSeparateProcess);
+            putenv('SYMFONY_DEPRECATIONS_SERIALIZE=');
            foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
                if ($deprecation[0]) {
                    trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);

diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -12,12 +12,15 @@
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;

+// Detect if we need to serialize deprecations to a file.
+if ($file = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
+    DeprecationErrorHandler::collectDeprecations($file);
+
+    return;
+}
+
 // Detect if we're loaded by an actual run of phpunit
 if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists('PHPUnit_TextUI_Command', false) && !class_exists('PHPUnit\TextUI\Command', false)) {
-    if ($ser = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
-        DeprecationErrorHandler::collectDeprecations($ser);
-    }
-
    return;
 }
-Original file line number
+Diff line change
@@ -262,6 +262,7 @@ public function endTest($test, $time)
             if ($this->runsInSeparateProcess) {
                 $deprecations = file_get_contents($this->runsInSeparateProcess);
                 unlink($this->runsInSeparateProcess);
+                putenv('SYMFONY_DEPRECATIONS_SERIALIZE=');
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            nicolas-grekas
  

      

      

      


        Oct 26, 2017


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      the = should be removed, to really remove the env var (the = makes it the empty string, where we want to delete it, isn't it?)
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
                 foreach ($deprecations ? unserialize($deprecations) : array() as $deprecation) {
                     if ($deprecation[0]) {
                         trigger_error(serialize(array('deprecation' => $deprecation[1], 'class' => $className, 'method' => $test->getName(false))), E_USER_DEPRECATED);
-          Expand Down