sf4.2 port: Twig filter+extension deprecation fix. Section Portlet Page

ported.
PaskLab · May 15, 2019 · 53e2815 · 53e2815
1 parent 434b34a
commit 53e2815
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 291 deletions.
diff --git a/src/Controller/Site/MetadataController.php b/src/Controller/Site/MetadataController.php
@@ -2,8 +2,9 @@
 
 namespace App\Controller\Site;
 
-use App\Library\BaseController;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Response;
+use App\Library\BaseController;
 use Tutoriux\DoctrineBehaviorsBundle\ORM\Metadatable\MetadatableGetter;
 
 /**
@@ -14,12 +15,14 @@ class MetadataController extends BaseController
 {
     /**
      * @param MetadatableGetter $metadatableGetter
+     * @param ParameterBagInterface $parameterBag
      * @param $metaName
      * @param bool $ogMeta
      * @param bool $forceEmpty
      * @return Response
      */
-    public function metadata(MetadatableGetter $metadatableGetter, $metaName, $ogMeta = false, $forceEmpty = false)
+    public function metadata(MetadatableGetter $metadatableGetter, ParameterBagInterface $parameterBag,
+                             $metaName, $ogMeta = false, $forceEmpty = false)
     {
         $response = new Response();
         $response->setPublic();
@@ -32,8 +35,8 @@ public function metadata(MetadatableGetter $metadatableGetter, $metaName, $ogMet
         if (!$value && !$forceEmpty) {
             $parameter = sprintf('tutoriux.metadata.%s', $metaName);
 
-            if ($this->container->hasParameter($parameter)) {
-                $value = $this->container->getParameter($parameter);
+            if ($parameterBag->has($parameter)) {
+                $value = $parameterBag->get($parameter);
             }
         }
 

diff --git a/src/Controller/Site/SectionController.php b/src/Controller/Site/SectionController.php
@@ -2,12 +2,13 @@
 
 namespace App\Controller\Site;
 
-use Symfony\Component\HttpFoundation\Request,
-    Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 use App\Repository\TextRepository;
 use App\Library\BaseController;
 use App\Services\DoctrineInit;
+use App\Entity\Text;
 
 /**
  * Class SectionController
@@ -27,10 +28,9 @@ public function homePage()
     }
 
     /**
-     * @param Request $request
      * @return Response
      */
-    public function quickTour(Request $request)
+    public function quickTour()
     {
         $response = new Response();
         $response->setPublic();
@@ -46,15 +46,13 @@ public function quickTour(Request $request)
     /**
      * @param Request $request
      * @return Response
-     * @throws \Doctrine\ORM\ORMException
      */
     public function portlet(Request $request)
     {
         $sectionId = $this->getSection()->getId();
 
         /** @var TextRepository $textRepository */
-        $textRepository = $this->get(DoctrineInit::class)
-            ->initRepository($this->getEm()->getRepository('SystemBundle:Text'));
+        $textRepository = $this->getRepository(Text::class);
         $textLastUpdate = $textRepository->findLastUpdate(null, $sectionId);
 
         $response = new Response();
@@ -65,13 +63,13 @@ public function portlet(Request $request)
             return $response;
         }
 
-        $texts = $this->getEm()->getRepository('SystemBundle:Text')->findBy(
+        $texts = $textRepository->findBy(
             ['section' => $sectionId, 'static' => false, 'active' => true],
             ['ordering' => 'ASC']
         );
 
         return $this->render(
-            'SystemBundle:Frontend/Section:portlet.html.twig',
+            'site/section/portlet.html.twig',
             ['texts' => $texts],
             $response
         );