Skip to content

Commit 166019a

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: 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 Updated copyright to 2015 [VarDumper] increase debug.max_items to 2500 [Debug] Update exception messages. use value of DIRECTORY_SEPARATOR to detect Windows force ExpressionLanguage version >= 2.6 [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders. Clarify a comment. use PHP_WINDOWS_VERSION_BUILD to detect Windows Check if a field type_class is defined before using it. Currently if you want to use inline bootstrap form rendering, this is usually enough: Conflicts: src/Symfony/Component/Debug/composer.json
2 parents c4df70b + 30e03c5 commit 166019a

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

ConstraintViolationInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function getMessageTemplate();
6565
* @return array A possibly empty list of parameters indexed by the names
6666
* that appear in the message template.
6767
*
68-
* @see getMessageTemplate
68+
* @see getMessageTemplate()
6969
*
7070
* @api
7171
*/

GlobalExecutionContextInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getViolations();
4646
*
4747
* @return mixed The root value.
4848
*
49-
* @see ExecutionContextInterface::getRoot
49+
* @see ExecutionContextInterface::getRoot()
5050
*/
5151
public function getRoot();
5252

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2014 Fabien Potencier
1+
Copyright (c) 2004-2015 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

Mapping/Loader/FilesLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*
1919
* @author Bulat Shakirzyanov <[email protected]>
2020
*
21-
* @see Symfony\Component\Validator\Mapping\Loader\YamlFileLoader
22-
* @see Symfony\Component\Validator\Mapping\Loader\XmlFileLoader
21+
* @see YamlFileLoader
22+
* @see XmlFileLoader
2323
*/
2424
abstract class FilesLoader extends LoaderChain
2525
{

Mapping/Loader/XmlFilesLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @author Bulat Shakirzyanov <[email protected]>
1818
*
19-
* @see Symfony\Component\Validator\Mapping\Loader\FilesLoader
19+
* @see FilesLoader
2020
*/
2121
class XmlFilesLoader extends FilesLoader
2222
{

Mapping/Loader/YamlFilesLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @author Bulat Shakirzyanov <[email protected]>
1818
*
19-
* @see Symfony\Component\Validator\Mapping\Loader\FilesLoader
19+
* @see FilesLoader
2020
*/
2121
class YamlFilesLoader extends FilesLoader
2222
{

0 commit comments

Comments
 (0)