@@ -47,23 +47,23 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $pwd = getcwd(); |
| 49 | 49 | if (is_dir($buildDir)) { |
| 50 | - system("rm -rf ${buildDir}"); |
|
| 50 | + system("rm -rf ${builddir}"); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // build env |
| 54 | 54 | $filesystem->mkdir($buildDir, 0755); |
| 55 | 55 | $progress->advance(); |
| 56 | 56 | |
| 57 | - $filesystem->mirror($sourceDir, "${buildDir}/${name}"); |
|
| 57 | + $filesystem->mirror($sourceDir, "${builddir}/${name}"); |
|
| 58 | 58 | $progress->advance(); |
| 59 | 59 | |
| 60 | - PurgeVendorsCommand::cleanVendors("${buildDir}/${name}/vendor", $progress); |
|
| 61 | - FixAutoloaderCommand::fix("${buildDir}/${name}/vendor", $progress); |
|
| 60 | + PurgeVendorsCommand::cleanVendors("${builddir}/${name}/vendor", $progress); |
|
| 61 | + FixAutoloaderCommand::fix("${builddir}/${name}/vendor", $progress); |
|
| 62 | 62 | |
| 63 | 63 | $writableArray = [ |
| 64 | - "${buildDir}/${name}/var/cache", |
|
| 65 | - "${buildDir}/${name}/var/log", |
|
| 66 | - "${buildDir}/${name}/web/uploads", |
|
| 64 | + "${builddir}/${name}/var/cache", |
|
| 65 | + "${builddir}/${name}/var/log", |
|
| 66 | + "${builddir}/${name}/web/uploads", |
|
| 67 | 67 | ]; |
| 68 | 68 | $filesystem->chmod($writableArray, 0777); |
| 69 | 69 | $progress->advance(); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $zip = new ZipArchive(); |
| 87 | 87 | $fileName = "${name}.zip"; |
| 88 | 88 | if (true !== $zip->open($fileName, ZipArchive::CREATE)) { |
| 89 | - $output->writeln("<error>Error creating ${fileName}</error>"); |
|
| 89 | + $output->writeln("<error>Error creating ${filename}</error>"); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | foreach ($allFiles as $file) { |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | // build tar |
| 101 | 101 | $fileName = "${name}.tar"; |
| 102 | - system("tar cp ${name} > ${fileName}"); |
|
| 102 | + system("tar cp ${name} > ${filename}"); |
|
| 103 | 103 | $progress->advance(); |
| 104 | - system("gzip ${fileName}"); |
|
| 104 | + system("gzip ${filename}"); |
|
| 105 | 105 | $progress->advance(); |
| 106 | 106 | |
| 107 | 107 | // checksums |
@@ -117,16 +117,16 @@ discard block |
||
| 117 | 117 | -----------------sha1sums----------------- |
| 118 | 118 | ${zipSha1} ${name}.zip |
| 119 | 119 | ${tarSha1} ${name}.tar.gz |
| 120 | -CHECKSUM; |
|
| 120 | +checksum; |
|
| 121 | 121 | file_put_contents("${name}-checksum.txt", $checksum); |
| 122 | 122 | $progress->advance(); |
| 123 | 123 | |
| 124 | 124 | // cleanup |
| 125 | - system("rm -rf ${buildDir} ${name}"); |
|
| 125 | + system("rm -rf ${builddir} ${name}"); |
|
| 126 | 126 | chdir($pwd); |
| 127 | 127 | $progress->advance(); |
| 128 | 128 | $progress->finish(); |
| 129 | 129 | |
| 130 | - $output->writeln("<info>Artifacts built in ${buildDir}/ folder</info>"); |
|
| 130 | + $output->writeln("<info>Artifacts built in ${builddir}/ folder</info>"); |
|
| 131 | 131 | } |
| 132 | 132 | } |
@@ -123,7 +123,8 @@ |
||
| 123 | 123 | $form = $this->createForm(DefaultLoginType::class, ['uid' => $uid]); |
| 124 | 124 | $loginFormEvent = new UserFormAwareEvent($form); |
| 125 | 125 | $eventDispatcher->dispatch($loginFormEvent, AccessEvents::AUTHENTICATION_FORM); |
| 126 | - if ($form->count() > 3) { // count > 3 means that the AUTHENTICATION_FORM event added some form children |
|
| 126 | + if ($form->count() > 3) { |
|
| 127 | +// count > 3 means that the AUTHENTICATION_FORM event added some form children |
|
| 127 | 128 | $form->handleRequest($request); |
| 128 | 129 | if ($form->isSubmitted() && $form->isValid()) { |
| 129 | 130 | $uid = $form->get('uid')->getData(); |
@@ -282,7 +282,7 @@ |
||
| 282 | 282 | return $this->router->generate($routePrefix . 'view'); |
| 283 | 283 | case 'userOwnView': |
| 284 | 284 | case 'adminOwnView': |
| 285 | - return $this->router->generate($routePrefix . 'view', [ 'own' => 1 ]); |
|
| 285 | + return $this->router->generate($routePrefix . 'view', ['own' => 1]); |
|
| 286 | 286 | case 'userDisplay': |
| 287 | 287 | case 'adminDisplay': |
| 288 | 288 | if ( |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | if ($route->getTranslatable()) { |
| 73 | 73 | $languages = $container->get(LocaleApi::class)->getSupportedLocales(); |
| 74 | 74 | // TODO migrate this legacy call |
| 75 | - $isRequiredLangParam = true;//ZLanguage::isRequiredLangParam(); |
|
| 75 | + $isRequiredLangParam = true; //ZLanguage::isRequiredLangParam(); |
|
| 76 | 76 | if (!$isRequiredLangParam) { |
| 77 | 77 | $defaultLanguage = $this->variableApi->getSystemVar('language_i18n'); |
| 78 | 78 | unset($languages[array_search($defaultLanguage, $languages, true)]); |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | ->getPathWithBundlePrefix($route) |
| 89 | 89 | ); |
| 90 | 90 | |
| 91 | - $path = preg_replace_callback('#%(.*?)%#', static function ($matches) use ($container) { |
|
| 91 | + $path = preg_replace_callback('#%(.*?)%#', static function($matches) use ($container) { |
|
| 92 | 92 | return '<abbr title="' . htmlspecialchars($matches[0]) . '">' |
| 93 | 93 | . htmlspecialchars($container->getParameter($matches[1])) |
| 94 | 94 | . '</abbr>' |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | $defaults = $route->getDefaults(); |
| 99 | 99 | $requirements = $route->getRequirements(); |
| 100 | - $path = preg_replace_callback('#{(.*?)}#', function ($matches) use ($defaults, $requirements) { |
|
| 100 | + $path = preg_replace_callback('#{(.*?)}#', function($matches) use ($defaults, $requirements) { |
|
| 101 | 101 | $title = ''; |
| 102 | 102 | if (isset($defaults[$matches[1]])) { |
| 103 | 103 | $title .= $this->__f('Default: %s', ['%s' => htmlspecialchars($defaults[$matches[1]])]); |
@@ -256,7 +256,7 @@ |
||
| 256 | 256 | // access the logging channel |
| 257 | 257 | $logger = new Logger('mailer'); |
| 258 | 258 | $logger->pushHandler(new StreamHandler($logFile, Logger::INFO)); |
| 259 | - $logger->addError("Could not send message to: ${emailList} :: " . $this->message->toString()); |
|
| 259 | + $logger->addError("Could not send message to: ${emaillist} :: " . $this->message->toString()); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | $this->eventDispatcher->dispatch($event, MailerEvents::SEND_MESSAGE_FAILURE); |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $this->variableApi->set(VariableApi::CONFIG, 'language_i18n', $params['locale']); |
| 111 | 111 | // Set the System Identifier as a unique string. |
| 112 | 112 | if (!$this->variableApi->get(VariableApi::CONFIG, 'system_identifier')) { |
| 113 | - $this->variableApi->set(VariableApi::CONFIG, 'system_identifier', str_replace('.', '', uniqid((string) (random_int(1000000000, 9999999999)), true))); |
|
| 113 | + $this->variableApi->set(VariableApi::CONFIG, 'system_identifier', str_replace('.', '', uniqid((string)(random_int(1000000000, 9999999999)), true))); |
|
| 114 | 114 | } |
| 115 | 115 | // add admin email as site email |
| 116 | 116 | $this->variableApi->set(VariableApi::CONFIG, 'adminmail', $params['email']); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | // on upgrade, if a user doesn't add their custom theme back to the /theme dir, it should be reset to a core theme, if available. |
| 160 | - $defaultTheme = (string) $this->variableApi->getSystemVar('Default_Theme'); |
|
| 160 | + $defaultTheme = (string)$this->variableApi->getSystemVar('Default_Theme'); |
|
| 161 | 161 | if (!$this->kernel->isBundle($defaultTheme) && $this->kernel->isBundle('ZikulaBootstrapTheme')) { |
| 162 | 162 | $this->variableApi->set(VariableApi::CONFIG, 'Default_Theme', 'ZikulaBootstrapTheme'); |
| 163 | 163 | } |