Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Jan 13, 2012
  1. @fabpot

    merged branch igorw/double-detect-unicode (PR #233)

    fabpot authored
    Commits
    -------
    
    7caa312 [docs] remove duplicate "detect_unicode" line in pitfalls
    
    Discussion
    ----------
    
    [docs] remove duplicate "detect_unicode" line in pitfalls
    
    Not sure what happened there, I suppose some merge failed.
  2. @fabpot

    merged branch igorw/stream-changelog (PR #234)

    fabpot authored
    Commits
    -------
    
    28399b6 add streaming to the changelog
    
    Discussion
    ----------
    
    add streaming to the changelog
  3. @igorw

    add streaming to the changelog

    igorw authored
  4. @igorw
Commits on Jan 12, 2012
  1. @fabpot

    fixed some phpdoc

    fabpot authored
Commits on Jan 10, 2012
  1. @fabpot

    updated vendors

    fabpot authored
Commits on Jan 2, 2012
  1. @fabpot

    merged branch igorw/composer-classloader (PR #225)

    fabpot authored
    Commits
    -------
    
    006d7ba add symfony/class-loader to composer.json
    
    Discussion
    ----------
    
    add symfony/class-loader to composer.json
  2. @fabpot

    updated vendors

    fabpot authored
  3. @fabpot

    merged branch igorw/stream (PR #229)

    fabpot authored
    Commits
    -------
    
    8dd779e [stream] Fix rst formatting
    73fe0b1 [stream] Add a nice API for streaming responses
    
    Discussion
    ----------
    
    [stream] Add a nice API for streaming responses
    
    This PR adds a nice API for creating streaming responses with the new StreamedResponse class that was added to symfony [just recently](symfony/symfony#2935).
    
    Usage is documented in the usage doc, but for lazy people:
    
    ```php
    <?php
    
    $app->get('/images/{file}', function ($file) use ($app) {
        if (!file_exists(__DIR__.'/images/'.$file)) {
            return $app->abort(404, 'The image was not found.');
        }
    
        $stream = function () use ($file) {
            readfile($file);
        };
    
        return $app->stream($stream, 200, array('Content-Type' => 'image/png'));
    });
    ```
    
    Note: I had to point the autoloader to a copy of symfony/symfony because the subtree splits are not up-to-date. Thus the vendors are out of date too right now.
Commits on Dec 31, 2011
  1. @igorw

    [stream] Fix rst formatting

    igorw authored
  2. @igorw
Commits on Dec 27, 2011
  1. @igorw
  2. @fabpot

    simplified example

    fabpot authored
  3. @fabpot

    updated vendors

    fabpot authored
Commits on Dec 22, 2011
  1. @fabpot

    tweaked previous merge

    fabpot authored
  2. @fabpot

    merged branch marcw/doc-patch-1 (PR #224)

    fabpot authored
    Commits
    -------
    
    58fc60f Adds doc about proxy headers trust
    
    Discussion
    ----------
    
    Adds doc about proxy headers trust
    
    ---------------------------------------------------------------------------
    
    by igorw at 2011/12/21 07:07:57 -0800
    
    No instantiation needed, just call it statically on the request class:
    
        Request::trustProxyData();
    
    If there is something about this in the Symfony2 docs, it'd be nice to link to it.
    
    ---------------------------------------------------------------------------
    
    by marcw at 2011/12/21 07:19:53 -0800
    
    Well this is a configuration parameter in Symfony2...
Commits on Dec 21, 2011
  1. Adds doc about proxy headers trust

    marc.weistroff authored
Commits on Dec 3, 2011
  1. @fabpot

    fixed composer.json

    fabpot authored
  2. @fabpot

    merged branch igorw/detect-unicode-off (PR #217)

    fabpot authored
    Commits
    -------
    
    604b917 [docs] set detect_unicode=off, so phar:// is no longer needed
    
    Discussion
    ----------
    
    [docs] set detect_unicode=off, so phar:// is no longer needed
    
    detect_unicode was causing some issues with wrongly detecting the encoding. This is one of the reasons that phar:// was required, but I am not sure if this is the only case. I will leave the "phar-stub bug" section there for now.
Commits on Nov 30, 2011
  1. @igorw
Commits on Nov 18, 2011
  1. @fabpot

    merged branch hhamon/doc_fixes (PR #211)

    fabpot authored
    Commits
    -------
    
    2434ad9 [doc] proofread documentation and fixed some typos.
    
    Discussion
    ----------
    
    [doc] proofread documentation and fixed some typos.
    
    ---------------------------------------------------------------------------
    
    by igorw at 2011/11/10 05:30:58 -0800
    
    Thumbs up!
  2. @fabpot

    merged branch jeromemacias/DoctrineServiceProviderFix (PR #196)

    fabpot authored
    Commits
    -------
    
    3871f24 [DoctrineServiceProvider] Fix default options was not used with tests
    
    Discussion
    ----------
    
    [DoctrineServiceProvider] Fix default options was not used
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/10/25 23:13:23 -0700
    
    The code looks correct to as we are modifying the options by reference.
    
    ---------------------------------------------------------------------------
    
    by jeromemacias at 2011/10/26 05:54:18 -0700
    
    On the line 50 :
    
    ```php
    $tmp = $app['dbs.options'];
    ```
    
    This is a copy of options array, the reference used after does not has any effect on initial options array.
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2011/10/26 06:02:46 -0700
    
    @jeromemacias But in the ``` foreach ($tmp as $name => &$options) ``` the ```$options``` var is referenced (with the use of ```&```), not copied.
    Thus, if I'm not wrong, this loop *does* have an effect on ```$app['dbs.options']```.
    
    ---------------------------------------------------------------------------
    
    by jeromemacias at 2011/10/26 12:36:40 -0700
    
    @DrBenton The $options var is a reference to $tmp but $tmp is a copy of $apps['dbs.options'],  not a reference.
    
    ---------------------------------------------------------------------------
    
    by jeromemacias at 2011/10/26 12:58:38 -0700
    
    I used this config (json) :
    
    ```json
    {
      "db.options":
      {
        "dbname": "mydbname",
        "user": "mydbuser",
        "password": "mydbpass"
      }
    }
    ```
    
    With the current code :
    
    ```php
                $tmp = $app['dbs.options'];
                foreach ($tmp as $name => &$options) {
                    $options = array_replace($app['db.default_options'], $options);
    
                    if (!isset($app['dbs.default'])) {
                        $app['dbs.default'] = $name;
                    }
                }
    
                var_export($app['dbs.options']); die;
    ```
    
    The result is :
    
    ```php
    array ( 'default' => array ( 'dbname' => 'mydbname', 'user' => 'mydbuser', 'password' => 'mydbpass', ), )
    ```
    
    With the new code :
    
    ```php
                $tmp = $app['dbs.options'];
                foreach ($tmp as $name => &$options) {
                    $options = array_replace($app['db.default_options'], $options);
    
                    if (!isset($app['dbs.default'])) {
                        $app['dbs.default'] = $name;
                    }
                }
                $app['dbs.options'] = $tmp;
    
                var_export($app['dbs.options']); die;
    ```
    
    The result is :
    
    ```php
    array ( 'default' => array ( 'driver' => 'pdo_mysql', 'dbname' => 'mydbname', 'host' => 'localhost', 'user' => 'mydbuser', 'password' => 'mydbpass', ), )
    ```
    
    ---------------------------------------------------------------------------
    
    by igorw at 2011/10/26 13:59:51 -0700
    
    Issue confirmed, please reopen and merge.
    
    EDIT: To be clear: the defaults are not being applied to dbs.options.
    
    ---------------------------------------------------------------------------
    
    by DrBenton at 2011/10/26 14:05:23 -0700
    
    Sorry, you're right @jeromemacias. Since the values of ```$app['dbs.options']``` seem to be simple scalars, iterating though ```$tmp``` values, even by reference, does not affect ```$app['dbs.options']``` values. I thought ```$app['dbs.options']``` values where Objects (in that case, the code would have been ok).
    
    My mistake !
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/10/26 14:13:41 -0700
    
    We need some unit tests for this.
    
    ---------------------------------------------------------------------------
    
    by jeromemacias at 2011/10/30 09:28:53 -0700
    
    @fabpot Just added test
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/11/07 01:08:44 -0800
    
    Can you squash your commits? Thanks.
    
    ---------------------------------------------------------------------------
    
    by jeromemacias at 2011/11/07 15:18:40 -0800
    
    @fabpot Done.
  3. @fabpot

    merged branch igorw/stip-comments-keep-newlines (PR #210)

    fabpot authored
    Commits
    -------
    
    554425d maintain line numbers when minifying php for the phar
    
    Discussion
    ----------
    
    maintain line numbers when minifying php for the phar
    
    Currently the minification of a phar makes debugging impossible. This PR adds newlines to keep the line numbers intact.
  4. @fabpot

    merged branch hhamon/phpdoc_fixes (PR #212)

    fabpot authored
    Commits
    -------
    
    79e2684 [Silex] use @inheritdoc instead of a new phpdoc block.
    46dc1df [Silex] added missing PHPDoc blocks.
    
    Discussion
    ----------
    
    [Silex] added missing PHPDoc blocks.
  5. @fabpot

    merged branch igorw/monolog-enhancement (PR #213)

    fabpot authored
    Commits
    -------
    
    b711b70 [MonologServiceProvider] improve logging, log reponse status, improve test granularity
    
    Discussion
    ----------
    
    [MonologServiceProvider] improve logging, log response status, improve test granularity
  6. @igorw
Commits on Nov 10, 2011
  1. @hhamon
  2. @hhamon
  3. @hhamon
  4. @igorw
Commits on Nov 7, 2011
  1. @jeromemacias
  2. @fabpot

    merged branch igorw/composer (PR #206)

    fabpot authored
    Commits
    -------
    
    d53661a [composer] add autoload information
    
    Discussion
    ----------
    
    [composer] add autoload information
  3. @fabpot

    merged branch rejinka/master (PR #209)

    fabpot authored
    Commits
    -------
    
    1b1ce14 small correction in the configuration array
    
    Discussion
    ----------
    
    Small correction in the configuration array of DoctrineProvider
    
    Netbeans just complained about missing comma.
  4. small correction in the configuration array

    Tony Lemke authored
Commits on Nov 2, 2011
  1. @igorw
Something went wrong with that request. Please try again.