diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-22 13:00:37 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-15 09:35:38 +0100 |
commit | 5c895a7fd15822856fb407910264c5d95e1e223c (patch) | |
tree | a850ff9ccfd8067d4f8cdd341a2dda4324008afa | |
parent | 619cc45359ead519b64129181a07e14160fbbfcb (diff) | |
download | wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.gz wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.tar.zst wallabag-5c895a7fd15822856fb407910264c5d95e1e223c.zip |
Update bundle & stock file
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
28 files changed, 208 insertions, 203 deletions
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 | ||
3 | require_once __DIR__.'/AppKernel.php'; | ||
4 | |||
5 | use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache; | 3 | use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache; |
6 | 4 | ||
7 | class AppCache extends HttpCache | 5 | class AppCache extends HttpCache |
diff --git a/app/AppKernel.php b/app/AppKernel.php index d2aa8d1c..d97842f9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -35,7 +35,7 @@ class AppKernel extends Kernel | |||
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(), array('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(); |
@@ -48,6 +48,6 @@ class AppKernel extends Kernel | |||
48 | 48 | ||
49 | public function registerContainerConfiguration(LoaderInterface $loader) | 49 | public function registerContainerConfiguration(LoaderInterface $loader) |
50 | { | 50 | { |
51 | $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); | 51 | $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); |
52 | } | 52 | } |
53 | } | 53 | } |
diff --git a/app/check.php b/app/check.php index 60ae0a8b..282507f7 100644 --- a/app/check.php +++ b/app/check.php | |||
@@ -80,7 +80,7 @@ function get_error_message(Requirement $requirement, $lineSize) | |||
80 | return; | 80 | return; |
81 | } | 81 | } |
82 | 82 | ||
83 | $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; | 83 | $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; |
84 | $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; | 84 | $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; |
85 | 85 | ||
86 | return $errorMessage; | 86 | return $errorMessage; |
@@ -121,8 +121,8 @@ function echo_block($style, $title, $message) | |||
121 | echo PHP_EOL.PHP_EOL; | 121 | echo PHP_EOL.PHP_EOL; |
122 | 122 | ||
123 | echo_style($style, str_repeat(' ', $width).PHP_EOL); | 123 | echo_style($style, str_repeat(' ', $width).PHP_EOL); |
124 | echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); | 124 | 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); | 125 | echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); |
126 | echo_style($style, str_repeat(' ', $width).PHP_EOL); | 126 | echo_style($style, str_repeat(' ', $width).PHP_EOL); |
127 | } | 127 | } |
128 | 128 | ||
diff --git a/app/config/config.yml b/app/config/config.yml index 8e9369c2..5bc16dd9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -59,9 +59,8 @@ twig: | |||
59 | warning_message: %warning_message% | 59 | warning_message: %warning_message% |
60 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 60 | 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" | 61 | flattr_url: "https://flattr.com/thing/1265480" |
62 | form: | 62 | form_themes: |
63 | resources: | 63 | - "LexikFormFilterBundle:Form:form_div_layout.html.twig" |
64 | - LexikFormFilterBundle:Form:form_div_layout.html.twig | ||
65 | 64 | ||
66 | # Assetic Configuration | 65 | # Assetic Configuration |
67 | assetic: | 66 | assetic: |
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 | ||
10 | app: | 10 | app: |
11 | resource: @WallabagCoreBundle/Controller/ | 11 | resource: "@WallabagCoreBundle/Controller/" |
12 | type: annotation | 12 | type: annotation |
13 | 13 | ||
14 | doc-api: | 14 | doc-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/app/console index fa6a36e2..3b4c367c 100755 --- a/app/console +++ b/app/console | |||
@@ -1,18 +1,20 @@ | |||
1 | #!/usr/bin/env php | 1 | #!/usr/bin/env php |
2 | <?php | 2 | <?php |
3 | 3 | ||
4 | use Symfony\Bundle\FrameworkBundle\Console\Application; | ||
5 | use Symfony\Component\Console\Input\ArgvInput; | ||
6 | use 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 | ||
8 | set_time_limit(0); | 12 | set_time_limit(0); |
9 | 13 | ||
10 | require_once __DIR__.'/bootstrap.php.cache'; | 14 | /** |
11 | require_once __DIR__.'/AppKernel.php'; | 15 | * @var Composer\Autoload\ClassLoader $loader |
12 | 16 | */ | |
13 | use Symfony\Bundle\FrameworkBundle\Console\Application; | 17 | $loader = require __DIR__.'/autoload.php'; |
14 | use Symfony\Component\Console\Input\ArgvInput; | ||
15 | use 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(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); |
diff --git a/composer.json b/composer.json index cce26702..b9591aa3 100644 --- a/composer.json +++ b/composer.json | |||
@@ -30,26 +30,27 @@ | |||
30 | "require": { | 30 | "require": { |
31 | "php": ">=5.5.0", | 31 | "php": ">=5.5.0", |
32 | "symfony/symfony": "~2.8", | 32 | "symfony/symfony": "~2.8", |
33 | "doctrine/orm": "~2.3", | 33 | "doctrine/orm": "^2.5", |
34 | "doctrine/doctrine-bundle": "~1.5", | 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": "~4.0", |
55 | "j0k3r/graby": "~1.0", | 56 | "j0k3r/graby": "~1.0", |
@@ -64,8 +65,8 @@ | |||
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" | 71 | "symfony/phpunit-bridge": "~2.7" |
71 | }, | 72 | }, |
@@ -78,7 +79,8 @@ | |||
78 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", | 79 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", |
79 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", | 80 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", |
80 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", | 81 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", |
81 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" | 82 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", |
83 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" | ||
82 | ], | 84 | ], |
83 | "post-install-cmd": [ | 85 | "post-install-cmd": [ |
84 | "@post-cmd" | 86 | "@post-cmd" |
@@ -102,7 +104,8 @@ | |||
102 | } | 104 | } |
103 | }, | 105 | }, |
104 | "autoload": { | 106 | "autoload": { |
105 | "psr-0": { "": "src/" } | 107 | "psr-0": { "": "src/" }, |
108 | "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] | ||
106 | }, | 109 | }, |
107 | "config": { | 110 | "config": { |
108 | "bin-dir": "bin" | 111 | "bin-dir": "bin" |
diff --git a/composer.lock b/composer.lock index 8db3f948..d5c9d603 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": "3cfde4d3168704b0058a99413c69fc5a", | 7 | "hash": "f9037d0e31ddc387133f603a5f1a2c8c", |
8 | "content-hash": "6916bff6c2a88f268cd6ca75aebbf4c6", | 8 | "content-hash": "12c1a8f82eb6129b288629c4b56a448d", |
9 | "packages": [ | 9 | "packages": [ |
10 | { | 10 | { |
11 | "name": "behat/transliterator", | 11 | "name": "behat/transliterator", |
@@ -2169,16 +2169,16 @@ | |||
2169 | }, | 2169 | }, |
2170 | { | 2170 | { |
2171 | "name": "hoa/stream", | 2171 | "name": "hoa/stream", |
2172 | "version": "0.15.10.26", | 2172 | "version": "0.15.08.28", |
2173 | "source": { | 2173 | "source": { |
2174 | "type": "git", | 2174 | "type": "git", |
2175 | "url": "https://github.com/hoaproject/Stream.git", | 2175 | "url": "https://github.com/hoaproject/Stream.git", |
2176 | "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3" | 2176 | "reference": "cbd0f4749e447f4d31001e7c898f5e794c5861cb" |
2177 | }, | 2177 | }, |
2178 | "dist": { | 2178 | "dist": { |
2179 | "type": "zip", | 2179 | "type": "zip", |
2180 | "url": "https://api.github.com/repos/hoaproject/Stream/zipball/011ab91d942f1d7096deade4c8a10fe57d51c5b3", | 2180 | "url": "https://api.github.com/repos/hoaproject/Stream/zipball/cbd0f4749e447f4d31001e7c898f5e794c5861cb", |
2181 | "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3", | 2181 | "reference": "cbd0f4749e447f4d31001e7c898f5e794c5861cb", |
2182 | "shasum": "" | 2182 | "shasum": "" |
2183 | }, | 2183 | }, |
2184 | "require": { | 2184 | "require": { |
@@ -2223,7 +2223,7 @@ | |||
2223 | "stream", | 2223 | "stream", |
2224 | "wrapper" | 2224 | "wrapper" |
2225 | ], | 2225 | ], |
2226 | "time": "2015-10-22 06:30:43" | 2226 | "time": "2015-08-28 07:31:43" |
2227 | }, | 2227 | }, |
2228 | { | 2228 | { |
2229 | "name": "hoa/ustring", | 2229 | "name": "hoa/ustring", |
@@ -2823,36 +2823,41 @@ | |||
2823 | }, | 2823 | }, |
2824 | { | 2824 | { |
2825 | "name": "jms/serializer", | 2825 | "name": "jms/serializer", |
2826 | "version": "0.16.0", | 2826 | "version": "1.1.0", |
2827 | "source": { | 2827 | "source": { |
2828 | "type": "git", | 2828 | "type": "git", |
2829 | "url": "https://github.com/schmittjoh/serializer.git", | 2829 | "url": "https://github.com/schmittjoh/serializer.git", |
2830 | "reference": "c8a171357ca92b6706e395c757f334902d430ea9" | 2830 | "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48" |
2831 | }, | 2831 | }, |
2832 | "dist": { | 2832 | "dist": { |
2833 | "type": "zip", | 2833 | "type": "zip", |
2834 | "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9", | 2834 | "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fe13a1f993ea3456e195b7820692f2eb2b6bbb48", |
2835 | "reference": "c8a171357ca92b6706e395c757f334902d430ea9", | 2835 | "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48", |
2836 | "shasum": "" | 2836 | "shasum": "" |
2837 | }, | 2837 | }, |
2838 | "require": { | 2838 | "require": { |
2839 | "doctrine/annotations": "1.*", | 2839 | "doctrine/annotations": "1.*", |
2840 | "doctrine/instantiator": "~1.0.3", | ||
2840 | "jms/metadata": "~1.1", | 2841 | "jms/metadata": "~1.1", |
2841 | "jms/parser-lib": "1.*", | 2842 | "jms/parser-lib": "1.*", |
2842 | "php": ">=5.3.2", | 2843 | "php": ">=5.4.0", |
2843 | "phpcollection/phpcollection": "~0.1" | 2844 | "phpcollection/phpcollection": "~0.1" |
2844 | }, | 2845 | }, |
2846 | "conflict": { | ||
2847 | "twig/twig": "<1.12" | ||
2848 | }, | ||
2845 | "require-dev": { | 2849 | "require-dev": { |
2846 | "doctrine/orm": "~2.1", | 2850 | "doctrine/orm": "~2.1", |
2847 | "doctrine/phpcr-odm": "~1.0.1", | 2851 | "doctrine/phpcr-odm": "~1.0.1", |
2848 | "jackalope/jackalope-doctrine-dbal": "1.0.*", | 2852 | "jackalope/jackalope-doctrine-dbal": "1.0.*", |
2853 | "phpunit/phpunit": "~4.0", | ||
2849 | "propel/propel1": "~1.7", | 2854 | "propel/propel1": "~1.7", |
2850 | "symfony/filesystem": "2.*", | 2855 | "symfony/filesystem": "2.*", |
2851 | "symfony/form": "~2.1", | 2856 | "symfony/form": "~2.1", |
2852 | "symfony/translation": "~2.0", | 2857 | "symfony/translation": "~2.0", |
2853 | "symfony/validator": "~2.0", | 2858 | "symfony/validator": "~2.0", |
2854 | "symfony/yaml": "2.*", | 2859 | "symfony/yaml": "2.*", |
2855 | "twig/twig": ">=1.8,<2.0-dev" | 2860 | "twig/twig": "~1.12|~2.0" |
2856 | }, | 2861 | }, |
2857 | "suggest": { | 2862 | "suggest": { |
2858 | "symfony/yaml": "Required if you'd like to serialize data to YAML format." | 2863 | "symfony/yaml": "Required if you'd like to serialize data to YAML format." |
@@ -2860,7 +2865,7 @@ | |||
2860 | "type": "library", | 2865 | "type": "library", |
2861 | "extra": { | 2866 | "extra": { |
2862 | "branch-alias": { | 2867 | "branch-alias": { |
2863 | "dev-master": "0.15-dev" | 2868 | "dev-master": "1.1-dev" |
2864 | } | 2869 | } |
2865 | }, | 2870 | }, |
2866 | "autoload": { | 2871 | "autoload": { |
@@ -2874,10 +2879,8 @@ | |||
2874 | ], | 2879 | ], |
2875 | "authors": [ | 2880 | "authors": [ |
2876 | { | 2881 | { |
2877 | "name": "Johannes Schmitt", | 2882 | "name": "Johannes M. Schmitt", |
2878 | "email": "schmittjoh@gmail.com", | 2883 | "email": "schmittjoh@gmail.com" |
2879 | "homepage": "https://github.com/schmittjoh", | ||
2880 | "role": "Developer of wrapped JMSSerializerBundle" | ||
2881 | } | 2884 | } |
2882 | ], | 2885 | ], |
2883 | "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.", | 2886 | "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.", |
@@ -2889,27 +2892,28 @@ | |||
2889 | "serialization", | 2892 | "serialization", |
2890 | "xml" | 2893 | "xml" |
2891 | ], | 2894 | ], |
2892 | "time": "2014-03-18 08:39:00" | 2895 | "time": "2015-10-27 09:24:41" |
2893 | }, | 2896 | }, |
2894 | { | 2897 | { |
2895 | "name": "jms/serializer-bundle", | 2898 | "name": "jms/serializer-bundle", |
2896 | "version": "0.13.0", | 2899 | "version": "1.1.0", |
2897 | "target-dir": "JMS/SerializerBundle", | 2900 | "target-dir": "JMS/SerializerBundle", |
2898 | "source": { | 2901 | "source": { |
2899 | "type": "git", | 2902 | "type": "git", |
2900 | "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", | 2903 | "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", |
2901 | "reference": "bb15db3e661168f4310fad48b86915ff1ca33795" | 2904 | "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e" |
2902 | }, | 2905 | }, |
2903 | "dist": { | 2906 | "dist": { |
2904 | "type": "zip", | 2907 | "type": "zip", |
2905 | "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/bb15db3e661168f4310fad48b86915ff1ca33795", | 2908 | "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3e396c980545350c2efb65a50041d2a9f9d6562e", |
2906 | "reference": "bb15db3e661168f4310fad48b86915ff1ca33795", | 2909 | "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e", |
2907 | "shasum": "" | 2910 | "shasum": "" |
2908 | }, | 2911 | }, |
2909 | "require": { | 2912 | "require": { |
2910 | "jms/serializer": "~0.11", | 2913 | "jms/serializer": "^1.0.0", |
2911 | "php": ">=5.3.2", | 2914 | "php": ">=5.4.0", |
2912 | "symfony/framework-bundle": "~2.1" | 2915 | "phpoption/phpoption": "^1.1.0", |
2916 | "symfony/framework-bundle": "~2.3|~3.0" | ||
2913 | }, | 2917 | }, |
2914 | "require-dev": { | 2918 | "require-dev": { |
2915 | "doctrine/doctrine-bundle": "*", | 2919 | "doctrine/doctrine-bundle": "*", |
@@ -2920,6 +2924,7 @@ | |||
2920 | "symfony/finder": "*", | 2924 | "symfony/finder": "*", |
2921 | "symfony/form": "*", | 2925 | "symfony/form": "*", |
2922 | "symfony/process": "*", | 2926 | "symfony/process": "*", |
2927 | "symfony/stopwatch": "*", | ||
2923 | "symfony/twig-bundle": "*", | 2928 | "symfony/twig-bundle": "*", |
2924 | "symfony/validator": "*", | 2929 | "symfony/validator": "*", |
2925 | "symfony/yaml": "*" | 2930 | "symfony/yaml": "*" |
@@ -2930,7 +2935,7 @@ | |||
2930 | "type": "symfony-bundle", | 2935 | "type": "symfony-bundle", |
2931 | "extra": { | 2936 | "extra": { |
2932 | "branch-alias": { | 2937 | "branch-alias": { |
2933 | "dev-master": "0.13-dev" | 2938 | "dev-master": "1.1-dev" |
2934 | } | 2939 | } |
2935 | }, | 2940 | }, |
2936 | "autoload": { | 2941 | "autoload": { |
@@ -2944,10 +2949,8 @@ | |||
2944 | ], | 2949 | ], |
2945 | "authors": [ | 2950 | "authors": [ |
2946 | { | 2951 | { |
2947 | "name": "Johannes Schmitt", | 2952 | "name": "Johannes M. Schmitt", |
2948 | "email": "schmittjoh@gmail.com", | 2953 | "email": "schmittjoh@gmail.com" |
2949 | "homepage": "https://github.com/schmittjoh", | ||
2950 | "role": "Developer of wrapped JMSSerializerBundle" | ||
2951 | } | 2954 | } |
2952 | ], | 2955 | ], |
2953 | "description": "Allows you to easily serialize, and deserialize data of any complexity", | 2956 | "description": "Allows you to easily serialize, and deserialize data of any complexity", |
@@ -2959,7 +2962,7 @@ | |||
2959 | "serialization", | 2962 | "serialization", |
2960 | "xml" | 2963 | "xml" |
2961 | ], | 2964 | ], |
2962 | "time": "2013-12-05 14:36:11" | 2965 | "time": "2015-11-10 12:26:42" |
2963 | }, | 2966 | }, |
2964 | { | 2967 | { |
2965 | "name": "kphoen/rulerz", | 2968 | "name": "kphoen/rulerz", |
@@ -3219,36 +3222,40 @@ | |||
3219 | }, | 3222 | }, |
3220 | { | 3223 | { |
3221 | "name": "liip/theme-bundle", | 3224 | "name": "liip/theme-bundle", |
3222 | "version": "1.1.3", | 3225 | "version": "1.4.0", |
3223 | "target-dir": "Liip/ThemeBundle", | ||
3224 | "source": { | 3226 | "source": { |
3225 | "type": "git", | 3227 | "type": "git", |
3226 | "url": "https://github.com/liip/LiipThemeBundle.git", | 3228 | "url": "https://github.com/liip/LiipThemeBundle.git", |
3227 | "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b" | 3229 | "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905" |
3228 | }, | 3230 | }, |
3229 | "dist": { | 3231 | "dist": { |
3230 | "type": "zip", | 3232 | "type": "zip", |
3231 | "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/a594cc6deda293034b8fd7795c9950f02fc8251b", | 3233 | "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/ae4f0f1b045689bed9150d5bd32d2f7f2f98b905", |
3232 | "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b", | 3234 | "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905", |
3233 | "shasum": "" | 3235 | "shasum": "" |
3234 | }, | 3236 | }, |
3235 | "require": { | 3237 | "require": { |
3236 | "php": ">=5.3.3", | 3238 | "php": "^5.3.9|^7.0", |
3237 | "symfony/framework-bundle": "~2.0" | 3239 | "psr/log": "~1.0", |
3240 | "symfony/framework-bundle": "~2.3|~3.0" | ||
3238 | }, | 3241 | }, |
3239 | "require-dev": { | 3242 | "require-dev": { |
3240 | "symfony/console": "~2.0", | 3243 | "kriswallsmith/assetic": "~1.1", |
3241 | "symfony/expression-language": "~2.6" | 3244 | "phpunit/php-code-coverage": "~2.2@stable", |
3245 | "phpunit/phpunit": "~4.5@stable", | ||
3246 | "symfony/console": "~2.3|~3.0", | ||
3247 | "symfony/expression-language": "~2.6|~3.0", | ||
3248 | "twig/twig": "~1.4|~2.0@dev" | ||
3242 | }, | 3249 | }, |
3243 | "type": "symfony-bundle", | 3250 | "type": "symfony-bundle", |
3244 | "extra": { | 3251 | "extra": { |
3245 | "branch-alias": { | 3252 | "branch-alias": { |
3246 | "dev-master": "1.1-dev" | 3253 | "dev-master": "1.4-dev" |
3247 | } | 3254 | } |
3248 | }, | 3255 | }, |
3249 | "autoload": { | 3256 | "autoload": { |
3250 | "psr-0": { | 3257 | "psr-4": { |
3251 | "Liip\\ThemeBundle": "" | 3258 | "Liip\\ThemeBundle\\": "" |
3252 | } | 3259 | } |
3253 | }, | 3260 | }, |
3254 | "notification-url": "https://packagist.org/downloads/", | 3261 | "notification-url": "https://packagist.org/downloads/", |
@@ -3270,7 +3277,7 @@ | |||
3270 | "themes", | 3277 | "themes", |
3271 | "theming" | 3278 | "theming" |
3272 | ], | 3279 | ], |
3273 | "time": "2015-02-02 15:55:54" | 3280 | "time": "2015-12-05 09:33:29" |
3274 | }, | 3281 | }, |
3275 | { | 3282 | { |
3276 | "name": "mgargano/simplehtmldom", | 3283 | "name": "mgargano/simplehtmldom", |
@@ -4029,45 +4036,37 @@ | |||
4029 | }, | 4036 | }, |
4030 | { | 4037 | { |
4031 | "name": "sensio/distribution-bundle", | 4038 | "name": "sensio/distribution-bundle", |
4032 | "version": "v3.0.34", | 4039 | "version": "v5.0.3", |
4033 | "target-dir": "Sensio/Bundle/DistributionBundle", | ||
4034 | "source": { | 4040 | "source": { |
4035 | "type": "git", | 4041 | "type": "git", |
4036 | "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", | 4042 | "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", |
4037 | "reference": "587f3cd08bf8856cfc888b255f34f18b85930657" | 4043 | "reference": "419c1824af940e2be0f833aca2327e1181a6b503" |
4038 | }, | 4044 | }, |
4039 | "dist": { | 4045 | "dist": { |
4040 | "type": "zip", | 4046 | "type": "zip", |
4041 | "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/587f3cd08bf8856cfc888b255f34f18b85930657", | 4047 | "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/419c1824af940e2be0f833aca2327e1181a6b503", |
4042 | "reference": "587f3cd08bf8856cfc888b255f34f18b85930657", | 4048 | "reference": "419c1824af940e2be0f833aca2327e1181a6b503", |
4043 | "shasum": "" | 4049 | "shasum": "" |
4044 | }, | 4050 | }, |
4045 | "require": { | 4051 | "require": { |
4046 | "php": ">=5.3.3", | 4052 | "php": ">=5.3.9", |
4047 | "sensiolabs/security-checker": "~3.0", | 4053 | "sensiolabs/security-checker": "~3.0", |
4048 | "symfony/class-loader": "~2.2", | 4054 | "symfony/class-loader": "~2.3|~3.0", |
4049 | "symfony/framework-bundle": "~2.3", | 4055 | "symfony/config": "~2.3|~3.0", |
4050 | "symfony/process": "~2.2" | 4056 | "symfony/dependency-injection": "~2.3|~3.0", |
4051 | }, | 4057 | "symfony/filesystem": "~2.3|~3.0", |
4052 | "require-dev": { | 4058 | "symfony/http-kernel": "~2.3|~3.0", |
4053 | "symfony/form": "~2.2", | 4059 | "symfony/process": "~2.3|~3.0" |
4054 | "symfony/validator": "~2.2", | ||
4055 | "symfony/yaml": "~2.2" | ||
4056 | }, | ||
4057 | "suggest": { | ||
4058 | "symfony/form": "If you want to use the configurator", | ||
4059 | "symfony/validator": "If you want to use the configurator", | ||
4060 | "symfony/yaml": "If you want to use the configurator" | ||
4061 | }, | 4060 | }, |
4062 | "type": "symfony-bundle", | 4061 | "type": "symfony-bundle", |
4063 | "extra": { | 4062 | "extra": { |
4064 | "branch-alias": { | 4063 | "branch-alias": { |
4065 | "dev-master": "3.0.x-dev" | 4064 | "dev-master": "5.0.x-dev" |
4066 | } | 4065 | } |
4067 | }, | 4066 | }, |
4068 | "autoload": { | 4067 | "autoload": { |
4069 | "psr-0": { | 4068 | "psr-4": { |
4070 | "Sensio\\Bundle\\DistributionBundle": "" | 4069 | "Sensio\\Bundle\\DistributionBundle\\": "" |
4071 | } | 4070 | } |
4072 | }, | 4071 | }, |
4073 | "notification-url": "https://packagist.org/downloads/", | 4072 | "notification-url": "https://packagist.org/downloads/", |
@@ -4085,7 +4084,7 @@ | |||
4085 | "configuration", | 4084 | "configuration", |
4086 | "distribution" | 4085 | "distribution" |
4087 | ], | 4086 | ], |
4088 | "time": "2015-11-26 18:10:17" | 4087 | "time": "2015-12-18 17:44:11" |
4089 | }, | 4088 | }, |
4090 | { | 4089 | { |
4091 | "name": "sensio/framework-extra-bundle", | 4090 | "name": "sensio/framework-extra-bundle", |
@@ -5443,34 +5442,34 @@ | |||
5443 | }, | 5442 | }, |
5444 | { | 5443 | { |
5445 | "name": "willdurand/hateoas", | 5444 | "name": "willdurand/hateoas", |
5446 | "version": "v2.6.0", | 5445 | "version": "v2.9.0", |
5447 | "source": { | 5446 | "source": { |
5448 | "type": "git", | 5447 | "type": "git", |
5449 | "url": "https://github.com/willdurand/Hateoas.git", | 5448 | "url": "https://github.com/willdurand/Hateoas.git", |
5450 | "reference": "fc0869381d6934e5d430084154584761297caa6c" | 5449 | "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c" |
5451 | }, | 5450 | }, |
5452 | "dist": { | 5451 | "dist": { |
5453 | "type": "zip", | 5452 | "type": "zip", |
5454 | "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/fc0869381d6934e5d430084154584761297caa6c", | 5453 | "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/6e6ee945100bef3534c9276f0cf1c70d0115670c", |
5455 | "reference": "fc0869381d6934e5d430084154584761297caa6c", | 5454 | "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c", |
5456 | "shasum": "" | 5455 | "shasum": "" |
5457 | }, | 5456 | }, |
5458 | "require": { | 5457 | "require": { |
5459 | "doctrine/annotations": "~1.0", | 5458 | "doctrine/annotations": "~1.0", |
5460 | "doctrine/common": "~2.0", | 5459 | "doctrine/common": "~2.0", |
5461 | "jms/metadata": "~1.1", | 5460 | "jms/metadata": "~1.1", |
5462 | "jms/serializer": "~0.13", | 5461 | "jms/serializer": "~1.0", |
5463 | "php": ">=5.3", | 5462 | "php": ">=5.4", |
5464 | "symfony/expression-language": "~2.4" | 5463 | "symfony/expression-language": "~2.4 || ~3.0" |
5465 | }, | 5464 | }, |
5466 | "require-dev": { | 5465 | "require-dev": { |
5467 | "atoum/atoum": "*@dev", | 5466 | "atoum/atoum": "*@dev", |
5468 | "hautelook/frankenstein": "~0.1", | 5467 | "hautelook/frankenstein": "~0.1", |
5469 | "pagerfanta/pagerfanta": "~1.0", | 5468 | "pagerfanta/pagerfanta": "~1.0", |
5470 | "phpunit/phpunit": "~3.7", | 5469 | "phpunit/phpunit": "~3.7", |
5471 | "symfony/dependency-injection": "~2.0", | 5470 | "symfony/dependency-injection": "~2.0 || ~3.0", |
5472 | "symfony/routing": "~2.0", | 5471 | "symfony/routing": "~2.0 || ~3.0", |
5473 | "symfony/yaml": "~2.0", | 5472 | "symfony/yaml": "~2.0 || ~3.0", |
5474 | "twig/twig": "~1.12" | 5473 | "twig/twig": "~1.12" |
5475 | }, | 5474 | }, |
5476 | "suggest": { | 5475 | "suggest": { |
@@ -5481,7 +5480,7 @@ | |||
5481 | "type": "library", | 5480 | "type": "library", |
5482 | "extra": { | 5481 | "extra": { |
5483 | "branch-alias": { | 5482 | "branch-alias": { |
5484 | "dev-master": "2.6-dev" | 5483 | "dev-master": "2.9-dev" |
5485 | } | 5484 | } |
5486 | }, | 5485 | }, |
5487 | "autoload": { | 5486 | "autoload": { |
@@ -5504,36 +5503,36 @@ | |||
5504 | } | 5503 | } |
5505 | ], | 5504 | ], |
5506 | "description": "A PHP library to support implementing representations for HATEOAS REST web services", | 5505 | "description": "A PHP library to support implementing representations for HATEOAS REST web services", |
5507 | "time": "2015-05-21 21:57:34" | 5506 | "time": "2015-12-04 15:31:02" |
5508 | }, | 5507 | }, |
5509 | { | 5508 | { |
5510 | "name": "willdurand/hateoas-bundle", | 5509 | "name": "willdurand/hateoas-bundle", |
5511 | "version": "0.5.0", | 5510 | "version": "1.1.0", |
5512 | "target-dir": "Bazinga/Bundle/HateoasBundle", | 5511 | "target-dir": "Bazinga/Bundle/HateoasBundle", |
5513 | "source": { | 5512 | "source": { |
5514 | "type": "git", | 5513 | "type": "git", |
5515 | "url": "https://github.com/willdurand/BazingaHateoasBundle.git", | 5514 | "url": "https://github.com/willdurand/BazingaHateoasBundle.git", |
5516 | "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b" | 5515 | "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2" |
5517 | }, | 5516 | }, |
5518 | "dist": { | 5517 | "dist": { |
5519 | "type": "zip", | 5518 | "type": "zip", |
5520 | "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/3c86e8080e8a229365a0ce91818da6fe6562376b", | 5519 | "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/205a5a16899716f33edfb7a5afc4d451d0d2d0b2", |
5521 | "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b", | 5520 | "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2", |
5522 | "shasum": "" | 5521 | "shasum": "" |
5523 | }, | 5522 | }, |
5524 | "require": { | 5523 | "require": { |
5525 | "jms/serializer-bundle": "~0.13", | 5524 | "jms/serializer-bundle": "~1.0", |
5526 | "symfony/framework-bundle": "~2.2", | 5525 | "symfony/framework-bundle": "~2.2 || ~3.0", |
5527 | "willdurand/hateoas": "~2.0" | 5526 | "willdurand/hateoas": "~2.9" |
5528 | }, | 5527 | }, |
5529 | "require-dev": { | 5528 | "require-dev": { |
5530 | "symfony/expression-language": "~2.4", | 5529 | "symfony/expression-language": "~2.4 || ~3.0", |
5531 | "twig/twig": "~1.12" | 5530 | "twig/twig": "~1.12" |
5532 | }, | 5531 | }, |
5533 | "type": "symfony-bundle", | 5532 | "type": "symfony-bundle", |
5534 | "extra": { | 5533 | "extra": { |
5535 | "branch-alias": { | 5534 | "branch-alias": { |
5536 | "dev-master": "1.0.x-dev" | 5535 | "dev-master": "1.2-dev" |
5537 | } | 5536 | } |
5538 | }, | 5537 | }, |
5539 | "autoload": { | 5538 | "autoload": { |
@@ -5556,7 +5555,7 @@ | |||
5556 | "HATEOAS", | 5555 | "HATEOAS", |
5557 | "rest" | 5556 | "rest" |
5558 | ], | 5557 | ], |
5559 | "time": "2015-02-19 16:27:51" | 5558 | "time": "2015-12-07 08:25:05" |
5560 | }, | 5559 | }, |
5561 | { | 5560 | { |
5562 | "name": "willdurand/jsonp-callback-validator", | 5561 | "name": "willdurand/jsonp-callback-validator", |
@@ -5708,23 +5707,23 @@ | |||
5708 | }, | 5707 | }, |
5709 | { | 5708 | { |
5710 | "name": "doctrine/doctrine-fixtures-bundle", | 5709 | "name": "doctrine/doctrine-fixtures-bundle", |
5711 | "version": "v2.2.1", | 5710 | "version": "2.3.0", |
5712 | "source": { | 5711 | "source": { |
5713 | "type": "git", | 5712 | "type": "git", |
5714 | "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", | 5713 | "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", |
5715 | "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8" | 5714 | "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029" |
5716 | }, | 5715 | }, |
5717 | "dist": { | 5716 | "dist": { |
5718 | "type": "zip", | 5717 | "type": "zip", |
5719 | "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/817c2d233fde0fe85cb7e4d25d43fbfcd028aef8", | 5718 | "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/0f1a2f91b349e10f5c343f75ab71d23aace5b029", |
5720 | "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8", | 5719 | "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029", |
5721 | "shasum": "" | 5720 | "shasum": "" |
5722 | }, | 5721 | }, |
5723 | "require": { | 5722 | "require": { |
5724 | "doctrine/data-fixtures": "~1.0", | 5723 | "doctrine/data-fixtures": "~1.0", |
5725 | "doctrine/doctrine-bundle": "~1.0", | 5724 | "doctrine/doctrine-bundle": "~1.0", |
5726 | "php": ">=5.3.2", | 5725 | "php": ">=5.3.2", |
5727 | "symfony/doctrine-bridge": "~2.1" | 5726 | "symfony/doctrine-bridge": "~2.3|~3.0" |
5728 | }, | 5727 | }, |
5729 | "type": "symfony-bundle", | 5728 | "type": "symfony-bundle", |
5730 | "extra": { | 5729 | "extra": { |
@@ -5761,7 +5760,7 @@ | |||
5761 | "Fixture", | 5760 | "Fixture", |
5762 | "persistence" | 5761 | "persistence" |
5763 | ], | 5762 | ], |
5764 | "time": "2015-08-04 22:43:14" | 5763 | "time": "2015-11-04 21:23:23" |
5765 | }, | 5764 | }, |
5766 | { | 5765 | { |
5767 | "name": "phpdocumentor/reflection-docblock", | 5766 | "name": "phpdocumentor/reflection-docblock", |
@@ -6613,38 +6612,42 @@ | |||
6613 | }, | 6612 | }, |
6614 | { | 6613 | { |
6615 | "name": "sensio/generator-bundle", | 6614 | "name": "sensio/generator-bundle", |
6616 | "version": "v2.5.3", | 6615 | "version": "v3.0.3", |
6617 | "target-dir": "Sensio/Bundle/GeneratorBundle", | ||
6618 | "source": { | 6616 | "source": { |
6619 | "type": "git", | 6617 | "type": "git", |
6620 | "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", | 6618 | "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", |
6621 | "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" | 6619 | "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66" |
6622 | }, | 6620 | }, |
6623 | "dist": { | 6621 | "dist": { |
6624 | "type": "zip", | 6622 | "type": "zip", |
6625 | "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", | 6623 | "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/525e078ff7d5e9f19b0ef912bb6d6753673b3c66", |
6626 | "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", | 6624 | "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66", |
6627 | "shasum": "" | 6625 | "shasum": "" |
6628 | }, | 6626 | }, |
6629 | "require": { | 6627 | "require": { |
6630 | "symfony/console": "~2.5", | 6628 | "symfony/console": "~2.7|~3.0", |
6631 | "symfony/framework-bundle": "~2.2" | 6629 | "symfony/framework-bundle": "~2.7|~3.0", |
6630 | "symfony/process": "~2.7|~3.0", | ||
6631 | "symfony/yaml": "~2.7|~3.0" | ||
6632 | }, | 6632 | }, |
6633 | "require-dev": { | 6633 | "require-dev": { |
6634 | "doctrine/orm": "~2.2,>=2.2.3", | 6634 | "doctrine/orm": "~2.4", |
6635 | "symfony/doctrine-bridge": "~2.2", | 6635 | "symfony/doctrine-bridge": "~2.7|~3.0", |
6636 | "twig/twig": "~1.11" | 6636 | "twig/twig": "~1.18" |
6637 | }, | 6637 | }, |
6638 | "type": "symfony-bundle", | 6638 | "type": "symfony-bundle", |
6639 | "extra": { | 6639 | "extra": { |
6640 | "branch-alias": { | 6640 | "branch-alias": { |
6641 | "dev-master": "2.5.x-dev" | 6641 | "dev-master": "3.0.x-dev" |
6642 | } | 6642 | } |
6643 | }, | 6643 | }, |
6644 | "autoload": { | 6644 | "autoload": { |
6645 | "psr-0": { | 6645 | "psr-4": { |
6646 | "Sensio\\Bundle\\GeneratorBundle": "" | 6646 | "Sensio\\Bundle\\GeneratorBundle\\": "" |
6647 | } | 6647 | }, |
6648 | "exclude-from-classmap": [ | ||
6649 | "/Tests/" | ||
6650 | ] | ||
6648 | }, | 6651 | }, |
6649 | "notification-url": "https://packagist.org/downloads/", | 6652 | "notification-url": "https://packagist.org/downloads/", |
6650 | "license": [ | 6653 | "license": [ |
@@ -6657,7 +6660,7 @@ | |||
6657 | } | 6660 | } |
6658 | ], | 6661 | ], |
6659 | "description": "This bundle generates code for you", | 6662 | "description": "This bundle generates code for you", |
6660 | "time": "2015-03-17 06:36:52" | 6663 | "time": "2015-12-20 20:01:41" |
6661 | }, | 6664 | }, |
6662 | { | 6665 | { |
6663 | "name": "symfony/phpunit-bridge", | 6666 | "name": "symfony/phpunit-bridge", |
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5549b8a5..85fa964b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist | |||
@@ -9,7 +9,7 @@ | |||
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> |
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index f51ccaa4..d0cf91de 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -8,6 +8,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; | |||
8 | use Symfony\Component\HttpFoundation\Request; | 8 | use Symfony\Component\HttpFoundation\Request; |
9 | use Wallabag\CoreBundle\Entity\Config; | 9 | use Wallabag\CoreBundle\Entity\Config; |
10 | use Wallabag\CoreBundle\Entity\TaggingRule; | 10 | use Wallabag\CoreBundle\Entity\TaggingRule; |
11 | use Wallabag\CoreBundle\Form\Type\ConfigType; | ||
11 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; | 12 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; |
12 | use Wallabag\CoreBundle\Form\Type\NewUserType; | 13 | use Wallabag\CoreBundle\Form\Type\NewUserType; |
13 | use Wallabag\CoreBundle\Form\Type\RssType; | 14 | use Wallabag\CoreBundle\Form\Type\RssType; |
@@ -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 c1b5a71b..83e5b57d 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -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 | ||
@@ -234,7 +234,7 @@ class EntryController extends Controller | |||
234 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); | 234 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); |
235 | } | 235 | } |
236 | 236 | ||
237 | $form = $this->get('form.factory')->create(new EntryFilterType($repository, $this->getUser())); | 237 | $form = $this->createForm(new EntryFilterType($repository, $this->getUser())); |
238 | 238 | ||
239 | if ($request->query->has($form->getName())) { | 239 | if ($request->query->has($form->getName())) { |
240 | // manually bind values from the request | 240 | // manually bind values from the request |
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index 682cc6e6..ff4d64a8 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -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/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index e0a1cb31..4430c971 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php | |||
@@ -4,6 +4,11 @@ namespace Wallabag\CoreBundle\Filter; | |||
4 | 4 | ||
5 | use Doctrine\ORM\EntityRepository; | 5 | use Doctrine\ORM\EntityRepository; |
6 | use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; | 6 | use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; |
7 | use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType; | ||
8 | use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType; | ||
9 | use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType; | ||
10 | use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType; | ||
11 | use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType; | ||
7 | use Symfony\Component\Form\AbstractType; | 12 | use Symfony\Component\Form\AbstractType; |
8 | use Symfony\Component\Form\FormBuilderInterface; | 13 | use Symfony\Component\Form\FormBuilderInterface; |
9 | use Symfony\Component\OptionsResolver\OptionsResolver; | 14 | use Symfony\Component\OptionsResolver\OptionsResolver; |
@@ -29,8 +34,8 @@ class EntryFilterType extends AbstractType | |||
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,7 +52,7 @@ 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)) { |
@@ -58,9 +63,9 @@ class EntryFilterType extends AbstractType | |||
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,8 +76,9 @@ 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 | } |
diff --git a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php b/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php index 615b8169..7d05a5d8 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php | |||
@@ -19,7 +19,7 @@ class ChangePasswordType extends AbstractType | |||
19 | 'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')), | 19 | 'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')), |
20 | )) | 20 | )) |
21 | ->add('new_password', RepeatedType::class, array( | 21 | ->add('new_password', RepeatedType::class, array( |
22 | 'type' => 'password', | 22 | 'type' => PasswordType::class, |
23 | 'invalid_message' => 'The password fields must match.', | 23 | 'invalid_message' => 'The password fields must match.', |
24 | 'required' => true, | 24 | 'required' => true, |
25 | 'first_options' => array('label' => 'New password'), | 25 | 'first_options' => array('label' => 'New password'), |
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 88082a04..a139f2df 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -36,7 +36,8 @@ class ConfigType extends AbstractType | |||
36 | )) | 36 | )) |
37 | ->add('items_per_page') | 37 | ->add('items_per_page') |
38 | ->add('language', ChoiceType::class, array( | 38 | ->add('language', ChoiceType::class, array( |
39 | 'choices' => $this->languages, | 39 | 'choices' => array_flip($this->languages), |
40 | 'choices_as_values' => true, | ||
40 | )) | 41 | )) |
41 | ->add('save', SubmitType::class) | 42 | ->add('save', SubmitType::class) |
42 | ; | 43 | ; |
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index e6fff976..ffbe9ba2 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php | |||
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\Extension\Core\Type\EmailType; | 6 | use Symfony\Component\Form\Extension\Core\Type\EmailType; |
7 | use Symfony\Component\Form\Extension\Core\Type\PasswordType; | ||
7 | use Symfony\Component\Form\Extension\Core\Type\RepeatedType; | 8 | use Symfony\Component\Form\Extension\Core\Type\RepeatedType; |
8 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; | 9 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; |
9 | use Symfony\Component\Form\Extension\Core\Type\TextType; | 10 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
@@ -18,7 +19,7 @@ class NewUserType extends AbstractType | |||
18 | $builder | 19 | $builder |
19 | ->add('username', TextType::class, array('required' => true)) | 20 | ->add('username', TextType::class, array('required' => true)) |
20 | ->add('plainPassword', RepeatedType::class, array( | 21 | ->add('plainPassword', RepeatedType::class, array( |
21 | 'type' => 'password', | 22 | 'type' => PasswordType::class, |
22 | 'constraints' => array( | 23 | 'constraints' => array( |
23 | new Constraints\Length(array( | 24 | new Constraints\Length(array( |
24 | 'min' => 8, | 25 | 'min' => 8, |
diff --git a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php b/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php index 296cec9e..5815b8c6 100644 --- a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php +++ b/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php | |||
@@ -19,7 +19,7 @@ class TaggingRuleType extends AbstractType | |||
19 | ; | 19 | ; |
20 | 20 | ||
21 | $tagsField = $builder | 21 | $tagsField = $builder |
22 | ->create('tags', 'text') | 22 | ->create('tags', TextType::class) |
23 | ->addModelTransformer(new StringToListTransformer(',')); | 23 | ->addModelTransformer(new StringToListTransformer(',')); |
24 | 24 | ||
25 | $builder->add($tagsField); | 25 | $builder->add($tagsField); |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 80f737f8..e8dafc5d 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -12,19 +12,7 @@ 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 | |||
17 | wallabag_core.form.registration: | ||
18 | class: Wallabag\CoreBundle\Form\Type\RegistrationType | ||
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: | ||
25 | - "@doctrine" | ||
26 | tags: | ||
27 | - { name: form.type, alias: forgot_password } | ||
28 | 16 | ||
29 | wallabag_core.param_converter.username_rsstoken_converter: | 17 | wallabag_core.param_converter.username_rsstoken_converter: |
30 | class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter | 18 | class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter |
@@ -66,13 +54,13 @@ services: | |||
66 | # repository as a service | 54 | # repository as a service |
67 | wallabag_core.entry_repository: | 55 | wallabag_core.entry_repository: |
68 | class: Wallabag\CoreBundle\Repository\EntryRepository | 56 | class: Wallabag\CoreBundle\Repository\EntryRepository |
69 | factory: [ @doctrine.orm.default_entity_manager, getRepository ] | 57 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] |
70 | arguments: | 58 | arguments: |
71 | - WallabagCoreBundle:Entry | 59 | - WallabagCoreBundle:Entry |
72 | 60 | ||
73 | wallabag_core.tag_repository: | 61 | wallabag_core.tag_repository: |
74 | class: Wallabag\CoreBundle\Repository\TagRepository | 62 | class: Wallabag\CoreBundle\Repository\TagRepository |
75 | factory: [ @doctrine.orm.default_entity_manager, getRepository ] | 63 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] |
76 | arguments: | 64 | arguments: |
77 | - WallabagCoreBundle:Tag | 65 | - WallabagCoreBundle:Tag |
78 | 66 | ||
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/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/web/app.php b/web/app.php index c5c26409..cc2fefb5 100644 --- a/web/app.php +++ b/web/app.php | |||
@@ -1,23 +1,23 @@ | |||
1 | <?php | 1 | <?php |
2 | 2 | ||
3 | use Symfony\Component\ClassLoader\ApcClassLoader; | ||
4 | use Symfony\Component\HttpFoundation\Request; | 3 | use 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'; | ||
9 | include_once __DIR__.'/../app/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 | ||
18 | require_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..635bf7ac 100644 --- a/web/app_dev.php +++ b/web/app_dev.php | |||
@@ -4,7 +4,8 @@ use Symfony\Component\HttpFoundation\Request; | |||
4 | use Symfony\Component\Debug\Debug; | 4 | use 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. |
@@ -17,11 +18,12 @@ if (isset($_SERVER['HTTP_CLIENT_IP']) | |||
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'; | ||
21 | Debug::enable(); | 25 | Debug::enable(); |
22 | 26 | ||
23 | require_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(); |