Commit fafaf724 authored by Chris Berthe's avatar Chris Berthe

Grammar/Vocabulary fixes

Signed-off-by: 's avatarChris Berthe <chrisberthe@gmail.com>
parent d9802fe6
...@@ -8,7 +8,7 @@ return array( ...@@ -8,7 +8,7 @@ return array(
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| The URL used to access your application without a trailing slash. The URL | 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. | of your application.
| |
*/ */
...@@ -48,7 +48,7 @@ return array( ...@@ -48,7 +48,7 @@ return array(
| |
| This key is used by the encryption and cookie classes to generate secure | This key is used by the encryption and cookie classes to generate secure
| encrypted strings and hashes. It is extremely important that this key | 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. | characters of random gibberish.
| |
*/ */
...@@ -63,7 +63,7 @@ return array( ...@@ -63,7 +63,7 @@ return array(
| Laravel includes a beautiful profiler toolbar that gives you a heads | Laravel includes a beautiful profiler toolbar that gives you a heads
| up display of the queries and logs performed by your application. | up display of the queries and logs performed by your application.
| This is wonderful for development, but, of course, you should | 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 @@ return array( ...@@ -99,7 +99,7 @@ return array(
| SSL Link Generation | 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 | able to use SSL on your development machine, meaning all HTTPS will be
| broken during development. | broken during development.
| |
......
...@@ -29,7 +29,7 @@ return array( ...@@ -29,7 +29,7 @@ return array(
| This key will be prepended to item keys stored using Memcached and APC | This key will be prepended to item keys stored using Memcached and APC
| to prevent collisions with other applications on the server. Since the | to prevent collisions with other applications on the server. Since the
| memory based stores could be shared by other applications, we need to | 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.
| |
*/ */
......
...@@ -35,7 +35,7 @@ return array( ...@@ -35,7 +35,7 @@ return array(
| Default Database Connection | 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 | as the default for all database operations unless a different name is
| given when performing said operation. This connection name should be | given when performing said operation. This connection name should be
| listed in the array of connections below. | listed in the array of connections below.
...@@ -54,7 +54,7 @@ return array( ...@@ -54,7 +54,7 @@ return array(
| the freedom to specify as many connections as you can handle. | the freedom to specify as many connections as you can handle.
| |
| All database work in Laravel is done through the PHP's PDO facilities, | 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. | choice installed on your machine.
| |
*/ */
......
...@@ -9,7 +9,7 @@ return array( ...@@ -9,7 +9,7 @@ return array(
| |
| Here you simply specify the error levels that should be ignored by the | Here you simply specify the error levels that should be ignored by the
| Laravel error handler. These levels will still be logged; however, no | 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 @@ return array( ...@@ -56,7 +56,7 @@ return array(
| logging is enabled. | logging is enabled.
| |
| You may log the error message however you like; however, a simple log | 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. | text files within the application storage directory.
| |
*/ */
......
...@@ -23,7 +23,7 @@ return array( ...@@ -23,7 +23,7 @@ return array(
| Session Database | 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 | goes without saying that this option only matters if you are using
| the super slick database session driver. | the super slick database session driver.
| |
......
...@@ -8,7 +8,7 @@ return array( ...@@ -8,7 +8,7 @@ return array(
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This array contains the singular and plural forms of words. It's used by | 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. | word from singular to plural and vice versa.
| |
| Note that the regular expressions are only for inflecting English words. | Note that the regular expressions are only for inflecting English words.
......
...@@ -38,7 +38,7 @@ function document_exists($page) ...@@ -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) View::composer('docs::template', function($view)
{ {
...@@ -68,7 +68,7 @@ Route::get('(:bundle)/(:any)/(:any?)', function($section, $page = null) ...@@ -68,7 +68,7 @@ Route::get('(:bundle)/(:any)/(:any?)', function($section, $page = null)
// If no page was specified, but a "home" page exists for the section, // 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 // 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')) if (is_null($page) and document_exists($file.'/home'))
{ {
$file .= '/home'; $file .= '/home';
......
...@@ -80,7 +80,7 @@ abstract class Driver { ...@@ -80,7 +80,7 @@ abstract class Driver {
} }
/** /**
* Get the a given application user by ID. * Get the given application user by ID.
* *
* @param int $id * @param int $id
* @return mixed * @return mixed
...@@ -192,7 +192,7 @@ abstract class Driver { ...@@ -192,7 +192,7 @@ abstract class Driver {
} }
/** /**
* Get session key name used to store the token. * Get the session key name used to store the token.
* *
* @return string * @return string
*/ */
......
...@@ -40,7 +40,7 @@ class Autoloader { ...@@ -40,7 +40,7 @@ class Autoloader {
/** /**
* Load the file corresponding to a given class. * 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 * @param string $class
* @return void * @return void
...@@ -55,7 +55,7 @@ class Autoloader { ...@@ -55,7 +55,7 @@ class Autoloader {
return class_alias(static::$aliases[$class], $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 // routine that digs through directories. It's just a simple array of
// class to file path maps for ultra-fast file loading. // class to file path maps for ultra-fast file loading.
elseif (isset(static::$mappings[$class])) elseif (isset(static::$mappings[$class]))
...@@ -102,7 +102,7 @@ class Autoloader { ...@@ -102,7 +102,7 @@ class Autoloader {
protected static function load_psr($class, $directory = null) protected static function load_psr($class, $directory = null)
{ {
// The PSR-0 standard indicates that class namespaces and underscores // 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. // resides, so we'll convert them to slashes.
$file = str_replace(array('\\', '_'), '/', $class); $file = str_replace(array('\\', '_'), '/', $class);
......
...@@ -150,7 +150,7 @@ class Blade { ...@@ -150,7 +150,7 @@ class Blade {
} }
// First we'll split out the lines of the template so we can get the // 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. // located on the first line of the template contents.
$lines = preg_split("/(\r?\n)/", $value); $lines = preg_split("/(\r?\n)/", $value);
......
...@@ -46,7 +46,7 @@ class Bundle { ...@@ -46,7 +46,7 @@ class Bundle {
// If the given configuration is actually a string, we will assume it is a // 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 // 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)) if (is_string($config))
{ {
$bundle = $config; $bundle = $config;
...@@ -55,7 +55,7 @@ class Bundle { ...@@ -55,7 +55,7 @@ class Bundle {
} }
// If no location is set, we will set the location to match the name of // 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. // the bundle directory so a location was not set.
if ( ! isset($config['location'])) if ( ! isset($config['location']))
{ {
...@@ -66,7 +66,7 @@ class Bundle { ...@@ -66,7 +66,7 @@ class Bundle {
// It is possible for the developer to specify auto-loader mappings // It is possible for the developer to specify auto-loader mappings
// directly on the bundle registration. This provides a convenient // 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'])) if (isset($config['autoloads']))
{ {
static::autoloads($bundle, $config); static::autoloads($bundle, $config);
...@@ -74,7 +74,7 @@ class Bundle { ...@@ -74,7 +74,7 @@ class Bundle {
} }
/** /**
* 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. * If the bundle has already been started, no action will be taken.
* *
...@@ -124,7 +124,7 @@ class Bundle { ...@@ -124,7 +124,7 @@ class Bundle {
$path = static::path($bundle).'routes'.EXT; $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 // value to replace the (:bundle) place-holder with when the bundle
// routes are added, keeping the routes flexible. // routes are added, keeping the routes flexible.
Router::$bundle = static::option($bundle, 'handles'); Router::$bundle = static::option($bundle, 'handles');
...@@ -201,7 +201,7 @@ class Bundle { ...@@ -201,7 +201,7 @@ class Bundle {
} }
/** /**
* Deteremine if a bundle exists within the bundles directory. * Determine if a bundle exists within the bundles directory.
* *
* @param string $bundle * @param string $bundle
* @return bool * @return bool
...@@ -372,7 +372,7 @@ class Bundle { ...@@ -372,7 +372,7 @@ class Bundle {
} }
/** /**
* Parse a element identifier and return the bundle name and element. * Parse an element identifier and return the bundle name and element.
* *
* <code> * <code>
* // Returns array(null, 'admin.user') * // Returns array(null, 'admin.user')
......
...@@ -34,7 +34,7 @@ require path('sys').'cli/dependencies'.EXT; ...@@ -34,7 +34,7 @@ require path('sys').'cli/dependencies'.EXT;
* We will wrap the command execution in a try / catch block and * We will wrap the command execution in a try / catch block and
* simply write out any exception messages we receive to the CLI * simply write out any exception messages we receive to the CLI
* for the developer. Note that this only writes out messages * 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. * and will be totally dumped out to the CLI.
*/ */
try try
......
...@@ -121,7 +121,7 @@ class Command { ...@@ -121,7 +121,7 @@ class Command {
} }
// If the task file exists, we'll format the bundle and task name // 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. // the requested method may be executed.
if (file_exists($path = Bundle::path($bundle).'tasks/'.$task.EXT)) if (file_exists($path = Bundle::path($bundle).'tasks/'.$task.EXT))
{ {
......
...@@ -27,7 +27,7 @@ abstract class Provider { ...@@ -27,7 +27,7 @@ abstract class Provider {
// When installing a bundle from a Zip archive, we'll first clone // When installing a bundle from a Zip archive, we'll first clone
// down the bundle zip into the bundles "working" directory so // 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'; $target = $work.'laravel-bundle.zip';
File::put($target, $this->download($url)); File::put($target, $this->download($url));
......
...@@ -151,7 +151,7 @@ class Migrator extends Task { ...@@ -151,7 +151,7 @@ class Migrator extends Task {
$table->create(); $table->create();
// Migrations can be run for a specific bundle, so we'll use // 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 // for the migrations, allowing us to easily identify which
// migrations have been run for each bundle. // migrations have been run for each bundle.
$table->string('bundle', 50); $table->string('bundle', 50);
...@@ -206,7 +206,7 @@ class Migrator extends Task { ...@@ -206,7 +206,7 @@ class Migrator extends Task {
// Once the migration has been created, we'll return the // Once the migration has been created, we'll return the
// migration file name so it can be used by the task // 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; return $file;
} }
...@@ -223,7 +223,7 @@ class Migrator extends Task { ...@@ -223,7 +223,7 @@ class Migrator extends Task {
$prefix = Bundle::class_prefix($bundle); $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 // where the bundle name is prefixed to the class if it is not in
// the default "application" bundle. // the default "application" bundle.
$class = $prefix.Str::classify($migration); $class = $prefix.Str::classify($migration);
......
...@@ -73,7 +73,7 @@ class Config { ...@@ -73,7 +73,7 @@ class Config {
$items = static::$items[$bundle][$file]; $items = static::$items[$bundle][$file];
// If a specific configuration item was not requested, the key will be null, // 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. // requested configuration file. Otherwise we can return the item.
if (is_null($item)) if (is_null($item))
{ {
...@@ -175,7 +175,7 @@ class Config { ...@@ -175,7 +175,7 @@ class Config {
// requested. This allows many types of config "drivers". // requested. This allows many types of config "drivers".
$config = Event::first(static::loader, func_get_args()); $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 // will add them to the configuration array and return true, otherwise
// we will return false indicating the file was not found. // we will return false indicating the file was not found.
if (count($config) > 0) if (count($config) > 0)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class Cookie { class Cookie {
/** /**
* How long is forever (in minutes). * How long is forever (in minutes)?
* *
* @var int * @var int
*/ */
......
...@@ -147,7 +147,7 @@ Request::$foundation = RequestFoundation::createFromGlobals(); ...@@ -147,7 +147,7 @@ Request::$foundation = RequestFoundation::createFromGlobals();
| Determine The Application Environment | 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 | 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 | environments that lives in the "paths.php" file for the application
| and is parsed. When determining the CLI environment, the "--env" | and is parsed. When determining the CLI environment, the "--env"
...@@ -178,7 +178,7 @@ else ...@@ -178,7 +178,7 @@ else
| |
| Once we have determined the application environment, we will set it on | Once we have determined the application environment, we will set it on
| the global server array of the HttpFoundation request. This makes it | 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. | used to determine which configuration files to merge in.
| |
*/ */
...@@ -216,7 +216,7 @@ if (defined('STDIN')) ...@@ -216,7 +216,7 @@ if (defined('STDIN'))
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Finally we will register all of the bundles that have been defined for | 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. | so that they may be started by the developer at any time.
| |
*/ */
......
...@@ -209,7 +209,7 @@ class Connection { ...@@ -209,7 +209,7 @@ class Connection {
/** /**
* Execute a SQL query against the connection. * 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 string $sql
* @param array $bindings * @param array $bindings
...@@ -265,7 +265,7 @@ class Connection { ...@@ -265,7 +265,7 @@ class Connection {
throw $exception; 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 // execution time in a static array that is accessed by all of
// the connections actively being used by the application. // the connections actively being used by the application.
if (Config::get('database.profile')) if (Config::get('database.profile'))
...@@ -287,7 +287,7 @@ class Connection { ...@@ -287,7 +287,7 @@ class Connection {
{ {
// If the fetch style is "class", we'll hydrate an array of PHP // If the fetch style is "class", we'll hydrate an array of PHP
// stdClass objects as generic containers for the query rows, // 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) if ($style === PDO::FETCH_CLASS)
{ {
return $statement->fetchAll(PDO::FETCH_CLASS, 'stdClass'); return $statement->fetchAll(PDO::FETCH_CLASS, 'stdClass');
......
...@@ -736,7 +736,7 @@ abstract class Model { ...@@ -736,7 +736,7 @@ abstract class Model {
{ {
$meta = array('key', 'table', 'connection', 'sequence', 'per_page', 'timestamps'); $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 // return the value of the static property. This makes it convenient for
// relationships to access these values off of the instances. // relationships to access these values off of the instances.
if (in_array($method, $meta)) if (in_array($method, $meta))
...@@ -746,7 +746,7 @@ abstract class Model { ...@@ -746,7 +746,7 @@ abstract class Model {
$underscored = array('with', 'find'); $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 // keep underscored methods of those methods and intercept calls to them
// here so they can be called either way on the model instance. // here so they can be called either way on the model instance.
if (in_array($method, $underscored)) if (in_array($method, $underscored))
......
...@@ -118,7 +118,7 @@ class Query { ...@@ -118,7 +118,7 @@ class Query {
$new = new $class(array(), true); $new = new $class(array(), true);
// We need to set the attributes manually in case the accessible property is // 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. // we were to pass them in using the constructor or fill methods.
$new->fill_raw($result); $new->fill_raw($result);
...@@ -141,7 +141,7 @@ class Query { ...@@ -141,7 +141,7 @@ class Query {
} }
} }
// 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 // so we will call the "clean" method on the relationship to remove
// any pivot columns that are on the model. // any pivot columns that are on the model.
if ($this instanceof Relationships\Has_Many_And_Belongs_To) if ($this instanceof Relationships\Has_Many_And_Belongs_To)
...@@ -199,7 +199,7 @@ class Query { ...@@ -199,7 +199,7 @@ class Query {
foreach ($this->model_includes() as $include => $constraints) foreach ($this->model_includes() as $include => $constraints)
{ {
// To get the nested includes, we want to find any includes that begin // 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. // nesting indicator and set the include in the array.
if (starts_with($include, $relationship.'.')) if (starts_with($include, $relationship.'.'))
{ {
...@@ -222,7 +222,7 @@ class Query { ...@@ -222,7 +222,7 @@ class Query {
foreach ($this->model->includes as $relationship => $constraints) foreach ($this->model->includes as $relationship => $constraints)
{ {
// When eager loading relationships, constraints may be set on the eager // 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. // and the value of the array since there are no constraints.
if (is_numeric($relationship)) if (is_numeric($relationship))
{ {
......
...@@ -44,7 +44,7 @@ class Has_Many_And_Belongs_To extends Relationship { ...@@ -44,7 +44,7 @@ class Has_Many_And_Belongs_To extends Relationship {
$this->joining = $table ?: $this->joining($model, $associated); $this->joining = $table ?: $this->joining($model, $associated);
// If the Pivot table is timestamped, we'll set the timestamp columns to be // 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. // the ID will be the only "extra" column fetched in by default.
if (Pivot::$timestamps) if (Pivot::$timestamps)
{ {
...@@ -131,7 +131,7 @@ class Has_Many_And_Belongs_To extends Relationship { ...@@ -131,7 +131,7 @@ class Has_Many_And_Belongs_To extends Relationship {
} }
// Next we will take the difference of the current and given IDs and detach // 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. // the array of IDs given to the method, finishing the sync.
$detach = array_diff($current, $ids); $detach = array_diff($current, $ids);
......
...@@ -35,7 +35,7 @@ abstract class Grammar { ...@@ -35,7 +35,7 @@ abstract class Grammar {
*/ */
public function wrap_table($table) 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 // so we do not want to wrap them in any way. We will just return
// the string value from the expression to be included. // the string value from the expression to be included.
if ($table instanceof Expression) if ($table instanceof Expression)
...@@ -64,7 +64,7 @@ abstract class Grammar { ...@@ -64,7 +64,7 @@ abstract class Grammar {
*/ */
public function wrap($value) 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 // so we do not want to wrap them in any way. We will just return
// the string value from the expression to be included. // the string value from the expression to be included.
if ($value instanceof Expression) if ($value instanceof Expression)
......
...@@ -158,7 +158,7 @@ class Query { ...@@ -158,7 +158,7 @@ class Query {
{ {
// If the "column" is really an instance of a Closure, the developer is // 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 // 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) if ($column1 instanceof Closure)
{ {
$this->joins[] = new Query\Join($type, $table); $this->joins[] = new Query\Join($type, $table);
...@@ -167,8 +167,8 @@ class Query { ...@@ -167,8 +167,8 @@ class Query {
} }
// If the column is just a string, we can assume that the join just // 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 // 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 else
{ {
$join = new Query\Join($type, $table); $join = new Query\Join($type, $table);
...@@ -453,7 +453,7 @@ class Query { ...@@ -453,7 +453,7 @@ class Query {
foreach ($segments as $segment) 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 // 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. // of the query's where clause and keep iterating the segments.
if ($segment != '_and_' and $segment != '_or_') if ($segment != '_and_' and $segment != '_or_')
...@@ -676,7 +676,7 @@ class Query { ...@@ -676,7 +676,7 @@ class Query {
public function aggregate($aggregator, $columns) public function aggregate($aggregator, $columns)
{ {
// We'll set the aggregate value so the grammar does not try to compile // 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. // grammar function will be used to build the SQL syntax.
$this->aggregate = compact('aggregator', 'columns'); $this->aggregate = compact('aggregator', 'columns');
...@@ -730,12 +730,12 @@ class Query { ...@@ -730,12 +730,12 @@ class Query {
{ {
// Force every insert to be treated like a batch insert to make creating // 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 // 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); if ( ! is_array(reset($values))) $values = array($values);
$bindings = array(); $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 // bindings so that they will be bound to the PDO statement when it
// is executed by the database connection. // is executed by the database connection.
foreach ($values as $value) foreach ($values as $value)
...@@ -836,7 +836,7 @@ class Query { ...@@ -836,7 +836,7 @@ class Query {
/** /**
* Execute the query as a DELETE statement. * 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 * @param int $id
* @return int * @return int
......
...@@ -13,7 +13,7 @@ class Grammar extends \Laravel\Database\Grammar { ...@@ -13,7 +13,7 @@ class Grammar extends \Laravel\Database\Grammar {
public $datetime = 'Y-m-d H:i:s'; 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 * @var array
*/ */
...@@ -125,7 +125,7 @@ class Grammar extends \Laravel\Database\Grammar { ...@@ -125,7 +125,7 @@ class Grammar extends \Laravel\Database\Grammar {
protected function joins(Query $query) protected function joins(Query $query)
{ {
// We need to iterate through each JOIN clause that is attached to the // 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. // wrapped in identifiers to avoid naming collisions.
foreach ($query->joins as $join) foreach ($query->joins as $join)
{ {
...@@ -135,7 +135,7 @@ class Grammar extends \Laravel\Database\Grammar { ...@@ -135,7 +135,7 @@ class Grammar extends \Laravel\Database\Grammar {
// Each JOIN statement may have multiple clauses, so we will iterate // Each JOIN statement may have multiple clauses, so we will iterate
// through each clause creating the conditions then we'll join all // 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) foreach ($join->clauses as $clause)
{ {
extract($clause); extract($clause);
...@@ -149,7 +149,7 @@ class Grammar extends \Laravel\Database\Grammar { ...@@ -149,7 +149,7 @@ class Grammar extends \Laravel\Database\Grammar {
// The first clause will have a connector on the front, but it is // 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 // 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 '); $search = array('AND ', 'OR ');
$clauses[0] = str_replace($search, '', $clauses[0]); $clauses[0] = str_replace($search, '', $clauses[0]);
...@@ -376,7 +376,7 @@ class Grammar extends \Laravel\Database\Grammar { ...@@ -376,7 +376,7 @@ class Grammar extends \Laravel\Database\Grammar {
} }
/** /**
* Compile a SQL INSERT and get ID statment from a Query instance. * Compile a SQL INSERT and get ID statement from a Query instance.
* *
* @param Query $query * @param Query $query
* @param array $values * @param array $values
...@@ -389,7 +389,7 @@ class Grammar extends \Laravel\Database\Grammar { ...@@ -389,7 +389,7 @@ class Grammar extends \Laravel\Database\Grammar {
} }
/** /**
* Compile a SQL UPDATE statment from a Query instance. * Compile a SQL UPDATE statement from a Query instance.
* *
* @param Query $query * @param Query $query
* @param array $values * @param array $values
...@@ -416,7 +416,7 @@ class Grammar extends \Laravel\Database\Grammar { ...@@ -416,7 +416,7 @@ class Grammar extends \Laravel\Database\Grammar {
} }
/** /**
* Compile a SQL DELETE statment from a Query instance. * Compile a SQL DELETE statement from a Query instance.
* *
* @param Query $query * @param Query $query
* @return string * @return string
......
...@@ -5,7 +5,7 @@ use Laravel\Database\Query; ...@@ -5,7 +5,7 @@ use Laravel\Database\Query;
class Postgres extends Grammar { 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 Query $query
* @param array $values * @param array $values
......
...@@ -95,7 +95,7 @@ class SQLServer extends Grammar { ...@@ -95,7 +95,7 @@ class SQLServer extends Grammar {
// Next we need to calculate the constraint that should be placed on // 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. // 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) if ($query->limit > 0)
{ {
$finish = $query->offset + $query->limit; $finish = $query->offset + $query->limit;
......
...@@ -71,7 +71,7 @@ class Schema { ...@@ -71,7 +71,7 @@ class Schema {
{ {
// The implications method is responsible for finding any fluently // The implications method is responsible for finding any fluently
// defined indexes on the schema table and adding the explicit // 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); static::implications($table);
foreach ($table->commands as $command) foreach ($table->commands as $command)
......
...@@ -37,7 +37,7 @@ class MySQL extends Grammar { ...@@ -37,7 +37,7 @@ class MySQL extends Grammar {
} }
/** /**
* Geenrate the SQL statements for a table modification command. * Generate the SQL statements for a table modification command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
...@@ -47,7 +47,7 @@ class MySQL extends Grammar { ...@@ -47,7 +47,7 @@ class MySQL extends Grammar {
{ {
$columns = $this->columns($table); $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 // front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL. // using commas like normal and generate the SQL.
$columns = implode(', ', array_map(function($column) $columns = implode(', ', array_map(function($column)
...@@ -260,7 +260,7 @@ class MySQL extends Grammar { ...@@ -260,7 +260,7 @@ class MySQL extends Grammar {
} }
/** /**
* Generate the SQL statement for a drop unqique key command. * Generate the SQL statement for a drop unique key command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
...@@ -284,7 +284,7 @@ class MySQL extends Grammar { ...@@ -284,7 +284,7 @@ class MySQL extends Grammar {
} }
/** /**
* Generate the SQL statement for a drop unqique key command. * Generate the SQL statement for a drop unique key command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
...@@ -353,7 +353,7 @@ class MySQL extends Grammar { ...@@ -353,7 +353,7 @@ class MySQL extends Grammar {
} }
/** /**
* Generate the data-type definintion for a decimal. * Generate the data-type definition for a decimal.
* *
* @param Fluent $column * @param Fluent $column
* @return string * @return string
......
...@@ -35,7 +35,7 @@ class Postgres extends Grammar { ...@@ -35,7 +35,7 @@ class Postgres extends Grammar {
{ {
$columns = $this->columns($table); $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 // front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL. // using commas like normal and generate the SQL.
$columns = implode(', ', array_map(function($column) $columns = implode(', ', array_map(function($column)
...@@ -246,7 +246,7 @@ class Postgres extends Grammar { ...@@ -246,7 +246,7 @@ class Postgres extends Grammar {
} }
/** /**
* Generate the SQL statement for a drop unqique key command. * Generate the SQL statement for a drop unique key command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
......
...@@ -29,7 +29,7 @@ class SQLite extends Grammar { ...@@ -29,7 +29,7 @@ class SQLite extends Grammar {
return $value->type == 'primary'; 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 key addition and append it to the SQL table creation statement for
// the schema table so the index is properly generated. // the schema table so the index is properly generated.
if ( ! is_null($primary)) if ( ! is_null($primary))
...@@ -43,7 +43,7 @@ class SQLite extends Grammar { ...@@ -43,7 +43,7 @@ class SQLite extends Grammar {
} }
/** /**
* Geenrate the SQL statements for a table modification command. * Generate the SQL statements for a table modification command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
...@@ -53,7 +53,7 @@ class SQLite extends Grammar { ...@@ -53,7 +53,7 @@ class SQLite extends Grammar {
{ {
$columns = $this->columns($table); $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 // front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL. // using commas like normal and generate the SQL.
$columns = array_map(function($column) $columns = array_map(function($column)
...@@ -87,7 +87,7 @@ class SQLite extends Grammar { ...@@ -87,7 +87,7 @@ class SQLite extends Grammar {
{ {
// Each of the data type's have their own definition creation method // Each of the data type's have their own definition creation method
// which is responsible for creating the SQL for the type. This lets // 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. // types to the types used by the database.
$sql = $this->wrap($column).' '.$this->type($column); $sql = $this->wrap($column).' '.$this->type($column);
...@@ -214,7 +214,7 @@ class SQLite extends Grammar { ...@@ -214,7 +214,7 @@ class SQLite extends Grammar {
} }
/** /**
* Generate the SQL statement for a drop unqique key command. * Generate the SQL statement for a drop unique key command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
...@@ -226,7 +226,7 @@ class SQLite extends Grammar { ...@@ -226,7 +226,7 @@ class SQLite extends Grammar {
} }
/** /**
* Generate the SQL statement for a drop unqique key command. * Generate the SQL statement for a drop unique key command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
......
...@@ -32,7 +32,7 @@ class SQLServer extends Grammar { ...@@ -32,7 +32,7 @@ class SQLServer extends Grammar {
} }
/** /**
* Geenrate the SQL statements for a table modification command. * Generate the SQL statements for a table modification command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
...@@ -42,7 +42,7 @@ class SQLServer extends Grammar { ...@@ -42,7 +42,7 @@ class SQLServer extends Grammar {
{ {
$columns = $this->columns($table); $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 // front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL. // using commas like normal and generate the SQL.
$columns = implode(', ', array_map(function($column) $columns = implode(', ', array_map(function($column)
...@@ -235,7 +235,7 @@ class SQLServer extends Grammar { ...@@ -235,7 +235,7 @@ class SQLServer extends Grammar {
{ {
$columns = array_map(array($this, 'wrap'), $command->columns); $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 // of each column, then we'll concatenate the columns using commas and
// generate the alter statement SQL. // generate the alter statement SQL.
$columns = implode(', ', array_map(function($column) $columns = implode(', ', array_map(function($column)
...@@ -260,7 +260,7 @@ class SQLServer extends Grammar { ...@@ -260,7 +260,7 @@ class SQLServer extends Grammar {
} }
/** /**
* Generate the SQL statement for a drop unqiue key command. * Generate the SQL statement for a drop unique key command.
* *
* @param Table $table * @param Table $table
* @param Fluent $command * @param Fluent $command
......
...@@ -80,7 +80,7 @@ class Error { ...@@ -80,7 +80,7 @@ class Error {
*/ */
public static function shutdown() 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, // create an ErrorException and feed it to the exception handler,
// as it will not yet have been handled. // as it will not yet have been handled.
$error = error_get_last(); $error = error_get_last();
......
...@@ -125,7 +125,7 @@ class Event { ...@@ -125,7 +125,7 @@ class Event {
} }
/** /**
* 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. * Execution will be halted after the first valid response is found.
* *
......
...@@ -161,7 +161,7 @@ class File { ...@@ -161,7 +161,7 @@ class File {
} }
/** /**
* 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. * The Fileinfo PHP extension is used to determine the file's MIME type.
* *
...@@ -184,7 +184,7 @@ class File { ...@@ -184,7 +184,7 @@ class File {
$mime = finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path); $mime = finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
// The MIME configuration file contains an array of file extensions and // 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. // developer wants to check and look for the MIME type.
foreach ((array) $extensions as $extension) foreach ((array) $extensions as $extension)
{ {
...@@ -296,7 +296,7 @@ class File { ...@@ -296,7 +296,7 @@ class File {
{ {
// If the item is a directory, we can just recurse into the // If the item is a directory, we can just recurse into the
// function and delete that sub-directory, otherwise we'll // 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()) if ($item->isDir())
{ {
static::rmdir($item->getRealPath()); static::rmdir($item->getRealPath());
...@@ -335,7 +335,7 @@ class File { ...@@ -335,7 +335,7 @@ class File {
$items = new fIterator($directory, $options); $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 // directory, setting the latest file if we encounter a file
// with a UNIX timestamp greater than the latest one. // with a UNIX timestamp greater than the latest one.
foreach ($items as $item) foreach ($items as $item)
......
...@@ -462,7 +462,7 @@ function root_namespace($class, $separator = '\\') ...@@ -462,7 +462,7 @@ function root_namespace($class, $separator = '\\')
/** /**
* Get the "class basename" of a class or object. * 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 * @param object|string $class
* @return string * @return string
......
...@@ -152,7 +152,7 @@ class IoC { ...@@ -152,7 +152,7 @@ class IoC {
$reflector = new \ReflectionClass($type); $reflector = new \ReflectionClass($type);
// If the type is not instantiable, the developer is attempting to resolve // 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. // no binding registered for the abstraction so we need to bail out.
if ( ! $reflector->isInstantiable()) if ( ! $reflector->isInstantiable())
{ {
...@@ -189,7 +189,7 @@ class IoC { ...@@ -189,7 +189,7 @@ class IoC {
$dependency = $parameter->getClass(); $dependency = $parameter->getClass();
// If the class is null, it means the dependency is a string or some other // 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. // we'll just bomb out with an error since we have nowhere to go.
if (is_null($dependency)) if (is_null($dependency))
{ {
......
...@@ -134,7 +134,7 @@ class Lang { ...@@ -134,7 +134,7 @@ class Lang {
$line = array_get($lines, $line, $default); $line = array_get($lines, $line, $default);
// If the line is not a string, it probably means the developer asked for // 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. // an array containing all of the lines in the file.
if (is_string($line)) if (is_string($line))
{ {
......
...@@ -54,7 +54,7 @@ register_shutdown_function(function() ...@@ -54,7 +54,7 @@ register_shutdown_function(function()
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| By setting error reporting to -1, we essentially force PHP to report | 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! | releases of PHP. This allows everything to be fixed early!
| |
*/ */
...@@ -143,7 +143,7 @@ $response->render(); ...@@ -143,7 +143,7 @@ $response->render();
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| If a session driver has been configured, we will save the session to | 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. | the session cookie in the cookie jar to be sent to the user.
| |
*/ */
...@@ -172,7 +172,7 @@ $response->send(); ...@@ -172,7 +172,7 @@ $response->send();
| And We're Done! | 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 | This allows the adding of debug toolbars, etc. to the view, or may be
| used to do some kind of logging by the application. | used to do some kind of logging by the application.
| |
......
...@@ -51,7 +51,7 @@ class Log { ...@@ -51,7 +51,7 @@ class Log {
// If there aren't listeners on the log event, we'll just write to the // 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 // 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 else
{ {
$message = static::format($type, $message); $message = static::format($type, $message);
......
...@@ -48,7 +48,7 @@ class Pluralizer { ...@@ -48,7 +48,7 @@ class Pluralizer {
} }
// English words may be automatically inflected using regular expressions. // 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. // inflection method and return the result, which is cached.
$irregular = $this->config['irregular']; $irregular = $this->config['irregular'];
...@@ -77,7 +77,7 @@ class Pluralizer { ...@@ -77,7 +77,7 @@ class Pluralizer {
} }
// English words may be automatically inflected using regular expressions. // 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. // inflection method and return the result, which is cached.
$irregular = array_flip($this->config['irregular']); $irregular = array_flip($this->config['irregular']);
...@@ -104,7 +104,7 @@ class Pluralizer { ...@@ -104,7 +104,7 @@ class Pluralizer {
return $value; 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 // like "children" and "teeth" which can not be inflected using the
// typically used regular expression matching approach. // typically used regular expression matching approach.
foreach ($irregular as $irregular => $pattern) foreach ($irregular as $irregular => $pattern)
......
...@@ -239,7 +239,7 @@ class Response { ...@@ -239,7 +239,7 @@ class Response {
public function render() public function render()
{ {
// If the content is a stringable object, we'll go ahead and call // 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. // the content object. Otherwise we'll just cast to string.
if (str_object($this->content)) if (str_object($this->content))
{ {
......
...@@ -14,7 +14,7 @@ class Filter { ...@@ -14,7 +14,7 @@ class Filter {
public static $filters = array(); public static $filters = array();
/** /**
* The route filters that are based on pattern. * The route filters that are based on a pattern.
* *
* @var array * @var array
*/ */
......
...@@ -10,7 +10,7 @@ use Laravel\Response; ...@@ -10,7 +10,7 @@ use Laravel\Response;
class Route { class Route {
/** /**
* The URI the route response to. * The URI the route responds to.
* *
* @var string * @var string
*/ */
...@@ -52,7 +52,7 @@ class Route { ...@@ -52,7 +52,7 @@ class Route {
public $action; public $action;
/** /**
* The parameters that will passed to the route callback. * The parameters that will be passed to the route callback.
* *
* @var array * @var array
*/ */
...@@ -79,7 +79,7 @@ class Route { ...@@ -79,7 +79,7 @@ class Route {
// We'll set the parameters based on the number of parameters passed // We'll set the parameters based on the number of parameters passed
// compared to the parameters that were needed. If more parameters // 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); $this->parameters($action, $parameters);
} }
...@@ -96,7 +96,7 @@ class Route { ...@@ -96,7 +96,7 @@ class Route {
// If there are less parameters than wildcards, we will figure out how // If there are less parameters than wildcards, we will figure out how
// many parameters we need to inject from the array of defaults and // 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)) if (count($defaults) > count($parameters))
{ {
$defaults = array_slice($defaults, count($parameters)); $defaults = array_slice($defaults, count($parameters));
......
...@@ -55,7 +55,7 @@ class Router { ...@@ -55,7 +55,7 @@ class Router {
public static $group; public static $group;
/** /**
* The "handes" clause for the bundle currently being routed. * The "handles" clause for the bundle currently being routed.
* *
* @var string * @var string
*/ */
...@@ -303,7 +303,7 @@ class Router { ...@@ -303,7 +303,7 @@ class Router {
{ {
list($bundle, $controller) = Bundle::parse($identifier); 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 // 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 // a cleaner syntax when specifying the controller. We will also grab the
// root URI for the controller's bundle. // root URI for the controller's bundle.
...@@ -311,7 +311,7 @@ class Router { ...@@ -311,7 +311,7 @@ class Router {
$root = Bundle::option($bundle, 'handles'); $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 // index method route for the controller. We'll remove "home" from the
// route root and setup a route to point to the index method. // route root and setup a route to point to the index method.
if (ends_with($controller, 'home')) if (ends_with($controller, 'home'))
...@@ -428,7 +428,7 @@ class Router { ...@@ -428,7 +428,7 @@ class Router {
// To find the route, we'll simply spin through the routes looking // 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 // 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 (static::routes() as $method => $routes)
{ {
foreach ($routes as $key => $value) foreach ($routes as $key => $value)
...@@ -484,7 +484,7 @@ class Router { ...@@ -484,7 +484,7 @@ class Router {
{ {
foreach (static::method($method) as $route => $action) 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 // would have been able to be matched by the search for literal matches
// we just did before we started searching. // we just did before we started searching.
if (str_contains($route, '(')) if (str_contains($route, '('))
......
...@@ -24,7 +24,7 @@ class Session { ...@@ -24,7 +24,7 @@ class Session {
const csrf_token = 'csrf_token'; const csrf_token = 'csrf_token';
/** /**
* Create the session payload and the load the session. * Create the session payload and load the session.
* *
* @return void * @return void
*/ */
......
...@@ -63,7 +63,7 @@ abstract class Driver { ...@@ -63,7 +63,7 @@ abstract class Driver {
return Str::random(40); 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 // not currently assigned to a session. This is almost definitely
// going to happen on the first iteration. // going to happen on the first iteration.
do { do {
......
...@@ -68,7 +68,7 @@ class URI { ...@@ -68,7 +68,7 @@ class URI {
} }
/** /**
* 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.
* *
* <code> * <code>
* // Get the first segment of the request URI * // Get the first segment of the request URI
......
...@@ -101,7 +101,7 @@ class URL { ...@@ -101,7 +101,7 @@ class URL {
return $url; 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. // security for any new links generated. So https for all secure links.
if (is_null($https)) $https = Request::secure(); if (is_null($https)) $https = Request::secure();
...@@ -169,7 +169,7 @@ class URL { ...@@ -169,7 +169,7 @@ class URL {
} }
/** /**
* Generate a action URL from a route definition * Generate an action URL from a route definition
* *
* @param array $route * @param array $route
* @param string $action * @param string $action
...@@ -196,7 +196,7 @@ class URL { ...@@ -196,7 +196,7 @@ class URL {
$bundle = Bundle::get($bundle); $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 // clause as the root of the generated URL, as the bundle can only handle
// URIs that begin with that string and no others. // URIs that begin with that string and no others.
$root = $bundle['handles'] ?: ''; $root = $bundle['handles'] ?: '';
......
...@@ -401,8 +401,8 @@ class Validator { ...@@ -401,8 +401,8 @@ class Validator {
protected function size($attribute, $value) protected function size($attribute, $value)
{ {
// This method will determine if the attribute is a number, string, or file and // 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 // return the proper size accordingly. If it is a number, the number itself is
// the size; if it is a file, the size is kilobytes in the size; if it is a // the size; if it is a file, the kilobytes is the size; if it is a
// string, the length is the size. // string, the length is the size.
if (is_numeric($value) and $this->has_rule($attribute, $this->numeric_rules)) if (is_numeric($value) and $this->has_rule($attribute, $this->numeric_rules))
{ {
...@@ -743,7 +743,7 @@ class Validator { ...@@ -743,7 +743,7 @@ class Validator {
} }
// We assume that attributes present in the $_FILES array are files, // We assume that attributes present in the $_FILES array are files,
// which makes sense. If the attribute doesn't have numeric rules // 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())) elseif (array_key_exists($attribute, Input::file()))
{ {
$line = 'file'; $line = 'file';
...@@ -862,7 +862,7 @@ class Validator { ...@@ -862,7 +862,7 @@ class Validator {
} }
/** /**
* Replace all place-holders for the not_in rule. * Replace all place-holders for the mimes rule.
* *
* @param string $message * @param string $message
* @param string $attribute * @param string $attribute
...@@ -953,7 +953,7 @@ class Validator { ...@@ -953,7 +953,7 @@ class Validator {
// If no language line has been specified for the attribute, all of // If no language line has been specified for the attribute, all of
// the underscores are removed from the attribute name and that // 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 else
{ {
return str_replace('_', ' ', $attribute); return str_replace('_', ' ', $attribute);
......
...@@ -163,7 +163,7 @@ class View implements ArrayAccess { ...@@ -163,7 +163,7 @@ class View implements ArrayAccess {
{ {
$directory = str_finish($directory, DS); $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 // extension, so we will need to check for both in the view path
// and return the first one we find for the given view. // and return the first one we find for the given view.
if (file_exists($path = $directory.$view.EXT)) if (file_exists($path = $directory.$view.EXT))
...@@ -291,7 +291,7 @@ class View implements ArrayAccess { ...@@ -291,7 +291,7 @@ class View implements ArrayAccess {
} }
// If there is no data in the array, we will render the contents of // 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. // string that is prefixed with "raw|" for convenience.
else else
{ {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
|---------------------------------------------------------------- |----------------------------------------------------------------
| |
| Laravel takes a dead simple approach to environments, and we | 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 | given environment, and when you access your application
| from a URL matching that pattern, we'll be sure to | from a URL matching that pattern, we'll be sure to
| merge in that environment's configuration files. | merge in that environment's configuration files.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment