Completed
Pull Request — master (#3630)
by Craig
05:45
created
lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/lib/Zikula/Bundle/CoreInstallerBundle/Helper/MigrationHelper.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
 
95 95
     /**
96 96
      * @param $uid
97
-     * @param $limit
97
+     * @param integer $limit
98 98
      * @return array
99 99
      */
100 100
     private function getUnMigratedUsers($uid, $limit)
Please login to merge, or discard this patch.
src/lib/Zikula/Bundle/CoreInstallerBundle/Command/UpgradeCommand.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         $count = $migrationHelper->countUnMigratedUsers();
98 98
         if ($count > 0) {
99 99
             $io->text($this->translator->__('Beginning user migration...'));
100
-            $userMigrationMaxuid = (int) $migrationHelper->getMaxUnMigratedUid();
100
+            $userMigrationMaxuid = (int)$migrationHelper->getMaxUnMigratedUid();
101 101
             $progressBar = new ProgressBar($output, ceil($count / MigrationHelper::BATCH_LIMIT));
102 102
             $progressBar->start();
103 103
             $lastUid = 0;
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $io->newLine();
134 134
 
135 135
         // write the parameters to custom_parameters.yml
136
-        $yamlManager = new YamlDumper($this->getContainer()->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml');
136
+        $yamlManager = new YamlDumper($this->getContainer()->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml');
137 137
         $params = array_merge($yamlManager->getParameters(), $settings);
138 138
         $yamlManager->setParameters($params);
139 139
 
Please login to merge, or discard this patch.