search

craue / CraueConfigBundle

Database-stored settings made available via a service for your Symfony project.
MIT License
173 stars 35 forks source link

Added settings function to Twig extension #10

Closed rvanlaak closed 10 years ago

rvanlaak commented 10 years ago

... by which it is possible to easily use the database settings in the template.

Can you also make a new tag?

rvanlaak commented 10 years ago

Also added a recommended default .gitignore file

http://augustl.com/blog/2009/global_gitignores/

craue commented 10 years ago

Did you really intend to add the first two commits? :smirk: Concerning the .gitignore file, I'd agree with it containing /.project and .DS_Store, but not the other stuff. The translation (although appreciated) has nothing to do with the goal of this PR and should be a separate one. Also, could you keep opening curly braces on the same line as before? Otherwise I'd have to revert these changes afterwards as I don't like this style.

rvanlaak commented 10 years ago

OK, I will remove the other elements from the .gitignore and remove the extra comments from the readme. Still have to add some info about usage in Twig.

What is the problem with accepting the translation in this PR? :)

According to your composer.json you're using the psr-0 standard, so brackets should be on the next line ;-)

craue commented 10 years ago

It's just that the translation is neither needed nor adds value for the functionality of this PR, thus should be separated. PSR-0 is about autoloading and indeed useful, but I don't obey PSR-2 as it conflicts with my perception of nicely formatted code.

rvanlaak commented 10 years ago

Okay, then I'll reformat the code and remove the translation from this branch. Give me some minutes!

craue commented 10 years ago

Take it easy.

craue commented 10 years ago

Now, one last thing (really :smirk:), could you rewrite the history to make it look rather clean?

rvanlaak commented 10 years ago

Uhm, I've actually got no idea how to do that

craue commented 10 years ago

I guess your IDE provides support for interactive rebasing, but still, doing it the first time is tough. Do you wanna try that or shall I merge the squashed commits (but I've never done that as well)?

rvanlaak commented 10 years ago

Yes that is fine with me, can you create a new tag after merging?

craue commented 10 years ago

Merged. Thank you (also for your endurance :smirk:). Do you still want to open another PR for the translation? I'd tag 1.2.0 afterwards.

rvanlaak commented 10 years ago

No problem, I'll have ready the PR with the translation within the hour ;)