From 584eaf70bb2faf9bb6a96d78e3ad090c4ae428aa Mon Sep 17 00:00:00 2001 From: Sayak Banerjee Date: Sun, 19 Jan 2014 17:09:34 -0600 Subject: [PATCH] Update dependencies --- bootstrap/compiled.php | 267 +++++++++++++----- composer.lock | 60 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 6 +- vendor/composer/installed.json | 212 +++++++------- vendor/d11wtq/boris/README.md | 35 ++- vendor/d11wtq/boris/lib/Boris/Boris.php | 2 +- .../boris/lib/Boris/ColoredInspector.php | 7 +- .../d11wtq/boris/lib/Boris/DumpInspector.php | 2 +- vendor/d11wtq/boris/lib/Boris/EvalWorker.php | 2 +- .../boris/lib/Boris/ExportInspector.php | 2 +- .../framework/src/Illuminate/Auth/Guard.php | 21 +- .../src/Illuminate/Auth/composer.json | 18 +- .../Illuminate/Cache/CacheServiceProvider.php | 9 +- .../Illuminate/Cache/MemcachedConnector.php | 4 +- .../src/Illuminate/Cache/Repository.php | 5 +- .../Config/EnvironmentVariables.php | 43 +++ .../EnvironmentVariablesLoaderInterface.php | 13 + .../Config/FileEnvironmentVariablesLoader.php | 71 +++++ .../src/Illuminate/Config/composer.json | 4 +- .../src/Illuminate/Container/Container.php | 2 +- .../src/Illuminate/Cookie/CookieJar.php | 11 + .../src/Illuminate/Cookie/composer.json | 6 +- .../src/Illuminate/Database/Connection.php | 2 + .../Database/Connectors/ConnectionFactory.php | 5 + .../Illuminate/Database/DatabaseManager.php | 4 +- .../Illuminate/Database/Eloquent/Builder.php | 4 +- .../Database/Eloquent/Collection.php | 2 +- .../Database/Eloquent/Relations/BelongsTo.php | 20 ++ .../src/Illuminate/Database/Query/Builder.php | 2 +- .../src/Illuminate/Database/composer.json | 16 +- .../src/Illuminate/Encryption/composer.json | 2 +- .../src/Illuminate/Events/Dispatcher.php | 17 +- .../src/Illuminate/Events/composer.json | 4 +- .../src/Illuminate/Exception/composer.json | 6 +- .../src/Illuminate/Filesystem/Filesystem.php | 11 - .../src/Illuminate/Foundation/Application.php | 94 ++++-- .../Foundation/Console/Optimize/config.php | 3 + .../Foundation/Console/TailCommand.php | 10 +- .../Foundation/ProviderRepository.php | 41 ++- .../src/Illuminate/Foundation/changes.json | 8 +- .../src/Illuminate/Foundation/start.php | 15 + .../src/Illuminate/Hashing/composer.json | 2 +- .../src/Illuminate/Html/composer.json | 6 +- .../framework/src/Illuminate/Http/Request.php | 47 ++- .../src/Illuminate/Http/composer.json | 4 +- .../src/Illuminate/Log/composer.json | 4 +- .../src/Illuminate/Mail/composer.json | 10 +- .../src/Illuminate/Pagination/composer.json | 6 +- .../src/Illuminate/Redis/composer.json | 2 +- .../src/Illuminate/Remote/RemoteManager.php | 4 + .../src/Illuminate/Remote/SecLibGateway.php | 19 +- .../src/Illuminate/Remote/composer.json | 4 +- .../Routing/Matching/SchemeValidator.php | 11 +- .../Routing/Matching/UriValidator.php | 2 +- .../src/Illuminate/Routing/Route.php | 79 ++++-- .../src/Illuminate/Routing/UrlGenerator.php | 71 +++-- .../src/Illuminate/Routing/composer.json | 12 +- .../src/Illuminate/Session/Middleware.php | 32 ++- .../src/Illuminate/Support/Facades/Cookie.php | 11 + .../Illuminate/Support/ServiceProvider.php | 10 + .../src/Illuminate/Support/helpers.php | 16 ++ .../src/Illuminate/Translation/composer.json | 4 +- .../src/Illuminate/Validation/Validator.php | 2 +- .../src/Illuminate/Validation/composer.json | 6 +- .../src/Illuminate/View/composer.json | 8 +- .../src/Illuminate/Workbench/composer.json | 6 +- .../Illuminate/Workbench/stubs/composer.json | 2 +- .../Workbench/stubs/plain.composer.json | 4 +- vendor/monolog/monolog/composer.json | 2 +- .../src/Monolog/Formatter/ScalarFormatter.php | 2 - vendor/monolog/monolog/src/Monolog/Logger.php | 2 +- vendor/phpseclib/phpseclib/composer.json | 2 +- .../phpseclib/phpseclib/Crypt/RC4.php | 4 +- .../phpseclib/phpseclib/File/ANSI.php | 6 +- .../phpseclib/phpseclib/File/X509.php | 8 +- .../phpseclib/phpseclib/phpseclib/Net/SCP.php | 6 +- .../phpseclib/phpseclib/Net/SFTP/Stream.php | 6 +- .../phpseclib/phpseclib/phpseclib/openssl.cnf | 2 +- .../phpseclib/tests/Crypt/RSA/LoadKeyTest.php | 2 +- .../tests/Math/BigInteger/TestCase.php | 2 +- .../phpseclib/tests/Net/SSH2Test.php | 4 +- vendor/predis/predis/CHANGELOG.md | 2 +- vendor/predis/predis/VERSION | 2 +- vendor/predis/predis/lib/Predis/Client.php | 2 +- vendor/predis/predis/package.ini | 2 +- vendor/psr/log/Psr/Log/LoggerAwareTrait.php | 2 +- vendor/psr/log/Psr/Log/LoggerTrait.php | 4 +- vendor/stack/builder/.travis.yml | 8 +- 89 files changed, 1053 insertions(+), 471 deletions(-) create mode 100755 vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariables.php create mode 100755 vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariablesLoaderInterface.php create mode 100755 vendor/laravel/framework/src/Illuminate/Config/FileEnvironmentVariablesLoader.php diff --git a/bootstrap/compiled.php b/bootstrap/compiled.php index 243af6475..7050be812 100755 --- a/bootstrap/compiled.php +++ b/bootstrap/compiled.php @@ -291,7 +291,7 @@ protected function fireResolvingCallbacks($abstract, $object) protected function fireCallbackArray($object, array $callbacks) { foreach ($callbacks as $callback) { - call_user_func($callback, $object); + call_user_func($callback, $object, $this); } } public function isShared($abstract) @@ -388,6 +388,7 @@ public function readyForResponses(); use Illuminate\Events\EventServiceProvider; use Illuminate\Routing\RoutingServiceProvider; use Illuminate\Exception\ExceptionServiceProvider; +use Illuminate\Config\FileEnvironmentVariablesLoader; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\TerminableInterface; use Symfony\Component\HttpKernel\Exception\HttpException; @@ -398,7 +399,7 @@ public function readyForResponses(); use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class Application extends Container implements HttpKernelInterface, TerminableInterface, ResponsePreparerInterface { - const VERSION = '4.1.16'; + const VERSION = '4.1.18'; protected $booted = false; protected $bootingCallbacks = array(); protected $bootedCallbacks = array(); @@ -426,7 +427,7 @@ protected function registerBaseBindings($request) } protected function registerBaseServiceProviders() { - foreach (array('Exception', 'Routing', 'Event') as $name) { + foreach (array('Event', 'Exception', 'Routing') as $name) { $this->{"register{$name}Provider"}(); } } @@ -520,8 +521,9 @@ public function resolveProviderClass($provider) } protected function markAsRegistered($provider) { + $this['events']->fire($class = get_class($provider), array($provider)); $this->serviceProviders[] = $provider; - $this->loadedProviders[get_class($provider)] = true; + $this->loadedProviders[$class] = true; } public function loadDeferredProviders() { @@ -551,6 +553,7 @@ public function registerDeferredProvider($provider, $service = null) } public function make($abstract, $parameters = array()) { + $abstract = $this->getAlias($abstract); if (isset($this->deferredServices[$abstract])) { $this->loadDeferredProvider($abstract); } @@ -576,6 +579,12 @@ public function shutdown($callback = null) $this->shutdownCallbacks[] = $callback; } } + public function useArraySessions(Closure $callback) + { + $this->bind('session.reject', function () use($callback) { + return $callback; + }); + } public function isBooted() { return $this->booted; @@ -616,7 +625,8 @@ public function run(SymfonyRequest $request = null) } protected function getStackedClient() { - $client = with(new \Stack\Builder())->push('Illuminate\\Cookie\\Guard', $this['encrypter'])->push('Illuminate\\Cookie\\Queue', $this['cookie'])->push('Illuminate\\Session\\Middleware', $this['session']); + $sessionReject = $this->bound('session.reject') ? $this['session.reject'] : null; + $client = with(new \Stack\Builder())->push('Illuminate\\Cookie\\Guard', $this['encrypter'])->push('Illuminate\\Cookie\\Queue', $this['cookie'])->push('Illuminate\\Session\\Middleware', $this['session'], $sessionReject); $this->mergeCustomMiddlewares($client); return $client->resolve($this); } @@ -690,8 +700,8 @@ protected function fireAppCallbacks(array $callbacks) } public function prepareRequest(Request $request) { - if (!is_null($this['config']['session.driver'])) { - $request->setSessionStore($this['session.store']); + if (!is_null($this['config']['session.driver']) && !$request->hasSession()) { + $request->setSession($this['session']->driver()); } return $request; } @@ -746,21 +756,15 @@ public function getConfigLoader() { return new FileLoader(new Filesystem(), $this['path'] . '/config'); } + public function getEnvironmentVariablesLoader() + { + return new FileEnvironmentVariablesLoader(new Filesystem(), $this['path.base']); + } public function getProviderRepository() { $manifest = $this['config']['app.manifest']; return new ProviderRepository(new Filesystem(), $manifest); } - public function getLocale() - { - return $this['config']->get('app.locale'); - } - public function setLocale($locale) - { - $this['config']->set('app.locale', $locale); - $this['translator']->setLocale($locale); - $this['events']->fire('locale.changed', array($locale)); - } public function getLoadedProviders() { return $this->loadedProviders; @@ -786,9 +790,19 @@ public static function onRequest($method, $parameters = array()) { return forward_static_call_array(array(static::requestClass(), $method), $parameters); } + public function getLocale() + { + return $this['config']->get('app.locale'); + } + public function setLocale($locale) + { + $this['config']->set('app.locale', $locale); + $this['translator']->setLocale($locale); + $this['events']->fire('locale.changed', array($locale)); + } public function registerCoreContainerAliases() { - $aliases = array('app' => 'Illuminate\\Foundation\\Application', 'artisan' => 'Illuminate\\Console\\Application', 'auth' => 'Illuminate\\Auth\\AuthManager', 'blade.compiler' => 'Illuminate\\View\\Compilers\\BladeCompiler', 'cache' => 'Illuminate\\Cache\\Repository', 'config' => 'Illuminate\\Config\\Repository', 'cookie' => 'Illuminate\\Cookie\\CookieJar', 'encrypter' => 'Illuminate\\Encryption\\Encrypter', 'db' => 'Illuminate\\Database\\DatabaseManager', 'events' => 'Illuminate\\Events\\Dispatacher', 'files' => 'Illuminate\\Filesystem\\Filesystem', 'form' => 'Illuminate\\Html\\FormBuilder', 'hash' => 'Illuminate\\Hashing\\HasherInterface', 'html' => 'Illuminate\\Html\\HtmlBuilder', 'translator' => 'Illuminate\\Translation\\Translator', 'log' => 'Illuminate\\Log\\Writer', 'mailer' => 'Illuminate\\Mail\\Mailer', 'paginator' => 'Illuminate\\Pagination\\Environment', 'auth.reminder' => 'Illuminate\\Auth\\Reminders\\PasswordBroker', 'queue' => 'Illuminate\\Queue\\QueueManager', 'redirect' => 'Illuminate\\Routing\\Redirector', 'redis' => 'Illuminate\\Redis\\Database', 'request' => 'Illuminate\\Http\\Request', 'router' => 'Illuminate\\Routing\\Router', 'session' => 'Illuminate\\Session\\SessionManager', 'session.store' => 'Illuminate\\Session\\Store', 'remote' => 'Illuminate\\Remote\\RemoteManager', 'url' => 'Illuminate\\Routing\\UrlGenerator', 'validator' => 'Illuminate\\Validation\\Factory', 'view' => 'Illuminate\\View\\Environment'); + $aliases = array('app' => 'Illuminate\\Foundation\\Application', 'artisan' => 'Illuminate\\Console\\Application', 'auth' => 'Illuminate\\Auth\\AuthManager', 'blade.compiler' => 'Illuminate\\View\\Compilers\\BladeCompiler', 'cache' => 'Illuminate\\Cache\\CacheManager', 'cache.store' => 'Illuminate\\Cache\\Repository', 'config' => 'Illuminate\\Config\\Repository', 'cookie' => 'Illuminate\\Cookie\\CookieJar', 'encrypter' => 'Illuminate\\Encryption\\Encrypter', 'db' => 'Illuminate\\Database\\DatabaseManager', 'events' => 'Illuminate\\Events\\Dispatacher', 'files' => 'Illuminate\\Filesystem\\Filesystem', 'form' => 'Illuminate\\Html\\FormBuilder', 'hash' => 'Illuminate\\Hashing\\HasherInterface', 'html' => 'Illuminate\\Html\\HtmlBuilder', 'translator' => 'Illuminate\\Translation\\Translator', 'log' => 'Illuminate\\Log\\Writer', 'mailer' => 'Illuminate\\Mail\\Mailer', 'paginator' => 'Illuminate\\Pagination\\Environment', 'auth.reminder' => 'Illuminate\\Auth\\Reminders\\PasswordBroker', 'queue' => 'Illuminate\\Queue\\QueueManager', 'redirect' => 'Illuminate\\Routing\\Redirector', 'redis' => 'Illuminate\\Redis\\Database', 'request' => 'Illuminate\\Http\\Request', 'router' => 'Illuminate\\Routing\\Router', 'session' => 'Illuminate\\Session\\SessionManager', 'session.store' => 'Illuminate\\Session\\Store', 'remote' => 'Illuminate\\Remote\\RemoteManager', 'url' => 'Illuminate\\Routing\\UrlGenerator', 'validator' => 'Illuminate\\Validation\\Factory', 'view' => 'Illuminate\\View\\Environment'); foreach ($aliases as $key => $alias) { $this->alias($key, $alias); } @@ -879,6 +893,10 @@ public function path() $pattern = trim($this->getPathInfo(), '/'); return $pattern == '' ? '/' : $pattern; } + public function decodedPath() + { + return rawurldecode($this->path()); + } public function segment($index, $default = null) { $segments = explode('/', trim($this->getPathInfo(), '/')); @@ -980,12 +998,12 @@ public function server($key = null, $default = null) } public function old($key = null, $default = null) { - return $this->getSessionStore()->getOldInput($key, $default); + return $this->session()->getOldInput($key, $default); } public function flash($filter = null, $keys = array()) { $flash = !is_null($filter) ? $this->{$filter}($keys) : $this->input(); - $this->getSessionStore()->flashInput($flash); + $this->session()->flashInput($flash); } public function flashOnly($keys) { @@ -999,7 +1017,7 @@ public function flashExcept($keys) } public function flush() { - $this->getSessionStore()->flashInput(array()); + $this->session()->flashInput(array()); } protected function retrieveItem($source, $key, $default) { @@ -1059,20 +1077,12 @@ public static function createFromBase(SymfonyRequest $request) } return with($self = new static())->duplicate($request->query->all(), $request->request->all(), $request->attributes->all(), $request->cookies->all(), $request->files->all(), $request->server->all()); } - public function getSessionStore() + public function session() { - if (!isset($this->sessionStore)) { + if (!$this->hasSession()) { throw new \RuntimeException('Session store not set on request.'); } - return $this->sessionStore; - } - public function setSessionStore(SessionStore $session) - { - $this->sessionStore = $session; - } - public function hasSessionStore() - { - return isset($this->sessionStore); + return $this->getSession(); } } namespace Illuminate\Http; @@ -2866,6 +2876,10 @@ public function provides() { return array(); } + public function when() + { + return array(); + } public function isDeferred() { return $this->defer; @@ -3684,6 +3698,61 @@ public function addNamespace($namespace, $hint); public function getNamespaces(); public function cascadePackage($environment, $package, $group, $items); } +namespace Illuminate\Config; + +interface EnvironmentVariablesLoaderInterface +{ + public function load($environment = null); +} +namespace Illuminate\Config; + +use Illuminate\Filesystem\Filesystem; +class FileEnvironmentVariablesLoader implements EnvironmentVariablesLoaderInterface +{ + protected $files; + protected $path; + public function __construct(Filesystem $files, $path = null) + { + $this->files = $files; + $this->path = $path ?: base_path(); + } + public function load($environment = null) + { + if ($environment == 'production') { + $environment = null; + } + if (!$this->files->exists($path = $this->getFile($environment))) { + return array(); + } else { + return $this->files->getRequire($path); + } + } + protected function getFile($environment) + { + if ($environment) { + return $this->path . '/.env.' . $environment . '.php'; + } else { + return $this->path . '/.env.php'; + } + } +} +namespace Illuminate\Config; + +class EnvironmentVariables +{ + protected $loader; + public function __construct(EnvironmentVariablesLoaderInterface $loader) + { + $this->loader = $loader; + } + public function load($environment = null) + { + foreach ($this->loader->load($environment) as $key => $value) { + $_ENV[$key] = $value; + $_SERVER[$key] = $value; + } + } +} namespace Illuminate\Filesystem; use FilesystemIterator; @@ -3705,10 +3774,6 @@ public function get($path) } throw new FileNotFoundException("File does not exist at path {$path}"); } - public function getRemote($path) - { - return file_get_contents($path); - } public function getRequire($path) { if ($this->isFile($path)) { @@ -3934,6 +3999,7 @@ class ProviderRepository { protected $files; protected $manifestPath; + protected $default = array('when' => array()); public function __construct(Filesystem $files, $manifestPath) { $this->files = $files; @@ -3948,11 +4014,23 @@ public function load(Application $app, array $providers) if ($app->runningInConsole()) { $manifest['eager'] = $manifest['providers']; } + foreach ($manifest['when'] as $provider => $events) { + $this->registerLoadEvents($app, $provider, $events); + } foreach ($manifest['eager'] as $provider) { $app->register($this->createProvider($app, $provider)); } $app->setDeferredServices($manifest['deferred']); } + protected function registerLoadEvents(Application $app, $provider, array $events) + { + if (count($events) < 1) { + return; + } + $app->make('events')->listen($events, function () use($app, $provider) { + $app->register($provider); + }); + } protected function compileManifest(Application $app, $providers) { $manifest = $this->freshManifest($providers); @@ -3962,6 +4040,7 @@ protected function compileManifest(Application $app, $providers) foreach ($instance->provides() as $service) { $manifest['deferred'][$service] = $provider; } + $manifest['when'][$provider] = $instance->when(); } else { $manifest['eager'][] = $provider; } @@ -3980,7 +4059,8 @@ public function loadManifest() { $path = $this->manifestPath . '/services.json'; if ($this->files->exists($path)) { - return json_decode($this->files->get($path), true); + $manifest = json_decode($this->files->get($path), true); + return array_merge($this->default, $manifest); } } public function writeManifest($manifest) @@ -4916,15 +4996,23 @@ public function bind(Request $request) } public function bindParameters(Request $request) { - preg_match($this->compiled->getRegex(), '/' . $request->path(), $matches); - $parameters = $this->combineMatchesWithKeys(array_slice($matches, 1)); + $params = $this->matchToKeys(array_slice($this->bindPathParameters($request), 1)); if (!is_null($this->compiled->getHostRegex())) { - preg_match($this->compiled->getHostRegex(), $request->getHost(), $matches); - $parameters = array_merge($this->combineMatchesWithKeys(array_slice($matches, 1)), $parameters); + $params = $this->bindHostParameters($request, $params); } - return $this->parameters = $this->replaceDefaults($parameters); + return $this->parameters = $this->replaceDefaults($params); + } + protected function bindPathParameters(Request $request) + { + preg_match($this->compiled->getRegex(), '/' . $request->decodedPath(), $matches); + return $matches; } - protected function combineMatchesWithKeys(array $matches) + protected function bindHostParameters(Request $request, $parameters) + { + preg_match($this->compiled->getHostRegex(), $request->getHost(), $matches); + return array_merge($this->matchToKeys(array_slice($matches, 1)), $parameters); + } + protected function matchToKeys(array $matches) { if (count($this->parameterNames()) == 0) { return array(); @@ -4934,10 +5022,6 @@ protected function combineMatchesWithKeys(array $matches) return is_string($value) && strlen($value) > 0; }); } - protected function padMatches(array $matches) - { - return array_pad($matches, count($this->parameterNames()), null); - } protected function replaceDefaults(array $parameters) { foreach ($parameters as $key => &$value) { @@ -5028,6 +5112,14 @@ public function methods() { return $this->methods; } + public function httpOnly() + { + return in_array('http', $this->action); + } + public function httpsOnly() + { + return $this->secure(); + } public function secure() { return in_array('https', $this->action); @@ -5300,7 +5392,7 @@ public function to($path, $extra = array(), $secure = null) return $path; } $scheme = $this->getScheme($secure); - $tail = implode('/', (array) $extra); + $tail = implode('/', array_map('rawurlencode', (array) $extra)); $root = $this->getRootUrl($scheme); return $this->trimUrl($root, $path, $tail); } @@ -5327,7 +5419,7 @@ public function secureAsset($path) } protected function getScheme($secure) { - if (!$secure) { + if (is_null($secure)) { return $this->request->getScheme() . '://'; } else { return $secure ? 'https://' : 'http://'; @@ -5355,19 +5447,16 @@ protected function replaceRoot($route, $domain, &$parameters) } protected function replaceRouteParameters($path, array &$parameters) { - foreach ($parameters as $key => $value) { - $path = $this->replaceRouteParameter($path, $key, $value, $parameters); + if (count($parameters)) { + $path = preg_replace_sub('/\\{.*?\\}/', $parameters, $this->replaceNamedParameters($path, $parameters)); } return trim(preg_replace('/\\{.*?\\?\\}/', '', $path), '/'); } - protected function replaceRouteParameter($path, $key, $value, array &$parameters) + protected function replaceNamedParameters($path, &$parameters) { - $pattern = is_string($key) ? '/\\{' . $key . '[\\?]?\\}/' : '/\\{.*?\\}/'; - $path = preg_replace($pattern, $value, $path, 1, $count); - if ($count > 0) { - unset($parameters[$key]); - } - return $path; + return preg_replace_callback('/\\{(.*?)\\??\\}/', function ($m) use(&$parameters) { + return isset($parameters[$m[1]]) ? array_pull($parameters, $m[1]) : $m[0]; + }, $path); } protected function getRouteQueryString(array $parameters) { @@ -5402,7 +5491,7 @@ protected function formatDomain($route, &$parameters) } protected function getDomainAndScheme($route) { - return $this->getScheme($route->secure()) . $route->domain(); + return $this->getRouteScheme($route) . $route->domain(); } protected function addPortToDomain($domain) { @@ -5414,7 +5503,17 @@ protected function addPortToDomain($domain) } protected function getRouteRoot($route, $domain) { - return $this->getRootUrl($this->getScheme($route->secure()), $domain); + return $this->getRootUrl($this->getRouteScheme($route), $domain); + } + protected function getRouteScheme($route) + { + if ($route->httpOnly()) { + return $this->getScheme(false); + } elseif ($route->httpsOnly()) { + return $this->getScheme(true); + } else { + return $this->getScheme(null); + } } public function action($action, $parameters = array(), $absolute = true) { @@ -5487,7 +5586,12 @@ class SchemeValidator implements ValidatorInterface { public function matches(Route $route, Request $request) { - return $route->secure() ? $request->secure() : true; + if ($route->httpOnly()) { + return !$request->secure(); + } elseif ($route->secure()) { + return $request->secure(); + } + return true; } } namespace Illuminate\Routing\Matching; @@ -5499,7 +5603,7 @@ class UriValidator implements ValidatorInterface public function matches(Route $route, Request $request) { $path = $request->path() == '/' ? '/' : '/' . $request->path(); - return preg_match($route->getCompiled()->getRegex(), $path); + return preg_match($route->getCompiled()->getRegex(), rawurldecode($path)); } } namespace Illuminate\Workbench; @@ -5538,13 +5642,15 @@ public function __construct(Container $container = null) { $this->container = $container ?: new Container(); } - public function listen($event, $listener, $priority = 0) + public function listen($events, $listener, $priority = 0) { - if (str_contains($event, '*')) { - return $this->setupWildcardListen($event, $listener); + foreach ((array) $events as $event) { + if (str_contains($event, '*')) { + return $this->setupWildcardListen($event, $listener); + } + $this->listeners[$event][$priority][] = $this->makeListener($listener); + unset($this->sorted[$event]); } - $this->listeners[$event][$priority][] = $this->makeListener($listener); - unset($this->sorted[$event]); } protected function setupWildcardListen($event, $listener) { @@ -6796,11 +6902,11 @@ protected function makeConnection($name) { $config = $this->getConfig($name); if (isset($this->extensions[$name])) { - return call_user_func($this->extensions[$name], $config); + return call_user_func($this->extensions[$name], $config, $name); } $driver = $config['driver']; if (isset($this->extensions[$driver])) { - return call_user_func($this->extensions[$driver], $config); + return call_user_func($this->extensions[$driver], $config, $name); } return $this->factory->make($config, $name); } @@ -6927,6 +7033,9 @@ public function createConnector(array $config) if (!isset($config['driver'])) { throw new \InvalidArgumentException('A driver must be specified.'); } + if ($this->container->bound($key = "db.connector.{$config['driver']}")) { + return $this->container->make($key); + } switch ($config['driver']) { case 'mysql': return new MySqlConnector(); @@ -6959,6 +7068,7 @@ protected function createConnection($driver, PDO $connection, $database, $prefix } namespace Illuminate\Session; +use Closure; use Carbon\Carbon; use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\Request; @@ -6968,15 +7078,19 @@ class Middleware implements HttpKernelInterface { protected $app; protected $manager; - public function __construct(HttpKernelInterface $app, SessionManager $manager) + protected $reject; + public function __construct(HttpKernelInterface $app, SessionManager $manager, Closure $reject = null) { $this->app = $app; + $this->reject = $reject; $this->manager = $manager; } public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true) { + $this->checkRequestForArraySessions($request); if ($this->sessionConfigured()) { $session = $this->startSession($request); + $request->setSession($session); } $response = $this->app->handle($request, $type, $catch); if ($this->sessionConfigured()) { @@ -6985,6 +7099,15 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ } return $response; } + public function checkRequestForArraySessions(Request $request) + { + if (is_null($this->reject)) { + return; + } + if (call_user_func($this->reject, $request)) { + $this->manager->setDefaultDriver('array'); + } + } protected function startSession(Request $request) { with($session = $this->getSession($request))->setRequestOnHandler($request); @@ -7444,6 +7567,10 @@ public function forget($name) { return $this->make($name, null, -2628000); } + public function hasQueued($key) + { + return !is_null($this->queued($key)); + } public function queued($key, $default = null) { return array_get($this->queued, $key, $default); diff --git a/composer.lock b/composer.lock index b482ec5c2..5ca8a0c8f 100755 --- a/composer.lock +++ b/composer.lock @@ -54,16 +54,16 @@ }, { "name": "d11wtq/boris", - "version": "v1.0.6", + "version": "v1.0.8", "source": { "type": "git", "url": "https://github.com/d11wtq/boris.git", - "reference": "7db59be30dad2e6f902db348e21a939215fbd967" + "reference": "125dd4e5752639af7678a22ea597115646d89c6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/d11wtq/boris/zipball/7db59be30dad2e6f902db348e21a939215fbd967", - "reference": "7db59be30dad2e6f902db348e21a939215fbd967", + "url": "https://api.github.com/repos/d11wtq/boris/zipball/125dd4e5752639af7678a22ea597115646d89c6e", + "reference": "125dd4e5752639af7678a22ea597115646d89c6e", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ } }, "notification-url": "https://packagist.org/downloads/", - "time": "2013-11-18 12:13:16" + "time": "2014-01-17 12:21:18" }, { "name": "filp/whoops", @@ -230,12 +230,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6e246f3468faef37c9073188728e7a942b93a638" + "reference": "34e901dc67ea34da1113e9b9974af8ddf441fd7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6e246f3468faef37c9073188728e7a942b93a638", - "reference": "6e246f3468faef37c9073188728e7a942b93a638", + "url": "https://api.github.com/repos/laravel/framework/zipball/34e901dc67ea34da1113e9b9974af8ddf441fd7f", + "reference": "34e901dc67ea34da1113e9b9974af8ddf441fd7f", "shasum": "" }, "require": { @@ -339,7 +339,7 @@ "framework", "laravel" ], - "time": "2014-01-14 06:12:57" + "time": "2014-01-19 20:18:45" }, { "name": "monolog/monolog", @@ -347,12 +347,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "d81ca5a8d2d97bf9d77605359a12399c0ca28653" + "reference": "7f783c0ab09dc341f858882e2d2ce6fc36ca1351" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d81ca5a8d2d97bf9d77605359a12399c0ca28653", - "reference": "d81ca5a8d2d97bf9d77605359a12399c0ca28653", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/7f783c0ab09dc341f858882e2d2ce6fc36ca1351", + "reference": "7f783c0ab09dc341f858882e2d2ce6fc36ca1351", "shasum": "" }, "require": { @@ -364,7 +364,7 @@ "doctrine/couchdb": "dev-master", "mlehner/gelf-php": "1.0.*", "phpunit/phpunit": "~3.7.0", - "raven/raven": "0.5.*", + "raven/raven": "~0.5", "ruflin/elastica": "0.90.*" }, "suggest": { @@ -406,7 +406,7 @@ "logging", "psr-3" ], - "time": "2014-01-10 08:22:47" + "time": "2014-01-17 14:16:06" }, { "name": "nesbot/carbon", @@ -556,12 +556,12 @@ "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "268ec2e5d18110235f3677a15abae39303191b2f" + "reference": "211e237090842f0bc1813b639633e05267fb0444" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/268ec2e5d18110235f3677a15abae39303191b2f", - "reference": "268ec2e5d18110235f3677a15abae39303191b2f", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211e237090842f0bc1813b639633e05267fb0444", + "reference": "211e237090842f0bc1813b639633e05267fb0444", "shasum": "" }, "require": { @@ -642,7 +642,7 @@ "x.509", "x509" ], - "time": "2013-12-28 19:49:05" + "time": "2014-01-18 17:51:33" }, { "name": "predis/predis", @@ -650,12 +650,12 @@ "source": { "type": "git", "url": "https://github.com/nrk/predis.git", - "reference": "0f01b89d44368633e05da72db434df3cb078f08c" + "reference": "5f2eea628eb465d866ad2771927d83769c8f956c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/0f01b89d44368633e05da72db434df3cb078f08c", - "reference": "0f01b89d44368633e05da72db434df3cb078f08c", + "url": "https://api.github.com/repos/nrk/predis/zipball/5f2eea628eb465d866ad2771927d83769c8f956c", + "reference": "5f2eea628eb465d866ad2771927d83769c8f956c", "shasum": "" }, "require": { @@ -689,7 +689,7 @@ "predis", "redis" ], - "time": "2014-01-10 16:46:58" + "time": "2014-01-16 14:10:29" }, { "name": "psr/log", @@ -697,12 +697,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "65f363ac44058796a8e1428cf41e6d92d8a75ddc" + "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/65f363ac44058796a8e1428cf41e6d92d8a75ddc", - "reference": "65f363ac44058796a8e1428cf41e6d92d8a75ddc", + "url": "https://api.github.com/repos/php-fig/log/zipball/a78d6504ff5d4367497785ab2ade91db3a9fbe11", + "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11", "shasum": "" }, "type": "library", @@ -732,7 +732,7 @@ "psr", "psr-3" ], - "time": "2013-12-25 11:17:50" + "time": "2014-01-18 15:33:09" }, { "name": "rmccue/requests", @@ -889,12 +889,12 @@ "source": { "type": "git", "url": "https://github.com/stackphp/builder.git", - "reference": "49ab90450d7f959943f3659a4bcb5965530117c2" + "reference": "f98a5eb77b212a77b67a70f74d856ae859dd74b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stackphp/builder/zipball/49ab90450d7f959943f3659a4bcb5965530117c2", - "reference": "49ab90450d7f959943f3659a4bcb5965530117c2", + "url": "https://api.github.com/repos/stackphp/builder/zipball/f98a5eb77b212a77b67a70f74d856ae859dd74b3", + "reference": "f98a5eb77b212a77b67a70f74d856ae859dd74b3", "shasum": "" }, "require": { @@ -931,7 +931,7 @@ "keywords": [ "stack" ], - "time": "2013-10-25 14:04:45" + "time": "2014-01-18 16:33:58" }, { "name": "swiftmailer/swiftmailer", diff --git a/vendor/autoload.php b/vendor/autoload.php index 6278bdb6f..9d4fc2635 100755 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit451623406cbd609c87766aaf673f4704::getLoader(); +return ComposerAutoloaderInitb8f1ff84878b2a23e8b0d2b3e29059c4::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 66275deb3..11f155846 100755 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit451623406cbd609c87766aaf673f4704 +class ComposerAutoloaderInitb8f1ff84878b2a23e8b0d2b3e29059c4 { private static $loader; @@ -19,9 +19,9 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit451623406cbd609c87766aaf673f4704', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb8f1ff84878b2a23e8b0d2b3e29059c4', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit451623406cbd609c87766aaf673f4704', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb8f1ff84878b2a23e8b0d2b3e29059c4', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f6ca922f0..b7c23cc35 100755 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -193,15 +193,15 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "65f363ac44058796a8e1428cf41e6d92d8a75ddc" + "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/65f363ac44058796a8e1428cf41e6d92d8a75ddc", - "reference": "65f363ac44058796a8e1428cf41e6d92d8a75ddc", + "url": "https://api.github.com/repos/php-fig/log/zipball/a78d6504ff5d4367497785ab2ade91db3a9fbe11", + "reference": "a78d6504ff5d4367497785ab2ade91db3a9fbe11", "shasum": "" }, - "time": "2013-12-25 11:17:50", + "time": "2014-01-18 15:33:09", "type": "library", "extra": { "branch-alias": { @@ -238,12 +238,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "d81ca5a8d2d97bf9d77605359a12399c0ca28653" + "reference": "7f783c0ab09dc341f858882e2d2ce6fc36ca1351" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d81ca5a8d2d97bf9d77605359a12399c0ca28653", - "reference": "d81ca5a8d2d97bf9d77605359a12399c0ca28653", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/7f783c0ab09dc341f858882e2d2ce6fc36ca1351", + "reference": "7f783c0ab09dc341f858882e2d2ce6fc36ca1351", "shasum": "" }, "require": { @@ -255,7 +255,7 @@ "doctrine/couchdb": "dev-master", "mlehner/gelf-php": "1.0.*", "phpunit/phpunit": "~3.7.0", - "raven/raven": "0.5.*", + "raven/raven": "~0.5", "ruflin/elastica": "0.90.*" }, "suggest": { @@ -267,7 +267,7 @@ "raven/raven": "Allow sending log messages to a Sentry server", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, - "time": "2014-01-10 08:22:47", + "time": "2014-01-17 14:16:06", "type": "library", "extra": { "branch-alias": { @@ -520,12 +520,12 @@ "source": { "type": "git", "url": "https://github.com/stackphp/builder.git", - "reference": "49ab90450d7f959943f3659a4bcb5965530117c2" + "reference": "f98a5eb77b212a77b67a70f74d856ae859dd74b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stackphp/builder/zipball/49ab90450d7f959943f3659a4bcb5965530117c2", - "reference": "49ab90450d7f959943f3659a4bcb5965530117c2", + "url": "https://api.github.com/repos/stackphp/builder/zipball/f98a5eb77b212a77b67a70f74d856ae859dd74b3", + "reference": "f98a5eb77b212a77b67a70f74d856ae859dd74b3", "shasum": "" }, "require": { @@ -536,7 +536,7 @@ "require-dev": { "silex/silex": "~1.0" }, - "time": "2013-10-25 14:04:45", + "time": "2014-01-18 16:33:58", "type": "library", "extra": { "branch-alias": { @@ -572,12 +572,12 @@ "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "268ec2e5d18110235f3677a15abae39303191b2f" + "reference": "211e237090842f0bc1813b639633e05267fb0444" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/268ec2e5d18110235f3677a15abae39303191b2f", - "reference": "268ec2e5d18110235f3677a15abae39303191b2f", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211e237090842f0bc1813b639633e05267fb0444", + "reference": "211e237090842f0bc1813b639633e05267fb0444", "shasum": "" }, "require": { @@ -591,7 +591,7 @@ "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.", "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP >= 4.3.3." }, - "time": "2013-12-28 19:49:05", + "time": "2014-01-18 17:51:33", "type": "library", "extra": { "branch-alias": { @@ -661,42 +661,6 @@ "x509" ] }, - { - "name": "d11wtq/boris", - "version": "v1.0.6", - "version_normalized": "1.0.6.0", - "source": { - "type": "git", - "url": "https://github.com/d11wtq/boris.git", - "reference": "7db59be30dad2e6f902db348e21a939215fbd967" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/d11wtq/boris/zipball/7db59be30dad2e6f902db348e21a939215fbd967", - "reference": "7db59be30dad2e6f902db348e21a939215fbd967", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "suggest": { - "ext-pcntl": "*", - "ext-posix": "*", - "ext-readline": "*" - }, - "time": "2013-11-18 12:13:16", - "bin": [ - "bin/boris" - ], - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Boris": "lib" - } - }, - "notification-url": "https://packagist.org/downloads/" - }, { "name": "filp/whoops", "version": "1.0.10", @@ -902,55 +866,6 @@ "time" ] }, - { - "name": "predis/predis", - "version": "0.8.x-dev", - "version_normalized": "0.8.9999999.9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/nrk/predis.git", - "reference": "0f01b89d44368633e05da72db434df3cb078f08c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/0f01b89d44368633e05da72db434df3cb078f08c", - "reference": "0f01b89d44368633e05da72db434df3cb078f08c", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "suggest": { - "ext-curl": "Allows access to Webdis when paired with phpiredis", - "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" - }, - "time": "2014-01-10 16:46:58", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Predis": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniele Alessandri", - "email": "suppakilla@gmail.com", - "homepage": "http://clorophilla.net" - } - ], - "description": "Flexible and feature-complete PHP client library for Redis", - "homepage": "http://github.com/nrk/predis", - "keywords": [ - "nosql", - "predis", - "redis" - ] - }, { "name": "symfony/browser-kit", "version": "2.4.x-dev", @@ -1625,6 +1540,91 @@ "description": "Symfony Console Component", "homepage": "http://symfony.com" }, + { + "name": "d11wtq/boris", + "version": "v1.0.8", + "version_normalized": "1.0.8.0", + "source": { + "type": "git", + "url": "https://github.com/d11wtq/boris.git", + "reference": "125dd4e5752639af7678a22ea597115646d89c6e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/d11wtq/boris/zipball/125dd4e5752639af7678a22ea597115646d89c6e", + "reference": "125dd4e5752639af7678a22ea597115646d89c6e", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "suggest": { + "ext-pcntl": "*", + "ext-posix": "*", + "ext-readline": "*" + }, + "time": "2014-01-17 12:21:18", + "bin": [ + "bin/boris" + ], + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Boris": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/" + }, + { + "name": "predis/predis", + "version": "0.8.x-dev", + "version_normalized": "0.8.9999999.9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/nrk/predis.git", + "reference": "5f2eea628eb465d866ad2771927d83769c8f956c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nrk/predis/zipball/5f2eea628eb465d866ad2771927d83769c8f956c", + "reference": "5f2eea628eb465d866ad2771927d83769c8f956c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "suggest": { + "ext-curl": "Allows access to Webdis when paired with phpiredis", + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + }, + "time": "2014-01-16 14:10:29", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Predis": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniele Alessandri", + "email": "suppakilla@gmail.com", + "homepage": "http://clorophilla.net" + } + ], + "description": "Flexible and feature-complete PHP client library for Redis", + "homepage": "http://github.com/nrk/predis", + "keywords": [ + "nosql", + "predis", + "redis" + ] + }, { "name": "laravel/framework", "version": "4.1.x-dev", @@ -1632,12 +1632,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6e246f3468faef37c9073188728e7a942b93a638" + "reference": "34e901dc67ea34da1113e9b9974af8ddf441fd7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6e246f3468faef37c9073188728e7a942b93a638", - "reference": "6e246f3468faef37c9073188728e7a942b93a638", + "url": "https://api.github.com/repos/laravel/framework/zipball/34e901dc67ea34da1113e9b9974af8ddf441fd7f", + "reference": "34e901dc67ea34da1113e9b9974af8ddf441fd7f", "shasum": "" }, "require": { @@ -1705,7 +1705,7 @@ "suggest": { "doctrine/dbal": "Allow renaming columns and dropping SQLite columns." }, - "time": "2014-01-14 06:12:57", + "time": "2014-01-19 20:18:45", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/d11wtq/boris/README.md b/vendor/d11wtq/boris/README.md index 2978672f8..cd5d75a48 100755 --- a/vendor/d11wtq/boris/README.md +++ b/vendor/d11wtq/boris/README.md @@ -19,15 +19,36 @@ PHP's lack of a real REPL to be frustrating and was not able to find an existing implementation that was complete. Boris weighs in at a few hundred lines of fairly straightforward code. -## Usage +## Installation + +### 1. As a pre-built phar file + +Boris is available for download as a Phar archive: + + - https://github.com/d11wtq/boris/releases/download/v1.0.8/boris.phar + +Simply download it and run it. + + curl -O https://github.com/d11wtq/boris/releases/download/v1.0.8/boris.phar + chmod +x boris.phar + ./boris.phar + +### 2. Via packagist -Boris is available via [Packagist](https://packagist.org/packages/d11wtq/boris), or you can use it directly from this repo: +For use with composer. + + - https://packagist.org/packages/d11wtq/boris + +### 3. Directly from this repo + +This is great if you want to stay really up-to-date. I don't commit unstable +code to master, ever. git clone git://github.com/d11wtq/boris.git cd boris ./bin/boris -**Pro Tip**: Add boris to your $PATH for easy access. +### 4. Build your own phar You can also build a PHAR file using [Box](http://box-project.org/): @@ -36,8 +57,14 @@ You can also build a PHAR file using [Box](http://box-project.org/): This will create a `boris.phar` file. Feel free to move it into your bin directory: + chmod +x boris.phar mv boris.phar /usr/local/bin/boris - chmod +x /usr/local/bin/boris + +### Pro Tip + +Add boris to your $PATH for easy access. + +## Usage When Boris starts, you will be at the `boris>` prompt. PHP code you enter at this prompt is evaluated. If an expression spans multiple lines, Boris will diff --git a/vendor/d11wtq/boris/lib/Boris/Boris.php b/vendor/d11wtq/boris/lib/Boris/Boris.php index 0e0c09e99..e2319cd71 100755 --- a/vendor/d11wtq/boris/lib/Boris/Boris.php +++ b/vendor/d11wtq/boris/lib/Boris/Boris.php @@ -8,7 +8,7 @@ * Boris is a tiny REPL for PHP. */ class Boris { - const VERSION = "1.0.6"; + const VERSION = "1.0.8"; private $_prompt; private $_historyFile; diff --git a/vendor/d11wtq/boris/lib/Boris/ColoredInspector.php b/vendor/d11wtq/boris/lib/Boris/ColoredInspector.php index e16530f7d..58123154b 100755 --- a/vendor/d11wtq/boris/lib/Boris/ColoredInspector.php +++ b/vendor/d11wtq/boris/lib/Boris/ColoredInspector.php @@ -85,7 +85,11 @@ public function __construct($colorMap = null) { } public function inspect($variable) { - return $this->_dump($variable); + return preg_replace( + '/^/m', + $this->_colorize('comment', '// '), + $this->_dump($variable) + ); } /** @@ -239,6 +243,7 @@ private function _defaultColorMap() { 'string' => 'light_red', 'bool' => 'light_purple', 'keyword' => 'light_cyan', + 'comment' => 'dark_grey', 'default' => 'none' ); } diff --git a/vendor/d11wtq/boris/lib/Boris/DumpInspector.php b/vendor/d11wtq/boris/lib/Boris/DumpInspector.php index 2b3feefad..96ab38ad5 100755 --- a/vendor/d11wtq/boris/lib/Boris/DumpInspector.php +++ b/vendor/d11wtq/boris/lib/Boris/DumpInspector.php @@ -11,6 +11,6 @@ class DumpInspector implements Inspector { public function inspect($variable) { ob_start(); var_dump($variable); - return trim(ob_get_clean()); + return sprintf(" → %s", trim(ob_get_clean())); } } diff --git a/vendor/d11wtq/boris/lib/Boris/EvalWorker.php b/vendor/d11wtq/boris/lib/Boris/EvalWorker.php index 6148d9991..563389cd5 100755 --- a/vendor/d11wtq/boris/lib/Boris/EvalWorker.php +++ b/vendor/d11wtq/boris/lib/Boris/EvalWorker.php @@ -139,7 +139,7 @@ public function start() { } if (preg_match('/\s*return\b/i', $__input)) { - fwrite(STDOUT, sprintf(" → %s\n", $this->_inspector->inspect($__result))); + fwrite(STDOUT, sprintf("%s\n", $this->_inspector->inspect($__result))); } $this->_expungeOldWorker(); } diff --git a/vendor/d11wtq/boris/lib/Boris/ExportInspector.php b/vendor/d11wtq/boris/lib/Boris/ExportInspector.php index 3c1081431..2ac226ba8 100755 --- a/vendor/d11wtq/boris/lib/Boris/ExportInspector.php +++ b/vendor/d11wtq/boris/lib/Boris/ExportInspector.php @@ -9,6 +9,6 @@ */ class ExportInspector implements Inspector { public function inspect($variable) { - return var_export($variable, true); + return sprintf(" → %s", var_export($variable, true)); } } diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Guard.php b/vendor/laravel/framework/src/Illuminate/Auth/Guard.php index 8c8bab757..c562aae63 100755 --- a/vendor/laravel/framework/src/Illuminate/Auth/Guard.php +++ b/vendor/laravel/framework/src/Illuminate/Auth/Guard.php @@ -283,19 +283,28 @@ public function attempt(array $credentials = array(), $remember = false, $login // If an implementation of UserInterface was returned, we'll ask the provider // to validate the user against the given credentials, and if they are in // fact valid we'll log the users into the application and return true. - if ($user instanceof UserInterface) + if ($this->hasValidCredentials($user, $credentials)) { - if ($this->provider->validateCredentials($user, $credentials)) - { - if ($login) $this->login($user, $remember); + if ($login) $this->login($user, $remember); - return true; - } + return true; } return false; } + /** + * Determine if the user matches the credentials. + * + * @param mixed $user + * @param array $credentials + * @return bool + */ + protected function hasValidCredentials($user, $credentials) + { + return ! is_null($user) && $this->provider->validateCredentials($user, $credentials); + } + /** * Fire the attempt event with the arguments. * diff --git a/vendor/laravel/framework/src/Illuminate/Auth/composer.json b/vendor/laravel/framework/src/Illuminate/Auth/composer.json index 4b232d514..98c97cb1b 100755 --- a/vendor/laravel/framework/src/Illuminate/Auth/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Auth/composer.json @@ -9,18 +9,18 @@ ], "require": { "php": ">=5.3.0", - "illuminate/cookie": "4.1.x", - "illuminate/encryption": "4.1.x", - "illuminate/events": "4.1.x", - "illuminate/hashing": "4.1.x", - "illuminate/http": "4.1.x", - "illuminate/session": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/cookie": "4.1.*", + "illuminate/encryption": "4.1.*", + "illuminate/events": "4.1.*", + "illuminate/hashing": "4.1.*", + "illuminate/http": "4.1.*", + "illuminate/session": "4.1.*", + "illuminate/support": "4.1.*", "nesbot/carbon": "1.*" }, "require-dev": { - "illuminate/console": "4.1.x", - "illuminate/routing": "4.1.x", + "illuminate/console": "4.1.*", + "illuminate/routing": "4.1.*", "phpunit/phpunit": "3.7.*" }, "autoload": { diff --git a/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php index 49e1c98e0..cd77a0b60 100755 --- a/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php +++ b/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php @@ -23,6 +23,11 @@ public function register() return new CacheManager($app); }); + $this->app->bindShared('cache.store', function($app) + { + return $app['cache']->driver(); + }); + $this->app->bindShared('memcached.connector', function() { return new MemcachedConnector; @@ -53,7 +58,7 @@ public function registerCommands() */ public function provides() { - return array('cache', 'memcached.connector', 'command.cache.clear'); + return array('cache', 'cache.store', 'memcached.connector', 'command.cache.clear'); } -} \ No newline at end of file +} diff --git a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php index b32a6ebba..92272d0fc 100755 --- a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php +++ b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php @@ -21,7 +21,9 @@ public function connect(array $servers) // servers we'll verify the connection is successful and return it back. foreach ($servers as $server) { - $memcached->addServer($server['host'], $server['port'], $server['weight']); + $memcached->addServer( + $server['host'], $server['port'], $server['weight'] + ); } if ($memcached->getVersion() === false) diff --git a/vendor/laravel/framework/src/Illuminate/Cache/Repository.php b/vendor/laravel/framework/src/Illuminate/Cache/Repository.php index da6b2adbb..96de3d53f 100755 --- a/vendor/laravel/framework/src/Illuminate/Cache/Repository.php +++ b/vendor/laravel/framework/src/Illuminate/Cache/Repository.php @@ -233,15 +233,12 @@ protected function getMinutes($duration) if ($duration instanceof DateTime) { $duration = Carbon::instance($duration); - } - if ($duration instanceof Carbon) - { return max(0, Carbon::now()->diffInMinutes($duration, false)); } else { - return intval($duration); + return is_string($duration) ? intval($duration) : $duration; } } diff --git a/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariables.php b/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariables.php new file mode 100755 index 000000000..759049daa --- /dev/null +++ b/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariables.php @@ -0,0 +1,43 @@ +loader = $loader; + } + + /** + * Load the server variables for a given environment. + * + * @param string $environment + */ + public function load($environment = null) + { + foreach ($this->loader->load($environment) as $key => $value) + { + $_ENV[$key] = $value; + + $_SERVER[$key] = $value; + } + } + +} \ No newline at end of file diff --git a/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariablesLoaderInterface.php b/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariablesLoaderInterface.php new file mode 100755 index 000000000..d42683b02 --- /dev/null +++ b/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariablesLoaderInterface.php @@ -0,0 +1,13 @@ +files = $files; + $this->path = $path ?: base_path(); + } + + /** + * Load the environment variables for the given environment. + * + * @param string $environment + * @return array + */ + public function load($environment = null) + { + if ($environment == 'production') $environment = null; + + if ( ! $this->files->exists($path = $this->getFile($environment))) + { + return array(); + } + else + { + return $this->files->getRequire($path); + } + } + + /** + * Get the file for the given environment. + * + * @param string $environment + * @return string + */ + protected function getFile($environment) + { + if ($environment) + { + return $this->path.'/.env.'.$environment.'.php'; + } + else + { + return $this->path.'/.env.php'; + } + } + +} \ No newline at end of file diff --git a/vendor/laravel/framework/src/Illuminate/Config/composer.json b/vendor/laravel/framework/src/Illuminate/Config/composer.json index 3641f0b42..f250cb289 100755 --- a/vendor/laravel/framework/src/Illuminate/Config/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Config/composer.json @@ -9,8 +9,8 @@ ], "require": { "php": ">=5.3.0", - "illuminate/filesystem": "4.1.x", - "illuminate/support": "4.1.x" + "illuminate/filesystem": "4.1.*", + "illuminate/support": "4.1.*" }, "require-dev": { "phpunit/phpunit": "3.7.*" diff --git a/vendor/laravel/framework/src/Illuminate/Container/Container.php b/vendor/laravel/framework/src/Illuminate/Container/Container.php index 30311b0ed..c3dd39a9d 100755 --- a/vendor/laravel/framework/src/Illuminate/Container/Container.php +++ b/vendor/laravel/framework/src/Illuminate/Container/Container.php @@ -639,7 +639,7 @@ protected function fireCallbackArray($object, array $callbacks) { foreach ($callbacks as $callback) { - call_user_func($callback, $object); + call_user_func($callback, $object, $this); } } diff --git a/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php b/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php index c633028eb..1b32219a1 100755 --- a/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php +++ b/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php @@ -73,6 +73,17 @@ public function forget($name) return $this->make($name, null, -2628000); } + /** + * Determine if a cookie has been queued. + * + * @param string $key + * @return bool + */ + public function hasQueued($key) + { + return ! is_null($this->queued($key)); + } + /** * Get a queued cookie instance. * diff --git a/vendor/laravel/framework/src/Illuminate/Cookie/composer.json b/vendor/laravel/framework/src/Illuminate/Cookie/composer.json index 40547fe95..fc25a6f66 100755 --- a/vendor/laravel/framework/src/Illuminate/Cookie/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Cookie/composer.json @@ -9,9 +9,9 @@ ], "require": { "php": ">=5.3.0", - "illuminate/encryption": "4.1.x", - "illuminate/support": "4.1.x", - "symfony/http-kernel": "2.4.x", + "illuminate/encryption": "4.1.*", + "illuminate/support": "4.1.*", + "symfony/http-kernel": "2.4.*", "symfony/http-foundation": "2.4.*" }, "require-dev": { diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connection.php b/vendor/laravel/framework/src/Illuminate/Database/Connection.php index 50399b8cd..6b7cfcc16 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Connection.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Connection.php @@ -649,6 +649,8 @@ public function getPdo() */ public function getReadPdo() { + if ($this->transactions >= 1) return $this->getPdo(); + return $this->readPdo ?: $this->pdo; } diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php b/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php index 5a27557c4..8269625a5 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php @@ -171,6 +171,11 @@ public function createConnector(array $config) throw new \InvalidArgumentException("A driver must be specified."); } + if ($this->container->bound($key = "db.connector.{$config['driver']}")) + { + return $this->container->make($key); + } + switch ($config['driver']) { case 'mysql': diff --git a/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php b/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php index 82e6da7aa..2d9ee17e3 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php +++ b/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php @@ -111,7 +111,7 @@ protected function makeConnection($name) // Closure and pass it the config allowing it to resolve the connection. if (isset($this->extensions[$name])) { - return call_user_func($this->extensions[$name], $config); + return call_user_func($this->extensions[$name], $config, $name); } $driver = $config['driver']; @@ -121,7 +121,7 @@ protected function makeConnection($name) // resolver for the drivers themselves which applies to all connections. if (isset($this->extensions[$driver])) { - return call_user_func($this->extensions[$driver], $config); + return call_user_func($this->extensions[$driver], $config, $name); } return $this->factory->make($config, $name); diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php index b3a8df166..5d9cca0ab 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php @@ -34,8 +34,8 @@ class Builder { * @var array */ protected $passthru = array( - 'toSql', 'lists', 'insert', 'insertGetId', 'pluck', - 'count', 'min', 'max', 'avg', 'sum', 'exists', + 'toSql', 'lists', 'insert', 'insertGetId', 'pluck', 'count', + 'min', 'max', 'avg', 'sum', 'exists', 'getBindings', ); /** diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php index 7c83ebb0e..753245af8 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php @@ -194,7 +194,7 @@ public function unique() return new static(array_values($dictionary)); } - /* + /** * Get a dictionary keyed by primary keys. * * @param \Illuminate\Support\Collection $collection diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php index e222dad53..f1179a99c 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php @@ -240,4 +240,24 @@ public function getQualifiedForeignKey() return $this->parent->getTable().'.'.$this->foreignKey; } + /** + * Get the associated key of the relationship. + * + * @return string + */ + public function getOtherKey() + { + return $this->otherKey; + } + + /** + * Get the fully qualified associated key of the relationship. + * + * @return string + */ + public function getQualifiedOtherKeyName() + { + return $this->related->getTable().'.'.$this->otherKey; + } + } diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php index a42b99fe8..0f9fd9833 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php @@ -928,7 +928,7 @@ public function oldest($column = 'created_at') return $this->orderBy($column, 'asc'); } - /* + /** * Add a raw "order by" clause to the query. * * @param string $sql diff --git a/vendor/laravel/framework/src/Illuminate/Database/composer.json b/vendor/laravel/framework/src/Illuminate/Database/composer.json index 4f05bc08c..19bbdbc49 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Database/composer.json @@ -10,17 +10,17 @@ ], "require": { "php": ">=5.3.0", - "illuminate/container": "4.1.x", - "illuminate/events": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/container": "4.1.*", + "illuminate/events": "4.1.*", + "illuminate/support": "4.1.*", "nesbot/carbon": "1.*" }, "require-dev": { - "illuminate/cache": "4.1.x", - "illuminate/console": "4.1.x", - "illuminate/filesystem": "4.1.x", - "illuminate/pagination": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/cache": "4.1.*", + "illuminate/console": "4.1.*", + "illuminate/filesystem": "4.1.*", + "illuminate/pagination": "4.1.*", + "illuminate/support": "4.1.*", "mockery/mockery": "0.7.2", "phpunit/phpunit": "3.7.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/Encryption/composer.json b/vendor/laravel/framework/src/Illuminate/Encryption/composer.json index 290552142..d722f9679 100755 --- a/vendor/laravel/framework/src/Illuminate/Encryption/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Encryption/composer.json @@ -9,7 +9,7 @@ ], "require": { "php": ">=5.3.0", - "illuminate/support": "4.1.x" + "illuminate/support": "4.1.*" }, "require-dev": { "phpunit/phpunit": "3.7.*" diff --git a/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php b/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php index 65f72a360..1f9a803cb 100755 --- a/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php +++ b/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php @@ -53,21 +53,24 @@ public function __construct(Container $container = null) /** * Register an event listener with the dispatcher. * - * @param string $event + * @param string|array $event * @param mixed $listener * @param int $priority * @return void */ - public function listen($event, $listener, $priority = 0) + public function listen($events, $listener, $priority = 0) { - if (str_contains($event, '*')) + foreach ((array) $events as $event) { - return $this->setupWildcardListen($event, $listener); - } + if (str_contains($event, '*')) + { + return $this->setupWildcardListen($event, $listener); + } - $this->listeners[$event][$priority][] = $this->makeListener($listener); + $this->listeners[$event][$priority][] = $this->makeListener($listener); - unset($this->sorted[$event]); + unset($this->sorted[$event]); + } } /** diff --git a/vendor/laravel/framework/src/Illuminate/Events/composer.json b/vendor/laravel/framework/src/Illuminate/Events/composer.json index 7bb8d3abe..f68bbd63c 100755 --- a/vendor/laravel/framework/src/Illuminate/Events/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Events/composer.json @@ -9,8 +9,8 @@ ], "require": { "php": ">=5.3.0", - "illuminate/container": "4.1.x", - "illuminate/support": "4.1.x" + "illuminate/container": "4.1.*", + "illuminate/support": "4.1.*" }, "require-dev": { "mockery/mockery": "0.7.2", diff --git a/vendor/laravel/framework/src/Illuminate/Exception/composer.json b/vendor/laravel/framework/src/Illuminate/Exception/composer.json index 094f320ad..8cbcde5d1 100755 --- a/vendor/laravel/framework/src/Illuminate/Exception/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Exception/composer.json @@ -10,12 +10,12 @@ "require": { "php": ">=5.3.0", "filp/whoops": "1.0.7", - "illuminate/support": "4.1.x", - "symfony/http-foundation": "2.4.x", + "illuminate/support": "4.1.*", + "symfony/http-foundation": "2.4.*", "symfony/http-kernel": "2.4.*" }, "require-dev": { - "monolog/monolog": "1.6.x", + "monolog/monolog": "1.6.*", "mockery/mockery": "0.7.2", "phpunit/phpunit": "3.7.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php b/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php index 92dedf867..e53304677 100755 --- a/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php +++ b/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php @@ -33,17 +33,6 @@ public function get($path) throw new FileNotFoundException("File does not exist at path {$path}"); } - /** - * Get the contents of a remote file. - * - * @param string $path - * @return string - */ - public function getRemote($path) - { - return file_get_contents($path); - } - /** * Get the returned value of a file. * diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php index dd00dc15c..604378005 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php @@ -10,6 +10,7 @@ use Illuminate\Events\EventServiceProvider; use Illuminate\Routing\RoutingServiceProvider; use Illuminate\Exception\ExceptionServiceProvider; +use Illuminate\Config\FileEnvironmentVariablesLoader; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\TerminableInterface; use Symfony\Component\HttpKernel\Exception\HttpException; @@ -26,7 +27,7 @@ class Application extends Container implements HttpKernelInterface, TerminableIn * * @var string */ - const VERSION = '4.1.16'; + const VERSION = '4.1.18'; /** * Indicates if the application has "booted". @@ -143,7 +144,7 @@ protected function registerBaseBindings($request) */ protected function registerBaseServiceProviders() { - foreach (array('Exception', 'Routing', 'Event') as $name) + foreach (array('Event', 'Exception', 'Routing') as $name) { $this->{"register{$name}Provider"}(); } @@ -372,9 +373,11 @@ public function resolveProviderClass($provider) */ protected function markAsRegistered($provider) { + $this['events']->fire($class = get_class($provider), array($provider)); + $this->serviceProviders[] = $provider; - $this->loadedProviders[get_class($provider)] = true; + $this->loadedProviders[$class] = true; } /** @@ -450,6 +453,8 @@ public function registerDeferredProvider($provider, $service = null) */ public function make($abstract, $parameters = array()) { + $abstract = $this->getAlias($abstract); + if (isset($this->deferredServices[$abstract])) { $this->loadDeferredProvider($abstract); @@ -509,6 +514,20 @@ public function shutdown($callback = null) } } + /** + * Register a function for determining when to use array sessions. + * + * @param \Closure $callback + * @return void + */ + public function useArraySessions(Closure $callback) + { + $this->bind('session.reject', function() use ($callback) + { + return $callback; + }); + } + /** * Determine if the application has booted. * @@ -598,10 +617,12 @@ public function run(SymfonyRequest $request = null) */ protected function getStackedClient() { + $sessionReject = $this->bound('session.reject') ? $this['session.reject'] : null; + $client = with(new \Stack\Builder) ->push('Illuminate\Cookie\Guard', $this['encrypter']) ->push('Illuminate\Cookie\Queue', $this['cookie']) - ->push('Illuminate\Session\Middleware', $this['session']); + ->push('Illuminate\Session\Middleware', $this['session'], $sessionReject); $this->mergeCustomMiddlewares($client); @@ -775,9 +796,9 @@ protected function fireAppCallbacks(array $callbacks) */ public function prepareRequest(Request $request) { - if ( ! is_null($this['config']['session.driver'])) + if ( ! is_null($this['config']['session.driver']) && ! $request->hasSession()) { - $request->setSessionStore($this['session.store']); + $request->setSession($this['session']->driver()); } return $request; @@ -911,40 +932,25 @@ public function getConfigLoader() } /** - * Get the service provider repository instance. - * - * @return \Illuminate\Foundation\ProviderRepository - */ - public function getProviderRepository() - { - $manifest = $this['config']['app.manifest']; - - return new ProviderRepository(new Filesystem, $manifest); - } - - /** - * Get the current application locale. + * Get the environment variables loader instance. * - * @return string + * @return \Illuminate\Config\EnvironmentVariablesLoaderInterface */ - public function getLocale() + public function getEnvironmentVariablesLoader() { - return $this['config']->get('app.locale'); + return new FileEnvironmentVariablesLoader(new Filesystem, $this['path.base']); } /** - * Set the current application locale. + * Get the service provider repository instance. * - * @param string $locale - * @return void + * @return \Illuminate\Foundation\ProviderRepository */ - public function setLocale($locale) + public function getProviderRepository() { - $this['config']->set('app.locale', $locale); - - $this['translator']->setLocale($locale); + $manifest = $this['config']['app.manifest']; - $this['events']->fire('locale.changed', array($locale)); + return new ProviderRepository(new Filesystem, $manifest); } /** @@ -1007,6 +1013,31 @@ public static function onRequest($method, $parameters = array()) return forward_static_call_array(array(static::requestClass(), $method), $parameters); } + /** + * Get the current application locale. + * + * @return string + */ + public function getLocale() + { + return $this['config']->get('app.locale'); + } + + /** + * Set the current application locale. + * + * @param string $locale + * @return void + */ + public function setLocale($locale) + { + $this['config']->set('app.locale', $locale); + + $this['translator']->setLocale($locale); + + $this['events']->fire('locale.changed', array($locale)); + } + /** * Register the core class aliases in the container. * @@ -1019,7 +1050,8 @@ public function registerCoreContainerAliases() 'artisan' => 'Illuminate\Console\Application', 'auth' => 'Illuminate\Auth\AuthManager', 'blade.compiler' => 'Illuminate\View\Compilers\BladeCompiler', - 'cache' => 'Illuminate\Cache\Repository', + 'cache' => 'Illuminate\Cache\CacheManager', + 'cache.store' => 'Illuminate\Cache\Repository', 'config' => 'Illuminate\Config\Repository', 'cookie' => 'Illuminate\Cookie\CookieJar', 'encrypter' => 'Illuminate\Encryption\Encrypter', diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php index cd72be248..3d729d957 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php @@ -37,6 +37,9 @@ $basePath.'/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Config/FileLoader.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Config/LoaderInterface.php', + $basePath.'/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariablesLoaderInterface.php', + $basePath.'/vendor/laravel/framework/src/Illuminate/Config/FileEnvironmentVariablesLoader.php', + $basePath.'/vendor/laravel/framework/src/Illuminate/Config/EnvironmentVariables.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php', $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php', diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php index bf47d5d30..5f72a1aef 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/TailCommand.php @@ -69,7 +69,9 @@ protected function tailLocalLogs($path) { $output = $this->output; - with(new Process('tail -f '.$path))->setTimeout(null)->run(function($type, $line) use ($output) + $lines = $this->option('lines'); + + with(new Process('tail -f -n '.$lines.' '.$path))->setTimeout(null)->run(function($type, $line) use ($output) { $output->write($line); }); @@ -86,7 +88,9 @@ protected function tailRemoteLogs($path, $connection) { $out = $this->output; - $this->getRemote($connection)->run('tail -f '.$path, function($line) use ($out) + $lines = $this->option('lines'); + + $this->getRemote($connection)->run('tail -f -n '.$lines.' '.$path, function($line) use ($out) { $out->write($line); }); @@ -155,6 +159,8 @@ protected function getOptions() { return array( array('path', null, InputOption::VALUE_OPTIONAL, 'The fully qualified path to the log file.'), + + array('lines', null, InputOption::VALUE_OPTIONAL, 'The number of lines to tail.', 20), ); } diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php b/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php index a82ccdca8..8b65f5753 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php @@ -18,6 +18,13 @@ class ProviderRepository { */ protected $manifestPath; + /** + * Default manifest structure. + * + * @var array + */ + protected $default = array('when' => array()); + /** * Create a new service repository instance. * @@ -48,7 +55,7 @@ public function load(Application $app, array $providers) // provides. This is used to know which services are "deferred" loaders. if ($this->shouldRecompile($manifest, $providers)) { - $manifest = $this->compileManifest($app, $providers); + $manifest = $this->compileManifest($app, $providers); } // If the application is running in the console, we will not lazy load any of @@ -59,6 +66,14 @@ public function load(Application $app, array $providers) $manifest['eager'] = $manifest['providers']; } + // Next, we will register events to load the providers for each of the events + // that it has requested. This allows the service provider to defer itself + // while still getting automatically loaded when a certain event occurs. + foreach ($manifest['when'] as $provider => $events) + { + $this->registerLoadEvents($app, $provider, $events); + } + // We will go ahead and register all of the eagerly loaded providers with the // application so their services can be registered with the application as // a provided service. Then we will set the deferred service list on it. @@ -70,6 +85,24 @@ public function load(Application $app, array $providers) $app->setDeferredServices($manifest['deferred']); } + /** + * Register the load events for the given provider. + * + * @param \Illuminate\Foundation\Application $app + * @param string $provider + * @param array $events + * @return void + */ + protected function registerLoadEvents(Application $app, $provider, array $events) + { + if (count($events) < 1) return; + + $app->make('events')->listen($events, function() use ($app, $provider) + { + $app->register($provider); + }); + } + /** * Compile the application manifest file. * @@ -97,6 +130,8 @@ protected function compileManifest(Application $app, $providers) { $manifest['deferred'][$service] = $provider; } + + $manifest['when'][$provider] = $instance->when(); } // If the service providers are not deferred, we will simply add it to an @@ -149,7 +184,9 @@ public function loadManifest() // deferred loading or should be eagerly loaded on each request to us. if ($this->files->exists($path)) { - return json_decode($this->files->get($path), true); + $manifest = json_decode($this->files->get($path), true); + + return array_merge($this->default, $manifest); } } diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/changes.json b/vendor/laravel/framework/src/Illuminate/Foundation/changes.json index 03014b70f..6fee2342d 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/changes.json +++ b/vendor/laravel/framework/src/Illuminate/Foundation/changes.json @@ -1,5 +1,5 @@ { - "4.1.x": [ + "4.1.*": [ {"message": "Added new SSH task runner tools.", "backport": null}, {"message": "Allow before and after validation rules to reference other fields.", "backport": null}, {"message": "Added splice method to Collection class.", "backport": null}, @@ -77,9 +77,11 @@ {"message": "Added groupBy to Collection class.", "backport": null}, {"message": "Added the View::composers method.", "backport": null}, {"message": "Added new 'sometimes' validation rule short-cut to only run validation if rule is present.", "backport": null}, - {"message": "Duplicate service providers can't be registered without 'force' parameter.", "backport": null} + {"message": "Duplicate service providers can't be registered without 'force' parameter.", "backport": null}, + {"message": "Added --lines option to the 'tail' Artisan command.", "backport": null}, + {"message": "Allow 'keytext' option to be set on Remote configuration.", "backport": null} ], - "4.0.x": [ + "4.0.*": [ {"message": "Added implode method to query builder and Collection class.", "backport": null}, {"message": "Fixed bug that caused Model->push method to fail.", "backport": null}, {"message": "Make session cookie HttpOnly by default.", "backport": null}, diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/start.php b/vendor/laravel/framework/src/Illuminate/Foundation/start.php index 4214948ef..6fdf56373 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/start.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/start.php @@ -45,6 +45,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Facade; use Illuminate\Foundation\AliasLoader; +use Illuminate\Config\EnvironmentVariables; use Illuminate\Config\Repository as Config; /* @@ -104,6 +105,20 @@ $app->registerCoreContainerAliases(); +/* +|-------------------------------------------------------------------------- +| Register The Environment Variables +|-------------------------------------------------------------------------- +| +| Here we will register all of the $_ENV and $_SERVER variables into the +| process so that they're globally available configuration options so +| sensitive configuration information can be swept out of the code. +| +*/ + +with($envVariables = new EnvironmentVariables( + $app->getEnvironmentVariablesLoader()))->load($env); + /* |-------------------------------------------------------------------------- | Register The Configuration Repository diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/composer.json b/vendor/laravel/framework/src/Illuminate/Hashing/composer.json index 00fc607a6..8daca4a3a 100755 --- a/vendor/laravel/framework/src/Illuminate/Hashing/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Hashing/composer.json @@ -9,7 +9,7 @@ ], "require": { "php": ">=5.3.0", - "illuminate/support": "4.1.x", + "illuminate/support": "4.1.*", "ircmaxell/password-compat": "1.0.*" }, "require-dev": { diff --git a/vendor/laravel/framework/src/Illuminate/Html/composer.json b/vendor/laravel/framework/src/Illuminate/Html/composer.json index bb50883d5..53d678463 100755 --- a/vendor/laravel/framework/src/Illuminate/Html/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Html/composer.json @@ -9,9 +9,9 @@ ], "require": { "php": ">=5.3.0", - "illuminate/http": "4.1.x", - "illuminate/session": "4.1.x", - "illuminate/support": "4.1.x" + "illuminate/http": "4.1.*", + "illuminate/session": "4.1.*", + "illuminate/support": "4.1.*" }, "require-dev": { "mockery/mockery": "0.7.2", diff --git a/vendor/laravel/framework/src/Illuminate/Http/Request.php b/vendor/laravel/framework/src/Illuminate/Http/Request.php index 7f8cb4260..7d787b3fd 100755 --- a/vendor/laravel/framework/src/Illuminate/Http/Request.php +++ b/vendor/laravel/framework/src/Illuminate/Http/Request.php @@ -74,6 +74,16 @@ public function path() return $pattern == '' ? '/' : $pattern; } + /** + * Get the current encoded path info for the request. + * + * @return string + */ + public function decodedPath() + { + return rawurldecode($this->path()); + } + /** * Get a segment from the URI (1 based index). * @@ -314,7 +324,7 @@ public function server($key = null, $default = null) */ public function old($key = null, $default = null) { - return $this->getSessionStore()->getOldInput($key, $default); + return $this->session()->getOldInput($key, $default); } /** @@ -328,7 +338,7 @@ public function flash($filter = null, $keys = array()) { $flash = ( ! is_null($filter)) ? $this->$filter($keys) : $this->input(); - $this->getSessionStore()->flashInput($flash); + $this->session()->flashInput($flash); } /** @@ -364,7 +374,7 @@ public function flashExcept($keys) */ public function flush() { - $this->getSessionStore()->flashInput(array()); + $this->session()->flashInput(array()); } /** @@ -496,41 +506,18 @@ public static function createFromBase(SymfonyRequest $request) } /** - * Get the Illuminate session store implementation. + * Get the session associated with the request. * * @return \Illuminate\Session\Store - * - * @throws \RuntimeException */ - public function getSessionStore() + public function session() { - if ( ! isset($this->sessionStore)) + if ( ! $this->hasSession()) { throw new \RuntimeException("Session store not set on request."); } - return $this->sessionStore; - } - - /** - * Set the Illuminate session store implementation. - * - * @param \Illuminate\Session\Store $session - * @return void - */ - public function setSessionStore(SessionStore $session) - { - $this->sessionStore = $session; - } - - /** - * Determine if the session store has been set. - * - * @return bool - */ - public function hasSessionStore() - { - return isset($this->sessionStore); + return $this->getSession(); } } diff --git a/vendor/laravel/framework/src/Illuminate/Http/composer.json b/vendor/laravel/framework/src/Illuminate/Http/composer.json index 712ad30be..040b4a511 100755 --- a/vendor/laravel/framework/src/Illuminate/Http/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Http/composer.json @@ -8,8 +8,8 @@ } ], "require": { - "illuminate/session": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/session": "4.1.*", + "illuminate/support": "4.1.*", "symfony/http-foundation": "2.4.*", "symfony/http-kernel": "2.4.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/Log/composer.json b/vendor/laravel/framework/src/Illuminate/Log/composer.json index 99e198e90..1cb5d014b 100755 --- a/vendor/laravel/framework/src/Illuminate/Log/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Log/composer.json @@ -9,13 +9,13 @@ ], "require": { "php": ">=5.3.0", - "illuminate/support": "4.1.x", + "illuminate/support": "4.1.*", "monolog/monolog": "1.6.*" }, "require-dev": { "mockery/mockery": "0.7.2", "phpunit/phpunit": "3.7.*", - "illuminate/events": "4.1.x" + "illuminate/events": "4.1.*" }, "autoload": { "psr-0": { diff --git a/vendor/laravel/framework/src/Illuminate/Mail/composer.json b/vendor/laravel/framework/src/Illuminate/Mail/composer.json index 5bdd37478..60d559a94 100755 --- a/vendor/laravel/framework/src/Illuminate/Mail/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Mail/composer.json @@ -9,14 +9,14 @@ ], "require": { "php": ">=5.3.0", - "illuminate/container": "4.1.x", - "illuminate/log": "4.1.x", - "illuminate/support": "4.1.x", - "illuminate/view": "4.1.x", + "illuminate/container": "4.1.*", + "illuminate/log": "4.1.*", + "illuminate/support": "4.1.*", + "illuminate/view": "4.1.*", "swiftmailer/swiftmailer": "4.3.*" }, "require-dev": { - "illuminate/queue": "4.1.x", + "illuminate/queue": "4.1.*", "mockery/mockery": "0.7.2", "phpunit/phpunit": "3.7.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/composer.json b/vendor/laravel/framework/src/Illuminate/Pagination/composer.json index 915831664..2fa4ff1fe 100755 --- a/vendor/laravel/framework/src/Illuminate/Pagination/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Pagination/composer.json @@ -9,9 +9,9 @@ ], "require": { "php": ">=5.3.0", - "illuminate/http": "4.1.x", - "illuminate/support": "4.1.x", - "illuminate/view": "4.1.x", + "illuminate/http": "4.1.*", + "illuminate/support": "4.1.*", + "illuminate/view": "4.1.*", "symfony/http-foundation": "2.4.*", "symfony/translation": "2.4.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/Redis/composer.json b/vendor/laravel/framework/src/Illuminate/Redis/composer.json index 0495688dc..bf884e4aa 100755 --- a/vendor/laravel/framework/src/Illuminate/Redis/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Redis/composer.json @@ -9,7 +9,7 @@ ], "require": { "php": ">=5.3.0", - "illuminate/support": "4.1.x", + "illuminate/support": "4.1.*", "predis/predis": "0.*" }, "require-dev": { diff --git a/vendor/laravel/framework/src/Illuminate/Remote/RemoteManager.php b/vendor/laravel/framework/src/Illuminate/Remote/RemoteManager.php index a336cd7c5..750853b52 100755 --- a/vendor/laravel/framework/src/Illuminate/Remote/RemoteManager.php +++ b/vendor/laravel/framework/src/Illuminate/Remote/RemoteManager.php @@ -144,6 +144,10 @@ protected function getAuth(array $config) { return array('key' => $config['key'], 'keyphrase' => $config['keyphrase']); } + elseif (isset($config['keytext']) && trim($config['keytext']) != '') + { + return array('keytext' => $config['keytext']); + } elseif (isset($config['password'])) { return array('password' => $config['password']); diff --git a/vendor/laravel/framework/src/Illuminate/Remote/SecLibGateway.php b/vendor/laravel/framework/src/Illuminate/Remote/SecLibGateway.php index 4303e5343..2e2f9f500 100755 --- a/vendor/laravel/framework/src/Illuminate/Remote/SecLibGateway.php +++ b/vendor/laravel/framework/src/Illuminate/Remote/SecLibGateway.php @@ -176,7 +176,9 @@ protected function getAuthForLogin() */ protected function hasRsaKey() { - return (isset($this->auth['key']) && trim($this->auth['key']) != ''); + $hasKey = (isset($this->auth['key']) && trim($this->auth['key']) != ''); + + return $hasKey || (isset($this->auth['keytext']) && trim($this->auth['keytext']) != ''); } /** @@ -187,11 +189,24 @@ protected function hasRsaKey() */ protected function loadRsaKey(array $auth) { - with($key = $this->getKey($auth))->loadKey($this->files->get($auth['key'])); + with($key = $this->getKey($auth))->loadKey($this->readRsaKey($auth)); return $key; } + /** + * Read the contents of the RSA key. + * + * @param array $auth + * @return string + */ + protected function readRsaKey(array $auth) + { + if (isset($auth['key'])) return $this->files->get($auth['key']); + + return $auth['keytext']; + } + /** * Create a new RSA key instance. * diff --git a/vendor/laravel/framework/src/Illuminate/Remote/composer.json b/vendor/laravel/framework/src/Illuminate/Remote/composer.json index 5c56869ab..c0c61766d 100755 --- a/vendor/laravel/framework/src/Illuminate/Remote/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Remote/composer.json @@ -9,8 +9,8 @@ ], "require": { "php": ">=5.3.0", - "illuminate/support": "4.1.x", - "phpseclib/phpseclib": "0.3.x" + "illuminate/support": "4.1.*", + "phpseclib/phpseclib": "0.3.*" }, "require-dev": { "mockery/mockery": "0.8.0" diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php b/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php index ace85ae19..a96d187d3 100755 --- a/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php +++ b/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php @@ -14,7 +14,16 @@ class SchemeValidator implements ValidatorInterface { */ public function matches(Route $route, Request $request) { - return $route->secure() ? $request->secure() : true; + if ($route->httpOnly()) + { + return ! $request->secure(); + } + elseif ($route->secure()) + { + return $request->secure(); + } + + return true; } } \ No newline at end of file diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php b/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php index 9a0dd6f98..6782d5220 100755 --- a/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php +++ b/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php @@ -16,7 +16,7 @@ public function matches(Route $route, Request $request) { $path = $request->path() == '/' ? '/' : '/'.$request->path(); - return preg_match($route->getCompiled()->getRegex(), $path); + return preg_match($route->getCompiled()->getRegex(), rawurldecode($path)); } } \ No newline at end of file diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Route.php b/vendor/laravel/framework/src/Illuminate/Routing/Route.php index 72406f697..9bfbb8577 100755 --- a/vendor/laravel/framework/src/Illuminate/Routing/Route.php +++ b/vendor/laravel/framework/src/Illuminate/Routing/Route.php @@ -371,47 +371,70 @@ public function bind(Request $request) */ public function bindParameters(Request $request) { - preg_match($this->compiled->getRegex(), '/'.$request->path(), $matches); + // If the route has a regular expression for the host part of the URI, we will + // compile that and get the parameter matches for this domain. We will then + // merge them into this parameters array so that this array is completed. + $params = $this->matchToKeys( - $parameters = $this->combineMatchesWithKeys(array_slice($matches, 1)); + array_slice($this->bindPathParameters($request), 1) + ); + + // If the route has a regular expression for the host part of the URI, we will + // compile that and get the parameter matches for this domain. We will then + // merge them into this parameters array so that this array is completed. if ( ! is_null($this->compiled->getHostRegex())) { - preg_match($this->compiled->getHostRegex(), $request->getHost(), $matches); - - $parameters = array_merge($this->combineMatchesWithKeys(array_slice($matches, 1)), $parameters); + $params = $this->bindHostParameters( + $request, $params + ); } - return $this->parameters = $this->replaceDefaults($parameters); + return $this->parameters = $this->replaceDefaults($params); } /** - * Combine a set of parameter matches with the route's keys. + * Get the parameter matches for the path portion of the URI. * - * @param array $matches + * @param \Illuminate\Http\Request $request * @return array */ - protected function combineMatchesWithKeys(array $matches) + protected function bindPathParameters(Request $request) { - if (count($this->parameterNames()) == 0) return array(); + preg_match($this->compiled->getRegex(), '/'.$request->decodedPath(), $matches); - $parameters = array_intersect_key($matches, array_flip($this->parameterNames())); + return $matches; + } - return array_filter($parameters, function($value) - { - return is_string($value) && strlen($value) > 0; - }); + /** + * Extract the parameter list from the host part of the request. + * + * @param \Illuminate\Http\Request $request + * @return array + */ + protected function bindHostParameters(Request $request, $parameters) + { + preg_match($this->compiled->getHostRegex(), $request->getHost(), $matches); + + return array_merge($this->matchToKeys(array_slice($matches, 1)), $parameters); } /** - * Pad an array to the number of keys. + * Combine a set of parameter matches with the route's keys. * * @param array $matches * @return array */ - protected function padMatches(array $matches) + protected function matchToKeys(array $matches) { - return array_pad($matches, count($this->parameterNames()), null); + if (count($this->parameterNames()) == 0) return array(); + + $parameters = array_intersect_key($matches, array_flip($this->parameterNames())); + + return array_filter($parameters, function($value) + { + return is_string($value) && strlen($value) > 0; + }); } /** @@ -644,6 +667,26 @@ public function methods() return $this->methods; } + /** + * Determine if the route only responds to HTTP requests. + * + * @return bool + */ + public function httpOnly() + { + return in_array('http', $this->action); + } + + /** + * Determine if the route only responds to HTTPS requests. + * + * @return bool + */ + public function httpsOnly() + { + return $this->secure(); + } + /** * Determine if the route only responds to HTTPS requests. * diff --git a/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php b/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php index e48c7b148..e9f9edd1f 100755 --- a/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php +++ b/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php @@ -98,7 +98,9 @@ public function to($path, $extra = array(), $secure = null) $scheme = $this->getScheme($secure); - $tail = implode('/', (array) $extra); + $tail = implode('/', array_map( + 'rawurlencode', (array) $extra) + ); // Once we have the scheme we will compile the "tail" by collapsing the values // into a single string delimited by slashes. This just makes it convenient @@ -171,7 +173,7 @@ public function secureAsset($path) */ protected function getScheme($secure) { - if ( ! $secure) + if (is_null($secure)) { return $this->request->getScheme().'://'; } @@ -250,35 +252,30 @@ protected function replaceRoot($route, $domain, &$parameters) */ protected function replaceRouteParameters($path, array &$parameters) { - foreach ($parameters as $key => $value) + if (count($parameters)) { - $path = $this->replaceRouteParameter($path, $key, $value, $parameters); + $path = preg_replace_sub( + '/\{.*?\}/', $parameters, $this->replaceNamedParameters($path, $parameters) + ); } return trim(preg_replace('/\{.*?\?\}/', '', $path), '/'); } /** - * Replace a given route parameter for a route path. + * Replace all of the named parameters in the path. * * @param string $path - * @param string $key - * @param string $value * @param array $parameters * @return string */ - protected function replaceRouteParameter($path, $key, $value, array &$parameters) + protected function replaceNamedParameters($path, &$parameters) { - $pattern = is_string($key) ? '/\{'.$key.'[\?]?\}/' : '/\{.*?\}/'; - - $path = preg_replace($pattern, $value, $path, 1, $count); - - // If the parameter was actually replaced in the route path, we are going to remove - // it from the parameter array (by reference), which is so we can use any of the - // extra parameters as query string variables once we process all the matches. - if ($count > 0) unset($parameters[$key]); + return preg_replace_callback('/\{(.*?)\??\}/', function($m) use (&$parameters) + { + return isset($parameters[$m[1]]) ? array_pull($parameters, $m[1]) : $m[0]; - return $path; + }, $path); } /** @@ -289,13 +286,23 @@ protected function replaceRouteParameter($path, $key, $value, array &$parameters */ protected function getRouteQueryString(array $parameters) { + // First we will get all of the string parameters that are remaining after we + // have replaced the route wildcards. We'll then build a query string from + // these string parameters then use it as a starting point for the rest. if (count($parameters) == 0) return ''; - $query = http_build_query($keyed = $this->getStringParameters($parameters)); + $query = http_build_query( + $keyed = $this->getStringParameters($parameters) + ); + // Lastly, if there are still parameters remaining, we will fetch the numeric + // parameters that are in the array and add them to the query string or we + // will build the intial query string if it wasn't started with strings. if (count($keyed) < count($parameters)) { - $query .= '&'.implode('&', $this->getNumericParameters($parameters)); + $query .= '&'.implode( + '&', $this->getNumericParameters($parameters) + ); } return '?'.trim($query, '&'); @@ -355,7 +362,7 @@ protected function formatDomain($route, &$parameters) */ protected function getDomainAndScheme($route) { - return $this->getScheme($route->secure()).$route->domain(); + return $this->getRouteScheme($route).$route->domain(); } /** @@ -385,7 +392,29 @@ protected function addPortToDomain($domain) */ protected function getRouteRoot($route, $domain) { - return $this->getRootUrl($this->getScheme($route->secure()), $domain); + return $this->getRootUrl($this->getRouteScheme($route), $domain); + } + + /** + * Get the scheme for the given route. + * + * @param \Illumiante\Routing\Route $route + * @return string + */ + protected function getRouteScheme($route) + { + if ($route->httpOnly()) + { + return $this->getScheme(false); + } + elseif ($route->httpsOnly()) + { + return $this->getScheme(true); + } + else + { + return $this->getScheme(null); + } } /** diff --git a/vendor/laravel/framework/src/Illuminate/Routing/composer.json b/vendor/laravel/framework/src/Illuminate/Routing/composer.json index 17f16ce36..33a679bb3 100755 --- a/vendor/laravel/framework/src/Illuminate/Routing/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Routing/composer.json @@ -8,17 +8,17 @@ } ], "require": { - "illuminate/container": "4.1.x", - "illuminate/http": "4.1.x", - "illuminate/session": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/container": "4.1.*", + "illuminate/http": "4.1.*", + "illuminate/session": "4.1.*", + "illuminate/support": "4.1.*", "symfony/http-foundation": "2.4.*", "symfony/http-kernel": "2.4.*", "symfony/routing": "2.4.*" }, "require-dev": { - "illuminate/console": "4.1.x", - "illuminate/filesystem": "4.1.x", + "illuminate/console": "4.1.*", + "illuminate/filesystem": "4.1.*", "mockery/mockery": "0.7.2", "phpunit/phpunit": "3.7.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/Session/Middleware.php b/vendor/laravel/framework/src/Illuminate/Session/Middleware.php index 144fd97f9..2a460adc4 100755 --- a/vendor/laravel/framework/src/Illuminate/Session/Middleware.php +++ b/vendor/laravel/framework/src/Illuminate/Session/Middleware.php @@ -1,5 +1,6 @@ app = $app; + $this->reject = $reject; $this->manager = $manager; } @@ -47,12 +57,16 @@ public function __construct(HttpKernelInterface $app, SessionManager $manager) */ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true) { + $this->checkRequestForArraySessions($request); + // If a session driver has been configured, we will need to start the session here // so that the data is ready for an application. Note that the Laravel sessions // do not make use of PHP "native" sessions in any way since they are crappy. if ($this->sessionConfigured()) { $session = $this->startSession($request); + + $request->setSession($session); } $response = $this->app->handle($request, $type, $catch); @@ -70,6 +84,22 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ return $response; } + /** + * Check the request and reject callback for array sessions. + * + * @param \Symfony\Component\HttpFoundation\Request $request + * @return void + */ + public function checkRequestForArraySessions(Request $request) + { + if (is_null($this->reject)) return; + + if (call_user_func($this->reject, $request)) + { + $this->manager->setDefaultDriver('array'); + } + } + /** * Start the session for the given request. * diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php index 866c06143..26f0fc8a3 100755 --- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php +++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php @@ -5,6 +5,17 @@ */ class Cookie extends Facade { + /** + * Determine if a cookie exists on the request. + * + * @param string $key + * @return bool + */ + public static function has($key) + { + return ! is_null(static::$app['request']->cookie($key, null)); + } + /** * Retrieve a cookie from the request. * diff --git a/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php index d93c812a0..346e6c7ea 100755 --- a/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php +++ b/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php @@ -169,6 +169,16 @@ public function provides() return array(); } + /** + * Get the events that trigger this service provider to register. + * + * @return array + */ + public function when() + { + return array(); + } + /** * Determine if the provider is deferred. * diff --git a/vendor/laravel/framework/src/Illuminate/Support/helpers.php b/vendor/laravel/framework/src/Illuminate/Support/helpers.php index f61ceb784..3c3e2791c 100755 --- a/vendor/laravel/framework/src/Illuminate/Support/helpers.php +++ b/vendor/laravel/framework/src/Illuminate/Support/helpers.php @@ -852,6 +852,22 @@ function str_is($pattern, $value) } } +if ( ! function_exists('str_limit')) +{ + /** + * Limit the number of characters in a string. + * + * @param string $value + * @param int $limit + * @param string $end + * @return string + */ + function str_limit($value, $limit = 100, $end = '...') + { + return Illuminate\Support\Str::limit($value, $limit, $end); + } +} + if ( ! function_exists('str_plural')) { /** diff --git a/vendor/laravel/framework/src/Illuminate/Translation/composer.json b/vendor/laravel/framework/src/Illuminate/Translation/composer.json index 7a4b0145f..7b836bf23 100755 --- a/vendor/laravel/framework/src/Illuminate/Translation/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Translation/composer.json @@ -9,8 +9,8 @@ ], "require": { "php": ">=5.3.0", - "illuminate/filesystem": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/filesystem": "4.1.*", + "illuminate/support": "4.1.*", "symfony/translation": "2.4.*" }, "require-dev": { diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php index dc450a720..e3114c2a7 100755 --- a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php +++ b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php @@ -750,7 +750,7 @@ protected function validateMax($attribute, $value, $parameters) return $this->getSize($attribute, $value) <= $parameters[0]; } - /* + /** * Get the size of an attribute. * * @param string $attribute diff --git a/vendor/laravel/framework/src/Illuminate/Validation/composer.json b/vendor/laravel/framework/src/Illuminate/Validation/composer.json index ff713a016..a6410794c 100755 --- a/vendor/laravel/framework/src/Illuminate/Validation/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Validation/composer.json @@ -9,13 +9,13 @@ ], "require": { "php": ">=5.3.0", - "illuminate/container": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/container": "4.1.*", + "illuminate/support": "4.1.*", "symfony/http-foundation": "2.4.*", "symfony/translation": "2.4.*" }, "require-dev": { - "illuminate/database": "4.1.x", + "illuminate/database": "4.1.*", "mockery/mockery": "0.7.2", "phpunit/phpunit": "3.7.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/View/composer.json b/vendor/laravel/framework/src/Illuminate/View/composer.json index 24c67a5fb..038dda6f5 100755 --- a/vendor/laravel/framework/src/Illuminate/View/composer.json +++ b/vendor/laravel/framework/src/Illuminate/View/composer.json @@ -9,10 +9,10 @@ ], "require": { "php": ">=5.3.0", - "illuminate/container": "4.1.x", - "illuminate/events": "4.1.x", - "illuminate/filesystem": "4.1.x", - "illuminate/support": "4.1.x" + "illuminate/container": "4.1.*", + "illuminate/events": "4.1.*", + "illuminate/filesystem": "4.1.*", + "illuminate/support": "4.1.*" }, "require-dev": { "mockery/mockery": "0.7.2", diff --git a/vendor/laravel/framework/src/Illuminate/Workbench/composer.json b/vendor/laravel/framework/src/Illuminate/Workbench/composer.json index 14a012c7a..741242b16 100755 --- a/vendor/laravel/framework/src/Illuminate/Workbench/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Workbench/composer.json @@ -8,12 +8,12 @@ } ], "require": { - "illuminate/filesystem": "4.1.x", - "illuminate/support": "4.1.x", + "illuminate/filesystem": "4.1.*", + "illuminate/support": "4.1.*", "symfony/finder": "2.4.*" }, "require-dev": { - "illuminate/console": "4.1.x", + "illuminate/console": "4.1.*", "mockery/mockery": "0.7.2", "phpunit/phpunit": "3.7.*" }, diff --git a/vendor/laravel/framework/src/Illuminate/Workbench/stubs/composer.json b/vendor/laravel/framework/src/Illuminate/Workbench/stubs/composer.json index 1d522b5cb..680233981 100755 --- a/vendor/laravel/framework/src/Illuminate/Workbench/stubs/composer.json +++ b/vendor/laravel/framework/src/Illuminate/Workbench/stubs/composer.json @@ -19,5 +19,5 @@ "{{vendor}}\\{{name}}\\": "src/" } }, - "minimum-stability": "dev" + "minimum-stability": "stable" } diff --git a/vendor/laravel/framework/src/Illuminate/Workbench/stubs/plain.composer.json b/vendor/laravel/framework/src/Illuminate/Workbench/stubs/plain.composer.json index 8a65fbd93..46518df2e 100755 --- a/vendor/laravel/framework/src/Illuminate/Workbench/stubs/plain.composer.json +++ b/vendor/laravel/framework/src/Illuminate/Workbench/stubs/plain.composer.json @@ -9,12 +9,12 @@ ], "require": { "php": ">=5.3.0", - "illuminate/support": "4.1.x" + "illuminate/support": "4.1.*" }, "autoload": { "psr-0": { "{{vendor}}\\{{name}}": "src/" } }, - "minimum-stability": "dev" + "minimum-stability": "stable" } \ No newline at end of file diff --git a/vendor/monolog/monolog/composer.json b/vendor/monolog/monolog/composer.json index 0939dd494..9b1531943 100755 --- a/vendor/monolog/monolog/composer.json +++ b/vendor/monolog/monolog/composer.json @@ -19,7 +19,7 @@ "require-dev": { "phpunit/phpunit": "~3.7.0", "mlehner/gelf-php": "1.0.*", - "raven/raven": "0.5.*", + "raven/raven": "~0.5", "ruflin/elastica": "0.90.*", "doctrine/couchdb": "dev-master", "aws/aws-sdk-php": "~2.4.8" diff --git a/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php b/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php index 9e4201ab3..5d345d53c 100755 --- a/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php +++ b/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php @@ -11,8 +11,6 @@ namespace Monolog\Formatter; -use Monolog\Formatter\NormalizerFormatter; - /** * Formats data into an associative array of scalar values. * Objects and arrays will be JSON encoded. diff --git a/vendor/monolog/monolog/src/Monolog/Logger.php b/vendor/monolog/monolog/src/Monolog/Logger.php index 82a222912..4a74db351 100755 --- a/vendor/monolog/monolog/src/Monolog/Logger.php +++ b/vendor/monolog/monolog/src/Monolog/Logger.php @@ -344,7 +344,7 @@ public function addAlert($message, array $context = array()) */ public function addEmergency($message, array $context = array()) { - return $this->addRecord(static::EMERGENCY, $message, $context); + return $this->addRecord(static::EMERGENCY, $message, $context); } /** diff --git a/vendor/phpseclib/phpseclib/composer.json b/vendor/phpseclib/phpseclib/composer.json index 515a426a4..9bb5cb4b0 100755 --- a/vendor/phpseclib/phpseclib/composer.json +++ b/vendor/phpseclib/phpseclib/composer.json @@ -54,7 +54,7 @@ "suggest": { "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.", "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", - "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP >= 4.3.3." + "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP >= 4.3.3." }, "include-path": ["phpseclib/"], "autoload": { diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php index 7e5a6c59f..148bee463 100755 --- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php @@ -104,11 +104,11 @@ class Crypt_RC4 extends Crypt_Base /** * Block Length of the cipher * - * RC4 is a stream cipher + * RC4 is a stream cipher * so we the block_size to 0 * * @see Crypt_Base::block_size - * @var Integer + * @var Integer * @access private */ var $block_size = 0; diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php b/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php index df22de81a..0e0004ce2 100755 --- a/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php +++ b/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php @@ -16,10 +16,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -557,4 +557,4 @@ function getHistory() return '
' . $scrollback . '
'; } -} \ No newline at end of file +} diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/X509.php b/vendor/phpseclib/phpseclib/phpseclib/File/X509.php index c558bf499..9e7b0b3b9 100755 --- a/vendor/phpseclib/phpseclib/phpseclib/File/X509.php +++ b/vendor/phpseclib/phpseclib/phpseclib/File/X509.php @@ -7,7 +7,7 @@ * * Encode and decode X.509 certificates. * - * The extensions are from {@link http://tools.ietf.org/html/rfc5280 RFC5280} and + * The extensions are from {@link http://tools.ietf.org/html/rfc5280 RFC5280} and * {@link http://web.archive.org/web/19961027104704/http://www3.netscape.com/eng/security/cert-exts.html Netscape Certificate Extensions}. * * Note that loading an X.509 certificate and resaving it may invalidate the signature. The reason being that the signature is based on a @@ -22,10 +22,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -248,7 +248,7 @@ class File_X509 * The signature subject * * There's no guarantee File_X509 is going to reencode an X.509 cert in the same way it was originally - * encoded so we take save the portion of the original cert that the signature would have made for. + * encoded so we take save the portion of the original cert that the signature would have made for. * * @var String * @access private diff --git a/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php index fcd43906b..4cfa35700 100755 --- a/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php @@ -29,10 +29,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -151,7 +151,7 @@ function Net_SCP($ssh) * So, for example, if you set $data to 'filename.ext' and then do Net_SCP::get(), you will get a file, twelve bytes * long, containing 'filename.ext' as its contents. * - * Setting $mode to NET_SCP_LOCAL_FILE will change the above behavior. With NET_SCP_LOCAL_FILE, $remote_file will + * Setting $mode to NET_SCP_LOCAL_FILE will change the above behavior. With NET_SCP_LOCAL_FILE, $remote_file will * contain as many bytes as filename.ext does on your local filesystem. If your filename.ext is 1MB then that is how * large $remote_file will be, as well. * diff --git a/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php index 56a366274..48b79b3ef 100755 --- a/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php @@ -13,10 +13,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -517,7 +517,7 @@ function _rename($path_from, $path_to) * Open directory handle * * The only $options is "whether or not to enforce safe_mode (0x04)". Since safe mode was deprecated in 5.3 and - * removed in 5.4 I'm just going to ignore it + * removed in 5.4 I'm just going to ignore it * * @param String $path * @param Integer $options diff --git a/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf b/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf index 6baa56610..2b8b52f9f 100755 --- a/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf +++ b/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf @@ -3,4 +3,4 @@ HOME = . RANDFILE = $ENV::HOME/.rnd -[ v3_ca ] \ No newline at end of file +[ v3_ca ] diff --git a/vendor/phpseclib/phpseclib/tests/Crypt/RSA/LoadKeyTest.php b/vendor/phpseclib/phpseclib/tests/Crypt/RSA/LoadKeyTest.php index 7ffbd4d66..9ef33065f 100755 --- a/vendor/phpseclib/phpseclib/tests/Crypt/RSA/LoadKeyTest.php +++ b/vendor/phpseclib/phpseclib/tests/Crypt/RSA/LoadKeyTest.php @@ -120,4 +120,4 @@ public function testRawPKCS1Key() $this->assertTrue($rsa->loadKey($key)); } -} \ No newline at end of file +} diff --git a/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php b/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php index 01edc475e..ceac1f4a2 100755 --- a/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php +++ b/vendor/phpseclib/phpseclib/tests/Math/BigInteger/TestCase.php @@ -24,7 +24,7 @@ public function getInstance($x = 0, $base = 10) public function testConstructorBase2() { // 2**65 = 36893488147419103232 - $this->assertSame('36893488147419103232', (string) $this->getInstance('1' . str_repeat('0', 65), 2)); + $this->assertSame('36893488147419103232', (string) $this->getInstance('1' . str_repeat('0', 65), 2)); } public function testConstructorBase10() diff --git a/vendor/phpseclib/phpseclib/tests/Net/SSH2Test.php b/vendor/phpseclib/phpseclib/tests/Net/SSH2Test.php index 3177a3233..1f0eca9ff 100755 --- a/vendor/phpseclib/phpseclib/tests/Net/SSH2Test.php +++ b/vendor/phpseclib/phpseclib/tests/Net/SSH2Test.php @@ -18,7 +18,7 @@ private function createSSHMock() ->setMethods(array('__destruct')) ->getMock(); } - + public function formatLogDataProvider() { return array( @@ -46,7 +46,7 @@ public function testFormatLog(array $message_log, array $message_number_log, $ex $result = $ssh->_format_log($message_log, $message_number_log); $this->assertEquals($expected, $result); } - + public function generateIdentifierProvider() { return array( diff --git a/vendor/predis/predis/CHANGELOG.md b/vendor/predis/predis/CHANGELOG.md index e8b42e256..6b161a292 100755 --- a/vendor/predis/predis/CHANGELOG.md +++ b/vendor/predis/predis/CHANGELOG.md @@ -1,4 +1,4 @@ -v0.8.5 (2013-xx-xx) +v0.8.5 (2014-01-16) ================================================================================ - Added `2.8` in the server profiles aliases list for Redis 2.8. `2.6` is still diff --git a/vendor/predis/predis/VERSION b/vendor/predis/predis/VERSION index a4a5561f1..7ada0d303 100755 --- a/vendor/predis/predis/VERSION +++ b/vendor/predis/predis/VERSION @@ -1 +1 @@ -0.8.5-dev +0.8.5 diff --git a/vendor/predis/predis/lib/Predis/Client.php b/vendor/predis/predis/lib/Predis/Client.php index 44f7d91eb..d501df967 100755 --- a/vendor/predis/predis/lib/Predis/Client.php +++ b/vendor/predis/predis/lib/Predis/Client.php @@ -30,7 +30,7 @@ */ class Client implements ClientInterface { - const VERSION = '0.8.5-dev'; + const VERSION = '0.8.5'; private $options; private $profile; diff --git a/vendor/predis/predis/package.ini b/vendor/predis/predis/package.ini index c37ad9259..06f3e97dd 100755 --- a/vendor/predis/predis/package.ini +++ b/vendor/predis/predis/package.ini @@ -11,7 +11,7 @@ desc = "Flexible and feature-complete PHP client library for Redis" homepage = "http://github.com/nrk/predis" license = "MIT" version = "0.8.5" -stability = "devel" +stability = "stable" channel = "pear.nrk.io" author = "Daniele Alessandri \"nrk\" " diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php index f087a3dac..31de587c5 100755 --- a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php +++ b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php @@ -12,7 +12,7 @@ trait LoggerAwareTrait /** * Sets a logger. - * + * * @param LoggerInterface $logger */ public function setLogger(LoggerInterface $logger) diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php b/vendor/psr/log/Psr/Log/LoggerTrait.php index 591249600..85597f516 100755 --- a/vendor/psr/log/Psr/Log/LoggerTrait.php +++ b/vendor/psr/log/Psr/Log/LoggerTrait.php @@ -6,8 +6,8 @@ * This is a simple Logger trait that classes unable to extend AbstractLogger * (because they extend another class, etc) can include. * - * It simply delegates all log-level-specific methods to the `log` method to - * reduce boilerplate code that a simple Logger that does the same thing with + * It simply delegates all log-level-specific methods to the `log` method to + * reduce boilerplate code that a simple Logger that does the same thing with * messages regardless of the error level has to implement. */ trait LoggerTrait diff --git a/vendor/stack/builder/.travis.yml b/vendor/stack/builder/.travis.yml index 79b0800fe..1d50df4d1 100755 --- a/vendor/stack/builder/.travis.yml +++ b/vendor/stack/builder/.travis.yml @@ -5,9 +5,15 @@ php: - 5.3 - 5.4 - 5.5 + - hhvm before_script: - composer self-update - - composer install --prefer-source + - composer install --no-interaction --prefer-source script: phpunit --coverage-text + +matrix: + allow_failures: + - php: hhvm + fast_finish: true