Fixed typos

flavorzyb · Apr 16, 2014 · 7172f42 · 7172f42
1 parent 06f6e86
commit 7172f42
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 31 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,11 +10,11 @@ This page contains guidelines for contributing to the Laravel framework. Please
 
 The pull request process differs for new features and bugs. Before sending a pull request for a new feature, you should first create an issue with `[Proposal]` in the title. The proposal should describe the new feature, as well as implementation ideas. The proposal will then be reviewed and either approved or denied. Once a proposal is approved, a pull request may be created implementing the new feature. Pull requests which do not follow this guideline will be closed immediately.
 
-Pull requests for bugs may be sent without creating any proposal issue. If you believe that you know of a solution for a bug that has been filed on Github, please leave a comment detailing your proposed fix.
+Pull requests for bugs may be sent without creating any proposal issue. If you believe that you know of a solution for a bug that has been filed on GitHub, please leave a comment detailing your proposed fix.
 
 ### Feature Requests
 
-If you have an idea for a new feature you would like to see added to Laravel, you may create an issue on Github with `[Request]` in the title. The feature request will then be reviewed by a core contributor.
+If you have an idea for a new feature you would like to see added to Laravel, you may create an issue on GitHub with `[Request]` in the title. The feature request will then be reviewed by a core contributor.
 
 ## Coding Guidelines
 

diff --git a/src/Illuminate/Config/FileEnvironmentVariablesLoader.php b/src/Illuminate/Config/FileEnvironmentVariablesLoader.php
@@ -21,7 +21,7 @@ class FileEnvironmentVariablesLoader implements EnvironmentVariablesLoaderInterf
 	/**
 	 * Create a new file environment loader instance.
 	 *
-	 * @param  \Illumiante\Filesystem\Filesystem  $files
+	 * @param  \Illuminate\Filesystem\Filesystem  $files
 	 * @return void
 	 */
 	public function __construct(Filesystem $files, $path = null)

diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -72,7 +72,7 @@ class Connection implements ConnectionInterface {
 	protected $fetchMode = PDO::FETCH_ASSOC;
 
 	/**
-	 * The number of active transasctions.
+	 * The number of active transactions.
 	 *
 	 * @var int
 	 */

diff --git a/src/Illuminate/Database/Connectors/SQLiteConnector.php b/src/Illuminate/Database/Connectors/SQLiteConnector.php
@@ -24,7 +24,7 @@ public function connect(array $config)
 
 		$path = realpath($config['database']);
 
-		// Here we'll verify that the SQLite database exists before we gooing further
+		// Here we'll verify that the SQLite database exists before we going further
 		// as the developer probably wants to know if the database exists and this
 		// SQLite driver will not throw any exception if it does not by default.
 		if ($path === false)

diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -685,7 +685,7 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
 	{
 		// If no relation name was given, we will use this debug backtrace to extract
 		// the calling method's name and use that as the relationship name as most
-		// of the time this will be what we desire to use for the relatinoships.
+		// of the time this will be what we desire to use for the relationships.
 		if (is_null($relation))
 		{
 			list(, $caller) = debug_backtrace(false);
@@ -745,7 +745,7 @@ public function morphTo($name = null, $type = null, $id = null)
 			);
 		}
 
-		// If we are not eager loading the relatinship, we will essentially treat this
+		// If we are not eager loading the relationship, we will essentially treat this
 		// as a belongs-to style relationship since morph-to extends that class and
 		// we will pass in the appropriate values so that it behaves as expected.
 		else
@@ -1337,7 +1337,7 @@ public function push()
 
 		// To sync all of the relationships to the database, we will simply spin through
 		// the relationships and save each model via this "push" method, which allows
-		// us to recurse into all of these nested relations for the model instance.
+		// us to recurs into all of these nested relations for the model instance.
 		foreach ($this->relations as $models)
 		{
 			foreach (Collection::make($models) as $model)

diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -785,7 +785,7 @@ protected function createAttachRecord($id, $timed)
 	}
 
 	/**
-	 * Set the creation and update timstamps on an attach record.
+	 * Set the creation and update timestamps on an attach record.
 	 *
 	 * @param  array  $record
 	 * @param  bool   $exists
@@ -965,7 +965,7 @@ public function getRelatedFreshUpdate()
 	}
 
 	/**
-	 * Get the key for comparing against the pareny key in "has" query.
+	 * Get the key for comparing against the parent key in "has" query.
 	 *
 	 * @return string
 	 */
@@ -995,7 +995,7 @@ public function getOtherKey()
 	}
 
 	/**
-	 * Get the fully qualified parent key naem.
+	 * Get the fully qualified parent key name.
 	 *
 	 * @return string
 	 */

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -243,7 +243,7 @@ protected function getQualifiedParentKeyName()
 	}
 
 	/**
-	 * Get the key for comparing against the pareny key in "has" query.
+	 * Get the key for comparing against the parent key in "has" query.
 	 *
 	 * @return string
 	 */

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -240,7 +240,7 @@ public function update(array $attributes)
 	}
 
 	/**
-	 * Get the key for comparing against the pareny key in "has" query.
+	 * Get the key for comparing against the parent key in "has" query.
 	 *
 	 * @return string
 	 */
@@ -282,7 +282,7 @@ public function getParentKey()
 	}
 
 	/**
-	 * Get the fully qualified parent key naem.
+	 * Get the fully qualified parent key name.
 	 *
 	 * @return string
 	 */

diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -58,7 +58,7 @@ public function addEagerConstraints(array $models)
 	}
 
 	/**
-	 * Buiild a dictionary with the models.
+	 * Build a dictionary with the models.
 	 *
 	 * @param  \Illuminate\Database\Eloquent\Models  $models
 	 * @return void

diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -219,7 +219,7 @@ public function getParent()
 	}
 
 	/**
-	 * Get the fully qualified parent key naem.
+	 * Get the fully qualified parent key name.
 	 *
 	 * @return string
 	 */

diff --git a/src/Illuminate/Database/Migrations/Migrator.php b/src/Illuminate/Database/Migrations/Migrator.php
@@ -72,7 +72,7 @@ public function run($path, $pretend = false)
 
 		// Once we grab all of the migration files for the path, we will compare them
 		// against the migrations that have already been run for this package then
-		// run all of the oustanding migrations against the database connection.
+		// run all of the outstanding migrations against the database connection.
 		$ran = $this->repository->getRan();
 
 		$migrations = array_diff($files, $ran);

diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -336,7 +336,7 @@ public function register($provider, $options = array(), $force = false)
 	}
 
 	/**
-	 * Get the registered service provider instnace if it exists.
+	 * Get the registered service provider instance if it exists.
 	 *
 	 * @param  \Illuminate\Support\ServiceProvider|string  $provider
 	 * @return \Illuminate\Support\ServiceProvider|null
@@ -418,7 +418,7 @@ protected function loadDeferredProvider($service)
 	}
 
 	/**
-	 * Register a deffered provider and service.
+	 * Register a deferred provider and service.
 	 *
 	 * @param  string  $provider
 	 * @param  string  $service

diff --git a/src/Illuminate/Foundation/EnvironmentDetector.php b/src/Illuminate/Foundation/EnvironmentDetector.php
@@ -76,7 +76,7 @@ protected function detectConsoleEnvironment($environments, array $args)
 	}
 
 	/**
-	 * Get the enviornment argument from the console.
+	 * Get the environment argument from the console.
 	 *
 	 * @param  array  $args
 	 * @return string|null

diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -177,7 +177,7 @@ public function exists($key)
 	}
 
 	/**
-	 * Determine if the request contains a non-emtpy value for an  input item.
+	 * Determine if the request contains a non-empty value for an  input item.
 	 *
 	 * @param  string|array  $key
 	 * @return bool

diff --git a/src/Illuminate/Routing/Console/MakeControllerCommand.php b/src/Illuminate/Routing/Console/MakeControllerCommand.php
@@ -78,7 +78,7 @@ protected function generateController()
 
 		// Finally, we're ready to generate the actual controller file on disk and let
 		// the developer start using it. The controller will be stored in the right
-		// place based on the naemspace of this controller specified by commands.
+		// place based on the namespace of this controller specified by commands.
 		$this->generator->make($controller, $path, $options);
 
 		$this->info('Controller created successfully!');

diff --git a/src/Illuminate/Routing/ControllerDispatcher.php b/src/Illuminate/Routing/ControllerDispatcher.php
@@ -174,7 +174,7 @@ protected function filterApplies($filter, $request, $method)
 	}
 
 	/**
-	 * Determine if the filter fails the "only" cosntraint.
+	 * Determine if the filter fails the "only" constraint.
 	 *
 	 * @param  array  $filter
 	 * @param  \Illuminate\Http\Request  $request
@@ -189,7 +189,7 @@ protected function filterFailsOnly($filter, $request, $method)
 	}
 
 	/**
-	 * Determine if the filter fails the "except" cosntraint.
+	 * Determine if the filter fails the "except" constraint.
 	 *
 	 * @param  array  $filter
 	 * @param  \Illuminate\Http\Request  $request
@@ -204,7 +204,7 @@ protected function filterFailsExcept($filter, $request, $method)
 	}
 
 	/**
-	 * Determine if the filter fails the "on" cosntraint.
+	 * Determine if the filter fails the "on" constraint.
 	 *
 	 * @param  array  $filter
 	 * @param  \Illuminate\Http\Request  $request

diff --git a/src/Illuminate/Routing/Generators/ControllerGenerator.php b/src/Illuminate/Routing/Generators/ControllerGenerator.php
@@ -115,7 +115,7 @@ protected function getController($controller)
 	{
 		$stub = $this->files->get(__DIR__.'/stubs/controller.stub');
 
-		// We will explode out the controller name on the naemspace delimiter so we
+		// We will explode out the controller name on the namespace delimiter so we
 		// are able to replace a namespace in this stub file. If no namespace is
 		// provided we'll just clear out the namespace place-holder locations.
 		$segments = explode('\\', $controller);

diff --git a/src/Illuminate/Routing/RouteCollection.php b/src/Illuminate/Routing/RouteCollection.php
@@ -204,7 +204,7 @@ protected function get($method = null)
 	}
 
 	/**
-	 * Deterine if the route collection contains a given named route.
+	 * Determine if the route collection contains a given named route.
 	 *
 	 * @param  string  $name
 	 * @return bool

diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -83,7 +83,7 @@ class Router implements HttpKernelInterface, RouteFiltererInterface {
 	protected $regexFilters = array();
 
 	/**
-	 * The reigstered route value binders.
+	 * The registered route value binders.
 	 *
 	 * @var array
 	 */

diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php
@@ -297,7 +297,7 @@ protected function getRouteQueryString(array $parameters)
 
 		// Lastly, if there are still parameters remaining, we will fetch the numeric
 		// parameters that are in the array and add them to the query string or we
-		// will build the intial query string if it wasn't started with strings.
+		// will build the initial query string if it wasn't started with strings.
 		if (count($keyed) < count($parameters))
 		{
 			$query .= '&'.implode(

diff --git a/src/Illuminate/View/View.php b/src/Illuminate/View/View.php
@@ -79,7 +79,7 @@ public function render(Closure $callback = null)
 
 		// Once we have the contents of the view, we will flush the sections if we are
 		// done rendering all views so that there is nothing left hanging over when
-		// anothoer view is rendered in the future by the application developers.
+		// another view is rendered in the future by the application developers.
 		$this->environment->flushSectionsIfDoneRendering();
 
 		return $response ?: $contents;

diff --git a/src/Illuminate/Workbench/PackageCreator.php b/src/Illuminate/Workbench/PackageCreator.php
@@ -203,7 +203,7 @@ protected function writeSupportDirectory(Package $package, $support, $directory)
 	{
 		// Once we create the source directory, we will write an empty file to the
 		// directory so that it will be kept in source control allowing the dev
-		// to go ahead and push these components to Github right on creation.
+		// to go ahead and push these components to GitHub right on creation.
 		$path = $directory.'/src/'.$support;
 
 		$this->files->makeDirectory($path, 0777, true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -243,7 +243,7 @@ protected function getQualifiedParentKeyName() @@
     	}
     	/**
-    	 * Get the key for comparing against the pareny key in "has" query.
+    	 * Get the key for comparing against the parent key in "has" query.
     	 *
     	 * @return string
     	 */
@@ Expand Down @@