| Line 63... |
Line 63... |
| 63 |
}
|
63 |
}
|
| 64 |
}
|
64 |
}
|
| Line 65... |
Line 65... |
| 65 |
|
65 |
|
| 66 |
//+------------------------------------------------------------------------------------------------------+
|
66 |
//+------------------------------------------------------------------------------------------------------+
|
| 67 |
// Refactorisation
|
67 |
// Refactorisation
|
| 68 |
public function consulterJson($service, $projet, $ressources, $parametres) {
|
68 |
public function consulterJson($service, $projet, $ressources, $parametres = NULL) {
|
| 69 |
$retourJson = self::consulterBrut($service, $projet, $ressources, $parametres);
|
69 |
$retourJson = self::consulterBrut($service, $projet, $ressources, $parametres);
|
| 70 |
$retour = json_decode($retourJson, true);
|
70 |
$retour = json_decode($retourJson, true);
|
| 71 |
$url = self::creerUrl($service, $ressources, $parametres);
|
71 |
$url = self::creerUrl($service, $ressources, $parametres);
|
| 72 |
$this->assertEquals(JSON_ERROR_NONE, json_last_error(), "Le json contient des erreurs qui bloquent le décodage. Voir : $url\n".print_r($retourJson, true));
|
72 |
$this->assertEquals(JSON_ERROR_NONE, json_last_error(), "Le json contient des erreurs qui bloquent le décodage. Voir : $url\n".print_r($retourJson, true));
|
| 73 |
return $retour;
|
73 |
return $retour;
|
| Line 74... |
Line 74... |
| 74 |
}
|
74 |
}
|
| 75 |
|
75 |
|
| 76 |
static function consulterBrut($service, $projet, $ressources, $parametres) {
|
- |
|
| 77 |
array_unshift($ressources, $service);
|
76 |
static function consulterBrut($service, $projet, $ressources, $parametres = NULL) {
|
| 78 |
array_unshift($ressources, $projet);
|
77 |
array_unshift($ressources, $projet, $service);
|
| 79 |
$projets = new Projets();
|
78 |
$projets = new Projets();
|
| 80 |
$retourJson = $projets->consulter($ressources, $parametres);
|
79 |
$retourJson = $projets->consulter($ressources, $parametres);
|
| Line 81... |
Line 80... |
| 81 |
return $retourJson;
|
80 |
return $retourJson;
|
| 82 |
}
|
81 |
}
|
| 83 |
|
82 |
|
| 84 |
static function creerUrl($service, $ressources, $parametres) {
|
83 |
static function creerUrl($service, $ressources, $parametres = NULL) {
|
| 85 |
// TODO ? $version
|
84 |
// TODO ? $version
|
| 86 |
$ressourcesUrl = array();
|
85 |
$ressourcesUrl = array();
|
| 87 |
foreach ($ressources as $ressource) {
|
86 |
foreach ($ressources as $ressource) {
|
| Line 88... |
Line 87... |
| 88 |
$ressourcesUrl[] = $ressource;
|
87 |
$ressourcesUrl[] = $ressource;
|
| 89 |
}
|
88 |
}
|
| 90 |
$ressourcesUrl = count($ressourcesUrl) > 0 ? '/'.implode('/', $ressourcesUrl) : '';
|
89 |
$ressourcesUrl = count($ressourcesUrl) > 0 ? '/'.implode('/', $ressourcesUrl) : '';
|
| 91 |
|
90 |
|
| 92 |
$parametresUrl = '';
|
91 |
$parametresUrl = '';
|
| 93 |
if (count($parametres) > 0) {
|
92 |
if ($parametres) {
|
| 94 |
foreach ($parametres as $cle => $valeur) {
|
93 |
foreach ($parametres as $cle => $valeur) {
|