Bumped version to 1.5, updated readme, changelog and todo.

CHANGELOG.md

@@ -1,3 +1,25 @@
+1.5
+- improved Slim support to use DI container to share Clockwork instance instead of config
+- improved Slim support now adds all messages logged via Slim's log interface to Clockwork log as well
+- improved CodeIgniter support to make Clockwork available through the CI app (tnx BradEstey)
+- fixed Laravel support breaking flash messages (tnx hannesvdvreken)
+- fixed CodeIgniter support PSR-0 autoloading and other improvements (tnx pwhelan)
+- fixed file storage warning when recursive data is collected
+
+1.4.4
+- changed Laravel support to disable permanent data collection by default (tnx jenssegers)
+- improved Laravel support to return Clockwork data with proper Content-Type (tnx maximebeaudoin)
+- fixed CodeIgniter support compatibility with PHP 5.3 (tnx BradEstey)
+
+1.4.3
+- fixed incorrect requests ids being generated depending on set locale
+
+1.4.2
+- fixed Laravel support compatibility with PHP 5.3
+
+1.4.1
+- fixed Laravel support compatibility with PHP 5.3
+
 1.4
 - added support for collecting emails and views data
 - added support for CodeIgniter 2.1 (tnx pwhelan)

Clockwork/Clockwork.php

@@ -18,7 +18,7 @@ class Clockwork implements LoggerInterface
 	/**
 	 * Clockwork version
 	 */
-	const VERSION = '1.4.2';
+	const VERSION = '1.5';
 
 	/**
 	 * Array of data sources, these objects provide data to be stored in a request object

README.md

@@ -80,6 +80,19 @@ $app = new Slim(...);
 $app->add(new Clockwork\Support\Slim\ClockworkMiddleware('/requests/storage/path'));
 ```
 
+Clockwork is now available in Slim's DI container and can be used like this:
+
+```php
+$app = Slim::getInstance();
+
+$app->clockwork->startEvent('event_name', 'Event description.'); // event called 'Event description.' appears in Clockwork timeline tab
+
+$app->clockwork->info('Message text.'); // 'Message text.' appears in Clockwork log tab
+$app->log->info('Message text.'); // 'Message text.' appears in Clockwork log tab as well as application log file
+
+$app->clockwork->endEvent('event_name');
+```
+
 ### CodeIgniter 2.1
 
 Once Clockwork is installed, you need to copy the Clockwork controller from `vendor/itsgoingd/clockwork/Clockwork/Support/CodeIgniter/Clockwork.php` to your controllers directory and set up the following route:
@@ -117,7 +130,6 @@ $this->clockwork->info('Message text.'); // 'Message text.' appears in Clockwork
 $this->clockwork->endEvent('event_name');
 ```
 
-
 ### Other frameworks
 
 There is a [brief architecture overview](https://github.com/itsgoingd/clockwork/wiki/Development-notes) available, that should provide some help when implementing support for new frameworks or custom applications.

TODO.md

@@ -1,4 +1,4 @@
-1.5
+1.6
 - documentation
 - support for application log, timeline and routes in Slim
 - support for application and/or PHP settings