Development

Changeset 32438

You must first sign up to be able to contribute.

Changeset 32438

Show
Ignore:
Timestamp:
04/04/11 00:00:05 (2 years ago)
Author:
fabien
Message:

Merge branch 'master' of git://github.com/symfony/symfony

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.0/src/Symfony/Component/Console/Tester/ApplicationTester.php

    r32226 r32438  
    2222{ 
    2323    private $application; 
    24     private $display; 
    2524    private $input; 
    2625    private $output; 
    …… 
    4746     * @param array $input   An array of arguments and options 
    4847     * @param array $options An array of options 
     48     * 
     49     * @return integer The command exit code 
    4950     */ 
    5051    public function run(array $input, $options = array()) 
    …… 
    6364        } 
    6465 
    65         $this->application->run($this->input, $this->output); 
    66  
    67         rewind($this->output->getStream()); 
    68  
    69         return $this->display = stream_get_contents($this->output->getStream()); 
     66        return $this->application->run($this->input, $this->output); 
    7067    } 
    7168 
    …… 
    7774    public function getDisplay() 
    7875    { 
    79         return $this->display; 
     76        rewind($this->output->getStream()); 
     77 
     78        return stream_get_contents($this->output->getStream()); 
    8079    } 
    8180