[VarDumper] inline exclude verbose casting

jschaedl · jschaedl · commit f004d686dbd9 · 2018-09-23T18:08:08.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Caster/IntlCaster.php b/src/Symfony/Component/VarDumper/Caster/IntlCaster.php
@@ -135,16 +135,7 @@ public static function castIntlCalendar(\IntlCalendar $c, array $a, Stub $stub,
             Caster::PREFIX_VIRTUAL.'type' => $c->getType(),
             Caster::PREFIX_VIRTUAL.'in_daylight_time' => $c->inDaylightTime(),
             Caster::PREFIX_VIRTUAL.'is_lenient' => $c->isLenient(),
-        );
-
-        if ($filter & Caster::EXCLUDE_VERBOSE) {
-            ++$stub->cut;
-
-            return self::castError($c, $a);
-        }
-
-        $a += array(
-            Caster::PREFIX_VIRTUAL.'time_zone' => $c->getTimeZone(),
+            Caster::PREFIX_VIRTUAL.'time_zone' => ($filter & Caster::EXCLUDE_VERBOSE) ? new CutStub($c->getTimeZone()) : $c->getTimeZone()
         );
 
         return self::castError($c, $a);
@@ -159,17 +150,8 @@ public static function castIntlDateFormatter(\IntlDateFormatter $c, array $a, St
             Caster::PREFIX_VIRTUAL.'time_zone_id' => $c->getTimeZoneId(),
             Caster::PREFIX_VIRTUAL.'time_type' => $c->getTimeType(),
             Caster::PREFIX_VIRTUAL.'date_type' => $c->getDateType(),
-        );
-
-        if ($filter & Caster::EXCLUDE_VERBOSE) {
-            $stub->cut += 2;
-
-            return self::castError($c, $a);
-        }
-
-        $a += array(
-            Caster::PREFIX_VIRTUAL.'calendar_object' => $c->getCalendarObject(),
-            Caster::PREFIX_VIRTUAL.'time_zone' => $c->getTimeZone(),
+            Caster::PREFIX_VIRTUAL.'calendar_object' => ($filter & Caster::EXCLUDE_VERBOSE) ? new CutStub($c->getCalendarObject()) : $c->getCalendarObject(),
+            Caster::PREFIX_VIRTUAL.'time_zone' => ($filter & Caster::EXCLUDE_VERBOSE) ? new CutStub($c->getTimeZone()) : $c->getTimeZone()
         );
 
         return self::castError($c, $a);
