[2.5] cleanup deprecated uses

nicolas-grekas · nicolas-grekas · commit 1e7c122a0996 · 2015-01-05T09:51:41.000+01:00
diff --git a/Tests/Helper/LegacyDialogHelperTest.php b/Tests/Helper/LegacyDialogHelperTest.php
@@ -17,8 +17,13 @@
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Output\StreamOutput;
 
-class DialogHelperTest extends \PHPUnit_Framework_TestCase
+class LegacyDialogHelperTest extends \PHPUnit_Framework_TestCase
 {
+    public function setUp()
+    {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+    }
+
     public function testSelect()
     {
         $dialog = new DialogHelper();
diff --git a/Tests/Helper/LegacyProgressHelperTest.php b/Tests/Helper/LegacyProgressHelperTest.php
@@ -14,8 +14,13 @@
 use Symfony\Component\Console\Helper\ProgressHelper;
 use Symfony\Component\Console\Output\StreamOutput;
 
-class ProgressHelperTest extends \PHPUnit_Framework_TestCase
+class LegacyProgressHelperTest extends \PHPUnit_Framework_TestCase
 {
+    public function setUp()
+    {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+    }
+
     public function testAdvance()
     {
         $progress = new ProgressHelper();
diff --git a/Tests/Helper/LegacyTableHelperTest.php b/Tests/Helper/LegacyTableHelperTest.php
@@ -14,12 +14,13 @@
 use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Output\StreamOutput;
 
-class TableHelperTest extends \PHPUnit_Framework_TestCase
+class LegacyTableHelperTest extends \PHPUnit_Framework_TestCase
 {
     protected $stream;
 
     protected function setUp()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->stream = fopen('php://memory', 'r+');
     }
 
diff --git a/Tests/Input/StringInputTest.php b/Tests/Input/StringInputTest.php
@@ -39,8 +39,16 @@ public function testInputOptionWithGivenString()
         $input = new StringInput('--foo=bar');
         $input->bind($definition);
         $this->assertEquals('bar', $input->getOption('foo'));
+    }
+
+    public function testLegacyInputOptionDefinitionInConstructor()
+    {
+        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+
+        $definition = new InputDefinition(
+            array(new InputOption('foo', null, InputOption::VALUE_REQUIRED))
+        );
 
-        // definition in constructor
         $input = new StringInput('--foo=bar', $definition);
         $this->assertEquals('bar', $input->getOption('foo'));
     }

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,13 @@`
`17`	`17`	`use Symfony\Component\Console\Helper\FormatterHelper;`
`18`	`18`	`use Symfony\Component\Console\Output\StreamOutput;`
`19`	`19`
`20`		`-class DialogHelperTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class LegacyDialogHelperTest extends \PHPUnit_Framework_TestCase`
`21`	`21`	`{`
	`22`	`+ public function setUp()`
	`23`	`+ {`
	`24`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
	`25`	`+ }`
	`26`	`+`
`22`	`27`	`public function testSelect()`
`23`	`28`	`{`
`24`	`29`	`$dialog = new DialogHelper();`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,13 @@`
`14`	`14`	`use Symfony\Component\Console\Helper\ProgressHelper;`
`15`	`15`	`use Symfony\Component\Console\Output\StreamOutput;`
`16`	`16`
`17`		`-class ProgressHelperTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class LegacyProgressHelperTest extends \PHPUnit_Framework_TestCase`
`18`	`18`	`{`
	`19`	`+ public function setUp()`
	`20`	`+ {`
	`21`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`public function testAdvance()`
`20`	`25`	`{`
`21`	`26`	`$progress = new ProgressHelper();`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,13 @@`
`14`	`14`	`use Symfony\Component\Console\Helper\TableHelper;`
`15`	`15`	`use Symfony\Component\Console\Output\StreamOutput;`
`16`	`16`
`17`		`-class TableHelperTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class LegacyTableHelperTest extends \PHPUnit_Framework_TestCase`
`18`	`18`	`{`
`19`	`19`	`protected $stream;`
`20`	`20`
`21`	`21`	`protected function setUp()`
`22`	`22`	`{`
	`23`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`23`	`24`	`$this->stream = fopen('php://memory', 'r+');`
`24`	`25`	`}`
`25`	`26`