aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Command/InstallCommand.php
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-03-08 17:02:34 +0100
committerThomas Citharel <tcit@tcit.fr>2016-06-09 17:12:51 +0200
commit5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 (patch)
tree03ee1eab0d89d1857daca9e273fd8c9ca47e33c2 /src/Wallabag/CoreBundle/Command/InstallCommand.php
parent9f95b14dec88cf083cefa38d5fbd84189e07acac (diff)
downloadwallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.gz
wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.zst
wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.zip
manage assets through npm
first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version
Diffstat (limited to 'src/Wallabag/CoreBundle/Command/InstallCommand.php')
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php23
1 files changed, 4 insertions, 19 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 813ac720..e134ced5 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -61,7 +61,6 @@ class InstallCommand extends ContainerAwareCommand
61 ->setupDatabase() 61 ->setupDatabase()
62 ->setupAdmin() 62 ->setupAdmin()
63 ->setupConfig() 63 ->setupConfig()
64 ->setupAsset()
65 ; 64 ;
66 65
67 $output->writeln('<info>Wallabag has been successfully installed.</info>'); 66 $output->writeln('<info>Wallabag has been successfully installed.</info>');
@@ -70,7 +69,7 @@ class InstallCommand extends ContainerAwareCommand
70 69
71 protected function checkRequirements() 70 protected function checkRequirements()
72 { 71 {
73 $this->defaultOutput->writeln('<info><comment>Step 1 of 5.</comment> Checking system requirements.</info>'); 72 $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>');
74 73
75 $fulfilled = true; 74 $fulfilled = true;
76 75
@@ -120,7 +119,7 @@ class InstallCommand extends ContainerAwareCommand
120 119
121 protected function setupDatabase() 120 protected function setupDatabase()
122 { 121 {
123 $this->defaultOutput->writeln('<info><comment>Step 2 of 5.</comment> Setting up database.</info>'); 122 $this->defaultOutput->writeln('<info><comment>Step 2 of 4.</comment> Setting up database.</info>');
124 123
125 // user want to reset everything? Don't care about what is already here 124 // user want to reset everything? Don't care about what is already here
126 if (true === $this->defaultInput->getOption('reset')) { 125 if (true === $this->defaultInput->getOption('reset')) {
@@ -191,7 +190,7 @@ class InstallCommand extends ContainerAwareCommand
191 190
192 protected function setupAdmin() 191 protected function setupAdmin()
193 { 192 {
194 $this->defaultOutput->writeln('<info><comment>Step 3 of 5.</comment> Administration setup.</info>'); 193 $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
195 194
196 $questionHelper = $this->getHelperSet()->get('question'); 195 $questionHelper = $this->getHelperSet()->get('question');
197 $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true); 196 $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
@@ -235,7 +234,7 @@ class InstallCommand extends ContainerAwareCommand
235 234
236 protected function setupConfig() 235 protected function setupConfig()
237 { 236 {
238 $this->defaultOutput->writeln('<info><comment>Step 4 of 5.</comment> Config setup.</info>'); 237 $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Config setup.</info>');
239 $em = $this->getContainer()->get('doctrine.orm.entity_manager'); 238 $em = $this->getContainer()->get('doctrine.orm.entity_manager');
240 239
241 // cleanup before insert new stuff 240 // cleanup before insert new stuff
@@ -374,20 +373,6 @@ class InstallCommand extends ContainerAwareCommand
374 return $this; 373 return $this;
375 } 374 }
376 375
377 protected function setupAsset()
378 {
379 $this->defaultOutput->writeln('<info><comment>Step 5 of 5.</comment> Installing assets.</info>');
380
381 $this
382 ->runCommand('assets:install')
383 ->runCommand('assetic:dump')
384 ;
385
386 $this->defaultOutput->writeln('');
387
388 return $this;
389 }
390
391 /** 376 /**
392 * Run a command. 377 * Run a command.
393 * 378 *