diff --git a/.travis.yml b/.travis.yml
index 287369e33..07d66f881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,17 +43,8 @@ before_script:
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
# disable xdebug since we don't use code-coverage for now
- if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
- # build coverage only on one build, to speed up results feedbacks
- # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
- if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
script:
- ant prepare-$DB
- bin/phpunit -v
-
-# after_script:
- # - |
- # if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
- # wget https://scrutinizer-ci.com/ocular.phar
- # php ocular.phar code-coverage:upload --format=php-clover coverage.clover
- # fi
diff --git a/COPYING.md b/COPYING.md
index b30299fe4..bc5be3414 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,19 +1,19 @@
-Copyright (c) 2013-2015 Nicolas Lœuillet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright (c) 2013-2016 Nicolas Lœuillet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/CREDITS.md b/CREDITS.md
index e3916170f..eb2096e0f 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -2,5 +2,4 @@ wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb)
Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
-Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
-).
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).
diff --git a/app/config/config.yml b/app/config/config.yml
index 5bc16dd9b..5fac31929 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -170,14 +170,8 @@ liip_theme:
autodetect_theme: wallabag_core.helper.detect_active_theme
path_patterns:
- # app_resource:
- # - %%app_path%%/views/themes/%%current_theme%%/%%template%%
- # - %%app_path%%/views/%%template%%
bundle_resource:
- %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
- # bundle_resource_dir:
- # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
- # - %%dir%%/views/%%bundle_name%%/%%override_path%%
fos_user:
db_driver: orm
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 205e0f66b..116dd0d5b 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -32,14 +32,6 @@ monolog:
VERBOSITY_VERY_VERBOSE: NOTICE
VERBOSITY_DEBUG: DEBUG
channels: ["doctrine"]
- # uncomment to get logging in your browser
- # you may have to allow bigger header sizes in your Web server configuration
- #firephp:
- # type: firephp
- # level: info
- #chromephp:
- # type: chromephp
- # level: info
assetic:
use_controller: true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 85fa964b8..0e8cc8ebb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -20,12 +20,6 @@
-