Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:laravel/laravel

This commit is contained in:
Taylor Otwell 2012-04-10 10:09:43 -05:00
parent cb9050844a 2e7cca1d0b
commit bcca8be072
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ protected function resolve($migrations)
// naming collisions with other bundle's migrations.
$prefix = Bundle::class_prefix($bundle);
$class = $prefix.substr($name, 18);
$class = $prefix.\Laravel\Str::classify(substr($name, 18));
$migration = new $class;

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

@ -465,7 +465,7 @@ public function dirty()
*/
public function table()
{
return static::$table ?: strtolower(Str::plural(basename(get_class($this))));
return static::$table ?: strtolower(Str::plural(class_basename($this)));
}
/**

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

@ -21,7 +21,7 @@ class Has_Many_And_Belongs_To extends Relationship {
protected $other;
/**
* The columns on the joining tbale that should be fetched.
* The columns on the joining table that should be fetched.
*
* @var array
*/

16
laravel/validator.php
View File

@ -559,7 +559,7 @@ protected function validate_url($attribute, $value)
protected function validate_active_url($attribute, $value)
{
$url = str_replace(array('http://', 'https://', 'ftp://'), '', Str::lower($value));
return checkdnsrr($url);
}
@ -608,7 +608,7 @@ protected function validate_alpha_num($attribute, $value)
*/
protected function validate_alpha_dash($attribute, $value)
{
return preg_match('/^([-a-z0-9_-])+$/i', $value);
return preg_match('/^([-a-z0-9_-])+$/i', $value);
}
/**
@ -657,7 +657,7 @@ protected function validate_mimes($attribute, $value, $parameters)
protected function validate_before($attribute, $value, $parameters)
{
return (strtotime($value) < strtotime($parameters[0]));
}
}
/**
* Validate the date is after a given date.
@ -670,7 +670,7 @@ protected function validate_before($attribute, $value, $parameters)
protected function validate_after($attribute, $value, $parameters)
{
return (strtotime($value) > strtotime($parameters[0]));
}
}
/**
* Get the proper error message for an attribute and rule.
@ -692,7 +692,7 @@ protected function message($attribute, $rule)
{
return $this->messages[$custom];
}
elseif (Lang::has($custom = "validation.custom.{$custom}", $this->language))
elseif (Lang::has($custom = "{$bundle}validation.custom.{$custom}", $this->language))
{
return Lang::line($custom)->get($this->language);
}
@ -753,7 +753,7 @@ protected function size_message($bundle, $attribute, $rule)
$line = 'string';
}
return Lang::line("{$bundle}validation.{$rule}.{$line}")->get($this->language);
return Lang::line("{$bundle}validation.{$rule}.{$line}")->get($this->language);
}
/**
@ -929,7 +929,7 @@ protected function replace_before($message, $attribute, $rule, $parameters)
protected function replace_after($message, $attribute, $rule, $parameters)
{
return str_replace(':date', $parameters[0], $message);
}
}
/**
* Get the displayable name for a given attribute.
@ -988,7 +988,7 @@ protected function parse($rule)
{
$parameters = array();
// The format for specifying validation rules and parameters follows a
// The format for specifying validation rules and parameters follows a
// {rule}:{parameters} formatting convention. For instance, the rule
// "max:3" specifies that the value may only be 3 characters long.
if (($colon = strpos($rule, ':')) !== false)