malhuda/laravel
1
0
Fork 0
mirror of https://github.com/laravel/laravel.git synced 2025-02-20 11:53:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees 2012-07-27 13:52:15 +01:00
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/config/application.php
View File

@ -8,7 +8,7 @@ return array(
|--------------------------------------------------------------------------
|
| 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 @@ return array(
|
| 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 @@ return array(
| 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.
|
*/
@ -112,7 +112,7 @@ return array(
| 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.
|

2
application/config/cache.php
View File

@ -29,7 +29,7 @@ return array(
| 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.
|
*/

4
application/config/database.php
View File

@ -35,7 +35,7 @@ return array(
| 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 @@ return array(
| 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.
|
*/

4
application/config/error.php
View File

@ -9,7 +9,7 @@ return array(
|
| 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 @@ return array(
| 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.
|
*/

2
application/config/session.php
View File

@ -23,7 +23,7 @@ return array(
| 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.
|

2
application/config/strings.php
View File

@ -8,7 +8,7 @@ return array(
|--------------------------------------------------------------------------
|
| 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.

4
bundles/docs/routes.php
View File

@ -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 @@ Route::get('(:bundle)/(:any)/(:any?)', function($section, $page = null)
// 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';

4
laravel/auth/drivers/driver.php
View File

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

2
laravel/auth/drivers/fluent.php
View File

@ -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)

10
laravel/blade.php
View File

@ -149,9 +149,9 @@ class Blade {
return $value;
}
// First we'll get the layout from the top of the template and remove it.
// Then it is replaced with @include and attached to the end.
// By convention it must be located on the first line of the template contents.
// 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
// located on the first line of the template contents.
preg_replace_callback(
'/^@layout(\s*?\(.+?\))(\r?\n)?/',
function($matches) use (&$value)
@ -211,7 +211,7 @@ class Blade {
protected static function compile_forelse($value)
{
preg_match_all('/@forelse\s*?\(\s*?\$(.+?)\s*?as\s*?\$(.+?)\s*?\)/', $value, $matches, PREG_SET_ORDER );
if ( count($matches) < 1 ) return $value;
foreach ($matches as $forelse)
@ -452,7 +452,7 @@ class Blade {
}
return $value;
}
}
/**
* Get the regular expression for a generic Blade function.

10
laravel/bundle.php
View File

@ -46,7 +46,7 @@ class Bundle {
// 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 @@ class Bundle {
}
// 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']))
{
@ -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.
*
@ -124,7 +124,7 @@ class 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');
@ -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>
* // Returns array(null, 'admin.user')

2
laravel/cli/artisan.php
View File

@ -34,7 +34,7 @@ require path('sys').'cli/dependencies'.EXT;
* 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

2
laravel/cli/command.php
View File

@ -121,7 +121,7 @@ class Command {
}
// 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))
{

2
laravel/cli/tasks/migrate/migrator.php
View File

@ -151,7 +151,7 @@ class Migrator extends Task {
$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);

4
laravel/config.php
View File

@ -73,7 +73,7 @@ class Config {
$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 @@ class Config {
// 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)

2
laravel/cookie.php
View File

@ -3,7 +3,7 @@
class Cookie {
/**
* How long is forever (in minutes).
* How long is forever (in minutes)?
*
* @var int
*/

6
laravel/core.php
View File

@ -147,7 +147,7 @@ Request::$foundation = RequestFoundation::createFromGlobals();
| 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 @@ else
|
| 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 @@ if (defined('STDIN'))
|--------------------------------------------------------------------------
|
| 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.
|
*/

4
laravel/database/connection.php
View File

@ -209,7 +209,7 @@ class 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 array $bindings
@ -265,7 +265,7 @@ class Connection {
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'))

2
laravel/database/eloquent/model.php
View File

@ -753,7 +753,7 @@ abstract class Model {
{
$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))

6
laravel/database/eloquent/query.php
View File

@ -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
// any pivot columns that are on the model.
if ($this instanceof Relationships\Has_Many_And_Belongs_To)
@ -199,7 +199,7 @@ class Query {
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.'.'))
{
@ -278,4 +278,4 @@ class Query {
return $this;
}
}
}

4
laravel/database/eloquent/relationships/has_many_and_belongs_to.php
View File

@ -44,7 +44,7 @@ class Has_Many_And_Belongs_To extends Relationship {
$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 @@ class Has_Many_And_Belongs_To extends Relationship {
}
// 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);

4
laravel/database/grammar.php
View File

@ -35,7 +35,7 @@ abstract class Grammar {
*/
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 @@ abstract class Grammar {
*/
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)

18
laravel/database/query.php
View File

@ -158,7 +158,7 @@ class Query {
{
// 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,7 +167,7 @@ class Query {
}
// If the column is just a string, we can assume that the join just
// has a simple on clause, and we'll create the join instance and
// has a simple "ON" clause, and we'll create the join instance and
// add the clause automatically for the developer.
else
{
@ -283,7 +283,7 @@ class Query {
*/
public function or_where_id($value)
{
return $this->or_where('id', '=', $value);
return $this->or_where('id', '=', $value);
}
/**
@ -436,7 +436,7 @@ class Query {
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_')
@ -659,7 +659,7 @@ class Query {
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');
@ -713,12 +713,12 @@ class Query {
{
// 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)
@ -819,7 +819,7 @@ class Query {
/**
* 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
@ -836,7 +836,7 @@ class Query {
$sql = $this->grammar->delete($this);
return $this->connection->query($sql, $this->bindings);
return $this->connection->query($sql, $this->bindings);
}
/**

4
laravel/database/query/grammars/grammar.php
View File

@ -125,7 +125,7 @@ class Grammar extends \Laravel\Database\Grammar {
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 @@ class Grammar extends \Laravel\Database\Grammar {
// 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);

2
laravel/database/query/grammars/sqlserver.php
View File

@ -95,7 +95,7 @@ class SQLServer extends Grammar {
// 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;

4
laravel/database/schema.php
View File

@ -90,7 +90,7 @@ class Schema {
{
// The implications method is responsible for finding any fluently
// defined indexes on the schema table and adding the explicit
// commands that are needed to the schema instance.
// commands that are needed for the schema instance.
static::implications($table);
foreach ($table->commands as $command)
@ -190,4 +190,4 @@ class Schema {
throw new \Exception("Schema operations not supported for [$driver].");
}
}
}

2
laravel/database/schema/grammars/mysql.php
View File

@ -47,7 +47,7 @@ class MySQL extends Grammar {
{
$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)

2
laravel/database/schema/grammars/postgres.php
View File

@ -35,7 +35,7 @@ class Postgres extends Grammar {
{
$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)

6
laravel/database/schema/grammars/sqlite.php
View File

@ -29,7 +29,7 @@ class SQLite extends Grammar {
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))
@ -53,7 +53,7 @@ class SQLite extends Grammar {
{
$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 @@ class SQLite extends Grammar {
{
// 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);

6
laravel/database/schema/grammars/sqlserver.php
View File

@ -32,7 +32,7 @@ class SQLServer extends Grammar {
}
/**
* Geenrate the SQL statements for a table modification command.
* Generate the SQL statements for a table modification command.
*
* @param Table $table
* @param Fluent $command
@ -42,7 +42,7 @@ class SQLServer extends Grammar {
{
$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)
@ -247,7 +247,7 @@ class SQLServer extends Grammar {
{
$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)

2
laravel/event.php
View File

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

6
laravel/file.php
View 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.
*
@ -184,7 +184,7 @@ class File {
$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)
{
@ -335,7 +335,7 @@ class File {
$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)

2
laravel/helpers.php
View File

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

2
laravel/ioc.php
View File

@ -154,7 +154,7 @@ class IoC {
$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())
{

2
laravel/laravel.php
View File

@ -210,7 +210,7 @@ $response->send();
| 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.
|

2
laravel/log.php
View File

@ -51,7 +51,7 @@ class Log {
// 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);

2
laravel/paginator.php
View File

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

2
laravel/pluralizer.php
View File

@ -104,7 +104,7 @@ class Pluralizer {
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)

2
laravel/response.php
View File

@ -239,7 +239,7 @@ class Response {
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))
{

2
laravel/routing/filter.php
View File

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

8
laravel/routing/route.php
View File

@ -10,7 +10,7 @@ use Laravel\Response;
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 @@ class Route {
// 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 @@ class Route {
// 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));

8
laravel/routing/router.php
View File

@ -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
*/
@ -311,7 +311,7 @@ class Router {
$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 @@ class Router {
// 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 @@ class Router {
{
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, '('))

2
laravel/session.php
View File

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

2
laravel/uri.php
View File

@ -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>
* // Get the first segment of the request URI

10
laravel/url.php
View File

@ -101,8 +101,8 @@ class URL {
return $url;
}
// Unless $https is specified (true or false) then maintain the current request
// security for any new links generated. So https for all secure links.
// 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();
$root = static::base().'/'.Config::get('application.index');
@ -177,7 +177,7 @@ class URL {
}
/**
* Generate a action URL from a route definition
* Generate an action URL from a route definition
*
* @param array $route
* @param string $action
@ -204,7 +204,7 @@ class URL {
$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'] ?: '';
@ -329,4 +329,4 @@ class URL {
return filter_var($url, FILTER_VALIDATE_URL) !== false;
}
}
}

8
laravel/validator.php
View File

@ -422,8 +422,8 @@ class Validator {
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))
{
@ -764,7 +764,7 @@ class Validator {
}
// 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';
@ -883,7 +883,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 $attribute

4
laravel/view.php
View File

@ -168,7 +168,7 @@ class View implements ArrayAccess {
{
$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))
@ -296,7 +296,7 @@ class View implements ArrayAccess {
}
// 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
{

2
paths.php
View File

@ -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.