1. 07 Jul, 2015 2 commits
  2. 01 Jul, 2015 4 commits
  3. 28 Jun, 2015 1 commit
  4. 25 Jun, 2015 1 commit
  5. 24 Jun, 2015 6 commits
    • Fabien Potencier's avatar
      Merge branch '1.3' · ef2a6803
      Fabien Potencier authored
      * 1.3:
        removed obsolete paragraph about the mailing-list
      ef2a6803
    • Fabien Potencier's avatar
      4f5a3a5c
    • Fabien Potencier's avatar
      fixed CS · 70fff6bd
      Fabien Potencier authored
      70fff6bd
    • Fabien Potencier's avatar
      Merge branch '1.3' · 03705ed2
      Fabien Potencier authored
      * 1.3:
        fixed CS
        Update usage.rst
        tweaks the testing docs
      
      Conflicts:
      	src/Silex/Application.php
      	src/Silex/Application/SecurityTrait.php
      	src/Silex/Provider/TwigServiceProvider.php
      03705ed2
    • Fabien Potencier's avatar
      fixed CS · 4422f429
      Fabien Potencier authored
      4422f429
    • Fabien Potencier's avatar
      feature #1175 Added factory for RouteCollection, makes subclassing of... · 21632f0e
      Fabien Potencier authored
      feature #1175 Added factory for RouteCollection, makes subclassing of RouteCollection possible. (lschricke)
      
      This PR was merged into the 2.0.x-dev branch.
      
      Discussion
      ----------
      
      Added factory for RouteCollection, makes subclassing of RouteCollection possible.
      
      Note: replaces #1174, which was targeting a wrong branch (and where I messed a bit with the commits ;)).
      
      --
      
      The aim of this PR is to allow developpers to subclass `Symfony\Component\Routing\RouteCollection` to change some of its behavior.
      
      In most of my Silex apps, I figured I don't want the Symfony's `RouteCollection` regular behavior where if you define two routes with the same name (bad copy-paste for instance), the first route added simply gets overriden by the second. Instead, I would like to be able to throw an Exception if that happens. So I've written [a tiny subclass of RouteCollection](https://github.com/lschricke/symfony-strict-route-collection), but to be able to use it (through [a service provider like this](https://github.com/lschricke/silex-strict-route-collection-service-provider) for instance (needs to be updated for Silex 2)), I need to be able to replace `RouteCollection` by my subclass. This PR makes it possible.
      
      Thanks! :)
      
      Commits
      -------
      
      18f253f2 Added factory for RouteCollection, makes subclassing of RouteCollection possible.
      21632f0e
  6. 19 Jun, 2015 2 commits
    • Fabien Potencier's avatar
      minor #1184 Update usage.rst (SpacePossum) · badec168
      Fabien Potencier authored
      This PR was merged into the 1.3 branch.
      
      Discussion
      ----------
      
      Update usage.rst
      
      * List all HTTP methods
      * Update the error handling priority text
      * Add link to error to exception cookbook entry
      * Add link to the Twig provider documentation
      
      Commits
      -------
      
      45da7908 Update usage.rst
      badec168
    • SpacePossum's avatar
      Update usage.rst · 45da7908
      SpacePossum authored
      * List all HTTP methods
      * Update the error handling priority text
      * Add link to error to exception cookbook entry
      * Add link to the Twig provider documentation
      45da7908
  7. 16 Jun, 2015 1 commit
  8. 14 Jun, 2015 1 commit
  9. 13 Jun, 2015 4 commits
  10. 12 Jun, 2015 5 commits
  11. 09 Jun, 2015 1 commit
    • Fabien Potencier's avatar
      Merge branch '1.3' · cfb6ed09
      Fabien Potencier authored
      * 1.3:
        bumped version to 1.3.1-DEV
        prepared the 1.3.0 release
        prepared the 1.2.5 release
        updated CHANGELOG
        fixed changelog
        update fastcgi_pass socket location
      
      Conflicts:
      	doc/changelog.rst
      	src/Silex/Application.php
      cfb6ed09
  12. 04 Jun, 2015 7 commits
  13. 30 May, 2015 1 commit
  14. 28 May, 2015 4 commits
    • Fabien Potencier's avatar
      minor #1167 Update fastcgi_pass socket location (victorhaggqvist) · deeb8982
      Fabien Potencier authored
      This PR was submitted for the master branch but it was merged into the 1.2 branch instead (closes #1167).
      
      Discussion
      ----------
      
      Update fastcgi_pass socket location
      
      This makes it correspond with ubuntu 14.04 defaults
      
      Commits
      -------
      
      42e9b8f2 update fastcgi_pass socket location
      deeb8982
    • Victor Häggqvist's avatar
      update fastcgi_pass socket location · 42e9b8f2
      Victor Häggqvist authored
      this makes it correspond with ubuntu 14.04 defaults
      42e9b8f2
    • Fabien Potencier's avatar
      Merge branch '1.3' · 7052d972
      Fabien Potencier authored
      * 1.3: (27 commits)
        updated docs
        deprecated the user() trait
        made it easier to get the user from the app
        updated the changelog
        Remove incorrect examples and fix grammar
        updated changelog and docs
        Fixed whitespace issue
        Add options request capability to controller collection
        Update Application add options method for handling option routing
        Basic documentation
        Use PHPUnit annotation to skip test on <5.4
        Document as mixed, may be a string intended to be resolved from the CallbackResolver
        Revert the CS fix and make a valid docComment
        More CS fixes
        CS Fixes
        Allow view listeners to be "skipped" by returning null
        Restricted visibility
        Fix docblock type
        Remove callable hint for 5.3 tests
        Avoid mutating state
        ...
      
      Conflicts:
      	src/Silex/Application.php
      	src/Silex/Provider/SecurityServiceProvider.php
      	tests/Silex/Tests/ApplicationTest.php
      7052d972
    • Fabien Potencier's avatar
      updated docs · 6a092186
      Fabien Potencier authored
      6a092186