Updated `composer.lock` file + fixed random CS issues
Merge pull request #1867 from stloyd/bugfix/composer_cs_fixes

Updated `composer.lock` file + fixed random CS issues