@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | public function __construct(ContainerInterface $container) |
44 | 44 | { |
45 | 45 | parent::__construct($container); |
46 | - $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() .'/config/parameters.yml')); |
|
47 | - $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
46 | + $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() . '/config/parameters.yml')); |
|
47 | + $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
48 | 48 | // load and set new default values from the original parameters.yml file into the custom_parameters.yml file. |
49 | 49 | $this->yamlManager->setParameters(array_merge($originalParameters['parameters'], $this->yamlManager->getParameters())); |
50 | 50 | $this->currentVersion = $this->container->getParameter(ZikulaKernel::CORE_INSTALLED_VERSION_PARAM); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $stage = $request->request->get('stage'); |
56 | 56 | $this->container->setParameter('upgrading', true); |
57 | 57 | $status = $this->executeStage($stage); |
58 | - $response = ['status' => (bool) $status]; |
|
58 | + $response = ['status' => (bool)$status]; |
|
59 | 59 | if (is_array($status)) { |
60 | 60 | $response['results'] = $status; |
61 | 61 | } |
@@ -116,7 +116,7 @@ |
||
116 | 116 | |
117 | 117 | /** |
118 | 118 | * @param $uid |
119 | - * @param $limit |
|
119 | + * @param integer $limit |
|
120 | 120 | * @return UserEntity[] |
121 | 121 | */ |
122 | 122 | public function getUnMigratedUsers($uid, $limit) |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $io->text($this->translator->__('Beginning user migration...')); |
100 | 100 | $migrationHelper = $this->getContainer()->get('zikula_core_installer.helper.migration_helper'); |
101 | 101 | $userMigrationMaxuid = $migrationHelper->getMaxUnMigratedUid(); |
102 | - $progressBar = new ProgressBar($output, ceil($count/MigrationHelper::BATCH_LIMIT)); |
|
102 | + $progressBar = new ProgressBar($output, ceil($count / MigrationHelper::BATCH_LIMIT)); |
|
103 | 103 | $progressBar->start(); |
104 | 104 | $lastUid = 0; |
105 | 105 | do { |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $io->newLine(); |
135 | 135 | |
136 | 136 | // write the parameters to custom_parameters.yml |
137 | - $yamlManager = new YamlDumper($this->getContainer()->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
137 | + $yamlManager = new YamlDumper($this->getContainer()->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
138 | 138 | $params = array_merge($yamlManager->getParameters(), $settings); |
139 | 139 | $yamlManager->setParameters($params); |
140 | 140 |