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
bffed619
Commit
bffed619
authored
Nov 15, 2013
by
till
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enhancement: CS fixes
* license * author tags * doc blocks * new lines
parent
11d160bd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
1 deletion
+36
-1
Connection.php
lib/Doctrine/DBAL/Connection.php
+1
-0
MysqliConnection.php
lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
+1
-0
PingableConnection.php
lib/Doctrine/DBAL/Driver/PingableConnection.php
+32
-0
ConnectionTest.php
tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
+2
-1
No files found.
lib/Doctrine/DBAL/Connection.php
View file @
bffed619
...
@@ -1507,6 +1507,7 @@ class Connection implements DriverConnection
...
@@ -1507,6 +1507,7 @@ class Connection implements DriverConnection
try
{
try
{
$this
->
query
(
$this
->
_platform
->
getDummySelectSQL
());
$this
->
query
(
$this
->
_platform
->
getDummySelectSQL
());
return
true
;
return
true
;
}
catch
(
DBALException
$e
)
{
}
catch
(
DBALException
$e
)
{
// As the underlying connection is unset, the next query will connect again thanks to the lazyness
// As the underlying connection is unset, the next query will connect again thanks to the lazyness
...
...
lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
View file @
bffed619
...
@@ -24,6 +24,7 @@ use \Doctrine\DBAL\Driver\PingableConnection;
...
@@ -24,6 +24,7 @@ use \Doctrine\DBAL\Driver\PingableConnection;
/**
/**
* @author Kim Hemsø Rasmussen <kimhemsoe@gmail.com>
* @author Kim Hemsø Rasmussen <kimhemsoe@gmail.com>
* @author Till Klampaeckel <till@php.net>
*/
*/
class
MysqliConnection
implements
Connection
,
PingableConnection
class
MysqliConnection
implements
Connection
,
PingableConnection
{
{
...
...
lib/Doctrine/DBAL/Driver/PingableConnection.php
View file @
bffed619
<?php
<?php
/*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>.
*/
namespace
Doctrine\DBAL\Driver
;
namespace
Doctrine\DBAL\Driver
;
/**
* An interface for connections which support a "native" ping method.
*
* @link www.doctrine-project.org
* @since 2.5
* @author Till Klampaeckel <till@php.net>
* @author Benjamin Eberlei <kontakt@beberlei.de>
*/
interface
PingableConnection
interface
PingableConnection
{
{
/**
* Pings the database server to determine if the connection is still
* available. Return true/false based on if that was successful or not.
*
* @return bool
*/
public
function
ping
();
public
function
ping
();
}
}
\ No newline at end of file
tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
View file @
bffed619
...
@@ -193,6 +193,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
...
@@ -193,6 +193,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
{
{
try
{
try
{
$this
->
_conn
->
transactional
(
function
(
$conn
)
{
$this
->
_conn
->
transactional
(
function
(
$conn
)
{
/* @var $conn \Doctrine\DBAL\Connection */
$conn
->
executeQuery
(
$conn
->
getDatabasePlatform
()
->
getDummySelectSQL
());
$conn
->
executeQuery
(
$conn
->
getDatabasePlatform
()
->
getDummySelectSQL
());
throw
new
\RuntimeException
(
"Ooops!"
);
throw
new
\RuntimeException
(
"Ooops!"
);
});
});
...
@@ -204,7 +205,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
...
@@ -204,7 +205,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
public
function
testTransactional
()
public
function
testTransactional
()
{
{
$this
->
_conn
->
transactional
(
function
(
$conn
)
{
$this
->
_conn
->
transactional
(
function
(
$conn
)
{
/* @var $conn Connection */
/* @var $conn
\Doctrine\DBAL\
Connection */
$conn
->
executeQuery
(
$conn
->
getDatabasePlatform
()
->
getDummySelectSQL
());
$conn
->
executeQuery
(
$conn
->
getDatabasePlatform
()
->
getDummySelectSQL
());
});
});
}
}
...
...
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