TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Boyquotes
2014-03-21 09:30:30 +01:00
parent 34937fe3ec 3e60725507
commit 95335babac
452 changed files with 24215 additions and 21493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Command/CreateAdminUser.php
View File

@@ -83,7 +83,7 @@ class CreateAdminUser extends ContainerAwareCommand
{
$output->writeln('Please enter the admin user information:');
$admin = $this->getAdminInfo($input, $output); // new Admin();
$admin = $this->getAdminInfo($input, $output);
$admin->save();

3
core/lib/Thelia/Command/GenerateResources.php
View File

@@ -61,8 +61,7 @@ class GenerateResources extends ContainerAwareCommand
$constants = $class->getConstants();
if (count($constants) == 0) {
$output->writeln('No resources found');
exit;
throw new \RuntimeException('No resources found');
}
switch ($input->getOption("output")) {

9
core/lib/Thelia/Command/Install.php
View File

@@ -163,11 +163,7 @@ class Install extends ContainerAwareCommand
}
if (false === $isValid) {
$output->writeln(array(
"",
"<error>Please put correct permissions and reload install process</error>"
));
exit;
throw new \RuntimeException('Please put correct permissions and reload install process');
}
}
@@ -198,9 +194,6 @@ class Install extends ContainerAwareCommand
file_put_contents($configFile, $configContent);
// FA - no, as no further install will be possible
// $fs->remove($sampleConfigFile);
$fs->remove($this->getContainer()->getParameter("kernel.cache_dir"));
}