Formatting issues
Formatting issues
Remove added fixtures and use existing. Updated one old test to add data from afterFind callback
Fixed some formatting
Fixed some formatting
Fixed some formatting
Start the 2.5.x branch.
Accept 'connectOptions' in Router::mapResources()
Merge pull request #1536 from rchavik/2.5-map-resources

Accept 'connectOptions' in Router::mapResources()
New line on end
Fixed formaiing and Successfully
Successfully
Successfully
Successfully :)
Sqlite::truncate(): Verify `sqlite_sequence` exists before _execute()

`sqlite_sequence` is a dynamic table that's only available when a table in
the database use an auto increment field.  For some cases, eg: databases that
exclusively use uuid for primary keys, this table won't exist and
truncate() call will fail with:

  Error: SQLSTATE[HY000]: General error: 1 no such table: sqlite_sequence
Merge branch '2.4' into 2.5

Conflicts:
	lib/Cake/VERSION.txt
Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()
Merge pull request #1549 from hencohen/ticket-4011

Ticket 4011 - Add support for matchers in Hash::remove() and Hash::insert()
Minor simplification.
Merge branch '2.4' into 2.5