diff --git a/artisan b/artisan index 689b7615..d8e05547 100644 --- a/artisan +++ b/artisan @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.6 + * @version 3.1.7 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/laravel/autoloader.php b/laravel/autoloader.php index 20634fea..f2d40072 100644 --- a/laravel/autoloader.php +++ b/laravel/autoloader.php @@ -61,6 +61,8 @@ class_alias(static::$aliases[$class], $class); elseif (isset(static::$mappings[$class])) { require static::$mappings[$class]; + + return; } // If the class namespace is mapped to a directory, we will load the diff --git a/laravel/cli/tasks/migrate/resolver.php b/laravel/cli/tasks/migrate/resolver.php index f139195c..0e144b4a 100644 --- a/laravel/cli/tasks/migrate/resolver.php +++ b/laravel/cli/tasks/migrate/resolver.php @@ -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; diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php index 3ab50c74..2f565e57 100644 --- a/laravel/database/eloquent/model.php +++ b/laravel/database/eloquent/model.php @@ -472,7 +472,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))); } /** diff --git a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php index a3ea36b5..628e3a8f 100644 --- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php +++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php @@ -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 */ diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index e9df8928..123dbb13 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -4,6 +4,8 @@ ## Contents - [Laravel 3.2](#3.2) - [Upgrading From 3.1](#upgrade-3.2) +- [Laravel 3.1.7](#3.1.7) +- [Upgrading From 3.1.6](#upgrade-3.1.7) - [Laravel 3.1.6](#3.1.6) - [Upgrading From 3.1.5](#upgrade-3.1.6) - [Laravel 3.1.5](#3.1.5) @@ -39,6 +41,18 @@ ## Upgrading From 3.1 - Replace the **laravel** folder. + +## Laravel 3.1.7 + +- Fixes custom validation language line loading from bundles. +- Fixes double-loading of classes when overriding the core. +- Classify migration names. + + +## Upgrading From 3.1.6 + +- Replace the **laravel** folder. + ## Laravel 3.1.6 diff --git a/laravel/validator.php b/laravel/validator.php index b238ce13..b18bf512 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -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) diff --git a/paths.php b/paths.php index c7139f9a..0dfed818 100644 --- a/paths.php +++ b/paths.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.6 + * @version 3.1.7 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 5dff5e4c..8a6217ce 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.6 + * @version 3.1.7 * @author Taylor Otwell * @link http://laravel.com */