Get DBAL from class property instead of Zend_Registry

This commit is contained in:
Michael RICOIS 2016-10-04 14:24:21 +02:00
parent 19668c044b
commit 54148e8aef

View File

@ -40,11 +40,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('jo.tabNaf5');
if ($id !== null) {
$queryBuilder->where('codNaf5 = :id');
@ -101,11 +97,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('insee.tabVilles');
if ($id !== null) {
$queryBuilder->where('codePostal = :id');
@ -165,11 +157,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('insee.departements');
if ($id !== null) {
$queryBuilder->where('numdep = :id');
@ -230,11 +218,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('jo.tabFJur');
if ($id !== null) {
$queryBuilder->where('code = :id');
@ -294,11 +278,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('jo.tabEvenements');
if ($id !== null) {
$queryBuilder->where('codeEven = :id');
@ -375,11 +355,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('jo.tabPays');
if ($id !== null) {
$queryBuilder->where('codPays3 = :id');
@ -423,11 +399,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('jo.tabDevises');
if ($id !== null) {
$queryBuilder->where('devIso = :id');
@ -488,11 +460,7 @@ class Catalog extends Scores_Ws_Server
// Data
try {
/**
* @var \Doctrine\DBAL\Connection $conn
*/
$conn = Zend_Registry::get('doctrine');
$queryBuilder = $conn->createQueryBuilder();
$queryBuilder = $this->conn->createQueryBuilder();
$queryBuilder->select($columnsDisplay)->from('jo.bodacc_fonctions');
if ($id !== null) {
$queryBuilder->where('codeFct = :id');