2.3/feature psr streams

Progress with the EntryBuilder and Formatter