From 0dd30a3761de340d2d58a593ae33ae862111f8b7 Mon Sep 17 00:00:00 2001 From: SASSU Thomas <thomas.sassu5@etu.univ-lorraine.fr> Date: Mon, 2 Mar 2020 15:39:22 +0100 Subject: [PATCH] namespaces --- src/controleurs/ControleurPrincipal.php | 9 +++------ src/modeles/Apporte.php | 18 ------------------ src/modeles/Character.php | 2 +- src/modeles/Client.php | 6 +----- src/modeles/Company.php | 3 +-- src/modeles/Contient.php | 5 +---- src/modeles/Game.php | 5 +---- src/modeles/Genre.php | 2 +- src/modeles/Platform.php | 5 +---- src/modeles/Theme.php | 3 +-- src/vues/VuePrincipale.php | 4 +--- 11 files changed, 12 insertions(+), 50 deletions(-) delete mode 100644 src/modeles/Apporte.php diff --git a/src/controleurs/ControleurPrincipal.php b/src/controleurs/ControleurPrincipal.php index 480faac..1f386f3 100644 --- a/src/controleurs/ControleurPrincipal.php +++ b/src/controleurs/ControleurPrincipal.php @@ -1,14 +1,11 @@ <?php - - -namespace fridgie\controleurs; - - +namespace gp\modeles; +use \gp\vues\VuePrincipale as VuePrincipale; class ControleurPrincipal { public function afficherAccueil() { $tab = []; - $v = new \fridgie\vues\VuePrincipale($tab); + $v = new VuePrincipale($tab); $v->render('afficherAccueil'); } } \ No newline at end of file diff --git a/src/modeles/Apporte.php b/src/modeles/Apporte.php deleted file mode 100644 index 94788c9..0000000 --- a/src/modeles/Apporte.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php - - - - -use Illuminate\Database\Eloquent\Builder; -class Apporte extends \Illuminate\Database\Eloquent\Model -{ - protected $table = 'apporte'; - protected $primaryKey = ['idCli', 'idIngre', 'idEvent']; - public $timestamps = false; - public $incrementing = false; - - public function ingredient() - { - return $this->hasOne('\fridgie\modeles\Ingredient', 'idIngre'); - } -} diff --git a/src/modeles/Character.php b/src/modeles/Character.php index 3764d1a..3c9bf63 100644 --- a/src/modeles/Character.php +++ b/src/modeles/Character.php @@ -1,5 +1,5 @@ <?php - +namespace gp\modeles; use Illuminate\Database\Eloquent\Builder; class Character extends \Illuminate\Database\Eloquent\Model { diff --git a/src/modeles/Client.php b/src/modeles/Client.php index 39527ec..ec48fcd 100644 --- a/src/modeles/Client.php +++ b/src/modeles/Client.php @@ -1,9 +1,5 @@ <?php - - -namespace fridgie\modeles; - - +namespace gp\modeles; class Client extends \Illuminate\Database\Eloquent\Model { protected $table = 'client'; diff --git a/src/modeles/Company.php b/src/modeles/Company.php index 4cf669a..0d7ed57 100644 --- a/src/modeles/Company.php +++ b/src/modeles/Company.php @@ -1,6 +1,5 @@ <?php - - +namespace gp\modeles; class Company extends \Illuminate\Database\Eloquent\Model { protected $table = 'company'; diff --git a/src/modeles/Contient.php b/src/modeles/Contient.php index 55efc80..33d26d7 100644 --- a/src/modeles/Contient.php +++ b/src/modeles/Contient.php @@ -1,8 +1,5 @@ <?php - - -namespace fridgie\modeles; - +namespace gp\modeles; use Illuminate\Database\Eloquent\Builder; class Contient extends \Illuminate\Database\Eloquent\Model { diff --git a/src/modeles/Game.php b/src/modeles/Game.php index 897f70d..588c91f 100644 --- a/src/modeles/Game.php +++ b/src/modeles/Game.php @@ -1,8 +1,5 @@ <?php - - - - +namespace gp\modeles; use Illuminate\Database\Eloquent\Builder; class Game extends \Illuminate\Database\Eloquent\Model { diff --git a/src/modeles/Genre.php b/src/modeles/Genre.php index b42970d..da686ba 100644 --- a/src/modeles/Genre.php +++ b/src/modeles/Genre.php @@ -1,5 +1,5 @@ <?php - +namespace gp\modeles; use Illuminate\Database\Eloquent\Builder; class Genre extends \Illuminate\Database\Eloquent\Model { diff --git a/src/modeles/Platform.php b/src/modeles/Platform.php index 694471b..93fd3e9 100644 --- a/src/modeles/Platform.php +++ b/src/modeles/Platform.php @@ -1,8 +1,5 @@ <?php - - - - +namespace gp\modeles; use Illuminate\Database\Eloquent\Builder; class Platform extends \Illuminate\Database\Eloquent\Model { diff --git a/src/modeles/Theme.php b/src/modeles/Theme.php index d374d33..3828bb4 100644 --- a/src/modeles/Theme.php +++ b/src/modeles/Theme.php @@ -1,6 +1,5 @@ <?php - - +namespace gp\modeles; class Theme extends \Illuminate\Database\Eloquent\Model { protected $table = 'theme'; diff --git a/src/vues/VuePrincipale.php b/src/vues/VuePrincipale.php index 4a28a16..90df31e 100644 --- a/src/vues/VuePrincipale.php +++ b/src/vues/VuePrincipale.php @@ -1,8 +1,6 @@ <?php - -namespace fridgie\vues; - +namespace gp\vues; class VuePrincipale { -- GitLab