Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
d82b6aa2
Unverified
Commit
d82b6aa2
authored
Oct 28, 2019
by
Marco Pivetta
Committed by
GitHub
Oct 28, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3706 from dmaicher/cmd-exit-code
add missing exit codes to ensure Symfony 5 compatibility
parents
ce401dd3
2f559255
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
ImportCommand.php
lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
+2
-2
RunSqlCommand.php
lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
+2
-0
RunSqlCommandTest.php
...s/Doctrine/Tests/DBAL/Tools/Console/RunSqlCommandTest.php
+2
-1
No files found.
lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
View file @
d82b6aa2
...
@@ -58,7 +58,7 @@ EOT
...
@@ -58,7 +58,7 @@ EOT
$fileNames
=
$input
->
getArgument
(
'file'
);
$fileNames
=
$input
->
getArgument
(
'file'
);
if
(
$fileNames
===
null
)
{
if
(
$fileNames
===
null
)
{
return
null
;
return
0
;
}
}
foreach
((
array
)
$fileNames
as
$fileName
)
{
foreach
((
array
)
$fileNames
as
$fileName
)
{
...
@@ -133,6 +133,6 @@ EOT
...
@@ -133,6 +133,6 @@ EOT
}
}
}
}
return
null
;
return
0
;
}
}
}
}
lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
View file @
d82b6aa2
...
@@ -68,5 +68,7 @@ EOT
...
@@ -68,5 +68,7 @@ EOT
}
}
$output
->
write
(
Dumper
::
dump
(
$resultSet
,
(
int
)
$depth
));
$output
->
write
(
Dumper
::
dump
(
$resultSet
,
(
int
)
$depth
));
return
0
;
}
}
}
}
tests/Doctrine/Tests/DBAL/Tools/Console/RunSqlCommandTest.php
View file @
d82b6aa2
...
@@ -70,10 +70,11 @@ class RunSqlCommandTest extends TestCase
...
@@ -70,10 +70,11 @@ class RunSqlCommandTest extends TestCase
{
{
$this
->
expectConnectionFetchAll
();
$this
->
expectConnectionFetchAll
();
$this
->
commandTester
->
execute
([
$
exitCode
=
$
this
->
commandTester
->
execute
([
'command'
=>
$this
->
command
->
getName
(),
'command'
=>
$this
->
command
->
getName
(),
'sql'
=>
'SELECT 1'
,
'sql'
=>
'SELECT 1'
,
]);
]);
$this
->
assertSame
(
0
,
$exitCode
);
self
::
assertRegExp
(
'@int.*1.*@'
,
$this
->
commandTester
->
getDisplay
());
self
::
assertRegExp
(
'@int.*1.*@'
,
$this
->
commandTester
->
getDisplay
());
self
::
assertRegExp
(
'@array.*1.*@'
,
$this
->
commandTester
->
getDisplay
());
self
::
assertRegExp
(
'@array.*1.*@'
,
$this
->
commandTester
->
getDisplay
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment