Skip to content

Commit a3366c2

Browse files
committed
Merge branch '2.8' into 3.0
2 parents 1c3a848 + 91181f0 commit a3366c2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ protected function getScript($request)
185185
$code = <<<EOF
186186
<?php
187187
188-
error_reporting($errorReporting & ~E_USER_DEPRECATED);
188+
error_reporting($errorReporting);
189189
190190
if ('$autoloader') {
191191
require_once '$autoloader';

Command/ContainerDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
118118
$helper = new DescriptorHelper();
119119
$options['format'] = $input->getOption('format');
120120
$options['raw_text'] = $input->getOption('raw');
121-
$options['output'] = $output;
121+
$options['output'] = $io;
122122
$helper->describe($output, $object, $options);
123123

124124
if (!$input->getArgument('name') && $input->isInteractive()) {

0 commit comments

Comments
 (0)