Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 11, 2015
  1. Merge branch '1.3'

    authored
    * 1.3:
      Revert "removed obsolete code"
    
    Conflicts:
    	src/Silex/Provider/ValidatorServiceProvider.php
  2. Revert "removed obsolete code"

    authored
    This reverts commit aaec9f8.
  3. Merge branch '1.3'

    authored
    * 1.3:
      removed obsolete code
    
    Conflicts:
    	src/Silex/Provider/ValidatorServiceProvider.php
  4. removed obsolete code

    authored
  5. removed obsolete code

    authored
  6. Merge branch '1.3'

    authored
    * 1.3:
      removed obsolete code
      Improve Silex\Route\SecurityTrait coverage
      updated CHANGELOG
  7. Merge branch '1.2' into 1.3

    authored
    * 1.2:
      removed obsolete code
      Improve Silex\Route\SecurityTrait coverage
      updated CHANGELOG
    
    Conflicts:
    	doc/changelog.rst
  8. removed obsolete code

    authored
  9. updated LICENSE years

    authored
  10. Merge branch '1.3'

    authored
    * 1.3:
      fixed CS
    
    Conflicts:
    	src/Silex/Application.php
    	src/Silex/EventListener/LogListener.php
    	src/Silex/LazyUrlMatcher.php
  11. fixed CS

    authored
  12. udpated odcs

    authored
  13. fixed travis ocnfig

    authored
  14. feature #990 A solution to resolve #983 (bad comportment of Translato…

    authored
    …r) (freepius44)
    
    This PR was merged into the 2.0.x-dev branch.
    
    Discussion
    ----------
    
    A solution to resolve #983 (bad comportment of Translator)
    
    Implementation of @henrikbjorn solution :
    
    Use the Translator directly from Symfony and create a EventListener that sets the Locale on the translator based on the request (like LocaleListener does).
    
    Commits
    -------
    
    36cfde2 A solution to resolve #983 (bad comportment of Translator)
  15. Merge branch '1.3'

    authored
    * 1.3: (44 commits)
      Add a isGranted() function to Silex\Application\SecurityTrait + unit tests
      Type hint against EventDispatcherInterface
      Update usage.rst
      Use PSR-4 for autoloading, works same as the PSR-0 configuration. Use autoload-dev for autoloading tests
      updated CHANGELOG
      Patch debug and caching translator (Symfony 2.6+ with caching enabled).
      Updated year in License
      Update testing.rst
      Add docblock for the $app field
      fixed CS
      Update intro.rst
      Correct exception message when mounting
      fixed compatibility with 2.7
      updated .travis.yml with only maintained Symfony versions
      Link to Monolog provider chapter
      Fix README doc about running unit tests
      add values to parameters copied from symfony docs
      Use the constant to refer to session auth strategy
      Revert "Merge branch '1.2' into 1.3"
      updated deps as Silex 1.2 is not compatible with Symfony 2.7
      ...
    
    Conflicts:
    	.travis.yml
    	README.rst
    	composer.json
    	doc/changelog.rst
    	doc/providers/security.rst
    	doc/usage.rst
    	src/Silex/Api/BootableProviderInterface.php
    	src/Silex/Application.php
    	src/Silex/Provider/FormServiceProvider.php
    	src/Silex/Provider/HttpCacheServiceProvider.php
    	src/Silex/Provider/SecurityServiceProvider.php
    	src/Silex/Provider/Translation/Translator.php
    	src/Silex/Provider/TranslationServiceProvider.php
    	src/Silex/Provider/ValidatorServiceProvider.php
    	tests/Silex/Tests/Provider/MonologServiceProviderTest.php
    	tests/Silex/Tests/Provider/TwigServiceProviderTest.php
  16. feature #1082 Add a isGranted() function to Silex\Application\Securit…

    authored
    …yTrait + unit tests (freepius)
    
    This PR was submitted for the master branch but it was merged into the 1.3 branch instead (closes #1082).
    
    Discussion
    ----------
    
    Add a isGranted() function to Silex\Application\SecurityTrait + unit tests
    
    Commits
    -------
    
    6d86c60 Add a isGranted() function to Silex\Application\SecurityTrait + unit tests
  17. @freepius
  18. minor #1101 Improve Silex\Route\SecurityTrait coverage (SofHad)

    authored
    This PR was submitted for the 1.3 branch but it was merged into the 1.2 branch instead (closes #1101).
    
    Discussion
    ----------
    
    Improve Silex\Route\SecurityTrait coverage
    
    Commits
    -------
    
    a124002 Improve Silex\Route\SecurityTrait coverage
  19. @SofHad

    Improve Silex\Route\SecurityTrait coverage

    SofHad authored committed
  20. updated CHANGELOG

    authored
  21. Merge branch '1.2' into 1.3

    authored
    * 1.2:
      Update usage.rst
      Updated year in License
      Update testing.rst
      Add docblock for the $app field
      fixed CS
      Update intro.rst
      Correct exception message when mounting
  22. minor #1026 Type hint against EventDispatcherInterface (JeroenDeDauw)

    authored
    This PR was submitted for the master branch but it was merged into the 1.3 branch instead (closes #1026).
    
    Discussion
    ----------
    
    Type hint against EventDispatcherInterface
    
    Commits
    -------
    
    9e3a35c Type hint against EventDispatcherInterface
  23. @JeroenDeDauw

    Type hint against EventDispatcherInterface

    JeroenDeDauw authored committed
  24. minor #993 Update "Error Handlers" part in usage.rst (Poisbeau Mathieu)

    authored
    This PR was merged into the 2.0.x-dev branch.
    
    Discussion
    ----------
    
    Update "Error Handlers" part in usage.rst
    
    Update "Error Handlers" part in usage.rst because of silexphp@e96f9be#diff-9460b640f6466d5890f37f7caf262024R52
    
    Commits
    -------
    
    46f125c Update "Error Handlers" part in usage.rst
  25. minor #1096 Update usage.rst (parhamdoustdar)

    authored
    This PR was submitted for the master branch but it was merged into the 1.2 branch instead (closes #1096).
    
    Discussion
    ----------
    
    Update usage.rst
    
    Fixed a small grammatical error.
    
    Commits
    -------
    
    b0def74 Update usage.rst
  26. @parhamdoustdar

    Update usage.rst

    parhamdoustdar authored committed
  27. minor #986 Use PSR-4 for autoloading, works same as the PSR-0 configu…

    authored
    …ration. Use au... (henrikbjorn)
    
    This PR was submitted for the master branch but it was merged into the 1.3 branch instead (closes #986).
    
    Discussion
    ----------
    
    Use PSR-4 for autoloading, works same as the PSR-0 configuration. Use au...
    
    ...toload-dev for autoloading tests
    
    Commits
    -------
    
    0df7637 Use PSR-4 for autoloading, works same as the PSR-0 configuration. Use autoload-dev for autoloading tests
  28. @henrikbjorn

    Use PSR-4 for autoloading, works same as the PSR-0 configuration. Use…

    henrikbjorn authored committed
    … autoload-dev for autoloading tests
  29. updated CHANGELOG

    authored
  30. feature #1124 Patch debug and caching translator (Symfony 2.6+ with c…

    authored
    …aching enabled). (khanhicetea)
    
    This PR was submitted for the 1.2 branch but it was merged into the 1.3 branch instead (closes #1124).
    
    Discussion
    ----------
    
    Patch debug and caching translator (Symfony 2.6+ with caching enabled).
    
    Patch debug and caching translator (Symfony 2.6+ with caching enabled).
    
    API 2.6 : http://api.symfony.com/2.6/Symfony/Component/Translation/Translator.html
    
    Commits
    -------
    
    ffff5bd Patch debug and caching translator (Symfony 2.6+ with caching enabled).
Something went wrong with that request. Please try again.