diff --git a/GamePedia/composer.lock b/GamePedia/composer.lock
index 4bbf2c8aa7a6582ebf1d996c6ad6e8f8b45c5336..8295e51e26eb19a87583ed5968cc82a8577c63f3 100644
--- a/GamePedia/composer.lock
+++ b/GamePedia/composer.lock
@@ -1,27 +1,27 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "cc18e66e95cadfdfa2cb91becd1b4524",
"packages": [
{
"name": "doctrine/inflector",
- "version": "v1.2.0",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
- "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"
+ "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462",
- "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
+ "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^6.2"
@@ -29,7 +29,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -42,6 +42,10 @@
"MIT"
],
"authors": [
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
@@ -50,10 +54,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
@@ -71,7 +71,7 @@
"singularize",
"string"
],
- "time": "2017-07-22T12:18:28+00:00"
+ "time": "2019-10-30T19:59:35+00:00"
},
{
"name": "illuminate/container",
@@ -632,36 +632,42 @@
},
{
"name": "symfony/translation",
- "version": "v3.4.38",
+ "version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "1eb074e0bd94939a30dd14dbecf7a92b165cea34"
+ "reference": "0a19a77fba20818a969ef03fdaf1602de0546353"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/1eb074e0bd94939a30dd14dbecf7a92b165cea34",
- "reference": "1eb074e0bd94939a30dd14dbecf7a92b165cea34",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/0a19a77fba20818a969ef03fdaf1602de0546353",
+ "reference": "0a19a77fba20818a969ef03fdaf1602de0546353",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8",
- "symfony/polyfill-mbstring": "~1.0"
+ "php": "^7.1.3",
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/translation-contracts": "^1.1.6|^2"
},
"conflict": {
- "symfony/config": "<2.8",
+ "symfony/config": "<3.4",
"symfony/dependency-injection": "<3.4",
+ "symfony/http-kernel": "<4.4",
"symfony/yaml": "<3.4"
},
+ "provide": {
+ "symfony/translation-implementation": "1.0"
+ },
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.8|~3.0|~4.0",
- "symfony/dependency-injection": "~3.4|~4.0",
- "symfony/finder": "~2.8|~3.0|~4.0",
- "symfony/http-kernel": "~3.4|~4.0",
- "symfony/intl": "^2.8.18|^3.2.5|~4.0",
- "symfony/var-dumper": "~3.4|~4.0",
- "symfony/yaml": "~3.4|~4.0"
+ "symfony/config": "^3.4|^4.0|^5.0",
+ "symfony/console": "^3.4|^4.0|^5.0",
+ "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+ "symfony/finder": "~2.8|~3.0|~4.0|^5.0",
+ "symfony/http-kernel": "^4.4",
+ "symfony/intl": "^3.4|^4.0|^5.0",
+ "symfony/service-contracts": "^1.1.2|^2",
+ "symfony/yaml": "^3.4|^4.0|^5.0"
},
"suggest": {
"psr/log-implementation": "To use logging capability in translator",
@@ -671,7 +677,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.4-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -698,7 +704,64 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2020-02-04T07:22:30+00:00"
+ "time": "2020-02-04T09:32:40+00:00"
+ },
+ {
+ "name": "symfony/translation-contracts",
+ "version": "v2.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/translation-contracts.git",
+ "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8cc682ac458d75557203b2f2f14b0b92e1c744ed",
+ "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2.5"
+ },
+ "suggest": {
+ "symfony/translation-implementation": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Contracts\\Translation\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Generic abstractions related to translation",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
+ ],
+ "time": "2019-11-18T17:27:11+00:00"
}
],
"packages-dev": [],
diff --git a/GamePedia/src/controleurs/ControleurScript.php b/GamePedia/src/controleurs/ControleurScript.php
index b1568639b5f7eef5e9c480054fa133959a9c9492..31af777de471d3892fe61d1d8c5a26a639ba06f5 100644
--- a/GamePedia/src/controleurs/ControleurScript.php
+++ b/GamePedia/src/controleurs/ControleurScript.php
@@ -78,44 +78,45 @@ class ControleurScript
*/
public function td2(){
- $q1 = $this->nameDeckByGame(12342)->get();
+ $q = $this->nameDeckByGame(12342)->get();
echo ("<p>---------------------------------------------<br>" .
"<p>(name, deck) des personnages du jeu 12342<br>" .
"<p>---------------------------------------------<br>");
- foreach ($q1 as $item) {
+ foreach ($q as $item) {
echo "<p>nom :$item->name , deck : $item->deck</p>";
}
- $q2 = Game::where('name','like',"Mario%")->get();
+ $q = Game::where('name','like',"Mario%")->get();
echo ("<p>---------------------------------------------<br>" .
"<p>les personnages des jeux dont le nom (du jeu) débute par 'Mario<br>" .
"<p>---------------------------------------------<br>");
- foreach ($q2 as $game) {
+ foreach ($q as $game) {
echo "<p>Characters from :$game->name</p>";
$list = $game->characters()->get();
foreach ($list as $char)
echo "<p>nom : $char->name</p>";
}
- $q3 = Company::where("name", "like", "%sony%")->get();
+ $q = Company::where("name", "like", "%sony%")->get();
echo ("<p>---------------------------------------------<br>" .
"<p>les jeux développés par une compagnie dont le nom contient 'Sony<br>" .
"<p>---------------------------------------------<br>");
- foreach ($q3 as $company) {
+ foreach ($q as $company) {
echo "<p>Games from :$company->name</p>";
$list = $company->games()->get();
foreach ($list as $game)
echo "<p>nom : $game->name</p>";
}
- $q2 = Game::where('name','like',"%Mario%")->get();
+ $q = Game::where('name','like',"%Mario%")->get();
echo ("<p>---------------------------------------------<br>" .
"<p>le rating initial (indiquer le rating board) des jeux dont le nom contient Mario<br>" .
"<p>---------------------------------------------<br>");
- foreach ($q2 as $game) {
+ foreach ($q as $game) {
$list = $game->ratings()->get();
+ echo "<p>From $game->name : </p>";
foreach ($list as $rate)
- echo "<p>id rating_board : $rate->rating_board_id, name : {$rate->rating_boards()->first()->name}</p>";
+ echo "<p>id rating_board : $rate->rating_board_id, name : {$rate->rating_board()->first()->name}</p>";
}
}
diff --git a/GamePedia/src/modeles/Character.php b/GamePedia/src/modeles/Character.php
index 2daad7f86e25b22cebb0d39393893effee6c3283..be7725bce2456fc4597b509b6f1bf2b40f0dcba3 100644
--- a/GamePedia/src/modeles/Character.php
+++ b/GamePedia/src/modeles/Character.php
@@ -8,6 +8,6 @@ class Character extends \Illuminate\Database\Eloquent\Model
public $timestamps = false ;
function games(){
- return $this->BelongsToMany('gp\modeles\Game', 'game2character','character_id');
+ return $this->BelongsToMany('gp\modeles\Game', 'game2character','character_id', 'game_id');
}
}
\ No newline at end of file
diff --git a/GamePedia/src/modeles/Game.php b/GamePedia/src/modeles/Game.php
index 1743136d9724f0260b0d39786592813cbf4b9763..11f8781d33e2cc9039eae521176a9f74aca4ee02 100644
--- a/GamePedia/src/modeles/Game.php
+++ b/GamePedia/src/modeles/Game.php
@@ -20,7 +20,7 @@ class Game extends \Illuminate\Database\Eloquent\Model
return $this->belongsToMany('gp\modeles\Genre', 'game2genre','game_id');
}
public function ratings(){
- return $this->belongsToMany('gp\modeles\Game_rating', 'game2rating','game_id');
+ return $this->belongsToMany('gp\modeles\Game_rating', 'game2rating','game_id','rating_id');
}
public function publishers(){
return $this->belongsToMany('gp\modeles\Company', 'game_publishers','game_id');
diff --git a/GamePedia/src/modeles/Game_rating.php b/GamePedia/src/modeles/Game_rating.php
index acdc7ecf1916f0bc97ffb7e8af9ef36d5484b95b..b6915dcf445d686ee601500e2c9729f2a7b0ee72 100644
--- a/GamePedia/src/modeles/Game_rating.php
+++ b/GamePedia/src/modeles/Game_rating.php
@@ -1,9 +1,10 @@
<?php
namespace gp\modeles;
+use Illuminate\Database\Eloquent\Builder;
class Game_rating extends \Illuminate\Database\Eloquent\Model
{
protected $table = 'game_rating';
- protected $primaryKey =['id', 'rating_id'];
+ protected $primaryKey ='id';
public $timestamps = false;
public $incrementing = false;
function games(){
diff --git a/GamePedia/src/modeles/Rating_board.php b/GamePedia/src/modeles/Rating_board.php
index abf29c6a9c7a2cef48e0495342ae081052526811..22d271eef08ca44b36fcda6e4e657b306331898a 100644
--- a/GamePedia/src/modeles/Rating_board.php
+++ b/GamePedia/src/modeles/Rating_board.php
@@ -2,8 +2,7 @@
namespace gp\modeles;
-
-
+use Illuminate\Database\Eloquent\Builder;
class Rating_board extends \Illuminate\Database\Eloquent\Model
{
protected $table = 'rating_board';