@@ -35,7 +35,7 @@ |
||
| 35 | 35 | $class = $this->entityCategoryClass; |
| 36 | 36 | |
| 37 | 37 | foreach ($value as $regId => $categories) { |
| 38 | - $regId = (int) substr($regId, strpos($regId, '_') + 1); |
|
| 38 | + $regId = (int)substr($regId, strpos($regId, '_') + 1); |
|
| 39 | 39 | $subCollection = new ArrayCollection(); |
| 40 | 40 | if (!is_array($categories) && $categories instanceof CategoryEntity) { |
| 41 | 41 | $categories = [$categories]; |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | */ |
| 26 | 26 | public function display(array $properties) |
| 27 | 27 | { |
| 28 | - if (!$this->hasPermission('Onlineblock::', $properties['bid'].'::', ACCESS_READ)) { |
|
| 28 | + if (!$this->hasPermission('Onlineblock::', $properties['bid'] . '::', ACCESS_READ)) { |
|
| 29 | 29 | return ''; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | { |
| 22 | 22 | public function display(array $properties) |
| 23 | 23 | { |
| 24 | - if ($this->hasPermission('Loginblock::', $properties['title'].'::', ACCESS_READ)) { |
|
| 24 | + if ($this->hasPermission('Loginblock::', $properties['title'] . '::', ACCESS_READ)) { |
|
| 25 | 25 | if (!$this->get('zikula_users_module.current_user')->isLoggedIn()) { |
| 26 | 26 | $request = $this->get('request_stack')->getCurrentRequest(); |
| 27 | 27 | |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | if ($form->get('download')->isClicked()) { |
| 47 | 47 | $data = $form->getData(); |
| 48 | 48 | $response = new StreamedResponse(); |
| 49 | - $response->setCallback(function () use ($data) { |
|
| 49 | + $response->setCallback(function() use ($data) { |
|
| 50 | 50 | $fields = ['uid', 'uname', 'activated', 'email', 'user_regdate', 'lastlogin', 'groups']; |
| 51 | 51 | foreach ($fields as $k => $field) { |
| 52 | 52 | if (isset($data[$field]) && !$data[$field]) { |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | UsersConstant::MODVAR_LOGIN_DISPLAY_APPROVAL_STATUS |
| 118 | 118 | ]; |
| 119 | 119 | foreach ($modvarsToConvertToBool as $modvarToConvert) { |
| 120 | - $this->setVar($modvarToConvert, (bool) $this->getVar($modvarToConvert)); |
|
| 120 | + $this->setVar($modvarToConvert, (bool)$this->getVar($modvarToConvert)); |
|
| 121 | 121 | } |
| 122 | 122 | $this->schemaTool->update(['Zikula\UsersModule\Entity\UserEntity']); |
| 123 | 123 | $this->delVar('login_redirect'); |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | $value = in_array($migratedModVarName, [ |
| 291 | 291 | ZAuthConstant::MODVAR_EMAIL_VERIFICATION_REQUIRED, |
| 292 | 292 | ZAuthConstant::MODVAR_PASSWORD_STRENGTH_METER_ENABLED |
| 293 | - ]) ? (bool) $value : $value; |
|
| 293 | + ]) ? (bool)$value : $value; |
|
| 294 | 294 | $this->container->get('zikula_extensions_module.api.variable')->set('ZikulaZAuthModule', $migratedModVarName, $value); |
| 295 | 295 | } |
| 296 | 296 | } |
@@ -295,7 +295,7 @@ |
||
| 295 | 295 | |
| 296 | 296 | /** |
| 297 | 297 | * These modvar names used to have UsersConstant values, but have been moved to ZAuthConstant and maintain their actual values. |
| 298 | - * @return array |
|
| 298 | + * @return string[] |
|
| 299 | 299 | */ |
| 300 | 300 | private function getMigratedModVarNames() |
| 301 | 301 | { |
@@ -175,7 +175,7 @@ |
||
| 175 | 175 | |
| 176 | 176 | // add body with formatting |
| 177 | 177 | $bodyFormat = 'text/plain'; |
| 178 | - if (!empty($altBody) || ((bool) $html) || $this->dataValues['html']) { |
|
| 178 | + if (!empty($altBody) || ((bool)$html) || $this->dataValues['html']) { |
|
| 179 | 179 | $bodyFormat = 'text/html'; |
| 180 | 180 | } |
| 181 | 181 | if (isset($body)) { |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $qb->from('ZikulaUsersModule:UserEntity', 'u'); |
| 109 | 109 | $qb->andWhere($qb->expr()->eq('tbl.user', 'u.uid')); |
| 110 | 110 | $qb->andWhere($qb->expr()->eq('tbl.user', ':uid')) |
| 111 | - ->setParameter('uid', $uid); |
|
| 111 | + ->setParameter('uid', $uid); |
|
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | 114 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $i = 1; |
| 118 | 118 | foreach ($filters as $w_key => $w_value) { |
| 119 | 119 | $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i)) |
| 120 | - ->setParameter($i, $w_value); |
|
| 120 | + ->setParameter($i, $w_value); |
|
| 121 | 121 | $i++; |
| 122 | 122 | } |
| 123 | 123 | } |
@@ -144,12 +144,12 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | if ($fieldName == 'uid') { |
| 146 | 146 | $qb->select('DISTINCT(u.' . $fieldName . ')') |
| 147 | - ->from('ZikulaUsersModule:UserEntity', 'u') |
|
| 148 | - ->where($qb->expr()->eq('tbl.user', 'u.uid')) |
|
| 149 | - ->addOrderBy('u.uname', 'ASC'); |
|
| 147 | + ->from('ZikulaUsersModule:UserEntity', 'u') |
|
| 148 | + ->where($qb->expr()->eq('tbl.user', 'u.uid')) |
|
| 149 | + ->addOrderBy('u.uname', 'ASC'); |
|
| 150 | 150 | } else { |
| 151 | 151 | $qb->select('DISTINCT(tbl.' . $fieldName . ')') |
| 152 | - ->addOrderBy('tbl.' . $fieldName, 'ASC'); |
|
| 152 | + ->addOrderBy('tbl.' . $fieldName, 'ASC'); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | $query = $qb->getQuery(); |
@@ -184,9 +184,9 @@ |
||
| 184 | 184 | $ldir = dirname(__FILE__); |
| 185 | 185 | $p = strpos($ldir, DIRECTORY_SEPARATOR . 'system'); // we are in system/AdminModule |
| 186 | 186 | $b = substr($ldir, 0, $p); |
| 187 | - $filePath = $b.'/'.$appDir.'/.htaccess'; |
|
| 187 | + $filePath = $b . '/' . $appDir . '/.htaccess'; |
|
| 188 | 188 | } else { |
| 189 | - $filePath = $appDir.'/.htaccess'; |
|
| 189 | + $filePath = $appDir . '/.htaccess'; |
|
| 190 | 190 | } |
| 191 | 191 | $app_htaccess = file_exists($filePath); |
| 192 | 192 | } |
@@ -25,6 +25,9 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | private $extensionStateMap = []; |
| 27 | 27 | |
| 28 | + /** |
|
| 29 | + * @param ZikulaKernel $kernel |
|
| 30 | + */ |
|
| 28 | 31 | public function getConnection($kernel) |
| 29 | 32 | { |
| 30 | 33 | // get bundles from persistence |
@@ -88,7 +91,7 @@ discard block |
||
| 88 | 91 | * @param string $class |
| 89 | 92 | * @param string $type |
| 90 | 93 | * |
| 91 | - * @return bool |
|
| 94 | + * @return boolean|null |
|
| 92 | 95 | */ |
| 93 | 96 | private function extensionIsActive(ZikulaKernel $kernel, $conn, $class, $type) |
| 94 | 97 | { |