Merge pull request #989 from dprvig/develop

Fixed various typos throughout laravel folder.

laravel/autoloader.php

@@ -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 @@ public static function load($class)
 			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 @@ protected static function load_namespaced($class, $namespace, $directory)
 	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);
 

laravel/bundle.php

@@ -66,7 +66,7 @@ public static function register($bundle, $config = array())
 
 		// 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 @@ public static function handles($uri)
 	}
 
 	/**
-	 * Deteremine if a bundle exists within the bundles directory.
+	 * Determine if a bundle exists within the bundles directory.
 	 *
 	 * @param  string  $bundle
 	 * @return bool

laravel/cli/tasks/bundle/bundler.php

@@ -49,7 +49,7 @@ public function install($bundles)
 			// all of its registered dependencies as well.
 			//
 			// Each bundle provider implements the Provider interface and
-			// is repsonsible for retrieving the bundle source from its
+			// is responsible for retrieving the bundle source from its
 			// hosting party and installing it into the application.
 			$path = path('bundle').$this->path($bundle);
 
@@ -135,7 +135,7 @@ protected function get($bundles)
 
 			$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']);

laravel/cli/tasks/bundle/providers/provider.php

@@ -27,7 +27,7 @@ protected function zipball($url, $bundle, $path)
 
 		// When installing a bundle from a Zip archive, we'll first clone
 		// down the bundle zip into the bundles "working" directory so
-		// we have a spot to do all of our bundle extration work.
+		// we have a spot to do all of our bundle extraction work.
 		$target = $work.'laravel-bundle.zip';
 
 		File::put($target, $this->download($url));
@@ -49,7 +49,7 @@ protected function zipball($url, $bundle, $path)
 
 		// 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');

laravel/cli/tasks/migrate/database.php

@@ -40,7 +40,7 @@ public function last()
 		$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();
 

laravel/cli/tasks/migrate/migrator.php

@@ -206,7 +206,7 @@ public function make($arguments = array())
 
 		// 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 @@ protected function stub($bundle, $migration)
 
 		$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);

laravel/cookie.php

@@ -77,7 +77,7 @@ public static function put($name, $value, $expiration = 0, $path = '/', $domain
 
 		// 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 unsecured HTTP.
 		if ($secure and ! Request::secure())
 		{
 			throw new \Exception("Attempting to set secure cookie over HTTP.");

laravel/database/connection.php

@@ -287,7 +287,7 @@ protected function fetch($statement, $style)
 	{
 		// If the fetch style is "class", we'll hydrate an array of PHP
 		// stdClass objects as generic containers for the query rows,
-		// otherwise we'll just use the fetch styel value.
+		// otherwise we'll just use the fetch style value.
 		if ($style === PDO::FETCH_CLASS)
 		{
 			return $statement->fetchAll(PDO::FETCH_CLASS, 'stdClass');

laravel/database/eloquent/model.php

@@ -763,7 +763,7 @@ public function __call($method, $parameters)
 
 		$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))

laravel/database/eloquent/query.php

@@ -38,7 +38,7 @@ class Query {
 	);
 
 	/**
-	 * Creat a new query instance for a model.
+	 * Create a new query instance for a model.
 	 *
 	 * @param  Model  $model
 	 * @return void
@@ -118,7 +118,7 @@ public function hydrate($model, $results)
 			$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);
 

laravel/database/query.php

@@ -168,7 +168,7 @@ public function join($table, $column1, $operator = null, $column2 = null, $type
 
 		// 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);
@@ -686,7 +686,7 @@ public function paginate($per_page = 20, $columns = array('*'))
 	{
 		// Because some database engines may throw errors if we leave orderings
 		// on the query when retrieving the total number of records, we'll drop
-		// all of the ordreings and put them back on the query.
+		// all of the orderings and put them back on the query.
 		list($orderings, $this->orderings) = array($this->orderings, null);
 
 		$total = $this->count(reset($columns));
@@ -852,7 +852,7 @@ public function __call($method, $parameters)
 		}
 
 		// 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')))
 		{

laravel/database/query/grammars/grammar.php

@@ -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 @@ protected function joins(Query $query)
 
 			// 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 @@ protected function offset(Query $query)
 	}
 
 	/**
-	 * 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 @@ public function insert(Query $query, $values)
 		$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 @@ public function insert(Query $query, $values)
 	}
 
 	/**
-	 * 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 @@ public function insert_get_id(Query $query, $values, $column)
 	}
 
 	/**
-	 * 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 @@ public function update(Query $query, $values)
 		$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

laravel/database/query/grammars/postgres.php

@@ -5,7 +5,7 @@
 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

laravel/database/schema.php

@@ -90,7 +90,7 @@ public static function execute($table)
 	{
 		// The implications method is responsible for finding any fluently
 		// defined indexes on the schema table and adding the explicit
-		// commands that are needed to tbe schema instance.
+		// commands that are needed to the schema instance.
 		static::implications($table);
 
 		foreach ($table->commands as $command)

laravel/database/schema/grammars/mysql.php

@@ -37,7 +37,7 @@ public function create(Table $table, Fluent $command)
 	}
 
 	/**
-	 * Geenrate the SQL statements for a table modification command.
+	 * Generate the SQL statements for a table modification command.
 	 *
 	 * @param  Table   $table
 	 * @param  Fluent  $command
@@ -296,7 +296,7 @@ public function drop_fulltext(Table $table, Fluent $command)
 	}
 
 	/**
-	 * 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
@@ -365,7 +365,7 @@ protected function type_float(Fluent $column)
 	}
 
 	/**
-	 * Generate the data-type definintion for a decimal.
+	 * Generate the data-type definition for a decimal.
 	 *
 	 * @param  Fluent  $column
 	 * @return string

laravel/database/schema/grammars/postgres.php

@@ -25,7 +25,7 @@ public function create(Table $table, Fluent $command)
 	}
 
 	/**
-	 * Geenrate the SQL statements for a table modification command.
+	 * Generate the SQL statements for a table modification command.
 	 *
 	 * @param  Table    $table
 	 * @param  Fluent   $command
@@ -258,7 +258,7 @@ public function drop_primary(Table $table, Fluent $command)
 	}
 
 	/**
-	 * 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
@@ -351,7 +351,7 @@ protected function type_float(Fluent $column)
 	}
 
 	/**
-	 * Generate the data-type definintion for a decimal.
+	 * Generate the data-type definition for a decimal.
 	 *
 	 * @param  Fluent  $column
 	 * @return string

laravel/database/schema/grammars/sqlite.php

@@ -43,7 +43,7 @@ public function create(Table $table, Fluent $command)
 	}
 
 	/**
-	 * Geenrate the SQL statements for a table modification command.
+	 * Generate the SQL statements for a table modification command.
 	 *
 	 * @param  Table   $table
 	 * @param  Fluent  $command
@@ -226,7 +226,7 @@ public function drop(Table $table, Fluent $command)
 	}
 
 	/**
-	 * 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
@@ -238,7 +238,7 @@ public function drop_unique(Table $table, Fluent $command)
 	}
 
 	/**
-	 * 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
@@ -295,7 +295,7 @@ protected function type_float(Fluent $column)
 	}
 
 	/**
-	 * Generate the data-type definintion for a decimal.
+	 * Generate the data-type definition for a decimal.
 	 *
 	 * @param  Fluent  $column
 	 * @return string

laravel/database/schema/grammars/sqlserver.php

@@ -272,7 +272,7 @@ public function drop_primary(Table $table, Fluent $command)
 	}
 
 	/**
-	 * 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
@@ -369,7 +369,7 @@ protected function type_float(Fluent $column)
 	}
 
 	/**
-	 * Generate the data-type definintion for a decimal.
+	 * Generate the data-type definition for a decimal.
 	 *
 	 * @param  Fluent  $column
 	 * @return string

laravel/error.php

@@ -80,7 +80,7 @@ public static function native($code, $error, $file, $line)
 	 */
 	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();

laravel/file.php

@@ -296,7 +296,7 @@ public static function rmdir($directory, $preserve = false)
 		{
 			// 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());

laravel/html.php

@@ -359,7 +359,7 @@ public static function attributes($attributes)
 		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;
 

laravel/ioc.php

@@ -191,7 +191,7 @@ protected static function dependencies($parameters)
 			$dependency = $parameter->getClass();
 
 			// If the class is null, it means the dependency is a string or some other
-			// primitive type, which we can not esolve since it is not a class and
+			// primitive type, which we can not resolve since it is not a class and
 			// we'll just bomb out with an error since we have nowhere to go.
 			if (is_null($dependency))
 			{

laravel/lang.php

@@ -134,7 +134,7 @@ public function get($language = null, $default = null)
 		$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))
 		{

laravel/laravel.php

@@ -54,7 +54,7 @@
 |--------------------------------------------------------------------------
 |
 | 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!
 |
 */
@@ -181,7 +181,7 @@
 |--------------------------------------------------------------------------
 |
 | 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.
 |
 */

laravel/log.php

@@ -28,7 +28,7 @@ protected static function exception_line($e)
 	 * Write a message to the log file.
 	 *
 	 * <code>
-	 *		// Write an "error" messge to the log file
+	 *		// Write an "error" message to the log file
 	 *		Log::write('error', 'Something went horribly wrong!');
 	 *
 	 *		// Write an "error" message using the class' magic method

laravel/pluralizer.php

@@ -48,7 +48,7 @@ public function singular($value)
 		}
 
 		// English words may be automatically inflected using regular expressions.
-		// If the word is english, we'll just pass off the word to the automatic
+		// If the word is English, we'll just pass off the word to the automatic
 		// inflection method and return the result, which is cached.
 		$irregular = $this->config['irregular'];
 
@@ -77,7 +77,7 @@ public function plural($value, $count = 2)
 		}
 
 		// English words may be automatically inflected using regular expressions.
-		// If the word is english, we'll just pass off the word to the automatic
+		// If the word is English, we'll just pass off the word to the automatic
 		// inflection method and return the result, which is cached.
 		$irregular = array_flip($this->config['irregular']);
 

laravel/redis.php

@@ -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
 	 */

laravel/routing/router.php

@@ -303,7 +303,7 @@ public static function controller($controllers, $defaults = 'index', $https = nu
 		{
 			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.

laravel/session/drivers/database.php

@@ -84,7 +84,7 @@ public function delete($id)
 	}
 
 	/**
-	 * Delete all expired sessions from persistant storage.
+	 * Delete all expired sessions from persistent storage.
 	 *
 	 * @param  int   $expiration
 	 * @return void

laravel/session/drivers/driver.php

@@ -63,7 +63,7 @@ public function id()
 			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 {

laravel/session/drivers/file.php

@@ -64,7 +64,7 @@ public function delete($id)
 	}
 
 	/**
-	 * Delete all expired sessions from persistant storage.
+	 * Delete all expired sessions from persistent storage.
 	 *
 	 * @param  int   $expiration
 	 * @return void

laravel/session/drivers/sweeper.php

@@ -3,7 +3,7 @@
 interface Sweeper {
 
 	/**
-	 * Delete all expired sessions from persistant storage.
+	 * Delete all expired sessions from persistent storage.
 	 *
 	 * @param  int   $expiration
 	 * @return void

laravel/session/payload.php

@@ -71,7 +71,7 @@ public function load($id)
 	}
 
 	/**
-	 * Deteremine if the session payload instance is valid.
+	 * Determine if the session payload instance is valid.
 	 *
 	 * The session is considered valid if it exists and has not expired.
 	 *

laravel/validator.php

@@ -974,7 +974,7 @@ protected function attribute($attribute)
 
 		// 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);