merge + fix conflicts from phpdocblocks pr #93

Open

DavidGoodwin wants to merge 2 commits intoneitanod:masterfrom

DavidGoodwin:phpdocblock-pr-fix

Commits on Oct 19, 2021

merge + fix conflicts from phpdocblocks pr ( https://github.com/neitanod/forceutf8/pull/46 ) from https://github.com/Tyres91/forceutf8
DavidGoodwin
committed
fix failure to lint
DavidGoodwin
committed