Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 2, 2014
  1. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      Configure firewall's kernel exception listener with configured entry point or a default entry point
      PSR-2 fixes
      [DependencyInjection] make paths relative to __DIR__ in the generated container
      Fixed the syntax of a composer.json file
      Fixed the symfony/config version constraint
      Tweaked the password-compat version constraint
      Docblock fixes
      define constant only if it wasn't defined before
      Fix incorrect spanish translation
      Fixed typos
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/Twig/TwigEngine.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
    	src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpFoundation/StreamedResponse.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
    	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
    	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
    	src/Symfony/Component/Process/Process.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
    	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
    	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
    	src/Symfony/Component/Stopwatch/StopwatchEvent.php
    	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
    	src/Symfony/Component/Templating/PhpEngine.php
    	src/Symfony/Component/Templating/TemplateReference.php
    	src/Symfony/Component/Templating/TemplateReferenceInterface.php
    	src/Symfony/Component/Translation/TranslatorInterface.php
    	src/Symfony/Component/Validator/ConstraintViolation.php
    	src/Symfony/Component/Validator/ExecutionContextInterface.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
    	src/Symfony/Component/Validator/MetadataFactoryInterface.php
Commits on Apr 16, 2014
  1. @fabpot

    Merge branch '2.3' into 2.4

    fabpot authored
    * 2.3:
      fixed types in phpdocs
    
    Conflicts:
    	src/Symfony/Bridge/Twig/TwigEngine.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Stopwatch/StopwatchEvent.php
    	src/Symfony/Component/Templating/PhpEngine.php
  2. @fabpot

    fixed types in phpdocs

    fabpot authored
  3. @fabpot

    Merge branch '2.3' into 2.4

    fabpot authored
    * 2.3:
      made {@inheritdoc} annotations consistent across the board
      fixed types in phpdocs
      made phpdoc types consistent with those defined in Hack
      Add support Thai translations
      made types consistent with those defined in Hack
      removed extra/unsupported arguments
      [HttpKernel] fixed an error message
      [TwigBundle] removed undefined argument
      [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.
    
    Conflicts:
    	src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
    	src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Console/Helper/DescriptorHelper.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
    	src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpFoundation/StreamedResponse.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
    	src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
    	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
    	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
    	src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
    	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
    	src/Symfony/Component/Translation/TranslatorInterface.php
    	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
Commits on Apr 13, 2014
  1. @fabpot
Commits on Jan 1, 2014
  1. @fabpot

    Merge branch '2.3' into 2.4

    fabpot authored
    * 2.3:
      removed unneeded use statements
      Prepend Child Bundle paths before the parent
      [Routing] add unit tests for Symfony\Component\Routing\RequestContext class
    
    Conflicts:
    	src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
    	src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
    	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
  2. @fabpot
Commits on Dec 28, 2013
  1. @fabpot

    Merge branch '2.3' into 2.4

    fabpot authored
    * 2.3:
      fixed a typo
      fixed CS for lambdas
      [Yaml] fixed some license headers
      Fixes message value for objects
      Check for hour, minute & second validity
      fixed various typos
      [Filesystem] Fixed mirror for symlinks
      [Validator] Removed duplicated test for IBAN in data provider
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
  2. @fabpot

    fixed CS for lambdas

    fabpot authored
Commits on Apr 21, 2013
  1. @fabpot
Commits on May 18, 2012
  1. @fabpot

    merged 2.0

    fabpot authored
Commits on May 16, 2012
  1. @fabpot

    [Console] fixed some CS

    fabpot authored
Commits on Oct 29, 2011
  1. @fabpot

    merged 2.0

    fabpot authored
Commits on Sep 29, 2011
  1. @fabpot
Commits on Mar 11, 2011
  1. @fabpot
Commits on Mar 6, 2011
  1. @fabpot
Commits on Nov 25, 2010
  1. @fabpot

    made some method name changes to have a better coherence throughout t…

    fabpot authored
    …he framework
    
    When an object has a "main" many relation with related "things" (objects,
    parameters, ...), the method names are normalized:
    
     * get()
     * set()
     * all()
     * replace()
     * remove()
     * clear()
     * isEmpty()
     * add()
     * register()
     * count()
     * keys()
    
    The classes below follow this method naming convention:
    
     * BrowserKit\CookieJar -> Cookie
     * BrowserKit\History -> Request
     * Console\Application -> Command
     * Console\Application\Helper\HelperSet -> HelperInterface
     * DependencyInjection\Container -> services
     * DependencyInjection\ContainerBuilder -> services
     * DependencyInjection\ParameterBag\ParameterBag -> parameters
     * DependencyInjection\ParameterBag\FrozenParameterBag -> parameters
     * DomCrawler\Form -> FormField
     * EventDispatcher\Event -> parameters
     * Form\FieldGroup -> Field
     * HttpFoundation\HeaderBag -> headers
     * HttpFoundation\ParameterBag -> parameters
     * HttpFoundation\Session -> attributes
     * HttpKernel\Profiler\Profiler -> DataCollectorInterface
     * Routing\RouteCollection -> Route
     * Security\Authentication\AuthenticationProviderManager -> AuthenticationProviderInterface
     * Templating\Engine -> HelperInterface
     * Translation\MessageCatalogue -> messages
    
    The usage of these methods are only allowed when it is clear that there is a
    main relation:
    
     * a CookieJar has many Cookies;
    
     * a Container has many services and many parameters (as services is the main
       relation, we use the naming convention for this relation);
    
     * a Console Input has many arguments and many options. There is no "main"
       relation, and so the naming convention does not apply.
    
    For many relations where the convention does not apply, the following methods
    must be used instead (where XXX is the name of the related thing):
    
     * get()      -> getXXX()
     * set()      -> setXXX()
     * all()      -> getXXXs()
     * replace()  -> setXXXs()
     * remove()   -> removeXXX()
     * clear()    -> clearXXX()
     * isEmpty()  -> isEmptyXXX()
     * add()      -> addXXX()
     * register() -> registerXXX()
     * count()    -> countXXX()
     * keys()
Commits on Aug 20, 2010
  1. @fabpot
Something went wrong with that request. Please try again.