| 65,24 → 65,24 |
|---|
| |
| //+------------------------------------------------------------------------------------------------------+ |
| // Refactorisation |
| protected function consulterJson($ressources, $parametres) { |
| $retourJson = $this->consulterBrut($ressources, $parametres); |
| public function consulterJson($service, $projet, $ressources, $parametres) { |
| $retourJson = self::consulterBrut($service, $projet, $ressources, $parametres); |
| $retour = json_decode($retourJson, true); |
| $url = $this->creerUrl($ressources, $parametres); |
| $url = self::creerUrl($service, $ressources, $parametres); |
| $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)); |
| return $retour; |
| } |
| |
| protected function consulterBrut($ressources, $parametres) { |
| array_unshift($ressources, $this->service); |
| array_unshift($ressources, $this->projet); |
| static function consulterBrut($service, $projet, $ressources, $parametres) { |
| array_unshift($ressources, $service); |
| array_unshift($ressources, $projet); |
| $projets = new Projets(); |
| $retourJson = $projets->consulter($ressources, $parametres); |
| return $retourJson; |
| } |
| |
| protected function creerUrl($ressources, $parametres) { |
| $version = ''; |
| static function creerUrl($service, $ressources, $parametres) { |
| // TODO ? $version |
| $ressourcesUrl = array(); |
| foreach ($ressources as $ressource) { |
| $ressourcesUrl[] = $ressource; |
| 97,8 → 97,7 |
|---|
| $parametresUrl = '?'.implode('&', $parametresUrl); |
| } |
| |
| $url = Config::get('url_service').'/'.$version.$this->service.$ressourcesUrl.$parametresUrl; |
| return $url; |
| return Config::get('url_service') . '/' . $service . $ressourcesUrl . $parametresUrl; |
| } |
| |
| //+------------------------------------------------------------------------------------------------------+ |
| 153,4 → 152,10 |
|---|
| return self::getMethodePrivee($objet, $nomMethode); |
| } |
| } |
| ?> |
| |
| /* |
| sed -i 's/$this->consulterBrut(/ServiceEflorePhpUnit::consulterBrut($this->service, $this->projet, /' $(grep -rl consulterBrut) |
| sed -i 's/$this->consulterJson(/$this->consulterJson($this->service, $this->projet, /' $(grep -rl consulterJson) |
| sed -i 's/$this->creerUrl(/ServiceEflorePhpUnit::creerUrl($this->service, /' $(grep -rl creerUrl) |
| */ |
| ?> |