Commit 8a34aa50 authored by Pascal Borreli's avatar Pascal Borreli

Fixed typos

parent f9697763
......@@ -38,7 +38,7 @@ function document_exists($page)
}
/**
* Attach the sidebar to the documentatoin template.
* Attach the sidebar to the documentation template.
*/
View::composer('docs::template', function($view)
{
......
......@@ -40,7 +40,7 @@ class Autoloader {
/**
* Load the file corresponding to a given class.
*
* This method is registerd in the bootstrap file as an SPL auto-loader.
* This method is registered in the bootstrap file as an SPL auto-loader.
*
* @param string $class
* @return void
......@@ -55,7 +55,7 @@ class Autoloader {
return class_alias(static::$aliases[$class], $class);
}
// All classes in Laravel are staticly mapped. There is no crazy search
// All classes in Laravel are statically mapped. There is no crazy search
// routine that digs through directories. It's just a simple array of
// class to file path maps for ultra-fast file loading.
elseif (isset(static::$mappings[$class]))
......@@ -102,7 +102,7 @@ class Autoloader {
protected static function load_psr($class, $directory = null)
{
// The PSR-0 standard indicates that class namespaces and underscores
// should be used to indcate the directory tree in which the class
// should be used to indicate the directory tree in which the class
// resides, so we'll convert them to slashes.
$file = str_replace(array('\\', '_'), '/', $class);
......
......@@ -66,7 +66,7 @@ class Bundle {
// It is possible for the developer to specify auto-loader mappings
// directly on the bundle registration. This provides a convenient
// way to register mappings withuot a bootstrap.
// way to register mappings without a bootstrap.
if (isset($config['autoloads']))
{
static::autoloads($bundle, $config);
......@@ -201,7 +201,7 @@ class Bundle {
}
/**
* Deteremine if a bundle exists within the bundles directory.
* Determine if a bundle exists within the bundles directory.
*
* @param string $bundle
* @return bool
......
......@@ -100,7 +100,7 @@ class Command {
* // Resolve an instance of a task
* $task = Command::resolve('application', 'migrate');
*
* // Resolve an instance of a task wtihin a bundle
* // Resolve an instance of a task within a bundle
* $task = Command::resolve('bundle', 'foo');
* </code>
*
......
......@@ -135,7 +135,7 @@ class Bundler extends Task {
$responses[] = $bundle;
// We'll also get the bundle's declared dependenceis so they
// We'll also get the bundle's declared dependencies so they
// can be installed along with the bundle, making it easy
// to install a group of bundles.
$dependencies = $this->get($bundle['dependencies']);
......
......@@ -49,7 +49,7 @@ abstract class Provider {
// Once we have the latest modified directory, we should be
// able to move its contents over into the bundles folder
// so the bundle will be usable by the develoepr.
// so the bundle will be usable by the developer.
File::mvdir($latest, $path);
File::rmdir($work.'zip');
......
......@@ -40,7 +40,7 @@ class Database {
$table = $this->table();
// First we need to grab the last batch ID from the migration table,
// as this will allow us to grab the lastest batch of migrations
// as this will allow us to grab the latest batch of migrations
// that need to be run for a rollback command.
$id = $this->batch();
......
......@@ -206,7 +206,7 @@ class Migrator extends Task {
// Once the migration has been created, we'll return the
// migration file name so it can be used by the task
// consumer if necessary for futher work.
// consumer if necessary for further work.
return $file;
}
......@@ -223,7 +223,7 @@ class Migrator extends Task {
$prefix = Bundle::class_prefix($bundle);
// The class name is formatted simialrly to tasks and controllers,
// The class name is formatted similarly to tasks and controllers,
// where the bundle name is prefixed to the class if it is not in
// the default "application" bundle.
$class = $prefix.Str::classify($migration);
......
......@@ -77,7 +77,7 @@ class Cookie {
// If the secure option is set to true, yet the request is not over HTTPS
// we'll throw an exception to let the developer know that they are
// attempting to send a secure cookie over the unsecure HTTP.
// attempting to send a secure cookie over the insecure HTTP.
if ($secure and ! Request::secure())
{
throw new \Exception("Attempting to set secure cookie over HTTP.");
......
......@@ -746,7 +746,7 @@ abstract class Model {
$underscored = array('with', 'find');
// Some methods need to be accessed both staticly and non-staticly so we'll
// Some methods need to be accessed both statically and non-statically so we'll
// keep underscored methods of those methods and intercept calls to them
// here so they can be called either way on the model instance.
if (in_array($method, $underscored))
......
......@@ -118,7 +118,7 @@ class Query {
$new = new $class(array(), true);
// We need to set the attributes manually in case the accessible property is
// set on the array which will prevent the mass assignemnt of attributes if
// set on the array which will prevent the mass assignment of attributes if
// we were to pass them in using the constructor or fill methods.
$new->fill_raw($result);
......
......@@ -168,7 +168,7 @@ class Query {
// If the column is just a string, we can assume that the join just
// has a simple on clause, and we'll create the join instance and
// add the clause automatically for the develoepr.
// add the clause automatically for the developer.
else
{
$join = new Query\Join($type, $table);
......@@ -869,7 +869,7 @@ class Query {
}
// All of the aggregate methods are handled by a single method, so we'll
// catch them all here and then pass them off to the agregate method
// catch them all here and then pass them off to the aggregate method
// instead of creating methods for each one of them.
if (in_array($method, array('count', 'min', 'max', 'avg', 'sum')))
{
......
......@@ -13,7 +13,7 @@ class Grammar extends \Laravel\Database\Grammar {
public $datetime = 'Y-m-d H:i:s';
/**
* All of the query componenets in the order they should be built.
* All of the query components in the order they should be built.
*
* @var array
*/
......@@ -149,7 +149,7 @@ class Grammar extends \Laravel\Database\Grammar {
// The first clause will have a connector on the front, but it is
// not needed on the first condition, so we will strip it off of
// the condition before adding it to the arrya of joins.
// the condition before adding it to the array of joins.
$search = array('AND ', 'OR ');
$clauses[0] = str_replace($search, '', $clauses[0]);
......@@ -343,7 +343,7 @@ class Grammar extends \Laravel\Database\Grammar {
}
/**
* Compile a SQL INSERT statment from a Query instance.
* Compile a SQL INSERT statement from a Query instance.
*
* This method handles the compilation of single row inserts and batch inserts.
*
......@@ -366,7 +366,7 @@ class Grammar extends \Laravel\Database\Grammar {
$columns = $this->columnize(array_keys(reset($values)));
// Build the list of parameter place-holders of values bound to the query.
// Each insert should have the same number of bound paramters, so we can
// Each insert should have the same number of bound parameters, so we can
// just use the first array of values.
$parameters = $this->parameterize(reset($values));
......@@ -376,7 +376,7 @@ class Grammar extends \Laravel\Database\Grammar {
}
/**
* Compile a SQL INSERT and get ID statment from a Query instance.
* Compile a SQL INSERT and get ID statement from a Query instance.
*
* @param Query $query
* @param array $values
......@@ -389,7 +389,7 @@ class Grammar extends \Laravel\Database\Grammar {
}
/**
* Compile a SQL UPDATE statment from a Query instance.
* Compile a SQL UPDATE statement from a Query instance.
*
* @param Query $query
* @param array $values
......@@ -410,13 +410,13 @@ class Grammar extends \Laravel\Database\Grammar {
$columns = implode(', ', $columns);
// UPDATE statements may be constrained by a WHERE clause, so we'll run
// the entire where compilation process for those contraints. This is
// the entire where compilation process for those constraints. This is
// easily achieved by passing it to the "wheres" method.
return trim("UPDATE {$table} SET {$columns} ".$this->wheres($query));
}
/**
* Compile a SQL DELETE statment from a Query instance.
* Compile a SQL DELETE statement from a Query instance.
*
* @param Query $query
* @return string
......
......@@ -5,7 +5,7 @@ use Laravel\Database\Query;
class Postgres extends Grammar {
/**
* Compile a SQL INSERT and get ID statment from a Query instance.
* Compile a SQL INSERT and get ID statement from a Query instance.
*
* @param Query $query
* @param array $values
......
......@@ -37,7 +37,7 @@ class MySQL extends Grammar {
}
/**
* Geenrate the SQL statements for a table modification command.
* Generate the SQL statements for a table modification command.
*
* @param Table $table
* @param Fluent $command
......@@ -260,7 +260,7 @@ class MySQL extends Grammar {
}
/**
* Generate the SQL statement for a drop unqique key command.
* Generate the SQL statement for a drop unique key command.
*
* @param Table $table
* @param Fluent $command
......@@ -284,7 +284,7 @@ class MySQL extends Grammar {
}
/**
* Generate the SQL statement for a drop unqique key command.
* Generate the SQL statement for a drop unique key command.
*
* @param Table $table
* @param Fluent $command
......@@ -353,7 +353,7 @@ class MySQL extends Grammar {
}
/**
* Generate the data-type definintion for a decimal.
* Generate the data-type definition for a decimal.
*
* @param Fluent $column
* @return string
......
......@@ -246,7 +246,7 @@ class Postgres extends Grammar {
}
/**
* Generate the SQL statement for a drop unqique key command.
* Generate the SQL statement for a drop unique key command.
*
* @param Table $table
* @param Fluent $command
......@@ -339,7 +339,7 @@ class Postgres extends Grammar {
}
/**
* Generate the data-type definintion for a decimal.
* Generate the data-type definition for a decimal.
*
* @param Fluent $column
* @return string
......
......@@ -214,7 +214,7 @@ class SQLite extends Grammar {
}
/**
* Generate the SQL statement for a drop unqique key command.
* Generate the SQL statement for a drop unique key command.
*
* @param Table $table
* @param Fluent $command
......@@ -226,7 +226,7 @@ class SQLite extends Grammar {
}
/**
* Generate the SQL statement for a drop unqique key command.
* Generate the SQL statement for a drop unique key command.
*
* @param Table $table
* @param Fluent $command
......
......@@ -32,7 +32,7 @@ class SQLServer extends Grammar {
}
/**
* Geenrate the SQL statements for a table modification command.
* Generate the SQL statements for a table modification command.
*
* @param Table $table
* @param Fluent $command
......@@ -260,7 +260,7 @@ class SQLServer extends Grammar {
}
/**
* Generate the SQL statement for a drop unqiue key command.
* Generate the SQL statement for a drop unique key command.
*
* @param Table $table
* @param Fluent $command
......@@ -357,7 +357,7 @@ class SQLServer extends Grammar {
}
/**
* Generate the data-type definintion for a decimal.
* Generate the data-type definition for a decimal.
*
* @param Fluent $column
* @return string
......
......@@ -21,7 +21,7 @@ Bundles are the heart of the improvements that were made in Laravel 3.0. They ar
<a name="creating-and-registering"></a>
## Creating Bundles
The first step in creating a bundle is to create a folder for the bundle within your **bundles** directory. For this example, let's create an "admin" bundle, which could house the administrator back-end to our application. The **application/start.php** file provides some basic configuration that helps to define how our application will run. Likewise we'll create a **start.php** file within our new bundle folder for the same purpose. It is run everytime the bundle is loaded. Let's create it:
The first step in creating a bundle is to create a folder for the bundle within your **bundles** directory. For this example, let's create an "admin" bundle, which could house the administrator back-end to our application. The **application/start.php** file provides some basic configuration that helps to define how our application will run. Likewise we'll create a **start.php** file within our new bundle folder for the same purpose. It is run every time the bundle is loaded. Let's create it:
#### Creating a bundle start.php file:
......
......@@ -223,7 +223,7 @@ Want to join on a different foreign key? No problem. Just pass it in the second
return $this->has_many('Comment', 'my_foreign_key');
You may be wondering: _If the dynamic properties return the relationship and require less keystokes, why would I ever use the relationship methods?_ Actually, relationship methods are very powerful. They allow you to continue to chain query methods before retrieving the relationship. Check this out:
You may be wondering: _If the dynamic properties return the relationship and require less keystrokes, why would I ever use the relationship methods?_ Actually, relationship methods are very powerful. They allow you to continue to chain query methods before retrieving the relationship. Check this out:
echo Post::find(1)->comments()->order_by('votes', 'desc')->take(10)->get();
......
......@@ -169,7 +169,7 @@ You may also specify multiple conditions for an **ON** clause by passing a Closu
$join->on('users.id', '=', 'phone.user_id');
$join->or_on('users.id', '=', 'phone.contact_id');
})
->get(array('users.email', 'phone.numer'));
->get(array('users.email', 'phone.number'));
<a name="ordering"></a>
## Ordering Results
......
......@@ -13,7 +13,7 @@
<a name="the-basics"></a>
## The Basics
The Schema Bulder provides methods for creating and modifying your database tables. Using a fluent syntax, you can work with your tables without using any vendor specific SQL.
The Schema Builder provides methods for creating and modifying your database tables. Using a fluent syntax, you can work with your tables without using any vendor specific SQL.
*Further Reading:*
......
......@@ -24,7 +24,7 @@ IoC containers help make your application more flexible and testable. Since you
});
Great! Now we have registered a resolver for SwiftMailer in our container. But, what if we don't want the container to create a new mailer instance every time we need one? Maybe we just want the container to return the same instance after the intial instance is created. Just tell the container the object should be a singleton:
Great! Now we have registered a resolver for SwiftMailer in our container. But, what if we don't want the container to create a new mailer instance every time we need one? Maybe we just want the container to return the same instance after the initial instance is created. Just tell the container the object should be a singleton:
#### Registering a singleton in the container:
......
......@@ -55,7 +55,7 @@ Need to retrieve the line in a language other than your default? Not a problem.
<a name="replace"></a>
## Place Holders & Replacements
Now, let's work on our welcome message. "Welcome to our website!" is a pretty generic message. It would be helpful to be able to specify the name of the person we are welcoming. But, creating a language line for each user of our application would be time-consuming and ridiculous. Thankfully, you don't have to. You can specify "place-holders" within your language lines. Place-holders are preceeded by a colon:
Now, let's work on our welcome message. "Welcome to our website!" is a pretty generic message. It would be helpful to be able to specify the name of the person we are welcoming. But, creating a language line for each user of our application would be time-consuming and ridiculous. Thankfully, you don't have to. You can specify "place-holders" within your language lines. Place-holders are preceded by a colon:
#### Creating a language line with place-holders:
......
......@@ -24,7 +24,7 @@ The **detail** option indicates if the framework should display the error messag
To enable logging, set the **log** option in the error configuration to "true". When enabled, the Closure defined by the **logger** configuration item will be executed when an error occurs. This gives you total flexibility in how the error should be logged. You can even e-mail the errors to your development team!
By default, logs are stored in the **storage/logs** direcetory, and a new log file is created for each day. This keeps your log files from getting crowded with too many messages.
By default, logs are stored in the **storage/logs** directory, and a new log file is created for each day. This keeps your log files from getting crowded with too many messages.
<a name="the-logger-class"></a>
## The Logger Class
......
......@@ -62,7 +62,7 @@ Sometimes you may need to determine if the current URI is a given string, or beg
// This request is over HTTPS!
}
#### Determing if the current request is an AJAX request:
#### Determining if the current request is an AJAX request:
if (Request::ajax())
{
......
......@@ -99,14 +99,14 @@ If a request enters your application but does not match any existing route, the
You are free to change this to fit the needs of your application!
*Futher Reading:*
*Further Reading:*
- *[Events](/docs/events)*
<a name="filters"></a>
## Filters
Route filters may be run before or after a route is executed. If a "before" filter returns a value, that value is considered the response to the request and the route is not executed, which is conveniont when implementing authentication filters, etc. Filters are typically defined in **application/routes.php**.
Route filters may be run before or after a route is executed. If a "before" filter returns a value, that value is considered the response to the request and the route is not executed, which is convenient when implementing authentication filters, etc. Filters are typically defined in **application/routes.php**.
#### Registering a filter:
......
......@@ -344,7 +344,7 @@ In the example above, the custom required message will be used for the email att
However, if you are using many custom error messages, specifying inline may become cumbersome and messy. For that reason, you can specify your custom messages in the **custom** array within the validation language file:
#### Adding custom error messages to the validation langauge file:
#### Adding custom error messages to the validation language file:
'custom' => array(
'email_required' => 'We need to know your e-mail address!',
......
......@@ -15,7 +15,7 @@
<a name="entities"></a>
## Entities
When displaying user input in your Views, it is important to convert all characters which have signifance in HTML to their "entity" representation.
When displaying user input in your Views, it is important to convert all characters which have significance in HTML to their "entity" representation.
For example, the < symbol should be converted to its entity representation. Converting HTML characters to their entity representation helps protect your application from cross-site scripting:
......
......@@ -10,7 +10,7 @@
<a name="the-basics"></a>
## The Basics
Your application probably uses a common layout across most of its pages. Manually creating this layout within every controller action can be a pain. Specifying a controller layout will make your develompent much more enjoyable. Here's how to get started:
Your application probably uses a common layout across most of its pages. Manually creating this layout within every controller action can be a pain. Specifying a controller layout will make your development much more enjoyable. Here's how to get started:
#### Specify a "layout" property on your controller:
......
......@@ -60,7 +60,7 @@ class Error {
{
if (error_reporting() === 0) return;
// For a PHP error, we'll create an ErrorExcepetion and then feed that
// For a PHP error, we'll create an ErrorException and then feed that
// exception to the exception method, which will create a simple view
// of the exception details for the developer.
$exception = new \ErrorException($error, $code, 0, $file, $line);
......@@ -80,7 +80,7 @@ class Error {
*/
public static function shutdown()
{
// If a fatal error occured that we have not handled yet, we will
// If a fatal error occurred that we have not handled yet, we will
// create an ErrorException and feed it to the exception handler,
// as it will not yet have been handled.
$error = error_get_last();
......
......@@ -296,7 +296,7 @@ class File {
{
// If the item is a directory, we can just recurse into the
// function and delete that sub-directory, otherwise we'll
// just deleete the file and keep going!
// just delete the file and keep going!
if ($item->isDir())
{
static::rmdir($item->getRealPath());
......
......@@ -359,7 +359,7 @@ class HTML {
foreach ((array) $attributes as $key => $value)
{
// For numeric keys, we will assume that the key and the value are the
// same, as this will conver HTML attributes such as "required" that
// same, as this will convert HTML attributes such as "required" that
// may be specified as required="required", etc.
if (is_numeric($key)) $key = $value;
......
......@@ -179,7 +179,7 @@ class IoC {
/**
* Resolve all of the dependencies from the ReflectionParameters.
*
* @param array $parameterrs
* @param array $parameters
* @return array
*/
protected static function dependencies($parameters)
......
......@@ -134,7 +134,7 @@ class Lang {
$line = array_get($lines, $line, $default);
// If the line is not a string, it probably means the developer asked for
// the entire langauge file and the value of the requested value will be
// the entire language file and the value of the requested value will be
// an array containing all of the lines in the file.
if (is_string($line))
{
......
......@@ -54,7 +54,7 @@ register_shutdown_function(function()
|--------------------------------------------------------------------------
|
| By setting error reporting to -1, we essentially force PHP to report
| every error, and this is guranteed to show every error on future
| every error, and this is guaranteed to show every error on future
| releases of PHP. This allows everything to be fixed early!
|
*/
......@@ -143,7 +143,7 @@ $response->render();
|--------------------------------------------------------------------------
|
| If a session driver has been configured, we will save the session to
| storage so it is avaiable for the next request. This will also set
| storage so it is available for the next request. This will also set
| the session cookie in the cookie jar to be sent to the user.
|
*/
......
......@@ -17,7 +17,7 @@ class Redis {
protected $port;
/**
* The databse number the connection selects on load.
* The database number the connection selects on load.
*
* @var int
*/
......
......@@ -106,7 +106,7 @@ class Response {
* return Response::eloquent($data, 200, array('header' => 'value'));
* </code>
*
* @param Eloquenet|array $data
* @param Eloquent|array $data
* @param int $status
* @param array $headers
* @return Response
......
......@@ -303,7 +303,7 @@ class Router {
{
list($bundle, $controller) = Bundle::parse($identifier);
// First we need to replace the dots with slashes in thte controller name
// First we need to replace the dots with slashes in the controller name
// so that it is in directory format. The dots allow the developer to use
// a cleaner syntax when specifying the controller. We will also grab the
// root URI for the controller's bundle.
......
......@@ -84,7 +84,7 @@ class Database extends Driver implements Sweeper {
}
/**
* Delete all expired sessions from persistant storage.
* Delete all expired sessions from persistent storage.
*
* @param int $expiration
* @return void
......
......@@ -63,7 +63,7 @@ abstract class Driver {
return Str::random(40);
}
// We'll containue generating random IDs until we find an ID that is
// We'll continue generating random IDs until we find an ID that is
// not currently assigned to a session. This is almost definitely
// going to happen on the first iteration.
do {
......
......@@ -953,7 +953,7 @@ class Validator {
// If no language line has been specified for the attribute, all of
// the underscores are removed from the attribute name and that
// will be used as the attribtue name.
// will be used as the attribute name.
else
{
return str_replace('_', ' ', $attribute);
......
......@@ -10,7 +10,7 @@
/*
|----------------------------------------------------------------
| Application Environemtns
| Application Environments
|----------------------------------------------------------------
|
| Laravel takes a dead simple approach to environments, and we
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment