Remove some commented code

This commit is contained in:
Jeremy Benoist 2016-01-14 14:10:33 +01:00
parent c38d27d421
commit 1d405d0e62
6 changed files with 20 additions and 50 deletions

View file

@ -43,17 +43,8 @@ before_script:
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; - 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 # 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 - 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; - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
script: script:
- ant prepare-$DB - ant prepare-$DB
- bin/phpunit -v - 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

View file

@ -1,4 +1,4 @@
Copyright (c) 2013-2015 Nicolas Lœuillet Copyright (c) 2013-2016 Nicolas Lœuillet
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View file

@ -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 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).
).

View file

@ -170,14 +170,8 @@ liip_theme:
autodetect_theme: wallabag_core.helper.detect_active_theme autodetect_theme: wallabag_core.helper.detect_active_theme
path_patterns: path_patterns:
# app_resource:
# - %%app_path%%/views/themes/%%current_theme%%/%%template%%
# - %%app_path%%/views/%%template%%
bundle_resource: bundle_resource:
- %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% - %%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: fos_user:
db_driver: orm db_driver: orm

View file

@ -32,14 +32,6 @@ monolog:
VERBOSITY_VERY_VERBOSE: NOTICE VERBOSITY_VERY_VERBOSE: NOTICE
VERBOSITY_DEBUG: DEBUG VERBOSITY_DEBUG: DEBUG
channels: ["doctrine"] 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: assetic:
use_controller: true use_controller: true

View file

@ -20,12 +20,6 @@
<php> <php>
<server name="KERNEL_DIR" value="./app/" /> <server name="KERNEL_DIR" value="./app/" />
<!--
Avoid tests to fail because of deprecated stuff
see: http://symfony.com/doc/current/cookbook/upgrade/major_version.html#deprecations-in-phpunit
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-->
</php> </php>
<filter> <filter>