nextcloud / server

apps/dav/lib/Migration/Version1006Date20180628111625.php

Indentation +70 added lines, -70 removed lines

@@ -31,78 +31,78 @@
 
 class Version1006Date20180628111625 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendarsubscrobjects')) {
-			$table = $schema->createTable('calendarsubscrobjects');
-			$table->addColumn('id', Type::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendardata', Type::BLOB, [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', Type::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('subscriptionid', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastmodified', Type::INTEGER, [
-				'notnull' => false,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', Type::STRING, [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('componenttype', Type::STRING, [
-				'notnull' => false,
-				'length' => 8,
-			]);
-			$table->addColumn('firstoccurence', Type::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastoccurence', Type::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', Type::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('classification', Type::INTEGER, [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['subscriptionid', 'uri'], 'subobjects_index');
-		}
+        if (!$schema->hasTable('calendarsubscrobjects')) {
+            $table = $schema->createTable('calendarsubscrobjects');
+            $table->addColumn('id', Type::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendardata', Type::BLOB, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', Type::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('subscriptionid', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastmodified', Type::INTEGER, [
+                'notnull' => false,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', Type::STRING, [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('componenttype', Type::STRING, [
+                'notnull' => false,
+                'length' => 8,
+            ]);
+            $table->addColumn('firstoccurence', Type::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastoccurence', Type::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', Type::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('classification', Type::INTEGER, [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['subscriptionid', 'uri'], 'subobjects_index');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }
 
 

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

Unused Use Statements -2 removed lines

@@ -42,8 +42,6 @@
 use Sabre\VObject\Reader;
 use Sabre\VObject\Splitter\ICalendar;
 
-use GuzzleHttp\Psr7\Response;
-
 class RefreshWebcalJob extends Job {
 
 	/** @var CalDavBackend */

Indentation +274 added lines, -274 removed lines

@@ -46,46 +46,46 @@ 
 
 class RefreshWebcalJob extends Job {
 
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var IClientService */
-	private $clientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var array */
-	private $subscription;
-
-	/**
-	 * RefreshWebcalJob constructor.
-	 *
-	 * @param CalDavBackend $calDavBackend
-	 * @param IClientService $clientService
-	 * @param ILogger $logger
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger, ITimeFactory $timeFactory) {
-		$this->calDavBackend = $calDavBackend;
-		$this->clientService = $clientService;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * this function is called at most every hour
-	 *
-	 * @inheritdoc
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$subscription = $this->getSubscription($this->argument['principaluri'], $this->argument['uri']);
-		if (!$subscription) {
-			return;
-		}
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var IClientService */
+    private $clientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var array */
+    private $subscription;
+
+    /**
+     * RefreshWebcalJob constructor.
+     *
+     * @param CalDavBackend $calDavBackend
+     * @param IClientService $clientService
+     * @param ILogger $logger
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(CalDavBackend $calDavBackend, IClientService $clientService, ILogger $logger, ITimeFactory $timeFactory) {
+        $this->calDavBackend = $calDavBackend;
+        $this->clientService = $clientService;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * this function is called at most every hour
+     *
+     * @inheritdoc
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $subscription = $this->getSubscription($this->argument['principaluri'], $this->argument['uri']);
+        if (!$subscription) {
+            return;
+        }
 
 //		// if no refresh rate was configured, just refresh once a week
 //		$subscriptionId = $subscription['id'];
@@ -105,238 +105,238 @@ 
 //			return;
 //		}
 
-		parent::execute($jobList, $logger);
-	}
-
-	/**
-	 * @param array $argument
-	 */
-	protected function run($argument) {
-		$subscription = $this->getSubscription($argument['principaluri'], $argument['uri']);
-		$mutations = [];
-		if (!$subscription) {
-			return;
-		}
-
-		$webcalData = $this->queryWebcalFeed($subscription, $mutations);
-		if (!$webcalData) {
-			return;
-		}
-
-		$stripTodos = $subscription['striptodos'] ?? true;
-		$stripAlarms = $subscription['stripalarms'] ?? true;
-		$stripAttachments = $subscription['stripattachments'] ?? true;
-
-		try {
-			$splitter = new ICalendar($webcalData, Reader::OPTION_FORGIVING);
-
-			// we wait with deleting all outdated events till we parsed the new ones
-			// in case the new calendar is broken and `new ICalendar` throws a ParseException
-			// the user will still see the old data
-			$this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
-
-			while ($vObject = $splitter->getNext()) {
-				/** @var Component $vObject */
-				$uid = null;
-				$compName = null;
-
-				foreach ($vObject->getComponents() as $component) {
-					if ($component->name === 'VTIMEZONE') {
-						continue;
-					}
-
-					$uid = $component->{'UID'}->getValue();
-					$compName = $component->name;
-
-					if ($stripAlarms) {
-						unset($component->{'VALARM'});
-					}
-					if ($stripAttachments) {
-						unset($component->{'ATTACH'});
-					}
-				}
-
-				if ($stripTodos && $compName === 'VTODO') {
-					continue;
-				}
-
-				$uri = $uid . '.ics';
-				$calendarData = $vObject->serialize();
-				try {
-					$this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
-				} catch(BadRequest $ex) {
-					$this->logger->logException($ex);
-				}
-			}
-
-			$newRefreshRate = $this->checkWebcalDataForRefreshRate($subscription, $webcalData);
-			if ($newRefreshRate) {
-				$mutations['{http://apple.com/ns/ical/}refreshrate'] = $newRefreshRate;
-			}
-
-			$this->updateSubscription($subscription, $mutations);
-		} catch(ParseException $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
-		}
-	}
-
-	/**
-	 * gets webcal feed from remote server
-	 *
-	 * @param array $subscription
-	 * @param array &$mutations
-	 * @return null|string
-	 */
-	private function queryWebcalFeed(array $subscription, array &$mutations) {
-		$client = $this->clientService->newClient();
-
-		$didBreak301Chain = false;
-		$latestLocation = null;
-
-		$handlerStack = HandlerStack::create();
-		$handlerStack->push(Middleware::mapRequest(function (RequestInterface $request) {
-			return $request
-				->withHeader('User-Agent', 'Nextcloud Webcal Crawler');
-		}));
-		$handlerStack->push(Middleware::mapResponse(function(ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
-			if (!$didBreak301Chain) {
-				if ($response->getStatusCode() !== 301) {
-					$didBreak301Chain = true;
-				} else {
-					$latestLocation = $response->getHeader('Location');
-				}
-			}
-			return $response;
-		}));
-
-		try {
-			$response = $client->get($subscription['source'], [
-				'allow_redirects' => [
-					'redirects' => 10
-				],
-				'handler' => $handlerStack,
-			]);
-
-			$body = $response->getBody();
-
-			if ($latestLocation) {
-				$mutations['{http://calendarserver.org/ns/}source'] = new Href($latestLocation);
-			}
-
-			return $body;
-		} catch(\Exception $ex) {
-			$subscriptionId = $subscription['id'];
-
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
-
-			return null;
-		}
-	}
-
-	/**
-	 * loads subscription from backend and store it locally
-	 *
-	 * @param string $principalUri
-	 * @param string $uri
-	 * @return array|null
-	 */
-	private function getSubscription($principalUri, $uri) {
-		if ($this->subscription) {
-			return $this->subscription;
-		}
-
-		$subscriptions = array_filter(
-			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function($sub) use ($uri) {
-				return $sub['uri'] === $uri;
-			}
-		);
-
-		if (\count($subscriptions) === 0) {
-			return null;
-		}
-
-		$this->subscription = $subscriptions[0];
-		return $this->subscription;
-	}
-
-	/**
-	 * get total number of seconds from DateInterval object
-	 *
-	 * @param \DateInterval $interval
-	 * @return int
-	 */
-	private function getIntervalFromDateInterval(\DateInterval $interval):int {
-		return $interval->s
-			+ ($interval->i * 60)
-			+ ($interval->h * 60 * 60)
-			+ ($interval->d * 60 * 60 * 24)
-			+ ($interval->m * 60 * 60 * 24 * 30)
-			+ ($interval->y * 60 * 60 * 24 * 365);
-	}
-
-	/**
-	 * check if:
-	 *  - current subscription stores a refreshrate
-	 *  - the webcal feed suggests a refreshrate
-	 *  - return suggested refreshrate if user didn't set a custom one
-	 *
-	 * @param array $subscription
-	 * @param string $webcalData
-	 * @return string|null
-	 */
-	private function checkWebcalDataForRefreshRate($subscription, $webcalData) {
-		// if there is no refreshrate stored in the database, check the webcal feed
-		// whether it suggests any refresh rate and store that in the database
-		if (isset($subscription['refreshrate']) && $subscription['refreshrate'] !== null) {
-			return null;
-		}
-
-		/** @var Component\VCalendar $vCalendar */
-		$vCalendar = Reader::read($webcalData);
-
-		$newRefreshrate = null;
-		if (isset($vCalendar->{'X-PUBLISHED-TTL'})) {
-			$newRefreshrate = $vCalendar->{'X-PUBLISHED-TTL'}->getValue();
-		}
-		if (isset($vCalendar->{'REFRESH-INTERVAL'})) {
-			$newRefreshrate = $vCalendar->{'REFRESH-INTERVAL'}->getValue();
-		}
-
-		if (!$newRefreshrate) {
-			return null;
-		}
-
-		// check if new refresh rate is even valid
-		try {
-			DateTimeParser::parseDuration($newRefreshrate);
-		} catch(InvalidDataException $ex) {
-			return null;
-		}
-
-		return $newRefreshrate;
-	}
-
-	/**
-	 * update subscription stored in database
-	 * used to set:
-	 *  - refreshrate
-	 *  - source
-	 *
-	 * @param array $subscription
-	 * @param array $mutations
-	 */
-	private function updateSubscription(array $subscription, array $mutations) {
-		if (empty($mutations)) {
-			return;
-		}
-
-		$propPatch = new PropPatch($mutations);
-		$this->calDavBackend->updateSubscription($subscription['id'], $propPatch);
-		$propPatch->commit();
-	}
+        parent::execute($jobList, $logger);
+    }
+
+    /**
+     * @param array $argument
+     */
+    protected function run($argument) {
+        $subscription = $this->getSubscription($argument['principaluri'], $argument['uri']);
+        $mutations = [];
+        if (!$subscription) {
+            return;
+        }
+
+        $webcalData = $this->queryWebcalFeed($subscription, $mutations);
+        if (!$webcalData) {
+            return;
+        }
+
+        $stripTodos = $subscription['striptodos'] ?? true;
+        $stripAlarms = $subscription['stripalarms'] ?? true;
+        $stripAttachments = $subscription['stripattachments'] ?? true;
+
+        try {
+            $splitter = new ICalendar($webcalData, Reader::OPTION_FORGIVING);
+
+            // we wait with deleting all outdated events till we parsed the new ones
+            // in case the new calendar is broken and `new ICalendar` throws a ParseException
+            // the user will still see the old data
+            $this->calDavBackend->purgeAllCachedEventsForSubscription($subscription['id']);
+
+            while ($vObject = $splitter->getNext()) {
+                /** @var Component $vObject */
+                $uid = null;
+                $compName = null;
+
+                foreach ($vObject->getComponents() as $component) {
+                    if ($component->name === 'VTIMEZONE') {
+                        continue;
+                    }
+
+                    $uid = $component->{'UID'}->getValue();
+                    $compName = $component->name;
+
+                    if ($stripAlarms) {
+                        unset($component->{'VALARM'});
+                    }
+                    if ($stripAttachments) {
+                        unset($component->{'ATTACH'});
+                    }
+                }
+
+                if ($stripTodos && $compName === 'VTODO') {
+                    continue;
+                }
+
+                $uri = $uid . '.ics';
+                $calendarData = $vObject->serialize();
+                try {
+                    $this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
+                } catch(BadRequest $ex) {
+                    $this->logger->logException($ex);
+                }
+            }
+
+            $newRefreshRate = $this->checkWebcalDataForRefreshRate($subscription, $webcalData);
+            if ($newRefreshRate) {
+                $mutations['{http://apple.com/ns/ical/}refreshrate'] = $newRefreshRate;
+            }
+
+            $this->updateSubscription($subscription, $mutations);
+        } catch(ParseException $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a parsing error");
+        }
+    }
+
+    /**
+     * gets webcal feed from remote server
+     *
+     * @param array $subscription
+     * @param array &$mutations
+     * @return null|string
+     */
+    private function queryWebcalFeed(array $subscription, array &$mutations) {
+        $client = $this->clientService->newClient();
+
+        $didBreak301Chain = false;
+        $latestLocation = null;
+
+        $handlerStack = HandlerStack::create();
+        $handlerStack->push(Middleware::mapRequest(function (RequestInterface $request) {
+            return $request
+                ->withHeader('User-Agent', 'Nextcloud Webcal Crawler');
+        }));
+        $handlerStack->push(Middleware::mapResponse(function(ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
+            if (!$didBreak301Chain) {
+                if ($response->getStatusCode() !== 301) {
+                    $didBreak301Chain = true;
+                } else {
+                    $latestLocation = $response->getHeader('Location');
+                }
+            }
+            return $response;
+        }));
+
+        try {
+            $response = $client->get($subscription['source'], [
+                'allow_redirects' => [
+                    'redirects' => 10
+                ],
+                'handler' => $handlerStack,
+            ]);
+
+            $body = $response->getBody();
+
+            if ($latestLocation) {
+                $mutations['{http://calendarserver.org/ns/}source'] = new Href($latestLocation);
+            }
+
+            return $body;
+        } catch(\Exception $ex) {
+            $subscriptionId = $subscription['id'];
+
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed due to a network error");
+
+            return null;
+        }
+    }
+
+    /**
+     * loads subscription from backend and store it locally
+     *
+     * @param string $principalUri
+     * @param string $uri
+     * @return array|null
+     */
+    private function getSubscription($principalUri, $uri) {
+        if ($this->subscription) {
+            return $this->subscription;
+        }
+
+        $subscriptions = array_filter(
+            $this->calDavBackend->getSubscriptionsForUser($principalUri),
+            function($sub) use ($uri) {
+                return $sub['uri'] === $uri;
+            }
+        );
+
+        if (\count($subscriptions) === 0) {
+            return null;
+        }
+
+        $this->subscription = $subscriptions[0];
+        return $this->subscription;
+    }
+
+    /**
+     * get total number of seconds from DateInterval object
+     *
+     * @param \DateInterval $interval
+     * @return int
+     */
+    private function getIntervalFromDateInterval(\DateInterval $interval):int {
+        return $interval->s
+            + ($interval->i * 60)
+            + ($interval->h * 60 * 60)
+            + ($interval->d * 60 * 60 * 24)
+            + ($interval->m * 60 * 60 * 24 * 30)
+            + ($interval->y * 60 * 60 * 24 * 365);
+    }
+
+    /**
+     * check if:
+     *  - current subscription stores a refreshrate
+     *  - the webcal feed suggests a refreshrate
+     *  - return suggested refreshrate if user didn't set a custom one
+     *
+     * @param array $subscription
+     * @param string $webcalData
+     * @return string|null
+     */
+    private function checkWebcalDataForRefreshRate($subscription, $webcalData) {
+        // if there is no refreshrate stored in the database, check the webcal feed
+        // whether it suggests any refresh rate and store that in the database
+        if (isset($subscription['refreshrate']) && $subscription['refreshrate'] !== null) {
+            return null;
+        }
+
+        /** @var Component\VCalendar $vCalendar */
+        $vCalendar = Reader::read($webcalData);
+
+        $newRefreshrate = null;
+        if (isset($vCalendar->{'X-PUBLISHED-TTL'})) {
+            $newRefreshrate = $vCalendar->{'X-PUBLISHED-TTL'}->getValue();
+        }
+        if (isset($vCalendar->{'REFRESH-INTERVAL'})) {
+            $newRefreshrate = $vCalendar->{'REFRESH-INTERVAL'}->getValue();
+        }
+
+        if (!$newRefreshrate) {
+            return null;
+        }
+
+        // check if new refresh rate is even valid
+        try {
+            DateTimeParser::parseDuration($newRefreshrate);
+        } catch(InvalidDataException $ex) {
+            return null;
+        }
+
+        return $newRefreshrate;
+    }
+
+    /**
+     * update subscription stored in database
+     * used to set:
+     *  - refreshrate
+     *  - source
+     *
+     * @param array $subscription
+     * @param array $mutations
+     */
+    private function updateSubscription(array $subscription, array $mutations) {
+        if (empty($mutations)) {
+            return;
+        }
+
+        $propPatch = new PropPatch($mutations);
+        $this->calDavBackend->updateSubscription($subscription['id'], $propPatch);
+        $propPatch->commit();
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -160,11 +160,11 @@ 
 					continue;
 				}
 
-				$uri = $uid . '.ics';
+				$uri = $uid.'.ics';
 				$calendarData = $vObject->serialize();
 				try {
 					$this->calDavBackend->addCachedEvent($subscription['id'], $uri, $calendarData);
-				} catch(BadRequest $ex) {
+				} catch (BadRequest $ex) {
 					$this->logger->logException($ex);
 				}
 			}
@@ -175,7 +175,7 @@ 
 			}
 
 			$this->updateSubscription($subscription, $mutations);
-		} catch(ParseException $ex) {
+		} catch (ParseException $ex) {
 			$subscriptionId = $subscription['id'];
 
 			$this->logger->logException($ex);
@@ -197,7 +197,7 @@ 
 		$latestLocation = null;
 
 		$handlerStack = HandlerStack::create();
-		$handlerStack->push(Middleware::mapRequest(function (RequestInterface $request) {
+		$handlerStack->push(Middleware::mapRequest(function(RequestInterface $request) {
 			return $request
 				->withHeader('User-Agent', 'Nextcloud Webcal Crawler');
 		}));
@@ -227,7 +227,7 @@ 
 			}
 
 			return $body;
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 			$subscriptionId = $subscription['id'];
 
 			$this->logger->logException($ex);
@@ -314,7 +314,7 @@ 
 		// check if new refresh rate is even valid
 		try {
 			DateTimeParser::parseDuration($newRefreshrate);
-		} catch(InvalidDataException $ex) {
+		} catch (InvalidDataException $ex) {
 			return null;
 		}
 

apps/dav/lib/CalDAV/WebcalCaching/GuzzleForwardTrackingPlugin.php

Indentation +148 added lines, -148 removed lines

@@ -34,152 +34,152 @@
  */
 class HistoryPlugin implements EventSubscriberInterface, \IteratorAggregate, \Countable
 {
-	/** @var int The maximum number of requests to maintain in the history */
-	protected $limit = 10;
-
-	/** @var array Requests and responses that have passed through the plugin */
-	protected $transactions = array();
-
-	public static function getSubscribedEvents()
-	{
-		return array('request.sent' => array('onRequestSent', 9999));
-	}
-
-	/**
-	 * Convert to a string that contains all request and response headers
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		$lines = array();
-		foreach ($this->transactions as $entry) {
-			$response = isset($entry['response']) ? $entry['response'] : '';
-			$lines[] = '> ' . trim($entry['request']) . "\n\n< " . trim($response) . "\n";
-		}
-
-		return implode("\n", $lines);
-	}
-
-	/**
-	 * Add a request to the history
-	 *
-	 * @param RequestInterface $request  Request to add
-	 * @param Response         $response Response of the request
-	 *
-	 * @return HistoryPlugin
-	 */
-	public function add(RequestInterface $request, Response $response = null)
-	{
-		if (!$response && $request->getResponse()) {
-			$response = $request->getResponse();
-		}
-
-		$this->transactions[] = array('request' => $request, 'response' => $response);
-		if (count($this->transactions) > $this->getlimit()) {
-			array_shift($this->transactions);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set the max number of requests to store
-	 *
-	 * @param int $limit Limit
-	 *
-	 * @return HistoryPlugin
-	 */
-	public function setLimit($limit)
-	{
-		$this->limit = (int) $limit;
-
-		return $this;
-	}
-
-	/**
-	 * Get the request limit
-	 *
-	 * @return int
-	 */
-	public function getLimit()
-	{
-		return $this->limit;
-	}
-
-	/**
-	 * Get all of the raw transactions in the form of an array of associative arrays containing
-	 * 'request' and 'response' keys.
-	 *
-	 * @return array
-	 */
-	public function getAll()
-	{
-		return $this->transactions;
-	}
-
-	/**
-	 * Get the requests in the history
-	 *
-	 * @return \ArrayIterator
-	 */
-	public function getIterator()
-	{
-		// Return an iterator just like the old iteration of the HistoryPlugin for BC compatibility (use getAll())
-		return new \ArrayIterator(array_map(function ($entry) {
-			$entry['request']->getParams()->set('actual_response', $entry['response']);
-			return $entry['request'];
-		}, $this->transactions));
-	}
-
-	/**
-	 * Get the number of requests in the history
-	 *
-	 * @return int
-	 */
-	public function count()
-	{
-		return count($this->transactions);
-	}
-
-	/**
-	 * Get the last request sent
-	 *
-	 * @return RequestInterface
-	 */
-	public function getLastRequest()
-	{
-		$last = end($this->transactions);
-
-		return $last['request'];
-	}
-
-	/**
-	 * Get the last response in the history
-	 *
-	 * @return Response|null
-	 */
-	public function getLastResponse()
-	{
-		$last = end($this->transactions);
-
-		return isset($last['response']) ? $last['response'] : null;
-	}
-
-	/**
-	 * Clears the history
-	 *
-	 * @return HistoryPlugin
-	 */
-	public function clear()
-	{
-		$this->transactions = array();
-
-		return $this;
-	}
-
-	public function onRequestSent(Event $event)
-	{
-		$this->add($event['request'], $event['response']);
-	}
+    /** @var int The maximum number of requests to maintain in the history */
+    protected $limit = 10;
+
+    /** @var array Requests and responses that have passed through the plugin */
+    protected $transactions = array();
+
+    public static function getSubscribedEvents()
+    {
+        return array('request.sent' => array('onRequestSent', 9999));
+    }
+
+    /**
+     * Convert to a string that contains all request and response headers
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $lines = array();
+        foreach ($this->transactions as $entry) {
+            $response = isset($entry['response']) ? $entry['response'] : '';
+            $lines[] = '> ' . trim($entry['request']) . "\n\n< " . trim($response) . "\n";
+        }
+
+        return implode("\n", $lines);
+    }
+
+    /**
+     * Add a request to the history
+     *
+     * @param RequestInterface $request  Request to add
+     * @param Response         $response Response of the request
+     *
+     * @return HistoryPlugin
+     */
+    public function add(RequestInterface $request, Response $response = null)
+    {
+        if (!$response && $request->getResponse()) {
+            $response = $request->getResponse();
+        }
+
+        $this->transactions[] = array('request' => $request, 'response' => $response);
+        if (count($this->transactions) > $this->getlimit()) {
+            array_shift($this->transactions);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the max number of requests to store
+     *
+     * @param int $limit Limit
+     *
+     * @return HistoryPlugin
+     */
+    public function setLimit($limit)
+    {
+        $this->limit = (int) $limit;
+
+        return $this;
+    }
+
+    /**
+     * Get the request limit
+     *
+     * @return int
+     */
+    public function getLimit()
+    {
+        return $this->limit;
+    }
+
+    /**
+     * Get all of the raw transactions in the form of an array of associative arrays containing
+     * 'request' and 'response' keys.
+     *
+     * @return array
+     */
+    public function getAll()
+    {
+        return $this->transactions;
+    }
+
+    /**
+     * Get the requests in the history
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        // Return an iterator just like the old iteration of the HistoryPlugin for BC compatibility (use getAll())
+        return new \ArrayIterator(array_map(function ($entry) {
+            $entry['request']->getParams()->set('actual_response', $entry['response']);
+            return $entry['request'];
+        }, $this->transactions));
+    }
+
+    /**
+     * Get the number of requests in the history
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->transactions);
+    }
+
+    /**
+     * Get the last request sent
+     *
+     * @return RequestInterface
+     */
+    public function getLastRequest()
+    {
+        $last = end($this->transactions);
+
+        return $last['request'];
+    }
+
+    /**
+     * Get the last response in the history
+     *
+     * @return Response|null
+     */
+    public function getLastResponse()
+    {
+        $last = end($this->transactions);
+
+        return isset($last['response']) ? $last['response'] : null;
+    }
+
+    /**
+     * Clears the history
+     *
+     * @return HistoryPlugin
+     */
+    public function clear()
+    {
+        $this->transactions = array();
+
+        return $this;
+    }
+
+    public function onRequestSent(Event $event)
+    {
+        $this->add($event['request'], $event['response']);
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 		$lines = array();
 		foreach ($this->transactions as $entry) {
 			$response = isset($entry['response']) ? $entry['response'] : '';
-			$lines[] = '> ' . trim($entry['request']) . "\n\n< " . trim($response) . "\n";
+			$lines[] = '> '.trim($entry['request'])."\n\n< ".trim($response)."\n";
 		}
 
 		return implode("\n", $lines);
@@ -126,7 +126,7 @@ 
 	public function getIterator()
 	{
 		// Return an iterator just like the old iteration of the HistoryPlugin for BC compatibility (use getAll())
-		return new \ArrayIterator(array_map(function ($entry) {
+		return new \ArrayIterator(array_map(function($entry) {
 			$entry['request']->getParams()->set('actual_response', $entry['response']);
 			return $entry['request'];
 		}, $this->transactions));