Skip to content

Commit 64c0388

Browse files
committed
Fixing namespaces
1 parent b224a62 commit 64c0388

14 files changed

+54
-30
lines changed

src/Mouf/Database/QueryWriter/Column.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Column implements SelectExpressionInterface {
1414
/**
1515
* Optional table name
1616
*
17-
* @Property
17+
* @Important
1818
* @var string
1919
*/
2020
public $tableName;
@@ -23,16 +23,14 @@ class Column implements SelectExpressionInterface {
2323
* The name of the column.
2424
* Use "*" to retrieve all columns.
2525
*
26-
* @Property
27-
* @Compulsory
26+
* @Important
2827
* @var string
2928
*/
3029
public $columnName;
3130

3231
/**
3332
* Optional alias name
3433
*
35-
* @Property
3634
* @var string
3735
*/
3836
public $alias;

src/Mouf/Database/QueryWriter/Filters/AndFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The AndFilter class translates into an "AND" SQL statement between many filters.
2426
*
@@ -64,10 +66,10 @@ public function setEnableCondition($enableCondition) {
6466
/**
6567
* Returns the SQL of the filter (the SQL WHERE clause).
6668
*
67-
* @param \DB_ConnectionInterface $dbConnection
69+
* @param ConnectionInterface $dbConnection
6870
* @return string
6971
*/
70-
public function toSql(\DB_ConnectionInterface $dbConnection) {
72+
public function toSql(ConnectionInterface $dbConnection) {
7173
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
7274
return "";
7375
}

src/Mouf/Database/QueryWriter/Filters/BetweenFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The BetweenFilter class translates into an "BETWEEN" SQL statement.
2426
*
@@ -106,10 +108,10 @@ public function BetweenFilter($tableName=null, $columnName=null, $value1=null, $
106108
/**
107109
* Returns the SQL of the filter (the SQL WHERE clause).
108110
*
109-
* @param \DB_ConnectionInterface $dbConnection
111+
* @param ConnectionInterface $dbConnection
110112
* @return string
111113
*/
112-
public function toSql(\DB_ConnectionInterface $dbConnection) {
114+
public function toSql(ConnectionInterface $dbConnection) {
113115
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
114116
return "";
115117
}

src/Mouf/Database/QueryWriter/Filters/DifferentFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The DifferentFilter class translates into an "<>" SQL statement (or a "IS NOT NULL" statement if the value to compare is null).
2426
*
@@ -92,10 +94,10 @@ public function DifferentFilter($tableName=null, $columnName=null, $value=null)
9294
/**
9395
* Returns the SQL of the filter (the SQL WHERE clause).
9496
*
95-
* @param \DB_ConnectionInterface $dbConnection
97+
* @param ConnectionInterface $dbConnection
9698
* @return string
9799
*/
98-
public function toSql(\DB_ConnectionInterface $dbConnection) {
100+
public function toSql(ConnectionInterface $dbConnection) {
99101
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
100102
return "";
101103
}

src/Mouf/Database/QueryWriter/Filters/EqualFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The EqualFilter class translates into an "=" SQL statement (or a "IS NULL" statement if the value to compare is null).
2426
*
@@ -91,10 +93,10 @@ public function EqualFilter($tableName=null, $columnName=null, $value=null) {
9193
/**
9294
* Returns the SQL of the filter (the SQL WHERE clause).
9395
*
94-
* @param \DB_ConnectionInterface $dbConnection
96+
* @param ConnectionInterface $dbConnection
9597
* @return string
9698
*/
97-
public function toSql(\DB_ConnectionInterface $dbConnection) {
99+
public function toSql(ConnectionInterface $dbConnection) {
98100
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
99101
return "";
100102
}

src/Mouf/Database/QueryWriter/Filters/GreaterFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The GreaterFilter class translates into an ">" SQL statement.
2426
*
@@ -91,10 +93,10 @@ public function GreaterFilter($tableName=null, $columnName=null, $value=null) {
9193
/**
9294
* Returns the SQL of the filter (the SQL WHERE clause).
9395
*
94-
* @param \DB_ConnectionInterface $dbConnection
96+
* @param ConnectionInterface $dbConnection
9597
* @return string
9698
*/
97-
public function toSql(\DB_ConnectionInterface $dbConnection) {
99+
public function toSql(ConnectionInterface $dbConnection) {
98100
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
99101
return "";
100102
}

src/Mouf/Database/QueryWriter/Filters/GreaterOrEqualFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The GreaterOrEqualFilter class translates into an ">=" SQL statement.
2426
*
@@ -92,10 +94,10 @@ public function GreaterOrEqualFilter($tableName=null, $columnName=null, $value=n
9294
/**
9395
* Returns the SQL of the filter (the SQL WHERE clause).
9496
*
95-
* @param \DB_ConnectionInterface $dbConnection
97+
* @param ConnectionInterface $dbConnection
9698
* @return string
9799
*/
98-
public function toSql(\DB_ConnectionInterface $dbConnection) {
100+
public function toSql(ConnectionInterface $dbConnection) {
99101
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
100102
return "";
101103
}

src/Mouf/Database/QueryWriter/Filters/InFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The InFilter class translates into an "IN" SQL statement.
2426
*
@@ -92,10 +94,10 @@ public function InFilter($tableName=null, $columnName=null, $values=array()) {
9294
/**
9395
* Returns the SQL of the filter (the SQL WHERE clause).
9496
*
95-
* @param \DB_ConnectionInterface $dbConnection
97+
* @param ConnectionInterface $dbConnection
9698
* @return string
9799
*/
98-
public function toSql(\DB_ConnectionInterface $dbConnection) {
100+
public function toSql(ConnectionInterface $dbConnection) {
99101
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
100102
return "";
101103
}

src/Mouf/Database/QueryWriter/Filters/LessFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The LessFilter class translates into an "<" SQL statement.
2426
*
@@ -91,10 +93,10 @@ public function LessFilter($tableName=null, $columnName=null, $value=null) {
9193
/**
9294
* Returns the SQL of the filter (the SQL WHERE clause).
9395
*
94-
* @param \DB_ConnectionInterface $dbConnection
96+
* @param ConnectionInterface $dbConnection
9597
* @return string
9698
*/
97-
public function toSql(\DB_ConnectionInterface $dbConnection) {
99+
public function toSql(ConnectionInterface $dbConnection) {
98100
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
99101
return "";
100102
}

src/Mouf/Database/QueryWriter/Filters/LessOrEqualFilter.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
namespace Mouf\Database\QueryWriter\Filters;
2121

22+
use Mouf\Database\DBConnection\ConnectionInterface;
23+
2224
/**
2325
* The LessOrEqualFilter class translates into an "<=" SQL statement (or a "IS NULL" statement if the value to compare is null).
2426
*
@@ -91,10 +93,10 @@ public function LessOrEqualFilter($tableName=null, $columnName=null, $value=null
9193
/**
9294
* Returns the SQL of the filter (the SQL WHERE clause).
9395
*
94-
* @param \DB_ConnectionInterface $dbConnection
96+
* @param ConnectionInterface $dbConnection
9597
* @return string
9698
*/
97-
public function toSql(\DB_ConnectionInterface $dbConnection) {
99+
public function toSql(ConnectionInterface $dbConnection) {
98100
if ($this->enableCondition != null && !$this->enableCondition->isOk()) {
99101
return "";
100102
}

0 commit comments

Comments
 (0)