diff --git a/fluxRSS/model/FluxModel.php b/fluxRSS/model/FluxModel.php index 8c0a9e7..5f9f882 100755 --- a/fluxRSS/model/FluxModel.php +++ b/fluxRSS/model/FluxModel.php @@ -2,19 +2,17 @@ namespace model; +use DAL\Connection; use DAL\FluxGateway; use metier\Flux; +require_once "config/config.php"; class FluxModel { - private FluxGateway $gateway; - - public function __construct(FluxGateway $fluxGateway){ - $this->gateway = $fluxGateway; - } public function FindAllFlux(){ + $gateway = new FluxGateway(new Connection( $base, $login, $mdp)); $data = array(); - $result = $this->gateway->findAllFlux(); + $result = $gateway->findAllFlux(); foreach ($result as $row){ $data[] = new Flux($row['$flux']); @@ -22,33 +20,37 @@ class FluxModel return $data; } - public function addFlux(Flux $flux) - { + public function addFlux(Flux $flux){ + $gateway = new FluxGateway(new Connection( $base, $login, $mdp)); $data = $this->findFlux($flux); if ($data == array()) { - $this->gateway->addFlux($flux); + $gateway->addFlux($flux); } } public function addFluxBySrc(string $flux): Flux { + $gateway = new FluxGateway(new Connection( $base, $login, $mdp)); $newFlux = new Flux($flux); - $this->gateway->addFlux($newFlux); + $gateway->addFlux($newFlux); return $newFlux; } public function removeFlux(Flux $flux){ - $this->gateway->removeFlux($flux); + $gateway = new FluxGateway(new Connection( $base, $login, $mdp)); + $gateway->removeFlux($flux); } public function removeFluxBySrc(string $flux): Flux { + $gateway = new FluxGateway(new Connection( $base, $login, $mdp)); $newFlux = new Flux($flux); - $this->gateway->removeFlux($newFlux); + $gateway->removeFlux($newFlux); return $newFlux; } public function findFlux(Flux $flux){ + $gateway = new FluxGateway(new Connection( $base, $login, $mdp)); $data = array(); - $result = $this->gateway->findFlux($flux); + $result = $gateway->findFlux($flux); foreach ($result as $row){ $data[] = new Flux($row['$flux']); @@ -57,8 +59,9 @@ class FluxModel } public function findFluxBySrc(string $flux){ + $gateway = new FluxGateway(new Connection( $base, $login, $mdp)); $data = array(); - $result = $this->gateway->findFluxBySrc($flux); + $result = $gateway->findFluxBySrc($flux); foreach ($result as $row){ $data[] = new Flux($row['$flux']);