Fix psysh upgrade

Author: GrahamCampbell

composer.json

@@ -26,7 +26,7 @@
         "monolog/monolog": "~1.11",
         "mtdowling/cron-expression": "~1.0",
         "nesbot/carbon": "~1.19",
-        "psy/psysh": "0.5.*",
+        "psy/psysh": "~0.5.1",
         "swiftmailer/swiftmailer": "~5.1",
         "symfony/console": "2.7.*",
         "symfony/css-selector": "2.7.*",

src/Illuminate/Foundation/Console/Tinker/IlluminateCaster.php

@@ -3,16 +3,16 @@
 namespace Illuminate\Foundation\Console\Tinker\Casters;
 
 use Exception;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Application;
 use Illuminate\Support\Collection;
-use Symfony\Component\VarDumper\Caster\Caster;
+use Illuminate\Foundation\Application;
+use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\VarDumper\Cloner\Stub;
+use Symfony\Component\VarDumper\Caster\Caster;
 
 class FoundationCaster
 {
     /**
-     * Illuminate Application methods to include in the presenter.
+     * Illuminate application methods to include in the presenter.
      *
      * @var array
      */
@@ -34,9 +34,9 @@ class FoundationCaster
     ];
 
     /**
-     * Get an array representing the properties of an Application object.
+     * Get an array representing the properties of an application.
      *
-     * @param  Application  $value
+     * @param  \Illuminate\Foundation\Application  $app
      * @param  array  $a
      * @param  Stub  $stub
      * @param  bool  $isNested
@@ -49,21 +49,22 @@ public static function castApplication(Application $app, array $a, Stub $stub, $
 
         foreach (self::$appProperties as $property) {
             try {
-                $val = $value->$property();
-                if ( ! is_null($val)) {
+                $val = $app->$property();
+                if (!is_null($val)) {
                     $a[Caster::PREFIX_VIRTUAL . $property] = $val;
                 }
             } catch (Exception $e) {
+                //
             }
         }
 
         return $a;
     }
 
     /**
-     * Get an array representing the properties of a Collection.
+     * Get an array representing the properties of a collection.
      *
-     * @param  Collection  $value
+     * @param  \Illuminate\Support\Collection  $value
      * @param  array  $a
      * @param  Stub  $stub
      * @param  bool  $isNested
@@ -78,9 +79,9 @@ public static function castCollection(Collection $coll, array $a, Stub $stub, $i
     }
 
     /**
-     * Get an array representing the properties of a Model object.
+     * Get an array representing the properties of a model.
      *
-     * @param  Application  $value
+     * @param  \Illuminate\Database\Eloquent\Model  $model
      * @param  array  $a
      * @param  Stub  $stub
      * @param  bool  $isNested

src/Illuminate/Foundation/Console/TinkerCommand.php

@@ -73,15 +73,15 @@ protected function getCommands()
     }
 
     /**
-     * Get an array of Laravel tailored Casters.
+     * Get an array of Laravel tailored casters.
      *
      * @return array
      */
     protected function getCasters()
     {
         return [
-            'Illuminate\Foundation\Application' => 'Illuminate\Foundation\Console\Tinker\IlluminateCaster::castApplication',
-            'Illuminate\Support\Collection' => 'Illuminate\Foundation\Console\Tinker\IlluminateCaster::castCollection',
+            'Illuminate\Foundation\Application'  => 'Illuminate\Foundation\Console\Tinker\IlluminateCaster::castApplication',
+            'Illuminate\Support\Collection'      => 'Illuminate\Foundation\Console\Tinker\IlluminateCaster::castCollection',
             'Illuminate\Database\Eloquent\Model' => 'Illuminate\Foundation\Console\Tinker\IlluminateCaster::castModel',
         ];
     }