Skip to content
Commits on Jan 23, 2016
  1. @Ener-Getick

    Merge branch '1.8' into master

    Ener-Getick committed
    Conflicts:
    	Context/Adapter/JMSContextAdapter.php
    	Context/Context.php
    	Controller/ExceptionController.php
    	DependencyInjection/Compiler/SerializerConfigurationPass.php
    	EventListener/ViewResponseListener.php
    	Request/AbstractRequestBodyParamConverter.php
    	Tests/Context/ContextTest.php
    	Tests/DependencyInjection/Compiler/SerializerConfigurationPassTest.php
    	Tests/EventListener/ViewResponseListenerTest.php
    	Tests/Fixtures/Controller/AnnotatedConditionalUsersController.php
    	Tests/Fixtures/Controller/AnnotatedPrefixedController.php
    	Tests/Fixtures/Controller/ArticleController.php
    	Tests/Request/AbstractRequestBodyParamConverterTest.php
    	Tests/Request/RequestBodyParamConverter20Test.php
    	Tests/Request/RequestBodyParamConverterTest.php
    	Tests/View/JsonpHandlerTest.php
    	Tests/View/ViewHandlerTest.php
    	View/View.php
    	View/ViewHandler.php
Commits on Jan 22, 2016
  1. @xabbuh
  2. @Ener-Getick

    Merge branch '1.7' in 1.8

    Ener-Getick committed
    Conflicts:
    	EventListener/ViewResponseListener.php
    	Tests/Functional/Bundle/TestBundle/Controller/ArticleController.php
    	Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
    	Tests/Functional/ViewResponseListenerTest.php
    	View/ViewHandler.php
Commits on Jan 15, 2016
  1. @Ener-Getick
Commits on Jan 8, 2016
  1. @Ener-Getick

    Fix #1301

    Ener-Getick committed
Commits on Dec 31, 2015
  1. @kherge

    Removing conflicting validation rule.

    kherge committed
    While PR #321 added support for using both serialization groups and versions, the configuration validation was not updated to reflect these changes. This commit simply removes the specific validation rule that is affected.
  2. @xabbuh

    make Twig exception controller service public

    xabbuh committed
    The controller resolver in the Symfony FrameworkBundle lazy loads
    controllers as services. Thus, the Twig exception controller service
    must be `public` and we must remove it in a compiler pass in case the
    injected `templating.engine.twig` service definition does not exist.
Commits on Dec 29, 2015
  1. @lsmith77
Commits on Dec 28, 2015
  1. @Ener-Getick

    Merge branch 'service-container' of https://github.com/xabbuh/FOSRest…

    Ener-Getick committed
    …Bundle into service-container
    
    Conflicts:
    	EventListener/ViewResponseListener.php
    	Request/ParamFetcher.php
    	Tests/Request/ParamFetcherTest.php
Commits on Dec 24, 2015
  1. @Ener-Getick

    Merge 01d95a8 in master

    Ener-Getick committed
Commits on Dec 21, 2015
  1. @Ener-Getick

    Fix a bug in FOSRestExtension

    Ener-Getick committed
    ``fos_rest.converter.request_body`` is always touched even if it doesn't exist in ``loadSerializer``.
  2. @Ener-Getick

    Support versioning from different channels

    Ener-Getick committed
    Conflicts:
    	DependencyInjection/Configuration.php
    	DependencyInjection/FOSRestExtension.php
    	EventListener/VersionListener.php
    	Resources/config/format_listener.xml
    	Resources/doc/format_listener.rst
    	Tests/DependencyInjection/FOSRestExtensionTest.php
    	Tests/EventListener/VersionListenerTest.php
    	Tests/Functional/app/Configuration/config.yml
    
    Conflicts:
    	Resources/doc/3-listener-support.rst
    	Resources/doc/format_listener.rst
Commits on Dec 20, 2015
  1. @Ener-Getick
Commits on Dec 7, 2015
  1. @xabbuh

    stop injecting the container when possible

    xabbuh committed
    Injecting the container in your services is not a good practice. After
    this, there are only three classes left that rely on the container being
    injected: The `RestRouteLoader` class needs it to resolve controllers
    registered as services, the `ParamFetcher` class injects the container
    into container aware `ParamInterface` implementations, and the parent
    class of the `ViewResponseListener` uses the container.
Commits on Dec 5, 2015
  1. @Ener-Getick

    Bump php version to 5.5

    Ener-Getick committed
Commits on Nov 28, 2015
  1. @Ener-Getick
Commits on Nov 13, 2015
  1. @jhcasado

    Patched zone creations

    jhcasado committed
    I was having this problems to generate de cache using one zone:
    Warning: substr() expects parameter 1 to be string, object given
    
    With --no-debug:
    PHP Warning:  strpos() expects parameter 1 to be string, object given in /home/r00t/Workspace/corporapp/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php on line 563
    PHP Warning:  ltrim() expects parameter 1 to be string, object given in /home/r00t/Workspace/corporapp/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php on line 563
    PHP Warning:  ltrim() expects parameter 1 to be string, object given in /home/r00t/Workspace/corporapp/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php on line 563
    PHP Warning:  substr() expects parameter 1 to be string, object given in /home/r00t/Workspace/corporapp/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php on line 371
    
    The service is already registered, we only want to add new definitions of the service with different arguments.
Commits on Nov 10, 2015
  1. @Ener-Getick
  2. @florianv @lsmith77

    Introduced the zone concept

    florianv committed with lsmith77
Commits on Oct 21, 2015
  1. @Ener-Getick

    Fix an error

    Ener-Getick committed
  2. @Ener-Getick

    Use a container parameter

    Ener-Getick committed
Commits on Oct 19, 2015
  1. @Ener-Getick

    Create a new test

    Ener-Getick committed
  2. @Ener-Getick

    Use Extension::prepend

    Ener-Getick committed
  3. @Ener-Getick
Commits on Oct 18, 2015
  1. @Ener-Getick
  2. @Ener-Getick
  3. @Ener-Getick

    Fix several errors

    Ener-Getick committed
  4. @Ener-Getick

    Create a new test

    Ener-Getick committed
Commits on Oct 12, 2015
  1. @Soullivaneuh

    Fix CS

    Soullivaneuh committed with Soullivaneuh
       1) Tests/EventListener/BodyListenerTest.php (phpdoc_scalar, phpdoc_short_description, phpdoc_params)
       2) Tests/EventListener/MimeTypeListenerTest.php (phpdoc_short_description)
       3) Tests/EventListener/ParamFetcherListenerTest.php (phpdoc_short_description)
       4) Tests/EventListener/AccessDeniedListenerTest.php (phpdoc_short_description, phpdoc_separation, unalign_double_arrow)
       5) Tests/EventListener/ViewResponseListenerTest.php (phpdoc_short_description)
       6) Tests/EventListener/FormatListenerTest.php (single_array_no_trailing_comma, phpdoc_short_description, trim_array_spaces, function_call_space)
       7) Tests/Decoder/JsonToFormDecoderTest.php (phpdoc_short_description)
       8) Tests/Fixtures/Controller/AnnotatedUsersController.php (single_line_after_imports, phpdoc_trim, braces)
       9) Tests/Fixtures/Controller/OrdersController.php (braces)
      10) Tests/Fixtures/Controller/MediaController.php (braces)
      11) Tests/Fixtures/Controller/AnnotatedConditionalUsersController.php (single_line_after_imports, phpdoc_trim, braces)
      12) Tests/Fixtures/Controller/ArticleController.php (braces)
      13) Tests/Fixtures/Controller/AnnotatedPrefixedController.php (single_line_after_imports, braces)
      14) Tests/Fixtures/Controller/UserTopicCommentsController.php (braces)
      15) Tests/Fixtures/Controller/ReportController.php (phpdoc_no_package, phpdoc_short_description, no_blank_lines_after_class_opening, phpdoc_trim)
      16) Tests/Fixtures/Controller/UsersController.php (braces)
      17) Tests/Fixtures/Controller/UserTopicsController.php (braces)
      18) Tests/Fixtures/Controller/InformationController.php (braces)
      19) Tests/Fixtures/Controller/ParamFetcherController.php (phpdoc_short_description, header_comment, braces)
      20) Tests/View/ViewTest.php (phpdoc_short_description, multiline_array_trailing_comma, function_declaration)
      21) Tests/View/ViewHandlerTest.php (single_quote, phpdoc_short_description, phpdoc_separation, return, multiline_array_trailing_comma, unalign_double_arrow, function_declaration, braces)
      22) Tests/View/JsonpHandlerTest.php (phpdoc_short_description, unalign_double_arrow)
      23) Tests/Routing/Loader/RestRouteLoaderTest.php (phpdoc_short_description, unalign_equals, method_argument_space, braces)
      24) Tests/Routing/Loader/RestYamlCollectionLoaderTest.php (unalign_equals, unalign_double_arrow)
      25) Tests/Routing/Loader/LoaderTest.php (phpdoc_short_description)
      26) Tests/Routing/Loader/RestXmlCollectionLoaderTest.php (unalign_equals, unalign_double_arrow)
      27) Tests/Request/ParamFetcherTest.php (single_quote, phpdoc_short_description, phpdoc_separation, unalign_equals, multiline_array_trailing_comma, method_argument_space, braces)
      28) Tests/Controller/Annotations/QueryParamTest.php (phpdoc_short_description, braces, eof_ending)
      29) Tests/Controller/Annotations/RequestParamTest.php (phpdoc_short_description)
      30) Tests/DependencyInjection/Compiler/FormatListenerRulesPassTest.php (parenthesis)
      31) Tests/DependencyInjection/Compiler/SerializerConfigurationPassTest.php (phpdoc_short_description, multiline_array_trailing_comma, extra_empty_lines)
      32) Tests/DependencyInjection/Compiler/ConfigurationCheckPassTest.php (phpdoc_short_description)
      33) Tests/DependencyInjection/FOSRestExtensionTest.php (unalign_equals, multiline_array_trailing_comma, unalign_double_arrow)
      34) Tests/Util/ViolationFormatterTest.php (single_quote)
      35) Tests/bootstrap.php (single_line_after_imports)
      36) Tests/FOSRestBundleTest.php (phpdoc_short_description)
      37) Tests/Functional/app/JMSSerializer/bundles.php (multiline_array_trailing_comma, header_comment)
      38) Tests/Functional/app/Serializer/bundles.php (multiline_array_trailing_comma, header_comment)
      39) Tests/Functional/app/RequestBodyParamConverter/bundles.php (header_comment)
      40) Tests/Functional/app/AppKernel.php (header_comment)
      41) Tests/Functional/WebTestCase.php (header_comment)
      42) Tests/Functional/SerializerErrorTest.php (return, header_comment)
      43) Tests/Functional/Bundle/TestBundle/Controller/SerializerErrorController.php (multiline_array_trailing_comma)
      44) EventListener/BodyListener.php (phpdoc_short_description, phpdoc_separation)
      45) EventListener/AccessDeniedListener.php (phpdoc_short_description)
      46) EventListener/MimeTypeListener.php (phpdoc_short_description)
      47) EventListener/FormatListener.php (single_quote, phpdoc_short_description, braces)
      48) EventListener/AllowedMethodsListener.php (phpdoc_short_description, braces)
      49) EventListener/ParamFetcherListener.php (return)
      50) Decoder/JsonToFormDecoder.php (phpdoc_short_description, header_comment)
      51) Decoder/DecoderProviderInterface.php (phpdoc_short_description, header_comment)
      52) Decoder/XmlDecoder.php (empty_return, header_comment)
      53) Decoder/JsonDecoder.php (header_comment)
      54) Decoder/DecoderInterface.php (phpdoc_short_description, header_comment)
      55) View/ViewHandlerInterface.php (phpdoc_short_description)
      56) View/JsonpHandler.php (phpdoc_short_description, unalign_equals)
      57) View/ConfigurableViewHandlerInterface.php (phpdoc_short_description)
      58) View/View.php (phpdoc_short_description, phpdoc_params)
      59) View/ViewHandler.php (phpdoc_short_description, unalign_double_arrow, braces)
      60) Normalizer/CamelKeysNormalizer.php (header_comment)
      61) Normalizer/ArrayNormalizerInterface.php (header_comment)
      62) Normalizer/Exception/NormalizationException.php (header_comment)
      63) Routing/RestRouteCollection.php (unary_operators_spaces, parenthesis, braces)
      64) Routing/Loader/RestYamlCollectionLoader.php (single_quote, unalign_equals, phpdoc_params, braces)
      65) Routing/Loader/Reader/RestActionReader.php (single_quote, operators_spaces, unalign_equals, multiline_array_trailing_comma, parenthesis, braces)
      66) Routing/Loader/Reader/RestControllerReader.php (unalign_equals)
      67) Routing/Loader/RestRouteLoader.php (pre_increment, unalign_equals, list_commas)
      68) Routing/Loader/RestXmlCollectionLoader.php (pre_increment, phpdoc_inline_tag, unalign_equals)
      69) Request/RequestBodyParamConverter.php (phpdoc_inline_tag)
      70) Request/ParamReaderInterface.php (phpdoc_short_description, phpdoc_trim)
      71) Request/ParamFetcherInterface.php (phpdoc_no_empty_return, phpdoc_trim)
      72) Request/AbstractRequestBodyParamConverter.php (phpdoc_params, eof_ending)
      73) Request/ParamFetcher.php (single_quote, phpdoc_short_description, phpdoc_inline_tag, return, unalign_equals, multiline_array_trailing_comma, phpdoc_params, braces)
      74) Request/RequestBodyParamConverter20.php (phpdoc_short_description, phpdoc_inline_tag)
      75) Request/ParamReader.php (phpdoc_short_description, phpdoc_inline_tag, phpdoc_trim)
      76) Controller/Annotations/Link.php (phpdoc_separation)
      77) Controller/Annotations/NoRoute.php (phpdoc_short_description, phpdoc_separation)
      78) Controller/Annotations/Prefix.php (phpdoc_separation)
      79) Controller/Annotations/Post.php (phpdoc_separation)
      80) Controller/Annotations/RouteResource.php (phpdoc_separation)
      81) Controller/Annotations/Patch.php (phpdoc_separation)
      82) Controller/Annotations/Route.php (empty_return, phpdoc_separation)
      83) Controller/Annotations/Delete.php (phpdoc_separation)
      84) Controller/Annotations/Options.php (phpdoc_separation)
      85) Controller/Annotations/RequestParam.php (phpdoc_separation)
      86) Controller/Annotations/Put.php (phpdoc_separation)
      87) Controller/Annotations/QueryParam.php (phpdoc_separation)
      88) Controller/Annotations/Head.php (phpdoc_separation)
      89) Controller/Annotations/View.php (phpdoc_var_without_name, phpdoc_separation)
      90) Controller/Annotations/NamePrefix.php (phpdoc_separation)
      91) Controller/Annotations/Get.php (phpdoc_separation)
      92) Controller/Annotations/Unlink.php (phpdoc_separation)
      93) Controller/ExceptionController.php (phpdoc_to_comment, single_quote, phpdoc_short_description, unalign_equals)
      94) Form/Transformer/EntityToIdObjectTransformer.php (single_quote, phpdoc_short_description, empty_return, phpdoc_separation, no_blank_lines_after_class_opening, phpdoc_params, braces)
      95) Form/Extension/DisableCSRFExtension.php (phpdoc_short_description)
      96) Response/AllowedMethodsLoader/AllowedMethodsLoaderInterface.php (phpdoc_short_description)
      97) Response/AllowedMethodsLoader/AllowedMethodsRouterLoader.php (phpdoc_short_description, unalign_equals, unalign_double_arrow, braces)
      98) DependencyInjection/Compiler/CsrfExtensionPass.php (braces)
      99) DependencyInjection/Compiler/TwigExceptionPass.php (phpdoc_short_description)
     100) DependencyInjection/FOSRestExtension.php (phpdoc_short_description, phpdoc_inline_tag, braces)
     101) DependencyInjection/Configuration.php (trailing_spaces, phpdoc_short_description, return, function_declaration, braces)
     102) Resources/doc/examples/RssHandler.php (single_quote, phpdoc_separation, unalign_double_arrow, header_comment, parenthesis)
     103) Util/ViolationFormatter.php (header_comment, braces)
     104) Util/FormatNegotiatorInterface.php (header_comment)
     105) Util/ViolationFormatterInterface.php (phpdoc_short_description, header_comment)
     106) Util/StopFormatListenerException.php (phpdoc_short_description, header_comment)
     107) Util/FormatNegotiator.php (empty_return, header_comment)
     108) Util/MediaTypeNegotiatorInterface.php (header_comment)
     109) Util/Inflector/DoctrineInflector.php (phpdoc_short_description, header_comment)
     110) Util/Inflector/InflectorInterface.php (phpdoc_short_description, header_comment)
     111) Util/Codes.php (header_comment)
Commits on Oct 7, 2015
  1. @xabbuh
Commits on Oct 6, 2015
  1. @lsmith77
  2. @lsmith77
Commits on Oct 4, 2015
  1. @lsmith77
Commits on Sep 14, 2015
  1. @lsmith77 @StyleCIBot

    Applied fixes from StyleCI

    lsmith77 committed with StyleCIBot
  2. @lsmith77 @StyleCIBot

    Applied fixes from StyleCI

    lsmith77 committed with StyleCIBot
Something went wrong with that request. Please try again.