Skip to content
Commits on Mar 26, 2012
  1. @fabpot

    merged branch GromNaN/patch-2 (PR #287)

    Commits
    -------
    
    0676cd2 Use the application charset as default charset for `$app->escape()` method.
    
    Discussion
    ----------
    
    Use the application charset as default charset for $app->escape() method
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-21T11:47:47Z
    
    👍
    
    I'm curious, are you using something other than UTF-8?
    
    ---------------------------------------------------------------------------
    
    by GromNaN at 2012-03-21T12:04:21Z
    
    @igorw The database is encoded in ISO-8859-15. With this patch, I'll only have to change the app charset once the database converted to UTF-8.
    fabpot committed Mar 26, 2012
  2. @fabpot

    merged branch guillaumepotier/master (PR #290)

    Commits
    -------
    
    96b0db5 [docs] fixed typo
    142143a [docs] fixed typos
    32c96a4 [docs] added cookbook recipe on how to disable CSRF Protection using FormExtension
    
    Discussion
    ----------
    
    [docs] added cookbook recipe on how to disable CSRF Protection using FormExtension
    
    Followed @igorw advice here: https://twitter.com/#!/igorwesome/status/183237649811783682
    
    It also could be awesome to add the FormExtension doc (PR #77) ;)
    fabpot committed Mar 26, 2012
  3. @fabpot

    merged branch jalliot/patch-1 (PR #292)

    Commits
    -------
    
    c9bbcc0 Use new json function in doc
    
    Discussion
    ----------
    
    Use new json function in doc
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-24T16:53:00Z
    
    Missed that one, thanks. 👍
    fabpot committed Mar 26, 2012
Commits on Mar 24, 2012
  1. @jalliot

    Use new json function in doc

    jalliot committed Mar 24, 2012
  2. @guillaumepotier

    [docs] fixed typo

    guillaumepotier committed Mar 24, 2012
Commits on Mar 23, 2012
  1. @guillaumepotier

    [docs] fixed typos

    guillaumepotier committed Mar 24, 2012
  2. @guillaumepotier
Commits on Mar 21, 2012
  1. @GromNaN
Commits on Mar 20, 2012
  1. @fabpot

    merged branch igorw/json (PR #286)

    Commits
    -------
    
    a327587 [json] add changelog entry
    
    Discussion
    ----------
    
    [json] add changelog entry
    fabpot committed Mar 20, 2012
  2. @igorw

    [json] add changelog entry

    igorw committed Mar 20, 2012
  3. @fabpot

    merged branch Seldaek/patch-1 (PR #281)

    Commits
    -------
    
    570f475 Improve phar compression
    
    Discussion
    ----------
    
    Improve phar compression
    
    Just did those changes for composer, with this patch added I only get a 4% size increase from the fully stripped version. Without I had a 33% size increase by adding the "stripComments" method from Silex which kinda sucked. As far as I can tell it doesn't break anything.
    fabpot committed Mar 20, 2012
  4. @fabpot

    merged branch igorw/json (PR #285)

    Commits
    -------
    
    aee65e3 [json] add docs to the usage page
    b256689 [json] adjust json request body recipe
    4ce8998 [json] add JSON helper
    
    Discussion
    ----------
    
    Json
    fabpot committed Mar 20, 2012
  5. @fabpot

    merged branch davedevelopment/symfony-session-refactoring (PR #284)

    Commits
    -------
    
    537b808 Updated docs to reflect session refactoring
    d1bd57d Updated to reflect symfony refactoring - needs doc updates
    
    Discussion
    ----------
    
    Updated Session Provider to reflect symfony refactoring - needs doc updates
    
    I'm not really sure what's required here, but here's what I had to do to get my app working again…
    
    ---------------------------------------------------------------------------
    
    by Koin at 2012-03-19T14:12:57Z
    
    omg, thanks davedevelopment.
    I'm not the only one to have this problem.
    
    ---------------------------------------------------------------------------
    
    by spantaleev at 2012-03-19T20:53:02Z
    
    Good. I just saw this myself and was about to fix it, but you're already ahead.
    Can we get the necessary doc updates and have this merged in?
    
    ---------------------------------------------------------------------------
    
    by dguyon at 2012-03-20T09:06:32Z
    
    @davedevelopment do you have time to add some docs that reflects your changes ?
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-20T09:18:11Z
    
    Looks good to me, please update the docs.
    
    ---------------------------------------------------------------------------
    
    by davedevelopment at 2012-03-20T09:26:17Z
    
    Will get the docs updated today
    On Mar 20, 2012 9:18 AM, "Igor Wiedler" <
    reply@reply.github.com>
    wrote:
    
    > Looks good to me, please update the docs.
    >
    > ---
    > Reply to this email directly or view it on GitHub:
    > https://github.com/fabpot/Silex/pull/284#issuecomment-4591304
    >
    
    ---------------------------------------------------------------------------
    
    by davedevelopment at 2012-03-20T13:29:09Z
    
    I did a quick test of the above with rst2html and it seem to render ok. The docs at api.symfony.com don't seem to have been updated yet (tried the master branch), so I left out hyperlinks for now.
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-20T13:47:20Z
    
    👍
    
    ---------------------------------------------------------------------------
    
    by dguyon at 2012-03-20T13:49:38Z
    
    Thanks for this quick patch !
    fabpot committed Mar 20, 2012
  6. @igorw

    [json] add docs to the usage page

    igorw committed Mar 20, 2012
  7. @igorw
  8. @igorw

    [json] add JSON helper

    igorw committed Feb 16, 2012
Commits on Mar 18, 2012
Commits on Mar 14, 2012
  1. @fabpot

    merged branch dschenk/master (PR #280)

    Commits
    -------
    
    fc108e0 completely removed pimple as submodule
    
    Discussion
    ----------
    
    Pimple was not completely removed as a submodule
    
    See https://github.com/fabpot/Silex/issues/158#issuecomment-4498365
    fabpot committed Mar 14, 2012
  2. @Seldaek

    Improve phar compression

    Seldaek committed Mar 14, 2012
  3. @dschenk
Commits on Mar 11, 2012
  1. @fabpot

    updated CHANGELOG

    fabpot committed Mar 11, 2012
  2. @fabpot

    tweaked doc

    fabpot committed Mar 11, 2012
  3. @fabpot

    merged branch GromNaN/doc-alternative-session-storage (PR #275)

    Commits
    -------
    
    4a5c10e Grammar
    e126447 Fix URL to Symfony API doc
    7a176af Cookbook recipe on how to use PdoSessionStorage
    
    Discussion
    ----------
    
    Cookbook recipe on how to use PdoSessionStorage
    
    Related to this issue #254
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-09T16:23:11Z
    
    👍
    fabpot committed Mar 11, 2012
  4. @fabpot

    tweaked documentation

    fabpot committed Mar 11, 2012
  5. @fabpot

    merged branch DrBenton/after-on-controllers (PR #272)

    Commits
    -------
    
    6445b9e Add Routes Middlewares
    
    Discussion
    ----------
    
    add "after($callback)" to Controller in order to mimic a "Route Middleware" feature in Silex
    
    Hi !
    
    As discussed in #262 and in my previous similar PR (https://github.com/fabpot/Silex/pull/270) with @GromNaN, here is another implementation of the Routes Middlewares feature, shipped with its Unit Test.
    
    The feature addition is still 100% backward compatible, but this time it may be more "Silex style" compliant - and it's "100% no performance loss" :-)
    
    With this PR the Silex ```Controller``` class has a new ```before()``` method, which registers a callback to trigger when the Route is matched, just before the route callback itself.
    This ```before()``` method can be called more than one time on a single Route definition, allowing multiple secondary callbacks (a.k.a. "Routes Middlewares") to be executed before the Route main callback.
    
    Would this feature be eligible for Silex integration, like this ?
    
    Olivier
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-01T22:16:05Z
    
    * The method is now named ```addMiddleware```, which may be more explicit for people used to "a la Sinatra" framewoks like _Node.js Express_  or _Slim_.
    * I no longer use the Silex ControllerResolver, but a dedicated Application protected service instead, fired just before the Application "before" process (I could have added a new listener on the ```Kernel```, but since we already have one for the right event for the "before" process, I used this one for simpler code).
    * I also added some checks on the ```$request``` in the Unit Test.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-03-02T11:40:30Z
    
    Can you add some information about this new feature in the documentation (with some typical usages)? Thanks for your work on this feature.
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-02T12:35:44Z
    
    **Done !** (the method is now named ```middleware```, and I've removed the useless comment)
    
    I've tried my best for the feature documentation, but unfortunately my english is fairly poor... :-/
    
    At this point, the Middlewares have access to the Request, but if I'm not wrong it can't be used for redirecting, for instance. Should I handle ```Response``` returns from middlewares, as in ```before``` filter ?
    
    ---------------------------------------------------------------------------
    
    by GromNaN at 2012-03-02T12:39:00Z
    
    I guess you can throw an exception (access denied for example) and manage this exception with the error handlers.
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-02T12:44:38Z
    
    Yes, in the sample usage of the documentation I've used exactly that ```Exception``` process.
    But I don't know if this is ok for everyone ?
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-02T15:08:29Z
    
    Very nice feature. But it should really be possible to return a response from the handler, like you can do with before() filters.
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-02T21:15:41Z
    
    All right, I think I know how to handle Responses, thanks to the code of the before() filter ; I'll push soon a new commit with the last code syle fixes and this feature !
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-03T11:34:44Z
    
    Ok, I've fixed the code style problems, and handled the Responses from middlewares.
    What do you think of it ?
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-05T13:11:56Z
    
    So... Are we OK for this feature, gentlemen ? :-)
    Do you want me to push a squashed commit ?
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-05T22:24:53Z
    
    Apart from the minor comments I made I am quite happy with the implementation as it is. I guess when those are fixed it can be merged.
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-05T22:58:23Z
    
    Sorry for all these "code style" errors, I'm still not enough used to Symfony 2 coding standards - but I'll get them ! :-)
    
    Well, all these errors should be fixed now. I also swapped  the order of execution with the Silex global ```before``` filters, as you asked it: the global filters are now triggered **before** the middlewares of the matched route.
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-05T23:10:35Z
    
    I'm not so sure about checking for `instanceof Response`. Maybe we should enforce a middleware to return either null or a Response to prevent unexpected behaviour.
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-06T14:37:42Z
    
    Well, I just copied the behaviour of the ```before``` filter :
    ```
    if ($ret instanceof Response) {
        $event->setResponse($ret);
    }```
    (in Application.php, line 237)
    
    Since route middlewares act as this ```before``` filter (in a "specific for each route" way), I thought we could copy the code of this ```before``` functionnality ?
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-08T14:34:13Z
    
    So ? Do you want me to change the ```instanceof Response```, or can we keep the current "copy of before filter" implementation ?
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-08T15:57:00Z
    
    IMO we should add something like this:
    
        if ($response instanceof Response) {
            ...
        } elseif (null !== $response) {
            throw new \RuntimeException('Before filter (or middleware for route foo) returned an invalid response value. Must return null or an instance of Response.');
        }
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-08T16:26:54Z
    
    Hum, I see. Sounds good to me, I'll push it soon with the documentation fixes :-)
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-08T16:42:48Z
    
    And tests please ;-)
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-08T22:15:11Z
    
    Here it is, sir ! :-)
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-10T19:45:59Z
    
    Shall I push in a new PR these 13 commits in a single squashed one ?
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-03-10T19:51:53Z
    
    👍
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-03-10T19:52:43Z
    
    No need to create a new PR for this. Simply squash your commits and force the push to the branch
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2012-03-10T21:59:12Z
    
    All right, here is the squashed commit ! :-)
    fabpot committed Mar 11, 2012
Commits on Mar 10, 2012
  1. @DrBenton

    Add Routes Middlewares

    DrBenton committed Mar 10, 2012
Commits on Mar 9, 2012
  1. @GromNaN

    Grammar

    GromNaN committed Mar 9, 2012
  2. @GromNaN

    Fix URL to Symfony API doc

    GromNaN committed Mar 9, 2012
  3. @GromNaN
Commits on Mar 2, 2012
  1. @fabpot

    fixed typo in the doc

    fabpot committed Mar 2, 2012
  2. @fabpot

    fixed cookbook

    fabpot committed Mar 2, 2012
  3. @fabpot
  4. @fabpot
Commits on Feb 27, 2012
  1. @fabpot

    merged branch igorw/composer (PR #268)

    Commits
    -------
    
    8d30526 [composer] remove version and type
    9d88f81 [composer] add branch-alias
    
    Discussion
    ----------
    
    [composer] add branch-alias
    
    This means we get a 1.0-dev version that can be installed as `1.0.*` or `>=1.0-dev`
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-02-27T13:57:11Z
    
    I think we also need to remove the version entry (ping @Seldaek).
    
    ---------------------------------------------------------------------------
    
    by igorw at 2012-02-27T14:01:17Z
    
    Good point, done.
    fabpot committed Feb 27, 2012
Something went wrong with that request. Please try again.