Skip to content

Commit 8477f2b

Browse files
nicolas-grekasnicolas-grekas
committed
minor symfony#32248 fix Debug component dependencies (xabbuh)
This PR was merged into the 3.4 branch. Discussion ---------- fix Debug component dependencies | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 87fe077 fix Debug component dependencies
2 parents bcc66e3 + 87fe077 commit 8477f2b

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"symfony/class-loader": "~3.2",
2323
"symfony/dependency-injection": "^3.4.24|^4.2.5",
2424
"symfony/config": "~3.4|~4.0",
25+
"symfony/debug": "~2.8|~3.0|~4.0",
2526
"symfony/event-dispatcher": "~3.4|~4.0",
2627
"symfony/http-foundation": "^3.3.11|~4.0",
2728
"symfony/http-kernel": "~3.4|~4.0",

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"require": {
1919
"php": "^5.5.9|>=7.0.8",
2020
"symfony/config": "~3.2|~4.0",
21+
"symfony/debug": "~2.8|~3.0|~4.0",
2122
"symfony/twig-bridge": "^3.4.3|^4.0.3",
2223
"symfony/http-foundation": "~2.8|~3.0|~4.0",
2324
"symfony/http-kernel": "^3.3|~4.0",

‎src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader
6161
}
6262

6363
$this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
64-
$this->assertSame($translatedMessage, $exception->getMessage());
64+
$this->assertRegExp($translatedMessage, $exception->getMessage());
6565
$this->assertSame($error['type'], $exception->getSeverity());
6666
$this->assertSame($error['file'], $exception->getFile());
6767
$this->assertSame($error['line'], $exception->getLine());
@@ -82,7 +82,7 @@ public function provideClassNotFoundData()
8282
'file' => 'foo.php',
8383
'message' => 'Class \'WhizBangFactory\' not found',
8484
],
85-
"Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?",
85+
"/^Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement\?$/",
8686
],
8787
[
8888
[
@@ -91,7 +91,7 @@ public function provideClassNotFoundData()
9191
'file' => 'foo.php',
9292
'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found',
9393
],
94-
"Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
94+
"/^Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for another namespace\?$/",
9595
],
9696
[
9797
[
@@ -100,7 +100,7 @@ public function provideClassNotFoundData()
100100
'file' => 'foo.php',
101101
'message' => 'Class \'UndefinedFunctionException\' not found',
102102
],
103-
"Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
103+
"/^Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for .*\"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
104104
],
105105
[
106106
[
@@ -109,7 +109,7 @@ public function provideClassNotFoundData()
109109
'file' => 'foo.php',
110110
'message' => 'Class \'PEARClass\' not found',
111111
],
112-
"Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"?",
112+
"/^Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"\?$/",
113113
],
114114
[
115115
[
@@ -118,7 +118,7 @@ public function provideClassNotFoundData()
118118
'file' => 'foo.php',
119119
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
120120
],
121-
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
121+
"/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for .*\"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
122122
],
123123
[
124124
[
@@ -127,7 +127,7 @@ public function provideClassNotFoundData()
127127
'file' => 'foo.php',
128128
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
129129
],
130-
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
130+
"/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for \"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?$/",
131131
[$autoloader, 'loadClass'],
132132
],
133133
[
@@ -137,7 +137,7 @@ public function provideClassNotFoundData()
137137
'file' => 'foo.php',
138138
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
139139
],
140-
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
140+
"/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for \"Symfony\\\\Component\\\\Debug\\\\Exception\\\\UndefinedFunctionException\"\?/",
141141
[$debugClassLoader, 'loadClass'],
142142
],
143143
[
@@ -147,7 +147,7 @@ public function provideClassNotFoundData()
147147
'file' => 'foo.php',
148148
'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
149149
],
150-
"Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
150+
"/^Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\\\Bar\".\nDid you forget a \"use\" statement for another namespace\?$/",
151151
function ($className) { /* do nothing here */ },
152152
],
153153
];

0 commit comments

Comments
 (0)