Update readme & fix console permission

diff --git a/README.md b/README.md
index 6d545ff51d0ceb72303528b809485e45f9e21981..927f39a8871c42493579137f49427c4e7bab1881 100644 (file)
--- a/README.md
+++ b/README.md
@@ -16,12 +16,11 @@ If you don't have it yet, please [install composer](https://getcomposer.org/down
 
 ```
 composer create-project wallabag/wallabag wallabag 2.0.0-alpha.1
-cd wallabag
-php app/console wallabag:install
-php app/console server:run
+php bin/console wallabag:install
+php bin/console server:run
 ```
 
 ## License
-Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.

diff --git a/bin/console b/bin/console
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0e8cc8ebb72db8ada71009b111216f6901006d15..e68df9de6fb5e19ad0464a2a438fe8f0f620f442 100644 (file)
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,22 +14,22 @@
 
     <testsuites>
         <testsuite name="wallabag Test Suite">
-            <directory>./src/Wallabag/*Bundle/Tests</directory>
+            <directory>src/Wallabag/*Bundle/Tests</directory>
         </testsuite>
     </testsuites>
 
     <php>
-        <server name="KERNEL_DIR" value="./app/" />
+        <server name="KERNEL_DIR" value="app/" />
     </php>
 
     <filter>
         <whitelist>
-            <directory>./src</directory>
+            <directory>src</directory>
             <exclude>
-                <directory>./vendor</directory>
-                <directory>./src/Wallabag/*Bundle/Resources</directory>
-                <directory>./src/Wallabag/*Bundle/Tests</directory>
-                <directory>./src/Wallabag/*Bundle/DataFixtures</directory>
+                <directory>vendor</directory>
+                <directory>src/Wallabag/*Bundle/Resources</directory>
+                <directory>src/Wallabag/*Bundle/Tests</directory>
+                <directory>src/Wallabag/*Bundle/DataFixtures</directory>
             </exclude>
         </whitelist>
     </filter>

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 941cb8cdc2c3f86fc04c8a6a1a71ee31235c41c3..da099a19bb8e0a003b5c0fc99fb80d87c02b6b6c 100644 (file)
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -12,7 +12,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
 use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\UserBundle\Entity\User;
 
 class InstallCommand extends ContainerAwareCommand
 {
@@ -56,7 +55,7 @@ class InstallCommand extends ContainerAwareCommand
         ;
 
         $output->writeln('<info>Wallabag has been successfully installed.</info>');
-        $output->writeln('<comment>Just execute `php app/console server:run` for using wallabag: http://localhost:8000</comment>');
+        $output->writeln('<comment>Just execute `php bin/console server:run` for using wallabag: http://localhost:8000</comment>');
     }
 
     protected function checkRequirements()