From fafaf724b0113bee94b9825a7779a672cd4adf82 Mon Sep 17 00:00:00 2001 From: Chris Berthe Date: Wed, 13 Jun 2012 11:19:20 -0400 Subject: [PATCH] Grammar/Vocabulary fixes Signed-off-by: Chris Berthe --- application/config/application.php | 8 ++++---- application/config/cache.php | 2 +- application/config/database.php | 4 ++-- application/config/error.php | 4 ++-- application/config/session.php | 2 +- application/config/strings.php | 2 +- bundles/docs/routes.php | 4 ++-- laravel/auth/drivers/driver.php | 4 ++-- laravel/auth/drivers/fluent.php | 2 +- laravel/autoloader.php | 6 +++--- laravel/blade.php | 2 +- laravel/bundle.php | 14 +++++++------- laravel/cli/artisan.php | 2 +- laravel/cli/command.php | 2 +- laravel/cli/tasks/bundle/providers/provider.php | 2 +- laravel/cli/tasks/migrate/migrator.php | 6 +++--- laravel/config.php | 4 ++-- laravel/cookie.php | 2 +- laravel/core.php | 6 +++--- laravel/database/connection.php | 6 +++--- laravel/database/eloquent/model.php | 4 ++-- laravel/database/eloquent/query.php | 8 ++++---- .../relationships/has_many_and_belongs_to.php | 4 ++-- laravel/database/grammar.php | 4 ++-- laravel/database/query.php | 16 ++++++++-------- laravel/database/query/grammars/grammar.php | 14 +++++++------- laravel/database/query/grammars/postgres.php | 2 +- laravel/database/query/grammars/sqlserver.php | 2 +- laravel/database/schema.php | 2 +- laravel/database/schema/grammars/mysql.php | 10 +++++----- laravel/database/schema/grammars/postgres.php | 4 ++-- laravel/database/schema/grammars/sqlite.php | 12 ++++++------ laravel/database/schema/grammars/sqlserver.php | 8 ++++---- laravel/error.php | 2 +- laravel/event.php | 2 +- laravel/file.php | 8 ++++---- laravel/helpers.php | 2 +- laravel/ioc.php | 4 ++-- laravel/lang.php | 2 +- laravel/laravel.php | 6 +++--- laravel/log.php | 2 +- laravel/paginator.php | 2 +- laravel/pluralizer.php | 6 +++--- laravel/response.php | 2 +- laravel/routing/filter.php | 2 +- laravel/routing/route.php | 8 ++++---- laravel/routing/router.php | 10 +++++----- laravel/session.php | 2 +- laravel/session/drivers/driver.php | 2 +- laravel/uri.php | 2 +- laravel/url.php | 6 +++--- laravel/validator.php | 10 +++++----- laravel/view.php | 4 ++-- paths.php | 2 +- 54 files changed, 130 insertions(+), 130 deletions(-) diff --git a/application/config/application.php b/application/config/application.php index 9f597954d3e..1bf0137fef1 100755 --- a/application/config/application.php +++ b/application/config/application.php @@ -8,7 +8,7 @@ |-------------------------------------------------------------------------- | | The URL used to access your application without a trailing slash. The URL - | does not have to be set. If it isn't we'll try our best to guess the URL + | does not have to be set. If it isn't, we'll try our best to guess the URL | of your application. | */ @@ -48,7 +48,7 @@ | | This key is used by the encryption and cookie classes to generate secure | encrypted strings and hashes. It is extremely important that this key - | remain secret and should not be shared with anyone. Make it about 32 + | remains secret and it should not be shared with anyone. Make it about 32 | characters of random gibberish. | */ @@ -63,7 +63,7 @@ | Laravel includes a beautiful profiler toolbar that gives you a heads | up display of the queries and logs performed by your application. | This is wonderful for development, but, of course, you should - | disable the toolbar for production applications.. + | disable the toolbar for production applications. | */ @@ -99,7 +99,7 @@ | SSL Link Generation |-------------------------------------------------------------------------- | - | Many sites use SSL to protect their users data. However, you may not be + | Many sites use SSL to protect their users' data. However, you may not be | able to use SSL on your development machine, meaning all HTTPS will be | broken during development. | diff --git a/application/config/cache.php b/application/config/cache.php index a507ff667ed..5dc267e69c9 100644 --- a/application/config/cache.php +++ b/application/config/cache.php @@ -29,7 +29,7 @@ | This key will be prepended to item keys stored using Memcached and APC | to prevent collisions with other applications on the server. Since the | memory based stores could be shared by other applications, we need to - | be polite and use a prefix to uniquely identifier our items. + | be polite and use a prefix to uniquely identify our items. | */ diff --git a/application/config/database.php b/application/config/database.php index d5e6ac1b46b..94b36f11e63 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -35,7 +35,7 @@ | Default Database Connection |-------------------------------------------------------------------------- | - | The name of your default database connection. This connection will used + | The name of your default database connection. This connection will be used | as the default for all database operations unless a different name is | given when performing said operation. This connection name should be | listed in the array of connections below. @@ -54,7 +54,7 @@ | the freedom to specify as many connections as you can handle. | | All database work in Laravel is done through the PHP's PDO facilities, - | so make sure you have the PDO drivers for your particlar database of + | so make sure you have the PDO drivers for your particular database of | choice installed on your machine. | */ diff --git a/application/config/error.php b/application/config/error.php index 1713afcefeb..c4d27fe47c9 100644 --- a/application/config/error.php +++ b/application/config/error.php @@ -9,7 +9,7 @@ | | Here you simply specify the error levels that should be ignored by the | Laravel error handler. These levels will still be logged; however, no - | information about about them will be displayed. + | information about them will be displayed. | */ @@ -56,7 +56,7 @@ | logging is enabled. | | You may log the error message however you like; however, a simple log - | solution has been setup for you which will log all error messages to + | solution has been set up for you which will log all error messages to | text files within the application storage directory. | */ diff --git a/application/config/session.php b/application/config/session.php index ea686f89aba..dbfe8b27bdc 100644 --- a/application/config/session.php +++ b/application/config/session.php @@ -23,7 +23,7 @@ | Session Database |-------------------------------------------------------------------------- | - | The database table on which the session should be stored. It probably + | The database table in which the session should be stored. It probably | goes without saying that this option only matters if you are using | the super slick database session driver. | diff --git a/application/config/strings.php b/application/config/strings.php index 5d94f81c255..3d8b68f6edb 100644 --- a/application/config/strings.php +++ b/application/config/strings.php @@ -8,7 +8,7 @@ |-------------------------------------------------------------------------- | | This array contains the singular and plural forms of words. It's used by - | the "singular" and "plural" methods on the Str class to convert a given + | the "singular" and "plural" methods in the Str class to convert a given | word from singular to plural and vice versa. | | Note that the regular expressions are only for inflecting English words. diff --git a/bundles/docs/routes.php b/bundles/docs/routes.php index 334c652d10d..2a8561ffbb7 100644 --- a/bundles/docs/routes.php +++ b/bundles/docs/routes.php @@ -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) { @@ -68,7 +68,7 @@ function document_exists($page) // If no page was specified, but a "home" page exists for the section, // we'll set the file to the home page so that the proper page is - // display back out to the client for the requested doc page. + // displayed back out to the client for the requested doc page. if (is_null($page) and document_exists($file.'/home')) { $file .= '/home'; diff --git a/laravel/auth/drivers/driver.php b/laravel/auth/drivers/driver.php index 4a272ba46fa..db649d24065 100644 --- a/laravel/auth/drivers/driver.php +++ b/laravel/auth/drivers/driver.php @@ -80,7 +80,7 @@ public function user() } /** - * Get the a given application user by ID. + * Get the given application user by ID. * * @param int $id * @return mixed @@ -192,7 +192,7 @@ protected function cookie($name, $value, $minutes) } /** - * Get session key name used to store the token. + * Get the session key name used to store the token. * * @return string */ diff --git a/laravel/auth/drivers/fluent.php b/laravel/auth/drivers/fluent.php index 4c23468b8aa..0bac2b019ca 100644 --- a/laravel/auth/drivers/fluent.php +++ b/laravel/auth/drivers/fluent.php @@ -11,7 +11,7 @@ class Fluent extends Driver { * * If the user is a guest, null should be returned. * - * @param int $id + * @param int $id * @return mixed|null */ public function retrieve($id) diff --git a/laravel/autoloader.php b/laravel/autoloader.php index 296b9dbde5b..4168e305c04 100644 --- a/laravel/autoloader.php +++ b/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 - // shoould 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); diff --git a/laravel/blade.php b/laravel/blade.php index c362d57b209..12381482a36 100644 --- a/laravel/blade.php +++ b/laravel/blade.php @@ -150,7 +150,7 @@ protected static function compile_layouts($value) } // First we'll split out the lines of the template so we can get the - // layout from the top of the template. By convention it must be + // layout from the top of the template. By convention, it must be // located on the first line of the template contents. $lines = preg_split("/(\r?\n)/", $value); diff --git a/laravel/bundle.php b/laravel/bundle.php index 2259228ee36..ea05747520d 100644 --- a/laravel/bundle.php +++ b/laravel/bundle.php @@ -46,7 +46,7 @@ public static function register($bundle, $config = array()) // If the given configuration is actually a string, we will assume it is a // location and set the bundle name to match it. This is common for most - // bundles who simply live in the root bundle directory. + // bundles that simply live in the root bundle directory. if (is_string($config)) { $bundle = $config; @@ -55,7 +55,7 @@ public static function register($bundle, $config = array()) } // If no location is set, we will set the location to match the name of - // the bundle. This is for bundles who are installed to the root of + // the bundle. This is for bundles that are installed on the root of // the bundle directory so a location was not set. if ( ! isset($config['location'])) { @@ -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); @@ -74,7 +74,7 @@ public static function register($bundle, $config = array()) } /** - * Load a bundle by running it's start-up script. + * Load a bundle by running its start-up script. * * If the bundle has already been started, no action will be taken. * @@ -124,7 +124,7 @@ public static function routes($bundle) $path = static::path($bundle).'routes'.EXT; - // By setting the bundle property on the router the router knows what + // By setting the bundle property on the router, the router knows what // value to replace the (:bundle) place-holder with when the bundle // routes are added, keeping the routes flexible. Router::$bundle = static::option($bundle, 'handles'); @@ -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 @@ -372,7 +372,7 @@ public static function resolve($bundle) } /** - * Parse a element identifier and return the bundle name and element. + * Parse an element identifier and return the bundle name and element. * * * // Returns array(null, 'admin.user') diff --git a/laravel/cli/artisan.php b/laravel/cli/artisan.php index 46886dc8a6e..e7bd130e664 100644 --- a/laravel/cli/artisan.php +++ b/laravel/cli/artisan.php @@ -34,7 +34,7 @@ * We will wrap the command execution in a try / catch block and * simply write out any exception messages we receive to the CLI * for the developer. Note that this only writes out messages - * for the CLI exceptions. All others will be not be caught + * for the CLI exceptions. All others will not be caught * and will be totally dumped out to the CLI. */ try diff --git a/laravel/cli/command.php b/laravel/cli/command.php index 7b4ae3af2cd..de11406ef14 100644 --- a/laravel/cli/command.php +++ b/laravel/cli/command.php @@ -121,7 +121,7 @@ public static function resolve($bundle, $task) } // If the task file exists, we'll format the bundle and task name - // into a task class name and resolve an instance of the so that + // into a task class name and resolve an instance of the class so that // the requested method may be executed. if (file_exists($path = Bundle::path($bundle).'tasks/'.$task.EXT)) { diff --git a/laravel/cli/tasks/bundle/providers/provider.php b/laravel/cli/tasks/bundle/providers/provider.php index bf6401f71a0..3a5e880c522 100644 --- a/laravel/cli/tasks/bundle/providers/provider.php +++ b/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)); diff --git a/laravel/cli/tasks/migrate/migrator.php b/laravel/cli/tasks/migrate/migrator.php index 5bf7617bf2f..4ab2ef05385 100644 --- a/laravel/cli/tasks/migrate/migrator.php +++ b/laravel/cli/tasks/migrate/migrator.php @@ -151,7 +151,7 @@ public function install() $table->create(); // Migrations can be run for a specific bundle, so we'll use - // the bundle name and string migration name as an unique ID + // the bundle name and string migration name as a unique ID // for the migrations, allowing us to easily identify which // migrations have been run for each bundle. $table->string('bundle', 50); @@ -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); diff --git a/laravel/config.php b/laravel/config.php index 50bd7dc81b5..ac46693bf5a 100644 --- a/laravel/config.php +++ b/laravel/config.php @@ -73,7 +73,7 @@ public static function get($key, $default = null) $items = static::$items[$bundle][$file]; // If a specific configuration item was not requested, the key will be null, - // meaning we'll to return the entire array of configuration item from the + // meaning we'll return the entire array of configuration items from the // requested configuration file. Otherwise we can return the item. if (is_null($item)) { @@ -175,7 +175,7 @@ public static function load($bundle, $file) // requested. This allows many types of config "drivers". $config = Event::first(static::loader, func_get_args()); - // If configuration items were actually found for the bundle and file we + // If configuration items were actually found for the bundle and file, we // will add them to the configuration array and return true, otherwise // we will return false indicating the file was not found. if (count($config) > 0) diff --git a/laravel/cookie.php b/laravel/cookie.php index 1f79a69bd71..8bb508a141f 100644 --- a/laravel/cookie.php +++ b/laravel/cookie.php @@ -3,7 +3,7 @@ class Cookie { /** - * How long is forever (in minutes). + * How long is forever (in minutes)? * * @var int */ diff --git a/laravel/core.php b/laravel/core.php index a38bf9dd65d..b19d924ddde 100644 --- a/laravel/core.php +++ b/laravel/core.php @@ -147,7 +147,7 @@ | Determine The Application Environment |-------------------------------------------------------------------------- | -| Next we're ready to determine the application environment. This may be +| Next, we're ready to determine the application environment. This may be | set either via the command line options or via the mapping of URIs to | environments that lives in the "paths.php" file for the application | and is parsed. When determining the CLI environment, the "--env" @@ -178,7 +178,7 @@ | | Once we have determined the application environment, we will set it on | the global server array of the HttpFoundation request. This makes it -| available throughout the application, thought it is mainly only +| available throughout the application, though it is mainly only | used to determine which configuration files to merge in. | */ @@ -216,7 +216,7 @@ |-------------------------------------------------------------------------- | | Finally we will register all of the bundles that have been defined for -| the application. None of them will be started yet, but will be setup +| the application. None of them will be started yet, but will be set up | so that they may be started by the developer at any time. | */ diff --git a/laravel/database/connection.php b/laravel/database/connection.php index 66601ef8465..b3774fd4362 100644 --- a/laravel/database/connection.php +++ b/laravel/database/connection.php @@ -209,7 +209,7 @@ public function query($sql, $bindings = array()) /** * Execute a SQL query against the connection. * - * The PDO statement and boolean result will be return in an array. + * The PDO statement and boolean result will be returned in an array. * * @param string $sql * @param array $bindings @@ -265,7 +265,7 @@ protected function execute($sql, $bindings = array()) throw $exception; } - // Once we have execute the query, we log the SQL, bindings, and + // Once we have executed the query, we log the SQL, bindings, and // execution time in a static array that is accessed by all of // the connections actively being used by the application. if (Config::get('database.profile')) @@ -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'); diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php index 2c28b8f9d6f..64802cdc0d4 100644 --- a/laravel/database/eloquent/model.php +++ b/laravel/database/eloquent/model.php @@ -736,7 +736,7 @@ public function __call($method, $parameters) { $meta = array('key', 'table', 'connection', 'sequence', 'per_page', 'timestamps'); - // If the method is actually the name of a static property on the model we'll + // If the method is actually the name of a static property on the model, we'll // return the value of the static property. This makes it convenient for // relationships to access these values off of the instances. if (in_array($method, $meta)) @@ -746,7 +746,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)) diff --git a/laravel/database/eloquent/query.php b/laravel/database/eloquent/query.php index 3aee79c9526..f3a54174474 100644 --- a/laravel/database/eloquent/query.php +++ b/laravel/database/eloquent/query.php @@ -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); @@ -141,7 +141,7 @@ public function hydrate($model, $results) } } - // The many to many relationships may have pivot table column on them + // The many to many relationships may have pivot table columns on them // so we will call the "clean" method on the relationship to remove // any pivot columns that are on the model. if ($this instanceof Relationships\Has_Many_And_Belongs_To) @@ -199,7 +199,7 @@ protected function nested_includes($relationship) foreach ($this->model_includes() as $include => $constraints) { // To get the nested includes, we want to find any includes that begin - // the relationship and a dot, then we will strip off the leading + // the relationship with a dot, then we will strip off the leading // nesting indicator and set the include in the array. if (starts_with($include, $relationship.'.')) { @@ -222,7 +222,7 @@ protected function model_includes() foreach ($this->model->includes as $relationship => $constraints) { // When eager loading relationships, constraints may be set on the eager - // load definition; however, is none are set, we need to swap the key + // load definition; however, if none are set, we need to swap the key // and the value of the array since there are no constraints. if (is_numeric($relationship)) { diff --git a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php index 587e504cdd9..5b247c9c309 100644 --- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php +++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php @@ -44,7 +44,7 @@ public function __construct($model, $associated, $table, $foreign, $other) $this->joining = $table ?: $this->joining($model, $associated); // If the Pivot table is timestamped, we'll set the timestamp columns to be - // fetched when the pivot table models are fetched by the developer else + // fetched when the pivot table models are fetched by the developer, or else // the ID will be the only "extra" column fetched in by default. if (Pivot::$timestamps) { @@ -131,7 +131,7 @@ public function sync($ids) } // Next we will take the difference of the current and given IDs and detach - // all of the entities that exists in the current array but are not in + // all of the entities that exist in the current array but are not in // the array of IDs given to the method, finishing the sync. $detach = array_diff($current, $ids); diff --git a/laravel/database/grammar.php b/laravel/database/grammar.php index 13d92d8ea10..0ff5bd14a79 100644 --- a/laravel/database/grammar.php +++ b/laravel/database/grammar.php @@ -35,7 +35,7 @@ public function __construct(Connection $connection) */ public function wrap_table($table) { - // Expressions should be injected into the query as raw strings so + // Expressions should be injected into the query as raw strings // so we do not want to wrap them in any way. We will just return // the string value from the expression to be included. if ($table instanceof Expression) @@ -64,7 +64,7 @@ public function wrap_table($table) */ public function wrap($value) { - // Expressions should be injected into the query as raw strings so + // Expressions should be injected into the query as raw strings // so we do not want to wrap them in any way. We will just return // the string value from the expression to be included. if ($value instanceof Expression) diff --git a/laravel/database/query.php b/laravel/database/query.php index 83c92b8399f..1fafb1cbf50 100644 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -158,7 +158,7 @@ public function join($table, $column1, $operator = null, $column2 = null, $type { // If the "column" is really an instance of a Closure, the developer is // trying to create a join with a complex "ON" clause. So, we will add - // the join, and then call the Closure with the join/ + // the join, and then call the Closure with the join. if ($column1 instanceof Closure) { $this->joins[] = new Query\Join($type, $table); @@ -167,8 +167,8 @@ 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. + // has a simple "ON" clause, and we'll create the join instance and + // add the clause automatically for the developer. else { $join = new Query\Join($type, $table); @@ -453,7 +453,7 @@ private function dynamic_where($method, $parameters) foreach ($segments as $segment) { - // If the segment is not a boolean connector, we can assume it it is + // If the segment is not a boolean connector, we can assume it is // a column name, and we'll add it to the query as a new constraint // of the query's where clause and keep iterating the segments. if ($segment != '_and_' and $segment != '_or_') @@ -676,7 +676,7 @@ public function get($columns = array('*')) public function aggregate($aggregator, $columns) { // We'll set the aggregate value so the grammar does not try to compile - // a SELECT clause on the query. If an aggregator is present, it's own + // a SELECT clause on the query. If an aggregator is present, its own // grammar function will be used to build the SQL syntax. $this->aggregate = compact('aggregator', 'columns'); @@ -730,12 +730,12 @@ public function insert($values) { // Force every insert to be treated like a batch insert to make creating // the binding array simpler since we can just spin through the inserted - // rows as if there/ was more than one every time. + // rows as if there was more than one every time. if ( ! is_array(reset($values))) $values = array($values); $bindings = array(); - // We need to merge the the insert values into the array of the query + // We need to merge the insert values into the array of the query // bindings so that they will be bound to the PDO statement when it // is executed by the database connection. foreach ($values as $value) @@ -836,7 +836,7 @@ public function update($values) /** * Execute the query as a DELETE statement. * - * Optionally, an ID may be passed to the method do delete a specific row. + * Optionally, an ID may be passed to the method to delete a specific row. * * @param int $id * @return int diff --git a/laravel/database/query/grammars/grammar.php b/laravel/database/query/grammars/grammar.php index 65c62cf3323..5f3c88e7c34 100644 --- a/laravel/database/query/grammars/grammar.php +++ b/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 */ @@ -125,7 +125,7 @@ protected function from(Query $query) protected function joins(Query $query) { // We need to iterate through each JOIN clause that is attached to the - // query an translate it into SQL. The table and the columns will be + // query and translate it into SQL. The table and the columns will be // wrapped in identifiers to avoid naming collisions. foreach ($query->joins as $join) { @@ -135,7 +135,7 @@ protected function joins(Query $query) // Each JOIN statement may have multiple clauses, so we will iterate // through each clause creating the conditions then we'll join all - // of the together at the end to build the clause. + // of them together at the end to build the clause. foreach ($join->clauses as $clause) { extract($clause); @@ -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]); @@ -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 @@ -416,7 +416,7 @@ public function update(Query $query, $values) } /** - * Compile a SQL DELETE statment from a Query instance. + * Compile a SQL DELETE statement from a Query instance. * * @param Query $query * @return string diff --git a/laravel/database/query/grammars/postgres.php b/laravel/database/query/grammars/postgres.php index 002b4cc76e1..6041ae82aa5 100644 --- a/laravel/database/query/grammars/postgres.php +++ b/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 diff --git a/laravel/database/query/grammars/sqlserver.php b/laravel/database/query/grammars/sqlserver.php index def519a5abf..f912f562fde 100644 --- a/laravel/database/query/grammars/sqlserver.php +++ b/laravel/database/query/grammars/sqlserver.php @@ -95,7 +95,7 @@ protected function ansi_offset(Query $query, $components) // Next we need to calculate the constraint that should be placed on // the row number to get the correct offset and limit on the query. - // If there is not limit, we'll just handle the offset. + // If there is not a limit, we'll just handle the offset. if ($query->limit > 0) { $finish = $query->offset + $query->limit; diff --git a/laravel/database/schema.php b/laravel/database/schema.php index c7e56309c89..c943e15c5ff 100644 --- a/laravel/database/schema.php +++ b/laravel/database/schema.php @@ -71,7 +71,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 for the schema instance. static::implications($table); foreach ($table->commands as $command) diff --git a/laravel/database/schema/grammars/mysql.php b/laravel/database/schema/grammars/mysql.php index c2ae7455e6d..fa725136d1a 100644 --- a/laravel/database/schema/grammars/mysql.php +++ b/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 @@ -47,7 +47,7 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we the array of column definitions, we need to add "add" to the + // Once we have the array of column definitions, we need to add "add" to the // front of each definition, then we'll concatenate the definitions // using commas like normal and generate the SQL. $columns = implode(', ', array_map(function($column) @@ -260,7 +260,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 @@ -284,7 +284,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 @@ -353,7 +353,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 diff --git a/laravel/database/schema/grammars/postgres.php b/laravel/database/schema/grammars/postgres.php index 930c516056a..9853523f6c5 100644 --- a/laravel/database/schema/grammars/postgres.php +++ b/laravel/database/schema/grammars/postgres.php @@ -35,7 +35,7 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we the array of column definitions, we need to add "add" to the + // Once we have the array of column definitions, we need to add "add" to the // front of each definition, then we'll concatenate the definitions // using commas like normal and generate the SQL. $columns = implode(', ', array_map(function($column) @@ -246,7 +246,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 diff --git a/laravel/database/schema/grammars/sqlite.php b/laravel/database/schema/grammars/sqlite.php index 09102f52ca2..31e23624b7b 100644 --- a/laravel/database/schema/grammars/sqlite.php +++ b/laravel/database/schema/grammars/sqlite.php @@ -29,7 +29,7 @@ public function create(Table $table, Fluent $command) return $value->type == 'primary'; }); - // If we found primary key in the array of commands, we'll create the SQL for + // If we found primary keys in the array of commands, we'll create the SQL for // the key addition and append it to the SQL table creation statement for // the schema table so the index is properly generated. if ( ! is_null($primary)) @@ -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 @@ -53,7 +53,7 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we the array of column definitions, we need to add "add" to the + // Once we have the array of column definitions, we need to add "add" to the // front of each definition, then we'll concatenate the definitions // using commas like normal and generate the SQL. $columns = array_map(function($column) @@ -87,7 +87,7 @@ protected function columns(Table $table) { // Each of the data type's have their own definition creation method // which is responsible for creating the SQL for the type. This lets - // us to keep the syntax easy and fluent, while translating the + // us keep the syntax easy and fluent, while translating the // types to the types used by the database. $sql = $this->wrap($column).' '.$this->type($column); @@ -214,7 +214,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 @@ -226,7 +226,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 diff --git a/laravel/database/schema/grammars/sqlserver.php b/laravel/database/schema/grammars/sqlserver.php index 5f756c2e85b..0e556abd43b 100644 --- a/laravel/database/schema/grammars/sqlserver.php +++ b/laravel/database/schema/grammars/sqlserver.php @@ -32,7 +32,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 @@ -42,7 +42,7 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we the array of column definitions, we need to add "add" to the + // Once we have the array of column definitions, we need to add "add" to the // front of each definition, then we'll concatenate the definitions // using commas like normal and generate the SQL. $columns = implode(', ', array_map(function($column) @@ -235,7 +235,7 @@ public function drop_column(Table $table, Fluent $command) { $columns = array_map(array($this, 'wrap'), $command->columns); - // Once we the array of column names, we need to add "drop" to the front + // Once we have the array of column names, we need to add "drop" to the front // of each column, then we'll concatenate the columns using commas and // generate the alter statement SQL. $columns = implode(', ', array_map(function($column) @@ -260,7 +260,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 diff --git a/laravel/error.php b/laravel/error.php index 729f632a151..606ad64a2fc 100644 --- a/laravel/error.php +++ b/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(); diff --git a/laravel/event.php b/laravel/event.php index 1f88d99f946..ea2eb715f4d 100644 --- a/laravel/event.php +++ b/laravel/event.php @@ -125,7 +125,7 @@ public static function first($event, $parameters = array()) } /** - * Fire an event and return the the first response. + * Fire an event and return the first response. * * Execution will be halted after the first valid response is found. * diff --git a/laravel/file.php b/laravel/file.php index efb46decc5d..d202226857f 100644 --- a/laravel/file.php +++ b/laravel/file.php @@ -161,7 +161,7 @@ public static function mime($extension, $default = 'application/octet-stream') } /** - * Determine if a file is a given type. + * Determine if a file is of a given type. * * The Fileinfo PHP extension is used to determine the file's MIME type. * @@ -184,7 +184,7 @@ public static function is($extensions, $path) $mime = finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path); // The MIME configuration file contains an array of file extensions and - // their associated MIME types. We will spin through each extension the + // their associated MIME types. We will loop through each extension the // developer wants to check and look for the MIME type. foreach ((array) $extensions as $extension) { @@ -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()); @@ -335,7 +335,7 @@ public static function latest($directory, $options = fIterator::SKIP_DOTS) $items = new fIterator($directory, $options); - // To get the latest created file, we'll simply spin through the + // To get the latest created file, we'll simply loop through the // directory, setting the latest file if we encounter a file // with a UNIX timestamp greater than the latest one. foreach ($items as $item) diff --git a/laravel/helpers.php b/laravel/helpers.php index 07f9940a8f7..3357c4df061 100644 --- a/laravel/helpers.php +++ b/laravel/helpers.php @@ -462,7 +462,7 @@ function root_namespace($class, $separator = '\\') /** * Get the "class basename" of a class or object. * - * The basename is considered the name of the class minus all namespaces. + * The basename is considered to be the name of the class minus all namespaces. * * @param object|string $class * @return string diff --git a/laravel/ioc.php b/laravel/ioc.php index 512cf863e6a..475932c51cf 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -152,7 +152,7 @@ protected static function build($type, $parameters = array()) $reflector = new \ReflectionClass($type); // If the type is not instantiable, the developer is attempting to resolve - // an abstract type such as an Interface of Abstract Class and there is + // an abstract type such as an Interface of an Abstract Class and there is // no binding registered for the abstraction so we need to bail out. if ( ! $reflector->isInstantiable()) { @@ -189,7 +189,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)) { diff --git a/laravel/lang.php b/laravel/lang.php index 8fd5f7ba5ba..fd3bf17716e 100644 --- a/laravel/lang.php +++ b/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)) { diff --git a/laravel/laravel.php b/laravel/laravel.php index a1ca20615f0..2772e323ebd 100644 --- a/laravel/laravel.php +++ b/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! | */ @@ -143,7 +143,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. | */ @@ -172,7 +172,7 @@ | And We're Done! |-------------------------------------------------------------------------- | -| Raise the "done" event so extra output can be attached to the response +| Raise the "done" event so extra output can be attached to the response. | This allows the adding of debug toolbars, etc. to the view, or may be | used to do some kind of logging by the application. | diff --git a/laravel/log.php b/laravel/log.php index 4cd3a30e61d..7c565131deb 100644 --- a/laravel/log.php +++ b/laravel/log.php @@ -51,7 +51,7 @@ public static function write($type, $message) // If there aren't listeners on the log event, we'll just write to the // log files using the default conventions, writing one log file per - // day so they files don't get too crowded. + // day so the files don't get too crowded. else { $message = static::format($type, $message); diff --git a/laravel/paginator.php b/laravel/paginator.php index ceffbe85b6e..3deb5f611d0 100644 --- a/laravel/paginator.php +++ b/laravel/paginator.php @@ -47,7 +47,7 @@ class Paginator { /** * The compiled appendage that will be appended to the links. * - * This consists of a sprintf format with a page place-holder and query string. + * This consists of a sprintf format with a page place-holder and query string. * * @var string */ diff --git a/laravel/pluralizer.php b/laravel/pluralizer.php index 857a7ff568f..ef5b7cb68d3 100644 --- a/laravel/pluralizer.php +++ b/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']); @@ -104,7 +104,7 @@ protected function auto($value, $source, $irregular) return $value; } - // Next we will check the "irregular" patterns, which contains words + // Next, we will check the "irregular" patterns, which contain words // like "children" and "teeth" which can not be inflected using the // typically used regular expression matching approach. foreach ($irregular as $irregular => $pattern) diff --git a/laravel/response.php b/laravel/response.php index b6fa4d8490b..11458fb8072 100644 --- a/laravel/response.php +++ b/laravel/response.php @@ -239,7 +239,7 @@ public function send() public function render() { // If the content is a stringable object, we'll go ahead and call - // to toString method so that we can get the string content of + // the toString method so that we can get the string content of // the content object. Otherwise we'll just cast to string. if (str_object($this->content)) { diff --git a/laravel/routing/filter.php b/laravel/routing/filter.php index 14b6e2e33a0..80beec93918 100644 --- a/laravel/routing/filter.php +++ b/laravel/routing/filter.php @@ -14,7 +14,7 @@ class Filter { public static $filters = array(); /** - * The route filters that are based on pattern. + * The route filters that are based on a pattern. * * @var array */ diff --git a/laravel/routing/route.php b/laravel/routing/route.php index 73b79521170..c1c38a8e3d1 100644 --- a/laravel/routing/route.php +++ b/laravel/routing/route.php @@ -10,7 +10,7 @@ class Route { /** - * The URI the route response to. + * The URI the route responds to. * * @var string */ @@ -52,7 +52,7 @@ class Route { public $action; /** - * The parameters that will passed to the route callback. + * The parameters that will be passed to the route callback. * * @var array */ @@ -79,7 +79,7 @@ public function __construct($method, $uri, $action, $parameters = array()) // We'll set the parameters based on the number of parameters passed // compared to the parameters that were needed. If more parameters - // are needed, we'll merge in defaults. + // are needed, we'll merge in the defaults. $this->parameters($action, $parameters); } @@ -96,7 +96,7 @@ protected function parameters($action, $parameters) // If there are less parameters than wildcards, we will figure out how // many parameters we need to inject from the array of defaults and - // merge them in into the main array for the route. + // merge them into the main array for the route. if (count($defaults) > count($parameters)) { $defaults = array_slice($defaults, count($parameters)); diff --git a/laravel/routing/router.php b/laravel/routing/router.php index 7c4888a23ee..dd3e056885e 100644 --- a/laravel/routing/router.php +++ b/laravel/routing/router.php @@ -55,7 +55,7 @@ class Router { public static $group; /** - * The "handes" clause for the bundle currently being routed. + * The "handles" clause for the bundle currently being routed. * * @var string */ @@ -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. @@ -311,7 +311,7 @@ public static function controller($controllers, $defaults = 'index', $https = nu $root = Bundle::option($bundle, 'handles'); - // If the controller is a "home" controller, we'll need to also build a + // If the controller is a "home" controller, we'll need to also build an // index method route for the controller. We'll remove "home" from the // route root and setup a route to point to the index method. if (ends_with($controller, 'home')) @@ -428,7 +428,7 @@ public static function uses($action) // To find the route, we'll simply spin through the routes looking // for a route with a "uses" key matching the action, and if we - // find one we cache and return it. + // find one, we cache and return it. foreach (static::routes() as $method => $routes) { foreach ($routes as $key => $value) @@ -484,7 +484,7 @@ protected static function match($method, $uri) { foreach (static::method($method) as $route => $action) { - // We only need to check routes with regular expression since all other + // We only need to check routes with regular expression since all others // would have been able to be matched by the search for literal matches // we just did before we started searching. if (str_contains($route, '(')) diff --git a/laravel/session.php b/laravel/session.php index b5b833fa64f..00b4a356e7e 100644 --- a/laravel/session.php +++ b/laravel/session.php @@ -24,7 +24,7 @@ class Session { const csrf_token = 'csrf_token'; /** - * Create the session payload and the load the session. + * Create the session payload and load the session. * * @return void */ diff --git a/laravel/session/drivers/driver.php b/laravel/session/drivers/driver.php index 8a54ac984ca..e5cef1ee3a9 100644 --- a/laravel/session/drivers/driver.php +++ b/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 { diff --git a/laravel/uri.php b/laravel/uri.php index 2477fe62004..3e89ea4b31b 100644 --- a/laravel/uri.php +++ b/laravel/uri.php @@ -68,7 +68,7 @@ public static function is($pattern) } /** - * Get a specific segment of the request URI via an one-based index. + * Get a specific segment of the request URI via a one-based index. * * * // Get the first segment of the request URI diff --git a/laravel/url.php b/laravel/url.php index 44b89428cfc..424d0f3098c 100644 --- a/laravel/url.php +++ b/laravel/url.php @@ -101,7 +101,7 @@ public static function to($url = '', $https = null) return $url; } - // Unless $https is specified (true or false) then maintain the current request + // Unless $https is specified (true or false), we maintain the current request // security for any new links generated. So https for all secure links. if (is_null($https)) $https = Request::secure(); @@ -169,7 +169,7 @@ public static function to_action($action, $parameters = array()) } /** - * Generate a action URL from a route definition + * Generate an action URL from a route definition * * @param array $route * @param string $action @@ -196,7 +196,7 @@ protected static function convention($action, $parameters) $bundle = Bundle::get($bundle); - // If a bundle exists for the action, we will attempt to use it's "handles" + // If a bundle exists for the action, we will attempt to use its "handles" // clause as the root of the generated URL, as the bundle can only handle // URIs that begin with that string and no others. $root = $bundle['handles'] ?: ''; diff --git a/laravel/validator.php b/laravel/validator.php index 3290bc17017..2196fdec3f4 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -401,8 +401,8 @@ protected function validate_max($attribute, $value, $parameters) protected function size($attribute, $value) { // This method will determine if the attribute is a number, string, or file and - // return the proper size accordingly. If it is a number, then number itself is - // the size; if it is a file, the size is kilobytes in the size; if it is a + // return the proper size accordingly. If it is a number, the number itself is + // the size; if it is a file, the kilobytes is the size; if it is a // string, the length is the size. if (is_numeric($value) and $this->has_rule($attribute, $this->numeric_rules)) { @@ -743,7 +743,7 @@ protected function size_message($bundle, $attribute, $rule) } // We assume that attributes present in the $_FILES array are files, // which makes sense. If the attribute doesn't have numeric rules - // and isn't as file, it's a string. + // and isn't a file, it's a string. elseif (array_key_exists($attribute, Input::file())) { $line = 'file'; @@ -862,7 +862,7 @@ protected function replace_not_in($message, $attribute, $rule, $parameters) } /** - * Replace all place-holders for the not_in rule. + * Replace all place-holders for the mimes rule. * * @param string $message * @param string $attribute @@ -953,7 +953,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); diff --git a/laravel/view.php b/laravel/view.php index f97b3dee9c7..2e38000de5a 100644 --- a/laravel/view.php +++ b/laravel/view.php @@ -163,7 +163,7 @@ public static function file($bundle, $view, $directory) { $directory = str_finish($directory, DS); - // Views may have either the default PHP file extension of the "Blade" + // Views may have either the default PHP file extension or the "Blade" // extension, so we will need to check for both in the view path // and return the first one we find for the given view. if (file_exists($path = $directory.$view.EXT)) @@ -291,7 +291,7 @@ public static function render_each($view, array $data, $iterator, $empty = 'raw| } // If there is no data in the array, we will render the contents of - // the "empty" view. Alternative, the "empty view" can be a raw + // the "empty" view. Alternatively, the "empty view" can be a raw // string that is prefixed with "raw|" for convenience. else { diff --git a/paths.php b/paths.php index 2a38aff025e..e37420426b7 100644 --- a/paths.php +++ b/paths.php @@ -14,7 +14,7 @@ |---------------------------------------------------------------- | | Laravel takes a dead simple approach to environments, and we -| think you'll love it. Just specify which URLs belongs to a +| think you'll love it. Just specify which URLs belong to a | given environment, and when you access your application | from a URL matching that pattern, we'll be sure to | merge in that environment's configuration files.