1. 27 Dec, 2011 2 commits
  2. 22 Dec, 2011 2 commits
    • Fabien Potencier's avatar
      tweaked previous merge · 801e13c1
      Fabien Potencier authored
      801e13c1
    • Fabien Potencier's avatar
      merged branch marcw/doc-patch-1 (PR #224) · 10884870
      Fabien Potencier authored
      Commits
      -------
      
      58fc60f3 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...
      10884870
  3. 21 Dec, 2011 1 commit
  4. 03 Dec, 2011 2 commits
    • Fabien Potencier's avatar
      fixed composer.json · ffe8f9fc
      Fabien Potencier authored
      ffe8f9fc
    • Fabien Potencier's avatar
      merged branch igorw/detect-unicode-off (PR #217) · 86d23251
      Fabien Potencier authored
      Commits
      -------
      
      604b9177 [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.
      86d23251
  5. 30 Nov, 2011 1 commit
  6. 18 Nov, 2011 6 commits
    • Fabien Potencier's avatar
      merged branch hhamon/doc_fixes (PR #211) · 66923851
      Fabien Potencier authored
      Commits
      -------
      
      2434ad91 [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!
      66923851
    • Fabien Potencier's avatar
      merged branch jeromemacias/DoctrineServiceProviderFix (PR #196) · 9fbd177a
      Fabien Potencier authored
      Commits
      -------
      
      3871f24c [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.
      9fbd177a
    • Fabien Potencier's avatar
      merged branch igorw/stip-comments-keep-newlines (PR #210) · 31a81912
      Fabien Potencier authored
      Commits
      -------
      
      554425d7 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.
      31a81912
    • Fabien Potencier's avatar
      merged branch hhamon/phpdoc_fixes (PR #212) · 8fca0d62
      Fabien Potencier authored
      Commits
      -------
      
      79e2684f [Silex] use @inheritdoc instead of a new phpdoc block.
      46dc1dff [Silex] added missing PHPDoc blocks.
      
      Discussion
      ----------
      
      [Silex] added missing PHPDoc blocks.
      8fca0d62
    • Fabien Potencier's avatar
      merged branch igorw/monolog-enhancement (PR #213) · 94be9476
      Fabien Potencier authored
      Commits
      -------
      
      b711b707 [MonologServiceProvider] improve logging, log reponse status, improve test granularity
      
      Discussion
      ----------
      
      [MonologServiceProvider] improve logging, log response status, improve test granularity
      94be9476
    • Igor Wiedler's avatar
  7. 10 Nov, 2011 4 commits
  8. 07 Nov, 2011 4 commits
  9. 02 Nov, 2011 1 commit
  10. 29 Oct, 2011 3 commits
  11. 27 Oct, 2011 3 commits
    • Igor Wiedler's avatar
      fix comment in LazyUrlMatcher · 43ae6965
      Igor Wiedler authored
      43ae6965
    • Igor Wiedler's avatar
      add test case for late listeners · 4d5ffca8
      Igor Wiedler authored
      4d5ffca8
    • Igor Wiedler's avatar
      Create default set of listeners late · 51df9f5a
      Igor Wiedler authored
      Right now the following subscribers are created together with the
      dispatcher:
      
      * app
      * exception_handler
      * ResponseListener
      * RouterListener
      
      With the exception_handler in particular this is an issue because you
      can no longer change it after the dispatcher has been created. And it
      gets created when you call before(), after() or error(). It means that
      you cannot unset it for tests.
      
      The RouterListener has a similar issue because you can no longer change
      the UrlMatcher it uses. And you cannot move its creation into a request
      listener, because request listeners cannot add other request listeners
      (the new ones won't get executed anymore at that point).
      
      This commit ensures that those listeners will be created a lot later,
      allowing their dependencies to be modified before runtime.
      51df9f5a
  12. 26 Oct, 2011 1 commit
  13. 23 Oct, 2011 4 commits
    • Fabien Potencier's avatar
      merged branch igorw/controller-defaultroutename-bug (PR #191) · bcb367ed
      Fabien Potencier authored
      Commits
      -------
      
      ef75e13b add a prefix to defaultRouteName to prevent route name conflicts
      
      Discussion
      ----------
      
      add a prefix to defaultRouteName to prevent route name conflicts
      
      * closes #189
      * identical route names no longer conflict when merging RouteCollections
      * route names are automatically generated by
        Controller::bindDefaultRouteName
      bcb367ed
    • Fabien Potencier's avatar
      merged branch romainneutron/master (PR #188) · d794134c
      Fabien Potencier authored
      Commits
      -------
      
      16a86e06 Connect method does not exist in Silex\Application
      
      Discussion
      ----------
      
      Documentation fix
      
      Connect method does not exists in providers doc ; but mount exists and this is the one expected in the example
      d794134c
    • Fabien Potencier's avatar
      merged branch ericclemmons/patch-1 (PR #192) · ee7a1f1a
      Fabien Potencier authored
      Commits
      -------
      
      01a0f12c Updating the `SymfonyBridgesServiceProvider` documentation with using the `TwigBridge` subtree split.
      
      Discussion
      ----------
      
      Added `TwigBridge` reference to `SymfonyBridgesServiceProvider` documentation
      
      Updated the `SymfonyBridgesServiceProvider` documentation with suggestion on using the `TwigBridge` subtree split.
      
      This has a much smaller footprint when doing deployments and packaging the application for 3rd parties.
      ee7a1f1a
    • Fabien Potencier's avatar
      fixed typos in doc · 5b191309
      Fabien Potencier authored
      5b191309
  14. 20 Oct, 2011 2 commits
  15. 19 Oct, 2011 1 commit
  16. 10 Oct, 2011 3 commits