aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md7
-rwxr-xr-x[-rw-r--r--]bin/console0
-rw-r--r--phpunit.xml.dist14
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php3
4 files changed, 11 insertions, 13 deletions
diff --git a/README.md b/README.md
index 6d545ff5..927f39a8 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,11 @@ If you don't have it yet, please [install composer](https://getcomposer.org/down
16 16
17``` 17```
18composer create-project wallabag/wallabag wallabag 2.0.0-alpha.1 18composer create-project wallabag/wallabag wallabag 2.0.0-alpha.1
19cd wallabag 19php bin/console wallabag:install
20php app/console wallabag:install 20php bin/console server:run
21php app/console server:run
22``` 21```
23 22
24## License 23## License
25Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org> 24Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
26This work is free. You can redistribute it and/or modify it under the 25This work is free. You can redistribute it and/or modify it under the
27terms of the MIT License. See the COPYING file for more details. 26terms of the MIT License. See the COPYING file for more details.
diff --git a/bin/console b/bin/console
index 49247c94..49247c94 100644..100755
--- a/bin/console
+++ b/bin/console
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0e8cc8eb..e68df9de 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,22 +14,22 @@
14 14
15 <testsuites> 15 <testsuites>
16 <testsuite name="wallabag Test Suite"> 16 <testsuite name="wallabag Test Suite">
17 <directory>./src/Wallabag/*Bundle/Tests</directory> 17 <directory>src/Wallabag/*Bundle/Tests</directory>
18 </testsuite> 18 </testsuite>
19 </testsuites> 19 </testsuites>
20 20
21 <php> 21 <php>
22 <server name="KERNEL_DIR" value="./app/" /> 22 <server name="KERNEL_DIR" value="app/" />
23 </php> 23 </php>
24 24
25 <filter> 25 <filter>
26 <whitelist> 26 <whitelist>
27 <directory>./src</directory> 27 <directory>src</directory>
28 <exclude> 28 <exclude>
29 <directory>./vendor</directory> 29 <directory>vendor</directory>
30 <directory>./src/Wallabag/*Bundle/Resources</directory> 30 <directory>src/Wallabag/*Bundle/Resources</directory>
31 <directory>./src/Wallabag/*Bundle/Tests</directory> 31 <directory>src/Wallabag/*Bundle/Tests</directory>
32 <directory>./src/Wallabag/*Bundle/DataFixtures</directory> 32 <directory>src/Wallabag/*Bundle/DataFixtures</directory>
33 </exclude> 33 </exclude>
34 </whitelist> 34 </whitelist>
35 </filter> 35 </filter>
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 941cb8cd..da099a19 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -12,7 +12,6 @@ use Symfony\Component\Console\Output\OutputInterface;
12use Symfony\Component\Console\Question\ConfirmationQuestion; 12use Symfony\Component\Console\Question\ConfirmationQuestion;
13use Symfony\Component\Console\Question\Question; 13use Symfony\Component\Console\Question\Question;
14use Wallabag\CoreBundle\Entity\Config; 14use Wallabag\CoreBundle\Entity\Config;
15use Wallabag\UserBundle\Entity\User;
16 15
17class InstallCommand extends ContainerAwareCommand 16class InstallCommand extends ContainerAwareCommand
18{ 17{
@@ -56,7 +55,7 @@ class InstallCommand extends ContainerAwareCommand
56 ; 55 ;
57 56
58 $output->writeln('<info>Wallabag has been successfully installed.</info>'); 57 $output->writeln('<info>Wallabag has been successfully installed.</info>');
59 $output->writeln('<comment>Just execute `php app/console server:run` for using wallabag: http://localhost:8000</comment>'); 58 $output->writeln('<comment>Just execute `php bin/console server:run` for using wallabag: http://localhost:8000</comment>');
60 } 59 }
61 60
62 protected function checkRequirements() 61 protected function checkRequirements()