Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6b738fd

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8'
* 2.8: (61 commits) [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups [2.6][Translator] Extend, refactor and simplify Translator tests. [VarDumper] Allow preserving a subset of cut arrays [Console] Bind the closure (code) to the Command if possible [VarDumper] Added support for SplFileObject [VarDumper] Added support for SplFileInfo Update DebugClassLoader.php inject asset packages in assets helper service [travis] Do not exclude legacy tests on 2.7 [HttpFoundation] remove getExtension method [2.6][Translation] fix legacy tests. [Form] Removed remaining deprecation notices in the test suite [Form] Moved deprecation notice triggers to file level [Debug] Map PHP errors to LogLevel::CRITICAL [FrameworkBundle][Server Command] add address port number option. [Routing][DependencyInjection] Support .yaml extension in YAML loaders [DX] improve file loader error for router/other resources in bundle [FrameworkBundle] Initialize translator with the default locale. [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors [2.7][Translation] remove duplicate code for loading catalogue. ... Conflicts: composer.json src/Symfony/Bridge/Swiftmailer/composer.json src/Symfony/Component/Console/Helper/DialogHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php src/Symfony/Component/Locale/composer.json
2 parents a541193 + f5a0ac2 commit 6b738fd

File tree

170 files changed

+1368
-1347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+1368
-1347
lines changed

‎UPGRADE-2.7.md‎

Lines changed: 0 additions & 530 deletions
This file was deleted.

‎composer.json‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,18 @@
7272
"doctrine/orm": "~2.2,>=2.2.3",
7373
"doctrine/doctrine-bundle": "~1.2",
7474
"monolog/monolog": "~1.11",
75-
"propel/propel1": "~1.6",
7675
"ocramius/proxy-manager": "~0.4|~1.0",
7776
"egulias/email-validator": "~1.2"
7877
},
7978
"autoload": {
80-
"psr-0": {
81-
"Symfony\\Bridge\\Doctrine\\": "src/",
82-
"Symfony\\Bridge\\Monolog\\": "src/",
83-
"Symfony\\Bridge\\ProxyManager\\": "src/",
84-
"Symfony\\Bridge\\Swiftmailer\\": "src/",
85-
"Symfony\\Bridge\\Twig\\": "src/",
86-
"Symfony\\Bundle\\": "src/",
87-
"Symfony\\Component\\": "src/"
79+
"psr-4": {
80+
"Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
81+
"Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
82+
"Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
83+
"Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
84+
"Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
85+
"Symfony\\Bundle\\": "src/Symfony/Bundle/",
86+
"Symfony\\Component\\": "src/Symfony/Component/"
8887
},
8988
"classmap": [
9089
"src/Symfony/Component/HttpFoundation/Resources/stubs",

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
1313

14+
trigger_error('The '.__NAMESPACE__.'\EntityChoiceList class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader instead.', E_USER_DEPRECATED);
15+
1416
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
1517
use Doctrine\Common\Persistence\ObjectManager;
1618
use Symfony\Component\Form\Exception\RuntimeException;
@@ -129,8 +131,6 @@ public function __construct(ObjectManager $manager, $class, $labelPath = null, E
129131
}
130132

131133
parent::__construct($entities, $labelPath, $preferredEntities, $groupPath, null, $propertyAccessor);
132-
133-
trigger_error('The '.__CLASS__.' class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader instead.', E_USER_DEPRECATED);
134134
}
135135

136136
/**

‎src/Symfony/Bridge/Doctrine/composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@
4242
"doctrine/orm": ""
4343
},
4444
"autoload": {
45-
"psr-0": { "Symfony\\Bridge\\Doctrine\\": "" }
45+
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" }
4646
},
47-
"target-dir": "Symfony/Bridge/Doctrine",
4847
"minimum-stability": "dev",
4948
"extra": {
5049
"branch-alias": {

‎src/Symfony/Bridge/Monolog/composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@
3131
"symfony/event-dispatcher": "Needed when using log messages in console commands."
3232
},
3333
"autoload": {
34-
"psr-0": { "Symfony\\Bridge\\Monolog\\": "" }
34+
"psr-4": { "Symfony\\Bridge\\Monolog\\": "" }
3535
},
36-
"target-dir": "Symfony/Bridge/Monolog",
3736
"minimum-stability": "dev",
3837
"extra": {
3938
"branch-alias": {

‎src/Symfony/Bridge/PhpUnit/composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
},
2424
"autoload": {
2525
"files": [ "bootstrap.php" ],
26-
"psr-0": { "Symfony\\Bridge\\PhpUnit\\": "" }
26+
"psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" }
2727
},
28-
"target-dir": "Symfony/Bridge/PhpUnit",
2928
"minimum-stability": "dev",
3029
"extra": {
3130
"branch-alias": {

‎src/Symfony/Bridge/ProxyManager/composer.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@
2525
"symfony/config": "~2.8|~3.0"
2626
},
2727
"autoload": {
28-
"psr-0": {
29-
"Symfony\\Bridge\\ProxyManager\\": ""
30-
}
28+
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" }
3129
},
32-
"target-dir": "Symfony/Bridge/ProxyManager",
3330
"minimum-stability": "dev",
3431
"extra": {
3532
"branch-alias": {

‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function abbrClass($class)
5858
$parts = explode('\\', $class);
5959
$short = array_pop($parts);
6060

61-
return sprintf("<abbr title=\"%s\">%s</abbr>", $class, $short);
61+
return sprintf('<abbr title="%s">%s</abbr>', $class, $short);
6262
}
6363

6464
public function abbrMethod($method)
@@ -67,9 +67,9 @@ public function abbrMethod($method)
6767
list($class, $method) = explode('::', $method, 2);
6868
$result = sprintf('%s::%s()', $this->abbrClass($class), $method);
6969
} elseif ('Closure' === $method) {
70-
$result = sprintf("<abbr title=\"%s\">%s</abbr>", $method, $method);
70+
$result = sprintf('<abbr title="%s">%s</abbr>', $method, $method);
7171
} else {
72-
$result = sprintf("<abbr title=\"%s\">%s</abbr>()", $method, $method);
72+
$result = sprintf('<abbr title="%s">%s</abbr>()', $method, $method);
7373
}
7474

7575
return $result;
@@ -89,7 +89,7 @@ public function formatArgs($args)
8989
if ('object' === $item[0]) {
9090
$parts = explode('\\', $item[1]);
9191
$short = array_pop($parts);
92-
$formattedValue = sprintf("<em>object</em>(<abbr title=\"%s\">%s</abbr>)", $item[1], $short);
92+
$formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
9393
} elseif ('array' === $item[0]) {
9494
$formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
9595
} elseif ('string' === $item[0]) {

‎src/Symfony/Bridge/Twig/Node/RenderBlockNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Bridge\Twig\Node;
1313

1414
/**
15-
* Compiles a call to {@link FormRendererInterface::renderBlock()}.
15+
* Compiles a call to {@link \Symfony\Component\Form\FormRendererInterface::renderBlock()}.
1616
*
1717
* The function name is used as block name. For example, if the function name
1818
* is "foo", the block "foo" will be rendered.

‎src/Symfony/Bridge/Twig/composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@
5151
"symfony/expression-language": "For using the ExpressionExtension"
5252
},
5353
"autoload": {
54-
"psr-0": { "Symfony\\Bridge\\Twig\\": "" }
54+
"psr-4": { "Symfony\\Bridge\\Twig\\": "" }
5555
},
56-
"target-dir": "Symfony/Bridge/Twig",
5756
"minimum-stability": "dev",
5857
"extra": {
5958
"branch-alias": {

0 commit comments

Comments
 (0)