Skip to content

Commit

Permalink
Merge latest version from github.
Browse files Browse the repository at this point in the history
  • Loading branch information
itsgoingd committed Dec 20, 2013
2 parents 8c98f0c + c50bfc3 commit ed5887e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ NOTE: Clockwork\Request\Log::log method arguments have been changed from log($me
- added clockwork:clean artisan command for cleaning request metadata for Laravel
- added an easy way to add timeline events and log records via main Clockwork class
- added support for Slim apps running in subdirs (requires Clockwork Chrome 1.1+)
- file stroage now creates default gitignore file for the request data when creating the storage dir
- file storage now creates default gitignore file for the request data when creating the storage dir
- fixed a few bugs which might cause request data to not appear in Chrome extension
- fixed a few bugs that could lead to PHP errors/exceptions

Expand All @@ -26,4 +26,4 @@ NOTE: Clockwork\Request\Log::log method arguments have been changed from log($me
- added support for application routes (ootb support for Laravel 4 only atm)
- added configuration file for Laravel 4
- added support for filtering stored data in Storage
- added library version constant Cloclwork::VERSION
- added library version constant Clockwork::VERSION
6 changes: 3 additions & 3 deletions Clockwork/Clockwork.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function setRequest(Request $request)
}

/**
* Add data from all data soruces to request
* Add data from all data sources to request
*/
public function resolveRequest()
{
Expand Down Expand Up @@ -169,7 +169,7 @@ public function setTimeline(Timeline $timeline)
}

/**
* Shortcut methods for current log instance
* Shortcut methods for the current log instance
*/

public function log($level = LogLevel::INFO, $message, array $context = array())
Expand Down Expand Up @@ -218,7 +218,7 @@ public function debug($message, array $context = array())
}

/**
* Shortcut methods for current timeline instance
* Shortcut methods for the current timeline instance
*/

public function startEvent($name, $description, $time = null)
Expand Down
2 changes: 1 addition & 1 deletion Clockwork/DataSource/EloquentDataSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function resolve(Request $request)
*/
protected function createRunnableQuery($query, $bindings)
{
# add bingins to query
# add bindings to query
$bindings = $this->connection->prepareBindings($bindings);

foreach ($bindings as $binding) {
Expand Down
10 changes: 5 additions & 5 deletions Clockwork/DataSource/PhpDataSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function resolve(Request $request)
}

/**
* Return cookies (replace unserializable items, attemp to remove passwords)
* Return cookies (replace unserializable items, attempt to remove passwords)
*/
protected function getCookies()
{
Expand All @@ -39,7 +39,7 @@ protected function getCookies()
}

/**
* Return GET data (replace unserializable items, attemp to remove passwords)
* Return GET data (replace unserializable items, attempt to remove passwords)
*/
protected function getGetData()
{
Expand All @@ -49,7 +49,7 @@ protected function getGetData()
}

/**
* Return POST data (replace unserializable items, attemp to remove passwords)
* Return POST data (replace unserializable items, attempt to remove passwords)
*/
protected function getPostData()
{
Expand Down Expand Up @@ -87,7 +87,7 @@ protected function getRequestHeaders()
}

/**
* Retrun request method
* Return request method
*/
protected function getRequestMethod()
{
Expand Down Expand Up @@ -138,7 +138,7 @@ protected function getResponseTime()
}

/**
* Return session data (replace unserializable items, attemp to remove passwords)
* Return session data (replace unserializable items, attempt to remove passwords)
*/
protected function getSessionData()
{
Expand Down
2 changes: 1 addition & 1 deletion Clockwork/Request/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function getDatabaseDuration()
}

/**
* Compute and return response duration in miliseconds
* Compute and return response duration in milliseconds
*/
public function getResponseDuration()
{
Expand Down
32 changes: 16 additions & 16 deletions Clockwork/Support/Laravel/ClockworkCleanCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,34 @@
class ClockworkCleanCommand extends Command
{
/**
* The console command name.
*
* @var string
*/
* The console command name.
*
* @var string
*/
protected $name = 'clockwork:clean';

/**
* The console command description.
*
* @var string
*/
* The console command description.
*
* @var string
*/
protected $description = 'Cleans all request metadata';

/**
* Create a new command instance.
*
* @return void
*/
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}

/**
* Execute the console command.
*
* @return void
*/
* Execute the console command.
*
* @return void
*/
public function fire()
{
$data_dir = storage_path() . '/clockwork';
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Clockwork
=========

[Clockwork](http://github.com/itsgoingd/clockwork-chrome) is a Chrome extension for PHP development, extending Developer Tools with a new panel providing all kinds of information useful for debugging and profilling your PHP applications, including information about request, headers, get and post data, cookies, session data, database queries, routes, visualisation of application runtime and more.
[Clockwork](http://github.com/itsgoingd/clockwork-chrome) is a Chrome extension for PHP development, extending Developer Tools with a new panel providing all kinds of information useful for debugging and profiling your PHP applications, including information about request, headers, get and post data, cookies, session data, database queries, routes, visualisation of application runtime and more.

This repository contains server-side component of Clockwork that gathers all the data, stores them in JSON format and serves them for displaying in Chrome Developer Tools extension.

Expand Down

0 comments on commit ed5887e

Please sign in to comment.