diff --git a/.travis.yml b/.travis.yml index 331b4794d5..d4c935355c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ cache: directories: - $HOME/.composer/cache +env: + global: + - SYMFONY_DEPRECATIONS_HELPER=34 + matrix: finish_fast: true include: @@ -28,7 +32,6 @@ install: if [ "$COMPOSER_CMD" = "install" ]; then composer install --prefer-dist before_script: - app/console doctrine:phpcr:init:dbal --force -e=test - - app/console doctrine:phpcr:workspace:create standard_test -e=test - app/console doctrine:phpcr:repository:init -e=test script: phpunit -c app diff --git a/LICENSE b/LICENSE index f57af7d901..a18cd8aaee 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2015 Symfony CMF +Copyright (c) 2004-2016 Symfony CMF Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/app/AppCache.php b/app/AppCache.php index ddb51db058..639ec2cd7e 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(); diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index ed261498cb..75842ebe18 100644 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -1,5 +1,76 @@ {% extends 'base.html.twig' %} {% block body %} - Homepage. +
+
+
+

Welcome to Symfony {{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }}

+
+ +
+

+ + + Your application is ready to start working on it at: + {{ base_dir }}/ +

+
+ + + +
+
+{% endblock %} + +{% block stylesheets %} + {% endblock %} diff --git a/app/check.php b/app/check.php index 60ae0a8b34..282507f703 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 9cba69ffa6..482ad4ce30 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,20 +3,28 @@ imports: - { resource: security.yml } - { resource: services.yml } +# Put parameters here that don't need to change on each machine where the app is deployed +# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration +parameters: + locale: en + framework: #esi: ~ - #translator: { fallbacks: ["%locale%"] } - secret: "%secret%" + #translator: { fallbacks: ['%locale%'] } + secret: '%secret%' router: - resource: "%kernel.root_dir%/config/routing.yml" + resource: '%kernel.root_dir%/config/routing.yml' strict_requirements: ~ form: ~ csrf_protection: ~ validation: { enable_annotations: true } + serializer: + enabled: true + #enable_annotations: true templating: engines: ['twig'] #assets_version: SomeVersionScheme - default_locale: "%locale%" + default_locale: '%locale%' trusted_hosts: ~ trusted_proxies: ~ session: @@ -24,48 +32,47 @@ framework: handler_id: ~ fragments: ~ http_method_override: true - serializer: true # Twig Configuration twig: - debug: "%kernel.debug%" - strict_variables: "%kernel.debug%" + debug: '%kernel.debug%' + strict_variables: '%kernel.debug%' # Assetic Configuration assetic: - debug: "%kernel.debug%" + debug: '%kernel.debug%' use_controller: false bundles: [CmfCreateBundle] #java: /usr/bin/java filters: cssrewrite: ~ #closure: - # jar: "%kernel.root_dir%/Resources/java/compiler.jar" + # jar: '%kernel.root_dir%/Resources/java/compiler.jar' #yui_css: - # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" + # jar: '%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar' # Doctrine Configuration (needed for Jackalope Doctrine DBAL) doctrine: dbal: - driver: "%database_driver%" - host: "%database_host%" - port: "%database_port%" - dbname: "%database_name%" - user: "%database_user%" - password: "%database_password%" + driver: pdo_sqlite + host: '%database_host%' + port: '%database_port%' + dbname: '%database_name%' + user: '%database_user%' + password: '%database_password%' charset: UTF8 - path: "%database_path%" + path: '%database_path%' # Doctrine PHPCR-ODM configuration doctrine_phpcr: session: - backend: "%phpcr_backend%" - workspace: "%phpcr_workspace%" - username: "%phpcr_user%" - password: "%phpcr_password%" + backend: '%phpcr_backend%' + workspace: '%phpcr_workspace%' + username: '%phpcr_user%' + password: '%phpcr_password%' odm: auto_mapping: true - auto_generate_proxy_classes: "%kernel.debug%" + auto_generate_proxy_classes: '%kernel.debug%' # Jackalope Metadata and Node Cache services doctrine_cache: @@ -87,7 +94,7 @@ cmf_core: cmf_routing: dynamic: templates_by_class: - Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: AcmeDemoBundle:Page:index.html.twig + Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: 'AcmeDemoBundle:Page:index.html.twig' # Menu Configuration knp_menu: @@ -104,8 +111,8 @@ fos_rest: # Swiftmailer Configuration swiftmailer: - transport: "%mailer_transport%" - host: "%mailer_host%" - username: "%mailer_user%" - password: "%mailer_password%" + transport: '%mailer_transport%' + host: '%mailer_host%' + username: '%mailer_user%' + password: '%mailer_password%' spool: { type: memory } diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 10a53473fb..77acd180ae 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -3,44 +3,25 @@ imports: framework: router: - resource: "%kernel.root_dir%/config/routing_dev.yml" + resource: '%kernel.root_dir%/config/routing_dev.yml' strict_requirements: true profiler: { only_exceptions: false } -security: - encoders: - # Don't use it in production - Symfony\Component\Security\Core\User\User: plaintext - providers: - in_memory: - memory: - users: %users% - web_profiler: - toolbar: "%debug_toolbar%" - intercept_redirects: "%debug_redirects%" + toolbar: '%debug_toolbar%' + intercept_redirects: '%debug_redirects%' monolog: handlers: main: - type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" - level: debug + type: stream + path: '%kernel.logs_dir%/%kernel.environment%.log' + level: debug + channels: [!event] console: type: console bubble: false - verbosity_levels: - VERBOSITY_VERBOSE: INFO - VERBOSITY_VERY_VERBOSE: DEBUG - channels: ["!doctrine"] - console_very_verbose: - type: console - bubble: false - verbosity_levels: - VERBOSITY_VERBOSE: NOTICE - VERBOSITY_VERY_VERBOSE: NOTICE - VERBOSITY_DEBUG: DEBUG - channels: ["doctrine"] + channels: [!event, !doctrine] # uncomment to get logging in your browser # you may have to allow bigger header sizes in your Web server configuration #firephp: @@ -51,7 +32,7 @@ monolog: # level: info assetic: - use_controller: "%use_assetic_controller%" + use_controller: '%use_assetic_controller%' #swiftmailer: # delivery_address: me@example.com diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index a835d60a3a..49bfc52728 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -3,7 +3,9 @@ imports: #framework: # validation: -# cache: apc +# cache: validator.mapping.cache.apc +# serializer: +# cache: serializer.mapping.cache.apc #doctrine: # orm: @@ -19,5 +21,5 @@ monolog: handler: nested nested: type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" + path: '%kernel.logs_dir%/%kernel.environment%.log' level: debug diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index b91c8904c7..67a86b52f2 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -1,12 +1,13 @@ -# This file is a "template" of what your parameters.yml file should look like +# This file is a 'template' of what your parameters.yml file should look like +# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production. +# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration parameters: - database_driver: pdo_sqlite database_host: ~ database_port: ~ database_name: ~ database_user: ~ database_password: ~ - database_path: "%kernel.root_dir%/app.sqlite" + database_path: '%kernel.root_dir%/app.sqlite' phpcr_backend: # if you're using Jackalope Doctrine DBAL @@ -34,15 +35,9 @@ parameters: mailer_user: ~ mailer_password: ~ - locale: en - # A secret key that's used to generate certain security-related tokens - secret: ThisTokenIsNotSoSecretChangeIt + secret: ThisTokenIsNotSoSecretChangeIt debug_toolbar: true debug_redirects: false use_assetic_controller: true - users: - admin: - password: admin - roles: ROLE_SUPER_ADMIN diff --git a/app/config/routing.yml b/app/config/routing.yml index 937defac4a..a9a599281f 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,11 +1,11 @@ # AcmeDemoBundle routes (to be removed) _demo: - resource: "@AcmeDemoBundle/Resources/config/routing.yml" + resource: '@AcmeDemoBundle/Resources/config/routing.yml' prefix: /demo _cmf_create: - resource: "@CmfCreateBundle/Resources/config/routing/rest.xml" + resource: '@CmfCreateBundle/Resources/config/routing/rest.xml' app: - resource: "@AppBundle/Controller/" + resource: '@AppBundle/Controller/' type: annotation diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 0f0afb615c..d4528251a2 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -1,17 +1,13 @@ _wdt: - resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" + resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' prefix: /_wdt _profiler: - resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" + 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" + resource: '@TwigBundle/Resources/config/routing/errors.xml' prefix: /_error _main: diff --git a/app/config/security.yml b/app/config/security.yml index 68cbf9ea03..a41b08841d 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,18 +1,40 @@ +# To get started with security, check out the documentation: +# http://symfony.com/doc/current/book/security.html security: + + # http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers providers: in_memory: - memory: ~ + memory: + users: + # Only for demo purposes. Of course, use a more + # secure password on production. + admin: + password: admin + roles: ROLE_SUPER_ADMIN + + # *NEVER* store passwords as plaintext in production, this is purely for + # demo purposes. + # http://symfony.com/doc/current/book/security#c-encoding-the-user-s-password + encoders: + Symfony\Component\Security\Core\User\User: plaintext firewalls: + # disables authentication for assets and the profiler, adapt it according to your needs dev: - pattern: ^/(_(profiler|wdt|error)|css|images|js)/ + pattern: ^/(_(profiler|wdt)|css|images|js)/ security: false - default: + main: + # activate different ways to authenticate + anonymous: ~ + logout: path: /demo/logout target: / + + # http://symfony.com/doc/current/cookbook/security/form_login_setup.html form_login: login_path: /demo/login check_path: /demo/login_check diff --git a/app/config/services.yml b/app/config/services.yml index 5c76fc5988..6295103fb7 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -6,4 +6,4 @@ parameters: services: # service_name: # class: AppBundle\Directory\ClassName -# arguments: ["@another_service_name", "plain_value", "%parameter_name%"] +# arguments: ['@another_service_name', 'plain_value', '%parameter_name%'] diff --git a/app/console b/app/console index fa6a36e249..3b4c367c98 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/app/phpunit.xml.dist b/app/phpunit.xml.dist index 2b41503b75..752acdce55 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -5,8 +5,12 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" backupGlobals="false" colors="true" - bootstrap="bootstrap.php.cache" + bootstrap="autoload.php" > + + + + ../src/*/*Bundle/Tests diff --git a/composer.json b/composer.json index 7bebb65924..cc03b49043 100644 --- a/composer.json +++ b/composer.json @@ -11,19 +11,20 @@ } ], "autoload": { - "psr-0": { "": "src/", "SymfonyStandard": "app/" } + "psr-4": { "": "src/" }, + "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, "minimum-stability": "dev", "prefer-stable": true, "require": { "php": "^5.3.9|^7.0", - "symfony/symfony": "~2.6", - "doctrine/orm": "~2.2,>=2.2.3,<2.5", - "doctrine/dbal": "<2.5", - "doctrine/doctrine-bundle": "~1.2", + "symfony/symfony": "~2.8", + "doctrine/orm": "^2.4.8", + "doctrine/doctrine-bundle": "~1.4", "doctrine/data-fixtures": "~1.0", "doctrine/doctrine-cache-bundle": "~1.0", "twig/extensions": "~1.0", + "sensio/framework-extra-bundle": "^3.0.2", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", @@ -35,15 +36,12 @@ }, "require-dev": { "liip/functional-test-bundle": "~1.0", - "sensio/generator-bundle": "~2.3", - "sensio/distribution-bundle": "~3.0,>=3.0.12", - "sensio/framework-extra-bundle": "~3.0,>=3.0.2", - "incenteev/composer-parameter-handler": "~2.0" + "sensio/generator-bundle": "~3.0", + "sensio/distribution-bundle": "~5.0", + "incenteev/composer-parameter-handler": "~2.0", + "symfony/phpunit-bridge": "~2.7" }, "scripts": { - "post-root-package-install": [ - "SymfonyStandard\\Composer::hookRootPackageInstall" - ], "post-install-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreateAndCkeditor", @@ -51,7 +49,6 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ], "post-update-cmd": [ @@ -61,7 +58,6 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ] }, diff --git a/composer.lock b/composer.lock index b1fde02d10..a2cf486bbd 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": "a1a1f7da9305a368e85e802a654118e2", - "content-hash": "c811557a16500689e9afbfecfb3d92ca", + "hash": "0ebb640eac295c39663e6a06ba073df4", + "content-hash": "280eb0af5274047cb57823eba6991d9c", "packages": [ { "name": "cocur/slugify", @@ -406,30 +406,38 @@ }, { "name": "doctrine/dbal", - "version": "v2.4.5", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "5a1f4bf34d61d997ccd9f0539fbc14c7a772aa16" + "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/5a1f4bf34d61d997ccd9f0539fbc14c7a772aa16", - "reference": "5a1f4bf34d61d997ccd9f0539fbc14c7a772aa16", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769", + "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769", "shasum": "" }, "require": { - "doctrine/common": "~2.4", + "doctrine/common": ">=2.4,<2.7-dev", "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "3.7.*", - "symfony/console": "~2.0" + "phpunit/phpunit": "4.*", + "symfony/console": "2.*" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." }, + "bin": [ + "bin/doctrine-dbal" + ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\DBAL\\": "lib/" @@ -465,7 +473,7 @@ "persistence", "queryobject" ], - "time": "2016-01-05 22:18:20" + "time": "2016-01-05 22:11:12" }, { "name": "doctrine/doctrine-bundle", @@ -547,16 +555,16 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" + "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", - "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/18c600a9b82f6454d2e81ca4957cdd56a1cf3504", + "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504", "shasum": "" }, "require": { @@ -570,6 +578,7 @@ "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", "phpunit/phpunit": "~4", + "predis/predis": "~0.8", "satooshi/php-coveralls": "~0.6.1", "squizlabs/php_codesniffer": "~1.5", "symfony/console": "~2.2|~3.0", @@ -630,7 +639,7 @@ "cache", "caching" ], - "time": "2015-11-27 04:59:07" + "time": "2016-01-26 17:28:51" }, { "name": "doctrine/inflector", @@ -809,28 +818,31 @@ }, { "name": "doctrine/orm", - "version": "v2.4.8", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "5aedac1e5c5caaeac14798822c70325dc242d467" + "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/5aedac1e5c5caaeac14798822c70325dc242d467", - "reference": "5aedac1e5c5caaeac14798822c70325dc242d467", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab", + "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab", "shasum": "" }, "require": { - "doctrine/collections": "~1.1", - "doctrine/dbal": "~2.4", + "doctrine/cache": "~1.4", + "doctrine/collections": "~1.2", + "doctrine/common": ">=2.5-dev,<2.7-dev", + "doctrine/dbal": ">=2.5-dev,<2.6-dev", + "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", - "php": ">=5.3.2", - "symfony/console": "~2.0" + "php": ">=5.4", + "symfony/console": "~2.5|~3.0" }, "require-dev": { - "satooshi/php-coveralls": "dev-master", - "symfony/yaml": "~2.1" + "phpunit/phpunit": "~4.0", + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -842,7 +854,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -878,7 +890,7 @@ "database", "orm" ], - "time": "2015-08-31 13:19:01" + "time": "2016-01-05 21:34:58" }, { "name": "doctrine/phpcr-bundle", @@ -1386,16 +1398,16 @@ }, { "name": "knplabs/knp-menu", - "version": "v2.1.0", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenu.git", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8" + "reference": "9917b999a3c3d3901386d60c4888b07679291031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/c6ad49933babd06a27b2f962a3469601ec9038b8", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8", + "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/9917b999a3c3d3901386d60c4888b07679291031", + "reference": "9917b999a3c3d3901386d60c4888b07679291031", "shasum": "" }, "require": { @@ -1404,7 +1416,8 @@ "require-dev": { "pimple/pimple": "~1.0", "silex/silex": "~1.0", - "symfony/phpunit-bridge": "~2.7", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/routing": "~2.3|~3.0", "twig/twig": "~1.16|~2.0" }, "suggest": { @@ -1447,7 +1460,7 @@ "menu", "tree" ], - "time": "2015-09-20 08:23:47" + "time": "2016-01-08 15:42:54" }, { "name": "knplabs/knp-menu-bundle", @@ -1766,16 +1779,16 @@ }, { "name": "paragonie/random_compat", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7" + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/e6f80ab77885151908d0ec743689ca700886e8b0", + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0", "shasum": "" }, "require": { @@ -1810,7 +1823,7 @@ "pseudorandom", "random" ], - "time": "2016-01-06 13:31:20" + "time": "2016-01-29 16:19:52" }, { "name": "phpcr/phpcr", @@ -1976,6 +1989,61 @@ ], "time": "2012-12-21 11:40:51" }, + { + "name": "sensio/framework-extra-bundle", + "version": "v3.0.12", + "source": { + "type": "git", + "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3e8936fe13aa4086644977d334d8fcd275f50357", + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357", + "shasum": "" + }, + "require": { + "doctrine/common": "~2.2", + "symfony/framework-bundle": "~2.3|~3.0" + }, + "require-dev": { + "symfony/expression-language": "~2.4|~3.0", + "symfony/security-bundle": "~2.4|~3.0" + }, + "suggest": { + "symfony/expression-language": "", + "symfony/psr-http-message-bridge": "To use the PSR-7 converters", + "symfony/security-bundle": "" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sensio\\Bundle\\FrameworkExtraBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle provides a way to configure your controllers with annotations", + "keywords": [ + "annotations", + "controllers" + ], + "time": "2015-12-18 17:39:27" + }, { "name": "sonata-project/block-bundle", "version": "2.2.13", @@ -2295,16 +2363,16 @@ }, { "name": "symfony-cmf/content-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/ContentBundle.git", - "reference": "68dd570ee098f35b8bfabcba3591099eab7d29e6" + "reference": "431b035c22a00b3d9610dc3a037691a78c2b9197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/68dd570ee098f35b8bfabcba3591099eab7d29e6", - "reference": "68dd570ee098f35b8bfabcba3591099eab7d29e6", + "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/431b035c22a00b3d9610dc3a037691a78c2b9197", + "reference": "431b035c22a00b3d9610dc3a037691a78c2b9197", "shasum": "" }, "require": { @@ -2316,15 +2384,15 @@ }, "require-dev": { "sonata-project/doctrine-phpcr-admin-bundle": "^1.1", - "symfony-cmf/testing": "^1.3", + "symfony-cmf/testing": "^1.3@dev", "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", "symfony/monolog-bundle": "^2.3" }, "suggest": { "doctrine/phpcr-bundle": "To integrate PHPCR-ODM with Symfony", "doctrine/phpcr-odm": "To persist content with the PHP content repository", + "egeloen/ckeditor-bundle": "to provide a CKEditor in the admin interface", "friendsofsymfony/rest-bundle": "Improved handling for different output formats", - "ivory/ckeditor-bundle": "to provide a CKEditor in the admin interface", "sonata-project/doctrine-phpcr-admin-bundle": "To provide admin interfaces for the content (^1.1)" }, "type": "symfony-bundle", @@ -2353,42 +2421,44 @@ "keywords": [ "Symfony CMF" ], - "time": "2016-01-05 07:39:42" + "time": "2016-01-24 17:20:14" }, { "name": "symfony-cmf/core-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/CoreBundle.git", - "reference": "b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69" + "reference": "6d608febc5f37df61fa155b5d54a555d01fa5119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69", - "reference": "b1c6d6bfe6ef51b087fa489fa1d63c5e8e3d4e69", + "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/6d608febc5f37df61fa155b5d54a555d01fa5119", + "reference": "6d608febc5f37df61fa155b5d54a555d01fa5119", "shasum": "" }, "require": { "php": "^5.3.9|^7.0", - "symfony/framework-bundle": "~2.3" + "symfony-cmf/slugifier-api": "^1.0@dev", + "symfony/framework-bundle": "^2.3" }, "require-dev": { "doctrine/dbal": "2.5.*", - "mockery/mockery": "~0.9.4", - "sonata-project/admin-bundle": "~2.2", - "symfony-cmf/routing-bundle": "~1.2,>=1.2.0-RC3", - "symfony-cmf/testing": "~1.2,>=1.2.6", - "symfony/security-bundle": "~2.1" + "mockery/mockery": "^0.9.4", + "sonata-project/admin-bundle": "^2.2", + "symfony-cmf/routing-bundle": "^1.2.0-RC3", + "symfony-cmf/testing": "^1.3@dev", + "symfony/security-bundle": "^2.1" }, "suggest": { - "doctrine/phpcr-bundle": "To be able to use the CMF twig extension, ~1.0", - "doctrine/phpcr-odm": "To be able to use the CMF twig extension, ~1.0", - "sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension, ~2.2", - "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable, ~1.0", - "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener, ~1.0", - "symfony/security-bundle": "To be able to use the publish workflow system, ~2.1", - "symfony/twig-bundle": "To get access to the CMF twig extension, ~2.1" + "doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)", + "doctrine/phpcr-odm": "To be able to use the CMF twig extension (^1.0)", + "sonata-project/admin-bundle": "To be able to enable the publish_workflow_listener extension (^2.2)", + "sonata-project/translation-bundle": "To be able to edit translatable documents (^1.0)", + "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^1.2)", + "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^1.2)", + "symfony/security-bundle": "To be able to use the publish workflow system (^2.1)", + "symfony/twig-bundle": "To get access to the CMF twig extension (^2.1)" }, "type": "symfony-bundle", "extra": { @@ -2416,7 +2486,7 @@ "keywords": [ "Symfony CMF" ], - "time": "2016-01-05 07:38:41" + "time": "2016-02-01 12:09:30" }, { "name": "symfony-cmf/create-bundle", @@ -2482,12 +2552,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/MediaBundle.git", - "reference": "c0700b90b47210cd4696c1d29232d444b4f89a43" + "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/c0700b90b47210cd4696c1d29232d444b4f89a43", - "reference": "c0700b90b47210cd4696c1d29232d444b4f89a43", + "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/7593e35baa26661a3230a7e13dbfb783f3df055c", + "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c", "shasum": "" }, "require": { @@ -2539,20 +2609,20 @@ "image", "media" ], - "time": "2016-01-05 07:43:01" + "time": "2016-02-03 12:37:12" }, { "name": "symfony-cmf/menu-bundle", - "version": "dev-master", + "version": "2.0.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/MenuBundle.git", - "reference": "ee6ace86d753b346ff3526abde59a1f26f7c4ec6" + "reference": "c391535555e4a794501d14c5aa137a8e9a4f1aa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/ee6ace86d753b346ff3526abde59a1f26f7c4ec6", - "reference": "ee6ace86d753b346ff3526abde59a1f26f7c4ec6", + "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/c391535555e4a794501d14c5aa137a8e9a4f1aa4", + "reference": "c391535555e4a794501d14c5aa137a8e9a4f1aa4", "shasum": "" }, "require": { @@ -2573,7 +2643,7 @@ "symfony-cmf/testing": "^1.3@dev", "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", "symfony/monolog-bundle": "^2.3", - "twig/twig": "^1.12.1" + "twig/twig": "^1.18" }, "suggest": { "burgov/key-value-form-bundle": "if you want to edit the advanced options on the node with the menu options extension", @@ -2606,7 +2676,7 @@ "Symfony CMF", "menu" ], - "time": "2016-01-03 16:34:28" + "time": "2016-01-23 15:44:42" }, { "name": "symfony-cmf/routing", @@ -2667,16 +2737,16 @@ }, { "name": "symfony-cmf/routing-bundle", - "version": "dev-master", + "version": "1.4.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingBundle.git", - "reference": "9c746de8a4af393d418977d9b31fc0c0e2206ce1" + "reference": "827703c49b81dd34833aca8b493ab717a38e5afa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/9c746de8a4af393d418977d9b31fc0c0e2206ce1", - "reference": "9c746de8a4af393d418977d9b31fc0c0e2206ce1", + "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/827703c49b81dd34833aca8b493ab717a38e5afa", + "reference": "827703c49b81dd34833aca8b493ab717a38e5afa", "shasum": "" }, "require": { @@ -2731,7 +2801,7 @@ "database", "routing" ], - "time": "2015-12-29 19:47:17" + "time": "2016-01-21 16:20:40" }, { "name": "symfony-cmf/simple-cms-bundle", @@ -2804,6 +2874,52 @@ ], "time": "2016-01-05 07:41:39" }, + { + "name": "symfony-cmf/slugifier-api", + "version": "1.0.0-RC1", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/slugifier-api.git", + "reference": "960f8d312e2fdff1bbb73f2b154989f0091b5596" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony-cmf/slugifier-api/zipball/960f8d312e2fdff1bbb73f2b154989f0091b5596", + "reference": "960f8d312e2fdff1bbb73f2b154989f0091b5596", + "shasum": "" + }, + "require": { + "php": "^5.3.9|^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Cmf\\Api\\Slugifier\\": "", + "Symfony\\Cmf\\Bundle\\CoreBundle\\Slugifier\\": "CoreBundle" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/RoutingBundle/contributors" + } + ], + "description": "Provides a basic slugifier interface", + "homepage": "http://cmf.symfony.com", + "keywords": [ + "slugify" + ], + "time": "2016-02-01 11:26:43" + }, { "name": "symfony-cmf/symfony-cmf", "version": "dev-master", @@ -2995,16 +3111,16 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "2deb44160e1c886241c06602b12b98779f728177" + "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2deb44160e1c886241c06602b12b98779f728177", - "reference": "2deb44160e1c886241c06602b12b98779f728177", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66b0bb4abda229bc073eff6bbc8f2685bdaac165", + "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165", "shasum": "" }, "require": { @@ -3014,7 +3130,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3046,20 +3162,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" + "reference": "1289d16209491b584839022f29257ad859b8532d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", "shasum": "" }, "require": { @@ -3071,7 +3187,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3105,20 +3221,20 @@ "portable", "shim" ], - "time": "2015-11-20 09:19:13" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php54", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc" + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", - "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054", + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054", "shasum": "" }, "require": { @@ -3127,7 +3243,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3163,20 +3279,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php55", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47" + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47", - "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", "shasum": "" }, "require": { @@ -3186,7 +3302,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3219,20 +3335,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php56", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" + "reference": "4d891fff050101a53a4caabb03277284942d1ad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", + "reference": "4d891fff050101a53a4caabb03277284942d1ad9", "shasum": "" }, "require": { @@ -3242,7 +3358,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3275,20 +3391,20 @@ "portable", "shim" ], - "time": "2015-12-18 15:10:25" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php70", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146" + "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", - "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/8428ceddbbaf102f2906769a8ef2438220c5cb95", + "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95", "shasum": "" }, "require": { @@ -3298,7 +3414,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3334,20 +3450,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-25 08:44:42" }, { "name": "symfony/polyfill-util", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969" + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", "shasum": "" }, "require": { @@ -3356,7 +3472,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3386,7 +3502,7 @@ "polyfill", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/security-acl", @@ -3451,16 +3567,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.9", + "version": "v2.3.11", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78" + "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", - "reference": "3d21ada19f23631f558ad6df653b168e35362e78", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/5e1a90f28213231ceee19c953bbebc5b5b95c690", + "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690", "shasum": "" }, "require": { @@ -3504,20 +3620,20 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2015-11-28 10:59:29" + "time": "2016-01-15 16:41:20" }, { "name": "symfony/symfony", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09" + "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/8956ed50a44c5c4e02f2176c0773e24487477b09", - "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09", + "url": "https://api.github.com/repos/symfony/symfony/zipball/f3e6a82bcbea4db3b56df08e491e20a1faae82b5", + "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5", "shasum": "" }, "require": { @@ -3637,7 +3753,7 @@ "keywords": [ "framework" ], - "time": "2015-12-26 15:56:52" + "time": "2016-01-14 12:01:11" }, { "name": "twig/extensions", @@ -3693,16 +3809,16 @@ }, { "name": "twig/twig", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", - "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", + "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8", "shasum": "" }, "require": { @@ -3715,7 +3831,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.23-dev" + "dev-master": "1.24-dev" } }, "autoload": { @@ -3750,7 +3866,7 @@ "keywords": [ "templating" ], - "time": "2015-11-05 12:49:06" + "time": "2016-01-25 21:22:18" }, { "name": "willdurand/jsonp-callback-validator", @@ -3896,35 +4012,45 @@ }, { "name": "liip/functional-test-bundle", - "version": "1.3.4", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/liip/LiipFunctionalTestBundle.git", - "reference": "0981fc0a18678b50a53410496239b602dc5a355b" + "reference": "1382ed3a04efa777084e6112c02a9ccd23901325" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/0981fc0a18678b50a53410496239b602dc5a355b", - "reference": "0981fc0a18678b50a53410496239b602dc5a355b", + "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/1382ed3a04efa777084e6112c02a9ccd23901325", + "reference": "1382ed3a04efa777084e6112c02a9ccd23901325", "shasum": "" }, "require": { "doctrine/common": "~2.0", "php": "^5.3.9|^7.0", "symfony/browser-kit": "~2.3|~3.0", - "symfony/framework-bundle": "~2.3|~3.0", - "symfony/validator": "~2.5|~3.0" + "symfony/framework-bundle": "2.3.*|~2.7|~3.0" + }, + "require-dev": { + "doctrine/doctrine-fixtures-bundle": "~2.3", + "doctrine/orm": "^2.4.8", + "nelmio/alice": "~1.7|~2.0", + "phpunit/phpunit": "4.8.*|5.1.*", + "symfony/assetic-bundle": "~2.3", + "symfony/monolog-bundle": "~2.4", + "symfony/symfony": "~2.3.1|~2.7|~3.0", + "twig/twig": "~1.12" }, "suggest": { "doctrine/dbal": "Required when using the fixture loading functionality with an ORM and SQLite", "doctrine/doctrine-fixtures-bundle": "Required when using the fixture loading functionality", "doctrine/orm": "Required when using the fixture loading functionality with an ORM and SQLite", - "nelmio/alice": "Required when using loadFixtureFiles functionality" + "nelmio/alice": "Required when using loadFixtureFiles functionality", + "symfony/framework-bundle": "To use assertStatusCode and assertValidationErrors ~2.5" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -3950,49 +4076,41 @@ "keywords": [ "Symfony2" ], - "time": "2015-12-28 19:04:56" + "time": "2016-02-02 21:30:21" }, { "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/", @@ -4010,34 +4128,32 @@ "configuration", "distribution" ], - "time": "2015-11-26 18:10:17" + "time": "2015-12-18 17:44:11" }, { - "name": "sensio/framework-extra-bundle", - "version": "v3.0.12", + "name": "sensio/generator-bundle", + "version": "v3.0.5", "source": { "type": "git", - "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "3e8936fe13aa4086644977d334d8fcd275f50357" + "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", + "reference": "5274eafa251359087230bade2ff35dd6cec2e530" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3e8936fe13aa4086644977d334d8fcd275f50357", - "reference": "3e8936fe13aa4086644977d334d8fcd275f50357", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/5274eafa251359087230bade2ff35dd6cec2e530", + "reference": "5274eafa251359087230bade2ff35dd6cec2e530", "shasum": "" }, "require": { - "doctrine/common": "~2.2", - "symfony/framework-bundle": "~2.3|~3.0" + "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": { - "symfony/expression-language": "~2.4|~3.0", - "symfony/security-bundle": "~2.4|~3.0" - }, - "suggest": { - "symfony/expression-language": "", - "symfony/psr-http-message-bridge": "To use the PSR-7 converters", - "symfony/security-bundle": "" + "doctrine/orm": "~2.4", + "symfony/doctrine-bridge": "~2.7|~3.0", + "twig/twig": "~1.18" }, "type": "symfony-bundle", "extra": { @@ -4047,8 +4163,11 @@ }, "autoload": { "psr-4": { - "Sensio\\Bundle\\FrameworkExtraBundle\\": "" - } + "Sensio\\Bundle\\GeneratorBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4060,46 +4179,38 @@ "email": "fabien@symfony.com" } ], - "description": "This bundle provides a way to configure your controllers with annotations", - "keywords": [ - "annotations", - "controllers" - ], - "time": "2015-12-18 17:39:27" + "description": "This bundle generates code for you", + "time": "2016-01-05 16:30:36" }, { - "name": "sensio/generator-bundle", - "version": "v2.5.3", - "target-dir": "Sensio/Bundle/GeneratorBundle", + "name": "sensiolabs/security-checker", + "version": "v3.0.2", "source": { "type": "git", - "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3" + "url": "https://github.com/sensiolabs/security-checker.git", + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3", - "reference": "e50108c2133ee5c9c484555faed50c17a61221d3", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93", + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93", "shasum": "" }, "require": { - "symfony/console": "~2.5", - "symfony/framework-bundle": "~2.2" - }, - "require-dev": { - "doctrine/orm": "~2.2,>=2.2.3", - "symfony/doctrine-bridge": "~2.2", - "twig/twig": "~1.11" + "symfony/console": "~2.0|~3.0" }, - "type": "symfony-bundle", + "bin": [ + "security-checker" + ], + "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-0": { - "Sensio\\Bundle\\GeneratorBundle": "" + "SensioLabs\\Security": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -4109,42 +4220,48 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien.potencier@gmail.com" } ], - "description": "This bundle generates code for you", - "time": "2015-03-17 06:36:52" + "description": "A security checker for your composer.lock", + "time": "2015-11-07 08:07:40" }, { - "name": "sensiolabs/security-checker", - "version": "v3.0.2", + "name": "symfony/phpunit-bridge", + "version": "v2.8.2", "source": { "type": "git", - "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93" + "url": "https://github.com/symfony/phpunit-bridge.git", + "reference": "855dc0e829fad123966347612b4183e307338c11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93", - "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/855dc0e829fad123966347612b4183e307338c11", + "reference": "855dc0e829fad123966347612b4183e307338c11", "shasum": "" }, "require": { - "symfony/console": "~2.0|~3.0" + "php": ">=5.3.3" }, - "bin": [ - "security-checker" - ], - "type": "library", + "suggest": { + "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" + }, + "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { - "SensioLabs\\Security": "" - } + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Bridge\\PhpUnit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4152,12 +4269,17 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien.potencier@gmail.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A security checker for your composer.lock", - "time": "2015-11-07 08:07:40" + "description": "Symfony PHPUnit Bridge", + "homepage": "https://symfony.com", + "time": "2016-01-06 09:59:23" } ], "aliases": [], diff --git a/src/Acme/DemoBundle/Controller/SecurityController.php b/src/Acme/DemoBundle/Controller/SecurityController.php index a51d711521..54c607ed17 100644 --- a/src/Acme/DemoBundle/Controller/SecurityController.php +++ b/src/Acme/DemoBundle/Controller/SecurityController.php @@ -2,29 +2,21 @@ namespace Acme\DemoBundle\Controller; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\SecurityContext; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; class SecurityController extends Controller { /** * @Route("/login", name="_demo_login") - * @Template */ - public function loginAction(Request $request) + public function loginAction() { - if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) { - $error = $request->attributes->get(SecurityContext::AUTHENTICATION_ERROR); - } else { - $error = $request->getSession()->get(SecurityContext::AUTHENTICATION_ERROR); - } + $authenticationUtils = $this->get('security.authentication_utils'); - return array( - 'last_username' => $request->getSession()->get(SecurityContext::LAST_USERNAME), - 'error' => $error, - ); + return $this->render('AppBundle:Security:login.html.twig', array( + 'last_username' => $authenticationUtils->getLastUsername(), + 'error' => $authenticationUtils->getLastAuthenticationError(), + )); } } diff --git a/src/Acme/DemoBundle/Resources/data/blocks.yml b/src/Acme/DemoBundle/Resources/data/blocks.yml index cf8aa927bf..54e86b92f4 100644 --- a/src/Acme/DemoBundle/Resources/data/blocks.yml +++ b/src/Acme/DemoBundle/Resources/data/blocks.yml @@ -9,12 +9,6 @@ Acme\DemoBundle\Document\UnitBlock: url: http://symfony.com/doc/current/cmf/quick_tour/the_big_picture.html image: bundles/acmedemo/images/welcome-quick-tour.gif - configure: - id: /cms/content/blocks/hero_unit/configure - text: Configure - route: _configurator_home - image: bundles/acmedemo/images/welcome-configure.gif - demo: id: /cms/content/blocks/hero_unit/demo text: View the demo diff --git a/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig b/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig index 8c33909f7b..eb9d8ce79d 100644 --- a/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig @@ -2,14 +2,14 @@ {% macro attributes(attributes) %} {% for name, value in attributes %} - {%- if value is not none and value is not sameas(false) -%} - {{- ' %s="%s"'|format(name, value is sameas(true) ? name|e : value|e)|raw -}} + {%- if value is not none and value is not same as(false) -%} + {{- ' %s="%s"'|format(name, value is same as(true) ? name|e : value|e)|raw -}} {%- endif -%} {%- endfor -%} {% endmacro %} {% block list %} - {% if item.hasChildren and options.depth is not sameas(0) and item.displayChildren %} + {% if item.hasChildren and options.depth is not same as(0) and item.displayChildren %} {{ block('children') }} diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 1b26f22388..7aa955a779 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -11,7 +11,7 @@ {% endblock %} {# CreateJS is only available for admins by default #} - {% if app.security is not null and is_granted('ROLE_ADMIN') %} + {% if app.user and is_granted('ROLE_ADMIN') %} {% include "CmfCreateBundle::includecssfiles.html.twig" %} {% endif %} @@ -34,6 +34,6 @@ {% block main %}{% endblock %} - {% render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) %} + {{ render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) }} diff --git a/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php b/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php index 7664a0876b..6683fc8e37 100644 --- a/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php +++ b/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php @@ -11,7 +11,7 @@ public function testHomePage() $client = $this->createClient(); $crawler = $client->request('GET', '/'); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertEquals(200, $client->getResponse()->getStatusCode(), $crawler->html()); $title = 'Welcome!'; $this->assertCount(1, $crawler->filter(sprintf('h1:contains("%s")', $title)), 'Page does not contain an h1 tag with: '.$title); diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index 541a768838..a37c53a819 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -7,11 +7,4 @@ class DefaultController extends Controller { - /** - * @Route("/app/example", name="homepage") - */ - public function indexAction() - { - return $this->render('default/index.html.twig'); - } } diff --git a/src/AppBundle/Tests/Controller/DefaultControllerTest.php b/src/AppBundle/Tests/Controller/DefaultControllerTest.php deleted file mode 100644 index f35af7522f..0000000000 --- a/src/AppBundle/Tests/Controller/DefaultControllerTest.php +++ /dev/null @@ -1,18 +0,0 @@ -request('GET', '/app/example'); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertTrue($crawler->filter('html:contains("Homepage")')->count() > 0); - } -} diff --git a/web/.htaccess b/web/.htaccess index 94b38929ed..207f78eecc 100644 --- a/web/.htaccess +++ b/web/.htaccess @@ -5,6 +5,12 @@ # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). DirectoryIndex app.php +# By default, Apache does not evaluate symbolic links if you did not enable this +# feature in your server configuration. Uncomment the following line if you +# install assets as symlinks or if you experience problems related to symlinks +# when compiling LESS/Sass/CoffeScript assets. +# Options FollowSymlinks + # Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve # to the front controller "/app.php" but be rewritten to "/app.php/app". diff --git a/web/app.php b/web/app.php index c5c2640906..cc2fefb556 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 e0279c2aeb..635bf7ac7b 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -4,7 +4,8 @@ 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 @@ 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(); diff --git a/web/config.php b/web/config.php index 162acfc7b2..2e153097b1 100644 --- a/web/config.php +++ b/web/config.php @@ -1,5 +1,15 @@ - Symfony Configuration + Symfony Configuration Checker - +
@@ -62,11 +148,10 @@
-

Welcome!

-

Welcome to your new Symfony project.

+

Configuration Checker

- This script will guide you through the basic configuration of your project. - You can also do the same by editing the ‘app/config/parameters.yml’ file directly. + This script analyzes your system to check whether is + ready to run Symfony applications.

@@ -103,14 +188,10 @@ -

Your configuration looks good to run Symfony.

+

All checks passed successfully. Your system is ready to run Symfony applications.