Closed merumelu closed 7 years ago
Oops, seems like I broke it a bit. Sorry @merumelu
Interesting, GitHub has a web-based conflict resolution editor now... That's not too bad a feature, though it of course introduces a non-cool commit that a proper rebase would have gotten rid of :p
Still, I'm getting errors when running this:
Message: Call to undefined method Godot\AssetLibrary\Helpers\Utils::errorResponseIfNoUserHasLevel()
File: .../assetlib/src/routes/asset_edit.php
Line: 616
Hello. Sorry for not having time for this until now.
I rebased and fixed the typo in src/routes/asset_edit.php
mentioned by @bojidar-bg. Hopefully that was the only one, but will retest again later tonight.
Apply PSR-1 and PSR-2 standard to files in
src/
andapi/
by usingphp-cs-fixer --level=psr2
plus the following manual fixes:Class files now use the namespace
Godot\AssetLibrary
to follow PSR-1, section 3, and use capitalized file names so they can easier follow both these points from PSR-1, section 1.Templates were left as is for now (aside from indetation changes) since they might be rewritten anyway.
Everything seems to work fine for me locally but please test. :)