diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
c4716d2511
symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php
History
Nicolas Grekas c4716d2511 Merge branch '2.7' into 2.8 
* 2.7:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
	src/Symfony/Component/Security/Acl/Model/AclInterface.php
	src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
	src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2016-06-06 13:11:27 +02:00
..
services1-1.php Merge branch '2.3' into 2.6 2015-03-27 11:19:51 +01:00
services1.php CS: general fixes 2015-03-25 00:47:08 +01:00
services8.php CS: general fixes 2015-03-25 00:47:08 +01:00
services9_compiled.php [DI] Allow to change the deprecation message in Definition 2015-09-24 10:53:13 +02:00
services9.php [DI] Allow to change the deprecation message in Definition 2015-09-24 10:53:13 +02:00
services10.php Merge branch '2.3' into 2.6 2015-04-27 14:43:05 +02:00
services12.php Merge branch '2.3' into 2.6 2015-04-27 14:43:05 +02:00
services13.php Fix merge 2016-06-06 11:00:08 +02:00
services19.php Fix merge 2015-03-27 19:02:17 +01:00
services20.php Fix merge 2015-03-27 19:18:01 +01:00
services24.php [DependencyInjection] Add autowiring support to dumpers 2015-11-03 15:47:58 -08:00
simple.php moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00