Fix: address issues identified by PHP Analyzer