Merge branch '2.5' into 2.6

fabpot · fabpot · commit 6c39103b6f13 · 2015-01-03T09:01:59.000+01:00
* 2.5:
  Use PHPUnit ini_set wrapper in tests
  [Process] Added a test skip check for Windows
  [Process] Removed unused variable assignment
  Fixes various phpdoc and coding standards.
  Fixes Issue #13184 - incremental output getters now return empty strings
  Updated copyright to 2015
  Updated copyright to 2015
  Clarify a comment.

Conflicts:
	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
diff --git a/Acl/LICENSE b/Acl/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Core/LICENSE b/Core/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
@@ -11,11 +11,13 @@
 
 namespace Symfony\Component\Security\Core\Util;
 
+use Doctrine\Common\Util\ClassUtils as DoctrineClassUtils;
+
 /**
  * Class related functionality for objects that
  * might or might not be proxy objects at the moment.
  *
- * @see Doctrine\Common\Util\ClassUtils
+ * @see DoctrineClassUtils
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  * @author Johannes Schmitt <schmittjoh@gmail.com>
diff --git a/Csrf/LICENSE b/Csrf/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Http/LICENSE b/Http/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2004-2014 Fabien Potencier`
	`1`	`+Copyright (c) 2004-2015 Fabien Potencier`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Core\Util;`
`13`	`13`
	`14`	`+use Doctrine\Common\Util\ClassUtils as DoctrineClassUtils;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Class related functionality for objects that`
`16`	`18`	`* might or might not be proxy objects at the moment.`
`17`	`19`	`*`
`18`		`- * @see Doctrine\Common\Util\ClassUtils`
	`20`	`+ * @see DoctrineClassUtils`
`19`	`21`	`*`
`20`	`22`	`* @author Benjamin Eberlei <[email protected]>`
`21`	`23`	`* @author Johannes Schmitt <[email protected]>`