aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-01-14 14:10:33 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-15 09:35:39 +0100
commit1d405d0e62a708928bccd2222ebd89d4804231f9 (patch)
tree70e65eb7d3b550c54f235a1ff1d7ab63b8a9c2e8
parentc38d27d4216bf74d6d3ae8f8f22d68923418ad80 (diff)
downloadwallabag-1d405d0e62a708928bccd2222ebd89d4804231f9.tar.gz
wallabag-1d405d0e62a708928bccd2222ebd89d4804231f9.tar.zst
wallabag-1d405d0e62a708928bccd2222ebd89d4804231f9.zip
Remove some commented code
-rw-r--r--.travis.yml9
-rw-r--r--COPYING.md38
-rw-r--r--CREDITS.md3
-rw-r--r--app/config/config.yml6
-rw-r--r--app/config/config_dev.yml8
-rw-r--r--phpunit.xml.dist6
6 files changed, 20 insertions, 50 deletions
diff --git a/.travis.yml b/.travis.yml
index 287369e3..07d66f88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,17 +43,8 @@ before_script:
43 - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; 43 - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
44 # disable xdebug since we don't use code-coverage for now 44 # disable xdebug since we don't use code-coverage for now
45 - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi 45 - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
46 # build coverage only on one build, to speed up results feedbacks
47 # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
48 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; 46 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
49 47
50script: 48script:
51 - ant prepare-$DB 49 - ant prepare-$DB
52 - bin/phpunit -v 50 - bin/phpunit -v
53
54# after_script:
55 # - |
56 # if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
57 # wget https://scrutinizer-ci.com/ocular.phar
58 # php ocular.phar code-coverage:upload --format=php-clover coverage.clover
59 # fi
diff --git a/COPYING.md b/COPYING.md
index b30299fe..bc5be341 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,19 +1,19 @@
1Copyright (c) 2013-2015 Nicolas Lœuillet 1Copyright (c) 2013-2016 Nicolas Lœuillet
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy 3Permission is hereby granted, free of charge, to any person obtaining a copy
4of this software and associated documentation files (the "Software"), to deal 4of this software and associated documentation files (the "Software"), to deal
5in the Software without restriction, including without limitation the rights 5in the Software without restriction, including without limitation the rights
6to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 6to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7copies of the Software, and to permit persons to whom the Software is furnished 7copies of the Software, and to permit persons to whom the Software is furnished
8to do so, subject to the following conditions: 8to do so, subject to the following conditions:
9 9
10The above copyright notice and this permission notice shall be included in all 10The above copyright notice and this permission notice shall be included in all
11copies or substantial portions of the Software. 11copies or substantial portions of the Software.
12 12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19THE SOFTWARE. 19THE SOFTWARE.
diff --git a/CREDITS.md b/CREDITS.md
index e3916170..eb2096e0 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -2,5 +2,4 @@ wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb)
2 2
3Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r). 3Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
4 4
5Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors 5Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).
6).
diff --git a/app/config/config.yml b/app/config/config.yml
index 5bc16dd9..5fac3192 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -170,14 +170,8 @@ liip_theme:
170 autodetect_theme: wallabag_core.helper.detect_active_theme 170 autodetect_theme: wallabag_core.helper.detect_active_theme
171 171
172 path_patterns: 172 path_patterns:
173 # app_resource:
174 # - %%app_path%%/views/themes/%%current_theme%%/%%template%%
175 # - %%app_path%%/views/%%template%%
176 bundle_resource: 173 bundle_resource:
177 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% 174 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
178 # bundle_resource_dir:
179 # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
180 # - %%dir%%/views/%%bundle_name%%/%%override_path%%
181 175
182fos_user: 176fos_user:
183 db_driver: orm 177 db_driver: orm
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 205e0f66..116dd0d5 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -32,14 +32,6 @@ monolog:
32 VERBOSITY_VERY_VERBOSE: NOTICE 32 VERBOSITY_VERY_VERBOSE: NOTICE
33 VERBOSITY_DEBUG: DEBUG 33 VERBOSITY_DEBUG: DEBUG
34 channels: ["doctrine"] 34 channels: ["doctrine"]
35 # uncomment to get logging in your browser
36 # you may have to allow bigger header sizes in your Web server configuration
37 #firephp:
38 # type: firephp
39 # level: info
40 #chromephp:
41 # type: chromephp
42 # level: info
43 35
44assetic: 36assetic:
45 use_controller: true 37 use_controller: true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 85fa964b..0e8cc8eb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -20,12 +20,6 @@
20 20
21 <php> 21 <php>
22 <server name="KERNEL_DIR" value="./app/" /> 22 <server name="KERNEL_DIR" value="./app/" />
23 <!--
24 Avoid tests to fail because of deprecated stuff
25 see: http://symfony.com/doc/current/cookbook/upgrade/major_version.html#deprecations-in-phpunit
26
27 <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
28 -->
29 </php> 23 </php>
30 24
31 <filter> 25 <filter>