From 5c895a7fd15822856fb407910264c5d95e1e223c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Dec 2015 13:00:37 +0100 Subject: [PATCH] Update bundle & stock file - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler --- app/AppCache.php | 2 - app/AppKernel.php | 4 +- app/check.php | 6 +- app/config/config.yml | 5 +- app/config/routing.yml | 2 +- app/config/routing_dev.yml | 6 +- app/config/security.yml | 9 +- app/console | 14 +- composer.json | 31 +-- composer.lock | 225 +++++++++--------- phpunit.xml.dist | 2 +- .../Controller/ConfigController.php | 13 +- .../CoreBundle/Controller/EntryController.php | 6 +- .../CoreBundle/Controller/TagController.php | 2 +- .../CoreBundle/Filter/EntryFilterType.php | 22 +- .../Form/Type/ChangePasswordType.php | 2 +- .../CoreBundle/Form/Type/ConfigType.php | 3 +- .../CoreBundle/Form/Type/NewUserType.php | 3 +- .../CoreBundle/Form/Type/TaggingRuleType.php | 2 +- .../CoreBundle/Resources/config/services.yml | 18 +- .../views/themes/baggy/Config/index.html.twig | 2 +- .../baggy/Registration/register.html.twig | 2 +- .../changePassword_content.html.twig | 2 +- .../Registration/register_content.html.twig | 2 +- .../passwordAlreadyRequested.html.twig | 2 +- .../Resetting/reset_content.html.twig | 2 +- web/app.php | 12 +- web/app_dev.php | 10 +- 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 @@ getEnvironment(), array('dev', 'test'))) { + if (in_array($this->getEnvironment(), array('dev', 'test'), true)) { $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); @@ -48,6 +48,6 @@ class AppKernel extends Kernel public function registerContainerConfiguration(LoaderInterface $loader) { - $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); + $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); } } 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) return; } - $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; + $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; return $errorMessage; @@ -121,8 +121,8 @@ function echo_block($style, $title, $message) echo PHP_EOL.PHP_EOL; echo_style($style, str_repeat(' ', $width).PHP_EOL); - echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); - echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); echo_style($style, str_repeat(' ', $width).PHP_EOL); } 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: warning_message: %warning_message% paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" flattr_url: "https://flattr.com/thing/1265480" - form: - resources: - - LexikFormFilterBundle:Form:form_div_layout.html.twig + form_themes: + - "LexikFormFilterBundle:Form:form_div_layout.html.twig" # Assetic Configuration 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: prefix: / app: - resource: @WallabagCoreBundle/Controller/ + resource: "@WallabagCoreBundle/Controller/" type: annotation 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: resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" prefix: /_profiler -_configurator: - resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml" - prefix: /_configurator - _errors: resource: "@TwigBundle/Resources/config/routing/errors.xml" prefix: /_error _main: - resource: routing.yml \ No newline at end of file + 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: # the main part of the security, where you can set up firewalls # for specific sections of your app firewalls: + # disables authentication for assets and the profiler, adapt it according to your needs + dev: + pattern: ^/(_(profiler|wdt)|css|images|js)/ + security: false + oauth_token: pattern: ^/oauth/v2/token security: false @@ -33,11 +38,11 @@ security: pattern: ^/ form_login: provider: fos_userbundle - csrf_provider: security.csrf.token_manager + csrf_token_generator: security.csrf.token_manager anonymous: true remember_me: - key: "%secret%" + secret: "%secret%" lifetime: 31536000 path: / domain: ~ diff --git a/app/console b/app/console index fa6a36e2..3b4c367c 100755 --- a/app/console +++ b/app/console @@ -1,18 +1,20 @@ #!/usr/bin/env php 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 @@ "require": { "php": ">=5.5.0", "symfony/symfony": "~2.8", - "doctrine/orm": "~2.3", - "doctrine/doctrine-bundle": "~1.5", + "doctrine/orm": "^2.5", + "doctrine/doctrine-bundle": "^1.6", + "doctrine/doctrine-cache-bundle": "^1.2", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", - "symfony/swiftmailer-bundle": "~2.3", - "symfony/monolog-bundle": "~2.4", - "sensio/distribution-bundle": "~3.0.12", - "sensio/framework-extra-bundle": "~3.0", - "incenteev/composer-parameter-handler": "~2.0", + "symfony/swiftmailer-bundle": "^2.3", + "symfony/monolog-bundle": "^2.8", + "sensio/distribution-bundle": "^5.0", + "sensio/framework-extra-bundle": "^3.0.2", + "incenteev/composer-parameter-handler": "^2.0", "nelmio/cors-bundle": "~1.4.0", "friendsofsymfony/rest-bundle": "~1.4", - "jms/serializer-bundle": "~0.13", + "jms/serializer-bundle": "~1.0", "nelmio/api-doc-bundle": "~2.7", "ezyang/htmlpurifier": "~4.6", "mgargano/simplehtmldom": "~1.5", "tecnickcom/tcpdf": "~6.2", "simplepie/simplepie": "~1.3.1", - "willdurand/hateoas-bundle": "~0.5.0", + "willdurand/hateoas-bundle": "~1.0", "htmlawed/htmlawed": "~1.1.19", - "liip/theme-bundle": "~1.1.3", + "liip/theme-bundle": "~1.1", "pagerfanta/pagerfanta": "~1.0.3", "lexik/form-filter-bundle": "~4.0", "j0k3r/graby": "~1.0", @@ -64,8 +65,8 @@ "doctrine/doctrine-migrations-bundle": "^1.0" }, "require-dev": { - "doctrine/doctrine-fixtures-bundle": "~2.2.0", - "sensio/generator-bundle": "~2.5", + "doctrine/doctrine-fixtures-bundle": "~2.2", + "sensio/generator-bundle": "~3.0", "phpunit/phpunit": "~4.4", "symfony/phpunit-bridge": "~2.7" }, @@ -78,7 +79,8 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ], "post-install-cmd": [ "@post-cmd" @@ -102,7 +104,8 @@ } }, "autoload": { - "psr-0": { "": "src/" } + "psr-0": { "": "src/" }, + "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, "config": { "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 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3cfde4d3168704b0058a99413c69fc5a", - "content-hash": "6916bff6c2a88f268cd6ca75aebbf4c6", + "hash": "f9037d0e31ddc387133f603a5f1a2c8c", + "content-hash": "12c1a8f82eb6129b288629c4b56a448d", "packages": [ { "name": "behat/transliterator", @@ -2169,16 +2169,16 @@ }, { "name": "hoa/stream", - "version": "0.15.10.26", + "version": "0.15.08.28", "source": { "type": "git", "url": "https://github.com/hoaproject/Stream.git", - "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3" + "reference": "cbd0f4749e447f4d31001e7c898f5e794c5861cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Stream/zipball/011ab91d942f1d7096deade4c8a10fe57d51c5b3", - "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3", + "url": "https://api.github.com/repos/hoaproject/Stream/zipball/cbd0f4749e447f4d31001e7c898f5e794c5861cb", + "reference": "cbd0f4749e447f4d31001e7c898f5e794c5861cb", "shasum": "" }, "require": { @@ -2223,7 +2223,7 @@ "stream", "wrapper" ], - "time": "2015-10-22 06:30:43" + "time": "2015-08-28 07:31:43" }, { "name": "hoa/ustring", @@ -2823,36 +2823,41 @@ }, { "name": "jms/serializer", - "version": "0.16.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "c8a171357ca92b6706e395c757f334902d430ea9" + "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9", - "reference": "c8a171357ca92b6706e395c757f334902d430ea9", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fe13a1f993ea3456e195b7820692f2eb2b6bbb48", + "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48", "shasum": "" }, "require": { "doctrine/annotations": "1.*", + "doctrine/instantiator": "~1.0.3", "jms/metadata": "~1.1", "jms/parser-lib": "1.*", - "php": ">=5.3.2", + "php": ">=5.4.0", "phpcollection/phpcollection": "~0.1" }, + "conflict": { + "twig/twig": "<1.12" + }, "require-dev": { "doctrine/orm": "~2.1", "doctrine/phpcr-odm": "~1.0.1", "jackalope/jackalope-doctrine-dbal": "1.0.*", + "phpunit/phpunit": "~4.0", "propel/propel1": "~1.7", "symfony/filesystem": "2.*", "symfony/form": "~2.1", "symfony/translation": "~2.0", "symfony/validator": "~2.0", "symfony/yaml": "2.*", - "twig/twig": ">=1.8,<2.0-dev" + "twig/twig": "~1.12|~2.0" }, "suggest": { "symfony/yaml": "Required if you'd like to serialize data to YAML format." @@ -2860,7 +2865,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.15-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2874,10 +2879,8 @@ ], "authors": [ { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.", @@ -2889,27 +2892,28 @@ "serialization", "xml" ], - "time": "2014-03-18 08:39:00" + "time": "2015-10-27 09:24:41" }, { "name": "jms/serializer-bundle", - "version": "0.13.0", + "version": "1.1.0", "target-dir": "JMS/SerializerBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "bb15db3e661168f4310fad48b86915ff1ca33795" + "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/bb15db3e661168f4310fad48b86915ff1ca33795", - "reference": "bb15db3e661168f4310fad48b86915ff1ca33795", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3e396c980545350c2efb65a50041d2a9f9d6562e", + "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e", "shasum": "" }, "require": { - "jms/serializer": "~0.11", - "php": ">=5.3.2", - "symfony/framework-bundle": "~2.1" + "jms/serializer": "^1.0.0", + "php": ">=5.4.0", + "phpoption/phpoption": "^1.1.0", + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { "doctrine/doctrine-bundle": "*", @@ -2920,6 +2924,7 @@ "symfony/finder": "*", "symfony/form": "*", "symfony/process": "*", + "symfony/stopwatch": "*", "symfony/twig-bundle": "*", "symfony/validator": "*", "symfony/yaml": "*" @@ -2930,7 +2935,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "0.13-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2944,10 +2949,8 @@ ], "authors": [ { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], "description": "Allows you to easily serialize, and deserialize data of any complexity", @@ -2959,7 +2962,7 @@ "serialization", "xml" ], - "time": "2013-12-05 14:36:11" + "time": "2015-11-10 12:26:42" }, { "name": "kphoen/rulerz", @@ -3219,36 +3222,40 @@ }, { "name": "liip/theme-bundle", - "version": "1.1.3", - "target-dir": "Liip/ThemeBundle", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/liip/LiipThemeBundle.git", - "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b" + "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/a594cc6deda293034b8fd7795c9950f02fc8251b", - "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b", + "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/ae4f0f1b045689bed9150d5bd32d2f7f2f98b905", + "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/framework-bundle": "~2.0" + "php": "^5.3.9|^7.0", + "psr/log": "~1.0", + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.0", - "symfony/expression-language": "~2.6" + "kriswallsmith/assetic": "~1.1", + "phpunit/php-code-coverage": "~2.2@stable", + "phpunit/phpunit": "~4.5@stable", + "symfony/console": "~2.3|~3.0", + "symfony/expression-language": "~2.6|~3.0", + "twig/twig": "~1.4|~2.0@dev" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.4-dev" } }, "autoload": { - "psr-0": { - "Liip\\ThemeBundle": "" + "psr-4": { + "Liip\\ThemeBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -3270,7 +3277,7 @@ "themes", "theming" ], - "time": "2015-02-02 15:55:54" + "time": "2015-12-05 09:33:29" }, { "name": "mgargano/simplehtmldom", @@ -4029,45 +4036,37 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.34", - "target-dir": "Sensio/Bundle/DistributionBundle", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "587f3cd08bf8856cfc888b255f34f18b85930657" + "reference": "419c1824af940e2be0f833aca2327e1181a6b503" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/587f3cd08bf8856cfc888b255f34f18b85930657", - "reference": "587f3cd08bf8856cfc888b255f34f18b85930657", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/419c1824af940e2be0f833aca2327e1181a6b503", + "reference": "419c1824af940e2be0f833aca2327e1181a6b503", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.9", "sensiolabs/security-checker": "~3.0", - "symfony/class-loader": "~2.2", - "symfony/framework-bundle": "~2.3", - "symfony/process": "~2.2" - }, - "require-dev": { - "symfony/form": "~2.2", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2" - }, - "suggest": { - "symfony/form": "If you want to use the configurator", - "symfony/validator": "If you want to use the configurator", - "symfony/yaml": "If you want to use the configurator" + "symfony/class-loader": "~2.3|~3.0", + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/filesystem": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/process": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\DistributionBundle": "" + "psr-4": { + "Sensio\\Bundle\\DistributionBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -4085,7 +4084,7 @@ "configuration", "distribution" ], - "time": "2015-11-26 18:10:17" + "time": "2015-12-18 17:44:11" }, { "name": "sensio/framework-extra-bundle", @@ -5443,34 +5442,34 @@ }, { "name": "willdurand/hateoas", - "version": "v2.6.0", + "version": "v2.9.0", "source": { "type": "git", "url": "https://github.com/willdurand/Hateoas.git", - "reference": "fc0869381d6934e5d430084154584761297caa6c" + "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/fc0869381d6934e5d430084154584761297caa6c", - "reference": "fc0869381d6934e5d430084154584761297caa6c", + "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/6e6ee945100bef3534c9276f0cf1c70d0115670c", + "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c", "shasum": "" }, "require": { "doctrine/annotations": "~1.0", "doctrine/common": "~2.0", "jms/metadata": "~1.1", - "jms/serializer": "~0.13", - "php": ">=5.3", - "symfony/expression-language": "~2.4" + "jms/serializer": "~1.0", + "php": ">=5.4", + "symfony/expression-language": "~2.4 || ~3.0" }, "require-dev": { "atoum/atoum": "*@dev", "hautelook/frankenstein": "~0.1", "pagerfanta/pagerfanta": "~1.0", "phpunit/phpunit": "~3.7", - "symfony/dependency-injection": "~2.0", - "symfony/routing": "~2.0", - "symfony/yaml": "~2.0", + "symfony/dependency-injection": "~2.0 || ~3.0", + "symfony/routing": "~2.0 || ~3.0", + "symfony/yaml": "~2.0 || ~3.0", "twig/twig": "~1.12" }, "suggest": { @@ -5481,7 +5480,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.9-dev" } }, "autoload": { @@ -5504,36 +5503,36 @@ } ], "description": "A PHP library to support implementing representations for HATEOAS REST web services", - "time": "2015-05-21 21:57:34" + "time": "2015-12-04 15:31:02" }, { "name": "willdurand/hateoas-bundle", - "version": "0.5.0", + "version": "1.1.0", "target-dir": "Bazinga/Bundle/HateoasBundle", "source": { "type": "git", "url": "https://github.com/willdurand/BazingaHateoasBundle.git", - "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b" + "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/3c86e8080e8a229365a0ce91818da6fe6562376b", - "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b", + "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/205a5a16899716f33edfb7a5afc4d451d0d2d0b2", + "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2", "shasum": "" }, "require": { - "jms/serializer-bundle": "~0.13", - "symfony/framework-bundle": "~2.2", - "willdurand/hateoas": "~2.0" + "jms/serializer-bundle": "~1.0", + "symfony/framework-bundle": "~2.2 || ~3.0", + "willdurand/hateoas": "~2.9" }, "require-dev": { - "symfony/expression-language": "~2.4", + "symfony/expression-language": "~2.4 || ~3.0", "twig/twig": "~1.12" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -5556,7 +5555,7 @@ "HATEOAS", "rest" ], - "time": "2015-02-19 16:27:51" + "time": "2015-12-07 08:25:05" }, { "name": "willdurand/jsonp-callback-validator", @@ -5708,23 +5707,23 @@ }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "v2.2.1", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8" + "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/817c2d233fde0fe85cb7e4d25d43fbfcd028aef8", - "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/0f1a2f91b349e10f5c343f75ab71d23aace5b029", + "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029", "shasum": "" }, "require": { "doctrine/data-fixtures": "~1.0", "doctrine/doctrine-bundle": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.1" + "symfony/doctrine-bridge": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { @@ -5761,7 +5760,7 @@ "Fixture", "persistence" ], - "time": "2015-08-04 22:43:14" + "time": "2015-11-04 21:23:23" }, { "name": "phpdocumentor/reflection-docblock", @@ -6613,38 +6612,42 @@ }, { "name": "sensio/generator-bundle", - "version": "v2.5.3", - "target-dir": "Sensio/Bundle/GeneratorBundle", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" + "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/525e078ff7d5e9f19b0ef912bb6d6753673b3c66", + "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66", "shasum": "" }, "require": { - "symfony/console": "~2.5", - "symfony/framework-bundle": "~2.2" + "symfony/console": "~2.7|~3.0", + "symfony/framework-bundle": "~2.7|~3.0", + "symfony/process": "~2.7|~3.0", + "symfony/yaml": "~2.7|~3.0" }, "require-dev": { - "doctrine/orm": "~2.2,>=2.2.3", - "symfony/doctrine-bridge": "~2.2", - "twig/twig": "~1.11" + "doctrine/orm": "~2.4", + "symfony/doctrine-bridge": "~2.7|~3.0", + "twig/twig": "~1.18" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { - "psr-0": { - "Sensio\\Bundle\\GeneratorBundle": "" - } + "psr-4": { + "Sensio\\Bundle\\GeneratorBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -6657,7 +6660,7 @@ } ], "description": "This bundle generates code for you", - "time": "2015-03-17 06:36:52" + "time": "2015-12-20 20:01:41" }, { "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 @@ processIsolation="false" stopOnFailure="false" syntaxCheck="false" - bootstrap="app/bootstrap.php.cache" + bootstrap="app/autoload.php" > 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; use Symfony\Component\HttpFoundation\Request; use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Entity\TaggingRule; +use Wallabag\CoreBundle\Form\Type\ConfigType; use Wallabag\CoreBundle\Form\Type\ChangePasswordType; use Wallabag\CoreBundle\Form\Type\NewUserType; use Wallabag\CoreBundle\Form\Type\RssType; @@ -31,7 +32,7 @@ class ConfigController extends Controller $user = $this->getUser(); // handle basic config detail (this form is defined as a service) - $configForm = $this->createForm('config', $config, array('action' => $this->generateUrl('config'))); + $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config'))); $configForm->handleRequest($request); if ($configForm->isValid()) { @@ -51,7 +52,7 @@ class ConfigController extends Controller } // handle changing password - $pwdForm = $this->createForm(new ChangePasswordType(), null, array('action' => $this->generateUrl('config').'#set4')); + $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4')); $pwdForm->handleRequest($request); if ($pwdForm->isValid()) { @@ -67,7 +68,7 @@ class ConfigController extends Controller } // handle changing user information - $userForm = $this->createForm(new UserInformationType(), $user, array( + $userForm = $this->createForm(UserInformationType::class, $user, array( 'validation_groups' => array('Profile'), 'action' => $this->generateUrl('config').'#set3', )); @@ -85,7 +86,7 @@ class ConfigController extends Controller } // handle rss information - $rssForm = $this->createForm(new RssType(), $config, array('action' => $this->generateUrl('config').'#set2')); + $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2')); $rssForm->handleRequest($request); if ($rssForm->isValid()) { @@ -102,7 +103,7 @@ class ConfigController extends Controller // handle tagging rule $taggingRule = new TaggingRule(); - $newTaggingRule = $this->createForm(new TaggingRuleType(), $taggingRule, array('action' => $this->generateUrl('config').'#set5')); + $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5')); $newTaggingRule->handleRequest($request); if ($newTaggingRule->isValid()) { @@ -122,7 +123,7 @@ class ConfigController extends Controller $newUser = $userManager->createUser(); // enable created user by default $newUser->setEnabled(true); - $newUserForm = $this->createForm(new NewUserType(), $newUser, array( + $newUserForm = $this->createForm(NewUserType::class, $newUser, array( 'validation_groups' => array('Profile'), 'action' => $this->generateUrl('config').'#set5', )); 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 { $entry = new Entry($this->getUser()); - $form = $this->createForm(new NewEntryType(), $entry); + $form = $this->createForm(NewEntryType::class, $entry); $form->handleRequest($request); @@ -117,7 +117,7 @@ class EntryController extends Controller { $this->checkUserAction($entry); - $form = $this->createForm(new EditEntryType(), $entry); + $form = $this->createForm(EditEntryType::class, $entry); $form->handleRequest($request); @@ -234,7 +234,7 @@ class EntryController extends Controller throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); } - $form = $this->get('form.factory')->create(new EntryFilterType($repository, $this->getUser())); + $form = $this->createForm(new EntryFilterType($repository, $this->getUser())); if ($request->query->has($form->getName())) { // 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 public function addTagFormAction(Request $request, Entry $entry) { $tag = new Tag(); - $form = $this->createForm(new NewTagType(), $tag); + $form = $this->createForm(NewTagType::class, $tag); $form->handleRequest($request); 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; use Doctrine\ORM\EntityRepository; use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType; +use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -29,8 +34,8 @@ class EntryFilterType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('readingTime', 'filter_number_range') - ->add('createdAt', 'filter_date_range', array( + ->add('readingTime', NumberRangeFilterType::class) + ->add('createdAt', DateRangeFilterType::class, array( 'left_date_options' => array( 'attr' => array( 'placeholder' => 'dd/mm/yyyy', @@ -47,7 +52,7 @@ class EntryFilterType extends AbstractType ), ) ) - ->add('domainName', 'filter_text', array( + ->add('domainName', TextFilterType::class, array( 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { $value = $values['value']; if (strlen($value) <= 2 || empty($value)) { @@ -58,9 +63,9 @@ class EntryFilterType extends AbstractType return $filterQuery->createCondition($expression); }, )) - ->add('isArchived', 'filter_checkbox') - ->add('isStarred', 'filter_checkbox') - ->add('previewPicture', 'filter_checkbox', array( + ->add('isArchived', CheckboxFilterType::class) + ->add('isStarred', CheckboxFilterType::class) + ->add('previewPicture', CheckboxFilterType::class, array( 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { if (false === $values['value']) { return; @@ -71,8 +76,9 @@ class EntryFilterType extends AbstractType return $filterQuery->createCondition($expression); }, )) - ->add('language', 'filter_choice', array( - 'choices' => $this->repository->findDistinctLanguageByUser($this->user->getId()), + ->add('language', ChoiceFilterType::class, array( + 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())), + 'choices_as_values' => true, )) ; } 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 'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')), )) ->add('new_password', RepeatedType::class, array( - 'type' => 'password', + 'type' => PasswordType::class, 'invalid_message' => 'The password fields must match.', 'required' => true, '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 )) ->add('items_per_page') ->add('language', ChoiceType::class, array( - 'choices' => $this->languages, + 'choices' => array_flip($this->languages), + 'choices_as_values' => true, )) ->add('save', SubmitType::class) ; 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; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\EmailType; +use Symfony\Component\Form\Extension\Core\Type\PasswordType; use Symfony\Component\Form\Extension\Core\Type\RepeatedType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -18,7 +19,7 @@ class NewUserType extends AbstractType $builder ->add('username', TextType::class, array('required' => true)) ->add('plainPassword', RepeatedType::class, array( - 'type' => 'password', + 'type' => PasswordType::class, 'constraints' => array( new Constraints\Length(array( '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 ; $tagsField = $builder - ->create('tags', 'text') + ->create('tags', TextType::class) ->addModelTransformer(new StringToListTransformer(',')); $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: - %liip_theme.themes% - %wallabag_core.languages% tags: - - { name: form.type, alias: config } - - wallabag_core.form.registration: - class: Wallabag\CoreBundle\Form\Type\RegistrationType - tags: - - { name: form.type, alias: wallabag_user_registration } - - wallabag_core.form.type.forgot_password: - class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType - arguments: - - "@doctrine" - tags: - - { name: form.type, alias: forgot_password } + - { name: form.type } wallabag_core.param_converter.username_rsstoken_converter: class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter @@ -66,13 +54,13 @@ services: # repository as a service wallabag_core.entry_repository: class: Wallabag\CoreBundle\Repository\EntryRepository - factory: [ @doctrine.orm.default_entity_manager, getRepository ] + factory: [ "@doctrine.orm.default_entity_manager", getRepository ] arguments: - WallabagCoreBundle:Entry wallabag_core.tag_repository: class: Wallabag\CoreBundle\Repository\TagRepository - factory: [ @doctrine.orm.default_entity_manager, getRepository ] + factory: [ "@doctrine.orm.default_entity_manager", getRepository ] arguments: - WallabagCoreBundle:Tag 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 @@ {% endfor %} -
+ {{ form_start(form.new_tagging_rule) }} {{ form_errors(form.new_tagging_rule) }}
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 @@ {% block messages %}{% endblock %} {% block content %} - + {{ form_start(form) }}

{% trans %}create an account{% endtrans %}

{% 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 @@ {% trans_default_domain 'FOSUserBundle' %} - +{{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }}
{{ 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 @@ {% trans_default_domain 'FOSUserBundle' %} - +{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
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 @@ {% block fos_user_content %}
- {{ 'resetting.password_already_requested'|trans }} + {{ 'resetting.password_already_requested'|trans }}
{% 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 @@ {% trans_default_domain 'FOSUserBundle' %} - +{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }}
{{ 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 @@ unregister(); $apcLoader->register(true); */ -require_once __DIR__.'/../app/AppKernel.php'; -//require_once __DIR__.'/../app/AppCache.php'; - $kernel = new AppKernel('prod', false); $kernel->loadClassCache(); //$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; use Symfony\Component\Debug\Debug; // If you don't want to setup permissions the proper way, just uncomment the following PHP line -// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information +// read http://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup +// for more information //umask(0000); // 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']) exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); } -$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; +/** + * @var Composer\Autoload\ClassLoader $loader + */ +$loader = require __DIR__.'/../app/autoload.php'; Debug::enable(); -require_once __DIR__.'/../app/AppKernel.php'; - $kernel = new AppKernel('dev', true); $kernel->loadClassCache(); $request = Request::createFromGlobals(); -- 2.41.0