[composer] add autoload information
small correction in the configuration array
merged branch rejinka/master (PR #209)

Commits
-------

1b1ce14 small correction in the configuration array

Discussion
----------

Small correction in the configuration array of DoctrineProvider

Netbeans just complained about missing comma.
merged branch igorw/composer (PR #206)

Commits
-------

d53661a [composer] add autoload information

Discussion
----------

[composer] add autoload information
[DoctrineServiceProvider] Fix default options was not used with tests
maintain line numbers when minifying php for the phar
[doc] proofread documentation and fixed some typos.
[Silex] added missing PHPDoc blocks.
[Silex] use @inheritdoc instead of a new phpdoc block.
[MonologServiceProvider] improve logging, log reponse status, improve test granularity
merged branch igorw/monolog-enhancement (PR #213)

Commits
-------

b711b70 [MonologServiceProvider] improve logging, log reponse status, improve test granularity

Discussion
----------

[MonologServiceProvider] improve logging, log response status, improve test granularity
merged branch hhamon/phpdoc_fixes (PR #212)

Commits
-------

79e2684 [Silex] use @inheritdoc instead of a new phpdoc block.
46dc1df [Silex] added missing PHPDoc blocks.

Discussion
----------

[Silex] added missing PHPDoc blocks.
merged branch igorw/stip-comments-keep-newlines (PR #210)

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.
merged branch jeromemacias/DoctrineServiceProviderFix (PR #196)

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.
merged branch hhamon/doc_fixes (PR #211)

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!
[docs] set detect_unicode=off, so phar:// is no longer needed
merged branch igorw/detect-unicode-off (PR #217)

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.
fixed composer.json
Adds doc about proxy headers trust
merged branch marcw/doc-patch-1 (PR #224)

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...