diff --git a/application/config/application.php b/application/config/application.php index 60735a60..01e9d106 100755 --- a/application/config/application.php +++ b/application/config/application.php @@ -159,6 +159,7 @@ return array( 'Blade' => 'Laravel\\Blade', 'Bundle' => 'Laravel\\Bundle', 'Cache' => 'Laravel\\Cache', + 'Command' => 'Laravel\\CLI\\Command', 'Config' => 'Laravel\\Config', 'Controller' => 'Laravel\\Routing\\Controller', 'Cookie' => 'Laravel\\Cookie', diff --git a/application/language/ro/pagination.php b/application/language/ro/pagination.php new file mode 100644 index 00000000..6a668f20 --- /dev/null +++ b/application/language/ro/pagination.php @@ -0,0 +1,19 @@ + '« Inapoi', + 'next' => 'Inainte »', + +); \ No newline at end of file diff --git a/application/language/ro/validation.php b/application/language/ro/validation.php new file mode 100644 index 00000000..52134a49 --- /dev/null +++ b/application/language/ro/validation.php @@ -0,0 +1,106 @@ + "Campul :attribute trebuie sa fie acceptat.", + "active_url" => "Campul :attribute nu este un URL valid.", + "after" => "Campul :attribute trebuie sa fie o data dupa :date.", + "alpha" => "Campul :attribute poate contine numai litere.", + "alpha_dash" => "Campul :attribute poate contine numai litere, numere si liniute.", + "alpha_num" => "Campul :attribute poate contine numai litere si numere.", + "array" => "Campul :attribute trebuie sa aiba elemente selectate.", + "before" => "Campul :attribute trebuie sa fie o data inainte de :date.", + "between" => array( + "numeric" => "Campul :attribute trebuie sa fie intre :min si :max.", + "file" => "Campul :attribute trebuie sa fie intre :min si :max kilobytes.", + "string" => "Campul :attribute trebuie sa fie intre :min si :max caractere.", + ), + "confirmed" => "Confirmarea :attribute nu se potriveste.", + "count" => "Campul :attribute trebuie sa aiba exact :count elemente selectate.", + "countbetween" => "Campul :attribute trebuie sa aiba intre :min si :max elemente selectate.", + "countmax" => "Campul :attribute trebuie sa aiba mai putin de :max elemente selectate.", + "countmin" => "Campul :attribute trebuie sa aiba cel putin :min elemente selectate.", + "date_format" => "Campul :attribute trebuie sa fie intr-un format valid.", + "different" => "Campurile :attribute si :other trebuie sa fie diferite.", + "email" => "Formatul campului :attribute este invalid.", + "exists" => "Campul :attribute selectat este invalid.", + "image" => "Campul :attribute trebuie sa fie o imagine.", + "in" => "Campul :attribute selectat este invalid.", + "integer" => "Campul :attribute trebuie sa fie un numar intreg.", + "ip" => "Campul :attribute trebuie sa fie o adresa IP valida.", + "match" => "Formatul campului :attribute este invalid.", + "max" => array( + "numeric" => "Campul :attribute trebuie sa fie mai mic de :max.", + "file" => "Campul :attribute trebuie sa fie mai mic de :max kilobytes.", + "string" => "Campul :attribute trebuie sa fie mai mic de :max caractere.", + ), + "mimes" => "Campul :attribute trebuie sa fie un fisier de tipul: :values.", + "min" => array( + "numeric" => "Campul :attribute trebuie sa fie cel putin :min.", + "file" => "Campul :attribute trebuie sa aiba cel putin :min kilobytes.", + "string" => "Campul :attribute trebuie sa aiba cel putin :min caractere.", + ), + "not_in" => "Campul :attribute selectat este invalid.", + "numeric" => "Campul :attribute trebuie sa fie un numar.", + "required" => "Campul :attribute este obligatoriu.", + "required_with" => "Campul :attribute este obligatoriu cu :field", + "same" => "Campul :attribute si :other trebuie sa fie identice.", + "size" => array( + "numeric" => "Campul :attribute trebuie sa fie :size.", + "file" => "Campul :attribute trebuie sa aiba :size kilobyte.", + "string" => "Campul :attribute trebuie sa aiba :size caractere.", + ), + "unique" => "Campul :attribute a fost deja folosit.", + "url" => "Campul :attribute nu este intr-un format valid.", + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute_rule" to name the lines. This helps keep your + | custom validation clean and tidy. + | + | So, say you want to use a custom validation message when validating that + | the "email" attribute is unique. Just add "email_unique" to this array + | with your custom message. The Validator will handle the rest! + | + */ + + 'custom' => array(), + + /* + |-------------------------------------------------------------------------- + | Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as "E-Mail Address" instead + | of "email". Your users will thank you. + | + | The Validator class will automatically search this array of lines it + | is attempting to replace the :attribute place-holder in messages. + | It's pretty slick. We think you'll like it. + | + */ + + 'attributes' => array(), + +); diff --git a/application/routes.php b/application/routes.php index 2892da90..06547e0f 100644 --- a/application/routes.php +++ b/application/routes.php @@ -48,7 +48,8 @@ Route::get('/', function() | | Similarly, we use an event to handle the display of 500 level errors | within the application. These errors are fired when there is an -| uncaught exception thrown in the application. +| uncaught exception thrown in the application. The exception object +| that is captured during execution is then passed to the 500 listener. | */ @@ -57,7 +58,7 @@ Event::listen('404', function() return Response::error('404'); }); -Event::listen('500', function() +Event::listen('500', function($exception) { return Response::error('500'); }); diff --git a/artisan b/artisan index 02beb785..f986e011 100644 --- a/artisan +++ b/artisan @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.2.13 + * @version 3.2.14 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/laravel/auth/drivers/driver.php b/laravel/auth/drivers/driver.php index b60d84e0..a3e09883 100644 --- a/laravel/auth/drivers/driver.php +++ b/laravel/auth/drivers/driver.php @@ -215,7 +215,7 @@ abstract class Driver { */ protected function recaller() { - return $this->name().'_remember'; + return Config::get('auth.cookie', $this->name().'_remember'); } /** @@ -228,4 +228,4 @@ abstract class Driver { return strtolower(str_replace('\\', '_', get_class($this))); } -} \ No newline at end of file +} diff --git a/laravel/cache/drivers/file.php b/laravel/cache/drivers/file.php index c37520ea..31ef9a4e 100644 --- a/laravel/cache/drivers/file.php +++ b/laravel/cache/drivers/file.php @@ -97,4 +97,14 @@ class File extends Driver { if (file_exists($this->path.$key)) @unlink($this->path.$key); } -} \ No newline at end of file + /** + * Flush the entire cache. + * + * @return void + */ + public function flush() + { + array_map('unlink', glob($this->path.'*')); + } + +} diff --git a/laravel/cache/drivers/redis.php b/laravel/cache/drivers/redis.php index 3195566c..ebc1c08f 100644 --- a/laravel/cache/drivers/redis.php +++ b/laravel/cache/drivers/redis.php @@ -88,4 +88,14 @@ class Redis extends Driver { $this->redis->del($key); } -} \ No newline at end of file + /** + * Flush the entire cache. + * + * @return void + */ + public function flush() + { + $this->redis->flushdb(); + } + +} diff --git a/laravel/cli/artisan.php b/laravel/cli/artisan.php index e7bd130e..90f29801 100644 --- a/laravel/cli/artisan.php +++ b/laravel/cli/artisan.php @@ -43,7 +43,8 @@ try } catch (\Exception $e) { - echo $e->getMessage(); + echo $e->getMessage().PHP_EOL; + exit(1); } -echo PHP_EOL; \ No newline at end of file +echo PHP_EOL; diff --git a/laravel/cli/tasks/test/runner.php b/laravel/cli/tasks/test/runner.php index 0d9fb4e6..eb1a8625 100644 --- a/laravel/cli/tasks/test/runner.php +++ b/laravel/cli/tasks/test/runner.php @@ -88,7 +88,7 @@ class Runner extends Task { // strings with spaces inside should be wrapped in quotes. $esc_path = escapeshellarg($path); - passthru('phpunit --configuration '.$esc_path, $status); + passthru('LARAVEL_ENV='.Request::env().' phpunit --configuration '.$esc_path, $status); @unlink($path); diff --git a/laravel/cookie.php b/laravel/cookie.php index 503732f1..775ff125 100644 --- a/laravel/cookie.php +++ b/laravel/cookie.php @@ -82,6 +82,10 @@ class Cookie { $value = static::hash($value).'+'.$value; + // If the developer has explicitly disabled SLL, then we shouldn't force + // this cookie over SSL. + $secure = $secure && Config::get('application.ssl'); + // If the secure option is set to true, yet the request is not over HTTPS // we'll throw an exception to let the developer know that they are // attempting to send a secure cookie over the insecure HTTP. diff --git a/laravel/crypter.php b/laravel/crypter.php index 18dd51bd..5cbf1101 100644 --- a/laravel/crypter.php +++ b/laravel/crypter.php @@ -138,7 +138,7 @@ class Crypter { $pad = ord(substr($value, -1)); } - if ($pad and $pad < static::$block) + if ($pad and $pad <= static::$block) { // If the correct padding is present on the string, we will remove // it and return the value. Otherwise, we'll throw an exception diff --git a/laravel/database/connection.php b/laravel/database/connection.php index 938ae97f..ec1ae884 100644 --- a/laravel/database/connection.php +++ b/laravel/database/connection.php @@ -75,7 +75,8 @@ class Connection { if (isset(\Laravel\Database::$registrar[$this->driver()])) { - return $this->grammar = \Laravel\Database::$registrar[$this->driver()]['query'](); + $resolver = \Laravel\Database::$registrar[$this->driver()]['query']; + return $this->grammar = $resolver($this); } switch ($this->driver()) @@ -308,7 +309,7 @@ class Connection { */ protected function log($sql, $bindings, $start) { - $time = number_format((microtime(true) - $start) * 1000, 2); + $time = (microtime(true) - $start) * 1000; Event::fire('laravel.query', array($sql, $bindings, $time)); diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php index cb555de4..23d25b02 100644 --- a/laravel/database/eloquent/model.php +++ b/laravel/database/eloquent/model.php @@ -517,7 +517,7 @@ abstract class Model { foreach ($this->attributes as $key => $value) { - if ( ! array_key_exists($key, $this->original) or $value != $this->original[$key]) + if ( ! array_key_exists($key, $this->original) or $value !== $this->original[$key]) { $dirty[$key] = $value; } @@ -795,4 +795,4 @@ abstract class Model { return call_user_func_array(array(new $model, $method), $parameters); } -} \ No newline at end of file +} diff --git a/laravel/database/query.php b/laravel/database/query.php index 73e45fe6..5787a6de 100755 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -829,7 +829,9 @@ class Query { } else if ($this->grammar instanceof Postgres) { - return (int) $result[0]->$column; + $row = (array) $result[0]; + + return (int) $row[$column]; } else { diff --git a/laravel/database/schema/table.php b/laravel/database/schema/table.php index c728260c..84b64dcf 100644 --- a/laravel/database/schema/table.php +++ b/laravel/database/schema/table.php @@ -39,6 +39,25 @@ class Table { */ public $commands = array(); + /** + * The registered custom macros. + * + * @var array + */ + public static $macros = array(); + + /** + * Registers a custom macro. + * + * @param string $name + * @param Closure $macro + * @return void + */ + public static function macro($name, $macro) + { + static::$macros[$name] = $macro; + } + /** * Create a new schema table instance. * @@ -422,4 +441,22 @@ class Table { return $this->columns[] = new Fluent($parameters); } -} \ No newline at end of file + /** + * Dynamically handle calls to custom macros. + * + * @param string $method + * @param array $parameters + * @return mixed + */ + public function __call($method, $parameters) + { + if (isset(static::$macros[$method])) + { + array_unshift($parameters, $this); + return call_user_func_array(static::$macros[$method], $parameters); + } + + throw new \Exception("Method [$method] does not exist."); + } + +} diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index 2f76114d..16b33f1d 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -2,6 +2,8 @@ ## Contents +- [Laravel 3.2.14](#3.2.14) +- [Upgrading From 3.2.13](#upgrade-3.2.14) - [Laravel 3.2.13](#3.2.13) - [Upgrading From 3.2.12](#upgrade-3.2.13) - [Laravel 3.2.12](#3.2.12) @@ -51,6 +53,17 @@ - [Laravel 3.1](#3.1) - [Upgrading From 3.0](#upgrade-3.1) + +## Laravel 3.2.14 + +- IoC can now resolve default parameters. +- Fix bug in Postgres insert_get_id when using FETCH_ASSOC. + + +### Upgrading From 3.2.13 + +- Replace the **laravel** folder. + ## Laravel 3.2.13 diff --git a/laravel/documentation/contrib/command-line.md b/laravel/documentation/contrib/command-line.md index 0602c2e2..d5bf4b3a 100644 --- a/laravel/documentation/contrib/command-line.md +++ b/laravel/documentation/contrib/command-line.md @@ -88,7 +88,7 @@ Next, commit the changes to the repository: # git commit -s -m "I added some more stuff to the Localization documentation." -- **-s** means that you are signing-off on your commit with your name. This tells the Laravel team know that you personally agree to your code being added to the Laravel core. +- **-s** means that you are signing-off on your commit with your name. This lets the Laravel team know that you personally agree to your code being added to the Laravel core. - **-m** is the message that goes with your commit. Provide a brief explanation of what you added or changed. diff --git a/laravel/documentation/contrib/tortoisegit.md b/laravel/documentation/contrib/tortoisegit.md index 96f1d9b9..9524657f 100644 --- a/laravel/documentation/contrib/tortoisegit.md +++ b/laravel/documentation/contrib/tortoisegit.md @@ -76,7 +76,7 @@ Now that you have finished coding and testing your changes, it's time to commit - Right-click the Laravel directory and goto **Git Commit -> "feature/localization-docs"…** - Commit - **Message:** Provide a brief explaination of what you added or changed - - Click **Sign** - This tells the Laravel team know that you personally agree to your code being added to the Laravel core + - Click **Sign** - This lets the Laravel team know that you personally agree to your code being added to the Laravel core - **Changes made:** Check all changed/added files - Click **OK** diff --git a/laravel/documentation/controllers.md b/laravel/documentation/controllers.md index 7bece18b..11621c8f 100644 --- a/laravel/documentation/controllers.md +++ b/laravel/documentation/controllers.md @@ -98,7 +98,7 @@ In this example the auth filter will be run before the action_index() or action_ $this->filter('before', 'auth')->except(array('add', 'posts')); -Much like the previous example, this declaration ensures that the auth filter is run on only some of this controller's actions. Instead of declaring to which actions the filter applies we are instead declaring the actions that will not require authenticated sessions. It can sometimes be safer to use the 'except' method as it's possible to add new actions to this controller and to forget to add them to only(). This could potentially lead your controller's action being unintentionally accessible by users who haven't been authenticated. +Much like the previous example, this declaration ensures that the auth filter is run on only some of this controller's actions. Instead of declaring to which actions the filter applies we are instead declaring the actions that will not require authenticated sessions. It can sometimes be safer to use the 'except' method as it's possible to add new actions to this controller and to forget to add them to only(). This could potentially lead to your controller's action being unintentionally accessible by users who haven't been authenticated. #### Attaching a filter to run on POST: diff --git a/laravel/documentation/database/eloquent.md b/laravel/documentation/database/eloquent.md index 81a9973f..fa4916cb 100644 --- a/laravel/documentation/database/eloquent.md +++ b/laravel/documentation/database/eloquent.md @@ -284,7 +284,7 @@ Or, as usual, you may retrieve the relationship through the dynamic roles proper $roles = User::find(1)->roles; -If your table names don't follow conventions, simply pass the table name in the second parameter to the **has\_and\_belongs\_to\_many** method: +If your table names don't follow conventions, simply pass the table name in the second parameter to the **has\_many\_and\_belongs\_to** method: class User extends Eloquent { diff --git a/laravel/documentation/database/fluent.md b/laravel/documentation/database/fluent.md index 307488ea..adede66e 100644 --- a/laravel/documentation/database/fluent.md +++ b/laravel/documentation/database/fluent.md @@ -76,6 +76,13 @@ There are a variety of methods to assist you in building where clauses. The most ->or_where('email', '=', 'example@gmail.com') ->first(); +To do the equivalent of an AND where, simply chain the query with another where: + + return DB::table('users') + ->where('id', '=', 1) + ->where('activated', '=', 1) + ->first(); + Of course, you are not limited to simply checking equality. You may also use **greater-than**, **less-than**, **not-equal**, and **like**: return DB::table('users') diff --git a/laravel/documentation/ioc.md b/laravel/documentation/ioc.md index 7df9572b..5d44ba8b 100644 --- a/laravel/documentation/ioc.md +++ b/laravel/documentation/ioc.md @@ -46,4 +46,13 @@ Now that we have SwiftMailer registered in the container, we can resolve it usin $mailer = IoC::resolve('mailer'); -> **Note:** You may also [register controllers in the container](/docs/controllers#dependency-injection). \ No newline at end of file +> **Note:** You may also [register controllers in the container](/docs/controllers#dependency-injection). + + +## Unregister an existing instance + +For test purposes sometimes you need to unregister some container. + +#### Unregister example mail class: + + IoC::unregister('mailer'); \ No newline at end of file diff --git a/laravel/documentation/views/forms.md b/laravel/documentation/views/forms.md index cee6287a..538fd935 100644 --- a/laravel/documentation/views/forms.md +++ b/laravel/documentation/views/forms.md @@ -83,6 +83,14 @@ Laravel provides an easy method of protecting your application from cross-site r echo Form::label('email', 'E-Mail Address', array('class' => 'awesome')); +#### Turning off HTML escaping of label contents: + + echo Form::label('confirm', 'Are you sure you want to proceed?', null, false); + +You can pass ```false``` as the optional fourth argument to disable automatic HTML escaping of the label content. + + + > **Note:** After creating a label, any form element you create with a name matching the label name will automatically receive an ID matching the label name as well. diff --git a/laravel/error.php b/laravel/error.php index c4c1ac6b..226d4639 100644 --- a/laravel/error.php +++ b/laravel/error.php @@ -54,7 +54,7 @@ class Error { // Using events gives the developer more freedom. else { - $response = Event::first('500'); + $response = Event::first('500', array($exception)); $response = Response::prepare($response); } diff --git a/laravel/form.php b/laravel/form.php index 5a450b52..d14cad69 100644 --- a/laravel/form.php +++ b/laravel/form.php @@ -182,13 +182,15 @@ class Form { * @param array $attributes * @return string */ - public static function label($name, $value, $attributes = array()) + public static function label($name, $value, $attributes = array(), $escape_html = true) { static::$labels[] = $name; $attributes = HTML::attributes($attributes); - $value = HTML::entities($value); + if ($escape_html) { + $value = HTML::entities($value); + } return ''; } diff --git a/laravel/helpers.php b/laravel/helpers.php index 513e3baa..4d4f3003 100644 --- a/laravel/helpers.php +++ b/laravel/helpers.php @@ -328,7 +328,7 @@ function head($array) */ function url($url = '', $https = null) { - return Laravel\URL::to($url, $https); + return URL::to($url, $https); } /** @@ -340,7 +340,7 @@ function url($url = '', $https = null) */ function asset($url, $https = null) { - return Laravel\URL::to_asset($url, $https); + return URL::to_asset($url, $https); } /** @@ -360,7 +360,7 @@ function asset($url, $https = null) */ function action($action, $parameters = array()) { - return Laravel\URL::to_action($action, $parameters); + return URL::to_action($action, $parameters); } /** @@ -380,7 +380,7 @@ function action($action, $parameters = array()) */ function route($name, $parameters = array()) { - return Laravel\URL::to_route($name, $parameters); + return URL::to_route($name, $parameters); } /** @@ -523,7 +523,7 @@ function view($view, $data = array()) { if (is_null($view)) return ''; - return Laravel\View::make($view, $data); + return View::make($view, $data); } /** @@ -537,7 +537,7 @@ function render($view, $data = array()) { if (is_null($view)) return ''; - return Laravel\View::make($view, $data)->render(); + return View::make($view, $data)->render(); } /** @@ -551,7 +551,7 @@ function render($view, $data = array()) */ function render_each($partial, array $data, $iterator, $empty = 'raw|') { - return Laravel\View::render_each($partial, $data, $iterator, $empty); + return View::render_each($partial, $data, $iterator, $empty); } /** @@ -562,7 +562,7 @@ function render_each($partial, array $data, $iterator, $empty = 'raw|') */ function yield($section) { - return Laravel\Section::yield($section); + return Section::yield($section); } /** diff --git a/laravel/input.php b/laravel/input.php index d9de36cb..84424570 100644 --- a/laravel/input.php +++ b/laravel/input.php @@ -40,6 +40,8 @@ class Input { */ public static function has($key) { + if (is_array(static::get($key))) return true; + return trim((string) static::get($key)) !== ''; } diff --git a/laravel/ioc.php b/laravel/ioc.php index 31a1b6a5..de070448 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -31,6 +31,19 @@ class IoC { static::$registry[$name] = compact('resolver', 'singleton'); } + /** + * Unregister an object + * + * @param string $name + */ + public static function unregister($name) + { + if (array_key_exists($name, static::$registry)) { + unset(static::$registry[$name]); + unset(static::$singletons[$name]); + } + } + /** * Determine if an object has been registered in the container. * @@ -39,7 +52,7 @@ class IoC { */ public static function registered($name) { - return array_key_exists($name, static::$registry); + return array_key_exists($name, static::$registry) || array_key_exists($name, static::$singletons); } /** @@ -141,6 +154,7 @@ class IoC { * @param string $type * @param array $parameters * @return mixed + * @throws \Exception */ protected static function build($type, $parameters = array()) { @@ -193,7 +207,7 @@ class IoC { $dependency = $parameter->getClass(); // If the person passed in some parameters to the class - // then we should probably use those instead of trying + // then we should probably use those instead of trying // to resolve a new instance of the class if (count($arguments) > 0) { @@ -205,7 +219,7 @@ class IoC { } else { - $dependencies[] = static::resolve($dependency->name); + $dependencies[] = static::resolve($dependency->name); } } @@ -218,6 +232,7 @@ class IoC { * * @param ReflectionParameter * @return default value + * @throws \Exception */ protected static function resolveNonClass($parameter) { @@ -229,6 +244,6 @@ class IoC { { throw new \Exception("Unresolvable dependency resolving [$parameter]."); } - } + } -} \ No newline at end of file +} diff --git a/laravel/log.php b/laravel/log.php index 88477a69..40b9c12c 100644 --- a/laravel/log.php +++ b/laravel/log.php @@ -56,7 +56,31 @@ class Log { Event::fire('laravel.log', array($type, $message)); } - $message = static::format($type, $message); + $trace=debug_backtrace(); + + foreach($trace as $item) + { + if (isset($item['class']) AND $item['class'] == __CLASS__) + { + continue; + } + + $caller = $item; + + break; + } + + $function = $caller['function']; + if (isset($caller['class'])) + { + $class = $caller['class'] . '::'; + } + else + { + $class = ''; + } + + $message = static::format($type, $class . $function . ' - ' . $message); File::append(path('storage').'logs/'.date('Y-m-d').'.log', $message); } @@ -96,4 +120,4 @@ class Log { static::write($method, $parameters[0], $parameters[1]); } -} \ No newline at end of file +} diff --git a/laravel/profiling/profiler.php b/laravel/profiling/profiler.php index fe4397e5..1c722681 100644 --- a/laravel/profiling/profiler.php +++ b/laravel/profiling/profiler.php @@ -146,9 +146,9 @@ class Profiler { foreach ($bindings as $binding) { $binding = Database::escape($binding); - + $sql = preg_replace('/\?/', $binding, $sql, 1); - $sql = htmlspecialchars($sql); + $sql = htmlspecialchars($sql, ENT_QUOTES, 'UTF-8', false); } static::$data['queries'][] = array($sql, $time); diff --git a/laravel/profiling/template.blade.php b/laravel/profiling/template.blade.php index c03b50f1..d9eab921 100755 --- a/laravel/profiling/template.blade.php +++ b/laravel/profiling/template.blade.php @@ -36,7 +36,7 @@ @foreach ($queries as $query) - {{ $query[1] }}ms + {{ number_format($query[1], 2) }}ms 
{{ $query[0] }}
@@ -103,7 +103,7 @@ SQL {{ count($queries) }} @if (count($queries)) - {{ array_sum(array_map(function($q) { return $q[1]; }, $queries)) }}ms + {{ number_format(array_sum(array_pluck($queries, '1')), 2) }}ms @endif diff --git a/laravel/redis.php b/laravel/redis.php index 02267d32..516f5aac 100644 --- a/laravel/redis.php +++ b/laravel/redis.php @@ -16,6 +16,13 @@ class Redis { */ protected $port; + /** + * The database password, if present. + * + * @var string + */ + protected $password; + /** * The database number the connection selects on load. * @@ -45,10 +52,11 @@ class Redis { * @param int $database * @return void */ - public function __construct($host, $port, $database = 0) + public function __construct($host, $port, $password = null, $database = 0) { $this->host = $host; $this->port = $port; + $this->password = $password; $this->database = $database; } @@ -79,7 +87,12 @@ class Redis { extract($config); - static::$databases[$name] = new static($host, $port, $database); + if ( ! isset($password)) + { + $password = null; + } + + static::$databases[$name] = new static($host, $port, $password, $database); } return static::$databases[$name]; @@ -153,6 +166,11 @@ class Redis { throw new \Exception("Error making Redis connection: {$error} - {$message}"); } + if ( $this->password ) + { + $this->auth($this->password); + } + $this->select($this->database); return $this->connection; diff --git a/laravel/request.php b/laravel/request.php index 0193776e..7cf85d69 100644 --- a/laravel/request.php +++ b/laravel/request.php @@ -196,7 +196,7 @@ class Request { */ public static function cli() { - return defined('STDIN') || (substr(PHP_SAPI, 0, 3) == 'cgi' && getenv('TERM')); + return defined('STDIN') || (PHP_SAPI != "cgi-fcgi" && substr(PHP_SAPI, 0, 3) == 'cgi' && getenv('TERM')); } /** @@ -287,4 +287,4 @@ class Request { return call_user_func_array(array(static::foundation(), $method), $parameters); } -} \ No newline at end of file +} diff --git a/laravel/routing/controller.php b/laravel/routing/controller.php index e81d6b5f..4e244948 100644 --- a/laravel/routing/controller.php +++ b/laravel/routing/controller.php @@ -276,7 +276,7 @@ abstract class Controller { // Again, as was the case with route closures, if the controller "before" // filters return a response, it will be considered the response to the // request and the controller method will not be used. - $response = Filter::run($filters, array(), true); + $response = Filter::run($filters, $parameters, true); if (is_null($response)) { @@ -439,4 +439,4 @@ abstract class Controller { } } -} \ No newline at end of file +} diff --git a/laravel/routing/route.php b/laravel/routing/route.php index 1ce17f1a..f2deba74 100644 --- a/laravel/routing/route.php +++ b/laravel/routing/route.php @@ -330,6 +330,18 @@ class Route { Router::register('PUT', $route, $action); } + /** + * Register a PATCH route with the router. + * + * @param string|array $route + * @param mixed $action + * @return void + */ + public static function patch($route, $action) + { + Router::register('PATCH', $route, $action); + } + /** * Register a DELETE route with the router. * diff --git a/laravel/session/drivers/cookie.php b/laravel/session/drivers/cookie.php index 63a60eec..9e75354c 100644 --- a/laravel/session/drivers/cookie.php +++ b/laravel/session/drivers/cookie.php @@ -39,7 +39,7 @@ class Cookie extends Driver { $payload = Crypter::encrypt(serialize($session)); - C::put(Cookie::payload, $payload, $lifetime, $path, $domain); + C::put(Cookie::payload, $payload, $lifetime, $path, $domain, $secure); } /** @@ -53,4 +53,4 @@ class Cookie extends Driver { C::forget(Cookie::payload); } -} \ No newline at end of file +} diff --git a/laravel/tests/cases/form.test.php b/laravel/tests/cases/form.test.php index 5f6f7fa3..8791dfd1 100644 --- a/laravel/tests/cases/form.test.php +++ b/laravel/tests/cases/form.test.php @@ -111,9 +111,11 @@ class FormTest extends PHPUnit_Framework_TestCase { { $form1 = Form::label('foo', 'Foobar'); $form2 = Form::label('foo', 'Foobar', array('class' => 'control-label')); + $form3 = Form::label('foo', 'Foobar baz', null, false); $this->assertEquals('', $form1); $this->assertEquals('', $form2); + $this->assertEquals('', $form3); } /** diff --git a/laravel/tests/cases/ioc.test.php b/laravel/tests/cases/ioc.test.php index a93442dd..805e1876 100644 --- a/laravel/tests/cases/ioc.test.php +++ b/laravel/tests/cases/ioc.test.php @@ -28,6 +28,7 @@ class TestClassTwoForIoC } } +use \Laravel\IoC as IoC; class IoCTest extends PHPUnit_Framework_TestCase { @@ -134,7 +135,7 @@ class IoCTest extends PHPUnit_Framework_TestCase { public function testClassTwoResolvesClassOneDependency() { $test = IoC::resolve('TestClassTwoForIoC'); - $this->assertInstanceOf('TestClassOneForIoC', $test->TestClassOneForIoC); + $this->assertInstanceOf('TestClassOneForIoC', $test->class_one); } /** @@ -146,8 +147,21 @@ class IoCTest extends PHPUnit_Framework_TestCase { $class_one = IoC::resolve('TestClassOneForIoC'); $class_one->test_variable = 42; - $class_two = IoC::resolve('TestClassTwoForIoC', [$class_one]); + $class_two = IoC::resolve('TestClassTwoForIoC', array($class_one)); $this->assertEquals(42, $class_two->class_one->test_variable); } -} \ No newline at end of file + public function testCanUnregisterRegistered() + { + $testClass = 'test'; + + IoC::register($testClass, function() {}); + + $this->assertTrue(IoC::registered($testClass)); + + IoC::unregister($testClass); + + $this->assertFalse(IoC::registered($testClass)); + } + +} diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/AcceptHeader.php b/laravel/vendor/Symfony/Component/HttpFoundation/AcceptHeader.php new file mode 100644 index 00000000..48c10c15 --- /dev/null +++ b/laravel/vendor/Symfony/Component/HttpFoundation/AcceptHeader.php @@ -0,0 +1,172 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation; + +/** + * Represents an Accept-* header. + * + * An accept header is compound with a list of items, + * sorted by descending quality. + * + * @author Jean-François Simon + */ +class AcceptHeader +{ + /** + * @var AcceptHeaderItem[] + */ + private $items = array(); + + /** + * @var bool + */ + private $sorted = true; + + /** + * Constructor. + * + * @param AcceptHeaderItem[] $items + */ + public function __construct(array $items) + { + foreach ($items as $item) { + $this->add($item); + } + } + + /** + * Builds an AcceptHeader instance from a string. + * + * @param string $headerValue + * + * @return AcceptHeader + */ + public static function fromString($headerValue) + { + $index = 0; + + return new self(array_map(function ($itemValue) use (&$index) { + $item = AcceptHeaderItem::fromString($itemValue); + $item->setIndex($index++); + + return $item; + }, preg_split('/\s*(?:,*("[^"]+"),*|,*(\'[^\']+\'),*|,+)\s*/', $headerValue, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE))); + } + + /** + * Returns header value's string representation. + * + * @return string + */ + public function __toString() + { + return implode(',', $this->items); + } + + /** + * Tests if header has given value. + * + * @param string $value + * + * @return Boolean + */ + public function has($value) + { + return isset($this->items[$value]); + } + + /** + * Returns given value's item, if exists. + * + * @param string $value + * + * @return AcceptHeaderItem|null + */ + public function get($value) + { + return isset($this->items[$value]) ? $this->items[$value] : null; + } + + /** + * Adds an item. + * + * @param AcceptHeaderItem $item + * + * @return AcceptHeader + */ + public function add(AcceptHeaderItem $item) + { + $this->items[$item->getValue()] = $item; + $this->sorted = false; + + return $this; + } + + /** + * Returns all items. + * + * @return AcceptHeaderItem[] + */ + public function all() + { + $this->sort(); + + return $this->items; + } + + /** + * Filters items on their value using given regex. + * + * @param string $pattern + * + * @return AcceptHeader + */ + public function filter($pattern) + { + return new self(array_filter($this->items, function (AcceptHeaderItem $item) use ($pattern) { + return preg_match($pattern, $item->getValue()); + })); + } + + /** + * Returns first item. + * + * @return AcceptHeaderItem|null + */ + public function first() + { + $this->sort(); + + return !empty($this->items) ? reset($this->items) : null; + } + + /** + * Sorts items by descending quality + */ + private function sort() + { + if (!$this->sorted) { + uasort($this->items, function ($a, $b) { + $qA = $a->getQuality(); + $qB = $b->getQuality(); + + if ($qA === $qB) { + return $a->getIndex() > $b->getIndex() ? 1 : -1; + } + + return $qA > $qB ? -1 : 1; + }); + + $this->sorted = true; + } + } +} diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/AcceptHeaderItem.php b/laravel/vendor/Symfony/Component/HttpFoundation/AcceptHeaderItem.php new file mode 100644 index 00000000..9d4c3132 --- /dev/null +++ b/laravel/vendor/Symfony/Component/HttpFoundation/AcceptHeaderItem.php @@ -0,0 +1,226 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation; + +/** + * Represents an Accept-* header item. + * + * @author Jean-François Simon + */ +class AcceptHeaderItem +{ + /** + * @var string + */ + private $value; + + /** + * @var float + */ + private $quality = 1.0; + + /** + * @var int + */ + private $index = 0; + + /** + * @var array + */ + private $attributes = array(); + + /** + * Constructor. + * + * @param string $value + * @param array $attributes + */ + public function __construct($value, array $attributes = array()) + { + $this->value = $value; + foreach ($attributes as $name => $value) { + $this->setAttribute($name, $value); + } + } + + /** + * Builds an AcceptHeaderInstance instance from a string. + * + * @param string $itemValue + * + * @return AcceptHeaderItem + */ + public static function fromString($itemValue) + { + $bits = preg_split('/\s*(?:;*("[^"]+");*|;*(\'[^\']+\');*|;+)\s*/', $itemValue, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE); + $value = array_shift($bits); + $attributes = array(); + + $lastNullAttribute = null; + foreach ($bits as $bit) { + if (($start = substr($bit, 0, 1)) === ($end = substr($bit, -1)) && ($start === '"' || $start === '\'')) { + $attributes[$lastNullAttribute] = substr($bit, 1, -1); + } elseif ('=' === $end) { + $lastNullAttribute = $bit = substr($bit, 0, -1); + $attributes[$bit] = null; + } else { + $parts = explode('=', $bit); + $attributes[$parts[0]] = isset($parts[1]) && strlen($parts[1]) > 0 ? $parts[1] : ''; + } + } + + return new self(($start = substr($value, 0, 1)) === ($end = substr($value, -1)) && ($start === '"' || $start === '\'') ? substr($value, 1, -1) : $value, $attributes); + } + + /** + * Returns header value's string representation. + * + * @return string + */ + public function __toString() + { + $string = $this->value.($this->quality < 1 ? ';q='.$this->quality : ''); + if (count($this->attributes) > 0) { + $string .= ';'.implode(';', array_map(function($name, $value) { + return sprintf(preg_match('/[,;=]/', $value) ? '%s="%s"' : '%s=%s', $name, $value); + }, array_keys($this->attributes), $this->attributes)); + } + + return $string; + } + + /** + * Set the item value. + * + * @param string $value + * + * @return AcceptHeaderItem + */ + public function setValue($value) + { + $this->value = $value; + + return $this; + } + + /** + * Returns the item value. + * + * @return string + */ + public function getValue() + { + return $this->value; + } + + /** + * Set the item quality. + * + * @param float $quality + * + * @return AcceptHeaderItem + */ + public function setQuality($quality) + { + $this->quality = $quality; + + return $this; + } + + /** + * Returns the item quality. + * + * @return float + */ + public function getQuality() + { + return $this->quality; + } + + /** + * Set the item index. + * + * @param int $index + * + * @return AcceptHeaderItem + */ + public function setIndex($index) + { + $this->index = $index; + + return $this; + } + + /** + * Returns the item index. + * + * @return int + */ + public function getIndex() + { + return $this->index; + } + + /** + * Tests if an attribute exists. + * + * @param string $name + * + * @return Boolean + */ + public function hasAttribute($name) + { + return isset($this->attributes[$name]); + } + + /** + * Returns an attribute by its name. + * + * @param string $name + * @param mixed $default + * + * @return mixed + */ + public function getAttribute($name, $default = null) + { + return isset($this->attributes[$name]) ? $this->attributes[$name] : $default; + } + + /** + * Returns all attributes. + * + * @return array + */ + public function getAttributes() + { + return $this->attributes; + } + + /** + * Set an attribute. + * + * @param string $name + * @param string $value + * + * @return AcceptHeaderItem + */ + public function setAttribute($name, $value) + { + if ('q' === $name) { + $this->quality = (float) $value; + } else { + $this->attributes[$name] = (string) $value; + } + + return $this; + } +} diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/laravel/vendor/Symfony/Component/HttpFoundation/BinaryFileResponse.php new file mode 100644 index 00000000..cb6c8a1e --- /dev/null +++ b/laravel/vendor/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -0,0 +1,278 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation; + +use Symfony\Component\HttpFoundation\File\File; +use Symfony\Component\HttpFoundation\File\Exception\FileException; + +/** + * BinaryFileResponse represents an HTTP response delivering a file. + * + * @author Niklas Fiekas + * @author stealth35 + * @author Igor Wiedler + * @author Jordan Alliot + * @author Sergey Linnik + */ +class BinaryFileResponse extends Response +{ + protected static $trustXSendfileTypeHeader = false; + + protected $file; + protected $offset; + protected $maxlen; + + /** + * Constructor. + * + * @param SplFileInfo|string $file The file to stream + * @param integer $status The response status code + * @param array $headers An array of response headers + * @param boolean $public Files are public by default + * @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename + * @param boolean $autoEtag Whether the ETag header should be automatically set + * @param boolean $autoLastModified Whether the Last-Modified header should be automatically set + */ + public function __construct($file, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true) + { + parent::__construct(null, $status, $headers); + + $this->setFile($file, $contentDisposition, $autoEtag, $autoLastModified); + + if ($public) { + $this->setPublic(); + } + } + + /** + * {@inheritdoc} + */ + public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true) + { + return new static($file, $status, $headers, $public, $contentDisposition, $autoEtag, $autoLastModified); + } + + /** + * Sets the file to stream. + * + * @param SplFileInfo|string $file The file to stream + * @param string $contentDisposition + * @param Boolean $autoEtag + * @param Boolean $autoLastModified + * + * @return BinaryFileResponse + * + * @throws FileException + */ + public function setFile($file, $contentDisposition = null, $autoEtag = false, $autoLastModified = true) + { + $file = new File((string) $file); + + if (!$file->isReadable()) { + throw new FileException('File must be readable.'); + } + + $this->file = $file; + + if ($autoEtag) { + $this->setAutoEtag(); + } + + if ($autoLastModified) { + $this->setAutoLastModified(); + } + + if ($contentDisposition) { + $this->setContentDisposition($contentDisposition); + } + + return $this; + } + + /** + * Gets the file. + * + * @return File The file to stream + */ + public function getFile() + { + return $this->file; + } + + /** + * Automatically sets the Last-Modified header according the file modification date. + */ + public function setAutoLastModified() + { + $this->setLastModified(\DateTime::createFromFormat('U', $this->file->getMTime())); + + return $this; + } + + /** + * Automatically sets the ETag header according to the checksum of the file. + */ + public function setAutoEtag() + { + $this->setEtag(sha1_file($this->file->getPathname())); + + return $this; + } + + /** + * Sets the Content-Disposition header with the given filename. + * + * @param string $disposition ResponseHeaderBag::DISPOSITION_INLINE or ResponseHeaderBag::DISPOSITION_ATTACHMENT + * @param string $filename Optionally use this filename instead of the real name of the file + * @param string $filenameFallback A fallback filename, containing only ASCII characters. Defaults to an automatically encoded filename + * + * @return BinaryFileResponse + */ + public function setContentDisposition($disposition, $filename = '', $filenameFallback = '') + { + if ($filename === '') { + $filename = $this->file->getFilename(); + } + + $dispositionHeader = $this->headers->makeDisposition($disposition, $filename, $filenameFallback); + $this->headers->set('Content-Disposition', $dispositionHeader); + + return $this; + } + + /** + * {@inheritdoc} + */ + public function prepare(Request $request) + { + $this->headers->set('Content-Length', $this->file->getSize()); + $this->headers->set('Accept-Ranges', 'bytes'); + $this->headers->set('Content-Transfer-Encoding', 'binary'); + + if (!$this->headers->has('Content-Type')) { + $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream'); + } + + if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) { + $this->setProtocolVersion('1.1'); + } + + $this->offset = 0; + $this->maxlen = -1; + + if (self::$trustXSendfileTypeHeader && $request->headers->has('X-Sendfile-Type')) { + // Use X-Sendfile, do not send any content. + $type = $request->headers->get('X-Sendfile-Type'); + $path = $this->file->getRealPath(); + if (strtolower($type) == 'x-accel-redirect') { + // Do X-Accel-Mapping substitutions. + foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) { + $mapping = explode('=', $mapping, 2); + + if (2 == count($mapping)) { + $location = trim($mapping[0]); + $pathPrefix = trim($mapping[1]); + + if (substr($path, 0, strlen($pathPrefix)) == $pathPrefix) { + $path = $location . substr($path, strlen($pathPrefix)); + break; + } + } + } + } + $this->headers->set($type, $path); + $this->maxlen = 0; + } elseif ($request->headers->has('Range')) { + // Process the range headers. + if (!$request->headers->has('If-Range') || $this->getEtag() == $request->headers->get('If-Range')) { + $range = $request->headers->get('Range'); + $fileSize = $this->file->getSize(); + + list($start, $end) = explode('-', substr($range, 6), 2) + array(0); + + $end = ('' === $end) ? $fileSize - 1 : (int) $end; + + if ('' === $start) { + $start = $fileSize - $end; + $end = $fileSize - 1; + } else { + $start = (int) $start; + } + + $start = max($start, 0); + $end = min($end, $fileSize - 1); + + $this->maxlen = $end < $fileSize ? $end - $start + 1 : -1; + $this->offset = $start; + + $this->setStatusCode(206); + $this->headers->set('Content-Range', sprintf('bytes %s-%s/%s', $start, $end, $fileSize)); + } + } + + return $this; + } + + /** + * Sends the file. + */ + public function sendContent() + { + if (!$this->isSuccessful()) { + parent::sendContent(); + + return; + } + + if (0 === $this->maxlen) { + return; + } + + $out = fopen('php://output', 'wb'); + $file = fopen($this->file->getPathname(), 'rb'); + + stream_copy_to_stream($file, $out, $this->maxlen, $this->offset); + + fclose($out); + fclose($file); + } + + /** + * {@inheritdoc} + * + * @throws \LogicException when the content is not null + */ + public function setContent($content) + { + if (null !== $content) { + throw new \LogicException('The content cannot be set on a BinaryFileResponse instance.'); + } + } + + /** + * {@inheritdoc} + * + * @return false + */ + public function getContent() + { + return false; + } + + /** + * Trust X-Sendfile-Type header. + */ + public static function trustXSendfileTypeHeader() + { + self::$trustXSendfileTypeHeader = true; + } +} diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/CHANGELOG.md b/laravel/vendor/Symfony/Component/HttpFoundation/CHANGELOG.md index 4a00207e..318383aa 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/CHANGELOG.md +++ b/laravel/vendor/Symfony/Component/HttpFoundation/CHANGELOG.md @@ -1,6 +1,20 @@ CHANGELOG ========= +2.2.0 +----- + + * fixed the Request::create() precedence (URI information always take precedence now) + * added Request::getTrustedProxies() + * deprecated Request::isProxyTrusted() + * [BC BREAK] JsonResponse does not turn a top level empty array to an object anymore, use an ArrayObject to enforce objects + * added a IpUtils class to check if an IP belongs to a CIDR + * added Request::getRealMethod() to get the "real" HTTP method (getMethod() returns the "intended" HTTP method) + * disabled _method request parameter support by default (call Request::enableHttpMethodParameterOverride() to + enable it, and Request::getHttpMethodParameterOverride() to check if it is supported) + * Request::splitHttpAcceptHeader() method is deprecated and will be removed in 2.3 + * Deprecated Flashbag::count() and \Countable interface, will be removed in 2.3 + 2.1.0 ----- diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Cookie.php b/laravel/vendor/Symfony/Component/HttpFoundation/Cookie.php index fe3a4cff..fdc33e36 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Cookie.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Cookie.php @@ -39,6 +39,8 @@ class Cookie * @param Boolean $secure Whether the cookie should only be transmitted over a secure HTTPS connection from the client * @param Boolean $httpOnly Whether the cookie will be made accessible only through the HTTP protocol * + * @throws \InvalidArgumentException + * * @api */ public function __construct($name, $value = null, $expire = 0, $path = '/', $domain = null, $secure = false, $httpOnly = true) diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php index 3da63dd4..f23ddd2f 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php @@ -45,7 +45,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface */ public static function isSupported() { - return !defined('PHP_WINDOWS_VERSION_BUILD'); + return !defined('PHP_WINDOWS_VERSION_BUILD') && function_exists('passthru') && function_exists('escapeshellarg'); } /** @@ -77,7 +77,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface $type = trim(ob_get_clean()); - if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-]+)#i', $type, $match)) { + if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) { // it's not a type, but an error message return null; } diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php index a8247ab4..59ddc077 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpFoundation\File\MimeType; -use Symfony\Component\HttpFoundation\File\Exception\FileException; use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException; @@ -99,7 +98,9 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface * * @return string The mime type or NULL, if none could be guessed * - * @throws FileException If the file does not exist + * @throws \LogicException + * @throws FileNotFoundException + * @throws AccessDeniedException */ public function guess($path) { diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php b/laravel/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php index d201e2dc..63c5386a 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -118,6 +118,19 @@ class UploadedFile extends File return $this->originalName; } + /** + * Returns the original file extension + * + * It is extracted from the original file name that was uploaded. + * Then is should not be considered as a safe value. + * + * @return string The extension + */ + public function getClientOriginalExtension() + { + return pathinfo($this->originalName, PATHINFO_EXTENSION); + } + /** * Returns the file mime type. * diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/HeaderBag.php b/laravel/vendor/Symfony/Component/HttpFoundation/HeaderBag.php index 2360e55b..b579eb99 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/HeaderBag.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/HeaderBag.php @@ -149,7 +149,7 @@ class HeaderBag implements \IteratorAggregate, \Countable * * @param string $key The key * @param string|array $values The value or an array of values - * @param Boolean $replace Whether to replace the actual value of not (true by default) + * @param Boolean $replace Whether to replace the actual value or not (true by default) * * @api */ @@ -223,7 +223,7 @@ class HeaderBag implements \IteratorAggregate, \Countable * @param string $key The parameter key * @param \DateTime $default The default value * - * @return null|\DateTime The filtered value + * @return null|\DateTime The parsed DateTime or the default value if the header does not exist * * @throws \RuntimeException When the HTTP header is not parseable * diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/IpUtils.php b/laravel/vendor/Symfony/Component/HttpFoundation/IpUtils.php new file mode 100644 index 00000000..2e3e1aa7 --- /dev/null +++ b/laravel/vendor/Symfony/Component/HttpFoundation/IpUtils.php @@ -0,0 +1,111 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation; + +/** + * Http utility functions. + * + * @author Fabien Potencier + */ +class IpUtils +{ + /** + * This class should not be instantiated + */ + private function __construct() {} + + /** + * Validates an IPv4 or IPv6 address. + * + * @param string $requestIp + * @param string $ip + * + * @return boolean Whether the IP is valid + */ + public static function checkIp($requestIp, $ip) + { + if (false !== strpos($requestIp, ':')) { + return self::checkIp6($requestIp, $ip); + } + + return self::checkIp4($requestIp, $ip); + } + + /** + * Validates an IPv4 address. + * + * @param string $requestIp + * @param string $ip + * + * @return boolean Whether the IP is valid + */ + public static function checkIp4($requestIp, $ip) + { + if (false !== strpos($ip, '/')) { + list($address, $netmask) = explode('/', $ip, 2); + + if ($netmask < 1 || $netmask > 32) { + return false; + } + } else { + $address = $ip; + $netmask = 32; + } + + return 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask); + } + + /** + * Validates an IPv6 address. + * + * @author David Soria Parra + * @see https://github.com/dsp/v6tools + * + * @param string $requestIp + * @param string $ip + * + * @return boolean Whether the IP is valid + * + * @throws \RuntimeException When IPV6 support is not enabled + */ + public static function checkIp6($requestIp, $ip) + { + if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) { + throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".'); + } + + if (false !== strpos($ip, '/')) { + list($address, $netmask) = explode('/', $ip, 2); + + if ($netmask < 1 || $netmask > 128) { + return false; + } + } else { + $address = $ip; + $netmask = 128; + } + + $bytesAddr = unpack("n*", inet_pton($address)); + $bytesTest = unpack("n*", inet_pton($requestIp)); + + for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; $i++) { + $left = $netmask - 16 * ($i-1); + $left = ($left <= 16) ? $left : 16; + $mask = ~(0xffff >> $left) & 0xffff; + if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) { + return false; + } + } + + return true; + } +} diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/JsonResponse.php b/laravel/vendor/Symfony/Component/HttpFoundation/JsonResponse.php index 29b4cc7b..b6ac8017 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/JsonResponse.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/JsonResponse.php @@ -28,17 +28,20 @@ class JsonResponse extends Response * @param integer $status The response status code * @param array $headers An array of response headers */ - public function __construct($data = array(), $status = 200, $headers = array()) + public function __construct($data = null, $status = 200, $headers = array()) { parent::__construct('', $status, $headers); + if (null === $data) { + $data = new \ArrayObject(); + } $this->setData($data); } /** * {@inheritDoc} */ - public static function create($data = array(), $status = 200, $headers = array()) + public static function create($data = null, $status = 200, $headers = array()) { return new static($data, $status, $headers); } @@ -49,6 +52,8 @@ class JsonResponse extends Response * @param string $callback * * @return JsonResponse + * + * @throws \InvalidArgumentException */ public function setCallback($callback = null) { @@ -77,11 +82,6 @@ class JsonResponse extends Response */ public function setData($data = array()) { - // root should be JSON object, not array - if (is_array($data) && 0 === count($data)) { - $data = new \ArrayObject(); - } - // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML. $this->data = json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT); diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/LICENSE b/laravel/vendor/Symfony/Component/HttpFoundation/LICENSE index cdffe7ae..88a57f8d 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/LICENSE +++ b/laravel/vendor/Symfony/Component/HttpFoundation/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2012 Fabien Potencier +Copyright (c) 2004-2013 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/ParameterBag.php b/laravel/vendor/Symfony/Component/HttpFoundation/ParameterBag.php index 0273d933..c8720cdc 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/ParameterBag.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/ParameterBag.php @@ -96,6 +96,8 @@ class ParameterBag implements \IteratorAggregate, \Countable * * @return mixed * + * @throws \InvalidArgumentException + * * @api */ public function get($path, $default = null, $deep = false) diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/README.md b/laravel/vendor/Symfony/Component/HttpFoundation/README.md index bb6f02c4..ed49b4e1 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/README.md +++ b/laravel/vendor/Symfony/Component/HttpFoundation/README.md @@ -31,7 +31,7 @@ the HTTP specification. Loading ------- -If you are using PHP 5.3.x you must add the following to your autoloader: +If you are not using Composer but are using PHP 5.3.x, you must add the following to your autoloader: // SessionHandlerInterface if (!interface_exists('SessionHandlerInterface')) { @@ -43,4 +43,6 @@ Resources You can run the unit tests with the following command: - phpunit + $ cd path/to/Symfony/Component/HttpFoundation/ + $ composer.phar install --dev + $ phpunit diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/RedirectResponse.php b/laravel/vendor/Symfony/Component/HttpFoundation/RedirectResponse.php index a9d98e6b..54f57216 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/RedirectResponse.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/RedirectResponse.php @@ -29,6 +29,8 @@ class RedirectResponse extends Response * @param integer $status The status code (302 by default) * @param array $headers The headers (Location is always set to the given url) * + * @throws \InvalidArgumentException + * * @see http://tools.ietf.org/html/rfc2616#section-10.3 * * @api @@ -72,6 +74,8 @@ class RedirectResponse extends Response * @param string $url The URL to redirect to * * @return RedirectResponse The current response. + * + * @throws \InvalidArgumentException */ public function setTargetUrl($url) { diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Request.php b/laravel/vendor/Symfony/Component/HttpFoundation/Request.php index 18e5480c..c48082a6 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Request.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Request.php @@ -30,10 +30,10 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface; */ class Request { - const HEADER_CLIENT_IP = 'client_ip'; - const HEADER_CLIENT_HOST = 'client_host'; + const HEADER_CLIENT_IP = 'client_ip'; + const HEADER_CLIENT_HOST = 'client_host'; const HEADER_CLIENT_PROTO = 'client_proto'; - const HEADER_CLIENT_PORT = 'client_port'; + const HEADER_CLIENT_PORT = 'client_port'; protected static $trustProxy = false; @@ -53,6 +53,8 @@ class Request self::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT', ); + protected static $httpMethodParameterOverride = false; + /** * @var \Symfony\Component\HttpFoundation\ParameterBag * @@ -251,6 +253,9 @@ class Request /** * Creates a Request based on a given URI and configuration. * + * The information contained in the URI always take precedence + * over the other information (server and parameters). + * * @param string $uri The URI * @param string $method The HTTP method * @param array $parameters The query (GET) or request (POST) parameters @@ -265,7 +270,7 @@ class Request */ public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null) { - $defaults = array( + $server = array_replace(array( 'SERVER_NAME' => 'localhost', 'SERVER_PORT' => 80, 'HTTP_HOST' => 'localhost', @@ -278,32 +283,38 @@ class Request 'SCRIPT_FILENAME' => '', 'SERVER_PROTOCOL' => 'HTTP/1.1', 'REQUEST_TIME' => time(), - ); + ), $server); + + $server['PATH_INFO'] = ''; + $server['REQUEST_METHOD'] = strtoupper($method); $components = parse_url($uri); if (isset($components['host'])) { - $defaults['SERVER_NAME'] = $components['host']; - $defaults['HTTP_HOST'] = $components['host']; + $server['SERVER_NAME'] = $components['host']; + $server['HTTP_HOST'] = $components['host']; } if (isset($components['scheme'])) { if ('https' === $components['scheme']) { - $defaults['HTTPS'] = 'on'; - $defaults['SERVER_PORT'] = 443; + $server['HTTPS'] = 'on'; + $server['SERVER_PORT'] = 443; + } else { + unset($server['HTTPS']); + $server['SERVER_PORT'] = 80; } } if (isset($components['port'])) { - $defaults['SERVER_PORT'] = $components['port']; - $defaults['HTTP_HOST'] = $defaults['HTTP_HOST'].':'.$components['port']; + $server['SERVER_PORT'] = $components['port']; + $server['HTTP_HOST'] = $server['HTTP_HOST'].':'.$components['port']; } if (isset($components['user'])) { - $defaults['PHP_AUTH_USER'] = $components['user']; + $server['PHP_AUTH_USER'] = $components['user']; } if (isset($components['pass'])) { - $defaults['PHP_AUTH_PW'] = $components['pass']; + $server['PHP_AUTH_PW'] = $components['pass']; } if (!isset($components['path'])) { @@ -314,7 +325,9 @@ class Request case 'POST': case 'PUT': case 'DELETE': - $defaults['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'; + if (!isset($server['CONTENT_TYPE'])) { + $server['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'; + } case 'PATCH': $request = $parameters; $query = array(); @@ -331,14 +344,8 @@ class Request } $queryString = http_build_query($query, '', '&'); - $uri = $components['path'].('' !== $queryString ? '?'.$queryString : ''); - - $server = array_replace($defaults, $server, array( - 'REQUEST_METHOD' => strtoupper($method), - 'PATH_INFO' => '', - 'REQUEST_URI' => $uri, - 'QUERY_STRING' => $queryString, - )); + $server['REQUEST_URI'] = $components['path'].('' !== $queryString ? '?'.$queryString : ''); + $server['QUERY_STRING'] = $queryString; return new static($query, $request, array(), $cookies, $files, $server, $content); } @@ -464,6 +471,8 @@ class Request */ public static function trustProxyData() { + trigger_error('trustProxyData() is deprecated since version 2.0 and will be removed in 2.3. Use setTrustedProxies() instead.', E_USER_DEPRECATED); + self::$trustProxy = true; } @@ -482,6 +491,16 @@ class Request self::$trustProxy = $proxies ? true : false; } + /** + * Gets the list of trusted proxies. + * + * @return array An array of trusted proxies. + */ + public static function getTrustedProxies() + { + return self::$trustedProxies; + } + /** * Sets the name for trusted headers. * @@ -496,6 +515,8 @@ class Request * * @param string $key The header key * @param string $value The header name + * + * @throws \InvalidArgumentException */ public static function setTrustedHeaderName($key, $value) { @@ -511,6 +532,8 @@ class Request * false otherwise. * * @return boolean + * + * @deprecated Deprecated since version 2.2, to be removed in 2.3. Use getTrustedProxies instead. */ public static function isProxyTrusted() { @@ -560,6 +583,29 @@ class Request return implode('&', $parts); } + /** + * Enables support for the _method request parameter to determine the intended HTTP method. + * + * Be warned that enabling this feature might lead to CSRF issues in your code. + * Check that you are using CSRF tokens when required. + * + * The HTTP method can only be overridden when the real HTTP method is POST. + */ + public static function enableHttpMethodParameterOverride() + { + self::$httpMethodParameterOverride = true; + } + + /** + * Checks whether support for the _method request parameter is enabled. + * + * @return Boolean True when the _method request parameter is enabled, false otherwise + */ + public static function getHttpMethodParameterOverride() + { + return self::$httpMethodParameterOverride; + } + /** * Gets a "parameter" value. * @@ -657,8 +703,6 @@ class Request * * @see http://en.wikipedia.org/wiki/X-Forwarded-For * - * @deprecated The proxy argument is deprecated since version 2.0 and will be removed in 2.3. Use setTrustedProxies instead. - * * @api */ public function getClientIp() @@ -703,7 +747,7 @@ class Request * * * http://localhost/mysite returns an empty string * * http://localhost/mysite/about returns '/about' - * * htpp://localhost/mysite/enco%20ded returns '/enco%20ded' + * * http://localhost/mysite/enco%20ded returns '/enco%20ded' * * http://localhost/mysite/about?var=1 returns '/about' * * @return string The raw path (i.e. not urldecoded) @@ -897,8 +941,7 @@ class Request */ public function getUri() { - $qs = $this->getQueryString(); - if (null !== $qs) { + if (null !== $qs = $this->getQueryString()) { $qs = '?'.$qs; } @@ -1017,26 +1060,51 @@ class Request } /** - * Gets the request method. + * Gets the request "intended" method. + * + * If the X-HTTP-Method-Override header is set, and if the method is a POST, + * then it is used to determine the "real" intended HTTP method. + * + * The _method request parameter can also be used to determine the HTTP method, + * but only if enableHttpMethodParameterOverride() has been called. * * The method is always an uppercased string. * * @return string The request method * * @api + * + * @see getRealMethod */ public function getMethod() { if (null === $this->method) { $this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET')); + if ('POST' === $this->method) { - $this->method = strtoupper($this->headers->get('X-HTTP-METHOD-OVERRIDE', $this->request->get('_method', $this->query->get('_method', 'POST')))); + if ($method = $this->headers->get('X-HTTP-METHOD-OVERRIDE')) { + $this->method = strtoupper($method); + } elseif (self::$httpMethodParameterOverride) { + $this->method = strtoupper($this->request->get('_method', $this->query->get('_method', 'POST'))); + } } } return $this->method; } + /** + * Gets the "real" request method. + * + * @return string The request method + * + * @see getMethod + */ + public function getRealMethod() + { + return strtoupper($this->server->get('REQUEST_METHOD', 'GET')); + } + /** * Gets the mime type associated with the format. * @@ -1216,6 +1284,8 @@ class Request * @param Boolean $asResource If true, a resource will be returned * * @return string|resource The request body content or a resource to read the body stream. + * + * @throws \LogicException */ public function getContent($asResource = false) { @@ -1275,7 +1345,18 @@ class Request return $locales[0]; } - $preferredLanguages = array_values(array_intersect($preferredLanguages, $locales)); + $extendedPreferredLanguages = array(); + foreach ($preferredLanguages as $language) { + $extendedPreferredLanguages[] = $language; + if (false !== $position = strpos($language, '_')) { + $superLanguage = substr($language, 0, $position); + if (!in_array($superLanguage, $preferredLanguages)) { + $extendedPreferredLanguages[] = $superLanguage; + } + } + } + + $preferredLanguages = array_values(array_intersect($extendedPreferredLanguages, $locales)); return isset($preferredLanguages[0]) ? $preferredLanguages[0] : $locales[0]; } @@ -1293,9 +1374,9 @@ class Request return $this->languages; } - $languages = $this->splitHttpAcceptHeader($this->headers->get('Accept-Language')); + $languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all(); $this->languages = array(); - foreach ($languages as $lang => $q) { + foreach (array_keys($languages) as $lang) { if (strstr($lang, '-')) { $codes = explode('-', $lang); if ($codes[0] == 'i') { @@ -1335,7 +1416,7 @@ class Request return $this->charsets; } - return $this->charsets = array_keys($this->splitHttpAcceptHeader($this->headers->get('Accept-Charset'))); + return $this->charsets = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all()); } /** @@ -1351,14 +1432,15 @@ class Request return $this->acceptableContentTypes; } - return $this->acceptableContentTypes = array_keys($this->splitHttpAcceptHeader($this->headers->get('Accept'))); + return $this->acceptableContentTypes = array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all()); } /** * Returns true if the request is a XMLHttpRequest. * * It works if your JavaScript library set an X-Requested-With HTTP header. - * It is known to work with Prototype, Mootools, jQuery. + * It is known to work with common JavaScript frameworks: + * @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript * * @return Boolean true if the request is an XMLHttpRequest, false otherwise * @@ -1375,40 +1457,23 @@ class Request * @param string $header Header to split * * @return array Array indexed by the values of the Accept-* header in preferred order + * + * @deprecated Deprecated since version 2.2, to be removed in 2.3. */ public function splitHttpAcceptHeader($header) { - if (!$header) { - return array(); - } + trigger_error('splitHttpAcceptHeader() is deprecated since version 2.2 and will be removed in 2.3.', E_USER_DEPRECATED); - $values = array(); - $groups = array(); - foreach (array_filter(explode(',', $header)) as $value) { - // Cut off any q-value that might come after a semi-colon - if (preg_match('/;\s*(q=.*$)/', $value, $match)) { - $q = substr(trim($match[1]), 2); - $value = trim(substr($value, 0, -strlen($match[0]))); - } else { - $q = 1; + $headers = array(); + foreach (AcceptHeader::fromString($header)->all() as $item) { + $key = $item->getValue(); + foreach ($item->getAttributes() as $name => $value) { + $key .= sprintf(';%s=%s', $name, $value); } - - $groups[$q][] = $value; + $headers[$key] = $item->getQuality(); } - krsort($groups); - - foreach ($groups as $q => $items) { - $q = (float) $q; - - if (0 < $q) { - foreach ($items as $value) { - $values[trim($value)] = $q; - } - } - } - - return $values; + return $headers; } /* @@ -1426,12 +1491,16 @@ class Request if ($this->headers->has('X_ORIGINAL_URL') && false !== stripos(PHP_OS, 'WIN')) { // IIS with Microsoft Rewrite Module $requestUri = $this->headers->get('X_ORIGINAL_URL'); + $this->headers->remove('X_ORIGINAL_URL'); } elseif ($this->headers->has('X_REWRITE_URL') && false !== stripos(PHP_OS, 'WIN')) { // IIS with ISAPI_Rewrite $requestUri = $this->headers->get('X_REWRITE_URL'); + $this->headers->remove('X_REWRITE_URL'); } elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') { // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem) $requestUri = $this->server->get('UNENCODED_URL'); + $this->server->remove('UNENCODED_URL'); + $this->server->remove('IIS_WasUrlRewritten'); } elseif ($this->server->has('REQUEST_URI')) { $requestUri = $this->server->get('REQUEST_URI'); // HTTP proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path @@ -1445,8 +1514,12 @@ class Request if ('' != $this->server->get('QUERY_STRING')) { $requestUri .= '?'.$this->server->get('QUERY_STRING'); } + $this->server->remove('ORIG_PATH_INFO'); } + // normalize the request URI to ease creating sub-requests from this request + $this->server->set('REQUEST_URI', $requestUri); + return $requestUri; } diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php b/laravel/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php index 7ebae28b..49b92f0e 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/RequestMatcher.php @@ -143,95 +143,10 @@ class RequestMatcher implements RequestMatcherInterface return false; } - if (null !== $this->ip && !$this->checkIp($request->getClientIp(), $this->ip)) { + if (null !== $this->ip && !IpUtils::checkIp($request->getClientIp(), $this->ip)) { return false; } return true; } - - /** - * Validates an IP address. - * - * @param string $requestIp - * @param string $ip - * - * @return boolean True valid, false if not. - */ - protected function checkIp($requestIp, $ip) - { - // IPv6 address - if (false !== strpos($requestIp, ':')) { - return $this->checkIp6($requestIp, $ip); - } else { - return $this->checkIp4($requestIp, $ip); - } - } - - /** - * Validates an IPv4 address. - * - * @param string $requestIp - * @param string $ip - * - * @return boolean True valid, false if not. - */ - protected function checkIp4($requestIp, $ip) - { - if (false !== strpos($ip, '/')) { - list($address, $netmask) = explode('/', $ip, 2); - - if ($netmask < 1 || $netmask > 32) { - return false; - } - } else { - $address = $ip; - $netmask = 32; - } - - return 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask); - } - - /** - * Validates an IPv6 address. - * - * @author David Soria Parra - * @see https://github.com/dsp/v6tools - * - * @param string $requestIp - * @param string $ip - * - * @return boolean True valid, false if not. - */ - protected function checkIp6($requestIp, $ip) - { - if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) { - throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".'); - } - - if (false !== strpos($ip, '/')) { - list($address, $netmask) = explode('/', $ip, 2); - - if ($netmask < 1 || $netmask > 128) { - return false; - } - } else { - $address = $ip; - $netmask = 128; - } - - $bytesAddr = unpack("n*", inet_pton($address)); - $bytesTest = unpack("n*", inet_pton($requestIp)); - - for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; $i++) { - $left = $netmask - 16 * ($i-1); - $left = ($left <= 16) ? $left : 16; - $mask = ~(0xffff >> $left) & 0xffff; - if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) { - return false; - } - } - - return true; - } } diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Response.php b/laravel/vendor/Symfony/Component/HttpFoundation/Response.php index 7428b9a9..7ac4e800 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Response.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Response.php @@ -131,6 +131,8 @@ class Response * @param integer $status The response status code * @param array $headers An array of response headers * + * @throws \InvalidArgumentException When the HTTP status code is not valid + * * @api */ public function __construct($content = '', $status = 200, $headers = array()) @@ -231,7 +233,7 @@ class Response $headers->remove('Content-Length'); } - if ('HEAD' === $request->getMethod()) { + if ($request->isMethod('HEAD')) { // cf. RFC2616 14.13 $length = $headers->get('Content-Length'); $this->setContent(null); @@ -251,6 +253,16 @@ class Response $this->headers->set('expires', -1); } + /** + * Check if we need to remove Cache-Control for ssl encrypted downloads when using IE < 9 + * @link http://support.microsoft.com/kb/323308 + */ + if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) == 1 && true === $request->isSecure()) { + if (intval(preg_replace("/(MSIE )(.*?);/", "$2", $match[0])) < 9) { + $this->headers->remove('Cache-Control'); + } + } + return $this; } @@ -270,7 +282,7 @@ class Response header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)); // headers - foreach ($this->headers->all() as $name => $values) { + foreach ($this->headers->allPreserveCase() as $name => $values) { foreach ($values as $value) { header($name.': '.$value, false); } @@ -336,6 +348,8 @@ class Response * * @return Response * + * @throws \UnexpectedValueException + * * @api */ public function setContent($content) @@ -431,7 +445,7 @@ class Response /** * Retrieves the status code for the current web response. * - * @return string Status code + * @return integer Status code * * @api */ @@ -499,7 +513,7 @@ class Response * * Fresh responses may be served from cache without any interaction with the * origin. A response is considered fresh when it includes a Cache-Control/max-age - * indicator or Expiration header and the calculated age is less than the freshness lifetime. + * indicator or Expires header and the calculated age is less than the freshness lifetime. * * @return Boolean true if the response is fresh, false otherwise * @@ -612,8 +626,8 @@ class Response */ public function getAge() { - if ($age = $this->headers->get('Age')) { - return $age; + if (null !== $age = $this->headers->get('Age')) { + return (int) $age; } return max(time() - $this->getDate()->format('U'), 0); @@ -638,21 +652,26 @@ class Response /** * Returns the value of the Expires header as a DateTime instance. * - * @return \DateTime A DateTime instance + * @return \DateTime|null A DateTime instance or null if the header does not exist * * @api */ public function getExpires() { - return $this->headers->getDate('Expires'); + try { + return $this->headers->getDate('Expires'); + } catch (\RuntimeException $e) { + // according to RFC 2616 invalid date formats (e.g. "0" and "-1") must be treated as in the past + return \DateTime::createFromFormat(DATE_RFC2822, 'Sat, 01 Jan 00 00:00:00 +0000'); + } } /** * Sets the Expires HTTP header with a DateTime instance. * - * If passed a null value, it removes the header. + * Passing null as value will remove the header. * - * @param \DateTime $date A \DateTime instance + * @param \DateTime|null $date A \DateTime instance or null to remove the header * * @return Response * @@ -672,7 +691,7 @@ class Response } /** - * Sets the number of seconds after the time specified in the response's Date + * Returns the number of seconds after the time specified in the response's Date * header when the the response should no longer be considered fresh. * * First, it checks for a s-maxage directive, then a max-age directive, and then it falls @@ -684,12 +703,12 @@ class Response */ public function getMaxAge() { - if ($age = $this->headers->getCacheControlDirective('s-maxage')) { - return $age; + if ($this->headers->hasCacheControlDirective('s-maxage')) { + return (int) $this->headers->getCacheControlDirective('s-maxage'); } - if ($age = $this->headers->getCacheControlDirective('max-age')) { - return $age; + if ($this->headers->hasCacheControlDirective('max-age')) { + return (int) $this->headers->getCacheControlDirective('max-age'); } if (null !== $this->getExpires()) { @@ -750,7 +769,7 @@ class Response */ public function getTtl() { - if ($maxAge = $this->getMaxAge()) { + if (null !== $maxAge = $this->getMaxAge()) { return $maxAge - $this->getAge(); } @@ -796,7 +815,9 @@ class Response /** * Returns the Last-Modified HTTP header as a DateTime instance. * - * @return \DateTime A DateTime instance + * @return \DateTime|null A DateTime instance or null if the header does not exist + * + * @throws \RuntimeException When the HTTP header is not parseable * * @api */ @@ -808,9 +829,9 @@ class Response /** * Sets the Last-Modified HTTP header with a DateTime instance. * - * If passed a null value, it removes the header. + * Passing null as value will remove the header. * - * @param \DateTime $date A \DateTime instance + * @param \DateTime|null $date A \DateTime instance or null to remove the header * * @return Response * @@ -832,7 +853,7 @@ class Response /** * Returns the literal value of the ETag HTTP header. * - * @return string The ETag HTTP header + * @return string|null The ETag HTTP header or null if it does not exist * * @api */ @@ -844,8 +865,8 @@ class Response /** * Sets the ETag value. * - * @param string $etag The ETag unique identifier - * @param Boolean $weak Whether you want a weak ETag or not + * @param string|null $etag The ETag unique identifier or null to remove the header + * @param Boolean $weak Whether you want a weak ETag or not * * @return Response * @@ -875,6 +896,8 @@ class Response * * @return Response * + * @throws \InvalidArgumentException + * * @api */ public function setCache(array $options) @@ -952,7 +975,7 @@ class Response */ public function hasVary() { - return (Boolean) $this->headers->get('Vary'); + return null !== $this->headers->get('Vary'); } /** @@ -1108,7 +1131,7 @@ class Response } /** - * Is the reponse forbidden? + * Is the response forbidden? * * @return Boolean * diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/laravel/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index c27d8116..f52f0488 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -36,6 +36,11 @@ class ResponseHeaderBag extends HeaderBag */ protected $cookies = array(); + /** + * @var array + */ + protected $headerNames = array(); + /** * Constructor. * @@ -48,7 +53,7 @@ class ResponseHeaderBag extends HeaderBag parent::__construct($headers); if (!isset($this->headers['cache-control'])) { - $this->set('cache-control', ''); + $this->set('Cache-Control', ''); } } @@ -62,9 +67,21 @@ class ResponseHeaderBag extends HeaderBag $cookies .= 'Set-Cookie: '.$cookie."\r\n"; } + ksort($this->headerNames); + return parent::__toString().$cookies; } + /** + * Returns the headers, with original capitalizations. + * + * @return array An array of headers + */ + public function allPreserveCase() + { + return array_combine($this->headerNames, $this->headers); + } + /** * {@inheritdoc} * @@ -72,10 +89,12 @@ class ResponseHeaderBag extends HeaderBag */ public function replace(array $headers = array()) { + $this->headerNames = array(); + parent::replace($headers); if (!isset($this->headers['cache-control'])) { - $this->set('cache-control', ''); + $this->set('Cache-Control', ''); } } @@ -88,10 +107,14 @@ class ResponseHeaderBag extends HeaderBag { parent::set($key, $values, $replace); + $uniqueKey = strtr(strtolower($key), '_', '-'); + $this->headerNames[$uniqueKey] = $key; + // ensure the cache-control header has sensible defaults - if (in_array(strtr(strtolower($key), '_', '-'), array('cache-control', 'etag', 'last-modified', 'expires'))) { + if (in_array($uniqueKey, array('cache-control', 'etag', 'last-modified', 'expires'))) { $computed = $this->computeCacheControlValue(); $this->headers['cache-control'] = array($computed); + $this->headerNames['cache-control'] = 'Cache-Control'; $this->computedCacheControl = $this->parseCacheControl($computed); } } @@ -105,7 +128,10 @@ class ResponseHeaderBag extends HeaderBag { parent::remove($key); - if ('cache-control' === strtr(strtolower($key), '_', '-')) { + $uniqueKey = strtr(strtolower($key), '_', '-'); + unset($this->headerNames[$uniqueKey]); + + if ('cache-control' === $uniqueKey) { $this->computedCacheControl = array(); } } diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php index 2f1a4222..e9d02571 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php @@ -31,7 +31,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta /** * Constructor. * - * @param string $storageKey The key used to store flashes in the session. + * @param string $storageKey The key used to store attributes in the session. */ public function __construct($storageKey = '_sf2_attributes') { diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php index ce9308e1..5bb43bc5 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php @@ -177,10 +177,17 @@ class FlashBag implements FlashBagInterface, \IteratorAggregate, \Countable /** * Returns the number of flashes. * + * This method does not work. + * + * @deprecated in 2.2, removed in 2.3 + * @see https://github.com/symfony/symfony/issues/6408 + * * @return int The number of flashes */ public function count() { + trigger_error(sprintf('%s() is deprecated since 2.2 and will be removed in 2.3', __METHOD__), E_USER_DEPRECATED); + return count($this->flashes); } } diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Session.php b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Session.php index ee987c67..b0b3ff3d 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Session.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Session.php @@ -259,6 +259,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function getFlashes() { + trigger_error('getFlashes() is deprecated since version 2.1 and will be removed in 2.3. Use the FlashBag instead.', E_USER_DEPRECATED); + $all = $this->getBag($this->flashName)->all(); $return = array(); @@ -282,6 +284,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function setFlashes($values) { + trigger_error('setFlashes() is deprecated since version 2.1 and will be removed in 2.3. Use the FlashBag instead.', E_USER_DEPRECATED); + foreach ($values as $name => $value) { $this->getBag($this->flashName)->set($name, $value); } @@ -297,6 +301,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function getFlash($name, $default = null) { + trigger_error('getFlash() is deprecated since version 2.1 and will be removed in 2.3. Use the FlashBag instead.', E_USER_DEPRECATED); + $return = $this->getBag($this->flashName)->get($name); return empty($return) ? $default : reset($return); @@ -310,6 +316,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function setFlash($name, $value) { + trigger_error('setFlash() is deprecated since version 2.1 and will be removed in 2.3. Use the FlashBag instead.', E_USER_DEPRECATED); + $this->getBag($this->flashName)->set($name, $value); } @@ -322,6 +330,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function hasFlash($name) { + trigger_error('hasFlash() is deprecated since version 2.1 and will be removed in 2.3. Use the FlashBag instead.', E_USER_DEPRECATED); + return $this->getBag($this->flashName)->has($name); } @@ -332,6 +342,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function removeFlash($name) { + trigger_error('removeFlash() is deprecated since version 2.1 and will be removed in 2.3. Use the FlashBag instead.', E_USER_DEPRECATED); + $this->getBag($this->flashName)->get($name); } @@ -342,6 +354,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function clearFlashes() { + trigger_error('clearFlashes() is deprecated since version 2.1 and will be removed in 2.3. Use the FlashBag instead.', E_USER_DEPRECATED); + return $this->getBag($this->flashName)->clear(); } } diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php index 93a57296..69ebae95 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php @@ -36,6 +36,13 @@ class MongoDbSessionHandler implements \SessionHandlerInterface /** * Constructor. * + * List of available options: + * * database: The name of the database [required] + * * collection: The name of the collection [required] + * * id_field: The field name for storing the session id [default: _id] + * * data_field: The field name for storing the session data [default: data] + * * time_field: The field name for storing the timestamp [default: time] + * * @param \Mongo|\MongoClient $mongo A MongoClient or Mongo instance * @param array $options An associative array of field options * @@ -55,9 +62,9 @@ class MongoDbSessionHandler implements \SessionHandlerInterface $this->mongo = $mongo; $this->options = array_merge(array( - 'id_field' => 'sess_id', - 'data_field' => 'sess_data', - 'time_field' => 'sess_time', + 'id_field' => '_id', + 'data_field' => 'data', + 'time_field' => 'time', ), $options); } @@ -82,10 +89,9 @@ class MongoDbSessionHandler implements \SessionHandlerInterface */ public function destroy($sessionId) { - $this->getCollection()->remove( - array($this->options['id_field'] => $sessionId), - array('justOne' => true) - ); + $this->getCollection()->remove(array( + $this->options['id_field'] => $sessionId + )); return true; } @@ -95,11 +101,21 @@ class MongoDbSessionHandler implements \SessionHandlerInterface */ public function gc($lifetime) { - $time = new \MongoTimestamp(time() - $lifetime); + /* Note: MongoDB 2.2+ supports TTL collections, which may be used in + * place of this method by indexing the "time_field" field with an + * "expireAfterSeconds" option. Regardless of whether TTL collections + * are used, consider indexing this field to make the remove query more + * efficient. + * + * See: http://docs.mongodb.org/manual/tutorial/expire-data/ + */ + $time = new \MongoDate(time() - $lifetime); $this->getCollection()->remove(array( $this->options['time_field'] => array('$lt' => $time), )); + + return true; } /** @@ -107,16 +123,13 @@ class MongoDbSessionHandler implements \SessionHandlerInterface */ public function write($sessionId, $data) { - $data = array( - $this->options['id_field'] => $sessionId, - $this->options['data_field'] => new \MongoBinData($data, \MongoBinData::BYTE_ARRAY), - $this->options['time_field'] => new \MongoTimestamp() - ); - $this->getCollection()->update( array($this->options['id_field'] => $sessionId), - array('$set' => $data), - array('upsert' => true) + array('$set' => array( + $this->options['data_field'] => new \MongoBinData($data, \MongoBinData::BYTE_ARRAY), + $this->options['time_field'] => new \MongoDate(), + )), + array('upsert' => true, 'multiple' => false) ); return true; diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index 2dc85648..4b9be5e9 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -27,17 +27,17 @@ class NativeSessionStorage implements SessionStorageInterface /** * Array of SessionBagInterface * - * @var array + * @var SessionBagInterface[] */ protected $bags; /** - * @var boolean + * @var Boolean */ protected $started = false; /** - * @var boolean + * @var Boolean */ protected $closed = false; @@ -332,9 +332,9 @@ class NativeSessionStorage implements SessionStorageInterface * Registers save handler as a PHP session handler. * * To use internal PHP session save handlers, override this method using ini_set with - * session.save_handlers and session.save_path e.g. + * session.save_handler and session.save_path e.g. * - * ini_set('session.save_handlers', 'files'); + * ini_set('session.save_handler', 'files'); * ini_set('session.save_path', /tmp'); * * @see http://php.net/session-set-save-handler diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php index 0d4cb8b6..1f68f249 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php @@ -99,6 +99,8 @@ abstract class AbstractProxy * Sets the session ID. * * @param string $id + * + * @throws \LogicException */ public function setId($id) { @@ -123,6 +125,8 @@ abstract class AbstractProxy * Sets the session name. * * @param string $name + * + * @throws \LogicException */ public function setName($name) { diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/StreamedResponse.php b/laravel/vendor/Symfony/Component/HttpFoundation/StreamedResponse.php index 53bdbe64..ae579bea 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/StreamedResponse.php +++ b/laravel/vendor/Symfony/Component/HttpFoundation/StreamedResponse.php @@ -62,6 +62,8 @@ class StreamedResponse extends Response * Sets the PHP callback associated with this Response. * * @param mixed $callback A valid PHP callback + * + * @throws \LogicException */ public function setCallback($callback) { diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/composer.json b/laravel/vendor/Symfony/Component/HttpFoundation/composer.json index e9f54948..09b87253 100755 --- a/laravel/vendor/Symfony/Component/HttpFoundation/composer.json +++ b/laravel/vendor/Symfony/Component/HttpFoundation/composer.json @@ -19,11 +19,14 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { - "Symfony\\Component\\HttpFoundation": "", - "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" - } + "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" }, + "classmap": [ "Symfony/Component/HttpFoundation/Resources/stubs" ] }, "target-dir": "Symfony/Component/HttpFoundation", - "minimum-stability": "dev" + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + } } diff --git a/laravel/vendor/Symfony/Component/HttpFoundation/phpunit.xml.dist b/laravel/vendor/Symfony/Component/HttpFoundation/phpunit.xml.dist new file mode 100644 index 00000000..df11f72c --- /dev/null +++ b/laravel/vendor/Symfony/Component/HttpFoundation/phpunit.xml.dist @@ -0,0 +1,30 @@ + + + + + + ./Tests/ + + + + + + ./ + + ./Resources + ./Tests + ./vendor + + + + diff --git a/paths.php b/paths.php index 37c5b1ed..b2193bb7 100644 --- a/paths.php +++ b/paths.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.2.13 + * @version 3.2.14 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 5da356f2..ab225617 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.2.13 + * @version 3.2.14 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index d3333c94..f073bf19 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -1,5 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Ubuntu); -@import url(http://fonts.googleapis.com/css?family=Droid+Sans); +@import url(http://fonts.googleapis.com/css?family=Ubuntu|Droid+Sans); article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; } audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }