PHP7ize Laravel 4.2

Author: Joel Klaverkamp

composer.json

@@ -14,7 +14,7 @@
         "classpreloader/classpreloader": "~1.0.2",
         "d11wtq/boris": "~1.0",
         "ircmaxell/password-compat": "~1.0",
-        "filp/whoops": "1.1.*",
+        "filp/whoops": "2.*",
         "jeremeamia/superclosure": "~1.0.1",
         "monolog/monolog": "~1.6",
         "nesbot/carbon": "~1.0",

src/Illuminate/Exception/ExceptionDisplayerInterface.php

@@ -9,6 +9,6 @@ interface ExceptionDisplayerInterface {
 	 *
 	 * @param  \Exception  $exception
 	 */
-	public function display(Exception $exception);
+	public function display(\Throwable $exception);
 
 }

src/Illuminate/Exception/Handler.php

@@ -316,7 +316,7 @@ protected function hints(ReflectionFunction $reflection, $exception)
 	 * @param  \Exception  $e
 	 * @return string
 	 */
-	protected function formatException(\Exception $e)
+	protected function formatException(\Throwable $e)
 	{
 		if ($this->debug)
 		{

src/Illuminate/Exception/PlainDisplayer.php

@@ -12,7 +12,7 @@ class PlainDisplayer implements ExceptionDisplayerInterface {
 	 * @param  \Exception  $exception
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function display(Exception $exception)
+	public function display(\Throwable $exception)
 	{
 		$status = $exception instanceof HttpExceptionInterface ? $exception->getStatusCode() : 500;
 

src/Illuminate/Exception/SymfonyDisplayer.php

@@ -39,7 +39,7 @@ public function __construct(ExceptionHandler $symfony, $returnJson = false)
 	 * @param  \Exception  $exception
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function display(Exception $exception)
+	public function display(\Throwable $exception)
 	{
 		if ($this->returnJson)
 		{

src/Illuminate/Exception/WhoopsDisplayer.php

@@ -40,7 +40,7 @@ public function __construct(Run $whoops, $runningInConsole)
 	 * @param  \Exception  $exception
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function display(Exception $exception)
+	public function display(\Throwable $exception)
 	{
 		$status = $exception instanceof HttpExceptionInterface ? $exception->getStatusCode() : 500;
 

tests/Database/DatabaseConnectorTest.php

@@ -28,8 +28,7 @@ public function testMySqlConnectCallsCreateConnectionWithProperArguments($dsn, $
 		$connector->expects($this->once())->method('getOptions')->with($this->equalTo($config))->will($this->returnValue(array('options')));
 		$connector->expects($this->once())->method('createConnection')->with($this->equalTo($dsn), $this->equalTo($config), $this->equalTo(array('options')))->will($this->returnValue($connection));
 		$connection->shouldReceive('prepare')->once()->with('set names \'utf8\' collate \'utf8_unicode_ci\'')->andReturn($connection);
-		$connection->shouldReceive('prepare')->once()->with('set session sql_mode=\'\'')->andReturn($connection);
-		$connection->shouldReceive('execute')->times(2);
+		$connection->shouldReceive('execute')->once();
 		$connection->shouldReceive('exec')->zeroOrMoreTimes();
 		$result = $connector->connect($config);