This reverts commit e3ab1276, reversing
changes made to f988b0a6.

The reasoning behind this is to essentially rely on a single type (or
the absence of it), therefore add type declarations.

Since these are private methods we can do that without breaking BC.

fixes #1339
closes #921

Take the column order into account and sort non PK columns last

- Fixed docblocks
- Removed return statements on void methods
- Cleaned up unused private / local variables
- Fixed license issues
- Removed SVN leftovers
- Fixed doctrine-project.org links
- Added line breaks before return statements