Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 24, 2014
  1. fixed CS

    authored
  2. bug #1046 Fix Monolog error where newer versions does not allow an em…

    authored
    …pty stream (henrikbjorn)
    
    This PR was merged into the 2.0.x-dev branch.
    
    Discussion
    ----------
    
    Fix Monolog error where newer versions does not allow an empty stream
    
    Fixes an error with Monolog, only problem is that i think i have already done this PR once before, but it have gone missing.
    
    Commits
    -------
    
    26c7d59 Fix Monolog error where newer versions does not allow an empty stream
  3. Merge branch '1.2'

    authored
    * 1.2:
      fixed tests for PHP 5.3
    
    Conflicts:
    	tests/Silex/Tests/CallbackServicesTest.php
  4. fixed tests for PHP 5.3

    authored
  5. Merge branch '1.2'

    authored
    * 1.2:
      fixed some tests
      fixed CS
      simplified the build matrix
      fixed tests for Symfony 2.6+
      allowed any Symfony 2.x versions
      Grammar correction
    
    Conflicts:
    	composer.json
    	tests/Silex/Tests/Application/UrlGeneratorTraitTest.php
    	tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php
  6. fixed some tests

    authored
  7. fixed CS

    authored
  8. minor #1057 allowed any Symfony 2.x versions for Silex 1.2 (fabpot)

    authored
    This PR was merged into the 1.2 branch.
    
    Discussion
    ----------
    
    allowed any Symfony 2.x versions for Silex 1.2
    
    As we know that Symfony 3.0 will be next year, let's allow any Symfony 2.x versions. I've added the 2.6 and 2.7 versions in Travis to check that everything work fine for all supported Symfony 2.x versions.
    
    Commits
    -------
    
    a5dd2b5 simplified the build matrix
    ec53f07 fixed tests for Symfony 2.6+
    288d891 allowed any Symfony 2.x versions
  9. simplified the build matrix

    authored
  10. fixed tests for Symfony 2.6+

    authored
Commits on Nov 23, 2014
  1. minor #1056 Grammar correction (okj579)

    authored
    This PR was submitted for the master branch but it was merged into the 1.2 branch instead (closes #1056).
    
    Discussion
    ----------
    
    Grammar correction
    
    Commits
    -------
    
    2900425 Grammar correction
  2. Owen Kieffer-Jones

    Grammar correction

    okj579 authored committed
Commits on Nov 7, 2014
  1. Henrik Bjørnskov
Commits on Oct 12, 2014
  1. Merge branch '1.2'

    authored
    * 1.2:
      Update RememberMeServiceProvider.php
  2. bug #1033 Update RememberMeServiceProvider.php (kevinpostma)

    authored
    This PR was submitted for the master branch but it was merged into the 1.2 branch instead (closes #1033).
    
    Discussion
    ----------
    
    Update RememberMeServiceProvider.php
    
    Dispatcher is not called in the remember me listener because dispatcher was not given in the constructor of the RememberMe Listener.
    
    Commits
    -------
    
    89b1287 Update RememberMeServiceProvider.php
  3. Kevin

    Update RememberMeServiceProvider.php

    kevinpostma authored committed
  4. Merge branch '1.2'

    authored
    * 1.2:
      Remove PHPUnit as a development dependency
    
    Conflicts:
    	composer.json
  5. minor #1039 Remove PHPUnit as a development dependency (henrikbjorn)

    authored
    This PR was submitted for the master branch but it was merged into the 1.2 branch instead (closes #1039).
    
    Discussion
    ----------
    
    Remove PHPUnit as a development dependency
    
    This will make it more inline with how Symfony uses PHPUnit and already
    considers this a tool installed when developing.
    
    for reference as PR that rejects having phpunit as dependency in symfony
    symfony/symfony#12136
    
    Commits
    -------
    
    62b0fa7 Remove PHPUnit as a development dependency
  6. Henrik Bjørnskov

    Remove PHPUnit as a development dependency

    henrikbjorn authored committed
    This will make it more inline with how Symfony uses PHPUnit and already
    considers this a tool installed when developing.
    
    for reference as PR that rejects having phpunit as dependency in symfony
    symfony/symfony#12136
Commits on Sep 26, 2014
  1. Merge branch '1.2'

    authored
    * 1.2:
      bumped version to 1.2.3-DEV
      prepared the 1.2.2 release
      updated CHANGELOG
      fixed translator
      fixed translator
      Update testing.rst
    
    Conflicts:
    	doc/changelog.rst
    	src/Silex/Application.php
  2. bumped version to 1.2.3-DEV

    authored
  3. prepared the 1.2.2 release

    authored
  4. updated CHANGELOG

    authored
  5. bug #1029 fixed translator (fabpot)

    authored
    This PR was merged into the 1.2 branch.
    
    Discussion
    ----------
    
    fixed translator
    
    Fixes #1028, #988, #983, #1023
    
    That makes the tests pass again.
    
    Commits
    -------
    
    712375b fixed translator
  6. fixed translator

    authored
    As of Symfony 2.5.2, Translator::__construct() calls setLocale.
    As the Silex Translator calls it with null and because we synchronize
    the translator language with the app one, the locale was always
    set to null when calling the translator for the first time, overriding
    the current app locale.
  7. fixed translator

    authored
    As of Symfony 2.5.2, Translator::__construct() calls setLocale.
    As the Silex Translator calls it with null and because we synchronize
    the translator language with the app one, the locale was always
    set to null when calling the translator for the first time, overriding
    the current app locale.
Commits on Sep 22, 2014
  1. minor #1025 Add missing @param tags (JeroenDeDauw)

    authored
    This PR was merged into the 2.0.x-dev branch.
    
    Discussion
    ----------
    
    Add missing @param tags
    
    Commits
    -------
    
    6a54320 Add missing @param tags
  2. minor #1024 Add imports for type hints (JeroenDeDauw)

    authored
    This PR was merged into the 2.0.x-dev branch.
    
    Discussion
    ----------
    
    Add imports for type hints
    
    Commits
    -------
    
    926bbc0 Add imports for type hints
  3. Jeroen De Dauw

    Add missing @param tags

    JeroenDeDauw authored
  4. Jeroen De Dauw
  5. minor #1021 Update testing.rst (1emming)

    authored
    This PR was submitted for the master branch but it was merged into the 1.2 branch instead (closes #1021).
    
    Discussion
    ----------
    
    Update testing.rst
    
    Fix dead link, @see:
    silexphp#1020
    
    Commits
    -------
    
    8c8b6a6 Update testing.rst
  6. A B

    Update testing.rst

    1emming authored committed
    Fix dead link, @see:
    silexphp#1020
Commits on Sep 21, 2014
  1. Merge branch '1.2'

    authored
    * 1.2:
      fixed CS
      Update session.rst
      updated docs and changelog
      Add  parameter for application middlewares (before, after, finish)
      updated docs and changelog
      allow to register form types without extensions
    
    Conflicts:
    	src/Silex/Provider/FormServiceProvider.php
    	tests/Silex/Tests/Provider/FormServiceProviderTest.php
Something went wrong with that request. Please try again.