This PR was merged into the 2.0.x-dev branch.

Discussion
----------

Added support for callables in CallbackResolver

Added the ability for the callback resolver to support any callable instead
of just the object and method callable type.

An alternate implementation to this would be to update the CallbackResolver to use an interface, then keep the old CallbackResolver as is and just add a new implementation that you can change if you'd like. I'd probably prefer to do the interface, but depends on what people think.

This fixes #1327
Signed-off-by: RJ Garcia <rj@bighead.net>

Commits
-------

65afac9f Added support for callables in CallbackResolver

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

Fixed Session Service Provider registry

The service provider was registering the wrong parameters
to the session listener instead of the actual session class

This fixes #1342
Signed-off-by: RJ Garcia <rj@bighead.net>

Commits
-------

cecdb85e Fixed Session Service Provider registry

The service provider was registering the wrong parameters
to the session listener instead of the actual session class
Signed-off-by: RJ Garcia <rj@bighead.net>

- Added the ability for the callback resolver to support any callable instead
of just the object and method callable type.
- Updated the service_controller documentation to note about all callables
Signed-off-by: RJ Garcia <rj@bighead.net>

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

Clarify purpose of BootableServiceProvider

`BootableServiceProvider` has an outdated description.  This PR brings the comment into line with the rest of the interfaces in `Silex\Api`

Commits
-------

4e1ca0c7 Clarify purpose of BootableServiceProvider

`BootableServiceProvider` has an outdated description.  This PR brings the comment into line with the rest of the interfaces in `Silex\Api`

* 1.3:
  tweaked previous merge
  [WIP] Mention use of controller() function in docs

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

added route conditions

fixes #1334

Commits
-------

e0b5c888 added route conditions

This PR was squashed before being merged into the 1.3 branch (closes #1288).

Discussion
----------

[WIP] Mention use of controller() function in docs

This was discussed on twitter before:

https://twitter.com/lsmith/status/669145035770851328

Commits
-------

9c6b02d6 [WIP] Mention use of controller() function in docs

* 1.3:
  Remove slash from FallbackResource

This PR was merged into the 1.3 branch.

Discussion
----------

Remove slash from FallbackResource

Apache config is not my thing, so this might not be correct. However, what I can tell is that it does not work with the slash for me, and that it does without the slash.

Commits
-------

ffab90c3 Remove slash from FallbackResource

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

Address bc changes from Symfony 2.8 to Symfony 3

Ref: https://github.com/silexphp/Silex/issues/1302

How is pre-Symfony3 documentation handled?  Is that a separate page or should notes on pre-Symfony3 usage be included on this page?

Commits
-------

b29c33f5 Address bc changes from Symfony 2.8 to Symfony 3

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

removed support for Symfony 2.7 in Silex 2.0

As 2.8 is a LTS and compatible with 3.0, it's going to be much easier to maintain both the code and the documentation for Silex 2.0 if we drop support for Symfony 2.7.

Commits
-------

155cb751 removed support for Symfony 2.7

This PR was squashed before being merged into the 2.0.x-dev branch (closes #1324).

Discussion
----------

Added test for access rule path array

Related to PR #1310 Also fixed default value for 5th argument passed to RequestMatcher
constructor.

Commits
-------

5a9516ed Added test for access rule path array

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

encode documentation exemple password with password_hash

update documentation hashed password to match the default password encoder because the old hash is not valid with the bcrypt encoder

see #1320

Commits
-------

b6db6b38 encode documentation exemple password with password_hash

bug #1332 Fixing TwigServiceProvider when used with FormServiceProvider but without CsrfServiceProvider (skalpa)

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

Fixing TwigServiceProvider when used with FormServiceProvider but without CsrfServiceProvider

Trivial fix for #1331, with test.

Commits
-------

cd682f5f Changing the declaration of twig.form.render to ensure it won't choke if CsrfServiceProvider is not used.

* 1.3:
  fixed typo
  s/middlewares/middleware

This PR was submitted for the master branch but it was merged into the 1.3 branch instead (closes #1285).

Discussion
----------

s/middlewares/middleware

Feel free to discard this PR,
but reading 'Middlewares' with an 's' feels jarring to me,
I never saw it written this way before.

For uses without the 's' see :
http://english.stackexchange.com/questions/257120/middleware-vs-middlewares
https://en.wikipedia.org/wiki/Middleware
http://expressjs.com/guide/using-middleware.html

I did find uses of 'middlewares' in these pages, so, again, feel free to discard :
http://guides.rubyonrails.org/rails_on_rack.html
https://blog.engineyard.com/2015/understanding-rack-apps-and-middleware

But for example it appears just twice with an 's' in this stack overflow page, and many more times without the 's' :
http://stackoverflow.com/questions/2256569/what-is-rack-middleware

Commits
-------

06374dc8 s/middlewares/middleware

This PR was squashed before being merged into the 2.0.x-dev branch (closes #1296).

Discussion
----------

Add support for the Guard component to the SecurityServiceProvider

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #1260
| License       | MIT
| Doc PR        | included

Services configuration are extracted from the SecurityBundle [`guard.xml`](https://github.com/symfony/symfony/blob/3.0/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml) and [`GuardAuthenticationFactory`](https://github.com/symfony/symfony/blob/3.0/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php)

Usage is quite simple, the `guard` type can be configured in the firewall like other ones.

```php
$app['app.authenticator'] = function ($app) {
    return new Authenticator();
};

$app->register(new Silex\Provider\SecurityServiceProvider(), [
    'security.firewalls' => [
        'main' => [
            'pattern' => '^/admin',
            'guard' => [
                'authenticators' => [
                    'app.authenticator'
                ]
            ]
        ]
    ]
]);
```

Commits
-------

4b5ccc9a Add support for the Guard component to the SecurityServiceProvider

Changing the declaration of twig.form.render to ensure it won't choke if CsrfServiceProvider is not used.

Fixes #1331

This PR was squashed before being merged into the 2.0.x-dev branch (closes #1310).

Discussion
----------

Allow use of all the RequestMatcher parameters by providing an array

Provider: Silex\Provider\SecurityServiceProvider
Little patch to make full use of the `RequestMatcher` in `$app['security.access_rules']`

```php
    $app['security.access_rules'] = [
        [[
            'host' => 'symfony.com',
            'ips' => '192.168.0.1',
            ...
         ], 'ROLE_ADMIN'],
        ...
    ];
```

Commits
-------

9698b776 Allow use of all the RequestMatcher parameters by providing an array

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

Use BCrypt by default as encoder #1312

Based on work of @mvanbaak (https://github.com/silexphp/Silex/pull/1316) with applied comments from @mathroc and fixed tests.

Commits
-------

7f13e76f use bcrypt by default as encoder #1312; add pbkdf2 encoder

* 1.3:
  Fix env variable in travis.yaml
  bumped version to 1.3.6-DEV
  prepared the 1.3.5 release
  updated CHANGELOG
  Replace binary gender examples with something that is actually single-choice
  Update validator.rst

This PR was merged into the 1.3 branch.

Discussion
----------

Fix env variable in travis.yaml

SYMFONY_DEPS_VERSION=3 was never evaluated correctly as the before_scripts are comparing with 3.0
The tests were still installing 3.0, as minimumStability=dev, but maybe it is nice fixing that.

Commits
-------

7c3c8d72 Fix env variable in travis.yaml

SYMFONY_DEPS_VERSION=3 was never evaluated correctly as the before_scripts are comparing with 3.0
The test are installing dev-master for some dependencies which might not be 3.0

This PR was merged into the 1.3 branch.

Discussion
----------

Update validator.rst

Example from documentation throws `Call to undefined method Symfony\Component\Validator\Validator\RecursiveValidator::validateValue()`

Commits
-------

04ecee29 Update validator.rst

Ref: https://github.com/silexphp/Silex/issues/1302

How is pre-Symfony3 documentation handled?  Is that a separate page or should notes on pre-Symfony3 usage be included on this page?