Merge branch 'master' of https://gitea.laclic.fr/Laclic/LcShopBundle

ShopBundle/Controller/Admin/NewsController.php

@@ -24,7 +24,7 @@ class NewsController extends AdminController
                         foreach ($users as $user) {
                                 $message = new \Swift_Message('[Place du Local] '.$news->getTitle());
                                 $message->addTo($user->getEmail())
-                                        ->addFrom('no-reply@opendistrib.net', 'Place du Local')
+                                        ->addFrom($this->getParameter('app.noreply_email'), $this->getParameter('app.site_name'))
                                         ->setBody($this->renderView('mail/news.html.twig', [
                                                 'message' => $news->getDescription(),
                                                 'image' => $news->getImage(),

ShopBundle/Services/GlobalParam.php

@@ -2,12 +2,14 @@
 
 namespace Lc\ShopBundle\Services;
 
+use App\Repository\HubRepository;
 use Lc\ShopBundle\Context\GlobalParamInterface;
+use Lc\ShopBundle\Repository\MerchantRepository;
 use Symfony\Component\Security\Core\Security;
 
 class GlobalParam
 {
-        private $security;
+        protected $security;
 
         public function __construct(Security $security)
         {
@@ -25,5 +27,4 @@ class GlobalParam
                         return false ;
                 }
         }
-
 }