aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore23
-rw-r--r--.travis.yml11
-rw-r--r--COPYING.md38
-rw-r--r--CREDITS.md3
-rw-r--r--README.md7
-rw-r--r--app/AppCache.php2
-rw-r--r--app/AppKernel.php23
-rw-r--r--app/autoload.php2
-rw-r--r--app/config/config.yml15
-rw-r--r--app/config/config_dev.yml13
-rw-r--r--app/config/routing.yml2
-rw-r--r--app/config/routing_dev.yml6
-rw-r--r--app/config/security.yml9
-rwxr-xr-xbin/console (renamed from app/console)18
l---------bin/doctrine1
l---------bin/doctrine-dbal1
l---------bin/doctrine-migrations1
l---------bin/doctrine.php1
-rw-r--r--bin/poche.sqlitebin393216 -> 0 bytes
l---------bin/security-checker1
-rwxr-xr-x[-rw-r--r--]bin/symfony_requirements (renamed from app/check.php)9
-rw-r--r--build.xml18
-rw-r--r--composer.json71
-rw-r--r--composer.lock1231
-rw-r--r--phpunit.xml.dist21
-rw-r--r--src/Wallabag/ApiBundle/Controller/WallabagRestController.php7
-rw-r--r--src/Wallabag/ApiBundle/Entity/AccessToken.php2
-rw-r--r--src/Wallabag/ApiBundle/Entity/AuthCode.php2
-rw-r--r--src/Wallabag/ApiBundle/Entity/Client.php2
-rw-r--r--src/Wallabag/ApiBundle/Entity/RefreshToken.php2
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php10
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php21
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php14
-rw-r--r--src/Wallabag/CoreBundle/Controller/RssController.php8
-rw-r--r--src/Wallabag/CoreBundle/Controller/TagController.php6
-rw-r--r--src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php4
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Tag.php4
-rw-r--r--src/Wallabag/CoreBundle/Entity/TaggingRule.php2
-rw-r--r--src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php2
-rw-r--r--src/Wallabag/CoreBundle/EventListener/LocaleListener.php2
-rw-r--r--src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php4
-rw-r--r--src/Wallabag/CoreBundle/Filter/EntryFilterType.php48
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php13
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php13
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EditEntryType.php11
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/NewEntryType.php8
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/NewTagType.php8
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/NewUserType.php17
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/RssType.php5
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php10
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/UserInformationType.php16
-rw-r--r--src/Wallabag/CoreBundle/Helper/EntriesExport.php6
-rw-r--r--src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php2
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml40
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriber.php2
-rw-r--r--src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php12
-rw-r--r--src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php6
-rw-r--r--src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php6
-rw-r--r--src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php6
-rw-r--r--src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php2
-rw-r--r--src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php2
-rw-r--r--src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php2
-rw-r--r--src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php4
-rw-r--r--src/Wallabag/ImportBundle/Controller/PocketController.php5
-rw-r--r--src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php2
-rw-r--r--src/Wallabag/ImportBundle/Form/Type/UploadImportType.php8
-rw-r--r--src/Wallabag/UserBundle/Controller/ResettingController.php6
-rw-r--r--src/Wallabag/UserBundle/Entity/User.php6
-rw-r--r--src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig2
-rw-r--r--src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig2
-rw-r--r--src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig2
-rw-r--r--src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig2
-rw-r--r--src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig2
-rw-r--r--var/SymfonyRequirements.php (renamed from app/SymfonyRequirements.php)0
-rw-r--r--var/cache/.gitkeep (renamed from app/logs/.gitkeep)0
-rw-r--r--var/logs/.gitkeep0
-rw-r--r--var/sessions/.gitkeep0
-rw-r--r--web/.htaccess22
-rw-r--r--web/app.php12
-rw-r--r--web/app_dev.php12
-rw-r--r--web/robots.txt4
83 files changed, 1280 insertions, 669 deletions
diff --git a/.gitignore b/.gitignore
index f88370d7..b6d6aa5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,20 @@
1# Cache and logs (Symfony2) 1# Cache, logs & sessions
2/app/cache/* 2/var/*
3/app/logs/* 3!/var/cache
4!app/cache/.gitkeep
5!app/logs/.gitkeep
6
7# Cache and logs (Symfony3)
8/var/cache/* 4/var/cache/*
9/var/logs/*
10!var/cache/.gitkeep 5!var/cache/.gitkeep
6!/var/logs
7/var/logs/*
11!var/logs/.gitkeep 8!var/logs/.gitkeep
9!/var/sessions
10/var/sessions/*
11!var/sessions/.gitkeep
12!var/SymfonyRequirements.php
12 13
13# Parameters 14# Parameters
14/app/config/parameters.yml 15/app/config/parameters.yml
15/app/config/parameters.ini
16 16
17# Managed by Composer 17# Managed by Composer
18/app/bootstrap.php.cache
19/var/bootstrap.php.cache
20/bin/*
21!bin/console
22!bin/symfony_requirements
23/vendor/ 18/vendor/
24 19
25# Assets and user uploads 20# Assets and user uploads
diff --git a/.travis.yml b/.travis.yml
index 7a7c9056..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 - SYMFONY_DEPRECATIONS_HELPER=weak 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/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/app/AppCache.php b/app/AppCache.php
index ddb51db0..639ec2cd 100644
--- a/app/AppCache.php
+++ b/app/AppCache.php
@@ -1,7 +1,5 @@
1<?php 1<?php
2 2
3require_once __DIR__.'/AppKernel.php';
4
5use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache; 3use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
6 4
7class AppCache extends HttpCache 5class AppCache extends HttpCache
diff --git a/app/AppKernel.php b/app/AppKernel.php
index d2aa8d1c..7e76a9e9 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -7,7 +7,7 @@ class AppKernel extends Kernel
7{ 7{
8 public function registerBundles() 8 public function registerBundles()
9 { 9 {
10 $bundles = array( 10 $bundles = [
11 new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), 11 new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
12 new Symfony\Bundle\SecurityBundle\SecurityBundle(), 12 new Symfony\Bundle\SecurityBundle\SecurityBundle(),
13 new Symfony\Bundle\TwigBundle\TwigBundle(), 13 new Symfony\Bundle\TwigBundle\TwigBundle(),
@@ -33,9 +33,9 @@ class AppKernel extends Kernel
33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(), 33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
34 new Wallabag\ImportBundle\WallabagImportBundle(), 34 new Wallabag\ImportBundle\WallabagImportBundle(),
35 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), 35 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
36 ); 36 ];
37 37
38 if (in_array($this->getEnvironment(), array('dev', 'test'))) { 38 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
39 $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); 39 $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
40 $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); 40 $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
41 $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); 41 $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
@@ -46,8 +46,23 @@ class AppKernel extends Kernel
46 return $bundles; 46 return $bundles;
47 } 47 }
48 48
49 public function getRootDir()
50 {
51 return __DIR__;
52 }
53
54 public function getCacheDir()
55 {
56 return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
57 }
58
59 public function getLogDir()
60 {
61 return dirname(__DIR__).'/var/logs';
62 }
63
49 public function registerContainerConfiguration(LoaderInterface $loader) 64 public function registerContainerConfiguration(LoaderInterface $loader)
50 { 65 {
51 $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); 66 $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
52 } 67 }
53} 68}
diff --git a/app/autoload.php b/app/autoload.php
index 70526bb5..fa582ecd 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -8,6 +8,6 @@ use Composer\Autoload\ClassLoader;
8 */ 8 */
9$loader = require __DIR__.'/../vendor/autoload.php'; 9$loader = require __DIR__.'/../vendor/autoload.php';
10 10
11AnnotationRegistry::registerLoader(array($loader, 'loadClass')); 11AnnotationRegistry::registerLoader([$loader, 'loadClass']);
12 12
13return $loader; 13return $loader;
diff --git a/app/config/config.yml b/app/config/config.yml
index 8e9369c2..19e7155d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -21,9 +21,11 @@ framework:
21 trusted_proxies: ~ 21 trusted_proxies: ~
22 session: 22 session:
23 # handler_id set to null will use default session handler from php.ini 23 # handler_id set to null will use default session handler from php.ini
24 handler_id: ~ 24 handler_id: session.handler.native_file
25 save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
25 fragments: ~ 26 fragments: ~
26 http_method_override: true 27 http_method_override: true
28 assets: ~
27 29
28wallabag_core: 30wallabag_core:
29 languages: 31 languages:
@@ -59,9 +61,8 @@ twig:
59 warning_message: %warning_message% 61 warning_message: %warning_message%
60 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 62 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
61 flattr_url: "https://flattr.com/thing/1265480" 63 flattr_url: "https://flattr.com/thing/1265480"
62 form: 64 form_themes:
63 resources: 65 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
64 - LexikFormFilterBundle:Form:form_div_layout.html.twig
65 66
66# Assetic Configuration 67# Assetic Configuration
67assetic: 68assetic:
@@ -171,14 +172,8 @@ liip_theme:
171 autodetect_theme: wallabag_core.helper.detect_active_theme 172 autodetect_theme: wallabag_core.helper.detect_active_theme
172 173
173 path_patterns: 174 path_patterns:
174 # app_resource:
175 # - %%app_path%%/views/themes/%%current_theme%%/%%template%%
176 # - %%app_path%%/views/%%template%%
177 bundle_resource: 175 bundle_resource:
178 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% 176 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
179 # bundle_resource_dir:
180 # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
181 # - %%dir%%/views/%%bundle_name%%/%%override_path%%
182 177
183fos_user: 178fos_user:
184 db_driver: orm 179 db_driver: orm
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 205e0f66..6b077fdb 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -17,13 +17,14 @@ monolog:
17 type: stream 17 type: stream
18 path: "%kernel.logs_dir%/%kernel.environment%.log" 18 path: "%kernel.logs_dir%/%kernel.environment%.log"
19 level: debug 19 level: debug
20 channels: [!event]
20 console: 21 console:
21 type: console 22 type: console
22 bubble: false 23 bubble: false
23 verbosity_levels: 24 verbosity_levels:
24 VERBOSITY_VERBOSE: INFO 25 VERBOSITY_VERBOSE: INFO
25 VERBOSITY_VERY_VERBOSE: DEBUG 26 VERBOSITY_VERY_VERBOSE: DEBUG
26 channels: ["!doctrine"] 27 channels: [!event, !doctrine]
27 console_very_verbose: 28 console_very_verbose:
28 type: console 29 type: console
29 bubble: false 30 bubble: false
@@ -31,15 +32,7 @@ monolog:
31 VERBOSITY_VERBOSE: NOTICE 32 VERBOSITY_VERBOSE: NOTICE
32 VERBOSITY_VERY_VERBOSE: NOTICE 33 VERBOSITY_VERY_VERBOSE: NOTICE
33 VERBOSITY_DEBUG: DEBUG 34 VERBOSITY_DEBUG: DEBUG
34 channels: ["doctrine"] 35 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 36
44assetic: 37assetic:
45 use_controller: true 38 use_controller: true
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 1ca2f677..84b98d23 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -8,7 +8,7 @@ wallabag_api:
8 prefix: / 8 prefix: /
9 9
10app: 10app:
11 resource: @WallabagCoreBundle/Controller/ 11 resource: "@WallabagCoreBundle/Controller/"
12 type: annotation 12 type: annotation
13 13
14doc-api: 14doc-api:
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
index 1a236e28..404f6a3b 100644
--- a/app/config/routing_dev.yml
+++ b/app/config/routing_dev.yml
@@ -6,13 +6,9 @@ _profiler:
6 resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" 6 resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
7 prefix: /_profiler 7 prefix: /_profiler
8 8
9_configurator:
10 resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
11 prefix: /_configurator
12
13_errors: 9_errors:
14 resource: "@TwigBundle/Resources/config/routing/errors.xml" 10 resource: "@TwigBundle/Resources/config/routing/errors.xml"
15 prefix: /_error 11 prefix: /_error
16 12
17_main: 13_main:
18 resource: routing.yml \ No newline at end of file 14 resource: routing.yml
diff --git a/app/config/security.yml b/app/config/security.yml
index 576cfd25..a99a7d80 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -15,6 +15,11 @@ security:
15 # the main part of the security, where you can set up firewalls 15 # the main part of the security, where you can set up firewalls
16 # for specific sections of your app 16 # for specific sections of your app
17 firewalls: 17 firewalls:
18 # disables authentication for assets and the profiler, adapt it according to your needs
19 dev:
20 pattern: ^/(_(profiler|wdt)|css|images|js)/
21 security: false
22
18 oauth_token: 23 oauth_token:
19 pattern: ^/oauth/v2/token 24 pattern: ^/oauth/v2/token
20 security: false 25 security: false
@@ -33,11 +38,11 @@ security:
33 pattern: ^/ 38 pattern: ^/
34 form_login: 39 form_login:
35 provider: fos_userbundle 40 provider: fos_userbundle
36 csrf_provider: security.csrf.token_manager 41 csrf_token_generator: security.csrf.token_manager
37 42
38 anonymous: true 43 anonymous: true
39 remember_me: 44 remember_me:
40 key: "%secret%" 45 secret: "%secret%"
41 lifetime: 31536000 46 lifetime: 31536000
42 path: / 47 path: /
43 domain: ~ 48 domain: ~
diff --git a/app/console b/bin/console
index fa6a36e2..49247c94 100755
--- a/app/console
+++ b/bin/console
@@ -1,22 +1,24 @@
1#!/usr/bin/env php 1#!/usr/bin/env php
2<?php 2<?php
3 3
4use Symfony\Bundle\FrameworkBundle\Console\Application;
5use Symfony\Component\Console\Input\ArgvInput;
6use Symfony\Component\Debug\Debug;
7
4// if you don't want to setup permissions the proper way, just uncomment the following PHP line 8// if you don't want to setup permissions the proper way, just uncomment the following PHP line
5// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information 9// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
6//umask(0000); 10//umask(0000);
7 11
8set_time_limit(0); 12set_time_limit(0);
9 13
10require_once __DIR__.'/bootstrap.php.cache'; 14/**
11require_once __DIR__.'/AppKernel.php'; 15 * @var Composer\Autoload\ClassLoader $loader
12 16 */
13use Symfony\Bundle\FrameworkBundle\Console\Application; 17$loader = require __DIR__.'/../app/autoload.php';
14use Symfony\Component\Console\Input\ArgvInput;
15use Symfony\Component\Debug\Debug;
16 18
17$input = new ArgvInput(); 19$input = new ArgvInput();
18$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); 20$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
19$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; 21$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
20 22
21if ($debug) { 23if ($debug) {
22 Debug::enable(); 24 Debug::enable();
diff --git a/bin/doctrine b/bin/doctrine
new file mode 120000
index 00000000..0f72e36f
--- /dev/null
+++ b/bin/doctrine
@@ -0,0 +1 @@
../vendor/doctrine/orm/bin/doctrine \ No newline at end of file
diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal
new file mode 120000
index 00000000..110e93c5
--- /dev/null
+++ b/bin/doctrine-dbal
@@ -0,0 +1 @@
../vendor/doctrine/dbal/bin/doctrine-dbal \ No newline at end of file
diff --git a/bin/doctrine-migrations b/bin/doctrine-migrations
new file mode 120000
index 00000000..7184da71
--- /dev/null
+++ b/bin/doctrine-migrations
@@ -0,0 +1 @@
../vendor/doctrine/migrations/bin/doctrine-migrations \ No newline at end of file
diff --git a/bin/doctrine.php b/bin/doctrine.php
new file mode 120000
index 00000000..b22b74da
--- /dev/null
+++ b/bin/doctrine.php
@@ -0,0 +1 @@
../vendor/doctrine/orm/bin/doctrine.php \ No newline at end of file
diff --git a/bin/poche.sqlite b/bin/poche.sqlite
deleted file mode 100644
index f2b79b68..00000000
--- a/bin/poche.sqlite
+++ /dev/null
Binary files differ
diff --git a/bin/security-checker b/bin/security-checker
new file mode 120000
index 00000000..85f6e8ed
--- /dev/null
+++ b/bin/security-checker
@@ -0,0 +1 @@
../vendor/sensiolabs/security-checker/security-checker \ No newline at end of file
diff --git a/app/check.php b/bin/symfony_requirements
index 60ae0a8b..1eca6719 100644..100755
--- a/app/check.php
+++ b/bin/symfony_requirements
@@ -1,6 +1,7 @@
1#!/usr/bin/env php
1<?php 2<?php
2 3
3require_once dirname(__FILE__).'/SymfonyRequirements.php'; 4require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
4 5
5$lineSize = 70; 6$lineSize = 70;
6$symfonyRequirements = new SymfonyRequirements(); 7$symfonyRequirements = new SymfonyRequirements();
@@ -80,7 +81,7 @@ function get_error_message(Requirement $requirement, $lineSize)
80 return; 81 return;
81 } 82 }
82 83
83 $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; 84 $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
84 $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; 85 $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL;
85 86
86 return $errorMessage; 87 return $errorMessage;
@@ -121,8 +122,8 @@ function echo_block($style, $title, $message)
121 echo PHP_EOL.PHP_EOL; 122 echo PHP_EOL.PHP_EOL;
122 123
123 echo_style($style, str_repeat(' ', $width).PHP_EOL); 124 echo_style($style, str_repeat(' ', $width).PHP_EOL);
124 echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); 125 echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
125 echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); 126 echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
126 echo_style($style, str_repeat(' ', $width).PHP_EOL); 127 echo_style($style, str_repeat(' ', $width).PHP_EOL);
127} 128}
128 129
diff --git a/build.xml b/build.xml
index 110011e8..ab8cac29 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
6 <target name="prepare-pgsql" depends="clean,composer,db_pgsql,prepare"/> 6 <target name="prepare-pgsql" depends="clean,composer,db_pgsql,prepare"/>
7 7
8 <target name="clean" description="Cleanup build artifacts"> 8 <target name="clean" description="Cleanup build artifacts">
9 <delete dir="${basedir}/app/cache"/> 9 <delete dir="${basedir}/var/cache"/>
10 </target> 10 </target>
11 11
12 <target name="composer" description="Install deps using Composer"> 12 <target name="composer" description="Install deps using Composer">
@@ -19,28 +19,28 @@
19 19
20 <target name="prepare" description="Prepare for build"> 20 <target name="prepare" description="Prepare for build">
21 <exec executable="php"> 21 <exec executable="php">
22 <arg value="${basedir}/app/console"/> 22 <arg value="${basedir}/bin/console"/>
23 <arg value="doctrine:database:drop"/> 23 <arg value="doctrine:database:drop"/>
24 <arg value="--force"/> 24 <arg value="--force"/>
25 <arg value="--env=test"/> 25 <arg value="--env=test"/>
26 </exec> 26 </exec>
27 <exec executable="php"> 27 <exec executable="php">
28 <arg value="${basedir}/app/console"/> 28 <arg value="${basedir}/bin/console"/>
29 <arg value="doctrine:database:create"/> 29 <arg value="doctrine:database:create"/>
30 <arg value="--env=test"/> 30 <arg value="--env=test"/>
31 </exec> 31 </exec>
32 <exec executable="php"> 32 <exec executable="php">
33 <arg value="${basedir}/app/console"/> 33 <arg value="${basedir}/bin/console"/>
34 <arg value="doctrine:schema:create"/> 34 <arg value="doctrine:schema:create"/>
35 <arg value="--env=test"/> 35 <arg value="--env=test"/>
36 </exec> 36 </exec>
37 <exec executable="php"> 37 <exec executable="php">
38 <arg value="${basedir}/app/console"/> 38 <arg value="${basedir}/bin/console"/>
39 <arg value="cache:clear"/> 39 <arg value="cache:clear"/>
40 <arg value="--env=test"/> 40 <arg value="--env=test"/>
41 </exec> 41 </exec>
42 <exec executable="php"> 42 <exec executable="php">
43 <arg value="${basedir}/app/console"/> 43 <arg value="${basedir}/bin/console"/>
44 <arg value="doctrine:fixtures:load"/> 44 <arg value="doctrine:fixtures:load"/>
45 <arg value="--no-interaction"/> 45 <arg value="--no-interaction"/>
46 <arg value="--env=test"/> 46 <arg value="--env=test"/>
@@ -55,7 +55,7 @@
55 </exec> 55 </exec>
56 56
57 <exec executable="php"> 57 <exec executable="php">
58 <arg value="${basedir}/app/console"/> 58 <arg value="${basedir}/bin/console"/>
59 <arg value="cache:clear"/> 59 <arg value="cache:clear"/>
60 <arg value="--env=test"/> 60 <arg value="--env=test"/>
61 </exec> 61 </exec>
@@ -69,7 +69,7 @@
69 </exec> 69 </exec>
70 70
71 <exec executable="php"> 71 <exec executable="php">
72 <arg value="${basedir}/app/console"/> 72 <arg value="${basedir}/bin/console"/>
73 <arg value="cache:clear"/> 73 <arg value="cache:clear"/>
74 <arg value="--env=test"/> 74 <arg value="--env=test"/>
75 </exec> 75 </exec>
@@ -83,7 +83,7 @@
83 </exec> 83 </exec>
84 84
85 <exec executable="php"> 85 <exec executable="php">
86 <arg value="${basedir}/app/console"/> 86 <arg value="${basedir}/bin/console"/>
87 <arg value="cache:clear"/> 87 <arg value="cache:clear"/>
88 <arg value="--env=test"/> 88 <arg value="--env=test"/>
89 </exec> 89 </exec>
diff --git a/composer.json b/composer.json
index 3300c0fb..78b32307 100644
--- a/composer.json
+++ b/composer.json
@@ -28,35 +28,36 @@
28 "issues": "https://github.com/wallabag/wallabag/issues" 28 "issues": "https://github.com/wallabag/wallabag/issues"
29 }, 29 },
30 "require": { 30 "require": {
31 "php": ">=5.5.0", 31 "php": ">=5.5.9",
32 "symfony/symfony": "~2.7.0", 32 "symfony/symfony": "3.0.*",
33 "doctrine/orm": "~2.3", 33 "doctrine/orm": "^2.5",
34 "doctrine/doctrine-bundle": "1.5.2", 34 "doctrine/doctrine-bundle": "^1.6",
35 "doctrine/doctrine-cache-bundle": "^1.2",
35 "twig/extensions": "~1.0", 36 "twig/extensions": "~1.0",
36 "symfony/assetic-bundle": "~2.3", 37 "symfony/assetic-bundle": "~2.3",
37 "symfony/swiftmailer-bundle": "~2.3", 38 "symfony/swiftmailer-bundle": "^2.3",
38 "symfony/monolog-bundle": "~2.4", 39 "symfony/monolog-bundle": "^2.8",
39 "sensio/distribution-bundle": "~3.0.12", 40 "sensio/distribution-bundle": "^5.0",
40 "sensio/framework-extra-bundle": "~3.0", 41 "sensio/framework-extra-bundle": "^3.0.2",
41 "incenteev/composer-parameter-handler": "~2.0", 42 "incenteev/composer-parameter-handler": "^2.0",
42 "nelmio/cors-bundle": "~1.4.0", 43 "nelmio/cors-bundle": "~1.4.0",
43 "friendsofsymfony/rest-bundle": "~1.4", 44 "friendsofsymfony/rest-bundle": "~1.4",
44 "jms/serializer-bundle": "~0.13", 45 "jms/serializer-bundle": "~1.0",
45 "nelmio/api-doc-bundle": "~2.7", 46 "nelmio/api-doc-bundle": "~2.7",
46 "ezyang/htmlpurifier": "~4.6", 47 "ezyang/htmlpurifier": "~4.6",
47 "mgargano/simplehtmldom": "~1.5", 48 "mgargano/simplehtmldom": "~1.5",
48 "tecnickcom/tcpdf": "~6.2", 49 "tecnickcom/tcpdf": "~6.2",
49 "simplepie/simplepie": "~1.3.1", 50 "simplepie/simplepie": "~1.3.1",
50 "willdurand/hateoas-bundle": "~0.5.0", 51 "willdurand/hateoas-bundle": "~1.0",
51 "htmlawed/htmlawed": "~1.1.19", 52 "htmlawed/htmlawed": "~1.1.19",
52 "liip/theme-bundle": "~1.1.3", 53 "liip/theme-bundle": "~1.1",
53 "pagerfanta/pagerfanta": "~1.0.3", 54 "pagerfanta/pagerfanta": "~1.0.3",
54 "lexik/form-filter-bundle": "~4.0", 55 "lexik/form-filter-bundle": "~5.0",
55 "j0k3r/graby": "~1.0", 56 "j0k3r/graby": "~1.0",
56 "friendsofsymfony/user-bundle": "dev-master", 57 "friendsofsymfony/user-bundle": "dev-master",
57 "friendsofsymfony/oauth-server-bundle": "^1.4@dev", 58 "friendsofsymfony/oauth-server-bundle": "^1.5@dev",
58 "stof/doctrine-extensions-bundle": "^1.2@dev", 59 "stof/doctrine-extensions-bundle": "^1.2@dev",
59 "scheb/two-factor-bundle": "~1.4.0", 60 "scheb/two-factor-bundle": "~2.0",
60 "grandt/phpepub": "~4.0", 61 "grandt/phpepub": "~4.0",
61 "wallabag/php-mobi": "~1.0.0", 62 "wallabag/php-mobi": "~1.0.0",
62 "kphoen/rulerz-bundle": "~0.10", 63 "kphoen/rulerz-bundle": "~0.10",
@@ -64,39 +65,36 @@
64 "doctrine/doctrine-migrations-bundle": "^1.0" 65 "doctrine/doctrine-migrations-bundle": "^1.0"
65 }, 66 },
66 "require-dev": { 67 "require-dev": {
67 "doctrine/doctrine-fixtures-bundle": "~2.2.0", 68 "doctrine/doctrine-fixtures-bundle": "~2.2",
68 "sensio/generator-bundle": "~2.5", 69 "sensio/generator-bundle": "^3.0",
69 "phpunit/phpunit": "~4.4", 70 "phpunit/phpunit": "~4.4",
70 "symfony/phpunit-bridge": "~2.7.0" 71 "symfony/phpunit-bridge": "^2.7"
71 }, 72 },
72 "repositories": [
73 {
74 "type": "vcs",
75 "url": "https://github.com/wallabag/phpMobi"
76 }
77 ],
78 "scripts": { 73 "scripts": {
79 "post-install-cmd": [ 74 "build-parameters": [
80 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", 75 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
81 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
82 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
83 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
84 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
85 ], 76 ],
86 "post-update-cmd": [ 77 "post-cmd": [
87 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", 78 "@build-parameters",
88 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", 79 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
89 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", 80 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
90 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", 81 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
91 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" 82 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
83 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
92 ], 84 ],
93 "build-parameters": [ 85 "post-install-cmd": [
94 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters" 86 "@post-cmd"
87 ],
88 "post-update-cmd": [
89 "@post-cmd"
95 ] 90 ]
96 }, 91 },
97 "extra": { 92 "extra": {
98 "symfony-app-dir": "app", 93 "symfony-app-dir": "app",
94 "symfony-bin-dir": "bin",
95 "symfony-var-dir": "var",
99 "symfony-web-dir": "web", 96 "symfony-web-dir": "web",
97 "symfony-tests-dir": "tests",
100 "symfony-assets-install": "relative", 98 "symfony-assets-install": "relative",
101 "incenteev-parameters": { 99 "incenteev-parameters": {
102 "file": "app/config/parameters.yml", 100 "file": "app/config/parameters.yml",
@@ -109,7 +107,8 @@
109 } 107 }
110 }, 108 },
111 "autoload": { 109 "autoload": {
112 "psr-0": { "": "src/" } 110 "psr-4": { "": "src/" },
111 "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
113 }, 112 },
114 "config": { 113 "config": {
115 "bin-dir": "bin" 114 "bin-dir": "bin"
diff --git a/composer.lock b/composer.lock
index f47e8574..842b749d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "e738598a939db93e1c63d4aca980e42b", 7 "hash": "084bbfd3166c16fd6bb6feb2c954a9da",
8 "content-hash": "19dffb1d7e701242746aea4ca17cebc2", 8 "content-hash": "9352d3c7f307a23d5fec42c350ea0653",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "behat/transliterator", 11 "name": "behat/transliterator",
@@ -397,16 +397,16 @@
397 }, 397 },
398 { 398 {
399 "name": "doctrine/doctrine-bundle", 399 "name": "doctrine/doctrine-bundle",
400 "version": "v1.5.2", 400 "version": "1.6.1",
401 "source": { 401 "source": {
402 "type": "git", 402 "type": "git",
403 "url": "https://github.com/doctrine/DoctrineBundle.git", 403 "url": "https://github.com/doctrine/DoctrineBundle.git",
404 "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3" 404 "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b"
405 }, 405 },
406 "dist": { 406 "dist": {
407 "type": "zip", 407 "type": "zip",
408 "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", 408 "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b",
409 "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", 409 "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b",
410 "shasum": "" 410 "shasum": ""
411 }, 411 },
412 "require": { 412 "require": {
@@ -471,7 +471,7 @@
471 "orm", 471 "orm",
472 "persistence" 472 "persistence"
473 ], 473 ],
474 "time": "2015-08-31 14:47:06" 474 "time": "2015-11-16 17:11:46"
475 }, 475 },
476 { 476 {
477 "name": "doctrine/doctrine-cache-bundle", 477 "name": "doctrine/doctrine-cache-bundle",
@@ -983,32 +983,33 @@
983 }, 983 },
984 { 984 {
985 "name": "friendsofsymfony/oauth-server-bundle", 985 "name": "friendsofsymfony/oauth-server-bundle",
986 "version": "1.4.2", 986 "version": "1.5.0-BETA",
987 "target-dir": "FOS/OAuthServerBundle",
988 "source": { 987 "source": {
989 "type": "git", 988 "type": "git",
990 "url": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle.git", 989 "url": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle.git",
991 "reference": "9e15c229eff547443d686445d629e9356ab0672e" 990 "reference": "a67c26e3a37cd6a63f75e2607418dd9247ed741b"
992 }, 991 },
993 "dist": { 992 "dist": {
994 "type": "zip", 993 "type": "zip",
995 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSOAuthServerBundle/zipball/9e15c229eff547443d686445d629e9356ab0672e", 994 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSOAuthServerBundle/zipball/a67c26e3a37cd6a63f75e2607418dd9247ed741b",
996 "reference": "9e15c229eff547443d686445d629e9356ab0672e", 995 "reference": "a67c26e3a37cd6a63f75e2607418dd9247ed741b",
997 "shasum": "" 996 "shasum": ""
998 }, 997 },
999 "require": { 998 "require": {
1000 "friendsofsymfony/oauth2-php": "~1.1.0", 999 "friendsofsymfony/oauth2-php": "~1.1",
1001 "php": ">=5.3.3", 1000 "php": ">=5.3.3",
1002 "symfony/framework-bundle": "~2.1", 1001 "symfony/framework-bundle": "~2.2|~3.0",
1003 "symfony/security-bundle": "~2.1" 1002 "symfony/security-bundle": "~2.1|~3.0"
1004 }, 1003 },
1005 "require-dev": { 1004 "require-dev": {
1006 "doctrine/doctrine-bundle": "~1.0", 1005 "doctrine/doctrine-bundle": "~1.0",
1007 "doctrine/mongodb-odm": "1.0.*@dev", 1006 "doctrine/mongodb-odm": "~1.0",
1008 "doctrine/orm": ">=2.2,<2.5-dev", 1007 "doctrine/orm": "~2.2",
1009 "symfony/class-loader": "~2.1", 1008 "phing/phing": "~2.4",
1010 "symfony/yaml": "~2.1", 1009 "propel/propel1": "^1.6.5",
1011 "willdurand/propel-typehintable-behavior": "1.0.*" 1010 "symfony/class-loader": "~2.1|~3.0",
1011 "symfony/yaml": "~2.1|~3.0",
1012 "willdurand/propel-typehintable-behavior": "^1.0.4"
1012 }, 1013 },
1013 "suggest": { 1014 "suggest": {
1014 "doctrine/doctrine-bundle": "*", 1015 "doctrine/doctrine-bundle": "*",
@@ -1019,12 +1020,12 @@
1019 "type": "symfony-bundle", 1020 "type": "symfony-bundle",
1020 "extra": { 1021 "extra": {
1021 "branch-alias": { 1022 "branch-alias": {
1022 "dev-master": "1.4-dev" 1023 "dev-master": "1.5-dev"
1023 } 1024 }
1024 }, 1025 },
1025 "autoload": { 1026 "autoload": {
1026 "psr-0": { 1027 "psr-4": {
1027 "FOS\\OAuthServerBundle": "" 1028 "FOS\\OAuthServerBundle\\": ""
1028 } 1029 }
1029 }, 1030 },
1030 "notification-url": "https://packagist.org/downloads/", 1031 "notification-url": "https://packagist.org/downloads/",
@@ -1048,25 +1049,25 @@
1048 "oauth2", 1049 "oauth2",
1049 "server" 1050 "server"
1050 ], 1051 ],
1051 "time": "2014-10-31 13:44:14" 1052 "time": "2016-01-14 12:20:34"
1052 }, 1053 },
1053 { 1054 {
1054 "name": "friendsofsymfony/oauth2-php", 1055 "name": "friendsofsymfony/oauth2-php",
1055 "version": "1.1.1", 1056 "version": "1.2.0",
1056 "source": { 1057 "source": {
1057 "type": "git", 1058 "type": "git",
1058 "url": "https://github.com/FriendsOfSymfony/oauth2-php.git", 1059 "url": "https://github.com/FriendsOfSymfony/oauth2-php.git",
1059 "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310" 1060 "reference": "4ae0a2aa85566146ef6f0f7169854c49e0c9243a"
1060 }, 1061 },
1061 "dist": { 1062 "dist": {
1062 "type": "zip", 1063 "type": "zip",
1063 "url": "https://api.github.com/repos/FriendsOfSymfony/oauth2-php/zipball/23e76537c4a02e666ab4ba5abe67a69a886a0310", 1064 "url": "https://api.github.com/repos/FriendsOfSymfony/oauth2-php/zipball/4ae0a2aa85566146ef6f0f7169854c49e0c9243a",
1064 "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310", 1065 "reference": "4ae0a2aa85566146ef6f0f7169854c49e0c9243a",
1065 "shasum": "" 1066 "shasum": ""
1066 }, 1067 },
1067 "require": { 1068 "require": {
1068 "php": ">=5.3.2", 1069 "php": ">=5.3.2",
1069 "symfony/http-foundation": "~2.0" 1070 "symfony/http-foundation": "~2.0|~3.0"
1070 }, 1071 },
1071 "require-dev": { 1072 "require-dev": {
1072 "phpunit/phpunit": "~4.0" 1073 "phpunit/phpunit": "~4.0"
@@ -1102,7 +1103,7 @@
1102 "oauth", 1103 "oauth",
1103 "oauth2" 1104 "oauth2"
1104 ], 1105 ],
1105 "time": "2014-11-03 10:21:20" 1106 "time": "2015-12-21 11:32:17"
1106 }, 1107 },
1107 { 1108 {
1108 "name": "friendsofsymfony/rest-bundle", 1109 "name": "friendsofsymfony/rest-bundle",
@@ -1737,34 +1738,36 @@
1737 }, 1738 },
1738 { 1739 {
1739 "name": "hoa/compiler", 1740 "name": "hoa/compiler",
1740 "version": "2.15.10.29", 1741 "version": "3.16.01.14",
1741 "source": { 1742 "source": {
1742 "type": "git", 1743 "type": "git",
1743 "url": "https://github.com/hoaproject/Compiler.git", 1744 "url": "https://github.com/hoaproject/Compiler.git",
1744 "reference": "ec0849fd3c1472fbcd86c3c961981f0cfe1f8d39" 1745 "reference": "a1505e507e8368dbf7a5b490c4a5a90e06d7bd69"
1745 }, 1746 },
1746 "dist": { 1747 "dist": {
1747 "type": "zip", 1748 "type": "zip",
1748 "url": "https://api.github.com/repos/hoaproject/Compiler/zipball/ec0849fd3c1472fbcd86c3c961981f0cfe1f8d39", 1749 "url": "https://api.github.com/repos/hoaproject/Compiler/zipball/a1505e507e8368dbf7a5b490c4a5a90e06d7bd69",
1749 "reference": "ec0849fd3c1472fbcd86c3c961981f0cfe1f8d39", 1750 "reference": "a1505e507e8368dbf7a5b490c4a5a90e06d7bd69",
1750 "shasum": "" 1751 "shasum": ""
1751 }, 1752 },
1752 "require": { 1753 "require": {
1753 "hoa/core": "~2.0", 1754 "hoa/consistency": "~1.0",
1754 "hoa/file": "~0.0", 1755 "hoa/exception": "~1.0",
1755 "hoa/iterator": "~1.0", 1756 "hoa/file": "~1.0",
1756 "hoa/math": "~0.0", 1757 "hoa/iterator": "~2.0",
1757 "hoa/regex": "~0.0", 1758 "hoa/math": "~1.0",
1758 "hoa/visitor": "~1.0" 1759 "hoa/protocol": "~1.0",
1760 "hoa/regex": "~1.0",
1761 "hoa/visitor": "~2.0"
1759 }, 1762 },
1760 "require-dev": { 1763 "require-dev": {
1761 "hoa/json": "~1.0", 1764 "hoa/json": "~2.0",
1762 "hoa/test": "~1.0" 1765 "hoa/test": "~2.0"
1763 }, 1766 },
1764 "type": "library", 1767 "type": "library",
1765 "extra": { 1768 "extra": {
1766 "branch-alias": { 1769 "branch-alias": {
1767 "dev-master": "2.x-dev" 1770 "dev-master": "3.x-dev"
1768 } 1771 }
1769 }, 1772 },
1770 "autoload": { 1773 "autoload": {
@@ -1813,45 +1816,42 @@
1813 "trace", 1816 "trace",
1814 "uniform" 1817 "uniform"
1815 ], 1818 ],
1816 "time": "2015-10-29 21:35:12" 1819 "time": "2016-01-14 20:44:59"
1817 }, 1820 },
1818 { 1821 {
1819 "name": "hoa/core", 1822 "name": "hoa/consistency",
1820 "version": "2.15.11.09", 1823 "version": "1.16.01.14",
1821 "source": { 1824 "source": {
1822 "type": "git", 1825 "type": "git",
1823 "url": "https://github.com/hoaproject/Core.git", 1826 "url": "https://github.com/hoaproject/Consistency.git",
1824 "reference": "5538b1e90e2c66c90df5cc45e03fb85d047be900" 1827 "reference": "7656b971a8248a8d314ed0c5bb0668936438f62a"
1825 }, 1828 },
1826 "dist": { 1829 "dist": {
1827 "type": "zip", 1830 "type": "zip",
1828 "url": "https://api.github.com/repos/hoaproject/Core/zipball/5538b1e90e2c66c90df5cc45e03fb85d047be900", 1831 "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/7656b971a8248a8d314ed0c5bb0668936438f62a",
1829 "reference": "5538b1e90e2c66c90df5cc45e03fb85d047be900", 1832 "reference": "7656b971a8248a8d314ed0c5bb0668936438f62a",
1830 "shasum": "" 1833 "shasum": ""
1831 }, 1834 },
1832 "require": { 1835 "require": {
1833 "ext-spl": "*", 1836 "hoa/exception": "~1.0",
1834 "php": ">=5.4.0" 1837 "php": ">=5.5.0"
1835 }, 1838 },
1836 "require-dev": { 1839 "require-dev": {
1837 "hoa/test": "~1.0" 1840 "hoa/stream": "~0.0",
1838 }, 1841 "hoa/test": "~2.0"
1839 "suggest": {
1840 "ext-mbstring": "ext/mbstring must be present (or a third implementation).",
1841 "hoa/cli": "To use the `hoa` script."
1842 }, 1842 },
1843 "type": "library", 1843 "type": "library",
1844 "extra": { 1844 "extra": {
1845 "branch-alias": { 1845 "branch-alias": {
1846 "dev-master": "2.x-dev" 1846 "dev-master": "1.x-dev"
1847 } 1847 }
1848 }, 1848 },
1849 "autoload": { 1849 "autoload": {
1850 "psr-4": { 1850 "psr-4": {
1851 "Hoa\\Core\\": "." 1851 "Hoa\\Consistency\\": "."
1852 }, 1852 },
1853 "files": [ 1853 "files": [
1854 "Core.php" 1854 "Prelude.php"
1855 ] 1855 ]
1856 }, 1856 },
1857 "notification-url": "https://packagist.org/downloads/", 1857 "notification-url": "https://packagist.org/downloads/",
@@ -1868,46 +1868,157 @@
1868 "homepage": "http://hoa-project.net/" 1868 "homepage": "http://hoa-project.net/"
1869 } 1869 }
1870 ], 1870 ],
1871 "description": "The Hoa\\Core library.", 1871 "description": "The Hoa\\Consistency library.",
1872 "homepage": "http://hoa-project.net/", 1872 "homepage": "http://hoa-project.net/",
1873 "keywords": [ 1873 "keywords": [
1874 "autoloader",
1875 "callable",
1874 "consistency", 1876 "consistency",
1875 "core", 1877 "entity",
1876 "data", 1878 "flex",
1879 "keyword",
1880 "library"
1881 ],
1882 "time": "2016-01-14 10:26:48"
1883 },
1884 {
1885 "name": "hoa/event",
1886 "version": "1.16.01.11",
1887 "source": {
1888 "type": "git",
1889 "url": "https://github.com/hoaproject/Event.git",
1890 "reference": "4470e090207336c01ea0cc6f9f1fa8832e4d9866"
1891 },
1892 "dist": {
1893 "type": "zip",
1894 "url": "https://api.github.com/repos/hoaproject/Event/zipball/4470e090207336c01ea0cc6f9f1fa8832e4d9866",
1895 "reference": "4470e090207336c01ea0cc6f9f1fa8832e4d9866",
1896 "shasum": ""
1897 },
1898 "require": {
1899 "hoa/consistency": "~1.0",
1900 "hoa/exception": "~1.0"
1901 },
1902 "require-dev": {
1903 "hoa/test": "~2.0"
1904 },
1905 "type": "library",
1906 "extra": {
1907 "branch-alias": {
1908 "dev-master": "1.x-dev"
1909 }
1910 },
1911 "autoload": {
1912 "psr-4": {
1913 "Hoa\\Event\\": "."
1914 }
1915 },
1916 "notification-url": "https://packagist.org/downloads/",
1917 "license": [
1918 "BSD-3-Clause"
1919 ],
1920 "authors": [
1921 {
1922 "name": "Ivan Enderlin",
1923 "email": "ivan.enderlin@hoa-project.net"
1924 },
1925 {
1926 "name": "Hoa community",
1927 "homepage": "http://hoa-project.net/"
1928 }
1929 ],
1930 "description": "The Hoa\\Event library.",
1931 "homepage": "http://hoa-project.net/",
1932 "keywords": [
1877 "event", 1933 "event",
1878 "library", 1934 "library",
1879 "listener", 1935 "listener",
1880 "parameter", 1936 "observer"
1881 "protocol"
1882 ], 1937 ],
1883 "time": "2015-11-09 06:51:06" 1938 "time": "2016-01-11 08:34:41"
1939 },
1940 {
1941 "name": "hoa/exception",
1942 "version": "1.16.01.11",
1943 "source": {
1944 "type": "git",
1945 "url": "https://github.com/hoaproject/Exception.git",
1946 "reference": "fa4a9648aef2c8ca8f4cd543429b24dc8feaa366"
1947 },
1948 "dist": {
1949 "type": "zip",
1950 "url": "https://api.github.com/repos/hoaproject/Exception/zipball/fa4a9648aef2c8ca8f4cd543429b24dc8feaa366",
1951 "reference": "fa4a9648aef2c8ca8f4cd543429b24dc8feaa366",
1952 "shasum": ""
1953 },
1954 "require": {
1955 "hoa/consistency": "~1.0",
1956 "hoa/event": "~1.0"
1957 },
1958 "require-dev": {
1959 "hoa/test": "~2.0"
1960 },
1961 "type": "library",
1962 "extra": {
1963 "branch-alias": {
1964 "dev-master": "1.x-dev"
1965 }
1966 },
1967 "autoload": {
1968 "psr-4": {
1969 "Hoa\\Exception\\": "."
1970 }
1971 },
1972 "notification-url": "https://packagist.org/downloads/",
1973 "license": [
1974 "BSD-3-Clause"
1975 ],
1976 "authors": [
1977 {
1978 "name": "Ivan Enderlin",
1979 "email": "ivan.enderlin@hoa-project.net"
1980 },
1981 {
1982 "name": "Hoa community",
1983 "homepage": "http://hoa-project.net/"
1984 }
1985 ],
1986 "description": "The Hoa\\Exception library.",
1987 "homepage": "http://hoa-project.net/",
1988 "keywords": [
1989 "exception",
1990 "library"
1991 ],
1992 "time": "2016-01-11 08:38:17"
1884 }, 1993 },
1885 { 1994 {
1886 "name": "hoa/file", 1995 "name": "hoa/file",
1887 "version": "0.15.11.09", 1996 "version": "1.16.01.15",
1888 "source": { 1997 "source": {
1889 "type": "git", 1998 "type": "git",
1890 "url": "https://github.com/hoaproject/File.git", 1999 "url": "https://github.com/hoaproject/File.git",
1891 "reference": "f46fe552ff79cb6c93a2ff9c25cfbc134fbd57ee" 2000 "reference": "bc04ddb476bfeee03c2be585fc37a98d2887277b"
1892 }, 2001 },
1893 "dist": { 2002 "dist": {
1894 "type": "zip", 2003 "type": "zip",
1895 "url": "https://api.github.com/repos/hoaproject/File/zipball/f46fe552ff79cb6c93a2ff9c25cfbc134fbd57ee", 2004 "url": "https://api.github.com/repos/hoaproject/File/zipball/bc04ddb476bfeee03c2be585fc37a98d2887277b",
1896 "reference": "f46fe552ff79cb6c93a2ff9c25cfbc134fbd57ee", 2005 "reference": "bc04ddb476bfeee03c2be585fc37a98d2887277b",
1897 "shasum": "" 2006 "shasum": ""
1898 }, 2007 },
1899 "require": { 2008 "require": {
1900 "hoa/core": "~2.0", 2009 "hoa/consistency": "~1.0",
1901 "hoa/iterator": "~1.0", 2010 "hoa/event": "~1.0",
1902 "hoa/stream": "~0.0" 2011 "hoa/exception": "~1.0",
2012 "hoa/iterator": "~2.0",
2013 "hoa/stream": "~1.0"
1903 }, 2014 },
1904 "require-dev": { 2015 "require-dev": {
1905 "hoa/test": "~1.0" 2016 "hoa/test": "~2.0"
1906 }, 2017 },
1907 "type": "library", 2018 "type": "library",
1908 "extra": { 2019 "extra": {
1909 "branch-alias": { 2020 "branch-alias": {
1910 "dev-master": "0.x-dev" 2021 "dev-master": "1.x-dev"
1911 } 2022 }
1912 }, 2023 },
1913 "autoload": { 2024 "autoload": {
@@ -1940,32 +2051,33 @@
1940 "link", 2051 "link",
1941 "temporary" 2052 "temporary"
1942 ], 2053 ],
1943 "time": "2015-11-09 06:55:20" 2054 "time": "2016-01-14 20:55:07"
1944 }, 2055 },
1945 { 2056 {
1946 "name": "hoa/iterator", 2057 "name": "hoa/iterator",
1947 "version": "1.15.10.29", 2058 "version": "2.16.01.11",
1948 "source": { 2059 "source": {
1949 "type": "git", 2060 "type": "git",
1950 "url": "https://github.com/hoaproject/Iterator.git", 2061 "url": "https://github.com/hoaproject/Iterator.git",
1951 "reference": "a64ed9fd62579a34e4450134d6d1abdf77d54435" 2062 "reference": "eed36f2ec8233f494fd4450d570453b9a84736da"
1952 }, 2063 },
1953 "dist": { 2064 "dist": {
1954 "type": "zip", 2065 "type": "zip",
1955 "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/a64ed9fd62579a34e4450134d6d1abdf77d54435", 2066 "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/eed36f2ec8233f494fd4450d570453b9a84736da",
1956 "reference": "a64ed9fd62579a34e4450134d6d1abdf77d54435", 2067 "reference": "eed36f2ec8233f494fd4450d570453b9a84736da",
1957 "shasum": "" 2068 "shasum": ""
1958 }, 2069 },
1959 "require": { 2070 "require": {
1960 "hoa/core": "~2.0" 2071 "hoa/consistency": "~1.0",
2072 "hoa/exception": "~1.0"
1961 }, 2073 },
1962 "require-dev": { 2074 "require-dev": {
1963 "hoa/test": "~1.0" 2075 "hoa/test": "~2.0"
1964 }, 2076 },
1965 "type": "library", 2077 "type": "library",
1966 "extra": { 2078 "extra": {
1967 "branch-alias": { 2079 "branch-alias": {
1968 "dev-master": "1.x-dev" 2080 "dev-master": "2.x-dev"
1969 } 2081 }
1970 }, 2082 },
1971 "autoload": { 2083 "autoload": {
@@ -1993,34 +2105,37 @@
1993 "iterator", 2105 "iterator",
1994 "library" 2106 "library"
1995 ], 2107 ],
1996 "time": "2015-10-29 21:37:16" 2108 "time": "2016-01-11 09:13:46"
1997 }, 2109 },
1998 { 2110 {
1999 "name": "hoa/math", 2111 "name": "hoa/math",
2000 "version": "0.15.10.26", 2112 "version": "1.16.01.15",
2001 "source": { 2113 "source": {
2002 "type": "git", 2114 "type": "git",
2003 "url": "https://github.com/hoaproject/Math.git", 2115 "url": "https://github.com/hoaproject/Math.git",
2004 "reference": "62631c65d9a4f1b8bb4c4a3d6cdff0e8971d684e" 2116 "reference": "218e6b4a42b66094e94cf9cbabf0a4276fece6bf"
2005 }, 2117 },
2006 "dist": { 2118 "dist": {
2007 "type": "zip", 2119 "type": "zip",
2008 "url": "https://api.github.com/repos/hoaproject/Math/zipball/62631c65d9a4f1b8bb4c4a3d6cdff0e8971d684e", 2120 "url": "https://api.github.com/repos/hoaproject/Math/zipball/218e6b4a42b66094e94cf9cbabf0a4276fece6bf",
2009 "reference": "62631c65d9a4f1b8bb4c4a3d6cdff0e8971d684e", 2121 "reference": "218e6b4a42b66094e94cf9cbabf0a4276fece6bf",
2010 "shasum": "" 2122 "shasum": ""
2011 }, 2123 },
2012 "require": { 2124 "require": {
2013 "hoa/compiler": "~2.0", 2125 "hoa/compiler": "~3.0",
2014 "hoa/core": "~2.0", 2126 "hoa/consistency": "~1.0",
2015 "hoa/iterator": "~1.0" 2127 "hoa/exception": "~1.0",
2128 "hoa/iterator": "~2.0",
2129 "hoa/protocol": "~1.0",
2130 "hoa/zformat": "~1.0"
2016 }, 2131 },
2017 "require-dev": { 2132 "require-dev": {
2018 "hoa/test": "~1.0" 2133 "hoa/test": "~2.0"
2019 }, 2134 },
2020 "type": "library", 2135 "type": "library",
2021 "extra": { 2136 "extra": {
2022 "branch-alias": { 2137 "branch-alias": {
2023 "dev-master": "0.x-dev" 2138 "dev-master": "1.x-dev"
2024 } 2139 }
2025 }, 2140 },
2026 "autoload": { 2141 "autoload": {
@@ -2055,32 +2170,94 @@
2055 "sampler", 2170 "sampler",
2056 "set" 2171 "set"
2057 ], 2172 ],
2058 "time": "2015-10-26 15:22:52" 2173 "time": "2016-01-14 21:02:22"
2174 },
2175 {
2176 "name": "hoa/protocol",
2177 "version": "1.16.01.11",
2178 "source": {
2179 "type": "git",
2180 "url": "https://github.com/hoaproject/Protocol.git",
2181 "reference": "97a33357e9f0827b75e19a78429d037fab18c1ce"
2182 },
2183 "dist": {
2184 "type": "zip",
2185 "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/97a33357e9f0827b75e19a78429d037fab18c1ce",
2186 "reference": "97a33357e9f0827b75e19a78429d037fab18c1ce",
2187 "shasum": ""
2188 },
2189 "require": {
2190 "hoa/consistency": "~1.0",
2191 "hoa/exception": "~1.0"
2192 },
2193 "require-dev": {
2194 "hoa/test": "~2.0"
2195 },
2196 "type": "library",
2197 "extra": {
2198 "branch-alias": {
2199 "dev-master": "1.x-dev"
2200 }
2201 },
2202 "autoload": {
2203 "psr-4": {
2204 "Hoa\\Protocol\\": "."
2205 },
2206 "files": [
2207 "Wrapper.php"
2208 ]
2209 },
2210 "notification-url": "https://packagist.org/downloads/",
2211 "license": [
2212 "BSD-3-Clause"
2213 ],
2214 "authors": [
2215 {
2216 "name": "Ivan Enderlin",
2217 "email": "ivan.enderlin@hoa-project.net"
2218 },
2219 {
2220 "name": "Hoa community",
2221 "homepage": "http://hoa-project.net/"
2222 }
2223 ],
2224 "description": "The Hoa\\Protocol library.",
2225 "homepage": "http://hoa-project.net/",
2226 "keywords": [
2227 "library",
2228 "protocol",
2229 "resource",
2230 "stream",
2231 "wrapper"
2232 ],
2233 "time": "2016-01-11 08:41:20"
2059 }, 2234 },
2060 { 2235 {
2061 "name": "hoa/regex", 2236 "name": "hoa/regex",
2062 "version": "0.15.08.13", 2237 "version": "1.16.01.15",
2063 "source": { 2238 "source": {
2064 "type": "git", 2239 "type": "git",
2065 "url": "https://github.com/hoaproject/Regex.git", 2240 "url": "https://github.com/hoaproject/Regex.git",
2066 "reference": "2ef8a77ef3885ca202fcd9c31a8e54c44cd04232" 2241 "reference": "e7fb36fdea23ea9fc814a1a68bd0144df1891463"
2067 }, 2242 },
2068 "dist": { 2243 "dist": {
2069 "type": "zip", 2244 "type": "zip",
2070 "url": "https://api.github.com/repos/hoaproject/Regex/zipball/2ef8a77ef3885ca202fcd9c31a8e54c44cd04232", 2245 "url": "https://api.github.com/repos/hoaproject/Regex/zipball/e7fb36fdea23ea9fc814a1a68bd0144df1891463",
2071 "reference": "2ef8a77ef3885ca202fcd9c31a8e54c44cd04232", 2246 "reference": "e7fb36fdea23ea9fc814a1a68bd0144df1891463",
2072 "shasum": "" 2247 "shasum": ""
2073 }, 2248 },
2074 "require": { 2249 "require": {
2075 "hoa/core": "~2.0", 2250 "hoa/consistency": "~1.0",
2076 "hoa/math": "~0.0", 2251 "hoa/exception": "~1.0",
2077 "hoa/ustring": "~3.0", 2252 "hoa/math": "~1.0",
2078 "hoa/visitor": "~1.0" 2253 "hoa/protocol": "~1.0",
2254 "hoa/ustring": "~4.0",
2255 "hoa/visitor": "~2.0"
2079 }, 2256 },
2080 "type": "library", 2257 "type": "library",
2081 "extra": { 2258 "extra": {
2082 "branch-alias": { 2259 "branch-alias": {
2083 "dev-master": "0.x-dev" 2260 "dev-master": "1.x-dev"
2084 } 2261 }
2085 }, 2262 },
2086 "autoload": { 2263 "autoload": {
@@ -2109,35 +2286,36 @@
2109 "library", 2286 "library",
2110 "regex" 2287 "regex"
2111 ], 2288 ],
2112 "time": "2015-08-13 06:48:47" 2289 "time": "2016-01-14 21:10:33"
2113 }, 2290 },
2114 { 2291 {
2115 "name": "hoa/ruler", 2292 "name": "hoa/ruler",
2116 "version": "1.15.11.09", 2293 "version": "2.16.01.15",
2117 "source": { 2294 "source": {
2118 "type": "git", 2295 "type": "git",
2119 "url": "https://github.com/hoaproject/Ruler.git", 2296 "url": "https://github.com/hoaproject/Ruler.git",
2120 "reference": "9afc9ae032d40b6dc10bff85c9126cf516953925" 2297 "reference": "0aeb1a48d78427a55fbf656c65c6406c096a4325"
2121 }, 2298 },
2122 "dist": { 2299 "dist": {
2123 "type": "zip", 2300 "type": "zip",
2124 "url": "https://api.github.com/repos/hoaproject/Ruler/zipball/9afc9ae032d40b6dc10bff85c9126cf516953925", 2301 "url": "https://api.github.com/repos/hoaproject/Ruler/zipball/0aeb1a48d78427a55fbf656c65c6406c096a4325",
2125 "reference": "9afc9ae032d40b6dc10bff85c9126cf516953925", 2302 "reference": "0aeb1a48d78427a55fbf656c65c6406c096a4325",
2126 "shasum": "" 2303 "shasum": ""
2127 }, 2304 },
2128 "require": { 2305 "require": {
2129 "hoa/compiler": "~2.0", 2306 "hoa/compiler": "~3.0",
2130 "hoa/core": "~2.0", 2307 "hoa/consistency": "~1.0",
2131 "hoa/file": "~0.0", 2308 "hoa/exception": "~1.0",
2132 "hoa/visitor": "~1.0" 2309 "hoa/file": "~1.0",
2310 "hoa/visitor": "~2.0"
2133 }, 2311 },
2134 "require-dev": { 2312 "require-dev": {
2135 "hoa/test": "~1.0" 2313 "hoa/test": "~2.0"
2136 }, 2314 },
2137 "type": "library", 2315 "type": "library",
2138 "extra": { 2316 "extra": {
2139 "branch-alias": { 2317 "branch-alias": {
2140 "dev-master": "1.x-dev" 2318 "dev-master": "2.x-dev"
2141 } 2319 }
2142 }, 2320 },
2143 "autoload": { 2321 "autoload": {
@@ -2165,29 +2343,32 @@
2165 "library", 2343 "library",
2166 "ruler" 2344 "ruler"
2167 ], 2345 ],
2168 "time": "2015-11-09 06:58:52" 2346 "time": "2016-01-14 21:42:47"
2169 }, 2347 },
2170 { 2348 {
2171 "name": "hoa/stream", 2349 "name": "hoa/stream",
2172 "version": "0.15.10.26", 2350 "version": "1.16.01.14",
2173 "source": { 2351 "source": {
2174 "type": "git", 2352 "type": "git",
2175 "url": "https://github.com/hoaproject/Stream.git", 2353 "url": "https://github.com/hoaproject/Stream.git",
2176 "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3" 2354 "reference": "c00b35078ef8c0881b7d2ed533de19fe0aaf9896"
2177 }, 2355 },
2178 "dist": { 2356 "dist": {
2179 "type": "zip", 2357 "type": "zip",
2180 "url": "https://api.github.com/repos/hoaproject/Stream/zipball/011ab91d942f1d7096deade4c8a10fe57d51c5b3", 2358 "url": "https://api.github.com/repos/hoaproject/Stream/zipball/c00b35078ef8c0881b7d2ed533de19fe0aaf9896",
2181 "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3", 2359 "reference": "c00b35078ef8c0881b7d2ed533de19fe0aaf9896",
2182 "shasum": "" 2360 "shasum": ""
2183 }, 2361 },
2184 "require": { 2362 "require": {
2185 "hoa/core": "~2.0" 2363 "hoa/consistency": "~1.0",
2364 "hoa/event": "~1.0",
2365 "hoa/exception": "~1.0",
2366 "hoa/protocol": "~1.0"
2186 }, 2367 },
2187 "type": "library", 2368 "type": "library",
2188 "extra": { 2369 "extra": {
2189 "branch-alias": { 2370 "branch-alias": {
2190 "dev-master": "0.x-dev" 2371 "dev-master": "1.x-dev"
2191 } 2372 }
2192 }, 2373 },
2193 "autoload": { 2374 "autoload": {
@@ -2223,27 +2404,28 @@
2223 "stream", 2404 "stream",
2224 "wrapper" 2405 "wrapper"
2225 ], 2406 ],
2226 "time": "2015-10-22 06:30:43" 2407 "time": "2016-01-14 20:11:37"
2227 }, 2408 },
2228 { 2409 {
2229 "name": "hoa/ustring", 2410 "name": "hoa/ustring",
2230 "version": "3.15.11.09", 2411 "version": "4.16.01.11",
2231 "source": { 2412 "source": {
2232 "type": "git", 2413 "type": "git",
2233 "url": "https://github.com/hoaproject/Ustring.git", 2414 "url": "https://github.com/hoaproject/Ustring.git",
2234 "reference": "8506be4910212b1a2beb9014763a8a4fbd871001" 2415 "reference": "9f76b9aae5901b4f476ef854e29ccd746d6899d2"
2235 }, 2416 },
2236 "dist": { 2417 "dist": {
2237 "type": "zip", 2418 "type": "zip",
2238 "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/8506be4910212b1a2beb9014763a8a4fbd871001", 2419 "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/9f76b9aae5901b4f476ef854e29ccd746d6899d2",
2239 "reference": "8506be4910212b1a2beb9014763a8a4fbd871001", 2420 "reference": "9f76b9aae5901b4f476ef854e29ccd746d6899d2",
2240 "shasum": "" 2421 "shasum": ""
2241 }, 2422 },
2242 "require": { 2423 "require": {
2243 "hoa/core": "~2.0" 2424 "hoa/consistency": "~1.0",
2425 "hoa/exception": "~1.0"
2244 }, 2426 },
2245 "require-dev": { 2427 "require-dev": {
2246 "hoa/test": "~1.0" 2428 "hoa/test": "~2.0"
2247 }, 2429 },
2248 "suggest": { 2430 "suggest": {
2249 "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().", 2431 "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().",
@@ -2252,7 +2434,7 @@
2252 "type": "library", 2434 "type": "library",
2253 "extra": { 2435 "extra": {
2254 "branch-alias": { 2436 "branch-alias": {
2255 "dev-master": "3.x-dev" 2437 "dev-master": "4.x-dev"
2256 } 2438 }
2257 }, 2439 },
2258 "autoload": { 2440 "autoload": {
@@ -2282,32 +2464,32 @@
2282 "string", 2464 "string",
2283 "unicode" 2465 "unicode"
2284 ], 2466 ],
2285 "time": "2015-11-09 06:44:33" 2467 "time": "2016-01-11 09:51:34"
2286 }, 2468 },
2287 { 2469 {
2288 "name": "hoa/visitor", 2470 "name": "hoa/visitor",
2289 "version": "1.15.08.17", 2471 "version": "2.16.01.11",
2290 "source": { 2472 "source": {
2291 "type": "git", 2473 "type": "git",
2292 "url": "https://github.com/hoaproject/Visitor.git", 2474 "url": "https://github.com/hoaproject/Visitor.git",
2293 "reference": "e30bfff741f71979f6476a41548e34afe8053c67" 2475 "reference": "cb21074b7eb89c3ac9f76d25c72671d579735ca9"
2294 }, 2476 },
2295 "dist": { 2477 "dist": {
2296 "type": "zip", 2478 "type": "zip",
2297 "url": "https://api.github.com/repos/hoaproject/Visitor/zipball/e30bfff741f71979f6476a41548e34afe8053c67", 2479 "url": "https://api.github.com/repos/hoaproject/Visitor/zipball/cb21074b7eb89c3ac9f76d25c72671d579735ca9",
2298 "reference": "e30bfff741f71979f6476a41548e34afe8053c67", 2480 "reference": "cb21074b7eb89c3ac9f76d25c72671d579735ca9",
2299 "shasum": "" 2481 "shasum": ""
2300 }, 2482 },
2301 "require": { 2483 "require": {
2302 "hoa/core": "~2.0" 2484 "hoa/consistency": "~1.0"
2303 }, 2485 },
2304 "require-dev": { 2486 "require-dev": {
2305 "hoa/test": "~1.0" 2487 "hoa/test": "~2.0"
2306 }, 2488 },
2307 "type": "library", 2489 "type": "library",
2308 "extra": { 2490 "extra": {
2309 "branch-alias": { 2491 "branch-alias": {
2310 "dev-master": "1.x-dev" 2492 "dev-master": "2.x-dev"
2311 } 2493 }
2312 }, 2494 },
2313 "autoload": { 2495 "autoload": {
@@ -2337,7 +2519,59 @@
2337 "visit", 2519 "visit",
2338 "visitor" 2520 "visitor"
2339 ], 2521 ],
2340 "time": "2015-08-17 06:30:58" 2522 "time": "2016-01-11 09:54:01"
2523 },
2524 {
2525 "name": "hoa/zformat",
2526 "version": "1.16.01.14",
2527 "source": {
2528 "type": "git",
2529 "url": "https://github.com/hoaproject/Zformat.git",
2530 "reference": "685bba314c5cacb97afdd5e638b64c42399a580c"
2531 },
2532 "dist": {
2533 "type": "zip",
2534 "url": "https://api.github.com/repos/hoaproject/Zformat/zipball/685bba314c5cacb97afdd5e638b64c42399a580c",
2535 "reference": "685bba314c5cacb97afdd5e638b64c42399a580c",
2536 "shasum": ""
2537 },
2538 "require": {
2539 "hoa/consistency": "~1.0",
2540 "hoa/exception": "~1.0"
2541 },
2542 "type": "library",
2543 "extra": {
2544 "branch-alias": {
2545 "dev-master": "1.x-dev"
2546 }
2547 },
2548 "autoload": {
2549 "psr-4": {
2550 "Hoa\\Zformat\\": "."
2551 }
2552 },
2553 "notification-url": "https://packagist.org/downloads/",
2554 "license": [
2555 "BSD-3-Clause"
2556 ],
2557 "authors": [
2558 {
2559 "name": "Ivan Enderlin",
2560 "email": "ivan.enderlin@hoa-project.net"
2561 },
2562 {
2563 "name": "Hoa community",
2564 "homepage": "http://hoa-project.net/"
2565 }
2566 ],
2567 "description": "The Hoa\\Zformat library.",
2568 "homepage": "http://hoa-project.net/",
2569 "keywords": [
2570 "library",
2571 "parameter",
2572 "zformat"
2573 ],
2574 "time": "2016-01-14 20:19:54"
2341 }, 2575 },
2342 { 2576 {
2343 "name": "htmlawed/htmlawed", 2577 "name": "htmlawed/htmlawed",
@@ -2438,23 +2672,23 @@
2438 }, 2672 },
2439 { 2673 {
2440 "name": "j0k3r/graby", 2674 "name": "j0k3r/graby",
2441 "version": "1.0.8", 2675 "version": "1.1.0",
2442 "source": { 2676 "source": {
2443 "type": "git", 2677 "type": "git",
2444 "url": "https://github.com/j0k3r/graby.git", 2678 "url": "https://github.com/j0k3r/graby.git",
2445 "reference": "bf152ccc6629bdd63b1e5e8b297c2912516b5f1e" 2679 "reference": "fa5356fbbabe8288ed57a978ab05725c7063727e"
2446 }, 2680 },
2447 "dist": { 2681 "dist": {
2448 "type": "zip", 2682 "type": "zip",
2449 "url": "https://api.github.com/repos/j0k3r/graby/zipball/bf152ccc6629bdd63b1e5e8b297c2912516b5f1e", 2683 "url": "https://api.github.com/repos/j0k3r/graby/zipball/fa5356fbbabe8288ed57a978ab05725c7063727e",
2450 "reference": "bf152ccc6629bdd63b1e5e8b297c2912516b5f1e", 2684 "reference": "fa5356fbbabe8288ed57a978ab05725c7063727e",
2451 "shasum": "" 2685 "shasum": ""
2452 }, 2686 },
2453 "require": { 2687 "require": {
2454 "ext-curl": "*", 2688 "ext-curl": "*",
2455 "guzzlehttp/guzzle": "^5.2.0", 2689 "guzzlehttp/guzzle": "^5.2.0",
2456 "htmlawed/htmlawed": "^1.1.19", 2690 "htmlawed/htmlawed": "^1.1.19",
2457 "j0k3r/graby-site-config": "^1.0.0", 2691 "j0k3r/graby-site-config": "^1.0",
2458 "j0k3r/php-readability": "^1.0", 2692 "j0k3r/php-readability": "^1.0",
2459 "j0k3r/safecurl": "~2.0", 2693 "j0k3r/safecurl": "~2.0",
2460 "monolog/monolog": "^1.13.1", 2694 "monolog/monolog": "^1.13.1",
@@ -2490,20 +2724,20 @@
2490 } 2724 }
2491 ], 2725 ],
2492 "description": "Graby helps you extract article content from web pages", 2726 "description": "Graby helps you extract article content from web pages",
2493 "time": "2015-12-24 08:28:38" 2727 "time": "2016-01-15 09:52:40"
2494 }, 2728 },
2495 { 2729 {
2496 "name": "j0k3r/graby-site-config", 2730 "name": "j0k3r/graby-site-config",
2497 "version": "1.0.11", 2731 "version": "1.0.12",
2498 "source": { 2732 "source": {
2499 "type": "git", 2733 "type": "git",
2500 "url": "https://github.com/j0k3r/graby-site-config.git", 2734 "url": "https://github.com/j0k3r/graby-site-config.git",
2501 "reference": "ac198f308beabccc97bbd35ed0daeaac63fbf1e3" 2735 "reference": "ddd602cab137ee40ac3f5a8dd9b749bea7d2f541"
2502 }, 2736 },
2503 "dist": { 2737 "dist": {
2504 "type": "zip", 2738 "type": "zip",
2505 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/ac198f308beabccc97bbd35ed0daeaac63fbf1e3", 2739 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/ddd602cab137ee40ac3f5a8dd9b749bea7d2f541",
2506 "reference": "ac198f308beabccc97bbd35ed0daeaac63fbf1e3", 2740 "reference": "ddd602cab137ee40ac3f5a8dd9b749bea7d2f541",
2507 "shasum": "" 2741 "shasum": ""
2508 }, 2742 },
2509 "require": { 2743 "require": {
@@ -2526,7 +2760,7 @@
2526 } 2760 }
2527 ], 2761 ],
2528 "description": "Graby site config files", 2762 "description": "Graby site config files",
2529 "time": "2015-12-23 22:52:15" 2763 "time": "2016-01-15 09:59:00"
2530 }, 2764 },
2531 { 2765 {
2532 "name": "j0k3r/php-readability", 2766 "name": "j0k3r/php-readability",
@@ -2781,36 +3015,41 @@
2781 }, 3015 },
2782 { 3016 {
2783 "name": "jms/serializer", 3017 "name": "jms/serializer",
2784 "version": "0.16.0", 3018 "version": "1.1.0",
2785 "source": { 3019 "source": {
2786 "type": "git", 3020 "type": "git",
2787 "url": "https://github.com/schmittjoh/serializer.git", 3021 "url": "https://github.com/schmittjoh/serializer.git",
2788 "reference": "c8a171357ca92b6706e395c757f334902d430ea9" 3022 "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48"
2789 }, 3023 },
2790 "dist": { 3024 "dist": {
2791 "type": "zip", 3025 "type": "zip",
2792 "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9", 3026 "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fe13a1f993ea3456e195b7820692f2eb2b6bbb48",
2793 "reference": "c8a171357ca92b6706e395c757f334902d430ea9", 3027 "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48",
2794 "shasum": "" 3028 "shasum": ""
2795 }, 3029 },
2796 "require": { 3030 "require": {
2797 "doctrine/annotations": "1.*", 3031 "doctrine/annotations": "1.*",
3032 "doctrine/instantiator": "~1.0.3",
2798 "jms/metadata": "~1.1", 3033 "jms/metadata": "~1.1",
2799 "jms/parser-lib": "1.*", 3034 "jms/parser-lib": "1.*",
2800 "php": ">=5.3.2", 3035 "php": ">=5.4.0",
2801 "phpcollection/phpcollection": "~0.1" 3036 "phpcollection/phpcollection": "~0.1"
2802 }, 3037 },
3038 "conflict": {
3039 "twig/twig": "<1.12"
3040 },
2803 "require-dev": { 3041 "require-dev": {
2804 "doctrine/orm": "~2.1", 3042 "doctrine/orm": "~2.1",
2805 "doctrine/phpcr-odm": "~1.0.1", 3043 "doctrine/phpcr-odm": "~1.0.1",
2806 "jackalope/jackalope-doctrine-dbal": "1.0.*", 3044 "jackalope/jackalope-doctrine-dbal": "1.0.*",
3045 "phpunit/phpunit": "~4.0",
2807 "propel/propel1": "~1.7", 3046 "propel/propel1": "~1.7",
2808 "symfony/filesystem": "2.*", 3047 "symfony/filesystem": "2.*",
2809 "symfony/form": "~2.1", 3048 "symfony/form": "~2.1",
2810 "symfony/translation": "~2.0", 3049 "symfony/translation": "~2.0",
2811 "symfony/validator": "~2.0", 3050 "symfony/validator": "~2.0",
2812 "symfony/yaml": "2.*", 3051 "symfony/yaml": "2.*",
2813 "twig/twig": ">=1.8,<2.0-dev" 3052 "twig/twig": "~1.12|~2.0"
2814 }, 3053 },
2815 "suggest": { 3054 "suggest": {
2816 "symfony/yaml": "Required if you'd like to serialize data to YAML format." 3055 "symfony/yaml": "Required if you'd like to serialize data to YAML format."
@@ -2818,7 +3057,7 @@
2818 "type": "library", 3057 "type": "library",
2819 "extra": { 3058 "extra": {
2820 "branch-alias": { 3059 "branch-alias": {
2821 "dev-master": "0.15-dev" 3060 "dev-master": "1.1-dev"
2822 } 3061 }
2823 }, 3062 },
2824 "autoload": { 3063 "autoload": {
@@ -2832,10 +3071,8 @@
2832 ], 3071 ],
2833 "authors": [ 3072 "authors": [
2834 { 3073 {
2835 "name": "Johannes Schmitt", 3074 "name": "Johannes M. Schmitt",
2836 "email": "schmittjoh@gmail.com", 3075 "email": "schmittjoh@gmail.com"
2837 "homepage": "https://github.com/schmittjoh",
2838 "role": "Developer of wrapped JMSSerializerBundle"
2839 } 3076 }
2840 ], 3077 ],
2841 "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.", 3078 "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
@@ -2847,27 +3084,28 @@
2847 "serialization", 3084 "serialization",
2848 "xml" 3085 "xml"
2849 ], 3086 ],
2850 "time": "2014-03-18 08:39:00" 3087 "time": "2015-10-27 09:24:41"
2851 }, 3088 },
2852 { 3089 {
2853 "name": "jms/serializer-bundle", 3090 "name": "jms/serializer-bundle",
2854 "version": "0.13.0", 3091 "version": "1.1.0",
2855 "target-dir": "JMS/SerializerBundle", 3092 "target-dir": "JMS/SerializerBundle",
2856 "source": { 3093 "source": {
2857 "type": "git", 3094 "type": "git",
2858 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", 3095 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
2859 "reference": "bb15db3e661168f4310fad48b86915ff1ca33795" 3096 "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e"
2860 }, 3097 },
2861 "dist": { 3098 "dist": {
2862 "type": "zip", 3099 "type": "zip",
2863 "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/bb15db3e661168f4310fad48b86915ff1ca33795", 3100 "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3e396c980545350c2efb65a50041d2a9f9d6562e",
2864 "reference": "bb15db3e661168f4310fad48b86915ff1ca33795", 3101 "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e",
2865 "shasum": "" 3102 "shasum": ""
2866 }, 3103 },
2867 "require": { 3104 "require": {
2868 "jms/serializer": "~0.11", 3105 "jms/serializer": "^1.0.0",
2869 "php": ">=5.3.2", 3106 "php": ">=5.4.0",
2870 "symfony/framework-bundle": "~2.1" 3107 "phpoption/phpoption": "^1.1.0",
3108 "symfony/framework-bundle": "~2.3|~3.0"
2871 }, 3109 },
2872 "require-dev": { 3110 "require-dev": {
2873 "doctrine/doctrine-bundle": "*", 3111 "doctrine/doctrine-bundle": "*",
@@ -2878,6 +3116,7 @@
2878 "symfony/finder": "*", 3116 "symfony/finder": "*",
2879 "symfony/form": "*", 3117 "symfony/form": "*",
2880 "symfony/process": "*", 3118 "symfony/process": "*",
3119 "symfony/stopwatch": "*",
2881 "symfony/twig-bundle": "*", 3120 "symfony/twig-bundle": "*",
2882 "symfony/validator": "*", 3121 "symfony/validator": "*",
2883 "symfony/yaml": "*" 3122 "symfony/yaml": "*"
@@ -2888,7 +3127,7 @@
2888 "type": "symfony-bundle", 3127 "type": "symfony-bundle",
2889 "extra": { 3128 "extra": {
2890 "branch-alias": { 3129 "branch-alias": {
2891 "dev-master": "0.13-dev" 3130 "dev-master": "1.1-dev"
2892 } 3131 }
2893 }, 3132 },
2894 "autoload": { 3133 "autoload": {
@@ -2902,10 +3141,8 @@
2902 ], 3141 ],
2903 "authors": [ 3142 "authors": [
2904 { 3143 {
2905 "name": "Johannes Schmitt", 3144 "name": "Johannes M. Schmitt",
2906 "email": "schmittjoh@gmail.com", 3145 "email": "schmittjoh@gmail.com"
2907 "homepage": "https://github.com/schmittjoh",
2908 "role": "Developer of wrapped JMSSerializerBundle"
2909 } 3146 }
2910 ], 3147 ],
2911 "description": "Allows you to easily serialize, and deserialize data of any complexity", 3148 "description": "Allows you to easily serialize, and deserialize data of any complexity",
@@ -2917,26 +3154,26 @@
2917 "serialization", 3154 "serialization",
2918 "xml" 3155 "xml"
2919 ], 3156 ],
2920 "time": "2013-12-05 14:36:11" 3157 "time": "2015-11-10 12:26:42"
2921 }, 3158 },
2922 { 3159 {
2923 "name": "kphoen/rulerz", 3160 "name": "kphoen/rulerz",
2924 "version": "0.16.2", 3161 "version": "0.17.0",
2925 "source": { 3162 "source": {
2926 "type": "git", 3163 "type": "git",
2927 "url": "https://github.com/K-Phoen/rulerz.git", 3164 "url": "https://github.com/K-Phoen/rulerz.git",
2928 "reference": "2b4fd796dadad204353e966b9f53040225ce6871" 3165 "reference": "4ebd03bd801d17f108ab74f611b8ec1b430c909f"
2929 }, 3166 },
2930 "dist": { 3167 "dist": {
2931 "type": "zip", 3168 "type": "zip",
2932 "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/2b4fd796dadad204353e966b9f53040225ce6871", 3169 "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/4ebd03bd801d17f108ab74f611b8ec1b430c909f",
2933 "reference": "2b4fd796dadad204353e966b9f53040225ce6871", 3170 "reference": "4ebd03bd801d17f108ab74f611b8ec1b430c909f",
2934 "shasum": "" 3171 "shasum": ""
2935 }, 3172 },
2936 "require": { 3173 "require": {
2937 "hoa/ruler": "~1.0", 3174 "hoa/ruler": "~2.0",
2938 "php": ">=5.5", 3175 "php": ">=5.5",
2939 "symfony/property-access": "~2.3" 3176 "symfony/property-access": "~2.3|~3.0"
2940 }, 3177 },
2941 "require-dev": { 3178 "require-dev": {
2942 "behat/behat": "~3.0", 3179 "behat/behat": "~3.0",
@@ -2987,31 +3224,32 @@
2987 "doctrine", 3224 "doctrine",
2988 "specification" 3225 "specification"
2989 ], 3226 ],
2990 "time": "2015-12-07 22:24:24" 3227 "time": "2016-01-13 16:55:19"
2991 }, 3228 },
2992 { 3229 {
2993 "name": "kphoen/rulerz-bundle", 3230 "name": "kphoen/rulerz-bundle",
2994 "version": "0.11.0", 3231 "version": "0.11.1",
2995 "source": { 3232 "source": {
2996 "type": "git", 3233 "type": "git",
2997 "url": "https://github.com/K-Phoen/RulerZBundle.git", 3234 "url": "https://github.com/K-Phoen/RulerZBundle.git",
2998 "reference": "dcaaed69d8252fa1e3a25802f8cf697947570778" 3235 "reference": "57416b75d70d21c10c1f1c31b9fd6d2a7f82a277"
2999 }, 3236 },
3000 "dist": { 3237 "dist": {
3001 "type": "zip", 3238 "type": "zip",
3002 "url": "https://api.github.com/repos/K-Phoen/RulerZBundle/zipball/dcaaed69d8252fa1e3a25802f8cf697947570778", 3239 "url": "https://api.github.com/repos/K-Phoen/RulerZBundle/zipball/57416b75d70d21c10c1f1c31b9fd6d2a7f82a277",
3003 "reference": "dcaaed69d8252fa1e3a25802f8cf697947570778", 3240 "reference": "57416b75d70d21c10c1f1c31b9fd6d2a7f82a277",
3004 "shasum": "" 3241 "shasum": ""
3005 }, 3242 },
3006 "require": { 3243 "require": {
3007 "kphoen/rulerz": "~0.1, >=0.13.0", 3244 "kphoen/rulerz": "~0.1, >=0.13.0",
3008 "symfony/framework-bundle": "~2.3|~3.0", 3245 "symfony/framework-bundle": "~2.5|~3.0",
3009 "symfony/validator": "~2.3|~3.0" 3246 "symfony/validator": "~2.5|~3.0"
3010 }, 3247 },
3011 "require-dev": { 3248 "require-dev": {
3012 "matthiasnoback/symfony-dependency-injection-test": "~0.7", 3249 "matthiasnoback/symfony-dependency-injection-test": "~0.7",
3013 "mikey179/vfsstream": "~1.0", 3250 "mikey179/vfsstream": "~1.0",
3014 "phpunit/phpunit": "~4.8" 3251 "phpunit/phpunit": "~4.8",
3252 "symfony/phpunit-bridge": "~2.7|~3.0"
3015 }, 3253 },
3016 "type": "symfony-bundle", 3254 "type": "symfony-bundle",
3017 "autoload": { 3255 "autoload": {
@@ -3037,7 +3275,7 @@
3037 "rulerz", 3275 "rulerz",
3038 "specification" 3276 "specification"
3039 ], 3277 ],
3040 "time": "2015-11-13 13:00:14" 3278 "time": "2016-01-11 13:54:58"
3041 }, 3279 },
3042 { 3280 {
3043 "name": "kriswallsmith/assetic", 3281 "name": "kriswallsmith/assetic",
@@ -3118,31 +3356,32 @@
3118 }, 3356 },
3119 { 3357 {
3120 "name": "lexik/form-filter-bundle", 3358 "name": "lexik/form-filter-bundle",
3121 "version": "v4.0.2", 3359 "version": "v5.0.0",
3122 "source": { 3360 "source": {
3123 "type": "git", 3361 "type": "git",
3124 "url": "https://github.com/lexik/LexikFormFilterBundle.git", 3362 "url": "https://github.com/lexik/LexikFormFilterBundle.git",
3125 "reference": "d6081d308b71e14509602722c78d28801e4ed78a" 3363 "reference": "dbc3c81600d2334a3408b37dccc3627d2019472c"
3126 }, 3364 },
3127 "dist": { 3365 "dist": {
3128 "type": "zip", 3366 "type": "zip",
3129 "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/d6081d308b71e14509602722c78d28801e4ed78a", 3367 "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/dbc3c81600d2334a3408b37dccc3627d2019472c",
3130 "reference": "d6081d308b71e14509602722c78d28801e4ed78a", 3368 "reference": "dbc3c81600d2334a3408b37dccc3627d2019472c",
3131 "shasum": "" 3369 "shasum": ""
3132 }, 3370 },
3133 "require": { 3371 "require": {
3134 "doctrine/orm": "~2.2", 3372 "doctrine/orm": "^2.4.8",
3135 "php": ">=5.3.2", 3373 "php": ">=5.5.9",
3136 "symfony/form": "~2.7", 3374 "symfony/form": "~2.8|~3.0",
3137 "symfony/framework-bundle": "~2.7" 3375 "symfony/framework-bundle": "~2.8|~3.0"
3138 }, 3376 },
3139 "require-dev": { 3377 "require-dev": {
3378 "doctrine/mongodb-odm-bundle": "~3.0",
3140 "phpunit/phpunit": "~3.7" 3379 "phpunit/phpunit": "~3.7"
3141 }, 3380 },
3142 "type": "symfony-bundle", 3381 "type": "symfony-bundle",
3143 "extra": { 3382 "extra": {
3144 "branch-alias": { 3383 "branch-alias": {
3145 "dev-master": "4.x.x-dev" 3384 "dev-master": "5.x.x-dev"
3146 } 3385 }
3147 }, 3386 },
3148 "autoload": { 3387 "autoload": {
@@ -3173,40 +3412,44 @@
3173 "filter", 3412 "filter",
3174 "form" 3413 "form"
3175 ], 3414 ],
3176 "time": "2015-10-20 12:45:52" 3415 "time": "2016-01-11 17:05:05"
3177 }, 3416 },
3178 { 3417 {
3179 "name": "liip/theme-bundle", 3418 "name": "liip/theme-bundle",
3180 "version": "1.1.3", 3419 "version": "1.4.0",
3181 "target-dir": "Liip/ThemeBundle",
3182 "source": { 3420 "source": {
3183 "type": "git", 3421 "type": "git",
3184 "url": "https://github.com/liip/LiipThemeBundle.git", 3422 "url": "https://github.com/liip/LiipThemeBundle.git",
3185 "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b" 3423 "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905"
3186 }, 3424 },
3187 "dist": { 3425 "dist": {
3188 "type": "zip", 3426 "type": "zip",
3189 "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/a594cc6deda293034b8fd7795c9950f02fc8251b", 3427 "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/ae4f0f1b045689bed9150d5bd32d2f7f2f98b905",
3190 "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b", 3428 "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905",
3191 "shasum": "" 3429 "shasum": ""
3192 }, 3430 },
3193 "require": { 3431 "require": {
3194 "php": ">=5.3.3", 3432 "php": "^5.3.9|^7.0",
3195 "symfony/framework-bundle": "~2.0" 3433 "psr/log": "~1.0",
3434 "symfony/framework-bundle": "~2.3|~3.0"
3196 }, 3435 },
3197 "require-dev": { 3436 "require-dev": {
3198 "symfony/console": "~2.0", 3437 "kriswallsmith/assetic": "~1.1",
3199 "symfony/expression-language": "~2.6" 3438 "phpunit/php-code-coverage": "~2.2@stable",
3439 "phpunit/phpunit": "~4.5@stable",
3440 "symfony/console": "~2.3|~3.0",
3441 "symfony/expression-language": "~2.6|~3.0",
3442 "twig/twig": "~1.4|~2.0@dev"
3200 }, 3443 },
3201 "type": "symfony-bundle", 3444 "type": "symfony-bundle",
3202 "extra": { 3445 "extra": {
3203 "branch-alias": { 3446 "branch-alias": {
3204 "dev-master": "1.1-dev" 3447 "dev-master": "1.4-dev"
3205 } 3448 }
3206 }, 3449 },
3207 "autoload": { 3450 "autoload": {
3208 "psr-0": { 3451 "psr-4": {
3209 "Liip\\ThemeBundle": "" 3452 "Liip\\ThemeBundle\\": ""
3210 } 3453 }
3211 }, 3454 },
3212 "notification-url": "https://packagist.org/downloads/", 3455 "notification-url": "https://packagist.org/downloads/",
@@ -3228,7 +3471,7 @@
3228 "themes", 3471 "themes",
3229 "theming" 3472 "theming"
3230 ], 3473 ],
3231 "time": "2015-02-02 15:55:54" 3474 "time": "2015-12-05 09:33:29"
3232 }, 3475 },
3233 { 3476 {
3234 "name": "mgargano/simplehtmldom", 3477 "name": "mgargano/simplehtmldom",
@@ -3646,6 +3889,54 @@
3646 "time": "2014-10-06 10:57:25" 3889 "time": "2014-10-06 10:57:25"
3647 }, 3890 },
3648 { 3891 {
3892 "name": "paragonie/random_compat",
3893 "version": "1.1.5",
3894 "source": {
3895 "type": "git",
3896 "url": "https://github.com/paragonie/random_compat.git",
3897 "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7"
3898 },
3899 "dist": {
3900 "type": "zip",
3901 "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7",
3902 "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7",
3903 "shasum": ""
3904 },
3905 "require": {
3906 "php": ">=5.2.0"
3907 },
3908 "require-dev": {
3909 "phpunit/phpunit": "4.*|5.*"
3910 },
3911 "suggest": {
3912 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
3913 },
3914 "type": "library",
3915 "autoload": {
3916 "files": [
3917 "lib/random.php"
3918 ]
3919 },
3920 "notification-url": "https://packagist.org/downloads/",
3921 "license": [
3922 "MIT"
3923 ],
3924 "authors": [
3925 {
3926 "name": "Paragon Initiative Enterprises",
3927 "email": "security@paragonie.com",
3928 "homepage": "https://paragonie.com"
3929 }
3930 ],
3931 "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
3932 "keywords": [
3933 "csprng",
3934 "pseudorandom",
3935 "random"
3936 ],
3937 "time": "2016-01-06 13:31:20"
3938 },
3939 {
3649 "name": "phpcollection/phpcollection", 3940 "name": "phpcollection/phpcollection",
3650 "version": "0.4.0", 3941 "version": "0.4.0",
3651 "source": { 3942 "source": {
@@ -3890,26 +4181,27 @@
3890 }, 4181 },
3891 { 4182 {
3892 "name": "scheb/two-factor-bundle", 4183 "name": "scheb/two-factor-bundle",
3893 "version": "v1.4.7", 4184 "version": "v2.0.0",
3894 "source": { 4185 "source": {
3895 "type": "git", 4186 "type": "git",
3896 "url": "https://github.com/scheb/two-factor-bundle.git", 4187 "url": "https://github.com/scheb/two-factor-bundle.git",
3897 "reference": "ef6830dbbf62b22efd335db8f64bf0f51d4284a2" 4188 "reference": "27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4"
3898 }, 4189 },
3899 "dist": { 4190 "dist": {
3900 "type": "zip", 4191 "type": "zip",
3901 "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/ef6830dbbf62b22efd335db8f64bf0f51d4284a2", 4192 "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4",
3902 "reference": "ef6830dbbf62b22efd335db8f64bf0f51d4284a2", 4193 "reference": "27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4",
3903 "shasum": "" 4194 "shasum": ""
3904 }, 4195 },
3905 "require": { 4196 "require": {
4197 "paragonie/random_compat": "~1.0",
3906 "sonata-project/google-authenticator": "~1.0", 4198 "sonata-project/google-authenticator": "~1.0",
3907 "symfony/symfony": "~2.1" 4199 "symfony/symfony": "~2.6|~3.0"
3908 }, 4200 },
3909 "require-dev": { 4201 "require-dev": {
3910 "satooshi/php-coveralls": "~0.6", 4202 "satooshi/php-coveralls": "~0.6",
3911 "swiftmailer/swiftmailer": ">=4.3, <6.0", 4203 "swiftmailer/swiftmailer": ">=4.3, <6.0",
3912 "symfony/phpunit-bridge": "~2.7" 4204 "symfony/phpunit-bridge": "~2.7|~3.0"
3913 }, 4205 },
3914 "type": "symfony-bundle", 4206 "type": "symfony-bundle",
3915 "autoload": { 4207 "autoload": {
@@ -3927,57 +4219,50 @@
3927 "email": "me@christianscheb.de" 4219 "email": "me@christianscheb.de"
3928 } 4220 }
3929 ], 4221 ],
3930 "description": "Provides two-factor authenticaton for Symfony2", 4222 "description": "Provides two-factor authentication for Symfony applications",
3931 "homepage": "https://github.com/scheb/two-factor-bundle", 4223 "homepage": "https://github.com/scheb/two-factor-bundle",
3932 "keywords": [ 4224 "keywords": [
3933 "Authentication", 4225 "Authentication",
3934 "Symfony2", 4226 "security",
4227 "symfony",
3935 "two-factor", 4228 "two-factor",
3936 "two-step" 4229 "two-step"
3937 ], 4230 ],
3938 "time": "2015-08-25 19:58:00" 4231 "time": "2015-12-31 17:20:20"
3939 }, 4232 },
3940 { 4233 {
3941 "name": "sensio/distribution-bundle", 4234 "name": "sensio/distribution-bundle",
3942 "version": "v3.0.34", 4235 "version": "v5.0.3",
3943 "target-dir": "Sensio/Bundle/DistributionBundle",
3944 "source": { 4236 "source": {
3945 "type": "git", 4237 "type": "git",
3946 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", 4238 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
3947 "reference": "587f3cd08bf8856cfc888b255f34f18b85930657" 4239 "reference": "419c1824af940e2be0f833aca2327e1181a6b503"
3948 }, 4240 },
3949 "dist": { 4241 "dist": {
3950 "type": "zip", 4242 "type": "zip",
3951 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/587f3cd08bf8856cfc888b255f34f18b85930657", 4243 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/419c1824af940e2be0f833aca2327e1181a6b503",
3952 "reference": "587f3cd08bf8856cfc888b255f34f18b85930657", 4244 "reference": "419c1824af940e2be0f833aca2327e1181a6b503",
3953 "shasum": "" 4245 "shasum": ""
3954 }, 4246 },
3955 "require": { 4247 "require": {
3956 "php": ">=5.3.3", 4248 "php": ">=5.3.9",
3957 "sensiolabs/security-checker": "~3.0", 4249 "sensiolabs/security-checker": "~3.0",
3958 "symfony/class-loader": "~2.2", 4250 "symfony/class-loader": "~2.3|~3.0",
3959 "symfony/framework-bundle": "~2.3", 4251 "symfony/config": "~2.3|~3.0",
3960 "symfony/process": "~2.2" 4252 "symfony/dependency-injection": "~2.3|~3.0",
3961 }, 4253 "symfony/filesystem": "~2.3|~3.0",
3962 "require-dev": { 4254 "symfony/http-kernel": "~2.3|~3.0",
3963 "symfony/form": "~2.2", 4255 "symfony/process": "~2.3|~3.0"
3964 "symfony/validator": "~2.2",
3965 "symfony/yaml": "~2.2"
3966 },
3967 "suggest": {
3968 "symfony/form": "If you want to use the configurator",
3969 "symfony/validator": "If you want to use the configurator",
3970 "symfony/yaml": "If you want to use the configurator"
3971 }, 4256 },
3972 "type": "symfony-bundle", 4257 "type": "symfony-bundle",
3973 "extra": { 4258 "extra": {
3974 "branch-alias": { 4259 "branch-alias": {
3975 "dev-master": "3.0.x-dev" 4260 "dev-master": "5.0.x-dev"
3976 } 4261 }
3977 }, 4262 },
3978 "autoload": { 4263 "autoload": {
3979 "psr-0": { 4264 "psr-4": {
3980 "Sensio\\Bundle\\DistributionBundle": "" 4265 "Sensio\\Bundle\\DistributionBundle\\": ""
3981 } 4266 }
3982 }, 4267 },
3983 "notification-url": "https://packagist.org/downloads/", 4268 "notification-url": "https://packagist.org/downloads/",
@@ -3995,7 +4280,7 @@
3995 "configuration", 4280 "configuration",
3996 "distribution" 4281 "distribution"
3997 ], 4282 ],
3998 "time": "2015-11-26 18:10:17" 4283 "time": "2015-12-18 17:44:11"
3999 }, 4284 },
4000 { 4285 {
4001 "name": "sensio/framework-extra-bundle", 4286 "name": "sensio/framework-extra-bundle",
@@ -4245,22 +4530,22 @@
4245 }, 4530 },
4246 { 4531 {
4247 "name": "stof/doctrine-extensions-bundle", 4532 "name": "stof/doctrine-extensions-bundle",
4248 "version": "v1.2.1", 4533 "version": "dev-master",
4249 "source": { 4534 "source": {
4250 "type": "git", 4535 "type": "git",
4251 "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git", 4536 "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
4252 "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e" 4537 "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5"
4253 }, 4538 },
4254 "dist": { 4539 "dist": {
4255 "type": "zip", 4540 "type": "zip",
4256 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/7b3144572617b0555f9a443317dbc2f9cf5b524e", 4541 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5",
4257 "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e", 4542 "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5",
4258 "shasum": "" 4543 "shasum": ""
4259 }, 4544 },
4260 "require": { 4545 "require": {
4261 "gedmo/doctrine-extensions": "^2.3.1", 4546 "gedmo/doctrine-extensions": "^2.3.1",
4262 "php": ">=5.3.2", 4547 "php": ">=5.3.2",
4263 "symfony/framework-bundle": "~2.1" 4548 "symfony/framework-bundle": "~2.1|~3.0"
4264 }, 4549 },
4265 "suggest": { 4550 "suggest": {
4266 "doctrine/doctrine-bundle": "to use the ORM extensions", 4551 "doctrine/doctrine-bundle": "to use the ORM extensions",
@@ -4302,7 +4587,7 @@
4302 "translatable", 4587 "translatable",
4303 "tree" 4588 "tree"
4304 ], 4589 ],
4305 "time": "2015-08-12 16:23:48" 4590 "time": "2015-11-26 18:29:38"
4306 }, 4591 },
4307 { 4592 {
4308 "name": "swiftmailer/swiftmailer", 4593 "name": "swiftmailer/swiftmailer",
@@ -4487,17 +4772,298 @@
4487 "time": "2015-11-17 10:02:29" 4772 "time": "2015-11-17 10:02:29"
4488 }, 4773 },
4489 { 4774 {
4775 "name": "symfony/polyfill-intl-icu",
4776 "version": "v1.0.1",
4777 "source": {
4778 "type": "git",
4779 "url": "https://github.com/symfony/polyfill-intl-icu.git",
4780 "reference": "2deb44160e1c886241c06602b12b98779f728177"
4781 },
4782 "dist": {
4783 "type": "zip",
4784 "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2deb44160e1c886241c06602b12b98779f728177",
4785 "reference": "2deb44160e1c886241c06602b12b98779f728177",
4786 "shasum": ""
4787 },
4788 "require": {
4789 "php": ">=5.3.3",
4790 "symfony/intl": "~2.3|~3.0"
4791 },
4792 "type": "library",
4793 "extra": {
4794 "branch-alias": {
4795 "dev-master": "1.0-dev"
4796 }
4797 },
4798 "autoload": {
4799 "files": [
4800 "bootstrap.php"
4801 ]
4802 },
4803 "notification-url": "https://packagist.org/downloads/",
4804 "license": [
4805 "MIT"
4806 ],
4807 "authors": [
4808 {
4809 "name": "Nicolas Grekas",
4810 "email": "p@tchwork.com"
4811 },
4812 {
4813 "name": "Symfony Community",
4814 "homepage": "https://symfony.com/contributors"
4815 }
4816 ],
4817 "description": "Symfony polyfill for intl's ICU-related data and classes",
4818 "homepage": "https://symfony.com",
4819 "keywords": [
4820 "compatibility",
4821 "icu",
4822 "intl",
4823 "polyfill",
4824 "portable",
4825 "shim"
4826 ],
4827 "time": "2015-11-04 20:28:58"
4828 },
4829 {
4830 "name": "symfony/polyfill-mbstring",
4831 "version": "v1.0.1",
4832 "source": {
4833 "type": "git",
4834 "url": "https://github.com/symfony/polyfill-mbstring.git",
4835 "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
4836 },
4837 "dist": {
4838 "type": "zip",
4839 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
4840 "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
4841 "shasum": ""
4842 },
4843 "require": {
4844 "php": ">=5.3.3"
4845 },
4846 "suggest": {
4847 "ext-mbstring": "For best performance"
4848 },
4849 "type": "library",
4850 "extra": {
4851 "branch-alias": {
4852 "dev-master": "1.0-dev"
4853 }
4854 },
4855 "autoload": {
4856 "psr-4": {
4857 "Symfony\\Polyfill\\Mbstring\\": ""
4858 },
4859 "files": [
4860 "bootstrap.php"
4861 ]
4862 },
4863 "notification-url": "https://packagist.org/downloads/",
4864 "license": [
4865 "MIT"
4866 ],
4867 "authors": [
4868 {
4869 "name": "Nicolas Grekas",
4870 "email": "p@tchwork.com"
4871 },
4872 {
4873 "name": "Symfony Community",
4874 "homepage": "https://symfony.com/contributors"
4875 }
4876 ],
4877 "description": "Symfony polyfill for the Mbstring extension",
4878 "homepage": "https://symfony.com",
4879 "keywords": [
4880 "compatibility",
4881 "mbstring",
4882 "polyfill",
4883 "portable",
4884 "shim"
4885 ],
4886 "time": "2015-11-20 09:19:13"
4887 },
4888 {
4889 "name": "symfony/polyfill-php56",
4890 "version": "v1.0.1",
4891 "source": {
4892 "type": "git",
4893 "url": "https://github.com/symfony/polyfill-php56.git",
4894 "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f"
4895 },
4896 "dist": {
4897 "type": "zip",
4898 "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f",
4899 "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f",
4900 "shasum": ""
4901 },
4902 "require": {
4903 "php": ">=5.3.3",
4904 "symfony/polyfill-util": "~1.0"
4905 },
4906 "type": "library",
4907 "extra": {
4908 "branch-alias": {
4909 "dev-master": "1.0-dev"
4910 }
4911 },
4912 "autoload": {
4913 "psr-4": {
4914 "Symfony\\Polyfill\\Php56\\": ""
4915 },
4916 "files": [
4917 "bootstrap.php"
4918 ]
4919 },
4920 "notification-url": "https://packagist.org/downloads/",
4921 "license": [
4922 "MIT"
4923 ],
4924 "authors": [
4925 {
4926 "name": "Nicolas Grekas",
4927 "email": "p@tchwork.com"
4928 },
4929 {
4930 "name": "Symfony Community",
4931 "homepage": "https://symfony.com/contributors"
4932 }
4933 ],
4934 "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
4935 "homepage": "https://symfony.com",
4936 "keywords": [
4937 "compatibility",
4938 "polyfill",
4939 "portable",
4940 "shim"
4941 ],
4942 "time": "2015-12-18 15:10:25"
4943 },
4944 {
4945 "name": "symfony/polyfill-php70",
4946 "version": "v1.0.1",
4947 "source": {
4948 "type": "git",
4949 "url": "https://github.com/symfony/polyfill-php70.git",
4950 "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146"
4951 },
4952 "dist": {
4953 "type": "zip",
4954 "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/7f7f3c9c2b9f17722e0cd64fdb4f957330c53146",
4955 "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146",
4956 "shasum": ""
4957 },
4958 "require": {
4959 "paragonie/random_compat": "~1.0",
4960 "php": ">=5.3.3"
4961 },
4962 "type": "library",
4963 "extra": {
4964 "branch-alias": {
4965 "dev-master": "1.0-dev"
4966 }
4967 },
4968 "autoload": {
4969 "psr-4": {
4970 "Symfony\\Polyfill\\Php70\\": ""
4971 },
4972 "files": [
4973 "bootstrap.php"
4974 ],
4975 "classmap": [
4976 "Resources/stubs"
4977 ]
4978 },
4979 "notification-url": "https://packagist.org/downloads/",
4980 "license": [
4981 "MIT"
4982 ],
4983 "authors": [
4984 {
4985 "name": "Nicolas Grekas",
4986 "email": "p@tchwork.com"
4987 },
4988 {
4989 "name": "Symfony Community",
4990 "homepage": "https://symfony.com/contributors"
4991 }
4992 ],
4993 "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
4994 "homepage": "https://symfony.com",
4995 "keywords": [
4996 "compatibility",
4997 "polyfill",
4998 "portable",
4999 "shim"
5000 ],
5001 "time": "2015-11-04 20:28:58"
5002 },
5003 {
5004 "name": "symfony/polyfill-util",
5005 "version": "v1.0.1",
5006 "source": {
5007 "type": "git",
5008 "url": "https://github.com/symfony/polyfill-util.git",
5009 "reference": "4271c55cbc0a77b2641f861b978123e46b3da969"
5010 },
5011 "dist": {
5012 "type": "zip",
5013 "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969",
5014 "reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
5015 "shasum": ""
5016 },
5017 "require": {
5018 "php": ">=5.3.3"
5019 },
5020 "type": "library",
5021 "extra": {
5022 "branch-alias": {
5023 "dev-master": "1.0-dev"
5024 }
5025 },
5026 "autoload": {
5027 "psr-4": {
5028 "Symfony\\Polyfill\\Util\\": ""
5029 }
5030 },
5031 "notification-url": "https://packagist.org/downloads/",
5032 "license": [
5033 "MIT"
5034 ],
5035 "authors": [
5036 {
5037 "name": "Nicolas Grekas",
5038 "email": "p@tchwork.com"
5039 },
5040 {
5041 "name": "Symfony Community",
5042 "homepage": "https://symfony.com/contributors"
5043 }
5044 ],
5045 "description": "Symfony utilities for portability of PHP codes",
5046 "homepage": "https://symfony.com",
5047 "keywords": [
5048 "compat",
5049 "compatibility",
5050 "polyfill",
5051 "shim"
5052 ],
5053 "time": "2015-11-04 20:28:58"
5054 },
5055 {
4490 "name": "symfony/swiftmailer-bundle", 5056 "name": "symfony/swiftmailer-bundle",
4491 "version": "v2.3.9", 5057 "version": "v2.3.10",
4492 "source": { 5058 "source": {
4493 "type": "git", 5059 "type": "git",
4494 "url": "https://github.com/symfony/swiftmailer-bundle.git", 5060 "url": "https://github.com/symfony/swiftmailer-bundle.git",
4495 "reference": "3d21ada19f23631f558ad6df653b168e35362e78" 5061 "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51"
4496 }, 5062 },
4497 "dist": { 5063 "dist": {
4498 "type": "zip", 5064 "type": "zip",
4499 "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", 5065 "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
4500 "reference": "3d21ada19f23631f558ad6df653b168e35362e78", 5066 "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
4501 "shasum": "" 5067 "shasum": ""
4502 }, 5068 },
4503 "require": { 5069 "require": {
@@ -4541,28 +5107,36 @@
4541 ], 5107 ],
4542 "description": "Symfony SwiftmailerBundle", 5108 "description": "Symfony SwiftmailerBundle",
4543 "homepage": "http://symfony.com", 5109 "homepage": "http://symfony.com",
4544 "time": "2015-11-28 10:59:29" 5110 "time": "2016-01-14 10:25:38"
4545 }, 5111 },
4546 { 5112 {
4547 "name": "symfony/symfony", 5113 "name": "symfony/symfony",
4548 "version": "v2.7.8", 5114 "version": "v3.0.1",
4549 "source": { 5115 "source": {
4550 "type": "git", 5116 "type": "git",
4551 "url": "https://github.com/symfony/symfony.git", 5117 "url": "https://github.com/symfony/symfony.git",
4552 "reference": "ad264021e44a5aaa132f16aef69f92e56795683e" 5118 "reference": "979d7323716fec847508eac3e62d59b117612a6e"
4553 }, 5119 },
4554 "dist": { 5120 "dist": {
4555 "type": "zip", 5121 "type": "zip",
4556 "url": "https://api.github.com/repos/symfony/symfony/zipball/ad264021e44a5aaa132f16aef69f92e56795683e", 5122 "url": "https://api.github.com/repos/symfony/symfony/zipball/979d7323716fec847508eac3e62d59b117612a6e",
4557 "reference": "ad264021e44a5aaa132f16aef69f92e56795683e", 5123 "reference": "979d7323716fec847508eac3e62d59b117612a6e",
4558 "shasum": "" 5124 "shasum": ""
4559 }, 5125 },
4560 "require": { 5126 "require": {
4561 "doctrine/common": "~2.4", 5127 "doctrine/common": "~2.4",
4562 "php": ">=5.3.9", 5128 "php": ">=5.5.9",
4563 "psr/log": "~1.0", 5129 "psr/log": "~1.0",
5130 "symfony/polyfill-intl-icu": "~1.0",
5131 "symfony/polyfill-mbstring": "~1.0",
5132 "symfony/polyfill-php56": "~1.0",
5133 "symfony/polyfill-php70": "~1.0",
5134 "symfony/polyfill-util": "~1.0",
4564 "twig/twig": "~1.23|~2.0" 5135 "twig/twig": "~1.23|~2.0"
4565 }, 5136 },
5137 "conflict": {
5138 "phpdocumentor/reflection": "<1.0.7"
5139 },
4566 "replace": { 5140 "replace": {
4567 "symfony/asset": "self.version", 5141 "symfony/asset": "self.version",
4568 "symfony/browser-kit": "self.version", 5142 "symfony/browser-kit": "self.version",
@@ -4584,22 +5158,22 @@
4584 "symfony/http-foundation": "self.version", 5158 "symfony/http-foundation": "self.version",
4585 "symfony/http-kernel": "self.version", 5159 "symfony/http-kernel": "self.version",
4586 "symfony/intl": "self.version", 5160 "symfony/intl": "self.version",
4587 "symfony/locale": "self.version", 5161 "symfony/ldap": "self.version",
4588 "symfony/monolog-bridge": "self.version", 5162 "symfony/monolog-bridge": "self.version",
4589 "symfony/options-resolver": "self.version", 5163 "symfony/options-resolver": "self.version",
4590 "symfony/process": "self.version", 5164 "symfony/process": "self.version",
4591 "symfony/property-access": "self.version", 5165 "symfony/property-access": "self.version",
5166 "symfony/property-info": "self.version",
4592 "symfony/proxy-manager-bridge": "self.version", 5167 "symfony/proxy-manager-bridge": "self.version",
4593 "symfony/routing": "self.version", 5168 "symfony/routing": "self.version",
4594 "symfony/security": "self.version", 5169 "symfony/security": "self.version",
4595 "symfony/security-acl": "self.version",
4596 "symfony/security-bundle": "self.version", 5170 "symfony/security-bundle": "self.version",
4597 "symfony/security-core": "self.version", 5171 "symfony/security-core": "self.version",
4598 "symfony/security-csrf": "self.version", 5172 "symfony/security-csrf": "self.version",
5173 "symfony/security-guard": "self.version",
4599 "symfony/security-http": "self.version", 5174 "symfony/security-http": "self.version",
4600 "symfony/serializer": "self.version", 5175 "symfony/serializer": "self.version",
4601 "symfony/stopwatch": "self.version", 5176 "symfony/stopwatch": "self.version",
4602 "symfony/swiftmailer-bridge": "self.version",
4603 "symfony/templating": "self.version", 5177 "symfony/templating": "self.version",
4604 "symfony/translation": "self.version", 5178 "symfony/translation": "self.version",
4605 "symfony/twig-bridge": "self.version", 5179 "symfony/twig-bridge": "self.version",
@@ -4612,17 +5186,18 @@
4612 "require-dev": { 5186 "require-dev": {
4613 "doctrine/data-fixtures": "1.0.*", 5187 "doctrine/data-fixtures": "1.0.*",
4614 "doctrine/dbal": "~2.4", 5188 "doctrine/dbal": "~2.4",
4615 "doctrine/doctrine-bundle": "~1.2", 5189 "doctrine/doctrine-bundle": "~1.4",
4616 "doctrine/orm": "~2.4,>=2.4.5", 5190 "doctrine/orm": "~2.4,>=2.4.5",
4617 "egulias/email-validator": "~1.2", 5191 "egulias/email-validator": "~1.2",
4618 "ircmaxell/password-compat": "~1.0",
4619 "monolog/monolog": "~1.11", 5192 "monolog/monolog": "~1.11",
4620 "ocramius/proxy-manager": "~0.4|~1.0" 5193 "ocramius/proxy-manager": "~0.4|~1.0",
5194 "phpdocumentor/reflection": "^1.0.7",
5195 "symfony/security-acl": "~2.8|~3.0"
4621 }, 5196 },
4622 "type": "library", 5197 "type": "library",
4623 "extra": { 5198 "extra": {
4624 "branch-alias": { 5199 "branch-alias": {
4625 "dev-master": "2.7-dev" 5200 "dev-master": "3.0-dev"
4626 } 5201 }
4627 }, 5202 },
4628 "autoload": { 5203 "autoload": {
@@ -4636,12 +5211,8 @@
4636 "Symfony\\Component\\": "src/Symfony/Component/" 5211 "Symfony\\Component\\": "src/Symfony/Component/"
4637 }, 5212 },
4638 "classmap": [ 5213 "classmap": [
4639 "src/Symfony/Component/HttpFoundation/Resources/stubs",
4640 "src/Symfony/Component/Intl/Resources/stubs" 5214 "src/Symfony/Component/Intl/Resources/stubs"
4641 ], 5215 ],
4642 "files": [
4643 "src/Symfony/Component/Intl/Resources/stubs/functions.php"
4644 ],
4645 "exclude-from-classmap": [ 5216 "exclude-from-classmap": [
4646 "**/Tests/" 5217 "**/Tests/"
4647 ] 5218 ]
@@ -4665,7 +5236,7 @@
4665 "keywords": [ 5236 "keywords": [
4666 "framework" 5237 "framework"
4667 ], 5238 ],
4668 "time": "2015-12-26 15:02:06" 5239 "time": "2015-12-26 16:49:48"
4669 }, 5240 },
4670 { 5241 {
4671 "name": "tecnickcom/tcpdf", 5242 "name": "tecnickcom/tcpdf",
@@ -4784,16 +5355,16 @@
4784 }, 5355 },
4785 { 5356 {
4786 "name": "twig/twig", 5357 "name": "twig/twig",
4787 "version": "v1.23.1", 5358 "version": "v1.23.3",
4788 "source": { 5359 "source": {
4789 "type": "git", 5360 "type": "git",
4790 "url": "https://github.com/twigphp/Twig.git", 5361 "url": "https://github.com/twigphp/Twig.git",
4791 "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" 5362 "reference": "ae53fc2c312fdee63773b75cb570304f85388b08"
4792 }, 5363 },
4793 "dist": { 5364 "dist": {
4794 "type": "zip", 5365 "type": "zip",
4795 "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", 5366 "url": "https://api.github.com/repos/twigphp/Twig/zipball/ae53fc2c312fdee63773b75cb570304f85388b08",
4796 "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", 5367 "reference": "ae53fc2c312fdee63773b75cb570304f85388b08",
4797 "shasum": "" 5368 "shasum": ""
4798 }, 5369 },
4799 "require": { 5370 "require": {
@@ -4841,7 +5412,7 @@
4841 "keywords": [ 5412 "keywords": [
4842 "templating" 5413 "templating"
4843 ], 5414 ],
4844 "time": "2015-11-05 12:49:06" 5415 "time": "2016-01-11 14:02:19"
4845 }, 5416 },
4846 { 5417 {
4847 "name": "wallabag/php-mobi", 5418 "name": "wallabag/php-mobi",
@@ -4891,34 +5462,34 @@
4891 }, 5462 },
4892 { 5463 {
4893 "name": "willdurand/hateoas", 5464 "name": "willdurand/hateoas",
4894 "version": "v2.6.0", 5465 "version": "v2.9.0",
4895 "source": { 5466 "source": {
4896 "type": "git", 5467 "type": "git",
4897 "url": "https://github.com/willdurand/Hateoas.git", 5468 "url": "https://github.com/willdurand/Hateoas.git",
4898 "reference": "fc0869381d6934e5d430084154584761297caa6c" 5469 "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c"
4899 }, 5470 },
4900 "dist": { 5471 "dist": {
4901 "type": "zip", 5472 "type": "zip",
4902 "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/fc0869381d6934e5d430084154584761297caa6c", 5473 "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/6e6ee945100bef3534c9276f0cf1c70d0115670c",
4903 "reference": "fc0869381d6934e5d430084154584761297caa6c", 5474 "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c",
4904 "shasum": "" 5475 "shasum": ""
4905 }, 5476 },
4906 "require": { 5477 "require": {
4907 "doctrine/annotations": "~1.0", 5478 "doctrine/annotations": "~1.0",
4908 "doctrine/common": "~2.0", 5479 "doctrine/common": "~2.0",
4909 "jms/metadata": "~1.1", 5480 "jms/metadata": "~1.1",
4910 "jms/serializer": "~0.13", 5481 "jms/serializer": "~1.0",
4911 "php": ">=5.3", 5482 "php": ">=5.4",
4912 "symfony/expression-language": "~2.4" 5483 "symfony/expression-language": "~2.4 || ~3.0"
4913 }, 5484 },
4914 "require-dev": { 5485 "require-dev": {
4915 "atoum/atoum": "*@dev", 5486 "atoum/atoum": "*@dev",
4916 "hautelook/frankenstein": "~0.1", 5487 "hautelook/frankenstein": "~0.1",
4917 "pagerfanta/pagerfanta": "~1.0", 5488 "pagerfanta/pagerfanta": "~1.0",
4918 "phpunit/phpunit": "~3.7", 5489 "phpunit/phpunit": "~3.7",
4919 "symfony/dependency-injection": "~2.0", 5490 "symfony/dependency-injection": "~2.0 || ~3.0",
4920 "symfony/routing": "~2.0", 5491 "symfony/routing": "~2.0 || ~3.0",
4921 "symfony/yaml": "~2.0", 5492 "symfony/yaml": "~2.0 || ~3.0",
4922 "twig/twig": "~1.12" 5493 "twig/twig": "~1.12"
4923 }, 5494 },
4924 "suggest": { 5495 "suggest": {
@@ -4929,7 +5500,7 @@
4929 "type": "library", 5500 "type": "library",
4930 "extra": { 5501 "extra": {
4931 "branch-alias": { 5502 "branch-alias": {
4932 "dev-master": "2.6-dev" 5503 "dev-master": "2.9-dev"
4933 } 5504 }
4934 }, 5505 },
4935 "autoload": { 5506 "autoload": {
@@ -4952,36 +5523,36 @@
4952 } 5523 }
4953 ], 5524 ],
4954 "description": "A PHP library to support implementing representations for HATEOAS REST web services", 5525 "description": "A PHP library to support implementing representations for HATEOAS REST web services",
4955 "time": "2015-05-21 21:57:34" 5526 "time": "2015-12-04 15:31:02"
4956 }, 5527 },
4957 { 5528 {
4958 "name": "willdurand/hateoas-bundle", 5529 "name": "willdurand/hateoas-bundle",
4959 "version": "0.5.0", 5530 "version": "1.1.0",
4960 "target-dir": "Bazinga/Bundle/HateoasBundle", 5531 "target-dir": "Bazinga/Bundle/HateoasBundle",
4961 "source": { 5532 "source": {
4962 "type": "git", 5533 "type": "git",
4963 "url": "https://github.com/willdurand/BazingaHateoasBundle.git", 5534 "url": "https://github.com/willdurand/BazingaHateoasBundle.git",
4964 "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b" 5535 "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2"
4965 }, 5536 },
4966 "dist": { 5537 "dist": {
4967 "type": "zip", 5538 "type": "zip",
4968 "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/3c86e8080e8a229365a0ce91818da6fe6562376b", 5539 "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/205a5a16899716f33edfb7a5afc4d451d0d2d0b2",
4969 "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b", 5540 "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2",
4970 "shasum": "" 5541 "shasum": ""
4971 }, 5542 },
4972 "require": { 5543 "require": {
4973 "jms/serializer-bundle": "~0.13", 5544 "jms/serializer-bundle": "~1.0",
4974 "symfony/framework-bundle": "~2.2", 5545 "symfony/framework-bundle": "~2.2 || ~3.0",
4975 "willdurand/hateoas": "~2.0" 5546 "willdurand/hateoas": "~2.9"
4976 }, 5547 },
4977 "require-dev": { 5548 "require-dev": {
4978 "symfony/expression-language": "~2.4", 5549 "symfony/expression-language": "~2.4 || ~3.0",
4979 "twig/twig": "~1.12" 5550 "twig/twig": "~1.12"
4980 }, 5551 },
4981 "type": "symfony-bundle", 5552 "type": "symfony-bundle",
4982 "extra": { 5553 "extra": {
4983 "branch-alias": { 5554 "branch-alias": {
4984 "dev-master": "1.0.x-dev" 5555 "dev-master": "1.2-dev"
4985 } 5556 }
4986 }, 5557 },
4987 "autoload": { 5558 "autoload": {
@@ -5004,7 +5575,7 @@
5004 "HATEOAS", 5575 "HATEOAS",
5005 "rest" 5576 "rest"
5006 ], 5577 ],
5007 "time": "2015-02-19 16:27:51" 5578 "time": "2015-12-07 08:25:05"
5008 }, 5579 },
5009 { 5580 {
5010 "name": "willdurand/jsonp-callback-validator", 5581 "name": "willdurand/jsonp-callback-validator",
@@ -5156,23 +5727,23 @@
5156 }, 5727 },
5157 { 5728 {
5158 "name": "doctrine/doctrine-fixtures-bundle", 5729 "name": "doctrine/doctrine-fixtures-bundle",
5159 "version": "v2.2.1", 5730 "version": "2.3.0",
5160 "source": { 5731 "source": {
5161 "type": "git", 5732 "type": "git",
5162 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", 5733 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
5163 "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8" 5734 "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029"
5164 }, 5735 },
5165 "dist": { 5736 "dist": {
5166 "type": "zip", 5737 "type": "zip",
5167 "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/817c2d233fde0fe85cb7e4d25d43fbfcd028aef8", 5738 "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/0f1a2f91b349e10f5c343f75ab71d23aace5b029",
5168 "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8", 5739 "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029",
5169 "shasum": "" 5740 "shasum": ""
5170 }, 5741 },
5171 "require": { 5742 "require": {
5172 "doctrine/data-fixtures": "~1.0", 5743 "doctrine/data-fixtures": "~1.0",
5173 "doctrine/doctrine-bundle": "~1.0", 5744 "doctrine/doctrine-bundle": "~1.0",
5174 "php": ">=5.3.2", 5745 "php": ">=5.3.2",
5175 "symfony/doctrine-bridge": "~2.1" 5746 "symfony/doctrine-bridge": "~2.3|~3.0"
5176 }, 5747 },
5177 "type": "symfony-bundle", 5748 "type": "symfony-bundle",
5178 "extra": { 5749 "extra": {
@@ -5209,7 +5780,7 @@
5209 "Fixture", 5780 "Fixture",
5210 "persistence" 5781 "persistence"
5211 ], 5782 ],
5212 "time": "2015-08-04 22:43:14" 5783 "time": "2015-11-04 21:23:23"
5213 }, 5784 },
5214 { 5785 {
5215 "name": "phpdocumentor/reflection-docblock", 5786 "name": "phpdocumentor/reflection-docblock",
@@ -6061,38 +6632,42 @@
6061 }, 6632 },
6062 { 6633 {
6063 "name": "sensio/generator-bundle", 6634 "name": "sensio/generator-bundle",
6064 "version": "v2.5.3", 6635 "version": "v3.0.5",
6065 "target-dir": "Sensio/Bundle/GeneratorBundle",
6066 "source": { 6636 "source": {
6067 "type": "git", 6637 "type": "git",
6068 "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", 6638 "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
6069 "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" 6639 "reference": "5274eafa251359087230bade2ff35dd6cec2e530"
6070 }, 6640 },
6071 "dist": { 6641 "dist": {
6072 "type": "zip", 6642 "type": "zip",
6073 "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", 6643 "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/5274eafa251359087230bade2ff35dd6cec2e530",
6074 "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", 6644 "reference": "5274eafa251359087230bade2ff35dd6cec2e530",
6075 "shasum": "" 6645 "shasum": ""
6076 }, 6646 },
6077 "require": { 6647 "require": {
6078 "symfony/console": "~2.5", 6648 "symfony/console": "~2.7|~3.0",
6079 "symfony/framework-bundle": "~2.2" 6649 "symfony/framework-bundle": "~2.7|~3.0",
6650 "symfony/process": "~2.7|~3.0",
6651 "symfony/yaml": "~2.7|~3.0"
6080 }, 6652 },
6081 "require-dev": { 6653 "require-dev": {
6082 "doctrine/orm": "~2.2,>=2.2.3", 6654 "doctrine/orm": "~2.4",
6083 "symfony/doctrine-bridge": "~2.2", 6655 "symfony/doctrine-bridge": "~2.7|~3.0",
6084 "twig/twig": "~1.11" 6656 "twig/twig": "~1.18"
6085 }, 6657 },
6086 "type": "symfony-bundle", 6658 "type": "symfony-bundle",
6087 "extra": { 6659 "extra": {
6088 "branch-alias": { 6660 "branch-alias": {
6089 "dev-master": "2.5.x-dev" 6661 "dev-master": "3.0.x-dev"
6090 } 6662 }
6091 }, 6663 },
6092 "autoload": { 6664 "autoload": {
6093 "psr-0": { 6665 "psr-4": {
6094 "Sensio\\Bundle\\GeneratorBundle": "" 6666 "Sensio\\Bundle\\GeneratorBundle\\": ""
6095 } 6667 },
6668 "exclude-from-classmap": [
6669 "/Tests/"
6670 ]
6096 }, 6671 },
6097 "notification-url": "https://packagist.org/downloads/", 6672 "notification-url": "https://packagist.org/downloads/",
6098 "license": [ 6673 "license": [
@@ -6105,24 +6680,24 @@
6105 } 6680 }
6106 ], 6681 ],
6107 "description": "This bundle generates code for you", 6682 "description": "This bundle generates code for you",
6108 "time": "2015-03-17 06:36:52" 6683 "time": "2016-01-05 16:30:36"
6109 }, 6684 },
6110 { 6685 {
6111 "name": "symfony/phpunit-bridge", 6686 "name": "symfony/phpunit-bridge",
6112 "version": "v2.7.8", 6687 "version": "v2.8.2",
6113 "source": { 6688 "source": {
6114 "type": "git", 6689 "type": "git",
6115 "url": "https://github.com/symfony/phpunit-bridge.git", 6690 "url": "https://github.com/symfony/phpunit-bridge.git",
6116 "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed" 6691 "reference": "855dc0e829fad123966347612b4183e307338c11"
6117 }, 6692 },
6118 "dist": { 6693 "dist": {
6119 "type": "zip", 6694 "type": "zip",
6120 "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e960e64acbed50e49818eb78840486c8d7fe1bed", 6695 "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/855dc0e829fad123966347612b4183e307338c11",
6121 "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed", 6696 "reference": "855dc0e829fad123966347612b4183e307338c11",
6122 "shasum": "" 6697 "shasum": ""
6123 }, 6698 },
6124 "require": { 6699 "require": {
6125 "php": ">=5.3.9" 6700 "php": ">=5.3.3"
6126 }, 6701 },
6127 "suggest": { 6702 "suggest": {
6128 "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" 6703 "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
@@ -6130,7 +6705,7 @@
6130 "type": "symfony-bridge", 6705 "type": "symfony-bridge",
6131 "extra": { 6706 "extra": {
6132 "branch-alias": { 6707 "branch-alias": {
6133 "dev-master": "2.7-dev" 6708 "dev-master": "2.8-dev"
6134 } 6709 }
6135 }, 6710 },
6136 "autoload": { 6711 "autoload": {
@@ -6160,7 +6735,7 @@
6160 ], 6735 ],
6161 "description": "Symfony PHPUnit Bridge", 6736 "description": "Symfony PHPUnit Bridge",
6162 "homepage": "https://symfony.com", 6737 "homepage": "https://symfony.com",
6163 "time": "2015-11-06 10:15:01" 6738 "time": "2016-01-06 09:59:23"
6164 } 6739 }
6165 ], 6740 ],
6166 "aliases": [], 6741 "aliases": [],
@@ -6173,7 +6748,7 @@
6173 "prefer-stable": true, 6748 "prefer-stable": true,
6174 "prefer-lowest": false, 6749 "prefer-lowest": false,
6175 "platform": { 6750 "platform": {
6176 "php": ">=5.5.0" 6751 "php": ">=5.5.9"
6177 }, 6752 },
6178 "platform-dev": [] 6753 "platform-dev": []
6179} 6754}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7bec5b5e..e68df9de 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,32 +9,27 @@
9 processIsolation="false" 9 processIsolation="false"
10 stopOnFailure="false" 10 stopOnFailure="false"
11 syntaxCheck="false" 11 syntaxCheck="false"
12 bootstrap="app/bootstrap.php.cache" 12 bootstrap="app/autoload.php"
13 > 13 >
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 <!--
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 </php> 23 </php>
29 24
30 <filter> 25 <filter>
31 <whitelist> 26 <whitelist>
32 <directory>./src</directory> 27 <directory>src</directory>
33 <exclude> 28 <exclude>
34 <directory>./vendor</directory> 29 <directory>vendor</directory>
35 <directory>./src/Wallabag/*Bundle/Resources</directory> 30 <directory>src/Wallabag/*Bundle/Resources</directory>
36 <directory>./src/Wallabag/*Bundle/Tests</directory> 31 <directory>src/Wallabag/*Bundle/Tests</directory>
37 <directory>./src/Wallabag/*Bundle/DataFixtures</directory> 32 <directory>src/Wallabag/*Bundle/DataFixtures</directory>
38 </exclude> 33 </exclude>
39 </whitelist> 34 </whitelist>
40 </filter> 35 </filter>
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
index 354a6f8e..d9035cac 100644
--- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
@@ -3,13 +3,14 @@
3namespace Wallabag\ApiBundle\Controller; 3namespace Wallabag\ApiBundle\Controller;
4 4
5use FOS\RestBundle\Controller\FOSRestController; 5use FOS\RestBundle\Controller\FOSRestController;
6use Hateoas\Configuration\Route;
7use Hateoas\Representation\Factory\PagerfantaFactory;
6use Nelmio\ApiDocBundle\Annotation\ApiDoc; 8use Nelmio\ApiDocBundle\Annotation\ApiDoc;
7use Symfony\Component\HttpFoundation\Request; 9use Symfony\Component\HttpFoundation\Request;
8use Symfony\Component\HttpFoundation\Response; 10use Symfony\Component\HttpFoundation\Response;
11use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
9use Wallabag\CoreBundle\Entity\Entry; 12use Wallabag\CoreBundle\Entity\Entry;
10use Wallabag\CoreBundle\Entity\Tag; 13use Wallabag\CoreBundle\Entity\Tag;
11use Hateoas\Configuration\Route;
12use Hateoas\Representation\Factory\PagerfantaFactory;
13 14
14class WallabagRestController extends FOSRestController 15class WallabagRestController extends FOSRestController
15{ 16{
@@ -84,7 +85,7 @@ class WallabagRestController extends FOSRestController
84 $pagerfantaFactory = new PagerfantaFactory('page', 'perPage'); 85 $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
85 $paginatedCollection = $pagerfantaFactory->createRepresentation( 86 $paginatedCollection = $pagerfantaFactory->createRepresentation(
86 $pager, 87 $pager,
87 new Route('api_get_entries', [], $absolute = true) 88 new Route('api_get_entries', [], UrlGeneratorInterface::ABSOLUTE_URL)
88 ); 89 );
89 90
90 $json = $this->get('serializer')->serialize($paginatedCollection, 'json'); 91 $json = $this->get('serializer')->serialize($paginatedCollection, 'json');
diff --git a/src/Wallabag/ApiBundle/Entity/AccessToken.php b/src/Wallabag/ApiBundle/Entity/AccessToken.php
index b1f4e7de..2ff63a83 100644
--- a/src/Wallabag/ApiBundle/Entity/AccessToken.php
+++ b/src/Wallabag/ApiBundle/Entity/AccessToken.php
@@ -2,8 +2,8 @@
2 2
3namespace Wallabag\ApiBundle\Entity; 3namespace Wallabag\ApiBundle\Entity;
4 4
5use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
6use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
7 7
8/** 8/**
9 * @ORM\Table("oauth2_access_tokens") 9 * @ORM\Table("oauth2_access_tokens")
diff --git a/src/Wallabag/ApiBundle/Entity/AuthCode.php b/src/Wallabag/ApiBundle/Entity/AuthCode.php
index 81398158..4d4b09fe 100644
--- a/src/Wallabag/ApiBundle/Entity/AuthCode.php
+++ b/src/Wallabag/ApiBundle/Entity/AuthCode.php
@@ -2,8 +2,8 @@
2 2
3namespace Wallabag\ApiBundle\Entity; 3namespace Wallabag\ApiBundle\Entity;
4 4
5use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
6use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
7 7
8/** 8/**
9 * @ORM\Table("oauth2_auth_codes") 9 * @ORM\Table("oauth2_auth_codes")
diff --git a/src/Wallabag/ApiBundle/Entity/Client.php b/src/Wallabag/ApiBundle/Entity/Client.php
index d449870a..c04ed0f6 100644
--- a/src/Wallabag/ApiBundle/Entity/Client.php
+++ b/src/Wallabag/ApiBundle/Entity/Client.php
@@ -2,8 +2,8 @@
2 2
3namespace Wallabag\ApiBundle\Entity; 3namespace Wallabag\ApiBundle\Entity;
4 4
5use FOS\OAuthServerBundle\Entity\Client as BaseClient;
6use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6use FOS\OAuthServerBundle\Entity\Client as BaseClient;
7 7
8/** 8/**
9 * @ORM\Table("oauth2_clients") 9 * @ORM\Table("oauth2_clients")
diff --git a/src/Wallabag/ApiBundle/Entity/RefreshToken.php b/src/Wallabag/ApiBundle/Entity/RefreshToken.php
index be2c1d2e..6d0cab68 100644
--- a/src/Wallabag/ApiBundle/Entity/RefreshToken.php
+++ b/src/Wallabag/ApiBundle/Entity/RefreshToken.php
@@ -2,8 +2,8 @@
2 2
3namespace Wallabag\ApiBundle\Entity; 3namespace Wallabag\ApiBundle\Entity;
4 4
5use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
6use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
7 7
8/** 8/**
9 * @ORM\Table("oauth2_refresh_tokens") 9 * @ORM\Table("oauth2_refresh_tokens")
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index e791d4dd..da099a19 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -3,14 +3,14 @@
3namespace Wallabag\CoreBundle\Command; 3namespace Wallabag\CoreBundle\Command;
4 4
5use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; 5use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
6use Symfony\Component\Console\Helper\Table;
7use Symfony\Component\Console\Input\ArrayInput;
6use Symfony\Component\Console\Input\InputInterface; 8use Symfony\Component\Console\Input\InputInterface;
7use Symfony\Component\Console\Input\InputOption; 9use Symfony\Component\Console\Input\InputOption;
8use Symfony\Component\Console\Input\ArrayInput;
9use Symfony\Component\Console\Output\OutputInterface;
10use Symfony\Component\Console\Output\NullOutput; 10use Symfony\Component\Console\Output\NullOutput;
11use Symfony\Component\Console\Question\Question; 11use Symfony\Component\Console\Output\OutputInterface;
12use Symfony\Component\Console\Question\ConfirmationQuestion; 12use Symfony\Component\Console\Question\ConfirmationQuestion;
13use Symfony\Component\Console\Helper\Table; 13use Symfony\Component\Console\Question\Question;
14use Wallabag\CoreBundle\Entity\Config; 14use Wallabag\CoreBundle\Entity\Config;
15 15
16class InstallCommand extends ContainerAwareCommand 16class InstallCommand extends ContainerAwareCommand
@@ -55,7 +55,7 @@ class InstallCommand extends ContainerAwareCommand
55 ; 55 ;
56 56
57 $output->writeln('<info>Wallabag has been successfully installed.</info>'); 57 $output->writeln('<info>Wallabag has been successfully installed.</info>');
58 $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>');
59 } 59 }
60 60
61 protected function checkRequirements() 61 protected function checkRequirements()
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 7a187710..d0cf91de 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -4,17 +4,18 @@ namespace Wallabag\CoreBundle\Controller;
4 4
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
6use Symfony\Bundle\FrameworkBundle\Controller\Controller; 6use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7use Symfony\Component\HttpFoundation\Request;
8use Symfony\Component\HttpFoundation\JsonResponse; 7use Symfony\Component\HttpFoundation\JsonResponse;
8use Symfony\Component\HttpFoundation\Request;
9use Wallabag\CoreBundle\Entity\Config; 9use Wallabag\CoreBundle\Entity\Config;
10use Wallabag\CoreBundle\Entity\TaggingRule; 10use Wallabag\CoreBundle\Entity\TaggingRule;
11use Wallabag\UserBundle\Entity\User; 11use Wallabag\CoreBundle\Form\Type\ConfigType;
12use Wallabag\CoreBundle\Form\Type\ChangePasswordType; 12use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
13use Wallabag\CoreBundle\Form\Type\UserInformationType;
14use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
15use Wallabag\CoreBundle\Form\Type\NewUserType; 13use Wallabag\CoreBundle\Form\Type\NewUserType;
16use Wallabag\CoreBundle\Form\Type\RssType; 14use Wallabag\CoreBundle\Form\Type\RssType;
15use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
16use Wallabag\CoreBundle\Form\Type\UserInformationType;
17use Wallabag\CoreBundle\Tools\Utils; 17use Wallabag\CoreBundle\Tools\Utils;
18use Wallabag\UserBundle\Entity\User;
18 19
19class ConfigController extends Controller 20class ConfigController extends Controller
20{ 21{
@@ -31,7 +32,7 @@ class ConfigController extends Controller
31 $user = $this->getUser(); 32 $user = $this->getUser();
32 33
33 // handle basic config detail (this form is defined as a service) 34 // handle basic config detail (this form is defined as a service)
34 $configForm = $this->createForm('config', $config, array('action' => $this->generateUrl('config'))); 35 $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config')));
35 $configForm->handleRequest($request); 36 $configForm->handleRequest($request);
36 37
37 if ($configForm->isValid()) { 38 if ($configForm->isValid()) {
@@ -51,7 +52,7 @@ class ConfigController extends Controller
51 } 52 }
52 53
53 // handle changing password 54 // handle changing password
54 $pwdForm = $this->createForm(new ChangePasswordType(), null, array('action' => $this->generateUrl('config').'#set4')); 55 $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4'));
55 $pwdForm->handleRequest($request); 56 $pwdForm->handleRequest($request);
56 57
57 if ($pwdForm->isValid()) { 58 if ($pwdForm->isValid()) {
@@ -67,7 +68,7 @@ class ConfigController extends Controller
67 } 68 }
68 69
69 // handle changing user information 70 // handle changing user information
70 $userForm = $this->createForm(new UserInformationType(), $user, array( 71 $userForm = $this->createForm(UserInformationType::class, $user, array(
71 'validation_groups' => array('Profile'), 72 'validation_groups' => array('Profile'),
72 'action' => $this->generateUrl('config').'#set3', 73 'action' => $this->generateUrl('config').'#set3',
73 )); 74 ));
@@ -85,7 +86,7 @@ class ConfigController extends Controller
85 } 86 }
86 87
87 // handle rss information 88 // handle rss information
88 $rssForm = $this->createForm(new RssType(), $config, array('action' => $this->generateUrl('config').'#set2')); 89 $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2'));
89 $rssForm->handleRequest($request); 90 $rssForm->handleRequest($request);
90 91
91 if ($rssForm->isValid()) { 92 if ($rssForm->isValid()) {
@@ -102,7 +103,7 @@ class ConfigController extends Controller
102 103
103 // handle tagging rule 104 // handle tagging rule
104 $taggingRule = new TaggingRule(); 105 $taggingRule = new TaggingRule();
105 $newTaggingRule = $this->createForm(new TaggingRuleType(), $taggingRule, array('action' => $this->generateUrl('config').'#set5')); 106 $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
106 $newTaggingRule->handleRequest($request); 107 $newTaggingRule->handleRequest($request);
107 108
108 if ($newTaggingRule->isValid()) { 109 if ($newTaggingRule->isValid()) {
@@ -122,7 +123,7 @@ class ConfigController extends Controller
122 $newUser = $userManager->createUser(); 123 $newUser = $userManager->createUser();
123 // enable created user by default 124 // enable created user by default
124 $newUser->setEnabled(true); 125 $newUser->setEnabled(true);
125 $newUserForm = $this->createForm(new NewUserType(), $newUser, array( 126 $newUserForm = $this->createForm(NewUserType::class, $newUser, array(
126 'validation_groups' => array('Profile'), 127 'validation_groups' => array('Profile'),
127 'action' => $this->generateUrl('config').'#set5', 128 'action' => $this->generateUrl('config').'#set5',
128 )); 129 ));
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 3d22c7bc..aa70307b 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -2,16 +2,16 @@
2 2
3namespace Wallabag\CoreBundle\Controller; 3namespace Wallabag\CoreBundle\Controller;
4 4
5use Pagerfanta\Adapter\DoctrineORMAdapter;
6use Pagerfanta\Pagerfanta;
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 7use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
6use Symfony\Bundle\FrameworkBundle\Controller\Controller; 8use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7use Symfony\Component\HttpFoundation\Request; 9use Symfony\Component\HttpFoundation\Request;
8use Symfony\Component\Routing\Generator\UrlGeneratorInterface; 10use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
9use Wallabag\CoreBundle\Entity\Entry; 11use Wallabag\CoreBundle\Entity\Entry;
10use Wallabag\CoreBundle\Form\Type\NewEntryType;
11use Wallabag\CoreBundle\Form\Type\EditEntryType;
12use Wallabag\CoreBundle\Filter\EntryFilterType; 12use Wallabag\CoreBundle\Filter\EntryFilterType;
13use Pagerfanta\Adapter\DoctrineORMAdapter; 13use Wallabag\CoreBundle\Form\Type\EditEntryType;
14use Pagerfanta\Pagerfanta; 14use Wallabag\CoreBundle\Form\Type\NewEntryType;
15 15
16class EntryController extends Controller 16class EntryController extends Controller
17{ 17{
@@ -43,7 +43,7 @@ class EntryController extends Controller
43 { 43 {
44 $entry = new Entry($this->getUser()); 44 $entry = new Entry($this->getUser());
45 45
46 $form = $this->createForm(new NewEntryType(), $entry); 46 $form = $this->createForm(NewEntryType::class, $entry);
47 47
48 $form->handleRequest($request); 48 $form->handleRequest($request);
49 49
@@ -117,7 +117,7 @@ class EntryController extends Controller
117 { 117 {
118 $this->checkUserAction($entry); 118 $this->checkUserAction($entry);
119 119
120 $form = $this->createForm(new EditEntryType(), $entry); 120 $form = $this->createForm(EditEntryType::class, $entry);
121 121
122 $form->handleRequest($request); 122 $form->handleRequest($request);
123 123
@@ -239,7 +239,7 @@ class EntryController extends Controller
239 throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); 239 throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
240 } 240 }
241 241
242 $form = $this->get('form.factory')->create(new EntryFilterType($repository, $this->getUser())); 242 $form = $this->createForm(EntryFilterType::class);
243 243
244 if ($request->query->has($form->getName())) { 244 if ($request->query->has($form->getName())) {
245 // manually bind values from the request 245 // manually bind values from the request
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php
index 023a6228..2b7ef598 100644
--- a/src/Wallabag/CoreBundle/Controller/RssController.php
+++ b/src/Wallabag/CoreBundle/Controller/RssController.php
@@ -2,13 +2,13 @@
2 2
3namespace Wallabag\CoreBundle\Controller; 3namespace Wallabag\CoreBundle\Controller;
4 4
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 5use Pagerfanta\Adapter\DoctrineORMAdapter;
6use Pagerfanta\Pagerfanta;
6use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; 7use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
8use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
7use Symfony\Bundle\FrameworkBundle\Controller\Controller; 9use Symfony\Bundle\FrameworkBundle\Controller\Controller;
8use Wallabag\UserBundle\Entity\User;
9use Wallabag\CoreBundle\Entity\Entry; 10use Wallabag\CoreBundle\Entity\Entry;
10use Pagerfanta\Adapter\DoctrineORMAdapter; 11use Wallabag\UserBundle\Entity\User;
11use Pagerfanta\Pagerfanta;
12 12
13class RssController extends Controller 13class RssController extends Controller
14{ 14{
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 64d53f0c..ff4d64a8 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -5,9 +5,9 @@ namespace Wallabag\CoreBundle\Controller;
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
6use Symfony\Bundle\FrameworkBundle\Controller\Controller; 6use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7use Symfony\Component\HttpFoundation\Request; 7use Symfony\Component\HttpFoundation\Request;
8use Wallabag\CoreBundle\Form\Type\NewTagType;
9use Wallabag\CoreBundle\Entity\Tag;
10use Wallabag\CoreBundle\Entity\Entry; 8use Wallabag\CoreBundle\Entity\Entry;
9use Wallabag\CoreBundle\Entity\Tag;
10use Wallabag\CoreBundle\Form\Type\NewTagType;
11 11
12class TagController extends Controller 12class TagController extends Controller
13{ 13{
@@ -21,7 +21,7 @@ class TagController extends Controller
21 public function addTagFormAction(Request $request, Entry $entry) 21 public function addTagFormAction(Request $request, Entry $entry)
22 { 22 {
23 $tag = new Tag(); 23 $tag = new Tag();
24 $form = $this->createForm(new NewTagType(), $tag); 24 $form = $this->createForm(NewTagType::class, $tag);
25 $form->handleRequest($request); 25 $form->handleRequest($request);
26 26
27 if ($form->isValid()) { 27 if ($form->isValid()) {
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index 330cc957..9ff9b732 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -2,10 +2,10 @@
2 2
3namespace Wallabag\CoreBundle\DependencyInjection; 3namespace Wallabag\CoreBundle\DependencyInjection;
4 4
5use Symfony\Component\DependencyInjection\ContainerBuilder;
6use Symfony\Component\Config\FileLocator; 5use Symfony\Component\Config\FileLocator;
7use Symfony\Component\HttpKernel\DependencyInjection\Extension; 6use Symfony\Component\DependencyInjection\ContainerBuilder;
8use Symfony\Component\DependencyInjection\Loader; 7use Symfony\Component\DependencyInjection\Loader;
8use Symfony\Component\HttpKernel\DependencyInjection\Extension;
9 9
10class WallabagCoreExtension extends Extension 10class WallabagCoreExtension extends Extension
11{ 11{
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index f11a7786..24b24dbb 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -4,10 +4,10 @@ namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\Common\Collections\ArrayCollection; 5use Doctrine\Common\Collections\ArrayCollection;
6use Doctrine\ORM\Mapping as ORM; 6use Doctrine\ORM\Mapping as ORM;
7use Symfony\Component\Validator\Constraints as Assert;
8use Hateoas\Configuration\Annotation as Hateoas; 7use Hateoas\Configuration\Annotation as Hateoas;
9use JMS\Serializer\Annotation\Groups; 8use JMS\Serializer\Annotation\Groups;
10use JMS\Serializer\Annotation\XmlRoot; 9use JMS\Serializer\Annotation\XmlRoot;
10use Symfony\Component\Validator\Constraints as Assert;
11use Wallabag\UserBundle\Entity\User; 11use Wallabag\UserBundle\Entity\User;
12 12
13/** 13/**
diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php
index 0689c7b3..c1940e99 100644
--- a/src/Wallabag/CoreBundle/Entity/Tag.php
+++ b/src/Wallabag/CoreBundle/Entity/Tag.php
@@ -2,12 +2,12 @@
2 2
3namespace Wallabag\CoreBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\Common\Collections\ArrayCollection;
5use Doctrine\ORM\Mapping as ORM; 6use Doctrine\ORM\Mapping as ORM;
6use JMS\Serializer\Annotation\XmlRoot;
7use JMS\Serializer\Annotation\ExclusionPolicy; 7use JMS\Serializer\Annotation\ExclusionPolicy;
8use JMS\Serializer\Annotation\Expose; 8use JMS\Serializer\Annotation\Expose;
9use Doctrine\Common\Collections\ArrayCollection;
10use Gedmo\Mapping\Annotation as Gedmo; 9use Gedmo\Mapping\Annotation as Gedmo;
10use JMS\Serializer\Annotation\XmlRoot;
11 11
12/** 12/**
13 * Tag. 13 * Tag.
diff --git a/src/Wallabag/CoreBundle/Entity/TaggingRule.php b/src/Wallabag/CoreBundle/Entity/TaggingRule.php
index 329d7ff8..28914cc1 100644
--- a/src/Wallabag/CoreBundle/Entity/TaggingRule.php
+++ b/src/Wallabag/CoreBundle/Entity/TaggingRule.php
@@ -3,8 +3,8 @@
3namespace Wallabag\CoreBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6use Symfony\Component\Validator\Constraints as Assert;
7use KPhoen\RulerZBundle\Validator\Constraints as RulerZAssert; 6use KPhoen\RulerZBundle\Validator\Constraints as RulerZAssert;
7use Symfony\Component\Validator\Constraints as Assert;
8 8
9/** 9/**
10 * Tagging rule. 10 * Tagging rule.
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
index cfdbfe97..cabb3eca 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
@@ -2,8 +2,8 @@
2 2
3namespace Wallabag\CoreBundle\Event\Subscriber; 3namespace Wallabag\CoreBundle\Event\Subscriber;
4 4
5use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
6use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent; 5use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
6use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
7use Symfony\Component\EventDispatcher\EventSubscriberInterface; 7use Symfony\Component\EventDispatcher\EventSubscriberInterface;
8 8
9/** 9/**
diff --git a/src/Wallabag/CoreBundle/EventListener/LocaleListener.php b/src/Wallabag/CoreBundle/EventListener/LocaleListener.php
index 80f59504..05deac0a 100644
--- a/src/Wallabag/CoreBundle/EventListener/LocaleListener.php
+++ b/src/Wallabag/CoreBundle/EventListener/LocaleListener.php
@@ -2,9 +2,9 @@
2 2
3namespace Wallabag\CoreBundle\EventListener; 3namespace Wallabag\CoreBundle\EventListener;
4 4
5use Symfony\Component\EventDispatcher\EventSubscriberInterface;
5use Symfony\Component\HttpKernel\Event\GetResponseEvent; 6use Symfony\Component\HttpKernel\Event\GetResponseEvent;
6use Symfony\Component\HttpKernel\KernelEvents; 7use Symfony\Component\HttpKernel\KernelEvents;
7use Symfony\Component\EventDispatcher\EventSubscriberInterface;
8 8
9/** 9/**
10 * @see http://symfony.com/doc/current/cookbook/session/locale_sticky_session.html 10 * @see http://symfony.com/doc/current/cookbook/session/locale_sticky_session.html
diff --git a/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php
index 68c25f1f..1c9160d5 100644
--- a/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php
+++ b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php
@@ -2,11 +2,11 @@
2 2
3namespace Wallabag\CoreBundle\EventListener; 3namespace Wallabag\CoreBundle\EventListener;
4 4
5use Symfony\Component\EventDispatcher\EventDispatcherInterface;
6use Symfony\Component\EventDispatcher\EventSubscriberInterface;
7use Doctrine\ORM\EntityManager; 5use Doctrine\ORM\EntityManager;
8use FOS\UserBundle\Event\FilterUserResponseEvent; 6use FOS\UserBundle\Event\FilterUserResponseEvent;
9use FOS\UserBundle\FOSUserEvents; 7use FOS\UserBundle\FOSUserEvents;
8use Symfony\Component\EventDispatcher\EventDispatcherInterface;
9use Symfony\Component\EventDispatcher\EventSubscriberInterface;
10use Wallabag\CoreBundle\Entity\Config; 10use Wallabag\CoreBundle\Entity\Config;
11 11
12class RegistrationConfirmedListener implements EventSubscriberInterface 12class RegistrationConfirmedListener implements EventSubscriberInterface
diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
index 32de21ca..c38be832 100644
--- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
@@ -2,12 +2,17 @@
2 2
3namespace Wallabag\CoreBundle\Filter; 3namespace Wallabag\CoreBundle\Filter;
4 4
5use Doctrine\ORM\EntityRepository;
6use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
7use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
8use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
9use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType;
10use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType;
11use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
5use Symfony\Component\Form\AbstractType; 12use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\FormBuilderInterface; 13use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 14use Symfony\Component\OptionsResolver\OptionsResolver;
8use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; 15use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
9use Doctrine\ORM\EntityRepository;
10use Wallabag\UserBundle\Entity\User;
11 16
12class EntryFilterType extends AbstractType 17class EntryFilterType extends AbstractType
13{ 18{
@@ -18,19 +23,19 @@ class EntryFilterType extends AbstractType
18 * Repository & user are used to get a list of language entries for this user. 23 * Repository & user are used to get a list of language entries for this user.
19 * 24 *
20 * @param EntityRepository $entryRepository 25 * @param EntityRepository $entryRepository
21 * @param User $user 26 * @param TokenStorage $token
22 */ 27 */
23 public function __construct(EntityRepository $entryRepository, User $user) 28 public function __construct(EntityRepository $entryRepository, TokenStorage $token)
24 { 29 {
25 $this->repository = $entryRepository; 30 $this->repository = $entryRepository;
26 $this->user = $user; 31 $this->user = $token->getToken()->getUser();
27 } 32 }
28 33
29 public function buildForm(FormBuilderInterface $builder, array $options) 34 public function buildForm(FormBuilderInterface $builder, array $options)
30 { 35 {
31 $builder 36 $builder
32 ->add('readingTime', 'filter_number_range') 37 ->add('readingTime', NumberRangeFilterType::class)
33 ->add('createdAt', 'filter_date_range', array( 38 ->add('createdAt', DateRangeFilterType::class, array(
34 'left_date_options' => array( 39 'left_date_options' => array(
35 'attr' => array( 40 'attr' => array(
36 'placeholder' => 'dd/mm/yyyy', 41 'placeholder' => 'dd/mm/yyyy',
@@ -47,20 +52,20 @@ class EntryFilterType extends AbstractType
47 ), 52 ),
48 ) 53 )
49 ) 54 )
50 ->add('domainName', 'filter_text', array( 55 ->add('domainName', TextFilterType::class, array(
51 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { 56 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
52 $value = $values['value']; 57 $value = $values['value'];
53 if (strlen($value) <= 2 || empty($value)) { 58 if (strlen($value) <= 2 || empty($value)) {
54 return; 59 return;
55 } 60 }
56 $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%')); 61 $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
57 62
58 return $filterQuery->createCondition($expression); 63 return $filterQuery->createCondition($expression);
59 }, 64 },
60 )) 65 ))
61 ->add('isArchived', 'filter_checkbox') 66 ->add('isArchived', CheckboxFilterType::class)
62 ->add('isStarred', 'filter_checkbox') 67 ->add('isStarred', CheckboxFilterType::class)
63 ->add('previewPicture', 'filter_checkbox', array( 68 ->add('previewPicture', CheckboxFilterType::class, array(
64 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { 69 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
65 if (false === $values['value']) { 70 if (false === $values['value']) {
66 return; 71 return;
@@ -71,13 +76,14 @@ class EntryFilterType extends AbstractType
71 return $filterQuery->createCondition($expression); 76 return $filterQuery->createCondition($expression);
72 }, 77 },
73 )) 78 ))
74 ->add('language', 'filter_choice', array( 79 ->add('language', ChoiceFilterType::class, array(
75 'choices' => $this->repository->findDistinctLanguageByUser($this->user->getId()), 80 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
81 'choices_as_values' => true,
76 )) 82 ))
77 ; 83 ;
78 } 84 }
79 85
80 public function getName() 86 public function getBlockPrefix()
81 { 87 {
82 return 'entry_filter'; 88 return 'entry_filter';
83 } 89 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php b/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php
index 82e1954d..7d05a5d8 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php
@@ -3,6 +3,9 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\PasswordType;
7use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
8use Symfony\Component\Form\Extension\Core\Type\SubmitType;
6use Symfony\Component\Form\FormBuilderInterface; 9use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; 10use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
8use Symfony\Component\Validator\Constraints; 11use Symfony\Component\Validator\Constraints;
@@ -12,11 +15,11 @@ class ChangePasswordType extends AbstractType
12 public function buildForm(FormBuilderInterface $builder, array $options) 15 public function buildForm(FormBuilderInterface $builder, array $options)
13 { 16 {
14 $builder 17 $builder
15 ->add('old_password', 'password', array( 18 ->add('old_password', PasswordType::class, array(
16 'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')), 19 'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')),
17 )) 20 ))
18 ->add('new_password', 'repeated', array( 21 ->add('new_password', RepeatedType::class, array(
19 'type' => 'password', 22 'type' => PasswordType::class,
20 'invalid_message' => 'The password fields must match.', 23 'invalid_message' => 'The password fields must match.',
21 'required' => true, 24 'required' => true,
22 'first_options' => array('label' => 'New password'), 25 'first_options' => array('label' => 'New password'),
@@ -29,11 +32,11 @@ class ChangePasswordType extends AbstractType
29 new Constraints\NotBlank(), 32 new Constraints\NotBlank(),
30 ), 33 ),
31 )) 34 ))
32 ->add('save', 'submit') 35 ->add('save', SubmitType::class)
33 ; 36 ;
34 } 37 }
35 38
36 public function getName() 39 public function getBlockPrefix()
37 { 40 {
38 return 'change_passwd'; 41 return 'change_passwd';
39 } 42 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 1f0ad89d..a139f2df 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -3,6 +3,8 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
7use Symfony\Component\Form\Extension\Core\Type\SubmitType;
6use Symfony\Component\Form\FormBuilderInterface; 8use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 9use Symfony\Component\OptionsResolver\OptionsResolver;
8 10
@@ -28,15 +30,16 @@ class ConfigType extends AbstractType
28 public function buildForm(FormBuilderInterface $builder, array $options) 30 public function buildForm(FormBuilderInterface $builder, array $options)
29 { 31 {
30 $builder 32 $builder
31 ->add('theme', 'choice', array( 33 ->add('theme', ChoiceType::class, array(
32 'choices' => array_flip($this->themes), 34 'choices' => array_flip($this->themes),
33 'choices_as_values' => true, 35 'choices_as_values' => true,
34 )) 36 ))
35 ->add('items_per_page') 37 ->add('items_per_page')
36 ->add('language', 'choice', array( 38 ->add('language', ChoiceType::class, array(
37 'choices' => $this->languages, 39 'choices' => array_flip($this->languages),
40 'choices_as_values' => true,
38 )) 41 ))
39 ->add('save', 'submit') 42 ->add('save', SubmitType::class)
40 ; 43 ;
41 } 44 }
42 45
@@ -47,7 +50,7 @@ class ConfigType extends AbstractType
47 )); 50 ));
48 } 51 }
49 52
50 public function getName() 53 public function getBlockPrefix()
51 { 54 {
52 return 'config'; 55 return 'config';
53 } 56 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
index 0fa4b71f..0cb29881 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
@@ -3,6 +3,9 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
7use Symfony\Component\Form\Extension\Core\Type\SubmitType;
8use Symfony\Component\Form\Extension\Core\Type\TextType;
6use Symfony\Component\Form\FormBuilderInterface; 9use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 10use Symfony\Component\OptionsResolver\OptionsResolver;
8 11
@@ -11,14 +14,14 @@ class EditEntryType extends AbstractType
11 public function buildForm(FormBuilderInterface $builder, array $options) 14 public function buildForm(FormBuilderInterface $builder, array $options)
12 { 15 {
13 $builder 16 $builder
14 ->add('title', 'text', array('required' => true)) 17 ->add('title', TextType::class, array('required' => true))
15 ->add('is_public', 'checkbox', array('required' => false)) 18 ->add('is_public', CheckboxType::class, array('required' => false))
16 // @todo: add autocomplete 19 // @todo: add autocomplete
17 // ->add('tags', 'entity', array( 20 // ->add('tags', 'entity', array(
18 // 'class' => 'Wallabag\CoreBundle\Entity\Tag', 21 // 'class' => 'Wallabag\CoreBundle\Entity\Tag',
19 // 'choice_translation_domain' => true, 22 // 'choice_translation_domain' => true,
20 // )) 23 // ))
21 ->add('save', 'submit') 24 ->add('save', SubmitType::class)
22 ; 25 ;
23 } 26 }
24 27
@@ -29,7 +32,7 @@ class EditEntryType extends AbstractType
29 )); 32 ));
30 } 33 }
31 34
32 public function getName() 35 public function getBlockPrefix()
33 { 36 {
34 return 'entry'; 37 return 'entry';
35 } 38 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
index cb96d11a..fbce13f1 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
@@ -3,6 +3,8 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\SubmitType;
7use Symfony\Component\Form\Extension\Core\Type\UrlType;
6use Symfony\Component\Form\FormBuilderInterface; 8use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 9use Symfony\Component\OptionsResolver\OptionsResolver;
8 10
@@ -11,8 +13,8 @@ class NewEntryType extends AbstractType
11 public function buildForm(FormBuilderInterface $builder, array $options) 13 public function buildForm(FormBuilderInterface $builder, array $options)
12 { 14 {
13 $builder 15 $builder
14 ->add('url', 'url', array('required' => true)) 16 ->add('url', UrlType::class, array('required' => true))
15 ->add('save', 'submit') 17 ->add('save', SubmitType::class)
16 ; 18 ;
17 } 19 }
18 20
@@ -23,7 +25,7 @@ class NewEntryType extends AbstractType
23 )); 25 ));
24 } 26 }
25 27
26 public function getName() 28 public function getBlockPrefix()
27 { 29 {
28 return 'entry'; 30 return 'entry';
29 } 31 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewTagType.php b/src/Wallabag/CoreBundle/Form/Type/NewTagType.php
index 8e4ab649..0f559031 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewTagType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewTagType.php
@@ -3,6 +3,8 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\SubmitType;
7use Symfony\Component\Form\Extension\Core\Type\TextType;
6use Symfony\Component\Form\FormBuilderInterface; 8use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 9use Symfony\Component\OptionsResolver\OptionsResolver;
8 10
@@ -11,8 +13,8 @@ class NewTagType extends AbstractType
11 public function buildForm(FormBuilderInterface $builder, array $options) 13 public function buildForm(FormBuilderInterface $builder, array $options)
12 { 14 {
13 $builder 15 $builder
14 ->add('label', 'text', array('required' => true)) 16 ->add('label', TextType::class, array('required' => true))
15 ->add('save', 'submit') 17 ->add('save', SubmitType::class)
16 ; 18 ;
17 } 19 }
18 20
@@ -23,7 +25,7 @@ class NewTagType extends AbstractType
23 )); 25 ));
24 } 26 }
25 27
26 public function getName() 28 public function getBlockPrefix()
27 { 29 {
28 return 'tag'; 30 return 'tag';
29 } 31 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
index 8aabc8bb..ffbe9ba2 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
@@ -3,6 +3,11 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\EmailType;
7use Symfony\Component\Form\Extension\Core\Type\PasswordType;
8use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
9use Symfony\Component\Form\Extension\Core\Type\SubmitType;
10use Symfony\Component\Form\Extension\Core\Type\TextType;
6use Symfony\Component\Form\FormBuilderInterface; 11use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 12use Symfony\Component\OptionsResolver\OptionsResolver;
8use Symfony\Component\Validator\Constraints; 13use Symfony\Component\Validator\Constraints;
@@ -12,9 +17,9 @@ class NewUserType extends AbstractType
12 public function buildForm(FormBuilderInterface $builder, array $options) 17 public function buildForm(FormBuilderInterface $builder, array $options)
13 { 18 {
14 $builder 19 $builder
15 ->add('username', 'text', array('required' => true)) 20 ->add('username', TextType::class, array('required' => true))
16 ->add('plainPassword', 'repeated', array( 21 ->add('plainPassword', RepeatedType::class, array(
17 'type' => 'password', 22 'type' => PasswordType::class,
18 'constraints' => array( 23 'constraints' => array(
19 new Constraints\Length(array( 24 new Constraints\Length(array(
20 'min' => 8, 25 'min' => 8,
@@ -23,8 +28,8 @@ class NewUserType extends AbstractType
23 new Constraints\NotBlank(), 28 new Constraints\NotBlank(),
24 ), 29 ),
25 )) 30 ))
26 ->add('email', 'email') 31 ->add('email', EmailType::class)
27 ->add('save', 'submit') 32 ->add('save', SubmitType::class)
28 ; 33 ;
29 } 34 }
30 35
@@ -35,7 +40,7 @@ class NewUserType extends AbstractType
35 )); 40 ));
36 } 41 }
37 42
38 public function getName() 43 public function getBlockPrefix()
39 { 44 {
40 return 'new_user'; 45 return 'new_user';
41 } 46 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/RssType.php b/src/Wallabag/CoreBundle/Form/Type/RssType.php
index 1f7f4c68..def8782c 100644
--- a/src/Wallabag/CoreBundle/Form/Type/RssType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/RssType.php
@@ -3,6 +3,7 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\SubmitType;
6use Symfony\Component\Form\FormBuilderInterface; 7use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 8use Symfony\Component\OptionsResolver\OptionsResolver;
8 9
@@ -12,7 +13,7 @@ class RssType extends AbstractType
12 { 13 {
13 $builder 14 $builder
14 ->add('rss_limit') 15 ->add('rss_limit')
15 ->add('save', 'submit') 16 ->add('save', SubmitType::class)
16 ; 17 ;
17 } 18 }
18 19
@@ -23,7 +24,7 @@ class RssType extends AbstractType
23 )); 24 ));
24 } 25 }
25 26
26 public function getName() 27 public function getBlockPrefix()
27 { 28 {
28 return 'rss_config'; 29 return 'rss_config';
29 } 30 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php b/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php
index 428d94b3..5815b8c6 100644
--- a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php
@@ -3,6 +3,8 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\SubmitType;
7use Symfony\Component\Form\Extension\Core\Type\TextType;
6use Symfony\Component\Form\FormBuilderInterface; 8use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 9use Symfony\Component\OptionsResolver\OptionsResolver;
8use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer; 10use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
@@ -12,12 +14,12 @@ class TaggingRuleType extends AbstractType
12 public function buildForm(FormBuilderInterface $builder, array $options) 14 public function buildForm(FormBuilderInterface $builder, array $options)
13 { 15 {
14 $builder 16 $builder
15 ->add('rule', 'text', array('required' => true)) 17 ->add('rule', TextType::class, array('required' => true))
16 ->add('save', 'submit') 18 ->add('save', SubmitType::class)
17 ; 19 ;
18 20
19 $tagsField = $builder 21 $tagsField = $builder
20 ->create('tags', 'text') 22 ->create('tags', TextType::class)
21 ->addModelTransformer(new StringToListTransformer(',')); 23 ->addModelTransformer(new StringToListTransformer(','));
22 24
23 $builder->add($tagsField); 25 $builder->add($tagsField);
@@ -30,7 +32,7 @@ class TaggingRuleType extends AbstractType
30 )); 32 ));
31 } 33 }
32 34
33 public function getName() 35 public function getBlockPrefix()
34 { 36 {
35 return 'tagging_rule'; 37 return 'tagging_rule';
36 } 38 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
index e06c937d..f491b0ae 100644
--- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -3,6 +3,10 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
7use Symfony\Component\Form\Extension\Core\Type\EmailType;
8use Symfony\Component\Form\Extension\Core\Type\SubmitType;
9use Symfony\Component\Form\Extension\Core\Type\TextType;
6use Symfony\Component\Form\FormBuilderInterface; 10use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolver; 11use Symfony\Component\OptionsResolver\OptionsResolver;
8 12
@@ -11,10 +15,10 @@ class UserInformationType extends AbstractType
11 public function buildForm(FormBuilderInterface $builder, array $options) 15 public function buildForm(FormBuilderInterface $builder, array $options)
12 { 16 {
13 $builder 17 $builder
14 ->add('name', 'text') 18 ->add('name', TextType::class)
15 ->add('email', 'email') 19 ->add('email', EmailType::class)
16 ->add('twoFactorAuthentication', 'checkbox', array('required' => false)) 20 ->add('twoFactorAuthentication', CheckboxType::class, array('required' => false))
17 ->add('save', 'submit') 21 ->add('save', SubmitType::class)
18 ->remove('username') 22 ->remove('username')
19 ->remove('plainPassword') 23 ->remove('plainPassword')
20 ; 24 ;
@@ -22,7 +26,7 @@ class UserInformationType extends AbstractType
22 26
23 public function getParent() 27 public function getParent()
24 { 28 {
25 return 'fos_user_registration'; 29 return 'FOS\UserBundle\Form\Type\RegistrationFormType';
26 } 30 }
27 31
28 public function configureOptions(OptionsResolver $resolver) 32 public function configureOptions(OptionsResolver $resolver)
@@ -32,7 +36,7 @@ class UserInformationType extends AbstractType
32 )); 36 ));
33 } 37 }
34 38
35 public function getName() 39 public function getBlockPrefix()
36 { 40 {
37 return 'update_user'; 41 return 'update_user';
38 } 42 }
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index d6a4d094..31a80d6e 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -2,12 +2,12 @@
2 2
3namespace Wallabag\CoreBundle\Helper; 3namespace Wallabag\CoreBundle\Helper;
4 4
5use JMS\Serializer;
6use JMS\Serializer\SerializationContext;
7use JMS\Serializer\SerializerBuilder;
5use PHPePub\Core\EPub; 8use PHPePub\Core\EPub;
6use PHPePub\Core\Structure\OPF\DublinCore; 9use PHPePub\Core\Structure\OPF\DublinCore;
7use Symfony\Component\HttpFoundation\Response; 10use Symfony\Component\HttpFoundation\Response;
8use JMS\Serializer;
9use JMS\Serializer\SerializerBuilder;
10use JMS\Serializer\SerializationContext;
11 11
12/** 12/**
13 * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest. 13 * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.
diff --git a/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php b/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php
index f7faa2c1..6ea2a4f3 100644
--- a/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php
+++ b/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php
@@ -2,9 +2,9 @@
2 2
3namespace Wallabag\CoreBundle\ParamConverter; 3namespace Wallabag\CoreBundle\ParamConverter;
4 4
5use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
6use Doctrine\Common\Persistence\ManagerRegistry; 5use Doctrine\Common\Persistence\ManagerRegistry;
7use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; 6use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
7use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
8use Symfony\Component\HttpFoundation\Request; 8use Symfony\Component\HttpFoundation\Request;
9use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; 9use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
10use Wallabag\UserBundle\Entity\User; 10use Wallabag\UserBundle\Entity\User;
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 96b1c931..43600735 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -2,7 +2,7 @@ services:
2 wallabag_core.helper.detect_active_theme: 2 wallabag_core.helper.detect_active_theme:
3 class: Wallabag\CoreBundle\Helper\DetectActiveTheme 3 class: Wallabag\CoreBundle\Helper\DetectActiveTheme
4 arguments: 4 arguments:
5 - @security.token_storage 5 - "@security.token_storage"
6 - %theme% # default theme from parameters.yml 6 - %theme% # default theme from parameters.yml
7 7
8 # custom form type 8 # custom form type
@@ -12,26 +12,22 @@ services:
12 - %liip_theme.themes% 12 - %liip_theme.themes%
13 - %wallabag_core.languages% 13 - %wallabag_core.languages%
14 tags: 14 tags:
15 - { name: form.type, alias: config } 15 - { name: form.type }
16 16
17 wallabag_core.form.registration: 17 wallabag_core.filter.type.entry:
18 class: Wallabag\CoreBundle\Form\Type\RegistrationType 18 class: Wallabag\CoreBundle\Filter\EntryFilterType
19 tags:
20 - { name: form.type, alias: wallabag_user_registration }
21
22 wallabag_core.form.type.forgot_password:
23 class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType
24 arguments: 19 arguments:
25 - @doctrine 20 - "@wallabag_core.entry_repository"
21 - "@security.token_storage"
26 tags: 22 tags:
27 - { name: form.type, alias: forgot_password } 23 - { name: form.type }
28 24
29 wallabag_core.param_converter.username_rsstoken_converter: 25 wallabag_core.param_converter.username_rsstoken_converter:
30 class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter 26 class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter
31 tags: 27 tags:
32 - { name: request.param_converter, converter: username_rsstoken_converter } 28 - { name: request.param_converter, converter: username_rsstoken_converter }
33 arguments: 29 arguments:
34 - @doctrine 30 - "@doctrine"
35 31
36 wallabag_core.table_prefix_subscriber: 32 wallabag_core.table_prefix_subscriber:
37 class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber 33 class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber
@@ -45,41 +41,41 @@ services:
45 arguments: 41 arguments:
46 - { error_message: false } 42 - { error_message: false }
47 calls: 43 calls:
48 - [ setLogger, [ @logger ] ] 44 - [ setLogger, [ "@logger" ] ]
49 tags: 45 tags:
50 - { name: monolog.logger, channel: graby } 46 - { name: monolog.logger, channel: graby }
51 47
52 wallabag_core.content_proxy: 48 wallabag_core.content_proxy:
53 class: Wallabag\CoreBundle\Helper\ContentProxy 49 class: Wallabag\CoreBundle\Helper\ContentProxy
54 arguments: 50 arguments:
55 - @wallabag_core.graby 51 - "@wallabag_core.graby"
56 - @wallabag_core.rule_based_tagger 52 - "@wallabag_core.rule_based_tagger"
57 - @logger 53 - "@logger"
58 54
59 wallabag_core.rule_based_tagger: 55 wallabag_core.rule_based_tagger:
60 class: Wallabag\CoreBundle\Helper\RuleBasedTagger 56 class: Wallabag\CoreBundle\Helper\RuleBasedTagger
61 arguments: 57 arguments:
62 - @rulerz 58 - "@rulerz"
63 - @wallabag_core.tag_repository 59 - "@wallabag_core.tag_repository"
64 - @wallabag_core.entry_repository 60 - "@wallabag_core.entry_repository"
65 61
66 # repository as a service 62 # repository as a service
67 wallabag_core.entry_repository: 63 wallabag_core.entry_repository:
68 class: Wallabag\CoreBundle\Repository\EntryRepository 64 class: Wallabag\CoreBundle\Repository\EntryRepository
69 factory: [ @doctrine.orm.default_entity_manager, getRepository ] 65 factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
70 arguments: 66 arguments:
71 - WallabagCoreBundle:Entry 67 - WallabagCoreBundle:Entry
72 68
73 wallabag_core.tag_repository: 69 wallabag_core.tag_repository:
74 class: Wallabag\CoreBundle\Repository\TagRepository 70 class: Wallabag\CoreBundle\Repository\TagRepository
75 factory: [ @doctrine.orm.default_entity_manager, getRepository ] 71 factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
76 arguments: 72 arguments:
77 - WallabagCoreBundle:Tag 73 - WallabagCoreBundle:Tag
78 74
79 wallabag_core.registration_confirmed: 75 wallabag_core.registration_confirmed:
80 class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener 76 class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
81 arguments: 77 arguments:
82 - @doctrine.orm.entity_manager 78 - "@doctrine.orm.entity_manager"
83 - %theme% 79 - %theme%
84 - %items_on_page% 80 - %items_on_page%
85 - %rss_limit% 81 - %rss_limit%
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index d9850f7a..6ac6decb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -164,7 +164,7 @@
164 {% endfor %} 164 {% endfor %}
165 </ul> 165 </ul>
166 166
167 <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_tagging_rule) }}> 167 {{ form_start(form.new_tagging_rule) }}
168 {{ form_errors(form.new_tagging_rule) }} 168 {{ form_errors(form.new_tagging_rule) }}
169 169
170 <fieldset class="w500p inline"> 170 <fieldset class="w500p inline">
diff --git a/src/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriber.php b/src/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriber.php
index 0019eead..9a4b16ee 100644
--- a/src/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriber.php
+++ b/src/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriber.php
@@ -2,8 +2,8 @@
2 2
3namespace Wallabag\CoreBundle\Subscriber; 3namespace Wallabag\CoreBundle\Subscriber;
4 4
5use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
6use Doctrine\Common\EventSubscriber; 5use Doctrine\Common\EventSubscriber;
6use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
7use Doctrine\ORM\Mapping\ClassMetadataInfo; 7use Doctrine\ORM\Mapping\ClassMetadataInfo;
8 8
9/** 9/**
diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
index c9346040..7d75e2b7 100644
--- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
@@ -2,15 +2,15 @@
2 2
3namespace Wallabag\CoreBundle\Tests\Command; 3namespace Wallabag\CoreBundle\Tests\Command;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
6use Wallabag\CoreBundle\Command\InstallCommand; 6use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
7use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
8use Symfony\Bundle\FrameworkBundle\Console\Application; 7use Symfony\Bundle\FrameworkBundle\Console\Application;
9use Symfony\Component\Console\Tester\CommandTester;
10use Symfony\Component\Console\Input\ArrayInput; 8use Symfony\Component\Console\Input\ArrayInput;
11use Symfony\Component\Console\Output\NullOutput; 9use Symfony\Component\Console\Output\NullOutput;
12use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand; 10use Symfony\Component\Console\Tester\CommandTester;
13use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand; 11use Wallabag\CoreBundle\Command\InstallCommand;
12use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
13use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
14 14
15class InstallCommandTest extends WallabagCoreTestCase 15class InstallCommandTest extends WallabagCoreTestCase
16{ 16{
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php
index d89bee04..b4c022d5 100644
--- a/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php
@@ -4,11 +4,11 @@ namespace Wallabag\CoreBundle\Tests\EventListener;
4 4
5use Symfony\Component\EventDispatcher\EventDispatcher; 5use Symfony\Component\EventDispatcher\EventDispatcher;
6use Symfony\Component\HttpFoundation\Request; 6use Symfony\Component\HttpFoundation\Request;
7use Symfony\Component\HttpKernel\KernelEvents; 7use Symfony\Component\HttpFoundation\Session\Session;
8use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
8use Symfony\Component\HttpKernel\Event\GetResponseEvent; 9use Symfony\Component\HttpKernel\Event\GetResponseEvent;
9use Symfony\Component\HttpKernel\HttpKernelInterface; 10use Symfony\Component\HttpKernel\HttpKernelInterface;
10use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; 11use Symfony\Component\HttpKernel\KernelEvents;
11use Symfony\Component\HttpFoundation\Session\Session;
12use Wallabag\CoreBundle\EventListener\LocaleListener; 12use Wallabag\CoreBundle\EventListener\LocaleListener;
13 13
14class LocaleListenerTest extends \PHPUnit_Framework_TestCase 14class LocaleListenerTest extends \PHPUnit_Framework_TestCase
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
index 31283399..7039dc61 100644
--- a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
@@ -2,13 +2,13 @@
2 2
3namespace Wallabag\CoreBundle\Tests\EventListener; 3namespace Wallabag\CoreBundle\Tests\EventListener;
4 4
5use FOS\UserBundle\Event\FilterUserResponseEvent;
6use FOS\UserBundle\FOSUserEvents;
5use Symfony\Component\EventDispatcher\EventDispatcher; 7use Symfony\Component\EventDispatcher\EventDispatcher;
6use Symfony\Component\HttpFoundation\Request; 8use Symfony\Component\HttpFoundation\Request;
7use Symfony\Component\HttpFoundation\Response; 9use Symfony\Component\HttpFoundation\Response;
8use FOS\UserBundle\FOSUserEvents;
9use FOS\UserBundle\Event\FilterUserResponseEvent;
10use Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener;
11use Wallabag\CoreBundle\Entity\Config; 10use Wallabag\CoreBundle\Entity\Config;
11use Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener;
12use Wallabag\UserBundle\Entity\User; 12use Wallabag\UserBundle\Entity\User;
13 13
14class RegistrationConfirmedListenerTest extends \PHPUnit_Framework_TestCase 14class RegistrationConfirmedListenerTest extends \PHPUnit_Framework_TestCase
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php
index 80ddb457..d9ffe30e 100644
--- a/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php
@@ -3,12 +3,12 @@
3namespace Wallabag\CoreBundle\Tests\EventListener; 3namespace Wallabag\CoreBundle\Tests\EventListener;
4 4
5use Symfony\Component\HttpFoundation\Request; 5use Symfony\Component\HttpFoundation\Request;
6use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
7use Symfony\Component\HttpFoundation\Session\Session; 6use Symfony\Component\HttpFoundation\Session\Session;
8use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; 7use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
9use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; 8use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
10use Wallabag\CoreBundle\EventListener\UserLocaleListener; 9use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
11use Wallabag\CoreBundle\Entity\Config; 10use Wallabag\CoreBundle\Entity\Config;
11use Wallabag\CoreBundle\EventListener\UserLocaleListener;
12use Wallabag\UserBundle\Entity\User; 12use Wallabag\UserBundle\Entity\User;
13 13
14class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase 14class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php b/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php
index ac518dbb..d29984e9 100644
--- a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php
@@ -4,8 +4,8 @@ namespace Wallabag\CoreBundle\Tests\Helper;
4 4
5use Psr\Log\NullLogger; 5use Psr\Log\NullLogger;
6use Wallabag\CoreBundle\Entity\Entry; 6use Wallabag\CoreBundle\Entity\Entry;
7use Wallabag\UserBundle\Entity\User;
8use Wallabag\CoreBundle\Helper\ContentProxy; 7use Wallabag\CoreBundle\Helper\ContentProxy;
8use Wallabag\UserBundle\Entity\User;
9 9
10class ContentProxyTest extends \PHPUnit_Framework_TestCase 10class ContentProxyTest extends \PHPUnit_Framework_TestCase
11{ 11{
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php b/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php
index dee17d65..c43c62c3 100644
--- a/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php
@@ -6,8 +6,8 @@ use Wallabag\CoreBundle\Entity\Config;
6use Wallabag\CoreBundle\Entity\Entry; 6use Wallabag\CoreBundle\Entity\Entry;
7use Wallabag\CoreBundle\Entity\Tag; 7use Wallabag\CoreBundle\Entity\Tag;
8use Wallabag\CoreBundle\Entity\TaggingRule; 8use Wallabag\CoreBundle\Entity\TaggingRule;
9use Wallabag\UserBundle\Entity\User;
10use Wallabag\CoreBundle\Helper\RuleBasedTagger; 9use Wallabag\CoreBundle\Helper\RuleBasedTagger;
10use Wallabag\UserBundle\Entity\User;
11 11
12class RuleBasedTaggerTest extends \PHPUnit_Framework_TestCase 12class RuleBasedTaggerTest extends \PHPUnit_Framework_TestCase
13{ 13{
diff --git a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php b/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php
index 1c9a4ad7..b95be133 100644
--- a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php
+++ b/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php
@@ -2,9 +2,9 @@
2 2
3namespace Wallabag\CoreBundle\Tests\Command; 3namespace Wallabag\CoreBundle\Tests\Command;
4 4
5use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter;
6use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; 5use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
7use Symfony\Component\HttpFoundation\Request; 6use Symfony\Component\HttpFoundation\Request;
7use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter;
8use Wallabag\UserBundle\Entity\User; 8use Wallabag\UserBundle\Entity\User;
9 9
10class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase 10class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase
diff --git a/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php b/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php
index a26ff436..49dbb316 100644
--- a/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php
@@ -2,9 +2,9 @@
2 2
3namespace Wallabag\CoreBundle\Tests\Subscriber; 3namespace Wallabag\CoreBundle\Tests\Subscriber;
4 4
5use Doctrine\ORM\Mapping\ClassMetadata;
6use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
7use Doctrine\Common\EventManager; 5use Doctrine\Common\EventManager;
6use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
7use Doctrine\ORM\Mapping\ClassMetadata;
8use Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber; 8use Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber;
9 9
10class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase 10class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php
index a0853383..7aee302f 100644
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@@ -3,6 +3,7 @@
3namespace Wallabag\ImportBundle\Controller; 3namespace Wallabag\ImportBundle\Controller;
4 4
5use Symfony\Bundle\FrameworkBundle\Controller\Controller; 5use Symfony\Bundle\FrameworkBundle\Controller\Controller;
6use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
6use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 7use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
7 8
8class PocketController extends Controller 9class PocketController extends Controller
@@ -23,12 +24,12 @@ class PocketController extends Controller
23 public function authAction() 24 public function authAction()
24 { 25 {
25 $requestToken = $this->get('wallabag_import.pocket.import') 26 $requestToken = $this->get('wallabag_import.pocket.import')
26 ->getRequestToken($this->generateUrl('import', [], true)); 27 ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL));
27 28
28 $this->get('session')->set('import.pocket.code', $requestToken); 29 $this->get('session')->set('import.pocket.code', $requestToken);
29 30
30 return $this->redirect( 31 return $this->redirect(
31 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', [], true), 32 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL),
32 301 33 301
33 ); 34 );
34 } 35 }
diff --git a/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php b/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php
index e50a6c35..35fe620f 100644
--- a/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php
+++ b/src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php
@@ -14,7 +14,7 @@ class WallabagV1Controller extends Controller
14 */ 14 */
15 public function indexAction(Request $request) 15 public function indexAction(Request $request)
16 { 16 {
17 $form = $this->createForm(new UploadImportType()); 17 $form = $this->createForm(UploadImportType::class);
18 $form->handleRequest($request); 18 $form->handleRequest($request);
19 19
20 $wallabag = $this->get('wallabag_import.wallabag_v1.import'); 20 $wallabag = $this->get('wallabag_import.wallabag_v1.import');
diff --git a/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php b/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
index 415890f3..2e6b59cb 100644
--- a/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
+++ b/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
@@ -4,18 +4,20 @@ namespace Wallabag\ImportBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\FormBuilderInterface; 6use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\Form\Extension\Core\Type\SubmitType;
8use Symfony\Component\Form\Extension\Core\Type\FileType;
7 9
8class UploadImportType extends AbstractType 10class UploadImportType extends AbstractType
9{ 11{
10 public function buildForm(FormBuilderInterface $builder, array $options) 12 public function buildForm(FormBuilderInterface $builder, array $options)
11 { 13 {
12 $builder 14 $builder
13 ->add('file', 'file') 15 ->add('file', FileType::class)
14 ->add('save', 'submit') 16 ->add('save', SubmitType::class)
15 ; 17 ;
16 } 18 }
17 19
18 public function getName() 20 public function getBlockPrefix()
19 { 21 {
20 return 'upload_import_file'; 22 return 'upload_import_file';
21 } 23 }
diff --git a/src/Wallabag/UserBundle/Controller/ResettingController.php b/src/Wallabag/UserBundle/Controller/ResettingController.php
index 8aa1e230..62e27d00 100644
--- a/src/Wallabag/UserBundle/Controller/ResettingController.php
+++ b/src/Wallabag/UserBundle/Controller/ResettingController.php
@@ -2,12 +2,12 @@
2 2
3namespace Wallabag\UserBundle\Controller; 3namespace Wallabag\UserBundle\Controller;
4 4
5use FOS\UserBundle\FOSUserEvents; 5use FOS\UserBundle\Event\FilterUserResponseEvent;
6use FOS\UserBundle\Event\FormEvent; 6use FOS\UserBundle\Event\FormEvent;
7use FOS\UserBundle\Event\GetResponseUserEvent; 7use FOS\UserBundle\Event\GetResponseUserEvent;
8use FOS\UserBundle\Event\FilterUserResponseEvent; 8use FOS\UserBundle\FOSUserEvents;
9use Symfony\Component\HttpFoundation\Request;
10use Symfony\Component\HttpFoundation\RedirectResponse; 9use Symfony\Component\HttpFoundation\RedirectResponse;
10use Symfony\Component\HttpFoundation\Request;
11use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; 11use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
12 12
13class ResettingController extends \FOS\UserBundle\Controller\ResettingController 13class ResettingController extends \FOS\UserBundle\Controller\ResettingController
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index e6528420..4bbb68dc 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -6,11 +6,11 @@ use Doctrine\Common\Collections\ArrayCollection;
6use Doctrine\ORM\Mapping as ORM; 6use Doctrine\ORM\Mapping as ORM;
7use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; 7use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
8use Scheb\TwoFactorBundle\Model\TrustedComputerInterface; 8use Scheb\TwoFactorBundle\Model\TrustedComputerInterface;
9use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; 9use FOS\UserBundle\Model\User as BaseUser;
10use Symfony\Component\Security\Core\User\UserInterface;
11use JMS\Serializer\Annotation\ExclusionPolicy; 10use JMS\Serializer\Annotation\ExclusionPolicy;
12use JMS\Serializer\Annotation\Expose; 11use JMS\Serializer\Annotation\Expose;
13use FOS\UserBundle\Model\User as BaseUser; 12use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
13use Symfony\Component\Security\Core\User\UserInterface;
14use Wallabag\CoreBundle\Entity\Config; 14use Wallabag\CoreBundle\Entity\Config;
15use Wallabag\CoreBundle\Entity\Entry; 15use Wallabag\CoreBundle\Entity\Entry;
16 16
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig
index e5c1876b..2713bf45 100644
--- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig
@@ -8,7 +8,7 @@
8{% block messages %}{% endblock %} 8{% block messages %}{% endblock %}
9 9
10{% block content %} 10{% block content %}
11 <form action="{{ path('fos_user_registration_register') }}" {{ form_enctype(form) }} method="POST" class="fos_user_registration_register"> 11 {{ form_start(form) }}
12 <fieldset class="w500p center"> 12 <fieldset class="w500p center">
13 <h2 class="mbs txtcenter">{% trans %}create an account{% endtrans %}</h2> 13 <h2 class="mbs txtcenter">{% trans %}create an account{% endtrans %}</h2>
14 {% include "FOSUserBundle:Registration:register_content.html.twig" %} 14 {% include "FOSUserBundle:Registration:register_content.html.twig" %}
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig
index e7b7318b..abb68421 100644
--- a/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig
@@ -1,6 +1,6 @@
1{% trans_default_domain 'FOSUserBundle' %} 1{% trans_default_domain 'FOSUserBundle' %}
2 2
3<form action="{{ path('fos_user_change_password') }}" {{ form_enctype(form) }} method="POST" class="fos_user_change_password"> 3{{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }}
4 <div class="card-content"> 4 <div class="card-content">
5 <div class="row"> 5 <div class="row">
6 {{ form_widget(form) }} 6 {{ form_widget(form) }}
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig
index 865a24ae..e92b515e 100644
--- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig
@@ -1,6 +1,6 @@
1{% trans_default_domain 'FOSUserBundle' %} 1{% trans_default_domain 'FOSUserBundle' %}
2 2
3<form action="{{ path('fos_user_registration_register') }}" {{ form_enctype(form) }} method="POST" class="fos_user_registration_register"> 3{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
4 <div class="card-content"> 4 <div class="card-content">
5 <div class="row"> 5 <div class="row">
6 6
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig
index 0eec4301..1e245372 100644
--- a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig
@@ -5,7 +5,7 @@
5{% block fos_user_content %} 5{% block fos_user_content %}
6<div class="card-content"> 6<div class="card-content">
7 <div class="row"> 7 <div class="row">
8 {{ 'resetting.password_already_requested'|trans }} 8 {{ 'resetting.password_already_requested'|trans }}
9 </div> 9 </div>
10</div> 10</div>
11{% endblock fos_user_content %} 11{% endblock fos_user_content %}
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig
index f7e061dd..9d0a061c 100644
--- a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig
@@ -1,6 +1,6 @@
1{% trans_default_domain 'FOSUserBundle' %} 1{% trans_default_domain 'FOSUserBundle' %}
2 2
3<form action="{{ path('fos_user_resetting_reset', {'token': token}) }}" {{ form_enctype(form) }} method="POST" class="fos_user_resetting_reset"> 3{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }}
4 <div class="card-content"> 4 <div class="card-content">
5 <div class="row"> 5 <div class="row">
6 {{ form_widget(form) }} 6 {{ form_widget(form) }}
diff --git a/app/SymfonyRequirements.php b/var/SymfonyRequirements.php
index 28b0dcdb..28b0dcdb 100644
--- a/app/SymfonyRequirements.php
+++ b/var/SymfonyRequirements.php
diff --git a/app/logs/.gitkeep b/var/cache/.gitkeep
index e69de29b..e69de29b 100644
--- a/app/logs/.gitkeep
+++ b/var/cache/.gitkeep
diff --git a/var/logs/.gitkeep b/var/logs/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/var/logs/.gitkeep
diff --git a/var/sessions/.gitkeep b/var/sessions/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/var/sessions/.gitkeep
diff --git a/web/.htaccess b/web/.htaccess
index b52e3ae6..4dc72516 100644
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -5,6 +5,18 @@
5# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). 5# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
6DirectoryIndex app.php 6DirectoryIndex app.php
7 7
8# By default, Apache does not evaluate symbolic links if you did not enable this
9# feature in your server configuration. Uncomment the following line if you
10# install assets as symlinks or if you experience problems related to symlinks
11# when compiling LESS/Sass/CoffeScript assets.
12# Options FollowSymlinks
13
14# Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve
15# to the front controller "/app.php" but be rewritten to "/app.php/app".
16<IfModule mod_negotiation.c>
17 Options -MultiViews
18</IfModule>
19
8<IfModule mod_rewrite.c> 20<IfModule mod_rewrite.c>
9 RewriteEngine On 21 RewriteEngine On
10 22
@@ -18,9 +30,9 @@ DirectoryIndex app.php
18 RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$ 30 RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
19 RewriteRule ^(.*) - [E=BASE:%1] 31 RewriteRule ^(.*) - [E=BASE:%1]
20 32
21 # Sets the HTTP_AUTHORIZATION header removed by apache 33 # Sets the HTTP_AUTHORIZATION header removed by Apache
22 RewriteCond %{HTTP:Authorization} . 34 RewriteCond %{HTTP:Authorization} .
23 RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] 35 RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
24 36
25 # Redirect to URI without front controller to prevent duplicate content 37 # Redirect to URI without front controller to prevent duplicate content
26 # (with and without `/app.php`). Only do this redirect on the initial 38 # (with and without `/app.php`). Only do this redirect on the initial
@@ -34,15 +46,15 @@ DirectoryIndex app.php
34 # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the 46 # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
35 # following RewriteCond (best solution) 47 # following RewriteCond (best solution)
36 RewriteCond %{ENV:REDIRECT_STATUS} ^$ 48 RewriteCond %{ENV:REDIRECT_STATUS} ^$
37 RewriteRule ^app\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L] 49 RewriteRule ^app\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
38 50
39 # If the requested filename exists, simply serve it. 51 # If the requested filename exists, simply serve it.
40 # We only want to let Apache serve files and not directories. 52 # We only want to let Apache serve files and not directories.
41 RewriteCond %{REQUEST_FILENAME} -f 53 RewriteCond %{REQUEST_FILENAME} -f
42 RewriteRule .? - [L] 54 RewriteRule ^ - [L]
43 55
44 # Rewrite all other queries to the front controller. 56 # Rewrite all other queries to the front controller.
45 RewriteRule .? %{ENV:BASE}/app.php [L] 57 RewriteRule ^ %{ENV:BASE}/app.php [L]
46</IfModule> 58</IfModule>
47 59
48<IfModule !mod_rewrite.c> 60<IfModule !mod_rewrite.c>
diff --git a/web/app.php b/web/app.php
index c5c26409..5c5ee03b 100644
--- a/web/app.php
+++ b/web/app.php
@@ -1,23 +1,23 @@
1<?php 1<?php
2 2
3use Symfony\Component\ClassLoader\ApcClassLoader;
4use Symfony\Component\HttpFoundation\Request; 3use Symfony\Component\HttpFoundation\Request;
5 4
6$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; 5/**
6 * @var Composer\Autoload\ClassLoader
7 */
8$loader = require __DIR__.'/../app/autoload.php';
9include_once __DIR__.'/../var/bootstrap.php.cache';
7 10
8// Enable APC for autoloading to improve performance. 11// Enable APC for autoloading to improve performance.
9// You should change the ApcClassLoader first argument to a unique prefix 12// You should change the ApcClassLoader first argument to a unique prefix
10// in order to prevent cache key conflicts with other applications 13// in order to prevent cache key conflicts with other applications
11// also using APC. 14// also using APC.
12/* 15/*
13$apcLoader = new ApcClassLoader(sha1(__FILE__), $loader); 16$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
14$loader->unregister(); 17$loader->unregister();
15$apcLoader->register(true); 18$apcLoader->register(true);
16*/ 19*/
17 20
18require_once __DIR__.'/../app/AppKernel.php';
19//require_once __DIR__.'/../app/AppCache.php';
20
21$kernel = new AppKernel('prod', false); 21$kernel = new AppKernel('prod', false);
22$kernel->loadClassCache(); 22$kernel->loadClassCache();
23//$kernel = new AppCache($kernel); 23//$kernel = new AppCache($kernel);
diff --git a/web/app_dev.php b/web/app_dev.php
index e0279c2a..8456754d 100644
--- a/web/app_dev.php
+++ b/web/app_dev.php
@@ -4,24 +4,26 @@ use Symfony\Component\HttpFoundation\Request;
4use Symfony\Component\Debug\Debug; 4use Symfony\Component\Debug\Debug;
5 5
6// If you don't want to setup permissions the proper way, just uncomment the following PHP line 6// If you don't want to setup permissions the proper way, just uncomment the following PHP line
7// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information 7// read http://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup
8// for more information
8//umask(0000); 9//umask(0000);
9 10
10// This check prevents access to debug front controllers that are deployed by accident to production servers. 11// This check prevents access to debug front controllers that are deployed by accident to production servers.
11// Feel free to remove this, extend it, or make something more sophisticated. 12// Feel free to remove this, extend it, or make something more sophisticated.
12if (isset($_SERVER['HTTP_CLIENT_IP']) 13if (isset($_SERVER['HTTP_CLIENT_IP'])
13 || isset($_SERVER['HTTP_X_FORWARDED_FOR']) 14 || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
14 || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server') 15 || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
15) { 16) {
16 header('HTTP/1.0 403 Forbidden'); 17 header('HTTP/1.0 403 Forbidden');
17 exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); 18 exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
18} 19}
19 20
20$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; 21/**
22 * @var Composer\Autoload\ClassLoader $loader
23 */
24$loader = require __DIR__.'/../app/autoload.php';
21Debug::enable(); 25Debug::enable();
22 26
23require_once __DIR__.'/../app/AppKernel.php';
24
25$kernel = new AppKernel('dev', true); 27$kernel = new AppKernel('dev', true);
26$kernel->loadClassCache(); 28$kernel->loadClassCache();
27$request = Request::createFromGlobals(); 29$request = Request::createFromGlobals();
diff --git a/web/robots.txt b/web/robots.txt
index 77470cb3..214e4119 100644
--- a/web/robots.txt
+++ b/web/robots.txt
@@ -1,2 +1,4 @@
1# www.robotstxt.org/
2# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449
3
1User-agent: * 4User-agent: *
2Disallow: / \ No newline at end of file