kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove getFlashName and use getFlashMessage

Browse source 
This method can be deleted, we can used directly the existing
getFlashMessage
This commit is contained in:
amenophis 2013-08-19 21:45:08 +02:00
parent 54424a2a3c
commit 1cdfbcc377
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Sylius/Bundle/ResourceBundle/Controller/Configuration.php
View file

@ -103,11 +103,6 @@ class Configuration
return sprintf('%s:%s.%s', $this->templateNamespace ?: ':', $name, $this->templatingEngine);
}
public function getFlashName($message)
{
return sprintf('%s.%s.%s', $this->bundlePrefix, $this->resourceName, $message);
}
public function getTemplate($name)
{
return $this->get('template', $this->getTemplateName($name));
@ -206,9 +201,10 @@ class Configuration
return $this->get('arguments', $default);
}
public function getFlashMessage()
public function getFlashMessage($message = null)
{
return $this->get('flash');
$message = sprintf('%s.%s.%s', $this->bundlePrefix, $this->resourceName, $message);
return $this->get('flash', $message);
}
protected function get($parameter, $default = null)

6
src/Sylius/Bundle/ResourceBundle/Controller/ResourceController.php
View file

@ -395,11 +395,7 @@ class ResourceController extends FOSRestController
{
$config = $this->getConfiguration();
if (null !== $message = $config->getFlashMessage()) {
return $this->translateFlashMessage($message, $params);
}
$message = $this->configuration->getFlashName($event);
$message = $config->getFlashMessage($event);
$translatedMessage = $this->translateFlashMessage($message, $params);
if ($message !== $translatedMessage) {

5
src/Sylius/Bundle/ResourceBundle/spec/Sylius/Bundle/ResourceBundle/Controller/ConfigurationSpec.php
View file

@ -75,11 +75,6 @@ class ConfigurationSpec extends ObjectBehavior
$this->getTemplateName('custom.html')->shouldReturn('SyliusWebBundle:Product:custom.html.twig');
}
function it_generates_flash_name()
{
$this->getFlashName('custom_message')->shouldReturn('sylius.product.custom_message');
}
function it_generates_route_names()
{
$this->getRouteName('index')->shouldReturn('sylius_product_index');