godotengine / godot-asset-library

PHP frontend for Godot Engine's asset library
https://godotengine.org/asset-library
MIT License
294 stars 98 forks source link

Use four spaces for indetation and follow PSR-1 and PSR-2 #91

Closed merumelu closed 7 years ago

merumelu commented 8 years ago

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. :)

bojidar-bg commented 7 years ago

Oops, seems like I broke it a bit. Sorry @merumelu

akien-mga commented 7 years ago

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

bojidar-bg commented 7 years ago

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
merumelu commented 7 years ago

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.