Merge branch 'master' into v5

Author: itsgoingd

Clockwork/Storage/SymfonyStorage.php

@@ -22,7 +22,7 @@ public function __construct(Profiler $profiler, $path)
 	}
 
 	// Store request, no-op since this is read-only storage implementation
-	public function store(Request $request)
+	public function store(Request $request, $skipIndex = false)
 	{
 		return;
 	}

Clockwork/Support/Slim/ClockworkMiddleware.php

@@ -80,7 +80,7 @@ protected function retrieveRequest(Request $request, $id, $direction, $count)
 
 	protected function logRequest(Request $request, $response)
 	{
-		$this->clockwork->getTimeline()->finalize($this->startTime);
+		$this->clockwork->timeline()->finalize($this->startTime);
 		$this->clockwork->addDataSource(new PsrMessageDataSource($request, $response));
 
 		$this->clockwork->resolveRequest();

Clockwork/Support/Slim/Legacy/ClockworkMiddleware.php

@@ -82,7 +82,7 @@ protected function retrieveRequest(Response $response, Request $request, $id, $d
 
 	protected function logRequest(Request $request, Response $response)
 	{
-		$this->clockwork->getTimeline()->finalize($this->startTime);
+		$this->clockwork->timeline()->finalize($this->startTime);
 		$this->clockwork->addDataSource(new PsrMessageDataSource($request, $response));
 
 		$this->clockwork->resolveRequest();

Clockwork/Support/Vanilla/Clockwork.php

@@ -296,7 +296,7 @@ public function configureShouldCollect()
 		]);
 
 		// don't collect data for Clockwork requests
-		$this->clockwork->shouldCollect()->except(rtrim($this->config['api'], '/'));
+		$this->clockwork->shouldCollect()->except(preg_quote(rtrim($this->config['api'], '/'), '#'));
 	}
 
 	// Configure should record rules based on user configuration