@@ -55,7 +55,7 @@ |
||
| 55 | 55 | * This function must consider all the released versions of the module! |
| 56 | 56 | * If the upgrade fails at some point, it returns the last upgraded version. |
| 57 | 57 | * |
| 58 | - * @param string $oldversion Version number string to upgrade from |
|
| 58 | + * @param string $oldVersion Version number string to upgrade from |
|
| 59 | 59 | * |
| 60 | 60 | * @return boolean|string True on success, last valid version string or false if fails |
| 61 | 61 | */ |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | /** |
| 80 | 80 | * Returns a list of custom Twig functions. |
| 81 | 81 | * |
| 82 | - * @return array |
|
| 82 | + * @return \Twig_SimpleFunction[] |
|
| 83 | 83 | */ |
| 84 | 84 | public function getFunctions() |
| 85 | 85 | { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | /** |
| 97 | 97 | * Returns a list of custom Twig filters. |
| 98 | 98 | * |
| 99 | - * @return array |
|
| 99 | + * @return \Twig_SimpleFilter[] |
|
| 100 | 100 | */ |
| 101 | 101 | public function getFilters() |
| 102 | 102 | { |
@@ -16,8 +16,8 @@ |
||
| 16 | 16 | use Zikula\Common\Translator\TranslatorInterface; |
| 17 | 17 | use Zikula\Common\Translator\TranslatorTrait; |
| 18 | 18 | use Zikula\ExtensionsModule\Api\ApiInterface\VariableApiInterface; |
| 19 | -use Zikula\RoutesModule\Helper\ListEntriesHelper; |
|
| 20 | 19 | use Zikula\RoutesModule\Helper\EntityDisplayHelper; |
| 20 | +use Zikula\RoutesModule\Helper\ListEntriesHelper; |
|
| 21 | 21 | use Zikula\RoutesModule\Helper\WorkflowHelper; |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -49,7 +49,6 @@ |
||
| 49 | 49 | * Example: |
| 50 | 50 | * {{ route.defaults|zikularoutesmodule_arrayToString }} |
| 51 | 51 | * |
| 52 | - * @param array $array The input array. |
|
| 53 | 52 | * |
| 54 | 53 | * @return string Output string for display. |
| 55 | 54 | */ |
@@ -106,13 +106,13 @@ |
||
| 106 | 106 | $path = htmlspecialchars($route->getPathWithBundlePrefix()); |
| 107 | 107 | $container = $this->container; |
| 108 | 108 | |
| 109 | - $path = preg_replace_callback('#%(.*?)%#', function ($matches) use ($container) { |
|
| 109 | + $path = preg_replace_callback('#%(.*?)%#', function($matches) use ($container) { |
|
| 110 | 110 | return '<abbr title="' . htmlspecialchars($matches[0]) . '">' . htmlspecialchars($container->getParameter($matches[1])) . '</abbr>'; |
| 111 | 111 | }, $path); |
| 112 | 112 | |
| 113 | 113 | $defaults = $route->getDefaults(); |
| 114 | 114 | $requirements = $route->getRequirements(); |
| 115 | - $path = preg_replace_callback('#{(.*?)}#', function ($matches) use ($defaults, $requirements) { |
|
| 115 | + $path = preg_replace_callback('#{(.*?)}#', function($matches) use ($defaults, $requirements) { |
|
| 116 | 116 | $title = ''; |
| 117 | 117 | if (isset($defaults[$matches[1]])) { |
| 118 | 118 | $title .= $this->__f('Default: %s', ['%s' => htmlspecialchars($defaults[$matches[1]])]); |
@@ -13,9 +13,9 @@ |
||
| 13 | 13 | namespace Zikula\RoutesModule\Twig; |
| 14 | 14 | |
| 15 | 15 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 16 | +use ZLanguage; |
|
| 16 | 17 | use Zikula\RoutesModule\Entity\RouteEntity; |
| 17 | 18 | use Zikula\RoutesModule\Twig\Base\AbstractTwigExtension; |
| 18 | -use ZLanguage; |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * Twig extension implementation class. |
@@ -251,6 +251,9 @@ |
||
| 251 | 251 | return false; |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | + /** |
|
| 255 | + * @param string $name |
|
| 256 | + */ |
|
| 254 | 257 | private function setSystemVar($name, $value = '') |
| 255 | 258 | { |
| 256 | 259 | return $this->container->get('zikula_extensions_module.api.variable')->set(VariableApi::CONFIG, $name, $value); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $this->setSystemVar('sessionstoretofile', Constant::SESSION_STORAGE_FILE); |
| 56 | 56 | $this->setSystemVar('sessionsavepath', ''); |
| 57 | 57 | $this->setSystemVar('gc_probability', 100); |
| 58 | - $this->setSystemVar('sessioncsrftokenonetime', 1); // 1 means use same token for entire session |
|
| 58 | + $this->setSystemVar('sessioncsrftokenonetime', 1); // 1 means use same token for entire session |
|
| 59 | 59 | $this->setSystemVar('sessionrandregenerate', 1); |
| 60 | 60 | $this->setSystemVar('sessionregenerate', 1); |
| 61 | 61 | $this->setSystemVar('sessionregeneratefreq', 10); |
@@ -77,13 +77,13 @@ discard block |
||
| 77 | 77 | $this->setSystemVar('useids', 0); |
| 78 | 78 | $this->setSystemVar('idsmail', 0); |
| 79 | 79 | $this->setSystemVar('idsrulepath', 'system/SecurityCenterModule/Resources/config/phpids_zikula_default.xml'); |
| 80 | - $this->setSystemVar('idssoftblock', 1); // do not block requests, but warn for debugging |
|
| 81 | - $this->setSystemVar('idsfilter', 'xml'); // filter type |
|
| 82 | - $this->setSystemVar('idsimpactthresholdone', 1); // db logging |
|
| 83 | - $this->setSystemVar('idsimpactthresholdtwo', 10); // mail admin |
|
| 84 | - $this->setSystemVar('idsimpactthresholdthree', 25); // block request |
|
| 85 | - $this->setSystemVar('idsimpactthresholdfour', 75); // kick user, destroy session |
|
| 86 | - $this->setSystemVar('idsimpactmode', 1); // per request per default |
|
| 80 | + $this->setSystemVar('idssoftblock', 1); // do not block requests, but warn for debugging |
|
| 81 | + $this->setSystemVar('idsfilter', 'xml'); // filter type |
|
| 82 | + $this->setSystemVar('idsimpactthresholdone', 1); // db logging |
|
| 83 | + $this->setSystemVar('idsimpactthresholdtwo', 10); // mail admin |
|
| 84 | + $this->setSystemVar('idsimpactthresholdthree', 25); // block request |
|
| 85 | + $this->setSystemVar('idsimpactthresholdfour', 75); // kick user, destroy session |
|
| 86 | + $this->setSystemVar('idsimpactmode', 1); // per request per default |
|
| 87 | 87 | $this->setSystemVar('idshtmlfields', ['POST.__wysiwyg']); |
| 88 | 88 | $this->setSystemVar('idsjsonfields', ['POST.__jsondata']); |
| 89 | 89 | $this->setSystemVar('idsexceptions', [ |
@@ -11,9 +11,9 @@ |
||
| 11 | 11 | |
| 12 | 12 | namespace Zikula\SecurityCenterModule; |
| 13 | 13 | |
| 14 | -use Zikula\ExtensionsModule\Api\VariableApi; |
|
| 15 | 14 | use Zikula\Bundle\CoreBundle\HttpKernel\ZikulaKernel; |
| 16 | 15 | use Zikula\Core\AbstractExtensionInstaller; |
| 16 | +use Zikula\ExtensionsModule\Api\VariableApi; |
|
| 17 | 17 | use Zikula\SecurityCenterModule\Api\ApiInterface\HtmlFilterApiInterface; |
| 18 | 18 | |
| 19 | 19 | /** |
@@ -284,7 +284,7 @@ |
||
| 284 | 284 | |
| 285 | 285 | /** |
| 286 | 286 | * Remove comments, whitespace and spaces from css files |
| 287 | - * @param $contents |
|
| 287 | + * @param string $contents |
|
| 288 | 288 | * @return string |
| 289 | 289 | */ |
| 290 | 290 | private function minify($contents) |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | - $cacheName = in_array($type, ['js', 'css']) ? "{$type}Cache" : null; |
|
| 101 | + $cacheName = in_array($type, ['js', 'css']) ? "{$type}cache" : null; |
|
| 102 | 102 | /** @var CacheProvider $cacheService */ |
| 103 | 103 | $cacheService = $this->$cacheName; |
| 104 | 104 | $key = md5(serialize($assets)) . (int)$this->minify . (int)$this->compress . $this->lifetime . '.' . $type; |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
| 94 | - * @return array of service aliases |
|
| 94 | + * @return integer[] of service aliases |
|
| 95 | 95 | */ |
| 96 | 96 | public function getKeys() |
| 97 | 97 | { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
| 102 | - * @return array of active service aliases |
|
| 102 | + * @return integer[] of active service aliases |
|
| 103 | 103 | */ |
| 104 | 104 | public function getActiveKeys() |
| 105 | 105 | { |
@@ -262,6 +262,9 @@ |
||
| 262 | 262 | return $this->mailerApi->sendMessage($message, null, null, $textBody, $html); |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | + /** |
|
| 266 | + * @param string $notificationType |
|
| 267 | + */ |
|
| 265 | 268 | private function generateEmailSubject($notificationType, array $templateArgs = []) |
| 266 | 269 | { |
| 267 | 270 | $siteName = $this->variableApi->getSystemVar('sitename'); |
@@ -110,6 +110,9 @@ discard block |
||
| 110 | 110 | $this->passwordApi = $passwordApi; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | + /** |
|
| 114 | + * @param TranslatorInterface $translator |
|
| 115 | + */ |
|
| 113 | 116 | public function setTranslator($translator) |
| 114 | 117 | { |
| 115 | 118 | $this->translator = $translator; |
@@ -273,8 +276,8 @@ discard block |
||
| 273 | 276 | /** |
| 274 | 277 | * Convert errors to string and add current line. |
| 275 | 278 | * @param $errors |
| 276 | - * @param $type |
|
| 277 | - * @param $line |
|
| 279 | + * @param string $type |
|
| 280 | + * @param integer $line |
|
| 278 | 281 | * @return string |
| 279 | 282 | */ |
| 280 | 283 | private function locateErrors($errors, $type, $line) |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | use Doctrine\ORM\EntityManager; |
| 15 | 15 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
| 16 | 16 | use Symfony\Component\HttpFoundation\File\UploadedFile; |
| 17 | -use Symfony\Component\Validator\Constraints\NotNull; |
|
| 18 | 17 | use Symfony\Component\Validator\ConstraintViolationListInterface; |
| 18 | +use Symfony\Component\Validator\Constraints\NotNull; |
|
| 19 | 19 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
| 20 | 20 | use Zikula\Common\Translator\TranslatorInterface; |
| 21 | 21 | use Zikula\Common\Translator\TranslatorTrait; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | public function getInstallerClass() |
| 55 | 55 | { |
| 56 | 56 | $ns = $this->getNamespace(); |
| 57 | - $class = $ns.'\\'.substr($ns, strrpos($ns, '\\') + 1, strlen($ns)).'Installer'; |
|
| 57 | + $class = $ns . '\\' . substr($ns, strrpos($ns, '\\') + 1, strlen($ns)) . 'Installer'; |
|
| 58 | 58 | |
| 59 | 59 | return $class; |
| 60 | 60 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function getLocalePath() |
| 78 | 78 | { |
| 79 | - return $this->getPath().'/Resources/locale'; |
|
| 79 | + return $this->getPath() . '/Resources/locale'; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function getViewsPath() |
| 88 | 88 | { |
| 89 | - return $this->getPath().'/Resources/views'; |
|
| 89 | + return $this->getPath() . '/Resources/views'; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public function getConfigPath() |
| 98 | 98 | { |
| 99 | - return $this->getPath().'/Resources/config'; |
|
| 99 | + return $this->getPath() . '/Resources/config'; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | /** |
@@ -144,9 +144,9 @@ discard block |
||
| 144 | 144 | $type = $this->getNameType(); |
| 145 | 145 | $typeLower = strtolower($type); |
| 146 | 146 | if (null === $this->extension) { |
| 147 | - $basename = preg_replace('/'.$type.'/', '', $this->getName()); |
|
| 147 | + $basename = preg_replace('/' . $type . '/', '', $this->getName()); |
|
| 148 | 148 | |
| 149 | - $class = $this->getNamespace().'\\DependencyInjection\\'.$basename.'Extension'; |
|
| 149 | + $class = $this->getNamespace() . '\\DependencyInjection\\' . $basename . 'Extension'; |
|
| 150 | 150 | if (class_exists($class)) { |
| 151 | 151 | $extension = new $class(); |
| 152 | 152 | |