Skip to content

Commit be8a0b1

Browse files
Merge branch '2.8' into 3.0
* 2.8: Drop hirak/prestissimo bumped Symfony version to 2.8.7 updated VERSION for 2.8.6 updated CHANGELOG for 2.8.6 bumped Symfony version to 2.7.14 updated VERSION for 2.7.13 updated CHANGELOG for 2.7.13 bumped Symfony version to 2.3.42 [Debug] Fix fatal error handlers on PHP 7 updated VERSION for 2.3.41 update CONTRIBUTORS for 2.3.41 updated CHANGELOG for 2.3.41 Conflicts: CHANGELOG-2.3.md CHANGELOG-2.7.md CHANGELOG-3.0.md appveyor.yml src/Symfony/Component/HttpKernel/Kernel.php
2 parents eadfc93 + c96d76d commit be8a0b1

File tree

8 files changed

+32
-89
lines changed

8 files changed

+32
-89
lines changed

.composer/composer.json

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

.composer/composer.lock

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

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ before_install:
5050
- if [[ ! $skip && $PHP != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi
5151
- if [[ ! $skip && $PHP != hhvm ]]; then phpenv config-rm xdebug.ini; fi
5252
- if [[ ! $skip ]]; then composer self-update --stable; fi
53-
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; composer global install; fi
53+
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; fi
5454
- if [[ ! $skip ]]; then ./phpunit install; fi
55-
- if [[ ! $skip && $deps ]]; then composer global remove hirak/prestissimo; fi
5655
- if [[ ! $skip ]]; then export PHPUNIT=$(readlink -f ./phpunit); fi
5756

5857
install:

CONTRIBUTORS.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Symfony is the result of the work of many people who made the code better
4040
- Alexandre Salomé (alexandresalome)
4141
- William Durand (couac)
4242
- ornicar
43+
- Jules Pietri (heah)
4344
- stealth35 ‏ (stealth35)
4445
- Alexander Mols (asm89)
45-
- Jules Pietri (heah)
4646
- Francis Besset (francisbesset)
4747
- Bulat Shakirzyanov (avalanche123)
4848
- Saša Stamenković (umpirsky)
@@ -129,6 +129,7 @@ Symfony is the result of the work of many people who made the code better
129129
- Arnaud Kleinpeter (nanocom)
130130
- Joel Wurtz (brouznouf)
131131
- Philipp Wahala (hifi)
132+
- Titouan Galopin (tgalopin)
132133
- Richard Shank (iampersistent)
133134
- Thomas Rabaix (rande)
134135
- Vincent AUBERT (vincent)
@@ -141,7 +142,6 @@ Symfony is the result of the work of many people who made the code better
141142
- Michał Pipa (michal.pipa)
142143
- Amal Raghav (kertz)
143144
- Jonathan Ingram (jonathaningram)
144-
- Titouan Galopin (tgalopin)
145145
- Artur Kotyrba
146146
- Rouven Weßling (realityking)
147147
- Warnar Boekkooi (boekkooi)
@@ -240,6 +240,7 @@ Symfony is the result of the work of many people who made the code better
240240
- Michael Holm (hollo)
241241
- Marc Weistroff (futurecat)
242242
- Hidde Wieringa (hiddewie)
243+
- Daniel Espendiller
243244
- Chris Smith (cs278)
244245
- Florian Klein (docteurklein)
245246
- Manuel Kiessling (manuelkiessling)
@@ -436,6 +437,7 @@ Symfony is the result of the work of many people who made the code better
436437
- Benjamin Leveque (benji07)
437438
- Nate (frickenate)
438439
- jhonnyL
440+
- Jhonny Lidfors (jhonne)
439441
- sasezaki
440442
- Dawid Pakuła (zulusx)
441443
- Florian Rey (nervo)
@@ -611,7 +613,6 @@ Symfony is the result of the work of many people who made the code better
611613
- Adrien Lucas (adrienlucas)
612614
- James Michael DuPont
613615
- Tom Klingenberg
614-
- Jhonny Lidfors (jhonne)
615616
- Christopher Hall (mythmakr)
616617
- Paul Kamer (pkamer)
617618
- Rafał Wrzeszcz (rafalwrzeszcz)
@@ -904,7 +905,6 @@ Symfony is the result of the work of many people who made the code better
904905
- Albin Kerouaton
905906
- Sébastien HOUZÉ
906907
- Jingyu Wang
907-
- Daniel Espendiller
908908
- steveYeah
909909
- Samy Dindane (dinduks)
910910
- Keri Henare (kerihenare)
@@ -945,6 +945,7 @@ Symfony is the result of the work of many people who made the code better
945945
- Tadcka
946946
- Beth Binkovitz
947947
- Romain Geissler
948+
- Oliver Hoff
948949
- Tomaz Ahlin
949950
- Benjamin Cremer (bcremer)
950951
- Marcus Stöhr (dafish)
@@ -1302,6 +1303,7 @@ Symfony is the result of the work of many people who made the code better
13021303
- znerol
13031304
- Christian Eikermann
13041305
- Antonio Angelino
1306+
- Shawn Iwinski
13051307
- Vladimir Sazhin
13061308
- lol768
13071309
- jamogon

appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ init:
1818
install:
1919
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
2020
- cd c:\php
21-
- IF %PHP%==1 appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem
21+
- IF %PHP%==1 appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
2222
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.5.9-nts-Win32-VC11-x86.zip
2323
- IF %PHP%==1 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul
2424
- IF %PHP%==1 del /Q *.zip
@@ -46,12 +46,11 @@ install:
4646
- IF %PHP%==1 echo extension=php_ldap.dll >> php.ini-max
4747
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
4848
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
49-
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.2/composer.phar
49+
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.3/composer.phar
5050
- copy /Y php.ini-max php.ini
5151
- cd c:\projects\symfony
5252
- mkdir %APPDATA%\Composer
5353
- copy /Y .composer\* %APPDATA%\Composer\
54-
- composer global install --no-progress --ansi
5554
- php phpunit install
5655
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5756
- composer update --no-progress --ansi

src/Symfony/Component/Debug/ErrorHandler.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public function handleException($exception, array $error = null)
494494
}
495495
$type = $exception instanceof FatalErrorException ? $exception->getSeverity() : E_ERROR;
496496

497-
if ($this->loggedErrors & $type) {
497+
if (($this->loggedErrors & $type) || $exception instanceof FatalThrowableError) {
498498
$e = array(
499499
'type' => $type,
500500
'file' => $exception->getFile(),
@@ -521,9 +521,9 @@ public function handleException($exception, array $error = null)
521521
} else {
522522
$message = 'Uncaught Exception: '.$exception->getMessage();
523523
}
524-
if ($this->loggedErrors & $e['type']) {
525-
$this->loggers[$e['type']][0]->log($this->loggers[$e['type']][1], $message, $e);
526-
}
524+
}
525+
if ($this->loggedErrors & $type) {
526+
$this->loggers[$type][0]->log($this->loggers[$type][1], $message, $e);
527527
}
528528
if ($exception instanceof FatalErrorException && !$exception instanceof OutOfMemoryException && $error) {
529529
foreach ($this->getFatalErrorHandlers() as $handler) {

src/Symfony/Component/Debug/Exception/FatalThrowableError.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(\Throwable $e)
2727
$message = 'Type error: '.$e->getMessage();
2828
$severity = E_RECOVERABLE_ERROR;
2929
} else {
30-
$message = 'Fatal error: '.$e->getMessage();
30+
$message = $e->getMessage();
3131
$severity = E_ERROR;
3232
}
3333

src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,24 @@ public function testHandleFatalError()
448448
}
449449
}
450450

451+
/**
452+
* @requires PHP 7
453+
*/
454+
public function testHandleErrorException()
455+
{
456+
$exception = new \Error("Class 'Foo' not found");
457+
458+
$handler = new ErrorHandler();
459+
$handler->setExceptionHandler(function () use (&$args) {
460+
$args = func_get_args();
461+
});
462+
463+
$handler->handleException($exception);
464+
465+
$this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $args[0]);
466+
$this->assertSame("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement?", $args[0]->getMessage());
467+
}
468+
451469
public function testHandleFatalErrorOnHHVM()
452470
{
453471
try {

0 commit comments

Comments
 (0)