@@ -85,7 +85,7 @@ |
||
85 | 85 | <p>Zikula has been successfully installed at <a href="$url">$url</a>. If you have further questions, |
86 | 86 | visit <a href="http://zikula.org">zikula.org</a></p> |
87 | 87 | </body> |
88 | -EOF; |
|
88 | +eof; |
|
89 | 89 | $message = \Swift_Message::newInstance() |
90 | 90 | ->setSubject($this->__('Zikula installation completed!')) |
91 | 91 | ->setFrom($adminUser->getEmail()) |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function __construct(ContainerInterface $container) |
27 | 27 | { |
28 | 28 | $this->container = $container; |
29 | - $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
29 | + $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | public function getName() |
@@ -45,7 +45,7 @@ |
||
45 | 45 | public function __construct(ContainerInterface $container) |
46 | 46 | { |
47 | 47 | $this->container = $container; |
48 | - $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml', 'parameters.yml'); |
|
48 | + $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml', 'parameters.yml'); |
|
49 | 49 | $this->installedLocales = $container->get('zikula_settings_module.locale_api')->getSupportedLocales(); |
50 | 50 | $this->matchedLocale = $container->get('zikula_settings_module.locale_api')->getBrowserLocale(); |
51 | 51 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
77 | - * @param $moduleName |
|
77 | + * @param string $moduleName |
|
78 | 78 | * @return bool |
79 | 79 | */ |
80 | 80 | protected function installModule($moduleName) |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | /** |
119 | 119 | * Set an admin category for a module or set to default |
120 | 120 | * @param $moduleName |
121 | - * @param $translatedCategoryName |
|
121 | + * @param string $translatedCategoryName |
|
122 | 122 | */ |
123 | 123 | protected function setModuleCategory($moduleName, $translatedCategoryName) |
124 | 124 | { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | preg_match_all($argumentsRegex, file_get_contents($file), $singularMatches); |
46 | 46 | foreach ($singularMatches[2] as $string) { |
47 | 47 | $message = new Message($string, self::JAVASCRIPT_DOMAIN); |
48 | - $message->addSource(new FileSource((string) $file)); |
|
48 | + $message->addSource(new FileSource((string)$file)); |
|
49 | 49 | $catalogue->add($message); |
50 | 50 | } |
51 | 51 | // plural type |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | foreach ($pluralMatches[2] as $key => $singularString) { |
55 | 55 | $fullString = $singularString . '|' . $pluralMatches[4][$key]; |
56 | 56 | $message = new Message($fullString, self::JAVASCRIPT_DOMAIN); |
57 | - $message->addSource(new FileSource((string) $file)); |
|
57 | + $message->addSource(new FileSource((string)$file)); |
|
58 | 58 | $catalogue->add($message); |
59 | 59 | } |
60 | 60 | } |
@@ -75,10 +75,10 @@ |
||
75 | 75 | [ |
76 | 76 | 'decorate' => true, |
77 | 77 | 'html' => true, |
78 | - 'childOpen' => function ($node) { |
|
78 | + 'childOpen' => function($node) { |
|
79 | 79 | return '<li class="jstree-open" id="' . $this->domTreeNodePrefix . $node['id'] . '">'; |
80 | 80 | }, |
81 | - 'nodeDecorator' => function ($node) { |
|
81 | + 'nodeDecorator' => function($node) { |
|
82 | 82 | return '<a href="#">' . $node['title'] . ' (' . $node['id'] . ')</a>'; |
83 | 83 | } |
84 | 84 | ] |
@@ -122,6 +122,10 @@ |
||
122 | 122 | |
123 | 123 | /** |
124 | 124 | * This method includes the common implementation code for adminView() and view(). |
125 | + * @param string $sort |
|
126 | + * @param string $sortdir |
|
127 | + * @param integer $pos |
|
128 | + * @param integer $num |
|
125 | 129 | */ |
126 | 130 | protected function viewInternal(Request $request, $sort, $sortdir, $pos, $num, $isAdmin = false) |
127 | 131 | { |
@@ -506,7 +506,7 @@ |
||
506 | 506 | try { |
507 | 507 | // execute the workflow action |
508 | 508 | $success = $workflowHelper->executeAction($entity, $action); |
509 | - } catch(\Exception $e) { |
|
509 | + } catch (\Exception $e) { |
|
510 | 510 | $this->addFlash('error', $this->__f('Sorry, but an error occured during the %action% action.', ['%action%' => $action]) . ' ' . $e->getMessage()); |
511 | 511 | $logger->error('{app}: User {user} tried to execute the {action} workflow action for the {entity} with id {id}, but failed. Error details: {errorMessage}.', ['app' => 'ZikulaRoutesModule', 'user' => $userName, 'action' => $action, 'entity' => 'route', 'id' => $itemId, 'errorMessage' => $e->getMessage()]); |
512 | 512 | } |
@@ -13,13 +13,13 @@ |
||
13 | 13 | namespace Zikula\RoutesModule\Controller\Base; |
14 | 14 | |
15 | 15 | use RuntimeException; |
16 | -use Symfony\Component\HttpFoundation\Request; |
|
17 | -use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
18 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
19 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
20 | 16 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; |
21 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
22 | 18 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
19 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
20 | +use Symfony\Component\HttpFoundation\Request; |
|
21 | +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
22 | +use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
23 | 23 | use Zikula\Bundle\FormExtensionBundle\Form\Type\DeletionType; |
24 | 24 | use Zikula\Component\SortableColumns\Column; |
25 | 25 | use Zikula\Component\SortableColumns\SortableColumns; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | */ |
27 | 27 | public function load(array $configs, ContainerBuilder $container) |
28 | 28 | { |
29 | - $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config'))); |
|
29 | + $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config'))); |
|
30 | 30 | |
31 | 31 | $loader->load('services.yml'); |
32 | 32 | $loader->load('doctrine.yml'); |
@@ -95,7 +95,7 @@ |
||
95 | 95 | } |
96 | 96 | // remove disabled |
97 | 97 | foreach ($searchModules as $displayName => $moduleName) { |
98 | - if ((bool) $this->getVar('disable_' . $moduleName, false)) { |
|
98 | + if ((bool)$this->getVar('disable_' . $moduleName, false)) { |
|
99 | 99 | unset($searchModules[$displayName]); |
100 | 100 | } |
101 | 101 | } |