refactored mailer module to 2.0 style

src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php

@@ -62,7 +62,7 @@ public function getResponse(Request $request)
         } else {
             $request->getSession()->getFlashBag()->add('warning', __('Email settings are not yet configured. Please configure them below.'));
 
-            return new RedirectResponse($this->container->get('router')->generate('zikulamailermodule_admin_modifyconfig', array(), RouterInterface::ABSOLUTE_URL));
+            return new RedirectResponse($this->container->get('router')->generate('zikulamailermodule_config_config', array(), RouterInterface::ABSOLUTE_URL));
         }
     }
 

src/system/BlocksModule/Container/LinkContainer.php

@@ -24,10 +24,12 @@ class LinkContainer implements LinkContainerInterface
      * @var Translator
      */
     private $translator;
+
     /**
      * @var RouterInterface
      */
     private $router;
+
     /**
      * @var PermissionApi
      */
@@ -87,8 +89,7 @@ private function getAdmin()
                 'text' => $this->translator->__('Create new block'),
                 'icon' => 'plus'
             ];
-        }
-        if ($this->permissionApi->hasPermission('ZikulaBlocksModule::', '::', ACCESS_ADD)) {
+
             $links[] = [
                 'url' => $this->router->generate('zikulablocksmodule_position_edit'),
                 'text' => $this->translator->__('Create new block position'),

src/system/BlocksModule/Controller/AdminController.php

@@ -118,6 +118,7 @@ public function viewAction(Request $request)
      * @Template
      *
      * @param Request $request
+     * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function configAction(Request $request)
@@ -127,22 +128,23 @@ public function configAction(Request $request)
         }
 
         $form = $this->createFormBuilder($this->getVars())
-            ->add('collapseable', 'checkbox', ['label' => __('Enable block collapse icons'),
+            ->add('collapseable', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [
+                'label' => $this->__('Enable block collapse icons'),
                 'required' => false
             ])
-            ->add('save', 'submit', ['label' => 'Save'])
-            ->add('cancel', 'submit', ['label' => 'Cancel'])
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Save')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
 
         $form->handleRequest($request);
 
         if ($form->isValid()) {
             if ($form->get('save')->isClicked()) {
                 $this->setVars($form->getData());
-                $this->addFlash('status', __('Done! Module configuration updated.'));
+                $this->addFlash('status', $this->__('Done! Module configuration updated.'));
             }
             if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', __('Operation cancelled.'));
+                $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
             return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));

src/system/BlocksModule/Controller/BlockController.php

@@ -164,8 +164,8 @@ public function deleteAction(Request $request, BlockEntity $blockEntity)
         }
 
         $form = $this->createFormBuilder()
-            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Delete'])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Cancel'])
+            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
 
         $form->handleRequest($request);
@@ -247,11 +247,11 @@ private function getBlockModifyOutput($blockClassInstance, BlockEntity $blockEnt
      */
     private function formContentModify(Request $request, BlockEntity $blockEntity = null)
     {
+        $options = [];
         if (isset($blockEntity)) {
             $options = ['data' => $blockEntity->getContent() == [] ? '' : $blockEntity->getContent()];
-        } else {
-            $options = [];
         }
+
         $form = $this->createFormBuilder()
             ->add('content', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', $options)
             ->getForm();
@@ -277,7 +277,7 @@ private function formContentModify(Request $request, BlockEntity $blockEntity =
     public function viewAction(BlockEntity $blockEntity = null)
     {
         return $this->render('@ZikulaBlocksModule/Admin/blockview.html.twig', [
-                'block' => $blockEntity,
-            ]);
+            'block' => $blockEntity,
+        ]);
     }
 }

src/system/BlocksModule/Controller/PositionController.php

@@ -59,10 +59,10 @@ public function editAction(Request $request, BlockPositionEntity $positionEntity
                 $em = $this->getDoctrine()->getManager();
                 $em->persist($positionEntity);
                 $em->flush();
-                $this->addFlash('status', __('Position saved!'));
+                $this->addFlash('status', $this->__('Position saved!'));
             }
             if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', __('Operation cancelled.'));
+                $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
             return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
@@ -91,8 +91,8 @@ public function deleteAction(Request $request, BlockPositionEntity $positionEnti
         }
 
         $form = $this->createFormBuilder()
-            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Delete'])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Cancel'])
+            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
 
         $form->handleRequest($request);
@@ -102,10 +102,10 @@ public function deleteAction(Request $request, BlockPositionEntity $positionEnti
                 $em = $this->getDoctrine()->getManager();
                 $em->remove($positionEntity);
                 $em->flush();
-                $this->addFlash('status', __('Done! Position deleted.'));
+                $this->addFlash('status', $this->__('Done! Position deleted.'));
             }
             if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', __('Operation cancelled.'));
+                $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
             return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));

src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * This file is part of the Zikula package.
+ *
+ * Copyright Zikula Foundation - http://zikula.org/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Zikula\BlocksModule\DependencyInjection;
 

src/system/BlocksModule/Resources/config/services.xml

@@ -19,7 +19,7 @@
 
     <services>
         <service id="zikula_blocks_module.container.link_container" class="%zikula_blocks_module.container.link_container.class%">
-            <argument type="service" id="translator" />
+            <argument type="service" id="translator.default" />
             <argument type="service" id="jms_i18n_routing.router" />
             <argument type="service" id="zikula_permissions_module.api.permission" />
             <tag name="zikula.link_container"/>

src/system/BlocksModule/Resources/views/Admin/config.html.twig

@@ -21,6 +21,5 @@
         </div>
         {{ form_end(form) }}
     </div>
-
 </div>
 {{ adminFooter() }}

src/system/ExtensionsModule/Container/LinkContainer.php

@@ -24,10 +24,12 @@ class LinkContainer implements LinkContainerInterface
      * @var Translator
      */
     private $translator;
+
     /**
      * @var RouterInterface
      */
     private $router;
+
     /**
      * @var PermissionApi
      */
@@ -71,51 +73,72 @@ public function getLinks($type = LinkContainerInterface::TYPE_ADMIN)
      */
     private function getAdmin()
     {
-        $links = array();
-
-        if ($this->permissionApi->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
-            $links[] = [
-                'url' => $this->router->generate('zikulaextensionsmodule_module_viewmodulelist'),
-                'text' => $this->translator->__('Extension List'),
-                'icon' => 'list'
-            ];
-
-            $links[] = array(
-                'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
-                'text' => $this->translator->__('Plugins list'),
-                'icon' => 'table',
-                'links' => array(
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
-                        'text' => $this->translator->__('All')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => \PluginUtil::NOTINSTALLED)),
-                        'text' => $this->translator->__('Not installed')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => \PluginUtil::DISABLED)),
-                        'text' => $this->translator->__('Inactive')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => \PluginUtil::ENABLED)),
-                        'text' => $this->translator->__('Active'))
-                ));
-
-            $links[] = array(
-                'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true)),
-                'text' => $this->translator->__('System Plugins'),
-                'icon' => 'table',
-                'links' => array(
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true)),
-                        'text' => $this->translator->__('All')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true, 'state' => \PluginUtil::NOTINSTALLED)),
-                        'text' => $this->translator->__('Not installed')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true, 'state' => \PluginUtil::DISABLED)),
-                        'text' => $this->translator->__('Inactive')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true, 'state' => \PluginUtil::ENABLED)),
-                        'text' => $this->translator->__('Active'))
-                ));
-
-            $links[] = array(
-                'url' => $this->router->generate('zikulaextensionsmodule_config_config'),
-                'text' => $this->translator->__('Settings'),
-                'icon' => 'wrench');
+        $links = [];
+
+        if (!$this->permissionApi->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
+            return $links;
         }
 
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_module_viewmodulelist'),
+            'text' => $this->translator->__('Extension List'),
+            'icon' => 'list'
+        ];
+
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
+            'text' => $this->translator->__('Plugins list'),
+            'icon' => 'table',
+            'links' => [
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
+                    'text' => $this->translator->__('All')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['state' => \PluginUtil::NOTINSTALLED]),
+                    'text' => $this->translator->__('Not installed')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['state' => \PluginUtil::DISABLED]),
+                    'text' => $this->translator->__('Inactive')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['state' => \PluginUtil::ENABLED]),
+                    'text' => $this->translator->__('Active')
+                ]
+            ]
+        ];
+
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true]),
+            'text' => $this->translator->__('System Plugins'),
+            'icon' => 'table',
+            'links' => [
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true]),
+                    'text' => $this->translator->__('All')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true, 'state' => \PluginUtil::NOTINSTALLED]),
+                    'text' => $this->translator->__('Not installed')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true, 'state' => \PluginUtil::DISABLED]),
+                    'text' => $this->translator->__('Inactive')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true, 'state' => \PluginUtil::ENABLED]),
+                    'text' => $this->translator->__('Active')
+                ]
+            ]
+        ];
+
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_config_config'),
+            'text' => $this->translator->__('Settings'),
+            'icon' => 'wrench'
+        ];
+
         return $links;
     }
 

src/system/ExtensionsModule/Controller/ModuleController.php

@@ -390,8 +390,8 @@ public function uninstallAction(Request $request, ExtensionEntity $extension)
         $blocks = $this->getDoctrine()->getManager()->getRepository('ZikulaBlocksModule:BlockEntity')->findBy(['module' => $extension]);
 
         $form = $this->createFormBuilder()
-            ->add('uninstall', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Delete'])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Cancel'])
+            ->add('uninstall', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
         $form->handleRequest($request);
 

src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * This file is part of the Zikula package.
+ *
+ * Copyright Zikula Foundation - http://zikula.org/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Zikula\ExtensionsModule\DependencyInjection;
 

src/system/ExtensionsModule/Resources/config/services.xml

@@ -23,7 +23,7 @@
 
     <services>
         <service id="zikula_extensions_module.container.link_container" class="%zikula_extensions_module.container.link_container.class%">
-            <argument type="service" id="translator" />
+            <argument type="service" id="translator.default" />
             <argument type="service" id="jms_i18n_routing.router" />
             <argument type="service" id="zikula_permissions_module.api.permission" />
             <tag name="zikula.link_container"/>

src/system/ExtensionsModule/Resources/views/Config/config.html.twig

@@ -22,7 +22,6 @@
         </div>
         {{ form_end(form) }}
     </div>
-
 </div>
 {{ adminFooter() }}
 <script type="text/javascript">