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.
symfony/src/Symfony/Bundle/FrameworkBundle
Nicolas Grekas 3c40825202 Merge branch '2.8' into 3.0
* 2.8: (22 commits)
  Fix backport
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
  [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests
  [PropertyAccess] Fix isPropertyWritable not using the reflection cache
  [PropertyAccess] Backport fixes from 2.7
  [FrameworkBundle][2.8] Add tests for the Controller class
  [DependencyInjection] Update changelog
  Added WebProfiler toolbar ajax panel table layout css.
  [Validator] use correct term for a property in docblock (not "option")
  [Routing] small refactoring for scheme requirement
  [PropertyAccess] Remove most ref mismatches to improve perf
  [PropertyInfo] Support Doctrine custom mapping type in DoctrineExtractor
  [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
  [NumberFormatter] Fix invalid numeric literal on PHP 7
  [Process] fix docblock syntax
  use the clock mock for progress indicator tests
  Use XML_ELEMENT_NODE in nodeType check
  [PropertyAccess] Reduce overhead of UnexpectedTypeException tracking
  [PropertyAccess] Throw an UnexpectedTypeException when the type do not match
  [FrameworkBundle] Add tests for the Controller class
  ...

Conflicts:
	.travis.yml
	composer.json
	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
2016-03-23 14:23:25 +01:00
..
CacheWarmer [FrameworkBundle] Fix ClassCacheWarme when classes.php is already warmed 2015-10-23 11:38:55 +02:00
Command Merge branch '2.8' into 3.0 2016-02-13 10:23:44 +01:00
Console Merge branch '2.8' into 3.0 2016-02-23 16:16:06 +01:00
Controller Remove unused imports 2016-01-21 00:01:55 +02:00
DataCollector [3.0] Various deprecations cleanups 2015-10-06 09:31:12 +02:00
DependencyInjection Merge branch '2.8' into 3.0 2016-03-16 16:33:32 +01:00
EventListener [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
HttpCache Silence invasive deprecation warnings, opt-in for warnings 2015-06-08 10:37:21 +01:00
Kernel added a micro kernel 2015-11-04 18:19:57 +01:00
Resources Merge branch '2.8' into 3.0 2016-03-16 16:33:32 +01:00
Routing Merge branch '2.8' 2015-10-07 09:44:07 +02:00
Templating Merge branch '2.8' into 3.0 2016-03-04 08:55:57 +01:00
Test Merge branch '2.7' into 2.8 2016-01-07 14:38:40 +01:00
Tests Merge branch '2.8' into 3.0 2016-03-23 14:23:25 +01:00
Translation Merge branch '2.8' into 3.0 2016-01-20 13:18:23 +01:00
Validator [Validator] Removed legacy validator classes 2014-08-06 15:23:29 +02:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md Merge branch '2.8' 2015-10-01 18:50:30 +02:00
Client.php Merge branch '2.3' into 2.7 2016-03-16 17:00:15 +01:00
composer.json Merge branch '2.8' into 3.0 2016-03-23 14:23:25 +01:00
FrameworkBundle.php Merge branch '2.8' 2015-10-23 17:08:51 +02:00
LICENSE Move licenses according to new best practices 2016-01-31 22:16:42 +01:00
phpunit.xml.dist Add missing exclusions from phpunit.xml.dist 2015-11-18 09:19:46 +01:00
README.md add readme files where missing 2016-03-07 11:36:15 +01:00