diff --git a/application/vendor/autoload.php b/application/vendor/autoload.php
index 17999af..59fc4d5 100644
--- a/application/vendor/autoload.php
+++ b/application/vendor/autoload.php
@@ -2,6 +2,6 @@
// autoload.php @generated by Composer
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit43265f891b9f29a025a40de9ffd797c4::getLoader();
diff --git a/application/vendor/bin/classpreloader.php b/application/vendor/bin/classpreloader.php
deleted file mode 100644
index 164d33b..0000000
--- a/application/vendor/bin/classpreloader.php
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env sh
-
-dir=$(d=${0%[/\\]*}; cd "$d"; cd "../classpreloader/classpreloader" && pwd)
-
-# See if we are running in Cygwin by checking for cygpath program
-if command -v 'cygpath' >/dev/null 2>&1; then
- # Cygwin paths start with /cygdrive/ which will break windows PHP,
- # so we need to translate the dir path to windows format. However
- # we could be using cygwin PHP which does not require this, so we
- # test if the path to PHP starts with /cygdrive/ rather than /usr/bin
- if [[ $(which php) == /cygdrive/* ]]; then
- dir=$(cygpath -m $dir);
- fi
-fi
-
-dir=$(echo $dir | sed 's/ /\ /g')
-"${dir}/classpreloader.php" "$@"
diff --git a/application/vendor/bin/classpreloader.php.bat b/application/vendor/bin/classpreloader.php.bat
deleted file mode 100644
index 3dbe836..0000000
--- a/application/vendor/bin/classpreloader.php.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@ECHO OFF
-SET BIN_TARGET=%~dp0/../classpreloader/classpreloader/classpreloader.php
-php "%BIN_TARGET%" %*
diff --git a/application/vendor/bin/php-parse b/application/vendor/bin/php-parse
new file mode 100644
index 0000000..76d2d68
--- /dev/null
+++ b/application/vendor/bin/php-parse
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+dir=$(cd "${0%[/\\]*}" > /dev/null; cd '../nikic/php-parser/bin' && pwd)
+
+if [ -d /proc/cygdrive ]; then
+ case $(which php) in
+ $(readlink -n /proc/cygdrive)/*)
+ # We are in Cygwin using Windows php, so the path must be translated
+ dir=$(cygpath -m "$dir");
+ ;;
+ esac
+fi
+
+"${dir}/php-parse" "$@"
diff --git a/application/vendor/bin/psysh b/application/vendor/bin/psysh
index cad93e4..e43e1bb 100644
--- a/application/vendor/bin/psysh
+++ b/application/vendor/bin/psysh
@@ -1,123 +1,14 @@
-#!/usr/bin/env php
- /dev/null; cd '../psy/psysh/bin' && pwd)
-/* <<< */
-if (is_file(__DIR__ . '/../vendor/autoload.php')) {
- require(__DIR__ . '/../vendor/autoload.php');
-} elseif (is_file(__DIR__ . '/../../../autoload.php')) {
- require(__DIR__ . '/../../../autoload.php');
-} else {
- die(
- 'You must set up the Psy Shell dependencies, run the following commands:' . PHP_EOL .
- 'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
- 'php composer.phar install' . PHP_EOL
- );
-}
-/* >>> */
+if [ -d /proc/cygdrive ]; then
+ case $(which php) in
+ $(readlink -n /proc/cygdrive)/*)
+ # We are in Cygwin using Windows php, so the path must be translated
+ dir=$(cygpath -m "$dir");
+ ;;
+ esac
+fi
-use Psy\Configuration;
-use Psy\Shell;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
-// If the psysh binary was included directly, assume they just wanted an
-// autoloader and bail early.
-if (version_compare(PHP_VERSION, '5.3.6', '<')) {
- $trace = debug_backtrace();
-} elseif (version_compare(PHP_VERSION, '5.4.0', '<')) {
- $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-} else {
- $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-}
-
-if (Shell::isIncluded($trace)) {
- unset($trace);
-
- return;
-}
-
-// Clean up after ourselves.
-unset($trace);
-
-call_user_func(function() {
- $usageException = null;
-
- $input = new ArgvInput();
- try {
- $input->bind(new InputDefinition(array(
- new InputOption('help', 'h', InputOption::VALUE_NONE),
- new InputOption('config', 'c', InputOption::VALUE_REQUIRED),
- new InputOption('version', 'v', InputOption::VALUE_NONE),
-
- new InputArgument('include', InputArgument::IS_ARRAY),
- )));
- } catch (\RuntimeException $e) {
- $usageException = $e;
- }
-
- $config = array();
-
- // Handle --config
- if ($configFile = $input->getOption('config')) {
- $config['configFile'] = $configFile;
- }
-
- $shell = new Shell(new Configuration($config));
-
- // Handle --help
- if ($usageException !== null || $input->getOption('help')) {
- if ($usageException !== null) {
- echo $usageException->getMessage() . PHP_EOL . PHP_EOL;
- }
-
- $version = $shell->getVersion();
- $name = basename(reset($_SERVER['argv']));
- echo <<
getOption('version')) {
- echo $shell->getVersion() . PHP_EOL;
- exit(0);
- }
-
- // Pass additional arguments to Shell as 'includes'
- $shell->setIncludes($input->getArgument('include'));
-
- try {
- // And go!
- $shell->run();
- } catch (Exception $e) {
- echo $e->getMessage() . PHP_EOL;
-
- // TODO: this triggers the "exited unexpectedly" logic in the
- // ForkingLoop, so we can't exit(1) after starting the shell...
- // fix this :)
-
- // exit(1);
- }
-});
+"${dir}/psysh" "$@"
diff --git a/application/vendor/bin/upgrade-carbon b/application/vendor/bin/upgrade-carbon
new file mode 100644
index 0000000..bbe6340
--- /dev/null
+++ b/application/vendor/bin/upgrade-carbon
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+dir=$(cd "${0%[/\\]*}" > /dev/null; cd '../nesbot/carbon/bin' && pwd)
+
+if [ -d /proc/cygdrive ]; then
+ case $(which php) in
+ $(readlink -n /proc/cygdrive)/*)
+ # We are in Cygwin using Windows php, so the path must be translated
+ dir=$(cygpath -m "$dir");
+ ;;
+ esac
+fi
+
+"${dir}/upgrade-carbon" "$@"
diff --git a/application/vendor/classpreloader/classpreloader/.styleci.yml b/application/vendor/classpreloader/classpreloader/.styleci.yml
deleted file mode 100644
index 219abb7..0000000
--- a/application/vendor/classpreloader/classpreloader/.styleci.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-preset: recommended
-
-disabled:
- - short_array_syntax
diff --git a/application/vendor/classpreloader/classpreloader/LICENSE b/application/vendor/classpreloader/classpreloader/LICENSE
index 467a643..5e3bcbb 100644
--- a/application/vendor/classpreloader/classpreloader/LICENSE
+++ b/application/vendor/classpreloader/classpreloader/LICENSE
@@ -1,7 +1,7 @@
The MIT License (MIT)
Copyright (c) 2013-2014 Michael Dowling
-Copyright (c) 2014-2015 Graham Campbell
+Copyright (c) 2014-2017 Graham Campbell
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/application/vendor/classpreloader/classpreloader/classpreloader.php b/application/vendor/classpreloader/classpreloader/classpreloader.php
deleted file mode 100644
index 81e654d..0000000
--- a/application/vendor/classpreloader/classpreloader/classpreloader.php
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/env php
-
- * (c) Michael Dowling
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (file_exists($autoloadPath = __DIR__.'/../../autoload.php')) {
- require_once $autoloadPath;
-} else {
- require_once __DIR__.'/vendor/autoload.php';
-}
-
-$application = new ClassPreloader\Application();
-$application->run();
diff --git a/application/vendor/classpreloader/classpreloader/composer.json b/application/vendor/classpreloader/classpreloader/composer.json
index a9240e7..307d2f9 100644
--- a/application/vendor/classpreloader/classpreloader/composer.json
+++ b/application/vendor/classpreloader/classpreloader/composer.json
@@ -10,18 +10,15 @@
},
{
"name": "Graham Campbell",
- "email": "graham@cachethq.io"
+ "email": "graham@alt-three.com"
}
],
"require":{
- "php": ">=5.3.3",
- "symfony/console": "~2.1",
- "symfony/filesystem": "~2.1",
- "symfony/finder": "~2.1",
- "nikic/php-parser": "~1.3"
+ "php": ">=5.5.9",
+ "nikic/php-parser": "^1.0|^2.0|^3.0"
},
"require-dev":{
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "^4.8|^5.0"
},
"autoload": {
"psr-4": {
@@ -31,10 +28,14 @@
"autoload-dev": {
"classmap": ["tests/stubs/"]
},
- "bin": ["classpreloader.php"],
+ "config": {
+ "preferred-install": "dist"
+ },
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "3.2-dev"
}
- }
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true
}
diff --git a/application/vendor/classpreloader/classpreloader/src/Application.php b/application/vendor/classpreloader/classpreloader/src/Application.php
deleted file mode 100644
index 62951c1..0000000
--- a/application/vendor/classpreloader/classpreloader/src/Application.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- * (c) Michael Dowling
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ClassPreloader;
-
-use Symfony\Component\Console\Application as BaseApplication;
-use Symfony\Component\Finder\Finder;
-
-/**
- * This is the application class.
- *
- * This is sets everything up for the CLI.
- */
-class Application extends BaseApplication
-{
- /**
- * Create a new application.
- *
- * @return void
- */
- public function __construct()
- {
- parent::__construct('Class Preloader', '1.4');
-
- // Create a finder to find each non-abstract command in the filesystem
- $finder = new Finder();
- $finder->files()
- ->in(__DIR__.'/Command')
- ->notName('Abstract*')
- ->name('*.php');
-
- // Add each command to the CLI
- foreach ($finder as $file) {
- $filename = str_replace('\\', '/', $file->getRealpath());
- $pos = strripos($filename, '/ClassPreloader/') + strlen('/ClassPreloader/src/');
- $class = __NAMESPACE__.'\\'
- .substr(str_replace('/', '\\', substr($filename, $pos)), 0, -4);
- $this->add(new $class());
- }
- }
-}
diff --git a/application/vendor/classpreloader/classpreloader/src/ClassList.php b/application/vendor/classpreloader/classpreloader/src/ClassList.php
index 663c01b..cff1a5a 100644
--- a/application/vendor/classpreloader/classpreloader/src/ClassList.php
+++ b/application/vendor/classpreloader/classpreloader/src/ClassList.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
@@ -34,7 +34,7 @@ class ClassList
protected $current;
/**
- * Create a new class list.
+ * Create a new class list instance.
*
* @return void
*/
@@ -103,7 +103,7 @@ public function push($value)
*/
public function getClasses()
{
- $classes = array();
+ $classes = [];
$current = $this->head;
while ($current && $current->value) {
$classes[] = $current->value;
diff --git a/application/vendor/classpreloader/classpreloader/src/ClassLoader.php b/application/vendor/classpreloader/classpreloader/src/ClassLoader.php
index 677f2dd..7016f3b 100644
--- a/application/vendor/classpreloader/classpreloader/src/ClassLoader.php
+++ b/application/vendor/classpreloader/classpreloader/src/ClassLoader.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
@@ -12,9 +12,6 @@
namespace ClassPreloader;
-require_once __DIR__.'/ClassNode.php';
-require_once __DIR__.'/ClassList.php';
-
/**
* This is the class loader class.
*
@@ -32,7 +29,7 @@ class ClassLoader
public $classList;
/**
- * Create a new class loader.
+ * Create a new class loader instance.
*
* @return void
*/
@@ -81,7 +78,7 @@ public static function getIncludes($func)
*/
public function register()
{
- spl_autoload_register(array($this, 'loadClass'), true, true);
+ spl_autoload_register([$this, 'loadClass'], true, true);
}
/**
@@ -91,7 +88,7 @@ public function register()
*/
public function unregister()
{
- spl_autoload_unregister(array($this, 'loadClass'));
+ spl_autoload_unregister([$this, 'loadClass']);
}
/**
@@ -101,7 +98,7 @@ public function unregister()
*
* @param string $class
*
- * @return bool|null
+ * @return bool
*/
public function loadClass($class)
{
@@ -127,7 +124,7 @@ public function loadClass($class)
*/
public function getFilenames()
{
- $files = array();
+ $files = [];
foreach ($this->classList->getClasses() as $class) {
// Push interfaces before classes if not already loaded
try {
@@ -142,17 +139,9 @@ public function getFilenames()
$files[] = $r->getFileName();
}
} catch (\ReflectionException $e) {
- // We ignore all exceptions related to reflection,
- // because in some cases class can't exists. This
- // can be if you use in your code constructions like
- //
- // if (class_exists('SomeClass')) { // <-- here will trigger autoload
- // class SomeSuperClass extends SomeClass {
- // }
- // }
- //
- // We ignore all problems with classes, interfaces and
- // traits.
+ // We ignore all exceptions related to reflection because in
+ // some cases class doesn't need to exist. We're ignoring all
+ // problems with classes, interfaces and traits.
}
}
diff --git a/application/vendor/classpreloader/classpreloader/src/ClassNode.php b/application/vendor/classpreloader/classpreloader/src/ClassNode.php
index 7f2602b..b227a05 100644
--- a/application/vendor/classpreloader/classpreloader/src/ClassNode.php
+++ b/application/vendor/classpreloader/classpreloader/src/ClassNode.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
@@ -41,7 +41,7 @@ class ClassNode
public $value;
/**
- * Create a new class node.
+ * Create a new class node instance.
*
* @param mixed $value
* @param \ClassPreloader\ClassNode|null $prev
diff --git a/application/vendor/classpreloader/classpreloader/src/ClassPreloader.php b/application/vendor/classpreloader/classpreloader/src/ClassPreloader.php
new file mode 100644
index 0000000..48c8102
--- /dev/null
+++ b/application/vendor/classpreloader/classpreloader/src/ClassPreloader.php
@@ -0,0 +1,179 @@
+
+ * (c) Michael Dowling
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassPreloader;
+
+use ClassPreloader\Parser\NodeTraverser;
+use PhpParser\Node\Stmt\Namespace_ as NamespaceNode;
+use PhpParser\Parser;
+use PhpParser\PrettyPrinter\Standard as PrettyPrinter;
+use RuntimeException;
+
+/**
+ * This is the class preloader class.
+ *
+ * This is the main point of entry for interacting with this package.
+ */
+class ClassPreloader
+{
+ /**
+ * The printer.
+ *
+ * @var \PhpParser\PrettyPrinter\Standard
+ */
+ protected $printer;
+
+ /**
+ * The parser.
+ *
+ * @var \PhpParser\Parser
+ */
+ protected $parser;
+
+ /**
+ * The traverser.
+ *
+ * @var \ClassPreloader\Parser\NodeTraverser
+ */
+ protected $traverser;
+
+ /**
+ * Create a new class preloader instance.
+ *
+ * @param \PhpParser\PrettyPrinter\Standard $printer
+ * @param \PhpParser\Parser $parser
+ * @param \ClassPreloader\Parser\NodeTraverser $traverser
+ *
+ * @return void
+ */
+ public function __construct(PrettyPrinter $printer, Parser $parser, NodeTraverser $traverser)
+ {
+ $this->printer = $printer;
+ $this->parser = $parser;
+ $this->traverser = $traverser;
+ }
+
+ /**
+ * Prepare the output file and directory.
+ *
+ * @param string $output
+ * @param bool $strict
+ *
+ * @throws \RuntimeException
+ *
+ * @return resource
+ */
+ public function prepareOutput($output, $strict = false)
+ {
+ if ($strict && version_compare(PHP_VERSION, '7') < 1) {
+ throw new RuntimeException('Strict mode requires PHP 7 or greater.');
+ }
+
+ $dir = dirname($output);
+
+ if (!is_dir($dir) && !mkdir($dir, 0777, true)) {
+ throw new RuntimeException("Unable to create directory $dir.");
+ }
+
+ $handle = fopen($output, 'w');
+
+ if (!$handle) {
+ throw new RuntimeException("Unable to open $output for writing.");
+ }
+
+ if ($strict) {
+ fwrite($handle, "parser->parse($content);
+ $stmts = $this->traverser->traverseFile($parsed, $file);
+ $pretty = $this->printer->prettyPrint($stmts);
+
+ $pretty = preg_replace(
+ '#^(<\?php)?[\s]*(/\*\*?.*?\*/)?[\s]*(declare[\s]*\([\s]*strict_types[\s]*=[\s]*1[\s]*\);)?#s',
+ '',
+ $pretty
+ );
+
+ return $this->getCodeWrappedIntoNamespace($parsed, $pretty);
+ }
+
+ /**
+ * Wrap the code into a namespace.
+ *
+ * @param array $parsed
+ * @param string $pretty
+ *
+ * @return string
+ */
+ protected function getCodeWrappedIntoNamespace(array $parsed, $pretty)
+ {
+ if ($this->parsedCodeHasNamespaces($parsed)) {
+ $pretty = preg_replace('/^\s*(namespace.*);/im', '${1} {', $pretty, 1)."\n}\n";
+ } else {
+ $pretty = sprintf("namespace {\n%s\n}\n", $pretty);
+ }
+
+ return preg_replace('/(?
- * (c) Michael Dowling
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ClassPreloader\Command;
-
-use ClassPreloader\Config;
-use ClassPreloader\Exception\SkipFileException;
-use ClassPreloader\Parser\DirVisitor;
-use ClassPreloader\Parser\FileVisitor;
-use ClassPreloader\Parser\NodeTraverser;
-use PhpParser\Lexer;
-use PhpParser\Node\Stmt\Namespace_ as NamespaceNode;
-use PhpParser\Parser;
-use PhpParser\PrettyPrinter\Standard as PrettyPrinter;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Filesystem\Filesystem;
-
-/**
- * This is the pre-compile command class.
- *
- * This allows the user to communicate with class preloader.
- */
-class PreCompileCommand extends Command
-{
- /**
- * The printer.
- *
- * @var \PhpParser\PrettyPrinter\Standard
- */
- protected $printer;
-
- /**
- * The parser.
- *
- * @var \PhpParser\Parser
- */
- protected $parser;
-
- /**
- * The input.
- *
- * @var \Symfony\Component\Console\Input\InputInterface|null
- */
- protected $input;
-
- /**
- * The output.
- *
- * @var \Symfony\Component\Console\Output\OutputInterface|null
- */
- protected $output;
-
- /**
- * The traverser.
- *
- * @var \ClassPreloader\Parser\NodeTraverser|null
- */
- protected $traverser;
-
- /**
- * Create a new pre-compile command.
- *
- * @return void
- */
- public function __construct()
- {
- parent::__construct();
- $this->printer = new PrettyPrinter();
- $this->parser = new Parser(new Lexer());
- }
-
- /**
- * Configure the current command.
- *
- * @return void
- */
- protected function configure()
- {
- parent::configure();
-
- $this->setName('compile')
- ->setDescription('Compiles classes into a single file')
- ->addOption('config', null, InputOption::VALUE_REQUIRED, 'CSV of filenames to load, or the path to a PHP script that returns an array of file names')
- ->addOption('output', null, InputOption::VALUE_REQUIRED)
- ->addOption('skip_dir_file', null, InputOption::VALUE_NONE, 'Skip files with __DIR__ or __FILE__ to make the cache portable')
- ->addOption('fix_dir', null, InputOption::VALUE_REQUIRED, 'Convert __DIR__ constants to the original directory of a file', 1)
- ->addOption('fix_file', null, InputOption::VALUE_REQUIRED, 'Convert __FILE__ constants to the original path of a file', 1)
- ->addOption('strip_comments', null, InputOption::VALUE_REQUIRED, 'Set to 1 to strip comments from each source file', 0)
- ->setHelp(<<%command.name% command iterates over each script, normalizes
-the file to be wrapped in namespaces, and combines each file into a single PHP
-file.
-EOF
- );
- }
-
- /**
- * Get the node traverser used by the command.
- *
- * @return \ClassPreloader\Parser\NodeTraverser
- */
- protected function getTraverser()
- {
- if (!$this->traverser) {
- $this->traverser = new NodeTraverser();
- if ($this->input->getOption('fix_dir')) {
- $this->traverser->addVisitor(new DirVisitor($this->input->getOption('skip_dir_file')));
- }
- if ($this->input->getOption('fix_file')) {
- $this->traverser->addVisitor(new FileVisitor($this->input->getOption('skip_dir_file')));
- }
- }
-
- return $this->traverser;
- }
-
- /**
- * Get a pretty printed string of code from a file while applying visitors.
- *
- * @param string $file
- *
- * @throws \RuntimeException
- *
- * @return string
- */
- protected function getCode($file)
- {
- if (!is_readable($file)) {
- throw new \RuntimeException("Cannot open {$file} for reading");
- }
-
- if ($this->input->getOption('strip_comments')) {
- $content = php_strip_whitespace($file);
- } else {
- $content = file_get_contents($file);
- }
-
- $parsed = $this->parser->parse($content);
- $stmts = $this->getTraverser()->traverseFile($parsed, $file);
- $pretty = $this->printer->prettyPrint($stmts);
-
- // Remove the open PHP tag
- if (substr($pretty, 5) === 'getCodeWrappedIntoNamespace($parsed, $pretty);
- }
-
- /**
- * Wrap the code into a namespace.
- *
- * @param array $parsed
- * @param string $pretty
- *
- * @return string
- */
- protected function getCodeWrappedIntoNamespace(array $parsed, $pretty)
- {
- if ($this->parsedCodeHasNamespaces($parsed)) {
- $pretty = preg_replace('/^\s*(namespace.*);/i', '${1} {', $pretty, 1)."\n}\n";
- } else {
- $pretty = sprintf("namespace {\n%s\n}\n", $pretty);
- }
-
- return preg_replace('/(?input->getOption('output')) {
- throw new \InvalidArgumentException('An output option is required');
- }
-
- if (!$this->input->getOption('config')) {
- throw new \InvalidArgumentException('A config option is required');
- }
- }
-
- /**
- * Get a list of files in order.
- *
- * @param mixed $config Configuration option
- *
- * @throws \InvalidArgumentException
- *
- * @return array
- */
- protected function getFileList($config)
- {
- $this->output->writeln('> Loading configuration file');
- $filesystem = new Filesystem();
-
- if (strpos($config, ',')) {
- return array_filter(explode(',', $config));
- }
-
- // Ensure absolute paths are resolved
- if (!$filesystem->isAbsolutePath($config)) {
- $config = getcwd().'/'.$config;
- }
-
- // Ensure that the config file exists
- if (!file_exists($config)) {
- throw new \InvalidArgumentException(sprintf('Configuration file "%s" does not exist.', $config));
- }
-
- $result = require $config;
-
- if ($result instanceof Config) {
- foreach ($result->getVisitors() as $visitor) {
- $this->getTraverser()->addVisitor($visitor);
- }
-
- return $result;
- } elseif (is_array($result)) {
- return $result;
- }
-
- throw new \InvalidArgumentException('Config must return an array of filenames or a Config object');
- }
-
- /**
- * Prepare the output file and directory.
- *
- * @param string $outputFile
- *
- * @throws \RuntimeException
- *
- * @return void
- */
- protected function prepareOutput($outputFile)
- {
- $dir = dirname($outputFile);
- if (!is_dir($dir) && !mkdir($dir, 0777, true)) {
- throw new \RuntimeException('Unable to create directory '.$dir);
- }
- }
-
- /**
- * Executes the pre-compile command.
- *
- * @param \Symfony\Component\Console\Input\InputInterface $input
- * @param \Symfony\Component\Console\Output\OutputInterface $output
- *
- * @throws \RuntimeException
- *
- * @return null|int
- */
- protected function execute(InputInterface $input, OutputInterface $output)
- {
- $this->input = $input;
- $this->output = $output;
- $this->validateCommand();
- $outputFile = $this->input->getOption('output');
- $config = $this->input->getOption('config');
- $files = $this->getFileList($config);
- $output->writeLn('- Found '.count($files).' files');
-
- // Make sure that the output dir can be used or create it
- $this->prepareOutput($outputFile);
-
- if (!$handle = fopen($input->getOption('output'), 'w')) {
- throw new \RuntimeException("Unable to open {$outputFile} for writing");
- }
-
- // Write the first line of the output
- fwrite($handle, "writeln('> Compiling classes');
-
- $count = 0;
- $countSkipped = 0;
- foreach ($files as $file) {
- $count++;
- try {
- $code = $this->getCode($file);
- $this->output->writeln('- Writing '.$file);
- fwrite($handle, $code."\n");
- } catch (SkipFileException $ex) {
- $countSkipped++;
- $this->output->writeln('- Skipping '.$file);
- }
- }
- fclose($handle);
-
- $output->writeln("> Compiled loader written to {$outputFile}");
- $output->writeln('- Files: '.($count - $countSkipped).'/'.$count.' (skipped: '.$countSkipped.')');
- $output->writeln('- Filesize: '.(round(filesize($outputFile) / 1024)).' kb');
- }
-}
diff --git a/application/vendor/classpreloader/classpreloader/src/Config.php b/application/vendor/classpreloader/classpreloader/src/Config.php
index 94a3b04..78e17c9 100644
--- a/application/vendor/classpreloader/classpreloader/src/Config.php
+++ b/application/vendor/classpreloader/classpreloader/src/Config.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
@@ -12,43 +12,31 @@
namespace ClassPreloader;
-use ClassPreloader\Parser\AbstractNodeVisitor;
-use IteratorAggregate;
-
/**
* This is the config class.
- *
- * This contains all the class preloader configuration.
*/
-class Config implements IteratorAggregate
+class Config
{
- /**
- * The array of AbstractNodeVisitor objects that visit nodes.
- *
- * @var array
- */
- protected $visitors = array();
-
/**
* The array of file names.
*
* @var array
*/
- protected $filenames = array();
+ protected $filenames = [];
/**
* The array of exclusive filters.
*
* @var array
*/
- protected $exclusiveFilters = array();
+ protected $exclusiveFilters = [];
/**
* The array of inclusive filters.
*
* @var array
*/
- protected $inclusiveFilters = array();
+ protected $inclusiveFilters = [];
/**
* Add the filename owned by the config.
@@ -71,7 +59,7 @@ public function addFile($filename)
*/
public function getFilenames()
{
- $filenames = array();
+ $filenames = [];
foreach ($this->filenames as $f) {
foreach ($this->inclusiveFilters as $filter) {
if (!preg_match($filter, $f)) {
@@ -89,16 +77,6 @@ public function getFilenames()
return $filenames;
}
- /**
- * Get an iterator for the filenames.
- *
- * @return \ArrayIterator
- */
- public function getIterator()
- {
- return new \ArrayIterator($this->getFilenames());
- }
-
/**
* Add a filter used to filter out file names matching the pattern.
*
@@ -130,30 +108,4 @@ public function addInclusiveFilter($pattern)
return $this;
}
-
- /**
- * Add a visitor.
- *
- * It will visit each node when traversing the node list of each file.
- *
- * @param \ClassPreloader\Parser\AbstractNodeVisitor $visitor
- *
- * @return \ClassPreloader\Config
- */
- public function addVisitor(AbstractNodeVisitor $visitor)
- {
- $this->visitors[] = $visitor;
-
- return $this;
- }
-
- /**
- * Get an array of node visitors.
- *
- * @return array
- */
- public function getVisitors()
- {
- return $this->visitors;
- }
}
diff --git a/application/vendor/classpreloader/classpreloader/src/Exception/SkipFileException.php b/application/vendor/classpreloader/classpreloader/src/Exception/SkipFileException.php
deleted file mode 100644
index cfa9aab..0000000
--- a/application/vendor/classpreloader/classpreloader/src/Exception/SkipFileException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
- * (c) Michael Dowling
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ClassPreloader\Exception;
-
-use Exception;
-
-/**
- * This is the skip file exception class.
- */
-class SkipFileException extends Exception
-{
- //
-}
diff --git a/application/vendor/classpreloader/classpreloader/src/Exceptions/DirConstantException.php b/application/vendor/classpreloader/classpreloader/src/Exceptions/DirConstantException.php
new file mode 100644
index 0000000..f7f03d4
--- /dev/null
+++ b/application/vendor/classpreloader/classpreloader/src/Exceptions/DirConstantException.php
@@ -0,0 +1,23 @@
+
+ * (c) Michael Dowling
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassPreloader\Exceptions;
+
+use Exception;
+
+/**
+ * This is the dir constant exception class.
+ */
+class DirConstantException extends Exception implements VisitorExceptionInterface
+{
+ //
+}
diff --git a/application/vendor/classpreloader/classpreloader/src/Exceptions/FileConstantException.php b/application/vendor/classpreloader/classpreloader/src/Exceptions/FileConstantException.php
new file mode 100644
index 0000000..c773a0f
--- /dev/null
+++ b/application/vendor/classpreloader/classpreloader/src/Exceptions/FileConstantException.php
@@ -0,0 +1,23 @@
+
+ * (c) Michael Dowling
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassPreloader\Exceptions;
+
+use Exception;
+
+/**
+ * This is the file constant exception class.
+ */
+class FileConstantException extends Exception implements VisitorExceptionInterface
+{
+ //
+}
diff --git a/application/vendor/classpreloader/classpreloader/src/Exceptions/StrictTypesException.php b/application/vendor/classpreloader/classpreloader/src/Exceptions/StrictTypesException.php
new file mode 100644
index 0000000..b830be5
--- /dev/null
+++ b/application/vendor/classpreloader/classpreloader/src/Exceptions/StrictTypesException.php
@@ -0,0 +1,23 @@
+
+ * (c) Michael Dowling
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassPreloader\Exceptions;
+
+use Exception;
+
+/**
+ * This is the strict types exception class.
+ */
+class StrictTypesException extends Exception implements VisitorExceptionInterface
+{
+ //
+}
diff --git a/application/vendor/classpreloader/classpreloader/src/Exceptions/VisitorExceptionInterface.php b/application/vendor/classpreloader/classpreloader/src/Exceptions/VisitorExceptionInterface.php
new file mode 100644
index 0000000..d3236a7
--- /dev/null
+++ b/application/vendor/classpreloader/classpreloader/src/Exceptions/VisitorExceptionInterface.php
@@ -0,0 +1,21 @@
+
+ * (c) Michael Dowling
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassPreloader\Exceptions;
+
+/**
+ * This is the visitor exception interface.
+ */
+interface VisitorExceptionInterface
+{
+ //
+}
diff --git a/application/vendor/classpreloader/classpreloader/src/Factory.php b/application/vendor/classpreloader/classpreloader/src/Factory.php
new file mode 100644
index 0000000..ea9d070
--- /dev/null
+++ b/application/vendor/classpreloader/classpreloader/src/Factory.php
@@ -0,0 +1,95 @@
+
+ * (c) Michael Dowling
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassPreloader;
+
+use ClassPreloader\Parser\DirVisitor;
+use ClassPreloader\Parser\FileVisitor;
+use ClassPreloader\Parser\NodeTraverser;
+use ClassPreloader\Parser\StrictTypesVisitor;
+use PhpParser\Lexer;
+use PhpParser\Parser;
+use PhpParser\ParserFactory;
+use PhpParser\PrettyPrinter\Standard as PrettyPrinter;
+
+/**
+ * This is the class preloader factory class.
+ *
+ * This class is a simple way to create a class preloader instance.
+ */
+class Factory
+{
+ /**
+ * Create a new class preloader instance.
+ *
+ * Any options provided determine how the node traverser is setup.
+ *
+ * @param bool[] $options
+ *
+ * @return \ClassPreloader\ClassPreloader
+ */
+ public function create(array $options = [])
+ {
+ $printer = new PrettyPrinter();
+
+ $parser = $this->getParser();
+
+ $options = array_merge(['dir' => true, 'file' => true, 'skip' => false, 'strict' => false], $options);
+
+ $traverser = $this->getTraverser($options['dir'], $options['file'], $options['skip'], $options['strict']);
+
+ return new ClassPreloader($printer, $parser, $traverser);
+ }
+
+ /**
+ * Get the parser to use.
+ *
+ * @return \PhpParser\Parser
+ */
+ protected function getParser()
+ {
+ if (class_exists(ParserFactory::class)) {
+ return (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+ }
+
+ return new Parser(new Lexer());
+ }
+
+ /**
+ * Get the node traverser to use.
+ *
+ * @param bool $dir
+ * @param bool $file
+ * @param bool $skip
+ * @param bool $strict
+ *
+ * @return \ClassPreloader\Parser\NodeTraverser
+ */
+ protected function getTraverser($dir, $file, $skip, $strict)
+ {
+ $traverser = new NodeTraverser();
+
+ if ($dir) {
+ $traverser->addVisitor(new DirVisitor($skip));
+ }
+
+ if ($file) {
+ $traverser->addVisitor(new FileVisitor($skip));
+ }
+
+ if (!$strict) {
+ $traverser->addVisitor(new StrictTypesVisitor());
+ }
+
+ return $traverser;
+ }
+}
diff --git a/application/vendor/classpreloader/classpreloader/src/Parser/AbstractNodeVisitor.php b/application/vendor/classpreloader/classpreloader/src/Parser/AbstractNodeVisitor.php
index c614f7d..4e9dc3b 100644
--- a/application/vendor/classpreloader/classpreloader/src/Parser/AbstractNodeVisitor.php
+++ b/application/vendor/classpreloader/classpreloader/src/Parser/AbstractNodeVisitor.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
diff --git a/application/vendor/classpreloader/classpreloader/src/Parser/DirVisitor.php b/application/vendor/classpreloader/classpreloader/src/Parser/DirVisitor.php
index 767d5e8..6a5953f 100644
--- a/application/vendor/classpreloader/classpreloader/src/Parser/DirVisitor.php
+++ b/application/vendor/classpreloader/classpreloader/src/Parser/DirVisitor.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
@@ -12,7 +12,7 @@
namespace ClassPreloader\Parser;
-use ClassPreloader\Exception\SkipFileException;
+use ClassPreloader\Exceptions\DirConstantException;
use PhpParser\Node;
use PhpParser\Node\Scalar\MagicConst\Dir as DirNode;
use PhpParser\Node\Scalar\String_ as StringNode;
@@ -32,7 +32,7 @@ class DirVisitor extends AbstractNodeVisitor
protected $skip = false;
/**
- * Create a new directory visitor.
+ * Create a new directory visitor instance.
*
* @param bool $skip
*
@@ -48,13 +48,15 @@ public function __construct($skip = false)
*
* @param \PhpParser\Node $node
*
- * @return void
+ * @throws \ClassPreloader\Exceptions\DirConstantException
+ *
+ * @return \PhpParser\Node\Scalar\String_|null
*/
public function enterNode(Node $node)
{
if ($node instanceof DirNode) {
if ($this->skip) {
- throw new SkipFileException('__DIR__ constant found, skipping...');
+ throw new DirConstantException();
}
return new StringNode($this->getDir());
diff --git a/application/vendor/classpreloader/classpreloader/src/Parser/FileVisitor.php b/application/vendor/classpreloader/classpreloader/src/Parser/FileVisitor.php
index 59c20c6..5130564 100644
--- a/application/vendor/classpreloader/classpreloader/src/Parser/FileVisitor.php
+++ b/application/vendor/classpreloader/classpreloader/src/Parser/FileVisitor.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
@@ -12,7 +12,7 @@
namespace ClassPreloader\Parser;
-use ClassPreloader\Exception\SkipFileException;
+use ClassPreloader\Exceptions\FileConstantException;
use PhpParser\Node;
use PhpParser\Node\Scalar\MagicConst\File as FileNode;
use PhpParser\Node\Scalar\String_ as StringNode;
@@ -32,7 +32,7 @@ class FileVisitor extends AbstractNodeVisitor
protected $skip = false;
/**
- * Create a new file visitor.
+ * Create a new file visitor instance.
*
* @param bool $skip
*
@@ -48,13 +48,15 @@ public function __construct($skip = false)
*
* @param \PhpParser\Node $node
*
- * @return void
+ * @throws \ClassPreloader\Exceptions\FileConstantException
+ *
+ * @return \PhpParser\Node\Scalar\String_|null
*/
public function enterNode(Node $node)
{
if ($node instanceof FileNode) {
if ($this->skip) {
- throw new SkipFileException('__FILE__ constant found, skipping...');
+ throw new FileConstantException();
}
return new StringNode($this->getFilename());
diff --git a/application/vendor/classpreloader/classpreloader/src/Parser/NodeTraverser.php b/application/vendor/classpreloader/classpreloader/src/Parser/NodeTraverser.php
index e645aeb..fec6de4 100644
--- a/application/vendor/classpreloader/classpreloader/src/Parser/NodeTraverser.php
+++ b/application/vendor/classpreloader/classpreloader/src/Parser/NodeTraverser.php
@@ -3,7 +3,7 @@
/*
* This file is part of Class Preloader.
*
- * (c) Graham Campbell
+ * (c) Graham Campbell
* (c) Michael Dowling
*
* For the full copyright and license information, please view the LICENSE
@@ -27,7 +27,7 @@ class NodeTraverser extends BaseTraverser
* @param array $nodes
* @param string $filename
*
- * @return void
+ * @return \PhpParser\Node[]
*/
public function traverseFile(array $nodes, $filename)
{
diff --git a/application/vendor/classpreloader/classpreloader/src/Parser/StrictTypesVisitor.php b/application/vendor/classpreloader/classpreloader/src/Parser/StrictTypesVisitor.php
new file mode 100644
index 0000000..f72133d
--- /dev/null
+++ b/application/vendor/classpreloader/classpreloader/src/Parser/StrictTypesVisitor.php
@@ -0,0 +1,41 @@
+
+ * (c) Michael Dowling
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassPreloader\Parser;
+
+use ClassPreloader\Exceptions\StrictTypesException;
+use PhpParser\Node;
+use PhpParser\Node\Stmt\DeclareDeclare;
+
+/**
+ * This is the strict types visitor class.
+ *
+ * This allows us to identify files containing stict types declorations.
+ */
+class StrictTypesVisitor extends AbstractNodeVisitor
+{
+ /**
+ * Enter and modify the node.
+ *
+ * @param \PhpParser\Node $node
+ *
+ * @throws \ClassPreloader\Exceptions\StrictTypesException
+ *
+ * @return null
+ */
+ public function enterNode(Node $node)
+ {
+ if ($node instanceof DeclareDeclare && ($node->getLine() === 1 || $node->getLine() === 2)) {
+ throw new StrictTypesException();
+ }
+ }
+}
diff --git a/application/vendor/composer/ClassLoader.php b/application/vendor/composer/ClassLoader.php
index 5e1469e..fce8549 100644
--- a/application/vendor/composer/ClassLoader.php
+++ b/application/vendor/composer/ClassLoader.php
@@ -13,9 +13,7 @@
namespace Composer\Autoload;
/**
- * ClassLoader implements a PSR-0 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
@@ -39,6 +37,8 @@
*
* @author Fabien Potencier
* @author Jordi Boggiano
+ * @see http://www.php-fig.org/psr/psr-0/
+ * @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
@@ -53,8 +53,9 @@ class ClassLoader
private $useIncludePath = false;
private $classMap = array();
-
private $classMapAuthoritative = false;
+ private $missingClasses = array();
+ private $apcuPrefix;
public function getPrefixes()
{
@@ -147,7 +148,7 @@ public function add($prefix, $paths, $prepend = false)
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
- * @param array|string $paths The PSR-0 base directories
+ * @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
@@ -271,6 +272,26 @@ public function isClassMapAuthoritative()
return $this->classMapAuthoritative;
}
+ /**
+ * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+ *
+ * @param string|null $apcuPrefix
+ */
+ public function setApcuPrefix($apcuPrefix)
+ {
+ $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+ }
+
+ /**
+ * The APCu prefix in use, or null if APCu caching is not enabled.
+ *
+ * @return string|null
+ */
+ public function getApcuPrefix()
+ {
+ return $this->apcuPrefix;
+ }
+
/**
* Registers this instance as an autoloader.
*
@@ -313,29 +334,34 @@ public function loadClass($class)
*/
public function findFile($class)
{
- // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
- if ('\\' == $class[0]) {
- $class = substr($class, 1);
- }
-
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
- if ($this->classMapAuthoritative) {
+ if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
+ if (null !== $this->apcuPrefix) {
+ $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+ if ($hit) {
+ return $file;
+ }
+ }
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
- if ($file === null && defined('HHVM_VERSION')) {
+ if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
- if ($file === null) {
+ if (null !== $this->apcuPrefix) {
+ apcu_add($this->apcuPrefix.$class, $file);
+ }
+
+ if (false === $file) {
// Remember that this class does not exist.
- return $this->classMap[$class] = false;
+ $this->missingClasses[$class] = true;
}
return $file;
@@ -348,10 +374,14 @@ private function findFileWithExtension($class, $ext)
$first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) {
- foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
- if (0 === strpos($class, $prefix)) {
- foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+ $subPath = $class;
+ while (false !== $lastPos = strrpos($subPath, '\\')) {
+ $subPath = substr($subPath, 0, $lastPos);
+ $search = $subPath . '\\';
+ if (isset($this->prefixDirsPsr4[$search])) {
+ $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+ foreach ($this->prefixDirsPsr4[$search] as $dir) {
+ if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
@@ -399,6 +429,8 @@ private function findFileWithExtension($class, $ext)
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
+
+ return false;
}
}
diff --git a/application/vendor/composer/LICENSE b/application/vendor/composer/LICENSE
index c8d57af..f27399a 100644
--- a/application/vendor/composer/LICENSE
+++ b/application/vendor/composer/LICENSE
@@ -1,5 +1,5 @@
-Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+Copyright (c) Nils Adermann, Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/application/vendor/composer/autoload_classmap.php b/application/vendor/composer/autoload_classmap.php
index a5badcf..731bce8 100644
--- a/application/vendor/composer/autoload_classmap.php
+++ b/application/vendor/composer/autoload_classmap.php
@@ -65,17 +65,31 @@
'App\\User' => $baseDir . '/app/User.php',
'Carbon\\Carbon' => $vendorDir . '/nesbot/carbon/src/Carbon/Carbon.php',
'Carbon\\CarbonInterval' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonInterval.php',
- 'ClassPreloader\\Application' => $vendorDir . '/classpreloader/classpreloader/src/Application.php',
+ 'Carbon\\CarbonPeriod' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonPeriod.php',
+ 'Carbon\\Exceptions\\InvalidDateException' => $vendorDir . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php',
+ 'Carbon\\Laravel\\ServiceProvider' => $vendorDir . '/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php',
+ 'Carbon\\Translator' => $vendorDir . '/nesbot/carbon/src/Carbon/Translator.php',
+ 'Carbon\\Upgrade' => $vendorDir . '/nesbot/carbon/src/Carbon/Upgrade.php',
'ClassPreloader\\ClassList' => $vendorDir . '/classpreloader/classpreloader/src/ClassList.php',
'ClassPreloader\\ClassLoader' => $vendorDir . '/classpreloader/classpreloader/src/ClassLoader.php',
'ClassPreloader\\ClassNode' => $vendorDir . '/classpreloader/classpreloader/src/ClassNode.php',
- 'ClassPreloader\\Command\\PreCompileCommand' => $vendorDir . '/classpreloader/classpreloader/src/Command/PreCompileCommand.php',
+ 'ClassPreloader\\ClassPreloader' => $vendorDir . '/classpreloader/classpreloader/src/ClassPreloader.php',
'ClassPreloader\\Config' => $vendorDir . '/classpreloader/classpreloader/src/Config.php',
- 'ClassPreloader\\Exception\\SkipFileException' => $vendorDir . '/classpreloader/classpreloader/src/Exception/SkipFileException.php',
+ 'ClassPreloader\\Exceptions\\DirConstantException' => $vendorDir . '/classpreloader/classpreloader/src/Exceptions/DirConstantException.php',
+ 'ClassPreloader\\Exceptions\\FileConstantException' => $vendorDir . '/classpreloader/classpreloader/src/Exceptions/FileConstantException.php',
+ 'ClassPreloader\\Exceptions\\StrictTypesException' => $vendorDir . '/classpreloader/classpreloader/src/Exceptions/StrictTypesException.php',
+ 'ClassPreloader\\Exceptions\\VisitorExceptionInterface' => $vendorDir . '/classpreloader/classpreloader/src/Exceptions/VisitorExceptionInterface.php',
+ 'ClassPreloader\\Factory' => $vendorDir . '/classpreloader/classpreloader/src/Factory.php',
'ClassPreloader\\Parser\\AbstractNodeVisitor' => $vendorDir . '/classpreloader/classpreloader/src/Parser/AbstractNodeVisitor.php',
'ClassPreloader\\Parser\\DirVisitor' => $vendorDir . '/classpreloader/classpreloader/src/Parser/DirVisitor.php',
'ClassPreloader\\Parser\\FileVisitor' => $vendorDir . '/classpreloader/classpreloader/src/Parser/FileVisitor.php',
'ClassPreloader\\Parser\\NodeTraverser' => $vendorDir . '/classpreloader/classpreloader/src/Parser/NodeTraverser.php',
+ 'ClassPreloader\\Parser\\StrictTypesVisitor' => $vendorDir . '/classpreloader/classpreloader/src/Parser/StrictTypesVisitor.php',
+ 'Collective\\Html\\FormBuilder' => $vendorDir . '/laravelcollective/html/src/FormBuilder.php',
+ 'Collective\\Html\\FormFacade' => $vendorDir . '/laravelcollective/html/src/FormFacade.php',
+ 'Collective\\Html\\HtmlBuilder' => $vendorDir . '/laravelcollective/html/src/HtmlBuilder.php',
+ 'Collective\\Html\\HtmlFacade' => $vendorDir . '/laravelcollective/html/src/HtmlFacade.php',
+ 'Collective\\Html\\HtmlServiceProvider' => $vendorDir . '/laravelcollective/html/src/HtmlServiceProvider.php',
'CreatePasswordResetsTable' => $baseDir . '/database/migrations/2014_10_12_100000_create_password_resets_table.php',
'CreateServersTable' => $baseDir . '/database/migrations/2015_04_26_154117_create_servers_table.php',
'CreateUsersTable' => $baseDir . '/database/migrations/2014_10_12_000000_create_users_table.php',
@@ -93,6 +107,10 @@
'Doctrine\\Common\\Inflector\\Inflector' => $vendorDir . '/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php',
'Dotenv' => $vendorDir . '/vlucas/phpdotenv/src/Dotenv.php',
'IlluminateQueueClosure' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/IlluminateQueueClosure.php',
+ 'Illuminate\\Auth\\Access\\Gate' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Access/Gate.php',
+ 'Illuminate\\Auth\\Access\\HandlesAuthorization' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php',
+ 'Illuminate\\Auth\\Access\\Response' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Access/Response.php',
+ 'Illuminate\\Auth\\Access\\UnauthorizedException' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php',
'Illuminate\\Auth\\AuthManager' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/AuthManager.php',
'Illuminate\\Auth\\AuthServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php',
'Illuminate\\Auth\\Authenticatable' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Authenticatable.php',
@@ -108,9 +126,16 @@
'Illuminate\\Auth\\Passwords\\PasswordBroker' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php',
'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php',
'Illuminate\\Auth\\Passwords\\TokenRepositoryInterface' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php',
+ 'Illuminate\\Broadcasting\\BroadcastEvent' => $vendorDir . '/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php',
+ 'Illuminate\\Broadcasting\\BroadcastManager' => $vendorDir . '/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php',
+ 'Illuminate\\Broadcasting\\BroadcastServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php',
+ 'Illuminate\\Broadcasting\\Broadcasters\\LogBroadcaster' => $vendorDir . '/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php',
+ 'Illuminate\\Broadcasting\\Broadcasters\\PusherBroadcaster' => $vendorDir . '/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php',
+ 'Illuminate\\Broadcasting\\Broadcasters\\RedisBroadcaster' => $vendorDir . '/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php',
'Illuminate\\Bus\\BusServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php',
'Illuminate\\Bus\\Dispatcher' => $vendorDir . '/laravel/framework/src/Illuminate/Bus/Dispatcher.php',
'Illuminate\\Bus\\MarshalException' => $vendorDir . '/laravel/framework/src/Illuminate/Bus/MarshalException.php',
+ 'Illuminate\\Bus\\Queueable' => $vendorDir . '/laravel/framework/src/Illuminate/Bus/Queueable.php',
'Illuminate\\Cache\\ApcStore' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/ApcStore.php',
'Illuminate\\Cache\\ApcWrapper' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/ApcWrapper.php',
'Illuminate\\Cache\\ArrayStore' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/ArrayStore.php',
@@ -123,6 +148,7 @@
'Illuminate\\Cache\\MemcachedConnector' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php',
'Illuminate\\Cache\\MemcachedStore' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/MemcachedStore.php',
'Illuminate\\Cache\\NullStore' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/NullStore.php',
+ 'Illuminate\\Cache\\RateLimiter' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/RateLimiter.php',
'Illuminate\\Cache\\RedisStore' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/RedisStore.php',
'Illuminate\\Cache\\RedisTaggedCache' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php',
'Illuminate\\Cache\\Repository' => $vendorDir . '/laravel/framework/src/Illuminate/Cache/Repository.php',
@@ -137,6 +163,8 @@
'Illuminate\\Console\\Command' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Command.php',
'Illuminate\\Console\\ConfirmableTrait' => $vendorDir . '/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php',
'Illuminate\\Console\\GeneratorCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Console/GeneratorCommand.php',
+ 'Illuminate\\Console\\OutputStyle' => $vendorDir . '/laravel/framework/src/Illuminate/Console/OutputStyle.php',
+ 'Illuminate\\Console\\Parser' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Parser.php',
'Illuminate\\Console\\ScheduleServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Console/ScheduleServiceProvider.php',
'Illuminate\\Console\\Scheduling\\CallbackEvent' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php',
'Illuminate\\Console\\Scheduling\\Event' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/Event.php',
@@ -145,12 +173,18 @@
'Illuminate\\Container\\BindingResolutionException' => $vendorDir . '/laravel/framework/src/Illuminate/Container/BindingResolutionException.php',
'Illuminate\\Container\\Container' => $vendorDir . '/laravel/framework/src/Illuminate/Container/Container.php',
'Illuminate\\Container\\ContextualBindingBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php',
+ 'Illuminate\\Contracts\\Auth\\Access\\Authorizable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/Access/Authorizable.php',
+ 'Illuminate\\Contracts\\Auth\\Access\\Gate' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php',
'Illuminate\\Contracts\\Auth\\Authenticatable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/Authenticatable.php',
'Illuminate\\Contracts\\Auth\\CanResetPassword' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/CanResetPassword.php',
'Illuminate\\Contracts\\Auth\\Guard' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php',
'Illuminate\\Contracts\\Auth\\PasswordBroker' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/PasswordBroker.php',
'Illuminate\\Contracts\\Auth\\Registrar' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/Registrar.php',
'Illuminate\\Contracts\\Auth\\UserProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/UserProvider.php',
+ 'Illuminate\\Contracts\\Broadcasting\\Broadcaster' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/Broadcaster.php',
+ 'Illuminate\\Contracts\\Broadcasting\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/Factory.php',
+ 'Illuminate\\Contracts\\Broadcasting\\ShouldBroadcast' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php',
+ 'Illuminate\\Contracts\\Broadcasting\\ShouldBroadcastNow' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcastNow.php',
'Illuminate\\Contracts\\Bus\\Dispatcher' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php',
'Illuminate\\Contracts\\Bus\\HandlerResolver' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Bus/HandlerResolver.php',
'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Bus/QueueingDispatcher.php',
@@ -161,6 +195,7 @@
'Illuminate\\Contracts\\Config\\Repository' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Config/Repository.php',
'Illuminate\\Contracts\\Console\\Application' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Console/Application.php',
'Illuminate\\Contracts\\Console\\Kernel' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Console/Kernel.php',
+ 'Illuminate\\Contracts\\Container\\BindingResolutionException' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Container/BindingResolutionException.php',
'Illuminate\\Contracts\\Container\\Container' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Container/Container.php',
'Illuminate\\Contracts\\Container\\ContextualBindingBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Container/ContextualBindingBuilder.php',
'Illuminate\\Contracts\\Cookie\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php',
@@ -168,6 +203,7 @@
'Illuminate\\Contracts\\Database\\ModelIdentifier' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Database/ModelIdentifier.php',
'Illuminate\\Contracts\\Debug\\ExceptionHandler' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php',
'Illuminate\\Contracts\\Encryption\\DecryptException' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Encryption/DecryptException.php',
+ 'Illuminate\\Contracts\\Encryption\\EncryptException' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Encryption/EncryptException.php',
'Illuminate\\Contracts\\Encryption\\Encrypter' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Encryption/Encrypter.php',
'Illuminate\\Contracts\\Events\\Dispatcher' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php',
'Illuminate\\Contracts\\Filesystem\\Cloud' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Cloud.php',
@@ -193,6 +229,7 @@
'Illuminate\\Contracts\\Queue\\Queue' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Queue/Queue.php',
'Illuminate\\Contracts\\Queue\\QueueableEntity' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php',
'Illuminate\\Contracts\\Queue\\ShouldBeQueued' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Queue/ShouldBeQueued.php',
+ 'Illuminate\\Contracts\\Queue\\ShouldQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php',
'Illuminate\\Contracts\\Redis\\Database' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Redis/Database.php',
'Illuminate\\Contracts\\Routing\\Middleware' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Routing/Middleware.php',
'Illuminate\\Contracts\\Routing\\Registrar' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php',
@@ -201,6 +238,7 @@
'Illuminate\\Contracts\\Routing\\UrlGenerator' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php',
'Illuminate\\Contracts\\Routing\\UrlRoutable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Routing/UrlRoutable.php',
'Illuminate\\Contracts\\Support\\Arrayable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/Arrayable.php',
+ 'Illuminate\\Contracts\\Support\\Htmlable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/Htmlable.php',
'Illuminate\\Contracts\\Support\\Jsonable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/Jsonable.php',
'Illuminate\\Contracts\\Support\\MessageBag' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/MessageBag.php',
'Illuminate\\Contracts\\Support\\MessageProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php',
@@ -236,11 +274,15 @@
'Illuminate\\Database\\Console\\Migrations\\ResetCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php',
'Illuminate\\Database\\Console\\Migrations\\RollbackCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php',
'Illuminate\\Database\\Console\\Migrations\\StatusCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php',
- 'Illuminate\\Database\\Console\\SeedCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/SeedCommand.php',
+ 'Illuminate\\Database\\Console\\Seeds\\SeedCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php',
+ 'Illuminate\\Database\\Console\\Seeds\\SeederMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php',
'Illuminate\\Database\\DatabaseManager' => $vendorDir . '/laravel/framework/src/Illuminate/Database/DatabaseManager.php',
'Illuminate\\Database\\DatabaseServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php',
+ 'Illuminate\\Database\\DetectsLostConnections' => $vendorDir . '/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php',
'Illuminate\\Database\\Eloquent\\Builder' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php',
'Illuminate\\Database\\Eloquent\\Collection' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php',
+ 'Illuminate\\Database\\Eloquent\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php',
+ 'Illuminate\\Database\\Eloquent\\FactoryBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php',
'Illuminate\\Database\\Eloquent\\MassAssignmentException' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/MassAssignmentException.php',
'Illuminate\\Database\\Eloquent\\Model' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Model.php',
'Illuminate\\Database\\Eloquent\\ModelNotFoundException' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/ModelNotFoundException.php',
@@ -294,12 +336,14 @@
'Illuminate\\Database\\Schema\\Grammars\\SQLiteGrammar' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php',
'Illuminate\\Database\\Schema\\Grammars\\SqlServerGrammar' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php',
'Illuminate\\Database\\Schema\\MySqlBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php',
+ 'Illuminate\\Database\\Schema\\PostgresBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php',
'Illuminate\\Database\\SeedServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php',
'Illuminate\\Database\\Seeder' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Seeder.php',
'Illuminate\\Database\\SqlServerConnection' => $vendorDir . '/laravel/framework/src/Illuminate/Database/SqlServerConnection.php',
+ 'Illuminate\\Encryption\\BaseEncrypter' => $vendorDir . '/laravel/framework/src/Illuminate/Encryption/BaseEncrypter.php',
'Illuminate\\Encryption\\Encrypter' => $vendorDir . '/laravel/framework/src/Illuminate/Encryption/Encrypter.php',
'Illuminate\\Encryption\\EncryptionServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php',
- 'Illuminate\\Encryption\\InvalidKeyException' => $vendorDir . '/laravel/framework/src/Illuminate/Encryption/InvalidKeyException.php',
+ 'Illuminate\\Encryption\\McryptEncrypter' => $vendorDir . '/laravel/framework/src/Illuminate/Encryption/McryptEncrypter.php',
'Illuminate\\Events\\CallQueuedHandler' => $vendorDir . '/laravel/framework/src/Illuminate/Events/CallQueuedHandler.php',
'Illuminate\\Events\\Dispatcher' => $vendorDir . '/laravel/framework/src/Illuminate/Events/Dispatcher.php',
'Illuminate\\Events\\EventServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Events/EventServiceProvider.php',
@@ -310,8 +354,14 @@
'Illuminate\\Filesystem\\FilesystemServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php',
'Illuminate\\Foundation\\AliasLoader' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/AliasLoader.php',
'Illuminate\\Foundation\\Application' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Application.php',
+ 'Illuminate\\Foundation\\Auth\\Access\\Authorizable' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/Access/Authorizable.php',
+ 'Illuminate\\Foundation\\Auth\\Access\\AuthorizesRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php',
'Illuminate\\Foundation\\Auth\\AuthenticatesAndRegistersUsers' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php',
+ 'Illuminate\\Foundation\\Auth\\AuthenticatesUsers' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php',
+ 'Illuminate\\Foundation\\Auth\\RedirectsUsers' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php',
+ 'Illuminate\\Foundation\\Auth\\RegistersUsers' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/RegistersUsers.php',
'Illuminate\\Foundation\\Auth\\ResetsPasswords' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php',
+ 'Illuminate\\Foundation\\Auth\\ThrottlesLogins' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php',
'Illuminate\\Foundation\\Bootstrap\\BootProviders' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php',
'Illuminate\\Foundation\\Bootstrap\\ConfigureLogging' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php',
'Illuminate\\Foundation\\Bootstrap\\DetectEnvironment' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php',
@@ -321,7 +371,9 @@
'Illuminate\\Foundation\\Bootstrap\\RegisterProviders' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php',
'Illuminate\\Foundation\\Bootstrap\\SetRequestForConsole' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php',
'Illuminate\\Foundation\\Bus\\DispatchesCommands' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesCommands.php',
+ 'Illuminate\\Foundation\\Bus\\DispatchesJobs' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesJobs.php',
'Illuminate\\Foundation\\Composer' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Composer.php',
+ 'Illuminate\\Foundation\\ComposerScripts' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/ComposerScripts.php',
'Illuminate\\Foundation\\Console\\AppNameCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php',
'Illuminate\\Foundation\\Console\\ClearCompiledCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php',
'Illuminate\\Foundation\\Console\\CommandMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/CommandMakeCommand.php',
@@ -332,13 +384,16 @@
'Illuminate\\Foundation\\Console\\EnvironmentCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/EnvironmentCommand.php',
'Illuminate\\Foundation\\Console\\EventGenerateCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/EventGenerateCommand.php',
'Illuminate\\Foundation\\Console\\EventMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/EventMakeCommand.php',
- 'Illuminate\\Foundation\\Console\\FreshCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/FreshCommand.php',
'Illuminate\\Foundation\\Console\\HandlerCommandCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/HandlerCommandCommand.php',
'Illuminate\\Foundation\\Console\\HandlerEventCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/HandlerEventCommand.php',
+ 'Illuminate\\Foundation\\Console\\IlluminateCaster' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/IlluminateCaster.php',
+ 'Illuminate\\Foundation\\Console\\JobMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php',
'Illuminate\\Foundation\\Console\\Kernel' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php',
'Illuminate\\Foundation\\Console\\KeyGenerateCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php',
+ 'Illuminate\\Foundation\\Console\\ListenerMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php',
'Illuminate\\Foundation\\Console\\ModelMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
'Illuminate\\Foundation\\Console\\OptimizeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php',
+ 'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
'Illuminate\\Foundation\\Console\\ProviderMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ProviderMakeCommand.php',
'Illuminate\\Foundation\\Console\\QueuedJob' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/QueuedJob.php',
'Illuminate\\Foundation\\Console\\RequestMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/RequestMakeCommand.php',
@@ -346,12 +401,11 @@
'Illuminate\\Foundation\\Console\\RouteClearCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/RouteClearCommand.php',
'Illuminate\\Foundation\\Console\\RouteListCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php',
'Illuminate\\Foundation\\Console\\ServeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php',
+ 'Illuminate\\Foundation\\Console\\TestMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php',
'Illuminate\\Foundation\\Console\\TinkerCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php',
- 'Illuminate\\Foundation\\Console\\Tinker\\Presenters\\EloquentModelPresenter' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/EloquentModelPresenter.php',
- 'Illuminate\\Foundation\\Console\\Tinker\\Presenters\\IlluminateApplicationPresenter' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateApplicationPresenter.php',
- 'Illuminate\\Foundation\\Console\\Tinker\\Presenters\\IlluminateCollectionPresenter' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateCollectionPresenter.php',
'Illuminate\\Foundation\\Console\\UpCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php',
'Illuminate\\Foundation\\Console\\VendorPublishCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php',
+ 'Illuminate\\Foundation\\Console\\ViewClearCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php',
'Illuminate\\Foundation\\EnvironmentDetector' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php',
'Illuminate\\Foundation\\Exceptions\\Handler' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php',
'Illuminate\\Foundation\\Http\\FormRequest' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php',
@@ -366,22 +420,26 @@
'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php',
'Illuminate\\Foundation\\Providers\\FormRequestServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php',
'Illuminate\\Foundation\\Providers\\FoundationServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php',
+ 'Illuminate\\Foundation\\Support\\Providers\\AuthServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php',
'Illuminate\\Foundation\\Support\\Providers\\EventServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php',
'Illuminate\\Foundation\\Support\\Providers\\RouteServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php',
'Illuminate\\Foundation\\Testing\\ApplicationTrait' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/ApplicationTrait.php',
'Illuminate\\Foundation\\Testing\\AssertionsTrait' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/AssertionsTrait.php',
+ 'Illuminate\\Foundation\\Testing\\CrawlerTrait' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/CrawlerTrait.php',
+ 'Illuminate\\Foundation\\Testing\\DatabaseMigrations' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseMigrations.php',
+ 'Illuminate\\Foundation\\Testing\\DatabaseTransactions' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseTransactions.php',
+ 'Illuminate\\Foundation\\Testing\\HttpException' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/HttpException.php',
+ 'Illuminate\\Foundation\\Testing\\InteractsWithPages' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/InteractsWithPages.php',
'Illuminate\\Foundation\\Testing\\TestCase' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php',
+ 'Illuminate\\Foundation\\Testing\\WithoutEvents' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
+ 'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
'Illuminate\\Foundation\\Validation\\ValidatesRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
'Illuminate\\Hashing\\BcryptHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
'Illuminate\\Hashing\\HashServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php',
- 'Illuminate\\Html\\FormBuilder' => $vendorDir . '/illuminate/html/FormBuilder.php',
- 'Illuminate\\Html\\FormFacade' => $vendorDir . '/illuminate/html/FormFacade.php',
- 'Illuminate\\Html\\HtmlBuilder' => $vendorDir . '/illuminate/html/HtmlBuilder.php',
- 'Illuminate\\Html\\HtmlFacade' => $vendorDir . '/illuminate/html/HtmlFacade.php',
- 'Illuminate\\Html\\HtmlServiceProvider' => $vendorDir . '/illuminate/html/HtmlServiceProvider.php',
'Illuminate\\Http\\Exception\\HttpResponseException' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Exception/HttpResponseException.php',
'Illuminate\\Http\\Exception\\PostTooLargeException' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Exception/PostTooLargeException.php',
'Illuminate\\Http\\JsonResponse' => $vendorDir . '/laravel/framework/src/Illuminate/Http/JsonResponse.php',
+ 'Illuminate\\Http\\Middleware\\CheckResponseForModifications' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Middleware/CheckResponseForModifications.php',
'Illuminate\\Http\\Middleware\\FrameGuard' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php',
'Illuminate\\Http\\RedirectResponse' => $vendorDir . '/laravel/framework/src/Illuminate/Http/RedirectResponse.php',
'Illuminate\\Http\\Request' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Request.php',
@@ -396,6 +454,7 @@
'Illuminate\\Mail\\Transport\\MailgunTransport' => $vendorDir . '/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php',
'Illuminate\\Mail\\Transport\\MandrillTransport' => $vendorDir . '/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php',
'Illuminate\\Mail\\Transport\\SesTransport' => $vendorDir . '/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php',
+ 'Illuminate\\Mail\\Transport\\Transport' => $vendorDir . '/laravel/framework/src/Illuminate/Mail/Transport/Transport.php',
'Illuminate\\Pagination\\AbstractPaginator' => $vendorDir . '/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php',
'Illuminate\\Pagination\\BootstrapThreeNextPreviousButtonRendererTrait' => $vendorDir . '/laravel/framework/src/Illuminate/Pagination/BootstrapThreeNextPreviousButtonRendererTrait.php',
'Illuminate\\Pagination\\BootstrapThreePresenter' => $vendorDir . '/laravel/framework/src/Illuminate/Pagination/BootstrapThreePresenter.php',
@@ -433,6 +492,7 @@
'Illuminate\\Queue\\DatabaseQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php',
'Illuminate\\Queue\\Failed\\DatabaseFailedJobProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php',
'Illuminate\\Queue\\Failed\\FailedJobProviderInterface' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Failed/FailedJobProviderInterface.php',
+ 'Illuminate\\Queue\\Failed\\NullFailedJobProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Failed/NullFailedJobProvider.php',
'Illuminate\\Queue\\InteractsWithQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php',
'Illuminate\\Queue\\IronQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/IronQueue.php',
'Illuminate\\Queue\\Jobs\\BeanstalkdJob' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Jobs/BeanstalkdJob.php',
@@ -508,6 +568,7 @@
'Illuminate\\Support\\Facades\\Event' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Event.php',
'Illuminate\\Support\\Facades\\Facade' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Facade.php',
'Illuminate\\Support\\Facades\\File' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/File.php',
+ 'Illuminate\\Support\\Facades\\Gate' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Gate.php',
'Illuminate\\Support\\Facades\\Hash' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Hash.php',
'Illuminate\\Support\\Facades\\Input' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Input.php',
'Illuminate\\Support\\Facades\\Lang' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Lang.php',
@@ -527,6 +588,7 @@
'Illuminate\\Support\\Facades\\Validator' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Validator.php',
'Illuminate\\Support\\Facades\\View' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/View.php',
'Illuminate\\Support\\Fluent' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Fluent.php',
+ 'Illuminate\\Support\\HtmlString' => $vendorDir . '/laravel/framework/src/Illuminate/Support/HtmlString.php',
'Illuminate\\Support\\Manager' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Manager.php',
'Illuminate\\Support\\MessageBag' => $vendorDir . '/laravel/framework/src/Illuminate/Support/MessageBag.php',
'Illuminate\\Support\\NamespacedItemResolver' => $vendorDir . '/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php',
@@ -554,18 +616,21 @@
'Illuminate\\View\\Engines\\EngineInterface' => $vendorDir . '/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php',
'Illuminate\\View\\Engines\\EngineResolver' => $vendorDir . '/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php',
'Illuminate\\View\\Engines\\PhpEngine' => $vendorDir . '/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php',
+ 'Illuminate\\View\\Expression' => $vendorDir . '/laravel/framework/src/Illuminate/View/Expression.php',
'Illuminate\\View\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/View/Factory.php',
'Illuminate\\View\\FileViewFinder' => $vendorDir . '/laravel/framework/src/Illuminate/View/FileViewFinder.php',
'Illuminate\\View\\Middleware\\ShareErrorsFromSession' => $vendorDir . '/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php',
'Illuminate\\View\\View' => $vendorDir . '/laravel/framework/src/Illuminate/View/View.php',
'Illuminate\\View\\ViewFinderInterface' => $vendorDir . '/laravel/framework/src/Illuminate/View/ViewFinderInterface.php',
'Illuminate\\View\\ViewServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/View/ViewServiceProvider.php',
- 'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => $vendorDir . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php',
- 'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => $vendorDir . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php',
+ 'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => $vendorDir . '/jakub-onderka/php-console-color/src/ConsoleColor.php',
+ 'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => $vendorDir . '/jakub-onderka/php-console-color/src/InvalidStyleException.php',
'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => $vendorDir . '/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php',
+ 'JsonSerializable' => $vendorDir . '/nesbot/carbon/src/JsonSerializable.php',
'League\\Flysystem\\AdapterInterface' => $vendorDir . '/league/flysystem/src/AdapterInterface.php',
'League\\Flysystem\\Adapter\\AbstractAdapter' => $vendorDir . '/league/flysystem/src/Adapter/AbstractAdapter.php',
'League\\Flysystem\\Adapter\\AbstractFtpAdapter' => $vendorDir . '/league/flysystem/src/Adapter/AbstractFtpAdapter.php',
+ 'League\\Flysystem\\Adapter\\CanOverwriteFiles' => $vendorDir . '/league/flysystem/src/Adapter/CanOverwriteFiles.php',
'League\\Flysystem\\Adapter\\Ftp' => $vendorDir . '/league/flysystem/src/Adapter/Ftp.php',
'League\\Flysystem\\Adapter\\Ftpd' => $vendorDir . '/league/flysystem/src/Adapter/Ftpd.php',
'League\\Flysystem\\Adapter\\Local' => $vendorDir . '/league/flysystem/src/Adapter/Local.php',
@@ -585,12 +650,15 @@
'League\\Flysystem\\FileNotFoundException' => $vendorDir . '/league/flysystem/src/FileNotFoundException.php',
'League\\Flysystem\\Filesystem' => $vendorDir . '/league/flysystem/src/Filesystem.php',
'League\\Flysystem\\FilesystemInterface' => $vendorDir . '/league/flysystem/src/FilesystemInterface.php',
+ 'League\\Flysystem\\FilesystemNotFoundException' => $vendorDir . '/league/flysystem/src/FilesystemNotFoundException.php',
'League\\Flysystem\\Handler' => $vendorDir . '/league/flysystem/src/Handler.php',
'League\\Flysystem\\MountManager' => $vendorDir . '/league/flysystem/src/MountManager.php',
'League\\Flysystem\\NotSupportedException' => $vendorDir . '/league/flysystem/src/NotSupportedException.php',
'League\\Flysystem\\PluginInterface' => $vendorDir . '/league/flysystem/src/PluginInterface.php',
'League\\Flysystem\\Plugin\\AbstractPlugin' => $vendorDir . '/league/flysystem/src/Plugin/AbstractPlugin.php',
'League\\Flysystem\\Plugin\\EmptyDir' => $vendorDir . '/league/flysystem/src/Plugin/EmptyDir.php',
+ 'League\\Flysystem\\Plugin\\ForcedCopy' => $vendorDir . '/league/flysystem/src/Plugin/ForcedCopy.php',
+ 'League\\Flysystem\\Plugin\\ForcedRename' => $vendorDir . '/league/flysystem/src/Plugin/ForcedRename.php',
'League\\Flysystem\\Plugin\\GetWithMetadata' => $vendorDir . '/league/flysystem/src/Plugin/GetWithMetadata.php',
'League\\Flysystem\\Plugin\\ListFiles' => $vendorDir . '/league/flysystem/src/Plugin/ListFiles.php',
'League\\Flysystem\\Plugin\\ListPaths' => $vendorDir . '/league/flysystem/src/Plugin/ListPaths.php',
@@ -599,13 +667,17 @@
'League\\Flysystem\\Plugin\\PluginNotFoundException' => $vendorDir . '/league/flysystem/src/Plugin/PluginNotFoundException.php',
'League\\Flysystem\\ReadInterface' => $vendorDir . '/league/flysystem/src/ReadInterface.php',
'League\\Flysystem\\RootViolationException' => $vendorDir . '/league/flysystem/src/RootViolationException.php',
+ 'League\\Flysystem\\SafeStorage' => $vendorDir . '/league/flysystem/src/SafeStorage.php',
+ 'League\\Flysystem\\UnreadableFileException' => $vendorDir . '/league/flysystem/src/UnreadableFileException.php',
'League\\Flysystem\\Util' => $vendorDir . '/league/flysystem/src/Util.php',
'League\\Flysystem\\Util\\ContentListingFormatter' => $vendorDir . '/league/flysystem/src/Util/ContentListingFormatter.php',
'League\\Flysystem\\Util\\MimeType' => $vendorDir . '/league/flysystem/src/Util/MimeType.php',
+ 'League\\Flysystem\\Util\\StreamHasher' => $vendorDir . '/league/flysystem/src/Util/StreamHasher.php',
'Monolog\\ErrorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/ErrorHandler.php',
'Monolog\\Formatter\\ChromePHPFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php',
'Monolog\\Formatter\\ElasticaFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php',
'Monolog\\Formatter\\FlowdockFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php',
+ 'Monolog\\Formatter\\FluentdFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php',
'Monolog\\Formatter\\FormatterInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php',
'Monolog\\Formatter\\GelfMessageFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php',
'Monolog\\Formatter\\HtmlFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php',
@@ -627,6 +699,7 @@
'Monolog\\Handler\\CouchDBHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php',
'Monolog\\Handler\\CubeHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/CubeHandler.php',
'Monolog\\Handler\\Curl\\Util' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/Curl/Util.php',
+ 'Monolog\\Handler\\DeduplicationHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php',
'Monolog\\Handler\\DoctrineCouchDBHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php',
'Monolog\\Handler\\DynamoDbHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php',
'Monolog\\Handler\\ElasticSearchHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php',
@@ -639,11 +712,15 @@
'Monolog\\Handler\\FirePHPHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php',
'Monolog\\Handler\\FleepHookHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php',
'Monolog\\Handler\\FlowdockHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php',
+ 'Monolog\\Handler\\FormattableHandlerInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php',
+ 'Monolog\\Handler\\FormattableHandlerTrait' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php',
'Monolog\\Handler\\GelfHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/GelfHandler.php',
'Monolog\\Handler\\GroupHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/GroupHandler.php',
'Monolog\\Handler\\HandlerInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/HandlerInterface.php',
+ 'Monolog\\Handler\\HandlerWrapper' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php',
'Monolog\\Handler\\HipChatHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/HipChatHandler.php',
'Monolog\\Handler\\IFTTTHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php',
+ 'Monolog\\Handler\\InsightOpsHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php',
'Monolog\\Handler\\LogEntriesHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php',
'Monolog\\Handler\\LogglyHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/LogglyHandler.php',
'Monolog\\Handler\\MailHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/MailHandler.php',
@@ -654,6 +731,8 @@
'Monolog\\Handler\\NewRelicHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php',
'Monolog\\Handler\\NullHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/NullHandler.php',
'Monolog\\Handler\\PHPConsoleHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php',
+ 'Monolog\\Handler\\ProcessableHandlerInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php',
+ 'Monolog\\Handler\\ProcessableHandlerTrait' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php',
'Monolog\\Handler\\PsrHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/PsrHandler.php',
'Monolog\\Handler\\PushoverHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/PushoverHandler.php',
'Monolog\\Handler\\RavenHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/RavenHandler.php',
@@ -662,6 +741,9 @@
'Monolog\\Handler\\RotatingFileHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php',
'Monolog\\Handler\\SamplingHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SamplingHandler.php',
'Monolog\\Handler\\SlackHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SlackHandler.php',
+ 'Monolog\\Handler\\SlackWebhookHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php',
+ 'Monolog\\Handler\\Slack\\SlackRecord' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php',
+ 'Monolog\\Handler\\SlackbotHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php',
'Monolog\\Handler\\SocketHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SocketHandler.php',
'Monolog\\Handler\\StreamHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/StreamHandler.php',
'Monolog\\Handler\\SwiftMailerHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php',
@@ -677,12 +759,214 @@
'Monolog\\Processor\\MemoryPeakUsageProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php',
'Monolog\\Processor\\MemoryProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php',
'Monolog\\Processor\\MemoryUsageProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php',
+ 'Monolog\\Processor\\MercurialProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php',
'Monolog\\Processor\\ProcessIdProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php',
+ 'Monolog\\Processor\\ProcessorInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php',
'Monolog\\Processor\\PsrLogMessageProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php',
'Monolog\\Processor\\TagProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/TagProcessor.php',
'Monolog\\Processor\\UidProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/UidProcessor.php',
'Monolog\\Processor\\WebProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/WebProcessor.php',
'Monolog\\Registry' => $vendorDir . '/monolog/monolog/src/Monolog/Registry.php',
+ 'Monolog\\ResettableInterface' => $vendorDir . '/monolog/monolog/src/Monolog/ResettableInterface.php',
+ 'Monolog\\SignalHandler' => $vendorDir . '/monolog/monolog/src/Monolog/SignalHandler.php',
+ 'Monolog\\Utils' => $vendorDir . '/monolog/monolog/src/Monolog/Utils.php',
+ 'PhpParser\\Autoloader' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Autoloader.php',
+ 'PhpParser\\Builder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder.php',
+ 'PhpParser\\BuilderAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderAbstract.php',
+ 'PhpParser\\BuilderFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php',
+ 'PhpParser\\Builder\\Class_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Class_.php',
+ 'PhpParser\\Builder\\Declaration' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Declaration.php',
+ 'PhpParser\\Builder\\FunctionLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php',
+ 'PhpParser\\Builder\\Function_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Function_.php',
+ 'PhpParser\\Builder\\Interface_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Interface_.php',
+ 'PhpParser\\Builder\\Method' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Method.php',
+ 'PhpParser\\Builder\\Namespace_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php',
+ 'PhpParser\\Builder\\Param' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Param.php',
+ 'PhpParser\\Builder\\Property' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Property.php',
+ 'PhpParser\\Builder\\Trait_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Trait_.php',
+ 'PhpParser\\Builder\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php',
+ 'PhpParser\\Comment' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Comment.php',
+ 'PhpParser\\Comment\\Doc' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Comment/Doc.php',
+ 'PhpParser\\Error' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Error.php',
+ 'PhpParser\\Lexer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer.php',
+ 'PhpParser\\Lexer\\Emulative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php',
+ 'PhpParser\\Node' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node.php',
+ 'PhpParser\\NodeAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php',
+ 'PhpParser\\NodeDumper' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeDumper.php',
+ 'PhpParser\\NodeTraverser' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeTraverser.php',
+ 'PhpParser\\NodeTraverserInterface' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php',
+ 'PhpParser\\NodeVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor.php',
+ 'PhpParser\\NodeVisitorAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php',
+ 'PhpParser\\NodeVisitor\\NameResolver' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php',
+ 'PhpParser\\Node\\Arg' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Arg.php',
+ 'PhpParser\\Node\\Const_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Const_.php',
+ 'PhpParser\\Node\\Expr' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr.php',
+ 'PhpParser\\Node\\Expr\\ArrayDimFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php',
+ 'PhpParser\\Node\\Expr\\ArrayItem' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php',
+ 'PhpParser\\Node\\Expr\\Array_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php',
+ 'PhpParser\\Node\\Expr\\Assign' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php',
+ 'PhpParser\\Node\\Expr\\AssignOp' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\BitwiseAnd' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\BitwiseOr' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\BitwiseXor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Concat' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Div' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Minus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Mod' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Mul' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Plus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Pow' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\ShiftLeft' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\ShiftRight' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php',
+ 'PhpParser\\Node\\Expr\\AssignRef' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BitwiseAnd' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BitwiseOr' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BitwiseXor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BooleanAnd' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BooleanOr' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Coalesce' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Concat' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Div' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Equal' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Greater' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\GreaterOrEqual' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Identical' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\LogicalAnd' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\LogicalOr' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\LogicalXor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Minus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Mod' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Mul' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\NotEqual' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\NotIdentical' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Plus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Pow' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\ShiftLeft' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\ShiftRight' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Smaller' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\SmallerOrEqual' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Spaceship' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php',
+ 'PhpParser\\Node\\Expr\\BitwiseNot' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php',
+ 'PhpParser\\Node\\Expr\\BooleanNot' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php',
+ 'PhpParser\\Node\\Expr\\Cast' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Array_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Bool_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Double' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Int_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Object_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\String_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Unset_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php',
+ 'PhpParser\\Node\\Expr\\ClassConstFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php',
+ 'PhpParser\\Node\\Expr\\Clone_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php',
+ 'PhpParser\\Node\\Expr\\Closure' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php',
+ 'PhpParser\\Node\\Expr\\ClosureUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php',
+ 'PhpParser\\Node\\Expr\\ConstFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php',
+ 'PhpParser\\Node\\Expr\\Empty_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php',
+ 'PhpParser\\Node\\Expr\\ErrorSuppress' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php',
+ 'PhpParser\\Node\\Expr\\Eval_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php',
+ 'PhpParser\\Node\\Expr\\Exit_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php',
+ 'PhpParser\\Node\\Expr\\FuncCall' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php',
+ 'PhpParser\\Node\\Expr\\Include_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php',
+ 'PhpParser\\Node\\Expr\\Instanceof_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php',
+ 'PhpParser\\Node\\Expr\\Isset_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php',
+ 'PhpParser\\Node\\Expr\\List_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php',
+ 'PhpParser\\Node\\Expr\\MethodCall' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php',
+ 'PhpParser\\Node\\Expr\\New_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php',
+ 'PhpParser\\Node\\Expr\\PostDec' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php',
+ 'PhpParser\\Node\\Expr\\PostInc' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php',
+ 'PhpParser\\Node\\Expr\\PreDec' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php',
+ 'PhpParser\\Node\\Expr\\PreInc' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php',
+ 'PhpParser\\Node\\Expr\\Print_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php',
+ 'PhpParser\\Node\\Expr\\PropertyFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php',
+ 'PhpParser\\Node\\Expr\\ShellExec' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php',
+ 'PhpParser\\Node\\Expr\\StaticCall' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php',
+ 'PhpParser\\Node\\Expr\\StaticPropertyFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php',
+ 'PhpParser\\Node\\Expr\\Ternary' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php',
+ 'PhpParser\\Node\\Expr\\UnaryMinus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php',
+ 'PhpParser\\Node\\Expr\\UnaryPlus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php',
+ 'PhpParser\\Node\\Expr\\Variable' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php',
+ 'PhpParser\\Node\\Expr\\YieldFrom' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php',
+ 'PhpParser\\Node\\Expr\\Yield_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php',
+ 'PhpParser\\Node\\FunctionLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php',
+ 'PhpParser\\Node\\Name' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name.php',
+ 'PhpParser\\Node\\Name\\FullyQualified' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php',
+ 'PhpParser\\Node\\Name\\Relative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php',
+ 'PhpParser\\Node\\Param' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Param.php',
+ 'PhpParser\\Node\\Scalar' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar.php',
+ 'PhpParser\\Node\\Scalar\\DNumber' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php',
+ 'PhpParser\\Node\\Scalar\\Encapsed' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php',
+ 'PhpParser\\Node\\Scalar\\EncapsedStringPart' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php',
+ 'PhpParser\\Node\\Scalar\\LNumber' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Class_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Class_.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Dir' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\File' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Function_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Line' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Method' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Namespace_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Trait_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php',
+ 'PhpParser\\Node\\Scalar\\String_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php',
+ 'PhpParser\\Node\\Stmt' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt.php',
+ 'PhpParser\\Node\\Stmt\\Break_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php',
+ 'PhpParser\\Node\\Stmt\\Case_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php',
+ 'PhpParser\\Node\\Stmt\\Catch_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php',
+ 'PhpParser\\Node\\Stmt\\ClassConst' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php',
+ 'PhpParser\\Node\\Stmt\\ClassLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php',
+ 'PhpParser\\Node\\Stmt\\ClassMethod' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php',
+ 'PhpParser\\Node\\Stmt\\Class_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php',
+ 'PhpParser\\Node\\Stmt\\Const_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php',
+ 'PhpParser\\Node\\Stmt\\Continue_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php',
+ 'PhpParser\\Node\\Stmt\\DeclareDeclare' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php',
+ 'PhpParser\\Node\\Stmt\\Declare_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php',
+ 'PhpParser\\Node\\Stmt\\Do_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php',
+ 'PhpParser\\Node\\Stmt\\Echo_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php',
+ 'PhpParser\\Node\\Stmt\\ElseIf_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php',
+ 'PhpParser\\Node\\Stmt\\Else_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php',
+ 'PhpParser\\Node\\Stmt\\For_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php',
+ 'PhpParser\\Node\\Stmt\\Foreach_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php',
+ 'PhpParser\\Node\\Stmt\\Function_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php',
+ 'PhpParser\\Node\\Stmt\\Global_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php',
+ 'PhpParser\\Node\\Stmt\\Goto_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php',
+ 'PhpParser\\Node\\Stmt\\GroupUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php',
+ 'PhpParser\\Node\\Stmt\\HaltCompiler' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php',
+ 'PhpParser\\Node\\Stmt\\If_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php',
+ 'PhpParser\\Node\\Stmt\\InlineHTML' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php',
+ 'PhpParser\\Node\\Stmt\\Interface_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php',
+ 'PhpParser\\Node\\Stmt\\Label' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php',
+ 'PhpParser\\Node\\Stmt\\Namespace_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php',
+ 'PhpParser\\Node\\Stmt\\Nop' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php',
+ 'PhpParser\\Node\\Stmt\\Property' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php',
+ 'PhpParser\\Node\\Stmt\\PropertyProperty' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php',
+ 'PhpParser\\Node\\Stmt\\Return_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php',
+ 'PhpParser\\Node\\Stmt\\StaticVar' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php',
+ 'PhpParser\\Node\\Stmt\\Static_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php',
+ 'PhpParser\\Node\\Stmt\\Switch_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php',
+ 'PhpParser\\Node\\Stmt\\Throw_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php',
+ 'PhpParser\\Node\\Stmt\\TraitUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php',
+ 'PhpParser\\Node\\Stmt\\TraitUseAdaptation' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php',
+ 'PhpParser\\Node\\Stmt\\TraitUseAdaptation\\Alias' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php',
+ 'PhpParser\\Node\\Stmt\\TraitUseAdaptation\\Precedence' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php',
+ 'PhpParser\\Node\\Stmt\\Trait_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php',
+ 'PhpParser\\Node\\Stmt\\TryCatch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php',
+ 'PhpParser\\Node\\Stmt\\Unset_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php',
+ 'PhpParser\\Node\\Stmt\\UseUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php',
+ 'PhpParser\\Node\\Stmt\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php',
+ 'PhpParser\\Node\\Stmt\\While_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php',
+ 'PhpParser\\Parser' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser.php',
+ 'PhpParser\\ParserAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php',
+ 'PhpParser\\ParserFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ParserFactory.php',
+ 'PhpParser\\Parser\\Multiple' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser/Multiple.php',
+ 'PhpParser\\Parser\\Php5' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser/Php5.php',
+ 'PhpParser\\Parser\\Php7' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser/Php7.php',
+ 'PhpParser\\Parser\\Tokens' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php',
+ 'PhpParser\\PrettyPrinterAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php',
+ 'PhpParser\\PrettyPrinter\\Standard' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php',
+ 'PhpParser\\Serializer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Serializer.php',
+ 'PhpParser\\Serializer\\XML' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Serializer/XML.php',
+ 'PhpParser\\Unserializer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Unserializer.php',
+ 'PhpParser\\Unserializer\\XML' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Unserializer/XML.php',
'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
@@ -693,6 +977,7 @@
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
'Psy\\Autoloader' => $vendorDir . '/psy/psysh/src/Psy/Autoloader.php',
'Psy\\CodeCleaner' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner.php',
'Psy\\CodeCleaner\\AbstractClassPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/AbstractClassPass.php',
@@ -700,6 +985,7 @@
'Psy\\CodeCleaner\\CallTimePassByReferencePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/CallTimePassByReferencePass.php',
'Psy\\CodeCleaner\\CalledClassPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/CalledClassPass.php',
'Psy\\CodeCleaner\\CodeCleanerPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/CodeCleanerPass.php',
+ 'Psy\\CodeCleaner\\ExitPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ExitPass.php',
'Psy\\CodeCleaner\\FunctionReturnInWriteContextPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php',
'Psy\\CodeCleaner\\ImplicitReturnPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ImplicitReturnPass.php',
'Psy\\CodeCleaner\\InstanceOfPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php',
@@ -709,6 +995,7 @@
'Psy\\CodeCleaner\\NamespaceAwarePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/NamespaceAwarePass.php',
'Psy\\CodeCleaner\\NamespacePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/NamespacePass.php',
'Psy\\CodeCleaner\\StaticConstructorPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php',
+ 'Psy\\CodeCleaner\\StrictTypesPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php',
'Psy\\CodeCleaner\\UseStatementPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/UseStatementPass.php',
'Psy\\CodeCleaner\\ValidClassNamePass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ValidClassNamePass.php',
'Psy\\CodeCleaner\\ValidConstantPass' => $vendorDir . '/psy/psysh/src/Psy/CodeCleaner/ValidConstantPass.php',
@@ -742,16 +1029,20 @@
'Psy\\Command\\WhereamiCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/WhereamiCommand.php',
'Psy\\Command\\WtfCommand' => $vendorDir . '/psy/psysh/src/Psy/Command/WtfCommand.php',
'Psy\\Compiler' => $vendorDir . '/psy/psysh/src/Psy/Compiler.php',
+ 'Psy\\ConfigPaths' => $vendorDir . '/psy/psysh/src/Psy/ConfigPaths.php',
'Psy\\Configuration' => $vendorDir . '/psy/psysh/src/Psy/Configuration.php',
+ 'Psy\\ConsoleColorFactory' => $vendorDir . '/psy/psysh/src/Psy/ConsoleColorFactory.php',
'Psy\\Context' => $vendorDir . '/psy/psysh/src/Psy/Context.php',
'Psy\\ContextAware' => $vendorDir . '/psy/psysh/src/Psy/ContextAware.php',
'Psy\\Exception\\BreakException' => $vendorDir . '/psy/psysh/src/Psy/Exception/BreakException.php',
+ 'Psy\\Exception\\DeprecatedException' => $vendorDir . '/psy/psysh/src/Psy/Exception/DeprecatedException.php',
'Psy\\Exception\\ErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/ErrorException.php',
'Psy\\Exception\\Exception' => $vendorDir . '/psy/psysh/src/Psy/Exception/Exception.php',
'Psy\\Exception\\FatalErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/FatalErrorException.php',
'Psy\\Exception\\ParseErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/ParseErrorException.php',
'Psy\\Exception\\RuntimeException' => $vendorDir . '/psy/psysh/src/Psy/Exception/RuntimeException.php',
'Psy\\Exception\\ThrowUpException' => $vendorDir . '/psy/psysh/src/Psy/Exception/ThrowUpException.php',
+ 'Psy\\Exception\\TypeErrorException' => $vendorDir . '/psy/psysh/src/Psy/Exception/TypeErrorException.php',
'Psy\\ExecutionLoop\\ForkingLoop' => $vendorDir . '/psy/psysh/src/Psy/ExecutionLoop/ForkingLoop.php',
'Psy\\ExecutionLoop\\Loop' => $vendorDir . '/psy/psysh/src/Psy/ExecutionLoop/Loop.php',
'Psy\\Formatter\\CodeFormatter' => $vendorDir . '/psy/psysh/src/Psy/Formatter/CodeFormatter.php',
@@ -762,18 +1053,7 @@
'Psy\\Output\\PassthruPager' => $vendorDir . '/psy/psysh/src/Psy/Output/PassthruPager.php',
'Psy\\Output\\ProcOutputPager' => $vendorDir . '/psy/psysh/src/Psy/Output/ProcOutputPager.php',
'Psy\\Output\\ShellOutput' => $vendorDir . '/psy/psysh/src/Psy/Output/ShellOutput.php',
- 'Psy\\Presenter\\ArrayPresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/ArrayPresenter.php',
- 'Psy\\Presenter\\ClosurePresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/ClosurePresenter.php',
- 'Psy\\Presenter\\ExceptionPresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/ExceptionPresenter.php',
- 'Psy\\Presenter\\MongoCursorPresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/MongoCursorPresenter.php',
- 'Psy\\Presenter\\ObjectPresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/ObjectPresenter.php',
- 'Psy\\Presenter\\PHPParserPresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/PHPParserPresenter.php',
- 'Psy\\Presenter\\Presenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/Presenter.php',
- 'Psy\\Presenter\\PresenterManager' => $vendorDir . '/psy/psysh/src/Psy/Presenter/PresenterManager.php',
- 'Psy\\Presenter\\PresenterManagerAware' => $vendorDir . '/psy/psysh/src/Psy/Presenter/PresenterManagerAware.php',
- 'Psy\\Presenter\\RecursivePresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/RecursivePresenter.php',
- 'Psy\\Presenter\\ResourcePresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/ResourcePresenter.php',
- 'Psy\\Presenter\\ScalarPresenter' => $vendorDir . '/psy/psysh/src/Psy/Presenter/ScalarPresenter.php',
+ 'Psy\\ParserFactory' => $vendorDir . '/psy/psysh/src/Psy/ParserFactory.php',
'Psy\\Readline\\GNUReadline' => $vendorDir . '/psy/psysh/src/Psy/Readline/GNUReadline.php',
'Psy\\Readline\\Libedit' => $vendorDir . '/psy/psysh/src/Psy/Readline/Libedit.php',
'Psy\\Readline\\Readline' => $vendorDir . '/psy/psysh/src/Psy/Readline/Readline.php',
@@ -798,160 +1078,170 @@
'Psy\\Util\\Docblock' => $vendorDir . '/psy/psysh/src/Psy/Util/Docblock.php',
'Psy\\Util\\Json' => $vendorDir . '/psy/psysh/src/Psy/Util/Json.php',
'Psy\\Util\\Mirror' => $vendorDir . '/psy/psysh/src/Psy/Util/Mirror.php',
- 'Psy\\Util\\String' => $vendorDir . '/psy/psysh/src/Psy/Util/String.php',
- 'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php',
+ 'Psy\\Util\\Str' => $vendorDir . '/psy/psysh/src/Psy/Util/Str.php',
+ 'Psy\\VarDumper\\Cloner' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/Cloner.php',
+ 'Psy\\VarDumper\\Dumper' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/Dumper.php',
+ 'Psy\\VarDumper\\Presenter' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/Presenter.php',
+ 'Psy\\VarDumper\\PresenterAware' => $vendorDir . '/psy/psysh/src/Psy/VarDumper/PresenterAware.php',
+ 'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php',
'Stringy\\StaticStringy' => $vendorDir . '/danielstjules/stringy/src/StaticStringy.php',
'Stringy\\Stringy' => $vendorDir . '/danielstjules/stringy/src/Stringy.php',
- 'SuperClosure\\Analyzer\\AstAnalyzer' => $vendorDir . '/jeremeamia/SuperClosure/src/Analyzer/AstAnalyzer.php',
- 'SuperClosure\\Analyzer\\ClosureAnalyzer' => $vendorDir . '/jeremeamia/SuperClosure/src/Analyzer/ClosureAnalyzer.php',
- 'SuperClosure\\Analyzer\\Token' => $vendorDir . '/jeremeamia/SuperClosure/src/Analyzer/Token.php',
- 'SuperClosure\\Analyzer\\TokenAnalyzer' => $vendorDir . '/jeremeamia/SuperClosure/src/Analyzer/TokenAnalyzer.php',
- 'SuperClosure\\Analyzer\\Visitor\\ClosureLocatorVisitor' => $vendorDir . '/jeremeamia/SuperClosure/src/Analyzer/Visitor/ClosureLocatorVisitor.php',
- 'SuperClosure\\Analyzer\\Visitor\\MagicConstantVisitor' => $vendorDir . '/jeremeamia/SuperClosure/src/Analyzer/Visitor/MagicConstantVisitor.php',
- 'SuperClosure\\Analyzer\\Visitor\\ThisDetectorVisitor' => $vendorDir . '/jeremeamia/SuperClosure/src/Analyzer/Visitor/ThisDetectorVisitor.php',
- 'SuperClosure\\Exception\\ClosureAnalysisException' => $vendorDir . '/jeremeamia/SuperClosure/src/Exception/ClosureAnalysisException.php',
- 'SuperClosure\\Exception\\ClosureUnserializationException' => $vendorDir . '/jeremeamia/SuperClosure/src/Exception/ClosureUnserializationException.php',
- 'SuperClosure\\Exception\\SuperClosureException' => $vendorDir . '/jeremeamia/SuperClosure/src/Exception/SuperClosureException.php',
- 'SuperClosure\\SerializableClosure' => $vendorDir . '/jeremeamia/SuperClosure/src/SerializableClosure.php',
- 'SuperClosure\\Serializer' => $vendorDir . '/jeremeamia/SuperClosure/src/Serializer.php',
- 'SuperClosure\\SerializerInterface' => $vendorDir . '/jeremeamia/SuperClosure/src/SerializerInterface.php',
- 'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Symfony/Component/Console/Application.php',
- 'Symfony\\Component\\Console\\Command\\Command' => $vendorDir . '/symfony/console/Symfony/Component/Console/Command/Command.php',
- 'Symfony\\Component\\Console\\Command\\HelpCommand' => $vendorDir . '/symfony/console/Symfony/Component/Console/Command/HelpCommand.php',
- 'Symfony\\Component\\Console\\Command\\ListCommand' => $vendorDir . '/symfony/console/Symfony/Component/Console/Command/ListCommand.php',
- 'Symfony\\Component\\Console\\ConsoleEvents' => $vendorDir . '/symfony/console/Symfony/Component/Console/ConsoleEvents.php',
- 'Symfony\\Component\\Console\\Descriptor\\ApplicationDescription' => $vendorDir . '/symfony/console/Symfony/Component/Console/Descriptor/ApplicationDescription.php',
- 'Symfony\\Component\\Console\\Descriptor\\Descriptor' => $vendorDir . '/symfony/console/Symfony/Component/Console/Descriptor/Descriptor.php',
- 'Symfony\\Component\\Console\\Descriptor\\DescriptorInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Descriptor/DescriptorInterface.php',
- 'Symfony\\Component\\Console\\Descriptor\\JsonDescriptor' => $vendorDir . '/symfony/console/Symfony/Component/Console/Descriptor/JsonDescriptor.php',
- 'Symfony\\Component\\Console\\Descriptor\\MarkdownDescriptor' => $vendorDir . '/symfony/console/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php',
- 'Symfony\\Component\\Console\\Descriptor\\TextDescriptor' => $vendorDir . '/symfony/console/Symfony/Component/Console/Descriptor/TextDescriptor.php',
- 'Symfony\\Component\\Console\\Descriptor\\XmlDescriptor' => $vendorDir . '/symfony/console/Symfony/Component/Console/Descriptor/XmlDescriptor.php',
- 'Symfony\\Component\\Console\\Event\\ConsoleCommandEvent' => $vendorDir . '/symfony/console/Symfony/Component/Console/Event/ConsoleCommandEvent.php',
- 'Symfony\\Component\\Console\\Event\\ConsoleEvent' => $vendorDir . '/symfony/console/Symfony/Component/Console/Event/ConsoleEvent.php',
- 'Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent' => $vendorDir . '/symfony/console/Symfony/Component/Console/Event/ConsoleExceptionEvent.php',
- 'Symfony\\Component\\Console\\Event\\ConsoleTerminateEvent' => $vendorDir . '/symfony/console/Symfony/Component/Console/Event/ConsoleTerminateEvent.php',
- 'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => $vendorDir . '/symfony/console/Symfony/Component/Console/Formatter/OutputFormatter.php',
- 'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterInterface.php',
- 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyle' => $vendorDir . '/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyle.php',
- 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyleInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php',
- 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyleStack' => $vendorDir . '/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php',
- 'Symfony\\Component\\Console\\Helper\\DebugFormatterHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/DebugFormatterHelper.php',
- 'Symfony\\Component\\Console\\Helper\\DescriptorHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/DescriptorHelper.php',
- 'Symfony\\Component\\Console\\Helper\\DialogHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/DialogHelper.php',
- 'Symfony\\Component\\Console\\Helper\\FormatterHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/FormatterHelper.php',
- 'Symfony\\Component\\Console\\Helper\\Helper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/Helper.php',
- 'Symfony\\Component\\Console\\Helper\\HelperInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/HelperInterface.php',
- 'Symfony\\Component\\Console\\Helper\\HelperSet' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/HelperSet.php',
- 'Symfony\\Component\\Console\\Helper\\InputAwareHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/InputAwareHelper.php',
- 'Symfony\\Component\\Console\\Helper\\ProcessHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/ProcessHelper.php',
- 'Symfony\\Component\\Console\\Helper\\ProgressBar' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/ProgressBar.php',
- 'Symfony\\Component\\Console\\Helper\\ProgressHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/ProgressHelper.php',
- 'Symfony\\Component\\Console\\Helper\\QuestionHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/QuestionHelper.php',
- 'Symfony\\Component\\Console\\Helper\\Table' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/Table.php',
- 'Symfony\\Component\\Console\\Helper\\TableHelper' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/TableHelper.php',
- 'Symfony\\Component\\Console\\Helper\\TableSeparator' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/TableSeparator.php',
- 'Symfony\\Component\\Console\\Helper\\TableStyle' => $vendorDir . '/symfony/console/Symfony/Component/Console/Helper/TableStyle.php',
- 'Symfony\\Component\\Console\\Input\\ArgvInput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/ArgvInput.php',
- 'Symfony\\Component\\Console\\Input\\ArrayInput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/ArrayInput.php',
- 'Symfony\\Component\\Console\\Input\\Input' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/Input.php',
- 'Symfony\\Component\\Console\\Input\\InputArgument' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/InputArgument.php',
- 'Symfony\\Component\\Console\\Input\\InputAwareInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/InputAwareInterface.php',
- 'Symfony\\Component\\Console\\Input\\InputDefinition' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/InputDefinition.php',
- 'Symfony\\Component\\Console\\Input\\InputInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/InputInterface.php',
- 'Symfony\\Component\\Console\\Input\\InputOption' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/InputOption.php',
- 'Symfony\\Component\\Console\\Input\\StringInput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Input/StringInput.php',
- 'Symfony\\Component\\Console\\Logger\\ConsoleLogger' => $vendorDir . '/symfony/console/Symfony/Component/Console/Logger/ConsoleLogger.php',
- 'Symfony\\Component\\Console\\Output\\BufferedOutput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Output/BufferedOutput.php',
- 'Symfony\\Component\\Console\\Output\\ConsoleOutput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Output/ConsoleOutput.php',
- 'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Output/ConsoleOutputInterface.php',
- 'Symfony\\Component\\Console\\Output\\NullOutput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Output/NullOutput.php',
- 'Symfony\\Component\\Console\\Output\\Output' => $vendorDir . '/symfony/console/Symfony/Component/Console/Output/Output.php',
- 'Symfony\\Component\\Console\\Output\\OutputInterface' => $vendorDir . '/symfony/console/Symfony/Component/Console/Output/OutputInterface.php',
- 'Symfony\\Component\\Console\\Output\\StreamOutput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Output/StreamOutput.php',
- 'Symfony\\Component\\Console\\Question\\ChoiceQuestion' => $vendorDir . '/symfony/console/Symfony/Component/Console/Question/ChoiceQuestion.php',
- 'Symfony\\Component\\Console\\Question\\ConfirmationQuestion' => $vendorDir . '/symfony/console/Symfony/Component/Console/Question/ConfirmationQuestion.php',
- 'Symfony\\Component\\Console\\Question\\Question' => $vendorDir . '/symfony/console/Symfony/Component/Console/Question/Question.php',
- 'Symfony\\Component\\Console\\Shell' => $vendorDir . '/symfony/console/Symfony/Component/Console/Shell.php',
- 'Symfony\\Component\\Console\\Tester\\ApplicationTester' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tester/ApplicationTester.php',
- 'Symfony\\Component\\Console\\Tester\\CommandTester' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tester/CommandTester.php',
- 'Symfony\\Component\\Console\\Tests\\ApplicationTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php',
- 'Symfony\\Component\\Console\\Tests\\Command\\CommandTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Command/CommandTest.php',
- 'Symfony\\Component\\Console\\Tests\\Command\\HelpCommandTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Command/HelpCommandTest.php',
- 'Symfony\\Component\\Console\\Tests\\Command\\ListCommandTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Command/ListCommandTest.php',
- 'Symfony\\Component\\Console\\Tests\\CustomApplication' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php',
- 'Symfony\\Component\\Console\\Tests\\CustomDefaultCommandApplication' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/ApplicationTest.php',
- 'Symfony\\Component\\Console\\Tests\\Descriptor\\AbstractDescriptorTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php',
- 'Symfony\\Component\\Console\\Tests\\Descriptor\\JsonDescriptorTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php',
- 'Symfony\\Component\\Console\\Tests\\Descriptor\\MarkdownDescriptorTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php',
- 'Symfony\\Component\\Console\\Tests\\Descriptor\\ObjectsProvider' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php',
- 'Symfony\\Component\\Console\\Tests\\Descriptor\\TextDescriptorTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php',
- 'Symfony\\Component\\Console\\Tests\\Descriptor\\XmlDescriptorTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php',
- 'Symfony\\Component\\Console\\Tests\\Fixtures\\DescriptorApplication1' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php',
- 'Symfony\\Component\\Console\\Tests\\Fixtures\\DescriptorApplication2' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php',
- 'Symfony\\Component\\Console\\Tests\\Fixtures\\DescriptorCommand1' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php',
- 'Symfony\\Component\\Console\\Tests\\Fixtures\\DescriptorCommand2' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php',
- 'Symfony\\Component\\Console\\Tests\\Fixtures\\DummyOutput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Fixtures/DummyOutput.php',
- 'Symfony\\Component\\Console\\Tests\\Formatter\\OutputFormatterStyleStackTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleStackTest.php',
- 'Symfony\\Component\\Console\\Tests\\Formatter\\OutputFormatterStyleTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php',
- 'Symfony\\Component\\Console\\Tests\\Formatter\\OutputFormatterTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php',
- 'Symfony\\Component\\Console\\Tests\\Formatter\\TableCell' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\FormatterHelperTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\HelperSetTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/HelperSetTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\LegacyDialogHelperTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\LegacyProgressHelperTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\LegacyTableHelperTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\ProcessHelperTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\ProgressBarTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\QuestionHelperTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php',
- 'Symfony\\Component\\Console\\Tests\\Helper\\TableTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Helper/TableTest.php',
- 'Symfony\\Component\\Console\\Tests\\Input\\ArgvInputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Input/ArgvInputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Input\\ArrayInputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Input/ArrayInputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Input\\InputArgumentTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Input/InputArgumentTest.php',
- 'Symfony\\Component\\Console\\Tests\\Input\\InputDefinitionTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php',
- 'Symfony\\Component\\Console\\Tests\\Input\\InputOptionTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Input/InputOptionTest.php',
- 'Symfony\\Component\\Console\\Tests\\Input\\InputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Input/InputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Input\\StringInputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Input/StringInputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Logger\\ConsoleLoggerTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php',
- 'Symfony\\Component\\Console\\Tests\\Output\\ConsoleOutputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Output\\NullOutputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Output/NullOutputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Output\\OutputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Output/OutputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Output\\StreamOutputTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Output/StreamOutputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Output\\TestOutput' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Output/OutputTest.php',
- 'Symfony\\Component\\Console\\Tests\\Tester\\ApplicationTesterTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Tester/ApplicationTesterTest.php',
- 'Symfony\\Component\\Console\\Tests\\Tester\\CommandTesterTest' => $vendorDir . '/symfony/console/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php',
- 'Symfony\\Component\\Debug\\Debug' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Debug.php',
- 'Symfony\\Component\\Debug\\DebugClassLoader' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php',
- 'Symfony\\Component\\Debug\\ErrorHandler' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/ErrorHandler.php',
- 'Symfony\\Component\\Debug\\ErrorHandlerCanary' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/ErrorHandler.php',
- 'Symfony\\Component\\Debug\\ExceptionHandler' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php',
- 'Symfony\\Component\\Debug\\Exception\\ClassNotFoundException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/ClassNotFoundException.php',
- 'Symfony\\Component\\Debug\\Exception\\ContextErrorException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/ContextErrorException.php',
- 'Symfony\\Component\\Debug\\Exception\\DummyException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/DummyException.php',
- 'Symfony\\Component\\Debug\\Exception\\FatalErrorException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/FatalErrorException.php',
- 'Symfony\\Component\\Debug\\Exception\\FatalThrowableError' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/FatalThrowableError.php',
- 'Symfony\\Component\\Debug\\Exception\\FlattenException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php',
- 'Symfony\\Component\\Debug\\Exception\\OutOfMemoryException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/OutOfMemoryException.php',
- 'Symfony\\Component\\Debug\\Exception\\UndefinedFunctionException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/UndefinedFunctionException.php',
- 'Symfony\\Component\\Debug\\Exception\\UndefinedMethodException' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Exception/UndefinedMethodException.php',
- 'Symfony\\Component\\Debug\\FatalErrorHandler\\ClassNotFoundFatalErrorHandler' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php',
- 'Symfony\\Component\\Debug\\FatalErrorHandler\\FatalErrorHandlerInterface' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/FatalErrorHandlerInterface.php',
- 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedFunctionFatalErrorHandler' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php',
- 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedMethodFatalErrorHandler' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php',
- 'Symfony\\Component\\Debug\\Tests\\ClassLoader' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php',
- 'Symfony\\Component\\Debug\\Tests\\DebugClassLoaderTest' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php',
- 'Symfony\\Component\\Debug\\Tests\\ErrorHandlerTest' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php',
- 'Symfony\\Component\\Debug\\Tests\\ExceptionHandlerTest' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php',
- 'Symfony\\Component\\Debug\\Tests\\Exception\\FlattenExceptionTest' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php',
- 'Symfony\\Component\\Debug\\Tests\\FatalErrorHandler\\ClassNotFoundFatalErrorHandlerTest' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php',
- 'Symfony\\Component\\Debug\\Tests\\FatalErrorHandler\\UndefinedFunctionFatalErrorHandlerTest' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php',
- 'Symfony\\Component\\Debug\\Tests\\FatalErrorHandler\\UndefinedMethodFatalErrorHandlerTest' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php',
- 'Symfony\\Component\\Debug\\Tests\\Fixtures2\\RequiredTwice' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/Fixtures2/RequiredTwice.php',
- 'Symfony\\Component\\Debug\\Tests\\Fixtures\\CaseMismatch' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/casemismatch.php',
- 'Symfony\\Component\\Debug\\Tests\\Fixtures\\NotPSR0' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/reallyNotPsr0.php',
- 'Symfony\\Component\\Debug\\Tests\\Fixtures\\NotPSR0bis' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/notPsr0Bis.php',
- 'Symfony\\Component\\Debug\\Tests\\Fixtures\\PSR4CaseMismatch' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php',
- 'Symfony\\Component\\Debug\\Tests\\MockExceptionHandler' => $vendorDir . '/symfony/debug/Symfony/Component/Debug/Tests/MockExceptionHandler.php',
+ 'SuperClosure\\Analyzer\\AstAnalyzer' => $vendorDir . '/jeremeamia/superclosure/src/Analyzer/AstAnalyzer.php',
+ 'SuperClosure\\Analyzer\\ClosureAnalyzer' => $vendorDir . '/jeremeamia/superclosure/src/Analyzer/ClosureAnalyzer.php',
+ 'SuperClosure\\Analyzer\\Token' => $vendorDir . '/jeremeamia/superclosure/src/Analyzer/Token.php',
+ 'SuperClosure\\Analyzer\\TokenAnalyzer' => $vendorDir . '/jeremeamia/superclosure/src/Analyzer/TokenAnalyzer.php',
+ 'SuperClosure\\Analyzer\\Visitor\\ClosureLocatorVisitor' => $vendorDir . '/jeremeamia/superclosure/src/Analyzer/Visitor/ClosureLocatorVisitor.php',
+ 'SuperClosure\\Analyzer\\Visitor\\MagicConstantVisitor' => $vendorDir . '/jeremeamia/superclosure/src/Analyzer/Visitor/MagicConstantVisitor.php',
+ 'SuperClosure\\Analyzer\\Visitor\\ThisDetectorVisitor' => $vendorDir . '/jeremeamia/superclosure/src/Analyzer/Visitor/ThisDetectorVisitor.php',
+ 'SuperClosure\\Exception\\ClosureAnalysisException' => $vendorDir . '/jeremeamia/superclosure/src/Exception/ClosureAnalysisException.php',
+ 'SuperClosure\\Exception\\ClosureSerializationException' => $vendorDir . '/jeremeamia/superclosure/src/Exception/ClosureSerializationException.php',
+ 'SuperClosure\\Exception\\ClosureUnserializationException' => $vendorDir . '/jeremeamia/superclosure/src/Exception/ClosureUnserializationException.php',
+ 'SuperClosure\\Exception\\SuperClosureException' => $vendorDir . '/jeremeamia/superclosure/src/Exception/SuperClosureException.php',
+ 'SuperClosure\\SerializableClosure' => $vendorDir . '/jeremeamia/superclosure/src/SerializableClosure.php',
+ 'SuperClosure\\Serializer' => $vendorDir . '/jeremeamia/superclosure/src/Serializer.php',
+ 'SuperClosure\\SerializerInterface' => $vendorDir . '/jeremeamia/superclosure/src/SerializerInterface.php',
+ 'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Application.php',
+ 'Symfony\\Component\\Console\\Command\\Command' => $vendorDir . '/symfony/console/Command/Command.php',
+ 'Symfony\\Component\\Console\\Command\\HelpCommand' => $vendorDir . '/symfony/console/Command/HelpCommand.php',
+ 'Symfony\\Component\\Console\\Command\\ListCommand' => $vendorDir . '/symfony/console/Command/ListCommand.php',
+ 'Symfony\\Component\\Console\\ConsoleEvents' => $vendorDir . '/symfony/console/ConsoleEvents.php',
+ 'Symfony\\Component\\Console\\Descriptor\\ApplicationDescription' => $vendorDir . '/symfony/console/Descriptor/ApplicationDescription.php',
+ 'Symfony\\Component\\Console\\Descriptor\\Descriptor' => $vendorDir . '/symfony/console/Descriptor/Descriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\DescriptorInterface' => $vendorDir . '/symfony/console/Descriptor/DescriptorInterface.php',
+ 'Symfony\\Component\\Console\\Descriptor\\JsonDescriptor' => $vendorDir . '/symfony/console/Descriptor/JsonDescriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\MarkdownDescriptor' => $vendorDir . '/symfony/console/Descriptor/MarkdownDescriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\TextDescriptor' => $vendorDir . '/symfony/console/Descriptor/TextDescriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\XmlDescriptor' => $vendorDir . '/symfony/console/Descriptor/XmlDescriptor.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleCommandEvent' => $vendorDir . '/symfony/console/Event/ConsoleCommandEvent.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleEvent' => $vendorDir . '/symfony/console/Event/ConsoleEvent.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent' => $vendorDir . '/symfony/console/Event/ConsoleExceptionEvent.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleTerminateEvent' => $vendorDir . '/symfony/console/Event/ConsoleTerminateEvent.php',
+ 'Symfony\\Component\\Console\\Exception\\RuntimeException' => $vendorDir . '/symfony/console/Exception/RuntimeException.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => $vendorDir . '/symfony/console/Formatter/OutputFormatter.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => $vendorDir . '/symfony/console/Formatter/OutputFormatterInterface.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyle' => $vendorDir . '/symfony/console/Formatter/OutputFormatterStyle.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyleInterface' => $vendorDir . '/symfony/console/Formatter/OutputFormatterStyleInterface.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyleStack' => $vendorDir . '/symfony/console/Formatter/OutputFormatterStyleStack.php',
+ 'Symfony\\Component\\Console\\Helper\\DebugFormatterHelper' => $vendorDir . '/symfony/console/Helper/DebugFormatterHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\DescriptorHelper' => $vendorDir . '/symfony/console/Helper/DescriptorHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\DialogHelper' => $vendorDir . '/symfony/console/Helper/DialogHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\FormatterHelper' => $vendorDir . '/symfony/console/Helper/FormatterHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\Helper' => $vendorDir . '/symfony/console/Helper/Helper.php',
+ 'Symfony\\Component\\Console\\Helper\\HelperInterface' => $vendorDir . '/symfony/console/Helper/HelperInterface.php',
+ 'Symfony\\Component\\Console\\Helper\\HelperSet' => $vendorDir . '/symfony/console/Helper/HelperSet.php',
+ 'Symfony\\Component\\Console\\Helper\\InputAwareHelper' => $vendorDir . '/symfony/console/Helper/InputAwareHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\ProcessHelper' => $vendorDir . '/symfony/console/Helper/ProcessHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\ProgressBar' => $vendorDir . '/symfony/console/Helper/ProgressBar.php',
+ 'Symfony\\Component\\Console\\Helper\\ProgressHelper' => $vendorDir . '/symfony/console/Helper/ProgressHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\QuestionHelper' => $vendorDir . '/symfony/console/Helper/QuestionHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => $vendorDir . '/symfony/console/Helper/SymfonyQuestionHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\Table' => $vendorDir . '/symfony/console/Helper/Table.php',
+ 'Symfony\\Component\\Console\\Helper\\TableCell' => $vendorDir . '/symfony/console/Helper/TableCell.php',
+ 'Symfony\\Component\\Console\\Helper\\TableHelper' => $vendorDir . '/symfony/console/Helper/TableHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\TableSeparator' => $vendorDir . '/symfony/console/Helper/TableSeparator.php',
+ 'Symfony\\Component\\Console\\Helper\\TableStyle' => $vendorDir . '/symfony/console/Helper/TableStyle.php',
+ 'Symfony\\Component\\Console\\Input\\ArgvInput' => $vendorDir . '/symfony/console/Input/ArgvInput.php',
+ 'Symfony\\Component\\Console\\Input\\ArrayInput' => $vendorDir . '/symfony/console/Input/ArrayInput.php',
+ 'Symfony\\Component\\Console\\Input\\Input' => $vendorDir . '/symfony/console/Input/Input.php',
+ 'Symfony\\Component\\Console\\Input\\InputArgument' => $vendorDir . '/symfony/console/Input/InputArgument.php',
+ 'Symfony\\Component\\Console\\Input\\InputAwareInterface' => $vendorDir . '/symfony/console/Input/InputAwareInterface.php',
+ 'Symfony\\Component\\Console\\Input\\InputDefinition' => $vendorDir . '/symfony/console/Input/InputDefinition.php',
+ 'Symfony\\Component\\Console\\Input\\InputInterface' => $vendorDir . '/symfony/console/Input/InputInterface.php',
+ 'Symfony\\Component\\Console\\Input\\InputOption' => $vendorDir . '/symfony/console/Input/InputOption.php',
+ 'Symfony\\Component\\Console\\Input\\StringInput' => $vendorDir . '/symfony/console/Input/StringInput.php',
+ 'Symfony\\Component\\Console\\Logger\\ConsoleLogger' => $vendorDir . '/symfony/console/Logger/ConsoleLogger.php',
+ 'Symfony\\Component\\Console\\Output\\BufferedOutput' => $vendorDir . '/symfony/console/Output/BufferedOutput.php',
+ 'Symfony\\Component\\Console\\Output\\ConsoleOutput' => $vendorDir . '/symfony/console/Output/ConsoleOutput.php',
+ 'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => $vendorDir . '/symfony/console/Output/ConsoleOutputInterface.php',
+ 'Symfony\\Component\\Console\\Output\\NullOutput' => $vendorDir . '/symfony/console/Output/NullOutput.php',
+ 'Symfony\\Component\\Console\\Output\\Output' => $vendorDir . '/symfony/console/Output/Output.php',
+ 'Symfony\\Component\\Console\\Output\\OutputInterface' => $vendorDir . '/symfony/console/Output/OutputInterface.php',
+ 'Symfony\\Component\\Console\\Output\\StreamOutput' => $vendorDir . '/symfony/console/Output/StreamOutput.php',
+ 'Symfony\\Component\\Console\\Question\\ChoiceQuestion' => $vendorDir . '/symfony/console/Question/ChoiceQuestion.php',
+ 'Symfony\\Component\\Console\\Question\\ConfirmationQuestion' => $vendorDir . '/symfony/console/Question/ConfirmationQuestion.php',
+ 'Symfony\\Component\\Console\\Question\\Question' => $vendorDir . '/symfony/console/Question/Question.php',
+ 'Symfony\\Component\\Console\\Shell' => $vendorDir . '/symfony/console/Shell.php',
+ 'Symfony\\Component\\Console\\Style\\OutputStyle' => $vendorDir . '/symfony/console/Style/OutputStyle.php',
+ 'Symfony\\Component\\Console\\Style\\StyleInterface' => $vendorDir . '/symfony/console/Style/StyleInterface.php',
+ 'Symfony\\Component\\Console\\Style\\SymfonyStyle' => $vendorDir . '/symfony/console/Style/SymfonyStyle.php',
+ 'Symfony\\Component\\Console\\Tester\\ApplicationTester' => $vendorDir . '/symfony/console/Tester/ApplicationTester.php',
+ 'Symfony\\Component\\Console\\Tester\\CommandTester' => $vendorDir . '/symfony/console/Tester/CommandTester.php',
+ 'Symfony\\Component\\CssSelector\\CssSelector' => $vendorDir . '/symfony/css-selector/CssSelector.php',
+ 'Symfony\\Component\\CssSelector\\CssSelectorConverter' => $vendorDir . '/symfony/css-selector/CssSelectorConverter.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/css-selector/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => $vendorDir . '/symfony/css-selector/Exception/ExpressionErrorException.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\InternalErrorException' => $vendorDir . '/symfony/css-selector/Exception/InternalErrorException.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\ParseException' => $vendorDir . '/symfony/css-selector/Exception/ParseException.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\SyntaxErrorException' => $vendorDir . '/symfony/css-selector/Exception/SyntaxErrorException.php',
+ 'Symfony\\Component\\CssSelector\\Node\\AbstractNode' => $vendorDir . '/symfony/css-selector/Node/AbstractNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\AttributeNode' => $vendorDir . '/symfony/css-selector/Node/AttributeNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\ClassNode' => $vendorDir . '/symfony/css-selector/Node/ClassNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\CombinedSelectorNode' => $vendorDir . '/symfony/css-selector/Node/CombinedSelectorNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\ElementNode' => $vendorDir . '/symfony/css-selector/Node/ElementNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\FunctionNode' => $vendorDir . '/symfony/css-selector/Node/FunctionNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\HashNode' => $vendorDir . '/symfony/css-selector/Node/HashNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\NegationNode' => $vendorDir . '/symfony/css-selector/Node/NegationNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\NodeInterface' => $vendorDir . '/symfony/css-selector/Node/NodeInterface.php',
+ 'Symfony\\Component\\CssSelector\\Node\\PseudoNode' => $vendorDir . '/symfony/css-selector/Node/PseudoNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\SelectorNode' => $vendorDir . '/symfony/css-selector/Node/SelectorNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\Specificity' => $vendorDir . '/symfony/css-selector/Node/Specificity.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\CommentHandler' => $vendorDir . '/symfony/css-selector/Parser/Handler/CommentHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\HandlerInterface' => $vendorDir . '/symfony/css-selector/Parser/Handler/HandlerInterface.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\HashHandler' => $vendorDir . '/symfony/css-selector/Parser/Handler/HashHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\IdentifierHandler' => $vendorDir . '/symfony/css-selector/Parser/Handler/IdentifierHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\NumberHandler' => $vendorDir . '/symfony/css-selector/Parser/Handler/NumberHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\StringHandler' => $vendorDir . '/symfony/css-selector/Parser/Handler/StringHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\WhitespaceHandler' => $vendorDir . '/symfony/css-selector/Parser/Handler/WhitespaceHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Parser' => $vendorDir . '/symfony/css-selector/Parser/Parser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\ParserInterface' => $vendorDir . '/symfony/css-selector/Parser/ParserInterface.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Reader' => $vendorDir . '/symfony/css-selector/Parser/Reader.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\ClassParser' => $vendorDir . '/symfony/css-selector/Parser/Shortcut/ClassParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\ElementParser' => $vendorDir . '/symfony/css-selector/Parser/Shortcut/ElementParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\EmptyStringParser' => $vendorDir . '/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\HashParser' => $vendorDir . '/symfony/css-selector/Parser/Shortcut/HashParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Token' => $vendorDir . '/symfony/css-selector/Parser/Token.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\TokenStream' => $vendorDir . '/symfony/css-selector/Parser/TokenStream.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Tokenizer\\Tokenizer' => $vendorDir . '/symfony/css-selector/Parser/Tokenizer/Tokenizer.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Tokenizer\\TokenizerEscaping' => $vendorDir . '/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Tokenizer\\TokenizerPatterns' => $vendorDir . '/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\AbstractExtension' => $vendorDir . '/symfony/css-selector/XPath/Extension/AbstractExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\AttributeMatchingExtension' => $vendorDir . '/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\CombinationExtension' => $vendorDir . '/symfony/css-selector/XPath/Extension/CombinationExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\ExtensionInterface' => $vendorDir . '/symfony/css-selector/XPath/Extension/ExtensionInterface.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\FunctionExtension' => $vendorDir . '/symfony/css-selector/XPath/Extension/FunctionExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\HtmlExtension' => $vendorDir . '/symfony/css-selector/XPath/Extension/HtmlExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\NodeExtension' => $vendorDir . '/symfony/css-selector/XPath/Extension/NodeExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\PseudoClassExtension' => $vendorDir . '/symfony/css-selector/XPath/Extension/PseudoClassExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Translator' => $vendorDir . '/symfony/css-selector/XPath/Translator.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\TranslatorInterface' => $vendorDir . '/symfony/css-selector/XPath/TranslatorInterface.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\XPathExpr' => $vendorDir . '/symfony/css-selector/XPath/XPathExpr.php',
+ 'Symfony\\Component\\Debug\\Debug' => $vendorDir . '/symfony/debug/Debug.php',
+ 'Symfony\\Component\\Debug\\DebugClassLoader' => $vendorDir . '/symfony/debug/DebugClassLoader.php',
+ 'Symfony\\Component\\Debug\\ErrorHandler' => $vendorDir . '/symfony/debug/ErrorHandler.php',
+ 'Symfony\\Component\\Debug\\ErrorHandlerCanary' => $vendorDir . '/symfony/debug/ErrorHandler.php',
+ 'Symfony\\Component\\Debug\\ExceptionHandler' => $vendorDir . '/symfony/debug/ExceptionHandler.php',
+ 'Symfony\\Component\\Debug\\Exception\\ClassNotFoundException' => $vendorDir . '/symfony/debug/Exception/ClassNotFoundException.php',
+ 'Symfony\\Component\\Debug\\Exception\\ContextErrorException' => $vendorDir . '/symfony/debug/Exception/ContextErrorException.php',
+ 'Symfony\\Component\\Debug\\Exception\\DummyException' => $vendorDir . '/symfony/debug/Exception/DummyException.php',
+ 'Symfony\\Component\\Debug\\Exception\\FatalErrorException' => $vendorDir . '/symfony/debug/Exception/FatalErrorException.php',
+ 'Symfony\\Component\\Debug\\Exception\\FatalThrowableError' => $vendorDir . '/symfony/debug/Exception/FatalThrowableError.php',
+ 'Symfony\\Component\\Debug\\Exception\\FlattenException' => $vendorDir . '/symfony/debug/Exception/FlattenException.php',
+ 'Symfony\\Component\\Debug\\Exception\\OutOfMemoryException' => $vendorDir . '/symfony/debug/Exception/OutOfMemoryException.php',
+ 'Symfony\\Component\\Debug\\Exception\\UndefinedFunctionException' => $vendorDir . '/symfony/debug/Exception/UndefinedFunctionException.php',
+ 'Symfony\\Component\\Debug\\Exception\\UndefinedMethodException' => $vendorDir . '/symfony/debug/Exception/UndefinedMethodException.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\ClassNotFoundFatalErrorHandler' => $vendorDir . '/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\FatalErrorHandlerInterface' => $vendorDir . '/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedFunctionFatalErrorHandler' => $vendorDir . '/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedMethodFatalErrorHandler' => $vendorDir . '/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php',
+ 'Symfony\\Component\\DomCrawler\\Crawler' => $vendorDir . '/symfony/dom-crawler/Crawler.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\ChoiceFormField' => $vendorDir . '/symfony/dom-crawler/Field/ChoiceFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\FileFormField' => $vendorDir . '/symfony/dom-crawler/Field/FileFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\FormField' => $vendorDir . '/symfony/dom-crawler/Field/FormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\InputFormField' => $vendorDir . '/symfony/dom-crawler/Field/InputFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\TextareaFormField' => $vendorDir . '/symfony/dom-crawler/Field/TextareaFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Form' => $vendorDir . '/symfony/dom-crawler/Form.php',
+ 'Symfony\\Component\\DomCrawler\\FormFieldRegistry' => $vendorDir . '/symfony/dom-crawler/FormFieldRegistry.php',
+ 'Symfony\\Component\\DomCrawler\\Link' => $vendorDir . '/symfony/dom-crawler/Link.php',
'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/ContainerAwareEventDispatcher.php',
'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php',
'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php',
@@ -963,768 +1253,380 @@
'Symfony\\Component\\EventDispatcher\\EventSubscriberInterface' => $vendorDir . '/symfony/event-dispatcher/EventSubscriberInterface.php',
'Symfony\\Component\\EventDispatcher\\GenericEvent' => $vendorDir . '/symfony/event-dispatcher/GenericEvent.php',
'Symfony\\Component\\EventDispatcher\\ImmutableEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/ImmutableEventDispatcher.php',
- 'Symfony\\Component\\Filesystem\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/filesystem/Exception/ExceptionInterface.php',
- 'Symfony\\Component\\Filesystem\\Exception\\FileNotFoundException' => $vendorDir . '/symfony/filesystem/Exception/FileNotFoundException.php',
- 'Symfony\\Component\\Filesystem\\Exception\\IOException' => $vendorDir . '/symfony/filesystem/Exception/IOException.php',
- 'Symfony\\Component\\Filesystem\\Exception\\IOExceptionInterface' => $vendorDir . '/symfony/filesystem/Exception/IOExceptionInterface.php',
- 'Symfony\\Component\\Filesystem\\Filesystem' => $vendorDir . '/symfony/filesystem/Filesystem.php',
- 'Symfony\\Component\\Filesystem\\LockHandler' => $vendorDir . '/symfony/filesystem/LockHandler.php',
- 'Symfony\\Component\\Finder\\Adapter\\AbstractAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Adapter/AbstractAdapter.php',
- 'Symfony\\Component\\Finder\\Adapter\\AbstractFindAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php',
- 'Symfony\\Component\\Finder\\Adapter\\AdapterInterface' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Adapter/AdapterInterface.php',
- 'Symfony\\Component\\Finder\\Adapter\\BsdFindAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Adapter/BsdFindAdapter.php',
- 'Symfony\\Component\\Finder\\Adapter\\GnuFindAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Adapter/GnuFindAdapter.php',
- 'Symfony\\Component\\Finder\\Adapter\\PhpAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Adapter/PhpAdapter.php',
- 'Symfony\\Component\\Finder\\Comparator\\Comparator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Comparator/Comparator.php',
- 'Symfony\\Component\\Finder\\Comparator\\DateComparator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Comparator/DateComparator.php',
- 'Symfony\\Component\\Finder\\Comparator\\NumberComparator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Comparator/NumberComparator.php',
- 'Symfony\\Component\\Finder\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Exception/AccessDeniedException.php',
- 'Symfony\\Component\\Finder\\Exception\\AdapterFailureException' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Exception/AdapterFailureException.php',
- 'Symfony\\Component\\Finder\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Exception/ExceptionInterface.php',
- 'Symfony\\Component\\Finder\\Exception\\OperationNotPermitedException' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Exception/OperationNotPermitedException.php',
- 'Symfony\\Component\\Finder\\Exception\\ShellCommandFailureException' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Exception/ShellCommandFailureException.php',
- 'Symfony\\Component\\Finder\\Expression\\Expression' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Expression/Expression.php',
- 'Symfony\\Component\\Finder\\Expression\\Glob' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Expression/Glob.php',
- 'Symfony\\Component\\Finder\\Expression\\Regex' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Expression/Regex.php',
- 'Symfony\\Component\\Finder\\Expression\\ValueInterface' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Expression/ValueInterface.php',
- 'Symfony\\Component\\Finder\\Finder' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Finder.php',
- 'Symfony\\Component\\Finder\\Glob' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Glob.php',
- 'Symfony\\Component\\Finder\\Iterator\\CustomFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/CustomFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\DateRangeFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\DepthRangeFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\ExcludeDirectoryFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\FilePathsIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/FilePathsIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\FileTypeFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\FilecontentFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\FilenameFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\FilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/FilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\MultiplePcreFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\PathFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/PathFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\RecursiveDirectoryIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\SizeRangeFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php',
- 'Symfony\\Component\\Finder\\Iterator\\SortableIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Iterator/SortableIterator.php',
- 'Symfony\\Component\\Finder\\Shell\\Command' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Shell/Command.php',
- 'Symfony\\Component\\Finder\\Shell\\Shell' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Shell/Shell.php',
- 'Symfony\\Component\\Finder\\SplFileInfo' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/SplFileInfo.php',
- 'Symfony\\Component\\Finder\\Tests\\Comparator\\ComparatorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Comparator/ComparatorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Comparator\\DateComparatorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Comparator\\NumberComparatorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Comparator/NumberComparatorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Expression\\ExpressionTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Expression\\GlobTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Expression/GlobTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Expression\\RegexTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Expression/RegexTest.php',
- 'Symfony\\Component\\Finder\\Tests\\FakeAdapter\\DummyAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php',
- 'Symfony\\Component\\Finder\\Tests\\FakeAdapter\\FailingAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/FakeAdapter/FailingAdapter.php',
- 'Symfony\\Component\\Finder\\Tests\\FakeAdapter\\NamedAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/FakeAdapter/NamedAdapter.php',
- 'Symfony\\Component\\Finder\\Tests\\FakeAdapter\\UnsupportedAdapter' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/FakeAdapter/UnsupportedAdapter.php',
- 'Symfony\\Component\\Finder\\Tests\\FinderTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/FinderTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\CustomFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\DateRangeFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/DateRangeFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\DepthRangeFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/DepthRangeFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\ExcludeDirectoryFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\FilePathsIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\FileTypeFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FileTypeFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\FilecontentFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\FilenameFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilenameFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\FilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\InnerNameIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilenameFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\InnerSizeIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/SizeRangeFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\InnerTypeIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FileTypeFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\Iterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/Iterator.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\IteratorTestCase' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\MockFileListIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\MockSplFileInfo' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\MultiplePcreFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\PathFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/PathFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\RealIteratorTestCase' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\RecursiveDirectoryIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\SizeRangeFilterIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/SizeRangeFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\SortableIteratorTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Iterator\\TestMultiplePcreFilterIterator' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php',
- 'Symfony\\Component\\Finder\\Tests\\Shell\\CommandTest' => $vendorDir . '/symfony/finder/Symfony/Component/Finder/Tests/Shell/CommandTest.php',
- 'Symfony\\Component\\HttpFoundation\\AcceptHeader' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/AcceptHeader.php',
- 'Symfony\\Component\\HttpFoundation\\AcceptHeaderItem' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/AcceptHeaderItem.php',
- 'Symfony\\Component\\HttpFoundation\\ApacheRequest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/ApacheRequest.php',
- 'Symfony\\Component\\HttpFoundation\\BinaryFileResponse' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php',
- 'Symfony\\Component\\HttpFoundation\\Cookie' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php',
- 'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php',
- 'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php',
- 'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php',
- 'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/FileException.php',
- 'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php',
- 'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/UnexpectedTypeException.php',
- 'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/UploadException.php',
- 'Symfony\\Component\\HttpFoundation\\File\\File' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/File.php',
- 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\ExtensionGuesser' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php',
- 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\ExtensionGuesserInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php',
- 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\FileBinaryMimeTypeGuesser' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php',
- 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\FileinfoMimeTypeGuesser' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php',
- 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeExtensionGuesser' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php',
- 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeGuesser' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php',
- 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeGuesserInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php',
- 'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php',
- 'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php',
- 'Symfony\\Component\\HttpFoundation\\IpUtils' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php',
- 'Symfony\\Component\\HttpFoundation\\JsonResponse' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/JsonResponse.php',
- 'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php',
- 'Symfony\\Component\\HttpFoundation\\RedirectResponse' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php',
- 'Symfony\\Component\\HttpFoundation\\Request' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php',
- 'Symfony\\Component\\HttpFoundation\\RequestMatcher' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php',
- 'Symfony\\Component\\HttpFoundation\\RequestMatcherInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcherInterface.php',
- 'Symfony\\Component\\HttpFoundation\\RequestStack' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestStack.php',
- 'Symfony\\Component\\HttpFoundation\\Response' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php',
- 'Symfony\\Component\\HttpFoundation\\ResponseHeaderBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php',
- 'Symfony\\Component\\HttpFoundation\\ServerBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/ServerBag.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBagInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\NamespacedAttributeBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\AutoExpireFlashBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Session' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Session.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\LegacyPdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcacheSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\WriteCheckSessionHandler' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockFileSessionStorage' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\NativeProxy' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php',
- 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php',
- 'Symfony\\Component\\HttpFoundation\\StreamedResponse' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/StreamedResponse.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\AcceptHeaderItemTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/AcceptHeaderItemTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\AcceptHeaderTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/AcceptHeaderTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\ApacheRequestTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ApacheRequestTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\BinaryFileResponseTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\CookieTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/CookieTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\ExpressionRequestMatcherTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\FileBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/FileBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\File\\FakeFile' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/FakeFile.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\File\\FileTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/FileTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\File\\MimeType\\MimeTypeTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\File\\UploadedFileTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\HeaderBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\IpUtilsTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\JsonResponseTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\JsonSerializableObject' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\NewRequest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\ParameterBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\RedirectResponseTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\RequestContentProxy' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\RequestMatcherTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\RequestStackTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\RequestTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\ResponseHeaderBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\ResponseTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\ResponseTestCase' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTestCase.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\ServerBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Attribute\\AttributeBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Attribute\\NamespacedAttributeBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Flash\\AutoExpireFlashBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Flash\\FlashBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\SessionTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\LegacyPdoSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\MemcacheSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\MemcachedSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\MockPdo' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\MongoDbSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\NativeFileSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\NativeSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\NullSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\PdoSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Handler\\WriteCheckSessionHandlerTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\MetadataBagTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\MockArraySessionStorageTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\MockFileSessionStorageTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\NativeSessionStorageTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\PhpBridgeSessionStorageTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Proxy\\AbstractProxyTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Proxy\\ConcreteProxy' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Proxy\\ConcreteSessionHandlerInterfaceProxy' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Proxy\\NativeProxyTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/NativeProxyTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\Session\\Storage\\Proxy\\SessionHandlerProxyTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\StreamedResponseTest' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php',
- 'Symfony\\Component\\HttpFoundation\\Tests\\StringableObject' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php',
- 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Bundle/Bundle.php',
- 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Bundle/BundleInterface.php',
- 'Symfony\\Component\\HttpKernel\\CacheClearer\\CacheClearerInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php',
- 'Symfony\\Component\\HttpKernel\\CacheClearer\\ChainCacheClearer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php',
- 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php',
- 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerAggregate' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php',
- 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php',
- 'Symfony\\Component\\HttpKernel\\CacheWarmer\\WarmableInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/WarmableInterface.php',
- 'Symfony\\Component\\HttpKernel\\Client' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Client.php',
- 'Symfony\\Component\\HttpKernel\\Config\\EnvParametersResource' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Config/EnvParametersResource.php',
- 'Symfony\\Component\\HttpKernel\\Config\\FileLocator' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Config/FileLocator.php',
- 'Symfony\\Component\\HttpKernel\\Controller\\ControllerReference' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/ControllerReference.php',
- 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/ControllerResolver.php',
- 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php',
- 'Symfony\\Component\\HttpKernel\\Controller\\TraceableControllerResolver' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\ConfigDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\DataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\DataCollectorInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\DumpDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\EventDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\ExceptionDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\LateDataCollectorInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\LoggerDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\MemoryDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\RequestDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\RouterDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\TimeDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php',
- 'Symfony\\Component\\HttpKernel\\DataCollector\\Util\\ValueExporter' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php',
- 'Symfony\\Component\\HttpKernel\\Debug\\ErrorHandler' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ErrorHandler.php',
- 'Symfony\\Component\\HttpKernel\\Debug\\ExceptionHandler' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php',
- 'Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php',
- 'Symfony\\Component\\HttpKernel\\DependencyInjection\\AddClassesToCachePass' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DependencyInjection/AddClassesToCachePass.php',
- 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ConfigurableExtension' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php',
- 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ContainerAwareHttpKernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php',
- 'Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DependencyInjection/Extension.php',
- 'Symfony\\Component\\HttpKernel\\DependencyInjection\\MergeExtensionConfigurationPass' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php',
- 'Symfony\\Component\\HttpKernel\\DependencyInjection\\RegisterListenersPass' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\AddRequestFormatsListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\DebugHandlersListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\DumpListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/DumpListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\ErrorsLoggerListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\EsiListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/EsiListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\FragmentListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/FragmentListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\LocaleListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/LocaleListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\ProfilerListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/ResponseListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/RouterListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\SaveSessionListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\SessionListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SessionListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\StreamedResponseListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\SurrogateListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\TestSessionListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php',
- 'Symfony\\Component\\HttpKernel\\EventListener\\TranslatorListener' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php',
- 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/FilterControllerEvent.php',
- 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php',
- 'Symfony\\Component\\HttpKernel\\Event\\FinishRequestEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/FinishRequestEvent.php',
- 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php',
- 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseForControllerResultEvent.php',
- 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseForExceptionEvent.php',
- 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php',
- 'Symfony\\Component\\HttpKernel\\Event\\PostResponseEvent' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Event/PostResponseEvent.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\AccessDeniedHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\BadRequestHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\ConflictHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\GoneHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/GoneHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\HttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/HttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\HttpExceptionInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\LengthRequiredHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\MethodNotAllowedHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\NotAcceptableHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\PreconditionFailedHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\PreconditionRequiredHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\ServiceUnavailableHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\TooManyRequestsHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\UnauthorizedHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\UnprocessableEntityHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Exception\\UnsupportedMediaTypeHttpException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\AbstractSurrogateFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\EsiFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\FragmentHandler' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\FragmentRendererInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\HIncludeFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\InlineFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\RoutableFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php',
- 'Symfony\\Component\\HttpKernel\\Fragment\\SsiFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/SsiFragmentRenderer.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\Esi' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\EsiResponseCacheStrategy' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\EsiResponseCacheStrategyInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\HttpCache' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\ResponseCacheStrategy' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\ResponseCacheStrategyInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\Ssi' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Ssi.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\Store' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Store.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\StoreInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\SurrogateInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php',
- 'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php',
- 'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php',
- 'Symfony\\Component\\HttpKernel\\Kernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php',
- 'Symfony\\Component\\HttpKernel\\KernelEvents' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/KernelEvents.php',
- 'Symfony\\Component\\HttpKernel\\KernelInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php',
- 'Symfony\\Component\\HttpKernel\\Log\\DebugLoggerInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php',
- 'Symfony\\Component\\HttpKernel\\Log\\LoggerInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Log/LoggerInterface.php',
- 'Symfony\\Component\\HttpKernel\\Log\\NullLogger' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Log/NullLogger.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\BaseMemcacheProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\FileProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\MemcacheProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\MemcachedProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MemcachedProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\MongoDbProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\MysqlProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MysqlProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\PdoProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\Profile' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/Profile.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\Profiler' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/Profiler.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\RedisProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\Profiler\\SqliteProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php',
- 'Symfony\\Component\\HttpKernel\\TerminableInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/TerminableInterface.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Bundle\\BundleTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\CacheClearer\\ChainCacheClearerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\CacheWarmer\\CacheWarmerAggregateTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\CacheWarmer\\CacheWarmerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\CacheWarmer\\TestCacheWarmer' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\ClientTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/ClientTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Config\\EnvParametersResourceTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Config/EnvParametersResourceTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Config\\FileLocatorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Controller' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Controller\\ControllerResolverTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\ConfigDataCollectorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\DumpDataCollectorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\ExceptionDataCollectorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\KernelForTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\LoggerDataCollectorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\MemoryDataCollectorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\RequestDataCollectorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\TimeDataCollectorTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DataCollector\\Util\\ValueExporterTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/Util/ValueExporterTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Debug\\TraceableEventDispatcherTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DependencyInjection\\ContainerAwareHttpKernelTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\DependencyInjection\\MergeExtensionConfigurationPassTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\AddRequestFormatsListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\DebugHandlersListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\DumpListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\ExceptionListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\FragmentListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\LocaleListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\MockCloner' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\MockDumper' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\ProfilerListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\ResponseListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\RouterListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\SurrogateListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\TestKernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\TestKernelThatThrowsException' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\TestLogger' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\TestSessionListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\EventListener\\TranslatorListenerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionAbsentBundle\\ExtensionAbsentBundle' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionAbsentBundle/ExtensionAbsentBundle.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionLoadedBundle\\DependencyInjection\\ExtensionLoadedExtension' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionLoadedBundle/DependencyInjection/ExtensionLoadedExtension.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionLoadedBundle\\ExtensionLoadedBundle' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionLoadedBundle/ExtensionLoadedBundle.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionNotValidBundle\\DependencyInjection\\ExtensionNotValidExtension' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionNotValidBundle/DependencyInjection/ExtensionNotValidExtension.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionNotValidBundle\\ExtensionNotValidBundle' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionNotValidBundle/ExtensionNotValidBundle.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionPresentBundle\\Command\\BarCommand' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/Command/BarCommand.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionPresentBundle\\Command\\FooCommand' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/Command/FooCommand.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionPresentBundle\\DependencyInjection\\ExtensionPresentExtension' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\ExtensionPresentBundle\\ExtensionPresentBundle' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/ExtensionPresentBundle.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\FooBarBundle' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/FooBarBundle.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\KernelForOverrideName' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForOverrideName.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\KernelForTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\TestClient' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/TestClient.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fixtures\\TestEventDispatcher' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fragment\\Bar' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fragment\\EsiFragmentRendererTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fragment\\Foo' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fragment\\FragmentHandlerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fragment\\HIncludeFragmentRendererTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fragment\\InlineFragmentRendererTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Fragment\\RoutableFragmentRendererTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpCache\\EsiTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpCache\\HttpCacheTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpCache\\HttpCacheTestCase' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpCache\\SsiTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpCache\\StoreTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpCache\\TestHttpKernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/TestHttpKernel.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpCache\\TestMultipleHttpKernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\HttpKernelTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\KernelTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Logger' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Logger.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\AbstractProfilerStorageTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/AbstractProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\DummyMongoDbProfilerStorage' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\FileProfilerStorageTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\MemcacheProfilerStorageTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MemcacheProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\MemcachedProfilerStorageTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MemcachedProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\Mock\\MemcacheMock' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\Mock\\MemcachedMock' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\Mock\\RedisMock' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\MongoDbProfilerStorageTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\MongoDbProfilerStorageTestDataCollector' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\ProfilerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\RedisProfilerStorageTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/RedisProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\Profiler\\SqliteProfilerStorageTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\TestHttpKernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/TestHttpKernel.php',
- 'Symfony\\Component\\HttpKernel\\Tests\\UriSignerTest' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/UriSignerTest.php',
- 'Symfony\\Component\\HttpKernel\\UriSigner' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/UriSigner.php',
- 'Symfony\\Component\\Process\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/process/Symfony/Component/Process/Exception/ExceptionInterface.php',
- 'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Symfony/Component/Process/Exception/InvalidArgumentException.php',
- 'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Symfony/Component/Process/Exception/LogicException.php',
- 'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Symfony/Component/Process/Exception/ProcessFailedException.php',
- 'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Symfony/Component/Process/Exception/ProcessTimedOutException.php',
- 'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Symfony/Component/Process/Exception/RuntimeException.php',
- 'Symfony\\Component\\Process\\ExecutableFinder' => $vendorDir . '/symfony/process/Symfony/Component/Process/ExecutableFinder.php',
- 'Symfony\\Component\\Process\\PhpExecutableFinder' => $vendorDir . '/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php',
- 'Symfony\\Component\\Process\\PhpProcess' => $vendorDir . '/symfony/process/Symfony/Component/Process/PhpProcess.php',
- 'Symfony\\Component\\Process\\Pipes\\AbstractPipes' => $vendorDir . '/symfony/process/Symfony/Component/Process/Pipes/AbstractPipes.php',
- 'Symfony\\Component\\Process\\Pipes\\PipesInterface' => $vendorDir . '/symfony/process/Symfony/Component/Process/Pipes/PipesInterface.php',
- 'Symfony\\Component\\Process\\Pipes\\UnixPipes' => $vendorDir . '/symfony/process/Symfony/Component/Process/Pipes/UnixPipes.php',
- 'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => $vendorDir . '/symfony/process/Symfony/Component/Process/Pipes/WindowsPipes.php',
- 'Symfony\\Component\\Process\\Process' => $vendorDir . '/symfony/process/Symfony/Component/Process/Process.php',
- 'Symfony\\Component\\Process\\ProcessBuilder' => $vendorDir . '/symfony/process/Symfony/Component/Process/ProcessBuilder.php',
- 'Symfony\\Component\\Process\\ProcessUtils' => $vendorDir . '/symfony/process/Symfony/Component/Process/ProcessUtils.php',
- 'Symfony\\Component\\Process\\Tests\\AbstractProcessTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php',
- 'Symfony\\Component\\Process\\Tests\\ExecutableFinderTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/ExecutableFinderTest.php',
- 'Symfony\\Component\\Process\\Tests\\NonStringifiable' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php',
- 'Symfony\\Component\\Process\\Tests\\PhpExecutableFinderTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php',
- 'Symfony\\Component\\Process\\Tests\\PhpProcessTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/PhpProcessTest.php',
- 'Symfony\\Component\\Process\\Tests\\ProcessBuilderTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/ProcessBuilderTest.php',
- 'Symfony\\Component\\Process\\Tests\\ProcessFailedExceptionTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php',
- 'Symfony\\Component\\Process\\Tests\\ProcessInSigchildEnvironment' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/ProcessInSigchildEnvironment.php',
- 'Symfony\\Component\\Process\\Tests\\ProcessUtilsTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/ProcessUtilsTest.php',
- 'Symfony\\Component\\Process\\Tests\\SigchildDisabledProcessTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php',
- 'Symfony\\Component\\Process\\Tests\\SigchildEnabledProcessTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php',
- 'Symfony\\Component\\Process\\Tests\\SimpleProcessTest' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/SimpleProcessTest.php',
- 'Symfony\\Component\\Process\\Tests\\Stringifiable' => $vendorDir . '/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php',
- 'Symfony\\Component\\Routing\\Annotation\\Route' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Annotation/Route.php',
- 'Symfony\\Component\\Routing\\CompiledRoute' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/CompiledRoute.php',
- 'Symfony\\Component\\Routing\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Exception/ExceptionInterface.php',
- 'Symfony\\Component\\Routing\\Exception\\InvalidParameterException' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Exception/InvalidParameterException.php',
- 'Symfony\\Component\\Routing\\Exception\\MethodNotAllowedException' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Exception/MethodNotAllowedException.php',
- 'Symfony\\Component\\Routing\\Exception\\MissingMandatoryParametersException' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Exception/MissingMandatoryParametersException.php',
- 'Symfony\\Component\\Routing\\Exception\\ResourceNotFoundException' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Exception/ResourceNotFoundException.php',
- 'Symfony\\Component\\Routing\\Exception\\RouteNotFoundException' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Exception/RouteNotFoundException.php',
- 'Symfony\\Component\\Routing\\Generator\\ConfigurableRequirementsInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php',
- 'Symfony\\Component\\Routing\\Generator\\Dumper\\GeneratorDumper' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php',
- 'Symfony\\Component\\Routing\\Generator\\Dumper\\GeneratorDumperInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php',
- 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php',
- 'Symfony\\Component\\Routing\\Generator\\UrlGenerator' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php',
- 'Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php',
- 'Symfony\\Component\\Routing\\Loader\\AnnotationClassLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Loader/AnnotationClassLoader.php',
- 'Symfony\\Component\\Routing\\Loader\\AnnotationDirectoryLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php',
- 'Symfony\\Component\\Routing\\Loader\\AnnotationFileLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Loader/AnnotationFileLoader.php',
- 'Symfony\\Component\\Routing\\Loader\\ClosureLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Loader/ClosureLoader.php',
- 'Symfony\\Component\\Routing\\Loader\\PhpFileLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Loader/PhpFileLoader.php',
- 'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Loader/XmlFileLoader.php',
- 'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Loader/YamlFileLoader.php',
- 'Symfony\\Component\\Routing\\Matcher\\ApacheUrlMatcher' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php',
- 'Symfony\\Component\\Routing\\Matcher\\Dumper\\ApacheMatcherDumper' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php',
- 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php',
- 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperPrefixCollection' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php',
- 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php',
- 'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php',
- 'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php',
- 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php',
- 'Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcher' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php',
- 'Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcherInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php',
- 'Symfony\\Component\\Routing\\Matcher\\RequestMatcherInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php',
- 'Symfony\\Component\\Routing\\Matcher\\TraceableUrlMatcher' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php',
- 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php',
- 'Symfony\\Component\\Routing\\Matcher\\UrlMatcherInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php',
- 'Symfony\\Component\\Routing\\RequestContext' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/RequestContext.php',
- 'Symfony\\Component\\Routing\\RequestContextAwareInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/RequestContextAwareInterface.php',
- 'Symfony\\Component\\Routing\\Route' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Route.php',
- 'Symfony\\Component\\Routing\\RouteCollection' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/RouteCollection.php',
- 'Symfony\\Component\\Routing\\RouteCompiler' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/RouteCompiler.php',
- 'Symfony\\Component\\Routing\\RouteCompilerInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/RouteCompilerInterface.php',
- 'Symfony\\Component\\Routing\\Router' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Router.php',
- 'Symfony\\Component\\Routing\\RouterInterface' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/RouterInterface.php',
- 'Symfony\\Component\\Routing\\Tests\\Annotation\\RouteTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Annotation/RouteTest.php',
- 'Symfony\\Component\\Routing\\Tests\\CompiledRouteTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/CompiledRouteTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Fixtures\\AnnotatedClasses\\AbstractClass' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/AbstractClass.php',
- 'Symfony\\Component\\Routing\\Tests\\Fixtures\\AnnotatedClasses\\BarClass' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/BarClass.php',
- 'Symfony\\Component\\Routing\\Tests\\Fixtures\\AnnotatedClasses\\FooClass' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/FooClass.php',
- 'Symfony\\Component\\Routing\\Tests\\Fixtures\\CustomXmlFileLoader' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/CustomXmlFileLoader.php',
- 'Symfony\\Component\\Routing\\Tests\\Fixtures\\RedirectableUrlMatcher' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/RedirectableUrlMatcher.php',
- 'Symfony\\Component\\Routing\\Tests\\Generator\\Dumper\\PhpGeneratorDumperTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Generator\\UrlGeneratorTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\AbstractAnnotationLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\AnnotationClassLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\AnnotationDirectoryLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\AnnotationFileLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\ClosureLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/ClosureLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\PhpFileLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\XmlFileLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Loader\\YamlFileLoaderTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\Dumper\\DumperCollectionTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/Dumper/DumperCollectionTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\Dumper\\DumperPrefixCollectionTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/Dumper/DumperPrefixCollectionTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\Dumper\\LegacyApacheMatcherDumperTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\Dumper\\PhpMatcherDumperTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\LegacyApacheUrlMatcherTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\RedirectableUrlMatcherTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\TraceableUrlMatcherTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/TraceableUrlMatcherTest.php',
- 'Symfony\\Component\\Routing\\Tests\\Matcher\\UrlMatcherTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php',
- 'Symfony\\Component\\Routing\\Tests\\RequestContextTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/RequestContextTest.php',
- 'Symfony\\Component\\Routing\\Tests\\RouteCollectionTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/RouteCollectionTest.php',
- 'Symfony\\Component\\Routing\\Tests\\RouteCompilerTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/RouteCompilerTest.php',
- 'Symfony\\Component\\Routing\\Tests\\RouteTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php',
- 'Symfony\\Component\\Routing\\Tests\\RouterTest' => $vendorDir . '/symfony/routing/Symfony/Component/Routing/Tests/RouterTest.php',
- 'Symfony\\Component\\Security\\Core\\AuthenticationEvents' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/AuthenticationEvents.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationManagerInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/AuthenticationManagerInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolver' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolverInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AnonymousAuthenticationProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AuthenticationProviderInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Provider/AuthenticationProviderInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\DaoAuthenticationProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\PreAuthenticatedAuthenticationProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\RememberMeAuthenticationProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\SimpleAuthenticationProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\UserAuthenticationProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\RememberMe\\InMemoryTokenProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\RememberMe\\PersistentToken' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\RememberMe\\PersistentTokenInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentTokenInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\RememberMe\\TokenProviderInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\SimpleAuthenticatorInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/SimpleAuthenticatorInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\SimpleFormAuthenticatorInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/SimpleFormAuthenticatorInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\SimplePreAuthenticatorInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/SimplePreAuthenticatorInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AbstractToken' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\PreAuthenticatedToken' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\UsernamePasswordToken' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManagerInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationChecker' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationCheckerInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/AuthorizationCheckerInterface.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\ExpressionLanguage' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\ExpressionLanguageProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\AbstractVoter' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\AuthenticatedVoter' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\ExpressionVoter' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\RoleHierarchyVoter' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\RoleVoter' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php',
- 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\BCryptPasswordEncoder' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\BasePasswordEncoder' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\EncoderAwareInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/EncoderAwareInterface.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactory' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/EncoderFactory.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\MessageDigestPasswordEncoder' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/MessageDigestPasswordEncoder.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\Pbkdf2PasswordEncoder' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\PlaintextPasswordEncoder' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/PlaintextPasswordEncoder.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoder' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/UserPasswordEncoder.php',
- 'Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Encoder/UserPasswordEncoderInterface.php',
- 'Symfony\\Component\\Security\\Core\\Event\\AuthenticationEvent' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Event/AuthenticationEvent.php',
- 'Symfony\\Component\\Security\\Core\\Event\\AuthenticationFailureEvent' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Event/AuthenticationFailureEvent.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/AccessDeniedException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\AccountExpiredException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/AccountExpiredException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\AccountStatusException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/AccountStatusException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\AuthenticationCredentialsNotFoundException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/AuthenticationCredentialsNotFoundException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\AuthenticationException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/AuthenticationException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\AuthenticationServiceException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/AuthenticationServiceException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\BadCredentialsException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/BadCredentialsException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\CookieTheftException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/CookieTheftException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\CredentialsExpiredException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/CredentialsExpiredException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\DisabledException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/DisabledException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/ExceptionInterface.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\InsufficientAuthenticationException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/InsufficientAuthenticationException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/InvalidArgumentException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\InvalidCsrfTokenException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/InvalidCsrfTokenException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\LockedException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/LockedException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\LogoutException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/LogoutException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\NonceExpiredException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/NonceExpiredException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\ProviderNotFoundException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/ProviderNotFoundException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\RuntimeException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/RuntimeException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\SessionUnavailableException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/SessionUnavailableException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\TokenNotFoundException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/TokenNotFoundException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\UnsupportedUserException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/UnsupportedUserException.php',
- 'Symfony\\Component\\Security\\Core\\Exception\\UsernameNotFoundException' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Exception/UsernameNotFoundException.php',
- 'Symfony\\Component\\Security\\Core\\Role\\Role' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Role/Role.php',
- 'Symfony\\Component\\Security\\Core\\Role\\RoleHierarchy' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Role/RoleHierarchy.php',
- 'Symfony\\Component\\Security\\Core\\Role\\RoleHierarchyInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php',
- 'Symfony\\Component\\Security\\Core\\Role\\RoleInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Role/RoleInterface.php',
- 'Symfony\\Component\\Security\\Core\\Role\\SwitchUserRole' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Role/SwitchUserRole.php',
- 'Symfony\\Component\\Security\\Core\\Security' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Security.php',
- 'Symfony\\Component\\Security\\Core\\SecurityContext' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/SecurityContext.php',
- 'Symfony\\Component\\Security\\Core\\SecurityContextInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/SecurityContextInterface.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\AuthenticationProviderManagerTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\AuthenticationTrustResolverTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Provider\\AnonymousAuthenticationProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Provider\\DaoAuthenticationProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Provider\\PreAuthenticatedAuthenticationProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Provider\\RememberMeAuthenticationProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Provider\\UserAuthenticationProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\RememberMe\\InMemoryTokenProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\RememberMe\\PersistentTokenTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/RememberMe/PersistentTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\AbstractTokenTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\AnonymousTokenTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/AnonymousTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\ConcreteToken' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\PreAuthenticatedTokenTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/PreAuthenticatedTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\RememberMeTokenTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\Storage\\TokenStorageTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/TokenStorageTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\TestUser' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authentication\\Token\\UsernamePasswordTokenTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authorization\\AccessDecisionManagerTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authorization\\AuthorizationCheckerTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authorization\\ExpressionLanguageTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authorization/ExpressionLanguageTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authorization\\Voter\\AuthenticatedVoterTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authorization\\Voter\\ExpressionVoterTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authorization\\Voter\\RoleHierarchyVoterTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleHierarchyVoterTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Authorization\\Voter\\RoleVoterTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\BCryptPasswordEncoderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\BasePasswordEncoderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\EncAwareUser' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\EncoderFactoryTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\MessageDigestPasswordEncoderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\PasswordEncoder' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\Pbkdf2PasswordEncoderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\PlaintextPasswordEncoderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/PlaintextPasswordEncoderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\SomeChildUser' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\SomeUser' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Encoder\\UserPasswordEncoderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Encoder/UserPasswordEncoderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Exception\\UsernameNotFoundExceptionTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Exception/UsernameNotFoundExceptionTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Role\\RoleHierarchyTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Role/RoleHierarchyTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Role\\RoleTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Role/RoleTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Role\\SwitchUserRoleTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Role/SwitchUserRoleTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\SecurityContextTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/SecurityContextTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\User\\ChainUserProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\User\\InMemoryUserProviderTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\User\\UserCheckerTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\User\\UserTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/User/UserTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Util\\ClassUtilsTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Util/ClassUtilsTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Util\\SecureRandomTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Util/SecureRandomTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Util\\StringUtilsTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Util/StringUtilsTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Util\\TestObject' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Util/ClassUtilsTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Validator\\Constraints\\LegacyUserPasswordValidator2Dot4ApiTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Validator\\Constraints\\LegacyUserPasswordValidatorTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php',
- 'Symfony\\Component\\Security\\Core\\Tests\\Validator\\Constraints\\UserPasswordValidatorTest' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php',
- 'Symfony\\Component\\Security\\Core\\User\\AdvancedUserInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/AdvancedUserInterface.php',
- 'Symfony\\Component\\Security\\Core\\User\\ChainUserProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/ChainUserProvider.php',
- 'Symfony\\Component\\Security\\Core\\User\\EquatableInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/EquatableInterface.php',
- 'Symfony\\Component\\Security\\Core\\User\\InMemoryUserProvider' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/InMemoryUserProvider.php',
- 'Symfony\\Component\\Security\\Core\\User\\User' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/User.php',
- 'Symfony\\Component\\Security\\Core\\User\\UserChecker' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/UserChecker.php',
- 'Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/UserCheckerInterface.php',
- 'Symfony\\Component\\Security\\Core\\User\\UserInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/UserInterface.php',
- 'Symfony\\Component\\Security\\Core\\User\\UserProviderInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/User/UserProviderInterface.php',
- 'Symfony\\Component\\Security\\Core\\Util\\ClassUtils' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Util/ClassUtils.php',
- 'Symfony\\Component\\Security\\Core\\Util\\SecureRandom' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Util/SecureRandom.php',
- 'Symfony\\Component\\Security\\Core\\Util\\SecureRandomInterface' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Util/SecureRandomInterface.php',
- 'Symfony\\Component\\Security\\Core\\Util\\StringUtils' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Util/StringUtils.php',
- 'Symfony\\Component\\Security\\Core\\Validator\\Constraints\\UserPassword' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php',
- 'Symfony\\Component\\Security\\Core\\Validator\\Constraints\\UserPasswordValidator' => $vendorDir . '/symfony/security-core/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php',
- 'Symfony\\Component\\Translation\\Catalogue\\AbstractOperation' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Catalogue/AbstractOperation.php',
- 'Symfony\\Component\\Translation\\Catalogue\\DiffOperation' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Catalogue/DiffOperation.php',
- 'Symfony\\Component\\Translation\\Catalogue\\MergeOperation' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Catalogue/MergeOperation.php',
- 'Symfony\\Component\\Translation\\Catalogue\\OperationInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Catalogue/OperationInterface.php',
- 'Symfony\\Component\\Translation\\Dumper\\CsvFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/CsvFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\DumperInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/DumperInterface.php',
- 'Symfony\\Component\\Translation\\Dumper\\FileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/FileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\IcuResFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/IcuResFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\IniFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/IniFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\JsonFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/JsonFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\MoFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/MoFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\PhpFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/PhpFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\PoFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/PoFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\QtFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/QtFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\XliffFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/XliffFileDumper.php',
- 'Symfony\\Component\\Translation\\Dumper\\YamlFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Dumper/YamlFileDumper.php',
- 'Symfony\\Component\\Translation\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Exception/ExceptionInterface.php',
- 'Symfony\\Component\\Translation\\Exception\\InvalidResourceException' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Exception/InvalidResourceException.php',
- 'Symfony\\Component\\Translation\\Exception\\NotFoundResourceException' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Exception/NotFoundResourceException.php',
- 'Symfony\\Component\\Translation\\Extractor\\ChainExtractor' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Extractor/ChainExtractor.php',
- 'Symfony\\Component\\Translation\\Extractor\\ExtractorInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Extractor/ExtractorInterface.php',
- 'Symfony\\Component\\Translation\\IdentityTranslator' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/IdentityTranslator.php',
- 'Symfony\\Component\\Translation\\Interval' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Interval.php',
- 'Symfony\\Component\\Translation\\Loader\\ArrayLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/ArrayLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\CsvFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/CsvFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\IcuDatFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/IcuDatFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\IcuResFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/IcuResFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\IniFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/IniFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\JsonFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/JsonFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\LoaderInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/LoaderInterface.php',
- 'Symfony\\Component\\Translation\\Loader\\MoFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/MoFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\PhpFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/PhpFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\PoFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/PoFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\QtFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/QtFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\XliffFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/XliffFileLoader.php',
- 'Symfony\\Component\\Translation\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Loader/YamlFileLoader.php',
- 'Symfony\\Component\\Translation\\LoggingTranslator' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/LoggingTranslator.php',
- 'Symfony\\Component\\Translation\\MessageCatalogue' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/MessageCatalogue.php',
- 'Symfony\\Component\\Translation\\MessageCatalogueInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/MessageCatalogueInterface.php',
- 'Symfony\\Component\\Translation\\MessageSelector' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/MessageSelector.php',
- 'Symfony\\Component\\Translation\\MetadataAwareInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/MetadataAwareInterface.php',
- 'Symfony\\Component\\Translation\\PluralizationRules' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/PluralizationRules.php',
- 'Symfony\\Component\\Translation\\Tests\\Catalogue\\AbstractOperationTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Catalogue\\DiffOperationTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Catalogue/DiffOperationTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Catalogue\\MergeOperationTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\ConcreteFileDumper' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\CsvFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\FileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\IcuResFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\IniFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\JsonFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\MoFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\PhpFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\PoFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\QtFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\XliffFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Dumper\\YamlFileDumperTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php',
- 'Symfony\\Component\\Translation\\Tests\\IdentityTranslatorTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php',
- 'Symfony\\Component\\Translation\\Tests\\IntervalTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/IntervalTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\CsvFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\IcuDatFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\IcuResFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\IniFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\JsonFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\LocalizedTestCase' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/LocalizedTestCase.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\MoFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\PhpFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\PoFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\QtFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\XliffFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\Loader\\YamlFileLoaderTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php',
- 'Symfony\\Component\\Translation\\Tests\\LoggingTranslatorTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php',
- 'Symfony\\Component\\Translation\\Tests\\MessageCatalogueTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/MessageCatalogueTest.php',
- 'Symfony\\Component\\Translation\\Tests\\MessageSelectorTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/MessageSelectorTest.php',
- 'Symfony\\Component\\Translation\\Tests\\PluralizationRulesTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/PluralizationRulesTest.php',
- 'Symfony\\Component\\Translation\\Tests\\StaleResource' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/TranslatorCacheTest.php',
- 'Symfony\\Component\\Translation\\Tests\\StringClass' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/TranslatorTest.php',
- 'Symfony\\Component\\Translation\\Tests\\TranslatorCacheTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/TranslatorCacheTest.php',
- 'Symfony\\Component\\Translation\\Tests\\TranslatorTest' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Tests/TranslatorTest.php',
- 'Symfony\\Component\\Translation\\Translator' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Translator.php',
- 'Symfony\\Component\\Translation\\TranslatorBagInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/TranslatorBagInterface.php',
- 'Symfony\\Component\\Translation\\TranslatorInterface' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/TranslatorInterface.php',
- 'Symfony\\Component\\Translation\\Writer\\TranslationWriter' => $vendorDir . '/symfony/translation/Symfony/Component/Translation/Writer/TranslationWriter.php',
- 'Symfony\\Component\\VarDumper\\Caster\\ConstStub' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/ConstStub.php',
- 'Symfony\\Component\\VarDumper\\Caster\\CutStub' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/CutStub.php',
- 'Symfony\\Component\\VarDumper\\Caster\\DOMCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/DOMCaster.php',
- 'Symfony\\Component\\VarDumper\\Caster\\DoctrineCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/DoctrineCaster.php',
- 'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/ExceptionCaster.php',
- 'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/PdoCaster.php',
- 'Symfony\\Component\\VarDumper\\Caster\\ReflectionCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/ReflectionCaster.php',
- 'Symfony\\Component\\VarDumper\\Caster\\ResourceCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/ResourceCaster.php',
- 'Symfony\\Component\\VarDumper\\Caster\\SplCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/SplCaster.php',
- 'Symfony\\Component\\VarDumper\\Caster\\StubCaster' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Caster/StubCaster.php',
- 'Symfony\\Component\\VarDumper\\Cloner\\AbstractCloner' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Cloner/AbstractCloner.php',
- 'Symfony\\Component\\VarDumper\\Cloner\\ClonerInterface' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Cloner/ClonerInterface.php',
- 'Symfony\\Component\\VarDumper\\Cloner\\Cursor' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Cloner/Cursor.php',
- 'Symfony\\Component\\VarDumper\\Cloner\\Data' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Cloner/Data.php',
- 'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Cloner/DumperInterface.php',
- 'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Cloner/Stub.php',
- 'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Cloner/VarCloner.php',
- 'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Dumper/AbstractDumper.php',
- 'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Dumper/CliDumper.php',
- 'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php',
- 'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Dumper/HtmlDumper.php',
- 'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php',
- 'Symfony\\Component\\VarDumper\\Tests\\Caster\\PdoCasterTest' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Tests/Caster/PdoCasterTest.php',
- 'Symfony\\Component\\VarDumper\\Tests\\CliDumperTest' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Tests/CliDumperTest.php',
- 'Symfony\\Component\\VarDumper\\Tests\\Fixture\\DumbFoo' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php',
- 'Symfony\\Component\\VarDumper\\Tests\\HtmlDumperTest' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php',
- 'Symfony\\Component\\VarDumper\\Tests\\VarClonerTest' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Tests/VarClonerTest.php',
- 'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/VarDumper.php',
+ 'Symfony\\Component\\Finder\\Adapter\\AbstractAdapter' => $vendorDir . '/symfony/finder/Adapter/AbstractAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\AbstractFindAdapter' => $vendorDir . '/symfony/finder/Adapter/AbstractFindAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\AdapterInterface' => $vendorDir . '/symfony/finder/Adapter/AdapterInterface.php',
+ 'Symfony\\Component\\Finder\\Adapter\\BsdFindAdapter' => $vendorDir . '/symfony/finder/Adapter/BsdFindAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\GnuFindAdapter' => $vendorDir . '/symfony/finder/Adapter/GnuFindAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\PhpAdapter' => $vendorDir . '/symfony/finder/Adapter/PhpAdapter.php',
+ 'Symfony\\Component\\Finder\\Comparator\\Comparator' => $vendorDir . '/symfony/finder/Comparator/Comparator.php',
+ 'Symfony\\Component\\Finder\\Comparator\\DateComparator' => $vendorDir . '/symfony/finder/Comparator/DateComparator.php',
+ 'Symfony\\Component\\Finder\\Comparator\\NumberComparator' => $vendorDir . '/symfony/finder/Comparator/NumberComparator.php',
+ 'Symfony\\Component\\Finder\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/finder/Exception/AccessDeniedException.php',
+ 'Symfony\\Component\\Finder\\Exception\\AdapterFailureException' => $vendorDir . '/symfony/finder/Exception/AdapterFailureException.php',
+ 'Symfony\\Component\\Finder\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/finder/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Finder\\Exception\\OperationNotPermitedException' => $vendorDir . '/symfony/finder/Exception/OperationNotPermitedException.php',
+ 'Symfony\\Component\\Finder\\Exception\\ShellCommandFailureException' => $vendorDir . '/symfony/finder/Exception/ShellCommandFailureException.php',
+ 'Symfony\\Component\\Finder\\Expression\\Expression' => $vendorDir . '/symfony/finder/Expression/Expression.php',
+ 'Symfony\\Component\\Finder\\Expression\\Glob' => $vendorDir . '/symfony/finder/Expression/Glob.php',
+ 'Symfony\\Component\\Finder\\Expression\\Regex' => $vendorDir . '/symfony/finder/Expression/Regex.php',
+ 'Symfony\\Component\\Finder\\Expression\\ValueInterface' => $vendorDir . '/symfony/finder/Expression/ValueInterface.php',
+ 'Symfony\\Component\\Finder\\Finder' => $vendorDir . '/symfony/finder/Finder.php',
+ 'Symfony\\Component\\Finder\\Glob' => $vendorDir . '/symfony/finder/Glob.php',
+ 'Symfony\\Component\\Finder\\Iterator\\CustomFilterIterator' => $vendorDir . '/symfony/finder/Iterator/CustomFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\DateRangeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/DateRangeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\DepthRangeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/DepthRangeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\ExcludeDirectoryFilterIterator' => $vendorDir . '/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilePathsIterator' => $vendorDir . '/symfony/finder/Iterator/FilePathsIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FileTypeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FileTypeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilecontentFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilecontentFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilenameFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilenameFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\MultiplePcreFilterIterator' => $vendorDir . '/symfony/finder/Iterator/MultiplePcreFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\PathFilterIterator' => $vendorDir . '/symfony/finder/Iterator/PathFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\RecursiveDirectoryIterator' => $vendorDir . '/symfony/finder/Iterator/RecursiveDirectoryIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\SizeRangeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/SizeRangeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\SortableIterator' => $vendorDir . '/symfony/finder/Iterator/SortableIterator.php',
+ 'Symfony\\Component\\Finder\\Shell\\Command' => $vendorDir . '/symfony/finder/Shell/Command.php',
+ 'Symfony\\Component\\Finder\\Shell\\Shell' => $vendorDir . '/symfony/finder/Shell/Shell.php',
+ 'Symfony\\Component\\Finder\\SplFileInfo' => $vendorDir . '/symfony/finder/SplFileInfo.php',
+ 'Symfony\\Component\\HttpFoundation\\AcceptHeader' => $vendorDir . '/symfony/http-foundation/AcceptHeader.php',
+ 'Symfony\\Component\\HttpFoundation\\AcceptHeaderItem' => $vendorDir . '/symfony/http-foundation/AcceptHeaderItem.php',
+ 'Symfony\\Component\\HttpFoundation\\ApacheRequest' => $vendorDir . '/symfony/http-foundation/ApacheRequest.php',
+ 'Symfony\\Component\\HttpFoundation\\BinaryFileResponse' => $vendorDir . '/symfony/http-foundation/BinaryFileResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\Cookie' => $vendorDir . '/symfony/http-foundation/Cookie.php',
+ 'Symfony\\Component\\HttpFoundation\\Exception\\ConflictingHeadersException' => $vendorDir . '/symfony/http-foundation/Exception/ConflictingHeadersException.php',
+ 'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => $vendorDir . '/symfony/http-foundation/ExpressionRequestMatcher.php',
+ 'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => $vendorDir . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => $vendorDir . '/symfony/http-foundation/File/Exception/UploadException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\File' => $vendorDir . '/symfony/http-foundation/File/File.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\ExtensionGuesser' => $vendorDir . '/symfony/http-foundation/File/MimeType/ExtensionGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\ExtensionGuesserInterface' => $vendorDir . '/symfony/http-foundation/File/MimeType/ExtensionGuesserInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\FileBinaryMimeTypeGuesser' => $vendorDir . '/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\FileinfoMimeTypeGuesser' => $vendorDir . '/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeExtensionGuesser' => $vendorDir . '/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeGuesser' => $vendorDir . '/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeGuesserInterface' => $vendorDir . '/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => $vendorDir . '/symfony/http-foundation/File/UploadedFile.php',
+ 'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
+ 'Symfony\\Component\\HttpFoundation\\IpUtils' => $vendorDir . '/symfony/http-foundation/IpUtils.php',
+ 'Symfony\\Component\\HttpFoundation\\JsonResponse' => $vendorDir . '/symfony/http-foundation/JsonResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
+ 'Symfony\\Component\\HttpFoundation\\RedirectResponse' => $vendorDir . '/symfony/http-foundation/RedirectResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\Request' => $vendorDir . '/symfony/http-foundation/Request.php',
+ 'Symfony\\Component\\HttpFoundation\\RequestMatcher' => $vendorDir . '/symfony/http-foundation/RequestMatcher.php',
+ 'Symfony\\Component\\HttpFoundation\\RequestMatcherInterface' => $vendorDir . '/symfony/http-foundation/RequestMatcherInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\RequestStack' => $vendorDir . '/symfony/http-foundation/RequestStack.php',
+ 'Symfony\\Component\\HttpFoundation\\Response' => $vendorDir . '/symfony/http-foundation/Response.php',
+ 'Symfony\\Component\\HttpFoundation\\ResponseHeaderBag' => $vendorDir . '/symfony/http-foundation/ResponseHeaderBag.php',
+ 'Symfony\\Component\\HttpFoundation\\ServerBag' => $vendorDir . '/symfony/http-foundation/ServerBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBag' => $vendorDir . '/symfony/http-foundation/Session/Attribute/AttributeBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBagInterface' => $vendorDir . '/symfony/http-foundation/Session/Attribute/AttributeBagInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\NamespacedAttributeBag' => $vendorDir . '/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\AutoExpireFlashBag' => $vendorDir . '/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBag' => $vendorDir . '/symfony/http-foundation/Session/Flash/FlashBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface' => $vendorDir . '/symfony/http-foundation/Session/Flash/FlashBagInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Session' => $vendorDir . '/symfony/http-foundation/Session/Session.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionBagInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\LegacyPdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcacheSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\WriteCheckSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => $vendorDir . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockFileSessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/NativeSessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/PhpBridgeSessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy' => $vendorDir . '/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\NativeProxy' => $vendorDir . '/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy' => $vendorDir . '/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => $vendorDir . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\StreamedResponse' => $vendorDir . '/symfony/http-foundation/StreamedResponse.php',
+ 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle' => $vendorDir . '/symfony/http-kernel/Bundle/Bundle.php',
+ 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface' => $vendorDir . '/symfony/http-kernel/Bundle/BundleInterface.php',
+ 'Symfony\\Component\\HttpKernel\\CacheClearer\\CacheClearerInterface' => $vendorDir . '/symfony/http-kernel/CacheClearer/CacheClearerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\CacheClearer\\ChainCacheClearer' => $vendorDir . '/symfony/http-kernel/CacheClearer/ChainCacheClearer.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmer' => $vendorDir . '/symfony/http-kernel/CacheWarmer/CacheWarmer.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerAggregate' => $vendorDir . '/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerInterface' => $vendorDir . '/symfony/http-kernel/CacheWarmer/CacheWarmerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\WarmableInterface' => $vendorDir . '/symfony/http-kernel/CacheWarmer/WarmableInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Client' => $vendorDir . '/symfony/http-kernel/Client.php',
+ 'Symfony\\Component\\HttpKernel\\Config\\EnvParametersResource' => $vendorDir . '/symfony/http-kernel/Config/EnvParametersResource.php',
+ 'Symfony\\Component\\HttpKernel\\Config\\FileLocator' => $vendorDir . '/symfony/http-kernel/Config/FileLocator.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\ControllerReference' => $vendorDir . '/symfony/http-kernel/Controller/ControllerReference.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver' => $vendorDir . '/symfony/http-kernel/Controller/ControllerResolver.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface' => $vendorDir . '/symfony/http-kernel/Controller/ControllerResolverInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\TraceableControllerResolver' => $vendorDir . '/symfony/http-kernel/Controller/TraceableControllerResolver.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\ConfigDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/ConfigDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\DataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/DataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\DataCollectorInterface' => $vendorDir . '/symfony/http-kernel/DataCollector/DataCollectorInterface.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\DumpDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/DumpDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\EventDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/EventDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\ExceptionDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/ExceptionDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\LateDataCollectorInterface' => $vendorDir . '/symfony/http-kernel/DataCollector/LateDataCollectorInterface.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\LoggerDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/LoggerDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\MemoryDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/MemoryDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\RequestDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/RequestDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\RouterDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/RouterDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\TimeDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/TimeDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\Util\\ValueExporter' => $vendorDir . '/symfony/http-kernel/DataCollector/Util/ValueExporter.php',
+ 'Symfony\\Component\\HttpKernel\\Debug\\ErrorHandler' => $vendorDir . '/symfony/http-kernel/Debug/ErrorHandler.php',
+ 'Symfony\\Component\\HttpKernel\\Debug\\ExceptionHandler' => $vendorDir . '/symfony/http-kernel/Debug/ExceptionHandler.php',
+ 'Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/http-kernel/Debug/TraceableEventDispatcher.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\AddClassesToCachePass' => $vendorDir . '/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ConfigurableExtension' => $vendorDir . '/symfony/http-kernel/DependencyInjection/ConfigurableExtension.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ContainerAwareHttpKernel' => $vendorDir . '/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension' => $vendorDir . '/symfony/http-kernel/DependencyInjection/Extension.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\FragmentRendererPass' => $vendorDir . '/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\LazyLoadingFragmentHandler' => $vendorDir . '/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\MergeExtensionConfigurationPass' => $vendorDir . '/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\RegisterListenersPass' => $vendorDir . '/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\AddRequestFormatsListener' => $vendorDir . '/symfony/http-kernel/EventListener/AddRequestFormatsListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\DebugHandlersListener' => $vendorDir . '/symfony/http-kernel/EventListener/DebugHandlersListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\DumpListener' => $vendorDir . '/symfony/http-kernel/EventListener/DumpListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ErrorsLoggerListener' => $vendorDir . '/symfony/http-kernel/EventListener/ErrorsLoggerListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\EsiListener' => $vendorDir . '/symfony/http-kernel/EventListener/EsiListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener' => $vendorDir . '/symfony/http-kernel/EventListener/ExceptionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\FragmentListener' => $vendorDir . '/symfony/http-kernel/EventListener/FragmentListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\LocaleListener' => $vendorDir . '/symfony/http-kernel/EventListener/LocaleListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ProfilerListener' => $vendorDir . '/symfony/http-kernel/EventListener/ProfilerListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener' => $vendorDir . '/symfony/http-kernel/EventListener/ResponseListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener' => $vendorDir . '/symfony/http-kernel/EventListener/RouterListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\SaveSessionListener' => $vendorDir . '/symfony/http-kernel/EventListener/SaveSessionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\SessionListener' => $vendorDir . '/symfony/http-kernel/EventListener/SessionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\StreamedResponseListener' => $vendorDir . '/symfony/http-kernel/EventListener/StreamedResponseListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\SurrogateListener' => $vendorDir . '/symfony/http-kernel/EventListener/SurrogateListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\TestSessionListener' => $vendorDir . '/symfony/http-kernel/EventListener/TestSessionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\TranslatorListener' => $vendorDir . '/symfony/http-kernel/EventListener/TranslatorListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ValidateRequestListener' => $vendorDir . '/symfony/http-kernel/EventListener/ValidateRequestListener.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent' => $vendorDir . '/symfony/http-kernel/Event/FilterControllerEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent' => $vendorDir . '/symfony/http-kernel/Event/FilterResponseEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\FinishRequestEvent' => $vendorDir . '/symfony/http-kernel/Event/FinishRequestEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent' => $vendorDir . '/symfony/http-kernel/Event/GetResponseEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent' => $vendorDir . '/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent' => $vendorDir . '/symfony/http-kernel/Event/GetResponseForExceptionEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent' => $vendorDir . '/symfony/http-kernel/Event/KernelEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\PostResponseEvent' => $vendorDir . '/symfony/http-kernel/Event/PostResponseEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\AccessDeniedHttpException' => $vendorDir . '/symfony/http-kernel/Exception/AccessDeniedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\BadRequestHttpException' => $vendorDir . '/symfony/http-kernel/Exception/BadRequestHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\ConflictHttpException' => $vendorDir . '/symfony/http-kernel/Exception/ConflictHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\GoneHttpException' => $vendorDir . '/symfony/http-kernel/Exception/GoneHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\HttpException' => $vendorDir . '/symfony/http-kernel/Exception/HttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\HttpExceptionInterface' => $vendorDir . '/symfony/http-kernel/Exception/HttpExceptionInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\LengthRequiredHttpException' => $vendorDir . '/symfony/http-kernel/Exception/LengthRequiredHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\MethodNotAllowedHttpException' => $vendorDir . '/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\NotAcceptableHttpException' => $vendorDir . '/symfony/http-kernel/Exception/NotAcceptableHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException' => $vendorDir . '/symfony/http-kernel/Exception/NotFoundHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\PreconditionFailedHttpException' => $vendorDir . '/symfony/http-kernel/Exception/PreconditionFailedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\PreconditionRequiredHttpException' => $vendorDir . '/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\ServiceUnavailableHttpException' => $vendorDir . '/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\TooManyRequestsHttpException' => $vendorDir . '/symfony/http-kernel/Exception/TooManyRequestsHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\UnauthorizedHttpException' => $vendorDir . '/symfony/http-kernel/Exception/UnauthorizedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\UnprocessableEntityHttpException' => $vendorDir . '/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\UnsupportedMediaTypeHttpException' => $vendorDir . '/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\AbstractSurrogateFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\EsiFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Fragment/EsiFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\FragmentHandler' => $vendorDir . '/symfony/http-kernel/Fragment/FragmentHandler.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\FragmentRendererInterface' => $vendorDir . '/symfony/http-kernel/Fragment/FragmentRendererInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\HIncludeFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\InlineFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Fragment/InlineFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\RoutableFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\SsiFragmentRenderer' => $vendorDir . '/symfony/http-kernel/Fragment/SsiFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\Esi' => $vendorDir . '/symfony/http-kernel/HttpCache/Esi.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\EsiResponseCacheStrategy' => $vendorDir . '/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\EsiResponseCacheStrategyInterface' => $vendorDir . '/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\HttpCache' => $vendorDir . '/symfony/http-kernel/HttpCache/HttpCache.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\ResponseCacheStrategy' => $vendorDir . '/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\ResponseCacheStrategyInterface' => $vendorDir . '/symfony/http-kernel/HttpCache/ResponseCacheStrategyInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\Ssi' => $vendorDir . '/symfony/http-kernel/HttpCache/Ssi.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\Store' => $vendorDir . '/symfony/http-kernel/HttpCache/Store.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\StoreInterface' => $vendorDir . '/symfony/http-kernel/HttpCache/StoreInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\SubRequestHandler' => $vendorDir . '/symfony/http-kernel/HttpCache/SubRequestHandler.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\SurrogateInterface' => $vendorDir . '/symfony/http-kernel/HttpCache/SurrogateInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/HttpKernel.php',
+ 'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/HttpKernelInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Kernel' => $vendorDir . '/symfony/http-kernel/Kernel.php',
+ 'Symfony\\Component\\HttpKernel\\KernelEvents' => $vendorDir . '/symfony/http-kernel/KernelEvents.php',
+ 'Symfony\\Component\\HttpKernel\\KernelInterface' => $vendorDir . '/symfony/http-kernel/KernelInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Log\\DebugLoggerInterface' => $vendorDir . '/symfony/http-kernel/Log/DebugLoggerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Log\\LoggerInterface' => $vendorDir . '/symfony/http-kernel/Log/LoggerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Log\\NullLogger' => $vendorDir . '/symfony/http-kernel/Log/NullLogger.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\BaseMemcacheProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\FileProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/FileProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MemcacheProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MemcachedProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MongoDbProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MysqlProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/MysqlProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\PdoProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/PdoProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\Profile' => $vendorDir . '/symfony/http-kernel/Profiler/Profile.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\Profiler' => $vendorDir . '/symfony/http-kernel/Profiler/Profiler.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface' => $vendorDir . '/symfony/http-kernel/Profiler/ProfilerStorageInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\RedisProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/RedisProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\SqliteProfilerStorage' => $vendorDir . '/symfony/http-kernel/Profiler/SqliteProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\TerminableInterface' => $vendorDir . '/symfony/http-kernel/TerminableInterface.php',
+ 'Symfony\\Component\\HttpKernel\\UriSigner' => $vendorDir . '/symfony/http-kernel/UriSigner.php',
+ 'Symfony\\Component\\Process\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/process/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Exception/InvalidArgumentException.php',
+ 'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php',
+ 'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Exception/ProcessFailedException.php',
+ 'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Exception/ProcessTimedOutException.php',
+ 'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Exception/RuntimeException.php',
+ 'Symfony\\Component\\Process\\ExecutableFinder' => $vendorDir . '/symfony/process/ExecutableFinder.php',
+ 'Symfony\\Component\\Process\\PhpExecutableFinder' => $vendorDir . '/symfony/process/PhpExecutableFinder.php',
+ 'Symfony\\Component\\Process\\PhpProcess' => $vendorDir . '/symfony/process/PhpProcess.php',
+ 'Symfony\\Component\\Process\\Pipes\\AbstractPipes' => $vendorDir . '/symfony/process/Pipes/AbstractPipes.php',
+ 'Symfony\\Component\\Process\\Pipes\\PipesInterface' => $vendorDir . '/symfony/process/Pipes/PipesInterface.php',
+ 'Symfony\\Component\\Process\\Pipes\\UnixPipes' => $vendorDir . '/symfony/process/Pipes/UnixPipes.php',
+ 'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => $vendorDir . '/symfony/process/Pipes/WindowsPipes.php',
+ 'Symfony\\Component\\Process\\Process' => $vendorDir . '/symfony/process/Process.php',
+ 'Symfony\\Component\\Process\\ProcessBuilder' => $vendorDir . '/symfony/process/ProcessBuilder.php',
+ 'Symfony\\Component\\Process\\ProcessUtils' => $vendorDir . '/symfony/process/ProcessUtils.php',
+ 'Symfony\\Component\\Routing\\Annotation\\Route' => $vendorDir . '/symfony/routing/Annotation/Route.php',
+ 'Symfony\\Component\\Routing\\CompiledRoute' => $vendorDir . '/symfony/routing/CompiledRoute.php',
+ 'Symfony\\Component\\Routing\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/routing/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Routing\\Exception\\InvalidParameterException' => $vendorDir . '/symfony/routing/Exception/InvalidParameterException.php',
+ 'Symfony\\Component\\Routing\\Exception\\MethodNotAllowedException' => $vendorDir . '/symfony/routing/Exception/MethodNotAllowedException.php',
+ 'Symfony\\Component\\Routing\\Exception\\MissingMandatoryParametersException' => $vendorDir . '/symfony/routing/Exception/MissingMandatoryParametersException.php',
+ 'Symfony\\Component\\Routing\\Exception\\ResourceNotFoundException' => $vendorDir . '/symfony/routing/Exception/ResourceNotFoundException.php',
+ 'Symfony\\Component\\Routing\\Exception\\RouteNotFoundException' => $vendorDir . '/symfony/routing/Exception/RouteNotFoundException.php',
+ 'Symfony\\Component\\Routing\\Generator\\ConfigurableRequirementsInterface' => $vendorDir . '/symfony/routing/Generator/ConfigurableRequirementsInterface.php',
+ 'Symfony\\Component\\Routing\\Generator\\Dumper\\GeneratorDumper' => $vendorDir . '/symfony/routing/Generator/Dumper/GeneratorDumper.php',
+ 'Symfony\\Component\\Routing\\Generator\\Dumper\\GeneratorDumperInterface' => $vendorDir . '/symfony/routing/Generator/Dumper/GeneratorDumperInterface.php',
+ 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper' => $vendorDir . '/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php',
+ 'Symfony\\Component\\Routing\\Generator\\UrlGenerator' => $vendorDir . '/symfony/routing/Generator/UrlGenerator.php',
+ 'Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface' => $vendorDir . '/symfony/routing/Generator/UrlGeneratorInterface.php',
+ 'Symfony\\Component\\Routing\\Loader\\AnnotationClassLoader' => $vendorDir . '/symfony/routing/Loader/AnnotationClassLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\AnnotationDirectoryLoader' => $vendorDir . '/symfony/routing/Loader/AnnotationDirectoryLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\AnnotationFileLoader' => $vendorDir . '/symfony/routing/Loader/AnnotationFileLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\ClosureLoader' => $vendorDir . '/symfony/routing/Loader/ClosureLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\PhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\RecursiveCallbackFilterIterator' => $vendorDir . '/symfony/routing/Loader/AnnotationDirectoryLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/routing/Loader/XmlFileLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/routing/Loader/YamlFileLoader.php',
+ 'Symfony\\Component\\Routing\\Matcher\\ApacheUrlMatcher' => $vendorDir . '/symfony/routing/Matcher/ApacheUrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\ApacheMatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperPrefixCollection' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperPrefixCollection.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
+ 'Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcher' => $vendorDir . '/symfony/routing/Matcher/RedirectableUrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcherInterface' => $vendorDir . '/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php',
+ 'Symfony\\Component\\Routing\\Matcher\\RequestMatcherInterface' => $vendorDir . '/symfony/routing/Matcher/RequestMatcherInterface.php',
+ 'Symfony\\Component\\Routing\\Matcher\\TraceableUrlMatcher' => $vendorDir . '/symfony/routing/Matcher/TraceableUrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher' => $vendorDir . '/symfony/routing/Matcher/UrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\UrlMatcherInterface' => $vendorDir . '/symfony/routing/Matcher/UrlMatcherInterface.php',
+ 'Symfony\\Component\\Routing\\RequestContext' => $vendorDir . '/symfony/routing/RequestContext.php',
+ 'Symfony\\Component\\Routing\\RequestContextAwareInterface' => $vendorDir . '/symfony/routing/RequestContextAwareInterface.php',
+ 'Symfony\\Component\\Routing\\Route' => $vendorDir . '/symfony/routing/Route.php',
+ 'Symfony\\Component\\Routing\\RouteCollection' => $vendorDir . '/symfony/routing/RouteCollection.php',
+ 'Symfony\\Component\\Routing\\RouteCompiler' => $vendorDir . '/symfony/routing/RouteCompiler.php',
+ 'Symfony\\Component\\Routing\\RouteCompilerInterface' => $vendorDir . '/symfony/routing/RouteCompilerInterface.php',
+ 'Symfony\\Component\\Routing\\Router' => $vendorDir . '/symfony/routing/Router.php',
+ 'Symfony\\Component\\Routing\\RouterInterface' => $vendorDir . '/symfony/routing/RouterInterface.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\AbstractOperation' => $vendorDir . '/symfony/translation/Catalogue/AbstractOperation.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\DiffOperation' => $vendorDir . '/symfony/translation/Catalogue/DiffOperation.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\MergeOperation' => $vendorDir . '/symfony/translation/Catalogue/MergeOperation.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\OperationInterface' => $vendorDir . '/symfony/translation/Catalogue/OperationInterface.php',
+ 'Symfony\\Component\\Translation\\DataCollectorTranslator' => $vendorDir . '/symfony/translation/DataCollectorTranslator.php',
+ 'Symfony\\Component\\Translation\\DataCollector\\TranslationDataCollector' => $vendorDir . '/symfony/translation/DataCollector/TranslationDataCollector.php',
+ 'Symfony\\Component\\Translation\\Dumper\\CsvFileDumper' => $vendorDir . '/symfony/translation/Dumper/CsvFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\DumperInterface' => $vendorDir . '/symfony/translation/Dumper/DumperInterface.php',
+ 'Symfony\\Component\\Translation\\Dumper\\FileDumper' => $vendorDir . '/symfony/translation/Dumper/FileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\IcuResFileDumper' => $vendorDir . '/symfony/translation/Dumper/IcuResFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\IniFileDumper' => $vendorDir . '/symfony/translation/Dumper/IniFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\JsonFileDumper' => $vendorDir . '/symfony/translation/Dumper/JsonFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\MoFileDumper' => $vendorDir . '/symfony/translation/Dumper/MoFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\PhpFileDumper' => $vendorDir . '/symfony/translation/Dumper/PhpFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\PoFileDumper' => $vendorDir . '/symfony/translation/Dumper/PoFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\QtFileDumper' => $vendorDir . '/symfony/translation/Dumper/QtFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\XliffFileDumper' => $vendorDir . '/symfony/translation/Dumper/XliffFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\YamlFileDumper' => $vendorDir . '/symfony/translation/Dumper/YamlFileDumper.php',
+ 'Symfony\\Component\\Translation\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/translation/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Translation\\Exception\\InvalidResourceException' => $vendorDir . '/symfony/translation/Exception/InvalidResourceException.php',
+ 'Symfony\\Component\\Translation\\Exception\\NotFoundResourceException' => $vendorDir . '/symfony/translation/Exception/NotFoundResourceException.php',
+ 'Symfony\\Component\\Translation\\Extractor\\AbstractFileExtractor' => $vendorDir . '/symfony/translation/Extractor/AbstractFileExtractor.php',
+ 'Symfony\\Component\\Translation\\Extractor\\ChainExtractor' => $vendorDir . '/symfony/translation/Extractor/ChainExtractor.php',
+ 'Symfony\\Component\\Translation\\Extractor\\ExtractorInterface' => $vendorDir . '/symfony/translation/Extractor/ExtractorInterface.php',
+ 'Symfony\\Component\\Translation\\IdentityTranslator' => $vendorDir . '/symfony/translation/IdentityTranslator.php',
+ 'Symfony\\Component\\Translation\\Interval' => $vendorDir . '/symfony/translation/Interval.php',
+ 'Symfony\\Component\\Translation\\Loader\\ArrayLoader' => $vendorDir . '/symfony/translation/Loader/ArrayLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\CsvFileLoader' => $vendorDir . '/symfony/translation/Loader/CsvFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\IcuDatFileLoader' => $vendorDir . '/symfony/translation/Loader/IcuDatFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\IcuResFileLoader' => $vendorDir . '/symfony/translation/Loader/IcuResFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\IniFileLoader' => $vendorDir . '/symfony/translation/Loader/IniFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\JsonFileLoader' => $vendorDir . '/symfony/translation/Loader/JsonFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\LoaderInterface' => $vendorDir . '/symfony/translation/Loader/LoaderInterface.php',
+ 'Symfony\\Component\\Translation\\Loader\\MoFileLoader' => $vendorDir . '/symfony/translation/Loader/MoFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\PhpFileLoader' => $vendorDir . '/symfony/translation/Loader/PhpFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\PoFileLoader' => $vendorDir . '/symfony/translation/Loader/PoFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\QtFileLoader' => $vendorDir . '/symfony/translation/Loader/QtFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\XliffFileLoader' => $vendorDir . '/symfony/translation/Loader/XliffFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/translation/Loader/YamlFileLoader.php',
+ 'Symfony\\Component\\Translation\\LoggingTranslator' => $vendorDir . '/symfony/translation/LoggingTranslator.php',
+ 'Symfony\\Component\\Translation\\MessageCatalogue' => $vendorDir . '/symfony/translation/MessageCatalogue.php',
+ 'Symfony\\Component\\Translation\\MessageCatalogueInterface' => $vendorDir . '/symfony/translation/MessageCatalogueInterface.php',
+ 'Symfony\\Component\\Translation\\MessageSelector' => $vendorDir . '/symfony/translation/MessageSelector.php',
+ 'Symfony\\Component\\Translation\\MetadataAwareInterface' => $vendorDir . '/symfony/translation/MetadataAwareInterface.php',
+ 'Symfony\\Component\\Translation\\PluralizationRules' => $vendorDir . '/symfony/translation/PluralizationRules.php',
+ 'Symfony\\Component\\Translation\\Translator' => $vendorDir . '/symfony/translation/Translator.php',
+ 'Symfony\\Component\\Translation\\TranslatorBagInterface' => $vendorDir . '/symfony/translation/TranslatorBagInterface.php',
+ 'Symfony\\Component\\Translation\\TranslatorInterface' => $vendorDir . '/symfony/translation/TranslatorInterface.php',
+ 'Symfony\\Component\\Translation\\Writer\\TranslationWriter' => $vendorDir . '/symfony/translation/Writer/TranslationWriter.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\AmqpCaster' => $vendorDir . '/symfony/var-dumper/Caster/AmqpCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\Caster' => $vendorDir . '/symfony/var-dumper/Caster/Caster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ConstStub' => $vendorDir . '/symfony/var-dumper/Caster/ConstStub.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\CutStub' => $vendorDir . '/symfony/var-dumper/Caster/CutStub.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\DOMCaster' => $vendorDir . '/symfony/var-dumper/Caster/DOMCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\DoctrineCaster' => $vendorDir . '/symfony/var-dumper/Caster/DoctrineCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => $vendorDir . '/symfony/var-dumper/Caster/ExceptionCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\MongoCaster' => $vendorDir . '/symfony/var-dumper/Caster/MongoCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => $vendorDir . '/symfony/var-dumper/Caster/PdoCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ReflectionCaster' => $vendorDir . '/symfony/var-dumper/Caster/ReflectionCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ResourceCaster' => $vendorDir . '/symfony/var-dumper/Caster/ResourceCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\SplCaster' => $vendorDir . '/symfony/var-dumper/Caster/SplCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\StubCaster' => $vendorDir . '/symfony/var-dumper/Caster/StubCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\XmlResourceCaster' => $vendorDir . '/symfony/var-dumper/Caster/XmlResourceCaster.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\AbstractCloner' => $vendorDir . '/symfony/var-dumper/Cloner/AbstractCloner.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\ClonerInterface' => $vendorDir . '/symfony/var-dumper/Cloner/ClonerInterface.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\Cursor' => $vendorDir . '/symfony/var-dumper/Cloner/Cursor.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\Data' => $vendorDir . '/symfony/var-dumper/Cloner/Data.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Cloner/DumperInterface.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Cloner/Stub.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Cloner/VarCloner.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => $vendorDir . '/symfony/var-dumper/Dumper/AbstractDumper.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => $vendorDir . '/symfony/var-dumper/Dumper/CliDumper.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+ 'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+ 'Symfony\\Component\\VarDumper\\Test\\VarDumperTestCase' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestCase.php',
+ 'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
+ 'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
+ 'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
+ 'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php',
'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
'Symfony\\Polyfill\\Util\\TestListener' => $vendorDir . '/symfony/polyfill-util/TestListener.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerForV5' => $vendorDir . '/symfony/polyfill-util/TestListenerForV5.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerForV6' => $vendorDir . '/symfony/polyfill-util/TestListenerForV6.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerForV7' => $vendorDir . '/symfony/polyfill-util/TestListenerForV7.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerTrait' => $vendorDir . '/symfony/polyfill-util/TestListenerTrait.php',
+ 'UpdateHelper\\ComposerPlugin' => $vendorDir . '/kylekatarnls/update-helper/src/UpdateHelper/ComposerPlugin.php',
+ 'UpdateHelper\\NotUpdateInterfaceInstanceException' => $vendorDir . '/kylekatarnls/update-helper/src/UpdateHelper/NotUpdateInterfaceInstanceException.php',
+ 'UpdateHelper\\UpdateHelper' => $vendorDir . '/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php',
+ 'UpdateHelper\\UpdateHelperInterface' => $vendorDir . '/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelperInterface.php',
'XdgBaseDir\\Xdg' => $vendorDir . '/dnoegel/php-xdg-base-dir/src/Xdg.php',
);
diff --git a/application/vendor/composer/autoload_files.php b/application/vendor/composer/autoload_files.php
index d472715..e382886 100644
--- a/application/vendor/composer/autoload_files.php
+++ b/application/vendor/composer/autoload_files.php
@@ -6,14 +6,15 @@
$baseDir = dirname($vendorDir);
return array(
- '6fac04860a2cf4b03e356f4caca377d6' => $vendorDir . '/symfony/var-dumper/Symfony/Component/VarDumper/Resources/functions/dump.php',
- '742cc5b936ec765a3455c0a976796f29' => $vendorDir . '/nikic/php-parser/lib/bootstrap.php',
- '05669301f06448944ce5eb260126f84e' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
- '01b872096dad055849387e42d41a176d' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
- 'e87a3015738447d44bc0516cb3cdcd72' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
- 'da0e56e38d387da6d4174d0dd783cafd' => $vendorDir . '/psy/psysh/src/Psy/functions.php',
- '9b24cdf6705c981dc519077514baadf4' => $vendorDir . '/danielstjules/stringy/src/Create.php',
- '8c9698b305e308ed34201edf1f3c1e48' => $vendorDir . '/illuminate/html/helpers.php',
- '1078299014c0119b5037eeb7efc1d1de' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
- '183ed00ee3916a78840c7d11bba9bb86' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
+ '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
+ '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
+ '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
+ '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
+ 'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+ '65fec9ebcfbb3cbb4fd0d519687aea01' => $vendorDir . '/danielstjules/stringy/src/Create.php',
+ '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+ 'e7223560d890eab89cda23685e711e2c' => $vendorDir . '/psy/psysh/src/Psy/functions.php',
+ 'f0906e6318348a765ffb6eb24e0d0938' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
+ '58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
+ 'f18cc91337d49233e5754e93f3ed9ec3' => $vendorDir . '/laravelcollective/html/src/helpers.php',
);
diff --git a/application/vendor/composer/autoload_namespaces.php b/application/vendor/composer/autoload_namespaces.php
index ab29a44..de88cac 100644
--- a/application/vendor/composer/autoload_namespaces.php
+++ b/application/vendor/composer/autoload_namespaces.php
@@ -6,21 +6,7 @@
$baseDir = dirname($vendorDir);
return array(
- 'Symfony\\Component\\VarDumper\\' => array($vendorDir . '/symfony/var-dumper'),
- 'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
- 'Symfony\\Component\\Security\\Core\\' => array($vendorDir . '/symfony/security-core'),
- 'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
- 'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
- 'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
- 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
- 'Symfony\\Component\\Finder\\' => array($vendorDir . '/symfony/finder'),
- 'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
- 'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
- 'Psy\\' => array($vendorDir . '/psy/psysh/src'),
- 'Psr\\Log\\' => array($vendorDir . '/psr/log'),
+ 'UpdateHelper\\' => array($vendorDir . '/kylekatarnls/update-helper/src'),
'JakubOnderka\\PhpConsoleHighlighter' => array($vendorDir . '/jakub-onderka/php-console-highlighter/src'),
- 'JakubOnderka\\PhpConsoleColor' => array($vendorDir . '/jakub-onderka/php-console-color/src'),
'Dotenv' => array($vendorDir . '/vlucas/phpdotenv/src'),
- 'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'),
- 'Cron' => array($vendorDir . '/mtdowling/cron-expression/src'),
);
diff --git a/application/vendor/composer/autoload_psr4.php b/application/vendor/composer/autoload_psr4.php
index 4015cfb..b546906 100644
--- a/application/vendor/composer/autoload_psr4.php
+++ b/application/vendor/composer/autoload_psr4.php
@@ -9,15 +9,33 @@
'XdgBaseDir\\' => array($vendorDir . '/dnoegel/php-xdg-base-dir/src'),
'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'),
'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'),
- 'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
+ 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
+ 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
+ 'Symfony\\Component\\VarDumper\\' => array($vendorDir . '/symfony/var-dumper'),
+ 'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
+ 'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
+ 'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
+ 'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
+ 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
+ 'Symfony\\Component\\Finder\\' => array($vendorDir . '/symfony/finder'),
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
- 'SuperClosure\\' => array($vendorDir . '/jeremeamia/SuperClosure/src'),
+ 'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
+ 'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
+ 'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'),
+ 'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
+ 'SuperClosure\\' => array($vendorDir . '/jeremeamia/superclosure/src'),
'Stringy\\' => array($vendorDir . '/danielstjules/stringy/src'),
+ 'Psy\\' => array($vendorDir . '/psy/psysh/src/Psy'),
+ 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
+ 'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
- 'Illuminate\\Html\\' => array($vendorDir . '/illuminate/html'),
+ 'JakubOnderka\\PhpConsoleColor\\' => array($vendorDir . '/jakub-onderka/php-console-color/src'),
'Illuminate\\' => array($vendorDir . '/laravel/framework/src/Illuminate'),
+ 'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib/Doctrine/Common/Inflector'),
+ 'Cron\\' => array($vendorDir . '/mtdowling/cron-expression/src/Cron'),
+ 'Collective\\Html\\' => array($vendorDir . '/laravelcollective/html/src'),
'ClassPreloader\\' => array($vendorDir . '/classpreloader/classpreloader/src'),
- 'Carbon\\' => array($vendorDir . '/nesbot/carbon/src/Carbon'),
'App\\' => array($baseDir . '/app'),
+ '' => array($vendorDir . '/nesbot/carbon/src'),
);
diff --git a/application/vendor/composer/autoload_real.php b/application/vendor/composer/autoload_real.php
index 8825de4..4b0dd32 100644
--- a/application/vendor/composer/autoload_real.php
+++ b/application/vendor/composer/autoload_real.php
@@ -23,24 +23,35 @@ public static function getLoader()
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit43265f891b9f29a025a40de9ffd797c4', 'loadClassLoader'));
- $map = require __DIR__ . '/autoload_namespaces.php';
- foreach ($map as $namespace => $path) {
- $loader->set($namespace, $path);
- }
+ $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+ if ($useStaticLoader) {
+ require_once __DIR__ . '/autoload_static.php';
- $map = require __DIR__ . '/autoload_psr4.php';
- foreach ($map as $namespace => $path) {
- $loader->setPsr4($namespace, $path);
- }
+ call_user_func(\Composer\Autoload\ComposerStaticInit43265f891b9f29a025a40de9ffd797c4::getInitializer($loader));
+ } else {
+ $map = require __DIR__ . '/autoload_namespaces.php';
+ foreach ($map as $namespace => $path) {
+ $loader->set($namespace, $path);
+ }
- $classMap = require __DIR__ . '/autoload_classmap.php';
- if ($classMap) {
- $loader->addClassMap($classMap);
+ $map = require __DIR__ . '/autoload_psr4.php';
+ foreach ($map as $namespace => $path) {
+ $loader->setPsr4($namespace, $path);
+ }
+
+ $classMap = require __DIR__ . '/autoload_classmap.php';
+ if ($classMap) {
+ $loader->addClassMap($classMap);
+ }
}
$loader->register(true);
- $includeFiles = require __DIR__ . '/autoload_files.php';
+ if ($useStaticLoader) {
+ $includeFiles = Composer\Autoload\ComposerStaticInit43265f891b9f29a025a40de9ffd797c4::$files;
+ } else {
+ $includeFiles = require __DIR__ . '/autoload_files.php';
+ }
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire43265f891b9f29a025a40de9ffd797c4($fileIdentifier, $file);
}
diff --git a/application/vendor/composer/autoload_static.php b/application/vendor/composer/autoload_static.php
new file mode 100644
index 0000000..0b4aad4
--- /dev/null
+++ b/application/vendor/composer/autoload_static.php
@@ -0,0 +1,1879 @@
+ __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
+ '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
+ '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
+ '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
+ 'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
+ '65fec9ebcfbb3cbb4fd0d519687aea01' => __DIR__ . '/..' . '/danielstjules/stringy/src/Create.php',
+ '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
+ 'e7223560d890eab89cda23685e711e2c' => __DIR__ . '/..' . '/psy/psysh/src/Psy/functions.php',
+ 'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
+ '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
+ 'f18cc91337d49233e5754e93f3ed9ec3' => __DIR__ . '/..' . '/laravelcollective/html/src/helpers.php',
+ );
+
+ public static $prefixLengthsPsr4 = array (
+ 'X' =>
+ array (
+ 'XdgBaseDir\\' => 11,
+ ),
+ 'S' =>
+ array (
+ 'Symfony\\Polyfill\\Util\\' => 22,
+ 'Symfony\\Polyfill\\Php56\\' => 23,
+ 'Symfony\\Polyfill\\Mbstring\\' => 26,
+ 'Symfony\\Polyfill\\Ctype\\' => 23,
+ 'Symfony\\Component\\VarDumper\\' => 28,
+ 'Symfony\\Component\\Translation\\' => 30,
+ 'Symfony\\Component\\Routing\\' => 26,
+ 'Symfony\\Component\\Process\\' => 26,
+ 'Symfony\\Component\\HttpKernel\\' => 29,
+ 'Symfony\\Component\\HttpFoundation\\' => 33,
+ 'Symfony\\Component\\Finder\\' => 25,
+ 'Symfony\\Component\\EventDispatcher\\' => 34,
+ 'Symfony\\Component\\DomCrawler\\' => 29,
+ 'Symfony\\Component\\Debug\\' => 24,
+ 'Symfony\\Component\\CssSelector\\' => 30,
+ 'Symfony\\Component\\Console\\' => 26,
+ 'SuperClosure\\' => 13,
+ 'Stringy\\' => 8,
+ ),
+ 'P' =>
+ array (
+ 'Psy\\' => 4,
+ 'Psr\\Log\\' => 8,
+ 'PhpParser\\' => 10,
+ ),
+ 'M' =>
+ array (
+ 'Monolog\\' => 8,
+ ),
+ 'L' =>
+ array (
+ 'League\\Flysystem\\' => 17,
+ ),
+ 'J' =>
+ array (
+ 'JakubOnderka\\PhpConsoleColor\\' => 29,
+ ),
+ 'I' =>
+ array (
+ 'Illuminate\\' => 11,
+ ),
+ 'D' =>
+ array (
+ 'Doctrine\\Common\\Inflector\\' => 26,
+ ),
+ 'C' =>
+ array (
+ 'Cron\\' => 5,
+ 'Collective\\Html\\' => 16,
+ 'ClassPreloader\\' => 15,
+ ),
+ 'A' =>
+ array (
+ 'App\\' => 4,
+ ),
+ );
+
+ public static $prefixDirsPsr4 = array (
+ 'XdgBaseDir\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/dnoegel/php-xdg-base-dir/src',
+ ),
+ 'Symfony\\Polyfill\\Util\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/polyfill-util',
+ ),
+ 'Symfony\\Polyfill\\Php56\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/polyfill-php56',
+ ),
+ 'Symfony\\Polyfill\\Mbstring\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
+ ),
+ 'Symfony\\Polyfill\\Ctype\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
+ ),
+ 'Symfony\\Component\\VarDumper\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/var-dumper',
+ ),
+ 'Symfony\\Component\\Translation\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/translation',
+ ),
+ 'Symfony\\Component\\Routing\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/routing',
+ ),
+ 'Symfony\\Component\\Process\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/process',
+ ),
+ 'Symfony\\Component\\HttpKernel\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/http-kernel',
+ ),
+ 'Symfony\\Component\\HttpFoundation\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/http-foundation',
+ ),
+ 'Symfony\\Component\\Finder\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/finder',
+ ),
+ 'Symfony\\Component\\EventDispatcher\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/event-dispatcher',
+ ),
+ 'Symfony\\Component\\DomCrawler\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/dom-crawler',
+ ),
+ 'Symfony\\Component\\Debug\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/debug',
+ ),
+ 'Symfony\\Component\\CssSelector\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/css-selector',
+ ),
+ 'Symfony\\Component\\Console\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/console',
+ ),
+ 'SuperClosure\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/jeremeamia/superclosure/src',
+ ),
+ 'Stringy\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/danielstjules/stringy/src',
+ ),
+ 'Psy\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/psy/psysh/src/Psy',
+ ),
+ 'Psr\\Log\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
+ ),
+ 'PhpParser\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser',
+ ),
+ 'Monolog\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
+ ),
+ 'League\\Flysystem\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/league/flysystem/src',
+ ),
+ 'JakubOnderka\\PhpConsoleColor\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src',
+ ),
+ 'Illuminate\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/laravel/framework/src/Illuminate',
+ ),
+ 'Doctrine\\Common\\Inflector\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/doctrine/inflector/lib/Doctrine/Common/Inflector',
+ ),
+ 'Cron\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron',
+ ),
+ 'Collective\\Html\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/laravelcollective/html/src',
+ ),
+ 'ClassPreloader\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/classpreloader/classpreloader/src',
+ ),
+ 'App\\' =>
+ array (
+ 0 => __DIR__ . '/../..' . '/app',
+ ),
+ );
+
+ public static $fallbackDirsPsr4 = array (
+ 0 => __DIR__ . '/..' . '/nesbot/carbon/src',
+ );
+
+ public static $prefixesPsr0 = array (
+ 'U' =>
+ array (
+ 'UpdateHelper\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/kylekatarnls/update-helper/src',
+ ),
+ ),
+ 'J' =>
+ array (
+ 'JakubOnderka\\PhpConsoleHighlighter' =>
+ array (
+ 0 => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src',
+ ),
+ ),
+ 'D' =>
+ array (
+ 'Dotenv' =>
+ array (
+ 0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src',
+ ),
+ ),
+ );
+
+ public static $classMap = array (
+ 'App\\Commands\\Command' => __DIR__ . '/../..' . '/app/Commands/Command.php',
+ 'App\\Console\\Commands\\Inspire' => __DIR__ . '/../..' . '/app/Console/Commands/Inspire.php',
+ 'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
+ 'App\\Events\\Event' => __DIR__ . '/../..' . '/app/Events/Event.php',
+ 'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
+ 'App\\Http\\Controllers\\AdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/AdminController.php',
+ 'App\\Http\\Controllers\\ApiController' => __DIR__ . '/../..' . '/app/Http/Controllers/ApiController.php',
+ 'App\\Http\\Controllers\\Auth\\AuthController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/AuthController.php',
+ 'App\\Http\\Controllers\\Auth\\PasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/PasswordController.php',
+ 'App\\Http\\Controllers\\ConfigurationController' => __DIR__ . '/../..' . '/app/Http/Controllers/ConfigurationController.php',
+ 'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
+ 'App\\Http\\Controllers\\InstallController' => __DIR__ . '/../..' . '/app/Http/Controllers/InstallController.php',
+ 'App\\Http\\Controllers\\PlayerAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerAdminController.php',
+ 'App\\Http\\Controllers\\PlayerBanController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerBanController.php',
+ 'App\\Http\\Controllers\\PlayerBanRecordController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerBanRecordController.php',
+ 'App\\Http\\Controllers\\PlayerController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerController.php',
+ 'App\\Http\\Controllers\\PlayerKickController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerKickController.php',
+ 'App\\Http\\Controllers\\PlayerMuteController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerMuteController.php',
+ 'App\\Http\\Controllers\\PlayerMuteRecordController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerMuteRecordController.php',
+ 'App\\Http\\Controllers\\PlayerNoteController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerNoteController.php',
+ 'App\\Http\\Controllers\\PlayerWarningController' => __DIR__ . '/../..' . '/app/Http/Controllers/PlayerWarningController.php',
+ 'App\\Http\\Controllers\\ServerController' => __DIR__ . '/../..' . '/app/Http/Controllers/ServerController.php',
+ 'App\\Http\\Controllers\\StaticPageController' => __DIR__ . '/../..' . '/app/Http/Controllers/StaticPageController.php',
+ 'App\\Http\\Controllers\\StatsController' => __DIR__ . '/../..' . '/app/Http/Controllers/StatsController.php',
+ 'App\\Http\\Controllers\\UserController' => __DIR__ . '/../..' . '/app/Http/Controllers/UserController.php',
+ 'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php',
+ 'App\\Http\\Middleware\\AdminAuthenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/AdminAuthenticate.php',
+ 'App\\Http\\Middleware\\Authenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/Authenticate.php',
+ 'App\\Http\\Middleware\\ModeratorAuthenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/ModeratorAuthenticate.php',
+ 'App\\Http\\Middleware\\RedirectIfAuthenticated' => __DIR__ . '/../..' . '/app/Http/Middleware/RedirectIfAuthenticated.php',
+ 'App\\Http\\Middleware\\SuperuserAuthenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/SuperuserAuthenticate.php',
+ 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
+ 'App\\Http\\Middleware\\VerifyInstalled' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyInstalled.php',
+ 'App\\Http\\Middleware\\VerifyNotInstalled' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyNotInstalled.php',
+ 'App\\Http\\Middleware\\VerifyServers' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyServers.php',
+ 'App\\Http\\Requests\\Request' => __DIR__ . '/../..' . '/app/Http/Requests/Request.php',
+ 'App\\IpBan' => __DIR__ . '/../..' . '/app/IpBan.php',
+ 'App\\IpBanRecord' => __DIR__ . '/../..' . '/app/IpBanRecord.php',
+ 'App\\PastRecordBaseModel' => __DIR__ . '/../..' . '/app/PastRecordBaseModel.php',
+ 'App\\Player' => __DIR__ . '/../..' . '/app/Player.php',
+ 'App\\PlayerBan' => __DIR__ . '/../..' . '/app/PlayerBan.php',
+ 'App\\PlayerBanRecord' => __DIR__ . '/../..' . '/app/PlayerBanRecord.php',
+ 'App\\PlayerKick' => __DIR__ . '/../..' . '/app/PlayerKick.php',
+ 'App\\PlayerMute' => __DIR__ . '/../..' . '/app/PlayerMute.php',
+ 'App\\PlayerMuteRecord' => __DIR__ . '/../..' . '/app/PlayerMuteRecord.php',
+ 'App\\PlayerNote' => __DIR__ . '/../..' . '/app/PlayerNote.php',
+ 'App\\PlayerWarning' => __DIR__ . '/../..' . '/app/PlayerWarning.php',
+ 'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
+ 'App\\Providers\\BusServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BusServiceProvider.php',
+ 'App\\Providers\\ConfigServiceProvider' => __DIR__ . '/../..' . '/app/Providers/ConfigServiceProvider.php',
+ 'App\\Providers\\EventServiceProvider' => __DIR__ . '/../..' . '/app/Providers/EventServiceProvider.php',
+ 'App\\Providers\\HelperServiceProvider' => __DIR__ . '/../..' . '/app/Providers/HelperServiceProvider.php',
+ 'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php',
+ 'App\\RecordBaseModel' => __DIR__ . '/../..' . '/app/RecordBaseModel.php',
+ 'App\\Server' => __DIR__ . '/../..' . '/app/Server.php',
+ 'App\\Services\\Registrar' => __DIR__ . '/../..' . '/app/Services/Registrar.php',
+ 'App\\User' => __DIR__ . '/../..' . '/app/User.php',
+ 'Carbon\\Carbon' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Carbon.php',
+ 'Carbon\\CarbonInterval' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonInterval.php',
+ 'Carbon\\CarbonPeriod' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonPeriod.php',
+ 'Carbon\\Exceptions\\InvalidDateException' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php',
+ 'Carbon\\Laravel\\ServiceProvider' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php',
+ 'Carbon\\Translator' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Translator.php',
+ 'Carbon\\Upgrade' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Upgrade.php',
+ 'ClassPreloader\\ClassList' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/ClassList.php',
+ 'ClassPreloader\\ClassLoader' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/ClassLoader.php',
+ 'ClassPreloader\\ClassNode' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/ClassNode.php',
+ 'ClassPreloader\\ClassPreloader' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/ClassPreloader.php',
+ 'ClassPreloader\\Config' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Config.php',
+ 'ClassPreloader\\Exceptions\\DirConstantException' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Exceptions/DirConstantException.php',
+ 'ClassPreloader\\Exceptions\\FileConstantException' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Exceptions/FileConstantException.php',
+ 'ClassPreloader\\Exceptions\\StrictTypesException' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Exceptions/StrictTypesException.php',
+ 'ClassPreloader\\Exceptions\\VisitorExceptionInterface' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Exceptions/VisitorExceptionInterface.php',
+ 'ClassPreloader\\Factory' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Factory.php',
+ 'ClassPreloader\\Parser\\AbstractNodeVisitor' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Parser/AbstractNodeVisitor.php',
+ 'ClassPreloader\\Parser\\DirVisitor' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Parser/DirVisitor.php',
+ 'ClassPreloader\\Parser\\FileVisitor' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Parser/FileVisitor.php',
+ 'ClassPreloader\\Parser\\NodeTraverser' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Parser/NodeTraverser.php',
+ 'ClassPreloader\\Parser\\StrictTypesVisitor' => __DIR__ . '/..' . '/classpreloader/classpreloader/src/Parser/StrictTypesVisitor.php',
+ 'Collective\\Html\\FormBuilder' => __DIR__ . '/..' . '/laravelcollective/html/src/FormBuilder.php',
+ 'Collective\\Html\\FormFacade' => __DIR__ . '/..' . '/laravelcollective/html/src/FormFacade.php',
+ 'Collective\\Html\\HtmlBuilder' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlBuilder.php',
+ 'Collective\\Html\\HtmlFacade' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlFacade.php',
+ 'Collective\\Html\\HtmlServiceProvider' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlServiceProvider.php',
+ 'CreatePasswordResetsTable' => __DIR__ . '/../..' . '/database/migrations/2014_10_12_100000_create_password_resets_table.php',
+ 'CreateServersTable' => __DIR__ . '/../..' . '/database/migrations/2015_04_26_154117_create_servers_table.php',
+ 'CreateUsersTable' => __DIR__ . '/../..' . '/database/migrations/2014_10_12_000000_create_users_table.php',
+ 'Cron\\AbstractField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/AbstractField.php',
+ 'Cron\\CronExpression' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/CronExpression.php',
+ 'Cron\\DayOfMonthField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/DayOfMonthField.php',
+ 'Cron\\DayOfWeekField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/DayOfWeekField.php',
+ 'Cron\\FieldFactory' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/FieldFactory.php',
+ 'Cron\\FieldInterface' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/FieldInterface.php',
+ 'Cron\\HoursField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/HoursField.php',
+ 'Cron\\MinutesField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/MinutesField.php',
+ 'Cron\\MonthField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/MonthField.php',
+ 'Cron\\YearField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/YearField.php',
+ 'DatabaseSeeder' => __DIR__ . '/../..' . '/database/seeds/DatabaseSeeder.php',
+ 'Doctrine\\Common\\Inflector\\Inflector' => __DIR__ . '/..' . '/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php',
+ 'Dotenv' => __DIR__ . '/..' . '/vlucas/phpdotenv/src/Dotenv.php',
+ 'IlluminateQueueClosure' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/IlluminateQueueClosure.php',
+ 'Illuminate\\Auth\\Access\\Gate' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Access/Gate.php',
+ 'Illuminate\\Auth\\Access\\HandlesAuthorization' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php',
+ 'Illuminate\\Auth\\Access\\Response' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Access/Response.php',
+ 'Illuminate\\Auth\\Access\\UnauthorizedException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php',
+ 'Illuminate\\Auth\\AuthManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/AuthManager.php',
+ 'Illuminate\\Auth\\AuthServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php',
+ 'Illuminate\\Auth\\Authenticatable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Authenticatable.php',
+ 'Illuminate\\Auth\\Console\\ClearResetsCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php',
+ 'Illuminate\\Auth\\DatabaseUserProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php',
+ 'Illuminate\\Auth\\EloquentUserProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php',
+ 'Illuminate\\Auth\\GeneratorServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php',
+ 'Illuminate\\Auth\\GenericUser' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/GenericUser.php',
+ 'Illuminate\\Auth\\Guard' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Guard.php',
+ 'Illuminate\\Auth\\Middleware\\AuthenticateWithBasicAuth' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php',
+ 'Illuminate\\Auth\\Passwords\\CanResetPassword' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php',
+ 'Illuminate\\Auth\\Passwords\\DatabaseTokenRepository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php',
+ 'Illuminate\\Auth\\Passwords\\PasswordBroker' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php',
+ 'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php',
+ 'Illuminate\\Auth\\Passwords\\TokenRepositoryInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php',
+ 'Illuminate\\Broadcasting\\BroadcastEvent' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php',
+ 'Illuminate\\Broadcasting\\BroadcastManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php',
+ 'Illuminate\\Broadcasting\\BroadcastServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php',
+ 'Illuminate\\Broadcasting\\Broadcasters\\LogBroadcaster' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php',
+ 'Illuminate\\Broadcasting\\Broadcasters\\PusherBroadcaster' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php',
+ 'Illuminate\\Broadcasting\\Broadcasters\\RedisBroadcaster' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php',
+ 'Illuminate\\Bus\\BusServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php',
+ 'Illuminate\\Bus\\Dispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Bus/Dispatcher.php',
+ 'Illuminate\\Bus\\MarshalException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Bus/MarshalException.php',
+ 'Illuminate\\Bus\\Queueable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Bus/Queueable.php',
+ 'Illuminate\\Cache\\ApcStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/ApcStore.php',
+ 'Illuminate\\Cache\\ApcWrapper' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/ApcWrapper.php',
+ 'Illuminate\\Cache\\ArrayStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/ArrayStore.php',
+ 'Illuminate\\Cache\\CacheManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/CacheManager.php',
+ 'Illuminate\\Cache\\CacheServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php',
+ 'Illuminate\\Cache\\Console\\CacheTableCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php',
+ 'Illuminate\\Cache\\Console\\ClearCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php',
+ 'Illuminate\\Cache\\DatabaseStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/DatabaseStore.php',
+ 'Illuminate\\Cache\\FileStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/FileStore.php',
+ 'Illuminate\\Cache\\MemcachedConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php',
+ 'Illuminate\\Cache\\MemcachedStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/MemcachedStore.php',
+ 'Illuminate\\Cache\\NullStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/NullStore.php',
+ 'Illuminate\\Cache\\RateLimiter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/RateLimiter.php',
+ 'Illuminate\\Cache\\RedisStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/RedisStore.php',
+ 'Illuminate\\Cache\\RedisTaggedCache' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php',
+ 'Illuminate\\Cache\\Repository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/Repository.php',
+ 'Illuminate\\Cache\\TagSet' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/TagSet.php',
+ 'Illuminate\\Cache\\TaggableStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/TaggableStore.php',
+ 'Illuminate\\Cache\\TaggedCache' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/TaggedCache.php',
+ 'Illuminate\\Cache\\WinCacheStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/WinCacheStore.php',
+ 'Illuminate\\Cache\\XCacheStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cache/XCacheStore.php',
+ 'Illuminate\\Config\\Repository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Config/Repository.php',
+ 'Illuminate\\Console\\AppNamespaceDetectorTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/AppNamespaceDetectorTrait.php',
+ 'Illuminate\\Console\\Application' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Application.php',
+ 'Illuminate\\Console\\Command' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Command.php',
+ 'Illuminate\\Console\\ConfirmableTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php',
+ 'Illuminate\\Console\\GeneratorCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/GeneratorCommand.php',
+ 'Illuminate\\Console\\OutputStyle' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/OutputStyle.php',
+ 'Illuminate\\Console\\Parser' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Parser.php',
+ 'Illuminate\\Console\\ScheduleServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/ScheduleServiceProvider.php',
+ 'Illuminate\\Console\\Scheduling\\CallbackEvent' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php',
+ 'Illuminate\\Console\\Scheduling\\Event' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/Event.php',
+ 'Illuminate\\Console\\Scheduling\\Schedule' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php',
+ 'Illuminate\\Console\\Scheduling\\ScheduleRunCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php',
+ 'Illuminate\\Container\\BindingResolutionException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Container/BindingResolutionException.php',
+ 'Illuminate\\Container\\Container' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Container/Container.php',
+ 'Illuminate\\Container\\ContextualBindingBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php',
+ 'Illuminate\\Contracts\\Auth\\Access\\Authorizable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/Access/Authorizable.php',
+ 'Illuminate\\Contracts\\Auth\\Access\\Gate' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php',
+ 'Illuminate\\Contracts\\Auth\\Authenticatable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/Authenticatable.php',
+ 'Illuminate\\Contracts\\Auth\\CanResetPassword' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/CanResetPassword.php',
+ 'Illuminate\\Contracts\\Auth\\Guard' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php',
+ 'Illuminate\\Contracts\\Auth\\PasswordBroker' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/PasswordBroker.php',
+ 'Illuminate\\Contracts\\Auth\\Registrar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/Registrar.php',
+ 'Illuminate\\Contracts\\Auth\\UserProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/UserProvider.php',
+ 'Illuminate\\Contracts\\Broadcasting\\Broadcaster' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/Broadcaster.php',
+ 'Illuminate\\Contracts\\Broadcasting\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/Factory.php',
+ 'Illuminate\\Contracts\\Broadcasting\\ShouldBroadcast' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php',
+ 'Illuminate\\Contracts\\Broadcasting\\ShouldBroadcastNow' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcastNow.php',
+ 'Illuminate\\Contracts\\Bus\\Dispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php',
+ 'Illuminate\\Contracts\\Bus\\HandlerResolver' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Bus/HandlerResolver.php',
+ 'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Bus/QueueingDispatcher.php',
+ 'Illuminate\\Contracts\\Bus\\SelfHandling' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Bus/SelfHandling.php',
+ 'Illuminate\\Contracts\\Cache\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Cache/Factory.php',
+ 'Illuminate\\Contracts\\Cache\\Repository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Cache/Repository.php',
+ 'Illuminate\\Contracts\\Cache\\Store' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Cache/Store.php',
+ 'Illuminate\\Contracts\\Config\\Repository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Config/Repository.php',
+ 'Illuminate\\Contracts\\Console\\Application' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Console/Application.php',
+ 'Illuminate\\Contracts\\Console\\Kernel' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Console/Kernel.php',
+ 'Illuminate\\Contracts\\Container\\BindingResolutionException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Container/BindingResolutionException.php',
+ 'Illuminate\\Contracts\\Container\\Container' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Container/Container.php',
+ 'Illuminate\\Contracts\\Container\\ContextualBindingBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Container/ContextualBindingBuilder.php',
+ 'Illuminate\\Contracts\\Cookie\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php',
+ 'Illuminate\\Contracts\\Cookie\\QueueingFactory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Cookie/QueueingFactory.php',
+ 'Illuminate\\Contracts\\Database\\ModelIdentifier' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Database/ModelIdentifier.php',
+ 'Illuminate\\Contracts\\Debug\\ExceptionHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php',
+ 'Illuminate\\Contracts\\Encryption\\DecryptException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Encryption/DecryptException.php',
+ 'Illuminate\\Contracts\\Encryption\\EncryptException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Encryption/EncryptException.php',
+ 'Illuminate\\Contracts\\Encryption\\Encrypter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Encryption/Encrypter.php',
+ 'Illuminate\\Contracts\\Events\\Dispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php',
+ 'Illuminate\\Contracts\\Filesystem\\Cloud' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Cloud.php',
+ 'Illuminate\\Contracts\\Filesystem\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Factory.php',
+ 'Illuminate\\Contracts\\Filesystem\\FileNotFoundException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/FileNotFoundException.php',
+ 'Illuminate\\Contracts\\Filesystem\\Filesystem' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php',
+ 'Illuminate\\Contracts\\Foundation\\Application' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php',
+ 'Illuminate\\Contracts\\Hashing\\Hasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php',
+ 'Illuminate\\Contracts\\Http\\Kernel' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php',
+ 'Illuminate\\Contracts\\Logging\\Log' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Logging/Log.php',
+ 'Illuminate\\Contracts\\Mail\\MailQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php',
+ 'Illuminate\\Contracts\\Mail\\Mailer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php',
+ 'Illuminate\\Contracts\\Pagination\\LengthAwarePaginator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Pagination/LengthAwarePaginator.php',
+ 'Illuminate\\Contracts\\Pagination\\Paginator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Pagination/Paginator.php',
+ 'Illuminate\\Contracts\\Pagination\\Presenter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Pagination/Presenter.php',
+ 'Illuminate\\Contracts\\Pipeline\\Hub' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Pipeline/Hub.php',
+ 'Illuminate\\Contracts\\Pipeline\\Pipeline' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Pipeline/Pipeline.php',
+ 'Illuminate\\Contracts\\Queue\\EntityNotFoundException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/EntityNotFoundException.php',
+ 'Illuminate\\Contracts\\Queue\\EntityResolver' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/EntityResolver.php',
+ 'Illuminate\\Contracts\\Queue\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/Factory.php',
+ 'Illuminate\\Contracts\\Queue\\Job' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/Job.php',
+ 'Illuminate\\Contracts\\Queue\\Monitor' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/Monitor.php',
+ 'Illuminate\\Contracts\\Queue\\Queue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/Queue.php',
+ 'Illuminate\\Contracts\\Queue\\QueueableEntity' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php',
+ 'Illuminate\\Contracts\\Queue\\ShouldBeQueued' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/ShouldBeQueued.php',
+ 'Illuminate\\Contracts\\Queue\\ShouldQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php',
+ 'Illuminate\\Contracts\\Redis\\Database' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Redis/Database.php',
+ 'Illuminate\\Contracts\\Routing\\Middleware' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Routing/Middleware.php',
+ 'Illuminate\\Contracts\\Routing\\Registrar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php',
+ 'Illuminate\\Contracts\\Routing\\ResponseFactory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php',
+ 'Illuminate\\Contracts\\Routing\\TerminableMiddleware' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Routing/TerminableMiddleware.php',
+ 'Illuminate\\Contracts\\Routing\\UrlGenerator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php',
+ 'Illuminate\\Contracts\\Routing\\UrlRoutable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Routing/UrlRoutable.php',
+ 'Illuminate\\Contracts\\Support\\Arrayable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/Arrayable.php',
+ 'Illuminate\\Contracts\\Support\\Htmlable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/Htmlable.php',
+ 'Illuminate\\Contracts\\Support\\Jsonable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/Jsonable.php',
+ 'Illuminate\\Contracts\\Support\\MessageBag' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/MessageBag.php',
+ 'Illuminate\\Contracts\\Support\\MessageProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php',
+ 'Illuminate\\Contracts\\Support\\Renderable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php',
+ 'Illuminate\\Contracts\\Validation\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Validation/Factory.php',
+ 'Illuminate\\Contracts\\Validation\\UnauthorizedException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Validation/UnauthorizedException.php',
+ 'Illuminate\\Contracts\\Validation\\ValidatesWhenResolved' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php',
+ 'Illuminate\\Contracts\\Validation\\ValidationException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Validation/ValidationException.php',
+ 'Illuminate\\Contracts\\Validation\\Validator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php',
+ 'Illuminate\\Contracts\\View\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/View/Factory.php',
+ 'Illuminate\\Contracts\\View\\View' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/View/View.php',
+ 'Illuminate\\Cookie\\CookieJar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cookie/CookieJar.php',
+ 'Illuminate\\Cookie\\CookieServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php',
+ 'Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php',
+ 'Illuminate\\Cookie\\Middleware\\EncryptCookies' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php',
+ 'Illuminate\\Database\\Capsule\\Manager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Capsule/Manager.php',
+ 'Illuminate\\Database\\Connection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connection.php',
+ 'Illuminate\\Database\\ConnectionInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/ConnectionInterface.php',
+ 'Illuminate\\Database\\ConnectionResolver' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/ConnectionResolver.php',
+ 'Illuminate\\Database\\ConnectionResolverInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php',
+ 'Illuminate\\Database\\Connectors\\ConnectionFactory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php',
+ 'Illuminate\\Database\\Connectors\\Connector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connectors/Connector.php',
+ 'Illuminate\\Database\\Connectors\\ConnectorInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connectors/ConnectorInterface.php',
+ 'Illuminate\\Database\\Connectors\\MySqlConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php',
+ 'Illuminate\\Database\\Connectors\\PostgresConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connectors/PostgresConnector.php',
+ 'Illuminate\\Database\\Connectors\\SQLiteConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php',
+ 'Illuminate\\Database\\Connectors\\SqlServerConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php',
+ 'Illuminate\\Database\\Console\\Migrations\\BaseCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php',
+ 'Illuminate\\Database\\Console\\Migrations\\InstallCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php',
+ 'Illuminate\\Database\\Console\\Migrations\\MigrateCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php',
+ 'Illuminate\\Database\\Console\\Migrations\\MigrateMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php',
+ 'Illuminate\\Database\\Console\\Migrations\\RefreshCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php',
+ 'Illuminate\\Database\\Console\\Migrations\\ResetCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php',
+ 'Illuminate\\Database\\Console\\Migrations\\RollbackCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php',
+ 'Illuminate\\Database\\Console\\Migrations\\StatusCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php',
+ 'Illuminate\\Database\\Console\\Seeds\\SeedCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php',
+ 'Illuminate\\Database\\Console\\Seeds\\SeederMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php',
+ 'Illuminate\\Database\\DatabaseManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/DatabaseManager.php',
+ 'Illuminate\\Database\\DatabaseServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php',
+ 'Illuminate\\Database\\DetectsLostConnections' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php',
+ 'Illuminate\\Database\\Eloquent\\Builder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php',
+ 'Illuminate\\Database\\Eloquent\\Collection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php',
+ 'Illuminate\\Database\\Eloquent\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php',
+ 'Illuminate\\Database\\Eloquent\\FactoryBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php',
+ 'Illuminate\\Database\\Eloquent\\MassAssignmentException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/MassAssignmentException.php',
+ 'Illuminate\\Database\\Eloquent\\Model' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Model.php',
+ 'Illuminate\\Database\\Eloquent\\ModelNotFoundException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/ModelNotFoundException.php',
+ 'Illuminate\\Database\\Eloquent\\QueueEntityResolver' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/QueueEntityResolver.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\BelongsTo' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\BelongsToMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\HasMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\HasManyThrough' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\HasOne' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOne.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\HasOneOrMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\MorphMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\MorphOne' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOne.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\MorphOneOrMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\MorphPivot' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\MorphTo' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\MorphToMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\Pivot' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php',
+ 'Illuminate\\Database\\Eloquent\\Relations\\Relation' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php',
+ 'Illuminate\\Database\\Eloquent\\ScopeInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/ScopeInterface.php',
+ 'Illuminate\\Database\\Eloquent\\SoftDeletes' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php',
+ 'Illuminate\\Database\\Eloquent\\SoftDeletingScope' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php',
+ 'Illuminate\\Database\\Grammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Grammar.php',
+ 'Illuminate\\Database\\MigrationServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php',
+ 'Illuminate\\Database\\Migrations\\DatabaseMigrationRepository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php',
+ 'Illuminate\\Database\\Migrations\\Migration' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Migrations/Migration.php',
+ 'Illuminate\\Database\\Migrations\\MigrationCreator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php',
+ 'Illuminate\\Database\\Migrations\\MigrationRepositoryInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php',
+ 'Illuminate\\Database\\Migrations\\Migrator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php',
+ 'Illuminate\\Database\\MySqlConnection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/MySqlConnection.php',
+ 'Illuminate\\Database\\PostgresConnection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/PostgresConnection.php',
+ 'Illuminate\\Database\\QueryException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/QueryException.php',
+ 'Illuminate\\Database\\Query\\Builder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Builder.php',
+ 'Illuminate\\Database\\Query\\Expression' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Expression.php',
+ 'Illuminate\\Database\\Query\\Grammars\\Grammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php',
+ 'Illuminate\\Database\\Query\\Grammars\\MySqlGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php',
+ 'Illuminate\\Database\\Query\\Grammars\\PostgresGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php',
+ 'Illuminate\\Database\\Query\\Grammars\\SQLiteGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php',
+ 'Illuminate\\Database\\Query\\Grammars\\SqlServerGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php',
+ 'Illuminate\\Database\\Query\\JoinClause' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/JoinClause.php',
+ 'Illuminate\\Database\\Query\\Processors\\MySqlProcessor' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php',
+ 'Illuminate\\Database\\Query\\Processors\\PostgresProcessor' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Processors/PostgresProcessor.php',
+ 'Illuminate\\Database\\Query\\Processors\\Processor' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php',
+ 'Illuminate\\Database\\Query\\Processors\\SQLiteProcessor' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Processors/SQLiteProcessor.php',
+ 'Illuminate\\Database\\Query\\Processors\\SqlServerProcessor' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php',
+ 'Illuminate\\Database\\SQLiteConnection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/SQLiteConnection.php',
+ 'Illuminate\\Database\\Schema\\Blueprint' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php',
+ 'Illuminate\\Database\\Schema\\Builder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Builder.php',
+ 'Illuminate\\Database\\Schema\\Grammars\\Grammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php',
+ 'Illuminate\\Database\\Schema\\Grammars\\MySqlGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php',
+ 'Illuminate\\Database\\Schema\\Grammars\\PostgresGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php',
+ 'Illuminate\\Database\\Schema\\Grammars\\SQLiteGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php',
+ 'Illuminate\\Database\\Schema\\Grammars\\SqlServerGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php',
+ 'Illuminate\\Database\\Schema\\MySqlBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php',
+ 'Illuminate\\Database\\Schema\\PostgresBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php',
+ 'Illuminate\\Database\\SeedServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php',
+ 'Illuminate\\Database\\Seeder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Seeder.php',
+ 'Illuminate\\Database\\SqlServerConnection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/SqlServerConnection.php',
+ 'Illuminate\\Encryption\\BaseEncrypter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Encryption/BaseEncrypter.php',
+ 'Illuminate\\Encryption\\Encrypter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Encryption/Encrypter.php',
+ 'Illuminate\\Encryption\\EncryptionServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php',
+ 'Illuminate\\Encryption\\McryptEncrypter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Encryption/McryptEncrypter.php',
+ 'Illuminate\\Events\\CallQueuedHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Events/CallQueuedHandler.php',
+ 'Illuminate\\Events\\Dispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Events/Dispatcher.php',
+ 'Illuminate\\Events\\EventServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Events/EventServiceProvider.php',
+ 'Illuminate\\Filesystem\\ClassFinder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Filesystem/ClassFinder.php',
+ 'Illuminate\\Filesystem\\Filesystem' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Filesystem/Filesystem.php',
+ 'Illuminate\\Filesystem\\FilesystemAdapter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php',
+ 'Illuminate\\Filesystem\\FilesystemManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php',
+ 'Illuminate\\Filesystem\\FilesystemServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php',
+ 'Illuminate\\Foundation\\AliasLoader' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/AliasLoader.php',
+ 'Illuminate\\Foundation\\Application' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Application.php',
+ 'Illuminate\\Foundation\\Auth\\Access\\Authorizable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/Access/Authorizable.php',
+ 'Illuminate\\Foundation\\Auth\\Access\\AuthorizesRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php',
+ 'Illuminate\\Foundation\\Auth\\AuthenticatesAndRegistersUsers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php',
+ 'Illuminate\\Foundation\\Auth\\AuthenticatesUsers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php',
+ 'Illuminate\\Foundation\\Auth\\RedirectsUsers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php',
+ 'Illuminate\\Foundation\\Auth\\RegistersUsers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/RegistersUsers.php',
+ 'Illuminate\\Foundation\\Auth\\ResetsPasswords' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php',
+ 'Illuminate\\Foundation\\Auth\\ThrottlesLogins' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php',
+ 'Illuminate\\Foundation\\Bootstrap\\BootProviders' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php',
+ 'Illuminate\\Foundation\\Bootstrap\\ConfigureLogging' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php',
+ 'Illuminate\\Foundation\\Bootstrap\\DetectEnvironment' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php',
+ 'Illuminate\\Foundation\\Bootstrap\\HandleExceptions' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php',
+ 'Illuminate\\Foundation\\Bootstrap\\LoadConfiguration' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php',
+ 'Illuminate\\Foundation\\Bootstrap\\RegisterFacades' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php',
+ 'Illuminate\\Foundation\\Bootstrap\\RegisterProviders' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php',
+ 'Illuminate\\Foundation\\Bootstrap\\SetRequestForConsole' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php',
+ 'Illuminate\\Foundation\\Bus\\DispatchesCommands' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesCommands.php',
+ 'Illuminate\\Foundation\\Bus\\DispatchesJobs' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesJobs.php',
+ 'Illuminate\\Foundation\\Composer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Composer.php',
+ 'Illuminate\\Foundation\\ComposerScripts' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/ComposerScripts.php',
+ 'Illuminate\\Foundation\\Console\\AppNameCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php',
+ 'Illuminate\\Foundation\\Console\\ClearCompiledCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php',
+ 'Illuminate\\Foundation\\Console\\CommandMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/CommandMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\ConfigCacheCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php',
+ 'Illuminate\\Foundation\\Console\\ConfigClearCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ConfigClearCommand.php',
+ 'Illuminate\\Foundation\\Console\\ConsoleMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\DownCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php',
+ 'Illuminate\\Foundation\\Console\\EnvironmentCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/EnvironmentCommand.php',
+ 'Illuminate\\Foundation\\Console\\EventGenerateCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/EventGenerateCommand.php',
+ 'Illuminate\\Foundation\\Console\\EventMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/EventMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\HandlerCommandCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/HandlerCommandCommand.php',
+ 'Illuminate\\Foundation\\Console\\HandlerEventCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/HandlerEventCommand.php',
+ 'Illuminate\\Foundation\\Console\\IlluminateCaster' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/IlluminateCaster.php',
+ 'Illuminate\\Foundation\\Console\\JobMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\Kernel' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php',
+ 'Illuminate\\Foundation\\Console\\KeyGenerateCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php',
+ 'Illuminate\\Foundation\\Console\\ListenerMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\ModelMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\OptimizeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php',
+ 'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\ProviderMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ProviderMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\QueuedJob' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/QueuedJob.php',
+ 'Illuminate\\Foundation\\Console\\RequestMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/RequestMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\RouteCacheCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/RouteCacheCommand.php',
+ 'Illuminate\\Foundation\\Console\\RouteClearCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/RouteClearCommand.php',
+ 'Illuminate\\Foundation\\Console\\RouteListCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php',
+ 'Illuminate\\Foundation\\Console\\ServeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php',
+ 'Illuminate\\Foundation\\Console\\TestMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php',
+ 'Illuminate\\Foundation\\Console\\TinkerCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php',
+ 'Illuminate\\Foundation\\Console\\UpCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php',
+ 'Illuminate\\Foundation\\Console\\VendorPublishCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php',
+ 'Illuminate\\Foundation\\Console\\ViewClearCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php',
+ 'Illuminate\\Foundation\\EnvironmentDetector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php',
+ 'Illuminate\\Foundation\\Exceptions\\Handler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php',
+ 'Illuminate\\Foundation\\Http\\FormRequest' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php',
+ 'Illuminate\\Foundation\\Http\\Kernel' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php',
+ 'Illuminate\\Foundation\\Http\\Middleware\\CheckForMaintenanceMode' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php',
+ 'Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php',
+ 'Illuminate\\Foundation\\Http\\Middleware\\VerifyPostSize' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyPostSize.php',
+ 'Illuminate\\Foundation\\Inspiring' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Inspiring.php',
+ 'Illuminate\\Foundation\\ProviderRepository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php',
+ 'Illuminate\\Foundation\\Providers\\ArtisanServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php',
+ 'Illuminate\\Foundation\\Providers\\ComposerServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php',
+ 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php',
+ 'Illuminate\\Foundation\\Providers\\FormRequestServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php',
+ 'Illuminate\\Foundation\\Providers\\FoundationServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php',
+ 'Illuminate\\Foundation\\Support\\Providers\\AuthServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php',
+ 'Illuminate\\Foundation\\Support\\Providers\\EventServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php',
+ 'Illuminate\\Foundation\\Support\\Providers\\RouteServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php',
+ 'Illuminate\\Foundation\\Testing\\ApplicationTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/ApplicationTrait.php',
+ 'Illuminate\\Foundation\\Testing\\AssertionsTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/AssertionsTrait.php',
+ 'Illuminate\\Foundation\\Testing\\CrawlerTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/CrawlerTrait.php',
+ 'Illuminate\\Foundation\\Testing\\DatabaseMigrations' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseMigrations.php',
+ 'Illuminate\\Foundation\\Testing\\DatabaseTransactions' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseTransactions.php',
+ 'Illuminate\\Foundation\\Testing\\HttpException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/HttpException.php',
+ 'Illuminate\\Foundation\\Testing\\InteractsWithPages' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/InteractsWithPages.php',
+ 'Illuminate\\Foundation\\Testing\\TestCase' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php',
+ 'Illuminate\\Foundation\\Testing\\WithoutEvents' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
+ 'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
+ 'Illuminate\\Foundation\\Validation\\ValidatesRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
+ 'Illuminate\\Hashing\\BcryptHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
+ 'Illuminate\\Hashing\\HashServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php',
+ 'Illuminate\\Http\\Exception\\HttpResponseException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Exception/HttpResponseException.php',
+ 'Illuminate\\Http\\Exception\\PostTooLargeException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Exception/PostTooLargeException.php',
+ 'Illuminate\\Http\\JsonResponse' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/JsonResponse.php',
+ 'Illuminate\\Http\\Middleware\\CheckResponseForModifications' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Middleware/CheckResponseForModifications.php',
+ 'Illuminate\\Http\\Middleware\\FrameGuard' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php',
+ 'Illuminate\\Http\\RedirectResponse' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/RedirectResponse.php',
+ 'Illuminate\\Http\\Request' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Request.php',
+ 'Illuminate\\Http\\Response' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Response.php',
+ 'Illuminate\\Http\\ResponseTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/ResponseTrait.php',
+ 'Illuminate\\Log\\Writer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Log/Writer.php',
+ 'Illuminate\\Mail\\MailServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php',
+ 'Illuminate\\Mail\\Mailer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Mailer.php',
+ 'Illuminate\\Mail\\Message' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Message.php',
+ 'Illuminate\\Mail\\TransportManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/TransportManager.php',
+ 'Illuminate\\Mail\\Transport\\LogTransport' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php',
+ 'Illuminate\\Mail\\Transport\\MailgunTransport' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php',
+ 'Illuminate\\Mail\\Transport\\MandrillTransport' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php',
+ 'Illuminate\\Mail\\Transport\\SesTransport' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php',
+ 'Illuminate\\Mail\\Transport\\Transport' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Transport/Transport.php',
+ 'Illuminate\\Pagination\\AbstractPaginator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php',
+ 'Illuminate\\Pagination\\BootstrapThreeNextPreviousButtonRendererTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/BootstrapThreeNextPreviousButtonRendererTrait.php',
+ 'Illuminate\\Pagination\\BootstrapThreePresenter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/BootstrapThreePresenter.php',
+ 'Illuminate\\Pagination\\LengthAwarePaginator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/LengthAwarePaginator.php',
+ 'Illuminate\\Pagination\\PaginationServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php',
+ 'Illuminate\\Pagination\\Paginator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/Paginator.php',
+ 'Illuminate\\Pagination\\SimpleBootstrapThreePresenter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/SimpleBootstrapThreePresenter.php',
+ 'Illuminate\\Pagination\\UrlWindow' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/UrlWindow.php',
+ 'Illuminate\\Pagination\\UrlWindowPresenterTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pagination/UrlWindowPresenterTrait.php',
+ 'Illuminate\\Pipeline\\Hub' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pipeline/Hub.php',
+ 'Illuminate\\Pipeline\\Pipeline' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pipeline/Pipeline.php',
+ 'Illuminate\\Pipeline\\PipelineServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php',
+ 'Illuminate\\Queue\\BeanstalkdQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php',
+ 'Illuminate\\Queue\\CallQueuedHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php',
+ 'Illuminate\\Queue\\Capsule\\Manager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Capsule/Manager.php',
+ 'Illuminate\\Queue\\Connectors\\BeanstalkdConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php',
+ 'Illuminate\\Queue\\Connectors\\ConnectorInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/ConnectorInterface.php',
+ 'Illuminate\\Queue\\Connectors\\DatabaseConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/DatabaseConnector.php',
+ 'Illuminate\\Queue\\Connectors\\IronConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/IronConnector.php',
+ 'Illuminate\\Queue\\Connectors\\NullConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/NullConnector.php',
+ 'Illuminate\\Queue\\Connectors\\RedisConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/RedisConnector.php',
+ 'Illuminate\\Queue\\Connectors\\SqsConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php',
+ 'Illuminate\\Queue\\Connectors\\SyncConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php',
+ 'Illuminate\\Queue\\ConsoleServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/ConsoleServiceProvider.php',
+ 'Illuminate\\Queue\\Console\\FailedTableCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/FailedTableCommand.php',
+ 'Illuminate\\Queue\\Console\\FlushFailedCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/FlushFailedCommand.php',
+ 'Illuminate\\Queue\\Console\\ForgetFailedCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php',
+ 'Illuminate\\Queue\\Console\\ListFailedCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/ListFailedCommand.php',
+ 'Illuminate\\Queue\\Console\\ListenCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/ListenCommand.php',
+ 'Illuminate\\Queue\\Console\\RestartCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php',
+ 'Illuminate\\Queue\\Console\\RetryCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php',
+ 'Illuminate\\Queue\\Console\\SubscribeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/SubscribeCommand.php',
+ 'Illuminate\\Queue\\Console\\TableCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php',
+ 'Illuminate\\Queue\\Console\\WorkCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php',
+ 'Illuminate\\Queue\\DatabaseQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php',
+ 'Illuminate\\Queue\\Failed\\DatabaseFailedJobProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php',
+ 'Illuminate\\Queue\\Failed\\FailedJobProviderInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Failed/FailedJobProviderInterface.php',
+ 'Illuminate\\Queue\\Failed\\NullFailedJobProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Failed/NullFailedJobProvider.php',
+ 'Illuminate\\Queue\\InteractsWithQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php',
+ 'Illuminate\\Queue\\IronQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/IronQueue.php',
+ 'Illuminate\\Queue\\Jobs\\BeanstalkdJob' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Jobs/BeanstalkdJob.php',
+ 'Illuminate\\Queue\\Jobs\\DatabaseJob' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Jobs/DatabaseJob.php',
+ 'Illuminate\\Queue\\Jobs\\IronJob' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Jobs/IronJob.php',
+ 'Illuminate\\Queue\\Jobs\\Job' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Jobs/Job.php',
+ 'Illuminate\\Queue\\Jobs\\RedisJob' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Jobs/RedisJob.php',
+ 'Illuminate\\Queue\\Jobs\\SqsJob' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Jobs/SqsJob.php',
+ 'Illuminate\\Queue\\Jobs\\SyncJob' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php',
+ 'Illuminate\\Queue\\Listener' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Listener.php',
+ 'Illuminate\\Queue\\NullQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/NullQueue.php',
+ 'Illuminate\\Queue\\Queue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Queue.php',
+ 'Illuminate\\Queue\\QueueManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/QueueManager.php',
+ 'Illuminate\\Queue\\QueueServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php',
+ 'Illuminate\\Queue\\RedisQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/RedisQueue.php',
+ 'Illuminate\\Queue\\SerializesModels' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/SerializesModels.php',
+ 'Illuminate\\Queue\\SqsQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/SqsQueue.php',
+ 'Illuminate\\Queue\\SyncQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/SyncQueue.php',
+ 'Illuminate\\Queue\\Worker' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Worker.php',
+ 'Illuminate\\Redis\\Database' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Database.php',
+ 'Illuminate\\Redis\\RedisServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php',
+ 'Illuminate\\Routing\\Console\\ControllerMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php',
+ 'Illuminate\\Routing\\Console\\MiddlewareMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php',
+ 'Illuminate\\Routing\\Controller' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Controller.php',
+ 'Illuminate\\Routing\\ControllerDispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php',
+ 'Illuminate\\Routing\\ControllerInspector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ControllerInspector.php',
+ 'Illuminate\\Routing\\ControllerServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ControllerServiceProvider.php',
+ 'Illuminate\\Routing\\GeneratorServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/GeneratorServiceProvider.php',
+ 'Illuminate\\Routing\\Matching\\HostValidator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php',
+ 'Illuminate\\Routing\\Matching\\MethodValidator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php',
+ 'Illuminate\\Routing\\Matching\\SchemeValidator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php',
+ 'Illuminate\\Routing\\Matching\\UriValidator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php',
+ 'Illuminate\\Routing\\Matching\\ValidatorInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php',
+ 'Illuminate\\Routing\\Redirector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Redirector.php',
+ 'Illuminate\\Routing\\ResourceRegistrar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php',
+ 'Illuminate\\Routing\\ResponseFactory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ResponseFactory.php',
+ 'Illuminate\\Routing\\Route' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Route.php',
+ 'Illuminate\\Routing\\RouteCollection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/RouteCollection.php',
+ 'Illuminate\\Routing\\RouteDependencyResolverTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php',
+ 'Illuminate\\Routing\\Router' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Router.php',
+ 'Illuminate\\Routing\\RoutingServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php',
+ 'Illuminate\\Routing\\UrlGenerator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/UrlGenerator.php',
+ 'Illuminate\\Session\\CacheBasedSessionHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/CacheBasedSessionHandler.php',
+ 'Illuminate\\Session\\CommandsServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/CommandsServiceProvider.php',
+ 'Illuminate\\Session\\Console\\SessionTableCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/Console/SessionTableCommand.php',
+ 'Illuminate\\Session\\CookieSessionHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/CookieSessionHandler.php',
+ 'Illuminate\\Session\\DatabaseSessionHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/DatabaseSessionHandler.php',
+ 'Illuminate\\Session\\EncryptedStore' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/EncryptedStore.php',
+ 'Illuminate\\Session\\ExistenceAwareInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/ExistenceAwareInterface.php',
+ 'Illuminate\\Session\\FileSessionHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/FileSessionHandler.php',
+ 'Illuminate\\Session\\Middleware\\StartSession' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php',
+ 'Illuminate\\Session\\SessionInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/SessionInterface.php',
+ 'Illuminate\\Session\\SessionManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/SessionManager.php',
+ 'Illuminate\\Session\\SessionServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php',
+ 'Illuminate\\Session\\Store' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/Store.php',
+ 'Illuminate\\Session\\TokenMismatchException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Session/TokenMismatchException.php',
+ 'Illuminate\\Support\\AggregateServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php',
+ 'Illuminate\\Support\\Arr' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Arr.php',
+ 'Illuminate\\Support\\ClassLoader' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/ClassLoader.php',
+ 'Illuminate\\Support\\Collection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Collection.php',
+ 'Illuminate\\Support\\Debug\\Dumper' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Debug/Dumper.php',
+ 'Illuminate\\Support\\Debug\\HtmlDumper' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php',
+ 'Illuminate\\Support\\Facades\\App' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/App.php',
+ 'Illuminate\\Support\\Facades\\Artisan' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Artisan.php',
+ 'Illuminate\\Support\\Facades\\Auth' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Auth.php',
+ 'Illuminate\\Support\\Facades\\Blade' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Blade.php',
+ 'Illuminate\\Support\\Facades\\Bus' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Bus.php',
+ 'Illuminate\\Support\\Facades\\Cache' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Cache.php',
+ 'Illuminate\\Support\\Facades\\Config' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Config.php',
+ 'Illuminate\\Support\\Facades\\Cookie' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Cookie.php',
+ 'Illuminate\\Support\\Facades\\Crypt' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Crypt.php',
+ 'Illuminate\\Support\\Facades\\DB' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/DB.php',
+ 'Illuminate\\Support\\Facades\\Event' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Event.php',
+ 'Illuminate\\Support\\Facades\\Facade' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Facade.php',
+ 'Illuminate\\Support\\Facades\\File' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/File.php',
+ 'Illuminate\\Support\\Facades\\Gate' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Gate.php',
+ 'Illuminate\\Support\\Facades\\Hash' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Hash.php',
+ 'Illuminate\\Support\\Facades\\Input' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Input.php',
+ 'Illuminate\\Support\\Facades\\Lang' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Lang.php',
+ 'Illuminate\\Support\\Facades\\Log' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Log.php',
+ 'Illuminate\\Support\\Facades\\Mail' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Mail.php',
+ 'Illuminate\\Support\\Facades\\Password' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Password.php',
+ 'Illuminate\\Support\\Facades\\Queue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Queue.php',
+ 'Illuminate\\Support\\Facades\\Redirect' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Redirect.php',
+ 'Illuminate\\Support\\Facades\\Redis' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Redis.php',
+ 'Illuminate\\Support\\Facades\\Request' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Request.php',
+ 'Illuminate\\Support\\Facades\\Response' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Response.php',
+ 'Illuminate\\Support\\Facades\\Route' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Route.php',
+ 'Illuminate\\Support\\Facades\\Schema' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Schema.php',
+ 'Illuminate\\Support\\Facades\\Session' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Session.php',
+ 'Illuminate\\Support\\Facades\\Storage' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Storage.php',
+ 'Illuminate\\Support\\Facades\\URL' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/URL.php',
+ 'Illuminate\\Support\\Facades\\Validator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Validator.php',
+ 'Illuminate\\Support\\Facades\\View' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/View.php',
+ 'Illuminate\\Support\\Fluent' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Fluent.php',
+ 'Illuminate\\Support\\HtmlString' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/HtmlString.php',
+ 'Illuminate\\Support\\Manager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Manager.php',
+ 'Illuminate\\Support\\MessageBag' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/MessageBag.php',
+ 'Illuminate\\Support\\NamespacedItemResolver' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php',
+ 'Illuminate\\Support\\Pluralizer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Pluralizer.php',
+ 'Illuminate\\Support\\ServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/ServiceProvider.php',
+ 'Illuminate\\Support\\Str' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Str.php',
+ 'Illuminate\\Support\\Traits\\CapsuleManagerTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Traits/CapsuleManagerTrait.php',
+ 'Illuminate\\Support\\Traits\\Macroable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Traits/Macroable.php',
+ 'Illuminate\\Support\\ViewErrorBag' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/ViewErrorBag.php',
+ 'Illuminate\\Translation\\FileLoader' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Translation/FileLoader.php',
+ 'Illuminate\\Translation\\LoaderInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Translation/LoaderInterface.php',
+ 'Illuminate\\Translation\\TranslationServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Translation/TranslationServiceProvider.php',
+ 'Illuminate\\Translation\\Translator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Translation/Translator.php',
+ 'Illuminate\\Validation\\DatabasePresenceVerifier' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php',
+ 'Illuminate\\Validation\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/Factory.php',
+ 'Illuminate\\Validation\\PresenceVerifierInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php',
+ 'Illuminate\\Validation\\ValidatesWhenResolvedTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php',
+ 'Illuminate\\Validation\\ValidationServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php',
+ 'Illuminate\\Validation\\Validator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/Validator.php',
+ 'Illuminate\\View\\Compilers\\BladeCompiler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php',
+ 'Illuminate\\View\\Compilers\\Compiler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Compiler.php',
+ 'Illuminate\\View\\Compilers\\CompilerInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php',
+ 'Illuminate\\View\\Engines\\CompilerEngine' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Engines/CompilerEngine.php',
+ 'Illuminate\\View\\Engines\\Engine' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Engines/Engine.php',
+ 'Illuminate\\View\\Engines\\EngineInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php',
+ 'Illuminate\\View\\Engines\\EngineResolver' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php',
+ 'Illuminate\\View\\Engines\\PhpEngine' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php',
+ 'Illuminate\\View\\Expression' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Expression.php',
+ 'Illuminate\\View\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Factory.php',
+ 'Illuminate\\View\\FileViewFinder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/FileViewFinder.php',
+ 'Illuminate\\View\\Middleware\\ShareErrorsFromSession' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php',
+ 'Illuminate\\View\\View' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/View.php',
+ 'Illuminate\\View\\ViewFinderInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/ViewFinderInterface.php',
+ 'Illuminate\\View\\ViewServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/ViewServiceProvider.php',
+ 'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/ConsoleColor.php',
+ 'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/InvalidStyleException.php',
+ 'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php',
+ 'JsonSerializable' => __DIR__ . '/..' . '/nesbot/carbon/src/JsonSerializable.php',
+ 'League\\Flysystem\\AdapterInterface' => __DIR__ . '/..' . '/league/flysystem/src/AdapterInterface.php',
+ 'League\\Flysystem\\Adapter\\AbstractAdapter' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/AbstractAdapter.php',
+ 'League\\Flysystem\\Adapter\\AbstractFtpAdapter' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/AbstractFtpAdapter.php',
+ 'League\\Flysystem\\Adapter\\CanOverwriteFiles' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/CanOverwriteFiles.php',
+ 'League\\Flysystem\\Adapter\\Ftp' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Ftp.php',
+ 'League\\Flysystem\\Adapter\\Ftpd' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Ftpd.php',
+ 'League\\Flysystem\\Adapter\\Local' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Local.php',
+ 'League\\Flysystem\\Adapter\\NullAdapter' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/NullAdapter.php',
+ 'League\\Flysystem\\Adapter\\Polyfill\\NotSupportingVisibilityTrait' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Polyfill/NotSupportingVisibilityTrait.php',
+ 'League\\Flysystem\\Adapter\\Polyfill\\StreamedCopyTrait' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Polyfill/StreamedCopyTrait.php',
+ 'League\\Flysystem\\Adapter\\Polyfill\\StreamedReadingTrait' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Polyfill/StreamedReadingTrait.php',
+ 'League\\Flysystem\\Adapter\\Polyfill\\StreamedTrait' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Polyfill/StreamedTrait.php',
+ 'League\\Flysystem\\Adapter\\Polyfill\\StreamedWritingTrait' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/Polyfill/StreamedWritingTrait.php',
+ 'League\\Flysystem\\Adapter\\SynologyFtp' => __DIR__ . '/..' . '/league/flysystem/src/Adapter/SynologyFtp.php',
+ 'League\\Flysystem\\Config' => __DIR__ . '/..' . '/league/flysystem/src/Config.php',
+ 'League\\Flysystem\\ConfigAwareTrait' => __DIR__ . '/..' . '/league/flysystem/src/ConfigAwareTrait.php',
+ 'League\\Flysystem\\Directory' => __DIR__ . '/..' . '/league/flysystem/src/Directory.php',
+ 'League\\Flysystem\\Exception' => __DIR__ . '/..' . '/league/flysystem/src/Exception.php',
+ 'League\\Flysystem\\File' => __DIR__ . '/..' . '/league/flysystem/src/File.php',
+ 'League\\Flysystem\\FileExistsException' => __DIR__ . '/..' . '/league/flysystem/src/FileExistsException.php',
+ 'League\\Flysystem\\FileNotFoundException' => __DIR__ . '/..' . '/league/flysystem/src/FileNotFoundException.php',
+ 'League\\Flysystem\\Filesystem' => __DIR__ . '/..' . '/league/flysystem/src/Filesystem.php',
+ 'League\\Flysystem\\FilesystemInterface' => __DIR__ . '/..' . '/league/flysystem/src/FilesystemInterface.php',
+ 'League\\Flysystem\\FilesystemNotFoundException' => __DIR__ . '/..' . '/league/flysystem/src/FilesystemNotFoundException.php',
+ 'League\\Flysystem\\Handler' => __DIR__ . '/..' . '/league/flysystem/src/Handler.php',
+ 'League\\Flysystem\\MountManager' => __DIR__ . '/..' . '/league/flysystem/src/MountManager.php',
+ 'League\\Flysystem\\NotSupportedException' => __DIR__ . '/..' . '/league/flysystem/src/NotSupportedException.php',
+ 'League\\Flysystem\\PluginInterface' => __DIR__ . '/..' . '/league/flysystem/src/PluginInterface.php',
+ 'League\\Flysystem\\Plugin\\AbstractPlugin' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/AbstractPlugin.php',
+ 'League\\Flysystem\\Plugin\\EmptyDir' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/EmptyDir.php',
+ 'League\\Flysystem\\Plugin\\ForcedCopy' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/ForcedCopy.php',
+ 'League\\Flysystem\\Plugin\\ForcedRename' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/ForcedRename.php',
+ 'League\\Flysystem\\Plugin\\GetWithMetadata' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/GetWithMetadata.php',
+ 'League\\Flysystem\\Plugin\\ListFiles' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/ListFiles.php',
+ 'League\\Flysystem\\Plugin\\ListPaths' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/ListPaths.php',
+ 'League\\Flysystem\\Plugin\\ListWith' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/ListWith.php',
+ 'League\\Flysystem\\Plugin\\PluggableTrait' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/PluggableTrait.php',
+ 'League\\Flysystem\\Plugin\\PluginNotFoundException' => __DIR__ . '/..' . '/league/flysystem/src/Plugin/PluginNotFoundException.php',
+ 'League\\Flysystem\\ReadInterface' => __DIR__ . '/..' . '/league/flysystem/src/ReadInterface.php',
+ 'League\\Flysystem\\RootViolationException' => __DIR__ . '/..' . '/league/flysystem/src/RootViolationException.php',
+ 'League\\Flysystem\\SafeStorage' => __DIR__ . '/..' . '/league/flysystem/src/SafeStorage.php',
+ 'League\\Flysystem\\UnreadableFileException' => __DIR__ . '/..' . '/league/flysystem/src/UnreadableFileException.php',
+ 'League\\Flysystem\\Util' => __DIR__ . '/..' . '/league/flysystem/src/Util.php',
+ 'League\\Flysystem\\Util\\ContentListingFormatter' => __DIR__ . '/..' . '/league/flysystem/src/Util/ContentListingFormatter.php',
+ 'League\\Flysystem\\Util\\MimeType' => __DIR__ . '/..' . '/league/flysystem/src/Util/MimeType.php',
+ 'League\\Flysystem\\Util\\StreamHasher' => __DIR__ . '/..' . '/league/flysystem/src/Util/StreamHasher.php',
+ 'Monolog\\ErrorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ErrorHandler.php',
+ 'Monolog\\Formatter\\ChromePHPFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php',
+ 'Monolog\\Formatter\\ElasticaFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php',
+ 'Monolog\\Formatter\\FlowdockFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php',
+ 'Monolog\\Formatter\\FluentdFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php',
+ 'Monolog\\Formatter\\FormatterInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php',
+ 'Monolog\\Formatter\\GelfMessageFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php',
+ 'Monolog\\Formatter\\HtmlFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php',
+ 'Monolog\\Formatter\\JsonFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php',
+ 'Monolog\\Formatter\\LineFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/LineFormatter.php',
+ 'Monolog\\Formatter\\LogglyFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php',
+ 'Monolog\\Formatter\\LogstashFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php',
+ 'Monolog\\Formatter\\MongoDBFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php',
+ 'Monolog\\Formatter\\NormalizerFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php',
+ 'Monolog\\Formatter\\ScalarFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php',
+ 'Monolog\\Formatter\\WildfireFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php',
+ 'Monolog\\Handler\\AbstractHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AbstractHandler.php',
+ 'Monolog\\Handler\\AbstractProcessingHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php',
+ 'Monolog\\Handler\\AbstractSyslogHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php',
+ 'Monolog\\Handler\\AmqpHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AmqpHandler.php',
+ 'Monolog\\Handler\\BrowserConsoleHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php',
+ 'Monolog\\Handler\\BufferHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/BufferHandler.php',
+ 'Monolog\\Handler\\ChromePHPHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php',
+ 'Monolog\\Handler\\CouchDBHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php',
+ 'Monolog\\Handler\\CubeHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/CubeHandler.php',
+ 'Monolog\\Handler\\Curl\\Util' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/Curl/Util.php',
+ 'Monolog\\Handler\\DeduplicationHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php',
+ 'Monolog\\Handler\\DoctrineCouchDBHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php',
+ 'Monolog\\Handler\\DynamoDbHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php',
+ 'Monolog\\Handler\\ElasticSearchHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php',
+ 'Monolog\\Handler\\ErrorLogHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php',
+ 'Monolog\\Handler\\FilterHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FilterHandler.php',
+ 'Monolog\\Handler\\FingersCrossedHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php',
+ 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php',
+ 'Monolog\\Handler\\FingersCrossed\\ChannelLevelActivationStrategy' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php',
+ 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php',
+ 'Monolog\\Handler\\FirePHPHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php',
+ 'Monolog\\Handler\\FleepHookHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php',
+ 'Monolog\\Handler\\FlowdockHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php',
+ 'Monolog\\Handler\\FormattableHandlerInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php',
+ 'Monolog\\Handler\\FormattableHandlerTrait' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php',
+ 'Monolog\\Handler\\GelfHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/GelfHandler.php',
+ 'Monolog\\Handler\\GroupHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/GroupHandler.php',
+ 'Monolog\\Handler\\HandlerInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/HandlerInterface.php',
+ 'Monolog\\Handler\\HandlerWrapper' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php',
+ 'Monolog\\Handler\\HipChatHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/HipChatHandler.php',
+ 'Monolog\\Handler\\IFTTTHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php',
+ 'Monolog\\Handler\\InsightOpsHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php',
+ 'Monolog\\Handler\\LogEntriesHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php',
+ 'Monolog\\Handler\\LogglyHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/LogglyHandler.php',
+ 'Monolog\\Handler\\MailHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MailHandler.php',
+ 'Monolog\\Handler\\MandrillHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MandrillHandler.php',
+ 'Monolog\\Handler\\MissingExtensionException' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php',
+ 'Monolog\\Handler\\MongoDBHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php',
+ 'Monolog\\Handler\\NativeMailerHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php',
+ 'Monolog\\Handler\\NewRelicHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php',
+ 'Monolog\\Handler\\NullHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/NullHandler.php',
+ 'Monolog\\Handler\\PHPConsoleHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php',
+ 'Monolog\\Handler\\ProcessableHandlerInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php',
+ 'Monolog\\Handler\\ProcessableHandlerTrait' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php',
+ 'Monolog\\Handler\\PsrHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/PsrHandler.php',
+ 'Monolog\\Handler\\PushoverHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/PushoverHandler.php',
+ 'Monolog\\Handler\\RavenHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RavenHandler.php',
+ 'Monolog\\Handler\\RedisHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RedisHandler.php',
+ 'Monolog\\Handler\\RollbarHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RollbarHandler.php',
+ 'Monolog\\Handler\\RotatingFileHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php',
+ 'Monolog\\Handler\\SamplingHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SamplingHandler.php',
+ 'Monolog\\Handler\\SlackHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SlackHandler.php',
+ 'Monolog\\Handler\\SlackWebhookHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php',
+ 'Monolog\\Handler\\Slack\\SlackRecord' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php',
+ 'Monolog\\Handler\\SlackbotHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php',
+ 'Monolog\\Handler\\SocketHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SocketHandler.php',
+ 'Monolog\\Handler\\StreamHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/StreamHandler.php',
+ 'Monolog\\Handler\\SwiftMailerHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php',
+ 'Monolog\\Handler\\SyslogHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SyslogHandler.php',
+ 'Monolog\\Handler\\SyslogUdpHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php',
+ 'Monolog\\Handler\\SyslogUdp\\UdpSocket' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php',
+ 'Monolog\\Handler\\TestHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/TestHandler.php',
+ 'Monolog\\Handler\\WhatFailureGroupHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php',
+ 'Monolog\\Handler\\ZendMonitorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php',
+ 'Monolog\\Logger' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Logger.php',
+ 'Monolog\\Processor\\GitProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/GitProcessor.php',
+ 'Monolog\\Processor\\IntrospectionProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php',
+ 'Monolog\\Processor\\MemoryPeakUsageProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php',
+ 'Monolog\\Processor\\MemoryProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php',
+ 'Monolog\\Processor\\MemoryUsageProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php',
+ 'Monolog\\Processor\\MercurialProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php',
+ 'Monolog\\Processor\\ProcessIdProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php',
+ 'Monolog\\Processor\\ProcessorInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php',
+ 'Monolog\\Processor\\PsrLogMessageProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php',
+ 'Monolog\\Processor\\TagProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/TagProcessor.php',
+ 'Monolog\\Processor\\UidProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/UidProcessor.php',
+ 'Monolog\\Processor\\WebProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/WebProcessor.php',
+ 'Monolog\\Registry' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Registry.php',
+ 'Monolog\\ResettableInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ResettableInterface.php',
+ 'Monolog\\SignalHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/SignalHandler.php',
+ 'Monolog\\Utils' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Utils.php',
+ 'PhpParser\\Autoloader' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Autoloader.php',
+ 'PhpParser\\Builder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder.php',
+ 'PhpParser\\BuilderAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderAbstract.php',
+ 'PhpParser\\BuilderFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php',
+ 'PhpParser\\Builder\\Class_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Class_.php',
+ 'PhpParser\\Builder\\Declaration' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Declaration.php',
+ 'PhpParser\\Builder\\FunctionLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php',
+ 'PhpParser\\Builder\\Function_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Function_.php',
+ 'PhpParser\\Builder\\Interface_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Interface_.php',
+ 'PhpParser\\Builder\\Method' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Method.php',
+ 'PhpParser\\Builder\\Namespace_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php',
+ 'PhpParser\\Builder\\Param' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Param.php',
+ 'PhpParser\\Builder\\Property' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Property.php',
+ 'PhpParser\\Builder\\Trait_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Trait_.php',
+ 'PhpParser\\Builder\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php',
+ 'PhpParser\\Comment' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Comment.php',
+ 'PhpParser\\Comment\\Doc' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Comment/Doc.php',
+ 'PhpParser\\Error' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Error.php',
+ 'PhpParser\\Lexer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer.php',
+ 'PhpParser\\Lexer\\Emulative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php',
+ 'PhpParser\\Node' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node.php',
+ 'PhpParser\\NodeAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php',
+ 'PhpParser\\NodeDumper' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeDumper.php',
+ 'PhpParser\\NodeTraverser' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeTraverser.php',
+ 'PhpParser\\NodeTraverserInterface' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php',
+ 'PhpParser\\NodeVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor.php',
+ 'PhpParser\\NodeVisitorAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php',
+ 'PhpParser\\NodeVisitor\\NameResolver' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php',
+ 'PhpParser\\Node\\Arg' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Arg.php',
+ 'PhpParser\\Node\\Const_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Const_.php',
+ 'PhpParser\\Node\\Expr' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr.php',
+ 'PhpParser\\Node\\Expr\\ArrayDimFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php',
+ 'PhpParser\\Node\\Expr\\ArrayItem' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php',
+ 'PhpParser\\Node\\Expr\\Array_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php',
+ 'PhpParser\\Node\\Expr\\Assign' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php',
+ 'PhpParser\\Node\\Expr\\AssignOp' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\BitwiseAnd' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\BitwiseOr' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\BitwiseXor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Concat' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Div' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Minus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Mod' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Mul' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Plus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\Pow' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\ShiftLeft' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php',
+ 'PhpParser\\Node\\Expr\\AssignOp\\ShiftRight' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php',
+ 'PhpParser\\Node\\Expr\\AssignRef' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BitwiseAnd' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BitwiseOr' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BitwiseXor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BooleanAnd' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\BooleanOr' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Coalesce' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Concat' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Div' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Equal' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Greater' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\GreaterOrEqual' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Identical' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\LogicalAnd' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\LogicalOr' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\LogicalXor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Minus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Mod' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Mul' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\NotEqual' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\NotIdentical' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Plus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Pow' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\ShiftLeft' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\ShiftRight' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Smaller' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\SmallerOrEqual' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php',
+ 'PhpParser\\Node\\Expr\\BinaryOp\\Spaceship' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php',
+ 'PhpParser\\Node\\Expr\\BitwiseNot' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php',
+ 'PhpParser\\Node\\Expr\\BooleanNot' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php',
+ 'PhpParser\\Node\\Expr\\Cast' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Array_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Bool_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Double' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Int_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Object_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\String_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php',
+ 'PhpParser\\Node\\Expr\\Cast\\Unset_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php',
+ 'PhpParser\\Node\\Expr\\ClassConstFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php',
+ 'PhpParser\\Node\\Expr\\Clone_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php',
+ 'PhpParser\\Node\\Expr\\Closure' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php',
+ 'PhpParser\\Node\\Expr\\ClosureUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php',
+ 'PhpParser\\Node\\Expr\\ConstFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php',
+ 'PhpParser\\Node\\Expr\\Empty_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php',
+ 'PhpParser\\Node\\Expr\\ErrorSuppress' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php',
+ 'PhpParser\\Node\\Expr\\Eval_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php',
+ 'PhpParser\\Node\\Expr\\Exit_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php',
+ 'PhpParser\\Node\\Expr\\FuncCall' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php',
+ 'PhpParser\\Node\\Expr\\Include_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php',
+ 'PhpParser\\Node\\Expr\\Instanceof_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php',
+ 'PhpParser\\Node\\Expr\\Isset_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php',
+ 'PhpParser\\Node\\Expr\\List_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php',
+ 'PhpParser\\Node\\Expr\\MethodCall' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php',
+ 'PhpParser\\Node\\Expr\\New_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php',
+ 'PhpParser\\Node\\Expr\\PostDec' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php',
+ 'PhpParser\\Node\\Expr\\PostInc' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php',
+ 'PhpParser\\Node\\Expr\\PreDec' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php',
+ 'PhpParser\\Node\\Expr\\PreInc' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php',
+ 'PhpParser\\Node\\Expr\\Print_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php',
+ 'PhpParser\\Node\\Expr\\PropertyFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php',
+ 'PhpParser\\Node\\Expr\\ShellExec' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php',
+ 'PhpParser\\Node\\Expr\\StaticCall' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php',
+ 'PhpParser\\Node\\Expr\\StaticPropertyFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php',
+ 'PhpParser\\Node\\Expr\\Ternary' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php',
+ 'PhpParser\\Node\\Expr\\UnaryMinus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php',
+ 'PhpParser\\Node\\Expr\\UnaryPlus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php',
+ 'PhpParser\\Node\\Expr\\Variable' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php',
+ 'PhpParser\\Node\\Expr\\YieldFrom' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php',
+ 'PhpParser\\Node\\Expr\\Yield_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php',
+ 'PhpParser\\Node\\FunctionLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php',
+ 'PhpParser\\Node\\Name' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name.php',
+ 'PhpParser\\Node\\Name\\FullyQualified' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php',
+ 'PhpParser\\Node\\Name\\Relative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php',
+ 'PhpParser\\Node\\Param' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Param.php',
+ 'PhpParser\\Node\\Scalar' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar.php',
+ 'PhpParser\\Node\\Scalar\\DNumber' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php',
+ 'PhpParser\\Node\\Scalar\\Encapsed' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php',
+ 'PhpParser\\Node\\Scalar\\EncapsedStringPart' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php',
+ 'PhpParser\\Node\\Scalar\\LNumber' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Class_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Class_.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Dir' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\File' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Function_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Line' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Method' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Namespace_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php',
+ 'PhpParser\\Node\\Scalar\\MagicConst\\Trait_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php',
+ 'PhpParser\\Node\\Scalar\\String_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php',
+ 'PhpParser\\Node\\Stmt' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt.php',
+ 'PhpParser\\Node\\Stmt\\Break_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php',
+ 'PhpParser\\Node\\Stmt\\Case_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php',
+ 'PhpParser\\Node\\Stmt\\Catch_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php',
+ 'PhpParser\\Node\\Stmt\\ClassConst' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php',
+ 'PhpParser\\Node\\Stmt\\ClassLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php',
+ 'PhpParser\\Node\\Stmt\\ClassMethod' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php',
+ 'PhpParser\\Node\\Stmt\\Class_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php',
+ 'PhpParser\\Node\\Stmt\\Const_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php',
+ 'PhpParser\\Node\\Stmt\\Continue_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php',
+ 'PhpParser\\Node\\Stmt\\DeclareDeclare' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php',
+ 'PhpParser\\Node\\Stmt\\Declare_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php',
+ 'PhpParser\\Node\\Stmt\\Do_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php',
+ 'PhpParser\\Node\\Stmt\\Echo_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php',
+ 'PhpParser\\Node\\Stmt\\ElseIf_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php',
+ 'PhpParser\\Node\\Stmt\\Else_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php',
+ 'PhpParser\\Node\\Stmt\\For_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php',
+ 'PhpParser\\Node\\Stmt\\Foreach_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php',
+ 'PhpParser\\Node\\Stmt\\Function_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php',
+ 'PhpParser\\Node\\Stmt\\Global_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php',
+ 'PhpParser\\Node\\Stmt\\Goto_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php',
+ 'PhpParser\\Node\\Stmt\\GroupUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php',
+ 'PhpParser\\Node\\Stmt\\HaltCompiler' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php',
+ 'PhpParser\\Node\\Stmt\\If_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php',
+ 'PhpParser\\Node\\Stmt\\InlineHTML' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php',
+ 'PhpParser\\Node\\Stmt\\Interface_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php',
+ 'PhpParser\\Node\\Stmt\\Label' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php',
+ 'PhpParser\\Node\\Stmt\\Namespace_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php',
+ 'PhpParser\\Node\\Stmt\\Nop' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php',
+ 'PhpParser\\Node\\Stmt\\Property' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php',
+ 'PhpParser\\Node\\Stmt\\PropertyProperty' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php',
+ 'PhpParser\\Node\\Stmt\\Return_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php',
+ 'PhpParser\\Node\\Stmt\\StaticVar' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php',
+ 'PhpParser\\Node\\Stmt\\Static_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php',
+ 'PhpParser\\Node\\Stmt\\Switch_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php',
+ 'PhpParser\\Node\\Stmt\\Throw_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php',
+ 'PhpParser\\Node\\Stmt\\TraitUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php',
+ 'PhpParser\\Node\\Stmt\\TraitUseAdaptation' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php',
+ 'PhpParser\\Node\\Stmt\\TraitUseAdaptation\\Alias' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php',
+ 'PhpParser\\Node\\Stmt\\TraitUseAdaptation\\Precedence' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php',
+ 'PhpParser\\Node\\Stmt\\Trait_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php',
+ 'PhpParser\\Node\\Stmt\\TryCatch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php',
+ 'PhpParser\\Node\\Stmt\\Unset_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php',
+ 'PhpParser\\Node\\Stmt\\UseUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php',
+ 'PhpParser\\Node\\Stmt\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php',
+ 'PhpParser\\Node\\Stmt\\While_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php',
+ 'PhpParser\\Parser' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser.php',
+ 'PhpParser\\ParserAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php',
+ 'PhpParser\\ParserFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ParserFactory.php',
+ 'PhpParser\\Parser\\Multiple' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser/Multiple.php',
+ 'PhpParser\\Parser\\Php5' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser/Php5.php',
+ 'PhpParser\\Parser\\Php7' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser/Php7.php',
+ 'PhpParser\\Parser\\Tokens' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php',
+ 'PhpParser\\PrettyPrinterAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php',
+ 'PhpParser\\PrettyPrinter\\Standard' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php',
+ 'PhpParser\\Serializer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Serializer.php',
+ 'PhpParser\\Serializer\\XML' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Serializer/XML.php',
+ 'PhpParser\\Unserializer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Unserializer.php',
+ 'PhpParser\\Unserializer\\XML' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Unserializer/XML.php',
+ 'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php',
+ 'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php',
+ 'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php',
+ 'Psr\\Log\\LoggerAwareInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareInterface.php',
+ 'Psr\\Log\\LoggerAwareTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareTrait.php',
+ 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
+ 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
+ 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
+ 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
+ 'Psy\\Autoloader' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Autoloader.php',
+ 'Psy\\CodeCleaner' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner.php',
+ 'Psy\\CodeCleaner\\AbstractClassPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/AbstractClassPass.php',
+ 'Psy\\CodeCleaner\\AssignThisVariablePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/AssignThisVariablePass.php',
+ 'Psy\\CodeCleaner\\CallTimePassByReferencePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/CallTimePassByReferencePass.php',
+ 'Psy\\CodeCleaner\\CalledClassPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/CalledClassPass.php',
+ 'Psy\\CodeCleaner\\CodeCleanerPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/CodeCleanerPass.php',
+ 'Psy\\CodeCleaner\\ExitPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ExitPass.php',
+ 'Psy\\CodeCleaner\\FunctionReturnInWriteContextPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php',
+ 'Psy\\CodeCleaner\\ImplicitReturnPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ImplicitReturnPass.php',
+ 'Psy\\CodeCleaner\\InstanceOfPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php',
+ 'Psy\\CodeCleaner\\LeavePsyshAlonePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/LeavePsyshAlonePass.php',
+ 'Psy\\CodeCleaner\\LegacyEmptyPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/LegacyEmptyPass.php',
+ 'Psy\\CodeCleaner\\MagicConstantsPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/MagicConstantsPass.php',
+ 'Psy\\CodeCleaner\\NamespaceAwarePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/NamespaceAwarePass.php',
+ 'Psy\\CodeCleaner\\NamespacePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/NamespacePass.php',
+ 'Psy\\CodeCleaner\\StaticConstructorPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php',
+ 'Psy\\CodeCleaner\\StrictTypesPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php',
+ 'Psy\\CodeCleaner\\UseStatementPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/UseStatementPass.php',
+ 'Psy\\CodeCleaner\\ValidClassNamePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ValidClassNamePass.php',
+ 'Psy\\CodeCleaner\\ValidConstantPass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ValidConstantPass.php',
+ 'Psy\\CodeCleaner\\ValidFunctionNamePass' => __DIR__ . '/..' . '/psy/psysh/src/Psy/CodeCleaner/ValidFunctionNamePass.php',
+ 'Psy\\Command\\BufferCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/BufferCommand.php',
+ 'Psy\\Command\\ClearCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ClearCommand.php',
+ 'Psy\\Command\\Command' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/Command.php',
+ 'Psy\\Command\\DocCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/DocCommand.php',
+ 'Psy\\Command\\DumpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/DumpCommand.php',
+ 'Psy\\Command\\ExitCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ExitCommand.php',
+ 'Psy\\Command\\HelpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/HelpCommand.php',
+ 'Psy\\Command\\HistoryCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/HistoryCommand.php',
+ 'Psy\\Command\\ListCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand.php',
+ 'Psy\\Command\\ListCommand\\ClassConstantEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/ClassConstantEnumerator.php',
+ 'Psy\\Command\\ListCommand\\ClassEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/ClassEnumerator.php',
+ 'Psy\\Command\\ListCommand\\ConstantEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/ConstantEnumerator.php',
+ 'Psy\\Command\\ListCommand\\Enumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/Enumerator.php',
+ 'Psy\\Command\\ListCommand\\FunctionEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/FunctionEnumerator.php',
+ 'Psy\\Command\\ListCommand\\GlobalVariableEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/GlobalVariableEnumerator.php',
+ 'Psy\\Command\\ListCommand\\InterfaceEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/InterfaceEnumerator.php',
+ 'Psy\\Command\\ListCommand\\MethodEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/MethodEnumerator.php',
+ 'Psy\\Command\\ListCommand\\PropertyEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/PropertyEnumerator.php',
+ 'Psy\\Command\\ListCommand\\TraitEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/TraitEnumerator.php',
+ 'Psy\\Command\\ListCommand\\VariableEnumerator' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ListCommand/VariableEnumerator.php',
+ 'Psy\\Command\\ParseCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ParseCommand.php',
+ 'Psy\\Command\\PsyVersionCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/PsyVersionCommand.php',
+ 'Psy\\Command\\ReflectingCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ReflectingCommand.php',
+ 'Psy\\Command\\ShowCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ShowCommand.php',
+ 'Psy\\Command\\ThrowUpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/ThrowUpCommand.php',
+ 'Psy\\Command\\TraceCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/TraceCommand.php',
+ 'Psy\\Command\\WhereamiCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/WhereamiCommand.php',
+ 'Psy\\Command\\WtfCommand' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Command/WtfCommand.php',
+ 'Psy\\Compiler' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Compiler.php',
+ 'Psy\\ConfigPaths' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ConfigPaths.php',
+ 'Psy\\Configuration' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Configuration.php',
+ 'Psy\\ConsoleColorFactory' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ConsoleColorFactory.php',
+ 'Psy\\Context' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Context.php',
+ 'Psy\\ContextAware' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ContextAware.php',
+ 'Psy\\Exception\\BreakException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/BreakException.php',
+ 'Psy\\Exception\\DeprecatedException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/DeprecatedException.php',
+ 'Psy\\Exception\\ErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/ErrorException.php',
+ 'Psy\\Exception\\Exception' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/Exception.php',
+ 'Psy\\Exception\\FatalErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/FatalErrorException.php',
+ 'Psy\\Exception\\ParseErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/ParseErrorException.php',
+ 'Psy\\Exception\\RuntimeException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/RuntimeException.php',
+ 'Psy\\Exception\\ThrowUpException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/ThrowUpException.php',
+ 'Psy\\Exception\\TypeErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Exception/TypeErrorException.php',
+ 'Psy\\ExecutionLoop\\ForkingLoop' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ExecutionLoop/ForkingLoop.php',
+ 'Psy\\ExecutionLoop\\Loop' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ExecutionLoop/Loop.php',
+ 'Psy\\Formatter\\CodeFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/CodeFormatter.php',
+ 'Psy\\Formatter\\DocblockFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/DocblockFormatter.php',
+ 'Psy\\Formatter\\Formatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/Formatter.php',
+ 'Psy\\Formatter\\SignatureFormatter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Formatter/SignatureFormatter.php',
+ 'Psy\\Output\\OutputPager' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/OutputPager.php',
+ 'Psy\\Output\\PassthruPager' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/PassthruPager.php',
+ 'Psy\\Output\\ProcOutputPager' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/ProcOutputPager.php',
+ 'Psy\\Output\\ShellOutput' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Output/ShellOutput.php',
+ 'Psy\\ParserFactory' => __DIR__ . '/..' . '/psy/psysh/src/Psy/ParserFactory.php',
+ 'Psy\\Readline\\GNUReadline' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/GNUReadline.php',
+ 'Psy\\Readline\\Libedit' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/Libedit.php',
+ 'Psy\\Readline\\Readline' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/Readline.php',
+ 'Psy\\Readline\\Transient' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Readline/Transient.php',
+ 'Psy\\Reflection\\ReflectionConstant' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Reflection/ReflectionConstant.php',
+ 'Psy\\Shell' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Shell.php',
+ 'Psy\\TabCompletion\\AutoCompleter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/AutoCompleter.php',
+ 'Psy\\TabCompletion\\Matcher\\AbstractContextAwareMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractContextAwareMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\AbstractMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/AbstractMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\ClassAttributesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassAttributesMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\ClassMethodsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassMethodsMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\ClassNamesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ClassNamesMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\CommandsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/CommandsMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\ConstantsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ConstantsMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\FunctionsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/FunctionsMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\KeywordsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/KeywordsMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\MongoClientMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/MongoClientMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\MongoDatabaseMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/MongoDatabaseMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\ObjectAttributesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectAttributesMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\ObjectMethodsMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/ObjectMethodsMatcher.php',
+ 'Psy\\TabCompletion\\Matcher\\VariablesMatcher' => __DIR__ . '/..' . '/psy/psysh/src/Psy/TabCompletion/Matcher/VariablesMatcher.php',
+ 'Psy\\Util\\Docblock' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Docblock.php',
+ 'Psy\\Util\\Json' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Json.php',
+ 'Psy\\Util\\Mirror' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Mirror.php',
+ 'Psy\\Util\\Str' => __DIR__ . '/..' . '/psy/psysh/src/Psy/Util/Str.php',
+ 'Psy\\VarDumper\\Cloner' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/Cloner.php',
+ 'Psy\\VarDumper\\Dumper' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/Dumper.php',
+ 'Psy\\VarDumper\\Presenter' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/Presenter.php',
+ 'Psy\\VarDumper\\PresenterAware' => __DIR__ . '/..' . '/psy/psysh/src/Psy/VarDumper/PresenterAware.php',
+ 'SessionHandlerInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php',
+ 'Stringy\\StaticStringy' => __DIR__ . '/..' . '/danielstjules/stringy/src/StaticStringy.php',
+ 'Stringy\\Stringy' => __DIR__ . '/..' . '/danielstjules/stringy/src/Stringy.php',
+ 'SuperClosure\\Analyzer\\AstAnalyzer' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Analyzer/AstAnalyzer.php',
+ 'SuperClosure\\Analyzer\\ClosureAnalyzer' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Analyzer/ClosureAnalyzer.php',
+ 'SuperClosure\\Analyzer\\Token' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Analyzer/Token.php',
+ 'SuperClosure\\Analyzer\\TokenAnalyzer' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Analyzer/TokenAnalyzer.php',
+ 'SuperClosure\\Analyzer\\Visitor\\ClosureLocatorVisitor' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Analyzer/Visitor/ClosureLocatorVisitor.php',
+ 'SuperClosure\\Analyzer\\Visitor\\MagicConstantVisitor' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Analyzer/Visitor/MagicConstantVisitor.php',
+ 'SuperClosure\\Analyzer\\Visitor\\ThisDetectorVisitor' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Analyzer/Visitor/ThisDetectorVisitor.php',
+ 'SuperClosure\\Exception\\ClosureAnalysisException' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Exception/ClosureAnalysisException.php',
+ 'SuperClosure\\Exception\\ClosureSerializationException' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Exception/ClosureSerializationException.php',
+ 'SuperClosure\\Exception\\ClosureUnserializationException' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Exception/ClosureUnserializationException.php',
+ 'SuperClosure\\Exception\\SuperClosureException' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Exception/SuperClosureException.php',
+ 'SuperClosure\\SerializableClosure' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/SerializableClosure.php',
+ 'SuperClosure\\Serializer' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/Serializer.php',
+ 'SuperClosure\\SerializerInterface' => __DIR__ . '/..' . '/jeremeamia/superclosure/src/SerializerInterface.php',
+ 'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
+ 'Symfony\\Component\\Console\\Command\\Command' => __DIR__ . '/..' . '/symfony/console/Command/Command.php',
+ 'Symfony\\Component\\Console\\Command\\HelpCommand' => __DIR__ . '/..' . '/symfony/console/Command/HelpCommand.php',
+ 'Symfony\\Component\\Console\\Command\\ListCommand' => __DIR__ . '/..' . '/symfony/console/Command/ListCommand.php',
+ 'Symfony\\Component\\Console\\ConsoleEvents' => __DIR__ . '/..' . '/symfony/console/ConsoleEvents.php',
+ 'Symfony\\Component\\Console\\Descriptor\\ApplicationDescription' => __DIR__ . '/..' . '/symfony/console/Descriptor/ApplicationDescription.php',
+ 'Symfony\\Component\\Console\\Descriptor\\Descriptor' => __DIR__ . '/..' . '/symfony/console/Descriptor/Descriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\DescriptorInterface' => __DIR__ . '/..' . '/symfony/console/Descriptor/DescriptorInterface.php',
+ 'Symfony\\Component\\Console\\Descriptor\\JsonDescriptor' => __DIR__ . '/..' . '/symfony/console/Descriptor/JsonDescriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\MarkdownDescriptor' => __DIR__ . '/..' . '/symfony/console/Descriptor/MarkdownDescriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\TextDescriptor' => __DIR__ . '/..' . '/symfony/console/Descriptor/TextDescriptor.php',
+ 'Symfony\\Component\\Console\\Descriptor\\XmlDescriptor' => __DIR__ . '/..' . '/symfony/console/Descriptor/XmlDescriptor.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleCommandEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleCommandEvent.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleEvent.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleExceptionEvent.php',
+ 'Symfony\\Component\\Console\\Event\\ConsoleTerminateEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleTerminateEvent.php',
+ 'Symfony\\Component\\Console\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/console/Exception/RuntimeException.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatter.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterInterface.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyle' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterStyle.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyleInterface' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterStyleInterface.php',
+ 'Symfony\\Component\\Console\\Formatter\\OutputFormatterStyleStack' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterStyleStack.php',
+ 'Symfony\\Component\\Console\\Helper\\DebugFormatterHelper' => __DIR__ . '/..' . '/symfony/console/Helper/DebugFormatterHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\DescriptorHelper' => __DIR__ . '/..' . '/symfony/console/Helper/DescriptorHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\DialogHelper' => __DIR__ . '/..' . '/symfony/console/Helper/DialogHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\FormatterHelper' => __DIR__ . '/..' . '/symfony/console/Helper/FormatterHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\Helper' => __DIR__ . '/..' . '/symfony/console/Helper/Helper.php',
+ 'Symfony\\Component\\Console\\Helper\\HelperInterface' => __DIR__ . '/..' . '/symfony/console/Helper/HelperInterface.php',
+ 'Symfony\\Component\\Console\\Helper\\HelperSet' => __DIR__ . '/..' . '/symfony/console/Helper/HelperSet.php',
+ 'Symfony\\Component\\Console\\Helper\\InputAwareHelper' => __DIR__ . '/..' . '/symfony/console/Helper/InputAwareHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\ProcessHelper' => __DIR__ . '/..' . '/symfony/console/Helper/ProcessHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\ProgressBar' => __DIR__ . '/..' . '/symfony/console/Helper/ProgressBar.php',
+ 'Symfony\\Component\\Console\\Helper\\ProgressHelper' => __DIR__ . '/..' . '/symfony/console/Helper/ProgressHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\QuestionHelper' => __DIR__ . '/..' . '/symfony/console/Helper/QuestionHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => __DIR__ . '/..' . '/symfony/console/Helper/SymfonyQuestionHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\Table' => __DIR__ . '/..' . '/symfony/console/Helper/Table.php',
+ 'Symfony\\Component\\Console\\Helper\\TableCell' => __DIR__ . '/..' . '/symfony/console/Helper/TableCell.php',
+ 'Symfony\\Component\\Console\\Helper\\TableHelper' => __DIR__ . '/..' . '/symfony/console/Helper/TableHelper.php',
+ 'Symfony\\Component\\Console\\Helper\\TableSeparator' => __DIR__ . '/..' . '/symfony/console/Helper/TableSeparator.php',
+ 'Symfony\\Component\\Console\\Helper\\TableStyle' => __DIR__ . '/..' . '/symfony/console/Helper/TableStyle.php',
+ 'Symfony\\Component\\Console\\Input\\ArgvInput' => __DIR__ . '/..' . '/symfony/console/Input/ArgvInput.php',
+ 'Symfony\\Component\\Console\\Input\\ArrayInput' => __DIR__ . '/..' . '/symfony/console/Input/ArrayInput.php',
+ 'Symfony\\Component\\Console\\Input\\Input' => __DIR__ . '/..' . '/symfony/console/Input/Input.php',
+ 'Symfony\\Component\\Console\\Input\\InputArgument' => __DIR__ . '/..' . '/symfony/console/Input/InputArgument.php',
+ 'Symfony\\Component\\Console\\Input\\InputAwareInterface' => __DIR__ . '/..' . '/symfony/console/Input/InputAwareInterface.php',
+ 'Symfony\\Component\\Console\\Input\\InputDefinition' => __DIR__ . '/..' . '/symfony/console/Input/InputDefinition.php',
+ 'Symfony\\Component\\Console\\Input\\InputInterface' => __DIR__ . '/..' . '/symfony/console/Input/InputInterface.php',
+ 'Symfony\\Component\\Console\\Input\\InputOption' => __DIR__ . '/..' . '/symfony/console/Input/InputOption.php',
+ 'Symfony\\Component\\Console\\Input\\StringInput' => __DIR__ . '/..' . '/symfony/console/Input/StringInput.php',
+ 'Symfony\\Component\\Console\\Logger\\ConsoleLogger' => __DIR__ . '/..' . '/symfony/console/Logger/ConsoleLogger.php',
+ 'Symfony\\Component\\Console\\Output\\BufferedOutput' => __DIR__ . '/..' . '/symfony/console/Output/BufferedOutput.php',
+ 'Symfony\\Component\\Console\\Output\\ConsoleOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutput.php',
+ 'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutputInterface.php',
+ 'Symfony\\Component\\Console\\Output\\NullOutput' => __DIR__ . '/..' . '/symfony/console/Output/NullOutput.php',
+ 'Symfony\\Component\\Console\\Output\\Output' => __DIR__ . '/..' . '/symfony/console/Output/Output.php',
+ 'Symfony\\Component\\Console\\Output\\OutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/OutputInterface.php',
+ 'Symfony\\Component\\Console\\Output\\StreamOutput' => __DIR__ . '/..' . '/symfony/console/Output/StreamOutput.php',
+ 'Symfony\\Component\\Console\\Question\\ChoiceQuestion' => __DIR__ . '/..' . '/symfony/console/Question/ChoiceQuestion.php',
+ 'Symfony\\Component\\Console\\Question\\ConfirmationQuestion' => __DIR__ . '/..' . '/symfony/console/Question/ConfirmationQuestion.php',
+ 'Symfony\\Component\\Console\\Question\\Question' => __DIR__ . '/..' . '/symfony/console/Question/Question.php',
+ 'Symfony\\Component\\Console\\Shell' => __DIR__ . '/..' . '/symfony/console/Shell.php',
+ 'Symfony\\Component\\Console\\Style\\OutputStyle' => __DIR__ . '/..' . '/symfony/console/Style/OutputStyle.php',
+ 'Symfony\\Component\\Console\\Style\\StyleInterface' => __DIR__ . '/..' . '/symfony/console/Style/StyleInterface.php',
+ 'Symfony\\Component\\Console\\Style\\SymfonyStyle' => __DIR__ . '/..' . '/symfony/console/Style/SymfonyStyle.php',
+ 'Symfony\\Component\\Console\\Tester\\ApplicationTester' => __DIR__ . '/..' . '/symfony/console/Tester/ApplicationTester.php',
+ 'Symfony\\Component\\Console\\Tester\\CommandTester' => __DIR__ . '/..' . '/symfony/console/Tester/CommandTester.php',
+ 'Symfony\\Component\\CssSelector\\CssSelector' => __DIR__ . '/..' . '/symfony/css-selector/CssSelector.php',
+ 'Symfony\\Component\\CssSelector\\CssSelectorConverter' => __DIR__ . '/..' . '/symfony/css-selector/CssSelectorConverter.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExpressionErrorException.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\InternalErrorException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/InternalErrorException.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\ParseException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ParseException.php',
+ 'Symfony\\Component\\CssSelector\\Exception\\SyntaxErrorException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/SyntaxErrorException.php',
+ 'Symfony\\Component\\CssSelector\\Node\\AbstractNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/AbstractNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\AttributeNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/AttributeNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\ClassNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/ClassNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\CombinedSelectorNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/CombinedSelectorNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\ElementNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/ElementNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\FunctionNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/FunctionNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\HashNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/HashNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\NegationNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/NegationNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\NodeInterface' => __DIR__ . '/..' . '/symfony/css-selector/Node/NodeInterface.php',
+ 'Symfony\\Component\\CssSelector\\Node\\PseudoNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/PseudoNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\SelectorNode' => __DIR__ . '/..' . '/symfony/css-selector/Node/SelectorNode.php',
+ 'Symfony\\Component\\CssSelector\\Node\\Specificity' => __DIR__ . '/..' . '/symfony/css-selector/Node/Specificity.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\CommentHandler' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Handler/CommentHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\HandlerInterface' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Handler/HandlerInterface.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\HashHandler' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Handler/HashHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\IdentifierHandler' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Handler/IdentifierHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\NumberHandler' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Handler/NumberHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\StringHandler' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Handler/StringHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Handler\\WhitespaceHandler' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Handler/WhitespaceHandler.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Parser' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Parser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\ParserInterface' => __DIR__ . '/..' . '/symfony/css-selector/Parser/ParserInterface.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Reader' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Reader.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\ClassParser' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Shortcut/ClassParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\ElementParser' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Shortcut/ElementParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\EmptyStringParser' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Shortcut\\HashParser' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Shortcut/HashParser.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Token' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Token.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\TokenStream' => __DIR__ . '/..' . '/symfony/css-selector/Parser/TokenStream.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Tokenizer\\Tokenizer' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Tokenizer/Tokenizer.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Tokenizer\\TokenizerEscaping' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php',
+ 'Symfony\\Component\\CssSelector\\Parser\\Tokenizer\\TokenizerPatterns' => __DIR__ . '/..' . '/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\AbstractExtension' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/AbstractExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\AttributeMatchingExtension' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\CombinationExtension' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/CombinationExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\ExtensionInterface' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/ExtensionInterface.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\FunctionExtension' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/FunctionExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\HtmlExtension' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/HtmlExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\NodeExtension' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/NodeExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Extension\\PseudoClassExtension' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Extension/PseudoClassExtension.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\Translator' => __DIR__ . '/..' . '/symfony/css-selector/XPath/Translator.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\TranslatorInterface' => __DIR__ . '/..' . '/symfony/css-selector/XPath/TranslatorInterface.php',
+ 'Symfony\\Component\\CssSelector\\XPath\\XPathExpr' => __DIR__ . '/..' . '/symfony/css-selector/XPath/XPathExpr.php',
+ 'Symfony\\Component\\Debug\\Debug' => __DIR__ . '/..' . '/symfony/debug/Debug.php',
+ 'Symfony\\Component\\Debug\\DebugClassLoader' => __DIR__ . '/..' . '/symfony/debug/DebugClassLoader.php',
+ 'Symfony\\Component\\Debug\\ErrorHandler' => __DIR__ . '/..' . '/symfony/debug/ErrorHandler.php',
+ 'Symfony\\Component\\Debug\\ErrorHandlerCanary' => __DIR__ . '/..' . '/symfony/debug/ErrorHandler.php',
+ 'Symfony\\Component\\Debug\\ExceptionHandler' => __DIR__ . '/..' . '/symfony/debug/ExceptionHandler.php',
+ 'Symfony\\Component\\Debug\\Exception\\ClassNotFoundException' => __DIR__ . '/..' . '/symfony/debug/Exception/ClassNotFoundException.php',
+ 'Symfony\\Component\\Debug\\Exception\\ContextErrorException' => __DIR__ . '/..' . '/symfony/debug/Exception/ContextErrorException.php',
+ 'Symfony\\Component\\Debug\\Exception\\DummyException' => __DIR__ . '/..' . '/symfony/debug/Exception/DummyException.php',
+ 'Symfony\\Component\\Debug\\Exception\\FatalErrorException' => __DIR__ . '/..' . '/symfony/debug/Exception/FatalErrorException.php',
+ 'Symfony\\Component\\Debug\\Exception\\FatalThrowableError' => __DIR__ . '/..' . '/symfony/debug/Exception/FatalThrowableError.php',
+ 'Symfony\\Component\\Debug\\Exception\\FlattenException' => __DIR__ . '/..' . '/symfony/debug/Exception/FlattenException.php',
+ 'Symfony\\Component\\Debug\\Exception\\OutOfMemoryException' => __DIR__ . '/..' . '/symfony/debug/Exception/OutOfMemoryException.php',
+ 'Symfony\\Component\\Debug\\Exception\\UndefinedFunctionException' => __DIR__ . '/..' . '/symfony/debug/Exception/UndefinedFunctionException.php',
+ 'Symfony\\Component\\Debug\\Exception\\UndefinedMethodException' => __DIR__ . '/..' . '/symfony/debug/Exception/UndefinedMethodException.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\ClassNotFoundFatalErrorHandler' => __DIR__ . '/..' . '/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\FatalErrorHandlerInterface' => __DIR__ . '/..' . '/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedFunctionFatalErrorHandler' => __DIR__ . '/..' . '/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php',
+ 'Symfony\\Component\\Debug\\FatalErrorHandler\\UndefinedMethodFatalErrorHandler' => __DIR__ . '/..' . '/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php',
+ 'Symfony\\Component\\DomCrawler\\Crawler' => __DIR__ . '/..' . '/symfony/dom-crawler/Crawler.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\ChoiceFormField' => __DIR__ . '/..' . '/symfony/dom-crawler/Field/ChoiceFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\FileFormField' => __DIR__ . '/..' . '/symfony/dom-crawler/Field/FileFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\FormField' => __DIR__ . '/..' . '/symfony/dom-crawler/Field/FormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\InputFormField' => __DIR__ . '/..' . '/symfony/dom-crawler/Field/InputFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Field\\TextareaFormField' => __DIR__ . '/..' . '/symfony/dom-crawler/Field/TextareaFormField.php',
+ 'Symfony\\Component\\DomCrawler\\Form' => __DIR__ . '/..' . '/symfony/dom-crawler/Form.php',
+ 'Symfony\\Component\\DomCrawler\\FormFieldRegistry' => __DIR__ . '/..' . '/symfony/dom-crawler/FormFieldRegistry.php',
+ 'Symfony\\Component\\DomCrawler\\Link' => __DIR__ . '/..' . '/symfony/dom-crawler/Link.php',
+ 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher' => __DIR__ . '/..' . '/symfony/event-dispatcher/ContainerAwareEventDispatcher.php',
+ 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => __DIR__ . '/..' . '/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php',
+ 'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface' => __DIR__ . '/..' . '/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php',
+ 'Symfony\\Component\\EventDispatcher\\Debug\\WrappedListener' => __DIR__ . '/..' . '/symfony/event-dispatcher/Debug/WrappedListener.php',
+ 'Symfony\\Component\\EventDispatcher\\DependencyInjection\\RegisterListenersPass' => __DIR__ . '/..' . '/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php',
+ 'Symfony\\Component\\EventDispatcher\\Event' => __DIR__ . '/..' . '/symfony/event-dispatcher/Event.php',
+ 'Symfony\\Component\\EventDispatcher\\EventDispatcher' => __DIR__ . '/..' . '/symfony/event-dispatcher/EventDispatcher.php',
+ 'Symfony\\Component\\EventDispatcher\\EventDispatcherInterface' => __DIR__ . '/..' . '/symfony/event-dispatcher/EventDispatcherInterface.php',
+ 'Symfony\\Component\\EventDispatcher\\EventSubscriberInterface' => __DIR__ . '/..' . '/symfony/event-dispatcher/EventSubscriberInterface.php',
+ 'Symfony\\Component\\EventDispatcher\\GenericEvent' => __DIR__ . '/..' . '/symfony/event-dispatcher/GenericEvent.php',
+ 'Symfony\\Component\\EventDispatcher\\ImmutableEventDispatcher' => __DIR__ . '/..' . '/symfony/event-dispatcher/ImmutableEventDispatcher.php',
+ 'Symfony\\Component\\Finder\\Adapter\\AbstractAdapter' => __DIR__ . '/..' . '/symfony/finder/Adapter/AbstractAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\AbstractFindAdapter' => __DIR__ . '/..' . '/symfony/finder/Adapter/AbstractFindAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\AdapterInterface' => __DIR__ . '/..' . '/symfony/finder/Adapter/AdapterInterface.php',
+ 'Symfony\\Component\\Finder\\Adapter\\BsdFindAdapter' => __DIR__ . '/..' . '/symfony/finder/Adapter/BsdFindAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\GnuFindAdapter' => __DIR__ . '/..' . '/symfony/finder/Adapter/GnuFindAdapter.php',
+ 'Symfony\\Component\\Finder\\Adapter\\PhpAdapter' => __DIR__ . '/..' . '/symfony/finder/Adapter/PhpAdapter.php',
+ 'Symfony\\Component\\Finder\\Comparator\\Comparator' => __DIR__ . '/..' . '/symfony/finder/Comparator/Comparator.php',
+ 'Symfony\\Component\\Finder\\Comparator\\DateComparator' => __DIR__ . '/..' . '/symfony/finder/Comparator/DateComparator.php',
+ 'Symfony\\Component\\Finder\\Comparator\\NumberComparator' => __DIR__ . '/..' . '/symfony/finder/Comparator/NumberComparator.php',
+ 'Symfony\\Component\\Finder\\Exception\\AccessDeniedException' => __DIR__ . '/..' . '/symfony/finder/Exception/AccessDeniedException.php',
+ 'Symfony\\Component\\Finder\\Exception\\AdapterFailureException' => __DIR__ . '/..' . '/symfony/finder/Exception/AdapterFailureException.php',
+ 'Symfony\\Component\\Finder\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/finder/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Finder\\Exception\\OperationNotPermitedException' => __DIR__ . '/..' . '/symfony/finder/Exception/OperationNotPermitedException.php',
+ 'Symfony\\Component\\Finder\\Exception\\ShellCommandFailureException' => __DIR__ . '/..' . '/symfony/finder/Exception/ShellCommandFailureException.php',
+ 'Symfony\\Component\\Finder\\Expression\\Expression' => __DIR__ . '/..' . '/symfony/finder/Expression/Expression.php',
+ 'Symfony\\Component\\Finder\\Expression\\Glob' => __DIR__ . '/..' . '/symfony/finder/Expression/Glob.php',
+ 'Symfony\\Component\\Finder\\Expression\\Regex' => __DIR__ . '/..' . '/symfony/finder/Expression/Regex.php',
+ 'Symfony\\Component\\Finder\\Expression\\ValueInterface' => __DIR__ . '/..' . '/symfony/finder/Expression/ValueInterface.php',
+ 'Symfony\\Component\\Finder\\Finder' => __DIR__ . '/..' . '/symfony/finder/Finder.php',
+ 'Symfony\\Component\\Finder\\Glob' => __DIR__ . '/..' . '/symfony/finder/Glob.php',
+ 'Symfony\\Component\\Finder\\Iterator\\CustomFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/CustomFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\DateRangeFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/DateRangeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\DepthRangeFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/DepthRangeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\ExcludeDirectoryFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilePathsIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FilePathsIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FileTypeFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FileTypeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilecontentFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FilecontentFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilenameFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FilenameFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\FilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\MultiplePcreFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/MultiplePcreFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\PathFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/PathFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\RecursiveDirectoryIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/RecursiveDirectoryIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\SizeRangeFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/SizeRangeFilterIterator.php',
+ 'Symfony\\Component\\Finder\\Iterator\\SortableIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/SortableIterator.php',
+ 'Symfony\\Component\\Finder\\Shell\\Command' => __DIR__ . '/..' . '/symfony/finder/Shell/Command.php',
+ 'Symfony\\Component\\Finder\\Shell\\Shell' => __DIR__ . '/..' . '/symfony/finder/Shell/Shell.php',
+ 'Symfony\\Component\\Finder\\SplFileInfo' => __DIR__ . '/..' . '/symfony/finder/SplFileInfo.php',
+ 'Symfony\\Component\\HttpFoundation\\AcceptHeader' => __DIR__ . '/..' . '/symfony/http-foundation/AcceptHeader.php',
+ 'Symfony\\Component\\HttpFoundation\\AcceptHeaderItem' => __DIR__ . '/..' . '/symfony/http-foundation/AcceptHeaderItem.php',
+ 'Symfony\\Component\\HttpFoundation\\ApacheRequest' => __DIR__ . '/..' . '/symfony/http-foundation/ApacheRequest.php',
+ 'Symfony\\Component\\HttpFoundation\\BinaryFileResponse' => __DIR__ . '/..' . '/symfony/http-foundation/BinaryFileResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\Cookie' => __DIR__ . '/..' . '/symfony/http-foundation/Cookie.php',
+ 'Symfony\\Component\\HttpFoundation\\Exception\\ConflictingHeadersException' => __DIR__ . '/..' . '/symfony/http-foundation/Exception/ConflictingHeadersException.php',
+ 'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => __DIR__ . '/..' . '/symfony/http-foundation/ExpressionRequestMatcher.php',
+ 'Symfony\\Component\\HttpFoundation\\FileBag' => __DIR__ . '/..' . '/symfony/http-foundation/FileBag.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UploadException.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\File' => __DIR__ . '/..' . '/symfony/http-foundation/File/File.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\ExtensionGuesser' => __DIR__ . '/..' . '/symfony/http-foundation/File/MimeType/ExtensionGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\ExtensionGuesserInterface' => __DIR__ . '/..' . '/symfony/http-foundation/File/MimeType/ExtensionGuesserInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\FileBinaryMimeTypeGuesser' => __DIR__ . '/..' . '/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\FileinfoMimeTypeGuesser' => __DIR__ . '/..' . '/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeExtensionGuesser' => __DIR__ . '/..' . '/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeGuesser' => __DIR__ . '/..' . '/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\MimeType\\MimeTypeGuesserInterface' => __DIR__ . '/..' . '/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => __DIR__ . '/..' . '/symfony/http-foundation/File/UploadedFile.php',
+ 'Symfony\\Component\\HttpFoundation\\HeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderBag.php',
+ 'Symfony\\Component\\HttpFoundation\\IpUtils' => __DIR__ . '/..' . '/symfony/http-foundation/IpUtils.php',
+ 'Symfony\\Component\\HttpFoundation\\JsonResponse' => __DIR__ . '/..' . '/symfony/http-foundation/JsonResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\ParameterBag' => __DIR__ . '/..' . '/symfony/http-foundation/ParameterBag.php',
+ 'Symfony\\Component\\HttpFoundation\\RedirectResponse' => __DIR__ . '/..' . '/symfony/http-foundation/RedirectResponse.php',
+ 'Symfony\\Component\\HttpFoundation\\Request' => __DIR__ . '/..' . '/symfony/http-foundation/Request.php',
+ 'Symfony\\Component\\HttpFoundation\\RequestMatcher' => __DIR__ . '/..' . '/symfony/http-foundation/RequestMatcher.php',
+ 'Symfony\\Component\\HttpFoundation\\RequestMatcherInterface' => __DIR__ . '/..' . '/symfony/http-foundation/RequestMatcherInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\RequestStack' => __DIR__ . '/..' . '/symfony/http-foundation/RequestStack.php',
+ 'Symfony\\Component\\HttpFoundation\\Response' => __DIR__ . '/..' . '/symfony/http-foundation/Response.php',
+ 'Symfony\\Component\\HttpFoundation\\ResponseHeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/ResponseHeaderBag.php',
+ 'Symfony\\Component\\HttpFoundation\\ServerBag' => __DIR__ . '/..' . '/symfony/http-foundation/ServerBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Attribute/AttributeBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBagInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Attribute/AttributeBagInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\NamespacedAttributeBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\AutoExpireFlashBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Flash/FlashBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Flash/FlashBagInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Session' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Session.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionBagInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\LegacyPdoSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcacheSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\WriteCheckSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockFileSessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/NativeSessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/PhpBridgeSessionStorage.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\NativeProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\StreamedResponse' => __DIR__ . '/..' . '/symfony/http-foundation/StreamedResponse.php',
+ 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle' => __DIR__ . '/..' . '/symfony/http-kernel/Bundle/Bundle.php',
+ 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Bundle/BundleInterface.php',
+ 'Symfony\\Component\\HttpKernel\\CacheClearer\\CacheClearerInterface' => __DIR__ . '/..' . '/symfony/http-kernel/CacheClearer/CacheClearerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\CacheClearer\\ChainCacheClearer' => __DIR__ . '/..' . '/symfony/http-kernel/CacheClearer/ChainCacheClearer.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmer' => __DIR__ . '/..' . '/symfony/http-kernel/CacheWarmer/CacheWarmer.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerAggregate' => __DIR__ . '/..' . '/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerInterface' => __DIR__ . '/..' . '/symfony/http-kernel/CacheWarmer/CacheWarmerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\CacheWarmer\\WarmableInterface' => __DIR__ . '/..' . '/symfony/http-kernel/CacheWarmer/WarmableInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Client' => __DIR__ . '/..' . '/symfony/http-kernel/Client.php',
+ 'Symfony\\Component\\HttpKernel\\Config\\EnvParametersResource' => __DIR__ . '/..' . '/symfony/http-kernel/Config/EnvParametersResource.php',
+ 'Symfony\\Component\\HttpKernel\\Config\\FileLocator' => __DIR__ . '/..' . '/symfony/http-kernel/Config/FileLocator.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\ControllerReference' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ControllerReference.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ControllerResolver.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ControllerResolverInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Controller\\TraceableControllerResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/TraceableControllerResolver.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\ConfigDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/ConfigDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\DataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/DataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\DataCollectorInterface' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/DataCollectorInterface.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\DumpDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/DumpDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\EventDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/EventDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\ExceptionDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/ExceptionDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\LateDataCollectorInterface' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/LateDataCollectorInterface.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\LoggerDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/LoggerDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\MemoryDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/MemoryDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\RequestDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/RequestDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\RouterDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/RouterDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\TimeDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/TimeDataCollector.php',
+ 'Symfony\\Component\\HttpKernel\\DataCollector\\Util\\ValueExporter' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/Util/ValueExporter.php',
+ 'Symfony\\Component\\HttpKernel\\Debug\\ErrorHandler' => __DIR__ . '/..' . '/symfony/http-kernel/Debug/ErrorHandler.php',
+ 'Symfony\\Component\\HttpKernel\\Debug\\ExceptionHandler' => __DIR__ . '/..' . '/symfony/http-kernel/Debug/ExceptionHandler.php',
+ 'Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher' => __DIR__ . '/..' . '/symfony/http-kernel/Debug/TraceableEventDispatcher.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\AddClassesToCachePass' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ConfigurableExtension' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/ConfigurableExtension.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ContainerAwareHttpKernel' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/Extension.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\FragmentRendererPass' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\LazyLoadingFragmentHandler' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\MergeExtensionConfigurationPass' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php',
+ 'Symfony\\Component\\HttpKernel\\DependencyInjection\\RegisterListenersPass' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\AddRequestFormatsListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/AddRequestFormatsListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\DebugHandlersListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/DebugHandlersListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\DumpListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/DumpListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ErrorsLoggerListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/ErrorsLoggerListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\EsiListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/EsiListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/ExceptionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\FragmentListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/FragmentListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\LocaleListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/LocaleListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ProfilerListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/ProfilerListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/ResponseListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/RouterListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\SaveSessionListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/SaveSessionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\SessionListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/SessionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\StreamedResponseListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/StreamedResponseListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\SurrogateListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/SurrogateListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\TestSessionListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/TestSessionListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\TranslatorListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/TranslatorListener.php',
+ 'Symfony\\Component\\HttpKernel\\EventListener\\ValidateRequestListener' => __DIR__ . '/..' . '/symfony/http-kernel/EventListener/ValidateRequestListener.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/FilterControllerEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/FilterResponseEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\FinishRequestEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/FinishRequestEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/GetResponseEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/GetResponseForExceptionEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/KernelEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Event\\PostResponseEvent' => __DIR__ . '/..' . '/symfony/http-kernel/Event/PostResponseEvent.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\AccessDeniedHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/AccessDeniedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\BadRequestHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/BadRequestHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\ConflictHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/ConflictHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\GoneHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/GoneHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\HttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/HttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\HttpExceptionInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/HttpExceptionInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\LengthRequiredHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/LengthRequiredHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\MethodNotAllowedHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\NotAcceptableHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/NotAcceptableHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/NotFoundHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\PreconditionFailedHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/PreconditionFailedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\PreconditionRequiredHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\ServiceUnavailableHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\TooManyRequestsHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/TooManyRequestsHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\UnauthorizedHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/UnauthorizedHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\UnprocessableEntityHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Exception\\UnsupportedMediaTypeHttpException' => __DIR__ . '/..' . '/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\AbstractSurrogateFragmentRenderer' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\EsiFragmentRenderer' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/EsiFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\FragmentHandler' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/FragmentHandler.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\FragmentRendererInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/FragmentRendererInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\HIncludeFragmentRenderer' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\InlineFragmentRenderer' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/InlineFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\RoutableFragmentRenderer' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\Fragment\\SsiFragmentRenderer' => __DIR__ . '/..' . '/symfony/http-kernel/Fragment/SsiFragmentRenderer.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\Esi' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/Esi.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\EsiResponseCacheStrategy' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\EsiResponseCacheStrategyInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\HttpCache' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/HttpCache.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\ResponseCacheStrategy' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\ResponseCacheStrategyInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/ResponseCacheStrategyInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\Ssi' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/Ssi.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\Store' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/Store.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\StoreInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/StoreInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\SubRequestHandler' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/SubRequestHandler.php',
+ 'Symfony\\Component\\HttpKernel\\HttpCache\\SurrogateInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/SurrogateInterface.php',
+ 'Symfony\\Component\\HttpKernel\\HttpKernel' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernel.php',
+ 'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernelInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Kernel' => __DIR__ . '/..' . '/symfony/http-kernel/Kernel.php',
+ 'Symfony\\Component\\HttpKernel\\KernelEvents' => __DIR__ . '/..' . '/symfony/http-kernel/KernelEvents.php',
+ 'Symfony\\Component\\HttpKernel\\KernelInterface' => __DIR__ . '/..' . '/symfony/http-kernel/KernelInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Log\\DebugLoggerInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Log/DebugLoggerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Log\\LoggerInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Log/LoggerInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Log\\NullLogger' => __DIR__ . '/..' . '/symfony/http-kernel/Log/NullLogger.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\BaseMemcacheProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\FileProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/FileProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MemcacheProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MemcachedProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MongoDbProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\MysqlProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/MysqlProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\PdoProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/PdoProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\Profile' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/Profile.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\Profiler' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/Profiler.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/ProfilerStorageInterface.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\RedisProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/RedisProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\Profiler\\SqliteProfilerStorage' => __DIR__ . '/..' . '/symfony/http-kernel/Profiler/SqliteProfilerStorage.php',
+ 'Symfony\\Component\\HttpKernel\\TerminableInterface' => __DIR__ . '/..' . '/symfony/http-kernel/TerminableInterface.php',
+ 'Symfony\\Component\\HttpKernel\\UriSigner' => __DIR__ . '/..' . '/symfony/http-kernel/UriSigner.php',
+ 'Symfony\\Component\\Process\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/process/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/process/Exception/InvalidArgumentException.php',
+ 'Symfony\\Component\\Process\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/process/Exception/LogicException.php',
+ 'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessFailedException.php',
+ 'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessTimedOutException.php',
+ 'Symfony\\Component\\Process\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/process/Exception/RuntimeException.php',
+ 'Symfony\\Component\\Process\\ExecutableFinder' => __DIR__ . '/..' . '/symfony/process/ExecutableFinder.php',
+ 'Symfony\\Component\\Process\\PhpExecutableFinder' => __DIR__ . '/..' . '/symfony/process/PhpExecutableFinder.php',
+ 'Symfony\\Component\\Process\\PhpProcess' => __DIR__ . '/..' . '/symfony/process/PhpProcess.php',
+ 'Symfony\\Component\\Process\\Pipes\\AbstractPipes' => __DIR__ . '/..' . '/symfony/process/Pipes/AbstractPipes.php',
+ 'Symfony\\Component\\Process\\Pipes\\PipesInterface' => __DIR__ . '/..' . '/symfony/process/Pipes/PipesInterface.php',
+ 'Symfony\\Component\\Process\\Pipes\\UnixPipes' => __DIR__ . '/..' . '/symfony/process/Pipes/UnixPipes.php',
+ 'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => __DIR__ . '/..' . '/symfony/process/Pipes/WindowsPipes.php',
+ 'Symfony\\Component\\Process\\Process' => __DIR__ . '/..' . '/symfony/process/Process.php',
+ 'Symfony\\Component\\Process\\ProcessBuilder' => __DIR__ . '/..' . '/symfony/process/ProcessBuilder.php',
+ 'Symfony\\Component\\Process\\ProcessUtils' => __DIR__ . '/..' . '/symfony/process/ProcessUtils.php',
+ 'Symfony\\Component\\Routing\\Annotation\\Route' => __DIR__ . '/..' . '/symfony/routing/Annotation/Route.php',
+ 'Symfony\\Component\\Routing\\CompiledRoute' => __DIR__ . '/..' . '/symfony/routing/CompiledRoute.php',
+ 'Symfony\\Component\\Routing\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/routing/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Routing\\Exception\\InvalidParameterException' => __DIR__ . '/..' . '/symfony/routing/Exception/InvalidParameterException.php',
+ 'Symfony\\Component\\Routing\\Exception\\MethodNotAllowedException' => __DIR__ . '/..' . '/symfony/routing/Exception/MethodNotAllowedException.php',
+ 'Symfony\\Component\\Routing\\Exception\\MissingMandatoryParametersException' => __DIR__ . '/..' . '/symfony/routing/Exception/MissingMandatoryParametersException.php',
+ 'Symfony\\Component\\Routing\\Exception\\ResourceNotFoundException' => __DIR__ . '/..' . '/symfony/routing/Exception/ResourceNotFoundException.php',
+ 'Symfony\\Component\\Routing\\Exception\\RouteNotFoundException' => __DIR__ . '/..' . '/symfony/routing/Exception/RouteNotFoundException.php',
+ 'Symfony\\Component\\Routing\\Generator\\ConfigurableRequirementsInterface' => __DIR__ . '/..' . '/symfony/routing/Generator/ConfigurableRequirementsInterface.php',
+ 'Symfony\\Component\\Routing\\Generator\\Dumper\\GeneratorDumper' => __DIR__ . '/..' . '/symfony/routing/Generator/Dumper/GeneratorDumper.php',
+ 'Symfony\\Component\\Routing\\Generator\\Dumper\\GeneratorDumperInterface' => __DIR__ . '/..' . '/symfony/routing/Generator/Dumper/GeneratorDumperInterface.php',
+ 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper' => __DIR__ . '/..' . '/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php',
+ 'Symfony\\Component\\Routing\\Generator\\UrlGenerator' => __DIR__ . '/..' . '/symfony/routing/Generator/UrlGenerator.php',
+ 'Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface' => __DIR__ . '/..' . '/symfony/routing/Generator/UrlGeneratorInterface.php',
+ 'Symfony\\Component\\Routing\\Loader\\AnnotationClassLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/AnnotationClassLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\AnnotationDirectoryLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/AnnotationDirectoryLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\AnnotationFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/AnnotationFileLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\ClosureLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/ClosureLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\PhpFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/PhpFileLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\RecursiveCallbackFilterIterator' => __DIR__ . '/..' . '/symfony/routing/Loader/AnnotationDirectoryLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/XmlFileLoader.php',
+ 'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/YamlFileLoader.php',
+ 'Symfony\\Component\\Routing\\Matcher\\ApacheUrlMatcher' => __DIR__ . '/..' . '/symfony/routing/Matcher/ApacheUrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\ApacheMatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperPrefixCollection' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperPrefixCollection.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
+ 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
+ 'Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcher' => __DIR__ . '/..' . '/symfony/routing/Matcher/RedirectableUrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcherInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php',
+ 'Symfony\\Component\\Routing\\Matcher\\RequestMatcherInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/RequestMatcherInterface.php',
+ 'Symfony\\Component\\Routing\\Matcher\\TraceableUrlMatcher' => __DIR__ . '/..' . '/symfony/routing/Matcher/TraceableUrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher' => __DIR__ . '/..' . '/symfony/routing/Matcher/UrlMatcher.php',
+ 'Symfony\\Component\\Routing\\Matcher\\UrlMatcherInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/UrlMatcherInterface.php',
+ 'Symfony\\Component\\Routing\\RequestContext' => __DIR__ . '/..' . '/symfony/routing/RequestContext.php',
+ 'Symfony\\Component\\Routing\\RequestContextAwareInterface' => __DIR__ . '/..' . '/symfony/routing/RequestContextAwareInterface.php',
+ 'Symfony\\Component\\Routing\\Route' => __DIR__ . '/..' . '/symfony/routing/Route.php',
+ 'Symfony\\Component\\Routing\\RouteCollection' => __DIR__ . '/..' . '/symfony/routing/RouteCollection.php',
+ 'Symfony\\Component\\Routing\\RouteCompiler' => __DIR__ . '/..' . '/symfony/routing/RouteCompiler.php',
+ 'Symfony\\Component\\Routing\\RouteCompilerInterface' => __DIR__ . '/..' . '/symfony/routing/RouteCompilerInterface.php',
+ 'Symfony\\Component\\Routing\\Router' => __DIR__ . '/..' . '/symfony/routing/Router.php',
+ 'Symfony\\Component\\Routing\\RouterInterface' => __DIR__ . '/..' . '/symfony/routing/RouterInterface.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\AbstractOperation' => __DIR__ . '/..' . '/symfony/translation/Catalogue/AbstractOperation.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\DiffOperation' => __DIR__ . '/..' . '/symfony/translation/Catalogue/DiffOperation.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\MergeOperation' => __DIR__ . '/..' . '/symfony/translation/Catalogue/MergeOperation.php',
+ 'Symfony\\Component\\Translation\\Catalogue\\OperationInterface' => __DIR__ . '/..' . '/symfony/translation/Catalogue/OperationInterface.php',
+ 'Symfony\\Component\\Translation\\DataCollectorTranslator' => __DIR__ . '/..' . '/symfony/translation/DataCollectorTranslator.php',
+ 'Symfony\\Component\\Translation\\DataCollector\\TranslationDataCollector' => __DIR__ . '/..' . '/symfony/translation/DataCollector/TranslationDataCollector.php',
+ 'Symfony\\Component\\Translation\\Dumper\\CsvFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/CsvFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\DumperInterface' => __DIR__ . '/..' . '/symfony/translation/Dumper/DumperInterface.php',
+ 'Symfony\\Component\\Translation\\Dumper\\FileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/FileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\IcuResFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/IcuResFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\IniFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/IniFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\JsonFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/JsonFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\MoFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/MoFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\PhpFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/PhpFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\PoFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/PoFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\QtFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/QtFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\XliffFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/XliffFileDumper.php',
+ 'Symfony\\Component\\Translation\\Dumper\\YamlFileDumper' => __DIR__ . '/..' . '/symfony/translation/Dumper/YamlFileDumper.php',
+ 'Symfony\\Component\\Translation\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/translation/Exception/ExceptionInterface.php',
+ 'Symfony\\Component\\Translation\\Exception\\InvalidResourceException' => __DIR__ . '/..' . '/symfony/translation/Exception/InvalidResourceException.php',
+ 'Symfony\\Component\\Translation\\Exception\\NotFoundResourceException' => __DIR__ . '/..' . '/symfony/translation/Exception/NotFoundResourceException.php',
+ 'Symfony\\Component\\Translation\\Extractor\\AbstractFileExtractor' => __DIR__ . '/..' . '/symfony/translation/Extractor/AbstractFileExtractor.php',
+ 'Symfony\\Component\\Translation\\Extractor\\ChainExtractor' => __DIR__ . '/..' . '/symfony/translation/Extractor/ChainExtractor.php',
+ 'Symfony\\Component\\Translation\\Extractor\\ExtractorInterface' => __DIR__ . '/..' . '/symfony/translation/Extractor/ExtractorInterface.php',
+ 'Symfony\\Component\\Translation\\IdentityTranslator' => __DIR__ . '/..' . '/symfony/translation/IdentityTranslator.php',
+ 'Symfony\\Component\\Translation\\Interval' => __DIR__ . '/..' . '/symfony/translation/Interval.php',
+ 'Symfony\\Component\\Translation\\Loader\\ArrayLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/ArrayLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\CsvFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/CsvFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\IcuDatFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/IcuDatFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\IcuResFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/IcuResFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\IniFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/IniFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\JsonFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/JsonFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\LoaderInterface' => __DIR__ . '/..' . '/symfony/translation/Loader/LoaderInterface.php',
+ 'Symfony\\Component\\Translation\\Loader\\MoFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/MoFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\PhpFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/PhpFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\PoFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/PoFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\QtFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/QtFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\XliffFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/XliffFileLoader.php',
+ 'Symfony\\Component\\Translation\\Loader\\YamlFileLoader' => __DIR__ . '/..' . '/symfony/translation/Loader/YamlFileLoader.php',
+ 'Symfony\\Component\\Translation\\LoggingTranslator' => __DIR__ . '/..' . '/symfony/translation/LoggingTranslator.php',
+ 'Symfony\\Component\\Translation\\MessageCatalogue' => __DIR__ . '/..' . '/symfony/translation/MessageCatalogue.php',
+ 'Symfony\\Component\\Translation\\MessageCatalogueInterface' => __DIR__ . '/..' . '/symfony/translation/MessageCatalogueInterface.php',
+ 'Symfony\\Component\\Translation\\MessageSelector' => __DIR__ . '/..' . '/symfony/translation/MessageSelector.php',
+ 'Symfony\\Component\\Translation\\MetadataAwareInterface' => __DIR__ . '/..' . '/symfony/translation/MetadataAwareInterface.php',
+ 'Symfony\\Component\\Translation\\PluralizationRules' => __DIR__ . '/..' . '/symfony/translation/PluralizationRules.php',
+ 'Symfony\\Component\\Translation\\Translator' => __DIR__ . '/..' . '/symfony/translation/Translator.php',
+ 'Symfony\\Component\\Translation\\TranslatorBagInterface' => __DIR__ . '/..' . '/symfony/translation/TranslatorBagInterface.php',
+ 'Symfony\\Component\\Translation\\TranslatorInterface' => __DIR__ . '/..' . '/symfony/translation/TranslatorInterface.php',
+ 'Symfony\\Component\\Translation\\Writer\\TranslationWriter' => __DIR__ . '/..' . '/symfony/translation/Writer/TranslationWriter.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\AmqpCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/AmqpCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\Caster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/Caster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ConstStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ConstStub.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\CutStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/CutStub.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\DOMCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/DOMCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\DoctrineCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/DoctrineCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ExceptionCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\MongoCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/MongoCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PdoCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ReflectionCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ReflectionCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\ResourceCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ResourceCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\SplCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/SplCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\StubCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/StubCaster.php',
+ 'Symfony\\Component\\VarDumper\\Caster\\XmlResourceCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/XmlResourceCaster.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\AbstractCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/AbstractCloner.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\ClonerInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/ClonerInterface.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\Cursor' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Cursor.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\Data' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Data.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/DumperInterface.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\Stub' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Stub.php',
+ 'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/VarCloner.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/AbstractDumper.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/CliDumper.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
+ 'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+ 'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+ 'Symfony\\Component\\VarDumper\\Test\\VarDumperTestCase' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestCase.php',
+ 'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
+ 'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
+ 'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
+ 'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
+ 'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
+ 'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php',
+ 'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
+ 'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
+ 'Symfony\\Polyfill\\Util\\TestListener' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListener.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerForV5' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerForV5.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerForV6' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerForV6.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerForV7' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerForV7.php',
+ 'Symfony\\Polyfill\\Util\\TestListenerTrait' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListenerTrait.php',
+ 'UpdateHelper\\ComposerPlugin' => __DIR__ . '/..' . '/kylekatarnls/update-helper/src/UpdateHelper/ComposerPlugin.php',
+ 'UpdateHelper\\NotUpdateInterfaceInstanceException' => __DIR__ . '/..' . '/kylekatarnls/update-helper/src/UpdateHelper/NotUpdateInterfaceInstanceException.php',
+ 'UpdateHelper\\UpdateHelper' => __DIR__ . '/..' . '/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php',
+ 'UpdateHelper\\UpdateHelperInterface' => __DIR__ . '/..' . '/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelperInterface.php',
+ 'XdgBaseDir\\Xdg' => __DIR__ . '/..' . '/dnoegel/php-xdg-base-dir/src/Xdg.php',
+ );
+
+ public static function getInitializer(ClassLoader $loader)
+ {
+ return \Closure::bind(function () use ($loader) {
+ $loader->prefixLengthsPsr4 = ComposerStaticInit43265f891b9f29a025a40de9ffd797c4::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit43265f891b9f29a025a40de9ffd797c4::$prefixDirsPsr4;
+ $loader->fallbackDirsPsr4 = ComposerStaticInit43265f891b9f29a025a40de9ffd797c4::$fallbackDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit43265f891b9f29a025a40de9ffd797c4::$prefixesPsr0;
+ $loader->classMap = ComposerStaticInit43265f891b9f29a025a40de9ffd797c4::$classMap;
+
+ }, null, ClassLoader::class);
+ }
+}
diff --git a/application/vendor/composer/installed.json b/application/vendor/composer/installed.json
index 1196fee..f863936 100644
--- a/application/vendor/composer/installed.json
+++ b/application/vendor/composer/installed.json
@@ -1,25 +1,37 @@
[
{
- "name": "psr/log",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
+ "name": "classpreloader/classpreloader",
+ "version": "3.2.0",
+ "version_normalized": "3.2.0.0",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+ "url": "https://github.com/ClassPreloader/ClassPreloader.git",
+ "reference": "4729e438e0ada350f91148e7d4bb9809342575ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/4729e438e0ada350f91148e7d4bb9809342575ff",
+ "reference": "4729e438e0ada350f91148e7d4bb9809342575ff",
"shasum": ""
},
- "time": "2012-12-21 11:40:51",
+ "require": {
+ "nikic/php-parser": "^1.0|^2.0|^3.0",
+ "php": ">=5.5.9"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8|^5.0"
+ },
+ "time": "2017-12-10T11:40:39+00:00",
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Psr\\Log\\": ""
+ "psr-4": {
+ "ClassPreloader\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -28,60 +40,77 @@
],
"authors": [
{
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com"
+ },
+ {
+ "name": "Graham Campbell",
+ "email": "graham@alt-three.com"
}
],
- "description": "Common interface for logging libraries",
+ "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case",
"keywords": [
- "log",
- "psr",
- "psr-3"
+ "autoload",
+ "class",
+ "preload"
]
},
{
- "name": "jakub-onderka/php-console-color",
- "version": "0.1",
- "version_normalized": "0.1.0.0",
+ "name": "danielstjules/stringy",
+ "version": "1.10.0",
+ "version_normalized": "1.10.0.0",
"source": {
"type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
+ "url": "https://github.com/danielstjules/Stringy.git",
+ "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
+ "url": "https://api.github.com/repos/danielstjules/Stringy/zipball/4749c205db47ee5b32e8d1adf6d9aff8db6caf3b",
+ "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "ext-mbstring": "*",
+ "php": ">=5.3.0"
},
"require-dev": {
- "jakub-onderka/php-code-style": "1.0",
- "jakub-onderka/php-parallel-lint": "0.*",
- "jakub-onderka/php-var-dump-check": "0.*",
- "phpunit/phpunit": "3.7.*",
- "squizlabs/php_codesniffer": "1.*"
+ "phpunit/phpunit": "~4.0"
},
- "time": "2014-04-08 15:00:19",
+ "time": "2015-07-23T00:54:12+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleColor": "src/"
- }
+ "psr-4": {
+ "Stringy\\": "src/"
+ },
+ "files": [
+ "src/Create.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-2-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com",
- "homepage": "http://www.acci.cz"
+ "name": "Daniel St. Jules",
+ "email": "danielst.jules@gmail.com",
+ "homepage": "http://www.danielstjules.com"
}
+ ],
+ "description": "A string manipulation library with multibyte support",
+ "homepage": "https://github.com/danielstjules/Stringy",
+ "keywords": [
+ "UTF",
+ "helpers",
+ "manipulation",
+ "methods",
+ "multibyte",
+ "string",
+ "utf-8",
+ "utility",
+ "utils"
]
},
{
@@ -105,7 +134,7 @@
"require-dev": {
"phpunit/phpunit": "@stable"
},
- "time": "2014-10-24 07:27:01",
+ "time": "2014-10-24T07:27:01+00:00",
"type": "project",
"installation-source": "dist",
"autoload": {
@@ -120,56 +149,37 @@
"description": "implementation of xdg base directory specification for php"
},
{
- "name": "psy/psysh",
- "version": "v0.4.4",
- "version_normalized": "0.4.4.0",
+ "name": "doctrine/inflector",
+ "version": "v1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
- "url": "https://github.com/bobthecow/psysh.git",
- "reference": "489816db71649bd95b416e3ed9062d40528ab0ac"
+ "url": "https://github.com/doctrine/inflector.git",
+ "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/489816db71649bd95b416e3ed9062d40528ab0ac",
- "reference": "489816db71649bd95b416e3ed9062d40528ab0ac",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
+ "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"shasum": ""
},
"require": {
- "dnoegel/php-xdg-base-dir": "0.1",
- "jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "~1.0",
- "php": ">=5.3.0",
- "symfony/console": "~2.3.10|~2.4.2|~2.5"
+ "php": "^7.1"
},
"require-dev": {
- "fabpot/php-cs-fixer": "~1.5",
- "phpunit/phpunit": "~3.7|~4.0",
- "squizlabs/php_codesniffer": "~2.0",
- "symfony/finder": "~2.1|~3.0"
- },
- "suggest": {
- "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
- "ext-pdo-sqlite": "The doc command requires SQLite to work.",
- "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
- "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+ "phpunit/phpunit": "^6.2"
},
- "time": "2015-03-26 18:43:54",
- "bin": [
- "bin/psysh"
- ],
+ "time": "2018-01-09T20:05:19+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.4.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "files": [
- "src/Psy/functions.php"
- ],
- "psr-0": {
- "Psy\\": "src/"
+ "psr-4": {
+ "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -178,91 +188,112 @@
],
"authors": [
{
- "name": "Justin Hileman",
- "email": "justin@justinhileman.info",
- "homepage": "http://justinhileman.com"
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
- "description": "An interactive shell for modern PHP.",
- "homepage": "http://psysh.org",
+ "description": "Common String Manipulations with regard to casing and singular/plural rules.",
+ "homepage": "http://www.doctrine-project.org",
"keywords": [
- "REPL",
- "console",
- "interactive",
- "shell"
+ "inflection",
+ "pluralize",
+ "singularize",
+ "string"
]
},
{
- "name": "mtdowling/cron-expression",
- "version": "v1.0.4",
- "version_normalized": "1.0.4.0",
+ "name": "jakub-onderka/php-console-color",
+ "version": "v0.2",
+ "version_normalized": "0.2.0.0",
"source": {
"type": "git",
- "url": "https://github.com/mtdowling/cron-expression.git",
- "reference": "fd92e883195e5dfa77720b1868cf084b08be4412"
+ "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/fd92e883195e5dfa77720b1868cf084b08be4412",
- "reference": "fd92e883195e5dfa77720b1868cf084b08be4412",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "jakub-onderka/php-code-style": "1.0",
+ "jakub-onderka/php-parallel-lint": "1.0",
+ "jakub-onderka/php-var-dump-check": "0.*",
+ "phpunit/phpunit": "~4.3",
+ "squizlabs/php_codesniffer": "1.*"
},
- "time": "2015-01-11 23:07:46",
+ "time": "2018-09-29T17:23:10+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Cron": "src/"
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleColor\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-2-Clause"
],
"authors": [
{
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
+ "name": "Jakub Onderka",
+ "email": "jakub.onderka@gmail.com"
}
- ],
- "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
- "keywords": [
- "cron",
- "schedule"
]
},
{
- "name": "ircmaxell/password-compat",
- "version": "v1.0.4",
- "version_normalized": "1.0.4.0",
+ "name": "jakub-onderka/php-console-highlighter",
+ "version": "v0.3.2",
+ "version_normalized": "0.3.2.0",
"source": {
"type": "git",
- "url": "https://github.com/ircmaxell/password_compat.git",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+ "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
+ "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+ "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
"shasum": ""
},
+ "require": {
+ "jakub-onderka/php-console-color": "~0.1",
+ "php": ">=5.3.0"
+ },
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "jakub-onderka/php-code-style": "~1.0",
+ "jakub-onderka/php-parallel-lint": "~0.5",
+ "jakub-onderka/php-var-dump-check": "~0.1",
+ "phpunit/phpunit": "~4.0",
+ "squizlabs/php_codesniffer": "~1.5"
},
- "time": "2014-11-20 16:49:30",
+ "time": "2015-04-20T18:58:01+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
- "files": [
- "lib/password.php"
- ]
+ "psr-0": {
+ "JakubOnderka\\PhpConsoleHighlighter": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -270,54 +301,47 @@
],
"authors": [
{
- "name": "Anthony Ferrara",
- "email": "ircmaxell@php.net",
- "homepage": "http://blog.ircmaxell.com"
+ "name": "Jakub Onderka",
+ "email": "acci@acci.cz",
+ "homepage": "http://www.acci.cz/"
}
- ],
- "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
- "homepage": "https://github.com/ircmaxell/password_compat",
- "keywords": [
- "hashing",
- "password"
]
},
{
- "name": "illuminate/html",
- "version": "v5.0.0",
- "version_normalized": "5.0.0.0",
+ "name": "jeremeamia/superclosure",
+ "version": "2.4.0",
+ "version_normalized": "2.4.0.0",
"source": {
"type": "git",
- "url": "https://github.com/illuminate/html.git",
- "reference": "3d1009bb8e0f25720c914af5c1f4015dd373c9ef"
+ "url": "https://github.com/jeremeamia/super_closure.git",
+ "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/illuminate/html/zipball/3d1009bb8e0f25720c914af5c1f4015dd373c9ef",
- "reference": "3d1009bb8e0f25720c914af5c1f4015dd373c9ef",
+ "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/5707d5821b30b9a07acfb4d76949784aaa0e9ce9",
+ "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9",
"shasum": ""
},
"require": {
- "illuminate/http": "~5.0",
- "illuminate/session": "~5.0",
- "illuminate/support": "~5.0",
- "php": ">=5.4.0"
+ "nikic/php-parser": "^1.2|^2.0|^3.0|^4.0",
+ "php": ">=5.4",
+ "symfony/polyfill-php56": "^1.0"
},
- "time": "2015-01-01 16:31:18",
+ "require-dev": {
+ "phpunit/phpunit": "^4.0|^5.0"
+ },
+ "time": "2018-03-21T22:21:57+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "2.4-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Illuminate\\Html\\": ""
- },
- "files": [
- "helpers.php"
- ]
+ "SuperClosure\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -325,98 +349,183 @@
],
"authors": [
{
- "name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "name": "Jeremy Lindblom",
+ "email": "jeremeamia@gmail.com",
+ "homepage": "https://github.com/jeremeamia",
+ "role": "Developer"
}
+ ],
+ "description": "Serialize Closure objects, including their context and binding",
+ "homepage": "https://github.com/jeremeamia/super_closure",
+ "keywords": [
+ "closure",
+ "function",
+ "lambda",
+ "parser",
+ "serializable",
+ "serialize",
+ "tokenizer"
]
},
{
- "name": "vlucas/phpdotenv",
- "version": "v1.1.1",
- "version_normalized": "1.1.1.0",
+ "name": "kylekatarnls/update-helper",
+ "version": "1.2.0",
+ "version_normalized": "1.2.0.0",
"source": {
"type": "git",
- "url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa"
+ "url": "https://github.com/kylekatarnls/update-helper.git",
+ "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa",
- "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa",
+ "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/5786fa188e0361b9adf9e8199d7280d1b2db165e",
+ "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "composer-plugin-api": "^1.1.0 || ^2.0.0",
+ "php": ">=5.3.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "codeclimate/php-test-reporter": "dev-master",
+ "composer/composer": "2.0.x-dev || ^2.0.0-dev",
+ "phpunit/phpunit": ">=4.8.35 <6.0"
+ },
+ "time": "2019-07-29T11:03:54+00:00",
+ "type": "composer-plugin",
+ "extra": {
+ "class": "UpdateHelper\\ComposerPlugin"
},
- "time": "2015-05-30 15:59:26",
- "type": "library",
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Dotenv": "src/"
+ "UpdateHelper\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD"
+ "MIT"
],
"authors": [
{
- "name": "Vance Lucas",
- "email": "vance@vancelucas.com",
- "homepage": "http://www.vancelucas.com"
+ "name": "Kyle",
+ "email": "kylekatarnls@gmail.com"
}
],
- "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
- "homepage": "http://github.com/vlucas/phpdotenv",
- "keywords": [
- "dotenv",
- "env",
- "environment"
- ]
+ "description": "Update helper"
},
{
- "name": "symfony/var-dumper",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/VarDumper",
+ "name": "laravel/framework",
+ "version": "v5.1.46",
+ "version_normalized": "5.1.46.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/var-dumper.git",
- "reference": "5fba957a30161d8724aade093593cd22f815bea2"
+ "url": "https://github.com/laravel/framework.git",
+ "reference": "7f2f892e62163138121e8210b92b21394fda8d1c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5fba957a30161d8724aade093593cd22f815bea2",
- "reference": "5fba957a30161d8724aade093593cd22f815bea2",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/7f2f892e62163138121e8210b92b21394fda8d1c",
+ "reference": "7f2f892e62163138121e8210b92b21394fda8d1c",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
- "suggest": {
- "ext-symfony_debug": ""
+ "classpreloader/classpreloader": "~2.0|~3.0",
+ "danielstjules/stringy": "~1.8",
+ "doctrine/inflector": "~1.0",
+ "ext-mbstring": "*",
+ "ext-openssl": "*",
+ "jeremeamia/superclosure": "~2.0",
+ "league/flysystem": "~1.0",
+ "monolog/monolog": "~1.11",
+ "mtdowling/cron-expression": "~1.0",
+ "nesbot/carbon": "~1.19",
+ "paragonie/random_compat": "~1.4",
+ "php": ">=5.5.9",
+ "psy/psysh": "0.7.*",
+ "swiftmailer/swiftmailer": "~5.1",
+ "symfony/console": "2.7.*",
+ "symfony/css-selector": "2.7.*|2.8.*",
+ "symfony/debug": "2.7.*",
+ "symfony/dom-crawler": "2.7.*",
+ "symfony/finder": "2.7.*",
+ "symfony/http-foundation": "2.7.*",
+ "symfony/http-kernel": "2.7.*",
+ "symfony/process": "2.7.*",
+ "symfony/routing": "2.7.*",
+ "symfony/translation": "2.7.*",
+ "symfony/var-dumper": "2.7.*",
+ "vlucas/phpdotenv": "~1.0"
},
- "time": "2015-07-01 10:03:42",
- "type": "library",
+ "replace": {
+ "illuminate/auth": "self.version",
+ "illuminate/broadcasting": "self.version",
+ "illuminate/bus": "self.version",
+ "illuminate/cache": "self.version",
+ "illuminate/config": "self.version",
+ "illuminate/console": "self.version",
+ "illuminate/container": "self.version",
+ "illuminate/contracts": "self.version",
+ "illuminate/cookie": "self.version",
+ "illuminate/database": "self.version",
+ "illuminate/encryption": "self.version",
+ "illuminate/events": "self.version",
+ "illuminate/exception": "self.version",
+ "illuminate/filesystem": "self.version",
+ "illuminate/hashing": "self.version",
+ "illuminate/http": "self.version",
+ "illuminate/log": "self.version",
+ "illuminate/mail": "self.version",
+ "illuminate/pagination": "self.version",
+ "illuminate/pipeline": "self.version",
+ "illuminate/queue": "self.version",
+ "illuminate/redis": "self.version",
+ "illuminate/routing": "self.version",
+ "illuminate/session": "self.version",
+ "illuminate/support": "self.version",
+ "illuminate/translation": "self.version",
+ "illuminate/validation": "self.version",
+ "illuminate/view": "self.version"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "~3.0",
+ "iron-io/iron_mq": "~2.0",
+ "mockery/mockery": "~0.9.4",
+ "pda/pheanstalk": "~3.0",
+ "phpunit/phpunit": "~4.0",
+ "predis/predis": "~1.0"
+ },
+ "suggest": {
+ "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
+ "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
+ "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).",
+ "iron-io/iron_mq": "Required to use the iron queue driver (~2.0).",
+ "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
+ "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
+ "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
+ "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
+ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
+ "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
+ },
+ "time": "2017-03-24T16:31:45+00:00",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "5.1-dev"
}
},
"installation-source": "dist",
"autoload": {
+ "classmap": [
+ "src/Illuminate/Queue/IlluminateQueueClosure.php"
+ ],
"files": [
- "Resources/functions/dump.php"
+ "src/Illuminate/Foundation/helpers.php",
+ "src/Illuminate/Support/helpers.php"
],
- "psr-0": {
- "Symfony\\Component\\VarDumper\\": ""
+ "psr-4": {
+ "Illuminate\\": "src/Illuminate/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -425,64 +534,53 @@
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Taylor Otwell",
+ "email": "taylorotwell@gmail.com"
}
],
- "description": "Symfony mechanism for exploring and dumping PHP variables",
- "homepage": "https://symfony.com",
+ "description": "The Laravel Framework.",
+ "homepage": "http://laravel.com",
"keywords": [
- "debug",
- "dump"
+ "framework",
+ "laravel"
]
},
{
- "name": "symfony/translation",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/Translation",
+ "name": "laravelcollective/html",
+ "version": "v5.1.11",
+ "version_normalized": "5.1.11.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/translation.git",
- "reference": "d84291215b5892834dd8ca8ee52f9cbdb8274904"
+ "url": "https://github.com/LaravelCollective/html.git",
+ "reference": "99342cc22507cf8d7178bb390c215968183993bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/d84291215b5892834dd8ca8ee52f9cbdb8274904",
- "reference": "d84291215b5892834dd8ca8ee52f9cbdb8274904",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/99342cc22507cf8d7178bb390c215968183993bb",
+ "reference": "99342cc22507cf8d7178bb390c215968183993bb",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "illuminate/http": "5.1.*",
+ "illuminate/routing": "5.1.*",
+ "illuminate/session": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "php": ">=5.5.9"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~2.3,>=2.3.12",
- "symfony/intl": "~2.3",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.2"
- },
- "suggest": {
- "psr/log": "To use logging capability in translator",
- "symfony/config": "",
- "symfony/yaml": ""
+ "mockery/mockery": "~0.9",
+ "phpunit/phpunit": "~4.0"
},
- "time": "2015-07-08 05:59:48",
+ "time": "2017-09-07T18:12:11+00:00",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- },
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\Translation\\": ""
- }
+ "psr-4": {
+ "Collective\\Html\\": "src/"
+ },
+ "files": [
+ "src/helpers.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -490,64 +588,68 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Taylor Otwell",
+ "email": "taylorotwell@gmail.com"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Adam Engebretson",
+ "email": "adam@laravelcollective.com"
}
- ],
- "description": "Symfony Translation Component",
- "homepage": "https://symfony.com"
+ ]
},
{
- "name": "symfony/security-core",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/Security/Core",
+ "name": "league/flysystem",
+ "version": "1.0.57",
+ "version_normalized": "1.0.57.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/security-core.git",
- "reference": "05f58bb3814e8a853332dc448e3b7addaa87679c"
+ "url": "https://github.com/thephpleague/flysystem.git",
+ "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/security-core/zipball/05f58bb3814e8a853332dc448e3b7addaa87679c",
- "reference": "05f58bb3814e8a853332dc448e3b7addaa87679c",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
+ "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "ext-fileinfo": "*",
+ "php": ">=5.5.9"
+ },
+ "conflict": {
+ "league/flysystem-sftp": "<1.0.6"
},
"require-dev": {
- "ircmaxell/password-compat": "1.0.*",
- "psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1",
- "symfony/expression-language": "~2.6",
- "symfony/http-foundation": "~2.4",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/validator": "~2.5,>=2.5.5"
+ "phpspec/phpspec": "^3.4",
+ "phpunit/phpunit": "^5.7.10"
},
"suggest": {
- "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5",
- "symfony/event-dispatcher": "",
- "symfony/expression-language": "For using the expression voter",
- "symfony/http-foundation": "",
- "symfony/validator": "For using the user password constraint"
+ "ext-fileinfo": "Required for MimeType",
+ "ext-ftp": "Allows you to use FTP server storage",
+ "ext-openssl": "Allows you to use FTPS server storage",
+ "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
+ "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
+ "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
+ "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
+ "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
+ "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
+ "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
+ "league/flysystem-webdav": "Allows you to use WebDAV storage",
+ "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
+ "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
},
- "time": "2015-07-22 10:08:40",
+ "time": "2019-10-16T21:01:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "1.1-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\Security\\Core\\": ""
+ "psr-4": {
+ "League\\Flysystem\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -556,63 +658,90 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Frank de Jonge",
+ "email": "info@frenky.net"
}
],
- "description": "Symfony Security Component - Core Library",
- "homepage": "https://symfony.com"
+ "description": "Filesystem abstraction: Many filesystems, one API.",
+ "keywords": [
+ "Cloud Files",
+ "WebDAV",
+ "abstraction",
+ "aws",
+ "cloud",
+ "copy.com",
+ "dropbox",
+ "file systems",
+ "files",
+ "filesystem",
+ "filesystems",
+ "ftp",
+ "rackspace",
+ "remote",
+ "s3",
+ "sftp",
+ "storage"
+ ]
},
{
- "name": "symfony/routing",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/Routing",
+ "name": "monolog/monolog",
+ "version": "1.25.1",
+ "version_normalized": "1.25.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/routing.git",
- "reference": "0a1764d41bbb54f3864808c50569ac382b44d128"
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/0a1764d41bbb54f3864808c50569ac382b44d128",
- "reference": "0a1764d41bbb54f3864808c50569ac382b44d128",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
+ "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.0",
+ "psr/log": "~1.0"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0.0"
},
"require-dev": {
- "doctrine/annotations": "~1.0",
- "doctrine/common": "~2.2",
- "psr/log": "~1.0",
- "symfony/config": "~2.2",
- "symfony/expression-language": "~2.4",
- "symfony/http-foundation": "~2.3",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/yaml": "~2.0,>=2.0.5"
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
+ "jakub-onderka/php-parallel-lint": "0.9",
+ "php-amqplib/php-amqplib": "~2.4",
+ "php-console/php-console": "^3.1.3",
+ "phpunit/phpunit": "~4.5",
+ "phpunit/phpunit-mock-objects": "2.3.0",
+ "ruflin/elastica": ">=0.90 <3.0",
+ "sentry/sentry": "^0.13",
+ "swiftmailer/swiftmailer": "^5.3|^6.0"
},
"suggest": {
- "doctrine/annotations": "For using the annotation loader",
- "symfony/config": "For using the all-in-one router or any loader",
- "symfony/expression-language": "For using expression matching",
- "symfony/yaml": "For using the YAML loader"
+ "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+ "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+ "ext-mongo": "Allow sending log messages to a MongoDB server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+ "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+ "php-console/php-console": "Allow sending log messages to Google Chrome",
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "sentry/sentry": "Allow sending log messages to a Sentry server"
},
- "time": "2015-07-09 16:02:48",
+ "time": "2019-09-06T13:49:17+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\Routing\\": ""
+ "psr-4": {
+ "Monolog\\": "src/Monolog"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -621,56 +750,46 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
}
],
- "description": "Symfony Routing Component",
- "homepage": "https://symfony.com",
+ "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+ "homepage": "http://github.com/Seldaek/monolog",
"keywords": [
- "router",
- "routing",
- "uri",
- "url"
+ "log",
+ "logging",
+ "psr-3"
]
},
{
- "name": "symfony/process",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/Process",
+ "name": "mtdowling/cron-expression",
+ "version": "v1.2.1",
+ "version_normalized": "1.2.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/process.git",
- "reference": "57f1e88bb5dafa449b83f9f265b11d52d517b3e9"
+ "url": "https://github.com/mtdowling/cron-expression.git",
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/57f1e88bb5dafa449b83f9f265b11d52d517b3e9",
- "reference": "57f1e88bb5dafa449b83f9f265b11d52d517b3e9",
+ "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.2"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "phpunit/phpunit": "~4.0|~5.0"
},
- "time": "2015-06-30 16:10:16",
+ "time": "2017-01-23T04:29:33+00:00",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- },
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\Process\\": ""
+ "psr-4": {
+ "Cron\\": "src/Cron/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -679,55 +798,60 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
}
],
- "description": "Symfony Process Component",
- "homepage": "https://symfony.com"
+ "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+ "keywords": [
+ "cron",
+ "schedule"
+ ]
},
{
- "name": "symfony/http-foundation",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/HttpFoundation",
+ "name": "nesbot/carbon",
+ "version": "1.39.1",
+ "version_normalized": "1.39.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/http-foundation.git",
- "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c"
+ "url": "https://github.com/briannesbitt/Carbon.git",
+ "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c",
- "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4be0c005164249208ce1b5ca633cd57bdd42ff33",
+ "reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "kylekatarnls/update-helper": "^1.1",
+ "php": ">=5.3.9",
+ "symfony/translation": "~2.6 || ~3.0 || ~4.0"
},
"require-dev": {
- "symfony/expression-language": "~2.4",
- "symfony/phpunit-bridge": "~2.7"
+ "composer/composer": "^1.2",
+ "friendsofphp/php-cs-fixer": "~2",
+ "phpunit/phpunit": "^4.8.35 || ^5.7"
},
- "time": "2015-07-22 10:08:40",
+ "time": "2019-10-14T05:51:36+00:00",
+ "bin": [
+ "bin/upgrade-carbon"
+ ],
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
+ "update-helper": "Carbon\\Upgrade",
+ "laravel": {
+ "providers": [
+ "Carbon\\Laravel\\ServiceProvider"
+ ]
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\HttpFoundation\\": ""
- },
- "classmap": [
- "Symfony/Component/HttpFoundation/Resources/stubs"
- ]
+ "psr-4": {
+ "": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -735,123 +859,151 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Brian Nesbitt",
+ "email": "brian@nesbot.com",
+ "homepage": "http://nesbot.com"
}
],
- "description": "Symfony HttpFoundation Component",
- "homepage": "https://symfony.com"
+ "description": "A simple API extension for DateTime.",
+ "homepage": "http://carbon.nesbot.com",
+ "keywords": [
+ "date",
+ "datetime",
+ "time"
+ ]
},
{
- "name": "symfony/event-dispatcher",
- "version": "v2.8.0",
- "version_normalized": "2.8.0.0",
+ "name": "nikic/php-parser",
+ "version": "v2.1.1",
+ "version_normalized": "2.1.1.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc"
+ "url": "https://github.com/nikic/PHP-Parser.git",
+ "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc",
- "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4dd659edadffdc2143e4753df655d866dbfeedf0",
+ "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "ext-tokenizer": "*",
+ "php": ">=5.4"
},
"require-dev": {
- "psr/log": "~1.0",
- "symfony/config": "~2.0,>=2.0.5|~3.0.0",
- "symfony/dependency-injection": "~2.6|~3.0.0",
- "symfony/expression-language": "~2.6|~3.0.0",
- "symfony/stopwatch": "~2.3|~3.0.0"
- },
- "suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
+ "phpunit/phpunit": "~4.0"
},
- "time": "2015-10-30 20:15:42",
+ "time": "2016-09-16T12:04:44+00:00",
+ "bin": [
+ "bin/php-parse"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\EventDispatcher\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "PhpParser\\": "lib/PhpParser"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Nikita Popov"
}
],
- "description": "Symfony EventDispatcher Component",
- "homepage": "https://symfony.com"
+ "description": "A PHP parser written in PHP",
+ "keywords": [
+ "parser",
+ "php"
+ ]
},
{
- "name": "symfony/debug",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/Debug",
+ "name": "paragonie/random_compat",
+ "version": "v1.4.3",
+ "version_normalized": "1.4.3.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/debug.git",
- "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941"
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/fca5696e0c9787722baa8f2ad6940dfd7a6a6941",
- "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/9b3899e3c3ddde89016f576edb8c489708ad64cd",
+ "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "psr/log": "~1.0"
- },
- "conflict": {
- "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+ "php": ">=5.2.0"
},
"require-dev": {
- "symfony/class-loader": "~2.2",
- "symfony/http-foundation": "~2.1",
- "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
- "symfony/phpunit-bridge": "~2.7"
+ "phpunit/phpunit": "4.*|5.*"
},
"suggest": {
- "symfony/http-foundation": "",
- "symfony/http-kernel": ""
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ },
+ "time": "2018-04-04T21:48:54+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "lib/random.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "keywords": [
+ "csprng",
+ "pseudorandom",
+ "random"
+ ]
+ },
+ {
+ "name": "psr/log",
+ "version": "1.1.2",
+ "version_normalized": "1.1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
- "time": "2015-07-08 05:59:48",
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2019-11-01T11:05:21+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "1.1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\Debug\\": ""
+ "psr-4": {
+ "Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -860,78 +1012,70 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
}
],
- "description": "Symfony Debug Component",
- "homepage": "https://symfony.com"
+ "description": "Common interface for logging libraries",
+ "homepage": "https://github.com/php-fig/log",
+ "keywords": [
+ "log",
+ "psr",
+ "psr-3"
+ ]
},
{
- "name": "symfony/http-kernel",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/HttpKernel",
+ "name": "psy/psysh",
+ "version": "v0.7.2",
+ "version_normalized": "0.7.2.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/http-kernel.git",
- "reference": "498866a8ca0bcbcd3f3824b1520fa568ff7ca3b6"
+ "url": "https://github.com/bobthecow/psysh.git",
+ "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/498866a8ca0bcbcd3f3824b1520fa568ff7ca3b6",
- "reference": "498866a8ca0bcbcd3f3824b1520fa568ff7ca3b6",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e64e10b20f8d229cac76399e1f3edddb57a0f280",
+ "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "psr/log": "~1.0",
- "symfony/debug": "~2.6,>=2.6.2",
- "symfony/event-dispatcher": "~2.6,>=2.6.7",
- "symfony/http-foundation": "~2.5,>=2.5.4"
+ "dnoegel/php-xdg-base-dir": "0.1",
+ "jakub-onderka/php-console-highlighter": "0.3.*",
+ "nikic/php-parser": "^1.2.1|~2.0",
+ "php": ">=5.3.9",
+ "symfony/console": "~2.3.10|^2.4.2|~3.0",
+ "symfony/var-dumper": "~2.7|~3.0"
},
"require-dev": {
- "symfony/browser-kit": "~2.3",
- "symfony/class-loader": "~2.1",
- "symfony/config": "~2.0,>=2.0.5",
- "symfony/console": "~2.3",
- "symfony/css-selector": "~2.0,>=2.0.5",
- "symfony/dependency-injection": "~2.2",
- "symfony/dom-crawler": "~2.0,>=2.0.5",
- "symfony/expression-language": "~2.4",
- "symfony/finder": "~2.0,>=2.0.5",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.0,>=2.0.5",
- "symfony/routing": "~2.2",
- "symfony/stopwatch": "~2.3",
- "symfony/templating": "~2.2",
- "symfony/translation": "~2.0,>=2.0.5",
- "symfony/var-dumper": "~2.6"
+ "fabpot/php-cs-fixer": "~1.5",
+ "phpunit/phpunit": "~3.7|~4.0|~5.0",
+ "squizlabs/php_codesniffer": "~2.0",
+ "symfony/finder": "~2.1|~3.0"
},
"suggest": {
- "symfony/browser-kit": "",
- "symfony/class-loader": "",
- "symfony/config": "",
- "symfony/console": "",
- "symfony/dependency-injection": "",
- "symfony/finder": "",
- "symfony/var-dumper": ""
+ "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
+ "ext-pdo-sqlite": "The doc command requires SQLite to work.",
+ "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
+ "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
},
- "time": "2015-11-23 11:37:53",
+ "time": "2016-03-09T05:03:14+00:00",
+ "bin": [
+ "bin/psysh"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-develop": "0.8.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\HttpKernel\\": ""
+ "files": [
+ "src/Psy/functions.php"
+ ],
+ "psr-4": {
+ "Psy\\": "src/Psy/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -940,51 +1084,54 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Justin Hileman",
+ "email": "justin@justinhileman.info",
+ "homepage": "http://justinhileman.com"
}
],
- "description": "Symfony HttpKernel Component",
- "homepage": "https://symfony.com"
+ "description": "An interactive shell for modern PHP.",
+ "homepage": "http://psysh.org",
+ "keywords": [
+ "REPL",
+ "console",
+ "interactive",
+ "shell"
+ ]
},
{
- "name": "symfony/finder",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/Finder",
+ "name": "swiftmailer/swiftmailer",
+ "version": "v5.4.12",
+ "version_normalized": "5.4.12.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/finder.git",
- "reference": "203a10f928ae30176deeba33512999233181dd28"
+ "url": "https://github.com/swiftmailer/swiftmailer.git",
+ "reference": "181b89f18a90f8925ef805f950d47a7190e9b950"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/203a10f928ae30176deeba33512999233181dd28",
- "reference": "203a10f928ae30176deeba33512999233181dd28",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950",
+ "reference": "181b89f18a90f8925ef805f950d47a7190e9b950",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "mockery/mockery": "~0.9.1",
+ "symfony/phpunit-bridge": "~3.2"
},
- "time": "2015-07-09 16:02:48",
+ "time": "2018-07-31T09:26:32+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "5.4-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Symfony\\Component\\Finder\\": ""
- }
+ "files": [
+ "lib/swift_required.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -992,59 +1139,65 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Chris Corbyn"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
- "description": "Symfony Finder Component",
- "homepage": "https://symfony.com"
+ "description": "Swiftmailer, free feature-rich PHP mailer",
+ "homepage": "https://swiftmailer.symfony.com",
+ "keywords": [
+ "email",
+ "mail",
+ "mailer"
+ ]
},
{
"name": "symfony/console",
- "version": "v2.6.12",
- "version_normalized": "2.6.12.0",
- "target-dir": "Symfony/Component/Console",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359"
+ "reference": "574cb4cfaa01ba115fc2fc0c2355b2c5472a4804"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/0e5e18ae09d3f5c06367759be940e9ed3f568359",
- "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359",
+ "url": "https://api.github.com/repos/symfony/console/zipball/574cb4cfaa01ba115fc2fc0c2355b2c5472a4804",
+ "reference": "574cb4cfaa01ba115fc2fc0c2355b2c5472a4804",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9",
+ "symfony/debug": "^2.7.2"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1",
- "symfony/phpunit-bridge": "~2.7",
"symfony/process": "~2.1"
},
"suggest": {
- "psr/log": "For using the console logger",
+ "psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/process": ""
},
- "time": "2015-07-26 09:08:40",
+ "time": "2018-05-13T15:44:36+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Console\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1064,37 +1217,37 @@
"homepage": "https://symfony.com"
},
{
- "name": "swiftmailer/swiftmailer",
- "version": "v5.4.1",
- "version_normalized": "5.4.1.0",
+ "name": "symfony/css-selector",
+ "version": "v2.8.50",
+ "version_normalized": "2.8.50.0",
"source": {
"type": "git",
- "url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421"
+ "url": "https://github.com/symfony/css-selector.git",
+ "reference": "7b1692e418d7ccac24c373528453bc90e42797de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/7b1692e418d7ccac24c373528453bc90e42797de",
+ "reference": "7b1692e418d7ccac24c373528453bc90e42797de",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "mockery/mockery": "~0.9.1,<0.9.4"
+ "php": ">=5.3.9"
},
- "time": "2015-06-06 14:19:39",
+ "time": "2018-11-11T11:18:13+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.4-dev"
+ "dev-master": "2.8-dev"
}
},
"installation-source": "dist",
"autoload": {
- "files": [
- "lib/swift_required.php"
+ "psr-4": {
+ "Symfony\\Component\\CssSelector\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -1103,101 +1256,120 @@
],
"authors": [
{
- "name": "Chris Corbyn"
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Swiftmailer, free feature-rich PHP mailer",
- "homepage": "http://swiftmailer.org",
- "keywords": [
- "email",
- "mail",
- "mailer"
- ]
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "nikic/php-parser",
- "version": "v1.4.1",
- "version_normalized": "1.4.1.0",
+ "name": "symfony/debug",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
- "url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51"
+ "url": "https://github.com/symfony/debug.git",
+ "reference": "4a7330f29b3d215f8bacf076689f9d1c3d568681"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
- "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/4a7330f29b3d215f8bacf076689f9d1c3d568681",
+ "reference": "4a7330f29b3d215f8bacf076689f9d1c3d568681",
"shasum": ""
},
"require": {
- "ext-tokenizer": "*",
- "php": ">=5.3"
+ "php": ">=5.3.9",
+ "psr/log": "~1.0"
},
- "time": "2015-09-19 14:15:08",
+ "conflict": {
+ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+ },
+ "require-dev": {
+ "symfony/class-loader": "~2.2",
+ "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2"
+ },
+ "time": "2018-08-03T11:24:48+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "files": [
- "lib/bootstrap.php"
+ "psr-4": {
+ "Symfony\\Component\\Debug\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Nikita Popov"
- }
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
],
- "description": "A PHP parser written in PHP",
- "keywords": [
- "parser",
- "php"
- ]
+ "description": "Symfony Debug Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "jakub-onderka/php-console-highlighter",
- "version": "v0.3.2",
- "version_normalized": "0.3.2.0",
+ "name": "symfony/dom-crawler",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
+ "url": "https://github.com/symfony/dom-crawler.git",
+ "reference": "d905e1c5885735ee66af60c205429b9941f24752"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d905e1c5885735ee66af60c205429b9941f24752",
+ "reference": "d905e1c5885735ee66af60c205429b9941f24752",
"shasum": ""
},
"require": {
- "jakub-onderka/php-console-color": "~0.1",
- "php": ">=5.3.0"
+ "php": ">=5.3.9",
+ "symfony/polyfill-ctype": "~1.8"
},
"require-dev": {
- "jakub-onderka/php-code-style": "~1.0",
- "jakub-onderka/php-parallel-lint": "~0.5",
- "jakub-onderka/php-var-dump-check": "~0.1",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~1.5"
+ "symfony/css-selector": "~2.3"
},
- "time": "2015-04-20 18:58:01",
+ "suggest": {
+ "symfony/css-selector": ""
+ },
+ "time": "2018-05-01T22:30:49+00:00",
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleHighlighter": "src/"
- }
+ "psr-4": {
+ "Symfony\\Component\\DomCrawler\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1205,41 +1377,61 @@
],
"authors": [
{
- "name": "Jakub Onderka",
- "email": "acci@acci.cz",
- "homepage": "http://www.acci.cz/"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
- ]
+ ],
+ "description": "Symfony DomCrawler Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "nesbot/carbon",
- "version": "1.21.0",
- "version_normalized": "1.21.0.0",
+ "name": "symfony/event-dispatcher",
+ "version": "v2.8.50",
+ "version_normalized": "2.8.50.0",
"source": {
"type": "git",
- "url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
+ "url": "https://github.com/symfony/event-dispatcher.git",
+ "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
- "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a77e974a5fecb4398833b0709210e3d5e334ffb0",
+ "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
- "symfony/translation": "~2.6|~3.0"
+ "php": ">=5.3.9"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "psr/log": "~1.0",
+ "symfony/config": "^2.0.5|~3.0.0",
+ "symfony/dependency-injection": "~2.6|~3.0.0",
+ "symfony/expression-language": "~2.6|~3.0.0",
+ "symfony/stopwatch": "~2.3|~3.0.0"
+ },
+ "suggest": {
+ "symfony/dependency-injection": "",
+ "symfony/http-kernel": ""
},
- "time": "2015-11-04 20:07:17",
+ "time": "2018-11-21T14:20:20+00:00",
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.8-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Carbon\\": "src/Carbon/"
- }
+ "Symfony\\Component\\EventDispatcher\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1247,78 +1439,108 @@
],
"authors": [
{
- "name": "Brian Nesbitt",
- "email": "brian@nesbot.com",
- "homepage": "http://nesbot.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "A simple API extension for DateTime.",
- "homepage": "http://carbon.nesbot.com",
- "keywords": [
- "date",
- "datetime",
- "time"
- ]
+ "description": "Symfony EventDispatcher Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "monolog/monolog",
- "version": "1.17.2",
- "version_normalized": "1.17.2.0",
+ "name": "symfony/finder",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
- "url": "https://github.com/Seldaek/monolog.git",
- "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24"
+ "url": "https://github.com/symfony/finder.git",
+ "reference": "34226a3aa279f1e356ad56181b91acfdc9a2525c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
- "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/34226a3aa279f1e356ad56181b91acfdc9a2525c",
+ "reference": "34226a3aa279f1e356ad56181b91acfdc9a2525c",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
- "psr/log": "~1.0"
+ "php": ">=5.3.9"
},
- "provide": {
- "psr/log-implementation": "1.0.0"
+ "time": "2018-05-14T06:36:14+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
},
- "require-dev": {
- "aws/aws-sdk-php": "^2.4.9",
- "doctrine/couchdb": "~1.0@dev",
- "graylog2/gelf-php": "~1.0",
- "jakub-onderka/php-parallel-lint": "0.9",
- "php-console/php-console": "^3.1.3",
- "phpunit/phpunit": "~4.5",
- "phpunit/phpunit-mock-objects": "2.3.0",
- "raven/raven": "^0.13",
- "ruflin/elastica": ">=0.90 <3.0",
- "swiftmailer/swiftmailer": "~5.3",
- "videlalvaro/php-amqplib": "~2.4"
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Finder\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
- "suggest": {
- "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
- "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
- "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
- "ext-mongo": "Allow sending log messages to a MongoDB server",
- "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
- "php-console/php-console": "Allow sending log messages to Google Chrome",
- "raven/raven": "Allow sending log messages to a Sentry server",
- "rollbar/rollbar": "Allow sending log messages to Rollbar",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
- "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Finder Component",
+ "homepage": "https://symfony.com"
+ },
+ {
+ "name": "symfony/http-foundation",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/http-foundation.git",
+ "reference": "b67e5cbd2bf837fb3681f2c4965826d6c6758532"
},
- "time": "2015-10-14 12:51:02",
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b67e5cbd2bf837fb3681f2c4965826d6c6758532",
+ "reference": "b67e5cbd2bf837fb3681f2c4965826d6c6758532",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.9",
+ "symfony/polyfill-mbstring": "~1.1"
+ },
+ "require-dev": {
+ "symfony/expression-language": "~2.4"
+ },
+ "time": "2019-04-16T09:58:21+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.16.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Monolog\\": "src/Monolog"
- }
+ "Symfony\\Component\\HttpFoundation\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ],
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1326,135 +1548,199 @@
],
"authors": [
{
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
- "homepage": "http://github.com/Seldaek/monolog",
- "keywords": [
- "log",
- "logging",
- "psr-3"
- ]
+ "description": "Symfony HttpFoundation Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "league/flysystem",
- "version": "1.0.15",
- "version_normalized": "1.0.15.0",
+ "name": "symfony/http-kernel",
+ "version": "v2.7.52",
+ "version_normalized": "2.7.52.0",
"source": {
"type": "git",
- "url": "https://github.com/thephpleague/flysystem.git",
- "reference": "31525caf9e8772683672fefd8a1ca0c0736020f4"
+ "url": "https://github.com/symfony/http-kernel.git",
+ "reference": "435064b3b143f79469206915137c21e88b56bfb9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/31525caf9e8772683672fefd8a1ca0c0736020f4",
- "reference": "31525caf9e8772683672fefd8a1ca0c0736020f4",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/435064b3b143f79469206915137c21e88b56bfb9",
+ "reference": "435064b3b143f79469206915137c21e88b56bfb9",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "php": ">=5.3.9",
+ "psr/log": "~1.0",
+ "symfony/debug": "^2.6.2",
+ "symfony/event-dispatcher": "^2.6.7",
+ "symfony/http-foundation": "~2.7.36|^2.8.29",
+ "symfony/polyfill-ctype": "~1.8"
},
"conflict": {
- "league/flysystem-sftp": "<1.0.6"
+ "symfony/config": "<2.7",
+ "twig/twig": "<1.34|<2.4,>=2"
},
"require-dev": {
- "ext-fileinfo": "*",
- "mockery/mockery": "~0.9",
- "phpspec/phpspec": "^2.2",
- "phpspec/prophecy-phpunit": "~1.0",
- "phpunit/phpunit": "~4.1"
+ "symfony/browser-kit": "~2.3",
+ "symfony/class-loader": "~2.1",
+ "symfony/config": "~2.7",
+ "symfony/console": "~2.3",
+ "symfony/css-selector": "^2.0.5",
+ "symfony/dependency-injection": "~2.2",
+ "symfony/dom-crawler": "^2.0.5",
+ "symfony/expression-language": "~2.4",
+ "symfony/finder": "^2.0.5",
+ "symfony/process": "^2.0.5",
+ "symfony/routing": "~2.2",
+ "symfony/stopwatch": "~2.3",
+ "symfony/templating": "~2.2",
+ "symfony/translation": "^2.0.5",
+ "symfony/var-dumper": "~2.6"
},
"suggest": {
- "ext-fileinfo": "Required for MimeType",
- "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
- "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
- "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
- "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
- "league/flysystem-copy": "Allows you to use Copy.com storage",
- "league/flysystem-dropbox": "Allows you to use Dropbox storage",
- "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
- "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
- "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
- "league/flysystem-webdav": "Allows you to use WebDAV storage",
- "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter"
+ "symfony/browser-kit": "",
+ "symfony/class-loader": "",
+ "symfony/config": "",
+ "symfony/console": "",
+ "symfony/dependency-injection": "",
+ "symfony/finder": "",
+ "symfony/var-dumper": ""
},
- "time": "2015-09-30 22:26:59",
+ "time": "2019-04-17T16:37:53+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "League\\Flysystem\\": "src/"
+ "Symfony\\Component\\HttpKernel\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony HttpKernel Component",
+ "homepage": "https://symfony.com"
+ },
+ {
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.12.0",
+ "version_normalized": "1.12.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
+ "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
+ "time": "2019-08-06T08:03:45+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.12-dev"
}
},
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Ctype\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
- "name": "Frank de Jonge",
- "email": "info@frenky.net"
+ "name": "Gert de Pagter",
+ "email": "BackEndTea@gmail.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Filesystem abstraction: Many filesystems, one API.",
+ "description": "Symfony polyfill for ctype functions",
+ "homepage": "https://symfony.com",
"keywords": [
- "Cloud Files",
- "WebDAV",
- "abstraction",
- "aws",
- "cloud",
- "copy.com",
- "dropbox",
- "file systems",
- "files",
- "filesystem",
- "filesystems",
- "ftp",
- "rackspace",
- "remote",
- "s3",
- "sftp",
- "storage"
+ "compatibility",
+ "ctype",
+ "polyfill",
+ "portable"
]
},
{
- "name": "symfony/polyfill-util",
- "version": "v1.0.0",
- "version_normalized": "1.0.0.0",
+ "name": "symfony/polyfill-mbstring",
+ "version": "v1.12.0",
+ "version_normalized": "1.12.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-util.git",
- "reference": "4271c55cbc0a77b2641f861b978123e46b3da969"
+ "url": "https://github.com/symfony/polyfill-mbstring.git",
+ "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969",
- "reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+ "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2015-11-04 20:28:58",
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
+ "time": "2019-08-06T08:03:45+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.12-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Polyfill\\Util\\": ""
- }
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1470,39 +1756,40 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony utilities for portability of PHP codes",
+ "description": "Symfony polyfill for the Mbstring extension",
"homepage": "https://symfony.com",
"keywords": [
- "compat",
"compatibility",
+ "mbstring",
"polyfill",
+ "portable",
"shim"
]
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.0.0",
- "version_normalized": "1.0.0.0",
+ "version": "v1.12.0",
+ "version_normalized": "1.12.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "a6bd4770a6967517e6610529e14afaa3111094a3"
+ "reference": "0e3b212e96a51338639d8ce175c046d7729c3403"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3",
- "reference": "a6bd4770a6967517e6610529e14afaa3111094a3",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403",
+ "reference": "0e3b212e96a51338639d8ce175c046d7729c3403",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/polyfill-util": "~1.0"
},
- "time": "2015-11-04 20:28:58",
+ "time": "2019-08-06T08:03:45+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.12-dev"
}
},
"installation-source": "dist",
@@ -1538,39 +1825,34 @@
]
},
{
- "name": "jeremeamia/SuperClosure",
- "version": "2.2.0",
- "version_normalized": "2.2.0.0",
+ "name": "symfony/polyfill-util",
+ "version": "v1.12.0",
+ "version_normalized": "1.12.0.0",
"source": {
"type": "git",
- "url": "https://github.com/jeremeamia/super_closure.git",
- "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938"
+ "url": "https://github.com/symfony/polyfill-util.git",
+ "reference": "4317de1386717b4c22caed7725350a8887ab205c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/29a88be2a4846d27c1613aed0c9071dfad7b5938",
- "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c",
+ "reference": "4317de1386717b4c22caed7725350a8887ab205c",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^1.2|^2.0",
- "php": ">=5.4",
- "symfony/polyfill-php56": "^1.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.0|^5.0"
+ "php": ">=5.3.3"
},
- "time": "2015-12-05 17:17:57",
+ "time": "2019-08-06T08:03:45+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "1.12-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "SuperClosure\\": "src/"
+ "Symfony\\Polyfill\\Util\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1579,57 +1861,56 @@
],
"authors": [
{
- "name": "Jeremy Lindblom",
- "email": "jeremeamia@gmail.com",
- "homepage": "https://github.com/jeremeamia",
- "role": "Developer"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Serialize Closure objects, including their context and binding",
- "homepage": "https://github.com/jeremeamia/super_closure",
+ "description": "Symfony utilities for portability of PHP codes",
+ "homepage": "https://symfony.com",
"keywords": [
- "closure",
- "function",
- "lambda",
- "parser",
- "serializable",
- "serialize",
- "tokenizer"
+ "compat",
+ "compatibility",
+ "polyfill",
+ "shim"
]
},
{
- "name": "doctrine/inflector",
- "version": "v1.1.0",
- "version_normalized": "1.1.0.0",
+ "name": "symfony/process",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/inflector.git",
- "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "eda637e05670e2afeec3842dcd646dce94262f6b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
- "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+ "url": "https://api.github.com/repos/symfony/process/zipball/eda637e05670e2afeec3842dcd646dce94262f6b",
+ "reference": "eda637e05670e2afeec3842dcd646dce94262f6b",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*"
+ "php": ">=5.3.9"
},
- "time": "2015-11-06 14:35:42",
+ "time": "2018-08-03T11:24:48+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Inflector\\": "lib/"
- }
+ "psr-4": {
+ "Symfony\\Component\\Process\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1637,66 +1918,68 @@
],
"authors": [
{
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Common String Manipulations with regard to casing and singular/plural rules.",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "inflection",
- "pluralize",
- "singularize",
- "string"
- ]
+ "description": "Symfony Process Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "danielstjules/stringy",
- "version": "1.10.0",
- "version_normalized": "1.10.0.0",
+ "name": "symfony/routing",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
- "url": "https://github.com/danielstjules/Stringy.git",
- "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b"
+ "url": "https://github.com/symfony/routing.git",
+ "reference": "33bd5882f201f9a3b7dd9640b95710b71304c4fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/danielstjules/Stringy/zipball/4749c205db47ee5b32e8d1adf6d9aff8db6caf3b",
- "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/33bd5882f201f9a3b7dd9640b95710b71304c4fb",
+ "reference": "33bd5882f201f9a3b7dd9640b95710b71304c4fb",
"shasum": ""
},
"require": {
- "ext-mbstring": "*",
- "php": ">=5.3.0"
+ "php": ">=5.3.9"
+ },
+ "conflict": {
+ "symfony/config": "<2.7"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "doctrine/annotations": "~1.0",
+ "doctrine/common": "~2.2",
+ "psr/log": "~1.0",
+ "symfony/config": "~2.7",
+ "symfony/expression-language": "~2.4",
+ "symfony/http-foundation": "~2.3",
+ "symfony/yaml": "^2.0.5"
+ },
+ "suggest": {
+ "doctrine/annotations": "For using the annotation loader",
+ "symfony/config": "For using the all-in-one router or any loader",
+ "symfony/expression-language": "For using expression matching",
+ "symfony/http-foundation": "For using a Symfony Request object",
+ "symfony/yaml": "For using the YAML loader"
},
- "time": "2015-07-23 00:54:12",
+ "time": "2018-02-28T09:36:59+00:00",
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Stringy\\": "src/"
+ "Symfony\\Component\\Routing\\": ""
},
- "files": [
- "src/Create.php"
+ "exclude-from-classmap": [
+ "/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -1705,54 +1988,66 @@
],
"authors": [
{
- "name": "Daniel St. Jules",
- "email": "danielst.jules@gmail.com",
- "homepage": "http://www.danielstjules.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "A string manipulation library with multibyte support",
- "homepage": "https://github.com/danielstjules/Stringy",
+ "description": "Symfony Routing Component",
+ "homepage": "https://symfony.com",
"keywords": [
- "UTF",
- "helpers",
- "manipulation",
- "methods",
- "multibyte",
- "string",
- "utf-8",
- "utility",
- "utils"
+ "router",
+ "routing",
+ "uri",
+ "url"
]
},
{
- "name": "symfony/filesystem",
- "version": "v2.8.0",
- "version_normalized": "2.8.0.0",
+ "name": "symfony/translation",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/filesystem.git",
- "reference": "3e661a0d521ac67496515fa6e6704bd61bcfff60"
+ "url": "https://github.com/symfony/translation.git",
+ "reference": "1959c78c5a32539ef221b3e18a961a96d949118f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/3e661a0d521ac67496515fa6e6704bd61bcfff60",
- "reference": "3e661a0d521ac67496515fa6e6704bd61bcfff60",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/1959c78c5a32539ef221b3e18a961a96d949118f",
+ "reference": "1959c78c5a32539ef221b3e18a961a96d949118f",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
- "time": "2015-11-23 10:19:46",
+ "conflict": {
+ "symfony/config": "<2.7"
+ },
+ "require-dev": {
+ "psr/log": "~1.0",
+ "symfony/config": "~2.7",
+ "symfony/intl": "~2.7.25|^2.8.18",
+ "symfony/yaml": "~2.2"
+ },
+ "suggest": {
+ "psr/log-implementation": "To use logging capability in translator",
+ "symfony/config": "",
+ "symfony/yaml": ""
+ },
+ "time": "2018-05-17T10:34:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Filesystem\\": ""
+ "Symfony\\Component\\Translation\\": ""
},
"exclude-from-classmap": [
"/Tests/"
@@ -1772,49 +2067,51 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Filesystem Component",
+ "description": "Symfony Translation Component",
"homepage": "https://symfony.com"
},
{
- "name": "classpreloader/classpreloader",
- "version": "1.4.0",
- "version_normalized": "1.4.0.0",
+ "name": "symfony/var-dumper",
+ "version": "v2.7.51",
+ "version_normalized": "2.7.51.0",
"source": {
"type": "git",
- "url": "https://github.com/ClassPreloader/ClassPreloader.git",
- "reference": "b76f3f4f603ebbe7e64351a7ef973431ddaf7b27"
+ "url": "https://github.com/symfony/var-dumper.git",
+ "reference": "6f9271e94369db05807b261fcfefe4cd1aafd390"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/b76f3f4f603ebbe7e64351a7ef973431ddaf7b27",
- "reference": "b76f3f4f603ebbe7e64351a7ef973431ddaf7b27",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6f9271e94369db05807b261fcfefe4cd1aafd390",
+ "reference": "6f9271e94369db05807b261fcfefe4cd1aafd390",
"shasum": ""
},
"require": {
- "nikic/php-parser": "~1.3",
- "php": ">=5.3.3",
- "symfony/console": "~2.1",
- "symfony/filesystem": "~2.1",
- "symfony/finder": "~2.1"
+ "php": ">=5.3.9"
},
- "require-dev": {
- "phpunit/phpunit": "~4.0"
+ "conflict": {
+ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
},
- "time": "2015-05-26 10:57:51",
- "bin": [
- "classpreloader.php"
- ],
+ "suggest": {
+ "ext-symfony_debug": ""
+ },
+ "time": "2018-04-22T05:56:10+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
+ "files": [
+ "Resources/functions/dump.php"
+ ],
"psr-4": {
- "ClassPreloader\\": "src/"
- }
+ "Symfony\\Component\\VarDumper\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1822,147 +2119,67 @@
],
"authors": [
{
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
},
{
- "name": "Graham Campbell",
- "email": "graham@cachethq.io"
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case",
+ "description": "Symfony mechanism for exploring and dumping PHP variables",
+ "homepage": "https://symfony.com",
"keywords": [
- "autoload",
- "class",
- "preload"
+ "debug",
+ "dump"
]
},
{
- "name": "laravel/framework",
- "version": "v5.0.34",
- "version_normalized": "5.0.34.0",
+ "name": "vlucas/phpdotenv",
+ "version": "v1.1.1",
+ "version_normalized": "1.1.1.0",
"source": {
"type": "git",
- "url": "https://github.com/laravel/framework.git",
- "reference": "98dbaafe8e2781f86b1b858f8610be0d7318b153"
+ "url": "https://github.com/vlucas/phpdotenv.git",
+ "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/98dbaafe8e2781f86b1b858f8610be0d7318b153",
- "reference": "98dbaafe8e2781f86b1b858f8610be0d7318b153",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa",
+ "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa",
"shasum": ""
},
"require": {
- "classpreloader/classpreloader": "~1.2",
- "danielstjules/stringy": "~1.8",
- "doctrine/inflector": "~1.0",
- "ext-mbstring": "*",
- "ext-mcrypt": "*",
- "ext-openssl": "*",
- "ircmaxell/password-compat": "~1.0",
- "jeremeamia/superclosure": "~2.0",
- "league/flysystem": "~1.0",
- "monolog/monolog": "~1.11",
- "mtdowling/cron-expression": "~1.0",
- "nesbot/carbon": "~1.0",
- "php": ">=5.4.0",
- "psy/psysh": "0.4.*",
- "swiftmailer/swiftmailer": "~5.1",
- "symfony/console": "2.6.*",
- "symfony/debug": "2.6.*",
- "symfony/finder": "2.6.*",
- "symfony/http-foundation": "2.6.*",
- "symfony/http-kernel": "2.6.*",
- "symfony/process": "2.6.*",
- "symfony/routing": "2.6.*",
- "symfony/security-core": "2.6.*",
- "symfony/translation": "2.6.*",
- "symfony/var-dumper": "2.6.*",
- "vlucas/phpdotenv": "~1.0"
- },
- "replace": {
- "illuminate/auth": "self.version",
- "illuminate/bus": "self.version",
- "illuminate/cache": "self.version",
- "illuminate/config": "self.version",
- "illuminate/console": "self.version",
- "illuminate/container": "self.version",
- "illuminate/contracts": "self.version",
- "illuminate/cookie": "self.version",
- "illuminate/database": "self.version",
- "illuminate/encryption": "self.version",
- "illuminate/events": "self.version",
- "illuminate/exception": "self.version",
- "illuminate/filesystem": "self.version",
- "illuminate/foundation": "self.version",
- "illuminate/hashing": "self.version",
- "illuminate/http": "self.version",
- "illuminate/log": "self.version",
- "illuminate/mail": "self.version",
- "illuminate/pagination": "self.version",
- "illuminate/pipeline": "self.version",
- "illuminate/queue": "self.version",
- "illuminate/redis": "self.version",
- "illuminate/routing": "self.version",
- "illuminate/session": "self.version",
- "illuminate/support": "self.version",
- "illuminate/translation": "self.version",
- "illuminate/validation": "self.version",
- "illuminate/view": "self.version"
+ "php": ">=5.3.2"
},
"require-dev": {
- "aws/aws-sdk-php": "~2.4",
- "iron-io/iron_mq": "~1.5",
- "mockery/mockery": "~0.9",
- "pda/pheanstalk": "~3.0",
- "phpunit/phpunit": "~4.0",
- "predis/predis": "~1.0"
- },
- "suggest": {
- "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~2.4).",
- "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.0).",
- "iron-io/iron_mq": "Required to use the iron queue driver (~1.5).",
- "league/flysystem-aws-s3-v2": "Required to use the Flysystem S3 driver (~1.0).",
- "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
- "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
- "predis/predis": "Required to use the redis cache and queue drivers (~1.0)."
+ "phpunit/phpunit": "~4.0"
},
- "time": "2015-12-04 23:20:49",
+ "time": "2015-05-30T15:59:26+00:00",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
"installation-source": "dist",
"autoload": {
- "classmap": [
- "src/Illuminate/Queue/IlluminateQueueClosure.php"
- ],
- "files": [
- "src/Illuminate/Foundation/helpers.php",
- "src/Illuminate/Support/helpers.php"
- ],
- "psr-4": {
- "Illuminate\\": "src/Illuminate/"
+ "psr-0": {
+ "Dotenv": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD"
],
"authors": [
{
- "name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "name": "Vance Lucas",
+ "email": "vance@vancelucas.com",
+ "homepage": "http://www.vancelucas.com"
}
],
- "description": "The Laravel Framework.",
- "homepage": "http://laravel.com",
+ "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+ "homepage": "http://github.com/vlucas/phpdotenv",
"keywords": [
- "framework",
- "laravel"
+ "dotenv",
+ "env",
+ "environment"
]
}
]
diff --git a/application/vendor/doctrine/inflector/.gitignore b/application/vendor/doctrine/inflector/.gitignore
deleted file mode 100644
index f2cb7f8..0000000
--- a/application/vendor/doctrine/inflector/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor/
-composer.lock
-composer.phar
-phpunit.xml
diff --git a/application/vendor/doctrine/inflector/.travis.yml b/application/vendor/doctrine/inflector/.travis.yml
deleted file mode 100644
index 9ec68f7..0000000
--- a/application/vendor/doctrine/inflector/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: php
-
-sudo: false
-
-cache:
- directory:
- - $HOME/.composer/cache
-
-php:
- - 5.3
- - 5.4
- - 5.5
- - 5.6
- - 7.0
- - hhvm
-
-install:
- - composer install -n
-
-script:
- - phpunit
diff --git a/application/vendor/doctrine/inflector/composer.json b/application/vendor/doctrine/inflector/composer.json
index 7e5b2ef..2189ff1 100644
--- a/application/vendor/doctrine/inflector/composer.json
+++ b/application/vendor/doctrine/inflector/composer.json
@@ -13,17 +13,20 @@
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
],
"require": {
- "php": ">=5.3.2"
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^6.2"
},
"autoload": {
- "psr-0": { "Doctrine\\Common\\Inflector\\": "lib/" }
+ "psr-4": { "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" }
+ },
+ "autoload-dev": {
+ "psr-4": { "Doctrine\\Tests\\Common\\Inflector\\": "tests/Doctrine/Tests/Common/Inflector" }
},
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.3.x-dev"
}
}
}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php b/application/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
index a53828a..f9067a0 100644
--- a/application/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
@@ -38,7 +38,7 @@ class Inflector
/**
* Plural inflector rules.
*
- * @var array
+ * @var string[][]
*/
private static $plural = array(
'rules' => array(
@@ -49,10 +49,11 @@ class Inflector
'/(matr|vert|ind)(ix|ex)$/i' => '\1ices',
'/(x|ch|ss|sh)$/i' => '\1es',
'/([^aeiouy]|qu)y$/i' => '\1ies',
- '/(hive)$/i' => '\1s',
+ '/(hive|gulf)$/i' => '\1s',
'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
'/sis$/i' => 'ses',
'/([ti])um$/i' => '\1a',
+ '/(c)riterion$/i' => '\1riteria',
'/(p)erson$/i' => '\1eople',
'/(m)an$/i' => '\1en',
'/(c)hild$/i' => '\1hildren',
@@ -67,7 +68,16 @@ class Inflector
'/$/' => 's',
),
'uninflected' => array(
- '.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people', 'cookie'
+ '.*[nrlm]ese',
+ '.*deer',
+ '.*fish',
+ '.*measles',
+ '.*ois',
+ '.*pox',
+ '.*sheep',
+ 'people',
+ 'cookie',
+ 'police',
),
'irregular' => array(
'atlas' => 'atlases',
@@ -76,6 +86,7 @@ class Inflector
'brother' => 'brothers',
'cafe' => 'cafes',
'chateau' => 'chateaux',
+ 'niveau' => 'niveaux',
'child' => 'children',
'cookie' => 'cookies',
'corpus' => 'corpuses',
@@ -90,11 +101,13 @@ class Inflector
'ganglion' => 'ganglions',
'genie' => 'genies',
'genus' => 'genera',
+ 'goose' => 'geese',
'graffito' => 'graffiti',
'hippopotamus' => 'hippopotami',
'hoof' => 'hoofs',
'human' => 'humans',
'iris' => 'irises',
+ 'larva' => 'larvae',
'leaf' => 'leaves',
'loaf' => 'loaves',
'man' => 'men',
@@ -112,6 +125,7 @@ class Inflector
'octopus' => 'octopuses',
'opus' => 'opuses',
'ox' => 'oxen',
+ 'passerby' => 'passersby',
'penis' => 'penises',
'person' => 'people',
'plateau' => 'plateaux',
@@ -126,6 +140,7 @@ class Inflector
'tornado' => 'tornadoes',
'trilby' => 'trilbys',
'turf' => 'turfs',
+ 'valve' => 'valves',
'volcano' => 'volcanoes',
)
);
@@ -133,7 +148,7 @@ class Inflector
/**
* Singular inflector rules.
*
- * @var array
+ * @var string[][]
*/
private static $singular = array(
'rules' => array(
@@ -161,9 +176,12 @@ class Inflector
'/(tive)s$/i' => '\1',
'/(hive)s$/i' => '\1',
'/(drive)s$/i' => '\1',
+ '/(dive)s$/i' => '\1',
+ '/(olive)s$/i' => '\1',
'/([^fo])ves$/i' => '\1fe',
'/(^analy)ses$/i' => '\1sis',
'/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+ '/(c)riteria$/i' => '\1riterion',
'/([ti])a$/i' => '\1um',
'/(p)eople$/i' => '\1\2erson',
'/(m)en$/i' => '\1an',
@@ -183,17 +201,27 @@ class Inflector
'.*pox',
'.*sheep',
'.*ss',
+ 'data',
+ 'police',
+ 'pants',
+ 'clothes',
),
'irregular' => array(
- 'criteria' => 'criterion',
- 'curves' => 'curve',
- 'emphases' => 'emphasis',
- 'foes' => 'foe',
- 'hoaxes' => 'hoax',
- 'media' => 'medium',
- 'neuroses' => 'neurosis',
- 'waves' => 'wave',
- 'oases' => 'oasis',
+ 'abuses' => 'abuse',
+ 'avalanches' => 'avalanche',
+ 'caches' => 'cache',
+ 'criteria' => 'criterion',
+ 'curves' => 'curve',
+ 'emphases' => 'emphasis',
+ 'foes' => 'foe',
+ 'geese' => 'goose',
+ 'graves' => 'grave',
+ 'hoaxes' => 'hoax',
+ 'media' => 'medium',
+ 'neuroses' => 'neurosis',
+ 'waves' => 'wave',
+ 'oases' => 'oasis',
+ 'valves' => 'valve',
)
);
@@ -203,18 +231,18 @@ class Inflector
* @var array
*/
private static $uninflected = array(
- 'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
- 'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
- 'debris', 'diabetes', 'djinn', 'eland', 'elk', 'equipment', 'Faroese', 'flounder',
- 'Foochowese', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti',
- 'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings',
- 'jackanapes', 'Kiplingese', 'Kongoese', 'Lucchese', 'mackerel', 'Maltese', '.*?media',
- 'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese',
- 'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese',
- 'proceedings', 'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors',
- 'sea[- ]bass', 'series', 'Shavese', 'shears', 'siemens', 'species', 'staff', 'swine',
- 'testes', 'trousers', 'trout', 'tuna', 'Vermontese', 'Wenchowese', 'whiting',
- 'wildebeest', 'Yengeese'
+ '.*?media', 'Amoyese', 'audio', 'bison', 'Borghese', 'bream', 'breeches',
+ 'britches', 'buffalo', 'cantus', 'carp', 'chassis', 'clippers', 'cod', 'coitus', 'compensation', 'Congoese',
+ 'contretemps', 'coreopsis', 'corps', 'data', 'debris', 'deer', 'diabetes', 'djinn', 'education', 'eland',
+ 'elk', 'emoji', 'equipment', 'evidence', 'Faroese', 'feedback', 'fish', 'flounder', 'Foochowese',
+ 'Furniture', 'furniture', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'gold',
+ 'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings', 'jackanapes', 'jedi',
+ 'Kiplingese', 'knowledge', 'Kongoese', 'love', 'Lucchese', 'Luggage', 'mackerel', 'Maltese', 'metadata',
+ 'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese', 'nutrition', 'offspring',
+ 'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'plankton', 'pliers', 'pokemon', 'police', 'Portuguese',
+ 'proceedings', 'rabies', 'rain', 'rhinoceros', 'rice', 'salmon', 'Sarawakese', 'scissors', 'sea[- ]bass',
+ 'series', 'Shavese', 'shears', 'sheep', 'siemens', 'species', 'staff', 'swine', 'traffic',
+ 'trousers', 'trout', 'tuna', 'us', 'Vermontese', 'Wenchowese', 'wheat', 'whiting', 'wildebeest', 'Yengeese'
);
/**
@@ -233,36 +261,24 @@ class Inflector
/**
* Converts a word into the format for a Doctrine table name. Converts 'ModelName' to 'model_name'.
- *
- * @param string $word The word to tableize.
- *
- * @return string The tableized word.
*/
- public static function tableize($word)
+ public static function tableize(string $word) : string
{
return strtolower(preg_replace('~(?<=\\w)([A-Z])~', '_$1', $word));
}
/**
* Converts a word into the format for a Doctrine class name. Converts 'table_name' to 'TableName'.
- *
- * @param string $word The word to classify.
- *
- * @return string The classified word.
*/
- public static function classify($word)
+ public static function classify(string $word) : string
{
- return str_replace(" ", "", ucwords(strtr($word, "_-", " ")));
+ return str_replace([' ', '_', '-'], '', ucwords($word, ' _-'));
}
/**
* Camelizes a word. This uses the classify() method and turns the first character to lowercase.
- *
- * @param string $word The word to camelize.
- *
- * @return string The camelized word.
*/
- public static function camelize($word)
+ public static function camelize(string $word) : string
{
return lcfirst(self::classify($word));
}
@@ -271,7 +287,7 @@ public static function camelize($word)
* Uppercases words with configurable delimeters between words.
*
* Takes a string and capitalizes all of the words, like PHP's built-in
- * ucwords function. This extends that behavior, however, by allowing the
+ * ucwords function. This extends that behavior, however, by allowing the
* word delimeters to be configured, rather than only separating on
* whitespace.
*
@@ -292,24 +308,16 @@ public static function camelize($word)
*
* @return string The string with all delimeter-separated words capitalized.
*/
- public static function ucwords($string, $delimiters = " \n\t\r\0\x0B-")
+ public static function ucwords(string $string, string $delimiters = " \n\t\r\0\x0B-") : string
{
- return preg_replace_callback(
- '/[^' . preg_quote($delimiters, '/') . ']+/',
- function($matches) {
- return ucfirst($matches[0]);
- },
- $string
- );
+ return ucwords($string, $delimiters);
}
/**
* Clears Inflectors inflected value caches, and resets the inflection
* rules to the initial values.
- *
- * @return void
*/
- public static function reset()
+ public static function reset() : void
{
if (empty(self::$initialState)) {
self::$initialState = get_class_vars('Inflector');
@@ -318,7 +326,7 @@ public static function reset()
}
foreach (self::$initialState as $key => $val) {
- if ($key != 'initialState') {
+ if ($key !== 'initialState') {
self::${$key} = $val;
}
}
@@ -338,14 +346,14 @@ public static function reset()
* ));
* }}}
*
- * @param string $type The type of inflection, either 'plural' or 'singular'
- * @param array $rules An array of rules to be added.
- * @param boolean $reset If true, will unset default inflections for all
- * new rules that are being defined in $rules.
+ * @param string $type The type of inflection, either 'plural' or 'singular'
+ * @param array|iterable $rules An array of rules to be added.
+ * @param boolean $reset If true, will unset default inflections for all
+ * new rules that are being defined in $rules.
*
* @return void
*/
- public static function rules($type, $rules, $reset = false)
+ public static function rules(string $type, iterable $rules, bool $reset = false) : void
{
foreach ($rules as $rule => $pattern) {
if ( ! is_array($pattern)) {
@@ -383,7 +391,7 @@ public static function rules($type, $rules, $reset = false)
*
* @return string The word in plural form.
*/
- public static function pluralize($word)
+ public static function pluralize(string $word) : string
{
if (isset(self::$cache['pluralize'][$word])) {
return self::$cache['pluralize'][$word];
@@ -403,8 +411,8 @@ public static function pluralize($word)
}
if (preg_match('/(.*)\\b(' . self::$plural['cacheIrregular'] . ')$/i', $word, $regs)) {
- self::$cache['pluralize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1);
-
+ self::$cache['pluralize'][$word] = $regs[1] . $word[0] . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1);
+
return self::$cache['pluralize'][$word];
}
@@ -430,7 +438,7 @@ public static function pluralize($word)
*
* @return string The word in singular form.
*/
- public static function singularize($word)
+ public static function singularize(string $word) : string
{
if (isset(self::$cache['singularize'][$word])) {
return self::$cache['singularize'][$word];
@@ -451,13 +459,13 @@ public static function singularize($word)
}
if (!isset(self::$singular['cacheUninflected']) || !isset(self::$singular['cacheIrregular'])) {
- self::$singular['cacheUninflected'] = '(?:' . join('|', self::$singular['merged']['uninflected']) . ')';
- self::$singular['cacheIrregular'] = '(?:' . join('|', array_keys(self::$singular['merged']['irregular'])) . ')';
+ self::$singular['cacheUninflected'] = '(?:' . implode('|', self::$singular['merged']['uninflected']) . ')';
+ self::$singular['cacheIrregular'] = '(?:' . implode('|', array_keys(self::$singular['merged']['irregular'])) . ')';
}
if (preg_match('/(.*)\\b(' . self::$singular['cacheIrregular'] . ')$/i', $word, $regs)) {
- self::$cache['singularize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1);
-
+ self::$cache['singularize'][$word] = $regs[1] . $word[0] . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1);
+
return self::$cache['singularize'][$word];
}
diff --git a/application/vendor/doctrine/inflector/phpunit.xml.dist b/application/vendor/doctrine/inflector/phpunit.xml.dist
deleted file mode 100644
index ef07faa..0000000
--- a/application/vendor/doctrine/inflector/phpunit.xml.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
- ./tests/Doctrine/
-
-
-
-
-
- ./lib/Doctrine/
-
-
-
-
-
- performance
-
-
-
diff --git a/application/vendor/doctrine/inflector/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php b/application/vendor/doctrine/inflector/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php
deleted file mode 100644
index 4198d22..0000000
--- a/application/vendor/doctrine/inflector/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php
+++ /dev/null
@@ -1,309 +0,0 @@
-assertEquals(
- $singular,
- Inflector::singularize($plural),
- "'$plural' should be singularized to '$singular'"
- );
- }
-
- /**
- * testInflectingPlurals method
- *
- * @dataProvider dataSampleWords
- * @return void
- */
- public function testInflectingPlurals($singular, $plural)
- {
- $this->assertEquals(
- $plural,
- Inflector::pluralize($singular),
- "'$singular' should be pluralized to '$plural'"
- );
- }
-
- /**
- * testCustomPluralRule method
- *
- * @return void
- */
- public function testCustomPluralRule()
- {
- Inflector::reset();
- Inflector::rules('plural', array('/^(custom)$/i' => '\1izables'));
-
- $this->assertEquals(Inflector::pluralize('custom'), 'customizables');
-
- Inflector::rules('plural', array('uninflected' => array('uninflectable')));
-
- $this->assertEquals(Inflector::pluralize('uninflectable'), 'uninflectable');
-
- Inflector::rules('plural', array(
- 'rules' => array('/^(alert)$/i' => '\1ables'),
- 'uninflected' => array('noflect', 'abtuse'),
- 'irregular' => array('amaze' => 'amazable', 'phone' => 'phonezes')
- ));
-
- $this->assertEquals(Inflector::pluralize('noflect'), 'noflect');
- $this->assertEquals(Inflector::pluralize('abtuse'), 'abtuse');
- $this->assertEquals(Inflector::pluralize('alert'), 'alertables');
- $this->assertEquals(Inflector::pluralize('amaze'), 'amazable');
- $this->assertEquals(Inflector::pluralize('phone'), 'phonezes');
- }
-
- /**
- * testCustomSingularRule method
- *
- * @return void
- */
- public function testCustomSingularRule()
- {
- Inflector::reset();
- Inflector::rules('singular', array('/(eple)r$/i' => '\1', '/(jente)r$/i' => '\1'));
-
- $this->assertEquals(Inflector::singularize('epler'), 'eple');
- $this->assertEquals(Inflector::singularize('jenter'), 'jente');
-
- Inflector::rules('singular', array(
- 'rules' => array('/^(bil)er$/i' => '\1', '/^(inflec|contribu)tors$/i' => '\1ta'),
- 'uninflected' => array('singulars'),
- 'irregular' => array('spins' => 'spinor')
- ));
-
- $this->assertEquals(Inflector::singularize('inflectors'), 'inflecta');
- $this->assertEquals(Inflector::singularize('contributors'), 'contributa');
- $this->assertEquals(Inflector::singularize('spins'), 'spinor');
- $this->assertEquals(Inflector::singularize('singulars'), 'singulars');
- }
-
- /**
- * test that setting new rules clears the inflector caches.
- *
- * @return void
- */
- public function testRulesClearsCaches()
- {
- Inflector::reset();
-
- $this->assertEquals(Inflector::singularize('Bananas'), 'Banana');
- $this->assertEquals(Inflector::pluralize('Banana'), 'Bananas');
-
- Inflector::rules('singular', array(
- 'rules' => array('/(.*)nas$/i' => '\1zzz')
- ));
-
- $this->assertEquals('Banazzz', Inflector::singularize('Bananas'), 'Was inflected with old rules.');
-
- Inflector::rules('plural', array(
- 'rules' => array('/(.*)na$/i' => '\1zzz'),
- 'irregular' => array('corpus' => 'corpora')
- ));
-
- $this->assertEquals(Inflector::pluralize('Banana'), 'Banazzz', 'Was inflected with old rules.');
- $this->assertEquals(Inflector::pluralize('corpus'), 'corpora', 'Was inflected with old irregular form.');
- }
-
- /**
- * Test resetting inflection rules.
- *
- * @return void
- */
- public function testCustomRuleWithReset()
- {
- Inflector::reset();
-
- $uninflected = array('atlas', 'lapis', 'onibus', 'pires', 'virus', '.*x');
- $pluralIrregular = array('as' => 'ases');
-
- Inflector::rules('singular', array(
- 'rules' => array('/^(.*)(a|e|o|u)is$/i' => '\1\2l'),
- 'uninflected' => $uninflected,
- ), true);
-
- Inflector::rules('plural', array(
- 'rules' => array(
- '/^(.*)(a|e|o|u)l$/i' => '\1\2is',
- ),
- 'uninflected' => $uninflected,
- 'irregular' => $pluralIrregular
- ), true);
-
- $this->assertEquals(Inflector::pluralize('Alcool'), 'Alcoois');
- $this->assertEquals(Inflector::pluralize('Atlas'), 'Atlas');
- $this->assertEquals(Inflector::singularize('Alcoois'), 'Alcool');
- $this->assertEquals(Inflector::singularize('Atlas'), 'Atlas');
- }
-
- /**
- * Test basic ucwords functionality.
- *
- * @return void
- */
- public function testUcwords()
- {
- $this->assertSame('Top-O-The-Morning To All_of_you!', Inflector::ucwords( 'top-o-the-morning to all_of_you!'));
- }
-
- /**
- * Test ucwords functionality with custom delimeters.
- *
- * @return void
- */
- public function testUcwordsWithCustomDelimeters()
- {
- $this->assertSame('Top-O-The-Morning To All_Of_You!', Inflector::ucwords( 'top-o-the-morning to all_of_you!', '-_ '));
- }
-}
-
diff --git a/application/vendor/doctrine/inflector/tests/Doctrine/Tests/DoctrineTestCase.php b/application/vendor/doctrine/inflector/tests/Doctrine/Tests/DoctrineTestCase.php
deleted file mode 100644
index e8323d2..0000000
--- a/application/vendor/doctrine/inflector/tests/Doctrine/Tests/DoctrineTestCase.php
+++ /dev/null
@@ -1,10 +0,0 @@
-url = $url;
- $this->html = $html;
- $this->csrfToken = $csrfToken;
- }
-
- /**
- * Open up a new HTML form.
- *
- * @param array $options
- * @return string
- */
- public function open(array $options = array())
- {
- $method = array_get($options, 'method', 'post');
-
- // We need to extract the proper method from the attributes. If the method is
- // something other than GET or POST we'll use POST since we will spoof the
- // actual method since forms don't support the reserved methods in HTML.
- $attributes['method'] = $this->getMethod($method);
-
- $attributes['action'] = $this->getAction($options);
-
- $attributes['accept-charset'] = 'UTF-8';
-
- // If the method is PUT, PATCH or DELETE we will need to add a spoofer hidden
- // field that will instruct the Symfony request to pretend the method is a
- // different method than it actually is, for convenience from the forms.
- $append = $this->getAppendage($method);
-
- if (isset($options['files']) && $options['files'])
- {
- $options['enctype'] = 'multipart/form-data';
- }
-
- // Finally we're ready to create the final form HTML field. We will attribute
- // format the array of attributes. We will also add on the appendage which
- // is used to spoof requests for this PUT, PATCH, etc. methods on forms.
- $attributes = array_merge(
-
- $attributes, array_except($options, $this->reserved)
-
- );
-
- // Finally, we will concatenate all of the attributes into a single string so
- // we can build out the final form open statement. We'll also append on an
- // extra value for the hidden _method field if it's needed for the form.
- $attributes = $this->html->attributes($attributes);
-
- return ''.$append;
- }
-
- /**
- * Create a new model based form builder.
- *
- * @param mixed $model
- * @param array $options
- * @return string
- */
- public function model($model, array $options = array())
- {
- $this->model = $model;
-
- return $this->open($options);
- }
-
- /**
- * Set the model instance on the form builder.
- *
- * @param mixed $model
- * @return void
- */
- public function setModel($model)
- {
- $this->model = $model;
- }
-
- /**
- * Close the current form.
- *
- * @return string
- */
- public function close()
- {
- $this->labels = array();
-
- $this->model = null;
-
- return '';
- }
-
- /**
- * Generate a hidden field with the current CSRF token.
- *
- * @return string
- */
- public function token()
- {
- $token = ! empty($this->csrfToken) ? $this->csrfToken : $this->session->getToken();
-
- return $this->hidden('_token', $token);
- }
-
- /**
- * Create a form label element.
- *
- * @param string $name
- * @param string $value
- * @param array $options
- * @return string
- */
- public function label($name, $value = null, $options = array())
- {
- $this->labels[] = $name;
-
- $options = $this->html->attributes($options);
-
- $value = e($this->formatLabel($name, $value));
-
- return '';
- }
-
- /**
- * Format the label value.
- *
- * @param string $name
- * @param string|null $value
- * @return string
- */
- protected function formatLabel($name, $value)
- {
- return $value ?: ucwords(str_replace('_', ' ', $name));
- }
-
- /**
- * Create a form input field.
- *
- * @param string $type
- * @param string $name
- * @param string $value
- * @param array $options
- * @return string
- */
- public function input($type, $name, $value = null, $options = array())
- {
- if ( ! isset($options['name'])) $options['name'] = $name;
-
- // We will get the appropriate value for the given field. We will look for the
- // value in the session for the value in the old input data then we'll look
- // in the model instance if one is set. Otherwise we will just use empty.
- $id = $this->getIdAttribute($name, $options);
-
- if ( ! in_array($type, $this->skipValueTypes))
- {
- $value = $this->getValueAttribute($name, $value);
- }
-
- // Once we have the type, value, and ID we can merge them into the rest of the
- // attributes array so we can convert them into their HTML attribute format
- // when creating the HTML element. Then, we will return the entire input.
- $merge = compact('type', 'value', 'id');
-
- $options = array_merge($options, $merge);
-
- return 'html->attributes($options).'>';
- }
-
- /**
- * Create a text input field.
- *
- * @param string $name
- * @param string $value
- * @param array $options
- * @return string
- */
- public function text($name, $value = null, $options = array())
- {
- return $this->input('text', $name, $value, $options);
- }
-
- /**
- * Create a password input field.
- *
- * @param string $name
- * @param array $options
- * @return string
- */
- public function password($name, $options = array())
- {
- return $this->input('password', $name, '', $options);
- }
-
- /**
- * Create a hidden input field.
- *
- * @param string $name
- * @param string $value
- * @param array $options
- * @return string
- */
- public function hidden($name, $value = null, $options = array())
- {
- return $this->input('hidden', $name, $value, $options);
- }
-
- /**
- * Create an e-mail input field.
- *
- * @param string $name
- * @param string $value
- * @param array $options
- * @return string
- */
- public function email($name, $value = null, $options = array())
- {
- return $this->input('email', $name, $value, $options);
- }
-
- /**
- * Create a url input field.
- *
- * @param string $name
- * @param string $value
- * @param array $options
- * @return string
- */
- public function url($name, $value = null, $options = array())
- {
- return $this->input('url', $name, $value, $options);
- }
-
- /**
- * Create a file input field.
- *
- * @param string $name
- * @param array $options
- * @return string
- */
- public function file($name, $options = array())
- {
- return $this->input('file', $name, null, $options);
- }
-
- /**
- * Create a textarea input field.
- *
- * @param string $name
- * @param string $value
- * @param array $options
- * @return string
- */
- public function textarea($name, $value = null, $options = array())
- {
- if ( ! isset($options['name'])) $options['name'] = $name;
-
- // Next we will look for the rows and cols attributes, as each of these are put
- // on the textarea element definition. If they are not present, we will just
- // assume some sane default values for these attributes for the developer.
- $options = $this->setTextAreaSize($options);
-
- $options['id'] = $this->getIdAttribute($name, $options);
-
- $value = (string) $this->getValueAttribute($name, $value);
-
- unset($options['size']);
-
- // Next we will convert the attributes into a string form. Also we have removed
- // the size attribute, as it was merely a short-cut for the rows and cols on
- // the element. Then we'll create the final textarea elements HTML for us.
- $options = $this->html->attributes($options);
-
- return ''.e($value).'';
- }
-
- /**
- * Set the text area size on the attributes.
- *
- * @param array $options
- * @return array
- */
- protected function setTextAreaSize($options)
- {
- if (isset($options['size']))
- {
- return $this->setQuickTextAreaSize($options);
- }
-
- // If the "size" attribute was not specified, we will just look for the regular
- // columns and rows attributes, using sane defaults if these do not exist on
- // the attributes array. We'll then return this entire options array back.
- $cols = array_get($options, 'cols', 50);
-
- $rows = array_get($options, 'rows', 10);
-
- return array_merge($options, compact('cols', 'rows'));
- }
-
- /**
- * Set the text area size using the quick "size" attribute.
- *
- * @param array $options
- * @return array
- */
- protected function setQuickTextAreaSize($options)
- {
- $segments = explode('x', $options['size']);
-
- return array_merge($options, array('cols' => $segments[0], 'rows' => $segments[1]));
- }
-
- /**
- * Create a select box field.
- *
- * @param string $name
- * @param array $list
- * @param string $selected
- * @param array $options
- * @return string
- */
- public function select($name, $list = array(), $selected = null, $options = array())
- {
- // When building a select box the "value" attribute is really the selected one
- // so we will use that when checking the model or session for a value which
- // should provide a convenient method of re-populating the forms on post.
- $selected = $this->getValueAttribute($name, $selected);
-
- $options['id'] = $this->getIdAttribute($name, $options);
-
- if ( ! isset($options['name'])) $options['name'] = $name;
-
- // We will simply loop through the options and build an HTML value for each of
- // them until we have an array of HTML declarations. Then we will join them
- // all together into one single HTML element that can be put on the form.
- $html = array();
-
- foreach ($list as $value => $display)
- {
- $html[] = $this->getSelectOption($display, $value, $selected);
- }
-
- // Once we have all of this HTML, we can join this into a single element after
- // formatting the attributes into an HTML "attributes" string, then we will
- // build out a final select statement, which will contain all the values.
- $options = $this->html->attributes($options);
-
- $list = implode('', $html);
-
- return "{$list}";
- }
-
- /**
- * Create a select range field.
- *
- * @param string $name
- * @param string $begin
- * @param string $end
- * @param string $selected
- * @param array $options
- * @return string
- */
- public function selectRange($name, $begin, $end, $selected = null, $options = array())
- {
- $range = array_combine($range = range($begin, $end), $range);
-
- return $this->select($name, $range, $selected, $options);
- }
-
- /**
- * Create a select year field.
- *
- * @param string $name
- * @param string $begin
- * @param string $end
- * @param string $selected
- * @param array $options
- * @return string
- */
- public function selectYear()
- {
- return call_user_func_array(array($this, 'selectRange'), func_get_args());
- }
-
- /**
- * Create a select month field.
- *
- * @param string $name
- * @param string $selected
- * @param array $options
- * @param string $format
- * @return string
- */
- public function selectMonth($name, $selected = null, $options = array(), $format = '%B')
- {
- $months = array();
-
- foreach (range(1, 12) as $month)
- {
- $months[$month] = strftime($format, mktime(0, 0, 0, $month, 1));
- }
-
- return $this->select($name, $months, $selected, $options);
- }
-
- /**
- * Get the select option for the given value.
- *
- * @param string $display
- * @param string $value
- * @param string $selected
- * @return string
- */
- public function getSelectOption($display, $value, $selected)
- {
- if (is_array($display))
- {
- return $this->optionGroup($display, $value, $selected);
- }
-
- return $this->option($display, $value, $selected);
- }
-
- /**
- * Create an option group form element.
- *
- * @param array $list
- * @param string $label
- * @param string $selected
- * @return string
- */
- protected function optionGroup($list, $label, $selected)
- {
- $html = array();
-
- foreach ($list as $value => $display)
- {
- $html[] = $this->option($display, $value, $selected);
- }
-
- return '';
- }
-
- /**
- * Create a select element option.
- *
- * @param string $display
- * @param string $value
- * @param string $selected
- * @return string
- */
- protected function option($display, $value, $selected)
- {
- $selected = $this->getSelectedValue($value, $selected);
-
- $options = array('value' => e($value), 'selected' => $selected);
-
- return 'html->attributes($options).'>'.e($display).'';
- }
-
- /**
- * Determine if the value is selected.
- *
- * @param string $value
- * @param string $selected
- * @return string
- */
- protected function getSelectedValue($value, $selected)
- {
- if (is_array($selected))
- {
- return in_array($value, $selected) ? 'selected' : null;
- }
-
- return ((string) $value == (string) $selected) ? 'selected' : null;
- }
-
- /**
- * Create a checkbox input field.
- *
- * @param string $name
- * @param mixed $value
- * @param bool $checked
- * @param array $options
- * @return string
- */
- public function checkbox($name, $value = 1, $checked = null, $options = array())
- {
- return $this->checkable('checkbox', $name, $value, $checked, $options);
- }
-
- /**
- * Create a radio button input field.
- *
- * @param string $name
- * @param mixed $value
- * @param bool $checked
- * @param array $options
- * @return string
- */
- public function radio($name, $value = null, $checked = null, $options = array())
- {
- if (is_null($value)) $value = $name;
-
- return $this->checkable('radio', $name, $value, $checked, $options);
- }
-
- /**
- * Create a checkable input field.
- *
- * @param string $type
- * @param string $name
- * @param mixed $value
- * @param bool $checked
- * @param array $options
- * @return string
- */
- protected function checkable($type, $name, $value, $checked, $options)
- {
- $checked = $this->getCheckedState($type, $name, $value, $checked);
-
- if ($checked) $options['checked'] = 'checked';
-
- return $this->input($type, $name, $value, $options);
- }
-
- /**
- * Get the check state for a checkable input.
- *
- * @param string $type
- * @param string $name
- * @param mixed $value
- * @param bool $checked
- * @return bool
- */
- protected function getCheckedState($type, $name, $value, $checked)
- {
- switch ($type)
- {
- case 'checkbox':
- return $this->getCheckboxCheckedState($name, $value, $checked);
-
- case 'radio':
- return $this->getRadioCheckedState($name, $value, $checked);
-
- default:
- return $this->getValueAttribute($name) == $value;
- }
- }
-
- /**
- * Get the check state for a checkbox input.
- *
- * @param string $name
- * @param mixed $value
- * @param bool $checked
- * @return bool
- */
- protected function getCheckboxCheckedState($name, $value, $checked)
- {
- if (isset($this->session) && ! $this->oldInputIsEmpty() && is_null($this->old($name))) return false;
-
- if ($this->missingOldAndModel($name)) return $checked;
-
- $posted = $this->getValueAttribute($name);
-
- return is_array($posted) ? in_array($value, $posted) : (bool) $posted;
- }
-
- /**
- * Get the check state for a radio input.
- *
- * @param string $name
- * @param mixed $value
- * @param bool $checked
- * @return bool
- */
- protected function getRadioCheckedState($name, $value, $checked)
- {
- if ($this->missingOldAndModel($name)) return $checked;
-
- return $this->getValueAttribute($name) == $value;
- }
-
- /**
- * Determine if old input or model input exists for a key.
- *
- * @param string $name
- * @return bool
- */
- protected function missingOldAndModel($name)
- {
- return (is_null($this->old($name)) && is_null($this->getModelValueAttribute($name)));
- }
-
- /**
- * Create a HTML reset input element.
- *
- * @param string $value
- * @param array $attributes
- * @return string
- */
- public function reset($value, $attributes = array())
- {
- return $this->input('reset', null, $value, $attributes);
- }
-
- /**
- * Create a HTML image input element.
- *
- * @param string $url
- * @param string $name
- * @param array $attributes
- * @return string
- */
- public function image($url, $name = null, $attributes = array())
- {
- $attributes['src'] = $this->url->asset($url);
-
- return $this->input('image', $name, null, $attributes);
- }
-
- /**
- * Create a submit button element.
- *
- * @param string $value
- * @param array $options
- * @return string
- */
- public function submit($value = null, $options = array())
- {
- return $this->input('submit', null, $value, $options);
- }
-
- /**
- * Create a button element.
- *
- * @param string $value
- * @param array $options
- * @return string
- */
- public function button($value = null, $options = array())
- {
- if ( ! array_key_exists('type', $options))
- {
- $options['type'] = 'button';
- }
-
- return 'html->attributes($options).'>'.$value.'';
- }
-
- /**
- * Parse the form action method.
- *
- * @param string $method
- * @return string
- */
- protected function getMethod($method)
- {
- $method = strtoupper($method);
-
- return $method != 'GET' ? 'POST' : $method;
- }
-
- /**
- * Get the form action from the options.
- *
- * @param array $options
- * @return string
- */
- protected function getAction(array $options)
- {
- // We will also check for a "route" or "action" parameter on the array so that
- // developers can easily specify a route or controller action when creating
- // a form providing a convenient interface for creating the form actions.
- if (isset($options['url']))
- {
- return $this->getUrlAction($options['url']);
- }
-
- if (isset($options['route']))
- {
- return $this->getRouteAction($options['route']);
- }
-
- // If an action is available, we are attempting to open a form to a controller
- // action route. So, we will use the URL generator to get the path to these
- // actions and return them from the method. Otherwise, we'll use current.
- elseif (isset($options['action']))
- {
- return $this->getControllerAction($options['action']);
- }
-
- return $this->url->current();
- }
-
- /**
- * Get the action for a "url" option.
- *
- * @param array|string $options
- * @return string
- */
- protected function getUrlAction($options)
- {
- if (is_array($options))
- {
- return $this->url->to($options[0], array_slice($options, 1));
- }
-
- return $this->url->to($options);
- }
-
- /**
- * Get the action for a "route" option.
- *
- * @param array|string $options
- * @return string
- */
- protected function getRouteAction($options)
- {
- if (is_array($options))
- {
- return $this->url->route($options[0], array_slice($options, 1));
- }
-
- return $this->url->route($options);
- }
-
- /**
- * Get the action for an "action" option.
- *
- * @param array|string $options
- * @return string
- */
- protected function getControllerAction($options)
- {
- if (is_array($options))
- {
- return $this->url->action($options[0], array_slice($options, 1));
- }
-
- return $this->url->action($options);
- }
-
- /**
- * Get the form appendage for the given method.
- *
- * @param string $method
- * @return string
- */
- protected function getAppendage($method)
- {
- list($method, $appendage) = array(strtoupper($method), '');
-
- // If the HTTP method is in this list of spoofed methods, we will attach the
- // method spoofer hidden input to the form. This allows us to use regular
- // form to initiate PUT and DELETE requests in addition to the typical.
- if (in_array($method, $this->spoofedMethods))
- {
- $appendage .= $this->hidden('_method', $method);
- }
-
- // If the method is something other than GET we will go ahead and attach the
- // CSRF token to the form, as this can't hurt and is convenient to simply
- // always have available on every form the developers creates for them.
- if ($method != 'GET')
- {
- $appendage .= $this->token();
- }
-
- return $appendage;
- }
-
- /**
- * Get the ID attribute for a field name.
- *
- * @param string $name
- * @param array $attributes
- * @return string
- */
- public function getIdAttribute($name, $attributes)
- {
- if (array_key_exists('id', $attributes))
- {
- return $attributes['id'];
- }
-
- if (in_array($name, $this->labels))
- {
- return $name;
- }
- }
-
- /**
- * Get the value that should be assigned to the field.
- *
- * @param string $name
- * @param string $value
- * @return string
- */
- public function getValueAttribute($name, $value = null)
- {
- if (is_null($name)) return $value;
-
- if ( ! is_null($this->old($name)))
- {
- return $this->old($name);
- }
-
- if ( ! is_null($value)) return $value;
-
- if (isset($this->model))
- {
- return $this->getModelValueAttribute($name);
- }
- }
-
- /**
- * Get the model value that should be assigned to the field.
- *
- * @param string $name
- * @return string
- */
- protected function getModelValueAttribute($name)
- {
- if (is_object($this->model))
- {
- return object_get($this->model, $this->transformKey($name));
- }
- elseif (is_array($this->model))
- {
- return array_get($this->model, $this->transformKey($name));
- }
- }
-
- /**
- * Get a value from the session's old input.
- *
- * @param string $name
- * @return string
- */
- public function old($name)
- {
- if (isset($this->session))
- {
- return $this->session->getOldInput($this->transformKey($name));
- }
- }
-
- /**
- * Determine if the old input is empty.
- *
- * @return bool
- */
- public function oldInputIsEmpty()
- {
- return (isset($this->session) && count($this->session->getOldInput()) == 0);
- }
-
- /**
- * Transform key from array to dot syntax.
- *
- * @param string $key
- * @return string
- */
- protected function transformKey($key)
- {
- return str_replace(array('.', '[]', '[', ']'), array('_', '', '.', ''), $key);
- }
-
- /**
- * Get the session store implementation.
- *
- * @return \Illuminate\Session\Store $session
- */
- public function getSessionStore()
- {
- return $this->session;
- }
-
- /**
- * Set the session store implementation.
- *
- * @param \Illuminate\Session\Store $session
- * @return $this
- */
- public function setSessionStore(Session $session)
- {
- $this->session = $session;
-
- return $this;
- }
-
-}
diff --git a/application/vendor/illuminate/html/FormFacade.php b/application/vendor/illuminate/html/FormFacade.php
deleted file mode 100644
index 4ddc0d7..0000000
--- a/application/vendor/illuminate/html/FormFacade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-url = $url;
- }
-
- /**
- * Convert an HTML string to entities.
- *
- * @param string $value
- * @return string
- */
- public function entities($value)
- {
- return htmlentities($value, ENT_QUOTES, 'UTF-8', false);
- }
-
- /**
- * Convert entities to HTML characters.
- *
- * @param string $value
- * @return string
- */
- public function decode($value)
- {
- return html_entity_decode($value, ENT_QUOTES, 'UTF-8');
- }
-
- /**
- * Generate a link to a JavaScript file.
- *
- * @param string $url
- * @param array $attributes
- * @param bool $secure
- * @return string
- */
- public function script($url, $attributes = array(), $secure = null)
- {
- $attributes['src'] = $this->url->asset($url, $secure);
-
- return 'attributes($attributes).'>'.PHP_EOL;
- }
-
- /**
- * Generate a link to a CSS file.
- *
- * @param string $url
- * @param array $attributes
- * @param bool $secure
- * @return string
- */
- public function style($url, $attributes = array(), $secure = null)
- {
- $defaults = array('media' => 'all', 'type' => 'text/css', 'rel' => 'stylesheet');
-
- $attributes = $attributes + $defaults;
-
- $attributes['href'] = $this->url->asset($url, $secure);
-
- return 'attributes($attributes).'>'.PHP_EOL;
- }
-
- /**
- * Generate an HTML image element.
- *
- * @param string $url
- * @param string $alt
- * @param array $attributes
- * @param bool $secure
- * @return string
- */
- public function image($url, $alt = null, $attributes = array(), $secure = null)
- {
- $attributes['alt'] = $alt;
-
- return '.')
attributes($attributes).'>';
- }
-
- /**
- * Generate a HTML link.
- *
- * @param string $url
- * @param string $title
- * @param array $attributes
- * @param bool $secure
- * @return string
- */
- public function link($url, $title = null, $attributes = array(), $secure = null)
- {
- $url = $this->url->to($url, array(), $secure);
-
- if (is_null($title) || $title === false) $title = $url;
-
- return 'attributes($attributes).'>'.$this->entities($title).'';
- }
-
- /**
- * Generate a HTTPS HTML link.
- *
- * @param string $url
- * @param string $title
- * @param array $attributes
- * @return string
- */
- public function secureLink($url, $title = null, $attributes = array())
- {
- return $this->link($url, $title, $attributes, true);
- }
-
- /**
- * Generate a HTML link to an asset.
- *
- * @param string $url
- * @param string $title
- * @param array $attributes
- * @param bool $secure
- * @return string
- */
- public function linkAsset($url, $title = null, $attributes = array(), $secure = null)
- {
- $url = $this->url->asset($url, $secure);
-
- return $this->link($url, $title ?: $url, $attributes, $secure);
- }
-
- /**
- * Generate a HTTPS HTML link to an asset.
- *
- * @param string $url
- * @param string $title
- * @param array $attributes
- * @return string
- */
- public function linkSecureAsset($url, $title = null, $attributes = array())
- {
- return $this->linkAsset($url, $title, $attributes, true);
- }
-
- /**
- * Generate a HTML link to a named route.
- *
- * @param string $name
- * @param string $title
- * @param array $parameters
- * @param array $attributes
- * @return string
- */
- public function linkRoute($name, $title = null, $parameters = array(), $attributes = array())
- {
- return $this->link($this->url->route($name, $parameters), $title, $attributes);
- }
-
- /**
- * Generate a HTML link to a controller action.
- *
- * @param string $action
- * @param string $title
- * @param array $parameters
- * @param array $attributes
- * @return string
- */
- public function linkAction($action, $title = null, $parameters = array(), $attributes = array())
- {
- return $this->link($this->url->action($action, $parameters), $title, $attributes);
- }
-
- /**
- * Generate a HTML link to an email address.
- *
- * @param string $email
- * @param string $title
- * @param array $attributes
- * @return string
- */
- public function mailto($email, $title = null, $attributes = array())
- {
- $email = $this->email($email);
-
- $title = $title ?: $email;
-
- $email = $this->obfuscate('mailto:') . $email;
-
- return 'attributes($attributes).'>'.$this->entities($title).'';
- }
-
- /**
- * Obfuscate an e-mail address to prevent spam-bots from sniffing it.
- *
- * @param string $email
- * @return string
- */
- public function email($email)
- {
- return str_replace('@', '@', $this->obfuscate($email));
- }
-
- /**
- * Generate an ordered list of items.
- *
- * @param array $list
- * @param array $attributes
- * @return string
- */
- public function ol($list, $attributes = array())
- {
- return $this->listing('ol', $list, $attributes);
- }
-
- /**
- * Generate an un-ordered list of items.
- *
- * @param array $list
- * @param array $attributes
- * @return string
- */
- public function ul($list, $attributes = array())
- {
- return $this->listing('ul', $list, $attributes);
- }
-
- /**
- * Create a listing HTML element.
- *
- * @param string $type
- * @param array $list
- * @param array $attributes
- * @return string
- */
- protected function listing($type, $list, $attributes = array())
- {
- $html = '';
-
- if (count($list) == 0) return $html;
-
- // Essentially we will just spin through the list and build the list of the HTML
- // elements from the array. We will also handled nested lists in case that is
- // present in the array. Then we will build out the final listing elements.
- foreach ($list as $key => $value)
- {
- $html .= $this->listingElement($key, $type, $value);
- }
-
- $attributes = $this->attributes($attributes);
-
- return "<{$type}{$attributes}>{$html}";
- }
-
- /**
- * Create the HTML for a listing element.
- *
- * @param mixed $key
- * @param string $type
- * @param string $value
- * @return string
- */
- protected function listingElement($key, $type, $value)
- {
- if (is_array($value))
- {
- return $this->nestedListing($key, $type, $value);
- }
- else
- {
- return ''.e($value).'';
- }
- }
-
- /**
- * Create the HTML for a nested listing attribute.
- *
- * @param mixed $key
- * @param string $type
- * @param string $value
- * @return string
- */
- protected function nestedListing($key, $type, $value)
- {
- if (is_int($key))
- {
- return $this->listing($type, $value);
- }
- else
- {
- return ''.$key.$this->listing($type, $value).'';
- }
- }
-
- /**
- * Build an HTML attribute string from an array.
- *
- * @param array $attributes
- * @return string
- */
- public function attributes($attributes)
- {
- $html = array();
-
- // For numeric keys we will assume that the key and the value are the same
- // as this will convert HTML attributes such as "required" to a correct
- // form like required="required" instead of using incorrect numerics.
- foreach ((array) $attributes as $key => $value)
- {
- $element = $this->attributeElement($key, $value);
-
- if ( ! is_null($element)) $html[] = $element;
- }
-
- return count($html) > 0 ? ' '.implode(' ', $html) : '';
- }
-
- /**
- * Build a single attribute element.
- *
- * @param string $key
- * @param string $value
- * @return string
- */
- protected function attributeElement($key, $value)
- {
- if (is_numeric($key)) $key = $value;
-
- if ( ! is_null($value)) return $key.'="'.e($value).'"';
- }
-
- /**
- * Obfuscate a string to prevent spam-bots from sniffing it.
- *
- * @param string $value
- * @return string
- */
- public function obfuscate($value)
- {
- $safe = '';
-
- foreach (str_split($value) as $letter)
- {
- if (ord($letter) > 128) return $letter;
-
- // To properly obfuscate the value, we will randomly convert each letter to
- // its entity or hexadecimal representation, keeping a bot from sniffing
- // the randomly obfuscated letters out of the string on the responses.
- switch (rand(1, 3))
- {
- case 1:
- $safe .= '&#'.ord($letter).';'; break;
-
- case 2:
- $safe .= '&#x'.dechex(ord($letter)).';'; break;
-
- case 3:
- $safe .= $letter;
- }
- }
-
- return $safe;
- }
-
-}
diff --git a/application/vendor/illuminate/html/HtmlFacade.php b/application/vendor/illuminate/html/HtmlFacade.php
deleted file mode 100644
index a2dc8e1..0000000
--- a/application/vendor/illuminate/html/HtmlFacade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-registerHtmlBuilder();
-
- $this->registerFormBuilder();
-
- $this->app->alias('html', 'Illuminate\Html\HtmlBuilder');
- $this->app->alias('form', 'Illuminate\Html\FormBuilder');
- }
-
- /**
- * Register the HTML builder instance.
- *
- * @return void
- */
- protected function registerHtmlBuilder()
- {
- $this->app->bindShared('html', function($app)
- {
- return new HtmlBuilder($app['url']);
- });
- }
-
- /**
- * Register the form builder instance.
- *
- * @return void
- */
- protected function registerFormBuilder()
- {
- $this->app->bindShared('form', function($app)
- {
- $form = new FormBuilder($app['html'], $app['url'], $app['session.store']->getToken());
-
- return $form->setSessionStore($app['session.store']);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array('html', 'form');
- }
-
-}
diff --git a/application/vendor/illuminate/html/composer.json b/application/vendor/illuminate/html/composer.json
deleted file mode 100644
index d26646b..0000000
--- a/application/vendor/illuminate/html/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "name": "illuminate/html",
- "license": "MIT",
- "authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
- }
- ],
- "require": {
- "php": ">=5.4.0",
- "illuminate/http": "~5.0",
- "illuminate/session": "~5.0",
- "illuminate/support": "~5.0"
- },
- "autoload": {
- "psr-4": {
- "Illuminate\\Html\\": ""
- },
- "files": [
- "helpers.php"
- ]
- },
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
- "minimum-stability": "dev"
-}
diff --git a/application/vendor/illuminate/html/helpers.php b/application/vendor/illuminate/html/helpers.php
deleted file mode 100644
index fa5bef6..0000000
--- a/application/vendor/illuminate/html/helpers.php
+++ /dev/null
@@ -1,69 +0,0 @@
-link($url, $title, $attributes, $secure);
- }
-}
-
-if ( ! function_exists('link_to_asset'))
-{
- /**
- * Generate a HTML link to an asset.
- *
- * @param string $url
- * @param string $title
- * @param array $attributes
- * @param bool $secure
- * @return string
- */
- function link_to_asset($url, $title = null, $attributes = array(), $secure = null)
- {
- return app('html')->linkAsset($url, $title, $attributes, $secure);
- }
-}
-
-if ( ! function_exists('link_to_route'))
-{
- /**
- * Generate a HTML link to a named route.
- *
- * @param string $name
- * @param string $title
- * @param array $parameters
- * @param array $attributes
- * @return string
- */
- function link_to_route($name, $title = null, $parameters = array(), $attributes = array())
- {
- return app('html')->linkRoute($name, $title, $parameters, $attributes);
- }
-}
-
-if ( ! function_exists('link_to_action'))
-{
- /**
- * Generate a HTML link to a controller action.
- *
- * @param string $action
- * @param string $title
- * @param array $parameters
- * @param array $attributes
- * @return string
- */
- function link_to_action($action, $title = null, $parameters = array(), $attributes = array())
- {
- return app('html')->linkAction($action, $title, $parameters, $attributes);
- }
-}
diff --git a/application/vendor/ircmaxell/password-compat/LICENSE.md b/application/vendor/ircmaxell/password-compat/LICENSE.md
deleted file mode 100644
index 1efc565..0000000
--- a/application/vendor/ircmaxell/password-compat/LICENSE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2012 Anthony Ferrara
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/application/vendor/ircmaxell/password-compat/composer.json b/application/vendor/ircmaxell/password-compat/composer.json
deleted file mode 100644
index 822fd1f..0000000
--- a/application/vendor/ircmaxell/password-compat/composer.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "ircmaxell/password-compat",
- "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
- "keywords": ["password", "hashing"],
- "homepage": "https://github.com/ircmaxell/password_compat",
- "license": "MIT",
- "authors": [
- {
- "name": "Anthony Ferrara",
- "email": "ircmaxell@php.net",
- "homepage": "http://blog.ircmaxell.com"
- }
- ],
- "require-dev": {
- "phpunit/phpunit": "4.*"
- },
- "autoload": {
- "files": ["lib/password.php"]
- }
-}
diff --git a/application/vendor/ircmaxell/password-compat/lib/password.php b/application/vendor/ircmaxell/password-compat/lib/password.php
deleted file mode 100644
index cc6896c..0000000
--- a/application/vendor/ircmaxell/password-compat/lib/password.php
+++ /dev/null
@@ -1,314 +0,0 @@
-
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @copyright 2012 The Authors
- */
-
-namespace {
-
- if (!defined('PASSWORD_BCRYPT')) {
- /**
- * PHPUnit Process isolation caches constants, but not function declarations.
- * So we need to check if the constants are defined separately from
- * the functions to enable supporting process isolation in userland
- * code.
- */
- define('PASSWORD_BCRYPT', 1);
- define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
- define('PASSWORD_BCRYPT_DEFAULT_COST', 10);
- }
-
- if (!function_exists('password_hash')) {
-
- /**
- * Hash the password using the specified algorithm
- *
- * @param string $password The password to hash
- * @param int $algo The algorithm to use (Defined by PASSWORD_* constants)
- * @param array $options The options for the algorithm to use
- *
- * @return string|false The hashed password, or false on error.
- */
- function password_hash($password, $algo, array $options = array()) {
- if (!function_exists('crypt')) {
- trigger_error("Crypt must be loaded for password_hash to function", E_USER_WARNING);
- return null;
- }
- if (is_null($password) || is_int($password)) {
- $password = (string) $password;
- }
- if (!is_string($password)) {
- trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
- return null;
- }
- if (!is_int($algo)) {
- trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
- return null;
- }
- $resultLength = 0;
- switch ($algo) {
- case PASSWORD_BCRYPT:
- $cost = PASSWORD_BCRYPT_DEFAULT_COST;
- if (isset($options['cost'])) {
- $cost = $options['cost'];
- if ($cost < 4 || $cost > 31) {
- trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
- return null;
- }
- }
- // The length of salt to generate
- $raw_salt_len = 16;
- // The length required in the final serialization
- $required_salt_len = 22;
- $hash_format = sprintf("$2y$%02d$", $cost);
- // The expected length of the final crypt() output
- $resultLength = 60;
- break;
- default:
- trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
- return null;
- }
- $salt_requires_encoding = false;
- if (isset($options['salt'])) {
- switch (gettype($options['salt'])) {
- case 'NULL':
- case 'boolean':
- case 'integer':
- case 'double':
- case 'string':
- $salt = (string) $options['salt'];
- break;
- case 'object':
- if (method_exists($options['salt'], '__tostring')) {
- $salt = (string) $options['salt'];
- break;
- }
- case 'array':
- case 'resource':
- default:
- trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
- return null;
- }
- if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
- trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
- return null;
- } elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt)) {
- $salt_requires_encoding = true;
- }
- } else {
- $buffer = '';
- $buffer_valid = false;
- if (function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
- $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
- if ($buffer) {
- $buffer_valid = true;
- }
- }
- if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
- $buffer = openssl_random_pseudo_bytes($raw_salt_len);
- if ($buffer) {
- $buffer_valid = true;
- }
- }
- if (!$buffer_valid && @is_readable('/dev/urandom')) {
- $f = fopen('/dev/urandom', 'r');
- $read = PasswordCompat\binary\_strlen($buffer);
- while ($read < $raw_salt_len) {
- $buffer .= fread($f, $raw_salt_len - $read);
- $read = PasswordCompat\binary\_strlen($buffer);
- }
- fclose($f);
- if ($read >= $raw_salt_len) {
- $buffer_valid = true;
- }
- }
- if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
- $bl = PasswordCompat\binary\_strlen($buffer);
- for ($i = 0; $i < $raw_salt_len; $i++) {
- if ($i < $bl) {
- $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
- } else {
- $buffer .= chr(mt_rand(0, 255));
- }
- }
- }
- $salt = $buffer;
- $salt_requires_encoding = true;
- }
- if ($salt_requires_encoding) {
- // encode string with the Base64 variant used by crypt
- $base64_digits =
- 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
- $bcrypt64_digits =
- './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
- $base64_string = base64_encode($salt);
- $salt = strtr(rtrim($base64_string, '='), $base64_digits, $bcrypt64_digits);
- }
- $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len);
-
- $hash = $hash_format . $salt;
-
- $ret = crypt($password, $hash);
-
- if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength) {
- return false;
- }
-
- return $ret;
- }
-
- /**
- * Get information about the password hash. Returns an array of the information
- * that was used to generate the password hash.
- *
- * array(
- * 'algo' => 1,
- * 'algoName' => 'bcrypt',
- * 'options' => array(
- * 'cost' => PASSWORD_BCRYPT_DEFAULT_COST,
- * ),
- * )
- *
- * @param string $hash The password hash to extract info from
- *
- * @return array The array of information about the hash.
- */
- function password_get_info($hash) {
- $return = array(
- 'algo' => 0,
- 'algoName' => 'unknown',
- 'options' => array(),
- );
- if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60) {
- $return['algo'] = PASSWORD_BCRYPT;
- $return['algoName'] = 'bcrypt';
- list($cost) = sscanf($hash, "$2y$%d$");
- $return['options']['cost'] = $cost;
- }
- return $return;
- }
-
- /**
- * Determine if the password hash needs to be rehashed according to the options provided
- *
- * If the answer is true, after validating the password using password_verify, rehash it.
- *
- * @param string $hash The hash to test
- * @param int $algo The algorithm used for new password hashes
- * @param array $options The options array passed to password_hash
- *
- * @return boolean True if the password needs to be rehashed.
- */
- function password_needs_rehash($hash, $algo, array $options = array()) {
- $info = password_get_info($hash);
- if ($info['algo'] != $algo) {
- return true;
- }
- switch ($algo) {
- case PASSWORD_BCRYPT:
- $cost = isset($options['cost']) ? $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
- if ($cost != $info['options']['cost']) {
- return true;
- }
- break;
- }
- return false;
- }
-
- /**
- * Verify a password against a hash using a timing attack resistant approach
- *
- * @param string $password The password to verify
- * @param string $hash The hash to verify against
- *
- * @return boolean If the password matches the hash
- */
- function password_verify($password, $hash) {
- if (!function_exists('crypt')) {
- trigger_error("Crypt must be loaded for password_verify to function", E_USER_WARNING);
- return false;
- }
- $ret = crypt($password, $hash);
- if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13) {
- return false;
- }
-
- $status = 0;
- for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
- $status |= (ord($ret[$i]) ^ ord($hash[$i]));
- }
-
- return $status === 0;
- }
- }
-
-}
-
-namespace PasswordCompat\binary {
-
- if (!function_exists('PasswordCompat\\binary\\_strlen')) {
-
- /**
- * Count the number of bytes in a string
- *
- * We cannot simply use strlen() for this, because it might be overwritten by the mbstring extension.
- * In this case, strlen() will count the number of *characters* based on the internal encoding. A
- * sequence of bytes might be regarded as a single multibyte character.
- *
- * @param string $binary_string The input string
- *
- * @internal
- * @return int The number of bytes
- */
- function _strlen($binary_string) {
- if (function_exists('mb_strlen')) {
- return mb_strlen($binary_string, '8bit');
- }
- return strlen($binary_string);
- }
-
- /**
- * Get a substring based on byte limits
- *
- * @see _strlen()
- *
- * @param string $binary_string The input string
- * @param int $start
- * @param int $length
- *
- * @internal
- * @return string The substring
- */
- function _substr($binary_string, $start, $length) {
- if (function_exists('mb_substr')) {
- return mb_substr($binary_string, $start, $length, '8bit');
- }
- return substr($binary_string, $start, $length);
- }
-
- /**
- * Check if current PHP version is compatible with the library
- *
- * @return boolean the check result
- */
- function check() {
- static $pass = NULL;
-
- if (is_null($pass)) {
- if (function_exists('crypt')) {
- $hash = '$2y$04$usesomesillystringfore7hnbRJHxXVLeakoG8K30oukPsA.ztMG';
- $test = crypt("password", $hash);
- $pass = $test == $hash;
- } else {
- $pass = false;
- }
- }
- return $pass;
- }
-
- }
-}
\ No newline at end of file
diff --git a/application/vendor/ircmaxell/password-compat/version-test.php b/application/vendor/ircmaxell/password-compat/version-test.php
deleted file mode 100644
index 96f60ca..0000000
--- a/application/vendor/ircmaxell/password-compat/version-test.php
+++ /dev/null
@@ -1,6 +0,0 @@
-=5.3.2"
+ "php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "3.7.*",
- "jakub-onderka/php-parallel-lint": "0.*",
+ "phpunit/phpunit": "~4.3",
+ "jakub-onderka/php-parallel-lint": "1.0",
"jakub-onderka/php-var-dump-check": "0.*",
"squizlabs/php_codesniffer": "1.*",
"jakub-onderka/php-code-style": "1.0"
}
-}
\ No newline at end of file
+}
diff --git a/application/vendor/jakub-onderka/php-console-color/phpunit.xml b/application/vendor/jakub-onderka/php-console-color/phpunit.xml
index 74011d9..f1105cc 100644
--- a/application/vendor/jakub-onderka/php-console-color/phpunit.xml
+++ b/application/vendor/jakub-onderka/php-console-color/phpunit.xml
@@ -1,8 +1,9 @@
-
+
- tests/*
+ tests
@@ -12,4 +13,4 @@
vendor
-
\ No newline at end of file
+
diff --git a/application/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php b/application/vendor/jakub-onderka/php-console-color/src/ConsoleColor.php
similarity index 90%
rename from application/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php
rename to application/vendor/jakub-onderka/php-console-color/src/ConsoleColor.php
index c367a76..90fd125 100644
--- a/application/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php
+++ b/application/vendor/jakub-onderka/php-console-color/src/ConsoleColor.php
@@ -201,10 +201,15 @@ public function removeTheme($name)
public function isSupported()
{
if (DIRECTORY_SEPARATOR === '\\') {
- return getenv('ANSICON') !== false || getenv('ConEmuANSI') === 'ON';
+ if (function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT)) {
+ return true;
+ } elseif (getenv('ANSICON') !== false || getenv('ConEmuANSI') === 'ON') {
+ return true;
+ }
+ return false;
+ } else {
+ return function_exists('posix_isatty') && @posix_isatty(STDOUT);
}
-
- return function_exists('posix_isatty') && @posix_isatty(STDOUT);
}
/**
@@ -212,7 +217,11 @@ public function isSupported()
*/
public function are256ColorsSupported()
{
- return DIRECTORY_SEPARATOR === '/' && strpos(getenv('TERM'), '256color') !== false;
+ if (DIRECTORY_SEPARATOR === '\\') {
+ return function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT);
+ } else {
+ return strpos(getenv('TERM'), '256color') !== false;
+ }
}
/**
@@ -225,8 +234,7 @@ public function getPossibleStyles()
/**
* @param string $name
- * @return string
- * @throws InvalidStyleException
+ * @return string[]
*/
private function themeSequence($name)
{
@@ -240,7 +248,6 @@ private function themeSequence($name)
/**
* @param string $style
* @return string
- * @throws InvalidStyleException
*/
private function styleSequence($style)
{
@@ -277,4 +284,4 @@ private function escSequence($value)
{
return "\033[{$value}m";
}
-}
\ No newline at end of file
+}
diff --git a/application/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php b/application/vendor/jakub-onderka/php-console-color/src/InvalidStyleException.php
similarity index 100%
rename from application/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php
rename to application/vendor/jakub-onderka/php-console-color/src/InvalidStyleException.php
diff --git a/application/vendor/jakub-onderka/php-console-color/tests/JakubOnderka/PhpConsoleColor/ConsoleColorTest.php b/application/vendor/jakub-onderka/php-console-color/tests/ConsoleColorTest.php
similarity index 100%
rename from application/vendor/jakub-onderka/php-console-color/tests/JakubOnderka/PhpConsoleColor/ConsoleColorTest.php
rename to application/vendor/jakub-onderka/php-console-color/tests/ConsoleColorTest.php
diff --git a/application/vendor/jakub-onderka/php-console-color/tests/bootstrap.php b/application/vendor/jakub-onderka/php-console-color/tests/bootstrap.php
deleted file mode 100644
index 7500417..0000000
--- a/application/vendor/jakub-onderka/php-console-color/tests/bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-=5.4",
- "nikic/php-parser": "^1.2|^2.0",
+ "nikic/php-parser": "^1.2|^2.0|^3.0|^4.0",
"symfony/polyfill-php56": "^1.0"
},
"require-dev": {
@@ -33,7 +33,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.4-dev"
}
}
}
diff --git a/application/vendor/jeremeamia/SuperClosure/src/Analyzer/AstAnalyzer.php b/application/vendor/jeremeamia/SuperClosure/src/Analyzer/AstAnalyzer.php
index 37e54c0..c15f83c 100644
--- a/application/vendor/jeremeamia/SuperClosure/src/Analyzer/AstAnalyzer.php
+++ b/application/vendor/jeremeamia/SuperClosure/src/Analyzer/AstAnalyzer.php
@@ -7,6 +7,7 @@
use PhpParser\NodeTraverser;
use PhpParser\PrettyPrinter\Standard as NodePrinter;
use PhpParser\Error as ParserError;
+use PhpParser\Node\Expr\Variable as VariableNode;
use PhpParser\NodeVisitor\NameResolver;
use PhpParser\Parser as CodeParser;
use PhpParser\ParserFactory;
@@ -92,7 +93,13 @@ protected function determineContext(array &$data)
if ($node->byRef) {
$refs++;
}
- return $node->var;
+ if ($node->var instanceof VariableNode) {
+ // For PHP-Parser >=4.0
+ return $node->var->name;
+ } else {
+ // For PHP-Parser <4.0
+ return $node->var;
+ }
}, $data['ast']->uses);
$data['hasRefs'] = ($refs > 0);
diff --git a/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/ClosureLocatorVisitor.php b/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/ClosureLocatorVisitor.php
index 758ce6a..69f92ed 100644
--- a/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/ClosureLocatorVisitor.php
+++ b/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/ClosureLocatorVisitor.php
@@ -54,16 +54,16 @@ public function enterNode(AstNode $node)
// Determine information about the closure's location
if (!$this->closureNode) {
if ($node instanceof NamespaceNode) {
- $namespace = ($node->name && is_array($node->name->parts))
- ? implode('\\', $node->name->parts)
+ $namespace = $node->name !== null
+ ? $node->name->toString()
: null;
$this->location['namespace'] = $namespace;
}
if ($node instanceof TraitNode) {
- $this->location['trait'] = $node->name;
+ $this->location['trait'] = (string) $node->name;
$this->location['class'] = null;
} elseif ($node instanceof ClassNode) {
- $this->location['class'] = $node->name;
+ $this->location['class'] = (string) $node->name;
$this->location['trait'] = null;
}
}
diff --git a/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/MagicConstantVisitor.php b/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/MagicConstantVisitor.php
index d9d227d..219654f 100644
--- a/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/MagicConstantVisitor.php
+++ b/application/vendor/jeremeamia/SuperClosure/src/Analyzer/Visitor/MagicConstantVisitor.php
@@ -30,21 +30,21 @@ public function leaveNode(AstNode $node)
{
switch ($node->getType()) {
case 'Scalar_MagicConst_Class' :
- return new StringNode($this->location['class']);
+ return new StringNode($this->location['class'] ?: '');
case 'Scalar_MagicConst_Dir' :
- return new StringNode($this->location['directory']);
+ return new StringNode($this->location['directory'] ?: '');
case 'Scalar_MagicConst_File' :
- return new StringNode($this->location['file']);
+ return new StringNode($this->location['file'] ?: '');
case 'Scalar_MagicConst_Function' :
- return new StringNode($this->location['function']);
+ return new StringNode($this->location['function'] ?: '');
case 'Scalar_MagicConst_Line' :
- return new NumberNode($node->getAttribute('startLine'));
+ return new NumberNode($node->getAttribute('startLine') ?: 0);
case 'Scalar_MagicConst_Method' :
- return new StringNode($this->location['method']);
+ return new StringNode($this->location['method'] ?: '');
case 'Scalar_MagicConst_Namespace' :
- return new StringNode($this->location['namespace']);
+ return new StringNode($this->location['namespace'] ?: '');
case 'Scalar_MagicConst_Trait' :
- return new StringNode($this->location['trait']);
+ return new StringNode($this->location['trait'] ?: '');
}
}
}
diff --git a/application/vendor/jeremeamia/SuperClosure/src/Exception/ClosureSerializationException.php b/application/vendor/jeremeamia/SuperClosure/src/Exception/ClosureSerializationException.php
new file mode 100644
index 0000000..942dbd1
--- /dev/null
+++ b/application/vendor/jeremeamia/SuperClosure/src/Exception/ClosureSerializationException.php
@@ -0,0 +1,9 @@
+signingKey) {
$signature = $this->calculateSignature($serialized);
diff --git a/application/vendor/kylekatarnls/update-helper/LICENSE b/application/vendor/kylekatarnls/update-helper/LICENSE
new file mode 100644
index 0000000..d55dee5
--- /dev/null
+++ b/application/vendor/kylekatarnls/update-helper/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2017 https://github.com/pug-php
+Copyright (c) 2017 https://github.com/kylekatarnls
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/application/vendor/kylekatarnls/update-helper/composer.json b/application/vendor/kylekatarnls/update-helper/composer.json
new file mode 100644
index 0000000..ced8527
--- /dev/null
+++ b/application/vendor/kylekatarnls/update-helper/composer.json
@@ -0,0 +1,50 @@
+{
+ "name": "kylekatarnls/update-helper",
+ "description": "Update helper",
+ "type": "composer-plugin",
+ "license": "MIT",
+ "minimum-stability": "dev",
+ "prefer-stable": true,
+ "authors": [
+ {
+ "name": "Kyle",
+ "email": "kylekatarnls@gmail.com"
+ }
+ ],
+ "require": {
+ "php": ">=5.3.0",
+ "composer-plugin-api": "^1.1.0 || ^2.0.0"
+ },
+ "require-dev": {
+ "composer/composer": "2.0.x-dev || ^2.0.0-dev",
+ "phpunit/phpunit": ">=4.8.35 <6.0",
+ "codeclimate/php-test-reporter": "dev-master"
+ },
+ "autoload": {
+ "psr-0": {
+ "UpdateHelper\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "UpdateHelper\\Tests\\": "tests/UpdateHelper/"
+ }
+ },
+ "scripts": {
+ "post-install-cmd": [
+ "UpdateHelper\\UpdateHelper::check"
+ ],
+ "post-update-cmd": [
+ "UpdateHelper\\UpdateHelper::check"
+ ],
+ "post-package-install": [
+ "UpdateHelper\\UpdateHelper::check"
+ ],
+ "post-package-update": [
+ "UpdateHelper\\UpdateHelper::check"
+ ]
+ },
+ "extra": {
+ "class": "UpdateHelper\\ComposerPlugin"
+ }
+}
diff --git a/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/ComposerPlugin.php b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/ComposerPlugin.php
new file mode 100644
index 0000000..f0e2313
--- /dev/null
+++ b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/ComposerPlugin.php
@@ -0,0 +1,37 @@
+io = $io;
+ }
+
+ public static function getSubscribedEvents()
+ {
+ return array(
+ 'post-autoload-dump' => array(
+ array('onAutoloadDump', 0),
+ ),
+ );
+ }
+
+ public function onAutoloadDump(Event $event)
+ {
+ if (!class_exists('UpdateHelper\\UpdateHelper')) {
+ return;
+ }
+
+ UpdateHelper::check($event);
+ }
+}
diff --git a/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/NotUpdateInterfaceInstanceException.php b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/NotUpdateInterfaceInstanceException.php
new file mode 100644
index 0000000..8213b5e
--- /dev/null
+++ b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/NotUpdateInterfaceInstanceException.php
@@ -0,0 +1,9 @@
+read();
+ } catch (Exception $e) {
+ $dependencyConfig = null;
+ }
+
+ if (is_array($dependencyConfig) && isset($dependencyConfig['extra'], $dependencyConfig['extra'][$key])) {
+ $classes[$file] = $dependencyConfig['extra'][$key];
+ }
+ }
+
+ protected static function getUpdateHelperConfig(Composer $composer, $key = null)
+ {
+ $vendorDir = $composer->getConfig()->get('vendor-dir');
+
+ $npm = array();
+
+ foreach (scandir($vendorDir) as $namespace) {
+ if ($namespace === '.' || $namespace === '..' || !is_dir($directory = $vendorDir.DIRECTORY_SEPARATOR.$namespace)) {
+ continue;
+ }
+
+ foreach (scandir($directory) as $dependency) {
+ if ($dependency === '.' || $dependency === '..' || !is_dir($subDirectory = $directory.DIRECTORY_SEPARATOR.$dependency)) {
+ continue;
+ }
+
+ static::appendConfig($npm, $subDirectory, $key);
+ }
+ }
+
+ static::appendConfig($npm, dirname($vendorDir), $key);
+
+ return $npm;
+ }
+
+ /**
+ * @param Event $event
+ * @param IOInterface $io
+ * @param Composer $composer
+ * @param string[] $subClasses
+ */
+ protected static function checkHelper($event, IOInterface $io, $composer, $class)
+ {
+ if (!is_string($class) || !class_exists($class)) {
+ throw new NotUpdateInterfaceInstanceException();
+ }
+
+ try {
+ $helper = new $class();
+ } catch (Exception $e) {
+ throw new InvalidArgumentException($e->getMessage(), 1000, $e);
+ } catch (Throwable $e) {
+ throw new InvalidArgumentException($e->getMessage(), 1000, $e);
+ }
+
+ if (!($helper instanceof UpdateHelperInterface)) {
+ throw new NotUpdateInterfaceInstanceException();
+ }
+
+ $helper->check(new static($event, $io, $composer));
+ }
+
+ /**
+ * @param string $file
+ * @param Event $event
+ * @param IOInterface $io
+ * @param Composer $composer
+ * @param string[] $subClasses
+ */
+ protected static function checkFileHelpers($file, $event, IOInterface $io, $composer, array $subClasses)
+ {
+ foreach ($subClasses as $class) {
+ try {
+ static::checkHelper($event, $io, $composer, $class);
+ } catch (InvalidArgumentException $e) {
+ $io->writeError($e instanceof NotUpdateInterfaceInstanceException
+ ? 'UpdateHelper error in '.$file.":\n".JsonFile::encode($class).' is not an instance of UpdateHelperInterface.'
+ : 'UpdateHelper error: '.$e->getPrevious()->getMessage().
+ "\nFile: ".$e->getPrevious()->getFile().
+ "\nLine:".$e->getPrevious()->getLine().
+ "\n\n".$e->getPrevious()->getTraceAsString()
+ );
+ continue;
+ }
+ }
+ }
+
+ public static function check(Event $event)
+ {
+ if (!($event instanceof ScriptEvent) && !($event instanceof PackageEvent)) {
+ return;
+ }
+
+ $io = $event->getIO();
+ $composer = $event->getComposer();
+ $autoload = $composer->getConfig()->get('vendor-dir').'/autoload.php';
+
+ if (file_exists($autoload)) {
+ include_once $autoload;
+ }
+
+ $classes = static::getUpdateHelperConfig($composer);
+
+ foreach ($classes as $file => $subClasses) {
+ static::checkFileHelpers($file, $event, $io, $composer, (array) $subClasses);
+ }
+ }
+
+ public function __construct(Event $event, IOInterface $io = null, Composer $composer = null)
+ {
+ $this->event = $event;
+ $this->io = $io ?: (method_exists($event, 'getIO') ? $event->getIO() : null);
+ $this->composer = $composer ?: (method_exists($event, 'getComposer') ? $event->getComposer() : null);
+
+ if ($this->composer &&
+ ($directory = $this->composer->getConfig()->get('archive-dir')) &&
+ file_exists($file = $directory.'/composer.json')
+ ) {
+ $this->composerFilePath = $file;
+ $this->file = new JsonFile($this->composerFilePath);
+ $this->dependencies = $this->file->read();
+ }
+ }
+
+ /**
+ * @return JsonFile
+ */
+ public function getFile()
+ {
+ return $this->file;
+ }
+
+ /**
+ * @return string
+ */
+ public function getComposerFilePath()
+ {
+ return $this->composerFilePath;
+ }
+
+ /**
+ * @return Composer
+ */
+ public function getComposer()
+ {
+ return $this->composer;
+ }
+
+ /**
+ * @return Event
+ */
+ public function getEvent()
+ {
+ return $this->event;
+ }
+
+ /**
+ * @return IOInterface|null
+ */
+ public function getIo()
+ {
+ return $this->io;
+ }
+
+ /**
+ * @return array
+ */
+ public function getDependencies()
+ {
+ return $this->dependencies;
+ }
+
+ /**
+ * @return array
+ */
+ public function getDevDependencies()
+ {
+ return isset($this->dependencies['require-dev']) ? $this->dependencies['require-dev'] : array();
+ }
+
+ /**
+ * @return array
+ */
+ public function getProdDependencies()
+ {
+ return isset($this->dependencies['require']) ? $this->dependencies['require'] : array();
+ }
+
+ /**
+ * @return array
+ */
+ public function getFlattenDependencies()
+ {
+ return array_merge($this->getDevDependencies(), $this->getProdDependencies());
+ }
+
+ /**
+ * @param string $dependency
+ *
+ * @return bool
+ */
+ public function hasAsDevDependency($dependency)
+ {
+ return isset($this->dependencies['require-dev'][$dependency]);
+ }
+
+ /**
+ * @param string $dependency
+ *
+ * @return bool
+ */
+ public function hasAsProdDependency($dependency)
+ {
+ return isset($this->dependencies['require'][$dependency]);
+ }
+
+ /**
+ * @param string $dependency
+ *
+ * @return bool
+ */
+ public function hasAsDependency($dependency)
+ {
+ return $this->hasAsDevDependency($dependency) || $this->hasAsProdDependency($dependency);
+ }
+
+ /**
+ * @param string $dependency
+ * @param string $version
+ *
+ * @return bool
+ */
+ public function isDependencyAtLeast($dependency, $version)
+ {
+ if ($this->hasAsProdDependency($dependency)) {
+ return Semver::satisfies($version, $this->dependencies['require'][$dependency]);
+ }
+
+ if ($this->hasAsDevDependency($dependency)) {
+ return Semver::satisfies($version, $this->dependencies['require-dev'][$dependency]);
+ }
+
+ return false;
+ }
+
+ /**
+ * @param string $dependency
+ * @param string $version
+ *
+ * @return bool
+ */
+ public function isDependencyLesserThan($dependency, $version)
+ {
+ return !$this->isDependencyAtLeast($dependency, $version);
+ }
+
+ /**
+ * @param string $dependency
+ * @param string $version
+ * @param array $environments
+ *
+ * @throws Exception
+ *
+ * @return $this
+ */
+ public function setDependencyVersion($dependency, $version, $environments = array('require', 'require-dev'))
+ {
+ return $this->setDependencyVersions(array($dependency => $version), $environments);
+ }
+
+ /**
+ * @param array $dependencies
+ * @param array $environments
+ *
+ * @throws Exception
+ *
+ * @return $this
+ */
+ public function setDependencyVersions($dependencies, $environments = array('require', 'require-dev'))
+ {
+ if (!$this->composerFilePath) {
+ throw new RuntimeException('No composer instance detected.');
+ }
+
+ $touched = false;
+
+ foreach ($environments as $environment) {
+ foreach ($dependencies as $dependency => $version) {
+ if (isset($this->dependencies[$environment], $this->dependencies[$environment][$dependency])) {
+ $this->dependencies[$environment][$dependency] = $version;
+ $touched = true;
+ }
+ }
+ }
+
+ if ($touched) {
+ if (!$this->composerFilePath) {
+ throw new RuntimeException('composer.json not found (custom vendor-dir are not yet supported).');
+ }
+
+ $file = new JsonFile($this->composerFilePath);
+ $file->write($this->dependencies);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @return $this
+ */
+ public function update()
+ {
+ $output = shell_exec('composer update --no-scripts');
+
+ if (!empty($output)) {
+ $this->write($output);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param string|array $text
+ */
+ public function write($text)
+ {
+ if ($this->io) {
+ $this->io->write($text);
+
+ return;
+ }
+
+ if (is_array($text)) {
+ $text = implode("\n", $text);
+ }
+
+ echo $text;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isInteractive()
+ {
+ return $this->io && $this->io->isInteractive();
+ }
+}
diff --git a/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelperInterface.php b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelperInterface.php
new file mode 100644
index 0000000..3809dc0
--- /dev/null
+++ b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelperInterface.php
@@ -0,0 +1,8 @@
+=5.4.0",
- "ext-openssl": "*",
- "ext-mcrypt": "*",
+ "php": ">=5.5.9",
"ext-mbstring": "*",
- "classpreloader/classpreloader": "~1.2",
+ "ext-openssl": "*",
+ "classpreloader/classpreloader": "~2.0|~3.0",
"danielstjules/stringy": "~1.8",
"doctrine/inflector": "~1.0",
- "ircmaxell/password-compat": "~1.0",
"jeremeamia/superclosure": "~2.0",
"league/flysystem": "~1.0",
"monolog/monolog": "~1.11",
"mtdowling/cron-expression": "~1.0",
- "nesbot/carbon": "~1.0",
- "psy/psysh": "0.4.*",
+ "nesbot/carbon": "~1.19",
+ "paragonie/random_compat": "~1.4",
+ "psy/psysh": "0.7.*",
"swiftmailer/swiftmailer": "~5.1",
- "symfony/console": "2.6.*",
- "symfony/debug": "2.6.*",
- "symfony/finder": "2.6.*",
- "symfony/http-foundation": "2.6.*",
- "symfony/http-kernel": "2.6.*",
- "symfony/process": "2.6.*",
- "symfony/routing": "2.6.*",
- "symfony/security-core": "2.6.*",
- "symfony/translation": "2.6.*",
- "symfony/var-dumper": "2.6.*",
+ "symfony/console": "2.7.*",
+ "symfony/css-selector": "2.7.*|2.8.*",
+ "symfony/debug": "2.7.*",
+ "symfony/dom-crawler": "2.7.*",
+ "symfony/finder": "2.7.*",
+ "symfony/http-foundation": "2.7.*",
+ "symfony/http-kernel": "2.7.*",
+ "symfony/process": "2.7.*",
+ "symfony/routing": "2.7.*",
+ "symfony/translation": "2.7.*",
+ "symfony/var-dumper": "2.7.*",
"vlucas/phpdotenv": "~1.0"
},
"replace": {
"illuminate/auth": "self.version",
"illuminate/bus": "self.version",
+ "illuminate/broadcasting": "self.version",
"illuminate/cache": "self.version",
"illuminate/config": "self.version",
"illuminate/console": "self.version",
@@ -56,7 +57,6 @@
"illuminate/events": "self.version",
"illuminate/exception": "self.version",
"illuminate/filesystem": "self.version",
- "illuminate/foundation": "self.version",
"illuminate/hashing": "self.version",
"illuminate/http": "self.version",
"illuminate/log": "self.version",
@@ -73,12 +73,12 @@
"illuminate/view": "self.version"
},
"require-dev": {
- "aws/aws-sdk-php": "~2.4",
- "iron-io/iron_mq": "~1.5",
+ "aws/aws-sdk-php": "~3.0",
+ "iron-io/iron_mq": "~2.0",
+ "mockery/mockery": "~0.9.4",
"pda/pheanstalk": "~3.0",
- "predis/predis": "~1.0",
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~4.0",
+ "predis/predis": "~1.0"
},
"autoload": {
"classmap": [
@@ -94,18 +94,21 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~2.4).",
+ "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.0).",
- "iron-io/iron_mq": "Required to use the iron queue driver (~1.5).",
- "league/flysystem-aws-s3-v2": "Required to use the Flysystem S3 driver (~1.0).",
+ "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).",
+ "iron-io/iron_mq": "Required to use the iron queue driver (~2.0).",
+ "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
- "predis/predis": "Required to use the redis cache and queue drivers (~1.0)."
+ "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
+ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
+ "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/readme.md b/application/vendor/laravel/framework/readme.md
index 0cfc013..4500a7b 100644
--- a/application/vendor/laravel/framework/readme.md
+++ b/application/vendor/laravel/framework/readme.md
@@ -1,5 +1,6 @@
## Laravel Framework (Kernel)
+[](https://styleci.io/repos/7548986)
[](https://travis-ci.org/laravel/framework)
[](https://packagist.org/packages/laravel/framework)
[](https://packagist.org/packages/laravel/framework)
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
new file mode 100644
index 0000000..de057d6
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
@@ -0,0 +1,453 @@
+policies = $policies;
+ $this->container = $container;
+ $this->abilities = $abilities;
+ $this->userResolver = $userResolver;
+ $this->afterCallbacks = $afterCallbacks;
+ $this->beforeCallbacks = $beforeCallbacks;
+ }
+
+ /**
+ * Determine if a given ability has been defined.
+ *
+ * @param string $ability
+ * @return bool
+ */
+ public function has($ability)
+ {
+ return isset($this->abilities[$ability]);
+ }
+
+ /**
+ * Define a new ability.
+ *
+ * @param string $ability
+ * @param callable|string $callback
+ * @return $this
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function define($ability, $callback)
+ {
+ if (is_callable($callback)) {
+ $this->abilities[$ability] = $callback;
+ } elseif (is_string($callback) && str_contains($callback, '@')) {
+ $this->abilities[$ability] = $this->buildAbilityCallback($callback);
+ } else {
+ throw new InvalidArgumentException("Callback must be a callable or a 'Class@method' string.");
+ }
+
+ return $this;
+ }
+
+ /**
+ * Create the ability callback for a callback string.
+ *
+ * @param string $callback
+ * @return \Closure
+ */
+ protected function buildAbilityCallback($callback)
+ {
+ return function () use ($callback) {
+ list($class, $method) = explode('@', $callback);
+
+ return call_user_func_array([$this->resolvePolicy($class), $method], func_get_args());
+ };
+ }
+
+ /**
+ * Define a policy class for a given class type.
+ *
+ * @param string $class
+ * @param string $policy
+ * @return $this
+ */
+ public function policy($class, $policy)
+ {
+ $this->policies[$class] = $policy;
+
+ return $this;
+ }
+
+ /**
+ * Register a callback to run before all Gate checks.
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function before(callable $callback)
+ {
+ $this->beforeCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Register a callback to run after all Gate checks.
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function after(callable $callback)
+ {
+ $this->afterCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Determine if the given ability should be granted for the current user.
+ *
+ * @param string $ability
+ * @param array|mixed $arguments
+ * @return bool
+ */
+ public function allows($ability, $arguments = [])
+ {
+ return $this->check($ability, $arguments);
+ }
+
+ /**
+ * Determine if the given ability should be denied for the current user.
+ *
+ * @param string $ability
+ * @param array|mixed $arguments
+ * @return bool
+ */
+ public function denies($ability, $arguments = [])
+ {
+ return ! $this->allows($ability, $arguments);
+ }
+
+ /**
+ * Determine if the given ability should be granted for the current user.
+ *
+ * @param string $ability
+ * @param array|mixed $arguments
+ * @return bool
+ */
+ public function check($ability, $arguments = [])
+ {
+ try {
+ $result = $this->raw($ability, $arguments);
+ } catch (UnauthorizedException $e) {
+ return false;
+ }
+
+ return (bool) $result;
+ }
+
+ /**
+ * Determine if the given ability should be granted for the current user.
+ *
+ * @param string $ability
+ * @param array|mixed $arguments
+ * @return \Illuminate\Auth\Access\Response
+ *
+ * @throws \Illuminate\Auth\Access\UnauthorizedException
+ */
+ public function authorize($ability, $arguments = [])
+ {
+ $result = $this->raw($ability, $arguments);
+
+ if ($result instanceof Response) {
+ return $result;
+ }
+
+ return $result ? $this->allow() : $this->deny();
+ }
+
+ /**
+ * Get the raw result for the given ability for the current user.
+ *
+ * @param string $ability
+ * @param array|mixed $arguments
+ * @return mixed
+ */
+ protected function raw($ability, $arguments = [])
+ {
+ if (! $user = $this->resolveUser()) {
+ return false;
+ }
+
+ $arguments = is_array($arguments) ? $arguments : [$arguments];
+
+ if (is_null($result = $this->callBeforeCallbacks($user, $ability, $arguments))) {
+ $result = $this->callAuthCallback($user, $ability, $arguments);
+ }
+
+ $this->callAfterCallbacks(
+ $user, $ability, $arguments, $result
+ );
+
+ return $result;
+ }
+
+ /**
+ * Resolve and call the appropriate authorization callback.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string $ability
+ * @param array $arguments
+ * @return bool
+ */
+ protected function callAuthCallback($user, $ability, array $arguments)
+ {
+ $callback = $this->resolveAuthCallback(
+ $user, $ability, $arguments
+ );
+
+ return call_user_func_array(
+ $callback, array_merge([$user], $arguments)
+ );
+ }
+
+ /**
+ * Call all of the before callbacks and return if a result is given.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string $ability
+ * @param array $arguments
+ * @return bool|null
+ */
+ protected function callBeforeCallbacks($user, $ability, array $arguments)
+ {
+ $arguments = array_merge([$user, $ability], $arguments);
+
+ foreach ($this->beforeCallbacks as $before) {
+ if (! is_null($result = call_user_func_array($before, $arguments))) {
+ return $result;
+ }
+ }
+ }
+
+ /**
+ * Call all of the after callbacks with check result.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string $ability
+ * @param array $arguments
+ * @param bool $result
+ * @return void
+ */
+ protected function callAfterCallbacks($user, $ability, array $arguments, $result)
+ {
+ $arguments = array_merge([$user, $ability, $result], $arguments);
+
+ foreach ($this->afterCallbacks as $after) {
+ call_user_func_array($after, $arguments);
+ }
+ }
+
+ /**
+ * Resolve the callable for the given ability and arguments.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string $ability
+ * @param array $arguments
+ * @return callable
+ */
+ protected function resolveAuthCallback($user, $ability, array $arguments)
+ {
+ if ($this->firstArgumentCorrespondsToPolicy($arguments)) {
+ return $this->resolvePolicyCallback($user, $ability, $arguments);
+ } elseif (isset($this->abilities[$ability])) {
+ return $this->abilities[$ability];
+ } else {
+ return function () {
+ return false;
+ };
+ }
+ }
+
+ /**
+ * Determine if the first argument in the array corresponds to a policy.
+ *
+ * @param array $arguments
+ * @return bool
+ */
+ protected function firstArgumentCorrespondsToPolicy(array $arguments)
+ {
+ if (! isset($arguments[0])) {
+ return false;
+ }
+
+ if (is_object($arguments[0])) {
+ return isset($this->policies[get_class($arguments[0])]);
+ }
+
+ return is_string($arguments[0]) && isset($this->policies[$arguments[0]]);
+ }
+
+ /**
+ * Resolve the callback for a policy check.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string $ability
+ * @param array $arguments
+ * @return callable
+ */
+ protected function resolvePolicyCallback($user, $ability, array $arguments)
+ {
+ return function () use ($user, $ability, $arguments) {
+ $instance = $this->getPolicyFor($arguments[0]);
+
+ if (method_exists($instance, 'before')) {
+ // We will prepend the user and ability onto the arguments so that the before
+ // callback can determine which ability is being called. Then we will call
+ // into the policy before methods with the arguments and get the result.
+ $beforeArguments = array_merge([$user, $ability], $arguments);
+
+ $result = call_user_func_array(
+ [$instance, 'before'], $beforeArguments
+ );
+
+ // If we recieved a non-null result from the before method, we will return it
+ // as the result of a check. This allows developers to override the checks
+ // in the policy and return a result for all rules defined in the class.
+ if (! is_null($result)) {
+ return $result;
+ }
+ }
+
+ if (strpos($ability, '-') !== false) {
+ $ability = Str::camel($ability);
+ }
+
+ if (! is_callable([$instance, $ability])) {
+ return false;
+ }
+
+ return call_user_func_array(
+ [$instance, $ability], array_merge([$user], $arguments)
+ );
+ };
+ }
+
+ /**
+ * Get a policy instance for a given class.
+ *
+ * @param object|string $class
+ * @return mixed
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function getPolicyFor($class)
+ {
+ if (is_object($class)) {
+ $class = get_class($class);
+ }
+
+ if (! isset($this->policies[$class])) {
+ throw new InvalidArgumentException("Policy not defined for [{$class}].");
+ }
+
+ return $this->resolvePolicy($this->policies[$class]);
+ }
+
+ /**
+ * Build a policy class instance of the given type.
+ *
+ * @param object|string $class
+ * @return mixed
+ */
+ public function resolvePolicy($class)
+ {
+ return $this->container->make($class);
+ }
+
+ /**
+ * Get a guard instance for the given user.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable|mixed $user
+ * @return static
+ */
+ public function forUser($user)
+ {
+ $callback = function () use ($user) {
+ return $user;
+ };
+
+ return new static(
+ $this->container, $callback, $this->abilities,
+ $this->policies, $this->beforeCallbacks, $this->afterCallbacks
+ );
+ }
+
+ /**
+ * Resolve the user from the user resolver.
+ *
+ * @return mixed
+ */
+ protected function resolveUser()
+ {
+ return call_user_func($this->userResolver);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php
new file mode 100644
index 0000000..148b584
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php
@@ -0,0 +1,30 @@
+message = $message;
+ }
+
+ /**
+ * Get the response message.
+ *
+ * @return string|null
+ */
+ public function message()
+ {
+ return $this->message;
+ }
+
+ /**
+ * Get the string representation of the message.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->message();
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php
new file mode 100644
index 0000000..7488c5b
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php
@@ -0,0 +1,10 @@
+setCookieJar($this->app['cookie']);
-
- $guard->setDispatcher($this->app['events']);
-
- return $guard->setRequest($this->app->refresh('request', $guard, 'setRequest'));
- }
-
- /**
- * Call a custom driver creator.
- *
- * @param string $driver
- * @return \Illuminate\Auth\Guard
- */
- protected function callCustomCreator($driver)
- {
- $custom = parent::callCustomCreator($driver);
-
- if ($custom instanceof Guard)
- {
- return $custom;
- }
-
- return new Guard($custom, $this->app['session.store']);
- }
-
- /**
- * Create an instance of the database driver.
- *
- * @return \Illuminate\Auth\Guard
- */
- public function createDatabaseDriver()
- {
- $provider = $this->createDatabaseProvider();
-
- return new Guard($provider, $this->app['session.store']);
- }
-
- /**
- * Create an instance of the database user provider.
- *
- * @return \Illuminate\Auth\DatabaseUserProvider
- */
- protected function createDatabaseProvider()
- {
- $connection = $this->app['db']->connection();
-
- // When using the basic database user provider, we need to inject the table we
- // want to use, since this is not an Eloquent model we will have no way to
- // know without telling the provider, so we'll inject the config value.
- $table = $this->app['config']['auth.table'];
-
- return new DatabaseUserProvider($connection, $this->app['hash'], $table);
- }
-
- /**
- * Create an instance of the Eloquent driver.
- *
- * @return \Illuminate\Auth\Guard
- */
- public function createEloquentDriver()
- {
- $provider = $this->createEloquentProvider();
-
- return new Guard($provider, $this->app['session.store']);
- }
-
- /**
- * Create an instance of the Eloquent user provider.
- *
- * @return \Illuminate\Auth\EloquentUserProvider
- */
- protected function createEloquentProvider()
- {
- $model = $this->app['config']['auth.model'];
-
- return new EloquentUserProvider($this->app['hash'], $model);
- }
-
- /**
- * Get the default authentication driver name.
- *
- * @return string
- */
- public function getDefaultDriver()
- {
- return $this->app['config']['auth.driver'];
- }
-
- /**
- * Set the default authentication driver name.
- *
- * @param string $name
- * @return void
- */
- public function setDefaultDriver($name)
- {
- $this->app['config']['auth.driver'] = $name;
- }
+namespace Illuminate\Auth;
+use Illuminate\Support\Manager;
+use Illuminate\Contracts\Auth\Guard as GuardContract;
+
+class AuthManager extends Manager
+{
+ /**
+ * Create a new driver instance.
+ *
+ * @param string $driver
+ * @return mixed
+ */
+ protected function createDriver($driver)
+ {
+ $guard = parent::createDriver($driver);
+
+ // When using the remember me functionality of the authentication services we
+ // will need to be set the encryption instance of the guard, which allows
+ // secure, encrypted cookie values to get generated for those cookies.
+ if (method_exists($guard, 'setCookieJar')) {
+ $guard->setCookieJar($this->app['cookie']);
+ }
+
+ if (method_exists($guard, 'setDispatcher')) {
+ $guard->setDispatcher($this->app['events']);
+ }
+
+ if (method_exists($guard, 'setRequest')) {
+ $guard->setRequest($this->app->refresh('request', $guard, 'setRequest'));
+ }
+
+ return $guard;
+ }
+
+ /**
+ * Call a custom driver creator.
+ *
+ * @param string $driver
+ * @return \Illuminate\Contracts\Auth\Guard
+ */
+ protected function callCustomCreator($driver)
+ {
+ $custom = parent::callCustomCreator($driver);
+
+ if ($custom instanceof GuardContract) {
+ return $custom;
+ }
+
+ return new Guard($custom, $this->app['session.store']);
+ }
+
+ /**
+ * Create an instance of the database driver.
+ *
+ * @return \Illuminate\Auth\Guard
+ */
+ public function createDatabaseDriver()
+ {
+ $provider = $this->createDatabaseProvider();
+
+ return new Guard($provider, $this->app['session.store']);
+ }
+
+ /**
+ * Create an instance of the database user provider.
+ *
+ * @return \Illuminate\Auth\DatabaseUserProvider
+ */
+ protected function createDatabaseProvider()
+ {
+ $connection = $this->app['db']->connection();
+
+ // When using the basic database user provider, we need to inject the table we
+ // want to use, since this is not an Eloquent model we will have no way to
+ // know without telling the provider, so we'll inject the config value.
+ $table = $this->app['config']['auth.table'];
+
+ return new DatabaseUserProvider($connection, $this->app['hash'], $table);
+ }
+
+ /**
+ * Create an instance of the Eloquent driver.
+ *
+ * @return \Illuminate\Auth\Guard
+ */
+ public function createEloquentDriver()
+ {
+ $provider = $this->createEloquentProvider();
+
+ return new Guard($provider, $this->app['session.store']);
+ }
+
+ /**
+ * Create an instance of the Eloquent user provider.
+ *
+ * @return \Illuminate\Auth\EloquentUserProvider
+ */
+ protected function createEloquentProvider()
+ {
+ $model = $this->app['config']['auth.model'];
+
+ return new EloquentUserProvider($this->app['hash'], $model);
+ }
+
+ /**
+ * Get the default authentication driver name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['auth.driver'];
+ }
+
+ /**
+ * Set the default authentication driver name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['auth.driver'] = $name;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php
index a2b9c8d..9ef8041 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php
@@ -1,73 +1,88 @@
-registerAuthenticator();
- /**
- * Register the service provider.
- *
- * @return void
- */
- public function register()
- {
- $this->registerAuthenticator();
+ $this->registerUserResolver();
- $this->registerUserResolver();
+ $this->registerAccessGate();
- $this->registerRequestRebindHandler();
- }
+ $this->registerRequestRebindHandler();
+ }
- /**
- * Register the authenticator services.
- *
- * @return void
- */
- protected function registerAuthenticator()
- {
- $this->app->singleton('auth', function($app)
- {
- // Once the authentication service has actually been requested by the developer
- // we will set a variable in the application indicating such. This helps us
- // know that we need to set any queued cookies in the after event later.
- $app['auth.loaded'] = true;
+ /**
+ * Register the authenticator services.
+ *
+ * @return void
+ */
+ protected function registerAuthenticator()
+ {
+ $this->app->singleton('auth', function ($app) {
+ // Once the authentication service has actually been requested by the developer
+ // we will set a variable in the application indicating such. This helps us
+ // know that we need to set any queued cookies in the after event later.
+ $app['auth.loaded'] = true;
- return new AuthManager($app);
- });
+ return new AuthManager($app);
+ });
- $this->app->singleton('auth.driver', function($app)
- {
- return $app['auth']->driver();
- });
- }
+ $this->app->singleton('auth.driver', function ($app) {
+ return $app['auth']->driver();
+ });
+ }
- /**
- * Register a resolver for the authenticated user.
- *
- * @return void
- */
- protected function registerUserResolver()
- {
- $this->app->bind('Illuminate\Contracts\Auth\Authenticatable', function($app)
- {
- return $app['auth']->user();
- });
- }
+ /**
+ * Register a resolver for the authenticated user.
+ *
+ * @return void
+ */
+ protected function registerUserResolver()
+ {
+ $this->app->bind(AuthenticatableContract::class, function ($app) {
+ return $app['auth']->user();
+ });
+ }
- /**
- * Register a resolver for the authenticated user.
- *
- * @return void
- */
- protected function registerRequestRebindHandler()
- {
- $this->app->rebinding('request', function($app, $request)
- {
- $request->setUserResolver(function() use ($app)
- {
- return $app['auth']->user();
- });
- });
- }
+ /**
+ * Register the access gate service.
+ *
+ * @return void
+ */
+ protected function registerAccessGate()
+ {
+ $this->app->singleton(GateContract::class, function ($app) {
+ return new Gate($app, function () use ($app) {
+ return $app['auth']->user();
+ });
+ });
+ }
+ /**
+ * Register a resolver for the authenticated user.
+ *
+ * @return void
+ */
+ protected function registerRequestRebindHandler()
+ {
+ $this->app->rebinding('request', function ($app, $request) {
+ $request->setUserResolver(function () use ($app) {
+ return $app['auth']->user();
+ });
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php
index 85db097..46101d2 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php
@@ -1,56 +1,57 @@
-getKey();
- }
+trait Authenticatable
+{
+ /**
+ * Get the unique identifier for the user.
+ *
+ * @return mixed
+ */
+ public function getAuthIdentifier()
+ {
+ return $this->getKey();
+ }
- /**
- * Get the password for the user.
- *
- * @return string
- */
- public function getAuthPassword()
- {
- return $this->password;
- }
+ /**
+ * Get the password for the user.
+ *
+ * @return string
+ */
+ public function getAuthPassword()
+ {
+ return $this->password;
+ }
- /**
- * Get the token value for the "remember me" session.
- *
- * @return string
- */
- public function getRememberToken()
- {
- return $this->{$this->getRememberTokenName()};
- }
+ /**
+ * Get the token value for the "remember me" session.
+ *
+ * @return string
+ */
+ public function getRememberToken()
+ {
+ return $this->{$this->getRememberTokenName()};
+ }
- /**
- * Set the token value for the "remember me" session.
- *
- * @param string $value
- * @return void
- */
- public function setRememberToken($value)
- {
- $this->{$this->getRememberTokenName()} = $value;
- }
-
- /**
- * Get the column name for the "remember me" token.
- *
- * @return string
- */
- public function getRememberTokenName()
- {
- return 'remember_token';
- }
+ /**
+ * Set the token value for the "remember me" session.
+ *
+ * @param string $value
+ * @return void
+ */
+ public function setRememberToken($value)
+ {
+ $this->{$this->getRememberTokenName()} = $value;
+ }
+ /**
+ * Get the column name for the "remember me" token.
+ *
+ * @return string
+ */
+ public function getRememberTokenName()
+ {
+ return 'remember_token';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php
index 05ae4fb..88dcb8c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php
@@ -1,33 +1,34 @@
-laravel['auth.password.tokens']->deleteExpired();
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Flush expired password reset tokens';
- $this->info('Expired reset tokens cleared!');
- }
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->laravel['auth.password.tokens']->deleteExpired();
+ $this->info('Expired reset tokens cleared!');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
index 2cd63c6..e23a63f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
@@ -1,147 +1,146 @@
-conn = $conn;
- $this->table = $table;
- $this->hasher = $hasher;
- }
-
- /**
- * Retrieve a user by their unique identifier.
- *
- * @param mixed $identifier
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function retrieveById($identifier)
- {
- $user = $this->conn->table($this->table)->find($identifier);
-
- return $this->getGenericUser($user);
- }
-
- /**
- * Retrieve a user by their unique identifier and "remember me" token.
- *
- * @param mixed $identifier
- * @param string $token
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function retrieveByToken($identifier, $token)
- {
- $user = $this->conn->table($this->table)
- ->where('id', $identifier)
- ->where('remember_token', $token)
- ->first();
-
- return $this->getGenericUser($user);
- }
-
- /**
- * Update the "remember me" token for the given user in storage.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param string $token
- * @return void
- */
- public function updateRememberToken(UserContract $user, $token)
- {
- $this->conn->table($this->table)
- ->where('id', $user->getAuthIdentifier())
- ->update(['remember_token' => $token]);
- }
-
- /**
- * Retrieve a user by the given credentials.
- *
- * @param array $credentials
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function retrieveByCredentials(array $credentials)
- {
- // First we will add each credential element to the query as a where clause.
- // Then we can execute the query and, if we found a user, return it in a
- // generic "user" object that will be utilized by the Guard instances.
- $query = $this->conn->table($this->table);
-
- foreach ($credentials as $key => $value)
- {
- if ( ! str_contains($key, 'password'))
- {
- $query->where($key, $value);
- }
- }
-
- // Now we are ready to execute the query to see if we have an user matching
- // the given credentials. If not, we will just return nulls and indicate
- // that there are no matching users for these given credential arrays.
- $user = $query->first();
-
- return $this->getGenericUser($user);
- }
-
- /**
- * Get the generic user.
- *
- * @param mixed $user
- * @return \Illuminate\Auth\GenericUser|null
- */
- protected function getGenericUser($user)
- {
- if ($user !== null)
- {
- return new GenericUser((array) $user);
- }
- }
-
- /**
- * Validate a user against the given credentials.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param array $credentials
- * @return bool
- */
- public function validateCredentials(UserContract $user, array $credentials)
- {
- $plain = $credentials['password'];
-
- return $this->hasher->check($plain, $user->getAuthPassword());
- }
-
+class DatabaseUserProvider implements UserProvider
+{
+ /**
+ * The active database connection.
+ *
+ * @var \Illuminate\Database\ConnectionInterface
+ */
+ protected $conn;
+
+ /**
+ * The hasher implementation.
+ *
+ * @var \Illuminate\Contracts\Hashing\Hasher
+ */
+ protected $hasher;
+
+ /**
+ * The table containing the users.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * Create a new database user provider.
+ *
+ * @param \Illuminate\Database\ConnectionInterface $conn
+ * @param \Illuminate\Contracts\Hashing\Hasher $hasher
+ * @param string $table
+ * @return void
+ */
+ public function __construct(ConnectionInterface $conn, HasherContract $hasher, $table)
+ {
+ $this->conn = $conn;
+ $this->table = $table;
+ $this->hasher = $hasher;
+ }
+
+ /**
+ * Retrieve a user by their unique identifier.
+ *
+ * @param mixed $identifier
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function retrieveById($identifier)
+ {
+ $user = $this->conn->table($this->table)->find($identifier);
+
+ return $this->getGenericUser($user);
+ }
+
+ /**
+ * Retrieve a user by their unique identifier and "remember me" token.
+ *
+ * @param mixed $identifier
+ * @param string $token
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function retrieveByToken($identifier, $token)
+ {
+ $user = $this->conn->table($this->table)
+ ->where('id', $identifier)
+ ->where('remember_token', $token)
+ ->first();
+
+ return $this->getGenericUser($user);
+ }
+
+ /**
+ * Update the "remember me" token for the given user in storage.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string $token
+ * @return void
+ */
+ public function updateRememberToken(UserContract $user, $token)
+ {
+ $this->conn->table($this->table)
+ ->where('id', $user->getAuthIdentifier())
+ ->update(['remember_token' => $token]);
+ }
+
+ /**
+ * Retrieve a user by the given credentials.
+ *
+ * @param array $credentials
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function retrieveByCredentials(array $credentials)
+ {
+ // First we will add each credential element to the query as a where clause.
+ // Then we can execute the query and, if we found a user, return it in a
+ // generic "user" object that will be utilized by the Guard instances.
+ $query = $this->conn->table($this->table);
+
+ foreach ($credentials as $key => $value) {
+ if (! Str::contains($key, 'password')) {
+ $query->where($key, $value);
+ }
+ }
+
+ // Now we are ready to execute the query to see if we have an user matching
+ // the given credentials. If not, we will just return nulls and indicate
+ // that there are no matching users for these given credential arrays.
+ $user = $query->first();
+
+ return $this->getGenericUser($user);
+ }
+
+ /**
+ * Get the generic user.
+ *
+ * @param mixed $user
+ * @return \Illuminate\Auth\GenericUser|null
+ */
+ protected function getGenericUser($user)
+ {
+ if ($user !== null) {
+ return new GenericUser((array) $user);
+ }
+ }
+
+ /**
+ * Validate a user against the given credentials.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param array $credentials
+ * @return bool
+ */
+ public function validateCredentials(UserContract $user, array $credentials)
+ {
+ $plain = $credentials['password'];
+
+ return $this->hasher->check($plain, $user->getAuthPassword());
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
index 484e322..e2b6dc7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
@@ -1,128 +1,174 @@
-model = $model;
- $this->hasher = $hasher;
- }
-
- /**
- * Retrieve a user by their unique identifier.
- *
- * @param mixed $identifier
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function retrieveById($identifier)
- {
- return $this->createModel()->newQuery()->find($identifier);
- }
-
- /**
- * Retrieve a user by their unique identifier and "remember me" token.
- *
- * @param mixed $identifier
- * @param string $token
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function retrieveByToken($identifier, $token)
- {
- $model = $this->createModel();
-
- return $model->newQuery()
- ->where($model->getKeyName(), $identifier)
- ->where($model->getRememberTokenName(), $token)
- ->first();
- }
-
- /**
- * Update the "remember me" token for the given user in storage.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param string $token
- * @return void
- */
- public function updateRememberToken(UserContract $user, $token)
- {
- $user->setRememberToken($token);
-
- $user->save();
- }
-
- /**
- * Retrieve a user by the given credentials.
- *
- * @param array $credentials
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function retrieveByCredentials(array $credentials)
- {
- // First we will add each credential element to the query as a where clause.
- // Then we can execute the query and, if we found a user, return it in a
- // Eloquent User "model" that will be utilized by the Guard instances.
- $query = $this->createModel()->newQuery();
-
- foreach ($credentials as $key => $value)
- {
- if ( ! str_contains($key, 'password'))
- {
- $query->where($key, $value);
- }
- }
-
- return $query->first();
- }
-
- /**
- * Validate a user against the given credentials.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param array $credentials
- * @return bool
- */
- public function validateCredentials(UserContract $user, array $credentials)
- {
- $plain = $credentials['password'];
-
- return $this->hasher->check($plain, $user->getAuthPassword());
- }
-
- /**
- * Create a new instance of the model.
- *
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function createModel()
- {
- $class = '\\'.ltrim($this->model, '\\');
-
- return new $class;
- }
-
+class EloquentUserProvider implements UserProvider
+{
+ /**
+ * The hasher implementation.
+ *
+ * @var \Illuminate\Contracts\Hashing\Hasher
+ */
+ protected $hasher;
+
+ /**
+ * The Eloquent user model.
+ *
+ * @var string
+ */
+ protected $model;
+
+ /**
+ * Create a new database user provider.
+ *
+ * @param \Illuminate\Contracts\Hashing\Hasher $hasher
+ * @param string $model
+ * @return void
+ */
+ public function __construct(HasherContract $hasher, $model)
+ {
+ $this->model = $model;
+ $this->hasher = $hasher;
+ }
+
+ /**
+ * Retrieve a user by their unique identifier.
+ *
+ * @param mixed $identifier
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function retrieveById($identifier)
+ {
+ return $this->createModel()->newQuery()->find($identifier);
+ }
+
+ /**
+ * Retrieve a user by their unique identifier and "remember me" token.
+ *
+ * @param mixed $identifier
+ * @param string $token
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function retrieveByToken($identifier, $token)
+ {
+ $model = $this->createModel();
+
+ return $model->newQuery()
+ ->where($model->getKeyName(), $identifier)
+ ->where($model->getRememberTokenName(), $token)
+ ->first();
+ }
+
+ /**
+ * Update the "remember me" token for the given user in storage.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string $token
+ * @return void
+ */
+ public function updateRememberToken(UserContract $user, $token)
+ {
+ $user->setRememberToken($token);
+
+ $user->save();
+ }
+
+ /**
+ * Retrieve a user by the given credentials.
+ *
+ * @param array $credentials
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function retrieveByCredentials(array $credentials)
+ {
+ // First we will add each credential element to the query as a where clause.
+ // Then we can execute the query and, if we found a user, return it in a
+ // Eloquent User "model" that will be utilized by the Guard instances.
+ $query = $this->createModel()->newQuery();
+
+ foreach ($credentials as $key => $value) {
+ if (! Str::contains($key, 'password')) {
+ $query->where($key, $value);
+ }
+ }
+
+ return $query->first();
+ }
+
+ /**
+ * Validate a user against the given credentials.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param array $credentials
+ * @return bool
+ */
+ public function validateCredentials(UserContract $user, array $credentials)
+ {
+ $plain = $credentials['password'];
+
+ return $this->hasher->check($plain, $user->getAuthPassword());
+ }
+
+ /**
+ * Create a new instance of the model.
+ *
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function createModel()
+ {
+ $class = '\\'.ltrim($this->model, '\\');
+
+ return new $class;
+ }
+
+ /**
+ * Gets the hasher implementation.
+ *
+ * @return \Illuminate\Contracts\Hashing\Hasher
+ */
+ public function getHasher()
+ {
+ return $this->hasher;
+ }
+
+ /**
+ * Sets the hasher implementation.
+ *
+ * @param \Illuminate\Contracts\Hashing\Hasher $hasher
+ * @return $this
+ */
+ public function setHasher(HasherContract $hasher)
+ {
+ $this->hasher = $hasher;
+
+ return $this;
+ }
+
+ /**
+ * Gets the name of the Eloquent user model.
+ *
+ * @return string
+ */
+ public function getModel()
+ {
+ return $this->model;
+ }
+
+ /**
+ * Sets the name of the Eloquent user model.
+ *
+ * @param string $model
+ * @return $this
+ */
+ public function setModel($model)
+ {
+ $this->model = $model;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php
index 4e14f2d..1b9ce10 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php
@@ -1,66 +1,65 @@
-commands as $command)
- {
- $this->{"register{$command}Command"}();
- }
+ /**
+ * The commands to be registered.
+ *
+ * @var array
+ */
+ protected $commands = [
+ 'ClearResets',
+ ];
- $this->commands(
- 'command.auth.resets.clear'
- );
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ foreach ($this->commands as $command) {
+ $this->{"register{$command}Command"}();
+ }
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerClearResetsCommand()
- {
- $this->app->singleton('command.auth.resets.clear', function()
- {
- return new ClearResetsCommand;
- });
- }
+ $this->commands(
+ 'command.auth.resets.clear'
+ );
+ }
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return [
- 'command.auth.resets.clear',
- ];
- }
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerClearResetsCommand()
+ {
+ $this->app->singleton('command.auth.resets.clear', function () {
+ return new ClearResetsCommand;
+ });
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'command.auth.resets.clear',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/GenericUser.php b/application/vendor/laravel/framework/src/Illuminate/Auth/GenericUser.php
index f0c86e0..d349d49 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/GenericUser.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/GenericUser.php
@@ -1,121 +1,122 @@
-attributes = $attributes;
- }
+class GenericUser implements UserContract
+{
+ /**
+ * All of the user's attributes.
+ *
+ * @var array
+ */
+ protected $attributes;
- /**
- * Get the unique identifier for the user.
- *
- * @return mixed
- */
- public function getAuthIdentifier()
- {
- return $this->attributes['id'];
- }
+ /**
+ * Create a new generic User object.
+ *
+ * @param array $attributes
+ * @return void
+ */
+ public function __construct(array $attributes)
+ {
+ $this->attributes = $attributes;
+ }
- /**
- * Get the password for the user.
- *
- * @return string
- */
- public function getAuthPassword()
- {
- return $this->attributes['password'];
- }
+ /**
+ * Get the unique identifier for the user.
+ *
+ * @return mixed
+ */
+ public function getAuthIdentifier()
+ {
+ return $this->attributes['id'];
+ }
- /**
- * Get the "remember me" token value.
- *
- * @return string
- */
- public function getRememberToken()
- {
- return $this->attributes[$this->getRememberTokenName()];
- }
+ /**
+ * Get the password for the user.
+ *
+ * @return string
+ */
+ public function getAuthPassword()
+ {
+ return $this->attributes['password'];
+ }
- /**
- * Set the "remember me" token value.
- *
- * @param string $value
- * @return void
- */
- public function setRememberToken($value)
- {
- $this->attributes[$this->getRememberTokenName()] = $value;
- }
+ /**
+ * Get the "remember me" token value.
+ *
+ * @return string
+ */
+ public function getRememberToken()
+ {
+ return $this->attributes[$this->getRememberTokenName()];
+ }
- /**
- * Get the column name for the "remember me" token.
- *
- * @return string
- */
- public function getRememberTokenName()
- {
- return 'remember_token';
- }
+ /**
+ * Set the "remember me" token value.
+ *
+ * @param string $value
+ * @return void
+ */
+ public function setRememberToken($value)
+ {
+ $this->attributes[$this->getRememberTokenName()] = $value;
+ }
- /**
- * Dynamically access the user's attributes.
- *
- * @param string $key
- * @return mixed
- */
- public function __get($key)
- {
- return $this->attributes[$key];
- }
+ /**
+ * Get the column name for the "remember me" token.
+ *
+ * @return string
+ */
+ public function getRememberTokenName()
+ {
+ return 'remember_token';
+ }
- /**
- * Dynamically set an attribute on the user.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function __set($key, $value)
- {
- $this->attributes[$key] = $value;
- }
+ /**
+ * Dynamically access the user's attributes.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function __get($key)
+ {
+ return $this->attributes[$key];
+ }
- /**
- * Dynamically check if a value is set on the user.
- *
- * @param string $key
- * @return bool
- */
- public function __isset($key)
- {
- return isset($this->attributes[$key]);
- }
+ /**
+ * Dynamically set an attribute on the user.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ $this->attributes[$key] = $value;
+ }
- /**
- * Dynamically unset a value on the user.
- *
- * @param string $key
- * @return void
- */
- public function __unset($key)
- {
- unset($this->attributes[$key]);
- }
+ /**
+ * Dynamically check if a value is set on the user.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function __isset($key)
+ {
+ return isset($this->attributes[$key]);
+ }
+ /**
+ * Dynamically unset a value on the user.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function __unset($key)
+ {
+ unset($this->attributes[$key]);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Guard.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
index a43ea31..482c3ea 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
@@ -1,8 +1,11 @@
-session = $session;
- $this->request = $request;
- $this->provider = $provider;
- }
-
- /**
- * Determine if the current user is authenticated.
- *
- * @return bool
- */
- public function check()
- {
- return ! is_null($this->user());
- }
-
- /**
- * Determine if the current user is a guest.
- *
- * @return bool
- */
- public function guest()
- {
- return ! $this->check();
- }
-
- /**
- * Get the currently authenticated user.
- *
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function user()
- {
- if ($this->loggedOut) return;
-
- // If we have already retrieved the user for the current request we can just
- // return it back immediately. We do not want to pull the user data every
- // request into the method because that would tremendously slow an app.
- if ( ! is_null($this->user))
- {
- return $this->user;
- }
-
- $id = $this->session->get($this->getName());
-
- // First we will try to load the user using the identifier in the session if
- // one exists. Otherwise we will check for a "remember me" cookie in this
- // request, and if one exists, attempt to retrieve the user using that.
- $user = null;
-
- if ( ! is_null($id))
- {
- $user = $this->provider->retrieveById($id);
- }
-
- // If the user is null, but we decrypt a "recaller" cookie we can attempt to
- // pull the user data on that cookie which serves as a remember cookie on
- // the application. Once we have a user we can return it to the caller.
- $recaller = $this->getRecaller();
-
- if (is_null($user) && ! is_null($recaller))
- {
- $user = $this->getUserByRecaller($recaller);
-
- if ($user)
- {
- $this->updateSession($user->getAuthIdentifier());
-
- $this->fireLoginEvent($user, true);
- }
- }
-
- return $this->user = $user;
- }
-
- /**
- * Get the ID for the currently authenticated user.
- *
- * @return int|null
- */
- public function id()
- {
- if ($this->loggedOut)
- {
- return;
- }
-
- $id = $this->session->get($this->getName(), $this->getRecallerId());
-
- if (is_null($id) && $this->user())
- {
- $id = $this->user()->getAuthIdentifier();
- }
-
- return $id;
- }
-
- /**
- * Pull a user from the repository by its recaller ID.
- *
- * @param string $recaller
- * @return mixed
- */
- protected function getUserByRecaller($recaller)
- {
- if ($this->validRecaller($recaller) && ! $this->tokenRetrievalAttempted)
- {
- $this->tokenRetrievalAttempted = true;
-
- list($id, $token) = explode('|', $recaller, 2);
-
- $this->viaRemember = ! is_null($user = $this->provider->retrieveByToken($id, $token));
-
- return $user;
- }
- }
-
- /**
- * Get the decrypted recaller cookie for the request.
- *
- * @return string|null
- */
- protected function getRecaller()
- {
- return $this->request->cookies->get($this->getRecallerName());
- }
-
- /**
- * Get the user ID from the recaller cookie.
- *
- * @return string
- */
- protected function getRecallerId()
- {
- if ($this->validRecaller($recaller = $this->getRecaller()))
- {
- return head(explode('|', $recaller));
- }
- }
-
- /**
- * Determine if the recaller cookie is in a valid format.
- *
- * @param string $recaller
- * @return bool
- */
- protected function validRecaller($recaller)
- {
- if ( ! is_string($recaller) || ! str_contains($recaller, '|')) return false;
-
- $segments = explode('|', $recaller);
-
- return count($segments) == 2 && trim($segments[0]) !== '' && trim($segments[1]) !== '';
- }
-
- /**
- * Log a user into the application without sessions or cookies.
- *
- * @param array $credentials
- * @return bool
- */
- public function once(array $credentials = [])
- {
- if ($this->validate($credentials))
- {
- $this->setUser($this->lastAttempted);
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Validate a user's credentials.
- *
- * @param array $credentials
- * @return bool
- */
- public function validate(array $credentials = [])
- {
- return $this->attempt($credentials, false, false);
- }
-
- /**
- * Attempt to authenticate using HTTP Basic Auth.
- *
- * @param string $field
- * @return \Symfony\Component\HttpFoundation\Response|null
- */
- public function basic($field = 'email')
- {
- if ($this->check())
- {
- return;
- }
-
- // If a username is set on the HTTP basic request, we will return out without
- // interrupting the request lifecycle. Otherwise, we'll need to generate a
- // request indicating that the given credentials were invalid for login.
- if ($this->attemptBasic($this->getRequest(), $field))
- {
- return;
- }
-
- return $this->getBasicResponse();
- }
-
- /**
- * Perform a stateless HTTP Basic login attempt.
- *
- * @param string $field
- * @return \Symfony\Component\HttpFoundation\Response|null
- */
- public function onceBasic($field = 'email')
- {
- if ( ! $this->once($this->getBasicCredentials($this->getRequest(), $field)))
- {
- return $this->getBasicResponse();
- }
- }
-
- /**
- * Attempt to authenticate using basic authentication.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @param string $field
- * @return bool
- */
- protected function attemptBasic(Request $request, $field)
- {
- if ( ! $request->getUser())
- {
- return false;
- }
-
- return $this->attempt($this->getBasicCredentials($request, $field));
- }
-
- /**
- * Get the credential array for a HTTP Basic request.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @param string $field
- * @return array
- */
- protected function getBasicCredentials(Request $request, $field)
- {
- return [$field => $request->getUser(), 'password' => $request->getPassword()];
- }
-
- /**
- * Get the response for basic authentication.
- *
- * @return \Symfony\Component\HttpFoundation\Response
- */
- protected function getBasicResponse()
- {
- $headers = ['WWW-Authenticate' => 'Basic'];
-
- return new Response('Invalid credentials.', 401, $headers);
- }
-
- /**
- * Attempt to authenticate a user using the given credentials.
- *
- * @param array $credentials
- * @param bool $remember
- * @param bool $login
- * @return bool
- */
- public function attempt(array $credentials = [], $remember = false, $login = true)
- {
- $this->fireAttemptEvent($credentials, $remember, $login);
-
- $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
-
- // 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 ($this->hasValidCredentials($user, $credentials))
- {
- if ($login) $this->login($user, $remember);
- {
- 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.
- *
- * @param array $credentials
- * @param bool $remember
- * @param bool $login
- * @return void
- */
- protected function fireAttemptEvent(array $credentials, $remember, $login)
- {
- if ($this->events)
- {
- $payload = [$credentials, $remember, $login];
-
- $this->events->fire('auth.attempt', $payload);
- }
- }
-
- /**
- * Register an authentication attempt event listener.
- *
- * @param mixed $callback
- * @return void
- */
- public function attempting($callback)
- {
- if ($this->events)
- {
- $this->events->listen('auth.attempt', $callback);
- }
- }
-
- /**
- * Log a user into the application.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param bool $remember
- * @return void
- */
- public function login(UserContract $user, $remember = false)
- {
- $this->updateSession($user->getAuthIdentifier());
-
- // If the user should be permanently "remembered" by the application we will
- // queue a permanent cookie that contains the encrypted copy of the user
- // identifier. We will then decrypt this later to retrieve the users.
- if ($remember)
- {
- $this->createRememberTokenIfDoesntExist($user);
-
- $this->queueRecallerCookie($user);
- }
-
- // If we have an event dispatcher instance set we will fire an event so that
- // any listeners will hook into the authentication events and run actions
- // based on the login and logout events fired from the guard instances.
- $this->fireLoginEvent($user, $remember);
-
- $this->setUser($user);
- }
-
- /**
- * Fire the login event if the dispatcher is set.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param bool $remember
- * @return void
- */
- protected function fireLoginEvent($user, $remember = false)
- {
- if (isset($this->events))
- {
- $this->events->fire('auth.login', [$user, $remember]);
- }
- }
-
- /**
- * Update the session with the given ID.
- *
- * @param string $id
- * @return void
- */
- protected function updateSession($id)
- {
- $this->session->set($this->getName(), $id);
-
- $this->session->migrate(true);
- }
-
- /**
- * Log the given user ID into the application.
- *
- * @param mixed $id
- * @param bool $remember
- * @return \Illuminate\Contracts\Auth\Authenticatable
- */
- public function loginUsingId($id, $remember = false)
- {
- $this->session->set($this->getName(), $id);
-
- $this->login($user = $this->provider->retrieveById($id), $remember);
-
- return $user;
- }
-
- /**
- * Log the given user ID into the application without sessions or cookies.
- *
- * @param mixed $id
- * @return bool
- */
- public function onceUsingId($id)
- {
- if ( ! is_null($user = $this->provider->retrieveById($id)))
- {
- $this->setUser($user);
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Queue the recaller cookie into the cookie jar.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @return void
- */
- protected function queueRecallerCookie(UserContract $user)
- {
- $value = $user->getAuthIdentifier().'|'.$user->getRememberToken();
-
- $this->getCookieJar()->queue($this->createRecaller($value));
- }
-
- /**
- * Create a "remember me" cookie for a given ID.
- *
- * @param string $value
- * @return \Symfony\Component\HttpFoundation\Cookie
- */
- protected function createRecaller($value)
- {
- return $this->getCookieJar()->forever($this->getRecallerName(), $value);
- }
-
- /**
- * Log the user out of the application.
- *
- * @return void
- */
- public function logout()
- {
- $user = $this->user();
-
- // If we have an event dispatcher instance, we can fire off the logout event
- // so any further processing can be done. This allows the developer to be
- // listening for anytime a user signs out of this application manually.
- $this->clearUserDataFromStorage();
-
- if ( ! is_null($this->user))
- {
- $this->refreshRememberToken($user);
- }
-
- if (isset($this->events))
- {
- $this->events->fire('auth.logout', [$user]);
- }
-
- // Once we have fired the logout event we will clear the users out of memory
- // so they are no longer available as the user is no longer considered as
- // being signed into this application and should not be available here.
- $this->user = null;
-
- $this->loggedOut = true;
- }
-
- /**
- * Remove the user data from the session and cookies.
- *
- * @return void
- */
- protected function clearUserDataFromStorage()
- {
- $this->session->remove($this->getName());
-
- $recaller = $this->getRecallerName();
-
- $this->getCookieJar()->queue($this->getCookieJar()->forget($recaller));
- }
-
- /**
- * Refresh the "remember me" token for the user.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @return void
- */
- protected function refreshRememberToken(UserContract $user)
- {
- $user->setRememberToken($token = str_random(60));
-
- $this->provider->updateRememberToken($user, $token);
- }
-
- /**
- * Create a new "remember me" token for the user if one doesn't already exist.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @return void
- */
- protected function createRememberTokenIfDoesntExist(UserContract $user)
- {
- $rememberToken = $user->getRememberToken();
-
- if (empty($rememberToken))
- {
- $this->refreshRememberToken($user);
- }
- }
-
- /**
- * Get the cookie creator instance used by the guard.
- *
- * @return \Illuminate\Contracts\Cookie\QueueingFactory
- *
- * @throws \RuntimeException
- */
- public function getCookieJar()
- {
- if ( ! isset($this->cookie))
- {
- throw new RuntimeException("Cookie jar has not been set.");
- }
-
- return $this->cookie;
- }
-
- /**
- * Set the cookie creator instance used by the guard.
- *
- * @param \Illuminate\Contracts\Cookie\QueueingFactory $cookie
- * @return void
- */
- public function setCookieJar(CookieJar $cookie)
- {
- $this->cookie = $cookie;
- }
-
- /**
- * Get the event dispatcher instance.
- *
- * @return \Illuminate\Contracts\Events\Dispatcher
- */
- public function getDispatcher()
- {
- return $this->events;
- }
-
- /**
- * Set the event dispatcher instance.
- *
- * @param \Illuminate\Contracts\Events\Dispatcher
- * @return void
- */
- public function setDispatcher(Dispatcher $events)
- {
- $this->events = $events;
- }
-
- /**
- * Get the session store used by the guard.
- *
- * @return \Illuminate\Session\Store
- */
- public function getSession()
- {
- return $this->session;
- }
-
- /**
- * Get the user provider used by the guard.
- *
- * @return \Illuminate\Contracts\Auth\UserProvider
- */
- public function getProvider()
- {
- return $this->provider;
- }
-
- /**
- * Set the user provider used by the guard.
- *
- * @param \Illuminate\Contracts\Auth\UserProvider $provider
- * @return void
- */
- public function setProvider(UserProvider $provider)
- {
- $this->provider = $provider;
- }
-
- /**
- * Return the currently cached user.
- *
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
- */
- public function getUser()
- {
- return $this->user;
- }
-
- /**
- * Set the current user.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @return void
- */
- public function setUser(UserContract $user)
- {
- $this->user = $user;
-
- $this->loggedOut = false;
- }
-
- /**
- * Get the current request instance.
- *
- * @return \Symfony\Component\HttpFoundation\Request
- */
- public function getRequest()
- {
- return $this->request ?: Request::createFromGlobals();
- }
-
- /**
- * Set the current request instance.
- *
- * @param \Symfony\Component\HttpFoundation\Request
- * @return $this
- */
- public function setRequest(Request $request)
- {
- $this->request = $request;
-
- return $this;
- }
-
- /**
- * Get the last user we attempted to authenticate.
- *
- * @return \Illuminate\Contracts\Auth\Authenticatable
- */
- public function getLastAttempted()
- {
- return $this->lastAttempted;
- }
-
- /**
- * Get a unique identifier for the auth session value.
- *
- * @return string
- */
- public function getName()
- {
- return 'login_'.md5(get_class($this));
- }
-
- /**
- * Get the name of the cookie used to store the "recaller".
- *
- * @return string
- */
- public function getRecallerName()
- {
- return 'remember_'.md5(get_class($this));
- }
-
- /**
- * Determine if the user was authenticated via "remember me" cookie.
- *
- * @return bool
- */
- public function viaRemember()
- {
- return $this->viaRemember;
- }
-
+class Guard implements GuardContract
+{
+ /**
+ * The currently authenticated user.
+ *
+ * @var \Illuminate\Contracts\Auth\Authenticatable
+ */
+ protected $user;
+
+ /**
+ * The user we last attempted to retrieve.
+ *
+ * @var \Illuminate\Contracts\Auth\Authenticatable
+ */
+ protected $lastAttempted;
+
+ /**
+ * Indicates if the user was authenticated via a recaller cookie.
+ *
+ * @var bool
+ */
+ protected $viaRemember = false;
+
+ /**
+ * The user provider implementation.
+ *
+ * @var \Illuminate\Contracts\Auth\UserProvider
+ */
+ protected $provider;
+
+ /**
+ * The session used by the guard.
+ *
+ * @var \Symfony\Component\HttpFoundation\Session\SessionInterface
+ */
+ protected $session;
+
+ /**
+ * The Illuminate cookie creator service.
+ *
+ * @var \Illuminate\Contracts\Cookie\QueueingFactory
+ */
+ protected $cookie;
+
+ /**
+ * The request instance.
+ *
+ * @var \Symfony\Component\HttpFoundation\Request
+ */
+ protected $request;
+
+ /**
+ * The event dispatcher instance.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected $events;
+
+ /**
+ * Indicates if the logout method has been called.
+ *
+ * @var bool
+ */
+ protected $loggedOut = false;
+
+ /**
+ * Indicates if a token user retrieval has been attempted.
+ *
+ * @var bool
+ */
+ protected $tokenRetrievalAttempted = false;
+
+ /**
+ * Create a new authentication guard.
+ *
+ * @param \Illuminate\Contracts\Auth\UserProvider $provider
+ * @param \Symfony\Component\HttpFoundation\Session\SessionInterface $session
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @return void
+ */
+ public function __construct(UserProvider $provider,
+ SessionInterface $session,
+ Request $request = null)
+ {
+ $this->session = $session;
+ $this->request = $request;
+ $this->provider = $provider;
+ }
+
+ /**
+ * Determine if the current user is authenticated.
+ *
+ * @return bool
+ */
+ public function check()
+ {
+ return ! is_null($this->user());
+ }
+
+ /**
+ * Determine if the current user is a guest.
+ *
+ * @return bool
+ */
+ public function guest()
+ {
+ return ! $this->check();
+ }
+
+ /**
+ * Get the currently authenticated user.
+ *
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function user()
+ {
+ if ($this->loggedOut) {
+ return;
+ }
+
+ // If we've already retrieved the user for the current request we can just
+ // return it back immediately. We do not want to fetch the user data on
+ // every call to this method because that would be tremendously slow.
+ if (! is_null($this->user)) {
+ return $this->user;
+ }
+
+ $id = $this->session->get($this->getName());
+
+ // First we will try to load the user using the identifier in the session if
+ // one exists. Otherwise we will check for a "remember me" cookie in this
+ // request, and if one exists, attempt to retrieve the user using that.
+ $user = null;
+
+ if (! is_null($id)) {
+ $user = $this->provider->retrieveById($id);
+ }
+
+ // If the user is null, but we decrypt a "recaller" cookie we can attempt to
+ // pull the user data on that cookie which serves as a remember cookie on
+ // the application. Once we have a user we can return it to the caller.
+ $recaller = $this->getRecaller();
+
+ if (is_null($user) && ! is_null($recaller)) {
+ $user = $this->getUserByRecaller($recaller);
+
+ if ($user) {
+ $this->updateSession($user->getAuthIdentifier());
+
+ $this->fireLoginEvent($user, true);
+ }
+ }
+
+ return $this->user = $user;
+ }
+
+ /**
+ * Get the ID for the currently authenticated user.
+ *
+ * @return int|null
+ */
+ public function id()
+ {
+ if ($this->loggedOut) {
+ return;
+ }
+
+ $id = $this->session->get($this->getName());
+
+ if (is_null($id) && $this->user()) {
+ $id = $this->user()->getAuthIdentifier();
+ }
+
+ return $id;
+ }
+
+ /**
+ * Pull a user from the repository by its recaller ID.
+ *
+ * @param string $recaller
+ * @return mixed
+ */
+ protected function getUserByRecaller($recaller)
+ {
+ if ($this->validRecaller($recaller) && ! $this->tokenRetrievalAttempted) {
+ $this->tokenRetrievalAttempted = true;
+
+ list($id, $token) = explode('|', $recaller, 2);
+
+ $this->viaRemember = ! is_null($user = $this->provider->retrieveByToken($id, $token));
+
+ return $user;
+ }
+ }
+
+ /**
+ * Get the decrypted recaller cookie for the request.
+ *
+ * @return string|null
+ */
+ protected function getRecaller()
+ {
+ return $this->request->cookies->get($this->getRecallerName());
+ }
+
+ /**
+ * Get the user ID from the recaller cookie.
+ *
+ * @return string|null
+ */
+ protected function getRecallerId()
+ {
+ if ($this->validRecaller($recaller = $this->getRecaller())) {
+ return head(explode('|', $recaller));
+ }
+ }
+
+ /**
+ * Determine if the recaller cookie is in a valid format.
+ *
+ * @param string $recaller
+ * @return bool
+ */
+ protected function validRecaller($recaller)
+ {
+ if (! is_string($recaller) || ! Str::contains($recaller, '|')) {
+ return false;
+ }
+
+ $segments = explode('|', $recaller);
+
+ return count($segments) == 2 && trim($segments[0]) !== '' && trim($segments[1]) !== '';
+ }
+
+ /**
+ * Log a user into the application without sessions or cookies.
+ *
+ * @param array $credentials
+ * @return bool
+ */
+ public function once(array $credentials = [])
+ {
+ if ($this->validate($credentials)) {
+ $this->setUser($this->lastAttempted);
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Validate a user's credentials.
+ *
+ * @param array $credentials
+ * @return bool
+ */
+ public function validate(array $credentials = [])
+ {
+ return $this->attempt($credentials, false, false);
+ }
+
+ /**
+ * Attempt to authenticate using HTTP Basic Auth.
+ *
+ * @param string $field
+ * @return \Symfony\Component\HttpFoundation\Response|null
+ */
+ public function basic($field = 'email')
+ {
+ if ($this->check()) {
+ return;
+ }
+
+ // If a username is set on the HTTP basic request, we will return out without
+ // interrupting the request lifecycle. Otherwise, we'll need to generate a
+ // request indicating that the given credentials were invalid for login.
+ if ($this->attemptBasic($this->getRequest(), $field)) {
+ return;
+ }
+
+ return $this->getBasicResponse();
+ }
+
+ /**
+ * Perform a stateless HTTP Basic login attempt.
+ *
+ * @param string $field
+ * @return \Symfony\Component\HttpFoundation\Response|null
+ */
+ public function onceBasic($field = 'email')
+ {
+ if (! $this->once($this->getBasicCredentials($this->getRequest(), $field))) {
+ return $this->getBasicResponse();
+ }
+ }
+
+ /**
+ * Attempt to authenticate using basic authentication.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @param string $field
+ * @return bool
+ */
+ protected function attemptBasic(Request $request, $field)
+ {
+ if (! $request->getUser()) {
+ return false;
+ }
+
+ return $this->attempt($this->getBasicCredentials($request, $field));
+ }
+
+ /**
+ * Get the credential array for a HTTP Basic request.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @param string $field
+ * @return array
+ */
+ protected function getBasicCredentials(Request $request, $field)
+ {
+ return [$field => $request->getUser(), 'password' => $request->getPassword()];
+ }
+
+ /**
+ * Get the response for basic authentication.
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ protected function getBasicResponse()
+ {
+ $headers = ['WWW-Authenticate' => 'Basic'];
+
+ return new Response('Invalid credentials.', 401, $headers);
+ }
+
+ /**
+ * Attempt to authenticate a user using the given credentials.
+ *
+ * @param array $credentials
+ * @param bool $remember
+ * @param bool $login
+ * @return bool
+ */
+ public function attempt(array $credentials = [], $remember = false, $login = true)
+ {
+ $this->fireAttemptEvent($credentials, $remember, $login);
+
+ $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
+
+ // 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 ($this->hasValidCredentials($user, $credentials)) {
+ if ($login) {
+ $this->login($user, $remember);
+ }
+
+ 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.
+ *
+ * @param array $credentials
+ * @param bool $remember
+ * @param bool $login
+ * @return void
+ */
+ protected function fireAttemptEvent(array $credentials, $remember, $login)
+ {
+ if ($this->events) {
+ $payload = [$credentials, $remember, $login];
+
+ $this->events->fire('auth.attempt', $payload);
+ }
+ }
+
+ /**
+ * Register an authentication attempt event listener.
+ *
+ * @param mixed $callback
+ * @return void
+ */
+ public function attempting($callback)
+ {
+ if ($this->events) {
+ $this->events->listen('auth.attempt', $callback);
+ }
+ }
+
+ /**
+ * Log a user into the application.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param bool $remember
+ * @return void
+ */
+ public function login(UserContract $user, $remember = false)
+ {
+ $this->updateSession($user->getAuthIdentifier());
+
+ // If the user should be permanently "remembered" by the application we will
+ // queue a permanent cookie that contains the encrypted copy of the user
+ // identifier. We will then decrypt this later to retrieve the users.
+ if ($remember) {
+ $this->createRememberTokenIfDoesntExist($user);
+
+ $this->queueRecallerCookie($user);
+ }
+
+ // If we have an event dispatcher instance set we will fire an event so that
+ // any listeners will hook into the authentication events and run actions
+ // based on the login and logout events fired from the guard instances.
+ $this->fireLoginEvent($user, $remember);
+
+ $this->setUser($user);
+ }
+
+ /**
+ * Fire the login event if the dispatcher is set.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param bool $remember
+ * @return void
+ */
+ protected function fireLoginEvent($user, $remember = false)
+ {
+ if (isset($this->events)) {
+ $this->events->fire('auth.login', [$user, $remember]);
+ }
+ }
+
+ /**
+ * Update the session with the given ID.
+ *
+ * @param string $id
+ * @return void
+ */
+ protected function updateSession($id)
+ {
+ $this->session->set($this->getName(), $id);
+
+ $this->session->migrate(true);
+ }
+
+ /**
+ * Log the given user ID into the application.
+ *
+ * @param mixed $id
+ * @param bool $remember
+ * @return \Illuminate\Contracts\Auth\Authenticatable
+ */
+ public function loginUsingId($id, $remember = false)
+ {
+ $this->session->set($this->getName(), $id);
+
+ $this->login($user = $this->provider->retrieveById($id), $remember);
+
+ return $user;
+ }
+
+ /**
+ * Log the given user ID into the application without sessions or cookies.
+ *
+ * @param mixed $id
+ * @return bool
+ */
+ public function onceUsingId($id)
+ {
+ if (! is_null($user = $this->provider->retrieveById($id))) {
+ $this->setUser($user);
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Queue the recaller cookie into the cookie jar.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @return void
+ */
+ protected function queueRecallerCookie(UserContract $user)
+ {
+ $value = $user->getAuthIdentifier().'|'.$user->getRememberToken();
+
+ $this->getCookieJar()->queue($this->createRecaller($value));
+ }
+
+ /**
+ * Create a "remember me" cookie for a given ID.
+ *
+ * @param string $value
+ * @return \Symfony\Component\HttpFoundation\Cookie
+ */
+ protected function createRecaller($value)
+ {
+ return $this->getCookieJar()->forever($this->getRecallerName(), $value);
+ }
+
+ /**
+ * Log the user out of the application.
+ *
+ * @return void
+ */
+ public function logout()
+ {
+ $user = $this->user();
+
+ // If we have an event dispatcher instance, we can fire off the logout event
+ // so any further processing can be done. This allows the developer to be
+ // listening for anytime a user signs out of this application manually.
+ $this->clearUserDataFromStorage();
+
+ if (! is_null($this->user)) {
+ $this->refreshRememberToken($user);
+ }
+
+ if (isset($this->events)) {
+ $this->events->fire('auth.logout', [$user]);
+ }
+
+ // Once we have fired the logout event we will clear the users out of memory
+ // so they are no longer available as the user is no longer considered as
+ // being signed into this application and should not be available here.
+ $this->user = null;
+
+ $this->loggedOut = true;
+ }
+
+ /**
+ * Remove the user data from the session and cookies.
+ *
+ * @return void
+ */
+ protected function clearUserDataFromStorage()
+ {
+ $this->session->remove($this->getName());
+
+ if (! is_null($this->getRecaller())) {
+ $recaller = $this->getRecallerName();
+
+ $this->getCookieJar()->queue($this->getCookieJar()->forget($recaller));
+ }
+ }
+
+ /**
+ * Refresh the "remember me" token for the user.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @return void
+ */
+ protected function refreshRememberToken(UserContract $user)
+ {
+ $user->setRememberToken($token = Str::random(60));
+
+ $this->provider->updateRememberToken($user, $token);
+ }
+
+ /**
+ * Create a new "remember me" token for the user if one doesn't already exist.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @return void
+ */
+ protected function createRememberTokenIfDoesntExist(UserContract $user)
+ {
+ if (empty($user->getRememberToken())) {
+ $this->refreshRememberToken($user);
+ }
+ }
+
+ /**
+ * Get the cookie creator instance used by the guard.
+ *
+ * @return \Illuminate\Contracts\Cookie\QueueingFactory
+ *
+ * @throws \RuntimeException
+ */
+ public function getCookieJar()
+ {
+ if (! isset($this->cookie)) {
+ throw new RuntimeException('Cookie jar has not been set.');
+ }
+
+ return $this->cookie;
+ }
+
+ /**
+ * Set the cookie creator instance used by the guard.
+ *
+ * @param \Illuminate\Contracts\Cookie\QueueingFactory $cookie
+ * @return void
+ */
+ public function setCookieJar(CookieJar $cookie)
+ {
+ $this->cookie = $cookie;
+ }
+
+ /**
+ * Get the event dispatcher instance.
+ *
+ * @return \Illuminate\Contracts\Events\Dispatcher
+ */
+ public function getDispatcher()
+ {
+ return $this->events;
+ }
+
+ /**
+ * Set the event dispatcher instance.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @return void
+ */
+ public function setDispatcher(Dispatcher $events)
+ {
+ $this->events = $events;
+ }
+
+ /**
+ * Get the session store used by the guard.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ public function getSession()
+ {
+ return $this->session;
+ }
+
+ /**
+ * Get the user provider used by the guard.
+ *
+ * @return \Illuminate\Contracts\Auth\UserProvider
+ */
+ public function getProvider()
+ {
+ return $this->provider;
+ }
+
+ /**
+ * Set the user provider used by the guard.
+ *
+ * @param \Illuminate\Contracts\Auth\UserProvider $provider
+ * @return void
+ */
+ public function setProvider(UserProvider $provider)
+ {
+ $this->provider = $provider;
+ }
+
+ /**
+ * Return the currently cached user.
+ *
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function getUser()
+ {
+ return $this->user;
+ }
+
+ /**
+ * Set the current user.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @return void
+ */
+ public function setUser(UserContract $user)
+ {
+ $this->user = $user;
+
+ $this->loggedOut = false;
+ }
+
+ /**
+ * Get the current request instance.
+ *
+ * @return \Symfony\Component\HttpFoundation\Request
+ */
+ public function getRequest()
+ {
+ return $this->request ?: Request::createFromGlobals();
+ }
+
+ /**
+ * Set the current request instance.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @return $this
+ */
+ public function setRequest(Request $request)
+ {
+ $this->request = $request;
+
+ return $this;
+ }
+
+ /**
+ * Get the last user we attempted to authenticate.
+ *
+ * @return \Illuminate\Contracts\Auth\Authenticatable
+ */
+ public function getLastAttempted()
+ {
+ return $this->lastAttempted;
+ }
+
+ /**
+ * Get a unique identifier for the auth session value.
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return 'login_'.md5(get_class($this));
+ }
+
+ /**
+ * Get the name of the cookie used to store the "recaller".
+ *
+ * @return string
+ */
+ public function getRecallerName()
+ {
+ return 'remember_'.md5(get_class($this));
+ }
+
+ /**
+ * Determine if the user was authenticated via "remember me" cookie.
+ *
+ * @return bool
+ */
+ public function viaRemember()
+ {
+ return $this->viaRemember;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
index f861805..a2418b3 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
@@ -1,39 +1,39 @@
-auth = $auth;
- }
+class AuthenticateWithBasicAuth
+{
+ /**
+ * The guard instance.
+ *
+ * @var \Illuminate\Contracts\Auth\Guard
+ */
+ protected $auth;
- /**
- * Handle an incoming request.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @return mixed
- */
- public function handle($request, Closure $next)
- {
- return $this->auth->basic() ?: $next($request);
- }
+ /**
+ * Create a new middleware instance.
+ *
+ * @param \Illuminate\Contracts\Auth\Guard $auth
+ * @return void
+ */
+ public function __construct(Guard $auth)
+ {
+ $this->auth = $auth;
+ }
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ return $this->auth->basic() ?: $next($request);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php
index ad59a98..d5d8e16 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php
@@ -1,15 +1,16 @@
-email;
- }
+namespace Illuminate\Auth\Passwords;
+trait CanResetPassword
+{
+ /**
+ * Get the e-mail address where password reset links are sent.
+ *
+ * @return string
+ */
+ public function getEmailForPasswordReset()
+ {
+ return $this->email;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
index c0efced..db93cf9 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
@@ -1,192 +1,193 @@
-table = $table;
- $this->hashKey = $hashKey;
- $this->expires = $expires * 60;
- $this->connection = $connection;
- }
-
- /**
- * Create a new token record.
- *
- * @param \Illuminate\Contracts\Auth\CanResetPassword $user
- * @return string
- */
- public function create(CanResetPasswordContract $user)
- {
- $email = $user->getEmailForPasswordReset();
-
- $this->deleteExisting($user);
-
- // We will create a new, random token for the user so that we can e-mail them
- // a safe link to the password reset form. Then we will insert a record in
- // the database so that we can verify the token within the actual reset.
- $token = $this->createNewToken($user);
-
- $this->getTable()->insert($this->getPayload($email, $token));
-
- return $token;
- }
-
- /**
- * Delete all existing reset tokens from the database.
- *
- * @param \Illuminate\Contracts\Auth\CanResetPassword $user
- * @return int
- */
- protected function deleteExisting(CanResetPasswordContract $user)
- {
- return $this->getTable()->where('email', $user->getEmailForPasswordReset())->delete();
- }
-
- /**
- * Build the record payload for the table.
- *
- * @param string $email
- * @param string $token
- * @return array
- */
- protected function getPayload($email, $token)
- {
- return ['email' => $email, 'token' => $token, 'created_at' => new Carbon];
- }
-
- /**
- * Determine if a token record exists and is valid.
- *
- * @param \Illuminate\Contracts\Auth\CanResetPassword $user
- * @param string $token
- * @return bool
- */
- public function exists(CanResetPasswordContract $user, $token)
- {
- $email = $user->getEmailForPasswordReset();
-
- $token = (array) $this->getTable()->where('email', $email)->where('token', $token)->first();
-
- return $token && ! $this->tokenExpired($token);
- }
-
- /**
- * Determine if the token has expired.
- *
- * @param array $token
- * @return bool
- */
- protected function tokenExpired($token)
- {
- $expirationTime = strtotime($token['created_at']) + $this->expires;
-
- return $expirationTime < $this->getCurrentTime();
- }
-
- /**
- * Get the current UNIX timestamp.
- *
- * @return int
- */
- protected function getCurrentTime()
- {
- return time();
- }
-
- /**
- * Delete a token record by token.
- *
- * @param string $token
- * @return void
- */
- public function delete($token)
- {
- $this->getTable()->where('token', $token)->delete();
- }
-
- /**
- * Delete expired tokens.
- *
- * @return void
- */
- public function deleteExpired()
- {
- $expiredAt = Carbon::now()->subSeconds($this->expires);
-
- $this->getTable()->where('created_at', '<', $expiredAt)->delete();
- }
-
- /**
- * Create a new token for the user.
- *
- * @param \Illuminate\Contracts\Auth\CanResetPassword $user
- * @return string
- */
- public function createNewToken(CanResetPasswordContract $user)
- {
- return hash_hmac('sha256', str_random(40), $this->hashKey);
- }
-
- /**
- * Begin a new database query against the table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function getTable()
- {
- return $this->connection->table($this->table);
- }
-
- /**
- * Get the database connection instance.
- *
- * @return \Illuminate\Database\ConnectionInterface
- */
- public function getConnection()
- {
- return $this->connection;
- }
-
+class DatabaseTokenRepository implements TokenRepositoryInterface
+{
+ /**
+ * The database connection instance.
+ *
+ * @var \Illuminate\Database\ConnectionInterface
+ */
+ protected $connection;
+
+ /**
+ * The token database table.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * The hashing key.
+ *
+ * @var string
+ */
+ protected $hashKey;
+
+ /**
+ * The number of seconds a token should last.
+ *
+ * @var int
+ */
+ protected $expires;
+
+ /**
+ * Create a new token repository instance.
+ *
+ * @param \Illuminate\Database\ConnectionInterface $connection
+ * @param string $table
+ * @param string $hashKey
+ * @param int $expires
+ * @return void
+ */
+ public function __construct(ConnectionInterface $connection, $table, $hashKey, $expires = 60)
+ {
+ $this->table = $table;
+ $this->hashKey = $hashKey;
+ $this->expires = $expires * 60;
+ $this->connection = $connection;
+ }
+
+ /**
+ * Create a new token record.
+ *
+ * @param \Illuminate\Contracts\Auth\CanResetPassword $user
+ * @return string
+ */
+ public function create(CanResetPasswordContract $user)
+ {
+ $email = $user->getEmailForPasswordReset();
+
+ $this->deleteExisting($user);
+
+ // We will create a new, random token for the user so that we can e-mail them
+ // a safe link to the password reset form. Then we will insert a record in
+ // the database so that we can verify the token within the actual reset.
+ $token = $this->createNewToken();
+
+ $this->getTable()->insert($this->getPayload($email, $token));
+
+ return $token;
+ }
+
+ /**
+ * Delete all existing reset tokens from the database.
+ *
+ * @param \Illuminate\Contracts\Auth\CanResetPassword $user
+ * @return int
+ */
+ protected function deleteExisting(CanResetPasswordContract $user)
+ {
+ return $this->getTable()->where('email', $user->getEmailForPasswordReset())->delete();
+ }
+
+ /**
+ * Build the record payload for the table.
+ *
+ * @param string $email
+ * @param string $token
+ * @return array
+ */
+ protected function getPayload($email, $token)
+ {
+ return ['email' => $email, 'token' => $token, 'created_at' => new Carbon];
+ }
+
+ /**
+ * Determine if a token record exists and is valid.
+ *
+ * @param \Illuminate\Contracts\Auth\CanResetPassword $user
+ * @param string $token
+ * @return bool
+ */
+ public function exists(CanResetPasswordContract $user, $token)
+ {
+ $email = $user->getEmailForPasswordReset();
+
+ $token = (array) $this->getTable()->where('email', $email)->where('token', $token)->first();
+
+ return $token && ! $this->tokenExpired($token);
+ }
+
+ /**
+ * Determine if the token has expired.
+ *
+ * @param array $token
+ * @return bool
+ */
+ protected function tokenExpired($token)
+ {
+ $expirationTime = strtotime($token['created_at']) + $this->expires;
+
+ return $expirationTime < $this->getCurrentTime();
+ }
+
+ /**
+ * Get the current UNIX timestamp.
+ *
+ * @return int
+ */
+ protected function getCurrentTime()
+ {
+ return time();
+ }
+
+ /**
+ * Delete a token record by token.
+ *
+ * @param string $token
+ * @return void
+ */
+ public function delete($token)
+ {
+ $this->getTable()->where('token', $token)->delete();
+ }
+
+ /**
+ * Delete expired tokens.
+ *
+ * @return void
+ */
+ public function deleteExpired()
+ {
+ $expiredAt = Carbon::now()->subSeconds($this->expires);
+
+ $this->getTable()->where('created_at', '<', $expiredAt)->delete();
+ }
+
+ /**
+ * Create a new token for the user.
+ *
+ * @return string
+ */
+ public function createNewToken()
+ {
+ return hash_hmac('sha256', Str::random(40), $this->hashKey);
+ }
+
+ /**
+ * Begin a new database query against the table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function getTable()
+ {
+ return $this->connection->table($this->table);
+ }
+
+ /**
+ * Get the database connection instance.
+ *
+ * @return \Illuminate\Database\ConnectionInterface
+ */
+ public function getConnection()
+ {
+ return $this->connection;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
index 55b8043..2fecd5b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
@@ -1,260 +1,253 @@
-users = $users;
- $this->mailer = $mailer;
- $this->tokens = $tokens;
- $this->emailView = $emailView;
- }
-
- /**
- * Send a password reset link to a user.
- *
- * @param array $credentials
- * @param \Closure|null $callback
- * @return string
- */
- public function sendResetLink(array $credentials, Closure $callback = null)
- {
- // First we will check to see if we found a user at the given credentials and
- // if we did not we will redirect back to this current URI with a piece of
- // "flash" data in the session to indicate to the developers the errors.
- $user = $this->getUser($credentials);
-
- if (is_null($user))
- {
- return PasswordBrokerContract::INVALID_USER;
- }
-
- // Once we have the reset token, we are ready to send the message out to this
- // user with a link to reset their password. We will then redirect back to
- // the current URI having nothing set in the session to indicate errors.
- $token = $this->tokens->create($user);
-
- $this->emailResetLink($user, $token, $callback);
-
- return PasswordBrokerContract::RESET_LINK_SENT;
- }
-
- /**
- * Send the password reset link via e-mail.
- *
- * @param \Illuminate\Contracts\Auth\CanResetPassword $user
- * @param string $token
- * @param \Closure|null $callback
- * @return int
- */
- public function emailResetLink(CanResetPasswordContract $user, $token, Closure $callback = null)
- {
- // We will use the reminder view that was given to the broker to display the
- // password reminder e-mail. We'll pass a "token" variable into the views
- // so that it may be displayed for an user to click for password reset.
- $view = $this->emailView;
-
- return $this->mailer->send($view, compact('token', 'user'), function($m) use ($user, $token, $callback)
- {
- $m->to($user->getEmailForPasswordReset());
-
- if ( ! is_null($callback))
- {
- call_user_func($callback, $m, $user, $token);
- }
- });
- }
-
- /**
- * Reset the password for the given token.
- *
- * @param array $credentials
- * @param \Closure $callback
- * @return mixed
- */
- public function reset(array $credentials, Closure $callback)
- {
- // If the responses from the validate method is not a user instance, we will
- // assume that it is a redirect and simply return it from this method and
- // the user is properly redirected having an error message on the post.
- $user = $this->validateReset($credentials);
-
- if ( ! $user instanceof CanResetPasswordContract)
- {
- return $user;
- }
-
- $pass = $credentials['password'];
-
- // Once we have called this callback, we will remove this token row from the
- // table and return the response from this callback so the user gets sent
- // to the destination given by the developers from the callback return.
- call_user_func($callback, $user, $pass);
-
- $this->tokens->delete($credentials['token']);
-
- return PasswordBrokerContract::PASSWORD_RESET;
- }
-
- /**
- * Validate a password reset for the given credentials.
- *
- * @param array $credentials
- * @return \Illuminate\Contracts\Auth\CanResetPassword
- */
- protected function validateReset(array $credentials)
- {
- if (is_null($user = $this->getUser($credentials)))
- {
- return PasswordBrokerContract::INVALID_USER;
- }
-
- if ( ! $this->validateNewPassword($credentials))
- {
- return PasswordBrokerContract::INVALID_PASSWORD;
- }
-
- if ( ! $this->tokens->exists($user, $credentials['token']))
- {
- return PasswordBrokerContract::INVALID_TOKEN;
- }
-
- return $user;
- }
-
- /**
- * Set a custom password validator.
- *
- * @param \Closure $callback
- * @return void
- */
- public function validator(Closure $callback)
- {
- $this->passwordValidator = $callback;
- }
-
- /**
- * Determine if the passwords match for the request.
- *
- * @param array $credentials
- * @return bool
- */
- public function validateNewPassword(array $credentials)
- {
- list($password, $confirm) = [
- $credentials['password'],
- $credentials['password_confirmation'],
- ];
-
- if (isset($this->passwordValidator))
- {
- return call_user_func(
- $this->passwordValidator, $credentials) && $password === $confirm;
- }
-
- return $this->validatePasswordWithDefaults($credentials);
- }
-
- /**
- * Determine if the passwords are valid for the request.
- *
- * @param array $credentials
- * @return bool
- */
- protected function validatePasswordWithDefaults(array $credentials)
- {
- list($password, $confirm) = [
- $credentials['password'],
- $credentials['password_confirmation'],
- ];
-
- return $password === $confirm && mb_strlen($password) >= 6;
- }
-
- /**
- * Get the user for the given credentials.
- *
- * @param array $credentials
- * @return \Illuminate\Contracts\Auth\CanResetPassword
- *
- * @throws \UnexpectedValueException
- */
- public function getUser(array $credentials)
- {
- $credentials = array_except($credentials, ['token']);
-
- $user = $this->users->retrieveByCredentials($credentials);
-
- if ($user && ! $user instanceof CanResetPasswordContract)
- {
- throw new UnexpectedValueException("User must implement CanResetPassword interface.");
- }
-
- return $user;
- }
-
- /**
- * Get the password reset token repository implementation.
- *
- * @return \Illuminate\Auth\Passwords\TokenRepositoryInterface
- */
- protected function getRepository()
- {
- return $this->tokens;
- }
-
+ {
+ $this->users = $users;
+ $this->mailer = $mailer;
+ $this->tokens = $tokens;
+ $this->emailView = $emailView;
+ }
+
+ /**
+ * Send a password reset link to a user.
+ *
+ * @param array $credentials
+ * @param \Closure|null $callback
+ * @return string
+ */
+ public function sendResetLink(array $credentials, Closure $callback = null)
+ {
+ // First we will check to see if we found a user at the given credentials and
+ // if we did not we will redirect back to this current URI with a piece of
+ // "flash" data in the session to indicate to the developers the errors.
+ $user = $this->getUser($credentials);
+
+ if (is_null($user)) {
+ return PasswordBrokerContract::INVALID_USER;
+ }
+
+ // Once we have the reset token, we are ready to send the message out to this
+ // user with a link to reset their password. We will then redirect back to
+ // the current URI having nothing set in the session to indicate errors.
+ $token = $this->tokens->create($user);
+
+ $this->emailResetLink($user, $token, $callback);
+
+ return PasswordBrokerContract::RESET_LINK_SENT;
+ }
+
+ /**
+ * Send the password reset link via e-mail.
+ *
+ * @param \Illuminate\Contracts\Auth\CanResetPassword $user
+ * @param string $token
+ * @param \Closure|null $callback
+ * @return int
+ */
+ public function emailResetLink(CanResetPasswordContract $user, $token, Closure $callback = null)
+ {
+ // We will use the reminder view that was given to the broker to display the
+ // password reminder e-mail. We'll pass a "token" variable into the views
+ // so that it may be displayed for an user to click for password reset.
+ $view = $this->emailView;
+
+ return $this->mailer->send($view, compact('token', 'user'), function ($m) use ($user, $token, $callback) {
+ $m->to($user->getEmailForPasswordReset());
+
+ if (! is_null($callback)) {
+ call_user_func($callback, $m, $user, $token);
+ }
+ });
+ }
+
+ /**
+ * Reset the password for the given token.
+ *
+ * @param array $credentials
+ * @param \Closure $callback
+ * @return mixed
+ */
+ public function reset(array $credentials, Closure $callback)
+ {
+ // If the responses from the validate method is not a user instance, we will
+ // assume that it is a redirect and simply return it from this method and
+ // the user is properly redirected having an error message on the post.
+ $user = $this->validateReset($credentials);
+
+ if (! $user instanceof CanResetPasswordContract) {
+ return $user;
+ }
+
+ $pass = $credentials['password'];
+
+ // Once we have called this callback, we will remove this token row from the
+ // table and return the response from this callback so the user gets sent
+ // to the destination given by the developers from the callback return.
+ call_user_func($callback, $user, $pass);
+
+ $this->tokens->delete($credentials['token']);
+
+ return PasswordBrokerContract::PASSWORD_RESET;
+ }
+
+ /**
+ * Validate a password reset for the given credentials.
+ *
+ * @param array $credentials
+ * @return \Illuminate\Contracts\Auth\CanResetPassword
+ */
+ protected function validateReset(array $credentials)
+ {
+ if (is_null($user = $this->getUser($credentials))) {
+ return PasswordBrokerContract::INVALID_USER;
+ }
+
+ if (! $this->validateNewPassword($credentials)) {
+ return PasswordBrokerContract::INVALID_PASSWORD;
+ }
+
+ if (! $this->tokens->exists($user, $credentials['token'])) {
+ return PasswordBrokerContract::INVALID_TOKEN;
+ }
+
+ return $user;
+ }
+
+ /**
+ * Set a custom password validator.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ public function validator(Closure $callback)
+ {
+ $this->passwordValidator = $callback;
+ }
+
+ /**
+ * Determine if the passwords match for the request.
+ *
+ * @param array $credentials
+ * @return bool
+ */
+ public function validateNewPassword(array $credentials)
+ {
+ list($password, $confirm) = [
+ $credentials['password'],
+ $credentials['password_confirmation'],
+ ];
+
+ if (isset($this->passwordValidator)) {
+ return call_user_func(
+ $this->passwordValidator, $credentials) && $password === $confirm;
+ }
+
+ return $this->validatePasswordWithDefaults($credentials);
+ }
+
+ /**
+ * Determine if the passwords are valid for the request.
+ *
+ * @param array $credentials
+ * @return bool
+ */
+ protected function validatePasswordWithDefaults(array $credentials)
+ {
+ list($password, $confirm) = [
+ $credentials['password'],
+ $credentials['password_confirmation'],
+ ];
+
+ return $password === $confirm && mb_strlen($password) >= 6;
+ }
+
+ /**
+ * Get the user for the given credentials.
+ *
+ * @param array $credentials
+ * @return \Illuminate\Contracts\Auth\CanResetPassword
+ *
+ * @throws \UnexpectedValueException
+ */
+ public function getUser(array $credentials)
+ {
+ $credentials = Arr::except($credentials, ['token']);
+
+ $user = $this->users->retrieveByCredentials($credentials);
+
+ if ($user && ! $user instanceof CanResetPasswordContract) {
+ throw new UnexpectedValueException('User must implement CanResetPassword interface.');
+ }
+
+ return $user;
+ }
+
+ /**
+ * Get the password reset token repository implementation.
+ *
+ * @return \Illuminate\Auth\Passwords\TokenRepositoryInterface
+ */
+ protected function getRepository()
+ {
+ return $this->tokens;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php
index 5615ec6..2da8f7d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php
@@ -1,88 +1,87 @@
-registerPasswordBroker();
-
- $this->registerTokenRepository();
- }
-
- /**
- * Register the password broker instance.
- *
- * @return void
- */
- protected function registerPasswordBroker()
- {
- $this->app->singleton('auth.password', function($app)
- {
- // The password token repository is responsible for storing the email addresses
- // and password reset tokens. It will be used to verify the tokens are valid
- // for the given e-mail addresses. We will resolve an implementation here.
- $tokens = $app['auth.password.tokens'];
-
- $users = $app['auth']->driver()->getProvider();
-
- $view = $app['config']['auth.password.email'];
-
- // The password broker uses a token repository to validate tokens and send user
- // password e-mails, as well as validating that password reset process as an
- // aggregate service of sorts providing a convenient interface for resets.
- return new PasswordBroker(
- $tokens, $users, $app['mailer'], $view
- );
- });
- }
-
- /**
- * Register the token repository implementation.
- *
- * @return void
- */
- protected function registerTokenRepository()
- {
- $this->app->singleton('auth.password.tokens', function($app)
- {
- $connection = $app['db']->connection();
-
- // The database token repository is an implementation of the token repository
- // interface, and is responsible for the actual storing of auth tokens and
- // their e-mail addresses. We will inject this table and hash key to it.
- $table = $app['config']['auth.password.table'];
-
- $key = $app['config']['app.key'];
-
- $expire = $app['config']->get('auth.password.expire', 60);
-
- return new DbRepository($connection, $table, $key, $expire);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return ['auth.password', 'auth.password.tokens'];
- }
-
+class PasswordResetServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerPasswordBroker();
+
+ $this->registerTokenRepository();
+ }
+
+ /**
+ * Register the password broker instance.
+ *
+ * @return void
+ */
+ protected function registerPasswordBroker()
+ {
+ $this->app->singleton('auth.password', function ($app) {
+ // The password token repository is responsible for storing the email addresses
+ // and password reset tokens. It will be used to verify the tokens are valid
+ // for the given e-mail addresses. We will resolve an implementation here.
+ $tokens = $app['auth.password.tokens'];
+
+ $users = $app['auth']->driver()->getProvider();
+
+ $view = $app['config']['auth.password.email'];
+
+ // The password broker uses a token repository to validate tokens and send user
+ // password e-mails, as well as validating that password reset process as an
+ // aggregate service of sorts providing a convenient interface for resets.
+ return new PasswordBroker(
+ $tokens, $users, $app['mailer'], $view
+ );
+ });
+ }
+
+ /**
+ * Register the token repository implementation.
+ *
+ * @return void
+ */
+ protected function registerTokenRepository()
+ {
+ $this->app->singleton('auth.password.tokens', function ($app) {
+ $connection = $app['db']->connection();
+
+ // The database token repository is an implementation of the token repository
+ // interface, and is responsible for the actual storing of auth tokens and
+ // their e-mail addresses. We will inject this table and hash key to it.
+ $table = $app['config']['auth.password.table'];
+
+ $key = $app['config']['app.key'];
+
+ $expire = $app['config']->get('auth.password.expire', 60);
+
+ return new DbRepository($connection, $table, $key, $expire);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['auth.password', 'auth.password.tokens'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php
index 06609d0..0570773 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php
@@ -1,39 +1,40 @@
-=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/http": "5.0.*",
- "illuminate/session": "5.0.*",
- "illuminate/support": "5.0.*",
- "nesbot/carbon": "~1.0"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/http": "5.1.*",
+ "illuminate/session": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "nesbot/carbon": "~1.19"
},
"autoload": {
"psr-4": {
@@ -28,11 +28,11 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "illuminate/console": "Required to use the auth:clear-resets command (5.0.*)."
+ "illuminate/console": "Required to use the auth:clear-resets command (5.1.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php
new file mode 100644
index 0000000..1b6bad9
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php
@@ -0,0 +1,87 @@
+broadcaster = $broadcaster;
+ }
+
+ /**
+ * Handle the queued job.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param array $data
+ * @return void
+ */
+ public function fire(Job $job, array $data)
+ {
+ $event = unserialize($data['event']);
+
+ $name = method_exists($event, 'broadcastAs')
+ ? $event->broadcastAs() : get_class($event);
+
+ $this->broadcaster->broadcast(
+ $event->broadcastOn(), $name, $this->getPayloadFromEvent($event)
+ );
+
+ $job->delete();
+ }
+
+ /**
+ * Get the payload for the given event.
+ *
+ * @param mixed $event
+ * @return array
+ */
+ protected function getPayloadFromEvent($event)
+ {
+ if (method_exists($event, 'broadcastWith')) {
+ return $event->broadcastWith();
+ }
+
+ $payload = [];
+
+ foreach ((new ReflectionClass($event))->getProperties(ReflectionProperty::IS_PUBLIC) as $property) {
+ $payload[$property->getName()] = $this->formatProperty($property->getValue($event));
+ }
+
+ return $payload;
+ }
+
+ /**
+ * Format the given value for a property.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function formatProperty($value)
+ {
+ if ($value instanceof Arrayable) {
+ return $value->toArray();
+ }
+
+ return $value;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
new file mode 100644
index 0000000..97a0fe5
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
@@ -0,0 +1,219 @@
+app = $app;
+ }
+
+ /**
+ * Get a driver instance.
+ *
+ * @param string $driver
+ * @return mixed
+ */
+ public function connection($driver = null)
+ {
+ return $this->driver($driver);
+ }
+
+ /**
+ * Get a driver instance.
+ *
+ * @param string $name
+ * @return mixed
+ */
+ public function driver($name = null)
+ {
+ $name = $name ?: $this->getDefaultDriver();
+
+ return $this->drivers[$name] = $this->get($name);
+ }
+
+ /**
+ * Attempt to get the connection from the local cache.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Broadcasting\Broadcaster
+ */
+ protected function get($name)
+ {
+ return isset($this->drivers[$name]) ? $this->drivers[$name] : $this->resolve($name);
+ }
+
+ /**
+ * Resolve the given store.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Broadcasting\Broadcaster
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function resolve($name)
+ {
+ $config = $this->getConfig($name);
+
+ if (is_null($config)) {
+ throw new InvalidArgumentException("Broadcaster [{$name}] is not defined.");
+ }
+
+ if (isset($this->customCreators[$config['driver']])) {
+ return $this->callCustomCreator($config);
+ } else {
+ $driverMethod = 'create'.ucfirst($config['driver']).'Driver';
+
+ if (method_exists($this, $driverMethod)) {
+ return $this->{$driverMethod}($config);
+ } else {
+ throw new InvalidArgumentException("Driver [{$config['driver']}] not supported.");
+ }
+ }
+ }
+
+ /**
+ * Call a custom driver creator.
+ *
+ * @param array $config
+ * @return mixed
+ */
+ protected function callCustomCreator(array $config)
+ {
+ return $this->customCreators[$config['driver']]($this->app, $config);
+ }
+
+ /**
+ * Create an instance of the driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Broadcasting\Broadcaster
+ */
+ protected function createPusherDriver(array $config)
+ {
+ return new PusherBroadcaster(
+ new Pusher($config['key'], $config['secret'], $config['app_id'], Arr::get($config, 'options', []))
+ );
+ }
+
+ /**
+ * Create an instance of the driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Broadcasting\Broadcaster
+ */
+ protected function createRedisDriver(array $config)
+ {
+ return new RedisBroadcaster(
+ $this->app->make('redis'), Arr::get($config, 'connection')
+ );
+ }
+
+ /**
+ * Create an instance of the driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Broadcasting\Broadcaster
+ */
+ protected function createLogDriver(array $config)
+ {
+ return new LogBroadcaster(
+ $this->app->make('Psr\Log\LoggerInterface')
+ );
+ }
+
+ /**
+ * Get the connection configuration.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function getConfig($name)
+ {
+ return $this->app['config']["broadcasting.connections.{$name}"];
+ }
+
+ /**
+ * Get the default driver name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['broadcasting.default'];
+ }
+
+ /**
+ * Set the default driver name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['broadcasting.default'] = $name;
+ }
+
+ /**
+ * Register a custom driver creator Closure.
+ *
+ * @param string $driver
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function extend($driver, Closure $callback)
+ {
+ $this->customCreators[$driver] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Dynamically call the default driver instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->driver(), $method], $parameters);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php
new file mode 100644
index 0000000..c6f14fe
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php
@@ -0,0 +1,49 @@
+app->singleton('Illuminate\Broadcasting\BroadcastManager', function ($app) {
+ return new BroadcastManager($app);
+ });
+
+ $this->app->singleton('Illuminate\Contracts\Broadcasting\Broadcaster', function ($app) {
+ return $app->make('Illuminate\Broadcasting\BroadcastManager')->connection();
+ });
+
+ $this->app->alias(
+ 'Illuminate\Broadcasting\BroadcastManager', 'Illuminate\Contracts\Broadcasting\Factory'
+ );
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'Illuminate\Broadcasting\BroadcastManager',
+ 'Illuminate\Contracts\Broadcasting\Factory',
+ 'Illuminate\Contracts\Broadcasting\Broadcaster',
+ ];
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php
new file mode 100644
index 0000000..6b90492
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php
@@ -0,0 +1,39 @@
+logger = $logger;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function broadcast(array $channels, $event, array $payload = [])
+ {
+ $channels = implode(', ', $channels);
+
+ $payload = json_encode($payload, JSON_PRETTY_PRINT);
+
+ $this->logger->info('Broadcasting ['.$event.'] on channels ['.$channels.'] with payload:'.PHP_EOL.$payload);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
new file mode 100644
index 0000000..cea2d38
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -0,0 +1,45 @@
+pusher = $pusher;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function broadcast(array $channels, $event, array $payload = [])
+ {
+ $this->pusher->trigger($channels, $event, $payload);
+ }
+
+ /**
+ * Get the Pusher SDK instance.
+ *
+ * @return \Pusher
+ */
+ public function getPusher()
+ {
+ return $this->pusher;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
new file mode 100644
index 0000000..91c7c61
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
@@ -0,0 +1,50 @@
+redis = $redis;
+ $this->connection = $connection;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function broadcast(array $channels, $event, array $payload = [])
+ {
+ $connection = $this->redis->connection($this->connection);
+
+ $payload = json_encode(['event' => $event, 'data' => $payload]);
+
+ foreach ($channels as $channel) {
+ $connection->publish($channel, $payload);
+ }
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
new file mode 100644
index 0000000..c3e89d1
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
@@ -0,0 +1,35 @@
+{
+ "name": "illuminate/broadcasting",
+ "description": "The Illuminate Broadcasting package.",
+ "license": "MIT",
+ "homepage": "http://laravel.com",
+ "support": {
+ "issues": "https://github.com/laravel/framework/issues",
+ "source": "https://github.com/laravel/framework"
+ },
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylorotwell@gmail.com"
+ }
+ ],
+ "require": {
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*"
+ },
+ "autoload": {
+ "psr-4": {
+ "Illuminate\\Broadcasting\\": ""
+ }
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.1-dev"
+ }
+ },
+ "suggest": {
+ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0)."
+ },
+ "minimum-stability": "dev"
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php
index e63d61f..55eeb2a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php
@@ -1,52 +1,51 @@
-app->singleton('Illuminate\Bus\Dispatcher', function($app)
- {
- return new Dispatcher($app, function() use ($app)
- {
- return $app['Illuminate\Contracts\Queue\Queue'];
- });
- });
+namespace Illuminate\Bus;
- $this->app->alias(
- 'Illuminate\Bus\Dispatcher', 'Illuminate\Contracts\Bus\Dispatcher'
- );
-
- $this->app->alias(
- 'Illuminate\Bus\Dispatcher', 'Illuminate\Contracts\Bus\QueueingDispatcher'
- );
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return [
- 'Illuminate\Bus\Dispatcher',
- 'Illuminate\Contracts\Bus\Dispatcher',
- 'Illuminate\Contracts\Bus\QueueingDispatcher',
- ];
- }
+use Illuminate\Support\ServiceProvider;
+class BusServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('Illuminate\Bus\Dispatcher', function ($app) {
+ return new Dispatcher($app, function () use ($app) {
+ return $app['Illuminate\Contracts\Queue\Queue'];
+ });
+ });
+
+ $this->app->alias(
+ 'Illuminate\Bus\Dispatcher', 'Illuminate\Contracts\Bus\Dispatcher'
+ );
+
+ $this->app->alias(
+ 'Illuminate\Bus\Dispatcher', 'Illuminate\Contracts\Bus\QueueingDispatcher'
+ );
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'Illuminate\Bus\Dispatcher',
+ 'Illuminate\Contracts\Bus\Dispatcher',
+ 'Illuminate\Contracts\Bus\QueueingDispatcher',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php b/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php
index 2e254ff..cecf9f1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php
@@ -1,4 +1,6 @@
-container = $container;
- $this->queueResolver = $queueResolver;
- $this->pipeline = new Pipeline($container);
- }
-
- /**
- * Marshal a command and dispatch it to its appropriate handler.
- *
- * @param mixed $command
- * @param array $array
- * @return mixed
- */
- public function dispatchFromArray($command, array $array)
- {
- return $this->dispatch($this->marshalFromArray($command, $array));
- }
-
- /**
- * Marshal a command and dispatch it to its appropriate handler.
- *
- * @param mixed $command
- * @param \ArrayAccess $source
- * @param array $extras
- * @return mixed
- */
- public function dispatchFrom($command, ArrayAccess $source, array $extras = [])
- {
- return $this->dispatch($this->marshal($command, $source, $extras));
- }
-
- /**
- * Marshal a command from the given array.
- *
- * @param string $command
- * @param array $array
- * @return mixed
- */
- protected function marshalFromArray($command, array $array)
- {
- return $this->marshal($command, new Collection, $array);
- }
-
- /**
- * Marshal a command from the given array accessible object.
- *
- * @param string $command
- * @param \ArrayAccess $source
- * @param array $extras
- * @return mixed
- */
- protected function marshal($command, ArrayAccess $source, array $extras = [])
- {
- $injected = [];
-
- $reflection = new ReflectionClass($command);
-
- if ($constructor = $reflection->getConstructor())
- {
- $injected = array_map(function($parameter) use ($command, $source, $extras)
- {
- return $this->getParameterValueForCommand($command, $source, $parameter, $extras);
-
- }, $constructor->getParameters());
- }
-
- return $reflection->newInstanceArgs($injected);
- }
-
- /**
- * Get a parameter value for a marshaled command.
- *
- * @param string $command
- * @param \ArrayAccess $source
- * @param \ReflectionParameter $parameter
- * @param array $extras
- * @return mixed
- */
- protected function getParameterValueForCommand($command, ArrayAccess $source,
- ReflectionParameter $parameter, array $extras = array())
- {
- if (array_key_exists($parameter->name, $extras))
- {
- return $extras[$parameter->name];
- }
-
- if (isset($source[$parameter->name]))
- {
- return $source[$parameter->name];
- }
-
- if ($parameter->isDefaultValueAvailable())
- {
- return $parameter->getDefaultValue();
- }
-
- MarshalException::whileMapping($command, $parameter);
- }
-
- /**
- * Dispatch a command to its appropriate handler.
- *
- * @param mixed $command
- * @param \Closure|null $afterResolving
- * @return mixed
- */
- public function dispatch($command, Closure $afterResolving = null)
- {
- if ($this->queueResolver && $this->commandShouldBeQueued($command))
- {
- return $this->dispatchToQueue($command);
- }
- else
- {
- return $this->dispatchNow($command, $afterResolving);
- }
- }
-
- /**
- * Dispatch a command to its appropriate handler in the current process.
- *
- * @param mixed $command
- * @param \Closure|null $afterResolving
- * @return mixed
- */
- public function dispatchNow($command, Closure $afterResolving = null)
- {
- return $this->pipeline->send($command)->through($this->pipes)->then(function($command) use ($afterResolving)
- {
- if ($command instanceof SelfHandling)
- {
- return $this->container->call([$command, 'handle']);
- }
-
- $handler = $this->resolveHandler($command);
-
- if ($afterResolving)
- {
- call_user_func($afterResolving, $handler);
- }
-
- return call_user_func(
- [$handler, $this->getHandlerMethod($command)], $command
- );
- });
-
- }
-
- /**
- * Determine if the given command should be queued.
- *
- * @param mixed $command
- * @return bool
- */
- protected function commandShouldBeQueued($command)
- {
- if ($command instanceof ShouldBeQueued)
- {
- return true;
- }
-
- return (new ReflectionClass($this->getHandlerClass($command)))->implementsInterface(
- 'Illuminate\Contracts\Queue\ShouldBeQueued'
- );
- }
-
- /**
- * Dispatch a command to its appropriate handler behind a queue.
- *
- * @param mixed $command
- * @return mixed
- *
- * @throws \RuntimeException
- */
- public function dispatchToQueue($command)
- {
- $queue = call_user_func($this->queueResolver);
-
- if ( ! $queue instanceof Queue)
- {
- throw new RuntimeException("Queue resolver did not return a Queue implementation.");
- }
-
- if (method_exists($command, 'queue'))
- {
- $command->queue($queue, $command);
- }
- else
- {
- $queue->push($command);
- }
- }
-
- /**
- * Get the handler instance for the given command.
- *
- * @param mixed $command
- * @return mixed
- */
- public function resolveHandler($command)
- {
- if ($command instanceof SelfHandling)
- {
- return $command;
- }
-
- return $this->container->make($this->getHandlerClass($command));
- }
-
- /**
- * Get the handler class for the given command.
- *
- * @param mixed $command
- * @return string
- */
- public function getHandlerClass($command)
- {
- if ($command instanceof SelfHandling)
- {
- return get_class($command);
- }
-
- return $this->inflectSegment($command, 0);
- }
-
- /**
- * Get the handler method for the given command.
- *
- * @param mixed $command
- * @return string
- */
- public function getHandlerMethod($command)
- {
- if ($command instanceof SelfHandling)
- {
- return 'handle';
- }
-
- return $this->inflectSegment($command, 1);
- }
-
- /**
- * Get the given handler segment for the given command.
- *
- * @param mixed $command
- * @param int $segment
- * @return string
- */
- protected function inflectSegment($command, $segment)
- {
- $className = get_class($command);
-
- if (isset($this->mappings[$className]))
- {
- return $this->getMappingSegment($className, $segment);
- }
- elseif ($this->mapper)
- {
- return $this->getMapperSegment($command, $segment);
- }
-
- throw new InvalidArgumentException("No handler registered for command [{$className}]");
- }
-
- /**
- * Get the given segment from a given class handler.
- *
- * @param string $className
- * @param int $segment
- * @return string
- */
- protected function getMappingSegment($className, $segment)
- {
- return explode('@', $this->mappings[$className])[$segment];
- }
-
- /**
- * Get the given segment from a given class handler using the custom mapper.
- *
- * @param mixed $command
- * @param int $segment
- * @return string
- */
- protected function getMapperSegment($command, $segment)
- {
- return explode('@', call_user_func($this->mapper, $command))[$segment];
- }
-
- /**
- * Register command-to-handler mappings.
- *
- * @param array $commands
- * @return void
- */
- public function maps(array $commands)
- {
- $this->mappings = array_merge($this->mappings, $commands);
- }
-
- /**
- * Register a fallback mapper callback.
- *
- * @param \Closure $mapper
- * @return void
- */
- public function mapUsing(Closure $mapper)
- {
- $this->mapper = $mapper;
- }
-
- /**
- * Map the command to a handler within a given root namespace.
- *
- * @param mixed $command
- * @param string $commandNamespace
- * @param string $handlerNamespace
- * @return string
- */
- public static function simpleMapping($command, $commandNamespace, $handlerNamespace)
- {
- $command = str_replace($commandNamespace, '', get_class($command));
-
- return $handlerNamespace.'\\'.trim($command, '\\').'Handler@handle';
- }
-
- /**
- * Set the pipes through which commands should be piped before dispatching.
- *
- * @param array $pipes
- * @return $this
- */
- public function pipeThrough(array $pipes)
- {
- $this->pipes = $pipes;
-
- return $this;
- }
-
+class Dispatcher implements DispatcherContract, QueueingDispatcher, HandlerResolver
+{
+ /**
+ * The container implementation.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The pipeline instance for the bus.
+ *
+ * @var \Illuminate\Pipeline\Pipeline
+ */
+ protected $pipeline;
+
+ /**
+ * The pipes to send commands through before dispatching.
+ *
+ * @var array
+ */
+ protected $pipes = [];
+
+ /**
+ * The queue resolver callback.
+ *
+ * @var \Closure|null
+ */
+ protected $queueResolver;
+
+ /**
+ * All of the command-to-handler mappings.
+ *
+ * @var array
+ */
+ protected $mappings = [];
+
+ /**
+ * The fallback mapping Closure.
+ *
+ * @var \Closure
+ */
+ protected $mapper;
+
+ /**
+ * Create a new command dispatcher instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @param \Closure|null $queueResolver
+ * @return void
+ */
+ public function __construct(Container $container, Closure $queueResolver = null)
+ {
+ $this->container = $container;
+ $this->queueResolver = $queueResolver;
+ $this->pipeline = new Pipeline($container);
+ }
+
+ /**
+ * Marshal a command and dispatch it to its appropriate handler.
+ *
+ * @param mixed $command
+ * @param array $array
+ * @return mixed
+ */
+ public function dispatchFromArray($command, array $array)
+ {
+ return $this->dispatch($this->marshalFromArray($command, $array));
+ }
+
+ /**
+ * Marshal a command and dispatch it to its appropriate handler.
+ *
+ * @param mixed $command
+ * @param \ArrayAccess $source
+ * @param array $extras
+ * @return mixed
+ */
+ public function dispatchFrom($command, ArrayAccess $source, array $extras = [])
+ {
+ return $this->dispatch($this->marshal($command, $source, $extras));
+ }
+
+ /**
+ * Marshal a command from the given array.
+ *
+ * @param string $command
+ * @param array $array
+ * @return mixed
+ */
+ protected function marshalFromArray($command, array $array)
+ {
+ return $this->marshal($command, new Collection, $array);
+ }
+
+ /**
+ * Marshal a command from the given array accessible object.
+ *
+ * @param string $command
+ * @param \ArrayAccess $source
+ * @param array $extras
+ * @return mixed
+ */
+ protected function marshal($command, ArrayAccess $source, array $extras = [])
+ {
+ $injected = [];
+
+ $reflection = new ReflectionClass($command);
+
+ if ($constructor = $reflection->getConstructor()) {
+ $injected = array_map(function ($parameter) use ($command, $source, $extras) {
+ return $this->getParameterValueForCommand($command, $source, $parameter, $extras);
+ }, $constructor->getParameters());
+ }
+
+ return $reflection->newInstanceArgs($injected);
+ }
+
+ /**
+ * Get a parameter value for a marshalled command.
+ *
+ * @param string $command
+ * @param \ArrayAccess $source
+ * @param \ReflectionParameter $parameter
+ * @param array $extras
+ * @return mixed
+ */
+ protected function getParameterValueForCommand($command, ArrayAccess $source, ReflectionParameter $parameter, array $extras = [])
+ {
+ if (array_key_exists($parameter->name, $extras)) {
+ return $extras[$parameter->name];
+ }
+
+ if (isset($source[$parameter->name])) {
+ return $source[$parameter->name];
+ }
+
+ if ($parameter->isDefaultValueAvailable()) {
+ return $parameter->getDefaultValue();
+ }
+
+ MarshalException::whileMapping($command, $parameter);
+ }
+
+ /**
+ * Dispatch a command to its appropriate handler.
+ *
+ * @param mixed $command
+ * @param \Closure|null $afterResolving
+ * @return mixed
+ */
+ public function dispatch($command, Closure $afterResolving = null)
+ {
+ if ($this->queueResolver && $this->commandShouldBeQueued($command)) {
+ return $this->dispatchToQueue($command);
+ } else {
+ return $this->dispatchNow($command, $afterResolving);
+ }
+ }
+
+ /**
+ * Dispatch a command to its appropriate handler in the current process.
+ *
+ * @param mixed $command
+ * @param \Closure|null $afterResolving
+ * @return mixed
+ */
+ public function dispatchNow($command, Closure $afterResolving = null)
+ {
+ return $this->pipeline->send($command)->through($this->pipes)->then(function ($command) use ($afterResolving) {
+ if ($command instanceof SelfHandling) {
+ return $this->container->call([$command, 'handle']);
+ }
+
+ $handler = $this->resolveHandler($command);
+
+ if ($afterResolving) {
+ call_user_func($afterResolving, $handler);
+ }
+
+ return call_user_func(
+ [$handler, $this->getHandlerMethod($command)], $command
+ );
+ });
+ }
+
+ /**
+ * Determine if the given command should be queued.
+ *
+ * @param mixed $command
+ * @return bool
+ */
+ protected function commandShouldBeQueued($command)
+ {
+ if ($command instanceof ShouldQueue) {
+ return true;
+ }
+
+ return (new ReflectionClass($this->getHandlerClass($command)))->implementsInterface(
+ 'Illuminate\Contracts\Queue\ShouldQueue'
+ );
+ }
+
+ /**
+ * Dispatch a command to its appropriate handler behind a queue.
+ *
+ * @param mixed $command
+ * @return mixed
+ *
+ * @throws \RuntimeException
+ */
+ public function dispatchToQueue($command)
+ {
+ $queue = call_user_func($this->queueResolver);
+
+ if (! $queue instanceof Queue) {
+ throw new RuntimeException('Queue resolver did not return a Queue implementation.');
+ }
+
+ if (method_exists($command, 'queue')) {
+ return $command->queue($queue, $command);
+ } else {
+ return $this->pushCommandToQueue($queue, $command);
+ }
+ }
+
+ /**
+ * Push the command onto the given queue instance.
+ *
+ * @param \Illuminate\Contracts\Queue\Queue $queue
+ * @param mixed $command
+ * @return mixed
+ */
+ protected function pushCommandToQueue($queue, $command)
+ {
+ if (isset($command->queue, $command->delay)) {
+ return $queue->laterOn($command->queue, $command->delay, $command);
+ }
+
+ if (isset($command->queue)) {
+ return $queue->pushOn($command->queue, $command);
+ }
+
+ if (isset($command->delay)) {
+ return $queue->later($command->delay, $command);
+ }
+
+ return $queue->push($command);
+ }
+
+ /**
+ * Get the handler instance for the given command.
+ *
+ * @param mixed $command
+ * @return mixed
+ */
+ public function resolveHandler($command)
+ {
+ if ($command instanceof SelfHandling) {
+ return $command;
+ }
+
+ return $this->container->make($this->getHandlerClass($command));
+ }
+
+ /**
+ * Get the handler class for the given command.
+ *
+ * @param mixed $command
+ * @return string
+ */
+ public function getHandlerClass($command)
+ {
+ if ($command instanceof SelfHandling) {
+ return get_class($command);
+ }
+
+ return $this->inflectSegment($command, 0);
+ }
+
+ /**
+ * Get the handler method for the given command.
+ *
+ * @param mixed $command
+ * @return string
+ */
+ public function getHandlerMethod($command)
+ {
+ if ($command instanceof SelfHandling) {
+ return 'handle';
+ }
+
+ return $this->inflectSegment($command, 1);
+ }
+
+ /**
+ * Get the given handler segment for the given command.
+ *
+ * @param mixed $command
+ * @param int $segment
+ * @return string
+ */
+ protected function inflectSegment($command, $segment)
+ {
+ $className = get_class($command);
+
+ if (isset($this->mappings[$className])) {
+ return $this->getMappingSegment($className, $segment);
+ } elseif ($this->mapper) {
+ return $this->getMapperSegment($command, $segment);
+ }
+
+ throw new InvalidArgumentException("No handler registered for command [{$className}]");
+ }
+
+ /**
+ * Get the given segment from a given class handler.
+ *
+ * @param string $className
+ * @param int $segment
+ * @return string
+ */
+ protected function getMappingSegment($className, $segment)
+ {
+ return explode('@', $this->mappings[$className])[$segment];
+ }
+
+ /**
+ * Get the given segment from a given class handler using the custom mapper.
+ *
+ * @param mixed $command
+ * @param int $segment
+ * @return string
+ */
+ protected function getMapperSegment($command, $segment)
+ {
+ return explode('@', call_user_func($this->mapper, $command))[$segment];
+ }
+
+ /**
+ * Register command-to-handler mappings.
+ *
+ * @param array $commands
+ * @return void
+ */
+ public function maps(array $commands)
+ {
+ $this->mappings = array_merge($this->mappings, $commands);
+ }
+
+ /**
+ * Register a fallback mapper callback.
+ *
+ * @param \Closure $mapper
+ * @return void
+ */
+ public function mapUsing(Closure $mapper)
+ {
+ $this->mapper = $mapper;
+ }
+
+ /**
+ * Map the command to a handler within a given root namespace.
+ *
+ * @param mixed $command
+ * @param string $commandNamespace
+ * @param string $handlerNamespace
+ * @return string
+ */
+ public static function simpleMapping($command, $commandNamespace, $handlerNamespace)
+ {
+ $command = str_replace($commandNamespace, '', get_class($command));
+
+ return $handlerNamespace.'\\'.trim($command, '\\').'Handler@handle';
+ }
+
+ /**
+ * Set the pipes through which commands should be piped before dispatching.
+ *
+ * @param array $pipes
+ * @return $this
+ */
+ public function pipeThrough(array $pipes)
+ {
+ $this->pipes = $pipes;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/MarshalException.php b/application/vendor/laravel/framework/src/Illuminate/Bus/MarshalException.php
index 35c9bf8..49c7674 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/MarshalException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/MarshalException.php
@@ -1,20 +1,23 @@
-name}] to command [{$command}]");
- }
-
+class MarshalException extends RuntimeException
+{
+ /**
+ * Throw a new exception.
+ *
+ * @param string $command
+ * @param \ReflectionParameter $parameter
+ * @return void
+ *
+ * @throws static
+ */
+ public static function whileMapping($command, ReflectionParameter $parameter)
+ {
+ throw new static("Unable to map parameter [{$parameter->name}] to command [{$command}]");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/Queueable.php b/application/vendor/laravel/framework/src/Illuminate/Bus/Queueable.php
new file mode 100644
index 0000000..42d1ca5
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/Queueable.php
@@ -0,0 +1,46 @@
+queue = $queue;
+
+ return $this;
+ }
+
+ /**
+ * Set the desired delay for the job.
+ *
+ * @param int $delay
+ * @return $this
+ */
+ public function delay($delay)
+ {
+ $this->delay = $delay;
+
+ return $this;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json b/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json
index cb3a40d..16982e6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json
@@ -14,10 +14,10 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/pipeline": "5.0.*",
- "illuminate/support": "5.0.*"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/pipeline": "5.1.*",
+ "illuminate/support": "5.1.*"
},
"autoload": {
"psr-4": {
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php
index 52c3ffc..9125dec 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php
@@ -1,130 +1,130 @@
-apc = $apc;
- $this->prefix = $prefix;
- }
+ /**
+ * A string that should be prepended to keys.
+ *
+ * @var string
+ */
+ protected $prefix;
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- $value = $this->apc->get($this->prefix.$key);
+ /**
+ * Create a new APC store.
+ *
+ * @param \Illuminate\Cache\ApcWrapper $apc
+ * @param string $prefix
+ * @return void
+ */
+ public function __construct(ApcWrapper $apc, $prefix = '')
+ {
+ $this->apc = $apc;
+ $this->prefix = $prefix;
+ }
- if ($value !== false)
- {
- return $value;
- }
- }
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ $value = $this->apc->get($this->prefix.$key);
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $this->apc->put($this->prefix.$key, $value, $minutes * 60);
- }
+ if ($value !== false) {
+ return $value;
+ }
+ }
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function increment($key, $value = 1)
- {
- return $this->apc->increment($this->prefix.$key, $value);
- }
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ $this->apc->put($this->prefix.$key, $value, $minutes * 60);
+ }
- /**
- * Decrement the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function decrement($key, $value = 1)
- {
- return $this->apc->decrement($this->prefix.$key, $value);
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function increment($key, $value = 1)
+ {
+ return $this->apc->increment($this->prefix.$key, $value);
+ }
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return array|bool
- */
- public function forever($key, $value)
- {
- return $this->put($key, $value, 0);
- }
+ /**
+ * Decrement the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function decrement($key, $value = 1)
+ {
+ return $this->apc->decrement($this->prefix.$key, $value);
+ }
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- return $this->apc->delete($this->prefix.$key);
- }
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->put($key, $value, 0);
+ }
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->apc->flush();
- }
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ return $this->apc->delete($this->prefix.$key);
+ }
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return $this->prefix;
- }
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->apc->flush();
+ }
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->prefix;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php b/application/vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php
index 09ac6e8..9fdf293 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php
@@ -1,91 +1,92 @@
-apcu = function_exists('apcu_fetch');
- }
+ /**
+ * Create a new APC wrapper instance.
+ *
+ * @return void
+ */
+ public function __construct()
+ {
+ $this->apcu = function_exists('apcu_fetch');
+ }
- /**
- * Get an item from the cache.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- return $this->apcu ? apcu_fetch($key) : apc_fetch($key);
- }
+ /**
+ * Get an item from the cache.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ return $this->apcu ? apcu_fetch($key) : apc_fetch($key);
+ }
- /**
- * Store an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @param int $seconds
- * @return array|bool
- */
- public function put($key, $value, $seconds)
- {
- return $this->apcu ? apcu_store($key, $value, $seconds) : apc_store($key, $value, $seconds);
- }
+ /**
+ * Store an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $seconds
+ * @return array|bool
+ */
+ public function put($key, $value, $seconds)
+ {
+ return $this->apcu ? apcu_store($key, $value, $seconds) : apc_store($key, $value, $seconds);
+ }
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function increment($key, $value)
- {
- return $this->apcu ? apcu_inc($key, $value) : apc_inc($key, $value);
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function increment($key, $value)
+ {
+ return $this->apcu ? apcu_inc($key, $value) : apc_inc($key, $value);
+ }
- /**
- * Decrement the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function decrement($key, $value)
- {
- return $this->apcu ? apcu_dec($key, $value) : apc_dec($key, $value);
- }
+ /**
+ * Decrement the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function decrement($key, $value)
+ {
+ return $this->apcu ? apcu_dec($key, $value) : apc_dec($key, $value);
+ }
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function delete($key)
- {
- return $this->apcu ? apcu_delete($key) : apc_delete($key);
- }
-
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->apcu ? apcu_clear_cache() : apc_clear_cache('user');
- }
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function delete($key)
+ {
+ return $this->apcu ? apcu_delete($key) : apc_delete($key);
+ }
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->apcu ? apcu_clear_cache() : apc_clear_cache('user');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
index 07f05d1..3dd8c04 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
@@ -1,112 +1,112 @@
-storage))
- {
- return $this->storage[$key];
- }
- }
+class ArrayStore extends TaggableStore implements Store
+{
+ /**
+ * The array of stored values.
+ *
+ * @var array
+ */
+ protected $storage = [];
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $this->storage[$key] = $value;
- }
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ if (array_key_exists($key, $this->storage)) {
+ return $this->storage[$key];
+ }
+ }
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function increment($key, $value = 1)
- {
- $this->storage[$key] = $this->storage[$key] + $value;
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ $this->storage[$key] = $value;
+ }
- return $this->storage[$key];
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function increment($key, $value = 1)
+ {
+ $this->storage[$key] = ((int) $this->storage[$key]) + $value;
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function decrement($key, $value = 1)
- {
- return $this->increment($key, $value * -1);
- }
+ return $this->storage[$key];
+ }
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $this->put($key, $value, 0);
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function decrement($key, $value = 1)
+ {
+ return $this->increment($key, $value * -1);
+ }
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- unset($this->storage[$key]);
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->put($key, $value, 0);
+ }
- return true;
- }
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ unset($this->storage[$key]);
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->storage = array();
- }
+ return true;
+ }
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return '';
- }
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->storage = [];
+ }
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return '';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
index 95dfa4f..1eb7935 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
@@ -1,315 +1,320 @@
-app = $app;
- }
-
- /**
- * Get a cache store instance by name.
- *
- * @param string|null $name
- * @return mixed
- */
- public function store($name = null)
- {
- $name = $name ?: $this->getDefaultDriver();
-
- return $this->stores[$name] = $this->get($name);
- }
-
- /**
- * Get a cache driver instance.
- *
- * @param string $driver
- * @return mixed
- */
- public function driver($driver = null)
- {
- return $this->store($driver);
- }
-
- /**
- * Attempt to get the store from the local cache.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Cache\Repository
- */
- protected function get($name)
- {
- return isset($this->stores[$name]) ? $this->stores[$name] : $this->resolve($name);
- }
-
- /**
- * Resolve the given store.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Cache\Repository
- */
- protected function resolve($name)
- {
- $config = $this->getConfig($name);
-
- if (is_null($config))
- {
- throw new InvalidArgumentException("Cache store [{$name}] is not defined.");
- }
-
- if (isset($this->customCreators[$config['driver']]))
- {
- return $this->callCustomCreator($config);
- }
- else
- {
- return $this->{"create".ucfirst($config['driver'])."Driver"}($config);
- }
- }
-
- /**
- * Call a custom driver creator.
- *
- * @param array $config
- * @return mixed
- */
- protected function callCustomCreator(array $config)
- {
- return $this->customCreators[$config['driver']]($this->app, $config);
- }
-
- /**
- * Create an instance of the APC cache driver.
- *
- * @param array $config
- * @return \Illuminate\Cache\ApcStore
- */
- protected function createApcDriver(array $config)
- {
- $prefix = $this->getPrefix($config);
-
- return $this->repository(new ApcStore(new ApcWrapper, $prefix));
- }
-
- /**
- * Create an instance of the array cache driver.
- *
- * @return \Illuminate\Cache\ArrayStore
- */
- protected function createArrayDriver()
- {
- return $this->repository(new ArrayStore);
- }
-
- /**
- * Create an instance of the file cache driver.
- *
- * @param array $config
- * @return \Illuminate\Cache\FileStore
- */
- protected function createFileDriver(array $config)
- {
- return $this->repository(new FileStore($this->app['files'], $config['path']));
- }
-
- /**
- * Create an instance of the Memcached cache driver.
- *
- * @param array $config
- * @return \Illuminate\Cache\MemcachedStore
- */
- protected function createMemcachedDriver(array $config)
- {
- $prefix = $this->getPrefix($config);
-
- $memcached = $this->app['memcached.connector']->connect($config['servers']);
-
- return $this->repository(new MemcachedStore($memcached, $prefix));
- }
-
- /**
- * Create an instance of the Null cache driver.
- *
- * @return \Illuminate\Cache\NullStore
- */
- protected function createNullDriver()
- {
- return $this->repository(new NullStore);
- }
-
- /**
- * Create an instance of the WinCache cache driver.
- *
- * @param array $config
- * @return \Illuminate\Cache\WinCacheStore
- */
- protected function createWincacheDriver(array $config)
- {
- return $this->repository(new WinCacheStore($this->getPrefix($config)));
- }
-
- /**
- * Create an instance of the XCache cache driver.
- *
- * @param array $config
- * @return \Illuminate\Cache\WinCacheStore
- */
- protected function createXcacheDriver(array $config)
- {
- return $this->repository(new XCacheStore($this->getPrefix($config)));
- }
-
- /**
- * Create an instance of the Redis cache driver.
- *
- * @param array $config
- * @return \Illuminate\Cache\RedisStore
- */
- protected function createRedisDriver(array $config)
- {
- $redis = $this->app['redis'];
-
- $connection = array_get($config, 'connection', 'default') ?: 'default';
-
- return $this->repository(new RedisStore($redis, $this->getPrefix($config), $connection));
- }
-
- /**
- * Create an instance of the database cache driver.
- *
- * @param array $config
- * @return \Illuminate\Cache\DatabaseStore
- */
- protected function createDatabaseDriver(array $config)
- {
- $connection = $this->app['db']->connection(array_get($config, 'connection'));
-
- return $this->repository(
- new DatabaseStore(
- $connection, $this->app['encrypter'], $config['table'], $this->getPrefix($config)
- )
- );
- }
-
- /**
- * Create a new cache repository with the given implementation.
- *
- * @param \Illuminate\Contracts\Cache\Store $store
- * @return \Illuminate\Cache\Repository
- */
- public function repository(Store $store)
- {
- $repository = new Repository($store);
-
- if ($this->app->bound('Illuminate\Contracts\Events\Dispatcher'))
- {
- $repository->setEventDispatcher(
- $this->app['Illuminate\Contracts\Events\Dispatcher']
- );
- }
-
- return $repository;
- }
-
- /**
- * Get the cache prefix.
- *
- * @param array $config
- * @return string
- */
- protected function getPrefix(array $config)
- {
- return array_get($config, 'prefix') ?: $this->app['config']['cache.prefix'];
- }
-
- /**
- * Get the cache connection configuration.
- *
- * @param string $name
- * @return array
- */
- protected function getConfig($name)
- {
- return $this->app['config']["cache.stores.{$name}"];
- }
-
- /**
- * Get the default cache driver name.
- *
- * @return string
- */
- public function getDefaultDriver()
- {
- return $this->app['config']['cache.default'];
- }
-
- /**
- * Set the default cache driver name.
- *
- * @param string $name
- * @return void
- */
- public function setDefaultDriver($name)
- {
- $this->app['config']['cache.default'] = $name;
- }
-
- /**
- * Register a custom driver creator Closure.
- *
- * @param string $driver
- * @param \Closure $callback
- * @return $this
- */
- public function extend($driver, Closure $callback)
- {
- $this->customCreators[$driver] = $callback;
-
- return $this;
- }
-
- /**
- * Dynamically call the default driver instance.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array(array($this->store(), $method), $parameters);
- }
-
+class CacheManager implements FactoryContract
+{
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The array of resolved cache stores.
+ *
+ * @var array
+ */
+ protected $stores = [];
+
+ /**
+ * The registered custom driver creators.
+ *
+ * @var array
+ */
+ protected $customCreators = [];
+
+ /**
+ * Create a new Cache manager instance.
+ *
+ * @param \Illuminate\Foundation\Application $app
+ * @return void
+ */
+ public function __construct($app)
+ {
+ $this->app = $app;
+ }
+
+ /**
+ * Get a cache store instance by name.
+ *
+ * @param string|null $name
+ * @return mixed
+ */
+ public function store($name = null)
+ {
+ $name = $name ?: $this->getDefaultDriver();
+
+ return $this->stores[$name] = $this->get($name);
+ }
+
+ /**
+ * Get a cache driver instance.
+ *
+ * @param string $driver
+ * @return mixed
+ */
+ public function driver($driver = null)
+ {
+ return $this->store($driver);
+ }
+
+ /**
+ * Attempt to get the store from the local cache.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Cache\Repository
+ */
+ protected function get($name)
+ {
+ return isset($this->stores[$name]) ? $this->stores[$name] : $this->resolve($name);
+ }
+
+ /**
+ * Resolve the given store.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Cache\Repository
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function resolve($name)
+ {
+ $config = $this->getConfig($name);
+
+ if (is_null($config)) {
+ throw new InvalidArgumentException("Cache store [{$name}] is not defined.");
+ }
+
+ if (isset($this->customCreators[$config['driver']])) {
+ return $this->callCustomCreator($config);
+ } else {
+ $driverMethod = 'create'.ucfirst($config['driver']).'Driver';
+
+ if (method_exists($this, $driverMethod)) {
+ return $this->{$driverMethod}($config);
+ } else {
+ throw new InvalidArgumentException("Driver [{$config['driver']}] not supported.");
+ }
+ }
+ }
+
+ /**
+ * Call a custom driver creator.
+ *
+ * @param array $config
+ * @return mixed
+ */
+ protected function callCustomCreator(array $config)
+ {
+ return $this->customCreators[$config['driver']]($this->app, $config);
+ }
+
+ /**
+ * Create an instance of the APC cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\ApcStore
+ */
+ protected function createApcDriver(array $config)
+ {
+ $prefix = $this->getPrefix($config);
+
+ return $this->repository(new ApcStore(new ApcWrapper, $prefix));
+ }
+
+ /**
+ * Create an instance of the array cache driver.
+ *
+ * @return \Illuminate\Cache\ArrayStore
+ */
+ protected function createArrayDriver()
+ {
+ return $this->repository(new ArrayStore);
+ }
+
+ /**
+ * Create an instance of the file cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\FileStore
+ */
+ protected function createFileDriver(array $config)
+ {
+ return $this->repository(new FileStore($this->app['files'], $config['path']));
+ }
+
+ /**
+ * Create an instance of the Memcached cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\MemcachedStore
+ */
+ protected function createMemcachedDriver(array $config)
+ {
+ $prefix = $this->getPrefix($config);
+
+ $memcached = $this->app['memcached.connector']->connect($config['servers']);
+
+ return $this->repository(new MemcachedStore($memcached, $prefix));
+ }
+
+ /**
+ * Create an instance of the Null cache driver.
+ *
+ * @return \Illuminate\Cache\NullStore
+ */
+ protected function createNullDriver()
+ {
+ return $this->repository(new NullStore);
+ }
+
+ /**
+ * Create an instance of the WinCache cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\WinCacheStore
+ */
+ protected function createWincacheDriver(array $config)
+ {
+ return $this->repository(new WinCacheStore($this->getPrefix($config)));
+ }
+
+ /**
+ * Create an instance of the XCache cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\WinCacheStore
+ */
+ protected function createXcacheDriver(array $config)
+ {
+ return $this->repository(new XCacheStore($this->getPrefix($config)));
+ }
+
+ /**
+ * Create an instance of the Redis cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\RedisStore
+ */
+ protected function createRedisDriver(array $config)
+ {
+ $redis = $this->app['redis'];
+
+ $connection = Arr::get($config, 'connection', 'default');
+
+ return $this->repository(new RedisStore($redis, $this->getPrefix($config), $connection));
+ }
+
+ /**
+ * Create an instance of the database cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\DatabaseStore
+ */
+ protected function createDatabaseDriver(array $config)
+ {
+ $connection = $this->app['db']->connection(Arr::get($config, 'connection'));
+
+ return $this->repository(
+ new DatabaseStore(
+ $connection, $this->app['encrypter'], $config['table'], $this->getPrefix($config)
+ )
+ );
+ }
+
+ /**
+ * Create a new cache repository with the given implementation.
+ *
+ * @param \Illuminate\Contracts\Cache\Store $store
+ * @return \Illuminate\Cache\Repository
+ */
+ public function repository(Store $store)
+ {
+ $repository = new Repository($store);
+
+ if ($this->app->bound('Illuminate\Contracts\Events\Dispatcher')) {
+ $repository->setEventDispatcher(
+ $this->app['Illuminate\Contracts\Events\Dispatcher']
+ );
+ }
+
+ return $repository;
+ }
+
+ /**
+ * Get the cache prefix.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getPrefix(array $config)
+ {
+ return Arr::get($config, 'prefix') ?: $this->app['config']['cache.prefix'];
+ }
+
+ /**
+ * Get the cache connection configuration.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function getConfig($name)
+ {
+ return $this->app['config']["cache.stores.{$name}"];
+ }
+
+ /**
+ * Get the default cache driver name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['cache.default'];
+ }
+
+ /**
+ * Set the default cache driver name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['cache.default'] = $name;
+ }
+
+ /**
+ * Register a custom driver creator Closure.
+ *
+ * @param string $driver
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function extend($driver, Closure $callback)
+ {
+ $this->customCreators[$driver] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Dynamically call the default driver instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->store(), $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php
index c646294..fe4801e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php
@@ -1,73 +1,69 @@
-app->singleton('cache', function($app)
- {
- return new CacheManager($app);
- });
+class CacheServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- $this->app->singleton('cache.store', function($app)
- {
- return $app['cache']->driver();
- });
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('cache', function ($app) {
+ return new CacheManager($app);
+ });
- $this->app->singleton('memcached.connector', function()
- {
- return new MemcachedConnector;
- });
+ $this->app->singleton('cache.store', function ($app) {
+ return $app['cache']->driver();
+ });
- $this->registerCommands();
- }
+ $this->app->singleton('memcached.connector', function () {
+ return new MemcachedConnector;
+ });
- /**
- * Register the cache related console commands.
- *
- * @return void
- */
- public function registerCommands()
- {
- $this->app->singleton('command.cache.clear', function($app)
- {
- return new ClearCommand($app['cache']);
- });
+ $this->registerCommands();
+ }
- $this->app->singleton('command.cache.table', function($app)
- {
- return new CacheTableCommand($app['files'], $app['composer']);
- });
+ /**
+ * Register the cache related console commands.
+ *
+ * @return void
+ */
+ public function registerCommands()
+ {
+ $this->app->singleton('command.cache.clear', function ($app) {
+ return new ClearCommand($app['cache']);
+ });
- $this->commands('command.cache.clear', 'command.cache.table');
- }
+ $this->app->singleton('command.cache.table', function ($app) {
+ return new CacheTableCommand($app['files'], $app['composer']);
+ });
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return [
- 'cache', 'cache.store', 'memcached.connector', 'command.cache.clear', 'command.cache.table',
- ];
- }
+ $this->commands('command.cache.clear', 'command.cache.table');
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'cache', 'cache.store', 'memcached.connector', 'command.cache.clear', 'command.cache.table',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php
index 589e676..2e436d6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php
@@ -1,80 +1,81 @@
-files = $files;
- $this->composer = $composer;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $fullPath = $this->createBaseMigration();
-
- $this->files->put($fullPath, $this->files->get(__DIR__.'/stubs/cache.stub'));
-
- $this->info('Migration created successfully!');
-
- $this->composer->dumpAutoloads();
- }
-
- /**
- * Create a base migration file for the table.
- *
- * @return string
- */
- protected function createBaseMigration()
- {
- $name = 'create_cache_table';
-
- $path = $this->laravel->databasePath().'/migrations';
-
- return $this->laravel['migration.creator']->create($name, $path);
- }
-
+class CacheTableCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'cache:table';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a migration for the cache database table';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * @var \Illuminate\Foundation\Composer
+ */
+ protected $composer;
+
+ /**
+ * Create a new cache table command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param \Illuminate\Foundation\Composer $composer
+ * @return void
+ */
+ public function __construct(Filesystem $files, Composer $composer)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ $this->composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $fullPath = $this->createBaseMigration();
+
+ $this->files->put($fullPath, $this->files->get(__DIR__.'/stubs/cache.stub'));
+
+ $this->info('Migration created successfully!');
+
+ $this->composer->dumpAutoloads();
+ }
+
+ /**
+ * Create a base migration file for the table.
+ *
+ * @return string
+ */
+ protected function createBaseMigration()
+ {
+ $name = 'create_cache_table';
+
+ $path = $this->laravel->databasePath().'/migrations';
+
+ return $this->laravel['migration.creator']->create($name, $path);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
index 3e55f83..02ea032 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
@@ -1,73 +1,74 @@
-cache = $cache;
- }
+ /**
+ * Create a new cache clear command instance.
+ *
+ * @param \Illuminate\Cache\CacheManager $cache
+ * @return void
+ */
+ public function __construct(CacheManager $cache)
+ {
+ parent::__construct();
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $storeName = $this->argument('store');
+ $this->cache = $cache;
+ }
- $this->laravel['events']->fire('cache:clearing', [$storeName]);
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $storeName = $this->argument('store');
- $this->cache->store($storeName)->flush();
+ $this->laravel['events']->fire('cache:clearing', [$storeName]);
- $this->laravel['events']->fire('cache:cleared', [$storeName]);
+ $this->cache->store($storeName)->flush();
- $this->info('Application cache cleared!');
- }
+ $this->laravel['events']->fire('cache:cleared', [$storeName]);
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return [
- ['store', InputArgument::OPTIONAL, 'The name of the store you would like to clear.'],
- ];
- }
+ $this->info('Application cache cleared!');
+ }
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['store', InputArgument::OPTIONAL, 'The name of the store you would like to clear.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/stubs/cache.stub b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/stubs/cache.stub
index 8ba4467..c972a4f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/stubs/cache.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/stubs/cache.stub
@@ -3,31 +3,29 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
-class CreateCacheTable extends Migration {
-
- /**
- * Run the migrations.
- *
- * @return void
- */
- public function up()
- {
- Schema::create('cache', function(Blueprint $table)
- {
- $table->string('key')->unique();
- $table->text('value');
- $table->integer('expiration');
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::drop('cache');
- }
+class CreateCacheTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('cache', function (Blueprint $table) {
+ $table->string('key')->unique();
+ $table->text('value');
+ $table->integer('expiration');
+ });
+ }
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('cache');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
index cc9c07f..20f20c7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
@@ -1,228 +1,260 @@
-table = $table;
- $this->prefix = $prefix;
- $this->encrypter = $encrypter;
- $this->connection = $connection;
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- $prefixed = $this->prefix.$key;
-
- $cache = $this->table()->where('key', '=', $prefixed)->first();
-
- // If we have a cache record we will check the expiration time against current
- // time on the system and see if the record has expired. If it has, we will
- // remove the records from the database table so it isn't returned again.
- if ( ! is_null($cache))
- {
- if (is_array($cache)) $cache = (object) $cache;
-
- if (time() >= $cache->expiration)
- {
- $this->forget($key);
-
- return;
- }
-
- return $this->encrypter->decrypt($cache->value);
- }
- }
-
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $key = $this->prefix.$key;
-
- // All of the cached values in the database are encrypted in case this is used
- // as a session data store by the consumer. We'll also calculate the expire
- // time and place that on the table so we will check it on our retrieval.
- $value = $this->encrypter->encrypt($value);
-
- $expiration = $this->getTime() + ($minutes * 60);
-
- try
- {
- $this->table()->insert(compact('key', 'value', 'expiration'));
- }
- catch (Exception $e)
- {
- $this->table()->where('key', '=', $key)->update(compact('value', 'expiration'));
- }
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- *
- * @throws \LogicException
- */
- public function increment($key, $value = 1)
- {
- throw new LogicException("Increment operations not supported by this driver.");
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- *
- * @throws \LogicException
- */
- public function decrement($key, $value = 1)
- {
- throw new LogicException("Decrement operations not supported by this driver.");
- }
-
- /**
- * Get the current system time.
- *
- * @return int
- */
- protected function getTime()
- {
- return time();
- }
-
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $this->put($key, $value, 5256000);
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- $this->table()->where('key', '=', $this->prefix.$key)->delete();
-
- return true;
- }
-
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->table()->delete();
- }
-
- /**
- * Get a query builder for the cache table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function table()
- {
- return $this->connection->table($this->table);
- }
-
- /**
- * Get the underlying database connection.
- *
- * @return \Illuminate\Database\ConnectionInterface
- */
- public function getConnection()
- {
- return $this->connection;
- }
-
- /**
- * Get the encrypter instance.
- *
- * @return \Illuminate\Contracts\Encryption\Encrypter
- */
- public function getEncrypter()
- {
- return $this->encrypter;
- }
-
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return $this->prefix;
- }
+class DatabaseStore implements Store
+{
+ /**
+ * The database connection instance.
+ *
+ * @var \Illuminate\Database\ConnectionInterface
+ */
+ protected $connection;
+
+ /**
+ * The encrypter instance.
+ *
+ * @var \Illuminate\Contracts\Encryption\Encrypter
+ */
+ protected $encrypter;
+
+ /**
+ * The name of the cache table.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * A string that should be prepended to keys.
+ *
+ * @var string
+ */
+ protected $prefix;
+
+ /**
+ * Create a new database store.
+ *
+ * @param \Illuminate\Database\ConnectionInterface $connection
+ * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
+ * @param string $table
+ * @param string $prefix
+ * @return void
+ */
+ public function __construct(ConnectionInterface $connection, EncrypterContract $encrypter, $table, $prefix = '')
+ {
+ $this->table = $table;
+ $this->prefix = $prefix;
+ $this->encrypter = $encrypter;
+ $this->connection = $connection;
+ }
+
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ $prefixed = $this->prefix.$key;
+
+ $cache = $this->table()->where('key', '=', $prefixed)->first();
+
+ // If we have a cache record we will check the expiration time against current
+ // time on the system and see if the record has expired. If it has, we will
+ // remove the records from the database table so it isn't returned again.
+ if (! is_null($cache)) {
+ if (is_array($cache)) {
+ $cache = (object) $cache;
+ }
+
+ if (time() >= $cache->expiration) {
+ $this->forget($key);
+
+ return;
+ }
+
+ return $this->encrypter->decrypt($cache->value);
+ }
+ }
+
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ $key = $this->prefix.$key;
+
+ // All of the cached values in the database are encrypted in case this is used
+ // as a session data store by the consumer. We'll also calculate the expire
+ // time and place that on the table so we will check it on our retrieval.
+ $value = $this->encrypter->encrypt($value);
+
+ $expiration = $this->getTime() + ($minutes * 60);
+
+ try {
+ $this->table()->insert(compact('key', 'value', 'expiration'));
+ } catch (Exception $e) {
+ $this->table()->where('key', '=', $key)->update(compact('value', 'expiration'));
+ }
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function increment($key, $value = 1)
+ {
+ return $this->incrementOrDecrement($key, $value, function ($current, $value) {
+ return $current + $value;
+ });
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function decrement($key, $value = 1)
+ {
+ return $this->incrementOrDecrement($key, $value, function ($current, $value) {
+ return $current - $value;
+ });
+ }
+
+ /**
+ * Increment or decrement an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param \Closure $callback
+ * @return int|bool
+ */
+ protected function incrementOrDecrement($key, $value, Closure $callback)
+ {
+ return $this->connection->transaction(function () use ($key, $value, $callback) {
+ $prefixed = $this->prefix.$key;
+
+ $cache = $this->table()->where('key', $prefixed)->lockForUpdate()->first();
+
+ if (is_null($cache)) {
+ return false;
+ }
+
+ $current = $this->encrypter->decrypt($cache->value);
+ $new = $callback((int) $current, $value);
+
+ if (! is_numeric($current)) {
+ return false;
+ }
+
+ $this->table()->where('key', $prefixed)->update([
+ 'value' => $this->encrypter->encrypt($new),
+ ]);
+
+ return $new;
+ });
+ }
+
+ /**
+ * Get the current system time.
+ *
+ * @return int
+ */
+ protected function getTime()
+ {
+ return time();
+ }
+
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->put($key, $value, 5256000);
+ }
+
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ $this->table()->where('key', '=', $this->prefix.$key)->delete();
+
+ return true;
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->table()->delete();
+ }
+
+ /**
+ * Get a query builder for the cache table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function table()
+ {
+ return $this->connection->table($this->table);
+ }
+
+ /**
+ * Get the underlying database connection.
+ *
+ * @return \Illuminate\Database\ConnectionInterface
+ */
+ public function getConnection()
+ {
+ return $this->connection;
+ }
+
+ /**
+ * Get the encrypter instance.
+ *
+ * @return \Illuminate\Contracts\Encryption\Encrypter
+ */
+ public function getEncrypter()
+ {
+ return $this->encrypter;
+ }
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->prefix;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
index 4728334..05f3eda 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
@@ -1,256 +1,250 @@
-files = $files;
- $this->directory = $directory;
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- return array_get($this->getPayload($key), 'data');
- }
-
- /**
- * Retrieve an item and expiry time from the cache by key.
- *
- * @param string $key
- * @return array
- */
- protected function getPayload($key)
- {
- $path = $this->path($key);
-
- // If the file doesn't exists, we obviously can't return the cache so we will
- // just return null. Otherwise, we'll get the contents of the file and get
- // the expiration UNIX timestamps from the start of the file's contents.
- try
- {
- $expire = substr($contents = $this->files->get($path), 0, 10);
- }
- catch (Exception $e)
- {
- return array('data' => null, 'time' => null);
- }
-
- // If the current time is greater than expiration timestamps we will delete
- // the file and return null. This helps clean up the old files and keeps
- // this directory much cleaner for us as old files aren't hanging out.
- if (time() >= $expire)
- {
- $this->forget($key);
-
- return array('data' => null, 'time' => null);
- }
-
- $data = unserialize(substr($contents, 10));
-
- // Next, we'll extract the number of minutes that are remaining for a cache
- // so that we can properly retain the time for things like the increment
- // operation that may be performed on the cache. We'll round this out.
- $time = ceil(($expire - time()) / 60);
-
- return compact('data', 'time');
- }
-
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $value = $this->expiration($minutes).serialize($value);
-
- $this->createCacheDirectory($path = $this->path($key));
-
- $this->files->put($path, $value);
- }
-
- /**
- * Create the file cache directory if necessary.
- *
- * @param string $path
- * @return void
- */
- protected function createCacheDirectory($path)
- {
- try
- {
- $this->files->makeDirectory(dirname($path), 0777, true, true);
- }
- catch (Exception $e)
- {
- //
- }
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function increment($key, $value = 1)
- {
- $raw = $this->getPayload($key);
-
- $int = ((int) $raw['data']) + $value;
-
- $this->put($key, $int, (int) $raw['time']);
-
- return $int;
- }
-
- /**
- * Decrement the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function decrement($key, $value = 1)
- {
- return $this->increment($key, $value * -1);
- }
-
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $this->put($key, $value, 0);
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- $file = $this->path($key);
-
- if ($this->files->exists($file))
- {
- return $this->files->delete($file);
- }
-
- return false;
- }
-
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- if ($this->files->isDirectory($this->directory))
- {
- foreach ($this->files->directories($this->directory) as $directory)
- {
- $this->files->deleteDirectory($directory);
- }
- }
- }
-
- /**
- * Get the full path for the given cache key.
- *
- * @param string $key
- * @return string
- */
- protected function path($key)
- {
- $parts = array_slice(str_split($hash = md5($key), 2), 0, 2);
-
- return $this->directory.'/'.implode('/', $parts).'/'.$hash;
- }
-
- /**
- * Get the expiration time based on the given minutes.
- *
- * @param int $minutes
- * @return int
- */
- protected function expiration($minutes)
- {
- if ($minutes === 0) return 9999999999;
-
- return time() + ($minutes * 60);
- }
-
- /**
- * Get the Filesystem instance.
- *
- * @return \Illuminate\Filesystem\Filesystem
- */
- public function getFilesystem()
- {
- return $this->files;
- }
-
- /**
- * Get the working directory of the cache.
- *
- * @return string
- */
- public function getDirectory()
- {
- return $this->directory;
- }
-
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return '';
- }
-
+class FileStore implements Store
+{
+ /**
+ * The Illuminate Filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * The file cache directory.
+ *
+ * @var string
+ */
+ protected $directory;
+
+ /**
+ * Create a new file cache store instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param string $directory
+ * @return void
+ */
+ public function __construct(Filesystem $files, $directory)
+ {
+ $this->files = $files;
+ $this->directory = $directory;
+ }
+
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ return Arr::get($this->getPayload($key), 'data');
+ }
+
+ /**
+ * Retrieve an item and expiry time from the cache by key.
+ *
+ * @param string $key
+ * @return array
+ */
+ protected function getPayload($key)
+ {
+ $path = $this->path($key);
+
+ // If the file doesn't exists, we obviously can't return the cache so we will
+ // just return null. Otherwise, we'll get the contents of the file and get
+ // the expiration UNIX timestamps from the start of the file's contents.
+ try {
+ $expire = substr($contents = $this->files->get($path), 0, 10);
+ } catch (Exception $e) {
+ return ['data' => null, 'time' => null];
+ }
+
+ // If the current time is greater than expiration timestamps we will delete
+ // the file and return null. This helps clean up the old files and keeps
+ // this directory much cleaner for us as old files aren't hanging out.
+ if (time() >= $expire) {
+ $this->forget($key);
+
+ return ['data' => null, 'time' => null];
+ }
+
+ $data = unserialize(substr($contents, 10));
+
+ // Next, we'll extract the number of minutes that are remaining for a cache
+ // so that we can properly retain the time for things like the increment
+ // operation that may be performed on the cache. We'll round this out.
+ $time = ceil(($expire - time()) / 60);
+
+ return compact('data', 'time');
+ }
+
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ $value = $this->expiration($minutes).serialize($value);
+
+ $this->createCacheDirectory($path = $this->path($key));
+
+ $this->files->put($path, $value);
+ }
+
+ /**
+ * Create the file cache directory if necessary.
+ *
+ * @param string $path
+ * @return void
+ */
+ protected function createCacheDirectory($path)
+ {
+ if (! $this->files->exists(dirname($path))) {
+ $this->files->makeDirectory(dirname($path), 0777, true, true);
+ }
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function increment($key, $value = 1)
+ {
+ $raw = $this->getPayload($key);
+
+ $int = ((int) $raw['data']) + $value;
+
+ $this->put($key, $int, (int) $raw['time']);
+
+ return $int;
+ }
+
+ /**
+ * Decrement the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function decrement($key, $value = 1)
+ {
+ return $this->increment($key, $value * -1);
+ }
+
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->put($key, $value, 0);
+ }
+
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ $file = $this->path($key);
+
+ if ($this->files->exists($file)) {
+ return $this->files->delete($file);
+ }
+
+ return false;
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ if ($this->files->isDirectory($this->directory)) {
+ foreach ($this->files->directories($this->directory) as $directory) {
+ $this->files->deleteDirectory($directory);
+ }
+ }
+ }
+
+ /**
+ * Get the full path for the given cache key.
+ *
+ * @param string $key
+ * @return string
+ */
+ protected function path($key)
+ {
+ $parts = array_slice(str_split($hash = md5($key), 2), 0, 2);
+
+ return $this->directory.'/'.implode('/', $parts).'/'.$hash;
+ }
+
+ /**
+ * Get the expiration time based on the given minutes.
+ *
+ * @param int $minutes
+ * @return int
+ */
+ protected function expiration($minutes)
+ {
+ $time = time() + ($minutes * 60);
+
+ if ($minutes === 0 || $time > 9999999999) {
+ return 9999999999;
+ }
+
+ return $time;
+ }
+
+ /**
+ * Get the Filesystem instance.
+ *
+ * @return \Illuminate\Filesystem\Filesystem
+ */
+ public function getFilesystem()
+ {
+ return $this->files;
+ }
+
+ /**
+ * Get the working directory of the cache.
+ *
+ * @return string
+ */
+ public function getDirectory()
+ {
+ return $this->directory;
+ }
+
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return '';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php b/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php
index 44b378f..49f5cd8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php
@@ -1,55 +1,53 @@
-getMemcached();
-
- // For each server in the array, we'll just extract the configuration and add
- // the server to the Memcached connection. Once we have added all of these
- // servers we'll verify the connection is successful and return it back.
- foreach ($servers as $server)
- {
- $memcached->addServer(
- $server['host'], $server['port'], $server['weight']
- );
- }
-
- $memcachedStatus = $memcached->getVersion();
-
- if ( ! is_array($memcachedStatus))
- {
- throw new RuntimeException("No Memcached servers added.");
- }
-
- if (in_array('255.255.255', $memcachedStatus) && count(array_unique($memcachedStatus)) === 1)
- {
- throw new RuntimeException("Could not establish Memcached connection.");
- }
-
- return $memcached;
- }
-
- /**
- * Get a new Memcached instance.
- *
- * @return \Memcached
- */
- protected function getMemcached()
- {
- return new Memcached;
- }
-
+class MemcachedConnector
+{
+ /**
+ * Create a new Memcached connection.
+ *
+ * @param array $servers
+ * @return \Memcached
+ *
+ * @throws \RuntimeException
+ */
+ public function connect(array $servers)
+ {
+ $memcached = $this->getMemcached();
+
+ // For each server in the array, we'll just extract the configuration and add
+ // the server to the Memcached connection. Once we have added all of these
+ // servers we'll verify the connection is successful and return it back.
+ foreach ($servers as $server) {
+ $memcached->addServer(
+ $server['host'], $server['port'], $server['weight']
+ );
+ }
+
+ $memcachedStatus = $memcached->getVersion();
+
+ if (! is_array($memcachedStatus)) {
+ throw new RuntimeException('No Memcached servers added.');
+ }
+
+ if (in_array('255.255.255', $memcachedStatus) && count(array_unique($memcachedStatus)) === 1) {
+ throw new RuntimeException('Could not establish Memcached connection.');
+ }
+
+ return $memcached;
+ }
+
+ /**
+ * Get a new Memcached instance.
+ *
+ * @return \Memcached
+ */
+ protected function getMemcached()
+ {
+ return new Memcached;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
index a3913f9..2c2aee0 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
@@ -1,153 +1,164 @@
-memcached = $memcached;
- $this->prefix = strlen($prefix) > 0 ? $prefix.':' : '';
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- $value = $this->memcached->get($this->prefix.$key);
-
- if ($this->memcached->getResultCode() == 0)
- {
- return $value;
- }
- }
-
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $this->memcached->set($this->prefix.$key, $value, $minutes * 60);
- }
-
- /**
- * Store an item in the cache if the key doesn't exist.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return bool
- */
- public function add($key, $value, $minutes)
- {
- return $this->memcached->add($this->prefix.$key, $value, $minutes * 60);
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function increment($key, $value = 1)
- {
- return $this->memcached->increment($this->prefix.$key, $value);
- }
-
- /**
- * Decrement the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function decrement($key, $value = 1)
- {
- return $this->memcached->decrement($this->prefix.$key, $value);
- }
-
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $this->put($key, $value, 0);
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- return $this->memcached->delete($this->prefix.$key);
- }
-
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->memcached->flush();
- }
-
- /**
- * Get the underlying Memcached connection.
- *
- * @return \Memcached
- */
- public function getMemcached()
- {
- return $this->memcached;
- }
-
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return $this->prefix;
- }
+use Illuminate\Contracts\Cache\Store;
+class MemcachedStore extends TaggableStore implements Store
+{
+ /**
+ * The Memcached instance.
+ *
+ * @var \Memcached
+ */
+ protected $memcached;
+
+ /**
+ * A string that should be prepended to keys.
+ *
+ * @var string
+ */
+ protected $prefix;
+
+ /**
+ * Create a new Memcached store.
+ *
+ * @param \Memcached $memcached
+ * @param string $prefix
+ * @return void
+ */
+ public function __construct($memcached, $prefix = '')
+ {
+ $this->setPrefix($prefix);
+ $this->memcached = $memcached;
+ }
+
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ $value = $this->memcached->get($this->prefix.$key);
+
+ if ($this->memcached->getResultCode() == 0) {
+ return $value;
+ }
+ }
+
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ $this->memcached->set($this->prefix.$key, $value, $minutes * 60);
+ }
+
+ /**
+ * Store an item in the cache if the key doesn't exist.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return bool
+ */
+ public function add($key, $value, $minutes)
+ {
+ return $this->memcached->add($this->prefix.$key, $value, $minutes * 60);
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function increment($key, $value = 1)
+ {
+ return $this->memcached->increment($this->prefix.$key, $value);
+ }
+
+ /**
+ * Decrement the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function decrement($key, $value = 1)
+ {
+ return $this->memcached->decrement($this->prefix.$key, $value);
+ }
+
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->put($key, $value, 0);
+ }
+
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ return $this->memcached->delete($this->prefix.$key);
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->memcached->flush();
+ }
+
+ /**
+ * Get the underlying Memcached connection.
+ *
+ * @return \Memcached
+ */
+ public function getMemcached()
+ {
+ return $this->memcached;
+ }
+
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->prefix;
+ }
+
+ /**
+ * Set the cache key prefix.
+ *
+ * @param string $prefix
+ * @return void
+ */
+ public function setPrefix($prefix)
+ {
+ $this->prefix = ! empty($prefix) ? $prefix.':' : '';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php
index b8b2bb8..46aed16 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php
@@ -1,105 +1,106 @@
-cache = $cache;
+ }
+
+ /**
+ * Determine if the given key has been "accessed" too many times.
+ *
+ * @param string $key
+ * @param int $maxAttempts
+ * @param int $decayMinutes
+ * @return bool
+ */
+ public function tooManyAttempts($key, $maxAttempts, $decayMinutes = 1)
+ {
+ $lockedOut = $this->cache->has($key.':lockout');
+
+ if ($this->attempts($key) > $maxAttempts || $lockedOut) {
+ if (! $lockedOut) {
+ $this->cache->add($key.':lockout', time() + ($decayMinutes * 60), $decayMinutes);
+ }
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Increment the counter for a given key for a given decay time.
+ *
+ * @param string $key
+ * @param int $decayMinutes
+ * @return int
+ */
+ public function hit($key, $decayMinutes = 1)
+ {
+ $this->cache->add($key, 1, $decayMinutes);
+
+ return (int) $this->cache->increment($key);
+ }
+
+ /**
+ * Get the number of attempts for the given key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function attempts($key)
+ {
+ return $this->cache->get($key, 0);
+ }
+
+ /**
+ * Clear the hits and lockout for the given key.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function clear($key)
+ {
+ $this->cache->forget($key);
+
+ $this->cache->forget($key.':lockout');
+ }
+
+ /**
+ * Get the number of seconds until the "key" is accessible again.
+ *
+ * @param string $key
+ * @return int
+ */
+ public function availableIn($key)
+ {
+ return $this->cache->get($key.':lockout') - time();
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php
index e5f06f4..aeea3f4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php
@@ -1,186 +1,197 @@
-redis = $redis;
- $this->connection = $connection;
- $this->prefix = strlen($prefix) > 0 ? $prefix.':' : '';
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- if ( ! is_null($value = $this->connection()->get($this->prefix.$key)))
- {
- return is_numeric($value) ? $value : unserialize($value);
- }
- }
-
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $value = is_numeric($value) ? $value : serialize($value);
-
- $minutes = max(1, $minutes);
-
- $this->connection()->setex($this->prefix.$key, $minutes * 60, $value);
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function increment($key, $value = 1)
- {
- return $this->connection()->incrby($this->prefix.$key, $value);
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function decrement($key, $value = 1)
- {
- return $this->connection()->decrby($this->prefix.$key, $value);
- }
-
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $value = is_numeric($value) ? $value : serialize($value);
-
- $this->connection()->set($this->prefix.$key, $value);
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- return (bool) $this->connection()->del($this->prefix.$key);
- }
-
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->connection()->flushdb();
- }
-
- /**
- * Begin executing a new tags operation.
- *
- * @param array|mixed $names
- * @return \Illuminate\Cache\RedisTaggedCache
- */
- public function tags($names)
- {
- return new RedisTaggedCache($this, new TagSet($this, is_array($names) ? $names : func_get_args()));
- }
-
- /**
- * Get the Redis connection instance.
- *
- * @return \Predis\ClientInterface
- */
- public function connection()
- {
- return $this->redis->connection($this->connection);
- }
-
- /**
- * Set the connection name to be used.
- *
- * @param string $connection
- * @return void
- */
- public function setConnection($connection)
- {
- $this->connection = $connection;
- }
-
- /**
- * Get the Redis database instance.
- *
- * @return \Illuminate\Redis\Database
- */
- public function getRedis()
- {
- return $this->redis;
- }
-
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return $this->prefix;
- }
-
+class RedisStore extends TaggableStore implements Store
+{
+ /**
+ * The Redis database connection.
+ *
+ * @var \Illuminate\Redis\Database
+ */
+ protected $redis;
+
+ /**
+ * A string that should be prepended to keys.
+ *
+ * @var string
+ */
+ protected $prefix;
+
+ /**
+ * The Redis connection that should be used.
+ *
+ * @var string
+ */
+ protected $connection;
+
+ /**
+ * Create a new Redis store.
+ *
+ * @param \Illuminate\Redis\Database $redis
+ * @param string $prefix
+ * @param string $connection
+ * @return void
+ */
+ public function __construct(Redis $redis, $prefix = '', $connection = 'default')
+ {
+ $this->redis = $redis;
+ $this->setPrefix($prefix);
+ $this->connection = $connection;
+ }
+
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ if (! is_null($value = $this->connection()->get($this->prefix.$key))) {
+ return is_numeric($value) ? $value : unserialize($value);
+ }
+ }
+
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ $value = is_numeric($value) ? $value : serialize($value);
+
+ $minutes = max(1, $minutes);
+
+ $this->connection()->setex($this->prefix.$key, $minutes * 60, $value);
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function increment($key, $value = 1)
+ {
+ return $this->connection()->incrby($this->prefix.$key, $value);
+ }
+
+ /**
+ * Decrement the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function decrement($key, $value = 1)
+ {
+ return $this->connection()->decrby($this->prefix.$key, $value);
+ }
+
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $value = is_numeric($value) ? $value : serialize($value);
+
+ $this->connection()->set($this->prefix.$key, $value);
+ }
+
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ return (bool) $this->connection()->del($this->prefix.$key);
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->connection()->flushdb();
+ }
+
+ /**
+ * Begin executing a new tags operation.
+ *
+ * @param array|mixed $names
+ * @return \Illuminate\Cache\RedisTaggedCache
+ */
+ public function tags($names)
+ {
+ return new RedisTaggedCache($this, new TagSet($this, is_array($names) ? $names : func_get_args()));
+ }
+
+ /**
+ * Get the Redis connection instance.
+ *
+ * @return \Predis\ClientInterface
+ */
+ public function connection()
+ {
+ return $this->redis->connection($this->connection);
+ }
+
+ /**
+ * Set the connection name to be used.
+ *
+ * @param string $connection
+ * @return void
+ */
+ public function setConnection($connection)
+ {
+ $this->connection = $connection;
+ }
+
+ /**
+ * Get the Redis database instance.
+ *
+ * @return \Illuminate\Redis\Database
+ */
+ public function getRedis()
+ {
+ return $this->redis;
+ }
+
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->prefix;
+ }
+
+ /**
+ * Set the cache key prefix.
+ *
+ * @param string $prefix
+ * @return void
+ */
+ public function setPrefix($prefix)
+ {
+ $this->prefix = ! empty($prefix) ? $prefix.':' : '';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php b/application/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php
index bd54827..285eaf9 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php
@@ -1,90 +1,164 @@
-pushForeverKeys($namespace = $this->tags->getNamespace(), $key);
-
- $this->store->forever(sha1($namespace).':'.$key, $value);
- }
-
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->deleteForeverKeys();
-
- parent::flush();
- }
-
- /**
- * Store a copy of the full key for each namespace segment.
- *
- * @param string $namespace
- * @param string $key
- * @return void
- */
- protected function pushForeverKeys($namespace, $key)
- {
- $fullKey = $this->getPrefix().sha1($namespace).':'.$key;
-
- foreach (explode('|', $namespace) as $segment)
- {
- $this->store->connection()->lpush($this->foreverKey($segment), $fullKey);
- }
- }
-
- /**
- * Delete all of the items that were stored forever.
- *
- * @return void
- */
- protected function deleteForeverKeys()
- {
- foreach (explode('|', $this->tags->getNamespace()) as $segment)
- {
- $this->deleteForeverValues($segment = $this->foreverKey($segment));
-
- $this->store->connection()->del($segment);
- }
- }
-
- /**
- * Delete all of the keys that have been stored forever.
- *
- * @param string $foreverKey
- * @return void
- */
- protected function deleteForeverValues($foreverKey)
- {
- $forever = array_unique($this->store->connection()->lrange($foreverKey, 0, -1));
-
- if (count($forever) > 0)
- {
- call_user_func_array(array($this->store->connection(), 'del'), $forever);
- }
- }
-
- /**
- * Get the forever reference key for the segment.
- *
- * @param string $segment
- * @return string
- */
- protected function foreverKey($segment)
- {
- return $this->getPrefix().$segment.':forever';
- }
+pushStandardKeys($this->tags->getNamespace(), $key);
+
+ parent::put($key, $value, $minutes);
+ }
+
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->pushForeverKeys($this->tags->getNamespace(), $key);
+
+ parent::forever($key, $value);
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->deleteForeverKeys();
+ $this->deleteStandardKeys();
+
+ parent::flush();
+ }
+
+ /**
+ * Store standard key references into store.
+ *
+ * @param string $namespace
+ * @param string $key
+ * @return void
+ */
+ protected function pushStandardKeys($namespace, $key)
+ {
+ $this->pushKeys($namespace, $key, self::REFERENCE_KEY_STANDARD);
+ }
+
+ /**
+ * Store forever key references into store.
+ *
+ * @param string $namespace
+ * @param string $key
+ * @return void
+ */
+ protected function pushForeverKeys($namespace, $key)
+ {
+ $this->pushKeys($namespace, $key, self::REFERENCE_KEY_FOREVER);
+ }
+
+ /**
+ * Store a reference to the cache key against the reference key.
+ *
+ * @param string $namespace
+ * @param string $key
+ * @param string $reference
+ * @return void
+ */
+ protected function pushKeys($namespace, $key, $reference)
+ {
+ $fullKey = $this->getPrefix().sha1($namespace).':'.$key;
+
+ foreach (explode('|', $namespace) as $segment) {
+ $this->store->connection()->sadd($this->referenceKey($segment, $reference), $fullKey);
+ }
+ }
+
+ /**
+ * Delete all of the items that were stored forever.
+ *
+ * @return void
+ */
+ protected function deleteForeverKeys()
+ {
+ $this->deleteKeysByReference(self::REFERENCE_KEY_FOREVER);
+ }
+
+ /**
+ * Delete all standard items.
+ *
+ * @return void
+ */
+ protected function deleteStandardKeys()
+ {
+ $this->deleteKeysByReference(self::REFERENCE_KEY_STANDARD);
+ }
+
+ /**
+ * Find and delete all of the items that were stored against a reference.
+ *
+ * @param string $reference
+ * @return void
+ */
+ protected function deleteKeysByReference($reference)
+ {
+ foreach (explode('|', $this->tags->getNamespace()) as $segment) {
+ $this->deleteValues($segment = $this->referenceKey($segment, $reference));
+
+ $this->store->connection()->del($segment);
+ }
+ }
+
+ /**
+ * Delete item keys that have been stored against a reference.
+ *
+ * @param string $referenceKey
+ * @return void
+ */
+ protected function deleteValues($referenceKey)
+ {
+ $values = array_unique($this->store->connection()->smembers($referenceKey));
+
+ if (count($values) > 0) {
+ call_user_func_array([$this->store->connection(), 'del'], $values);
+ }
+ }
+
+ /**
+ * Get the reference key for the segment.
+ *
+ * @param string $segment
+ * @param string $suffix
+ * @return string
+ */
+ protected function referenceKey($segment, $suffix)
+ {
+ return $this->getPrefix().$segment.':'.$suffix;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
index fdde11a..fb76105 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
@@ -1,369 +1,426 @@
-store = $store;
- }
-
- /**
- * Set the event dispatcher instance.
- *
- * @param \Illuminate\Contracts\Events\Dispatcher
- * @return void
- */
- public function setEventDispatcher(Dispatcher $events)
- {
- $this->events = $events;
- }
-
- /**
- * Fire an event for this cache instance.
- *
- * @param string $event
- * @param array $payload
- * @return void
- */
- protected function fireCacheEvent($event, $payload)
- {
- if (isset($this->events))
- {
- $this->events->fire('cache.'.$event, $payload);
- }
- }
-
- /**
- * Determine if an item exists in the cache.
- *
- * @param string $key
- * @return bool
- */
- public function has($key)
- {
- return ! is_null($this->get($key));
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function get($key, $default = null)
- {
- $value = $this->store->get($key);
-
- if (is_null($value))
- {
- $this->fireCacheEvent('missed', [$key]);
-
- $value = value($default);
- }
- else
- {
- $this->fireCacheEvent('hit', [$key, $value]);
- }
-
- return $value;
- }
-
- /**
- * Retrieve an item from the cache and delete it.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function pull($key, $default = null)
- {
- $value = $this->get($key, $default);
-
- $this->forget($key);
-
- return $value;
- }
-
- /**
- * Store an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @param \DateTime|int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $minutes = $this->getMinutes($minutes);
-
- if ( ! is_null($minutes))
- {
- $this->store->put($key, $value, $minutes);
-
- $this->fireCacheEvent('write', [$key, $value, $minutes]);
- }
- }
-
- /**
- * Store an item in the cache if the key does not exist.
- *
- * @param string $key
- * @param mixed $value
- * @param \DateTime|int $minutes
- * @return bool
- */
- public function add($key, $value, $minutes)
- {
- if (method_exists($this->store, 'add'))
- {
- return $this->store->add($key, $value, $minutes);
- }
-
- if (is_null($this->get($key)))
- {
- $this->put($key, $value, $minutes);
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $this->store->forever($key, $value);
-
- $this->fireCacheEvent('write', [$key, $value, 0]);
- }
-
- /**
- * Get an item from the cache, or store the default value.
- *
- * @param string $key
- * @param \DateTime|int $minutes
- * @param \Closure $callback
- * @return mixed
- */
- public function remember($key, $minutes, Closure $callback)
- {
- // If the item exists in the cache we will just return this immediately
- // otherwise we will execute the given Closure and cache the result
- // of that execution for the given number of minutes in storage.
- if ( ! is_null($value = $this->get($key)))
- {
- return $value;
- }
-
- $this->put($key, $value = $callback(), $minutes);
-
- return $value;
- }
-
- /**
- * Get an item from the cache, or store the default value forever.
- *
- * @param string $key
- * @param \Closure $callback
- * @return mixed
- */
- public function sear($key, Closure $callback)
- {
- return $this->rememberForever($key, $callback);
- }
-
- /**
- * Get an item from the cache, or store the default value forever.
- *
- * @param string $key
- * @param \Closure $callback
- * @return mixed
- */
- public function rememberForever($key, Closure $callback)
- {
- // If the item exists in the cache we will just return this immediately
- // otherwise we will execute the given Closure and cache the result
- // of that execution for the given number of minutes. It's easy.
- if ( ! is_null($value = $this->get($key)))
- {
- return $value;
- }
-
- $this->forever($key, $value = $callback());
-
- return $value;
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- $success = $this->store->forget($key);
-
- $this->fireCacheEvent('delete', [$key]);
-
- return $success;
- }
-
- /**
- * Get the default cache time.
- *
- * @return int
- */
- public function getDefaultCacheTime()
- {
- return $this->default;
- }
-
- /**
- * Set the default cache time in minutes.
- *
- * @param int $minutes
- * @return void
- */
- public function setDefaultCacheTime($minutes)
- {
- $this->default = $minutes;
- }
-
- /**
- * Get the cache store implementation.
- *
- * @return \Illuminate\Contracts\Cache\Store
- */
- public function getStore()
- {
- return $this->store;
- }
-
- /**
- * Determine if a cached value exists.
- *
- * @param string $key
- * @return bool
- */
- public function offsetExists($key)
- {
- return $this->has($key);
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function offsetGet($key)
- {
- return $this->get($key);
- }
-
- /**
- * Store an item in the cache for the default time.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function offsetSet($key, $value)
- {
- $this->put($key, $value, $this->default);
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return void
- */
- public function offsetUnset($key)
- {
- $this->forget($key);
- }
-
- /**
- * Calculate the number of minutes with the given duration.
- *
- * @param \DateTime|int $duration
- * @return int|null
- */
- protected function getMinutes($duration)
- {
- if ($duration instanceof DateTime)
- {
- $fromNow = Carbon::instance($duration)->diffInMinutes();
-
- return $fromNow > 0 ? $fromNow : null;
- }
-
- return is_string($duration) ? (int) $duration : $duration;
- }
-
- /**
- * Handle dynamic calls into macros or pass missing methods to the store.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- if (static::hasMacro($method))
- {
- return $this->macroCall($method, $parameters);
- }
-
- return call_user_func_array(array($this->store, $method), $parameters);
- }
-
+class Repository implements CacheContract, ArrayAccess
+{
+ use Macroable {
+ __call as macroCall;
+ }
+
+ /**
+ * The cache store implementation.
+ *
+ * @var \Illuminate\Contracts\Cache\Store
+ */
+ protected $store;
+
+ /**
+ * The event dispatcher implementation.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected $events;
+
+ /**
+ * The default number of minutes to store items.
+ *
+ * @var int
+ */
+ protected $default = 60;
+
+ /**
+ * Create a new cache repository instance.
+ *
+ * @param \Illuminate\Contracts\Cache\Store $store
+ * @return void
+ */
+ public function __construct(Store $store)
+ {
+ $this->store = $store;
+ }
+
+ /**
+ * Set the event dispatcher instance.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @return void
+ */
+ public function setEventDispatcher(Dispatcher $events)
+ {
+ $this->events = $events;
+ }
+
+ /**
+ * Fire an event for this cache instance.
+ *
+ * @param string $event
+ * @param array $payload
+ * @return void
+ */
+ protected function fireCacheEvent($event, $payload)
+ {
+ if (isset($this->events)) {
+ $this->events->fire('cache.'.$event, $payload);
+ }
+ }
+
+ /**
+ * Determine if an item exists in the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function has($key)
+ {
+ return ! is_null($this->get($key));
+ }
+
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function get($key, $default = null)
+ {
+ $value = $this->store->get($this->itemKey($key));
+
+ if (is_null($value)) {
+ $this->fireCacheEvent('missed', [$key]);
+
+ $value = value($default);
+ } else {
+ $this->fireCacheEvent('hit', [$key, $value]);
+ }
+
+ return $value;
+ }
+
+ /**
+ * Retrieve an item from the cache and delete it.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function pull($key, $default = null)
+ {
+ $value = $this->get($key, $default);
+
+ $this->forget($key);
+
+ return $value;
+ }
+
+ /**
+ * Store an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param \DateTime|int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ $minutes = $this->getMinutes($minutes);
+
+ if (! is_null($minutes)) {
+ $this->store->put($this->itemKey($key), $value, $minutes);
+
+ $this->fireCacheEvent('write', [$key, $value, $minutes]);
+ }
+ }
+
+ /**
+ * Store an item in the cache if the key does not exist.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param \DateTime|int $minutes
+ * @return bool
+ */
+ public function add($key, $value, $minutes)
+ {
+ $minutes = $this->getMinutes($minutes);
+
+ if (is_null($minutes)) {
+ return false;
+ }
+
+ if (method_exists($this->store, 'add')) {
+ return $this->store->add($this->itemKey($key), $value, $minutes);
+ }
+
+ if (is_null($this->get($key))) {
+ $this->put($key, $value, $minutes);
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->store->forever($this->itemKey($key), $value);
+
+ $this->fireCacheEvent('write', [$key, $value, 0]);
+ }
+
+ /**
+ * Get an item from the cache, or store the default value.
+ *
+ * @param string $key
+ * @param \DateTime|int $minutes
+ * @param \Closure $callback
+ * @return mixed
+ */
+ public function remember($key, $minutes, Closure $callback)
+ {
+ // If the item exists in the cache we will just return this immediately
+ // otherwise we will execute the given Closure and cache the result
+ // of that execution for the given number of minutes in storage.
+ if (! is_null($value = $this->get($key))) {
+ return $value;
+ }
+
+ $this->put($key, $value = $callback(), $minutes);
+
+ return $value;
+ }
+
+ /**
+ * Get an item from the cache, or store the default value forever.
+ *
+ * @param string $key
+ * @param \Closure $callback
+ * @return mixed
+ */
+ public function sear($key, Closure $callback)
+ {
+ return $this->rememberForever($key, $callback);
+ }
+
+ /**
+ * Get an item from the cache, or store the default value forever.
+ *
+ * @param string $key
+ * @param \Closure $callback
+ * @return mixed
+ */
+ public function rememberForever($key, Closure $callback)
+ {
+ // If the item exists in the cache we will just return this immediately
+ // otherwise we will execute the given Closure and cache the result
+ // of that execution for the given number of minutes. It's easy.
+ if (! is_null($value = $this->get($key))) {
+ return $value;
+ }
+
+ $this->forever($key, $value = $callback());
+
+ return $value;
+ }
+
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ $success = $this->store->forget($this->itemKey($key));
+
+ $this->fireCacheEvent('delete', [$key]);
+
+ return $success;
+ }
+
+ /**
+ * Begin executing a new tags operation if the store supports it.
+ *
+ * @param string $name
+ * @return \Illuminate\Cache\TaggedCache
+ *
+ * @deprecated since version 5.1. Use tags instead.
+ */
+ public function section($name)
+ {
+ return $this->tags($name);
+ }
+
+ /**
+ * Begin executing a new tags operation if the store supports it.
+ *
+ * @param array|mixed $names
+ * @return \Illuminate\Cache\TaggedCache
+ *
+ * @throws \BadMethodCallException
+ */
+ public function tags($names)
+ {
+ if (method_exists($this->store, 'tags')) {
+ $taggedCache = $this->store->tags($names);
+
+ if (! is_null($this->events)) {
+ $taggedCache->setEventDispatcher($this->events);
+ }
+
+ $taggedCache->setDefaultCacheTime($this->default);
+
+ return $taggedCache;
+ }
+
+ throw new BadMethodCallException('This cache store does not support tagging.');
+ }
+
+ /**
+ * Format the key for a cache item.
+ *
+ * @param string $key
+ * @return string
+ */
+ protected function itemKey($key)
+ {
+ return $key;
+ }
+
+ /**
+ * Get the default cache time.
+ *
+ * @return int
+ */
+ public function getDefaultCacheTime()
+ {
+ return $this->default;
+ }
+
+ /**
+ * Set the default cache time in minutes.
+ *
+ * @param int $minutes
+ * @return void
+ */
+ public function setDefaultCacheTime($minutes)
+ {
+ $this->default = $minutes;
+ }
+
+ /**
+ * Get the cache store implementation.
+ *
+ * @return \Illuminate\Contracts\Cache\Store
+ */
+ public function getStore()
+ {
+ return $this->store;
+ }
+
+ /**
+ * Determine if a cached value exists.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ return $this->has($key);
+ }
+
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function offsetGet($key)
+ {
+ return $this->get($key);
+ }
+
+ /**
+ * Store an item in the cache for the default time.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($key, $value)
+ {
+ $this->put($key, $value, $this->default);
+ }
+
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function offsetUnset($key)
+ {
+ $this->forget($key);
+ }
+
+ /**
+ * Calculate the number of minutes with the given duration.
+ *
+ * @param \DateTime|int $duration
+ * @return int|null
+ */
+ protected function getMinutes($duration)
+ {
+ if ($duration instanceof DateTime) {
+ $fromNow = Carbon::now()->diffInMinutes(Carbon::instance($duration), false);
+
+ return $fromNow > 0 ? $fromNow : null;
+ }
+
+ return is_string($duration) ? (int) $duration : $duration;
+ }
+
+ /**
+ * Handle dynamic calls into macros or pass missing methods to the store.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ if (static::hasMacro($method)) {
+ return $this->macroCall($method, $parameters);
+ }
+
+ return call_user_func_array([$this->store, $method], $parameters);
+ }
+
+ /**
+ * Clone cache repository instance.
+ *
+ * @return void
+ */
+ public function __clone()
+ {
+ $this->store = clone $this->store;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/TagSet.php b/application/vendor/laravel/framework/src/Illuminate/Cache/TagSet.php
index 1e03289..3f15f23 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/TagSet.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/TagSet.php
@@ -1,99 +1,110 @@
-store = $store;
- $this->names = $names;
- }
+ /**
+ * Create a new TagSet instance.
+ *
+ * @param \Illuminate\Contracts\Cache\Store $store
+ * @param array $names
+ * @return void
+ */
+ public function __construct(Store $store, array $names = [])
+ {
+ $this->store = $store;
+ $this->names = $names;
+ }
- /**
- * Reset all tags in the set.
- *
- * @return void
- */
- public function reset()
- {
- array_walk($this->names, array($this, 'resetTag'));
- }
+ /**
+ * Reset all tags in the set.
+ *
+ * @return void
+ */
+ public function reset()
+ {
+ array_walk($this->names, [$this, 'resetTag']);
+ }
- /**
- * Get the unique tag identifier for a given tag.
- *
- * @param string $name
- * @return string
- */
- public function tagId($name)
- {
- return $this->store->get($this->tagKey($name)) ?: $this->resetTag($name);
- }
+ /**
+ * Get the unique tag identifier for a given tag.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function tagId($name)
+ {
+ return $this->store->get($this->tagKey($name)) ?: $this->resetTag($name);
+ }
- /**
- * Get an array of tag identifiers for all of the tags in the set.
- *
- * @return array
- */
- protected function tagIds()
- {
- return array_map(array($this, 'tagId'), $this->names);
- }
+ /**
+ * Get an array of tag identifiers for all of the tags in the set.
+ *
+ * @return array
+ */
+ protected function tagIds()
+ {
+ return array_map([$this, 'tagId'], $this->names);
+ }
- /**
- * Get a unique namespace that changes when any of the tags are flushed.
- *
- * @return string
- */
- public function getNamespace()
- {
- return implode('|', $this->tagIds());
- }
+ /**
+ * Get a unique namespace that changes when any of the tags are flushed.
+ *
+ * @return string
+ */
+ public function getNamespace()
+ {
+ return implode('|', $this->tagIds());
+ }
- /**
- * Reset the tag and return the new tag identifier.
- *
- * @param string $name
- * @return string
- */
- public function resetTag($name)
- {
- $this->store->forever($this->tagKey($name), $id = str_replace('.', '', uniqid('', true)));
+ /**
+ * Reset the tag and return the new tag identifier.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function resetTag($name)
+ {
+ $this->store->forever($this->tagKey($name), $id = str_replace('.', '', uniqid('', true)));
- return $id;
- }
+ return $id;
+ }
- /**
- * Get the tag identifier key for a given tag.
- *
- * @param string $name
- * @return string
- */
- public function tagKey($name)
- {
- return 'tag:'.$name.':key';
- }
+ /**
+ * Get the tag identifier key for a given tag.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function tagKey($name)
+ {
+ return 'tag:'.$name.':key';
+ }
+ /**
+ * Get all of the tag names in the set.
+ *
+ * @return array
+ */
+ public function getNames()
+ {
+ return $this->names;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php
index c0b965d..4479fcc 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php
@@ -1,27 +1,30 @@
-tags($name);
- }
-
- /**
- * Begin executing a new tags operation.
- *
- * @param array|mixed $names
- * @return \Illuminate\Cache\TaggedCache
- */
- public function tags($names)
- {
- return new TaggedCache($this, new TagSet($this, is_array($names) ? $names : func_get_args()));
- }
+abstract class TaggableStore
+{
+ /**
+ * Begin executing a new tags operation.
+ *
+ * @param string $name
+ * @return \Illuminate\Cache\TaggedCache
+ *
+ * @deprecated since version 5.1. Use tags instead.
+ */
+ public function section($name)
+ {
+ return $this->tags($name);
+ }
+ /**
+ * Begin executing a new tags operation.
+ *
+ * @param array|mixed $names
+ * @return \Illuminate\Cache\TaggedCache
+ */
+ public function tags($names)
+ {
+ return new TaggedCache($this, new TagSet($this, is_array($names) ? $names : func_get_args()));
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
index 30f4b1a..c1cfec8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
@@ -1,247 +1,92 @@
-tags = $tags;
- $this->store = $store;
- }
-
- /**
- * Determine if an item exists in the cache.
- *
- * @param string $key
- * @return bool
- */
- public function has($key)
- {
- return ! is_null($this->get($key));
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function get($key, $default = null)
- {
- $value = $this->store->get($this->taggedItemKey($key));
-
- return ! is_null($value) ? $value : value($default);
- }
-
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param \DateTime|int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- $minutes = $this->getMinutes($minutes);
-
- if ( ! is_null($minutes))
- {
- $this->store->put($this->taggedItemKey($key), $value, $minutes);
- }
- }
-
- /**
- * Store an item in the cache if the key does not exist.
- *
- * @param string $key
- * @param mixed $value
- * @param \DateTime|int $minutes
- * @return bool
- */
- public function add($key, $value, $minutes)
- {
- if (is_null($this->get($key)))
- {
- $this->put($key, $value, $minutes);
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function increment($key, $value = 1)
- {
- $this->store->increment($this->taggedItemKey($key), $value);
- }
-
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function decrement($key, $value = 1)
- {
- $this->store->decrement($this->taggedItemKey($key), $value);
- }
+namespace Illuminate\Cache;
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $this->store->forever($this->taggedItemKey($key), $value);
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- return $this->store->forget($this->taggedItemKey($key));
- }
-
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- $this->tags->reset();
- }
-
- /**
- * Get an item from the cache, or store the default value.
- *
- * @param string $key
- * @param \DateTime|int $minutes
- * @param \Closure $callback
- * @return mixed
- */
- public function remember($key, $minutes, Closure $callback)
- {
- // If the item exists in the cache we will just return this immediately
- // otherwise we will execute the given Closure and cache the result
- // of that execution for the given number of minutes in storage.
- if ( ! is_null($value = $this->get($key))) return $value;
-
- $this->put($key, $value = $callback(), $minutes);
-
- return $value;
- }
-
- /**
- * Get an item from the cache, or store the default value forever.
- *
- * @param string $key
- * @param \Closure $callback
- * @return mixed
- */
- public function sear($key, Closure $callback)
- {
- return $this->rememberForever($key, $callback);
- }
-
- /**
- * Get an item from the cache, or store the default value forever.
- *
- * @param string $key
- * @param \Closure $callback
- * @return mixed
- */
- public function rememberForever($key, Closure $callback)
- {
- // If the item exists in the cache we will just return this immediately
- // otherwise we will execute the given Closure and cache the result
- // of that execution for the given number of minutes. It's easy.
- if ( ! is_null($value = $this->get($key))) return $value;
-
- $this->forever($key, $value = $callback());
-
- return $value;
- }
-
- /**
- * Get a fully qualified key for a tagged item.
- *
- * @param string $key
- * @return string
- */
- public function taggedItemKey($key)
- {
- return sha1($this->tags->getNamespace()).':'.$key;
- }
-
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return $this->store->getPrefix();
- }
-
- /**
- * Calculate the number of minutes with the given duration.
- *
- * @param \DateTime|int $duration
- * @return int|null
- */
- protected function getMinutes($duration)
- {
- if ($duration instanceof DateTime)
- {
- $fromNow = Carbon::instance($duration)->diffInMinutes();
-
- return $fromNow > 0 ? $fromNow : null;
- }
-
- return is_string($duration) ? (int) $duration : $duration;
- }
+use Illuminate\Contracts\Cache\Store;
+class TaggedCache extends Repository
+{
+ /**
+ * The tag set instance.
+ *
+ * @var \Illuminate\Cache\TagSet
+ */
+ protected $tags;
+
+ /**
+ * Create a new tagged cache instance.
+ *
+ * @param \Illuminate\Contracts\Cache\Store $store
+ * @param \Illuminate\Cache\TagSet $tags
+ * @return void
+ */
+ public function __construct(Store $store, TagSet $tags)
+ {
+ parent::__construct($store);
+
+ $this->tags = $tags;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function fireCacheEvent($event, $payload)
+ {
+ $payload[] = $this->tags->getNames();
+
+ parent::fireCacheEvent($event, $payload);
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function increment($key, $value = 1)
+ {
+ $this->store->increment($this->itemKey($key), $value);
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function decrement($key, $value = 1)
+ {
+ $this->store->decrement($this->itemKey($key), $value);
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->tags->reset();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function itemKey($key)
+ {
+ return $this->taggedItemKey($key);
+ }
+
+ /**
+ * Get a fully qualified key for a tagged item.
+ *
+ * @param string $key
+ * @return string
+ */
+ public function taggedItemKey($key)
+ {
+ return sha1($this->tags->getNamespace()).':'.$key;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/WinCacheStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/WinCacheStore.php
index d4fe62e..6dc3fc7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/WinCacheStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/WinCacheStore.php
@@ -1,121 +1,121 @@
-prefix = $prefix;
- }
+class WinCacheStore extends TaggableStore implements Store
+{
+ /**
+ * A string that should be prepended to keys.
+ *
+ * @var string
+ */
+ protected $prefix;
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- $value = wincache_ucache_get($this->prefix.$key);
+ /**
+ * Create a new WinCache store.
+ *
+ * @param string $prefix
+ * @return void
+ */
+ public function __construct($prefix = '')
+ {
+ $this->prefix = $prefix;
+ }
- if ($value !== false)
- {
- return $value;
- }
- }
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ $value = wincache_ucache_get($this->prefix.$key);
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- wincache_ucache_set($this->prefix.$key, $value, $minutes * 60);
- }
+ if ($value !== false) {
+ return $value;
+ }
+ }
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function increment($key, $value = 1)
- {
- return wincache_ucache_inc($this->prefix.$key, $value);
- }
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ wincache_ucache_set($this->prefix.$key, $value, $minutes * 60);
+ }
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int|bool
- */
- public function decrement($key, $value = 1)
- {
- return wincache_ucache_dec($this->prefix.$key, $value);
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function increment($key, $value = 1)
+ {
+ return wincache_ucache_inc($this->prefix.$key, $value);
+ }
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- $this->put($key, $value, 0);
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int|bool
+ */
+ public function decrement($key, $value = 1)
+ {
+ return wincache_ucache_dec($this->prefix.$key, $value);
+ }
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- return wincache_ucache_delete($this->prefix.$key);
- }
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ $this->put($key, $value, 0);
+ }
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- wincache_ucache_clear();
- }
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ return wincache_ucache_delete($this->prefix.$key);
+ }
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return $this->prefix;
- }
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ wincache_ucache_clear();
+ }
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->prefix;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/XCacheStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/XCacheStore.php
index b60141a..7ef64cf 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/XCacheStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/XCacheStore.php
@@ -1,121 +1,121 @@
-prefix = $prefix;
- }
+class XCacheStore extends TaggableStore implements Store
+{
+ /**
+ * A string that should be prepended to keys.
+ *
+ * @var string
+ */
+ protected $prefix;
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- $value = xcache_get($this->prefix.$key);
+ /**
+ * Create a new WinCache store.
+ *
+ * @param string $prefix
+ * @return void
+ */
+ public function __construct($prefix = '')
+ {
+ $this->prefix = $prefix;
+ }
- if (isset($value))
- {
- return $value;
- }
- }
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ $value = xcache_get($this->prefix.$key);
- /**
- * Store an item in the cache for a given number of minutes.
- *
- * @param string $key
- * @param mixed $value
- * @param int $minutes
- * @return void
- */
- public function put($key, $value, $minutes)
- {
- xcache_set($this->prefix.$key, $value, $minutes * 60);
- }
+ if (isset($value)) {
+ return $value;
+ }
+ }
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function increment($key, $value = 1)
- {
- return xcache_inc($this->prefix.$key, $value);
- }
+ /**
+ * Store an item in the cache for a given number of minutes.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $minutes
+ * @return void
+ */
+ public function put($key, $value, $minutes)
+ {
+ xcache_set($this->prefix.$key, $value, $minutes * 60);
+ }
- /**
- * Increment the value of an item in the cache.
- *
- * @param string $key
- * @param mixed $value
- * @return int
- */
- public function decrement($key, $value = 1)
- {
- return xcache_dec($this->prefix.$key, $value);
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function increment($key, $value = 1)
+ {
+ return xcache_inc($this->prefix.$key, $value);
+ }
- /**
- * Store an item in the cache indefinitely.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function forever($key, $value)
- {
- return $this->put($key, $value, 0);
- }
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function decrement($key, $value = 1)
+ {
+ return xcache_dec($this->prefix.$key, $value);
+ }
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- return xcache_unset($this->prefix.$key);
- }
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function forever($key, $value)
+ {
+ return $this->put($key, $value, 0);
+ }
- /**
- * Remove all items from the cache.
- *
- * @return void
- */
- public function flush()
- {
- xcache_clear_cache(XC_TYPE_VAR);
- }
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ return xcache_unset($this->prefix.$key);
+ }
- /**
- * Get the cache key prefix.
- *
- * @return string
- */
- public function getPrefix()
- {
- return $this->prefix;
- }
+ /**
+ * Remove all items from the cache.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ xcache_clear_cache(XC_TYPE_VAR);
+ }
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->prefix;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/composer.json b/application/vendor/laravel/framework/src/Illuminate/Cache/composer.json
index ecf8933..51ee8ac 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/composer.json
@@ -14,10 +14,10 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "nesbot/carbon": "~1.0"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "nesbot/carbon": "~1.19"
},
"autoload": {
"psr-4": {
@@ -26,13 +26,13 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "illuminate/database": "Required to use the database cache driver (5.0.*).",
- "illuminate/filesystem": "Required to use the file cache driver (5.0.*).",
- "illuminate/redis": "Required to use the redis cache driver (5.0.*)."
+ "illuminate/database": "Required to use the database cache driver (5.1.*).",
+ "illuminate/filesystem": "Required to use the file cache driver (5.1.*).",
+ "illuminate/redis": "Required to use the redis cache driver (5.1.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Config/Repository.php b/application/vendor/laravel/framework/src/Illuminate/Config/Repository.php
index 5e9ffd3..184a04a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Config/Repository.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Config/Repository.php
@@ -1,158 +1,156 @@
-items = $items;
- }
-
- /**
- * Determine if the given configuration value exists.
- *
- * @param string $key
- * @return bool
- */
- public function has($key)
- {
- return array_has($this->items, $key);
- }
-
- /**
- * Get the specified configuration value.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function get($key, $default = null)
- {
- return array_get($this->items, $key, $default);
- }
-
- /**
- * Set a given configuration value.
- *
- * @param array|string $key
- * @param mixed $value
- * @return void
- */
- public function set($key, $value = null)
- {
- if (is_array($key))
- {
- foreach ($key as $innerKey => $innerValue)
- {
- array_set($this->items, $innerKey, $innerValue);
- }
- }
- else
- {
- array_set($this->items, $key, $value);
- }
- }
-
- /**
- * Prepend a value onto an array configuration value.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function prepend($key, $value)
- {
- $array = $this->get($key);
-
- array_unshift($array, $value);
-
- $this->set($key, $array);
- }
-
- /**
- * Push a value onto an array configuration value.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function push($key, $value)
- {
- $array = $this->get($key);
-
- $array[] = $value;
-
- $this->set($key, $array);
- }
-
- /**
- * Get all of the configuration items for the application.
- *
- * @return array
- */
- public function all()
- {
- return $this->items;
- }
-
- /**
- * Determine if the given configuration option exists.
- *
- * @param string $key
- * @return bool
- */
- public function offsetExists($key)
- {
- return $this->has($key);
- }
-
- /**
- * Get a configuration option.
- *
- * @param string $key
- * @return mixed
- */
- public function offsetGet($key)
- {
- return $this->get($key);
- }
-
- /**
- * Set a configuration option.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function offsetSet($key, $value)
- {
- $this->set($key, $value);
- }
-
- /**
- * Unset a configuration option.
- *
- * @param string $key
- * @return void
- */
- public function offsetUnset($key)
- {
- $this->set($key, null);
- }
-
+class Repository implements ArrayAccess, ConfigContract
+{
+ /**
+ * All of the configuration items.
+ *
+ * @var array
+ */
+ protected $items = [];
+
+ /**
+ * Create a new configuration repository.
+ *
+ * @param array $items
+ * @return void
+ */
+ public function __construct(array $items = [])
+ {
+ $this->items = $items;
+ }
+
+ /**
+ * Determine if the given configuration value exists.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function has($key)
+ {
+ return Arr::has($this->items, $key);
+ }
+
+ /**
+ * Get the specified configuration value.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function get($key, $default = null)
+ {
+ return Arr::get($this->items, $key, $default);
+ }
+
+ /**
+ * Set a given configuration value.
+ *
+ * @param array|string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function set($key, $value = null)
+ {
+ if (is_array($key)) {
+ foreach ($key as $innerKey => $innerValue) {
+ Arr::set($this->items, $innerKey, $innerValue);
+ }
+ } else {
+ Arr::set($this->items, $key, $value);
+ }
+ }
+
+ /**
+ * Prepend a value onto an array configuration value.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function prepend($key, $value)
+ {
+ $array = $this->get($key);
+
+ array_unshift($array, $value);
+
+ $this->set($key, $array);
+ }
+
+ /**
+ * Push a value onto an array configuration value.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function push($key, $value)
+ {
+ $array = $this->get($key);
+
+ $array[] = $value;
+
+ $this->set($key, $array);
+ }
+
+ /**
+ * Get all of the configuration items for the application.
+ *
+ * @return array
+ */
+ public function all()
+ {
+ return $this->items;
+ }
+
+ /**
+ * Determine if the given configuration option exists.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ return $this->has($key);
+ }
+
+ /**
+ * Get a configuration option.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function offsetGet($key)
+ {
+ return $this->get($key);
+ }
+
+ /**
+ * Set a configuration option.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($key, $value)
+ {
+ $this->set($key, $value);
+ }
+
+ /**
+ * Unset a configuration option.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function offsetUnset($key)
+ {
+ $this->set($key, null);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Config/composer.json b/application/vendor/laravel/framework/src/Illuminate/Config/composer.json
index ef3080a..b4c4f23 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Config/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Config/composer.json
@@ -14,9 +14,10 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/filesystem": "5.1.*",
+ "illuminate/support": "5.1.*"
},
"autoload": {
"psr-4": {
@@ -25,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/AppNamespaceDetectorTrait.php b/application/vendor/laravel/framework/src/Illuminate/Console/AppNamespaceDetectorTrait.php
index 1938c7b..4feede9 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/AppNamespaceDetectorTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/AppNamespaceDetectorTrait.php
@@ -1,29 +1,18 @@
- $path)
- {
- foreach ((array) $path as $pathChoice)
- {
- if (realpath(app_path()) == realpath(base_path().'/'.$pathChoice)) return $namespace;
- }
- }
-
- throw new RuntimeException("Unable to detect application namespace.");
- }
+use Illuminate\Container\Container;
+trait AppNamespaceDetectorTrait
+{
+ /**
+ * Get the application namespace.
+ *
+ * @return string
+ */
+ protected function getAppNamespace()
+ {
+ return Container::getInstance()->getNamespace();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Application.php b/application/vendor/laravel/framework/src/Illuminate/Console/Application.php
index 094b133..ee45c0a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Application.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Application.php
@@ -1,4 +1,6 @@
-laravel = $laravel;
- $this->setAutoExit(false);
- $this->setCatchExceptions(false);
-
- $events->fire('artisan.start', [$this]);
- }
-
- /**
- * Run an Artisan console command by name.
- *
- * @param string $command
- * @param array $parameters
- * @return int
- */
- public function call($command, array $parameters = array())
- {
- $parameters['command'] = $command;
-
- $this->lastOutput = new BufferedOutput;
-
- return $this->find($command)->run(new ArrayInput($parameters), $this->lastOutput);
- }
-
- /**
- * Get the output for the last run command.
- *
- * @return string
- */
- public function output()
- {
- return $this->lastOutput ? $this->lastOutput->fetch() : '';
- }
-
- /**
- * Add a command to the console.
- *
- * @param \Symfony\Component\Console\Command\Command $command
- * @return \Symfony\Component\Console\Command\Command
- */
- public function add(SymfonyCommand $command)
- {
- if ($command instanceof Command)
- {
- $command->setLaravel($this->laravel);
- }
-
- return $this->addToParent($command);
- }
-
- /**
- * Add the command to the parent instance.
- *
- * @param \Symfony\Component\Console\Command\Command $command
- * @return \Symfony\Component\Console\Command\Command
- */
- protected function addToParent(SymfonyCommand $command)
- {
- return parent::add($command);
- }
-
- /**
- * Add a command, resolving through the application.
- *
- * @param string $command
- * @return \Symfony\Component\Console\Command\Command
- */
- public function resolve($command)
- {
- return $this->add($this->laravel->make($command));
- }
-
- /**
- * Resolve an array of commands through the application.
- *
- * @param array|mixed $commands
- * @return $this
- */
- public function resolveCommands($commands)
- {
- $commands = is_array($commands) ? $commands : func_get_args();
-
- foreach ($commands as $command)
- {
- $this->resolve($command);
- }
-
- return $this;
- }
-
- /**
- * Get the default input definitions for the applications.
- *
- * This is used to add the --env option to every available command.
- *
- * @return \Symfony\Component\Console\Input\InputDefinition
- */
- protected function getDefaultInputDefinition()
- {
- $definition = parent::getDefaultInputDefinition();
-
- $definition->addOption($this->getEnvironmentOption());
-
- return $definition;
- }
-
- /**
- * Get the global environment option for the definition.
- *
- * @return \Symfony\Component\Console\Input\InputOption
- */
- protected function getEnvironmentOption()
- {
- $message = 'The environment the command should run under.';
-
- return new InputOption('--env', null, InputOption::VALUE_OPTIONAL, $message);
- }
-
- /**
- * Get the Laravel application instance.
- *
- * @return \Illuminate\Contracts\Foundation\Application
- */
- public function getLaravel()
- {
- return $this->laravel;
- }
-
+class Application extends SymfonyApplication implements ApplicationContract
+{
+ /**
+ * The Laravel application instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $laravel;
+
+ /**
+ * The output from the previous command.
+ *
+ * @var \Symfony\Component\Console\Output\BufferedOutput
+ */
+ protected $lastOutput;
+
+ /**
+ * Create a new Artisan console application.
+ *
+ * @param \Illuminate\Contracts\Container\Container $laravel
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @param string $version
+ * @return void
+ */
+ public function __construct(Container $laravel, Dispatcher $events, $version)
+ {
+ parent::__construct('Laravel Framework', $version);
+
+ $this->laravel = $laravel;
+ $this->setAutoExit(false);
+ $this->setCatchExceptions(false);
+
+ $events->fire('artisan.start', [$this]);
+ }
+
+ /**
+ * Run an Artisan console command by name.
+ *
+ * @param string $command
+ * @param array $parameters
+ * @return int
+ */
+ public function call($command, array $parameters = [])
+ {
+ $parameters = collect($parameters)->prepend($command);
+
+ $this->lastOutput = new BufferedOutput;
+
+ $this->setCatchExceptions(false);
+
+ $result = $this->run(new ArrayInput($parameters->toArray()), $this->lastOutput);
+
+ $this->setCatchExceptions(true);
+
+ return $result;
+ }
+
+ /**
+ * Get the output for the last run command.
+ *
+ * @return string
+ */
+ public function output()
+ {
+ return $this->lastOutput ? $this->lastOutput->fetch() : '';
+ }
+
+ /**
+ * Add a command to the console.
+ *
+ * @param \Symfony\Component\Console\Command\Command $command
+ * @return \Symfony\Component\Console\Command\Command
+ */
+ public function add(SymfonyCommand $command)
+ {
+ if ($command instanceof Command) {
+ $command->setLaravel($this->laravel);
+ }
+
+ return $this->addToParent($command);
+ }
+
+ /**
+ * Add the command to the parent instance.
+ *
+ * @param \Symfony\Component\Console\Command\Command $command
+ * @return \Symfony\Component\Console\Command\Command
+ */
+ protected function addToParent(SymfonyCommand $command)
+ {
+ return parent::add($command);
+ }
+
+ /**
+ * Add a command, resolving through the application.
+ *
+ * @param string $command
+ * @return \Symfony\Component\Console\Command\Command
+ */
+ public function resolve($command)
+ {
+ return $this->add($this->laravel->make($command));
+ }
+
+ /**
+ * Resolve an array of commands through the application.
+ *
+ * @param array|mixed $commands
+ * @return $this
+ */
+ public function resolveCommands($commands)
+ {
+ $commands = is_array($commands) ? $commands : func_get_args();
+
+ foreach ($commands as $command) {
+ $this->resolve($command);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Get the default input definitions for the applications.
+ *
+ * This is used to add the --env option to every available command.
+ *
+ * @return \Symfony\Component\Console\Input\InputDefinition
+ */
+ protected function getDefaultInputDefinition()
+ {
+ $definition = parent::getDefaultInputDefinition();
+
+ $definition->addOption($this->getEnvironmentOption());
+
+ return $definition;
+ }
+
+ /**
+ * Get the global environment option for the definition.
+ *
+ * @return \Symfony\Component\Console\Input\InputOption
+ */
+ protected function getEnvironmentOption()
+ {
+ $message = 'The environment the command should run under.';
+
+ return new InputOption('--env', null, InputOption::VALUE_OPTIONAL, $message);
+ }
+
+ /**
+ * Get the Laravel application instance.
+ *
+ * @return \Illuminate\Contracts\Foundation\Application
+ */
+ public function getLaravel()
+ {
+ return $this->laravel;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Command.php b/application/vendor/laravel/framework/src/Illuminate/Console/Command.php
index 868385b..47b79d0 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Command.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Command.php
@@ -1,5 +1,8 @@
-name);
-
- // We will go ahead and set the name, description, and parameters on console
- // commands just to make things a little easier on the developer. This is
- // so they don't have to all be manually specified in the constructors.
- $this->setDescription($this->description);
-
- $this->specifyParameters();
- }
-
- /**
- * Specify the arguments and options on the command.
- *
- * @return void
- */
- protected function specifyParameters()
- {
- // We will loop through all of the arguments and options for the command and
- // set them all on the base command instance. This specifies what can get
- // passed into these commands as "parameters" to control the execution.
- foreach ($this->getArguments() as $arguments)
- {
- call_user_func_array(array($this, 'addArgument'), $arguments);
- }
-
- foreach ($this->getOptions() as $options)
- {
- call_user_func_array(array($this, 'addOption'), $options);
- }
- }
-
- /**
- * Run the console command.
- *
- * @param \Symfony\Component\Console\Input\InputInterface $input
- * @param \Symfony\Component\Console\Output\OutputInterface $output
- * @return int
- */
- public function run(InputInterface $input, OutputInterface $output)
- {
- $this->input = $input;
-
- $this->output = $output;
-
- return parent::run($input, $output);
- }
-
- /**
- * Execute the console command.
- *
- * @param \Symfony\Component\Console\Input\InputInterface $input
- * @param \Symfony\Component\Console\Output\OutputInterface $output
- * @return mixed
- */
- protected function execute(InputInterface $input, OutputInterface $output)
- {
- $method = method_exists($this, 'handle') ? 'handle' : 'fire';
-
- return $this->laravel->call([$this, $method]);
- }
-
- /**
- * Call another console command.
- *
- * @param string $command
- * @param array $arguments
- * @return int
- */
- public function call($command, array $arguments = array())
- {
- $instance = $this->getApplication()->find($command);
-
- $arguments['command'] = $command;
-
- return $instance->run(new ArrayInput($arguments), $this->output);
- }
-
- /**
- * Call another console command silently.
- *
- * @param string $command
- * @param array $arguments
- * @return int
- */
- public function callSilent($command, array $arguments = array())
- {
- $instance = $this->getApplication()->find($command);
-
- $arguments['command'] = $command;
-
- return $instance->run(new ArrayInput($arguments), new NullOutput);
- }
-
- /**
- * Get the value of a command argument.
- *
- * @param string $key
- * @return string|array
- */
- public function argument($key = null)
- {
- if (is_null($key)) return $this->input->getArguments();
-
- return $this->input->getArgument($key);
- }
-
- /**
- * Get the value of a command option.
- *
- * @param string $key
- * @return string|array
- */
- public function option($key = null)
- {
- if (is_null($key)) return $this->input->getOptions();
-
- return $this->input->getOption($key);
- }
-
- /**
- * Confirm a question with the user.
- *
- * @param string $question
- * @param bool $default
- * @return bool
- */
- public function confirm($question, $default = false)
- {
- $helper = $this->getHelperSet()->get('question');
-
- $question = new ConfirmationQuestion("{$question} ", $default);
-
- return $helper->ask($this->input, $this->output, $question);
- }
-
- /**
- * Prompt the user for input.
- *
- * @param string $question
- * @param string $default
- * @return string
- */
- public function ask($question, $default = null)
- {
- $helper = $this->getHelperSet()->get('question');
-
- $question = new Question("$question ", $default);
-
- return $helper->ask($this->input, $this->output, $question);
- }
-
- /**
- * Prompt the user for input with auto completion.
- *
- * @param string $question
- * @param array $choices
- * @param string $default
- * @return string
- */
- public function askWithCompletion($question, array $choices, $default = null)
- {
- $helper = $this->getHelperSet()->get('question');
-
- $question = new Question("$question ", $default);
-
- $question->setAutocompleterValues($choices);
-
- return $helper->ask($this->input, $this->output, $question);
- }
-
- /**
- * Prompt the user for input but hide the answer from the console.
- *
- * @param string $question
- * @param bool $fallback
- * @return string
- */
- public function secret($question, $fallback = true)
- {
- $helper = $this->getHelperSet()->get('question');
-
- $question = new Question("$question ");
-
- $question->setHidden(true)->setHiddenFallback($fallback);
-
- return $helper->ask($this->input, $this->output, $question);
- }
-
- /**
- * Give the user a single choice from an array of answers.
- *
- * @param string $question
- * @param array $choices
- * @param string $default
- * @param mixed $attempts
- * @param bool $multiple
- * @return bool
- */
- public function choice($question, array $choices, $default = null, $attempts = null, $multiple = null)
- {
- $helper = $this->getHelperSet()->get('question');
-
- $question = new ChoiceQuestion("$question ", $choices, $default);
-
- $question->setMaxAttempts($attempts)->setMultiselect($multiple);
-
- return $helper->ask($this->input, $this->output, $question);
- }
-
- /**
- * Format input to textual table.
- *
- * @param array $headers
- * @param array $rows
- * @param string $style
- * @return void
- */
- public function table(array $headers, array $rows, $style = 'default')
- {
- $table = new Table($this->output);
-
- $table->setHeaders($headers)->setRows($rows)->setStyle($style)->render();
- }
-
- /**
- * Write a string as information output.
- *
- * @param string $string
- * @return void
- */
- public function info($string)
- {
- $this->output->writeln("$string");
- }
-
- /**
- * Write a string as standard output.
- *
- * @param string $string
- * @return void
- */
- public function line($string)
- {
- $this->output->writeln($string);
- }
-
- /**
- * Write a string as comment output.
- *
- * @param string $string
- * @return void
- */
- public function comment($string)
- {
- $this->output->writeln("$string");
- }
-
- /**
- * Write a string as question output.
- *
- * @param string $string
- * @return void
- */
- public function question($string)
- {
- $this->output->writeln("$string");
- }
-
- /**
- * Write a string as error output.
- *
- * @param string $string
- * @return void
- */
- public function error($string)
- {
- $this->output->writeln("$string");
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array();
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array();
- }
-
- /**
- * Get the output implementation.
- *
- * @return \Symfony\Component\Console\Output\OutputInterface
- */
- public function getOutput()
- {
- return $this->output;
- }
-
- /**
- * Get the Laravel application instance.
- *
- * @return \Illuminate\Contracts\Foundation\Application
- */
- public function getLaravel()
- {
- return $this->laravel;
- }
-
- /**
- * Set the Laravel application instance.
- *
- * @param \Illuminate\Contracts\Foundation\Application $laravel
- * @return void
- */
- public function setLaravel(LaravelApplication $laravel)
- {
- $this->laravel = $laravel;
- }
-
+class Command extends SymfonyCommand
+{
+ /**
+ * The Laravel application instance.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $laravel;
+
+ /**
+ * The input interface implementation.
+ *
+ * @var \Symfony\Component\Console\Input\InputInterface
+ */
+ protected $input;
+
+ /**
+ * The output interface implementation.
+ *
+ * @var \Illuminate\Console\OutputStyle
+ */
+ protected $output;
+
+ /**
+ * The name and signature of the console command.
+ *
+ * @var string
+ */
+ protected $signature;
+
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name;
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description;
+
+ /**
+ * Create a new console command instance.
+ *
+ * @return void
+ */
+ public function __construct()
+ {
+ // We will go ahead and set the name, description, and parameters on console
+ // commands just to make things a little easier on the developer. This is
+ // so they don't have to all be manually specified in the constructors.
+ if (isset($this->signature)) {
+ $this->configureUsingFluentDefinition();
+ } else {
+ parent::__construct($this->name);
+ }
+
+ $this->setDescription($this->description);
+
+ if (! isset($this->signature)) {
+ $this->specifyParameters();
+ }
+ }
+
+ /**
+ * Configure the console command using a fluent definition.
+ *
+ * @return void
+ */
+ protected function configureUsingFluentDefinition()
+ {
+ list($name, $arguments, $options) = Parser::parse($this->signature);
+
+ parent::__construct($name);
+
+ foreach ($arguments as $argument) {
+ $this->getDefinition()->addArgument($argument);
+ }
+
+ foreach ($options as $option) {
+ $this->getDefinition()->addOption($option);
+ }
+ }
+
+ /**
+ * Specify the arguments and options on the command.
+ *
+ * @return void
+ */
+ protected function specifyParameters()
+ {
+ // We will loop through all of the arguments and options for the command and
+ // set them all on the base command instance. This specifies what can get
+ // passed into these commands as "parameters" to control the execution.
+ foreach ($this->getArguments() as $arguments) {
+ call_user_func_array([$this, 'addArgument'], $arguments);
+ }
+
+ foreach ($this->getOptions() as $options) {
+ call_user_func_array([$this, 'addOption'], $options);
+ }
+ }
+
+ /**
+ * Run the console command.
+ *
+ * @param \Symfony\Component\Console\Input\InputInterface $input
+ * @param \Symfony\Component\Console\Output\OutputInterface $output
+ * @return int
+ */
+ public function run(InputInterface $input, OutputInterface $output)
+ {
+ $this->input = $input;
+
+ $this->output = new OutputStyle($input, $output);
+
+ return parent::run($input, $output);
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @param \Symfony\Component\Console\Input\InputInterface $input
+ * @param \Symfony\Component\Console\Output\OutputInterface $output
+ * @return mixed
+ */
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $method = method_exists($this, 'handle') ? 'handle' : 'fire';
+
+ return $this->laravel->call([$this, $method]);
+ }
+
+ /**
+ * Call another console command.
+ *
+ * @param string $command
+ * @param array $arguments
+ * @return int
+ */
+ public function call($command, array $arguments = [])
+ {
+ $instance = $this->getApplication()->find($command);
+
+ $arguments['command'] = $command;
+
+ return $instance->run(new ArrayInput($arguments), $this->output);
+ }
+
+ /**
+ * Call another console command silently.
+ *
+ * @param string $command
+ * @param array $arguments
+ * @return int
+ */
+ public function callSilent($command, array $arguments = [])
+ {
+ $instance = $this->getApplication()->find($command);
+
+ $arguments['command'] = $command;
+
+ return $instance->run(new ArrayInput($arguments), new NullOutput);
+ }
+
+ /**
+ * Get the value of a command argument.
+ *
+ * @param string $key
+ * @return string|array
+ */
+ public function argument($key = null)
+ {
+ if (is_null($key)) {
+ return $this->input->getArguments();
+ }
+
+ return $this->input->getArgument($key);
+ }
+
+ /**
+ * Get the value of a command option.
+ *
+ * @param string $key
+ * @return string|array
+ */
+ public function option($key = null)
+ {
+ if (is_null($key)) {
+ return $this->input->getOptions();
+ }
+
+ return $this->input->getOption($key);
+ }
+
+ /**
+ * Confirm a question with the user.
+ *
+ * @param string $question
+ * @param bool $default
+ * @return bool
+ */
+ public function confirm($question, $default = false)
+ {
+ return $this->output->confirm($question, $default);
+ }
+
+ /**
+ * Prompt the user for input.
+ *
+ * @param string $question
+ * @param string $default
+ * @return string
+ */
+ public function ask($question, $default = null)
+ {
+ return $this->output->ask($question, $default);
+ }
+
+ /**
+ * Prompt the user for input with auto completion.
+ *
+ * @param string $question
+ * @param array $choices
+ * @param string $default
+ * @return string
+ */
+ public function anticipate($question, array $choices, $default = null)
+ {
+ return $this->askWithCompletion($question, $choices, $default);
+ }
+
+ /**
+ * Prompt the user for input with auto completion.
+ *
+ * @param string $question
+ * @param array $choices
+ * @param string $default
+ * @return string
+ */
+ public function askWithCompletion($question, array $choices, $default = null)
+ {
+ $question = new Question($question, $default);
+
+ $question->setAutocompleterValues($choices);
+
+ return $this->output->askQuestion($question);
+ }
+
+ /**
+ * Prompt the user for input but hide the answer from the console.
+ *
+ * @param string $question
+ * @param bool $fallback
+ * @return string
+ */
+ public function secret($question, $fallback = true)
+ {
+ $question = new Question($question);
+
+ $question->setHidden(true)->setHiddenFallback($fallback);
+
+ return $this->output->askQuestion($question);
+ }
+
+ /**
+ * Give the user a single choice from an array of answers.
+ *
+ * @param string $question
+ * @param array $choices
+ * @param string $default
+ * @param mixed $attempts
+ * @param bool $multiple
+ * @return string
+ */
+ public function choice($question, array $choices, $default = null, $attempts = null, $multiple = null)
+ {
+ $question = new ChoiceQuestion($question, $choices, $default);
+
+ $question->setMaxAttempts($attempts)->setMultiselect($multiple);
+
+ return $this->output->askQuestion($question);
+ }
+
+ /**
+ * Format input to textual table.
+ *
+ * @param array $headers
+ * @param \Illuminate\Contracts\Support\Arrayable|array $rows
+ * @param string $style
+ * @return void
+ */
+ public function table(array $headers, $rows, $style = 'default')
+ {
+ $table = new Table($this->output);
+
+ if ($rows instanceof Arrayable) {
+ $rows = $rows->toArray();
+ }
+
+ $table->setHeaders($headers)->setRows($rows)->setStyle($style)->render();
+ }
+
+ /**
+ * Write a string as information output.
+ *
+ * @param string $string
+ * @return void
+ */
+ public function info($string)
+ {
+ $this->output->writeln("$string");
+ }
+
+ /**
+ * Write a string as standard output.
+ *
+ * @param string $string
+ * @return void
+ */
+ public function line($string)
+ {
+ $this->output->writeln($string);
+ }
+
+ /**
+ * Write a string as comment output.
+ *
+ * @param string $string
+ * @return void
+ */
+ public function comment($string)
+ {
+ $this->output->writeln("$string");
+ }
+
+ /**
+ * Write a string as question output.
+ *
+ * @param string $string
+ * @return void
+ */
+ public function question($string)
+ {
+ $this->output->writeln("$string");
+ }
+
+ /**
+ * Write a string as error output.
+ *
+ * @param string $string
+ * @return void
+ */
+ public function error($string)
+ {
+ $this->output->writeln("$string");
+ }
+
+ /**
+ * Write a string as warning output.
+ *
+ * @param string $string
+ * @return void
+ */
+ public function warn($string)
+ {
+ if (! $this->output->getFormatter()->hasStyle('warning')) {
+ $style = new OutputFormatterStyle('yellow');
+
+ $this->output->getFormatter()->setStyle('warning', $style);
+ }
+
+ $this->output->writeln("$string");
+ }
+
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [];
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [];
+ }
+
+ /**
+ * Get the output implementation.
+ *
+ * @return \Symfony\Component\Console\Output\OutputInterface
+ */
+ public function getOutput()
+ {
+ return $this->output;
+ }
+
+ /**
+ * Get the Laravel application instance.
+ *
+ * @return \Illuminate\Contracts\Foundation\Application
+ */
+ public function getLaravel()
+ {
+ return $this->laravel;
+ }
+
+ /**
+ * Set the Laravel application instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $laravel
+ * @return void
+ */
+ public function setLaravel(LaravelApplication $laravel)
+ {
+ $this->laravel = $laravel;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php b/application/vendor/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php
index 71872eb..30f4402 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php
@@ -1,50 +1,57 @@
-getDefaultConfirmCallback();
-
- if (call_user_func($shouldConfirm))
- {
- if ($this->option('force')) return true;
-
- $this->comment(str_repeat('*', strlen($warning) + 12));
- $this->comment('* '.$warning.' *');
- $this->comment(str_repeat('*', strlen($warning) + 12));
- $this->output->writeln('');
-
- $confirmed = $this->confirm('Do you really wish to run this command? [y/N]');
-
- if ( ! $confirmed)
- {
- $this->comment('Command Cancelled!');
-
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Get the default confirmation callback.
- *
- * @return \Closure
- */
- protected function getDefaultConfirmCallback()
- {
- return function() { return $this->getLaravel()->environment() == 'production'; };
- }
+use Closure;
+trait ConfirmableTrait
+{
+ /**
+ * Confirm before proceeding with the action.
+ *
+ * This method only asks for confirmation in production.
+ *
+ * @param string $warning
+ * @param \Closure|bool|null $callback
+ * @return bool
+ */
+ public function confirmToProceed($warning = 'Application In Production!', $callback = null)
+ {
+ $callback = is_null($callback) ? $this->getDefaultConfirmCallback() : $callback;
+
+ $shouldConfirm = $callback instanceof Closure ? call_user_func($callback) : $callback;
+
+ if ($shouldConfirm) {
+ if ($this->option('force')) {
+ return true;
+ }
+
+ $this->comment(str_repeat('*', strlen($warning) + 12));
+ $this->comment('* '.$warning.' *');
+ $this->comment(str_repeat('*', strlen($warning) + 12));
+ $this->output->writeln('');
+
+ $confirmed = $this->confirm('Do you really wish to run this command?');
+
+ if (! $confirmed) {
+ $this->comment('Command Cancelled!');
+
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Get the default confirmation callback.
+ *
+ * @return \Closure
+ */
+ protected function getDefaultConfirmCallback()
+ {
+ return function () {
+ return $this->getLaravel()->environment() == 'production';
+ };
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php b/application/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php
index 7aad4ce..65203f9 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php
@@ -1,208 +1,219 @@
-files = $files;
- }
-
- /**
- * Get the stub file for the generator.
- *
- * @return string
- */
- abstract protected function getStub();
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $name = $this->parseName($this->getNameInput());
-
- if ($this->files->exists($path = $this->getPath($name)))
- {
- $this->error($this->type.' already exists!');
-
- return false;
- }
-
- $this->makeDirectory($path);
-
- $this->files->put($path, $this->buildClass($name));
-
- $this->info($this->type.' created successfully.');
- }
-
- /**
- * Get the destination class path.
- *
- * @param string $name
- * @return string
- */
- protected function getPath($name)
- {
- $name = str_replace($this->getAppNamespace(), '', $name);
-
- return $this->laravel['path'].'/'.str_replace('\\', '/', $name).'.php';
- }
-
- /**
- * Parse the name and format according to the root namespace.
- *
- * @param string $name
- * @return string
- */
- protected function parseName($name)
- {
- $rootNamespace = $this->getAppNamespace();
-
- if (starts_with($name, $rootNamespace))
- {
- return $name;
- }
-
- if (str_contains($name, '/'))
- {
- $name = str_replace('/', '\\', $name);
- }
-
- return $this->parseName($this->getDefaultNamespace(trim($rootNamespace, '\\')).'\\'.$name);
- }
-
- /**
- * Get the default namespace for the class.
- *
- * @param string $rootNamespace
- * @return string
- */
- protected function getDefaultNamespace($rootNamespace)
- {
- return $rootNamespace;
- }
-
- /**
- * Build the directory for the class if necessary.
- *
- * @param string $path
- * @return string
- */
- protected function makeDirectory($path)
- {
- if ( ! $this->files->isDirectory(dirname($path)))
- {
- $this->files->makeDirectory(dirname($path), 0777, true, true);
- }
- }
-
- /**
- * Build the class with the given name.
- *
- * @param string $name
- * @return string
- */
- protected function buildClass($name)
- {
- $stub = $this->files->get($this->getStub());
-
- return $this->replaceNamespace($stub, $name)->replaceClass($stub, $name);
- }
-
- /**
- * Replace the namespace for the given stub.
- *
- * @param string $stub
- * @param string $name
- * @return $this
- */
- protected function replaceNamespace(&$stub, $name)
- {
- $stub = str_replace(
- '{{namespace}}', $this->getNamespace($name), $stub
- );
-
- $stub = str_replace(
- '{{rootNamespace}}', $this->getAppNamespace(), $stub
- );
-
- return $this;
- }
-
- /**
- * Get the full namespace name for a given class.
- *
- * @param string $name
- * @return string
- */
- protected function getNamespace($name)
- {
- return trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\');
- }
-
- /**
- * Replace the class name for the given stub.
- *
- * @param string $stub
- * @param string $name
- * @return string
- */
- protected function replaceClass($stub, $name)
- {
- $class = str_replace($this->getNamespace($name).'\\', '', $name);
-
- return str_replace('{{class}}', $class, $stub);
- }
-
- /**
- * Get the desired class name from the input.
- *
- * @return string
- */
- protected function getNameInput()
- {
- return $this->argument('name');
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('name', InputArgument::REQUIRED, 'The name of the class'),
- );
- }
-
+abstract class GeneratorCommand extends Command
+{
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * The type of class being generated.
+ *
+ * @var string
+ */
+ protected $type;
+
+ /**
+ * Create a new controller creator command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Filesystem $files)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ }
+
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ abstract protected function getStub();
+
+ /**
+ * Execute the console command.
+ *
+ * @return bool|null
+ */
+ public function fire()
+ {
+ $name = $this->parseName($this->getNameInput());
+
+ $path = $this->getPath($name);
+
+ if ($this->alreadyExists($this->getNameInput())) {
+ $this->error($this->type.' already exists!');
+
+ return false;
+ }
+
+ $this->makeDirectory($path);
+
+ $this->files->put($path, $this->buildClass($name));
+
+ $this->info($this->type.' created successfully.');
+ }
+
+ /**
+ * Determine if the class already exists.
+ *
+ * @param string $rawName
+ * @return bool
+ */
+ protected function alreadyExists($rawName)
+ {
+ $name = $this->parseName($rawName);
+
+ return $this->files->exists($this->getPath($name));
+ }
+
+ /**
+ * Get the destination class path.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function getPath($name)
+ {
+ $name = str_replace($this->laravel->getNamespace(), '', $name);
+
+ return $this->laravel['path'].'/'.str_replace('\\', '/', $name).'.php';
+ }
+
+ /**
+ * Parse the name and format according to the root namespace.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function parseName($name)
+ {
+ $rootNamespace = $this->laravel->getNamespace();
+
+ if (Str::startsWith($name, $rootNamespace)) {
+ return $name;
+ }
+
+ if (Str::contains($name, '/')) {
+ $name = str_replace('/', '\\', $name);
+ }
+
+ return $this->parseName($this->getDefaultNamespace(trim($rootNamespace, '\\')).'\\'.$name);
+ }
+
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace;
+ }
+
+ /**
+ * Build the directory for the class if necessary.
+ *
+ * @param string $path
+ * @return string
+ */
+ protected function makeDirectory($path)
+ {
+ if (! $this->files->isDirectory(dirname($path))) {
+ $this->files->makeDirectory(dirname($path), 0777, true, true);
+ }
+ }
+
+ /**
+ * Build the class with the given name.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function buildClass($name)
+ {
+ $stub = $this->files->get($this->getStub());
+
+ return $this->replaceNamespace($stub, $name)->replaceClass($stub, $name);
+ }
+
+ /**
+ * Replace the namespace for the given stub.
+ *
+ * @param string $stub
+ * @param string $name
+ * @return $this
+ */
+ protected function replaceNamespace(&$stub, $name)
+ {
+ $stub = str_replace(
+ 'DummyNamespace', $this->getNamespace($name), $stub
+ );
+
+ $stub = str_replace(
+ 'DummyRootNamespace', $this->laravel->getNamespace(), $stub
+ );
+
+ return $this;
+ }
+
+ /**
+ * Get the full namespace name for a given class.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function getNamespace($name)
+ {
+ return trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\');
+ }
+
+ /**
+ * Replace the class name for the given stub.
+ *
+ * @param string $stub
+ * @param string $name
+ * @return string
+ */
+ protected function replaceClass($stub, $name)
+ {
+ $class = str_replace($this->getNamespace($name).'\\', '', $name);
+
+ return str_replace('DummyClass', $class, $stub);
+ }
+
+ /**
+ * Get the desired class name from the input.
+ *
+ * @return string
+ */
+ protected function getNameInput()
+ {
+ return trim($this->argument('name'));
+ }
+
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['name', InputArgument::REQUIRED, 'The name of the class'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/OutputStyle.php b/application/vendor/laravel/framework/src/Illuminate/Console/OutputStyle.php
new file mode 100644
index 0000000..925e66d
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/OutputStyle.php
@@ -0,0 +1,71 @@
+output = $output;
+
+ parent::__construct($input, $output);
+ }
+
+ /**
+ * Returns whether verbosity is quiet (-q).
+ *
+ * @return bool
+ */
+ public function isQuiet()
+ {
+ return $this->output->isQuiet();
+ }
+
+ /**
+ * Returns whether verbosity is verbose (-v).
+ *
+ * @return bool
+ */
+ public function isVerbose()
+ {
+ return $this->output->isVerbose();
+ }
+
+ /**
+ * Returns whether verbosity is very verbose (-vv).
+ *
+ * @return bool
+ */
+ public function isVeryVerbose()
+ {
+ return $this->output->isVeryVerbose();
+ }
+
+ /**
+ * Returns whether verbosity is debug (-vvv).
+ *
+ * @return bool
+ */
+ public function isDebug()
+ {
+ return $this->output->isDebug();
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Parser.php b/application/vendor/laravel/framework/src/Illuminate/Console/Parser.php
new file mode 100644
index 0000000..babba0e
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Parser.php
@@ -0,0 +1,134 @@
+commands('Illuminate\Console\Scheduling\ScheduleRunCommand');
- }
+class ScheduleServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return [
- 'Illuminate\Console\Scheduling\ScheduleRunCommand',
- ];
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->commands('Illuminate\Console\Scheduling\ScheduleRunCommand');
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'Illuminate\Console\Scheduling\ScheduleRunCommand',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php
index 0d7ee67..494f0e8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php
@@ -1,126 +1,122 @@
-callback = $callback;
- $this->parameters = $parameters;
-
- if ( ! is_string($this->callback) && ! is_callable($this->callback))
- {
- throw new InvalidArgumentException(
- "Invalid scheduled callback event. Must be string or callable."
- );
- }
- }
-
- /**
- * Run the given event.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return mixed
- */
- public function run(Container $container)
- {
- if ($this->description)
- {
- touch($this->mutexPath());
- }
-
- try {
- $response = $container->call($this->callback, $this->parameters);
- } catch (\Exception $e) {
- $this->removeMutex();
-
- throw $e;
- }
-
- $this->removeMutex();
-
- parent::callAfterCallbacks($container);
-
- return $response;
- }
-
- /**
- * Remove the mutex file from disk.
- *
- * @return void
- */
- protected function removeMutex()
- {
- if ($this->description)
- {
- @unlink($this->mutexPath());
- }
- }
-
- /**
- * Do not allow the event to overlap each other.
- *
- * @return $this
- */
- public function withoutOverlapping()
- {
- if ( ! isset($this->description))
- {
- throw new LogicException(
- "A scheduled event name is required to prevent overlapping. Use the 'name' method before 'withoutOverlapping'."
- );
- }
-
- return $this->skip(function()
- {
- return file_exists($this->mutexPath());
- });
- }
-
- /**
- * Get the mutex path for the scheduled command.
- *
- * @return string
- */
- protected function mutexPath()
- {
- return storage_path().'/framework/schedule-'.md5($this->description);
- }
-
- /**
- * Get the summary of the event for display.
- *
- * @return string
- */
- public function getSummaryForDisplay()
- {
- if (is_string($this->description)) return $this->description;
-
- return is_string($this->callback) ? $this->callback : 'Closure';
- }
-
+class CallbackEvent extends Event
+{
+ /**
+ * The callback to call.
+ *
+ * @var string
+ */
+ protected $callback;
+
+ /**
+ * The parameters to pass to the method.
+ *
+ * @var array
+ */
+ protected $parameters;
+
+ /**
+ * Create a new event instance.
+ *
+ * @param string $callback
+ * @param array $parameters
+ * @return void
+ */
+ public function __construct($callback, array $parameters = [])
+ {
+ $this->callback = $callback;
+ $this->parameters = $parameters;
+
+ if (! is_string($this->callback) && ! is_callable($this->callback)) {
+ throw new InvalidArgumentException(
+ 'Invalid scheduled callback event. Must be string or callable.'
+ );
+ }
+ }
+
+ /**
+ * Run the given event.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return mixed
+ *
+ * @throws \Exception
+ */
+ public function run(Container $container)
+ {
+ if ($this->description) {
+ touch($this->mutexPath());
+ }
+
+ try {
+ $response = $container->call($this->callback, $this->parameters);
+ } finally {
+ $this->removeMutex();
+ }
+
+ parent::callAfterCallbacks($container);
+
+ return $response;
+ }
+
+ /**
+ * Remove the mutex file from disk.
+ *
+ * @return void
+ */
+ protected function removeMutex()
+ {
+ if ($this->description) {
+ @unlink($this->mutexPath());
+ }
+ }
+
+ /**
+ * Do not allow the event to overlap each other.
+ *
+ * @return $this
+ */
+ public function withoutOverlapping()
+ {
+ if (! isset($this->description)) {
+ throw new LogicException(
+ "A scheduled event name is required to prevent overlapping. Use the 'name' method before 'withoutOverlapping'."
+ );
+ }
+
+ return $this->skip(function () {
+ return file_exists($this->mutexPath());
+ });
+ }
+
+ /**
+ * Get the mutex path for the scheduled command.
+ *
+ * @return string
+ */
+ protected function mutexPath()
+ {
+ return storage_path('framework/schedule-'.md5($this->description));
+ }
+
+ /**
+ * Get the summary of the event for display.
+ *
+ * @return string
+ */
+ public function getSummaryForDisplay()
+ {
+ if (is_string($this->description)) {
+ return $this->description;
+ }
+
+ return is_string($this->callback) ? $this->callback : 'Closure';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php
index 6541a95..6fee7ed 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php
@@ -1,4 +1,6 @@
-command = $command;
- }
-
- /**
- * Run the given event.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- public function run(Container $container)
- {
- if (count($this->afterCallbacks) > 0)
- {
- $this->runCommandInForeground($container);
- }
- else
- {
- $this->runCommandInBackground();
- }
- }
-
- /**
- * Run the command in the background using exec.
- *
- * @return void
- */
- protected function runCommandInBackground()
- {
- chdir(base_path());
-
- exec($this->buildCommand());
- }
-
- /**
- * Run the command in the foreground.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- protected function runCommandInForeground(Container $container)
- {
- (new Process(
- trim($this->buildCommand(), '& '), base_path(), null, null, null
- ))->run();
-
- $this->callAfterCallbacks($container);
- }
-
- /**
- * Call all of the "after" callbacks for the event.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- protected function callAfterCallbacks(Container $container)
- {
- foreach ($this->afterCallbacks as $callback)
- {
- $container->call($callback);
- }
- }
-
- /**
- * Build the comand string.
- *
- * @return string
- */
- public function buildCommand()
- {
- if ($this->withoutOverlapping)
- {
- $command = '(touch '.$this->mutexPath().'; '.$this->command.'; rm '.$this->mutexPath().') > '.$this->output.' 2>&1 &';
- }
- else
- {
- $command = $this->command.' > '.$this->output.' 2>&1 &';
- }
-
-
- return $this->user ? 'sudo -u '.$this->user.' '.$command : $command;
- }
-
- /**
- * Get the mutex path for the scheduled command.
- *
- * @return string
- */
- protected function mutexPath()
- {
- return storage_path().'/framework/schedule-'.md5($this->expression.$this->command);
- }
-
- /**
- * Determine if the given event should run based on the Cron expression.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @return bool
- */
- public function isDue(Application $app)
- {
- if ( ! $this->runsInMaintenanceMode() && $app->isDownForMaintenance())
- {
- return false;
- }
-
- return $this->expressionPasses() &&
- $this->filtersPass($app) &&
- $this->runsInEnvironment($app->environment());
- }
-
- /**
- * Determine if the Cron expression passes.
- *
- * @return bool
- */
- protected function expressionPasses()
- {
- $date = Carbon::now();
-
- if ($this->timezone)
- {
- $date->setTimezone($this->timezone);
- }
-
- return CronExpression::factory($this->expression)->isDue($date->toDateTimeString());
- }
-
- /**
- * Determine if the filters pass for the event.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @return bool
- */
- protected function filtersPass(Application $app)
- {
- if (($this->filter && ! $app->call($this->filter)) ||
- $this->reject && $app->call($this->reject))
- {
- return false;
- }
-
- return true;
- }
-
- /**
- * Determine if the event runs in the given environment.
- *
- * @param string $environment
- * @return bool
- */
- public function runsInEnvironment($environment)
- {
- return empty($this->environments) || in_array($environment, $this->environments);
- }
-
- /**
- * Determine if the event runs in maintenance mode.
- *
- * @return bool
- */
- public function runsInMaintenanceMode()
- {
- return $this->evenInMaintenanceMode;
- }
-
- /**
- * The Cron expression representing the event's frequency.
- *
- * @param string $expression
- * @return $this
- */
- public function cron($expression)
- {
- $this->expression = $expression;
-
- return $this;
- }
-
- /**
- * Schedule the event to run hourly.
- *
- * @return $this
- */
- public function hourly()
- {
- return $this->cron('0 * * * * *');
- }
-
- /**
- * Schedule the event to run daily.
- *
- * @return $this
- */
- public function daily()
- {
- return $this->cron('0 0 * * * *');
- }
-
- /**
- * Schedule the command at a given time.
- *
- * @param string $time
- * @return $this
- */
- public function at($time)
- {
- return $this->dailyAt($time);
- }
-
- /**
- * Schedule the event to run daily at a given time (10:00, 19:30, etc).
- *
- * @param string $time
- * @return $this
- */
- public function dailyAt($time)
- {
- $segments = explode(':', $time);
-
- return $this->spliceIntoPosition(2, (int) $segments[0])
- ->spliceIntoPosition(1, count($segments) == 2 ? (int) $segments[1] : '0');
- }
-
- /**
- * Schedule the event to run twice daily.
- *
- * @return $this
- */
- public function twiceDaily()
- {
- return $this->cron('0 1,13 * * * *');
- }
-
- /**
- * Schedule the event to run only on weekdays.
- *
- * @return $this
- */
- public function weekdays()
- {
- return $this->spliceIntoPosition(5, '1-5');
- }
-
- /**
- * Schedule the event to run only on Mondays.
- *
- * @return $this
- */
- public function mondays()
- {
- return $this->days(1);
- }
-
- /**
- * Schedule the event to run only on Tuesdays.
- *
- * @return $this
- */
- public function tuesdays()
- {
- return $this->days(2);
- }
-
- /**
- * Schedule the event to run only on Wednesdays.
- *
- * @return $this
- */
- public function wednesdays()
- {
- return $this->days(3);
- }
-
- /**
- * Schedule the event to run only on Thursdays.
- *
- * @return $this
- */
- public function thursdays()
- {
- return $this->days(4);
- }
-
- /**
- * Schedule the event to run only on Fridays.
- *
- * @return $this
- */
- public function fridays()
- {
- return $this->days(5);
- }
-
- /**
- * Schedule the event to run only on Saturdays.
- *
- * @return $this
- */
- public function saturdays()
- {
- return $this->days(6);
- }
-
- /**
- * Schedule the event to run only on Sundays.
- *
- * @return $this
- */
- public function sundays()
- {
- return $this->days(0);
- }
-
- /**
- * Schedule the event to run weekly.
- *
- * @return $this
- */
- public function weekly()
- {
- return $this->cron('0 0 * * 0 *');
- }
-
- /**
- * Schedule the event to run weekly on a given day and time.
- *
- * @param int $day
- * @param string $time
- * @return $this
- */
- public function weeklyOn($day, $time = '0:0')
- {
- $this->dailyAt($time);
-
- return $this->spliceIntoPosition(5, $day);
- }
-
- /**
- * Schedule the event to run monthly.
- *
- * @return $this
- */
- public function monthly()
- {
- return $this->cron('0 0 1 * * *');
- }
-
- /**
- * Schedule the event to run yearly.
- *
- * @return $this
- */
- public function yearly()
- {
- return $this->cron('0 0 1 1 * *');
- }
-
- /**
- * Schedule the event to run every five minutes.
- *
- * @return $this
- */
- public function everyFiveMinutes()
- {
- return $this->cron('*/5 * * * * *');
- }
-
- /**
- * Schedule the event to run every ten minutes.
- *
- * @return $this
- */
- public function everyTenMinutes()
- {
- return $this->cron('*/10 * * * * *');
- }
-
- /**
- * Schedule the event to run every thirty minutes.
- *
- * @return $this
- */
- public function everyThirtyMinutes()
- {
- return $this->cron('0,30 * * * * *');
- }
-
- /**
- * Set the days of the week the command should run on.
- *
- * @param array|dynamic $days
- * @return $this
- */
- public function days($days)
- {
- $days = is_array($days) ? $days : func_get_args();
-
- return $this->spliceIntoPosition(5, implode(',', $days));
- }
-
- /**
- * Set the timezone the date should be evaluated on.
- *
- * @param \DateTimeZone|string $timezone
- * @return $this
- */
- public function timezone($timezone)
- {
- $this->timezone = $timezone;
-
- return $this;
- }
-
- /**
- * Set which user the command should run as.
- *
- * @param string $user
- * @return $this
- */
- public function user($user)
- {
- $this->user = $user;
-
- return $this;
- }
-
- /**
- * Limit the environments the command should run in.
- *
- * @param array|dynamic $environments
- * @return $this
- */
- public function environments($environments)
- {
- $this->environments = is_array($environments) ? $environments : func_get_args();
-
- return $this;
- }
-
- /**
- * State that the command should run even in maintenance mode.
- *
- * @return $this
- */
- public function evenInMaintenanceMode()
- {
- $this->evenInMaintenanceMode = true;
-
- return $this;
- }
-
- /**
- * Do not allow the event to overlap each other.
- *
- * @return $this
- */
- public function withoutOverlapping()
- {
- $this->withoutOverlapping = true;
-
- return $this->skip(function()
- {
- return file_exists($this->mutexPath());
- });
- }
-
- /**
- * Register a callback to further filter the schedule.
- *
- * @param \Closure $callback
- * @return $this
- */
- public function when(Closure $callback)
- {
- $this->filter = $callback;
-
- return $this;
- }
-
- /**
- * Register a callback to further filter the schedule.
- *
- * @param \Closure $callback
- * @return $this
- */
- public function skip(Closure $callback)
- {
- $this->reject = $callback;
-
- return $this;
- }
-
- /**
- * Send the output of the command to a given location.
- *
- * @param string $location
- * @return $this
- */
- public function sendOutputTo($location)
- {
- $this->output = $location;
-
- return $this;
- }
-
- /**
- * E-mail the results of the scheduled operation.
- *
- * @param array|dynamic $addresses
- * @return $this
- *
- * @throws \LogicException
- */
- public function emailOutputTo($addresses)
- {
- if (is_null($this->output) || $this->output == '/dev/null')
- {
- throw new LogicException("Must direct output to a file in order to e-mail results.");
- }
-
- $addresses = is_array($addresses) ? $addresses : func_get_args();
-
- return $this->then(function(Mailer $mailer) use ($addresses)
- {
- $this->emailOutput($mailer, $addresses);
- });
- }
-
- /**
- * E-mail the output of the event to the recipients.
- *
- * @param \Illuminate\Contracts\Mail\Mailer $mailer
- * @param array $addresses
- * @return void
- */
- protected function emailOutput(Mailer $mailer, $addresses)
- {
- $mailer->raw(file_get_contents($this->output), function($m) use ($addresses)
- {
- $m->subject($this->getEmailSubject());
-
- foreach ($addresses as $address)
- {
- $m->to($address);
- }
- });
- }
-
- /**
- * Get the e-mail subject line for output results.
- *
- * @return string
- */
- protected function getEmailSubject()
- {
- if ($this->description)
- {
- return 'Scheduled Job Output ('.$this->description.')';
- }
-
- return 'Scheduled Job Output';
- }
-
- /**
- * Register a callback to ping a given URL after the job runs.
- *
- * @param string $url
- * @return $this
- */
- public function thenPing($url)
- {
- return $this->then(function() use ($url) { (new HttpClient)->get($url); });
- }
-
- /**
- * Register a callback to be called after the operation.
- *
- * @param \Closure $callback
- * @return $this
- */
- public function then(Closure $callback)
- {
- $this->afterCallbacks[] = $callback;
-
- return $this;
- }
-
- /**
- * Set the human-friendly description of the event.
- *
- * @param string $description
- * @return $this
- */
- public function name($description)
- {
- return $this->description($description);
- }
-
- /**
- * Set the human-friendly description of the event.
- *
- * @param string $description
- * @return $this
- */
- public function description($description)
- {
- $this->description = $description;
-
- return $this;
- }
-
- /**
- * Splice the given value into the given position of the expression.
- *
- * @param int $position
- * @param string $value
- * @return void
- */
- protected function spliceIntoPosition($position, $value)
- {
- $segments = explode(' ', $this->expression);
-
- $segments[$position - 1] = $value;
-
- return $this->cron(implode(' ', $segments));
- }
-
- /**
- * Get the summary of the event for display.
- *
- * @return string
- */
- public function getSummaryForDisplay()
- {
- if (is_string($this->description)) return $this->description;
-
- return $this->buildCommand();
- }
-
- /**
- * Get the Cron expression for the event.
- *
- * @return string
- */
- public function getExpression()
- {
- return $this->expression;
- }
-
+class Event
+{
+ /**
+ * The command string.
+ *
+ * @var string
+ */
+ public $command;
+
+ /**
+ * The cron expression representing the event's frequency.
+ *
+ * @var string
+ */
+ public $expression = '* * * * * *';
+
+ /**
+ * The timezone the date should be evaluated on.
+ *
+ * @var \DateTimeZone|string
+ */
+ public $timezone;
+
+ /**
+ * The user the command should run as.
+ *
+ * @var string
+ */
+ public $user;
+
+ /**
+ * The list of environments the command should run under.
+ *
+ * @var array
+ */
+ public $environments = [];
+
+ /**
+ * Indicates if the command should run in maintenance mode.
+ *
+ * @var bool
+ */
+ public $evenInMaintenanceMode = false;
+
+ /**
+ * Indicates if the command should not overlap itself.
+ *
+ * @var bool
+ */
+ public $withoutOverlapping = false;
+
+ /**
+ * The filter callback.
+ *
+ * @var \Closure
+ */
+ protected $filter;
+
+ /**
+ * The reject callback.
+ *
+ * @var \Closure
+ */
+ protected $reject;
+
+ /**
+ * The location that output should be sent to.
+ *
+ * @var string
+ */
+ public $output = '/dev/null';
+
+ /**
+ * Indicates whether output should be appended.
+ *
+ * @var bool
+ */
+ protected $shouldAppendOutput = false;
+
+ /**
+ * The array of callbacks to be run before the event is started.
+ *
+ * @var array
+ */
+ protected $beforeCallbacks = [];
+
+ /**
+ * The array of callbacks to be run after the event is finished.
+ *
+ * @var array
+ */
+ protected $afterCallbacks = [];
+
+ /**
+ * The human readable description of the event.
+ *
+ * @var string
+ */
+ public $description;
+
+ /**
+ * Create a new event instance.
+ *
+ * @param string $command
+ * @return void
+ */
+ public function __construct($command)
+ {
+ $this->command = $command;
+ $this->output = $this->getDefaultOutput();
+ }
+
+ /**
+ * Get the default output depending on the OS.
+ *
+ * @return string
+ */
+ protected function getDefaultOutput()
+ {
+ return (DIRECTORY_SEPARATOR == '\\') ? 'NUL' : '/dev/null';
+ }
+
+ /**
+ * Run the given event.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function run(Container $container)
+ {
+ if (count($this->afterCallbacks) > 0 || count($this->beforeCallbacks) > 0) {
+ $this->runCommandInForeground($container);
+ } else {
+ $this->runCommandInBackground();
+ }
+ }
+
+ /**
+ * Run the command in the background using exec.
+ *
+ * @return void
+ */
+ protected function runCommandInBackground()
+ {
+ chdir(base_path());
+
+ exec($this->buildCommand());
+ }
+
+ /**
+ * Run the command in the foreground.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ protected function runCommandInForeground(Container $container)
+ {
+ $this->callBeforeCallbacks($container);
+
+ (new Process(
+ trim($this->buildCommand(), '& '), base_path(), null, null, null
+ ))->run();
+
+ $this->callAfterCallbacks($container);
+ }
+
+ /**
+ * Call all of the "before" callbacks for the event.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ protected function callBeforeCallbacks(Container $container)
+ {
+ foreach ($this->beforeCallbacks as $callback) {
+ $container->call($callback);
+ }
+ }
+
+ /**
+ * Call all of the "after" callbacks for the event.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ protected function callAfterCallbacks(Container $container)
+ {
+ foreach ($this->afterCallbacks as $callback) {
+ $container->call($callback);
+ }
+ }
+
+ /**
+ * Build the command string.
+ *
+ * @return string
+ */
+ public function buildCommand()
+ {
+ $output = ProcessUtils::escapeArgument($this->output);
+
+ $redirect = $this->shouldAppendOutput ? ' >> ' : ' > ';
+
+ if ($this->withoutOverlapping) {
+ if (windows_os()) {
+ $command = '(echo \'\' > "'.$this->mutexPath().'" & '.$this->command.' & del "'.$this->mutexPath().'")'.$redirect.$output.' 2>&1 &';
+ } else {
+ $command = '(touch '.$this->mutexPath().'; '.$this->command.'; rm '.$this->mutexPath().')'.$redirect.$output.' 2>&1 &';
+ }
+ } else {
+ $command = $this->command.$redirect.$output.' 2>&1 &';
+ }
+
+ return $this->user && ! windows_os() ? 'sudo -u '.$this->user.' -- sh -c \''.$command.'\'' : $command;
+ }
+
+ /**
+ * Get the mutex path for the scheduled command.
+ *
+ * @return string
+ */
+ protected function mutexPath()
+ {
+ return storage_path('framework/schedule-'.md5($this->expression.$this->command));
+ }
+
+ /**
+ * Determine if the given event should run based on the Cron expression.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return bool
+ */
+ public function isDue(Application $app)
+ {
+ if (! $this->runsInMaintenanceMode() && $app->isDownForMaintenance()) {
+ return false;
+ }
+
+ return $this->expressionPasses() &&
+ $this->filtersPass($app) &&
+ $this->runsInEnvironment($app->environment());
+ }
+
+ /**
+ * Determine if the Cron expression passes.
+ *
+ * @return bool
+ */
+ protected function expressionPasses()
+ {
+ $date = Carbon::now();
+
+ if ($this->timezone) {
+ $date->setTimezone($this->timezone);
+ }
+
+ return CronExpression::factory($this->expression)->isDue($date->toDateTimeString());
+ }
+
+ /**
+ * Determine if the filters pass for the event.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return bool
+ */
+ protected function filtersPass(Application $app)
+ {
+ if (($this->filter && ! $app->call($this->filter)) ||
+ $this->reject && $app->call($this->reject)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Determine if the event runs in the given environment.
+ *
+ * @param string $environment
+ * @return bool
+ */
+ public function runsInEnvironment($environment)
+ {
+ return empty($this->environments) || in_array($environment, $this->environments);
+ }
+
+ /**
+ * Determine if the event runs in maintenance mode.
+ *
+ * @return bool
+ */
+ public function runsInMaintenanceMode()
+ {
+ return $this->evenInMaintenanceMode;
+ }
+
+ /**
+ * The Cron expression representing the event's frequency.
+ *
+ * @param string $expression
+ * @return $this
+ */
+ public function cron($expression)
+ {
+ $this->expression = $expression;
+
+ return $this;
+ }
+
+ /**
+ * Schedule the event to run hourly.
+ *
+ * @return $this
+ */
+ public function hourly()
+ {
+ return $this->cron('0 * * * * *');
+ }
+
+ /**
+ * Schedule the event to run daily.
+ *
+ * @return $this
+ */
+ public function daily()
+ {
+ return $this->cron('0 0 * * * *');
+ }
+
+ /**
+ * Schedule the command at a given time.
+ *
+ * @param string $time
+ * @return $this
+ */
+ public function at($time)
+ {
+ return $this->dailyAt($time);
+ }
+
+ /**
+ * Schedule the event to run daily at a given time (10:00, 19:30, etc).
+ *
+ * @param string $time
+ * @return $this
+ */
+ public function dailyAt($time)
+ {
+ $segments = explode(':', $time);
+
+ return $this->spliceIntoPosition(2, (int) $segments[0])
+ ->spliceIntoPosition(1, count($segments) == 2 ? (int) $segments[1] : '0');
+ }
+
+ /**
+ * Schedule the event to run twice daily.
+ *
+ * @param int $first
+ * @param int $second
+ * @return $this
+ */
+ public function twiceDaily($first = 1, $second = 13)
+ {
+ $hours = $first.','.$second;
+
+ return $this->spliceIntoPosition(1, 0)
+ ->spliceIntoPosition(2, $hours);
+ }
+
+ /**
+ * Schedule the event to run only on weekdays.
+ *
+ * @return $this
+ */
+ public function weekdays()
+ {
+ return $this->spliceIntoPosition(5, '1-5');
+ }
+
+ /**
+ * Schedule the event to run only on Mondays.
+ *
+ * @return $this
+ */
+ public function mondays()
+ {
+ return $this->days(1);
+ }
+
+ /**
+ * Schedule the event to run only on Tuesdays.
+ *
+ * @return $this
+ */
+ public function tuesdays()
+ {
+ return $this->days(2);
+ }
+
+ /**
+ * Schedule the event to run only on Wednesdays.
+ *
+ * @return $this
+ */
+ public function wednesdays()
+ {
+ return $this->days(3);
+ }
+
+ /**
+ * Schedule the event to run only on Thursdays.
+ *
+ * @return $this
+ */
+ public function thursdays()
+ {
+ return $this->days(4);
+ }
+
+ /**
+ * Schedule the event to run only on Fridays.
+ *
+ * @return $this
+ */
+ public function fridays()
+ {
+ return $this->days(5);
+ }
+
+ /**
+ * Schedule the event to run only on Saturdays.
+ *
+ * @return $this
+ */
+ public function saturdays()
+ {
+ return $this->days(6);
+ }
+
+ /**
+ * Schedule the event to run only on Sundays.
+ *
+ * @return $this
+ */
+ public function sundays()
+ {
+ return $this->days(0);
+ }
+
+ /**
+ * Schedule the event to run weekly.
+ *
+ * @return $this
+ */
+ public function weekly()
+ {
+ return $this->cron('0 0 * * 0 *');
+ }
+
+ /**
+ * Schedule the event to run weekly on a given day and time.
+ *
+ * @param int $day
+ * @param string $time
+ * @return $this
+ */
+ public function weeklyOn($day, $time = '0:0')
+ {
+ $this->dailyAt($time);
+
+ return $this->spliceIntoPosition(5, $day);
+ }
+
+ /**
+ * Schedule the event to run monthly.
+ *
+ * @return $this
+ */
+ public function monthly()
+ {
+ return $this->cron('0 0 1 * * *');
+ }
+
+ /**
+ * Schedule the event to run yearly.
+ *
+ * @return $this
+ */
+ public function yearly()
+ {
+ return $this->cron('0 0 1 1 * *');
+ }
+
+ /**
+ * Schedule the event to run every minute.
+ *
+ * @return $this
+ */
+ public function everyMinute()
+ {
+ return $this->cron('* * * * * *');
+ }
+
+ /**
+ * Schedule the event to run every five minutes.
+ *
+ * @return $this
+ */
+ public function everyFiveMinutes()
+ {
+ return $this->cron('*/5 * * * * *');
+ }
+
+ /**
+ * Schedule the event to run every ten minutes.
+ *
+ * @return $this
+ */
+ public function everyTenMinutes()
+ {
+ return $this->cron('*/10 * * * * *');
+ }
+
+ /**
+ * Schedule the event to run every thirty minutes.
+ *
+ * @return $this
+ */
+ public function everyThirtyMinutes()
+ {
+ return $this->cron('0,30 * * * * *');
+ }
+
+ /**
+ * Set the days of the week the command should run on.
+ *
+ * @param array|mixed $days
+ * @return $this
+ */
+ public function days($days)
+ {
+ $days = is_array($days) ? $days : func_get_args();
+
+ return $this->spliceIntoPosition(5, implode(',', $days));
+ }
+
+ /**
+ * Set the timezone the date should be evaluated on.
+ *
+ * @param \DateTimeZone|string $timezone
+ * @return $this
+ */
+ public function timezone($timezone)
+ {
+ $this->timezone = $timezone;
+
+ return $this;
+ }
+
+ /**
+ * Set which user the command should run as.
+ *
+ * @param string $user
+ * @return $this
+ */
+ public function user($user)
+ {
+ $this->user = $user;
+
+ return $this;
+ }
+
+ /**
+ * Limit the environments the command should run in.
+ *
+ * @param array|mixed $environments
+ * @return $this
+ */
+ public function environments($environments)
+ {
+ $this->environments = is_array($environments) ? $environments : func_get_args();
+
+ return $this;
+ }
+
+ /**
+ * State that the command should run even in maintenance mode.
+ *
+ * @return $this
+ */
+ public function evenInMaintenanceMode()
+ {
+ $this->evenInMaintenanceMode = true;
+
+ return $this;
+ }
+
+ /**
+ * Do not allow the event to overlap each other.
+ *
+ * @return $this
+ */
+ public function withoutOverlapping()
+ {
+ $this->withoutOverlapping = true;
+
+ return $this->skip(function () {
+ return file_exists($this->mutexPath());
+ });
+ }
+
+ /**
+ * Register a callback to further filter the schedule.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function when(Closure $callback)
+ {
+ $this->filter = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Register a callback to further filter the schedule.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function skip(Closure $callback)
+ {
+ $this->reject = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Send the output of the command to a given location.
+ *
+ * @param string $location
+ * @param bool $append
+ * @return $this
+ */
+ public function sendOutputTo($location, $append = false)
+ {
+ $this->output = $location;
+
+ $this->shouldAppendOutput = $append;
+
+ return $this;
+ }
+
+ /**
+ * Append the output of the command to a given location.
+ *
+ * @param string $location
+ * @return $this
+ */
+ public function appendOutputTo($location)
+ {
+ return $this->sendOutputTo($location, true);
+ }
+
+ /**
+ * E-mail the results of the scheduled operation.
+ *
+ * @param array|mixed $addresses
+ * @return $this
+ *
+ * @throws \LogicException
+ */
+ public function emailOutputTo($addresses)
+ {
+ if (is_null($this->output) || $this->output == $this->getDefaultOutput()) {
+ throw new LogicException('Must direct output to a file in order to e-mail results.');
+ }
+
+ $addresses = is_array($addresses) ? $addresses : func_get_args();
+
+ return $this->then(function (Mailer $mailer) use ($addresses) {
+ $this->emailOutput($mailer, $addresses);
+ });
+ }
+
+ /**
+ * E-mail the output of the event to the recipients.
+ *
+ * @param \Illuminate\Contracts\Mail\Mailer $mailer
+ * @param array $addresses
+ * @return void
+ */
+ protected function emailOutput(Mailer $mailer, $addresses)
+ {
+ $mailer->raw(file_get_contents($this->output), function ($m) use ($addresses) {
+ $m->subject($this->getEmailSubject());
+
+ foreach ($addresses as $address) {
+ $m->to($address);
+ }
+ });
+ }
+
+ /**
+ * Get the e-mail subject line for output results.
+ *
+ * @return string
+ */
+ protected function getEmailSubject()
+ {
+ if ($this->description) {
+ return 'Scheduled Job Output ('.$this->description.')';
+ }
+
+ return 'Scheduled Job Output';
+ }
+
+ /**
+ * Register a callback to ping a given URL before the job runs.
+ *
+ * @param string $url
+ * @return $this
+ */
+ public function pingBefore($url)
+ {
+ return $this->before(function () use ($url) {
+ (new HttpClient)->get($url);
+ });
+ }
+
+ /**
+ * Register a callback to be called before the operation.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function before(Closure $callback)
+ {
+ $this->beforeCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Register a callback to ping a given URL after the job runs.
+ *
+ * @param string $url
+ * @return $this
+ */
+ public function thenPing($url)
+ {
+ return $this->then(function () use ($url) {
+ (new HttpClient)->get($url);
+ });
+ }
+
+ /**
+ * Register a callback to be called after the operation.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function after(Closure $callback)
+ {
+ return $this->then($callback);
+ }
+
+ /**
+ * Register a callback to be called after the operation.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function then(Closure $callback)
+ {
+ $this->afterCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Set the human-friendly description of the event.
+ *
+ * @param string $description
+ * @return $this
+ */
+ public function name($description)
+ {
+ return $this->description($description);
+ }
+
+ /**
+ * Set the human-friendly description of the event.
+ *
+ * @param string $description
+ * @return $this
+ */
+ public function description($description)
+ {
+ $this->description = $description;
+
+ return $this;
+ }
+
+ /**
+ * Splice the given value into the given position of the expression.
+ *
+ * @param int $position
+ * @param string $value
+ * @return $this
+ */
+ protected function spliceIntoPosition($position, $value)
+ {
+ $segments = explode(' ', $this->expression);
+
+ $segments[$position - 1] = $value;
+
+ return $this->cron(implode(' ', $segments));
+ }
+
+ /**
+ * Get the summary of the event for display.
+ *
+ * @return string
+ */
+ public function getSummaryForDisplay()
+ {
+ if (is_string($this->description)) {
+ return $this->description;
+ }
+
+ return $this->buildCommand();
+ }
+
+ /**
+ * Get the Cron expression for the event.
+ *
+ * @return string
+ */
+ public function getExpression()
+ {
+ return $this->expression;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php
index 5e0a850..1f56b3d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php
@@ -1,76 +1,109 @@
-events[] = $event = new CallbackEvent($callback, $parameters);
+
+ return $event;
+ }
-class Schedule {
+ /**
+ * Add a new Artisan command event to the schedule.
+ *
+ * @param string $command
+ * @param array $parameters
+ * @return \Illuminate\Console\Scheduling\Event
+ */
+ public function command($command, array $parameters = [])
+ {
+ $binary = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
- /**
- * All of the events on the schedule.
- *
- * @var array
- */
- protected $events = [];
+ if (defined('HHVM_VERSION')) {
+ $binary .= ' --php';
+ }
- /**
- * Add a new callback event to the schedule.
- *
- * @param string $callback
- * @param array $parameters
- * @return \Illuminate\Console\Scheduling\Event
- */
- public function call($callback, array $parameters = array())
- {
- $this->events[] = $event = new CallbackEvent($callback, $parameters);
+ if (defined('ARTISAN_BINARY')) {
+ $artisan = ProcessUtils::escapeArgument(ARTISAN_BINARY);
+ } else {
+ $artisan = 'artisan';
+ }
- return $event;
- }
+ return $this->exec("{$binary} {$artisan} {$command}", $parameters);
+ }
- /**
- * Add a new Artisan command event to the schedule.
- *
- * @param string $command
- * @return \Illuminate\Console\Scheduling\Event
- */
- public function command($command)
- {
- return $this->exec(PHP_BINARY.' artisan '.$command);
- }
+ /**
+ * Add a new command event to the schedule.
+ *
+ * @param string $command
+ * @param array $parameters
+ * @return \Illuminate\Console\Scheduling\Event
+ */
+ public function exec($command, array $parameters = [])
+ {
+ if (count($parameters)) {
+ $command .= ' '.$this->compileParameters($parameters);
+ }
- /**
- * Add a new command event to the schedule.
- *
- * @param string $command
- * @return \Illuminate\Console\Scheduling\Event
- */
- public function exec($command)
- {
- $this->events[] = $event = new Event($command);
+ $this->events[] = $event = new Event($command);
- return $event;
- }
+ return $event;
+ }
- /**
- * Get all of the events on the schedule.
- *
- * @return array
- */
- public function events()
- {
- return $this->events;
- }
+ /**
+ * Compile parameters for a command.
+ *
+ * @param array $parameters
+ * @return string
+ */
+ protected function compileParameters(array $parameters)
+ {
+ return collect($parameters)->map(function ($value, $key) {
+ return is_numeric($key) ? $value : $key.'='.(is_numeric($value) ? $value : ProcessUtils::escapeArgument($value));
+ })->implode(' ');
+ }
- /**
- * Get all of the events on the schedule that are due.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @return array
- */
- public function dueEvents(Application $app)
- {
- return array_filter($this->events, function($event) use ($app)
- {
- return $event->isDue($app);
- });
- }
+ /**
+ * Get all of the events on the schedule.
+ *
+ * @return array
+ */
+ public function events()
+ {
+ return $this->events;
+ }
+ /**
+ * Get all of the events on the schedule that are due.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return array
+ */
+ public function dueEvents(Application $app)
+ {
+ return array_filter($this->events, function ($event) use ($app) {
+ return $event->isDue($app);
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
index da30250..3ce658c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
@@ -1,63 +1,62 @@
-schedule = $schedule;
-
- parent::__construct();
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $events = $this->schedule->dueEvents($this->laravel);
-
- foreach ($events as $event)
- {
- $this->line('Running scheduled command: '.$event->getSummaryForDisplay());
-
- $event->run($this->laravel);
- }
-
- if (count($events) === 0)
- {
- $this->info('No scheduled commands are ready to run.');
- }
- }
+use Illuminate\Console\Command;
+class ScheduleRunCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'schedule:run';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Run the scheduled commands';
+
+ /**
+ * The schedule instance.
+ *
+ * @var \Illuminate\Console\Scheduling\Schedule
+ */
+ protected $schedule;
+
+ /**
+ * Create a new command instance.
+ *
+ * @param \Illuminate\Console\Scheduling\Schedule $schedule
+ * @return void
+ */
+ public function __construct(Schedule $schedule)
+ {
+ $this->schedule = $schedule;
+
+ parent::__construct();
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $events = $this->schedule->dueEvents($this->laravel);
+
+ foreach ($events as $event) {
+ $this->line('Running scheduled command: '.$event->getSummaryForDisplay());
+
+ $event->run($this->laravel);
+ }
+
+ if (count($events) === 0) {
+ $this->info('No scheduled commands are ready to run.');
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/composer.json b/application/vendor/laravel/framework/src/Illuminate/Console/composer.json
index c9460bd..e7c8652 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Console/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/composer.json
@@ -14,10 +14,11 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "symfony/console": "2.6.*",
- "nesbot/carbon": "~1.0"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/console": "2.7.*",
+ "nesbot/carbon": "~1.19"
},
"autoload": {
"psr-4": {
@@ -26,14 +27,13 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "guzzlehttp/guzzle": "Required to use the thenPing method on schedules (~5.0).",
+ "guzzlehttp/guzzle": "Required to use the ping methods on schedules (~5.3|~6.0).",
"mtdowling/cron-expression": "Required to use scheduling component (~1.0).",
- "symfony/process": "Required to use scheduling component (2.6.*).",
- "nesbot/carbon": "Required to use scheduling component (~1.0)."
+ "symfony/process": "Required to use scheduling component (2.7.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Container/BindingResolutionException.php b/application/vendor/laravel/framework/src/Illuminate/Container/BindingResolutionException.php
index 105c018..198963e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Container/BindingResolutionException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Container/BindingResolutionException.php
@@ -1,5 +1,13 @@
-bound($abstract);
- }
-
- /**
- * Determine if the given abstract type has been bound.
- *
- * @param string $abstract
- * @return bool
- */
- public function bound($abstract)
- {
- return isset($this->bindings[$abstract]) || isset($this->instances[$abstract]) || $this->isAlias($abstract);
- }
-
- /**
- * Determine if the given abstract type has been resolved.
- *
- * @param string $abstract
- * @return bool
- */
- public function resolved($abstract)
- {
- return isset($this->resolved[$abstract]) || isset($this->instances[$abstract]);
- }
-
- /**
- * Determine if a given string is an alias.
- *
- * @param string $name
- * @return bool
- */
- public function isAlias($name)
- {
- return isset($this->aliases[$name]);
- }
-
- /**
- * Register a binding with the container.
- *
- * @param string|array $abstract
- * @param \Closure|string|null $concrete
- * @param bool $shared
- * @return void
- */
- public function bind($abstract, $concrete = null, $shared = false)
- {
- // If the given types are actually an array, we will assume an alias is being
- // defined and will grab this "real" abstract class name and register this
- // alias with the container so that it can be used as a shortcut for it.
- if (is_array($abstract))
- {
- list($abstract, $alias) = $this->extractAlias($abstract);
-
- $this->alias($abstract, $alias);
- }
-
- // If no concrete type was given, we will simply set the concrete type to the
- // abstract type. This will allow concrete type to be registered as shared
- // without being forced to state their classes in both of the parameter.
- $this->dropStaleInstances($abstract);
-
- if (is_null($concrete))
- {
- $concrete = $abstract;
- }
-
- // If the factory is not a Closure, it means it is just a class name which is
- // is bound into this container to the abstract type and we will just wrap
- // it up inside a Closure to make things more convenient when extending.
- if ( ! $concrete instanceof Closure)
- {
- $concrete = $this->getClosure($abstract, $concrete);
- }
-
- $this->bindings[$abstract] = compact('concrete', 'shared');
-
- // If the abstract type was already resolved in this container we'll fire the
- // rebound listener so that any objects which have already gotten resolved
- // can have their copy of the object updated via the listener callbacks.
- if ($this->resolved($abstract))
- {
- $this->rebound($abstract);
- }
- }
-
- /**
- * Get the Closure to be used when building a type.
- *
- * @param string $abstract
- * @param string $concrete
- * @return \Closure
- */
- protected function getClosure($abstract, $concrete)
- {
- return function($c, $parameters = []) use ($abstract, $concrete)
- {
- $method = ($abstract == $concrete) ? 'build' : 'make';
-
- return $c->$method($concrete, $parameters);
- };
- }
-
- /**
- * Add a contextual binding to the container.
- *
- * @param string $concrete
- * @param string $abstract
- * @param \Closure|string $implementation
- */
- public function addContextualBinding($concrete, $abstract, $implementation)
- {
- $this->contextual[$concrete][$abstract] = $implementation;
- }
-
- /**
- * Register a binding if it hasn't already been registered.
- *
- * @param string $abstract
- * @param \Closure|string|null $concrete
- * @param bool $shared
- * @return void
- */
- public function bindIf($abstract, $concrete = null, $shared = false)
- {
- if ( ! $this->bound($abstract))
- {
- $this->bind($abstract, $concrete, $shared);
- }
- }
-
- /**
- * Register a shared binding in the container.
- *
- * @param string $abstract
- * @param \Closure|string|null $concrete
- * @return void
- */
- public function singleton($abstract, $concrete = null)
- {
- $this->bind($abstract, $concrete, true);
- }
-
- /**
- * Wrap a Closure such that it is shared.
- *
- * @param \Closure $closure
- * @return \Closure
- */
- public function share(Closure $closure)
- {
- return function($container) use ($closure)
- {
- // We'll simply declare a static variable within the Closures and if it has
- // not been set we will execute the given Closures to resolve this value
- // and return it back to these consumers of the method as an instance.
- static $object;
-
- if (is_null($object))
- {
- $object = $closure($container);
- }
-
- return $object;
- };
- }
-
- /**
- * Bind a shared Closure into the container.
- *
- * @param string $abstract
- * @param \Closure $closure
- * @return void
- */
- public function bindShared($abstract, Closure $closure)
- {
- $this->bind($abstract, $this->share($closure), true);
- }
-
- /**
- * "Extend" an abstract type in the container.
- *
- * @param string $abstract
- * @param \Closure $closure
- * @return void
- *
- * @throws \InvalidArgumentException
- */
- public function extend($abstract, Closure $closure)
- {
- if (isset($this->instances[$abstract]))
- {
- $this->instances[$abstract] = $closure($this->instances[$abstract], $this);
-
- $this->rebound($abstract);
- }
- else
- {
- $this->extenders[$abstract][] = $closure;
- }
- }
-
- /**
- * Register an existing instance as shared in the container.
- *
- * @param string $abstract
- * @param mixed $instance
- * @return void
- */
- public function instance($abstract, $instance)
- {
- // First, we will extract the alias from the abstract if it is an array so we
- // are using the correct name when binding the type. If we get an alias it
- // will be registered with the container so we can resolve it out later.
- if (is_array($abstract))
- {
- list($abstract, $alias) = $this->extractAlias($abstract);
-
- $this->alias($abstract, $alias);
- }
-
- unset($this->aliases[$abstract]);
-
- // We'll check to determine if this type has been bound before, and if it has
- // we will fire the rebound callbacks registered with the container and it
- // can be updated with consuming classes that have gotten resolved here.
- $bound = $this->bound($abstract);
-
- $this->instances[$abstract] = $instance;
-
- if ($bound)
- {
- $this->rebound($abstract);
- }
- }
-
- /**
- * Assign a set of tags to a given binding.
- *
- * @param array|string $abstracts
- * @param array|mixed ...$tags
- * @return void
- */
- public function tag($abstracts, $tags)
- {
- $tags = is_array($tags) ? $tags : array_slice(func_get_args(), 1);
-
- foreach ($tags as $tag)
- {
- if ( ! isset($this->tags[$tag])) $this->tags[$tag] = [];
-
- foreach ((array) $abstracts as $abstract)
- {
- $this->tags[$tag][] = $abstract;
- }
- }
- }
-
- /**
- * Resolve all of the bindings for a given tag.
- *
- * @param string $tag
- * @return array
- */
- public function tagged($tag)
- {
- $results = [];
-
- if (isset($this->tags[$tag]))
- {
- foreach ($this->tags[$tag] as $abstract)
- {
- $results[] = $this->make($abstract);
- }
- }
-
- return $results;
- }
-
- /**
- * Alias a type to a different name.
- *
- * @param string $abstract
- * @param string $alias
- * @return void
- */
- public function alias($abstract, $alias)
- {
- $this->aliases[$alias] = $abstract;
- }
-
- /**
- * Extract the type and alias from a given definition.
- *
- * @param array $definition
- * @return array
- */
- protected function extractAlias(array $definition)
- {
- return [key($definition), current($definition)];
- }
-
- /**
- * Bind a new callback to an abstract's rebind event.
- *
- * @param string $abstract
- * @param \Closure $callback
- * @return mixed
- */
- public function rebinding($abstract, Closure $callback)
- {
- $this->reboundCallbacks[$abstract][] = $callback;
-
- if ($this->bound($abstract)) return $this->make($abstract);
- }
-
- /**
- * Refresh an instance on the given target and method.
- *
- * @param string $abstract
- * @param mixed $target
- * @param string $method
- * @return mixed
- */
- public function refresh($abstract, $target, $method)
- {
- return $this->rebinding($abstract, function($app, $instance) use ($target, $method)
- {
- $target->{$method}($instance);
- });
- }
-
- /**
- * Fire the "rebound" callbacks for the given abstract type.
- *
- * @param string $abstract
- * @return void
- */
- protected function rebound($abstract)
- {
- $instance = $this->make($abstract);
-
- foreach ($this->getReboundCallbacks($abstract) as $callback)
- {
- call_user_func($callback, $this, $instance);
- }
- }
-
- /**
- * Get the rebound callbacks for a given type.
- *
- * @param string $abstract
- * @return array
- */
- protected function getReboundCallbacks($abstract)
- {
- if (isset($this->reboundCallbacks[$abstract]))
- {
- return $this->reboundCallbacks[$abstract];
- }
-
- return [];
- }
-
- /**
- * Wrap the given closure such that its dependencies will be injected when executed.
- *
- * @param \Closure $callback
- * @param array $parameters
- * @return \Closure
- */
- public function wrap(Closure $callback, array $parameters = [])
- {
- return function() use ($callback, $parameters)
- {
- return $this->call($callback, $parameters);
- };
- }
-
- /**
- * Call the given Closure / class@method and inject its dependencies.
- *
- * @param callable|string $callback
- * @param array $parameters
- * @param string|null $defaultMethod
- * @return mixed
- */
- public function call($callback, array $parameters = [], $defaultMethod = null)
- {
- if ($this->isCallableWithAtSign($callback) || $defaultMethod)
- {
- return $this->callClass($callback, $parameters, $defaultMethod);
- }
-
- $dependencies = $this->getMethodDependencies($callback, $parameters);
-
- return call_user_func_array($callback, $dependencies);
- }
-
- /**
- * Determine if the given string is in Class@method syntax.
- *
- * @param mixed $callback
- * @return bool
- */
- protected function isCallableWithAtSign($callback)
- {
- if ( ! is_string($callback)) return false;
-
- return strpos($callback, '@') !== false;
- }
-
- /**
- * Get all dependencies for a given method.
- *
- * @param callable|string $callback
- * @param array $parameters
- * @return array
- */
- protected function getMethodDependencies($callback, $parameters = [])
- {
- $dependencies = [];
-
- foreach ($this->getCallReflector($callback)->getParameters() as $key => $parameter)
- {
- $this->addDependencyForCallParameter($parameter, $parameters, $dependencies);
- }
-
- return array_merge($dependencies, $parameters);
- }
-
- /**
- * Get the proper reflection instance for the given callback.
- *
- * @param callable|string $callback
- * @return \ReflectionFunctionAbstract
- */
- protected function getCallReflector($callback)
- {
- if (is_string($callback) && strpos($callback, '::') !== false)
- {
- $callback = explode('::', $callback);
- }
-
- if (is_array($callback))
- {
- return new ReflectionMethod($callback[0], $callback[1]);
- }
-
- return new ReflectionFunction($callback);
- }
-
- /**
- * Get the dependency for the given call parameter.
- *
- * @param \ReflectionParameter $parameter
- * @param array $parameters
- * @param array $dependencies
- * @return mixed
- */
- protected function addDependencyForCallParameter(ReflectionParameter $parameter, array &$parameters, &$dependencies)
- {
- if (array_key_exists($parameter->name, $parameters))
- {
- $dependencies[] = $parameters[$parameter->name];
-
- unset($parameters[$parameter->name]);
- }
- elseif ($parameter->getClass())
- {
- $dependencies[] = $this->make($parameter->getClass()->name);
- }
- elseif ($parameter->isDefaultValueAvailable())
- {
- $dependencies[] = $parameter->getDefaultValue();
- }
- }
-
- /**
- * Call a string reference to a class using Class@method syntax.
- *
- * @param string $target
- * @param array $parameters
- * @param string|null $defaultMethod
- * @return mixed
- */
- protected function callClass($target, array $parameters = [], $defaultMethod = null)
- {
- $segments = explode('@', $target);
-
- // If the listener has an @ sign, we will assume it is being used to delimit
- // the class name from the handle method name. This allows for handlers
- // to run multiple handler methods in a single class for convenience.
- $method = count($segments) == 2 ? $segments[1] : $defaultMethod;
-
- if (is_null($method))
- {
- throw new InvalidArgumentException("Method not provided.");
- }
-
- return $this->call([$this->make($segments[0]), $method], $parameters);
- }
-
- /**
- * Resolve the given type from the container.
- *
- * @param string $abstract
- * @param array $parameters
- * @return mixed
- */
- public function make($abstract, $parameters = [])
- {
- $abstract = $this->getAlias($abstract);
-
- // If an instance of the type is currently being managed as a singleton we'll
- // just return an existing instance instead of instantiating new instances
- // so the developer can keep using the same objects instance every time.
- if (isset($this->instances[$abstract]))
- {
- return $this->instances[$abstract];
- }
-
- $concrete = $this->getConcrete($abstract);
-
- // We're ready to instantiate an instance of the concrete type registered for
- // the binding. This will instantiate the types, as well as resolve any of
- // its "nested" dependencies recursively until all have gotten resolved.
- if ($this->isBuildable($concrete, $abstract))
- {
- $object = $this->build($concrete, $parameters);
- }
- else
- {
- $object = $this->make($concrete, $parameters);
- }
-
- // If we defined any extenders for this type, we'll need to spin through them
- // and apply them to the object being built. This allows for the extension
- // of services, such as changing configuration or decorating the object.
- foreach ($this->getExtenders($abstract) as $extender)
- {
- $object = $extender($object, $this);
- }
-
- // If the requested type is registered as a singleton we'll want to cache off
- // the instances in "memory" so we can return it later without creating an
- // entirely new instance of an object on each subsequent request for it.
- if ($this->isShared($abstract))
- {
- $this->instances[$abstract] = $object;
- }
-
- $this->fireResolvingCallbacks($abstract, $object);
-
- $this->resolved[$abstract] = true;
-
- return $object;
- }
-
- /**
- * Get the concrete type for a given abstract.
- *
- * @param string $abstract
- * @return mixed $concrete
- */
- protected function getConcrete($abstract)
- {
- if ( ! is_null($concrete = $this->getContextualConcrete($abstract)))
- {
- return $concrete;
- }
-
- // If we don't have a registered resolver or concrete for the type, we'll just
- // assume each type is a concrete name and will attempt to resolve it as is
- // since the container should be able to resolve concretes automatically.
- if ( ! isset($this->bindings[$abstract]))
- {
- if ($this->missingLeadingSlash($abstract) &&
- isset($this->bindings['\\'.$abstract]))
- {
- $abstract = '\\'.$abstract;
- }
-
- return $abstract;
- }
-
- return $this->bindings[$abstract]['concrete'];
- }
-
- /**
- * Get the contextual concrete binding for the given abstract.
- *
- * @param string $abstract
- * @return string
- */
- protected function getContextualConcrete($abstract)
- {
- if (isset($this->contextual[end($this->buildStack)][$abstract]))
- {
- return $this->contextual[end($this->buildStack)][$abstract];
- }
- }
-
- /**
- * Determine if the given abstract has a leading slash.
- *
- * @param string $abstract
- * @return bool
- */
- protected function missingLeadingSlash($abstract)
- {
- return is_string($abstract) && strpos($abstract, '\\') !== 0;
- }
-
- /**
- * Get the extender callbacks for a given type.
- *
- * @param string $abstract
- * @return array
- */
- protected function getExtenders($abstract)
- {
- if (isset($this->extenders[$abstract]))
- {
- return $this->extenders[$abstract];
- }
-
- return [];
- }
-
- /**
- * Instantiate a concrete instance of the given type.
- *
- * @param string $concrete
- * @param array $parameters
- * @return mixed
- *
- * @throws BindingResolutionException
- */
- public function build($concrete, $parameters = [])
- {
- // If the concrete type is actually a Closure, we will just execute it and
- // hand back the results of the functions, which allows functions to be
- // used as resolvers for more fine-tuned resolution of these objects.
- if ($concrete instanceof Closure)
- {
- return $concrete($this, $parameters);
- }
-
- $reflector = new ReflectionClass($concrete);
-
- // If the type is not instantiable, the developer is attempting to resolve
- // an abstract type such as an Interface of Abstract Class and there is
- // no binding registered for the abstractions so we need to bail out.
- if ( ! $reflector->isInstantiable())
- {
- $message = "Target [$concrete] is not instantiable.";
-
- throw new BindingResolutionException($message);
- }
-
- $this->buildStack[] = $concrete;
-
- $constructor = $reflector->getConstructor();
-
- // If there are no constructors, that means there are no dependencies then
- // we can just resolve the instances of the objects right away, without
- // resolving any other types or dependencies out of these containers.
- if (is_null($constructor))
- {
- array_pop($this->buildStack);
-
- return new $concrete;
- }
-
- $dependencies = $constructor->getParameters();
-
- // Once we have all the constructor's parameters we can create each of the
- // dependency instances and then use the reflection instances to make a
- // new instance of this class, injecting the created dependencies in.
- $parameters = $this->keyParametersByArgument(
- $dependencies, $parameters
- );
-
- $instances = $this->getDependencies(
- $dependencies, $parameters
- );
-
- array_pop($this->buildStack);
-
- return $reflector->newInstanceArgs($instances);
- }
-
- /**
- * Resolve all of the dependencies from the ReflectionParameters.
- *
- * @param array $parameters
- * @param array $primitives
- * @return array
- */
- protected function getDependencies($parameters, array $primitives = [])
- {
- $dependencies = [];
-
- foreach ($parameters as $parameter)
- {
- $dependency = $parameter->getClass();
-
- // If the class is null, it means the dependency is a string or some other
- // primitive type which we can not resolve since it is not a class and
- // we will just bomb out with an error since we have no-where to go.
- if (array_key_exists($parameter->name, $primitives))
- {
- $dependencies[] = $primitives[$parameter->name];
- }
- elseif (is_null($dependency))
- {
- $dependencies[] = $this->resolveNonClass($parameter);
- }
- else
- {
- $dependencies[] = $this->resolveClass($parameter);
- }
- }
-
- return (array) $dependencies;
- }
-
- /**
- * Resolve a non-class hinted dependency.
- *
- * @param \ReflectionParameter $parameter
- * @return mixed
- *
- * @throws BindingResolutionException
- */
- protected function resolveNonClass(ReflectionParameter $parameter)
- {
- if ($parameter->isDefaultValueAvailable())
- {
- return $parameter->getDefaultValue();
- }
-
- $message = "Unresolvable dependency resolving [$parameter] in class {$parameter->getDeclaringClass()->getName()}";
-
- throw new BindingResolutionException($message);
- }
-
- /**
- * Resolve a class based dependency from the container.
- *
- * @param \ReflectionParameter $parameter
- * @return mixed
- *
- * @throws BindingResolutionException
- */
- protected function resolveClass(ReflectionParameter $parameter)
- {
- try
- {
- return $this->make($parameter->getClass()->name);
- }
-
- // If we can not resolve the class instance, we will check to see if the value
- // is optional, and if it is we will return the optional parameter value as
- // the value of the dependency, similarly to how we do this with scalars.
- catch (BindingResolutionException $e)
- {
- if ($parameter->isOptional())
- {
- return $parameter->getDefaultValue();
- }
-
- throw $e;
- }
- }
-
- /**
- * If extra parameters are passed by numeric ID, rekey them by argument name.
- *
- * @param array $dependencies
- * @param array $parameters
- * @return array
- */
- protected function keyParametersByArgument(array $dependencies, array $parameters)
- {
- foreach ($parameters as $key => $value)
- {
- if (is_numeric($key))
- {
- unset($parameters[$key]);
-
- $parameters[$dependencies[$key]->name] = $value;
- }
- }
-
- return $parameters;
- }
-
- /**
- * Register a new resolving callback.
- *
- * @param string $abstract
- * @param \Closure $callback
- * @return void
- */
- public function resolving($abstract, Closure $callback = null)
- {
- if ($callback === null && $abstract instanceof Closure)
- {
- $this->resolvingCallback($abstract);
- }
- else
- {
- $this->resolvingCallbacks[$abstract][] = $callback;
- }
- }
-
- /**
- * Register a new after resolving callback for all types.
- *
- * @param string $abstract
- * @param \Closure $callback
- * @return void
- */
- public function afterResolving($abstract, Closure $callback = null)
- {
- if ($abstract instanceof Closure && $callback === null)
- {
- $this->afterResolvingCallback($abstract);
- }
- else
- {
- $this->afterResolvingCallbacks[$abstract][] = $callback;
- }
- }
-
- /**
- * Register a new resolving callback by type of its first argument.
- *
- * @param \Closure $callback
- * @return void
- */
- protected function resolvingCallback(Closure $callback)
- {
- $abstract = $this->getFunctionHint($callback);
-
- if ($abstract)
- {
- $this->resolvingCallbacks[$abstract][] = $callback;
- }
- else
- {
- $this->globalResolvingCallbacks[] = $callback;
- }
- }
-
- /**
- * Register a new after resolving callback by type of its first argument.
- *
- * @param \Closure $callback
- * @return void
- */
- protected function afterResolvingCallback(Closure $callback)
- {
- $abstract = $this->getFunctionHint($callback);
-
- if ($abstract)
- {
- $this->afterResolvingCallbacks[$abstract][] = $callback;
- }
- else
- {
- $this->globalAfterResolvingCallbacks[] = $callback;
- }
- }
-
- /**
- * Get the type hint for this closure's first argument.
- *
- * @param \Closure $callback
- * @return mixed
- */
- protected function getFunctionHint(Closure $callback)
- {
- $function = new ReflectionFunction($callback);
-
- if ($function->getNumberOfParameters() == 0)
- {
- return;
- }
-
- $expected = $function->getParameters()[0];
-
- if ( ! $expected->getClass())
- {
- return;
- }
-
- return $expected->getClass()->name;
- }
-
- /**
- * Fire all of the resolving callbacks.
- *
- * @param string $abstract
- * @param mixed $object
- * @return void
- */
- protected function fireResolvingCallbacks($abstract, $object)
- {
- $this->fireCallbackArray($object, $this->globalResolvingCallbacks);
-
- $this->fireCallbackArray(
- $object, $this->getCallbacksForType(
- $abstract, $object, $this->resolvingCallbacks
- )
- );
-
- $this->fireCallbackArray($object, $this->globalAfterResolvingCallbacks);
-
- $this->fireCallbackArray(
- $object, $this->getCallbacksForType(
- $abstract, $object, $this->afterResolvingCallbacks
- )
- );
- }
-
- /**
- * Get all callbacks for a given type.
- *
- * @param string $abstract
- * @param object $object
- * @param array $callbacksPerType
- *
- * @return array
- */
- protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
- {
- $results = [];
-
- foreach ($callbacksPerType as $type => $callbacks)
- {
- if ($type === $abstract || $object instanceof $type)
- {
- $results = array_merge($results, $callbacks);
- }
- }
-
- return $results;
- }
-
- /**
- * Fire an array of callbacks with an object.
- *
- * @param mixed $object
- * @param array $callbacks
- */
- protected function fireCallbackArray($object, array $callbacks)
- {
- foreach ($callbacks as $callback)
- {
- $callback($object, $this);
- }
- }
-
- /**
- * Determine if a given type is shared.
- *
- * @param string $abstract
- * @return bool
- */
- public function isShared($abstract)
- {
- if (isset($this->bindings[$abstract]['shared']))
- {
- $shared = $this->bindings[$abstract]['shared'];
- }
- else
- {
- $shared = false;
- }
-
- return isset($this->instances[$abstract]) || $shared === true;
- }
-
- /**
- * Determine if the given concrete is buildable.
- *
- * @param mixed $concrete
- * @param string $abstract
- * @return bool
- */
- protected function isBuildable($concrete, $abstract)
- {
- return $concrete === $abstract || $concrete instanceof Closure;
- }
-
- /**
- * Get the alias for an abstract if available.
- *
- * @param string $abstract
- * @return string
- */
- protected function getAlias($abstract)
- {
- return isset($this->aliases[$abstract]) ? $this->aliases[$abstract] : $abstract;
- }
-
- /**
- * Get the container's bindings.
- *
- * @return array
- */
- public function getBindings()
- {
- return $this->bindings;
- }
-
- /**
- * Drop all of the stale instances and aliases.
- *
- * @param string $abstract
- * @return void
- */
- protected function dropStaleInstances($abstract)
- {
- unset($this->instances[$abstract], $this->aliases[$abstract]);
- }
-
- /**
- * Remove a resolved instance from the instance cache.
- *
- * @param string $abstract
- * @return void
- */
- public function forgetInstance($abstract)
- {
- unset($this->instances[$abstract]);
- }
-
- /**
- * Clear all of the instances from the container.
- *
- * @return void
- */
- public function forgetInstances()
- {
- $this->instances = [];
- }
-
- /**
- * Flush the container of all bindings and resolved instances.
- *
- * @return void
- */
- public function flush()
- {
- $this->aliases = [];
- $this->resolved = [];
- $this->bindings = [];
- $this->instances = [];
- }
-
- /**
- * Set the globally available instance of the container.
- *
- * @return static
- */
- public static function getInstance()
- {
- return static::$instance;
- }
-
- /**
- * Set the shared instance of the container.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- public static function setInstance(ContainerContract $container)
- {
- static::$instance = $container;
- }
-
- /**
- * Determine if a given offset exists.
- *
- * @param string $key
- * @return bool
- */
- public function offsetExists($key)
- {
- return isset($this->bindings[$key]);
- }
-
- /**
- * Get the value at a given offset.
- *
- * @param string $key
- * @return mixed
- */
- public function offsetGet($key)
- {
- return $this->make($key);
- }
-
- /**
- * Set the value at a given offset.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function offsetSet($key, $value)
- {
- // If the value is not a Closure, we will make it one. This simply gives
- // more "drop-in" replacement functionality for the Pimple which this
- // container's simplest functions are base modeled and built after.
- if ( ! $value instanceof Closure)
- {
- $value = function() use ($value)
- {
- return $value;
- };
- }
-
- $this->bind($key, $value);
- }
-
- /**
- * Unset the value at a given offset.
- *
- * @param string $key
- * @return void
- */
- public function offsetUnset($key)
- {
- unset($this->bindings[$key], $this->instances[$key], $this->resolved[$key]);
- }
-
- /**
- * Dynamically access container services.
- *
- * @param string $key
- * @return mixed
- */
- public function __get($key)
- {
- return $this[$key];
- }
-
- /**
- * Dynamically set container services.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function __set($key, $value)
- {
- $this[$key] = $value;
- }
-
+use Illuminate\Contracts\Container\BindingResolutionException as BindingResolutionContractException;
+
+class Container implements ArrayAccess, ContainerContract
+{
+ /**
+ * The current globally available container (if any).
+ *
+ * @var static
+ */
+ protected static $instance;
+
+ /**
+ * An array of the types that have been resolved.
+ *
+ * @var array
+ */
+ protected $resolved = [];
+
+ /**
+ * The container's bindings.
+ *
+ * @var array
+ */
+ protected $bindings = [];
+
+ /**
+ * The container's shared instances.
+ *
+ * @var array
+ */
+ protected $instances = [];
+
+ /**
+ * The registered type aliases.
+ *
+ * @var array
+ */
+ protected $aliases = [];
+
+ /**
+ * The extension closures for services.
+ *
+ * @var array
+ */
+ protected $extenders = [];
+
+ /**
+ * All of the registered tags.
+ *
+ * @var array
+ */
+ protected $tags = [];
+
+ /**
+ * The stack of concretions currently being built.
+ *
+ * @var array
+ */
+ protected $buildStack = [];
+
+ /**
+ * The contextual binding map.
+ *
+ * @var array
+ */
+ public $contextual = [];
+
+ /**
+ * All of the registered rebound callbacks.
+ *
+ * @var array
+ */
+ protected $reboundCallbacks = [];
+
+ /**
+ * All of the global resolving callbacks.
+ *
+ * @var array
+ */
+ protected $globalResolvingCallbacks = [];
+
+ /**
+ * All of the global after resolving callbacks.
+ *
+ * @var array
+ */
+ protected $globalAfterResolvingCallbacks = [];
+
+ /**
+ * All of the after resolving callbacks by class type.
+ *
+ * @var array
+ */
+ protected $resolvingCallbacks = [];
+
+ /**
+ * All of the after resolving callbacks by class type.
+ *
+ * @var array
+ */
+ protected $afterResolvingCallbacks = [];
+
+ /**
+ * Define a contextual binding.
+ *
+ * @param string $concrete
+ * @return \Illuminate\Contracts\Container\ContextualBindingBuilder
+ */
+ public function when($concrete)
+ {
+ return new ContextualBindingBuilder($this, $concrete);
+ }
+
+ /**
+ * Determine if the given abstract type has been bound.
+ *
+ * @param string $abstract
+ * @return bool
+ */
+ public function bound($abstract)
+ {
+ return isset($this->bindings[$abstract]) || isset($this->instances[$abstract]) || $this->isAlias($abstract);
+ }
+
+ /**
+ * Determine if the given abstract type has been resolved.
+ *
+ * @param string $abstract
+ * @return bool
+ */
+ public function resolved($abstract)
+ {
+ if ($this->isAlias($abstract)) {
+ $abstract = $this->getAlias($abstract);
+ }
+
+ return isset($this->resolved[$abstract]) || isset($this->instances[$abstract]);
+ }
+
+ /**
+ * Determine if a given string is an alias.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function isAlias($name)
+ {
+ return isset($this->aliases[$name]);
+ }
+
+ /**
+ * Register a binding with the container.
+ *
+ * @param string|array $abstract
+ * @param \Closure|string|null $concrete
+ * @param bool $shared
+ * @return void
+ */
+ public function bind($abstract, $concrete = null, $shared = false)
+ {
+ // If the given types are actually an array, we will assume an alias is being
+ // defined and will grab this "real" abstract class name and register this
+ // alias with the container so that it can be used as a shortcut for it.
+ if (is_array($abstract)) {
+ list($abstract, $alias) = $this->extractAlias($abstract);
+
+ $this->alias($abstract, $alias);
+ }
+
+ // If no concrete type was given, we will simply set the concrete type to the
+ // abstract type. This will allow concrete type to be registered as shared
+ // without being forced to state their classes in both of the parameter.
+ $this->dropStaleInstances($abstract);
+
+ if (is_null($concrete)) {
+ $concrete = $abstract;
+ }
+
+ // If the factory is not a Closure, it means it is just a class name which is
+ // bound into this container to the abstract type and we will just wrap it
+ // up inside its own Closure to give us more convenience when extending.
+ if (! $concrete instanceof Closure) {
+ $concrete = $this->getClosure($abstract, $concrete);
+ }
+
+ $this->bindings[$abstract] = compact('concrete', 'shared');
+
+ // If the abstract type was already resolved in this container we'll fire the
+ // rebound listener so that any objects which have already gotten resolved
+ // can have their copy of the object updated via the listener callbacks.
+ if ($this->resolved($abstract)) {
+ $this->rebound($abstract);
+ }
+ }
+
+ /**
+ * Get the Closure to be used when building a type.
+ *
+ * @param string $abstract
+ * @param string $concrete
+ * @return \Closure
+ */
+ protected function getClosure($abstract, $concrete)
+ {
+ return function ($c, $parameters = []) use ($abstract, $concrete) {
+ $method = ($abstract == $concrete) ? 'build' : 'make';
+
+ return $c->$method($concrete, $parameters);
+ };
+ }
+
+ /**
+ * Add a contextual binding to the container.
+ *
+ * @param string $concrete
+ * @param string $abstract
+ * @param \Closure|string $implementation
+ * @return void
+ */
+ public function addContextualBinding($concrete, $abstract, $implementation)
+ {
+ $this->contextual[$concrete][$abstract] = $implementation;
+ }
+
+ /**
+ * Register a binding if it hasn't already been registered.
+ *
+ * @param string $abstract
+ * @param \Closure|string|null $concrete
+ * @param bool $shared
+ * @return void
+ */
+ public function bindIf($abstract, $concrete = null, $shared = false)
+ {
+ if (! $this->bound($abstract)) {
+ $this->bind($abstract, $concrete, $shared);
+ }
+ }
+
+ /**
+ * Register a shared binding in the container.
+ *
+ * @param string|array $abstract
+ * @param \Closure|string|null $concrete
+ * @return void
+ */
+ public function singleton($abstract, $concrete = null)
+ {
+ $this->bind($abstract, $concrete, true);
+ }
+
+ /**
+ * Wrap a Closure such that it is shared.
+ *
+ * @param \Closure $closure
+ * @return \Closure
+ */
+ public function share(Closure $closure)
+ {
+ return function ($container) use ($closure) {
+ // We'll simply declare a static variable within the Closures and if it has
+ // not been set we will execute the given Closures to resolve this value
+ // and return it back to these consumers of the method as an instance.
+ static $object;
+
+ if (is_null($object)) {
+ $object = $closure($container);
+ }
+
+ return $object;
+ };
+ }
+
+ /**
+ * Bind a shared Closure into the container.
+ *
+ * @param string $abstract
+ * @param \Closure $closure
+ * @return void
+ *
+ * @deprecated since version 5.1. Use singleton instead.
+ */
+ public function bindShared($abstract, Closure $closure)
+ {
+ $this->bind($abstract, $this->share($closure), true);
+ }
+
+ /**
+ * "Extend" an abstract type in the container.
+ *
+ * @param string $abstract
+ * @param \Closure $closure
+ * @return void
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function extend($abstract, Closure $closure)
+ {
+ if (isset($this->instances[$abstract])) {
+ $this->instances[$abstract] = $closure($this->instances[$abstract], $this);
+
+ $this->rebound($abstract);
+ } else {
+ $this->extenders[$abstract][] = $closure;
+ }
+ }
+
+ /**
+ * Register an existing instance as shared in the container.
+ *
+ * @param string $abstract
+ * @param mixed $instance
+ * @return void
+ */
+ public function instance($abstract, $instance)
+ {
+ // First, we will extract the alias from the abstract if it is an array so we
+ // are using the correct name when binding the type. If we get an alias it
+ // will be registered with the container so we can resolve it out later.
+ if (is_array($abstract)) {
+ list($abstract, $alias) = $this->extractAlias($abstract);
+
+ $this->alias($abstract, $alias);
+ }
+
+ unset($this->aliases[$abstract]);
+
+ // We'll check to determine if this type has been bound before, and if it has
+ // we will fire the rebound callbacks registered with the container and it
+ // can be updated with consuming classes that have gotten resolved here.
+ $bound = $this->bound($abstract);
+
+ $this->instances[$abstract] = $instance;
+
+ if ($bound) {
+ $this->rebound($abstract);
+ }
+ }
+
+ /**
+ * Assign a set of tags to a given binding.
+ *
+ * @param array|string $abstracts
+ * @param array|mixed ...$tags
+ * @return void
+ */
+ public function tag($abstracts, $tags)
+ {
+ $tags = is_array($tags) ? $tags : array_slice(func_get_args(), 1);
+
+ foreach ($tags as $tag) {
+ if (! isset($this->tags[$tag])) {
+ $this->tags[$tag] = [];
+ }
+
+ foreach ((array) $abstracts as $abstract) {
+ $this->tags[$tag][] = $abstract;
+ }
+ }
+ }
+
+ /**
+ * Resolve all of the bindings for a given tag.
+ *
+ * @param string $tag
+ * @return array
+ */
+ public function tagged($tag)
+ {
+ $results = [];
+
+ if (isset($this->tags[$tag])) {
+ foreach ($this->tags[$tag] as $abstract) {
+ $results[] = $this->make($abstract);
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Alias a type to a different name.
+ *
+ * @param string $abstract
+ * @param string $alias
+ * @return void
+ */
+ public function alias($abstract, $alias)
+ {
+ $this->aliases[$alias] = $abstract;
+ }
+
+ /**
+ * Extract the type and alias from a given definition.
+ *
+ * @param array $definition
+ * @return array
+ */
+ protected function extractAlias(array $definition)
+ {
+ return [key($definition), current($definition)];
+ }
+
+ /**
+ * Bind a new callback to an abstract's rebind event.
+ *
+ * @param string $abstract
+ * @param \Closure $callback
+ * @return mixed
+ */
+ public function rebinding($abstract, Closure $callback)
+ {
+ $this->reboundCallbacks[$abstract][] = $callback;
+
+ if ($this->bound($abstract)) {
+ return $this->make($abstract);
+ }
+ }
+
+ /**
+ * Refresh an instance on the given target and method.
+ *
+ * @param string $abstract
+ * @param mixed $target
+ * @param string $method
+ * @return mixed
+ */
+ public function refresh($abstract, $target, $method)
+ {
+ return $this->rebinding($abstract, function ($app, $instance) use ($target, $method) {
+ $target->{$method}($instance);
+ });
+ }
+
+ /**
+ * Fire the "rebound" callbacks for the given abstract type.
+ *
+ * @param string $abstract
+ * @return void
+ */
+ protected function rebound($abstract)
+ {
+ $instance = $this->make($abstract);
+
+ foreach ($this->getReboundCallbacks($abstract) as $callback) {
+ call_user_func($callback, $this, $instance);
+ }
+ }
+
+ /**
+ * Get the rebound callbacks for a given type.
+ *
+ * @param string $abstract
+ * @return array
+ */
+ protected function getReboundCallbacks($abstract)
+ {
+ if (isset($this->reboundCallbacks[$abstract])) {
+ return $this->reboundCallbacks[$abstract];
+ }
+
+ return [];
+ }
+
+ /**
+ * Wrap the given closure such that its dependencies will be injected when executed.
+ *
+ * @param \Closure $callback
+ * @param array $parameters
+ * @return \Closure
+ */
+ public function wrap(Closure $callback, array $parameters = [])
+ {
+ return function () use ($callback, $parameters) {
+ return $this->call($callback, $parameters);
+ };
+ }
+
+ /**
+ * Call the given Closure / class@method and inject its dependencies.
+ *
+ * @param callable|string $callback
+ * @param array $parameters
+ * @param string|null $defaultMethod
+ * @return mixed
+ */
+ public function call($callback, array $parameters = [], $defaultMethod = null)
+ {
+ if ($this->isCallableWithAtSign($callback) || $defaultMethod) {
+ return $this->callClass($callback, $parameters, $defaultMethod);
+ }
+
+ $dependencies = $this->getMethodDependencies($callback, $parameters);
+
+ return call_user_func_array($callback, $dependencies);
+ }
+
+ /**
+ * Determine if the given string is in Class@method syntax.
+ *
+ * @param mixed $callback
+ * @return bool
+ */
+ protected function isCallableWithAtSign($callback)
+ {
+ if (! is_string($callback)) {
+ return false;
+ }
+
+ return strpos($callback, '@') !== false;
+ }
+
+ /**
+ * Get all dependencies for a given method.
+ *
+ * @param callable|string $callback
+ * @param array $parameters
+ * @return array
+ */
+ protected function getMethodDependencies($callback, array $parameters = [])
+ {
+ $dependencies = [];
+
+ foreach ($this->getCallReflector($callback)->getParameters() as $key => $parameter) {
+ $this->addDependencyForCallParameter($parameter, $parameters, $dependencies);
+ }
+
+ return array_merge($dependencies, $parameters);
+ }
+
+ /**
+ * Get the proper reflection instance for the given callback.
+ *
+ * @param callable|string $callback
+ * @return \ReflectionFunctionAbstract
+ */
+ protected function getCallReflector($callback)
+ {
+ if (is_string($callback) && strpos($callback, '::') !== false) {
+ $callback = explode('::', $callback);
+ }
+
+ if (is_array($callback)) {
+ return new ReflectionMethod($callback[0], $callback[1]);
+ }
+
+ return new ReflectionFunction($callback);
+ }
+
+ /**
+ * Get the dependency for the given call parameter.
+ *
+ * @param \ReflectionParameter $parameter
+ * @param array $parameters
+ * @param array $dependencies
+ * @return mixed
+ */
+ protected function addDependencyForCallParameter(ReflectionParameter $parameter, array &$parameters, &$dependencies)
+ {
+ if (array_key_exists($parameter->name, $parameters)) {
+ $dependencies[] = $parameters[$parameter->name];
+
+ unset($parameters[$parameter->name]);
+ } elseif ($parameter->getClass()) {
+ $dependencies[] = $this->make($parameter->getClass()->name);
+ } elseif ($parameter->isDefaultValueAvailable()) {
+ $dependencies[] = $parameter->getDefaultValue();
+ }
+ }
+
+ /**
+ * Call a string reference to a class using Class@method syntax.
+ *
+ * @param string $target
+ * @param array $parameters
+ * @param string|null $defaultMethod
+ * @return mixed
+ */
+ protected function callClass($target, array $parameters = [], $defaultMethod = null)
+ {
+ $segments = explode('@', $target);
+
+ // If the listener has an @ sign, we will assume it is being used to delimit
+ // the class name from the handle method name. This allows for handlers
+ // to run multiple handler methods in a single class for convenience.
+ $method = count($segments) == 2 ? $segments[1] : $defaultMethod;
+
+ if (is_null($method)) {
+ throw new InvalidArgumentException('Method not provided.');
+ }
+
+ return $this->call([$this->make($segments[0]), $method], $parameters);
+ }
+
+ /**
+ * Resolve the given type from the container.
+ *
+ * @param string $abstract
+ * @param array $parameters
+ * @return mixed
+ */
+ public function make($abstract, array $parameters = [])
+ {
+ $abstract = $this->getAlias($abstract);
+
+ // If an instance of the type is currently being managed as a singleton we'll
+ // just return an existing instance instead of instantiating new instances
+ // so the developer can keep using the same objects instance every time.
+ if (isset($this->instances[$abstract])) {
+ return $this->instances[$abstract];
+ }
+
+ $concrete = $this->getConcrete($abstract);
+
+ // We're ready to instantiate an instance of the concrete type registered for
+ // the binding. This will instantiate the types, as well as resolve any of
+ // its "nested" dependencies recursively until all have gotten resolved.
+ if ($this->isBuildable($concrete, $abstract)) {
+ $object = $this->build($concrete, $parameters);
+ } else {
+ $object = $this->make($concrete, $parameters);
+ }
+
+ // If we defined any extenders for this type, we'll need to spin through them
+ // and apply them to the object being built. This allows for the extension
+ // of services, such as changing configuration or decorating the object.
+ foreach ($this->getExtenders($abstract) as $extender) {
+ $object = $extender($object, $this);
+ }
+
+ // If the requested type is registered as a singleton we'll want to cache off
+ // the instances in "memory" so we can return it later without creating an
+ // entirely new instance of an object on each subsequent request for it.
+ if ($this->isShared($abstract)) {
+ $this->instances[$abstract] = $object;
+ }
+
+ $this->fireResolvingCallbacks($abstract, $object);
+
+ $this->resolved[$abstract] = true;
+
+ return $object;
+ }
+
+ /**
+ * Get the concrete type for a given abstract.
+ *
+ * @param string $abstract
+ * @return mixed $concrete
+ */
+ protected function getConcrete($abstract)
+ {
+ if (! is_null($concrete = $this->getContextualConcrete($abstract))) {
+ return $concrete;
+ }
+
+ // If we don't have a registered resolver or concrete for the type, we'll just
+ // assume each type is a concrete name and will attempt to resolve it as is
+ // since the container should be able to resolve concretes automatically.
+ if (! isset($this->bindings[$abstract])) {
+ if ($this->missingLeadingSlash($abstract) &&
+ isset($this->bindings['\\'.$abstract])) {
+ $abstract = '\\'.$abstract;
+ }
+
+ return $abstract;
+ }
+
+ return $this->bindings[$abstract]['concrete'];
+ }
+
+ /**
+ * Get the contextual concrete binding for the given abstract.
+ *
+ * @param string $abstract
+ * @return string|null
+ */
+ protected function getContextualConcrete($abstract)
+ {
+ if (isset($this->contextual[end($this->buildStack)][$abstract])) {
+ return $this->contextual[end($this->buildStack)][$abstract];
+ }
+ }
+
+ /**
+ * Determine if the given abstract has a leading slash.
+ *
+ * @param string $abstract
+ * @return bool
+ */
+ protected function missingLeadingSlash($abstract)
+ {
+ return is_string($abstract) && strpos($abstract, '\\') !== 0;
+ }
+
+ /**
+ * Get the extender callbacks for a given type.
+ *
+ * @param string $abstract
+ * @return array
+ */
+ protected function getExtenders($abstract)
+ {
+ if (isset($this->extenders[$abstract])) {
+ return $this->extenders[$abstract];
+ }
+
+ return [];
+ }
+
+ /**
+ * Instantiate a concrete instance of the given type.
+ *
+ * @param string $concrete
+ * @param array $parameters
+ * @return mixed
+ *
+ * @throws \Illuminate\Contracts\Container\BindingResolutionException
+ */
+ public function build($concrete, array $parameters = [])
+ {
+ // If the concrete type is actually a Closure, we will just execute it and
+ // hand back the results of the functions, which allows functions to be
+ // used as resolvers for more fine-tuned resolution of these objects.
+ if ($concrete instanceof Closure) {
+ return $concrete($this, $parameters);
+ }
+
+ $reflector = new ReflectionClass($concrete);
+
+ // If the type is not instantiable, the developer is attempting to resolve
+ // an abstract type such as an Interface of Abstract Class and there is
+ // no binding registered for the abstractions so we need to bail out.
+ if (! $reflector->isInstantiable()) {
+ $message = "Target [$concrete] is not instantiable.";
+
+ throw new BindingResolutionContractException($message);
+ }
+
+ $this->buildStack[] = $concrete;
+
+ $constructor = $reflector->getConstructor();
+
+ // If there are no constructors, that means there are no dependencies then
+ // we can just resolve the instances of the objects right away, without
+ // resolving any other types or dependencies out of these containers.
+ if (is_null($constructor)) {
+ array_pop($this->buildStack);
+
+ return new $concrete;
+ }
+
+ $dependencies = $constructor->getParameters();
+
+ // Once we have all the constructor's parameters we can create each of the
+ // dependency instances and then use the reflection instances to make a
+ // new instance of this class, injecting the created dependencies in.
+ $parameters = $this->keyParametersByArgument(
+ $dependencies, $parameters
+ );
+
+ $instances = $this->getDependencies(
+ $dependencies, $parameters
+ );
+
+ array_pop($this->buildStack);
+
+ return $reflector->newInstanceArgs($instances);
+ }
+
+ /**
+ * Resolve all of the dependencies from the ReflectionParameters.
+ *
+ * @param array $parameters
+ * @param array $primitives
+ * @return array
+ */
+ protected function getDependencies(array $parameters, array $primitives = [])
+ {
+ $dependencies = [];
+
+ foreach ($parameters as $parameter) {
+ $dependency = $parameter->getClass();
+
+ // If the class is null, it means the dependency is a string or some other
+ // primitive type which we can not resolve since it is not a class and
+ // we will just bomb out with an error since we have no-where to go.
+ if (array_key_exists($parameter->name, $primitives)) {
+ $dependencies[] = $primitives[$parameter->name];
+ } elseif (is_null($dependency)) {
+ $dependencies[] = $this->resolveNonClass($parameter);
+ } else {
+ $dependencies[] = $this->resolveClass($parameter);
+ }
+ }
+
+ return (array) $dependencies;
+ }
+
+ /**
+ * Resolve a non-class hinted dependency.
+ *
+ * @param \ReflectionParameter $parameter
+ * @return mixed
+ *
+ * @throws \Illuminate\Contracts\Container\BindingResolutionException
+ */
+ protected function resolveNonClass(ReflectionParameter $parameter)
+ {
+ if ($parameter->isDefaultValueAvailable()) {
+ return $parameter->getDefaultValue();
+ }
+
+ $message = "Unresolvable dependency resolving [$parameter] in class {$parameter->getDeclaringClass()->getName()}";
+
+ throw new BindingResolutionContractException($message);
+ }
+
+ /**
+ * Resolve a class based dependency from the container.
+ *
+ * @param \ReflectionParameter $parameter
+ * @return mixed
+ *
+ * @throws \Illuminate\Contracts\Container\BindingResolutionException
+ */
+ protected function resolveClass(ReflectionParameter $parameter)
+ {
+ try {
+ return $this->make($parameter->getClass()->name);
+ }
+
+ // If we can not resolve the class instance, we will check to see if the value
+ // is optional, and if it is we will return the optional parameter value as
+ // the value of the dependency, similarly to how we do this with scalars.
+ catch (BindingResolutionContractException $e) {
+ if ($parameter->isOptional()) {
+ return $parameter->getDefaultValue();
+ }
+
+ throw $e;
+ }
+ }
+
+ /**
+ * If extra parameters are passed by numeric ID, rekey them by argument name.
+ *
+ * @param array $dependencies
+ * @param array $parameters
+ * @return array
+ */
+ protected function keyParametersByArgument(array $dependencies, array $parameters)
+ {
+ foreach ($parameters as $key => $value) {
+ if (is_numeric($key)) {
+ unset($parameters[$key]);
+
+ $parameters[$dependencies[$key]->name] = $value;
+ }
+ }
+
+ return $parameters;
+ }
+
+ /**
+ * Register a new resolving callback.
+ *
+ * @param string $abstract
+ * @param \Closure|null $callback
+ * @return void
+ */
+ public function resolving($abstract, Closure $callback = null)
+ {
+ if ($callback === null && $abstract instanceof Closure) {
+ $this->resolvingCallback($abstract);
+ } else {
+ $this->resolvingCallbacks[$abstract][] = $callback;
+ }
+ }
+
+ /**
+ * Register a new after resolving callback for all types.
+ *
+ * @param string $abstract
+ * @param \Closure|null $callback
+ * @return void
+ */
+ public function afterResolving($abstract, Closure $callback = null)
+ {
+ if ($abstract instanceof Closure && $callback === null) {
+ $this->afterResolvingCallback($abstract);
+ } else {
+ $this->afterResolvingCallbacks[$abstract][] = $callback;
+ }
+ }
+
+ /**
+ * Register a new resolving callback by type of its first argument.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ protected function resolvingCallback(Closure $callback)
+ {
+ $abstract = $this->getFunctionHint($callback);
+
+ if ($abstract) {
+ $this->resolvingCallbacks[$abstract][] = $callback;
+ } else {
+ $this->globalResolvingCallbacks[] = $callback;
+ }
+ }
+
+ /**
+ * Register a new after resolving callback by type of its first argument.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ protected function afterResolvingCallback(Closure $callback)
+ {
+ $abstract = $this->getFunctionHint($callback);
+
+ if ($abstract) {
+ $this->afterResolvingCallbacks[$abstract][] = $callback;
+ } else {
+ $this->globalAfterResolvingCallbacks[] = $callback;
+ }
+ }
+
+ /**
+ * Get the type hint for this closure's first argument.
+ *
+ * @param \Closure $callback
+ * @return mixed
+ */
+ protected function getFunctionHint(Closure $callback)
+ {
+ $function = new ReflectionFunction($callback);
+
+ if ($function->getNumberOfParameters() == 0) {
+ return;
+ }
+
+ $expected = $function->getParameters()[0];
+
+ if (! $expected->getClass()) {
+ return;
+ }
+
+ return $expected->getClass()->name;
+ }
+
+ /**
+ * Fire all of the resolving callbacks.
+ *
+ * @param string $abstract
+ * @param mixed $object
+ * @return void
+ */
+ protected function fireResolvingCallbacks($abstract, $object)
+ {
+ $this->fireCallbackArray($object, $this->globalResolvingCallbacks);
+
+ $this->fireCallbackArray(
+ $object, $this->getCallbacksForType(
+ $abstract, $object, $this->resolvingCallbacks
+ )
+ );
+
+ $this->fireCallbackArray($object, $this->globalAfterResolvingCallbacks);
+
+ $this->fireCallbackArray(
+ $object, $this->getCallbacksForType(
+ $abstract, $object, $this->afterResolvingCallbacks
+ )
+ );
+ }
+
+ /**
+ * Get all callbacks for a given type.
+ *
+ * @param string $abstract
+ * @param object $object
+ * @param array $callbacksPerType
+ *
+ * @return array
+ */
+ protected function getCallbacksForType($abstract, $object, array $callbacksPerType)
+ {
+ $results = [];
+
+ foreach ($callbacksPerType as $type => $callbacks) {
+ if ($type === $abstract || $object instanceof $type) {
+ $results = array_merge($results, $callbacks);
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Fire an array of callbacks with an object.
+ *
+ * @param mixed $object
+ * @param array $callbacks
+ * @return void
+ */
+ protected function fireCallbackArray($object, array $callbacks)
+ {
+ foreach ($callbacks as $callback) {
+ $callback($object, $this);
+ }
+ }
+
+ /**
+ * Determine if a given type is shared.
+ *
+ * @param string $abstract
+ * @return bool
+ */
+ public function isShared($abstract)
+ {
+ if (isset($this->bindings[$abstract]['shared'])) {
+ $shared = $this->bindings[$abstract]['shared'];
+ } else {
+ $shared = false;
+ }
+
+ return isset($this->instances[$abstract]) || $shared === true;
+ }
+
+ /**
+ * Determine if the given concrete is buildable.
+ *
+ * @param mixed $concrete
+ * @param string $abstract
+ * @return bool
+ */
+ protected function isBuildable($concrete, $abstract)
+ {
+ return $concrete === $abstract || $concrete instanceof Closure;
+ }
+
+ /**
+ * Get the alias for an abstract if available.
+ *
+ * @param string $abstract
+ * @return string
+ */
+ protected function getAlias($abstract)
+ {
+ if (! isset($this->aliases[$abstract])) {
+ return $abstract;
+ }
+
+ return $this->getAlias($this->aliases[$abstract]);
+ }
+
+ /**
+ * Get the container's bindings.
+ *
+ * @return array
+ */
+ public function getBindings()
+ {
+ return $this->bindings;
+ }
+
+ /**
+ * Drop all of the stale instances and aliases.
+ *
+ * @param string $abstract
+ * @return void
+ */
+ protected function dropStaleInstances($abstract)
+ {
+ unset($this->instances[$abstract], $this->aliases[$abstract]);
+ }
+
+ /**
+ * Remove a resolved instance from the instance cache.
+ *
+ * @param string $abstract
+ * @return void
+ */
+ public function forgetInstance($abstract)
+ {
+ unset($this->instances[$abstract]);
+ }
+
+ /**
+ * Clear all of the instances from the container.
+ *
+ * @return void
+ */
+ public function forgetInstances()
+ {
+ $this->instances = [];
+ }
+
+ /**
+ * Flush the container of all bindings and resolved instances.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->aliases = [];
+ $this->resolved = [];
+ $this->bindings = [];
+ $this->instances = [];
+ }
+
+ /**
+ * Set the globally available instance of the container.
+ *
+ * @return static
+ */
+ public static function getInstance()
+ {
+ return static::$instance;
+ }
+
+ /**
+ * Set the shared instance of the container.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public static function setInstance(ContainerContract $container)
+ {
+ static::$instance = $container;
+ }
+
+ /**
+ * Determine if a given offset exists.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ return $this->bound($key);
+ }
+
+ /**
+ * Get the value at a given offset.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function offsetGet($key)
+ {
+ return $this->make($key);
+ }
+
+ /**
+ * Set the value at a given offset.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($key, $value)
+ {
+ // If the value is not a Closure, we will make it one. This simply gives
+ // more "drop-in" replacement functionality for the Pimple which this
+ // container's simplest functions are base modeled and built after.
+ if (! $value instanceof Closure) {
+ $value = function () use ($value) {
+ return $value;
+ };
+ }
+
+ $this->bind($key, $value);
+ }
+
+ /**
+ * Unset the value at a given offset.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function offsetUnset($key)
+ {
+ unset($this->bindings[$key], $this->instances[$key], $this->resolved[$key]);
+ }
+
+ /**
+ * Dynamically access container services.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function __get($key)
+ {
+ return $this[$key];
+ }
+
+ /**
+ * Dynamically set container services.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ $this[$key] = $value;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php b/application/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php
index c96d56b..fc5cd61 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php
@@ -1,58 +1,66 @@
-concrete = $concrete;
- $this->container = $container;
- }
-
- /**
- * Define the abstract target that depends on the context.
- *
- * @param string $abstract
- * @return $this
- */
- public function needs($abstract)
- {
- $this->needs = $abstract;
-
- return $this;
- }
-
- /**
- * Define the implementation for the contextual binding.
- *
- * @param \Closure|string $implementation
- * @return void
- */
- public function give($implementation)
- {
- $this->container->addContextualBinding($this->concrete, $this->needs, $implementation);
- }
+class ContextualBindingBuilder implements ContextualBindingBuilderContract
+{
+ /**
+ * The underlying container instance.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The concrete instance.
+ *
+ * @var string
+ */
+ protected $concrete;
+
+ /**
+ * The abstract target.
+ *
+ * @var string
+ */
+ protected $needs;
+
+ /**
+ * Create a new contextual binding builder.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @param string $concrete
+ * @return void
+ */
+ public function __construct(Container $container, $concrete)
+ {
+ $this->concrete = $concrete;
+ $this->container = $container;
+ }
+
+ /**
+ * Define the abstract target that depends on the context.
+ *
+ * @param string $abstract
+ * @return $this
+ */
+ public function needs($abstract)
+ {
+ $this->needs = $abstract;
+
+ return $this;
+ }
+ /**
+ * Define the implementation for the contextual binding.
+ *
+ * @param \Closure|string $implementation
+ * @return void
+ */
+ public function give($implementation)
+ {
+ $this->container->addContextualBinding($this->concrete, $this->needs, $implementation);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Container/composer.json b/application/vendor/laravel/framework/src/Illuminate/Container/composer.json
index 3ebb17d..567d018 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Container/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Container/composer.json
@@ -14,8 +14,8 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*"
},
"autoload": {
"psr-4": {
@@ -24,7 +24,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Authorizable.php b/application/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Authorizable.php
new file mode 100644
index 0000000..2f9657c
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Authorizable.php
@@ -0,0 +1,15 @@
+id = $id;
- $this->class = $class;
- }
+ /**
+ * The unique identifier of the model.
+ *
+ * @var mixed
+ */
+ public $id;
+ /**
+ * Create a new model identifier.
+ *
+ * @param string $class
+ * @param mixed $id
+ * @return void
+ */
+ public function __construct($class, $id)
+ {
+ $this->id = $id;
+ $this->class = $class;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php b/application/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php
index d85fff5..e3f18a5 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php
@@ -1,33 +1,34 @@
-provider = $provider;
- }
+class ValidationException extends RuntimeException
+{
+ /**
+ * The message provider implementation.
+ *
+ * @var \Illuminate\Contracts\Support\MessageProvider
+ */
+ protected $provider;
- /**
- * Get the validation error message provider.
- *
- * @return \Illuminate\Contracts\Support\MessageProvider
- */
- public function errors()
- {
- return $this->provider->getMessageBag();
- }
+ /**
+ * Create a new validation exception instance.
+ *
+ * @param \Illuminate\Contracts\Support\MessageProvider $provider
+ * @return void
+ */
+ public function __construct(MessageProvider $provider)
+ {
+ $this->provider = $provider;
+ }
- /**
- * Get the validation error message provider.
- *
- * @return \Illuminate\Contracts\Support\MessageProvider
- */
- public function getMessageProvider()
- {
- return $this->provider;
- }
+ /**
+ * Get the validation error message provider.
+ *
+ * @return \Illuminate\Contracts\Support\MessageBag
+ */
+ public function errors()
+ {
+ return $this->provider->getMessageBag();
+ }
+ /**
+ * Get the validation error message provider.
+ *
+ * @return \Illuminate\Contracts\Support\MessageProvider
+ */
+ public function getMessageProvider()
+ {
+ return $this->provider;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php b/application/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php
index 8cc736f..9cf68c7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php
@@ -1,39 +1,40 @@
-=5.4.0"
+ "php": ">=5.5.9"
},
"autoload": {
"psr-4": {
@@ -23,7 +23,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php b/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php
index 2820367..ec7540a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php
@@ -1,168 +1,177 @@
-getPathAndDomain($path, $domain);
-
- $time = ($minutes == 0) ? 0 : time() + ($minutes * 60);
-
- return new Cookie($name, $value, $time, $path, $domain, $secure, $httpOnly);
- }
-
- /**
- * Create a cookie that lasts "forever" (five years).
- *
- * @param string $name
- * @param string $value
- * @param string $path
- * @param string $domain
- * @param bool $secure
- * @param bool $httpOnly
- * @return \Symfony\Component\HttpFoundation\Cookie
- */
- public function forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true)
- {
- return $this->make($name, $value, 2628000, $path, $domain, $secure, $httpOnly);
- }
-
- /**
- * Expire the given cookie.
- *
- * @param string $name
- * @param string $path
- * @param string $domain
- * @return \Symfony\Component\HttpFoundation\Cookie
- */
- public function forget($name, $path = null, $domain = null)
- {
- return $this->make($name, null, -2628000, $path, $domain);
- }
-
- /**
- * 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.
- *
- * @param string $key
- * @param mixed $default
- * @return \Symfony\Component\HttpFoundation\Cookie
- */
- public function queued($key, $default = null)
- {
- return array_get($this->queued, $key, $default);
- }
-
- /**
- * Queue a cookie to send with the next response.
- *
- * @param mixed
- * @return void
- */
- public function queue()
- {
- if (head(func_get_args()) instanceof Cookie)
- {
- $cookie = head(func_get_args());
- }
- else
- {
- $cookie = call_user_func_array(array($this, 'make'), func_get_args());
- }
-
- $this->queued[$cookie->getName()] = $cookie;
- }
-
- /**
- * Remove a cookie from the queue.
- *
- * @param string $name
- */
- public function unqueue($name)
- {
- unset($this->queued[$name]);
- }
-
- /**
- * Get the path and domain, or the default values.
- *
- * @param string $path
- * @param string $domain
- * @return array
- */
- protected function getPathAndDomain($path, $domain)
- {
- return array($path ?: $this->path, $domain ?: $this->domain);
- }
-
- /**
- * Set the default path and domain for the jar.
- *
- * @param string $path
- * @param string $domain
- * @return $this
- */
- public function setDefaultPathAndDomain($path, $domain)
- {
- list($this->path, $this->domain) = array($path, $domain);
-
- return $this;
- }
-
- /**
- * Get the cookies which have been queued for the next request.
- *
- * @return array
- */
- public function getQueuedCookies()
- {
- return $this->queued;
- }
-
+class CookieJar implements JarContract
+{
+ /**
+ * The default path (if specified).
+ *
+ * @var string
+ */
+ protected $path = '/';
+
+ /**
+ * The default domain (if specified).
+ *
+ * @var string
+ */
+ protected $domain = null;
+
+ /**
+ * The default secure setting (defaults to false).
+ *
+ * @var bool
+ */
+ protected $secure = false;
+
+ /**
+ * All of the cookies queued for sending.
+ *
+ * @var array
+ */
+ protected $queued = [];
+
+ /**
+ * Create a new cookie instance.
+ *
+ * @param string $name
+ * @param string $value
+ * @param int $minutes
+ * @param string $path
+ * @param string $domain
+ * @param bool $secure
+ * @param bool $httpOnly
+ * @return \Symfony\Component\HttpFoundation\Cookie
+ */
+ public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true)
+ {
+ list($path, $domain, $secure) = $this->getPathAndDomain($path, $domain, $secure);
+
+ $time = ($minutes == 0) ? 0 : time() + ($minutes * 60);
+
+ return new Cookie($name, $value, $time, $path, $domain, $secure, $httpOnly);
+ }
+
+ /**
+ * Create a cookie that lasts "forever" (five years).
+ *
+ * @param string $name
+ * @param string $value
+ * @param string $path
+ * @param string $domain
+ * @param bool $secure
+ * @param bool $httpOnly
+ * @return \Symfony\Component\HttpFoundation\Cookie
+ */
+ public function forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true)
+ {
+ return $this->make($name, $value, 2628000, $path, $domain, $secure, $httpOnly);
+ }
+
+ /**
+ * Expire the given cookie.
+ *
+ * @param string $name
+ * @param string $path
+ * @param string $domain
+ * @return \Symfony\Component\HttpFoundation\Cookie
+ */
+ public function forget($name, $path = null, $domain = null)
+ {
+ return $this->make($name, null, -2628000, $path, $domain);
+ }
+
+ /**
+ * 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.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return \Symfony\Component\HttpFoundation\Cookie
+ */
+ public function queued($key, $default = null)
+ {
+ return Arr::get($this->queued, $key, $default);
+ }
+
+ /**
+ * Queue a cookie to send with the next response.
+ *
+ * @param mixed
+ * @return void
+ */
+ public function queue()
+ {
+ if (head(func_get_args()) instanceof Cookie) {
+ $cookie = head(func_get_args());
+ } else {
+ $cookie = call_user_func_array([$this, 'make'], func_get_args());
+ }
+
+ $this->queued[$cookie->getName()] = $cookie;
+ }
+
+ /**
+ * Remove a cookie from the queue.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function unqueue($name)
+ {
+ unset($this->queued[$name]);
+ }
+
+ /**
+ * Get the path and domain, or the default values.
+ *
+ * @param string $path
+ * @param string $domain
+ * @param bool $secure
+ * @return array
+ */
+ protected function getPathAndDomain($path, $domain, $secure = false)
+ {
+ return [$path ?: $this->path, $domain ?: $this->domain, $secure ?: $this->secure];
+ }
+
+ /**
+ * Set the default path and domain for the jar.
+ *
+ * @param string $path
+ * @param string $domain
+ * @param bool $secure
+ * @return $this
+ */
+ public function setDefaultPathAndDomain($path, $domain, $secure = false)
+ {
+ list($this->path, $this->domain, $this->secure) = [$path, $domain, $secure];
+
+ return $this;
+ }
+
+ /**
+ * Get the cookies which have been queued for the next request.
+ *
+ * @return array
+ */
+ public function getQueuedCookies()
+ {
+ return $this->queued;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php
index 74589ce..cd04f12 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php
@@ -1,22 +1,22 @@
-app->singleton('cookie', function($app)
- {
- $config = $app['config']['session'];
+use Illuminate\Support\ServiceProvider;
- return (new CookieJar)->setDefaultPathAndDomain($config['path'], $config['domain']);
- });
- }
+class CookieServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('cookie', function ($app) {
+ $config = $app['config']['session'];
+ return (new CookieJar)->setDefaultPathAndDomain($config['path'], $config['domain'], $config['secure']);
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php b/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php
index 31b362b..4caa574 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php
@@ -1,46 +1,45 @@
-cookies = $cookies;
- }
-
- /**
- * Handle an incoming request.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @return mixed
- */
- public function handle($request, Closure $next)
- {
- $response = $next($request);
-
- foreach ($this->cookies->getQueuedCookies() as $cookie)
- {
- $response->headers->setCookie($cookie);
- }
-
- return $response;
- }
-
+class AddQueuedCookiesToResponse
+{
+ /**
+ * The cookie jar instance.
+ *
+ * @var \Illuminate\Contracts\Cookie\QueueingFactory
+ */
+ protected $cookies;
+
+ /**
+ * Create a new CookieQueue instance.
+ *
+ * @param \Illuminate\Contracts\Cookie\QueueingFactory $cookies
+ * @return void
+ */
+ public function __construct(CookieJar $cookies)
+ {
+ $this->cookies = $cookies;
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ $response = $next($request);
+
+ foreach ($this->cookies->getQueuedCookies() as $cookie) {
+ $response->headers->setCookie($cookie);
+ }
+
+ return $response;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php b/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php
index b291b43..c30d38c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php
@@ -1,130 +1,163 @@
-encrypter = $encrypter;
- }
-
- /**
- * Handle an incoming request.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @return mixed
- */
- public function handle($request, Closure $next)
- {
- return $this->encrypt($next($this->decrypt($request)));
- }
-
- /**
- * Decrypt the cookies on the request.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @return \Symfony\Component\HttpFoundation\Request
- */
- protected function decrypt(Request $request)
- {
- foreach ($request->cookies as $key => $c)
- {
- try
- {
- $request->cookies->set($key, $this->decryptCookie($c));
- }
- catch (DecryptException $e)
- {
- $request->cookies->set($key, null);
- }
- }
-
- return $request;
- }
-
- /**
- * Decrypt the given cookie and return the value.
- *
- * @param string|array $cookie
- * @return string|array
- */
- protected function decryptCookie($cookie)
- {
- return is_array($cookie)
- ? $this->decryptArray($cookie)
- : $this->encrypter->decrypt($cookie);
- }
-
- /**
- * Decrypt an array based cookie.
- *
- * @param array $cookie
- * @return array
- */
- protected function decryptArray(array $cookie)
- {
- $decrypted = array();
-
- foreach ($cookie as $key => $value)
- {
- $decrypted[$key] = $this->encrypter->decrypt($value);
- }
-
- return $decrypted;
- }
-
- /**
- * Encrypt the cookies on an outgoing response.
- *
- * @param \Symfony\Component\HttpFoundation\Response $response
- * @return \Symfony\Component\HttpFoundation\Response
- */
- protected function encrypt(Response $response)
- {
- foreach ($response->headers->getCookies() as $key => $cookie)
- {
- $response->headers->setCookie($this->duplicate(
- $cookie, $this->encrypter->encrypt($cookie->getValue())
- ));
- }
-
- return $response;
- }
-
- /**
- * Duplicate a cookie with a new value.
- *
- * @param \Symfony\Component\HttpFoundation\Cookie $c
- * @param mixed $value
- * @return \Symfony\Component\HttpFoundation\Cookie
- */
- protected function duplicate(Cookie $c, $value)
- {
- return new Cookie(
- $c->getName(), $value, $c->getExpiresTime(), $c->getPath(),
- $c->getDomain(), $c->isSecure(), $c->isHttpOnly()
- );
- }
+class EncryptCookies
+{
+ /**
+ * The encrypter instance.
+ *
+ * @var \Illuminate\Contracts\Encryption\Encrypter
+ */
+ protected $encrypter;
+
+ /**
+ * The names of the cookies that should not be encrypted.
+ *
+ * @var array
+ */
+ protected $except = [];
+
+ /**
+ * Create a new CookieGuard instance.
+ *
+ * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
+ * @return void
+ */
+ public function __construct(EncrypterContract $encrypter)
+ {
+ $this->encrypter = $encrypter;
+ }
+
+ /**
+ * Disable encryption for the given cookie name(s).
+ *
+ * @param string|array $cookieName
+ * @return void
+ */
+ public function disableFor($cookieName)
+ {
+ $this->except = array_merge($this->except, (array) $cookieName);
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ return $this->encrypt($next($this->decrypt($request)));
+ }
+
+ /**
+ * Decrypt the cookies on the request.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @return \Symfony\Component\HttpFoundation\Request
+ */
+ protected function decrypt(Request $request)
+ {
+ foreach ($request->cookies as $key => $c) {
+ if ($this->isDisabled($key)) {
+ continue;
+ }
+
+ try {
+ $request->cookies->set($key, $this->decryptCookie($c));
+ } catch (DecryptException $e) {
+ $request->cookies->set($key, null);
+ }
+ }
+
+ return $request;
+ }
+
+ /**
+ * Decrypt the given cookie and return the value.
+ *
+ * @param string|array $cookie
+ * @return string|array
+ */
+ protected function decryptCookie($cookie)
+ {
+ return is_array($cookie)
+ ? $this->decryptArray($cookie)
+ : $this->encrypter->decrypt($cookie);
+ }
+
+ /**
+ * Decrypt an array based cookie.
+ *
+ * @param array $cookie
+ * @return array
+ */
+ protected function decryptArray(array $cookie)
+ {
+ $decrypted = [];
+
+ foreach ($cookie as $key => $value) {
+ if (is_string($value)) {
+ $decrypted[$key] = $this->encrypter->decrypt($value);
+ }
+ }
+
+ return $decrypted;
+ }
+
+ /**
+ * Encrypt the cookies on an outgoing response.
+ *
+ * @param \Symfony\Component\HttpFoundation\Response $response
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ protected function encrypt(Response $response)
+ {
+ foreach ($response->headers->getCookies() as $cookie) {
+ if ($this->isDisabled($cookie->getName())) {
+ continue;
+ }
+
+ $response->headers->setCookie($this->duplicate(
+ $cookie, $this->encrypter->encrypt($cookie->getValue())
+ ));
+ }
+
+ return $response;
+ }
+
+ /**
+ * Duplicate a cookie with a new value.
+ *
+ * @param \Symfony\Component\HttpFoundation\Cookie $c
+ * @param mixed $value
+ * @return \Symfony\Component\HttpFoundation\Cookie
+ */
+ protected function duplicate(Cookie $c, $value)
+ {
+ return new Cookie(
+ $c->getName(), $value, $c->getExpiresTime(), $c->getPath(),
+ $c->getDomain(), $c->isSecure(), $c->isHttpOnly()
+ );
+ }
+ /**
+ * Determine whether encryption has been disabled for the given cookie.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function isDisabled($name)
+ {
+ return in_array($name, $this->except);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cookie/composer.json b/application/vendor/laravel/framework/src/Illuminate/Cookie/composer.json
index 22101e0..a3c3312 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cookie/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Cookie/composer.json
@@ -14,11 +14,11 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/http-kernel": "2.6.*",
- "symfony/http-foundation": "2.6.*"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/http-kernel": "2.7.*",
+ "symfony/http-foundation": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php b/application/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php
index aa272fa..1a14401 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php
@@ -1,202 +1,201 @@
-setupContainer($container ?: new Container);
-
- // Once we have the container setup, we will setup the default configuration
- // options in the container "config" binding. This will make the database
- // manager behave correctly since all the correct binding are in place.
- $this->setupDefaultConfiguration();
-
- $this->setupManager();
- }
-
- /**
- * Setup the default database configuration options.
- *
- * @return void
- */
- protected function setupDefaultConfiguration()
- {
- $this->container['config']['database.fetch'] = PDO::FETCH_ASSOC;
-
- $this->container['config']['database.default'] = 'default';
- }
-
- /**
- * Build the database manager instance.
- *
- * @return void
- */
- protected function setupManager()
- {
- $factory = new ConnectionFactory($this->container);
-
- $this->manager = new DatabaseManager($this->container, $factory);
- }
-
- /**
- * Get a connection instance from the global manager.
- *
- * @param string $connection
- * @return \Illuminate\Database\Connection
- */
- public static function connection($connection = null)
- {
- return static::$instance->getConnection($connection);
- }
-
- /**
- * Get a fluent query builder instance.
- *
- * @param string $table
- * @param string $connection
- * @return \Illuminate\Database\Query\Builder
- */
- public static function table($table, $connection = null)
- {
- return static::$instance->connection($connection)->table($table);
- }
-
- /**
- * Get a schema builder instance.
- *
- * @param string $connection
- * @return \Illuminate\Database\Schema\Builder
- */
- public static function schema($connection = null)
- {
- return static::$instance->connection($connection)->getSchemaBuilder();
- }
-
- /**
- * Get a registered connection instance.
- *
- * @param string $name
- * @return \Illuminate\Database\Connection
- */
- public function getConnection($name = null)
- {
- return $this->manager->connection($name);
- }
-
- /**
- * Register a connection with the manager.
- *
- * @param array $config
- * @param string $name
- * @return void
- */
- public function addConnection(array $config, $name = 'default')
- {
- $connections = $this->container['config']['database.connections'];
-
- $connections[$name] = $config;
-
- $this->container['config']['database.connections'] = $connections;
- }
-
- /**
- * Bootstrap Eloquent so it is ready for usage.
- *
- * @return void
- */
- public function bootEloquent()
- {
- Eloquent::setConnectionResolver($this->manager);
-
- // If we have an event dispatcher instance, we will go ahead and register it
- // with the Eloquent ORM, allowing for model callbacks while creating and
- // updating "model" instances; however, if it not necessary to operate.
- if ($dispatcher = $this->getEventDispatcher())
- {
- Eloquent::setEventDispatcher($dispatcher);
- }
- }
-
- /**
- * Set the fetch mode for the database connections.
- *
- * @param int $fetchMode
- * @return $this
- */
- public function setFetchMode($fetchMode)
- {
- $this->container['config']['database.fetch'] = $fetchMode;
-
- return $this;
- }
-
- /**
- * Get the database manager instance.
- *
- * @return \Illuminate\Database\DatabaseManager
- */
- public function getDatabaseManager()
- {
- return $this->manager;
- }
-
- /**
- * Get the current event dispatcher instance.
- *
- * @return \Illuminate\Contracts\Events\Dispatcher
- */
- public function getEventDispatcher()
- {
- if ($this->container->bound('events'))
- {
- return $this->container['events'];
- }
- }
-
- /**
- * Set the event dispatcher instance to be used by connections.
- *
- * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
- * @return void
- */
- public function setEventDispatcher(Dispatcher $dispatcher)
- {
- $this->container->instance('events', $dispatcher);
- }
-
- /**
- * Dynamically pass methods to the default connection.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public static function __callStatic($method, $parameters)
- {
- return call_user_func_array(array(static::connection(), $method), $parameters);
- }
+class Manager
+{
+ use CapsuleManagerTrait;
+
+ /**
+ * The database manager instance.
+ *
+ * @var \Illuminate\Database\DatabaseManager
+ */
+ protected $manager;
+
+ /**
+ * Create a new database capsule manager.
+ *
+ * @param \Illuminate\Container\Container|null $container
+ * @return void
+ */
+ public function __construct(Container $container = null)
+ {
+ $this->setupContainer($container ?: new Container);
+
+ // Once we have the container setup, we will setup the default configuration
+ // options in the container "config" binding. This will make the database
+ // manager behave correctly since all the correct binding are in place.
+ $this->setupDefaultConfiguration();
+
+ $this->setupManager();
+ }
+
+ /**
+ * Setup the default database configuration options.
+ *
+ * @return void
+ */
+ protected function setupDefaultConfiguration()
+ {
+ $this->container['config']['database.fetch'] = PDO::FETCH_OBJ;
+
+ $this->container['config']['database.default'] = 'default';
+ }
+
+ /**
+ * Build the database manager instance.
+ *
+ * @return void
+ */
+ protected function setupManager()
+ {
+ $factory = new ConnectionFactory($this->container);
+
+ $this->manager = new DatabaseManager($this->container, $factory);
+ }
+
+ /**
+ * Get a connection instance from the global manager.
+ *
+ * @param string $connection
+ * @return \Illuminate\Database\Connection
+ */
+ public static function connection($connection = null)
+ {
+ return static::$instance->getConnection($connection);
+ }
+
+ /**
+ * Get a fluent query builder instance.
+ *
+ * @param string $table
+ * @param string $connection
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public static function table($table, $connection = null)
+ {
+ return static::$instance->connection($connection)->table($table);
+ }
+
+ /**
+ * Get a schema builder instance.
+ *
+ * @param string $connection
+ * @return \Illuminate\Database\Schema\Builder
+ */
+ public static function schema($connection = null)
+ {
+ return static::$instance->connection($connection)->getSchemaBuilder();
+ }
+
+ /**
+ * Get a registered connection instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\Connection
+ */
+ public function getConnection($name = null)
+ {
+ return $this->manager->connection($name);
+ }
+
+ /**
+ * Register a connection with the manager.
+ *
+ * @param array $config
+ * @param string $name
+ * @return void
+ */
+ public function addConnection(array $config, $name = 'default')
+ {
+ $connections = $this->container['config']['database.connections'];
+
+ $connections[$name] = $config;
+
+ $this->container['config']['database.connections'] = $connections;
+ }
+
+ /**
+ * Bootstrap Eloquent so it is ready for usage.
+ *
+ * @return void
+ */
+ public function bootEloquent()
+ {
+ Eloquent::setConnectionResolver($this->manager);
+
+ // If we have an event dispatcher instance, we will go ahead and register it
+ // with the Eloquent ORM, allowing for model callbacks while creating and
+ // updating "model" instances; however, if it not necessary to operate.
+ if ($dispatcher = $this->getEventDispatcher()) {
+ Eloquent::setEventDispatcher($dispatcher);
+ }
+ }
+
+ /**
+ * Set the fetch mode for the database connections.
+ *
+ * @param int $fetchMode
+ * @return $this
+ */
+ public function setFetchMode($fetchMode)
+ {
+ $this->container['config']['database.fetch'] = $fetchMode;
+
+ return $this;
+ }
+
+ /**
+ * Get the database manager instance.
+ *
+ * @return \Illuminate\Database\DatabaseManager
+ */
+ public function getDatabaseManager()
+ {
+ return $this->manager;
+ }
+
+ /**
+ * Get the current event dispatcher instance.
+ *
+ * @return \Illuminate\Contracts\Events\Dispatcher|null
+ */
+ public function getEventDispatcher()
+ {
+ if ($this->container->bound('events')) {
+ return $this->container['events'];
+ }
+ }
+
+ /**
+ * Set the event dispatcher instance to be used by connections.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
+ * @return void
+ */
+ public function setEventDispatcher(Dispatcher $dispatcher)
+ {
+ $this->container->instance('events', $dispatcher);
+ }
+
+ /**
+ * Dynamically pass methods to the default connection.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public static function __callStatic($method, $parameters)
+ {
+ return call_user_func_array([static::connection(), $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Connection.php b/application/vendor/laravel/framework/src/Illuminate/Database/Connection.php
index 42d86ea..cc46b2e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Connection.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Connection.php
@@ -1,1126 +1,1165 @@
-pdo = $pdo;
-
- // First we will setup the default properties. We keep track of the DB
- // name we are connected to since it is needed when some reflective
- // type commands are run such as checking whether a table exists.
- $this->database = $database;
-
- $this->tablePrefix = $tablePrefix;
-
- $this->config = $config;
-
- // We need to initialize a query grammar and the query post processors
- // which are both very important parts of the database abstractions
- // so we initialize these to their default values while starting.
- $this->useDefaultQueryGrammar();
-
- $this->useDefaultPostProcessor();
- }
-
- /**
- * Set the query grammar to the default implementation.
- *
- * @return void
- */
- public function useDefaultQueryGrammar()
- {
- $this->queryGrammar = $this->getDefaultQueryGrammar();
- }
-
- /**
- * Get the default query grammar instance.
- *
- * @return \Illuminate\Database\Query\Grammars\Grammar
- */
- protected function getDefaultQueryGrammar()
- {
- return new QueryGrammar;
- }
-
- /**
- * Set the schema grammar to the default implementation.
- *
- * @return void
- */
- public function useDefaultSchemaGrammar()
- {
- $this->schemaGrammar = $this->getDefaultSchemaGrammar();
- }
-
- /**
- * Get the default schema grammar instance.
- *
- * @return \Illuminate\Database\Schema\Grammars\Grammar
- */
- protected function getDefaultSchemaGrammar()
- {
- //
- }
-
- /**
- * Set the query post processor to the default implementation.
- *
- * @return void
- */
- public function useDefaultPostProcessor()
- {
- $this->postProcessor = $this->getDefaultPostProcessor();
- }
-
- /**
- * Get the default post processor instance.
- *
- * @return \Illuminate\Database\Query\Processors\Processor
- */
- protected function getDefaultPostProcessor()
- {
- return new Query\Processors\Processor;
- }
-
- /**
- * Get a schema builder instance for the connection.
- *
- * @return \Illuminate\Database\Schema\Builder
- */
- public function getSchemaBuilder()
- {
- if (is_null($this->schemaGrammar)) { $this->useDefaultSchemaGrammar(); }
-
- return new Schema\Builder($this);
- }
-
- /**
- * Begin a fluent query against a database table.
- *
- * @param string $table
- * @return \Illuminate\Database\Query\Builder
- */
- public function table($table)
- {
- $processor = $this->getPostProcessor();
-
- $query = new Query\Builder($this, $this->getQueryGrammar(), $processor);
-
- return $query->from($table);
- }
-
- /**
- * Get a new raw query expression.
- *
- * @param mixed $value
- * @return \Illuminate\Database\Query\Expression
- */
- public function raw($value)
- {
- return new Query\Expression($value);
- }
-
- /**
- * Run a select statement and return a single result.
- *
- * @param string $query
- * @param array $bindings
- * @return mixed
- */
- public function selectOne($query, $bindings = array())
- {
- $records = $this->select($query, $bindings);
-
- return count($records) > 0 ? reset($records) : null;
- }
-
- /**
- * Run a select statement against the database.
- *
- * @param string $query
- * @param array $bindings
- * @return array
- */
- public function selectFromWriteConnection($query, $bindings = array())
- {
- return $this->select($query, $bindings, false);
- }
-
- /**
- * Run a select statement against the database.
- *
- * @param string $query
- * @param array $bindings
- * @param bool $useReadPdo
- * @return array
- */
- public function select($query, $bindings = array(), $useReadPdo = true)
- {
- return $this->run($query, $bindings, function($me, $query, $bindings) use ($useReadPdo)
- {
- if ($me->pretending()) return array();
-
- // For select statements, we'll simply execute the query and return an array
- // of the database result set. Each element in the array will be a single
- // row from the database table, and will either be an array or objects.
- $statement = $this->getPdoForSelect($useReadPdo)->prepare($query);
-
- $statement->execute($me->prepareBindings($bindings));
-
- return $statement->fetchAll($me->getFetchMode());
- });
- }
-
- /**
- * Get the PDO connection to use for a select query.
- *
- * @param bool $useReadPdo
- * @return \PDO
- */
- protected function getPdoForSelect($useReadPdo = true)
- {
- return $useReadPdo ? $this->getReadPdo() : $this->getPdo();
- }
-
- /**
- * Run an insert statement against the database.
- *
- * @param string $query
- * @param array $bindings
- * @return bool
- */
- public function insert($query, $bindings = array())
- {
- return $this->statement($query, $bindings);
- }
-
- /**
- * Run an update statement against the database.
- *
- * @param string $query
- * @param array $bindings
- * @return int
- */
- public function update($query, $bindings = array())
- {
- return $this->affectingStatement($query, $bindings);
- }
-
- /**
- * Run a delete statement against the database.
- *
- * @param string $query
- * @param array $bindings
- * @return int
- */
- public function delete($query, $bindings = array())
- {
- return $this->affectingStatement($query, $bindings);
- }
-
- /**
- * Execute an SQL statement and return the boolean result.
- *
- * @param string $query
- * @param array $bindings
- * @return bool
- */
- public function statement($query, $bindings = array())
- {
- return $this->run($query, $bindings, function($me, $query, $bindings)
- {
- if ($me->pretending()) return true;
-
- $bindings = $me->prepareBindings($bindings);
-
- return $me->getPdo()->prepare($query)->execute($bindings);
- });
- }
-
- /**
- * Run an SQL statement and get the number of rows affected.
- *
- * @param string $query
- * @param array $bindings
- * @return int
- */
- public function affectingStatement($query, $bindings = array())
- {
- return $this->run($query, $bindings, function($me, $query, $bindings)
- {
- if ($me->pretending()) return 0;
-
- // For update or delete statements, we want to get the number of rows affected
- // by the statement and return that back to the developer. We'll first need
- // to execute the statement and then we'll use PDO to fetch the affected.
- $statement = $me->getPdo()->prepare($query);
-
- $statement->execute($me->prepareBindings($bindings));
-
- return $statement->rowCount();
- });
- }
-
- /**
- * Run a raw, unprepared query against the PDO connection.
- *
- * @param string $query
- * @return bool
- */
- public function unprepared($query)
- {
- return $this->run($query, array(), function($me, $query)
- {
- if ($me->pretending()) return true;
-
- return (bool) $me->getPdo()->exec($query);
- });
- }
-
- /**
- * Prepare the query bindings for execution.
- *
- * @param array $bindings
- * @return array
- */
- public function prepareBindings(array $bindings)
- {
- $grammar = $this->getQueryGrammar();
-
- foreach ($bindings as $key => $value)
- {
- // We need to transform all instances of the DateTime class into an actual
- // date string. Each query grammar maintains its own date string format
- // so we'll just ask the grammar for the format to get from the date.
- if ($value instanceof DateTime)
- {
- $bindings[$key] = $value->format($grammar->getDateFormat());
- }
- elseif ($value === false)
- {
- $bindings[$key] = 0;
- }
- }
-
- return $bindings;
- }
-
- /**
- * Execute a Closure within a transaction.
- *
- * @param \Closure $callback
- * @return mixed
- *
- * @throws \Exception
- */
- public function transaction(Closure $callback)
- {
- $this->beginTransaction();
-
- // We'll simply execute the given callback within a try / catch block
- // and if we catch any exception we can rollback the transaction
- // so that none of the changes are persisted to the database.
- try
- {
- $result = $callback($this);
-
- $this->commit();
- }
-
- // If we catch an exception, we will roll back so nothing gets messed
- // up in the database. Then we'll re-throw the exception so it can
- // be handled how the developer sees fit for their applications.
- catch (Exception $e)
- {
- $this->rollBack();
-
- throw $e;
- }
-
- return $result;
- }
-
- /**
- * Start a new database transaction.
- *
- * @return void
- */
- public function beginTransaction()
- {
- ++$this->transactions;
-
- if ($this->transactions == 1)
- {
- $this->pdo->beginTransaction();
- }
-
- $this->fireConnectionEvent('beganTransaction');
- }
-
- /**
- * Commit the active database transaction.
- *
- * @return void
- */
- public function commit()
- {
- if ($this->transactions == 1) $this->pdo->commit();
-
- --$this->transactions;
-
- $this->fireConnectionEvent('committed');
- }
-
- /**
- * Rollback the active database transaction.
- *
- * @return void
- */
- public function rollBack()
- {
- if ($this->transactions == 1)
- {
- $this->transactions = 0;
-
- $this->pdo->rollBack();
- }
- else
- {
- --$this->transactions;
- }
-
- $this->fireConnectionEvent('rollingBack');
- }
-
- /**
- * Get the number of active transactions.
- *
- * @return int
- */
- public function transactionLevel()
- {
- return $this->transactions;
- }
-
- /**
- * Execute the given callback in "dry run" mode.
- *
- * @param \Closure $callback
- * @return array
- */
- public function pretend(Closure $callback)
- {
- $loggingQueries = $this->loggingQueries;
-
- $this->enableQueryLog();
-
- $this->pretending = true;
-
- $this->queryLog = [];
-
- // Basically to make the database connection "pretend", we will just return
- // the default values for all the query methods, then we will return an
- // array of queries that were "executed" within the Closure callback.
- $callback($this);
-
- $this->pretending = false;
-
- $this->loggingQueries = $loggingQueries;
-
- return $this->queryLog;
- }
-
- /**
- * Run a SQL statement and log its execution context.
- *
- * @param string $query
- * @param array $bindings
- * @param \Closure $callback
- * @return mixed
- *
- * @throws \Illuminate\Database\QueryException
- */
- protected function run($query, $bindings, Closure $callback)
- {
- $this->reconnectIfMissingConnection();
-
- $start = microtime(true);
-
- // Here we will run this query. If an exception occurs we'll determine if it was
- // caused by a connection that has been lost. If that is the cause, we'll try
- // to re-establish connection and re-run the query with a fresh connection.
- try
- {
- $result = $this->runQueryCallback($query, $bindings, $callback);
- }
- catch (QueryException $e)
- {
- $result = $this->tryAgainIfCausedByLostConnection(
- $e, $query, $bindings, $callback
- );
- }
-
- // Once we have run the query we will calculate the time that it took to run and
- // then log the query, bindings, and execution time so we will report them on
- // the event that the developer needs them. We'll log time in milliseconds.
- $time = $this->getElapsedTime($start);
-
- $this->logQuery($query, $bindings, $time);
-
- return $result;
- }
-
- /**
- * Run a SQL statement.
- *
- * @param string $query
- * @param array $bindings
- * @param \Closure $callback
- * @return mixed
- *
- * @throws \Illuminate\Database\QueryException
- */
- protected function runQueryCallback($query, $bindings, Closure $callback)
- {
- // To execute the statement, we'll simply call the callback, which will actually
- // run the SQL against the PDO connection. Then we can calculate the time it
- // took to execute and log the query SQL, bindings and time in our memory.
- try
- {
- $result = $callback($this, $query, $bindings);
- }
-
- // If an exception occurs when attempting to run a query, we'll format the error
- // message to include the bindings with SQL, which will make this exception a
- // lot more helpful to the developer instead of just the database's errors.
- catch (Exception $e)
- {
- throw new QueryException(
- $query, $this->prepareBindings($bindings), $e
- );
- }
-
- return $result;
- }
-
- /**
- * Handle a query exception that occurred during query execution.
- *
- * @param \Illuminate\Database\QueryException $e
- * @param string $query
- * @param array $bindings
- * @param \Closure $callback
- * @return mixed
- *
- * @throws \Illuminate\Database\QueryException
- */
- protected function tryAgainIfCausedByLostConnection(QueryException $e, $query, $bindings, Closure $callback)
- {
- if ($this->causedByLostConnection($e))
- {
- $this->reconnect();
-
- return $this->runQueryCallback($query, $bindings, $callback);
- }
-
- throw $e;
- }
-
- /**
- * Determine if the given exception was caused by a lost connection.
- *
- * @param \Illuminate\Database\QueryException $e
- * @return bool
- */
- protected function causedByLostConnection(QueryException $e)
- {
- $message = $e->getPrevious()->getMessage();
-
- return str_contains($message, [
- 'server has gone away',
- 'no connection to the server',
- 'Lost connection',
- ]);
- }
-
- /**
- * Disconnect from the underlying PDO connection.
- *
- * @return void
- */
- public function disconnect()
- {
- $this->setPdo(null)->setReadPdo(null);
- }
-
- /**
- * Reconnect to the database.
- *
- * @return void
- *
- * @throws \LogicException
- */
- public function reconnect()
- {
- if (is_callable($this->reconnector))
- {
- return call_user_func($this->reconnector, $this);
- }
-
- throw new LogicException("Lost connection and no reconnector available.");
- }
-
- /**
- * Reconnect to the database if a PDO connection is missing.
- *
- * @return void
- */
- protected function reconnectIfMissingConnection()
- {
- if (is_null($this->getPdo()) || is_null($this->getReadPdo()))
- {
- $this->reconnect();
- }
- }
-
- /**
- * Log a query in the connection's query log.
- *
- * @param string $query
- * @param array $bindings
- * @param float|null $time
- * @return void
- */
- public function logQuery($query, $bindings, $time = null)
- {
- if (isset($this->events))
- {
- $this->events->fire('illuminate.query', array($query, $bindings, $time, $this->getName()));
- }
-
- if ( ! $this->loggingQueries) return;
-
- $this->queryLog[] = compact('query', 'bindings', 'time');
- }
-
- /**
- * Register a database query listener with the connection.
- *
- * @param \Closure $callback
- * @return void
- */
- public function listen(Closure $callback)
- {
- if (isset($this->events))
- {
- $this->events->listen('illuminate.query', $callback);
- }
- }
-
- /**
- * Fire an event for this connection.
- *
- * @param string $event
- * @return void
- */
- protected function fireConnectionEvent($event)
- {
- if (isset($this->events))
- {
- $this->events->fire('connection.'.$this->getName().'.'.$event, $this);
- }
- }
-
- /**
- * Get the elapsed time since a given starting point.
- *
- * @param int $start
- * @return float
- */
- protected function getElapsedTime($start)
- {
- return round((microtime(true) - $start) * 1000, 2);
- }
-
- /**
- * Get a Doctrine Schema Column instance.
- *
- * @param string $table
- * @param string $column
- * @return \Doctrine\DBAL\Schema\Column
- */
- public function getDoctrineColumn($table, $column)
- {
- $schema = $this->getDoctrineSchemaManager();
-
- return $schema->listTableDetails($table)->getColumn($column);
- }
-
- /**
- * Get the Doctrine DBAL schema manager for the connection.
- *
- * @return \Doctrine\DBAL\Schema\AbstractSchemaManager
- */
- public function getDoctrineSchemaManager()
- {
- return $this->getDoctrineDriver()->getSchemaManager($this->getDoctrineConnection());
- }
-
- /**
- * Get the Doctrine DBAL database connection instance.
- *
- * @return \Doctrine\DBAL\Connection
- */
- public function getDoctrineConnection()
- {
- $driver = $this->getDoctrineDriver();
-
- $data = array('pdo' => $this->pdo, 'dbname' => $this->getConfig('database'));
-
- return new DoctrineConnection($data, $driver);
- }
-
- /**
- * Get the current PDO connection.
- *
- * @return \PDO
- */
- public function getPdo()
- {
- return $this->pdo;
- }
-
- /**
- * Get the current PDO connection used for reading.
- *
- * @return \PDO
- */
- public function getReadPdo()
- {
- if ($this->transactions >= 1) return $this->getPdo();
-
- return $this->readPdo ?: $this->pdo;
- }
-
- /**
- * Set the PDO connection.
- *
- * @param \PDO|null $pdo
- * @return $this
- */
- public function setPdo($pdo)
- {
- if ($this->transactions >= 1)
- throw new RuntimeException("Can't swap PDO instance while within transaction.");
-
- $this->pdo = $pdo;
-
- return $this;
- }
-
- /**
- * Set the PDO connection used for reading.
- *
- * @param \PDO|null $pdo
- * @return $this
- */
- public function setReadPdo($pdo)
- {
- $this->readPdo = $pdo;
-
- return $this;
- }
-
- /**
- * Set the reconnect instance on the connection.
- *
- * @param callable $reconnector
- * @return $this
- */
- public function setReconnector(callable $reconnector)
- {
- $this->reconnector = $reconnector;
-
- return $this;
- }
-
- /**
- * Get the database connection name.
- *
- * @return string|null
- */
- public function getName()
- {
- return $this->getConfig('name');
- }
-
- /**
- * Get an option from the configuration options.
- *
- * @param string $option
- * @return mixed
- */
- public function getConfig($option)
- {
- return array_get($this->config, $option);
- }
-
- /**
- * Get the PDO driver name.
- *
- * @return string
- */
- public function getDriverName()
- {
- return $this->pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
- }
-
- /**
- * Get the query grammar used by the connection.
- *
- * @return \Illuminate\Database\Query\Grammars\Grammar
- */
- public function getQueryGrammar()
- {
- return $this->queryGrammar;
- }
-
- /**
- * Set the query grammar used by the connection.
- *
- * @param \Illuminate\Database\Query\Grammars\Grammar
- * @return void
- */
- public function setQueryGrammar(Query\Grammars\Grammar $grammar)
- {
- $this->queryGrammar = $grammar;
- }
-
- /**
- * Get the schema grammar used by the connection.
- *
- * @return \Illuminate\Database\Schema\Grammars\Grammar
- */
- public function getSchemaGrammar()
- {
- return $this->schemaGrammar;
- }
-
- /**
- * Set the schema grammar used by the connection.
- *
- * @param \Illuminate\Database\Schema\Grammars\Grammar
- * @return void
- */
- public function setSchemaGrammar(Schema\Grammars\Grammar $grammar)
- {
- $this->schemaGrammar = $grammar;
- }
-
- /**
- * Get the query post processor used by the connection.
- *
- * @return \Illuminate\Database\Query\Processors\Processor
- */
- public function getPostProcessor()
- {
- return $this->postProcessor;
- }
-
- /**
- * Set the query post processor used by the connection.
- *
- * @param \Illuminate\Database\Query\Processors\Processor
- * @return void
- */
- public function setPostProcessor(Processor $processor)
- {
- $this->postProcessor = $processor;
- }
-
- /**
- * Get the event dispatcher used by the connection.
- *
- * @return \Illuminate\Contracts\Events\Dispatcher
- */
- public function getEventDispatcher()
- {
- return $this->events;
- }
-
- /**
- * Set the event dispatcher instance on the connection.
- *
- * @param \Illuminate\Contracts\Events\Dispatcher
- * @return void
- */
- public function setEventDispatcher(Dispatcher $events)
- {
- $this->events = $events;
- }
-
- /**
- * Determine if the connection in a "dry run".
- *
- * @return bool
- */
- public function pretending()
- {
- return $this->pretending === true;
- }
-
- /**
- * Get the default fetch mode for the connection.
- *
- * @return int
- */
- public function getFetchMode()
- {
- return $this->fetchMode;
- }
-
- /**
- * Set the default fetch mode for the connection.
- *
- * @param int $fetchMode
- * @return int
- */
- public function setFetchMode($fetchMode)
- {
- $this->fetchMode = $fetchMode;
- }
-
- /**
- * Get the connection query log.
- *
- * @return array
- */
- public function getQueryLog()
- {
- return $this->queryLog;
- }
-
- /**
- * Clear the query log.
- *
- * @return void
- */
- public function flushQueryLog()
- {
- $this->queryLog = array();
- }
-
- /**
- * Enable the query log on the connection.
- *
- * @return void
- */
- public function enableQueryLog()
- {
- $this->loggingQueries = true;
- }
-
- /**
- * Disable the query log on the connection.
- *
- * @return void
- */
- public function disableQueryLog()
- {
- $this->loggingQueries = false;
- }
-
- /**
- * Determine whether we're logging queries.
- *
- * @return bool
- */
- public function logging()
- {
- return $this->loggingQueries;
- }
-
- /**
- * Get the name of the connected database.
- *
- * @return string
- */
- public function getDatabaseName()
- {
- return $this->database;
- }
-
- /**
- * Set the name of the connected database.
- *
- * @param string $database
- * @return string
- */
- public function setDatabaseName($database)
- {
- $this->database = $database;
- }
-
- /**
- * Get the table prefix for the connection.
- *
- * @return string
- */
- public function getTablePrefix()
- {
- return $this->tablePrefix;
- }
-
- /**
- * Set the table prefix in use by the connection.
- *
- * @param string $prefix
- * @return void
- */
- public function setTablePrefix($prefix)
- {
- $this->tablePrefix = $prefix;
-
- $this->getQueryGrammar()->setTablePrefix($prefix);
- }
-
- /**
- * Set the table prefix and return the grammar.
- *
- * @param \Illuminate\Database\Grammar $grammar
- * @return \Illuminate\Database\Grammar
- */
- public function withTablePrefix(Grammar $grammar)
- {
- $grammar->setTablePrefix($this->tablePrefix);
-
- return $grammar;
- }
-
+class Connection implements ConnectionInterface
+{
+ use DetectsLostConnections;
+
+ /**
+ * The active PDO connection.
+ *
+ * @var PDO
+ */
+ protected $pdo;
+
+ /**
+ * The active PDO connection used for reads.
+ *
+ * @var PDO
+ */
+ protected $readPdo;
+
+ /**
+ * The reconnector instance for the connection.
+ *
+ * @var callable
+ */
+ protected $reconnector;
+
+ /**
+ * The query grammar implementation.
+ *
+ * @var \Illuminate\Database\Query\Grammars\Grammar
+ */
+ protected $queryGrammar;
+
+ /**
+ * The schema grammar implementation.
+ *
+ * @var \Illuminate\Database\Schema\Grammars\Grammar
+ */
+ protected $schemaGrammar;
+
+ /**
+ * The query post processor implementation.
+ *
+ * @var \Illuminate\Database\Query\Processors\Processor
+ */
+ protected $postProcessor;
+
+ /**
+ * The event dispatcher instance.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected $events;
+
+ /**
+ * The default fetch mode of the connection.
+ *
+ * @var int
+ */
+ protected $fetchMode = PDO::FETCH_OBJ;
+
+ /**
+ * The number of active transactions.
+ *
+ * @var int
+ */
+ protected $transactions = 0;
+
+ /**
+ * All of the queries run against the connection.
+ *
+ * @var array
+ */
+ protected $queryLog = [];
+
+ /**
+ * Indicates whether queries are being logged.
+ *
+ * @var bool
+ */
+ protected $loggingQueries = false;
+
+ /**
+ * Indicates if the connection is in a "dry run".
+ *
+ * @var bool
+ */
+ protected $pretending = false;
+
+ /**
+ * The name of the connected database.
+ *
+ * @var string
+ */
+ protected $database;
+
+ /**
+ * The instance of Doctrine connection.
+ *
+ * @var \Doctrine\DBAL\Connection
+ */
+ protected $doctrineConnection;
+
+ /**
+ * The table prefix for the connection.
+ *
+ * @var string
+ */
+ protected $tablePrefix = '';
+
+ /**
+ * The database connection configuration options.
+ *
+ * @var array
+ */
+ protected $config = [];
+
+ /**
+ * Create a new database connection instance.
+ *
+ * @param \PDO $pdo
+ * @param string $database
+ * @param string $tablePrefix
+ * @param array $config
+ * @return void
+ */
+ public function __construct(PDO $pdo, $database = '', $tablePrefix = '', array $config = [])
+ {
+ $this->pdo = $pdo;
+
+ // First we will setup the default properties. We keep track of the DB
+ // name we are connected to since it is needed when some reflective
+ // type commands are run such as checking whether a table exists.
+ $this->database = $database;
+
+ $this->tablePrefix = $tablePrefix;
+
+ $this->config = $config;
+
+ // We need to initialize a query grammar and the query post processors
+ // which are both very important parts of the database abstractions
+ // so we initialize these to their default values while starting.
+ $this->useDefaultQueryGrammar();
+
+ $this->useDefaultPostProcessor();
+ }
+
+ /**
+ * Set the query grammar to the default implementation.
+ *
+ * @return void
+ */
+ public function useDefaultQueryGrammar()
+ {
+ $this->queryGrammar = $this->getDefaultQueryGrammar();
+ }
+
+ /**
+ * Get the default query grammar instance.
+ *
+ * @return \Illuminate\Database\Query\Grammars\Grammar
+ */
+ protected function getDefaultQueryGrammar()
+ {
+ return new QueryGrammar;
+ }
+
+ /**
+ * Set the schema grammar to the default implementation.
+ *
+ * @return void
+ */
+ public function useDefaultSchemaGrammar()
+ {
+ $this->schemaGrammar = $this->getDefaultSchemaGrammar();
+ }
+
+ /**
+ * Get the default schema grammar instance.
+ *
+ * @return \Illuminate\Database\Schema\Grammars\Grammar
+ */
+ protected function getDefaultSchemaGrammar()
+ {
+ //
+ }
+
+ /**
+ * Set the query post processor to the default implementation.
+ *
+ * @return void
+ */
+ public function useDefaultPostProcessor()
+ {
+ $this->postProcessor = $this->getDefaultPostProcessor();
+ }
+
+ /**
+ * Get the default post processor instance.
+ *
+ * @return \Illuminate\Database\Query\Processors\Processor
+ */
+ protected function getDefaultPostProcessor()
+ {
+ return new Processor;
+ }
+
+ /**
+ * Get a schema builder instance for the connection.
+ *
+ * @return \Illuminate\Database\Schema\Builder
+ */
+ public function getSchemaBuilder()
+ {
+ if (is_null($this->schemaGrammar)) {
+ $this->useDefaultSchemaGrammar();
+ }
+
+ return new SchemaBuilder($this);
+ }
+
+ /**
+ * Begin a fluent query against a database table.
+ *
+ * @param string $table
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function table($table)
+ {
+ return $this->query()->from($table);
+ }
+
+ /**
+ * Get a new query builder instance.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function query()
+ {
+ return new QueryBuilder(
+ $this, $this->getQueryGrammar(), $this->getPostProcessor()
+ );
+ }
+
+ /**
+ * Get a new raw query expression.
+ *
+ * @param mixed $value
+ * @return \Illuminate\Database\Query\Expression
+ */
+ public function raw($value)
+ {
+ return new Expression($value);
+ }
+
+ /**
+ * Run a select statement and return a single result.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @return mixed
+ */
+ public function selectOne($query, $bindings = [])
+ {
+ $records = $this->select($query, $bindings);
+
+ return count($records) > 0 ? reset($records) : null;
+ }
+
+ /**
+ * Run a select statement against the database.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @return array
+ */
+ public function selectFromWriteConnection($query, $bindings = [])
+ {
+ return $this->select($query, $bindings, false);
+ }
+
+ /**
+ * Run a select statement against the database.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @param bool $useReadPdo
+ * @return array
+ */
+ public function select($query, $bindings = [], $useReadPdo = true)
+ {
+ return $this->run($query, $bindings, function ($me, $query, $bindings) use ($useReadPdo) {
+ if ($me->pretending()) {
+ return [];
+ }
+
+ // For select statements, we'll simply execute the query and return an array
+ // of the database result set. Each element in the array will be a single
+ // row from the database table, and will either be an array or objects.
+ $statement = $this->getPdoForSelect($useReadPdo)->prepare($query);
+
+ $statement->execute($me->prepareBindings($bindings));
+
+ return $statement->fetchAll($me->getFetchMode());
+ });
+ }
+
+ /**
+ * Get the PDO connection to use for a select query.
+ *
+ * @param bool $useReadPdo
+ * @return \PDO
+ */
+ protected function getPdoForSelect($useReadPdo = true)
+ {
+ return $useReadPdo ? $this->getReadPdo() : $this->getPdo();
+ }
+
+ /**
+ * Run an insert statement against the database.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @return bool
+ */
+ public function insert($query, $bindings = [])
+ {
+ return $this->statement($query, $bindings);
+ }
+
+ /**
+ * Run an update statement against the database.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @return int
+ */
+ public function update($query, $bindings = [])
+ {
+ return $this->affectingStatement($query, $bindings);
+ }
+
+ /**
+ * Run a delete statement against the database.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @return int
+ */
+ public function delete($query, $bindings = [])
+ {
+ return $this->affectingStatement($query, $bindings);
+ }
+
+ /**
+ * Execute an SQL statement and return the boolean result.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @return bool
+ */
+ public function statement($query, $bindings = [])
+ {
+ return $this->run($query, $bindings, function ($me, $query, $bindings) {
+ if ($me->pretending()) {
+ return true;
+ }
+
+ $bindings = $me->prepareBindings($bindings);
+
+ return $me->getPdo()->prepare($query)->execute($bindings);
+ });
+ }
+
+ /**
+ * Run an SQL statement and get the number of rows affected.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @return int
+ */
+ public function affectingStatement($query, $bindings = [])
+ {
+ return $this->run($query, $bindings, function ($me, $query, $bindings) {
+ if ($me->pretending()) {
+ return 0;
+ }
+
+ // For update or delete statements, we want to get the number of rows affected
+ // by the statement and return that back to the developer. We'll first need
+ // to execute the statement and then we'll use PDO to fetch the affected.
+ $statement = $me->getPdo()->prepare($query);
+
+ $statement->execute($me->prepareBindings($bindings));
+
+ return $statement->rowCount();
+ });
+ }
+
+ /**
+ * Run a raw, unprepared query against the PDO connection.
+ *
+ * @param string $query
+ * @return bool
+ */
+ public function unprepared($query)
+ {
+ return $this->run($query, [], function ($me, $query) {
+ if ($me->pretending()) {
+ return true;
+ }
+
+ return (bool) $me->getPdo()->exec($query);
+ });
+ }
+
+ /**
+ * Prepare the query bindings for execution.
+ *
+ * @param array $bindings
+ * @return array
+ */
+ public function prepareBindings(array $bindings)
+ {
+ $grammar = $this->getQueryGrammar();
+
+ foreach ($bindings as $key => $value) {
+ // We need to transform all instances of DateTimeInterface into the actual
+ // date string. Each query grammar maintains its own date string format
+ // so we'll just ask the grammar for the format to get from the date.
+ if ($value instanceof DateTimeInterface) {
+ $bindings[$key] = $value->format($grammar->getDateFormat());
+ } elseif ($value === false) {
+ $bindings[$key] = 0;
+ }
+ }
+
+ return $bindings;
+ }
+
+ /**
+ * Execute a Closure within a transaction.
+ *
+ * @param \Closure $callback
+ * @return mixed
+ *
+ * @throws \Throwable
+ */
+ public function transaction(Closure $callback)
+ {
+ $this->beginTransaction();
+
+ // We'll simply execute the given callback within a try / catch block
+ // and if we catch any exception we can rollback the transaction
+ // so that none of the changes are persisted to the database.
+ try {
+ $result = $callback($this);
+
+ $this->commit();
+ }
+
+ // If we catch an exception, we will roll back so nothing gets messed
+ // up in the database. Then we'll re-throw the exception so it can
+ // be handled how the developer sees fit for their applications.
+ catch (Exception $e) {
+ $this->rollBack();
+
+ throw $e;
+ } catch (Throwable $e) {
+ $this->rollBack();
+
+ throw $e;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Start a new database transaction.
+ *
+ * @return void
+ *
+ * @throws \Exception
+ */
+ public function beginTransaction()
+ {
+ if ($this->transactions == 0) {
+ try {
+ $this->pdo->beginTransaction();
+ } catch (Exception $e) {
+ if ($this->causedByLostConnection($e)) {
+ $this->reconnect();
+ $this->pdo->beginTransaction();
+ } else {
+ throw $e;
+ }
+ }
+ } elseif ($this->transactions >= 1 && $this->queryGrammar->supportsSavepoints()) {
+ $this->pdo->exec(
+ $this->queryGrammar->compileSavepoint('trans'.($this->transactions + 1))
+ );
+ }
+
+ ++$this->transactions;
+
+ $this->fireConnectionEvent('beganTransaction');
+ }
+
+ /**
+ * Commit the active database transaction.
+ *
+ * @return void
+ */
+ public function commit()
+ {
+ if ($this->transactions == 1) {
+ $this->pdo->commit();
+ }
+
+ --$this->transactions;
+
+ $this->fireConnectionEvent('committed');
+ }
+
+ /**
+ * Rollback the active database transaction.
+ *
+ * @return void
+ */
+ public function rollBack()
+ {
+ if ($this->transactions == 1) {
+ $this->pdo->rollBack();
+ } elseif ($this->transactions > 1 && $this->queryGrammar->supportsSavepoints()) {
+ $this->pdo->exec(
+ $this->queryGrammar->compileSavepointRollBack('trans'.$this->transactions)
+ );
+ }
+
+ $this->transactions = max(0, $this->transactions - 1);
+
+ $this->fireConnectionEvent('rollingBack');
+ }
+
+ /**
+ * Get the number of active transactions.
+ *
+ * @return int
+ */
+ public function transactionLevel()
+ {
+ return $this->transactions;
+ }
+
+ /**
+ * Execute the given callback in "dry run" mode.
+ *
+ * @param \Closure $callback
+ * @return array
+ */
+ public function pretend(Closure $callback)
+ {
+ $loggingQueries = $this->loggingQueries;
+
+ $this->enableQueryLog();
+
+ $this->pretending = true;
+
+ $this->queryLog = [];
+
+ // Basically to make the database connection "pretend", we will just return
+ // the default values for all the query methods, then we will return an
+ // array of queries that were "executed" within the Closure callback.
+ $callback($this);
+
+ $this->pretending = false;
+
+ $this->loggingQueries = $loggingQueries;
+
+ return $this->queryLog;
+ }
+
+ /**
+ * Run a SQL statement and log its execution context.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @param \Closure $callback
+ * @return mixed
+ *
+ * @throws \Illuminate\Database\QueryException
+ */
+ protected function run($query, $bindings, Closure $callback)
+ {
+ $this->reconnectIfMissingConnection();
+
+ $start = microtime(true);
+
+ // Here we will run this query. If an exception occurs we'll determine if it was
+ // caused by a connection that has been lost. If that is the cause, we'll try
+ // to re-establish connection and re-run the query with a fresh connection.
+ try {
+ $result = $this->runQueryCallback($query, $bindings, $callback);
+ } catch (QueryException $e) {
+ if ($this->transactions >= 1) {
+ throw $e;
+ }
+
+ $result = $this->tryAgainIfCausedByLostConnection(
+ $e, $query, $bindings, $callback
+ );
+ }
+
+ // Once we have run the query we will calculate the time that it took to run and
+ // then log the query, bindings, and execution time so we will report them on
+ // the event that the developer needs them. We'll log time in milliseconds.
+ $time = $this->getElapsedTime($start);
+
+ $this->logQuery($query, $bindings, $time);
+
+ return $result;
+ }
+
+ /**
+ * Run a SQL statement.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @param \Closure $callback
+ * @return mixed
+ *
+ * @throws \Illuminate\Database\QueryException
+ */
+ protected function runQueryCallback($query, $bindings, Closure $callback)
+ {
+ // To execute the statement, we'll simply call the callback, which will actually
+ // run the SQL against the PDO connection. Then we can calculate the time it
+ // took to execute and log the query SQL, bindings and time in our memory.
+ try {
+ $result = $callback($this, $query, $bindings);
+ }
+
+ // If an exception occurs when attempting to run a query, we'll format the error
+ // message to include the bindings with SQL, which will make this exception a
+ // lot more helpful to the developer instead of just the database's errors.
+ catch (Exception $e) {
+ throw new QueryException(
+ $query, $this->prepareBindings($bindings), $e
+ );
+ }
+
+ return $result;
+ }
+
+ /**
+ * Handle a query exception that occurred during query execution.
+ *
+ * @param \Illuminate\Database\QueryException $e
+ * @param string $query
+ * @param array $bindings
+ * @param \Closure $callback
+ * @return mixed
+ *
+ * @throws \Illuminate\Database\QueryException
+ */
+ protected function tryAgainIfCausedByLostConnection(QueryException $e, $query, $bindings, Closure $callback)
+ {
+ if ($this->causedByLostConnection($e->getPrevious())) {
+ $this->reconnect();
+
+ return $this->runQueryCallback($query, $bindings, $callback);
+ }
+
+ throw $e;
+ }
+
+ /**
+ * Disconnect from the underlying PDO connection.
+ *
+ * @return void
+ */
+ public function disconnect()
+ {
+ $this->setPdo(null)->setReadPdo(null);
+ }
+
+ /**
+ * Reconnect to the database.
+ *
+ * @return void
+ *
+ * @throws \LogicException
+ */
+ public function reconnect()
+ {
+ if (is_callable($this->reconnector)) {
+ return call_user_func($this->reconnector, $this);
+ }
+
+ throw new LogicException('Lost connection and no reconnector available.');
+ }
+
+ /**
+ * Reconnect to the database if a PDO connection is missing.
+ *
+ * @return void
+ */
+ protected function reconnectIfMissingConnection()
+ {
+ if (is_null($this->getPdo()) || is_null($this->getReadPdo())) {
+ $this->reconnect();
+ }
+ }
+
+ /**
+ * Log a query in the connection's query log.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @param float|null $time
+ * @return void
+ */
+ public function logQuery($query, $bindings, $time = null)
+ {
+ if (isset($this->events)) {
+ $this->events->fire('illuminate.query', [$query, $bindings, $time, $this->getName()]);
+ }
+
+ if (! $this->loggingQueries) {
+ return;
+ }
+
+ $this->queryLog[] = compact('query', 'bindings', 'time');
+ }
+
+ /**
+ * Register a database query listener with the connection.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ public function listen(Closure $callback)
+ {
+ if (isset($this->events)) {
+ $this->events->listen('illuminate.query', $callback);
+ }
+ }
+
+ /**
+ * Fire an event for this connection.
+ *
+ * @param string $event
+ * @return void
+ */
+ protected function fireConnectionEvent($event)
+ {
+ if (isset($this->events)) {
+ $this->events->fire('connection.'.$this->getName().'.'.$event, $this);
+ }
+ }
+
+ /**
+ * Get the elapsed time since a given starting point.
+ *
+ * @param int $start
+ * @return float
+ */
+ protected function getElapsedTime($start)
+ {
+ return round((microtime(true) - $start) * 1000, 2);
+ }
+
+ /**
+ * Is Doctrine available?
+ *
+ * @return bool
+ */
+ public function isDoctrineAvailable()
+ {
+ return class_exists('Doctrine\DBAL\Connection');
+ }
+
+ /**
+ * Get a Doctrine Schema Column instance.
+ *
+ * @param string $table
+ * @param string $column
+ * @return \Doctrine\DBAL\Schema\Column
+ */
+ public function getDoctrineColumn($table, $column)
+ {
+ $schema = $this->getDoctrineSchemaManager();
+
+ return $schema->listTableDetails($table)->getColumn($column);
+ }
+
+ /**
+ * Get the Doctrine DBAL schema manager for the connection.
+ *
+ * @return \Doctrine\DBAL\Schema\AbstractSchemaManager
+ */
+ public function getDoctrineSchemaManager()
+ {
+ return $this->getDoctrineDriver()->getSchemaManager($this->getDoctrineConnection());
+ }
+
+ /**
+ * Get the Doctrine DBAL database connection instance.
+ *
+ * @return \Doctrine\DBAL\Connection
+ */
+ public function getDoctrineConnection()
+ {
+ if (is_null($this->doctrineConnection)) {
+ $driver = $this->getDoctrineDriver();
+
+ $data = ['pdo' => $this->pdo, 'dbname' => $this->getConfig('database')];
+
+ $this->doctrineConnection = new DoctrineConnection($data, $driver);
+ }
+
+ return $this->doctrineConnection;
+ }
+
+ /**
+ * Get the current PDO connection.
+ *
+ * @return \PDO
+ */
+ public function getPdo()
+ {
+ return $this->pdo;
+ }
+
+ /**
+ * Get the current PDO connection used for reading.
+ *
+ * @return \PDO
+ */
+ public function getReadPdo()
+ {
+ if ($this->transactions >= 1) {
+ return $this->getPdo();
+ }
+
+ return $this->readPdo ?: $this->pdo;
+ }
+
+ /**
+ * Set the PDO connection.
+ *
+ * @param \PDO|null $pdo
+ * @return $this
+ *
+ * @throws \RuntimeException
+ */
+ public function setPdo($pdo)
+ {
+ if ($this->transactions >= 1) {
+ throw new RuntimeException("Can't swap PDO instance while within transaction.");
+ }
+
+ $this->pdo = $pdo;
+
+ return $this;
+ }
+
+ /**
+ * Set the PDO connection used for reading.
+ *
+ * @param \PDO|null $pdo
+ * @return $this
+ */
+ public function setReadPdo($pdo)
+ {
+ $this->readPdo = $pdo;
+
+ return $this;
+ }
+
+ /**
+ * Set the reconnect instance on the connection.
+ *
+ * @param callable $reconnector
+ * @return $this
+ */
+ public function setReconnector(callable $reconnector)
+ {
+ $this->reconnector = $reconnector;
+
+ return $this;
+ }
+
+ /**
+ * Get the database connection name.
+ *
+ * @return string|null
+ */
+ public function getName()
+ {
+ return $this->getConfig('name');
+ }
+
+ /**
+ * Get an option from the configuration options.
+ *
+ * @param string $option
+ * @return mixed
+ */
+ public function getConfig($option)
+ {
+ return Arr::get($this->config, $option);
+ }
+
+ /**
+ * Get the PDO driver name.
+ *
+ * @return string
+ */
+ public function getDriverName()
+ {
+ return $this->pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
+ }
+
+ /**
+ * Get the query grammar used by the connection.
+ *
+ * @return \Illuminate\Database\Query\Grammars\Grammar
+ */
+ public function getQueryGrammar()
+ {
+ return $this->queryGrammar;
+ }
+
+ /**
+ * Set the query grammar used by the connection.
+ *
+ * @param \Illuminate\Database\Query\Grammars\Grammar $grammar
+ * @return void
+ */
+ public function setQueryGrammar(Query\Grammars\Grammar $grammar)
+ {
+ $this->queryGrammar = $grammar;
+ }
+
+ /**
+ * Get the schema grammar used by the connection.
+ *
+ * @return \Illuminate\Database\Schema\Grammars\Grammar
+ */
+ public function getSchemaGrammar()
+ {
+ return $this->schemaGrammar;
+ }
+
+ /**
+ * Set the schema grammar used by the connection.
+ *
+ * @param \Illuminate\Database\Schema\Grammars\Grammar $grammar
+ * @return void
+ */
+ public function setSchemaGrammar(Schema\Grammars\Grammar $grammar)
+ {
+ $this->schemaGrammar = $grammar;
+ }
+
+ /**
+ * Get the query post processor used by the connection.
+ *
+ * @return \Illuminate\Database\Query\Processors\Processor
+ */
+ public function getPostProcessor()
+ {
+ return $this->postProcessor;
+ }
+
+ /**
+ * Set the query post processor used by the connection.
+ *
+ * @param \Illuminate\Database\Query\Processors\Processor $processor
+ * @return void
+ */
+ public function setPostProcessor(Processor $processor)
+ {
+ $this->postProcessor = $processor;
+ }
+
+ /**
+ * Get the event dispatcher used by the connection.
+ *
+ * @return \Illuminate\Contracts\Events\Dispatcher
+ */
+ public function getEventDispatcher()
+ {
+ return $this->events;
+ }
+
+ /**
+ * Set the event dispatcher instance on the connection.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @return void
+ */
+ public function setEventDispatcher(Dispatcher $events)
+ {
+ $this->events = $events;
+ }
+
+ /**
+ * Determine if the connection in a "dry run".
+ *
+ * @return bool
+ */
+ public function pretending()
+ {
+ return $this->pretending === true;
+ }
+
+ /**
+ * Get the default fetch mode for the connection.
+ *
+ * @return int
+ */
+ public function getFetchMode()
+ {
+ return $this->fetchMode;
+ }
+
+ /**
+ * Set the default fetch mode for the connection.
+ *
+ * @param int $fetchMode
+ * @return int
+ */
+ public function setFetchMode($fetchMode)
+ {
+ $this->fetchMode = $fetchMode;
+ }
+
+ /**
+ * Get the connection query log.
+ *
+ * @return array
+ */
+ public function getQueryLog()
+ {
+ return $this->queryLog;
+ }
+
+ /**
+ * Clear the query log.
+ *
+ * @return void
+ */
+ public function flushQueryLog()
+ {
+ $this->queryLog = [];
+ }
+
+ /**
+ * Enable the query log on the connection.
+ *
+ * @return void
+ */
+ public function enableQueryLog()
+ {
+ $this->loggingQueries = true;
+ }
+
+ /**
+ * Disable the query log on the connection.
+ *
+ * @return void
+ */
+ public function disableQueryLog()
+ {
+ $this->loggingQueries = false;
+ }
+
+ /**
+ * Determine whether we're logging queries.
+ *
+ * @return bool
+ */
+ public function logging()
+ {
+ return $this->loggingQueries;
+ }
+
+ /**
+ * Get the name of the connected database.
+ *
+ * @return string
+ */
+ public function getDatabaseName()
+ {
+ return $this->database;
+ }
+
+ /**
+ * Set the name of the connected database.
+ *
+ * @param string $database
+ * @return string
+ */
+ public function setDatabaseName($database)
+ {
+ $this->database = $database;
+ }
+
+ /**
+ * Get the table prefix for the connection.
+ *
+ * @return string
+ */
+ public function getTablePrefix()
+ {
+ return $this->tablePrefix;
+ }
+
+ /**
+ * Set the table prefix in use by the connection.
+ *
+ * @param string $prefix
+ * @return void
+ */
+ public function setTablePrefix($prefix)
+ {
+ $this->tablePrefix = $prefix;
+
+ $this->getQueryGrammar()->setTablePrefix($prefix);
+ }
+
+ /**
+ * Set the table prefix and return the grammar.
+ *
+ * @param \Illuminate\Database\Grammar $grammar
+ * @return \Illuminate\Database\Grammar
+ */
+ public function withTablePrefix(Grammar $grammar)
+ {
+ $grammar->setTablePrefix($this->tablePrefix);
+
+ return $grammar;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php b/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php
index 48d69b3..16eb667 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php
@@ -1,148 +1,149 @@
- $connection)
- {
- $this->addConnection($name, $connection);
- }
- }
+ /**
+ * Create a new connection resolver instance.
+ *
+ * @param array $connections
+ * @return void
+ */
+ public function __construct(array $connections = [])
+ {
+ foreach ($connections as $name => $connection) {
+ $this->addConnection($name, $connection);
+ }
+ }
- /**
- * Get a database connection instance.
- *
- * @param string $name
- * @return \Illuminate\Database\ConnectionInterface
- */
- public function connection($name = null)
- {
- if (is_null($name)) $name = $this->getDefaultConnection();
+ /**
+ * Get a database connection instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\ConnectionInterface
+ */
+ public function connection($name = null)
+ {
+ if (is_null($name)) {
+ $name = $this->getDefaultConnection();
+ }
- return $this->connections[$name];
- }
+ return $this->connections[$name];
+ }
- /**
- * Add a connection to the resolver.
- *
- * @param string $name
- * @param \Illuminate\Database\ConnectionInterface $connection
- * @return void
- */
- public function addConnection($name, ConnectionInterface $connection)
- {
- $this->connections[$name] = $connection;
- }
+ /**
+ * Add a connection to the resolver.
+ *
+ * @param string $name
+ * @param \Illuminate\Database\ConnectionInterface $connection
+ * @return void
+ */
+ public function addConnection($name, ConnectionInterface $connection)
+ {
+ $this->connections[$name] = $connection;
+ }
- /**
- * Check if a connection has been registered.
- *
- * @param string $name
- * @return bool
- */
- public function hasConnection($name)
- {
- return isset($this->connections[$name]);
- }
+ /**
+ * Check if a connection has been registered.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasConnection($name)
+ {
+ return isset($this->connections[$name]);
+ }
- /**
- * Get the default connection name.
- *
- * @return string
- */
- public function getDefaultConnection()
- {
- return $this->default;
- }
-
- /**
- * Set the default connection name.
- *
- * @param string $name
- * @return void
- */
- public function setDefaultConnection($name)
- {
- $this->default = $name;
- }
+ /**
+ * Get the default connection name.
+ *
+ * @return string
+ */
+ public function getDefaultConnection()
+ {
+ return $this->default;
+ }
+ /**
+ * Set the default connection name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultConnection($name)
+ {
+ $this->default = $name;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php b/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php
index 46abdc0..eb0397a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php
@@ -1,28 +1,29 @@
-container = $container;
- }
-
- /**
- * Establish a PDO connection based on the configuration.
- *
- * @param array $config
- * @param string $name
- * @return \Illuminate\Database\Connection
- */
- public function make(array $config, $name = null)
- {
- $config = $this->parseConfig($config, $name);
-
- if (isset($config['read']))
- {
- return $this->createReadWriteConnection($config);
- }
-
- return $this->createSingleConnection($config);
- }
-
- /**
- * Create a single database connection instance.
- *
- * @param array $config
- * @return \Illuminate\Database\Connection
- */
- protected function createSingleConnection(array $config)
- {
- $pdo = $this->createConnector($config)->connect($config);
-
- return $this->createConnection($config['driver'], $pdo, $config['database'], $config['prefix'], $config);
- }
-
- /**
- * Create a single database connection instance.
- *
- * @param array $config
- * @return \Illuminate\Database\Connection
- */
- protected function createReadWriteConnection(array $config)
- {
- $connection = $this->createSingleConnection($this->getWriteConfig($config));
-
- return $connection->setReadPdo($this->createReadPdo($config));
- }
-
- /**
- * Create a new PDO instance for reading.
- *
- * @param array $config
- * @return \PDO
- */
- protected function createReadPdo(array $config)
- {
- $readConfig = $this->getReadConfig($config);
-
- return $this->createConnector($readConfig)->connect($readConfig);
- }
-
- /**
- * Get the read configuration for a read / write connection.
- *
- * @param array $config
- * @return array
- */
- protected function getReadConfig(array $config)
- {
- $readConfig = $this->getReadWriteConfig($config, 'read');
-
- return $this->mergeReadWriteConfig($config, $readConfig);
- }
-
- /**
- * Get the read configuration for a read / write connection.
- *
- * @param array $config
- * @return array
- */
- protected function getWriteConfig(array $config)
- {
- $writeConfig = $this->getReadWriteConfig($config, 'write');
-
- return $this->mergeReadWriteConfig($config, $writeConfig);
- }
-
- /**
- * Get a read / write level configuration.
- *
- * @param array $config
- * @param string $type
- * @return array
- */
- protected function getReadWriteConfig(array $config, $type)
- {
- if (isset($config[$type][0]))
- {
- return $config[$type][array_rand($config[$type])];
- }
-
- return $config[$type];
- }
-
- /**
- * Merge a configuration for a read / write connection.
- *
- * @param array $config
- * @param array $merge
- * @return array
- */
- protected function mergeReadWriteConfig(array $config, array $merge)
- {
- return array_except(array_merge($config, $merge), array('read', 'write'));
- }
-
- /**
- * Parse and prepare the database configuration.
- *
- * @param array $config
- * @param string $name
- * @return array
- */
- protected function parseConfig(array $config, $name)
- {
- return array_add(array_add($config, 'prefix', ''), 'name', $name);
- }
-
- /**
- * Create a connector instance based on the configuration.
- *
- * @param array $config
- * @return \Illuminate\Database\Connectors\ConnectorInterface
- *
- * @throws \InvalidArgumentException
- */
- 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;
-
- case 'pgsql':
- return new PostgresConnector;
-
- case 'sqlite':
- return new SQLiteConnector;
-
- case 'sqlsrv':
- return new SqlServerConnector;
- }
-
- throw new InvalidArgumentException("Unsupported driver [{$config['driver']}]");
- }
-
- /**
- * Create a new connection instance.
- *
- * @param string $driver
- * @param \PDO $connection
- * @param string $database
- * @param string $prefix
- * @param array $config
- * @return \Illuminate\Database\Connection
- *
- * @throws \InvalidArgumentException
- */
- protected function createConnection($driver, PDO $connection, $database, $prefix = '', array $config = array())
- {
- if ($this->container->bound($key = "db.connection.{$driver}"))
- {
- return $this->container->make($key, array($connection, $database, $prefix, $config));
- }
-
- switch ($driver)
- {
- case 'mysql':
- return new MySqlConnection($connection, $database, $prefix, $config);
-
- case 'pgsql':
- return new PostgresConnection($connection, $database, $prefix, $config);
-
- case 'sqlite':
- return new SQLiteConnection($connection, $database, $prefix, $config);
-
- case 'sqlsrv':
- return new SqlServerConnection($connection, $database, $prefix, $config);
- }
-
- throw new InvalidArgumentException("Unsupported driver [$driver]");
- }
-
+class ConnectionFactory
+{
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * Create a new connection factory instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function __construct(Container $container)
+ {
+ $this->container = $container;
+ }
+
+ /**
+ * Establish a PDO connection based on the configuration.
+ *
+ * @param array $config
+ * @param string $name
+ * @return \Illuminate\Database\Connection
+ */
+ public function make(array $config, $name = null)
+ {
+ $config = $this->parseConfig($config, $name);
+
+ if (isset($config['read'])) {
+ return $this->createReadWriteConnection($config);
+ }
+
+ return $this->createSingleConnection($config);
+ }
+
+ /**
+ * Create a single database connection instance.
+ *
+ * @param array $config
+ * @return \Illuminate\Database\Connection
+ */
+ protected function createSingleConnection(array $config)
+ {
+ $pdo = $this->createConnector($config)->connect($config);
+
+ return $this->createConnection($config['driver'], $pdo, $config['database'], $config['prefix'], $config);
+ }
+
+ /**
+ * Create a single database connection instance.
+ *
+ * @param array $config
+ * @return \Illuminate\Database\Connection
+ */
+ protected function createReadWriteConnection(array $config)
+ {
+ $connection = $this->createSingleConnection($this->getWriteConfig($config));
+
+ return $connection->setReadPdo($this->createReadPdo($config));
+ }
+
+ /**
+ * Create a new PDO instance for reading.
+ *
+ * @param array $config
+ * @return \PDO
+ */
+ protected function createReadPdo(array $config)
+ {
+ $readConfig = $this->getReadConfig($config);
+
+ return $this->createConnector($readConfig)->connect($readConfig);
+ }
+
+ /**
+ * Get the read configuration for a read / write connection.
+ *
+ * @param array $config
+ * @return array
+ */
+ protected function getReadConfig(array $config)
+ {
+ $readConfig = $this->getReadWriteConfig($config, 'read');
+
+ if (isset($readConfig['host']) && is_array($readConfig['host'])) {
+ $readConfig['host'] = count($readConfig['host']) > 1
+ ? $readConfig['host'][array_rand($readConfig['host'])]
+ : $readConfig['host'][0];
+ }
+
+ return $this->mergeReadWriteConfig($config, $readConfig);
+ }
+
+ /**
+ * Get the read configuration for a read / write connection.
+ *
+ * @param array $config
+ * @return array
+ */
+ protected function getWriteConfig(array $config)
+ {
+ $writeConfig = $this->getReadWriteConfig($config, 'write');
+
+ return $this->mergeReadWriteConfig($config, $writeConfig);
+ }
+
+ /**
+ * Get a read / write level configuration.
+ *
+ * @param array $config
+ * @param string $type
+ * @return array
+ */
+ protected function getReadWriteConfig(array $config, $type)
+ {
+ if (isset($config[$type][0])) {
+ return $config[$type][array_rand($config[$type])];
+ }
+
+ return $config[$type];
+ }
+
+ /**
+ * Merge a configuration for a read / write connection.
+ *
+ * @param array $config
+ * @param array $merge
+ * @return array
+ */
+ protected function mergeReadWriteConfig(array $config, array $merge)
+ {
+ return Arr::except(array_merge($config, $merge), ['read', 'write']);
+ }
+
+ /**
+ * Parse and prepare the database configuration.
+ *
+ * @param array $config
+ * @param string $name
+ * @return array
+ */
+ protected function parseConfig(array $config, $name)
+ {
+ return Arr::add(Arr::add($config, 'prefix', ''), 'name', $name);
+ }
+
+ /**
+ * Create a connector instance based on the configuration.
+ *
+ * @param array $config
+ * @return \Illuminate\Database\Connectors\ConnectorInterface
+ *
+ * @throws \InvalidArgumentException
+ */
+ 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;
+ case 'pgsql':
+ return new PostgresConnector;
+ case 'sqlite':
+ return new SQLiteConnector;
+ case 'sqlsrv':
+ return new SqlServerConnector;
+ }
+
+ throw new InvalidArgumentException("Unsupported driver [{$config['driver']}]");
+ }
+
+ /**
+ * Create a new connection instance.
+ *
+ * @param string $driver
+ * @param \PDO $connection
+ * @param string $database
+ * @param string $prefix
+ * @param array $config
+ * @return \Illuminate\Database\Connection
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function createConnection($driver, PDO $connection, $database, $prefix = '', array $config = [])
+ {
+ if ($this->container->bound($key = "db.connection.{$driver}")) {
+ return $this->container->make($key, [$connection, $database, $prefix, $config]);
+ }
+
+ switch ($driver) {
+ case 'mysql':
+ return new MySqlConnection($connection, $database, $prefix, $config);
+ case 'pgsql':
+ return new PostgresConnection($connection, $database, $prefix, $config);
+ case 'sqlite':
+ return new SQLiteConnection($connection, $database, $prefix, $config);
+ case 'sqlsrv':
+ return new SqlServerConnection($connection, $database, $prefix, $config);
+ }
+
+ throw new InvalidArgumentException("Unsupported driver [$driver]");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php
index 6c388e0..ea2637c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php
@@ -1,71 +1,106 @@
- PDO::CASE_NATURAL,
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+ PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
+ PDO::ATTR_STRINGIFY_FETCHES => false,
+ PDO::ATTR_EMULATE_PREPARES => false,
+ ];
-class Connector {
+ /**
+ * Get the PDO options based on the configuration.
+ *
+ * @param array $config
+ * @return array
+ */
+ public function getOptions(array $config)
+ {
+ $options = Arr::get($config, 'options', []);
- /**
- * The default PDO connection options.
- *
- * @var array
- */
- protected $options = array(
- PDO::ATTR_CASE => PDO::CASE_NATURAL,
- PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
- PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
- PDO::ATTR_STRINGIFY_FETCHES => false,
- PDO::ATTR_EMULATE_PREPARES => false,
- );
+ return array_diff_key($this->options, $options) + $options;
+ }
- /**
- * Get the PDO options based on the configuration.
- *
- * @param array $config
- * @return array
- */
- public function getOptions(array $config)
- {
- $options = array_get($config, 'options', array());
+ /**
+ * Create a new PDO connection.
+ *
+ * @param string $dsn
+ * @param array $config
+ * @param array $options
+ * @return \PDO
+ */
+ public function createConnection($dsn, array $config, array $options)
+ {
+ $username = Arr::get($config, 'username');
- return array_diff_key($this->options, $options) + $options;
- }
+ $password = Arr::get($config, 'password');
- /**
- * Create a new PDO connection.
- *
- * @param string $dsn
- * @param array $config
- * @param array $options
- * @return \PDO
- */
- public function createConnection($dsn, array $config, array $options)
- {
- $username = array_get($config, 'username');
+ try {
+ $pdo = new PDO($dsn, $username, $password, $options);
+ } catch (Exception $e) {
+ $pdo = $this->tryAgainIfCausedByLostConnection(
+ $e, $dsn, $username, $password, $options
+ );
+ }
- $password = array_get($config, 'password');
+ return $pdo;
+ }
- return new PDO($dsn, $username, $password, $options);
- }
+ /**
+ * Get the default PDO connection options.
+ *
+ * @return array
+ */
+ public function getDefaultOptions()
+ {
+ return $this->options;
+ }
- /**
- * Get the default PDO connection options.
- *
- * @return array
- */
- public function getDefaultOptions()
- {
- return $this->options;
- }
+ /**
+ * Set the default PDO connection options.
+ *
+ * @param array $options
+ * @return void
+ */
+ public function setDefaultOptions(array $options)
+ {
+ $this->options = $options;
+ }
- /**
- * Set the default PDO connection options.
- *
- * @param array $options
- * @return void
- */
- public function setDefaultOptions(array $options)
- {
- $this->options = $options;
- }
+ /**
+ * Handle a exception that occurred during connect execution.
+ *
+ * @param \Exception $e
+ * @param string $dsn
+ * @param string $username
+ * @param string $password
+ * @param array $options
+ * @return \PDO
+ *
+ * @throws \Exception
+ */
+ protected function tryAgainIfCausedByLostConnection(Exception $e, $dsn, $username, $password, $options)
+ {
+ if ($this->causedByLostConnection($e)) {
+ return new PDO($dsn, $username, $password, $options);
+ }
+ throw $e;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectorInterface.php b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectorInterface.php
index c2c76a5..08597ac 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectorInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectorInterface.php
@@ -1,13 +1,14 @@
-getDsn($config);
-
- $options = $this->getOptions($config);
-
- // We need to grab the PDO options that should be used while making the brand
- // new connection instance. The PDO options control various aspects of the
- // connection's behavior, and some might be specified by the developers.
- $connection = $this->createConnection($dsn, $config, $options);
-
- if (isset($config['unix_socket']))
- {
- $connection->exec("use `{$config['database']}`;");
- }
-
- $collation = $config['collation'];
-
- // Next we will set the "names" and "collation" on the clients connections so
- // a correct character set will be used by this client. The collation also
- // is set on the server but needs to be set here on this client objects.
- $charset = $config['charset'];
-
- $names = "set names '$charset'".
- ( ! is_null($collation) ? " collate '$collation'" : '');
-
- $connection->prepare($names)->execute();
-
- // Next, we will check to see if a timezone has been specified in this config
- // and if it has we will issue a statement to modify the timezone with the
- // database. Setting this DB timezone is an optional configuration item.
- if (isset($config['timezone']))
- {
- $connection->prepare(
- 'set time_zone="'.$config['timezone'].'"'
- )->execute();
- }
-
- // If the "strict" option has been configured for the connection we'll enable
- // strict mode on all of these tables. This enforces some extra rules when
- // using the MySQL database system and is a quicker way to enforce them.
- if (isset($config['strict']) && $config['strict'])
- {
- $connection->prepare("set session sql_mode='STRICT_ALL_TABLES'")->execute();
- }
- else
- {
- $connection->prepare("set session sql_mode=''")->execute();
- }
-
- return $connection;
- }
-
- /**
- * Create a DSN string from a configuration.
- *
- * Chooses socket or host/port based on the 'unix_socket' config value.
- *
- * @param array $config
- * @return string
- */
- protected function getDsn(array $config)
- {
- return $this->configHasSocket($config) ? $this->getSocketDsn($config) : $this->getHostDsn($config);
- }
-
- /**
- * Determine if the given configuration array has a UNIX socket value.
- *
- * @param array $config
- * @return bool
- */
- protected function configHasSocket(array $config)
- {
- return isset($config['unix_socket']) && ! empty($config['unix_socket']);
- }
-
- /**
- * Get the DSN string for a socket configuration.
- *
- * @param array $config
- * @return string
- */
- protected function getSocketDsn(array $config)
- {
- extract($config);
-
- return "mysql:unix_socket={$config['unix_socket']};dbname={$database}";
- }
-
- /**
- * Get the DSN string for a host / port configuration.
- *
- * @param array $config
- * @return string
- */
- protected function getHostDsn(array $config)
- {
- extract($config);
-
- return isset($config['port'])
+getDsn($config);
+
+ $options = $this->getOptions($config);
+
+ // We need to grab the PDO options that should be used while making the brand
+ // new connection instance. The PDO options control various aspects of the
+ // connection's behavior, and some might be specified by the developers.
+ $connection = $this->createConnection($dsn, $config, $options);
+
+ if (isset($config['unix_socket'])) {
+ $connection->exec("use `{$config['database']}`;");
+ }
+
+ $collation = $config['collation'];
+
+ // Next we will set the "names" and "collation" on the clients connections so
+ // a correct character set will be used by this client. The collation also
+ // is set on the server but needs to be set here on this client objects.
+ if (isset($config['charset'])) {
+ $charset = $config['charset'];
+
+ $names = "set names '$charset'".
+ (! is_null($collation) ? " collate '$collation'" : '');
+
+ $connection->prepare($names)->execute();
+ }
+ // Next, we will check to see if a timezone has been specified in this config
+ // and if it has we will issue a statement to modify the timezone with the
+ // database. Setting this DB timezone is an optional configuration item.
+ if (isset($config['timezone'])) {
+ $connection->prepare(
+ 'set time_zone="'.$config['timezone'].'"'
+ )->execute();
+ }
+
+ // If the "strict" option has been configured for the connection we will setup
+ // strict mode for this session. Strict mode enforces some extra rules when
+ // using the MySQL database system and is a quicker way to enforce them.
+ if (isset($config['strict'])) {
+ if ($config['strict']) {
+ $connection->prepare("set session sql_mode='STRICT_ALL_TABLES'")->execute();
+ } else {
+ $connection->prepare("set session sql_mode=''")->execute();
+ }
+ }
+
+ return $connection;
+ }
+
+ /**
+ * Create a DSN string from a configuration.
+ *
+ * Chooses socket or host/port based on the 'unix_socket' config value.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getDsn(array $config)
+ {
+ return $this->configHasSocket($config) ? $this->getSocketDsn($config) : $this->getHostDsn($config);
+ }
+
+ /**
+ * Determine if the given configuration array has a UNIX socket value.
+ *
+ * @param array $config
+ * @return bool
+ */
+ protected function configHasSocket(array $config)
+ {
+ return isset($config['unix_socket']) && ! empty($config['unix_socket']);
+ }
+
+ /**
+ * Get the DSN string for a socket configuration.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getSocketDsn(array $config)
+ {
+ return "mysql:unix_socket={$config['unix_socket']};dbname={$config['database']}";
+ }
+
+ /**
+ * Get the DSN string for a host / port configuration.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getHostDsn(array $config)
+ {
+ extract($config, EXTR_SKIP);
+
+ return isset($port)
? "mysql:host={$host};port={$port};dbname={$database}"
: "mysql:host={$host};dbname={$database}";
- }
-
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/PostgresConnector.php b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/PostgresConnector.php
index d725d72..9371c8d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/PostgresConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/PostgresConnector.php
@@ -1,96 +1,117 @@
- PDO::CASE_NATURAL,
- PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
- PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
- PDO::ATTR_STRINGIFY_FETCHES => false,
- );
-
- /**
- * Establish a database connection.
- *
- * @param array $config
- * @return \PDO
- */
- public function connect(array $config)
- {
- // First we'll create the basic DSN and connection instance connecting to the
- // using the configuration option specified by the developer. We will also
- // set the default character set on the connections to UTF-8 by default.
- $dsn = $this->getDsn($config);
-
- $options = $this->getOptions($config);
-
- $connection = $this->createConnection($dsn, $config, $options);
-
- $charset = $config['charset'];
-
- $connection->prepare("set names '$charset'")->execute();
-
- // Next, we will check to see if a timezone has been specified in this config
- // and if it has we will issue a statement to modify the timezone with the
- // database. Setting this DB timezone is an optional configuration item.
- if (isset($config['timezone']))
- {
- $timezone = $config['timezone'];
-
- $connection->prepare("set time zone '$timezone'")->execute();
- }
-
- // Unlike MySQL, Postgres allows the concept of "schema" and a default schema
- // may have been specified on the connections. If that is the case we will
- // set the default schema search paths to the specified database schema.
- if (isset($config['schema']))
- {
- $schema = $config['schema'];
-
- $connection->prepare("set search_path to \"{$schema}\"")->execute();
- }
-
- return $connection;
- }
-
- /**
- * Create a DSN string from a configuration.
- *
- * @param array $config
- * @return string
- */
- protected function getDsn(array $config)
- {
- // First we will create the basic DSN setup as well as the port if it is in
- // in the configuration options. This will give us the basic DSN we will
- // need to establish the PDO connections and return them back for use.
- extract($config);
-
- $host = isset($host) ? "host={$host};" : '';
-
- $dsn = "pgsql:{$host}dbname={$database}";
-
- // If a port was specified, we will add it to this Postgres DSN connections
- // format. Once we have done that we are ready to return this connection
- // string back out for usage, as this has been fully constructed here.
- if (isset($config['port']))
- {
- $dsn .= ";port={$port}";
- }
-
- if (isset($config['sslmode']))
- {
- $dsn .= ";sslmode={$sslmode}";
- }
-
- return $dsn;
- }
+use PDO;
+class PostgresConnector extends Connector implements ConnectorInterface
+{
+ /**
+ * The default PDO connection options.
+ *
+ * @var array
+ */
+ protected $options = [
+ PDO::ATTR_CASE => PDO::CASE_NATURAL,
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+ PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
+ PDO::ATTR_STRINGIFY_FETCHES => false,
+ ];
+
+ /**
+ * Establish a database connection.
+ *
+ * @param array $config
+ * @return \PDO
+ */
+ public function connect(array $config)
+ {
+ // First we'll create the basic DSN and connection instance connecting to the
+ // using the configuration option specified by the developer. We will also
+ // set the default character set on the connections to UTF-8 by default.
+ $dsn = $this->getDsn($config);
+
+ $options = $this->getOptions($config);
+
+ $connection = $this->createConnection($dsn, $config, $options);
+
+ $charset = $config['charset'];
+
+ $connection->prepare("set names '$charset'")->execute();
+
+ // Next, we will check to see if a timezone has been specified in this config
+ // and if it has we will issue a statement to modify the timezone with the
+ // database. Setting this DB timezone is an optional configuration item.
+ if (isset($config['timezone'])) {
+ $timezone = $config['timezone'];
+
+ $connection->prepare("set time zone '$timezone'")->execute();
+ }
+
+ // Unlike MySQL, Postgres allows the concept of "schema" and a default schema
+ // may have been specified on the connections. If that is the case we will
+ // set the default schema search paths to the specified database schema.
+ if (isset($config['schema'])) {
+ $schema = $this->formatSchema($config['schema']);
+
+ $connection->prepare("set search_path to {$schema}")->execute();
+ }
+
+ // Postgres allows an application_name to be set by the user and this name is
+ // used to when monitoring the application with pg_stat_activity. So we'll
+ // determine if the option has been specified and run a statement if so.
+ if (isset($config['application_name'])) {
+ $applicationName = $config['application_name'];
+
+ $connection->prepare("set application_name to '$applicationName'")->execute();
+ }
+
+ return $connection;
+ }
+
+ /**
+ * Create a DSN string from a configuration.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getDsn(array $config)
+ {
+ // First we will create the basic DSN setup as well as the port if it is in
+ // in the configuration options. This will give us the basic DSN we will
+ // need to establish the PDO connections and return them back for use.
+ extract($config, EXTR_SKIP);
+
+ $host = isset($host) ? "host={$host};" : '';
+
+ $dsn = "pgsql:{$host}dbname={$database}";
+
+ // If a port was specified, we will add it to this Postgres DSN connections
+ // format. Once we have done that we are ready to return this connection
+ // string back out for usage, as this has been fully constructed here.
+ if (isset($config['port'])) {
+ $dsn .= ";port={$port}";
+ }
+
+ if (isset($config['sslmode'])) {
+ $dsn .= ";sslmode={$sslmode}";
+ }
+
+ return $dsn;
+ }
+
+ /**
+ * Format the schema for the DSN.
+ *
+ * @param array|string $schema
+ * @return string
+ */
+ protected function formatSchema($schema)
+ {
+ if (is_array($schema)) {
+ return '"'.implode('", "', $schema).'"';
+ } else {
+ return '"'.$schema.'"';
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php
index 697a72b..28f9091 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php
@@ -1,40 +1,39 @@
-getOptions($config);
-
- // SQLite supports "in-memory" databases that only last as long as the owning
- // connection does. These are useful for tests or for short lifetime store
- // querying. In-memory databases may only have a single open connection.
- if ($config['database'] == ':memory:')
- {
- return $this->createConnection('sqlite::memory:', $config, $options);
- }
+namespace Illuminate\Database\Connectors;
- $path = realpath($config['database']);
-
- // Here we'll verify that the SQLite database exists before going any further
- // as the developer probably wants to know if the database exists and this
- // SQLite driver will not throw any exception if it does not by default.
- if ($path === false)
- {
- throw new InvalidArgumentException("Database does not exist.");
- }
-
- return $this->createConnection("sqlite:{$path}", $config, $options);
- }
+use InvalidArgumentException;
+class SQLiteConnector extends Connector implements ConnectorInterface
+{
+ /**
+ * Establish a database connection.
+ *
+ * @param array $config
+ * @return \PDO
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function connect(array $config)
+ {
+ $options = $this->getOptions($config);
+
+ // SQLite supports "in-memory" databases that only last as long as the owning
+ // connection does. These are useful for tests or for short lifetime store
+ // querying. In-memory databases may only have a single open connection.
+ if ($config['database'] == ':memory:') {
+ return $this->createConnection('sqlite::memory:', $config, $options);
+ }
+
+ $path = realpath($config['database']);
+
+ // Here we'll verify that the SQLite database exists before going any further
+ // as the developer probably wants to know if the database exists and this
+ // SQLite driver will not throw any exception if it does not by default.
+ if ($path === false) {
+ throw new InvalidArgumentException("Database (${config['database']}) does not exist.");
+ }
+
+ return $this->createConnection("sqlite:{$path}", $config, $options);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php
index 020cbaf..46e0b84 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php
@@ -1,142 +1,137 @@
- PDO::CASE_NATURAL,
- PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
- PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
- PDO::ATTR_STRINGIFY_FETCHES => false,
- );
-
- /**
- * Establish a database connection.
- *
- * @param array $config
- * @return \PDO
- */
- public function connect(array $config)
- {
- $options = $this->getOptions($config);
-
- return $this->createConnection($this->getDsn($config), $config, $options);
- }
-
- /**
- * Create a DSN string from a configuration.
- *
- * @param array $config
- * @return string
- */
- protected function getDsn(array $config)
- {
- // First we will create the basic DSN setup as well as the port if it is in
- // in the configuration options. This will give us the basic DSN we will
- // need to establish the PDO connections and return them back for use.
- if (in_array('dblib', $this->getAvailableDrivers()))
- {
- return $this->getDblibDsn($config);
- }
- else
- {
- return $this->getSqlSrvDsn($config);
- }
- }
-
- /**
- * Get the DSN string for a DbLib connection.
- *
- * @param array $config
- * @return string
- */
- protected function getDblibDsn(array $config)
- {
- $arguments = array(
- 'host' => $this->buildHostString($config, ':'),
- 'dbname' => $config['database']
- );
-
- $arguments = array_merge(
- $arguments, array_only($config, ['appname', 'charset'])
- );
-
- return $this->buildConnectString('dblib', $arguments);
- }
-
- /**
- * Get the DSN string for a SqlSrv connection.
- *
- * @param array $config
- * @return string
- */
- protected function getSqlSrvDsn(array $config)
- {
- $arguments = array(
- 'Server' => $this->buildHostString($config, ',')
- );
-
- if (isset($config['database'])) {
- $arguments['Database'] = $config['database'];
- }
-
- if (isset($config['appname'])) {
- $arguments['APP'] = $config['appname'];
- }
-
- return $this->buildConnectString('sqlsrv', $arguments);
- }
-
- /**
- * Build a connection string from the given arguments.
- *
- * @param string $driver
- * @param array $arguments
- * @return string
- */
- protected function buildConnectString($driver, array $arguments)
- {
- $options = array_map(function($key) use ($arguments)
- {
- return sprintf("%s=%s", $key, $arguments[$key]);
- }, array_keys($arguments));
-
- return $driver.":".implode(';', $options);
- }
-
- /**
- * Build a host string from the given configuration.
- *
- * @param array $config
- * @param string $separator
- * @return string
- */
- protected function buildHostString(array $config, $separator)
- {
- if(isset($config['port']))
- {
- return $config['host'].$separator.$config['port'];
- }
- else
- {
- return $config['host'];
- }
- }
-
- /**
- * Get the available PDO drivers.
- *
- * @return array
- */
- protected function getAvailableDrivers()
- {
- return PDO::getAvailableDrivers();
- }
+namespace Illuminate\Database\Connectors;
+use PDO;
+use Illuminate\Support\Arr;
+
+class SqlServerConnector extends Connector implements ConnectorInterface
+{
+ /**
+ * The PDO connection options.
+ *
+ * @var array
+ */
+ protected $options = [
+ PDO::ATTR_CASE => PDO::CASE_NATURAL,
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+ PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL,
+ PDO::ATTR_STRINGIFY_FETCHES => false,
+ ];
+
+ /**
+ * Establish a database connection.
+ *
+ * @param array $config
+ * @return \PDO
+ */
+ public function connect(array $config)
+ {
+ $options = $this->getOptions($config);
+
+ return $this->createConnection($this->getDsn($config), $config, $options);
+ }
+
+ /**
+ * Create a DSN string from a configuration.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getDsn(array $config)
+ {
+ // First we will create the basic DSN setup as well as the port if it is in
+ // in the configuration options. This will give us the basic DSN we will
+ // need to establish the PDO connections and return them back for use.
+ if (in_array('dblib', $this->getAvailableDrivers())) {
+ return $this->getDblibDsn($config);
+ } else {
+ return $this->getSqlSrvDsn($config);
+ }
+ }
+
+ /**
+ * Get the DSN string for a DbLib connection.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getDblibDsn(array $config)
+ {
+ $arguments = [
+ 'host' => $this->buildHostString($config, ':'),
+ 'dbname' => $config['database'],
+ ];
+
+ $arguments = array_merge(
+ $arguments, Arr::only($config, ['appname', 'charset'])
+ );
+
+ return $this->buildConnectString('dblib', $arguments);
+ }
+
+ /**
+ * Get the DSN string for a SqlSrv connection.
+ *
+ * @param array $config
+ * @return string
+ */
+ protected function getSqlSrvDsn(array $config)
+ {
+ $arguments = [
+ 'Server' => $this->buildHostString($config, ','),
+ ];
+
+ if (isset($config['database'])) {
+ $arguments['Database'] = $config['database'];
+ }
+
+ if (isset($config['appname'])) {
+ $arguments['APP'] = $config['appname'];
+ }
+
+ return $this->buildConnectString('sqlsrv', $arguments);
+ }
+
+ /**
+ * Build a connection string from the given arguments.
+ *
+ * @param string $driver
+ * @param array $arguments
+ * @return string
+ */
+ protected function buildConnectString($driver, array $arguments)
+ {
+ $options = array_map(function ($key) use ($arguments) {
+ return sprintf('%s=%s', $key, $arguments[$key]);
+ }, array_keys($arguments));
+
+ return $driver.':'.implode(';', $options);
+ }
+
+ /**
+ * Build a host string from the given configuration.
+ *
+ * @param array $config
+ * @param string $separator
+ * @return string
+ */
+ protected function buildHostString(array $config, $separator)
+ {
+ if (isset($config['port'])) {
+ return $config['host'].$separator.$config['port'];
+ } else {
+ return $config['host'];
+ }
+ }
+
+ /**
+ * Get the available PDO drivers.
+ *
+ * @return array
+ */
+ protected function getAvailableDrivers()
+ {
+ return PDO::getAvailableDrivers();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php
index 6300755..f3459ac 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php
@@ -1,17 +1,18 @@
-laravel->databasePath().'/migrations';
- }
+use Illuminate\Console\Command;
+class BaseCommand extends Command
+{
+ /**
+ * Get the path to the migration directory.
+ *
+ * @return string
+ */
+ protected function getMigrationPath()
+ {
+ return $this->laravel->databasePath().'/migrations';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php
index d89c0c4..103dcaa 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php
@@ -1,69 +1,70 @@
-repository = $repository;
- }
+ /**
+ * Create a new migration install command instance.
+ *
+ * @param \Illuminate\Database\Migrations\MigrationRepositoryInterface $repository
+ * @return void
+ */
+ public function __construct(MigrationRepositoryInterface $repository)
+ {
+ parent::__construct();
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->repository->setSource($this->input->getOption('database'));
+ $this->repository = $repository;
+ }
- $this->repository->createRepository();
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->repository->setSource($this->input->getOption('database'));
- $this->info("Migration table created successfully.");
- }
+ $this->repository->createRepository();
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'),
- );
- }
+ $this->info('Migration table created successfully.');
+ }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php
index 148325c..920d417 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php
@@ -1,129 +1,126 @@
-migrator = $migrator;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- if ( ! $this->confirmToProceed()) return;
-
- $this->prepareDatabase();
-
- // The pretend option can be used for "simulating" the migration and grabbing
- // the SQL queries that would fire if the migration were to be run against
- // a database for real, which is helpful for double checking migrations.
- $pretend = $this->input->getOption('pretend');
-
- // Next, we will check to see if a path option has been defined. If it has
- // we will use the path relative to the root of this installation folder
- // so that migrations may be run for any path within the applications.
- if ( ! is_null($path = $this->input->getOption('path')))
- {
- $path = $this->laravel->basePath().'/'.$path;
- }
- else
- {
- $path = $this->getMigrationPath();
- }
-
- $this->migrator->run($path, $pretend);
-
- // Once the migrator has run we will grab the note output and send it out to
- // the console screen, since the migrator itself functions without having
- // any instances of the OutputInterface contract passed into the class.
- foreach ($this->migrator->getNotes() as $note)
- {
- $this->output->writeln($note);
- }
-
- // Finally, if the "seed" option has been given, we will re-run the database
- // seed task to re-populate the database, which is convenient when adding
- // a migration and a seed at the same time, as it is only this command.
- if ($this->input->getOption('seed'))
- {
- $this->call('db:seed', ['--force' => true]);
- }
- }
-
- /**
- * Prepare the migration database for running.
- *
- * @return void
- */
- protected function prepareDatabase()
- {
- $this->migrator->setConnection($this->input->getOption('database'));
-
- if ( ! $this->migrator->repositoryExists())
- {
- $options = array('--database' => $this->input->getOption('database'));
-
- $this->call('migrate:install', $options);
- }
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'),
-
- array('force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'),
-
- array('path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'),
-
- array('pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'),
-
- array('seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'),
- );
- }
-
+class MigrateCommand extends BaseCommand
+{
+ use ConfirmableTrait;
+
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'migrate';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Run the database migrations';
+
+ /**
+ * The migrator instance.
+ *
+ * @var \Illuminate\Database\Migrations\Migrator
+ */
+ protected $migrator;
+
+ /**
+ * Create a new migration command instance.
+ *
+ * @param \Illuminate\Database\Migrations\Migrator $migrator
+ * @return void
+ */
+ public function __construct(Migrator $migrator)
+ {
+ parent::__construct();
+
+ $this->migrator = $migrator;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (! $this->confirmToProceed()) {
+ return;
+ }
+
+ $this->prepareDatabase();
+
+ // The pretend option can be used for "simulating" the migration and grabbing
+ // the SQL queries that would fire if the migration were to be run against
+ // a database for real, which is helpful for double checking migrations.
+ $pretend = $this->input->getOption('pretend');
+
+ // Next, we will check to see if a path option has been defined. If it has
+ // we will use the path relative to the root of this installation folder
+ // so that migrations may be run for any path within the applications.
+ if (! is_null($path = $this->input->getOption('path'))) {
+ $path = $this->laravel->basePath().'/'.$path;
+ } else {
+ $path = $this->getMigrationPath();
+ }
+
+ $this->migrator->run($path, $pretend);
+
+ // Once the migrator has run we will grab the note output and send it out to
+ // the console screen, since the migrator itself functions without having
+ // any instances of the OutputInterface contract passed into the class.
+ foreach ($this->migrator->getNotes() as $note) {
+ $this->output->writeln($note);
+ }
+
+ // Finally, if the "seed" option has been given, we will re-run the database
+ // seed task to re-populate the database, which is convenient when adding
+ // a migration and a seed at the same time, as it is only this command.
+ if ($this->input->getOption('seed')) {
+ $this->call('db:seed', ['--force' => true]);
+ }
+ }
+
+ /**
+ * Prepare the migration database for running.
+ *
+ * @return void
+ */
+ protected function prepareDatabase()
+ {
+ $this->migrator->setConnection($this->input->getOption('database'));
+
+ if (! $this->migrator->repositoryExists()) {
+ $options = ['--database' => $this->input->getOption('database')];
+
+ $this->call('migrate:install', $options);
+ }
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+
+ ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+
+ ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
+
+ ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'],
+
+ ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php
index 2aafca6..8c78790 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php
@@ -1,120 +1,114 @@
-creator = $creator;
- $this->composer = $composer;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- // It's possible for the developer to specify the tables to modify in this
- // schema operation. The developer may also specify if this table needs
- // to be freshly created so we can create the appropriate migrations.
- $name = $this->input->getArgument('name');
-
- $table = $this->input->getOption('table');
-
- $create = $this->input->getOption('create');
-
- if ( ! $table && is_string($create)) $table = $create;
-
- // Now we are ready to write the migration out to disk. Once we've written
- // the migration out, we will dump-autoload for the entire framework to
- // make sure that the migrations are registered by the class loaders.
- $this->writeMigration($name, $table, $create);
-
- $this->composer->dumpAutoloads();
- }
-
- /**
- * Write the migration file to disk.
- *
- * @param string $name
- * @param string $table
- * @param bool $create
- * @return string
- */
- protected function writeMigration($name, $table, $create)
- {
- $path = $this->getMigrationPath();
-
- $file = pathinfo($this->creator->create($name, $path, $table, $create), PATHINFO_FILENAME);
-
- $this->line("Created Migration: $file");
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('name', InputArgument::REQUIRED, 'The name of the migration'),
- );
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('create', null, InputOption::VALUE_OPTIONAL, 'The table to be created.'),
-
- array('table', null, InputOption::VALUE_OPTIONAL, 'The table to migrate.'),
- );
- }
-
+class MigrateMakeCommand extends BaseCommand
+{
+ /**
+ * The console command signature.
+ *
+ * @var string
+ */
+ protected $signature = 'make:migration {name : The name of the migration.}
+ {--create= : The table to be created.}
+ {--table= : The table to migrate.}
+ {--path= : The location where the migration file should be created.}';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a new migration file';
+
+ /**
+ * The migration creator instance.
+ *
+ * @var \Illuminate\Database\Migrations\MigrationCreator
+ */
+ protected $creator;
+
+ /**
+ * The Composer instance.
+ *
+ * @var \Illuminate\Foundation\Composer
+ */
+ protected $composer;
+
+ /**
+ * Create a new migration install command instance.
+ *
+ * @param \Illuminate\Database\Migrations\MigrationCreator $creator
+ * @param \Illuminate\Foundation\Composer $composer
+ * @return void
+ */
+ public function __construct(MigrationCreator $creator, Composer $composer)
+ {
+ parent::__construct();
+
+ $this->creator = $creator;
+ $this->composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ // It's possible for the developer to specify the tables to modify in this
+ // schema operation. The developer may also specify if this table needs
+ // to be freshly created so we can create the appropriate migrations.
+ $name = trim($this->input->getArgument('name'));
+
+ $table = $this->input->getOption('table');
+
+ $create = $this->input->getOption('create');
+
+ if (! $table && is_string($create)) {
+ $table = $create;
+ }
+
+ // Now we are ready to write the migration out to disk. Once we've written
+ // the migration out, we will dump-autoload for the entire framework to
+ // make sure that the migrations are registered by the class loaders.
+ $this->writeMigration($name, $table, $create);
+
+ $this->composer->dumpAutoloads();
+ }
+
+ /**
+ * Write the migration file to disk.
+ *
+ * @param string $name
+ * @param string $table
+ * @param bool $create
+ * @return string
+ */
+ protected function writeMigration($name, $table, $create)
+ {
+ $path = $this->getMigrationPath();
+
+ $file = pathinfo($this->creator->create($name, $path, $table, $create), PATHINFO_FILENAME);
+
+ $this->line("Created Migration: $file");
+ }
+
+ /**
+ * Get migration path (either specified by '--path' option or default location).
+ *
+ * @return string
+ */
+ protected function getMigrationPath()
+ {
+ if (! is_null($targetPath = $this->input->getOption('path'))) {
+ return $this->laravel->basePath().'/'.$targetPath;
+ }
+
+ return parent::getMigrationPath();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php
index 8ee4e09..ce4e8f1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php
@@ -1,100 +1,108 @@
-confirmToProceed()) return;
-
- $database = $this->input->getOption('database');
-
- $force = $this->input->getOption('force');
-
- $this->call('migrate:reset', array(
- '--database' => $database, '--force' => $force,
- ));
-
- // The refresh command is essentially just a brief aggregate of a few other of
- // the migration commands and just provides a convenient wrapper to execute
- // them in succession. We'll also see if we need to re-seed the database.
- $this->call('migrate', array(
- '--database' => $database, '--force' => $force,
- ));
-
- if ($this->needsSeeding())
- {
- $this->runSeeder($database);
- }
- }
-
- /**
- * Determine if the developer has requested database seeding.
- *
- * @return bool
- */
- protected function needsSeeding()
- {
- return $this->option('seed') || $this->option('seeder');
- }
-
- /**
- * Run the database seeder command.
- *
- * @param string $database
- * @return void
- */
- protected function runSeeder($database)
- {
- $class = $this->option('seeder') ?: 'DatabaseSeeder';
-
- $force = $this->input->getOption('force');
-
- $this->call('db:seed', array(
- '--database' => $database, '--class' => $class, '--force' => $force,
- ));
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'),
-
- array('force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'),
-
- array('seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'),
-
- array('seeder', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder.'),
- );
- }
-
+class RefreshCommand extends Command
+{
+ use ConfirmableTrait;
+
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'migrate:refresh';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Reset and re-run all migrations';
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (! $this->confirmToProceed()) {
+ return;
+ }
+
+ $database = $this->input->getOption('database');
+
+ $force = $this->input->getOption('force');
+
+ $path = $this->input->getOption('path');
+
+ $this->call('migrate:reset', [
+ '--database' => $database, '--force' => $force,
+ ]);
+
+ // The refresh command is essentially just a brief aggregate of a few other of
+ // the migration commands and just provides a convenient wrapper to execute
+ // them in succession. We'll also see if we need to re-seed the database.
+ $this->call('migrate', [
+ '--database' => $database,
+ '--force' => $force,
+ '--path' => $path,
+ ]);
+
+ if ($this->needsSeeding()) {
+ $this->runSeeder($database);
+ }
+ }
+
+ /**
+ * Determine if the developer has requested database seeding.
+ *
+ * @return bool
+ */
+ protected function needsSeeding()
+ {
+ return $this->option('seed') || $this->option('seeder');
+ }
+
+ /**
+ * Run the database seeder command.
+ *
+ * @param string $database
+ * @return void
+ */
+ protected function runSeeder($database)
+ {
+ $class = $this->option('seeder') ?: 'DatabaseSeeder';
+
+ $force = $this->input->getOption('force');
+
+ $this->call('db:seed', [
+ '--database' => $database, '--class' => $class, '--force' => $force,
+ ]);
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+
+ ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+
+ ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
+
+ ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'],
+
+ ['seeder', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php
index 2ff6905..8871d3d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php
@@ -1,93 +1,94 @@
-migrator = $migrator;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- if ( ! $this->confirmToProceed()) return;
-
- $this->migrator->setConnection($this->input->getOption('database'));
-
- if ( ! $this->migrator->repositoryExists())
- {
- $this->output->writeln('Migration table not found.');
-
- return;
- }
-
- $pretend = $this->input->getOption('pretend');
-
- $this->migrator->reset($pretend);
-
- // Once the migrator has run we will grab the note output and send it out to
- // the console screen, since the migrator itself functions without having
- // any instances of the OutputInterface contract passed into the class.
- foreach ($this->migrator->getNotes() as $note)
- {
- $this->output->writeln($note);
- }
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'),
-
- array('force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'),
-
- array('pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'),
- );
- }
-
+class ResetCommand extends Command
+{
+ use ConfirmableTrait;
+
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'migrate:reset';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Rollback all database migrations';
+
+ /**
+ * The migrator instance.
+ *
+ * @var \Illuminate\Database\Migrations\Migrator
+ */
+ protected $migrator;
+
+ /**
+ * Create a new migration rollback command instance.
+ *
+ * @param \Illuminate\Database\Migrations\Migrator $migrator
+ * @return void
+ */
+ public function __construct(Migrator $migrator)
+ {
+ parent::__construct();
+
+ $this->migrator = $migrator;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (! $this->confirmToProceed()) {
+ return;
+ }
+
+ $this->migrator->setConnection($this->input->getOption('database'));
+
+ if (! $this->migrator->repositoryExists()) {
+ $this->output->writeln('Migration table not found.');
+
+ return;
+ }
+
+ $pretend = $this->input->getOption('pretend');
+
+ $this->migrator->reset($pretend);
+
+ // Once the migrator has run we will grab the note output and send it out to
+ // the console screen, since the migrator itself functions without having
+ // any instances of the OutputInterface contract passed into the class.
+ foreach ($this->migrator->getNotes() as $note) {
+ $this->output->writeln($note);
+ }
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+
+ ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+
+ ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php
index c11198f..a341b4f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php
@@ -1,86 +1,88 @@
-migrator = $migrator;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- if ( ! $this->confirmToProceed()) return;
-
- $this->migrator->setConnection($this->input->getOption('database'));
-
- $pretend = $this->input->getOption('pretend');
-
- $this->migrator->rollback($pretend);
-
- // Once the migrator has run we will grab the note output and send it out to
- // the console screen, since the migrator itself functions without having
- // any instances of the OutputInterface contract passed into the class.
- foreach ($this->migrator->getNotes() as $note)
- {
- $this->output->writeln($note);
- }
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'),
-
- array('force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'),
-
- array('pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'),
- );
- }
-
+class RollbackCommand extends Command
+{
+ use ConfirmableTrait;
+
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'migrate:rollback';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Rollback the last database migration';
+
+ /**
+ * The migrator instance.
+ *
+ * @var \Illuminate\Database\Migrations\Migrator
+ */
+ protected $migrator;
+
+ /**
+ * Create a new migration rollback command instance.
+ *
+ * @param \Illuminate\Database\Migrations\Migrator $migrator
+ * @return void
+ */
+ public function __construct(Migrator $migrator)
+ {
+ parent::__construct();
+
+ $this->migrator = $migrator;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (! $this->confirmToProceed()) {
+ return;
+ }
+
+ $this->migrator->setConnection($this->input->getOption('database'));
+
+ $pretend = $this->input->getOption('pretend');
+
+ $this->migrator->rollback($pretend);
+
+ // Once the migrator has run we will grab the note output and send it out to
+ // the console screen, since the migrator itself functions without having
+ // any instances of the OutputInterface contract passed into the class.
+ foreach ($this->migrator->getNotes() as $note) {
+ $this->output->writeln($note);
+ }
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+
+ ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+
+ ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php
index 5405ac9..aba7acf 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php
@@ -1,82 +1,102 @@
-migrator = $migrator;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (! $this->migrator->repositoryExists()) {
+ return $this->error('No migrations found.');
+ }
+
+ $this->migrator->setConnection($this->input->getOption('database'));
+
+ if (! is_null($path = $this->input->getOption('path'))) {
+ $path = $this->laravel->basePath().'/'.$path;
+ } else {
+ $path = $this->getMigrationPath();
+ }
+
+ $ran = $this->migrator->getRepository()->getRan();
+
+ $migrations = [];
+
+ foreach ($this->getAllMigrationFiles($path) as $migration) {
+ $migrations[] = in_array($migration, $ran) ? ['Y', $migration] : ['N', $migration];
+ }
+
+ if (count($migrations) > 0) {
+ $this->table(['Ran?', 'Migration'], $migrations);
+ } else {
+ $this->error('No migrations found');
+ }
+ }
+
+ /**
+ * Get all of the migration files.
+ *
+ * @param string $path
+ * @return array
+ */
+ protected function getAllMigrationFiles($path)
+ {
+ return $this->migrator->getMigrationFiles($path);
+ }
-class StatusCommand extends BaseCommand {
-
- /**
- * The console command name.
- *
- * @var string
- */
- protected $name = 'migrate:status';
-
- /**
- * The console command description.
- *
- * @var string
- */
- protected $description = 'Show the status of each migration';
-
- /**
- * The migrator instance.
- *
- * @var \Illuminate\Database\Migrations\Migrator
- */
- protected $migrator;
-
- /**
- * Create a new migration rollback command instance.
- *
- * @param \Illuminate\Database\Migrations\Migrator $migrator
- * @return \Illuminate\Database\Console\Migrations\StatusCommand
- */
- public function __construct(Migrator $migrator)
- {
- parent::__construct();
-
- $this->migrator = $migrator;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- if ( ! $this->migrator->repositoryExists())
- {
- return $this->error('No migrations found.');
- }
-
- $ran = $this->migrator->getRepository()->getRan();
-
- $migrations = [];
-
- foreach ($this->getAllMigrationFiles() as $migration)
- {
- $migrations[] = in_array($migration, $ran) ? ['Y', $migration] : ['N', $migration];
- }
-
- if (count($migrations) > 0)
- {
- $this->table(['Ran?', 'Migration'], $migrations);
- }
- else
- {
- $this->error('No migrations found');
- }
- }
-
- /**
- * Get all of the migration files.
- *
- * @return array
- */
- protected function getAllMigrationFiles()
- {
- return $this->migrator->getMigrationFiles($this->getMigrationPath());
- }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+ ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to use.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/SeedCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/SeedCommand.php
deleted file mode 100644
index cba115b..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Console/SeedCommand.php
+++ /dev/null
@@ -1,100 +0,0 @@
-resolver = $resolver;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- if ( ! $this->confirmToProceed()) return;
-
- $this->resolver->setDefaultConnection($this->getDatabase());
-
- $this->getSeeder()->run();
- }
-
- /**
- * Get a seeder instance from the container.
- *
- * @return \Illuminate\Database\Seeder
- */
- protected function getSeeder()
- {
- $class = $this->laravel->make($this->input->getOption('class'));
-
- return $class->setContainer($this->laravel)->setCommand($this);
- }
-
- /**
- * Get the name of the database connection to use.
- *
- * @return string
- */
- protected function getDatabase()
- {
- $database = $this->input->getOption('database');
-
- return $database ?: $this->laravel['config']['database.default'];
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('class', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder', 'DatabaseSeeder'),
-
- array('database', null, InputOption::VALUE_OPTIONAL, 'The database connection to seed'),
-
- array('force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'),
- );
- }
-
-}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php
new file mode 100644
index 0000000..f74164b
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php
@@ -0,0 +1,103 @@
+resolver = $resolver;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (! $this->confirmToProceed()) {
+ return;
+ }
+
+ $this->resolver->setDefaultConnection($this->getDatabase());
+
+ $this->getSeeder()->run();
+ }
+
+ /**
+ * Get a seeder instance from the container.
+ *
+ * @return \Illuminate\Database\Seeder
+ */
+ protected function getSeeder()
+ {
+ $class = $this->laravel->make($this->input->getOption('class'));
+
+ return $class->setContainer($this->laravel)->setCommand($this);
+ }
+
+ /**
+ * Get the name of the database connection to use.
+ *
+ * @return string
+ */
+ protected function getDatabase()
+ {
+ $database = $this->input->getOption('database');
+
+ return $database ?: $this->laravel['config']['database.default'];
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['class', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder', 'DatabaseSeeder'],
+
+ ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to seed'],
+
+ ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+ ];
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php
new file mode 100644
index 0000000..06a83c1
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php
@@ -0,0 +1,96 @@
+composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ parent::fire();
+
+ $this->composer->dumpAutoloads();
+ }
+
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ return __DIR__.'/stubs/seeder.stub';
+ }
+
+ /**
+ * Get the destination class path.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function getPath($name)
+ {
+ return $this->laravel->databasePath().'/seeds/'.$name.'.php';
+ }
+
+ /**
+ * Parse the name and format according to the root namespace.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function parseName($name)
+ {
+ return $name;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub
new file mode 100644
index 0000000..4aa3845
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub
@@ -0,0 +1,16 @@
+app = $app;
- $this->factory = $factory;
- }
-
- /**
- * Get a database connection instance.
- *
- * @param string $name
- * @return \Illuminate\Database\Connection
- */
- public function connection($name = null)
- {
- list($name, $type) = $this->parseConnectionName($name);
-
- // If we haven't created this connection, we'll create it based on the config
- // provided in the application. Once we've created the connections we will
- // set the "fetch mode" for PDO which determines the query return types.
- if ( ! isset($this->connections[$name]))
- {
- $connection = $this->makeConnection($name);
-
- $this->setPdoForType($connection, $type);
-
- $this->connections[$name] = $this->prepare($connection);
- }
-
- return $this->connections[$name];
- }
-
- /**
- * Parse the connection into an array of the name and read / write type.
- *
- * @param string $name
- * @return array
- */
- protected function parseConnectionName($name)
- {
- $name = $name ?: $this->getDefaultConnection();
-
- return Str::endsWith($name, ['::read', '::write'])
+class DatabaseManager implements ConnectionResolverInterface
+{
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The database connection factory instance.
+ *
+ * @var \Illuminate\Database\Connectors\ConnectionFactory
+ */
+ protected $factory;
+
+ /**
+ * The active connection instances.
+ *
+ * @var array
+ */
+ protected $connections = [];
+
+ /**
+ * The custom connection resolvers.
+ *
+ * @var array
+ */
+ protected $extensions = [];
+
+ /**
+ * Create a new database manager instance.
+ *
+ * @param \Illuminate\Foundation\Application $app
+ * @param \Illuminate\Database\Connectors\ConnectionFactory $factory
+ * @return void
+ */
+ public function __construct($app, ConnectionFactory $factory)
+ {
+ $this->app = $app;
+ $this->factory = $factory;
+ }
+
+ /**
+ * Get a database connection instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\Connection
+ */
+ public function connection($name = null)
+ {
+ list($name, $type) = $this->parseConnectionName($name);
+
+ // If we haven't created this connection, we'll create it based on the config
+ // provided in the application. Once we've created the connections we will
+ // set the "fetch mode" for PDO which determines the query return types.
+ if (! isset($this->connections[$name])) {
+ $connection = $this->makeConnection($name);
+
+ $this->setPdoForType($connection, $type);
+
+ $this->connections[$name] = $this->prepare($connection);
+ }
+
+ return $this->connections[$name];
+ }
+
+ /**
+ * Parse the connection into an array of the name and read / write type.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function parseConnectionName($name)
+ {
+ $name = $name ?: $this->getDefaultConnection();
+
+ return Str::endsWith($name, ['::read', '::write'])
? explode('::', $name, 2) : [$name, null];
- }
-
- /**
- * Disconnect from the given database and remove from local cache.
- *
- * @param string $name
- * @return void
- */
- public function purge($name = null)
- {
- $this->disconnect($name);
-
- unset($this->connections[$name]);
- }
-
- /**
- * Disconnect from the given database.
- *
- * @param string $name
- * @return void
- */
- public function disconnect($name = null)
- {
- if (isset($this->connections[$name = $name ?: $this->getDefaultConnection()]))
- {
- $this->connections[$name]->disconnect();
- }
- }
-
- /**
- * Reconnect to the given database.
- *
- * @param string $name
- * @return \Illuminate\Database\Connection
- */
- public function reconnect($name = null)
- {
- $this->disconnect($name = $name ?: $this->getDefaultConnection());
-
- if ( ! isset($this->connections[$name]))
- {
- return $this->connection($name);
- }
-
- return $this->refreshPdoConnections($name);
- }
-
- /**
- * Refresh the PDO connections on a given connection.
- *
- * @param string $name
- * @return \Illuminate\Database\Connection
- */
- protected function refreshPdoConnections($name)
- {
- $fresh = $this->makeConnection($name);
-
- return $this->connections[$name]
+ }
+
+ /**
+ * Disconnect from the given database and remove from local cache.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function purge($name = null)
+ {
+ $this->disconnect($name);
+
+ unset($this->connections[$name]);
+ }
+
+ /**
+ * Disconnect from the given database.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function disconnect($name = null)
+ {
+ if (isset($this->connections[$name = $name ?: $this->getDefaultConnection()])) {
+ $this->connections[$name]->disconnect();
+ }
+ }
+
+ /**
+ * Reconnect to the given database.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\Connection
+ */
+ public function reconnect($name = null)
+ {
+ $this->disconnect($name = $name ?: $this->getDefaultConnection());
+
+ if (! isset($this->connections[$name])) {
+ return $this->connection($name);
+ }
+
+ return $this->refreshPdoConnections($name);
+ }
+
+ /**
+ * Refresh the PDO connections on a given connection.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\Connection
+ */
+ protected function refreshPdoConnections($name)
+ {
+ $fresh = $this->makeConnection($name);
+
+ return $this->connections[$name]
->setPdo($fresh->getPdo())
->setReadPdo($fresh->getReadPdo());
- }
-
- /**
- * Make the database connection instance.
- *
- * @param string $name
- * @return \Illuminate\Database\Connection
- */
- protected function makeConnection($name)
- {
- $config = $this->getConfig($name);
-
- // First we will check by the connection name to see if an extension has been
- // registered specifically for that connection. If it has we will call the
- // 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, $name);
- }
-
- $driver = $config['driver'];
-
- // Next we will check to see if an extension has been registered for a driver
- // and will call the Closure if so, which allows us to have a more generic
- // resolver for the drivers themselves which applies to all connections.
- if (isset($this->extensions[$driver]))
- {
- return call_user_func($this->extensions[$driver], $config, $name);
- }
-
- return $this->factory->make($config, $name);
- }
-
- /**
- * Prepare the database connection instance.
- *
- * @param \Illuminate\Database\Connection $connection
- * @return \Illuminate\Database\Connection
- */
- protected function prepare(Connection $connection)
- {
- $connection->setFetchMode($this->app['config']['database.fetch']);
-
- if ($this->app->bound('events'))
- {
- $connection->setEventDispatcher($this->app['events']);
- }
-
- // Here we'll set a reconnector callback. This reconnector can be any callable
- // so we will set a Closure to reconnect from this manager with the name of
- // the connection, which will allow us to reconnect from the connections.
- $connection->setReconnector(function($connection)
- {
- $this->reconnect($connection->getName());
- });
-
- return $connection;
- }
-
- /**
- * Prepare the read write mode for database connection instance.
- *
- * @param \Illuminate\Database\Connection $connection
- * @param string $type
- * @return \Illuminate\Database\Connection
- */
- protected function setPdoForType(Connection $connection, $type = null)
- {
- if ($type == 'read')
- {
- $connection->setPdo($connection->getReadPdo());
- }
- elseif ($type == 'write')
- {
- $connection->setReadPdo($connection->getPdo());
- }
-
- return $connection;
- }
-
- /**
- * Get the configuration for a connection.
- *
- * @param string $name
- * @return array
- *
- * @throws \InvalidArgumentException
- */
- protected function getConfig($name)
- {
- $name = $name ?: $this->getDefaultConnection();
-
- // To get the database connection configuration, we will just pull each of the
- // connection configurations and get the configurations for the given name.
- // If the configuration doesn't exist, we'll throw an exception and bail.
- $connections = $this->app['config']['database.connections'];
-
- if (is_null($config = array_get($connections, $name)))
- {
- throw new InvalidArgumentException("Database [$name] not configured.");
- }
-
- return $config;
- }
-
- /**
- * Get the default connection name.
- *
- * @return string
- */
- public function getDefaultConnection()
- {
- return $this->app['config']['database.default'];
- }
-
- /**
- * Set the default connection name.
- *
- * @param string $name
- * @return void
- */
- public function setDefaultConnection($name)
- {
- $this->app['config']['database.default'] = $name;
- }
-
- /**
- * Register an extension connection resolver.
- *
- * @param string $name
- * @param callable $resolver
- * @return void
- */
- public function extend($name, callable $resolver)
- {
- $this->extensions[$name] = $resolver;
- }
-
- /**
- * Return all of the created connections.
- *
- * @return array
- */
- public function getConnections()
- {
- return $this->connections;
- }
-
- /**
- * Dynamically pass methods to the default connection.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array(array($this->connection(), $method), $parameters);
- }
-
+ }
+
+ /**
+ * Make the database connection instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\Connection
+ */
+ protected function makeConnection($name)
+ {
+ $config = $this->getConfig($name);
+
+ // First we will check by the connection name to see if an extension has been
+ // registered specifically for that connection. If it has we will call the
+ // 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, $name);
+ }
+
+ $driver = $config['driver'];
+
+ // Next we will check to see if an extension has been registered for a driver
+ // and will call the Closure if so, which allows us to have a more generic
+ // resolver for the drivers themselves which applies to all connections.
+ if (isset($this->extensions[$driver])) {
+ return call_user_func($this->extensions[$driver], $config, $name);
+ }
+
+ return $this->factory->make($config, $name);
+ }
+
+ /**
+ * Prepare the database connection instance.
+ *
+ * @param \Illuminate\Database\Connection $connection
+ * @return \Illuminate\Database\Connection
+ */
+ protected function prepare(Connection $connection)
+ {
+ $connection->setFetchMode($this->app['config']['database.fetch']);
+
+ if ($this->app->bound('events')) {
+ $connection->setEventDispatcher($this->app['events']);
+ }
+
+ // Here we'll set a reconnector callback. This reconnector can be any callable
+ // so we will set a Closure to reconnect from this manager with the name of
+ // the connection, which will allow us to reconnect from the connections.
+ $connection->setReconnector(function ($connection) {
+ $this->reconnect($connection->getName());
+ });
+
+ return $connection;
+ }
+
+ /**
+ * Prepare the read write mode for database connection instance.
+ *
+ * @param \Illuminate\Database\Connection $connection
+ * @param string $type
+ * @return \Illuminate\Database\Connection
+ */
+ protected function setPdoForType(Connection $connection, $type = null)
+ {
+ if ($type == 'read') {
+ $connection->setPdo($connection->getReadPdo());
+ } elseif ($type == 'write') {
+ $connection->setReadPdo($connection->getPdo());
+ }
+
+ return $connection;
+ }
+
+ /**
+ * Get the configuration for a connection.
+ *
+ * @param string $name
+ * @return array
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function getConfig($name)
+ {
+ $name = $name ?: $this->getDefaultConnection();
+
+ // To get the database connection configuration, we will just pull each of the
+ // connection configurations and get the configurations for the given name.
+ // If the configuration doesn't exist, we'll throw an exception and bail.
+ $connections = $this->app['config']['database.connections'];
+
+ if (is_null($config = Arr::get($connections, $name))) {
+ throw new InvalidArgumentException("Database [$name] not configured.");
+ }
+
+ return $config;
+ }
+
+ /**
+ * Get the default connection name.
+ *
+ * @return string
+ */
+ public function getDefaultConnection()
+ {
+ return $this->app['config']['database.default'];
+ }
+
+ /**
+ * Set the default connection name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultConnection($name)
+ {
+ $this->app['config']['database.default'] = $name;
+ }
+
+ /**
+ * Register an extension connection resolver.
+ *
+ * @param string $name
+ * @param callable $resolver
+ * @return void
+ */
+ public function extend($name, callable $resolver)
+ {
+ $this->extensions[$name] = $resolver;
+ }
+
+ /**
+ * Return all of the created connections.
+ *
+ * @return array
+ */
+ public function getConnections()
+ {
+ return $this->connections;
+ }
+
+ /**
+ * Dynamically pass methods to the default connection.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->connection(), $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php
index adb10b0..64d9d4b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php
@@ -1,61 +1,88 @@
-app['db']);
+
+ Model::setEventDispatcher($this->app['events']);
+ }
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ Model::clearBootedModels();
+
+ $this->registerEloquentFactory();
+
+ $this->registerQueueableEntityResolver();
+
+ // The connection factory is used to create the actual connection instances on
+ // the database. We will inject the factory into the manager so that it may
+ // make the connections while they are actually needed and not of before.
+ $this->app->singleton('db.factory', function ($app) {
+ return new ConnectionFactory($app);
+ });
+
+ // The database manager is used to resolve various connections, since multiple
+ // connections might be managed. It also implements the connection resolver
+ // interface which may be used by other components requiring connections.
+ $this->app->singleton('db', function ($app) {
+ return new DatabaseManager($app, $app['db.factory']);
+ });
+
+ $this->app->bind('db.connection', function ($app) {
+ return $app['db']->connection();
+ });
+ }
+
+ /**
+ * Register the Eloquent factory instance in the container.
+ *
+ * @return void
+ */
+ protected function registerEloquentFactory()
+ {
+ $this->app->singleton(FakerGenerator::class, function () {
+ return FakerFactory::create();
+ });
+
+ $this->app->singleton(EloquentFactory::class, function ($app) {
+ $faker = $app->make(FakerGenerator::class);
-class DatabaseServiceProvider extends ServiceProvider {
-
- /**
- * Bootstrap the application events.
- *
- * @return void
- */
- public function boot()
- {
- Model::setConnectionResolver($this->app['db']);
-
- Model::setEventDispatcher($this->app['events']);
- }
-
- /**
- * Register the service provider.
- *
- * @return void
- */
- public function register()
- {
- $this->registerQueueableEntityResolver();
-
- // The connection factory is used to create the actual connection instances on
- // the database. We will inject the factory into the manager so that it may
- // make the connections while they are actually needed and not of before.
- $this->app->singleton('db.factory', function($app)
- {
- return new ConnectionFactory($app);
- });
-
- // The database manager is used to resolve various connections, since multiple
- // connections might be managed. It also implements the connection resolver
- // interface which may be used by other components requiring connections.
- $this->app->singleton('db', function($app)
- {
- return new DatabaseManager($app, $app['db.factory']);
- });
- }
-
- /**
- * Register the queueable entity resolver implementation.
- *
- * @return void
- */
- protected function registerQueueableEntityResolver()
- {
- $this->app->singleton('Illuminate\Contracts\Queue\EntityResolver', function()
- {
- return new QueueEntityResolver;
- });
- }
+ return EloquentFactory::construct($faker, database_path('factories'));
+ });
+ }
+ /**
+ * Register the queueable entity resolver implementation.
+ *
+ * @return void
+ */
+ protected function registerQueueableEntityResolver()
+ {
+ $this->app->singleton('Illuminate\Contracts\Queue\EntityResolver', function () {
+ return new QueueEntityResolver;
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php b/application/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php
new file mode 100644
index 0000000..bee3482
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php
@@ -0,0 +1,33 @@
+getMessage();
+
+ return Str::contains($message, [
+ 'server has gone away',
+ 'no connection to the server',
+ 'Lost connection',
+ 'is dead or not enabled',
+ 'Error while sending',
+ 'decryption failed or bad record mac',
+ 'server closed the connection unexpectedly',
+ 'SSL connection has been closed unexpectedly',
+ 'Error writing data to the connection',
+ 'Resource deadlock avoided',
+ ]);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php
index 4ea4ab3..5e45ba7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php
@@ -1,948 +1,1029 @@
-query = $query;
- }
-
- /**
- * Find a model by its primary key.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|null
- */
- public function find($id, $columns = array('*'))
- {
- if (is_array($id))
- {
- return $this->findMany($id, $columns);
- }
-
- $this->query->where($this->model->getQualifiedKeyName(), '=', $id);
-
- return $this->first($columns);
- }
-
- /**
- * Find a model by its primary key.
- *
- * @param array $ids
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public function findMany($ids, $columns = array('*'))
- {
- if (empty($ids)) return $this->model->newCollection();
-
- $this->query->whereIn($this->model->getQualifiedKeyName(), $ids);
-
- return $this->get($columns);
- }
-
- /**
- * Find a model by its primary key or throw an exception.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection
- *
- * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
- */
- public function findOrFail($id, $columns = array('*'))
- {
- $result = $this->find($id, $columns);
-
- if (is_array($id))
- {
- if (count($result) == count(array_unique($id))) return $result;
- }
- elseif ( ! is_null($result))
- {
- return $result;
- }
-
- throw (new ModelNotFoundException)->setModel(get_class($this->model));
- }
-
- /**
- * Execute the query and get the first result.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model|static|null
- */
- public function first($columns = array('*'))
- {
- return $this->take(1)->get($columns)->first();
- }
-
- /**
- * Execute the query and get the first result or throw an exception.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model|static
- *
- * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
- */
- public function firstOrFail($columns = array('*'))
- {
- if ( ! is_null($model = $this->first($columns))) return $model;
-
- throw (new ModelNotFoundException)->setModel(get_class($this->model));
- }
-
- /**
- * Execute the query as a "select" statement.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Collection|static[]
- */
- public function get($columns = array('*'))
- {
- $models = $this->getModels($columns);
-
- // If we actually found models we will also eager load any relationships that
- // have been specified as needing to be eager loaded, which will solve the
- // n+1 query issue for the developers to avoid running a lot of queries.
- if (count($models) > 0)
- {
- $models = $this->eagerLoadRelations($models);
- }
-
- return $this->model->newCollection($models);
- }
-
- /**
- * Pluck a single column from the database.
- *
- * @param string $column
- * @return mixed
- */
- public function pluck($column)
- {
- $result = $this->first(array($column));
-
- if ($result) return $result->{$column};
- }
-
- /**
- * Chunk the results of the query.
- *
- * @param int $count
- * @param callable $callback
- * @return void
- */
- public function chunk($count, callable $callback)
- {
- $results = $this->forPage($page = 1, $count)->get();
-
- while (count($results) > 0)
- {
- // On each chunk result set, we will pass them to the callback and then let the
- // developer take care of everything within the callback, which allows us to
- // keep the memory low for spinning through large result sets for working.
- call_user_func($callback, $results);
-
- $page++;
-
- $results = $this->forPage($page, $count)->get();
- }
- }
-
- /**
- * Get an array with the values of a given column.
- *
- * @param string $column
- * @param string $key
- * @return array
- */
- public function lists($column, $key = null)
- {
- $results = $this->query->lists($column, $key);
-
- // If the model has a mutator for the requested column, we will spin through
- // the results and mutate the values so that the mutated version of these
- // columns are returned as you would expect from these Eloquent models.
- if ($this->model->hasGetMutator($column))
- {
- foreach ($results as $key => &$value)
- {
- $fill = array($column => $value);
-
- $value = $this->model->newFromBuilder($fill)->$column;
- }
- }
-
- return $results;
- }
-
- /**
- * Paginate the given query.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
- */
- public function paginate($perPage = null, $columns = ['*'])
- {
- $total = $this->query->getCountForPagination();
-
- $this->query->forPage(
- $page = Paginator::resolveCurrentPage(),
- $perPage = $perPage ?: $this->model->getPerPage()
- );
-
- return new LengthAwarePaginator($this->get($columns), $total, $perPage, $page, [
- 'path' => Paginator::resolveCurrentPath(),
- ]);
- }
-
- /**
- * Paginate the given query into a simple paginator.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\Paginator
- */
- public function simplePaginate($perPage = null, $columns = ['*'])
- {
- $page = Paginator::resolveCurrentPage();
-
- $perPage = $perPage ?: $this->model->getPerPage();
-
- $this->skip(($page - 1) * $perPage)->take($perPage + 1);
-
- return new Paginator($this->get($columns), $perPage, $page, [
- 'path' => Paginator::resolveCurrentPath(),
- ]);
- }
-
- /**
- * Update a record in the database.
- *
- * @param array $values
- * @return int
- */
- public function update(array $values)
- {
- return $this->query->update($this->addUpdatedAtColumn($values));
- }
-
- /**
- * Increment a column's value by a given amount.
- *
- * @param string $column
- * @param int $amount
- * @param array $extra
- * @return int
- */
- public function increment($column, $amount = 1, array $extra = array())
- {
- $extra = $this->addUpdatedAtColumn($extra);
-
- return $this->query->increment($column, $amount, $extra);
- }
-
- /**
- * Decrement a column's value by a given amount.
- *
- * @param string $column
- * @param int $amount
- * @param array $extra
- * @return int
- */
- public function decrement($column, $amount = 1, array $extra = array())
- {
- $extra = $this->addUpdatedAtColumn($extra);
-
- return $this->query->decrement($column, $amount, $extra);
- }
-
- /**
- * Add the "updated at" column to an array of values.
- *
- * @param array $values
- * @return array
- */
- protected function addUpdatedAtColumn(array $values)
- {
- if ( ! $this->model->usesTimestamps()) return $values;
-
- $column = $this->model->getUpdatedAtColumn();
-
- return array_add($values, $column, $this->model->freshTimestampString());
- }
-
- /**
- * Delete a record from the database.
- *
- * @return mixed
- */
- public function delete()
- {
- if (isset($this->onDelete))
- {
- return call_user_func($this->onDelete, $this);
- }
-
- return $this->query->delete();
- }
-
- /**
- * Run the default delete function on the builder.
- *
- * @return mixed
- */
- public function forceDelete()
- {
- return $this->query->delete();
- }
-
- /**
- * Register a replacement for the default delete function.
- *
- * @param \Closure $callback
- * @return void
- */
- public function onDelete(Closure $callback)
- {
- $this->onDelete = $callback;
- }
-
- /**
- * Get the hydrated models without eager loading.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model[]
- */
- public function getModels($columns = array('*'))
- {
- $results = $this->query->get($columns);
-
- $connection = $this->model->getConnectionName();
-
- return $this->model->hydrate($results, $connection)->all();
- }
-
- /**
- * Eager load the relationships for the models.
- *
- * @param array $models
- * @return array
- */
- public function eagerLoadRelations(array $models)
- {
- foreach ($this->eagerLoad as $name => $constraints)
- {
- // For nested eager loads we'll skip loading them here and they will be set as an
- // eager load on the query to retrieve the relation so that they will be eager
- // loaded on that query, because that is where they get hydrated as models.
- if (strpos($name, '.') === false)
- {
- $models = $this->loadRelation($models, $name, $constraints);
- }
- }
-
- return $models;
- }
-
- /**
- * Eagerly load the relationship on a set of models.
- *
- * @param array $models
- * @param string $name
- * @param \Closure $constraints
- * @return array
- */
- protected function loadRelation(array $models, $name, Closure $constraints)
- {
- // First we will "back up" the existing where conditions on the query so we can
- // add our eager constraints. Then we will merge the wheres that were on the
- // query back to it in order that any where conditions might be specified.
- $relation = $this->getRelation($name);
-
- $relation->addEagerConstraints($models);
-
- call_user_func($constraints, $relation);
-
- $models = $relation->initRelation($models, $name);
-
- // Once we have the results, we just match those back up to their parent models
- // using the relationship instance. Then we just return the finished arrays
- // of models which have been eagerly hydrated and are readied for return.
- $results = $relation->getEager();
-
- return $relation->match($models, $results, $name);
- }
-
- /**
- * Get the relation instance for the given relation name.
- *
- * @param string $relation
- * @return \Illuminate\Database\Eloquent\Relations\Relation
- */
- public function getRelation($relation)
- {
- // We want to run a relationship query without any constrains so that we will
- // not have to remove these where clauses manually which gets really hacky
- // and is error prone while we remove the developer's own where clauses.
- $query = Relation::noConstraints(function() use ($relation)
- {
- return $this->getModel()->$relation();
- });
-
- $nested = $this->nestedRelations($relation);
-
- // If there are nested relationships set on the query, we will put those onto
- // the query instances so that they can be handled after this relationship
- // is loaded. In this way they will all trickle down as they are loaded.
- if (count($nested) > 0)
- {
- $query->getQuery()->with($nested);
- }
-
- return $query;
- }
-
- /**
- * Get the deeply nested relations for a given top-level relation.
- *
- * @param string $relation
- * @return array
- */
- protected function nestedRelations($relation)
- {
- $nested = array();
-
- // We are basically looking for any relationships that are nested deeper than
- // the given top-level relationship. We will just check for any relations
- // that start with the given top relations and adds them to our arrays.
- foreach ($this->eagerLoad as $name => $constraints)
- {
- if ($this->isNested($name, $relation))
- {
- $nested[substr($name, strlen($relation.'.'))] = $constraints;
- }
- }
-
- return $nested;
- }
-
- /**
- * Determine if the relationship is nested.
- *
- * @param string $name
- * @param string $relation
- * @return bool
- */
- protected function isNested($name, $relation)
- {
- $dots = str_contains($name, '.');
-
- return $dots && starts_with($name, $relation.'.');
- }
-
- /**
- * Add a basic where clause to the query.
- *
- * @param string $column
- * @param string $operator
- * @param mixed $value
- * @param string $boolean
- * @return $this
- */
- public function where($column, $operator = null, $value = null, $boolean = 'and')
- {
- if ($column instanceof Closure)
- {
- $query = $this->model->newQueryWithoutScopes();
-
- call_user_func($column, $query);
-
- $this->query->addNestedWhereQuery($query->getQuery(), $boolean);
- }
- else
- {
- call_user_func_array(array($this->query, 'where'), func_get_args());
- }
-
- return $this;
- }
-
- /**
- * Add an "or where" clause to the query.
- *
- * @param string $column
- * @param string $operator
- * @param mixed $value
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function orWhere($column, $operator = null, $value = null)
- {
- return $this->where($column, $operator, $value, 'or');
- }
-
- /**
- * Add a relationship count condition to the query.
- *
- * @param string $relation
- * @param string $operator
- * @param int $count
- * @param string $boolean
- * @param \Closure|null $callback
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null)
- {
- if (strpos($relation, '.') !== false)
- {
- return $this->hasNested($relation, $operator, $count, $boolean, $callback);
- }
-
- $relation = $this->getHasRelationQuery($relation);
-
- $query = $relation->getRelationCountQuery($relation->getRelated()->newQuery(), $this);
-
- if ($callback) call_user_func($callback, $query);
-
- return $this->addHasWhere($query, $relation, $operator, $count, $boolean);
- }
-
- /**
- * Add nested relationship count conditions to the query.
- *
- * @param string $relations
- * @param string $operator
- * @param int $count
- * @param string $boolean
- * @param \Closure $callback
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- protected function hasNested($relations, $operator = '>=', $count = 1, $boolean = 'and', $callback = null)
- {
- $relations = explode('.', $relations);
-
- // In order to nest "has", we need to add count relation constraints on the
- // callback Closure. We'll do this by simply passing the Closure its own
- // reference to itself so it calls itself recursively on each segment.
- $closure = function ($q) use (&$closure, &$relations, $operator, $count, $boolean, $callback)
- {
- if (count($relations) > 1)
- {
- $q->whereHas(array_shift($relations), $closure);
- }
- else
- {
- $q->has(array_shift($relations), $operator, $count, 'and', $callback);
- }
- };
-
- return $this->has(array_shift($relations), '>=', 1, $boolean, $closure);
- }
-
- /**
- * Add a relationship count condition to the query.
- *
- * @param string $relation
- * @param string $boolean
- * @param \Closure|null $callback
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function doesntHave($relation, $boolean = 'and', Closure $callback = null)
- {
- return $this->has($relation, '<', 1, $boolean, $callback);
- }
-
- /**
- * Add a relationship count condition to the query with where clauses.
- *
- * @param string $relation
- * @param \Closure $callback
- * @param string $operator
- * @param int $count
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function whereHas($relation, Closure $callback, $operator = '>=', $count = 1)
- {
- return $this->has($relation, $operator, $count, 'and', $callback);
- }
-
- /**
- * Add a relationship count condition to the query with where clauses.
- *
- * @param string $relation
- * @param \Closure|null $callback
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function whereDoesntHave($relation, Closure $callback = null)
- {
- return $this->doesntHave($relation, 'and', $callback);
- }
-
- /**
- * Add a relationship count condition to the query with an "or".
- *
- * @param string $relation
- * @param string $operator
- * @param int $count
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function orHas($relation, $operator = '>=', $count = 1)
- {
- return $this->has($relation, $operator, $count, 'or');
- }
-
- /**
- * Add a relationship count condition to the query with where clauses and an "or".
- *
- * @param string $relation
- * @param \Closure $callback
- * @param string $operator
- * @param int $count
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function orWhereHas($relation, Closure $callback, $operator = '>=', $count = 1)
- {
- return $this->has($relation, $operator, $count, 'or', $callback);
- }
-
- /**
- * Add the "has" condition where clause to the query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $hasQuery
- * @param \Illuminate\Database\Eloquent\Relations\Relation $relation
- * @param string $operator
- * @param int $count
- * @param string $boolean
- * @return \Illuminate\Database\Eloquent\Builder
- */
- protected function addHasWhere(Builder $hasQuery, Relation $relation, $operator, $count, $boolean)
- {
- $this->mergeWheresToHas($hasQuery, $relation);
-
- if (is_numeric($count))
- {
- $count = new Expression($count);
- }
-
- return $this->where(new Expression('('.$hasQuery->toSql().')'), $operator, $count, $boolean);
- }
-
- /**
- * Merge the "wheres" from a relation query to a has query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $hasQuery
- * @param \Illuminate\Database\Eloquent\Relations\Relation $relation
- * @return void
- */
- protected function mergeWheresToHas(Builder $hasQuery, Relation $relation)
- {
- // Here we have the "has" query and the original relation. We need to copy over any
- // where clauses the developer may have put in the relationship function over to
- // the has query, and then copy the bindings from the "has" query to the main.
- $relationQuery = $relation->getBaseQuery();
-
- $hasQuery = $hasQuery->getModel()->removeGlobalScopes($hasQuery);
-
- $hasQuery->mergeWheres(
- $relationQuery->wheres, $relationQuery->getBindings()
- );
-
- $this->query->mergeBindings($hasQuery->getQuery());
- }
-
- /**
- * Get the "has relation" base query instance.
- *
- * @param string $relation
- * @return \Illuminate\Database\Eloquent\Builder
- */
- protected function getHasRelationQuery($relation)
- {
- return Relation::noConstraints(function() use ($relation)
- {
- return $this->getModel()->$relation();
- });
- }
-
- /**
- * Set the relationships that should be eager loaded.
- *
- * @param mixed $relations
- * @return $this
- */
- public function with($relations)
- {
- if (is_string($relations)) $relations = func_get_args();
-
- $eagers = $this->parseRelations($relations);
-
- $this->eagerLoad = array_merge($this->eagerLoad, $eagers);
-
- return $this;
- }
-
- /**
- * Parse a list of relations into individuals.
- *
- * @param array $relations
- * @return array
- */
- protected function parseRelations(array $relations)
- {
- $results = array();
-
- foreach ($relations as $name => $constraints)
- {
- // If the "relation" value is actually a numeric key, we can assume that no
- // constraints have been specified for the eager load and we'll just put
- // an empty Closure with the loader so that we can treat all the same.
- if (is_numeric($name))
- {
- $f = function() {};
-
- list($name, $constraints) = array($constraints, $f);
- }
-
- // We need to separate out any nested includes. Which allows the developers
- // to load deep relationships using "dots" without stating each level of
- // the relationship with its own key in the array of eager load names.
- $results = $this->parseNested($name, $results);
-
- $results[$name] = $constraints;
- }
-
- return $results;
- }
-
- /**
- * Parse the nested relationships in a relation.
- *
- * @param string $name
- * @param array $results
- * @return array
- */
- protected function parseNested($name, $results)
- {
- $progress = array();
-
- // If the relation has already been set on the result array, we will not set it
- // again, since that would override any constraints that were already placed
- // on the relationships. We will only set the ones that are not specified.
- foreach (explode('.', $name) as $segment)
- {
- $progress[] = $segment;
-
- if ( ! isset($results[$last = implode('.', $progress)]))
- {
- $results[$last] = function() {};
- }
- }
-
- return $results;
- }
-
- /**
- * Call the given model scope on the underlying model.
- *
- * @param string $scope
- * @param array $parameters
- * @return \Illuminate\Database\Query\Builder
- */
- protected function callScope($scope, $parameters)
- {
- array_unshift($parameters, $this);
-
- return call_user_func_array(array($this->model, $scope), $parameters) ?: $this;
- }
-
- /**
- * Get the underlying query builder instance.
- *
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function getQuery()
- {
- return $this->query;
- }
-
- /**
- * Set the underlying query builder instance.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return $this
- */
- public function setQuery($query)
- {
- $this->query = $query;
-
- return $this;
- }
-
- /**
- * Get the relationships being eagerly loaded.
- *
- * @return array
- */
- public function getEagerLoads()
- {
- return $this->eagerLoad;
- }
-
- /**
- * Set the relationships being eagerly loaded.
- *
- * @param array $eagerLoad
- * @return $this
- */
- public function setEagerLoads(array $eagerLoad)
- {
- $this->eagerLoad = $eagerLoad;
-
- return $this;
- }
-
- /**
- * Get the model instance being queried.
- *
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function getModel()
- {
- return $this->model;
- }
-
- /**
- * Set a model instance for the model being queried.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return $this
- */
- public function setModel(Model $model)
- {
- $this->model = $model;
-
- $this->query->from($model->getTable());
-
- return $this;
- }
-
- /**
- * Extend the builder with a given callback.
- *
- * @param string $name
- * @param \Closure $callback
- * @return void
- */
- public function macro($name, Closure $callback)
- {
- $this->macros[$name] = $callback;
- }
-
- /**
- * Get the given macro by name.
- *
- * @param string $name
- * @return \Closure
- */
- public function getMacro($name)
- {
- return array_get($this->macros, $name);
- }
-
- /**
- * Dynamically handle calls into the query instance.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- if (isset($this->macros[$method]))
- {
- array_unshift($parameters, $this);
-
- return call_user_func_array($this->macros[$method], $parameters);
- }
- elseif (method_exists($this->model, $scope = 'scope'.ucfirst($method)))
- {
- return $this->callScope($scope, $parameters);
- }
-
- $result = call_user_func_array(array($this->query, $method), $parameters);
-
- return in_array($method, $this->passthru) ? $result : $this;
- }
-
- /**
- * Force a clone of the underlying query builder when cloning.
- *
- * @return void
- */
- public function __clone()
- {
- $this->query = clone $this->query;
- }
-
+class Builder
+{
+ /**
+ * The base query builder instance.
+ *
+ * @var \Illuminate\Database\Query\Builder
+ */
+ protected $query;
+
+ /**
+ * The model being queried.
+ *
+ * @var \Illuminate\Database\Eloquent\Model
+ */
+ protected $model;
+
+ /**
+ * The relationships that should be eager loaded.
+ *
+ * @var array
+ */
+ protected $eagerLoad = [];
+
+ /**
+ * All of the registered builder macros.
+ *
+ * @var array
+ */
+ protected $macros = [];
+
+ /**
+ * A replacement for the typical delete function.
+ *
+ * @var \Closure
+ */
+ protected $onDelete;
+
+ /**
+ * The methods that should be returned from query builder.
+ *
+ * @var array
+ */
+ protected $passthru = [
+ 'insert', 'insertGetId', 'getBindings', 'toSql',
+ 'exists', 'count', 'min', 'max', 'avg', 'sum',
+ ];
+
+ /**
+ * Create a new Eloquent query builder instance.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return void
+ */
+ public function __construct(QueryBuilder $query)
+ {
+ $this->query = $query;
+ }
+
+ /**
+ * Find a model by its primary key.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|null
+ */
+ public function find($id, $columns = ['*'])
+ {
+ if (is_array($id)) {
+ return $this->findMany($id, $columns);
+ }
+
+ $this->query->where($this->model->getQualifiedKeyName(), '=', $id);
+
+ return $this->first($columns);
+ }
+
+ /**
+ * Find a model by its primary key.
+ *
+ * @param array $ids
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public function findMany($ids, $columns = ['*'])
+ {
+ if (empty($ids)) {
+ return $this->model->newCollection();
+ }
+
+ $this->query->whereIn($this->model->getQualifiedKeyName(), $ids);
+
+ return $this->get($columns);
+ }
+
+ /**
+ * Find a model by its primary key or throw an exception.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection
+ *
+ * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+ */
+ public function findOrFail($id, $columns = ['*'])
+ {
+ $result = $this->find($id, $columns);
+
+ if (is_array($id)) {
+ if (count($result) == count(array_unique($id))) {
+ return $result;
+ }
+ } elseif (! is_null($result)) {
+ return $result;
+ }
+
+ throw (new ModelNotFoundException)->setModel(get_class($this->model));
+ }
+
+ /**
+ * Find a model by its primary key or return fresh model instance.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function findOrNew($id, $columns = ['*'])
+ {
+ if (! is_null($model = $this->find($id, $columns))) {
+ return $model;
+ }
+
+ return $this->model->newInstance();
+ }
+
+ /**
+ * Get the first record matching the attributes or instantiate it.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrNew(array $attributes)
+ {
+ if (! is_null($instance = $this->where($attributes)->first())) {
+ return $instance;
+ }
+
+ return $this->model->newInstance($attributes);
+ }
+
+ /**
+ * Get the first record matching the attributes or create it.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrCreate(array $attributes)
+ {
+ if (! is_null($instance = $this->where($attributes)->first())) {
+ return $instance;
+ }
+
+ $instance = $this->model->newInstance($attributes);
+
+ $instance->save();
+
+ return $instance;
+ }
+
+ /**
+ * Create or update a record matching the attributes, and fill it with values.
+ *
+ * @param array $attributes
+ * @param array $values
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function updateOrCreate(array $attributes, array $values = [])
+ {
+ $instance = $this->firstOrNew($attributes);
+
+ $instance->fill($values)->save();
+
+ return $instance;
+ }
+
+ /**
+ * Execute the query and get the first result.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|static|null
+ */
+ public function first($columns = ['*'])
+ {
+ return $this->take(1)->get($columns)->first();
+ }
+
+ /**
+ * Execute the query and get the first result or throw an exception.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|static
+ *
+ * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+ */
+ public function firstOrFail($columns = ['*'])
+ {
+ if (! is_null($model = $this->first($columns))) {
+ return $model;
+ }
+
+ throw (new ModelNotFoundException)->setModel(get_class($this->model));
+ }
+
+ /**
+ * Execute the query as a "select" statement.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Collection|static[]
+ */
+ public function get($columns = ['*'])
+ {
+ $models = $this->getModels($columns);
+
+ // If we actually found models we will also eager load any relationships that
+ // have been specified as needing to be eager loaded, which will solve the
+ // n+1 query issue for the developers to avoid running a lot of queries.
+ if (count($models) > 0) {
+ $models = $this->eagerLoadRelations($models);
+ }
+
+ return $this->model->newCollection($models);
+ }
+
+ /**
+ * Get a single column's value from the first result of a query.
+ *
+ * @param string $column
+ * @return mixed
+ */
+ public function value($column)
+ {
+ $result = $this->first([$column]);
+
+ if ($result) {
+ return $result->{$column};
+ }
+ }
+
+ /**
+ * Get a single column's value from the first result of a query.
+ *
+ * This is an alias for the "value" method.
+ *
+ * @param string $column
+ * @return mixed
+ *
+ * @deprecated since version 5.1.
+ */
+ public function pluck($column)
+ {
+ return $this->value($column);
+ }
+
+ /**
+ * Chunk the results of the query.
+ *
+ * @param int $count
+ * @param callable $callback
+ * @return bool
+ */
+ public function chunk($count, callable $callback)
+ {
+ $results = $this->forPage($page = 1, $count)->get();
+
+ while (count($results) > 0) {
+ // On each chunk result set, we will pass them to the callback and then let the
+ // developer take care of everything within the callback, which allows us to
+ // keep the memory low for spinning through large result sets for working.
+ if (call_user_func($callback, $results) === false) {
+ return false;
+ }
+
+ $page++;
+
+ $results = $this->forPage($page, $count)->get();
+ }
+
+ return true;
+ }
+
+ /**
+ * Get an array with the values of a given column.
+ *
+ * @param string $column
+ * @param string|null $key
+ * @return \Illuminate\Support\Collection
+ */
+ public function lists($column, $key = null)
+ {
+ $results = $this->query->lists($column, $key);
+
+ // If the model has a mutator for the requested column, we will spin through
+ // the results and mutate the values so that the mutated version of these
+ // columns are returned as you would expect from these Eloquent models.
+ if ($this->model->hasGetMutator($column)) {
+ foreach ($results as $key => &$value) {
+ $fill = [$column => $value];
+
+ $value = $this->model->newFromBuilder($fill)->$column;
+ }
+ }
+
+ return collect($results);
+ }
+
+ /**
+ * Paginate the given query.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @param int|null $page
+ * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)
+ {
+ $total = $this->query->getCountForPagination();
+
+ $this->query->forPage(
+ $page = $page ?: Paginator::resolveCurrentPage($pageName),
+ $perPage = $perPage ?: $this->model->getPerPage()
+ );
+
+ return new LengthAwarePaginator($this->get($columns), $total, $perPage, $page, [
+ 'path' => Paginator::resolveCurrentPath(),
+ 'pageName' => $pageName,
+ ]);
+ }
+
+ /**
+ * Paginate the given query into a simple paginator.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @return \Illuminate\Contracts\Pagination\Paginator
+ */
+ public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page')
+ {
+ $page = Paginator::resolveCurrentPage($pageName);
+
+ $perPage = $perPage ?: $this->model->getPerPage();
+
+ $this->skip(($page - 1) * $perPage)->take($perPage + 1);
+
+ return new Paginator($this->get($columns), $perPage, $page, [
+ 'path' => Paginator::resolveCurrentPath(),
+ 'pageName' => $pageName,
+ ]);
+ }
+
+ /**
+ * Update a record in the database.
+ *
+ * @param array $values
+ * @return int
+ */
+ public function update(array $values)
+ {
+ return $this->query->update($this->addUpdatedAtColumn($values));
+ }
+
+ /**
+ * Increment a column's value by a given amount.
+ *
+ * @param string $column
+ * @param int $amount
+ * @param array $extra
+ * @return int
+ */
+ public function increment($column, $amount = 1, array $extra = [])
+ {
+ $extra = $this->addUpdatedAtColumn($extra);
+
+ return $this->query->increment($column, $amount, $extra);
+ }
+
+ /**
+ * Decrement a column's value by a given amount.
+ *
+ * @param string $column
+ * @param int $amount
+ * @param array $extra
+ * @return int
+ */
+ public function decrement($column, $amount = 1, array $extra = [])
+ {
+ $extra = $this->addUpdatedAtColumn($extra);
+
+ return $this->query->decrement($column, $amount, $extra);
+ }
+
+ /**
+ * Add the "updated at" column to an array of values.
+ *
+ * @param array $values
+ * @return array
+ */
+ protected function addUpdatedAtColumn(array $values)
+ {
+ if (! $this->model->usesTimestamps()) {
+ return $values;
+ }
+
+ $column = $this->model->getUpdatedAtColumn();
+
+ return Arr::add($values, $column, $this->model->freshTimestampString());
+ }
+
+ /**
+ * Delete a record from the database.
+ *
+ * @return mixed
+ */
+ public function delete()
+ {
+ if (isset($this->onDelete)) {
+ return call_user_func($this->onDelete, $this);
+ }
+
+ return $this->query->delete();
+ }
+
+ /**
+ * Run the default delete function on the builder.
+ *
+ * @return mixed
+ */
+ public function forceDelete()
+ {
+ return $this->query->delete();
+ }
+
+ /**
+ * Register a replacement for the default delete function.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ public function onDelete(Closure $callback)
+ {
+ $this->onDelete = $callback;
+ }
+
+ /**
+ * Get the hydrated models without eager loading.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model[]
+ */
+ public function getModels($columns = ['*'])
+ {
+ $results = $this->query->get($columns);
+
+ $connection = $this->model->getConnectionName();
+
+ return $this->model->hydrate($results, $connection)->all();
+ }
+
+ /**
+ * Eager load the relationships for the models.
+ *
+ * @param array $models
+ * @return array
+ */
+ public function eagerLoadRelations(array $models)
+ {
+ foreach ($this->eagerLoad as $name => $constraints) {
+ // For nested eager loads we'll skip loading them here and they will be set as an
+ // eager load on the query to retrieve the relation so that they will be eager
+ // loaded on that query, because that is where they get hydrated as models.
+ if (strpos($name, '.') === false) {
+ $models = $this->loadRelation($models, $name, $constraints);
+ }
+ }
+
+ return $models;
+ }
+
+ /**
+ * Eagerly load the relationship on a set of models.
+ *
+ * @param array $models
+ * @param string $name
+ * @param \Closure $constraints
+ * @return array
+ */
+ protected function loadRelation(array $models, $name, Closure $constraints)
+ {
+ // First we will "back up" the existing where conditions on the query so we can
+ // add our eager constraints. Then we will merge the wheres that were on the
+ // query back to it in order that any where conditions might be specified.
+ $relation = $this->getRelation($name);
+
+ $relation->addEagerConstraints($models);
+
+ call_user_func($constraints, $relation);
+
+ $models = $relation->initRelation($models, $name);
+
+ // Once we have the results, we just match those back up to their parent models
+ // using the relationship instance. Then we just return the finished arrays
+ // of models which have been eagerly hydrated and are readied for return.
+ $results = $relation->getEager();
+
+ return $relation->match($models, $results, $name);
+ }
+
+ /**
+ * Get the relation instance for the given relation name.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\Eloquent\Relations\Relation
+ */
+ public function getRelation($name)
+ {
+ // We want to run a relationship query without any constrains so that we will
+ // not have to remove these where clauses manually which gets really hacky
+ // and is error prone while we remove the developer's own where clauses.
+ $relation = Relation::noConstraints(function () use ($name) {
+ return $this->getModel()->$name();
+ });
+
+ $nested = $this->nestedRelations($name);
+
+ // If there are nested relationships set on the query, we will put those onto
+ // the query instances so that they can be handled after this relationship
+ // is loaded. In this way they will all trickle down as they are loaded.
+ if (count($nested) > 0) {
+ $relation->getQuery()->with($nested);
+ }
+
+ return $relation;
+ }
+
+ /**
+ * Get the deeply nested relations for a given top-level relation.
+ *
+ * @param string $relation
+ * @return array
+ */
+ protected function nestedRelations($relation)
+ {
+ $nested = [];
+
+ // We are basically looking for any relationships that are nested deeper than
+ // the given top-level relationship. We will just check for any relations
+ // that start with the given top relations and adds them to our arrays.
+ foreach ($this->eagerLoad as $name => $constraints) {
+ if ($this->isNested($name, $relation)) {
+ $nested[substr($name, strlen($relation.'.'))] = $constraints;
+ }
+ }
+
+ return $nested;
+ }
+
+ /**
+ * Determine if the relationship is nested.
+ *
+ * @param string $name
+ * @param string $relation
+ * @return bool
+ */
+ protected function isNested($name, $relation)
+ {
+ $dots = Str::contains($name, '.');
+
+ return $dots && Str::startsWith($name, $relation.'.');
+ }
+
+ /**
+ * Add a basic where clause to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param mixed $value
+ * @param string $boolean
+ * @return $this
+ */
+ public function where($column, $operator = null, $value = null, $boolean = 'and')
+ {
+ if ($column instanceof Closure) {
+ $query = $this->model->newQueryWithoutScopes();
+
+ call_user_func($column, $query);
+
+ $this->query->addNestedWhereQuery($query->getQuery(), $boolean);
+ } else {
+ call_user_func_array([$this->query, 'where'], func_get_args());
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add an "or where" clause to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param mixed $value
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function orWhere($column, $operator = null, $value = null)
+ {
+ return $this->where($column, $operator, $value, 'or');
+ }
+
+ /**
+ * Add a relationship count condition to the query.
+ *
+ * @param string $relation
+ * @param string $operator
+ * @param int $count
+ * @param string $boolean
+ * @param \Closure|null $callback
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null)
+ {
+ if (strpos($relation, '.') !== false) {
+ return $this->hasNested($relation, $operator, $count, $boolean, $callback);
+ }
+
+ $relation = $this->getHasRelationQuery($relation);
+
+ $query = $relation->getRelationCountQuery($relation->getRelated()->newQuery(), $this);
+
+ if ($callback) {
+ call_user_func($callback, $query);
+ }
+
+ return $this->addHasWhere($query, $relation, $operator, $count, $boolean);
+ }
+
+ /**
+ * Add nested relationship count conditions to the query.
+ *
+ * @param string $relations
+ * @param string $operator
+ * @param int $count
+ * @param string $boolean
+ * @param \Closure|null $callback
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ protected function hasNested($relations, $operator = '>=', $count = 1, $boolean = 'and', $callback = null)
+ {
+ $relations = explode('.', $relations);
+
+ // In order to nest "has", we need to add count relation constraints on the
+ // callback Closure. We'll do this by simply passing the Closure its own
+ // reference to itself so it calls itself recursively on each segment.
+ $closure = function ($q) use (&$closure, &$relations, $operator, $count, $boolean, $callback) {
+ if (count($relations) > 1) {
+ $q->whereHas(array_shift($relations), $closure);
+ } else {
+ $q->has(array_shift($relations), $operator, $count, 'and', $callback);
+ }
+ };
+
+ return $this->has(array_shift($relations), '>=', 1, $boolean, $closure);
+ }
+
+ /**
+ * Add a relationship count condition to the query.
+ *
+ * @param string $relation
+ * @param string $boolean
+ * @param \Closure|null $callback
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function doesntHave($relation, $boolean = 'and', Closure $callback = null)
+ {
+ return $this->has($relation, '<', 1, $boolean, $callback);
+ }
+
+ /**
+ * Add a relationship count condition to the query with where clauses.
+ *
+ * @param string $relation
+ * @param \Closure $callback
+ * @param string $operator
+ * @param int $count
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function whereHas($relation, Closure $callback, $operator = '>=', $count = 1)
+ {
+ return $this->has($relation, $operator, $count, 'and', $callback);
+ }
+
+ /**
+ * Add a relationship count condition to the query with where clauses.
+ *
+ * @param string $relation
+ * @param \Closure|null $callback
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function whereDoesntHave($relation, Closure $callback = null)
+ {
+ return $this->doesntHave($relation, 'and', $callback);
+ }
+
+ /**
+ * Add a relationship count condition to the query with an "or".
+ *
+ * @param string $relation
+ * @param string $operator
+ * @param int $count
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function orHas($relation, $operator = '>=', $count = 1)
+ {
+ return $this->has($relation, $operator, $count, 'or');
+ }
+
+ /**
+ * Add a relationship count condition to the query with where clauses and an "or".
+ *
+ * @param string $relation
+ * @param \Closure $callback
+ * @param string $operator
+ * @param int $count
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function orWhereHas($relation, Closure $callback, $operator = '>=', $count = 1)
+ {
+ return $this->has($relation, $operator, $count, 'or', $callback);
+ }
+
+ /**
+ * Add the "has" condition where clause to the query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $hasQuery
+ * @param \Illuminate\Database\Eloquent\Relations\Relation $relation
+ * @param string $operator
+ * @param int $count
+ * @param string $boolean
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ protected function addHasWhere(Builder $hasQuery, Relation $relation, $operator, $count, $boolean)
+ {
+ $this->mergeWheresToHas($hasQuery, $relation);
+
+ if (is_numeric($count)) {
+ $count = new Expression($count);
+ }
+
+ return $this->where(new Expression('('.$hasQuery->toSql().')'), $operator, $count, $boolean);
+ }
+
+ /**
+ * Merge the "wheres" from a relation query to a has query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $hasQuery
+ * @param \Illuminate\Database\Eloquent\Relations\Relation $relation
+ * @return void
+ */
+ protected function mergeWheresToHas(Builder $hasQuery, Relation $relation)
+ {
+ // Here we have the "has" query and the original relation. We need to copy over any
+ // where clauses the developer may have put in the relationship function over to
+ // the has query, and then copy the bindings from the "has" query to the main.
+ $relationQuery = $relation->getBaseQuery();
+
+ $hasQuery = $hasQuery->getModel()->removeGlobalScopes($hasQuery);
+
+ $whereBindings = array_get($relationQuery->getRawBindings(), 'where', []);
+
+ $hasQuery->mergeWheres($relationQuery->wheres, $whereBindings);
+
+ $this->query->addBinding($hasQuery->getQuery()->getBindings(), 'where');
+ }
+
+ /**
+ * Get the "has relation" base query instance.
+ *
+ * @param string $relation
+ * @return \Illuminate\Database\Eloquent\Relations\Relation
+ */
+ protected function getHasRelationQuery($relation)
+ {
+ return Relation::noConstraints(function () use ($relation) {
+ return $this->getModel()->$relation();
+ });
+ }
+
+ /**
+ * Set the relationships that should be eager loaded.
+ *
+ * @param mixed $relations
+ * @return $this
+ */
+ public function with($relations)
+ {
+ if (is_string($relations)) {
+ $relations = func_get_args();
+ }
+
+ $eagers = $this->parseRelations($relations);
+
+ $this->eagerLoad = array_merge($this->eagerLoad, $eagers);
+
+ return $this;
+ }
+
+ /**
+ * Parse a list of relations into individuals.
+ *
+ * @param array $relations
+ * @return array
+ */
+ protected function parseRelations(array $relations)
+ {
+ $results = [];
+
+ foreach ($relations as $name => $constraints) {
+ // If the "relation" value is actually a numeric key, we can assume that no
+ // constraints have been specified for the eager load and we'll just put
+ // an empty Closure with the loader so that we can treat all the same.
+ if (is_numeric($name)) {
+ $f = function () {
+ //
+ };
+
+ list($name, $constraints) = [$constraints, $f];
+ }
+
+ // We need to separate out any nested includes. Which allows the developers
+ // to load deep relationships using "dots" without stating each level of
+ // the relationship with its own key in the array of eager load names.
+ $results = $this->parseNested($name, $results);
+
+ $results[$name] = $constraints;
+ }
+
+ return $results;
+ }
+
+ /**
+ * Parse the nested relationships in a relation.
+ *
+ * @param string $name
+ * @param array $results
+ * @return array
+ */
+ protected function parseNested($name, $results)
+ {
+ $progress = [];
+
+ // If the relation has already been set on the result array, we will not set it
+ // again, since that would override any constraints that were already placed
+ // on the relationships. We will only set the ones that are not specified.
+ foreach (explode('.', $name) as $segment) {
+ $progress[] = $segment;
+
+ if (! isset($results[$last = implode('.', $progress)])) {
+ $results[$last] = function () {
+ //
+ };
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Call the given model scope on the underlying model.
+ *
+ * @param string $scope
+ * @param array $parameters
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function callScope($scope, $parameters)
+ {
+ array_unshift($parameters, $this);
+
+ return call_user_func_array([$this->model, $scope], $parameters) ?: $this;
+ }
+
+ /**
+ * Get the underlying query builder instance.
+ *
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function getQuery()
+ {
+ return $this->query;
+ }
+
+ /**
+ * Set the underlying query builder instance.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return $this
+ */
+ public function setQuery($query)
+ {
+ $this->query = $query;
+
+ return $this;
+ }
+
+ /**
+ * Get the relationships being eagerly loaded.
+ *
+ * @return array
+ */
+ public function getEagerLoads()
+ {
+ return $this->eagerLoad;
+ }
+
+ /**
+ * Set the relationships being eagerly loaded.
+ *
+ * @param array $eagerLoad
+ * @return $this
+ */
+ public function setEagerLoads(array $eagerLoad)
+ {
+ $this->eagerLoad = $eagerLoad;
+
+ return $this;
+ }
+
+ /**
+ * Get the model instance being queried.
+ *
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function getModel()
+ {
+ return $this->model;
+ }
+
+ /**
+ * Set a model instance for the model being queried.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return $this
+ */
+ public function setModel(Model $model)
+ {
+ $this->model = $model;
+
+ $this->query->from($model->getTable());
+
+ return $this;
+ }
+
+ /**
+ * Extend the builder with a given callback.
+ *
+ * @param string $name
+ * @param \Closure $callback
+ * @return void
+ */
+ public function macro($name, Closure $callback)
+ {
+ $this->macros[$name] = $callback;
+ }
+
+ /**
+ * Get the given macro by name.
+ *
+ * @param string $name
+ * @return \Closure
+ */
+ public function getMacro($name)
+ {
+ return Arr::get($this->macros, $name);
+ }
+
+ /**
+ * Dynamically handle calls into the query instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ if (isset($this->macros[$method])) {
+ array_unshift($parameters, $this);
+
+ return call_user_func_array($this->macros[$method], $parameters);
+ } elseif (method_exists($this->model, $scope = 'scope'.ucfirst($method))) {
+ return $this->callScope($scope, $parameters);
+ }
+
+ $result = call_user_func_array([$this->query, $method], $parameters);
+
+ return in_array($method, $this->passthru) ? $result : $this;
+ }
+
+ /**
+ * Force a clone of the underlying query builder when cloning.
+ *
+ * @return void
+ */
+ public function __clone()
+ {
+ $this->query = clone $this->query;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php
index 0809dde..19a449e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php
@@ -1,263 +1,254 @@
-getKey();
- }
-
- return array_first($this->items, function($itemKey, $model) use ($key)
- {
- return $model->getKey() == $key;
-
- }, $default);
- }
-
- /**
- * Load a set of relationships onto the collection.
- *
- * @param mixed $relations
- * @return $this
- */
- public function load($relations)
- {
- if (count($this->items) > 0)
- {
- if (is_string($relations)) $relations = func_get_args();
-
- $query = $this->first()->newQuery()->with($relations);
-
- $this->items = $query->eagerLoadRelations($this->items);
- }
-
- return $this;
- }
-
- /**
- * Add an item to the collection.
- *
- * @param mixed $item
- * @return $this
- */
- public function add($item)
- {
- $this->items[] = $item;
-
- return $this;
- }
-
- /**
- * Determine if a key exists in the collection.
- *
- * @param mixed $key
- * @param mixed $value
- * @return bool
- */
- public function contains($key, $value = null)
- {
- if (func_num_args() == 2) return parent::contains($key, $value);
-
- if ($this->useAsCallable($key)) return parent::contains($key);
-
- $key = $key instanceof Model ? $key->getKey() : $key;
-
- return parent::contains(function($k, $m) use ($key)
- {
- return $m->getKey() == $key;
- });
- }
-
- /**
- * Fetch a nested element of the collection.
- *
- * @param string $key
- * @return static
- */
- public function fetch($key)
- {
- return new static(array_fetch($this->toArray(), $key));
- }
-
- /**
- * Get the max value of a given key.
- *
- * @param string $key
- * @return mixed
- */
- public function max($key)
- {
- return $this->reduce(function($result, $item) use ($key)
- {
- return is_null($result) || $item->{$key} > $result ? $item->{$key} : $result;
- });
- }
-
- /**
- * Get the min value of a given key.
- *
- * @param string $key
- * @return mixed
- */
- public function min($key)
- {
- return $this->reduce(function($result, $item) use ($key)
- {
- return is_null($result) || $item->{$key} < $result ? $item->{$key} : $result;
- });
- }
-
- /**
- * Get the array of primary keys.
- *
- * @return array
- */
- public function modelKeys()
- {
- return array_map(function($m) { return $m->getKey(); }, $this->items);
- }
-
- /**
- * Merge the collection with the given items.
- *
- * @param \ArrayAccess|array $items
- * @return static
- */
- public function merge($items)
- {
- $dictionary = $this->getDictionary();
-
- foreach ($items as $item)
- {
- $dictionary[$item->getKey()] = $item;
- }
-
- return new static(array_values($dictionary));
- }
-
- /**
- * Diff the collection with the given items.
- *
- * @param \ArrayAccess|array $items
- * @return static
- */
- public function diff($items)
- {
- $diff = new static;
-
- $dictionary = $this->getDictionary($items);
-
- foreach ($this->items as $item)
- {
- if ( ! isset($dictionary[$item->getKey()]))
- {
- $diff->add($item);
- }
- }
-
- return $diff;
- }
-
- /**
- * Intersect the collection with the given items.
- *
- * @param \ArrayAccess|array $items
- * @return static
- */
- public function intersect($items)
- {
- $intersect = new static;
-
- $dictionary = $this->getDictionary($items);
-
- foreach ($this->items as $item)
- {
- if (isset($dictionary[$item->getKey()]))
- {
- $intersect->add($item);
- }
- }
-
- return $intersect;
- }
-
- /**
- * Return only unique items from the collection.
- *
- * @return static
- */
- public function unique()
- {
- $dictionary = $this->getDictionary();
-
- return new static(array_values($dictionary));
- }
-
- /**
- * Returns only the models from the collection with the specified keys.
- *
- * @param mixed $keys
- * @return static
- */
- public function only($keys)
- {
- $dictionary = array_only($this->getDictionary(), $keys);
-
- return new static(array_values($dictionary));
- }
-
- /**
- * Returns all models in the collection except the models with specified keys.
- *
- * @param mixed $keys
- * @return static
- */
- public function except($keys)
- {
- $dictionary = array_except($this->getDictionary(), $keys);
-
- return new static(array_values($dictionary));
- }
-
- /**
- * Get a dictionary keyed by primary keys.
- *
- * @param \ArrayAccess|array $items
- * @return array
- */
- public function getDictionary($items = null)
- {
- $items = is_null($items) ? $this->items : $items;
-
- $dictionary = array();
-
- foreach ($items as $value)
- {
- $dictionary[$value->getKey()] = $value;
- }
-
- return $dictionary;
- }
-
- /**
- * Get a base Support collection instance from this collection.
- *
- * @return \Illuminate\Support\Collection
- */
- public function toBase()
- {
- return new BaseCollection($this->items);
- }
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection as BaseCollection;
+class Collection extends BaseCollection
+{
+ /**
+ * Find a model in the collection by key.
+ *
+ * @param mixed $key
+ * @param mixed $default
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function find($key, $default = null)
+ {
+ if ($key instanceof Model) {
+ $key = $key->getKey();
+ }
+
+ return Arr::first($this->items, function ($itemKey, $model) use ($key) {
+ return $model->getKey() == $key;
+ }, $default);
+ }
+
+ /**
+ * Load a set of relationships onto the collection.
+ *
+ * @param mixed $relations
+ * @return $this
+ */
+ public function load($relations)
+ {
+ if (count($this->items) > 0) {
+ if (is_string($relations)) {
+ $relations = func_get_args();
+ }
+
+ $query = $this->first()->newQuery()->with($relations);
+
+ $this->items = $query->eagerLoadRelations($this->items);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add an item to the collection.
+ *
+ * @param mixed $item
+ * @return $this
+ */
+ public function add($item)
+ {
+ $this->items[] = $item;
+
+ return $this;
+ }
+
+ /**
+ * Determine if a key exists in the collection.
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @return bool
+ */
+ public function contains($key, $value = null)
+ {
+ if (func_num_args() == 2) {
+ return parent::contains($key, $value);
+ }
+
+ if ($this->useAsCallable($key)) {
+ return parent::contains($key);
+ }
+
+ $key = $key instanceof Model ? $key->getKey() : $key;
+
+ return parent::contains(function ($k, $m) use ($key) {
+ return $m->getKey() == $key;
+ });
+ }
+
+ /**
+ * Fetch a nested element of the collection.
+ *
+ * @param string $key
+ * @return static
+ *
+ * @deprecated since version 5.1. Use pluck instead.
+ */
+ public function fetch($key)
+ {
+ return new static(Arr::fetch($this->toArray(), $key));
+ }
+
+ /**
+ * Get the array of primary keys.
+ *
+ * @return array
+ */
+ public function modelKeys()
+ {
+ return array_map(function ($m) {
+ return $m->getKey();
+ }, $this->items);
+ }
+
+ /**
+ * Merge the collection with the given items.
+ *
+ * @param \ArrayAccess|array $items
+ * @return static
+ */
+ public function merge($items)
+ {
+ $dictionary = $this->getDictionary();
+
+ foreach ($items as $item) {
+ $dictionary[$item->getKey()] = $item;
+ }
+
+ return new static(array_values($dictionary));
+ }
+
+ /**
+ * Diff the collection with the given items.
+ *
+ * @param \ArrayAccess|array $items
+ * @return static
+ */
+ public function diff($items)
+ {
+ $diff = new static;
+
+ $dictionary = $this->getDictionary($items);
+
+ foreach ($this->items as $item) {
+ if (! isset($dictionary[$item->getKey()])) {
+ $diff->add($item);
+ }
+ }
+
+ return $diff;
+ }
+
+ /**
+ * Intersect the collection with the given items.
+ *
+ * @param \ArrayAccess|array $items
+ * @return static
+ */
+ public function intersect($items)
+ {
+ $intersect = new static;
+
+ $dictionary = $this->getDictionary($items);
+
+ foreach ($this->items as $item) {
+ if (isset($dictionary[$item->getKey()])) {
+ $intersect->add($item);
+ }
+ }
+
+ return $intersect;
+ }
+
+ /**
+ * Return only unique items from the collection.
+ *
+ * @param string|callable|null $key
+ * @return static
+ */
+ public function unique($key = null)
+ {
+ if (! is_null($key)) {
+ return parent::unique($key);
+ }
+
+ return new static(array_values($this->getDictionary()));
+ }
+
+ /**
+ * Returns only the models from the collection with the specified keys.
+ *
+ * @param mixed $keys
+ * @return static
+ */
+ public function only($keys)
+ {
+ $dictionary = Arr::only($this->getDictionary(), $keys);
+
+ return new static(array_values($dictionary));
+ }
+
+ /**
+ * Returns all models in the collection except the models with specified keys.
+ *
+ * @param mixed $keys
+ * @return static
+ */
+ public function except($keys)
+ {
+ $dictionary = Arr::except($this->getDictionary(), $keys);
+
+ return new static(array_values($dictionary));
+ }
+
+ /**
+ * Make the given, typically hidden, attributes visible across the entire collection.
+ *
+ * @param array|string $attributes
+ * @return $this
+ */
+ public function withHidden($attributes)
+ {
+ $this->each(function ($model) use ($attributes) {
+ $model->withHidden($attributes);
+ });
+
+ return $this;
+ }
+
+ /**
+ * Get a dictionary keyed by primary keys.
+ *
+ * @param \ArrayAccess|array $items
+ * @return array
+ */
+ public function getDictionary($items = null)
+ {
+ $items = is_null($items) ? $this->items : $items;
+
+ $dictionary = [];
+
+ foreach ($items as $value) {
+ $dictionary[$value->getKey()] = $value;
+ }
+
+ return $dictionary;
+ }
+
+ /**
+ * Get a base Support collection instance from this collection.
+ *
+ * @return \Illuminate\Support\Collection
+ */
+ public function toBase()
+ {
+ return new BaseCollection($this->items);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php
new file mode 100644
index 0000000..099f4b4
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php
@@ -0,0 +1,229 @@
+faker = $faker;
+ }
+
+ /**
+ * The model definitions in the container.
+ *
+ * @var array
+ */
+ protected $definitions = [];
+
+ /**
+ * Create a new factory container.
+ *
+ * @param \Faker\Generator $faker
+ * @param string|null $pathToFactories
+ * @return static
+ */
+ public static function construct(Faker $faker, $pathToFactories = null)
+ {
+ $pathToFactories = $pathToFactories ?: database_path('factories');
+
+ return (new static($faker))->load($pathToFactories);
+ }
+
+ /**
+ * Define a class with a given short-name.
+ *
+ * @param string $class
+ * @param string $name
+ * @param callable $attributes
+ * @return void
+ */
+ public function defineAs($class, $name, callable $attributes)
+ {
+ return $this->define($class, $attributes, $name);
+ }
+
+ /**
+ * Define a class with a given set of attributes.
+ *
+ * @param string $class
+ * @param callable $attributes
+ * @param string $name
+ * @return void
+ */
+ public function define($class, callable $attributes, $name = 'default')
+ {
+ $this->definitions[$class][$name] = $attributes;
+ }
+
+ /**
+ * Create an instance of the given model and persist it to the database.
+ *
+ * @param string $class
+ * @param array $attributes
+ * @return mixed
+ */
+ public function create($class, array $attributes = [])
+ {
+ return $this->of($class)->create($attributes);
+ }
+
+ /**
+ * Create an instance of the given model and type and persist it to the database.
+ *
+ * @param string $class
+ * @param string $name
+ * @param array $attributes
+ * @return mixed
+ */
+ public function createAs($class, $name, array $attributes = [])
+ {
+ return $this->of($class, $name)->create($attributes);
+ }
+
+ /**
+ * Load factories from path.
+ *
+ * @param string $path
+ * @return $this
+ */
+ public function load($path)
+ {
+ $factory = $this;
+
+ if (is_dir($path)) {
+ foreach (Finder::create()->files()->in($path) as $file) {
+ require $file->getRealPath();
+ }
+ }
+
+ return $factory;
+ }
+
+ /**
+ * Create an instance of the given model.
+ *
+ * @param string $class
+ * @param array $attributes
+ * @return mixed
+ */
+ public function make($class, array $attributes = [])
+ {
+ return $this->of($class)->make($attributes);
+ }
+
+ /**
+ * Create an instance of the given model and type.
+ *
+ * @param string $class
+ * @param string $name
+ * @param array $attributes
+ * @return mixed
+ */
+ public function makeAs($class, $name, array $attributes = [])
+ {
+ return $this->of($class, $name)->make($attributes);
+ }
+
+ /**
+ * Get the raw attribute array for a given named model.
+ *
+ * @param string $class
+ * @param string $name
+ * @param array $attributes
+ * @return array
+ */
+ public function rawOf($class, $name, array $attributes = [])
+ {
+ return $this->raw($class, $attributes, $name);
+ }
+
+ /**
+ * Get the raw attribute array for a given model.
+ *
+ * @param string $class
+ * @param array $attributes
+ * @param string $name
+ * @return array
+ */
+ public function raw($class, array $attributes = [], $name = 'default')
+ {
+ $raw = call_user_func($this->definitions[$class][$name], $this->faker);
+
+ return array_merge($raw, $attributes);
+ }
+
+ /**
+ * Create a builder for the given model.
+ *
+ * @param string $class
+ * @param string $name
+ * @return \Illuminate\Database\Eloquent\FactoryBuilder
+ */
+ public function of($class, $name = 'default')
+ {
+ return new FactoryBuilder($class, $name, $this->definitions, $this->faker);
+ }
+
+ /**
+ * Determine if the given offset exists.
+ *
+ * @param string $offset
+ * @return bool
+ */
+ public function offsetExists($offset)
+ {
+ return isset($this->definitions[$offset]);
+ }
+
+ /**
+ * Get the value of the given offset.
+ *
+ * @param string $offset
+ * @return mixed
+ */
+ public function offsetGet($offset)
+ {
+ return $this->make($offset);
+ }
+
+ /**
+ * Set the given offset to the given value.
+ *
+ * @param string $offset
+ * @param callable $value
+ * @return void
+ */
+ public function offsetSet($offset, $value)
+ {
+ return $this->define($offset, $value);
+ }
+
+ /**
+ * Unset the value at the given offset.
+ *
+ * @param string $offset
+ * @return void
+ */
+ public function offsetUnset($offset)
+ {
+ unset($this->definitions[$offset]);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php
new file mode 100644
index 0000000..89d274e
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php
@@ -0,0 +1,135 @@
+name = $name;
+ $this->class = $class;
+ $this->faker = $faker;
+ $this->definitions = $definitions;
+ }
+
+ /**
+ * Set the amount of models you wish to create / make.
+ *
+ * @param int $amount
+ * @return $this
+ */
+ public function times($amount)
+ {
+ $this->amount = $amount;
+
+ return $this;
+ }
+
+ /**
+ * Create a collection of models and persist them to the database.
+ *
+ * @param array $attributes
+ * @return mixed
+ */
+ public function create(array $attributes = [])
+ {
+ $results = $this->make($attributes);
+
+ if ($this->amount === 1) {
+ $results->save();
+ } else {
+ foreach ($results as $result) {
+ $result->save();
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Create a collection of models.
+ *
+ * @param array $attributes
+ * @return mixed
+ */
+ public function make(array $attributes = [])
+ {
+ if ($this->amount === 1) {
+ return $this->makeInstance($attributes);
+ } else {
+ $results = [];
+
+ for ($i = 0; $i < $this->amount; $i++) {
+ $results[] = $this->makeInstance($attributes);
+ }
+
+ return new Collection($results);
+ }
+ }
+
+ /**
+ * Make an instance of the model with the given attributes.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ protected function makeInstance(array $attributes = [])
+ {
+ return Model::unguarded(function () use ($attributes) {
+ if (! isset($this->definitions[$this->class][$this->name])) {
+ throw new InvalidArgumentException("Unable to locate factory with name [{$this->name}] [{$this->class}].");
+ }
+
+ $definition = call_user_func($this->definitions[$this->class][$this->name], $this->faker, $attributes);
+
+ return new $this->class(array_merge($definition, $attributes));
+ });
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/MassAssignmentException.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/MassAssignmentException.php
index 8874c7c..7c81aae 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/MassAssignmentException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/MassAssignmentException.php
@@ -1,5 +1,10 @@
-bootIfNotBooted();
-
- $this->syncOriginal();
-
- $this->fill($attributes);
- }
-
- /**
- * Check if the model needs to be booted and if so, do it.
- *
- * @return void
- */
- protected function bootIfNotBooted()
- {
- $class = get_class($this);
-
- if ( ! isset(static::$booted[$class]))
- {
- static::$booted[$class] = true;
-
- $this->fireModelEvent('booting', false);
-
- static::boot();
-
- $this->fireModelEvent('booted', false);
- }
- }
-
- /**
- * The "booting" method of the model.
- *
- * @return void
- */
- protected static function boot()
- {
- static::bootTraits();
- }
-
- /**
- * Boot all of the bootable traits on the model.
- *
- * @return void
- */
- protected static function bootTraits()
- {
- foreach (class_uses_recursive(get_called_class()) as $trait)
- {
- if (method_exists(get_called_class(), $method = 'boot'.class_basename($trait)))
- {
- forward_static_call([get_called_class(), $method]);
- }
- }
- }
-
- /**
- * Register a new global scope on the model.
- *
- * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
- * @return void
- */
- public static function addGlobalScope(ScopeInterface $scope)
- {
- static::$globalScopes[get_called_class()][get_class($scope)] = $scope;
- }
-
- /**
- * Determine if a model has a global scope.
- *
- * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
- * @return bool
- */
- public static function hasGlobalScope($scope)
- {
- return ! is_null(static::getGlobalScope($scope));
- }
-
- /**
- * Get a global scope registered with the model.
- *
- * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
- * @return \Illuminate\Database\Eloquent\ScopeInterface|null
- */
- public static function getGlobalScope($scope)
- {
- return array_first(static::$globalScopes[get_called_class()], function($key, $value) use ($scope)
- {
- return $scope instanceof $value;
- });
- }
-
- /**
- * Get the global scopes for this class instance.
- *
- * @return \Illuminate\Database\Eloquent\ScopeInterface[]
- */
- public function getGlobalScopes()
- {
- return array_get(static::$globalScopes, get_class($this), []);
- }
-
- /**
- * Register an observer with the Model.
- *
- * @param object|string $class
- * @return void
- */
- public static function observe($class)
- {
- $instance = new static;
-
- $className = is_string($class) ? $class : get_class($class);
-
- // When registering a model observer, we will spin through the possible events
- // and determine if this observer has that method. If it does, we will hook
- // it into the model's event system, making it convenient to watch these.
- foreach ($instance->getObservableEvents() as $event)
- {
- if (method_exists($class, $event))
- {
- static::registerModelEvent($event, $className.'@'.$event);
- }
- }
- }
-
- /**
- * Fill the model with an array of attributes.
- *
- * @param array $attributes
- * @return $this
- *
- * @throws \Illuminate\Database\Eloquent\MassAssignmentException
- */
- public function fill(array $attributes)
- {
- $totallyGuarded = $this->totallyGuarded();
-
- foreach ($this->fillableFromArray($attributes) as $key => $value)
- {
- $key = $this->removeTableFromKey($key);
-
- // The developers may choose to place some attributes in the "fillable"
- // array, which means only those attributes may be set through mass
- // assignment to the model, and all others will just be ignored.
- if ($this->isFillable($key))
- {
- $this->setAttribute($key, $value);
- }
- elseif ($totallyGuarded)
- {
- throw new MassAssignmentException($key);
- }
- }
-
- return $this;
- }
-
- /**
- * Fill the model with an array of attributes. Force mass assignment.
- *
- * @param array $attributes
- * @return $this
- */
- public function forceFill(array $attributes)
- {
- // Since some versions of PHP have a bug that prevents it from properly
- // binding the late static context in a closure, we will first store
- // the model in a variable, which we will then use in the closure.
- $model = $this;
-
- return static::unguarded(function() use ($model, $attributes)
- {
- return $model->fill($attributes);
- });
- }
-
- /**
- * Get the fillable attributes of a given array.
- *
- * @param array $attributes
- * @return array
- */
- protected function fillableFromArray(array $attributes)
- {
- if (count($this->fillable) > 0 && ! static::$unguarded)
- {
- return array_intersect_key($attributes, array_flip($this->fillable));
- }
-
- return $attributes;
- }
-
- /**
- * Create a new instance of the given model.
- *
- * @param array $attributes
- * @param bool $exists
- * @return static
- */
- public function newInstance($attributes = array(), $exists = false)
- {
- // This method just provides a convenient way for us to generate fresh model
- // instances of this current model. It is particularly useful during the
- // hydration of new objects via the Eloquent query builder instances.
- $model = new static((array) $attributes);
-
- $model->exists = $exists;
-
- return $model;
- }
-
- /**
- * Create a new model instance that is existing.
- *
- * @param array $attributes
- * @param string|null $connection
- * @return static
- */
- public function newFromBuilder($attributes = array(), $connection = null)
- {
- $model = $this->newInstance(array(), true);
-
- $model->setRawAttributes((array) $attributes, true);
-
- $model->setConnection($connection ?: $this->connection);
-
- return $model;
- }
-
- /**
- * Create a collection of models from plain arrays.
- *
- * @param array $items
- * @param string|null $connection
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public static function hydrate(array $items, $connection = null)
- {
- $instance = (new static)->setConnection($connection);
-
- $items = array_map(function ($item) use ($instance)
- {
- return $instance->newFromBuilder($item);
- }, $items);
-
- return $instance->newCollection($items);
- }
-
- /**
- * Create a collection of models from a raw query.
- *
- * @param string $query
- * @param array $bindings
- * @param string|null $connection
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public static function hydrateRaw($query, $bindings = array(), $connection = null)
- {
- $instance = (new static)->setConnection($connection);
-
- $items = $instance->getConnection()->select($query, $bindings);
-
- return static::hydrate($items, $connection);
- }
-
- /**
- * Save a new model and return the instance.
- *
- * @param array $attributes
- * @return static
- */
- public static function create(array $attributes)
- {
- $model = new static($attributes);
-
- $model->save();
-
- return $model;
- }
-
- /**
- * Save a new model and return the instance. Allow mass-assignment.
- *
- * @param array $attributes
- * @return static
- */
- public static function forceCreate(array $attributes)
- {
- // Since some versions of PHP have a bug that prevents it from properly
- // binding the late static context in a closure, we will first store
- // the model in a variable, which we will then use in the closure.
- $model = new static;
-
- return static::unguarded(function() use ($model, $attributes)
- {
- return $model->create($attributes);
- });
- }
-
- /**
- * Get the first record matching the attributes or create it.
- *
- * @param array $attributes
- * @return static
- */
- public static function firstOrCreate(array $attributes)
- {
- if ( ! is_null($instance = static::where($attributes)->first()))
- {
- return $instance;
- }
-
- return static::create($attributes);
- }
-
- /**
- * Get the first record matching the attributes or instantiate it.
- *
- * @param array $attributes
- * @return static
- */
- public static function firstOrNew(array $attributes)
- {
- if ( ! is_null($instance = static::where($attributes)->first()))
- {
- return $instance;
- }
-
- return new static($attributes);
- }
-
- /**
- * Create or update a record matching the attributes, and fill it with values.
- *
- * @param array $attributes
- * @param array $values
- * @return static
- */
- public static function updateOrCreate(array $attributes, array $values = array())
- {
- $instance = static::firstOrNew($attributes);
-
- $instance->fill($values)->save();
-
- return $instance;
- }
-
- /**
- * Get the first model for the given attributes.
- *
- * @param array $attributes
- * @return static|null
- */
- protected static function firstByAttributes($attributes)
- {
- return static::where($attributes)->first();
- }
-
- /**
- * Begin querying the model.
- *
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public static function query()
- {
- return (new static)->newQuery();
- }
-
- /**
- * Begin querying the model on a given connection.
- *
- * @param string|null $connection
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public static function on($connection = null)
- {
- // First we will just create a fresh instance of this model, and then we can
- // set the connection on the model so that it is be used for the queries
- // we execute, as well as being set on each relationship we retrieve.
- $instance = new static;
-
- $instance->setConnection($connection);
-
- return $instance->newQuery();
- }
-
- /**
- * Begin querying the model on the write connection.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- public static function onWriteConnection()
- {
- $instance = new static;
-
- return $instance->newQuery()->useWritePdo();
- }
-
- /**
- * Get all of the models from the database.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Collection|static[]
- */
- public static function all($columns = array('*'))
- {
- $instance = new static;
-
- return $instance->newQuery()->get($columns);
- }
-
- /**
- * Find a model by its primary key.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Support\Collection|static|null
- */
- public static function find($id, $columns = array('*'))
- {
- return static::query()->find($id, $columns);
- }
-
- /**
- * Find a model by its primary key or return new static.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Support\Collection|static
- */
- public static function findOrNew($id, $columns = array('*'))
- {
- if ( ! is_null($model = static::find($id, $columns))) return $model;
-
- return new static;
- }
-
- /**
- * Reload a fresh model instance from the database.
- *
- * @param array $with
- * @return $this
- */
- public function fresh(array $with = array())
- {
- if ( ! $this->exists) return;
-
- $key = $this->getKeyName();
-
- return static::with($with)->where($key, $this->getKey())->first();
- }
-
- /**
- * Eager load relations on the model.
- *
- * @param array|string $relations
- * @return $this
- */
- public function load($relations)
- {
- if (is_string($relations)) $relations = func_get_args();
-
- $query = $this->newQuery()->with($relations);
-
- $query->eagerLoadRelations(array($this));
-
- return $this;
- }
-
- /**
- * Being querying a model with eager loading.
- *
- * @param array|string $relations
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public static function with($relations)
- {
- if (is_string($relations)) $relations = func_get_args();
-
- $instance = new static;
-
- return $instance->newQuery()->with($relations);
- }
-
- /**
- * Define a one-to-one relationship.
- *
- * @param string $related
- * @param string $foreignKey
- * @param string $localKey
- * @return \Illuminate\Database\Eloquent\Relations\HasOne
- */
- public function hasOne($related, $foreignKey = null, $localKey = null)
- {
- $foreignKey = $foreignKey ?: $this->getForeignKey();
-
- $instance = new $related;
-
- $localKey = $localKey ?: $this->getKeyName();
-
- return new HasOne($instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey);
- }
-
- /**
- * Define a polymorphic one-to-one relationship.
- *
- * @param string $related
- * @param string $name
- * @param string $type
- * @param string $id
- * @param string $localKey
- * @return \Illuminate\Database\Eloquent\Relations\MorphOne
- */
- public function morphOne($related, $name, $type = null, $id = null, $localKey = null)
- {
- $instance = new $related;
-
- list($type, $id) = $this->getMorphs($name, $type, $id);
-
- $table = $instance->getTable();
-
- $localKey = $localKey ?: $this->getKeyName();
-
- return new MorphOne($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey);
- }
-
- /**
- * Define an inverse one-to-one or many relationship.
- *
- * @param string $related
- * @param string $foreignKey
- * @param string $otherKey
- * @param string $relation
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function belongsTo($related, $foreignKey = null, $otherKey = null, $relation = null)
- {
- // If no relation name was given, we will use this debug backtrace to extract
- // the calling method's name and use that as the relationship name as most
- // of the time this will be what we desire to use for the relationships.
- if (is_null($relation))
- {
- list(, $caller) = debug_backtrace(false, 2);
-
- $relation = $caller['function'];
- }
-
- // If no foreign key was supplied, we can use a backtrace to guess the proper
- // foreign key name by using the name of the relationship function, which
- // when combined with an "_id" should conventionally match the columns.
- if (is_null($foreignKey))
- {
- $foreignKey = snake_case($relation).'_id';
- }
-
- $instance = new $related;
-
- // Once we have the foreign key names, we'll just create a new Eloquent query
- // for the related models and returns the relationship instance which will
- // actually be responsible for retrieving and hydrating every relations.
- $query = $instance->newQuery();
-
- $otherKey = $otherKey ?: $instance->getKeyName();
-
- return new BelongsTo($query, $this, $foreignKey, $otherKey, $relation);
- }
-
- /**
- * Define a polymorphic, inverse one-to-one or many relationship.
- *
- * @param string $name
- * @param string $type
- * @param string $id
- * @return \Illuminate\Database\Eloquent\Relations\MorphTo
- */
- public function morphTo($name = null, $type = null, $id = null)
- {
- // If no name is provided, we will use the backtrace to get the function name
- // since that is most likely the name of the polymorphic interface. We can
- // use that to get both the class and foreign key that will be utilized.
- if (is_null($name))
- {
- list(, $caller) = debug_backtrace(false, 2);
-
- $name = snake_case($caller['function']);
- }
-
- list($type, $id) = $this->getMorphs($name, $type, $id);
-
- // If the type value is null it is probably safe to assume we're eager loading
- // the relationship. When that is the case we will pass in a dummy query as
- // there are multiple types in the morph and we can't use single queries.
- if (is_null($class = $this->$type))
- {
- return new MorphTo(
- $this->newQuery(), $this, $id, null, $type, $name
- );
- }
-
- // If we are not eager loading the relationship we will essentially treat this
- // as a belongs-to style relationship since morph-to extends that class and
- // we will pass in the appropriate values so that it behaves as expected.
- else
- {
- $instance = new $class;
-
- return new MorphTo(
- $instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name
- );
- }
- }
-
- /**
- * Define a one-to-many relationship.
- *
- * @param string $related
- * @param string $foreignKey
- * @param string $localKey
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function hasMany($related, $foreignKey = null, $localKey = null)
- {
- $foreignKey = $foreignKey ?: $this->getForeignKey();
-
- $instance = new $related;
-
- $localKey = $localKey ?: $this->getKeyName();
-
- return new HasMany($instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey);
- }
-
- /**
- * Define a has-many-through relationship.
- *
- * @param string $related
- * @param string $through
- * @param string|null $firstKey
- * @param string|null $secondKey
- * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
- */
- public function hasManyThrough($related, $through, $firstKey = null, $secondKey = null)
- {
- $through = new $through;
-
- $firstKey = $firstKey ?: $this->getForeignKey();
-
- $secondKey = $secondKey ?: $through->getForeignKey();
-
- return new HasManyThrough((new $related)->newQuery(), $this, $through, $firstKey, $secondKey);
- }
-
- /**
- * Define a polymorphic one-to-many relationship.
- *
- * @param string $related
- * @param string $name
- * @param string $type
- * @param string $id
- * @param string $localKey
- * @return \Illuminate\Database\Eloquent\Relations\MorphMany
- */
- public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
- {
- $instance = new $related;
-
- // Here we will gather up the morph type and ID for the relationship so that we
- // can properly query the intermediate table of a relation. Finally, we will
- // get the table and create the relationship instances for the developers.
- list($type, $id) = $this->getMorphs($name, $type, $id);
-
- $table = $instance->getTable();
-
- $localKey = $localKey ?: $this->getKeyName();
-
- return new MorphMany($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey);
- }
-
- /**
- * Define a many-to-many relationship.
- *
- * @param string $related
- * @param string $table
- * @param string $foreignKey
- * @param string $otherKey
- * @param string $relation
- * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
- */
- public function belongsToMany($related, $table = null, $foreignKey = null, $otherKey = null, $relation = null)
- {
- // If no relationship name was passed, we will pull backtraces to get the
- // name of the calling function. We will use that function name as the
- // title of this relation since that is a great convention to apply.
- if (is_null($relation))
- {
- $relation = $this->getBelongsToManyCaller();
- }
-
- // First, we'll need to determine the foreign key and "other key" for the
- // relationship. Once we have determined the keys we'll make the query
- // instances as well as the relationship instances we need for this.
- $foreignKey = $foreignKey ?: $this->getForeignKey();
-
- $instance = new $related;
-
- $otherKey = $otherKey ?: $instance->getForeignKey();
-
- // If no table name was provided, we can guess it by concatenating the two
- // models using underscores in alphabetical order. The two model names
- // are transformed to snake case from their default CamelCase also.
- if (is_null($table))
- {
- $table = $this->joiningTable($related);
- }
-
- // Now we're ready to create a new query builder for the related model and
- // the relationship instances for the relation. The relations will set
- // appropriate query constraint and entirely manages the hydrations.
- $query = $instance->newQuery();
-
- return new BelongsToMany($query, $this, $table, $foreignKey, $otherKey, $relation);
- }
-
- /**
- * Define a polymorphic many-to-many relationship.
- *
- * @param string $related
- * @param string $name
- * @param string $table
- * @param string $foreignKey
- * @param string $otherKey
- * @param bool $inverse
- * @return \Illuminate\Database\Eloquent\Relations\MorphToMany
- */
- public function morphToMany($related, $name, $table = null, $foreignKey = null, $otherKey = null, $inverse = false)
- {
- $caller = $this->getBelongsToManyCaller();
-
- // First, we will need to determine the foreign key and "other key" for the
- // relationship. Once we have determined the keys we will make the query
- // instances, as well as the relationship instances we need for these.
- $foreignKey = $foreignKey ?: $name.'_id';
-
- $instance = new $related;
-
- $otherKey = $otherKey ?: $instance->getForeignKey();
-
- // Now we're ready to create a new query builder for this related model and
- // the relationship instances for this relation. This relations will set
- // appropriate query constraints then entirely manages the hydrations.
- $query = $instance->newQuery();
-
- $table = $table ?: str_plural($name);
-
- return new MorphToMany(
- $query, $this, $name, $table, $foreignKey,
- $otherKey, $caller, $inverse
- );
- }
-
- /**
- * Define a polymorphic, inverse many-to-many relationship.
- *
- * @param string $related
- * @param string $name
- * @param string $table
- * @param string $foreignKey
- * @param string $otherKey
- * @return \Illuminate\Database\Eloquent\Relations\MorphToMany
- */
- public function morphedByMany($related, $name, $table = null, $foreignKey = null, $otherKey = null)
- {
- $foreignKey = $foreignKey ?: $this->getForeignKey();
-
- // For the inverse of the polymorphic many-to-many relations, we will change
- // the way we determine the foreign and other keys, as it is the opposite
- // of the morph-to-many method since we're figuring out these inverses.
- $otherKey = $otherKey ?: $name.'_id';
-
- return $this->morphToMany($related, $name, $table, $foreignKey, $otherKey, true);
- }
-
- /**
- * Get the relationship name of the belongs to many.
- *
- * @return string
- */
- protected function getBelongsToManyCaller()
- {
- $self = __FUNCTION__;
-
- $caller = array_first(debug_backtrace(false), function($key, $trace) use ($self)
- {
- $caller = $trace['function'];
-
- return ! in_array($caller, Model::$manyMethods) && $caller != $self;
- });
-
- return ! is_null($caller) ? $caller['function'] : null;
- }
-
- /**
- * Get the joining table name for a many-to-many relation.
- *
- * @param string $related
- * @return string
- */
- public function joiningTable($related)
- {
- // The joining table name, by convention, is simply the snake cased models
- // sorted alphabetically and concatenated with an underscore, so we can
- // just sort the models and join them together to get the table name.
- $base = snake_case(class_basename($this));
-
- $related = snake_case(class_basename($related));
-
- $models = array($related, $base);
-
- // Now that we have the model names in an array we can just sort them and
- // use the implode function to join them together with an underscores,
- // which is typically used by convention within the database system.
- sort($models);
-
- return strtolower(implode('_', $models));
- }
-
- /**
- * Destroy the models for the given IDs.
- *
- * @param array|int $ids
- * @return int
- */
- public static function destroy($ids)
- {
- // We'll initialize a count here so we will return the total number of deletes
- // for the operation. The developers can then check this number as a boolean
- // type value or get this total count of records deleted for logging, etc.
- $count = 0;
-
- $ids = is_array($ids) ? $ids : func_get_args();
-
- $instance = new static;
-
- // We will actually pull the models from the database table and call delete on
- // each of them individually so that their events get fired properly with a
- // correct set of attributes in case the developers wants to check these.
- $key = $instance->getKeyName();
-
- foreach ($instance->whereIn($key, $ids)->get() as $model)
- {
- if ($model->delete()) $count++;
- }
-
- return $count;
- }
-
- /**
- * Delete the model from the database.
- *
- * @return bool|null
- * @throws \Exception
- */
- public function delete()
- {
- if (is_null($this->primaryKey))
- {
- throw new Exception("No primary key defined on model.");
- }
-
- if ($this->exists)
- {
- if ($this->fireModelEvent('deleting') === false) return false;
-
- // Here, we'll touch the owning models, verifying these timestamps get updated
- // for the models. This will allow any caching to get broken on the parents
- // by the timestamp. Then we will go ahead and delete the model instance.
- $this->touchOwners();
-
- $this->performDeleteOnModel();
-
- $this->exists = false;
-
- // Once the model has been deleted, we will fire off the deleted event so that
- // the developers may hook into post-delete operations. We will then return
- // a boolean true as the delete is presumably successful on the database.
- $this->fireModelEvent('deleted', false);
-
- return true;
- }
- }
-
- /**
- * Force a hard delete on a soft deleted model.
- *
- * This method protects developers from running forceDelete when trait is missing.
- *
- * @return void
- */
- public function forceDelete()
- {
- return $this->delete();
- }
-
- /**
- * Perform the actual delete query on this model instance.
- *
- * @return void
- */
- protected function performDeleteOnModel()
- {
- $this->setKeysForSaveQuery($this->newQuery())->delete();
- }
-
- /**
- * Register a saving model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function saving($callback, $priority = 0)
- {
- static::registerModelEvent('saving', $callback, $priority);
- }
-
- /**
- * Register a saved model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function saved($callback, $priority = 0)
- {
- static::registerModelEvent('saved', $callback, $priority);
- }
-
- /**
- * Register an updating model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function updating($callback, $priority = 0)
- {
- static::registerModelEvent('updating', $callback, $priority);
- }
-
- /**
- * Register an updated model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function updated($callback, $priority = 0)
- {
- static::registerModelEvent('updated', $callback, $priority);
- }
-
- /**
- * Register a creating model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function creating($callback, $priority = 0)
- {
- static::registerModelEvent('creating', $callback, $priority);
- }
-
- /**
- * Register a created model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function created($callback, $priority = 0)
- {
- static::registerModelEvent('created', $callback, $priority);
- }
-
- /**
- * Register a deleting model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function deleting($callback, $priority = 0)
- {
- static::registerModelEvent('deleting', $callback, $priority);
- }
-
- /**
- * Register a deleted model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- public static function deleted($callback, $priority = 0)
- {
- static::registerModelEvent('deleted', $callback, $priority);
- }
-
- /**
- * Remove all of the event listeners for the model.
- *
- * @return void
- */
- public static function flushEventListeners()
- {
- if ( ! isset(static::$dispatcher)) return;
-
- $instance = new static;
-
- foreach ($instance->getObservableEvents() as $event)
- {
- static::$dispatcher->forget("eloquent.{$event}: ".get_called_class());
- }
- }
-
- /**
- * Register a model event with the dispatcher.
- *
- * @param string $event
- * @param \Closure|string $callback
- * @param int $priority
- * @return void
- */
- protected static function registerModelEvent($event, $callback, $priority = 0)
- {
- if (isset(static::$dispatcher))
- {
- $name = get_called_class();
-
- static::$dispatcher->listen("eloquent.{$event}: {$name}", $callback, $priority);
- }
- }
-
- /**
- * Get the observable event names.
- *
- * @return array
- */
- public function getObservableEvents()
- {
- return array_merge(
- array(
- 'creating', 'created', 'updating', 'updated',
- 'deleting', 'deleted', 'saving', 'saved',
- 'restoring', 'restored',
- ),
- $this->observables
- );
- }
-
- /**
- * Set the observable event names.
- *
- * @param array $observables
- * @return void
- */
- public function setObservableEvents(array $observables)
- {
- $this->observables = $observables;
- }
-
- /**
- * Add an observable event name.
- *
- * @param mixed $observables
- * @return void
- */
- public function addObservableEvents($observables)
- {
- $observables = is_array($observables) ? $observables : func_get_args();
-
- $this->observables = array_unique(array_merge($this->observables, $observables));
- }
-
- /**
- * Remove an observable event name.
- *
- * @param mixed $observables
- * @return void
- */
- public function removeObservableEvents($observables)
- {
- $observables = is_array($observables) ? $observables : func_get_args();
-
- $this->observables = array_diff($this->observables, $observables);
- }
-
- /**
- * Increment a column's value by a given amount.
- *
- * @param string $column
- * @param int $amount
- * @return int
- */
- protected function increment($column, $amount = 1)
- {
- return $this->incrementOrDecrement($column, $amount, 'increment');
- }
-
- /**
- * Decrement a column's value by a given amount.
- *
- * @param string $column
- * @param int $amount
- * @return int
- */
- protected function decrement($column, $amount = 1)
- {
- return $this->incrementOrDecrement($column, $amount, 'decrement');
- }
-
- /**
- * Run the increment or decrement method on the model.
- *
- * @param string $column
- * @param int $amount
- * @param string $method
- * @return int
- */
- protected function incrementOrDecrement($column, $amount, $method)
- {
- $query = $this->newQuery();
-
- if ( ! $this->exists)
- {
- return $query->{$method}($column, $amount);
- }
-
- $this->incrementOrDecrementAttributeValue($column, $amount, $method);
-
- return $query->where($this->getKeyName(), $this->getKey())->{$method}($column, $amount);
- }
-
- /**
- * Increment the underlying attribute value and sync with original.
- *
- * @param string $column
- * @param int $amount
- * @param string $method
- * @return void
- */
- protected function incrementOrDecrementAttributeValue($column, $amount, $method)
- {
- $this->{$column} = $this->{$column} + ($method == 'increment' ? $amount : $amount * -1);
-
- $this->syncOriginalAttribute($column);
- }
-
- /**
- * Update the model in the database.
- *
- * @param array $attributes
- * @return bool|int
- */
- public function update(array $attributes = array())
- {
- if ( ! $this->exists)
- {
- return $this->newQuery()->update($attributes);
- }
-
- return $this->fill($attributes)->save();
- }
-
- /**
- * Save the model and all of its relationships.
- *
- * @return bool
- */
- public function push()
- {
- if ( ! $this->save()) return false;
-
- // To sync all of the relationships to the database, we will simply spin through
- // the relationships and save each model via this "push" method, which allows
- // us to recurse into all of these nested relations for the model instance.
- foreach ($this->relations as $models)
- {
- $models = $models instanceof Collection
- ? $models->all() : array($models);
-
- foreach (array_filter($models) as $model)
- {
- if ( ! $model->push()) return false;
- }
- }
-
- return true;
- }
-
- /**
- * Save the model to the database.
- *
- * @param array $options
- * @return bool
- */
- public function save(array $options = array())
- {
- $query = $this->newQueryWithoutScopes();
-
- // If the "saving" event returns false we'll bail out of the save and return
- // false, indicating that the save failed. This provides a chance for any
- // listeners to cancel save operations if validations fail or whatever.
- if ($this->fireModelEvent('saving') === false)
- {
- return false;
- }
-
- // If the model already exists in the database we can just update our record
- // that is already in this database using the current IDs in this "where"
- // clause to only update this model. Otherwise, we'll just insert them.
- if ($this->exists)
- {
- $saved = $this->performUpdate($query, $options);
- }
-
- // If the model is brand new, we'll insert it into our database and set the
- // ID attribute on the model to the value of the newly inserted row's ID
- // which is typically an auto-increment value managed by the database.
- else
- {
- $saved = $this->performInsert($query, $options);
- }
-
- if ($saved) $this->finishSave($options);
-
- return $saved;
- }
-
- /**
- * Finish processing on a successful save operation.
- *
- * @param array $options
- * @return void
- */
- protected function finishSave(array $options)
- {
- $this->fireModelEvent('saved', false);
-
- $this->syncOriginal();
-
- if (array_get($options, 'touch', true)) $this->touchOwners();
- }
-
- /**
- * Perform a model update operation.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param array $options
- * @return bool|null
- */
- protected function performUpdate(Builder $query, array $options = [])
- {
- $dirty = $this->getDirty();
-
- if (count($dirty) > 0)
- {
- // If the updating event returns false, we will cancel the update operation so
- // developers can hook Validation systems into their models and cancel this
- // operation if the model does not pass validation. Otherwise, we update.
- if ($this->fireModelEvent('updating') === false)
- {
- return false;
- }
-
- // First we need to create a fresh query instance and touch the creation and
- // update timestamp on the model which are maintained by us for developer
- // convenience. Then we will just continue saving the model instances.
- if ($this->timestamps && array_get($options, 'timestamps', true))
- {
- $this->updateTimestamps();
- }
-
- // Once we have run the update operation, we will fire the "updated" event for
- // this model instance. This will allow developers to hook into these after
- // models are updated, giving them a chance to do any special processing.
- $dirty = $this->getDirty();
-
- if (count($dirty) > 0)
- {
- $this->setKeysForSaveQuery($query)->update($dirty);
-
- $this->fireModelEvent('updated', false);
- }
- }
-
- return true;
- }
-
- /**
- * Perform a model insert operation.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param array $options
- * @return bool
- */
- protected function performInsert(Builder $query, array $options = [])
- {
- if ($this->fireModelEvent('creating') === false) return false;
-
- // First we'll need to create a fresh query instance and touch the creation and
- // update timestamps on this model, which are maintained by us for developer
- // convenience. After, we will just continue saving these model instances.
- if ($this->timestamps && array_get($options, 'timestamps', true))
- {
- $this->updateTimestamps();
- }
-
- // If the model has an incrementing key, we can use the "insertGetId" method on
- // the query builder, which will give us back the final inserted ID for this
- // table from the database. Not all tables have to be incrementing though.
- $attributes = $this->attributes;
-
- if ($this->incrementing)
- {
- $this->insertAndSetId($query, $attributes);
- }
-
- // If the table is not incrementing we'll simply insert this attributes as they
- // are, as this attributes arrays must contain an "id" column already placed
- // there by the developer as the manually determined key for these models.
- else
- {
- $query->insert($attributes);
- }
-
- // We will go ahead and set the exists property to true, so that it is set when
- // the created event is fired, just in case the developer tries to update it
- // during the event. This will allow them to do so and run an update here.
- $this->exists = true;
-
- $this->fireModelEvent('created', false);
-
- return true;
- }
-
- /**
- * Insert the given attributes and set the ID on the model.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param array $attributes
- * @return void
- */
- protected function insertAndSetId(Builder $query, $attributes)
- {
- $id = $query->insertGetId($attributes, $keyName = $this->getKeyName());
-
- $this->setAttribute($keyName, $id);
- }
-
- /**
- * Touch the owning relations of the model.
- *
- * @return void
- */
- public function touchOwners()
- {
- foreach ($this->touches as $relation)
- {
- $this->$relation()->touch();
-
- if ($this->$relation instanceof Model)
- {
- $this->$relation->touchOwners();
- }
- elseif ($this->$relation instanceof Collection)
- {
- $this->$relation->each(function (Model $relation)
- {
- $relation->touchOwners();
- });
- }
- }
- }
-
- /**
- * Determine if the model touches a given relation.
- *
- * @param string $relation
- * @return bool
- */
- public function touches($relation)
- {
- return in_array($relation, $this->touches);
- }
-
- /**
- * Fire the given event for the model.
- *
- * @param string $event
- * @param bool $halt
- * @return mixed
- */
- protected function fireModelEvent($event, $halt = true)
- {
- if ( ! isset(static::$dispatcher)) return true;
-
- // We will append the names of the class to the event to distinguish it from
- // other model events that are fired, allowing us to listen on each model
- // event set individually instead of catching event for all the models.
- $event = "eloquent.{$event}: ".get_class($this);
-
- $method = $halt ? 'until' : 'fire';
-
- return static::$dispatcher->$method($event, $this);
- }
-
- /**
- * Set the keys for a save update query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @return \Illuminate\Database\Eloquent\Builder
- */
- protected function setKeysForSaveQuery(Builder $query)
- {
- $query->where($this->getKeyName(), '=', $this->getKeyForSaveQuery());
-
- return $query;
- }
-
- /**
- * Get the primary key value for a save query.
- *
- * @return mixed
- */
- protected function getKeyForSaveQuery()
- {
- if (isset($this->original[$this->getKeyName()]))
- {
- return $this->original[$this->getKeyName()];
- }
-
- return $this->getAttribute($this->getKeyName());
- }
-
- /**
- * Update the model's update timestamp.
- *
- * @return bool
- */
- public function touch()
- {
- if ( ! $this->timestamps) return false;
-
- $this->updateTimestamps();
-
- return $this->save();
- }
-
- /**
- * Update the creation and update timestamps.
- *
- * @return void
- */
- protected function updateTimestamps()
- {
- $time = $this->freshTimestamp();
-
- if ( ! $this->isDirty(static::UPDATED_AT))
- {
- $this->setUpdatedAt($time);
- }
-
- if ( ! $this->exists && ! $this->isDirty(static::CREATED_AT))
- {
- $this->setCreatedAt($time);
- }
- }
-
- /**
- * Set the value of the "created at" attribute.
- *
- * @param mixed $value
- * @return void
- */
- public function setCreatedAt($value)
- {
- $this->{static::CREATED_AT} = $value;
- }
-
- /**
- * Set the value of the "updated at" attribute.
- *
- * @param mixed $value
- * @return void
- */
- public function setUpdatedAt($value)
- {
- $this->{static::UPDATED_AT} = $value;
- }
-
- /**
- * Get the name of the "created at" column.
- *
- * @return string
- */
- public function getCreatedAtColumn()
- {
- return static::CREATED_AT;
- }
-
- /**
- * Get the name of the "updated at" column.
- *
- * @return string
- */
- public function getUpdatedAtColumn()
- {
- return static::UPDATED_AT;
- }
-
- /**
- * Get a fresh timestamp for the model.
- *
- * @return \Carbon\Carbon
- */
- public function freshTimestamp()
- {
- return new Carbon;
- }
-
- /**
- * Get a fresh timestamp for the model.
- *
- * @return string
- */
- public function freshTimestampString()
- {
- return $this->fromDateTime($this->freshTimestamp());
- }
-
- /**
- * Get a new query builder for the model's table.
- *
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function newQuery()
- {
- $builder = $this->newQueryWithoutScopes();
-
- return $this->applyGlobalScopes($builder);
- }
-
- /**
- * Get a new query instance without a given scope.
- *
- * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function newQueryWithoutScope($scope)
- {
- $this->getGlobalScope($scope)->remove($builder = $this->newQuery(), $this);
-
- return $builder;
- }
-
- /**
- * Get a new query builder that doesn't have any global scopes.
- *
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function newQueryWithoutScopes()
- {
- $builder = $this->newEloquentBuilder(
- $this->newBaseQueryBuilder()
- );
-
- // Once we have the query builders, we will set the model instances so the
- // builder can easily access any information it may need from the model
- // while it is constructing and executing various queries against it.
- return $builder->setModel($this)->with($this->with);
- }
-
- /**
- * Apply all of the global scopes to an Eloquent builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function applyGlobalScopes($builder)
- {
- foreach ($this->getGlobalScopes() as $scope)
- {
- $scope->apply($builder, $this);
- }
-
- return $builder;
- }
-
- /**
- * Remove all of the global scopes from an Eloquent builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function removeGlobalScopes($builder)
- {
- foreach ($this->getGlobalScopes() as $scope)
- {
- $scope->remove($builder, $this);
- }
-
- return $builder;
- }
-
- /**
- * Create a new Eloquent query builder for the model.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public function newEloquentBuilder($query)
- {
- return new Builder($query);
- }
-
- /**
- * Get a new query builder instance for the connection.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function newBaseQueryBuilder()
- {
- $conn = $this->getConnection();
-
- $grammar = $conn->getQueryGrammar();
-
- return new QueryBuilder($conn, $grammar, $conn->getPostProcessor());
- }
-
- /**
- * Create a new Eloquent Collection instance.
- *
- * @param array $models
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public function newCollection(array $models = array())
- {
- return new Collection($models);
- }
-
- /**
- * Create a new pivot model instance.
- *
- * @param \Illuminate\Database\Eloquent\Model $parent
- * @param array $attributes
- * @param string $table
- * @param bool $exists
- * @return \Illuminate\Database\Eloquent\Relations\Pivot
- */
- public function newPivot(Model $parent, array $attributes, $table, $exists)
- {
- return new Pivot($parent, $attributes, $table, $exists);
- }
-
- /**
- * Get the table associated with the model.
- *
- * @return string
- */
- public function getTable()
- {
- if (isset($this->table)) return $this->table;
-
- return str_replace('\\', '', snake_case(str_plural(class_basename($this))));
- }
-
- /**
- * Set the table associated with the model.
- *
- * @param string $table
- * @return void
- */
- public function setTable($table)
- {
- $this->table = $table;
- }
-
- /**
- * Get the value of the model's primary key.
- *
- * @return mixed
- */
- public function getKey()
- {
- return $this->getAttribute($this->getKeyName());
- }
-
- /**
- * Get the queueable identity for the entity.
- *
- * @return mixed
- */
- public function getQueueableId()
- {
- return $this->getKey();
- }
-
- /**
- * Get the primary key for the model.
- *
- * @return string
- */
- public function getKeyName()
- {
- return $this->primaryKey;
- }
-
- /**
- * Set the primary key for the model.
- *
- * @param string $key
- * @return void
- */
- public function setKeyName($key)
- {
- $this->primaryKey = $key;
- }
-
- /**
- * Get the table qualified key name.
- *
- * @return string
- */
- public function getQualifiedKeyName()
- {
- return $this->getTable().'.'.$this->getKeyName();
- }
-
- /**
- * Get the value of the model's route key.
- *
- * @return mixed
- */
- public function getRouteKey()
- {
- return $this->getAttribute($this->getRouteKeyName());
- }
-
- /**
- * Get the route key for the model.
- *
- * @return string
- */
- public function getRouteKeyName()
- {
- return $this->getKeyName();
- }
-
- /**
- * Determine if the model uses timestamps.
- *
- * @return bool
- */
- public function usesTimestamps()
- {
- return $this->timestamps;
- }
-
- /**
- * Get the polymorphic relationship columns.
- *
- * @param string $name
- * @param string $type
- * @param string $id
- * @return array
- */
- protected function getMorphs($name, $type, $id)
- {
- $type = $type ?: $name.'_type';
-
- $id = $id ?: $name.'_id';
-
- return array($type, $id);
- }
-
- /**
- * Get the class name for polymorphic relations.
- *
- * @return string
- */
- public function getMorphClass()
- {
- return $this->morphClass ?: get_class($this);
- }
-
- /**
- * Get the number of models to return per page.
- *
- * @return int
- */
- public function getPerPage()
- {
- return $this->perPage;
- }
-
- /**
- * Set the number of models to return per page.
- *
- * @param int $perPage
- * @return void
- */
- public function setPerPage($perPage)
- {
- $this->perPage = $perPage;
- }
-
- /**
- * Get the default foreign key name for the model.
- *
- * @return string
- */
- public function getForeignKey()
- {
- return snake_case(class_basename($this)).'_id';
- }
-
- /**
- * Get the hidden attributes for the model.
- *
- * @return array
- */
- public function getHidden()
- {
- return $this->hidden;
- }
-
- /**
- * Set the hidden attributes for the model.
- *
- * @param array $hidden
- * @return void
- */
- public function setHidden(array $hidden)
- {
- $this->hidden = $hidden;
- }
-
- /**
- * Add hidden attributes for the model.
- *
- * @param array|string|null $attributes
- * @return void
- */
- public function addHidden($attributes = null)
- {
- $attributes = is_array($attributes) ? $attributes : func_get_args();
-
- $this->hidden = array_merge($this->hidden, $attributes);
- }
-
- /**
- * Get the visible attributes for the model.
- *
- * @return array
- */
- public function getVisible()
- {
- return $this->visible;
- }
-
- /**
- * Set the visible attributes for the model.
- *
- * @param array $visible
- * @return void
- */
- public function setVisible(array $visible)
- {
- $this->visible = $visible;
- }
-
- /**
- * Add visible attributes for the model.
- *
- * @param array|string|null $attributes
- * @return void
- */
- public function addVisible($attributes = null)
- {
- $attributes = is_array($attributes) ? $attributes : func_get_args();
-
- $this->visible = array_merge($this->visible, $attributes);
- }
-
- /**
- * Set the accessors to append to model arrays.
- *
- * @param array $appends
- * @return void
- */
- public function setAppends(array $appends)
- {
- $this->appends = $appends;
- }
-
- /**
- * Get the fillable attributes for the model.
- *
- * @return array
- */
- public function getFillable()
- {
- return $this->fillable;
- }
-
- /**
- * Set the fillable attributes for the model.
- *
- * @param array $fillable
- * @return $this
- */
- public function fillable(array $fillable)
- {
- $this->fillable = $fillable;
-
- return $this;
- }
-
- /**
- * Get the guarded attributes for the model.
- *
- * @return array
- */
- public function getGuarded()
- {
- return $this->guarded;
- }
-
- /**
- * Set the guarded attributes for the model.
- *
- * @param array $guarded
- * @return $this
- */
- public function guard(array $guarded)
- {
- $this->guarded = $guarded;
-
- return $this;
- }
-
- /**
- * Disable all mass assignable restrictions.
- *
- * @return void
- */
- public static function unguard($state = true)
- {
- static::$unguarded = $state;
- }
-
- /**
- * Enable the mass assignment restrictions.
- *
- * @return void
- */
- public static function reguard()
- {
- static::$unguarded = false;
- }
-
- /**
- * Determine if current state is "unguarded".
- *
- * @return bool
- */
- public static function isUnguarded()
- {
- return static::$unguarded;
- }
-
- /**
- * Run the given callable while being unguarded.
- *
- * @param callable $callback
- * @return mixed
- */
- public static function unguarded(callable $callback)
- {
- if (static::$unguarded) return $callback();
-
- static::unguard();
-
- $result = $callback();
-
- static::reguard();
-
- return $result;
- }
-
- /**
- * Determine if the given attribute may be mass assigned.
- *
- * @param string $key
- * @return bool
- */
- public function isFillable($key)
- {
- if (static::$unguarded) return true;
-
- // If the key is in the "fillable" array, we can of course assume that it's
- // a fillable attribute. Otherwise, we will check the guarded array when
- // we need to determine if the attribute is black-listed on the model.
- if (in_array($key, $this->fillable)) return true;
-
- if ($this->isGuarded($key)) return false;
-
- return empty($this->fillable) && ! starts_with($key, '_');
- }
-
- /**
- * Determine if the given key is guarded.
- *
- * @param string $key
- * @return bool
- */
- public function isGuarded($key)
- {
- return in_array($key, $this->guarded) || $this->guarded == array('*');
- }
-
- /**
- * Determine if the model is totally guarded.
- *
- * @return bool
- */
- public function totallyGuarded()
- {
- return count($this->fillable) == 0 && $this->guarded == array('*');
- }
-
- /**
- * Remove the table name from a given key.
- *
- * @param string $key
- * @return string
- */
- protected function removeTableFromKey($key)
- {
- if ( ! str_contains($key, '.')) return $key;
-
- return last(explode('.', $key));
- }
-
- /**
- * Get the relationships that are touched on save.
- *
- * @return array
- */
- public function getTouchedRelations()
- {
- return $this->touches;
- }
-
- /**
- * Set the relationships that are touched on save.
- *
- * @param array $touches
- * @return void
- */
- public function setTouchedRelations(array $touches)
- {
- $this->touches = $touches;
- }
-
- /**
- * Get the value indicating whether the IDs are incrementing.
- *
- * @return bool
- */
- public function getIncrementing()
- {
- return $this->incrementing;
- }
-
- /**
- * Set whether IDs are incrementing.
- *
- * @param bool $value
- * @return void
- */
- public function setIncrementing($value)
- {
- $this->incrementing = $value;
- }
-
- /**
- * Convert the model instance to JSON.
- *
- * @param int $options
- * @return string
- */
- public function toJson($options = 0)
- {
- return json_encode($this->toArray(), $options);
- }
-
- /**
- * Convert the object into something JSON serializable.
- *
- * @return array
- */
- public function jsonSerialize()
- {
- return $this->toArray();
- }
-
- /**
- * Convert the model instance to an array.
- *
- * @return array
- */
- public function toArray()
- {
- $attributes = $this->attributesToArray();
-
- return array_merge($attributes, $this->relationsToArray());
- }
-
- /**
- * Convert the model's attributes to an array.
- *
- * @return array
- */
- public function attributesToArray()
- {
- $attributes = $this->getArrayableAttributes();
-
- // If an attribute is a date, we will cast it to a string after converting it
- // to a DateTime / Carbon instance. This is so we will get some consistent
- // formatting while accessing attributes vs. arraying / JSONing a model.
- foreach ($this->getDates() as $key)
- {
- if ( ! isset($attributes[$key])) continue;
-
- $attributes[$key] = (string) $this->asDateTime($attributes[$key]);
- }
-
- $mutatedAttributes = $this->getMutatedAttributes();
-
- // We want to spin through all the mutated attributes for this model and call
- // the mutator for the attribute. We cache off every mutated attributes so
- // we don't have to constantly check on attributes that actually change.
- foreach ($mutatedAttributes as $key)
- {
- if ( ! array_key_exists($key, $attributes)) continue;
-
- $attributes[$key] = $this->mutateAttributeForArray(
- $key, $attributes[$key]
- );
- }
-
- // Next we will handle any casts that have been setup for this model and cast
- // the values to their appropriate type. If the attribute has a mutator we
- // will not perform the cast on those attributes to avoid any confusion.
- foreach ($this->casts as $key => $value)
- {
- if ( ! array_key_exists($key, $attributes) ||
- in_array($key, $mutatedAttributes)) continue;
-
- $attributes[$key] = $this->castAttribute(
- $key, $attributes[$key]
- );
- }
-
- // Here we will grab all of the appended, calculated attributes to this model
- // as these attributes are not really in the attributes array, but are run
- // when we need to array or JSON the model for convenience to the coder.
- foreach ($this->getArrayableAppends() as $key)
- {
- $attributes[$key] = $this->mutateAttributeForArray($key, null);
- }
-
- return $attributes;
- }
-
- /**
- * Get an attribute array of all arrayable attributes.
- *
- * @return array
- */
- protected function getArrayableAttributes()
- {
- return $this->getArrayableItems($this->attributes);
- }
-
- /**
- * Get all of the appendable values that are arrayable.
- *
- * @return array
- */
- protected function getArrayableAppends()
- {
- if ( ! count($this->appends)) return [];
-
- return $this->getArrayableItems(
- array_combine($this->appends, $this->appends)
- );
- }
-
- /**
- * Get the model's relationships in array form.
- *
- * @return array
- */
- public function relationsToArray()
- {
- $attributes = array();
-
- foreach ($this->getArrayableRelations() as $key => $value)
- {
- if (in_array($key, $this->hidden)) continue;
-
- // If the values implements the Arrayable interface we can just call this
- // toArray method on the instances which will convert both models and
- // collections to their proper array form and we'll set the values.
- if ($value instanceof Arrayable)
- {
- $relation = $value->toArray();
- }
-
- // If the value is null, we'll still go ahead and set it in this list of
- // attributes since null is used to represent empty relationships if
- // if it a has one or belongs to type relationships on the models.
- elseif (is_null($value))
- {
- $relation = $value;
- }
-
- // If the relationships snake-casing is enabled, we will snake case this
- // key so that the relation attribute is snake cased in this returned
- // array to the developers, making this consistent with attributes.
- if (static::$snakeAttributes)
- {
- $key = snake_case($key);
- }
-
- // If the relation value has been set, we will set it on this attributes
- // list for returning. If it was not arrayable or null, we'll not set
- // the value on the array because it is some type of invalid value.
- if (isset($relation) || is_null($value))
- {
- $attributes[$key] = $relation;
- }
-
- unset($relation);
- }
-
- return $attributes;
- }
-
- /**
- * Get an attribute array of all arrayable relations.
- *
- * @return array
- */
- protected function getArrayableRelations()
- {
- return $this->getArrayableItems($this->relations);
- }
-
- /**
- * Get an attribute array of all arrayable values.
- *
- * @param array $values
- * @return array
- */
- protected function getArrayableItems(array $values)
- {
- if (count($this->visible) > 0)
- {
- return array_intersect_key($values, array_flip($this->visible));
- }
-
- return array_diff_key($values, array_flip($this->hidden));
- }
-
- /**
- * Get an attribute from the model.
- *
- * @param string $key
- * @return mixed
- */
- public function getAttribute($key)
- {
- $inAttributes = array_key_exists($key, $this->attributes);
-
- // If the key references an attribute, we can just go ahead and return the
- // plain attribute value from the model. This allows every attribute to
- // be dynamically accessed through the _get method without accessors.
- if ($inAttributes || $this->hasGetMutator($key))
- {
- return $this->getAttributeValue($key);
- }
-
- // If the key already exists in the relationships array, it just means the
- // relationship has already been loaded, so we'll just return it out of
- // here because there is no need to query within the relations twice.
- if (array_key_exists($key, $this->relations))
- {
- return $this->relations[$key];
- }
-
- // If the "attribute" exists as a method on the model, we will just assume
- // it is a relationship and will load and return results from the query
- // and hydrate the relationship's value on the "relationships" array.
- if (method_exists($this, $key))
- {
- return $this->getRelationshipFromMethod($key);
- }
- }
-
- /**
- * Get a plain attribute (not a relationship).
- *
- * @param string $key
- * @return mixed
- */
- protected function getAttributeValue($key)
- {
- $value = $this->getAttributeFromArray($key);
-
- // If the attribute has a get mutator, we will call that then return what
- // it returns as the value, which is useful for transforming values on
- // retrieval from the model to a form that is more useful for usage.
- if ($this->hasGetMutator($key))
- {
- return $this->mutateAttribute($key, $value);
- }
-
- // If the attribute exists within the cast array, we will convert it to
- // an appropriate native PHP type dependant upon the associated value
- // given with the key in the pair. Dayle made this comment line up.
- if ($this->hasCast($key))
- {
- $value = $this->castAttribute($key, $value);
- }
-
- // If the attribute is listed as a date, we will convert it to a DateTime
- // instance on retrieval, which makes it quite convenient to work with
- // date fields without having to create a mutator for each property.
- elseif (in_array($key, $this->getDates()))
- {
- if ( ! is_null($value)) return $this->asDateTime($value);
- }
-
- return $value;
- }
-
- /**
- * Get an attribute from the $attributes array.
- *
- * @param string $key
- * @return mixed
- */
- protected function getAttributeFromArray($key)
- {
- if (array_key_exists($key, $this->attributes))
- {
- return $this->attributes[$key];
- }
- }
-
- /**
- * Get a relationship value from a method.
- *
- * @param string $method
- * @return mixed
- *
- * @throws \LogicException
- */
- protected function getRelationshipFromMethod($method)
- {
- $relations = $this->$method();
-
- if ( ! $relations instanceof Relation)
- {
- throw new LogicException('Relationship method must return an object of type '
- . 'Illuminate\Database\Eloquent\Relations\Relation');
- }
-
- return $this->relations[$method] = $relations->getResults();
- }
-
- /**
- * Determine if a get mutator exists for an attribute.
- *
- * @param string $key
- * @return bool
- */
- public function hasGetMutator($key)
- {
- return method_exists($this, 'get'.studly_case($key).'Attribute');
- }
-
- /**
- * Get the value of an attribute using its mutator.
- *
- * @param string $key
- * @param mixed $value
- * @return mixed
- */
- protected function mutateAttribute($key, $value)
- {
- return $this->{'get'.studly_case($key).'Attribute'}($value);
- }
-
- /**
- * Get the value of an attribute using its mutator for array conversion.
- *
- * @param string $key
- * @param mixed $value
- * @return mixed
- */
- protected function mutateAttributeForArray($key, $value)
- {
- $value = $this->mutateAttribute($key, $value);
-
- return $value instanceof Arrayable ? $value->toArray() : $value;
- }
-
- /**
- * Determine whether an attribute should be casted to a native type.
- *
- * @param string $key
- * @return bool
- */
- protected function hasCast($key)
- {
- return array_key_exists($key, $this->casts);
- }
-
- /**
- * Determine whether a value is JSON castable for inbound manipulation.
- *
- * @param string $key
- * @return bool
- */
- protected function isJsonCastable($key)
- {
- if ($this->hasCast($key))
- {
- return in_array(
- $this->getCastType($key), ['array', 'json', 'object', 'collection'], true
- );
- }
-
- return false;
- }
-
- /**
- * Get the type of cast for a model attribute.
- *
- * @param string $key
- * @return string
- */
- protected function getCastType($key)
- {
- return trim(strtolower($this->casts[$key]));
- }
-
- /**
- * Cast an attribute to a native PHP type.
- *
- * @param string $key
- * @param mixed $value
- * @return mixed
- */
- protected function castAttribute($key, $value)
- {
- if (is_null($value)) return $value;
-
- switch ($this->getCastType($key))
- {
- case 'int':
- case 'integer':
- return (int) $value;
- case 'real':
- case 'float':
- case 'double':
- return (float) $value;
- case 'string':
- return (string) $value;
- case 'bool':
- case 'boolean':
- return (bool) $value;
- case 'object':
- return json_decode($value);
- case 'array':
- case 'json':
- return json_decode($value, true);
- case 'collection':
- return $this->newCollection(json_decode($value, true));
- default:
- return $value;
- }
- }
-
- /**
- * Set a given attribute on the model.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function setAttribute($key, $value)
- {
- // First we will check for the presence of a mutator for the set operation
- // which simply lets the developers tweak the attribute as it is set on
- // the model, such as "json_encoding" an listing of data for storage.
- if ($this->hasSetMutator($key))
- {
- $method = 'set'.studly_case($key).'Attribute';
-
- return $this->{$method}($value);
- }
-
- // If an attribute is listed as a "date", we'll convert it from a DateTime
- // instance into a form proper for storage on the database tables using
- // the connection grammar's date format. We will auto set the values.
- elseif (in_array($key, $this->getDates()) && $value)
- {
- $value = $this->fromDateTime($value);
- }
-
- if ($this->isJsonCastable($key))
- {
- $value = json_encode($value);
- }
-
- $this->attributes[$key] = $value;
- }
-
- /**
- * Determine if a set mutator exists for an attribute.
- *
- * @param string $key
- * @return bool
- */
- public function hasSetMutator($key)
- {
- return method_exists($this, 'set'.studly_case($key).'Attribute');
- }
-
- /**
- * Get the attributes that should be converted to dates.
- *
- * @return array
- */
- public function getDates()
- {
- $defaults = array(static::CREATED_AT, static::UPDATED_AT);
-
- return array_merge($this->dates, $defaults);
- }
-
- /**
- * Convert a DateTime to a storable string.
- *
- * @param \DateTime|int $value
- * @return string
- */
- public function fromDateTime($value)
- {
- $format = $this->getDateFormat();
-
- // If the value is already a DateTime instance, we will just skip the rest of
- // these checks since they will be a waste of time, and hinder performance
- // when checking the field. We will just return the DateTime right away.
- if ($value instanceof DateTime)
- {
- //
- }
-
- // If the value is totally numeric, we will assume it is a UNIX timestamp and
- // format the date as such. Once we have the date in DateTime form we will
- // format it according to the proper format for the database connection.
- elseif (is_numeric($value))
- {
- $value = Carbon::createFromTimestamp($value);
- }
-
- // If the value is in simple year, month, day format, we will format it using
- // that setup. This is for simple "date" fields which do not have hours on
- // the field. This conveniently picks up those dates and format correct.
- elseif (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $value))
- {
- $value = Carbon::createFromFormat('Y-m-d', $value)->startOfDay();
- }
-
- // If this value is some other type of string, we'll create the DateTime with
- // the format used by the database connection. Once we get the instance we
- // can return back the finally formatted DateTime instances to the devs.
- else
- {
- $value = Carbon::createFromFormat($format, $value);
- }
-
- return $value->format($format);
- }
-
- /**
- * Return a timestamp as DateTime object.
- *
- * @param mixed $value
- * @return \Carbon\Carbon
- */
- protected function asDateTime($value)
- {
- // If this value is an integer, we will assume it is a UNIX timestamp's value
- // and format a Carbon object from this timestamp. This allows flexibility
- // when defining your date fields as they might be UNIX timestamps here.
- if (is_numeric($value))
- {
- return Carbon::createFromTimestamp($value);
- }
-
- // If the value is in simply year, month, day format, we will instantiate the
- // Carbon instances from that format. Again, this provides for simple date
- // fields on the database, while still supporting Carbonized conversion.
- elseif (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $value))
- {
- return Carbon::createFromFormat('Y-m-d', $value)->startOfDay();
- }
-
- // Finally, we will just assume this date is in the format used by default on
- // the database connection and use that format to create the Carbon object
- // that is returned back out to the developers after we convert it here.
- elseif ( ! $value instanceof DateTime)
- {
- $format = $this->getDateFormat();
-
- return Carbon::createFromFormat($format, $value);
- }
-
- return Carbon::instance($value);
- }
-
- /**
- * Get the format for database stored dates.
- *
- * @return string
- */
- protected function getDateFormat()
- {
- return $this->getConnection()->getQueryGrammar()->getDateFormat();
- }
-
- /**
- * Clone the model into a new, non-existing instance.
- *
- * @param array $except
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function replicate(array $except = null)
- {
- $except = $except ?: [
- $this->getKeyName(),
- $this->getCreatedAtColumn(),
- $this->getUpdatedAtColumn(),
- ];
-
- $attributes = array_except($this->attributes, $except);
-
- with($instance = new static)->setRawAttributes($attributes);
-
- return $instance->setRelations($this->relations);
- }
-
- /**
- * Get all of the current attributes on the model.
- *
- * @return array
- */
- public function getAttributes()
- {
- return $this->attributes;
- }
-
- /**
- * Set the array of model attributes. No checking is done.
- *
- * @param array $attributes
- * @param bool $sync
- * @return void
- */
- public function setRawAttributes(array $attributes, $sync = false)
- {
- $this->attributes = $attributes;
-
- if ($sync) $this->syncOriginal();
- }
-
- /**
- * Get the model's original attribute values.
- *
- * @param string $key
- * @param mixed $default
- * @return array
- */
- public function getOriginal($key = null, $default = null)
- {
- return array_get($this->original, $key, $default);
- }
-
- /**
- * Sync the original attributes with the current.
- *
- * @return $this
- */
- public function syncOriginal()
- {
- $this->original = $this->attributes;
-
- return $this;
- }
-
- /**
- * Sync a single original attribute with its current value.
- *
- * @param string $attribute
- * @return $this
- */
- public function syncOriginalAttribute($attribute)
- {
- $this->original[$attribute] = $this->attributes[$attribute];
-
- return $this;
- }
-
- /**
- * Determine if the model or given attribute(s) have been modified.
- *
- * @param array|string|null $attributes
- * @return bool
- */
- public function isDirty($attributes = null)
- {
- $dirty = $this->getDirty();
-
- if (is_null($attributes)) return count($dirty) > 0;
-
- if ( ! is_array($attributes)) $attributes = func_get_args();
-
- foreach ($attributes as $attribute)
- {
- if (array_key_exists($attribute, $dirty)) return true;
- }
-
- return false;
- }
-
- /**
- * Get the attributes that have been changed since last sync.
- *
- * @return array
- */
- public function getDirty()
- {
- $dirty = array();
-
- foreach ($this->attributes as $key => $value)
- {
- if ( ! array_key_exists($key, $this->original))
- {
- $dirty[$key] = $value;
- }
- elseif ($value !== $this->original[$key] &&
- ! $this->originalIsNumericallyEquivalent($key))
- {
- $dirty[$key] = $value;
- }
- }
-
- return $dirty;
- }
-
- /**
- * Determine if the new and old values for a given key are numerically equivalent.
- *
- * @param string $key
- * @return bool
- */
- protected function originalIsNumericallyEquivalent($key)
- {
- $current = $this->attributes[$key];
-
- $original = $this->original[$key];
-
- return is_numeric($current) && is_numeric($original) && strcmp((string) $current, (string) $original) === 0;
- }
-
- /**
- * Get all the loaded relations for the instance.
- *
- * @return array
- */
- public function getRelations()
- {
- return $this->relations;
- }
-
- /**
- * Get a specified relationship.
- *
- * @param string $relation
- * @return mixed
- */
- public function getRelation($relation)
- {
- return $this->relations[$relation];
- }
-
- /**
- * Set the specific relationship in the model.
- *
- * @param string $relation
- * @param mixed $value
- * @return $this
- */
- public function setRelation($relation, $value)
- {
- $this->relations[$relation] = $value;
-
- return $this;
- }
-
- /**
- * Set the entire relations array on the model.
- *
- * @param array $relations
- * @return $this
- */
- public function setRelations(array $relations)
- {
- $this->relations = $relations;
-
- return $this;
- }
-
- /**
- * Get the database connection for the model.
- *
- * @return \Illuminate\Database\Connection
- */
- public function getConnection()
- {
- return static::resolveConnection($this->connection);
- }
-
- /**
- * Get the current connection name for the model.
- *
- * @return string
- */
- public function getConnectionName()
- {
- return $this->connection;
- }
-
- /**
- * Set the connection associated with the model.
- *
- * @param string $name
- * @return $this
- */
- public function setConnection($name)
- {
- $this->connection = $name;
-
- return $this;
- }
-
- /**
- * Resolve a connection instance.
- *
- * @param string $connection
- * @return \Illuminate\Database\Connection
- */
- public static function resolveConnection($connection = null)
- {
- return static::$resolver->connection($connection);
- }
-
- /**
- * Get the connection resolver instance.
- *
- * @return \Illuminate\Database\ConnectionResolverInterface
- */
- public static function getConnectionResolver()
- {
- return static::$resolver;
- }
-
- /**
- * Set the connection resolver instance.
- *
- * @param \Illuminate\Database\ConnectionResolverInterface $resolver
- * @return void
- */
- public static function setConnectionResolver(Resolver $resolver)
- {
- static::$resolver = $resolver;
- }
-
- /**
- * Unset the connection resolver for models.
- *
- * @return void
- */
- public static function unsetConnectionResolver()
- {
- static::$resolver = null;
- }
-
- /**
- * Get the event dispatcher instance.
- *
- * @return \Illuminate\Contracts\Events\Dispatcher
- */
- public static function getEventDispatcher()
- {
- return static::$dispatcher;
- }
-
- /**
- * Set the event dispatcher instance.
- *
- * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
- * @return void
- */
- public static function setEventDispatcher(Dispatcher $dispatcher)
- {
- static::$dispatcher = $dispatcher;
- }
-
- /**
- * Unset the event dispatcher for models.
- *
- * @return void
- */
- public static function unsetEventDispatcher()
- {
- static::$dispatcher = null;
- }
-
- /**
- * Get the mutated attributes for a given instance.
- *
- * @return array
- */
- public function getMutatedAttributes()
- {
- $class = get_class($this);
-
- if ( ! isset(static::$mutatorCache[$class]))
- {
- static::cacheMutatedAttributes($class);
- }
-
- return static::$mutatorCache[$class];
- }
-
- /**
- * Extract and cache all the mutated attributes of a class.
- *
- * @param string $class
- * @return void
- */
- public static function cacheMutatedAttributes($class)
- {
- $mutatedAttributes = array();
-
- // Here we will extract all of the mutated attributes so that we can quickly
- // spin through them after we export models to their array form, which we
- // need to be fast. This'll let us know the attributes that can mutate.
- foreach (get_class_methods($class) as $method)
- {
- if (strpos($method, 'Attribute') !== false &&
- preg_match('/^get(.+)Attribute$/', $method, $matches))
- {
- if (static::$snakeAttributes) $matches[1] = snake_case($matches[1]);
-
- $mutatedAttributes[] = lcfirst($matches[1]);
- }
- }
-
- static::$mutatorCache[$class] = $mutatedAttributes;
- }
-
- /**
- * Dynamically retrieve attributes on the model.
- *
- * @param string $key
- * @return mixed
- */
- public function __get($key)
- {
- return $this->getAttribute($key);
- }
-
- /**
- * Dynamically set attributes on the model.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function __set($key, $value)
- {
- $this->setAttribute($key, $value);
- }
-
- /**
- * Determine if the given attribute exists.
- *
- * @param mixed $offset
- * @return bool
- */
- public function offsetExists($offset)
- {
- return isset($this->$offset);
- }
-
- /**
- * Get the value for a given offset.
- *
- * @param mixed $offset
- * @return mixed
- */
- public function offsetGet($offset)
- {
- return $this->$offset;
- }
-
- /**
- * Set the value for a given offset.
- *
- * @param mixed $offset
- * @param mixed $value
- * @return void
- */
- public function offsetSet($offset, $value)
- {
- $this->$offset = $value;
- }
-
- /**
- * Unset the value for a given offset.
- *
- * @param mixed $offset
- * @return void
- */
- public function offsetUnset($offset)
- {
- unset($this->$offset);
- }
-
- /**
- * Determine if an attribute exists on the model.
- *
- * @param string $key
- * @return bool
- */
- public function __isset($key)
- {
- return (isset($this->attributes[$key]) || isset($this->relations[$key])) ||
- ($this->hasGetMutator($key) && ! is_null($this->getAttributeValue($key)));
- }
-
- /**
- * Unset an attribute on the model.
- *
- * @param string $key
- * @return void
- */
- public function __unset($key)
- {
- unset($this->attributes[$key], $this->relations[$key]);
- }
-
- /**
- * Handle dynamic method calls into the model.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- if (in_array($method, array('increment', 'decrement')))
- {
- return call_user_func_array(array($this, $method), $parameters);
- }
-
- $query = $this->newQuery();
-
- return call_user_func_array(array($query, $method), $parameters);
- }
-
- /**
- * Handle dynamic static method calls into the method.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public static function __callStatic($method, $parameters)
- {
- $instance = new static;
-
- return call_user_func_array(array($instance, $method), $parameters);
- }
-
- /**
- * Convert the model to its string representation.
- *
- * @return string
- */
- public function __toString()
- {
- return $this->toJson();
- }
-
- /**
- * When a model is being unserialized, check if it needs to be booted.
- *
- * @return void
- */
- public function __wakeup()
- {
- $this->bootIfNotBooted();
- }
-
+abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializable, QueueableEntity, UrlRoutable
+{
+ /**
+ * The connection name for the model.
+ *
+ * @var string
+ */
+ protected $connection;
+
+ /**
+ * The table associated with the model.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * The primary key for the model.
+ *
+ * @var string
+ */
+ protected $primaryKey = 'id';
+
+ /**
+ * The number of models to return for pagination.
+ *
+ * @var int
+ */
+ protected $perPage = 15;
+
+ /**
+ * Indicates if the IDs are auto-incrementing.
+ *
+ * @var bool
+ */
+ public $incrementing = true;
+
+ /**
+ * Indicates if the model should be timestamped.
+ *
+ * @var bool
+ */
+ public $timestamps = true;
+
+ /**
+ * The model's attributes.
+ *
+ * @var array
+ */
+ protected $attributes = [];
+
+ /**
+ * The model attribute's original state.
+ *
+ * @var array
+ */
+ protected $original = [];
+
+ /**
+ * The loaded relationships for the model.
+ *
+ * @var array
+ */
+ protected $relations = [];
+
+ /**
+ * The attributes that should be hidden for arrays.
+ *
+ * @var array
+ */
+ protected $hidden = [];
+
+ /**
+ * The attributes that should be visible in arrays.
+ *
+ * @var array
+ */
+ protected $visible = [];
+
+ /**
+ * The accessors to append to the model's array form.
+ *
+ * @var array
+ */
+ protected $appends = [];
+
+ /**
+ * The attributes that are mass assignable.
+ *
+ * @var array
+ */
+ protected $fillable = [];
+
+ /**
+ * The attributes that aren't mass assignable.
+ *
+ * @var array
+ */
+ protected $guarded = ['*'];
+
+ /**
+ * The attributes that should be mutated to dates.
+ *
+ * @var array
+ */
+ protected $dates = [];
+
+ /**
+ * The storage format of the model's date columns.
+ *
+ * @var string
+ */
+ protected $dateFormat;
+
+ /**
+ * The attributes that should be cast to native types.
+ *
+ * @var array
+ */
+ protected $casts = [];
+
+ /**
+ * The relationships that should be touched on save.
+ *
+ * @var array
+ */
+ protected $touches = [];
+
+ /**
+ * User exposed observable events.
+ *
+ * @var array
+ */
+ protected $observables = [];
+
+ /**
+ * The relations to eager load on every query.
+ *
+ * @var array
+ */
+ protected $with = [];
+
+ /**
+ * The class name to be used in polymorphic relations.
+ *
+ * @var string
+ */
+ protected $morphClass;
+
+ /**
+ * Indicates if the model exists.
+ *
+ * @var bool
+ */
+ public $exists = false;
+
+ /**
+ * Indicates if the model was inserted during the current request lifecycle.
+ *
+ * @var bool
+ */
+ public $wasRecentlyCreated = false;
+
+ /**
+ * Indicates whether attributes are snake cased on arrays.
+ *
+ * @var bool
+ */
+ public static $snakeAttributes = true;
+
+ /**
+ * The connection resolver instance.
+ *
+ * @var \Illuminate\Database\ConnectionResolverInterface
+ */
+ protected static $resolver;
+
+ /**
+ * The event dispatcher instance.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected static $dispatcher;
+
+ /**
+ * The array of booted models.
+ *
+ * @var array
+ */
+ protected static $booted = [];
+
+ /**
+ * The array of global scopes on the model.
+ *
+ * @var array
+ */
+ protected static $globalScopes = [];
+
+ /**
+ * Indicates if all mass assignment is enabled.
+ *
+ * @var bool
+ */
+ protected static $unguarded = false;
+
+ /**
+ * The cache of the mutated attributes for each class.
+ *
+ * @var array
+ */
+ protected static $mutatorCache = [];
+
+ /**
+ * The many to many relationship methods.
+ *
+ * @var array
+ */
+ public static $manyMethods = ['belongsToMany', 'morphToMany', 'morphedByMany'];
+
+ /**
+ * The name of the "created at" column.
+ *
+ * @var string
+ */
+ const CREATED_AT = 'created_at';
+
+ /**
+ * The name of the "updated at" column.
+ *
+ * @var string
+ */
+ const UPDATED_AT = 'updated_at';
+
+ /**
+ * Create a new Eloquent model instance.
+ *
+ * @param array $attributes
+ * @return void
+ */
+ public function __construct(array $attributes = [])
+ {
+ $this->bootIfNotBooted();
+
+ $this->syncOriginal();
+
+ $this->fill($attributes);
+ }
+
+ /**
+ * Check if the model needs to be booted and if so, do it.
+ *
+ * @return void
+ */
+ protected function bootIfNotBooted()
+ {
+ $class = get_class($this);
+
+ if (! isset(static::$booted[$class])) {
+ static::$booted[$class] = true;
+
+ $this->fireModelEvent('booting', false);
+
+ static::boot();
+
+ $this->fireModelEvent('booted', false);
+ }
+ }
+
+ /**
+ * The "booting" method of the model.
+ *
+ * @return void
+ */
+ protected static function boot()
+ {
+ static::bootTraits();
+ }
+
+ /**
+ * Boot all of the bootable traits on the model.
+ *
+ * @return void
+ */
+ protected static function bootTraits()
+ {
+ foreach (class_uses_recursive(get_called_class()) as $trait) {
+ if (method_exists(get_called_class(), $method = 'boot'.class_basename($trait))) {
+ forward_static_call([get_called_class(), $method]);
+ }
+ }
+ }
+
+ /**
+ * Clear the list of booted models so they will be re-booted.
+ *
+ * @return void
+ */
+ public static function clearBootedModels()
+ {
+ static::$booted = [];
+ }
+
+ /**
+ * Register a new global scope on the model.
+ *
+ * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
+ * @return void
+ */
+ public static function addGlobalScope(ScopeInterface $scope)
+ {
+ static::$globalScopes[get_called_class()][get_class($scope)] = $scope;
+ }
+
+ /**
+ * Determine if a model has a global scope.
+ *
+ * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
+ * @return bool
+ */
+ public static function hasGlobalScope($scope)
+ {
+ return ! is_null(static::getGlobalScope($scope));
+ }
+
+ /**
+ * Get a global scope registered with the model.
+ *
+ * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
+ * @return \Illuminate\Database\Eloquent\ScopeInterface|null
+ */
+ public static function getGlobalScope($scope)
+ {
+ return Arr::first(static::$globalScopes[get_called_class()], function ($key, $value) use ($scope) {
+ return $scope instanceof $value;
+ });
+ }
+
+ /**
+ * Get the global scopes for this class instance.
+ *
+ * @return array
+ */
+ public function getGlobalScopes()
+ {
+ return Arr::get(static::$globalScopes, get_class($this), []);
+ }
+
+ /**
+ * Register an observer with the Model.
+ *
+ * @param object|string $class
+ * @param int $priority
+ * @return void
+ */
+ public static function observe($class, $priority = 0)
+ {
+ $instance = new static;
+
+ $className = is_string($class) ? $class : get_class($class);
+
+ // When registering a model observer, we will spin through the possible events
+ // and determine if this observer has that method. If it does, we will hook
+ // it into the model's event system, making it convenient to watch these.
+ foreach ($instance->getObservableEvents() as $event) {
+ if (method_exists($class, $event)) {
+ static::registerModelEvent($event, $className.'@'.$event, $priority);
+ }
+ }
+ }
+
+ /**
+ * Fill the model with an array of attributes.
+ *
+ * @param array $attributes
+ * @return $this
+ *
+ * @throws \Illuminate\Database\Eloquent\MassAssignmentException
+ */
+ public function fill(array $attributes)
+ {
+ $totallyGuarded = $this->totallyGuarded();
+
+ foreach ($this->fillableFromArray($attributes) as $key => $value) {
+ $key = $this->removeTableFromKey($key);
+
+ // The developers may choose to place some attributes in the "fillable"
+ // array, which means only those attributes may be set through mass
+ // assignment to the model, and all others will just be ignored.
+ if ($this->isFillable($key)) {
+ $this->setAttribute($key, $value);
+ } elseif ($totallyGuarded) {
+ throw new MassAssignmentException($key);
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Fill the model with an array of attributes. Force mass assignment.
+ *
+ * @param array $attributes
+ * @return $this
+ */
+ public function forceFill(array $attributes)
+ {
+ // Since some versions of PHP have a bug that prevents it from properly
+ // binding the late static context in a closure, we will first store
+ // the model in a variable, which we will then use in the closure.
+ $model = $this;
+
+ return static::unguarded(function () use ($model, $attributes) {
+ return $model->fill($attributes);
+ });
+ }
+
+ /**
+ * Get the fillable attributes of a given array.
+ *
+ * @param array $attributes
+ * @return array
+ */
+ protected function fillableFromArray(array $attributes)
+ {
+ if (count($this->fillable) > 0 && ! static::$unguarded) {
+ return array_intersect_key($attributes, array_flip($this->fillable));
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * Create a new instance of the given model.
+ *
+ * @param array $attributes
+ * @param bool $exists
+ * @return static
+ */
+ public function newInstance($attributes = [], $exists = false)
+ {
+ // This method just provides a convenient way for us to generate fresh model
+ // instances of this current model. It is particularly useful during the
+ // hydration of new objects via the Eloquent query builder instances.
+ $model = new static((array) $attributes);
+
+ $model->exists = $exists;
+
+ return $model;
+ }
+
+ /**
+ * Create a new model instance that is existing.
+ *
+ * @param array $attributes
+ * @param string|null $connection
+ * @return static
+ */
+ public function newFromBuilder($attributes = [], $connection = null)
+ {
+ $model = $this->newInstance([], true);
+
+ $model->setRawAttributes((array) $attributes, true);
+
+ $model->setConnection($connection ?: $this->connection);
+
+ return $model;
+ }
+
+ /**
+ * Create a collection of models from plain arrays.
+ *
+ * @param array $items
+ * @param string|null $connection
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public static function hydrate(array $items, $connection = null)
+ {
+ $instance = (new static)->setConnection($connection);
+
+ $items = array_map(function ($item) use ($instance) {
+ return $instance->newFromBuilder($item);
+ }, $items);
+
+ return $instance->newCollection($items);
+ }
+
+ /**
+ * Create a collection of models from a raw query.
+ *
+ * @param string $query
+ * @param array $bindings
+ * @param string|null $connection
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public static function hydrateRaw($query, $bindings = [], $connection = null)
+ {
+ $instance = (new static)->setConnection($connection);
+
+ $items = $instance->getConnection()->select($query, $bindings);
+
+ return static::hydrate($items, $connection);
+ }
+
+ /**
+ * Save a new model and return the instance.
+ *
+ * @param array $attributes
+ * @return static
+ */
+ public static function create(array $attributes = [])
+ {
+ $model = new static($attributes);
+
+ $model->save();
+
+ return $model;
+ }
+
+ /**
+ * Save a new model and return the instance. Allow mass-assignment.
+ *
+ * @param array $attributes
+ * @return static
+ */
+ public static function forceCreate(array $attributes)
+ {
+ // Since some versions of PHP have a bug that prevents it from properly
+ // binding the late static context in a closure, we will first store
+ // the model in a variable, which we will then use in the closure.
+ $model = new static;
+
+ return static::unguarded(function () use ($model, $attributes) {
+ return $model->create($attributes);
+ });
+ }
+
+ /**
+ * Begin querying the model.
+ *
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public static function query()
+ {
+ return (new static)->newQuery();
+ }
+
+ /**
+ * Begin querying the model on a given connection.
+ *
+ * @param string|null $connection
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public static function on($connection = null)
+ {
+ // First we will just create a fresh instance of this model, and then we can
+ // set the connection on the model so that it is be used for the queries
+ // we execute, as well as being set on each relationship we retrieve.
+ $instance = new static;
+
+ $instance->setConnection($connection);
+
+ return $instance->newQuery();
+ }
+
+ /**
+ * Begin querying the model on the write connection.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public static function onWriteConnection()
+ {
+ $instance = new static;
+
+ return $instance->newQuery()->useWritePdo();
+ }
+
+ /**
+ * Get all of the models from the database.
+ *
+ * @param array|mixed $columns
+ * @return \Illuminate\Database\Eloquent\Collection|static[]
+ */
+ public static function all($columns = ['*'])
+ {
+ $columns = is_array($columns) ? $columns : func_get_args();
+
+ $instance = new static;
+
+ return $instance->newQuery()->get($columns);
+ }
+
+ /**
+ * Reload a fresh model instance from the database.
+ *
+ * @param array $with
+ * @return static|null
+ */
+ public function fresh(array $with = [])
+ {
+ if (! $this->exists) {
+ return;
+ }
+
+ $key = $this->getKeyName();
+
+ return static::with($with)->where($key, $this->getKey())->first();
+ }
+
+ /**
+ * Eager load relations on the model.
+ *
+ * @param array|string $relations
+ * @return $this
+ */
+ public function load($relations)
+ {
+ if (is_string($relations)) {
+ $relations = func_get_args();
+ }
+
+ $query = $this->newQuery()->with($relations);
+
+ $query->eagerLoadRelations([$this]);
+
+ return $this;
+ }
+
+ /**
+ * Begin querying a model with eager loading.
+ *
+ * @param array|string $relations
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public static function with($relations)
+ {
+ if (is_string($relations)) {
+ $relations = func_get_args();
+ }
+
+ $instance = new static;
+
+ return $instance->newQuery()->with($relations);
+ }
+
+ /**
+ * Append attributes to query when building a query.
+ *
+ * @param array|string $attributes
+ * @return $this
+ */
+ public function append($attributes)
+ {
+ if (is_string($attributes)) {
+ $attributes = func_get_args();
+ }
+
+ $this->appends = array_unique(
+ array_merge($this->appends, $attributes)
+ );
+
+ return $this;
+ }
+
+ /**
+ * Define a one-to-one relationship.
+ *
+ * @param string $related
+ * @param string $foreignKey
+ * @param string $localKey
+ * @return \Illuminate\Database\Eloquent\Relations\HasOne
+ */
+ public function hasOne($related, $foreignKey = null, $localKey = null)
+ {
+ $foreignKey = $foreignKey ?: $this->getForeignKey();
+
+ $instance = new $related;
+
+ $localKey = $localKey ?: $this->getKeyName();
+
+ return new HasOne($instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey);
+ }
+
+ /**
+ * Define a polymorphic one-to-one relationship.
+ *
+ * @param string $related
+ * @param string $name
+ * @param string $type
+ * @param string $id
+ * @param string $localKey
+ * @return \Illuminate\Database\Eloquent\Relations\MorphOne
+ */
+ public function morphOne($related, $name, $type = null, $id = null, $localKey = null)
+ {
+ $instance = new $related;
+
+ list($type, $id) = $this->getMorphs($name, $type, $id);
+
+ $table = $instance->getTable();
+
+ $localKey = $localKey ?: $this->getKeyName();
+
+ return new MorphOne($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey);
+ }
+
+ /**
+ * Define an inverse one-to-one or many relationship.
+ *
+ * @param string $related
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @param string $relation
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+ */
+ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relation = null)
+ {
+ // If no relation name was given, we will use this debug backtrace to extract
+ // the calling method's name and use that as the relationship name as most
+ // of the time this will be what we desire to use for the relationships.
+ if (is_null($relation)) {
+ list($current, $caller) = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+ $relation = $caller['function'];
+ }
+
+ // If no foreign key was supplied, we can use a backtrace to guess the proper
+ // foreign key name by using the name of the relationship function, which
+ // when combined with an "_id" should conventionally match the columns.
+ if (is_null($foreignKey)) {
+ $foreignKey = Str::snake($relation).'_id';
+ }
+
+ $instance = new $related;
+
+ // Once we have the foreign key names, we'll just create a new Eloquent query
+ // for the related models and returns the relationship instance which will
+ // actually be responsible for retrieving and hydrating every relations.
+ $query = $instance->newQuery();
+
+ $otherKey = $otherKey ?: $instance->getKeyName();
+
+ return new BelongsTo($query, $this, $foreignKey, $otherKey, $relation);
+ }
+
+ /**
+ * Define a polymorphic, inverse one-to-one or many relationship.
+ *
+ * @param string $name
+ * @param string $type
+ * @param string $id
+ * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+ */
+ public function morphTo($name = null, $type = null, $id = null)
+ {
+ // If no name is provided, we will use the backtrace to get the function name
+ // since that is most likely the name of the polymorphic interface. We can
+ // use that to get both the class and foreign key that will be utilized.
+ if (is_null($name)) {
+ list($current, $caller) = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+ $name = Str::snake($caller['function']);
+ }
+
+ list($type, $id) = $this->getMorphs($name, $type, $id);
+
+ // If the type value is null it is probably safe to assume we're eager loading
+ // the relationship. In this case we'll just pass in a dummy query where we
+ // need to remove any eager loads that may already be defined on a model.
+ if (empty($class = $this->$type)) {
+ return new MorphTo(
+ $this->newQuery()->setEagerLoads([]), $this, $id, null, $type, $name
+ );
+ }
+
+ // If we are not eager loading the relationship we will essentially treat this
+ // as a belongs-to style relationship since morph-to extends that class and
+ // we will pass in the appropriate values so that it behaves as expected.
+ else {
+ $class = $this->getActualClassNameForMorph($class);
+
+ $instance = new $class;
+
+ return new MorphTo(
+ $instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name
+ );
+ }
+ }
+
+ /**
+ * Retrieve the fully qualified class name from a slug.
+ *
+ * @param string $class
+ * @return string
+ */
+ public function getActualClassNameForMorph($class)
+ {
+ return Arr::get(Relation::morphMap(), $class, $class);
+ }
+
+ /**
+ * Define a one-to-many relationship.
+ *
+ * @param string $related
+ * @param string $foreignKey
+ * @param string $localKey
+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
+ */
+ public function hasMany($related, $foreignKey = null, $localKey = null)
+ {
+ $foreignKey = $foreignKey ?: $this->getForeignKey();
+
+ $instance = new $related;
+
+ $localKey = $localKey ?: $this->getKeyName();
+
+ return new HasMany($instance->newQuery(), $this, $instance->getTable().'.'.$foreignKey, $localKey);
+ }
+
+ /**
+ * Define a has-many-through relationship.
+ *
+ * @param string $related
+ * @param string $through
+ * @param string|null $firstKey
+ * @param string|null $secondKey
+ * @param string|null $localKey
+ * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
+ */
+ public function hasManyThrough($related, $through, $firstKey = null, $secondKey = null, $localKey = null)
+ {
+ $through = new $through;
+
+ $firstKey = $firstKey ?: $this->getForeignKey();
+
+ $secondKey = $secondKey ?: $through->getForeignKey();
+
+ $localKey = $localKey ?: $this->getKeyName();
+
+ return new HasManyThrough((new $related)->newQuery(), $this, $through, $firstKey, $secondKey, $localKey);
+ }
+
+ /**
+ * Define a polymorphic one-to-many relationship.
+ *
+ * @param string $related
+ * @param string $name
+ * @param string $type
+ * @param string $id
+ * @param string $localKey
+ * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+ */
+ public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
+ {
+ $instance = new $related;
+
+ // Here we will gather up the morph type and ID for the relationship so that we
+ // can properly query the intermediate table of a relation. Finally, we will
+ // get the table and create the relationship instances for the developers.
+ list($type, $id) = $this->getMorphs($name, $type, $id);
+
+ $table = $instance->getTable();
+
+ $localKey = $localKey ?: $this->getKeyName();
+
+ return new MorphMany($instance->newQuery(), $this, $table.'.'.$type, $table.'.'.$id, $localKey);
+ }
+
+ /**
+ * Define a many-to-many relationship.
+ *
+ * @param string $related
+ * @param string $table
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @param string $relation
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+ */
+ public function belongsToMany($related, $table = null, $foreignKey = null, $otherKey = null, $relation = null)
+ {
+ // If no relationship name was passed, we will pull backtraces to get the
+ // name of the calling function. We will use that function name as the
+ // title of this relation since that is a great convention to apply.
+ if (is_null($relation)) {
+ $relation = $this->getBelongsToManyCaller();
+ }
+
+ // First, we'll need to determine the foreign key and "other key" for the
+ // relationship. Once we have determined the keys we'll make the query
+ // instances as well as the relationship instances we need for this.
+ $foreignKey = $foreignKey ?: $this->getForeignKey();
+
+ $instance = new $related;
+
+ $otherKey = $otherKey ?: $instance->getForeignKey();
+
+ // If no table name was provided, we can guess it by concatenating the two
+ // models using underscores in alphabetical order. The two model names
+ // are transformed to snake case from their default CamelCase also.
+ if (is_null($table)) {
+ $table = $this->joiningTable($related);
+ }
+
+ // Now we're ready to create a new query builder for the related model and
+ // the relationship instances for the relation. The relations will set
+ // appropriate query constraint and entirely manages the hydrations.
+ $query = $instance->newQuery();
+
+ return new BelongsToMany($query, $this, $table, $foreignKey, $otherKey, $relation);
+ }
+
+ /**
+ * Define a polymorphic many-to-many relationship.
+ *
+ * @param string $related
+ * @param string $name
+ * @param string $table
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @param bool $inverse
+ * @return \Illuminate\Database\Eloquent\Relations\MorphToMany
+ */
+ public function morphToMany($related, $name, $table = null, $foreignKey = null, $otherKey = null, $inverse = false)
+ {
+ $caller = $this->getBelongsToManyCaller();
+
+ // First, we will need to determine the foreign key and "other key" for the
+ // relationship. Once we have determined the keys we will make the query
+ // instances, as well as the relationship instances we need for these.
+ $foreignKey = $foreignKey ?: $name.'_id';
+
+ $instance = new $related;
+
+ $otherKey = $otherKey ?: $instance->getForeignKey();
+
+ // Now we're ready to create a new query builder for this related model and
+ // the relationship instances for this relation. This relations will set
+ // appropriate query constraints then entirely manages the hydrations.
+ $query = $instance->newQuery();
+
+ $table = $table ?: Str::plural($name);
+
+ return new MorphToMany(
+ $query, $this, $name, $table, $foreignKey,
+ $otherKey, $caller, $inverse
+ );
+ }
+
+ /**
+ * Define a polymorphic, inverse many-to-many relationship.
+ *
+ * @param string $related
+ * @param string $name
+ * @param string $table
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @return \Illuminate\Database\Eloquent\Relations\MorphToMany
+ */
+ public function morphedByMany($related, $name, $table = null, $foreignKey = null, $otherKey = null)
+ {
+ $foreignKey = $foreignKey ?: $this->getForeignKey();
+
+ // For the inverse of the polymorphic many-to-many relations, we will change
+ // the way we determine the foreign and other keys, as it is the opposite
+ // of the morph-to-many method since we're figuring out these inverses.
+ $otherKey = $otherKey ?: $name.'_id';
+
+ return $this->morphToMany($related, $name, $table, $foreignKey, $otherKey, true);
+ }
+
+ /**
+ * Get the relationship name of the belongs to many.
+ *
+ * @return string
+ */
+ protected function getBelongsToManyCaller()
+ {
+ $self = __FUNCTION__;
+
+ $caller = Arr::first(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), function ($key, $trace) use ($self) {
+ $caller = $trace['function'];
+
+ return ! in_array($caller, Model::$manyMethods) && $caller != $self;
+ });
+
+ return ! is_null($caller) ? $caller['function'] : null;
+ }
+
+ /**
+ * Get the joining table name for a many-to-many relation.
+ *
+ * @param string $related
+ * @return string
+ */
+ public function joiningTable($related)
+ {
+ // The joining table name, by convention, is simply the snake cased models
+ // sorted alphabetically and concatenated with an underscore, so we can
+ // just sort the models and join them together to get the table name.
+ $base = Str::snake(class_basename($this));
+
+ $related = Str::snake(class_basename($related));
+
+ $models = [$related, $base];
+
+ // Now that we have the model names in an array we can just sort them and
+ // use the implode function to join them together with an underscores,
+ // which is typically used by convention within the database system.
+ sort($models);
+
+ return strtolower(implode('_', $models));
+ }
+
+ /**
+ * Destroy the models for the given IDs.
+ *
+ * @param array|int $ids
+ * @return int
+ */
+ public static function destroy($ids)
+ {
+ // We'll initialize a count here so we will return the total number of deletes
+ // for the operation. The developers can then check this number as a boolean
+ // type value or get this total count of records deleted for logging, etc.
+ $count = 0;
+
+ $ids = is_array($ids) ? $ids : func_get_args();
+
+ $instance = new static;
+
+ // We will actually pull the models from the database table and call delete on
+ // each of them individually so that their events get fired properly with a
+ // correct set of attributes in case the developers wants to check these.
+ $key = $instance->getKeyName();
+
+ foreach ($instance->whereIn($key, $ids)->get() as $model) {
+ if ($model->delete()) {
+ $count++;
+ }
+ }
+
+ return $count;
+ }
+
+ /**
+ * Delete the model from the database.
+ *
+ * @return bool|null
+ *
+ * @throws \Exception
+ */
+ public function delete()
+ {
+ if (is_null($this->getKeyName())) {
+ throw new Exception('No primary key defined on model.');
+ }
+
+ if ($this->exists) {
+ if ($this->fireModelEvent('deleting') === false) {
+ return false;
+ }
+
+ // Here, we'll touch the owning models, verifying these timestamps get updated
+ // for the models. This will allow any caching to get broken on the parents
+ // by the timestamp. Then we will go ahead and delete the model instance.
+ $this->touchOwners();
+
+ $this->performDeleteOnModel();
+
+ $this->exists = false;
+
+ // Once the model has been deleted, we will fire off the deleted event so that
+ // the developers may hook into post-delete operations. We will then return
+ // a boolean true as the delete is presumably successful on the database.
+ $this->fireModelEvent('deleted', false);
+
+ return true;
+ }
+ }
+
+ /**
+ * Force a hard delete on a soft deleted model.
+ *
+ * This method protects developers from running forceDelete when trait is missing.
+ *
+ * @return bool|null
+ */
+ public function forceDelete()
+ {
+ return $this->delete();
+ }
+
+ /**
+ * Perform the actual delete query on this model instance.
+ *
+ * @return void
+ */
+ protected function performDeleteOnModel()
+ {
+ $this->setKeysForSaveQuery($this->newQueryWithoutScopes())->delete();
+ }
+
+ /**
+ * Register a saving model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function saving($callback, $priority = 0)
+ {
+ static::registerModelEvent('saving', $callback, $priority);
+ }
+
+ /**
+ * Register a saved model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function saved($callback, $priority = 0)
+ {
+ static::registerModelEvent('saved', $callback, $priority);
+ }
+
+ /**
+ * Register an updating model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function updating($callback, $priority = 0)
+ {
+ static::registerModelEvent('updating', $callback, $priority);
+ }
+
+ /**
+ * Register an updated model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function updated($callback, $priority = 0)
+ {
+ static::registerModelEvent('updated', $callback, $priority);
+ }
+
+ /**
+ * Register a creating model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function creating($callback, $priority = 0)
+ {
+ static::registerModelEvent('creating', $callback, $priority);
+ }
+
+ /**
+ * Register a created model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function created($callback, $priority = 0)
+ {
+ static::registerModelEvent('created', $callback, $priority);
+ }
+
+ /**
+ * Register a deleting model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function deleting($callback, $priority = 0)
+ {
+ static::registerModelEvent('deleting', $callback, $priority);
+ }
+
+ /**
+ * Register a deleted model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ public static function deleted($callback, $priority = 0)
+ {
+ static::registerModelEvent('deleted', $callback, $priority);
+ }
+
+ /**
+ * Remove all of the event listeners for the model.
+ *
+ * @return void
+ */
+ public static function flushEventListeners()
+ {
+ if (! isset(static::$dispatcher)) {
+ return;
+ }
+
+ $instance = new static;
+
+ foreach ($instance->getObservableEvents() as $event) {
+ static::$dispatcher->forget("eloquent.{$event}: ".get_called_class());
+ }
+ }
+
+ /**
+ * Register a model event with the dispatcher.
+ *
+ * @param string $event
+ * @param \Closure|string $callback
+ * @param int $priority
+ * @return void
+ */
+ protected static function registerModelEvent($event, $callback, $priority = 0)
+ {
+ if (isset(static::$dispatcher)) {
+ $name = get_called_class();
+
+ static::$dispatcher->listen("eloquent.{$event}: {$name}", $callback, $priority);
+ }
+ }
+
+ /**
+ * Get the observable event names.
+ *
+ * @return array
+ */
+ public function getObservableEvents()
+ {
+ return array_merge(
+ [
+ 'creating', 'created', 'updating', 'updated',
+ 'deleting', 'deleted', 'saving', 'saved',
+ 'restoring', 'restored',
+ ],
+ $this->observables
+ );
+ }
+
+ /**
+ * Set the observable event names.
+ *
+ * @param array $observables
+ * @return $this
+ */
+ public function setObservableEvents(array $observables)
+ {
+ $this->observables = $observables;
+
+ return $this;
+ }
+
+ /**
+ * Add an observable event name.
+ *
+ * @param array|mixed $observables
+ * @return void
+ */
+ public function addObservableEvents($observables)
+ {
+ $observables = is_array($observables) ? $observables : func_get_args();
+
+ $this->observables = array_unique(array_merge($this->observables, $observables));
+ }
+
+ /**
+ * Remove an observable event name.
+ *
+ * @param array|mixed $observables
+ * @return void
+ */
+ public function removeObservableEvents($observables)
+ {
+ $observables = is_array($observables) ? $observables : func_get_args();
+
+ $this->observables = array_diff($this->observables, $observables);
+ }
+
+ /**
+ * Increment a column's value by a given amount.
+ *
+ * @param string $column
+ * @param int $amount
+ * @return int
+ */
+ protected function increment($column, $amount = 1)
+ {
+ return $this->incrementOrDecrement($column, $amount, 'increment');
+ }
+
+ /**
+ * Decrement a column's value by a given amount.
+ *
+ * @param string $column
+ * @param int $amount
+ * @return int
+ */
+ protected function decrement($column, $amount = 1)
+ {
+ return $this->incrementOrDecrement($column, $amount, 'decrement');
+ }
+
+ /**
+ * Run the increment or decrement method on the model.
+ *
+ * @param string $column
+ * @param int $amount
+ * @param string $method
+ * @return int
+ */
+ protected function incrementOrDecrement($column, $amount, $method)
+ {
+ $query = $this->newQuery();
+
+ if (! $this->exists) {
+ return $query->{$method}($column, $amount);
+ }
+
+ $this->incrementOrDecrementAttributeValue($column, $amount, $method);
+
+ return $query->where($this->getKeyName(), $this->getKey())->{$method}($column, $amount);
+ }
+
+ /**
+ * Increment the underlying attribute value and sync with original.
+ *
+ * @param string $column
+ * @param int $amount
+ * @param string $method
+ * @return void
+ */
+ protected function incrementOrDecrementAttributeValue($column, $amount, $method)
+ {
+ $this->{$column} = $this->{$column} + ($method == 'increment' ? $amount : $amount * -1);
+
+ $this->syncOriginalAttribute($column);
+ }
+
+ /**
+ * Update the model in the database.
+ *
+ * @param array $attributes
+ * @return bool|int
+ */
+ public function update(array $attributes = [])
+ {
+ if (! $this->exists) {
+ return false;
+ }
+
+ return $this->fill($attributes)->save();
+ }
+
+ /**
+ * Save the model and all of its relationships.
+ *
+ * @return bool
+ */
+ public function push()
+ {
+ if (! $this->save()) {
+ return false;
+ }
+
+ // To sync all of the relationships to the database, we will simply spin through
+ // the relationships and save each model via this "push" method, which allows
+ // us to recurse into all of these nested relations for the model instance.
+ foreach ($this->relations as $models) {
+ $models = $models instanceof Collection
+ ? $models->all() : [$models];
+
+ foreach (array_filter($models) as $model) {
+ if (! $model->push()) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Save the model to the database.
+ *
+ * @param array $options
+ * @return bool
+ */
+ public function save(array $options = [])
+ {
+ $query = $this->newQueryWithoutScopes();
+
+ // If the "saving" event returns false we'll bail out of the save and return
+ // false, indicating that the save failed. This provides a chance for any
+ // listeners to cancel save operations if validations fail or whatever.
+ if ($this->fireModelEvent('saving') === false) {
+ return false;
+ }
+
+ // If the model already exists in the database we can just update our record
+ // that is already in this database using the current IDs in this "where"
+ // clause to only update this model. Otherwise, we'll just insert them.
+ if ($this->exists) {
+ $saved = $this->performUpdate($query, $options);
+ }
+
+ // If the model is brand new, we'll insert it into our database and set the
+ // ID attribute on the model to the value of the newly inserted row's ID
+ // which is typically an auto-increment value managed by the database.
+ else {
+ $saved = $this->performInsert($query, $options);
+ }
+
+ if ($saved) {
+ $this->finishSave($options);
+ }
+
+ return $saved;
+ }
+
+ /**
+ * Save the model to the database using transaction.
+ *
+ * @param array $options
+ * @return bool
+ *
+ * @throws \Throwable
+ */
+ public function saveOrFail(array $options = [])
+ {
+ return $this->getConnection()->transaction(function () use ($options) {
+ return $this->save($options);
+ });
+ }
+
+ /**
+ * Finish processing on a successful save operation.
+ *
+ * @param array $options
+ * @return void
+ */
+ protected function finishSave(array $options)
+ {
+ $this->fireModelEvent('saved', false);
+
+ $this->syncOriginal();
+
+ if (Arr::get($options, 'touch', true)) {
+ $this->touchOwners();
+ }
+ }
+
+ /**
+ * Perform a model update operation.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param array $options
+ * @return bool
+ */
+ protected function performUpdate(Builder $query, array $options = [])
+ {
+ $dirty = $this->getDirty();
+
+ if (count($dirty) > 0) {
+ // If the updating event returns false, we will cancel the update operation so
+ // developers can hook Validation systems into their models and cancel this
+ // operation if the model does not pass validation. Otherwise, we update.
+ if ($this->fireModelEvent('updating') === false) {
+ return false;
+ }
+
+ // First we need to create a fresh query instance and touch the creation and
+ // update timestamp on the model which are maintained by us for developer
+ // convenience. Then we will just continue saving the model instances.
+ if ($this->timestamps && Arr::get($options, 'timestamps', true)) {
+ $this->updateTimestamps();
+ }
+
+ // Once we have run the update operation, we will fire the "updated" event for
+ // this model instance. This will allow developers to hook into these after
+ // models are updated, giving them a chance to do any special processing.
+ $dirty = $this->getDirty();
+
+ if (count($dirty) > 0) {
+ $numRows = $this->setKeysForSaveQuery($query)->update($dirty);
+
+ $this->fireModelEvent('updated', false);
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Perform a model insert operation.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param array $options
+ * @return bool
+ */
+ protected function performInsert(Builder $query, array $options = [])
+ {
+ if ($this->fireModelEvent('creating') === false) {
+ return false;
+ }
+
+ // First we'll need to create a fresh query instance and touch the creation and
+ // update timestamps on this model, which are maintained by us for developer
+ // convenience. After, we will just continue saving these model instances.
+ if ($this->timestamps && Arr::get($options, 'timestamps', true)) {
+ $this->updateTimestamps();
+ }
+
+ // If the model has an incrementing key, we can use the "insertGetId" method on
+ // the query builder, which will give us back the final inserted ID for this
+ // table from the database. Not all tables have to be incrementing though.
+ $attributes = $this->attributes;
+
+ if ($this->incrementing) {
+ $this->insertAndSetId($query, $attributes);
+ }
+
+ // If the table isn't incrementing we'll simply insert these attributes as they
+ // are. These attribute arrays must contain an "id" column previously placed
+ // there by the developer as the manually determined key for these models.
+ else {
+ $query->insert($attributes);
+ }
+
+ // We will go ahead and set the exists property to true, so that it is set when
+ // the created event is fired, just in case the developer tries to update it
+ // during the event. This will allow them to do so and run an update here.
+ $this->exists = true;
+
+ $this->wasRecentlyCreated = true;
+
+ $this->fireModelEvent('created', false);
+
+ return true;
+ }
+
+ /**
+ * Insert the given attributes and set the ID on the model.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param array $attributes
+ * @return void
+ */
+ protected function insertAndSetId(Builder $query, $attributes)
+ {
+ $id = $query->insertGetId($attributes, $keyName = $this->getKeyName());
+
+ $this->setAttribute($keyName, $id);
+ }
+
+ /**
+ * Touch the owning relations of the model.
+ *
+ * @return void
+ */
+ public function touchOwners()
+ {
+ foreach ($this->touches as $relation) {
+ $this->$relation()->touch();
+
+ if ($this->$relation instanceof self) {
+ $this->$relation->fireModelEvent('saved', false);
+
+ $this->$relation->touchOwners();
+ } elseif ($this->$relation instanceof Collection) {
+ $this->$relation->each(function (Model $relation) {
+ $relation->touchOwners();
+ });
+ }
+ }
+ }
+
+ /**
+ * Determine if the model touches a given relation.
+ *
+ * @param string $relation
+ * @return bool
+ */
+ public function touches($relation)
+ {
+ return in_array($relation, $this->touches);
+ }
+
+ /**
+ * Fire the given event for the model.
+ *
+ * @param string $event
+ * @param bool $halt
+ * @return mixed
+ */
+ protected function fireModelEvent($event, $halt = true)
+ {
+ if (! isset(static::$dispatcher)) {
+ return true;
+ }
+
+ // We will append the names of the class to the event to distinguish it from
+ // other model events that are fired, allowing us to listen on each model
+ // event set individually instead of catching event for all the models.
+ $event = "eloquent.{$event}: ".get_class($this);
+
+ $method = $halt ? 'until' : 'fire';
+
+ return static::$dispatcher->$method($event, $this);
+ }
+
+ /**
+ * Set the keys for a save update query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ protected function setKeysForSaveQuery(Builder $query)
+ {
+ $query->where($this->getKeyName(), '=', $this->getKeyForSaveQuery());
+
+ return $query;
+ }
+
+ /**
+ * Get the primary key value for a save query.
+ *
+ * @return mixed
+ */
+ protected function getKeyForSaveQuery()
+ {
+ if (isset($this->original[$this->getKeyName()])) {
+ return $this->original[$this->getKeyName()];
+ }
+
+ return $this->getAttribute($this->getKeyName());
+ }
+
+ /**
+ * Update the model's update timestamp.
+ *
+ * @return bool
+ */
+ public function touch()
+ {
+ if (! $this->timestamps) {
+ return false;
+ }
+
+ $this->updateTimestamps();
+
+ return $this->save();
+ }
+
+ /**
+ * Update the creation and update timestamps.
+ *
+ * @return void
+ */
+ protected function updateTimestamps()
+ {
+ $time = $this->freshTimestamp();
+
+ if (! $this->isDirty(static::UPDATED_AT)) {
+ $this->setUpdatedAt($time);
+ }
+
+ if (! $this->exists && ! $this->isDirty(static::CREATED_AT)) {
+ $this->setCreatedAt($time);
+ }
+ }
+
+ /**
+ * Set the value of the "created at" attribute.
+ *
+ * @param mixed $value
+ * @return $this
+ */
+ public function setCreatedAt($value)
+ {
+ $this->{static::CREATED_AT} = $value;
+
+ return $this;
+ }
+
+ /**
+ * Set the value of the "updated at" attribute.
+ *
+ * @param mixed $value
+ * @return $this
+ */
+ public function setUpdatedAt($value)
+ {
+ $this->{static::UPDATED_AT} = $value;
+
+ return $this;
+ }
+
+ /**
+ * Get the name of the "created at" column.
+ *
+ * @return string
+ */
+ public function getCreatedAtColumn()
+ {
+ return static::CREATED_AT;
+ }
+
+ /**
+ * Get the name of the "updated at" column.
+ *
+ * @return string
+ */
+ public function getUpdatedAtColumn()
+ {
+ return static::UPDATED_AT;
+ }
+
+ /**
+ * Get a fresh timestamp for the model.
+ *
+ * @return \Carbon\Carbon
+ */
+ public function freshTimestamp()
+ {
+ return new Carbon;
+ }
+
+ /**
+ * Get a fresh timestamp for the model.
+ *
+ * @return string
+ */
+ public function freshTimestampString()
+ {
+ return $this->fromDateTime($this->freshTimestamp());
+ }
+
+ /**
+ * Get a new query builder for the model's table.
+ *
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function newQuery()
+ {
+ $builder = $this->newQueryWithoutScopes();
+
+ return $this->applyGlobalScopes($builder);
+ }
+
+ /**
+ * Get a new query instance without a given scope.
+ *
+ * @param \Illuminate\Database\Eloquent\ScopeInterface $scope
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function newQueryWithoutScope($scope)
+ {
+ $this->getGlobalScope($scope)->remove($builder = $this->newQuery(), $this);
+
+ return $builder;
+ }
+
+ /**
+ * Get a new query builder that doesn't have any global scopes.
+ *
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function newQueryWithoutScopes()
+ {
+ $builder = $this->newEloquentBuilder(
+ $this->newBaseQueryBuilder()
+ );
+
+ // Once we have the query builders, we will set the model instances so the
+ // builder can easily access any information it may need from the model
+ // while it is constructing and executing various queries against it.
+ return $builder->setModel($this)->with($this->with);
+ }
+
+ /**
+ * Apply all of the global scopes to an Eloquent builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function applyGlobalScopes($builder)
+ {
+ foreach ($this->getGlobalScopes() as $scope) {
+ $scope->apply($builder, $this);
+ }
+
+ return $builder;
+ }
+
+ /**
+ * Remove all of the global scopes from an Eloquent builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function removeGlobalScopes($builder)
+ {
+ foreach ($this->getGlobalScopes() as $scope) {
+ $scope->remove($builder, $this);
+ }
+
+ return $builder;
+ }
+
+ /**
+ * Create a new Eloquent query builder for the model.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function newEloquentBuilder($query)
+ {
+ return new Builder($query);
+ }
+
+ /**
+ * Get a new query builder instance for the connection.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function newBaseQueryBuilder()
+ {
+ $conn = $this->getConnection();
+
+ $grammar = $conn->getQueryGrammar();
+
+ return new QueryBuilder($conn, $grammar, $conn->getPostProcessor());
+ }
+
+ /**
+ * Create a new Eloquent Collection instance.
+ *
+ * @param array $models
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public function newCollection(array $models = [])
+ {
+ return new Collection($models);
+ }
+
+ /**
+ * Create a new pivot model instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param array $attributes
+ * @param string $table
+ * @param bool $exists
+ * @return \Illuminate\Database\Eloquent\Relations\Pivot
+ */
+ public function newPivot(Model $parent, array $attributes, $table, $exists)
+ {
+ return new Pivot($parent, $attributes, $table, $exists);
+ }
+
+ /**
+ * Get the table associated with the model.
+ *
+ * @return string
+ */
+ public function getTable()
+ {
+ if (isset($this->table)) {
+ return $this->table;
+ }
+
+ return str_replace('\\', '', Str::snake(Str::plural(class_basename($this))));
+ }
+
+ /**
+ * Set the table associated with the model.
+ *
+ * @param string $table
+ * @return $this
+ */
+ public function setTable($table)
+ {
+ $this->table = $table;
+
+ return $this;
+ }
+
+ /**
+ * Get the value of the model's primary key.
+ *
+ * @return mixed
+ */
+ public function getKey()
+ {
+ return $this->getAttribute($this->getKeyName());
+ }
+
+ /**
+ * Get the queueable identity for the entity.
+ *
+ * @return mixed
+ */
+ public function getQueueableId()
+ {
+ return $this->getKey();
+ }
+
+ /**
+ * Get the primary key for the model.
+ *
+ * @return string
+ */
+ public function getKeyName()
+ {
+ return $this->primaryKey;
+ }
+
+ /**
+ * Set the primary key for the model.
+ *
+ * @param string $key
+ * @return $this
+ */
+ public function setKeyName($key)
+ {
+ $this->primaryKey = $key;
+
+ return $this;
+ }
+
+ /**
+ * Get the table qualified key name.
+ *
+ * @return string
+ */
+ public function getQualifiedKeyName()
+ {
+ return $this->getTable().'.'.$this->getKeyName();
+ }
+
+ /**
+ * Get the value of the model's route key.
+ *
+ * @return mixed
+ */
+ public function getRouteKey()
+ {
+ return $this->getAttribute($this->getRouteKeyName());
+ }
+
+ /**
+ * Get the route key for the model.
+ *
+ * @return string
+ */
+ public function getRouteKeyName()
+ {
+ return $this->getKeyName();
+ }
+
+ /**
+ * Determine if the model uses timestamps.
+ *
+ * @return bool
+ */
+ public function usesTimestamps()
+ {
+ return $this->timestamps;
+ }
+
+ /**
+ * Get the polymorphic relationship columns.
+ *
+ * @param string $name
+ * @param string $type
+ * @param string $id
+ * @return array
+ */
+ protected function getMorphs($name, $type, $id)
+ {
+ $type = $type ?: $name.'_type';
+
+ $id = $id ?: $name.'_id';
+
+ return [$type, $id];
+ }
+
+ /**
+ * Get the class name for polymorphic relations.
+ *
+ * @return string
+ */
+ public function getMorphClass()
+ {
+ $morphMap = Relation::morphMap();
+
+ $class = get_class($this);
+
+ if (! empty($morphMap) && in_array($class, $morphMap)) {
+ return array_search($class, $morphMap, true);
+ }
+
+ return $this->morphClass ?: $class;
+ }
+
+ /**
+ * Get the number of models to return per page.
+ *
+ * @return int
+ */
+ public function getPerPage()
+ {
+ return $this->perPage;
+ }
+
+ /**
+ * Set the number of models to return per page.
+ *
+ * @param int $perPage
+ * @return $this
+ */
+ public function setPerPage($perPage)
+ {
+ $this->perPage = $perPage;
+
+ return $this;
+ }
+
+ /**
+ * Get the default foreign key name for the model.
+ *
+ * @return string
+ */
+ public function getForeignKey()
+ {
+ return Str::snake(class_basename($this)).'_id';
+ }
+
+ /**
+ * Get the hidden attributes for the model.
+ *
+ * @return array
+ */
+ public function getHidden()
+ {
+ return $this->hidden;
+ }
+
+ /**
+ * Set the hidden attributes for the model.
+ *
+ * @param array $hidden
+ * @return $this
+ */
+ public function setHidden(array $hidden)
+ {
+ $this->hidden = $hidden;
+
+ return $this;
+ }
+
+ /**
+ * Add hidden attributes for the model.
+ *
+ * @param array|string|null $attributes
+ * @return void
+ */
+ public function addHidden($attributes = null)
+ {
+ $attributes = is_array($attributes) ? $attributes : func_get_args();
+
+ $this->hidden = array_merge($this->hidden, $attributes);
+ }
+
+ /**
+ * Make the given, typically hidden, attributes visible.
+ *
+ * @param array|string $attributes
+ * @return $this
+ */
+ public function withHidden($attributes)
+ {
+ $this->hidden = array_diff($this->hidden, (array) $attributes);
+
+ return $this;
+ }
+
+ /**
+ * Get the visible attributes for the model.
+ *
+ * @return array
+ */
+ public function getVisible()
+ {
+ return $this->visible;
+ }
+
+ /**
+ * Set the visible attributes for the model.
+ *
+ * @param array $visible
+ * @return $this
+ */
+ public function setVisible(array $visible)
+ {
+ $this->visible = $visible;
+
+ return $this;
+ }
+
+ /**
+ * Add visible attributes for the model.
+ *
+ * @param array|string|null $attributes
+ * @return void
+ */
+ public function addVisible($attributes = null)
+ {
+ $attributes = is_array($attributes) ? $attributes : func_get_args();
+
+ $this->visible = array_merge($this->visible, $attributes);
+ }
+
+ /**
+ * Set the accessors to append to model arrays.
+ *
+ * @param array $appends
+ * @return $this
+ */
+ public function setAppends(array $appends)
+ {
+ $this->appends = $appends;
+
+ return $this;
+ }
+
+ /**
+ * Get the fillable attributes for the model.
+ *
+ * @return array
+ */
+ public function getFillable()
+ {
+ return $this->fillable;
+ }
+
+ /**
+ * Set the fillable attributes for the model.
+ *
+ * @param array $fillable
+ * @return $this
+ */
+ public function fillable(array $fillable)
+ {
+ $this->fillable = $fillable;
+
+ return $this;
+ }
+
+ /**
+ * Get the guarded attributes for the model.
+ *
+ * @return array
+ */
+ public function getGuarded()
+ {
+ return $this->guarded;
+ }
+
+ /**
+ * Set the guarded attributes for the model.
+ *
+ * @param array $guarded
+ * @return $this
+ */
+ public function guard(array $guarded)
+ {
+ $this->guarded = $guarded;
+
+ return $this;
+ }
+
+ /**
+ * Disable all mass assignable restrictions.
+ *
+ * @param bool $state
+ * @return void
+ */
+ public static function unguard($state = true)
+ {
+ static::$unguarded = $state;
+ }
+
+ /**
+ * Enable the mass assignment restrictions.
+ *
+ * @return void
+ */
+ public static function reguard()
+ {
+ static::$unguarded = false;
+ }
+
+ /**
+ * Determine if current state is "unguarded".
+ *
+ * @return bool
+ */
+ public static function isUnguarded()
+ {
+ return static::$unguarded;
+ }
+
+ /**
+ * Run the given callable while being unguarded.
+ *
+ * @param callable $callback
+ * @return mixed
+ */
+ public static function unguarded(callable $callback)
+ {
+ if (static::$unguarded) {
+ return $callback();
+ }
+
+ static::unguard();
+
+ try {
+ return $callback();
+ } finally {
+ static::reguard();
+ }
+ }
+
+ /**
+ * Determine if the given attribute may be mass assigned.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function isFillable($key)
+ {
+ if (static::$unguarded) {
+ return true;
+ }
+
+ // If the key is in the "fillable" array, we can of course assume that it's
+ // a fillable attribute. Otherwise, we will check the guarded array when
+ // we need to determine if the attribute is black-listed on the model.
+ if (in_array($key, $this->fillable)) {
+ return true;
+ }
+
+ if ($this->isGuarded($key)) {
+ return false;
+ }
+
+ return empty($this->fillable) && ! Str::startsWith($key, '_');
+ }
+
+ /**
+ * Determine if the given key is guarded.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function isGuarded($key)
+ {
+ return in_array($key, $this->guarded) || $this->guarded == ['*'];
+ }
+
+ /**
+ * Determine if the model is totally guarded.
+ *
+ * @return bool
+ */
+ public function totallyGuarded()
+ {
+ return count($this->fillable) == 0 && $this->guarded == ['*'];
+ }
+
+ /**
+ * Remove the table name from a given key.
+ *
+ * @param string $key
+ * @return string
+ */
+ protected function removeTableFromKey($key)
+ {
+ if (! Str::contains($key, '.')) {
+ return $key;
+ }
+
+ return last(explode('.', $key));
+ }
+
+ /**
+ * Get the relationships that are touched on save.
+ *
+ * @return array
+ */
+ public function getTouchedRelations()
+ {
+ return $this->touches;
+ }
+
+ /**
+ * Set the relationships that are touched on save.
+ *
+ * @param array $touches
+ * @return $this
+ */
+ public function setTouchedRelations(array $touches)
+ {
+ $this->touches = $touches;
+
+ return $this;
+ }
+
+ /**
+ * Get the value indicating whether the IDs are incrementing.
+ *
+ * @return bool
+ */
+ public function getIncrementing()
+ {
+ return $this->incrementing;
+ }
+
+ /**
+ * Set whether IDs are incrementing.
+ *
+ * @param bool $value
+ * @return $this
+ */
+ public function setIncrementing($value)
+ {
+ $this->incrementing = $value;
+
+ return $this;
+ }
+
+ /**
+ * Convert the model instance to JSON.
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toJson($options = 0)
+ {
+ return json_encode($this->jsonSerialize(), $options);
+ }
+
+ /**
+ * Convert the object into something JSON serializable.
+ *
+ * @return array
+ */
+ public function jsonSerialize()
+ {
+ return $this->toArray();
+ }
+
+ /**
+ * Convert the model instance to an array.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ $attributes = $this->attributesToArray();
+
+ return array_merge($attributes, $this->relationsToArray());
+ }
+
+ /**
+ * Convert the model's attributes to an array.
+ *
+ * @return array
+ */
+ public function attributesToArray()
+ {
+ $attributes = $this->getArrayableAttributes();
+
+ // If an attribute is a date, we will cast it to a string after converting it
+ // to a DateTime / Carbon instance. This is so we will get some consistent
+ // formatting while accessing attributes vs. arraying / JSONing a model.
+ foreach ($this->getDates() as $key) {
+ if (! isset($attributes[$key])) {
+ continue;
+ }
+
+ $attributes[$key] = $this->serializeDate(
+ $this->asDateTime($attributes[$key])
+ );
+ }
+
+ $mutatedAttributes = $this->getMutatedAttributes();
+
+ // We want to spin through all the mutated attributes for this model and call
+ // the mutator for the attribute. We cache off every mutated attributes so
+ // we don't have to constantly check on attributes that actually change.
+ foreach ($mutatedAttributes as $key) {
+ if (! array_key_exists($key, $attributes)) {
+ continue;
+ }
+
+ $attributes[$key] = $this->mutateAttributeForArray(
+ $key, $attributes[$key]
+ );
+ }
+
+ // Next we will handle any casts that have been setup for this model and cast
+ // the values to their appropriate type. If the attribute has a mutator we
+ // will not perform the cast on those attributes to avoid any confusion.
+ foreach ($this->casts as $key => $value) {
+ if (! array_key_exists($key, $attributes) ||
+ in_array($key, $mutatedAttributes)) {
+ continue;
+ }
+
+ $attributes[$key] = $this->castAttribute(
+ $key, $attributes[$key]
+ );
+ }
+
+ // Here we will grab all of the appended, calculated attributes to this model
+ // as these attributes are not really in the attributes array, but are run
+ // when we need to array or JSON the model for convenience to the coder.
+ foreach ($this->getArrayableAppends() as $key) {
+ $attributes[$key] = $this->mutateAttributeForArray($key, null);
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * Get an attribute array of all arrayable attributes.
+ *
+ * @return array
+ */
+ protected function getArrayableAttributes()
+ {
+ return $this->getArrayableItems($this->attributes);
+ }
+
+ /**
+ * Get all of the appendable values that are arrayable.
+ *
+ * @return array
+ */
+ protected function getArrayableAppends()
+ {
+ if (! count($this->appends)) {
+ return [];
+ }
+
+ return $this->getArrayableItems(
+ array_combine($this->appends, $this->appends)
+ );
+ }
+
+ /**
+ * Get the model's relationships in array form.
+ *
+ * @return array
+ */
+ public function relationsToArray()
+ {
+ $attributes = [];
+
+ foreach ($this->getArrayableRelations() as $key => $value) {
+ // If the values implements the Arrayable interface we can just call this
+ // toArray method on the instances which will convert both models and
+ // collections to their proper array form and we'll set the values.
+ if ($value instanceof Arrayable) {
+ $relation = $value->toArray();
+ }
+
+ // If the value is null, we'll still go ahead and set it in this list of
+ // attributes since null is used to represent empty relationships if
+ // if it a has one or belongs to type relationships on the models.
+ elseif (is_null($value)) {
+ $relation = $value;
+ }
+
+ // If the relationships snake-casing is enabled, we will snake case this
+ // key so that the relation attribute is snake cased in this returned
+ // array to the developers, making this consistent with attributes.
+ if (static::$snakeAttributes) {
+ $key = Str::snake($key);
+ }
+
+ // If the relation value has been set, we will set it on this attributes
+ // list for returning. If it was not arrayable or null, we'll not set
+ // the value on the array because it is some type of invalid value.
+ if (isset($relation) || is_null($value)) {
+ $attributes[$key] = $relation;
+ }
+
+ unset($relation);
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * Get an attribute array of all arrayable relations.
+ *
+ * @return array
+ */
+ protected function getArrayableRelations()
+ {
+ return $this->getArrayableItems($this->relations);
+ }
+
+ /**
+ * Get an attribute array of all arrayable values.
+ *
+ * @param array $values
+ * @return array
+ */
+ protected function getArrayableItems(array $values)
+ {
+ if (count($this->getVisible()) > 0) {
+ return array_intersect_key($values, array_flip($this->getVisible()));
+ }
+
+ return array_diff_key($values, array_flip($this->getHidden()));
+ }
+
+ /**
+ * Get an attribute from the model.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function getAttribute($key)
+ {
+ if (array_key_exists($key, $this->attributes) || $this->hasGetMutator($key)) {
+ return $this->getAttributeValue($key);
+ }
+
+ return $this->getRelationValue($key);
+ }
+
+ /**
+ * Get a plain attribute (not a relationship).
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function getAttributeValue($key)
+ {
+ $value = $this->getAttributeFromArray($key);
+
+ // If the attribute has a get mutator, we will call that then return what
+ // it returns as the value, which is useful for transforming values on
+ // retrieval from the model to a form that is more useful for usage.
+ if ($this->hasGetMutator($key)) {
+ return $this->mutateAttribute($key, $value);
+ }
+
+ // If the attribute exists within the cast array, we will convert it to
+ // an appropriate native PHP type dependant upon the associated value
+ // given with the key in the pair. Dayle made this comment line up.
+ if ($this->hasCast($key)) {
+ $value = $this->castAttribute($key, $value);
+ }
+
+ // If the attribute is listed as a date, we will convert it to a DateTime
+ // instance on retrieval, which makes it quite convenient to work with
+ // date fields without having to create a mutator for each property.
+ elseif (in_array($key, $this->getDates())) {
+ if (! is_null($value)) {
+ return $this->asDateTime($value);
+ }
+ }
+
+ return $value;
+ }
+
+ /**
+ * Get a relationship.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function getRelationValue($key)
+ {
+ // If the key already exists in the relationships array, it just means the
+ // relationship has already been loaded, so we'll just return it out of
+ // here because there is no need to query within the relations twice.
+ if ($this->relationLoaded($key)) {
+ return $this->relations[$key];
+ }
+
+ // If the "attribute" exists as a method on the model, we will just assume
+ // it is a relationship and will load and return results from the query
+ // and hydrate the relationship's value on the "relationships" array.
+ if (method_exists($this, $key)) {
+ return $this->getRelationshipFromMethod($key);
+ }
+ }
+
+ /**
+ * Get an attribute from the $attributes array.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ protected function getAttributeFromArray($key)
+ {
+ if (array_key_exists($key, $this->attributes)) {
+ return $this->attributes[$key];
+ }
+ }
+
+ /**
+ * Get a relationship value from a method.
+ *
+ * @param string $method
+ * @return mixed
+ *
+ * @throws \LogicException
+ */
+ protected function getRelationshipFromMethod($method)
+ {
+ $relations = $this->$method();
+
+ if (! $relations instanceof Relation) {
+ throw new LogicException('Relationship method must return an object of type '
+ .'Illuminate\Database\Eloquent\Relations\Relation');
+ }
+
+ return $this->relations[$method] = $relations->getResults();
+ }
+
+ /**
+ * Determine if a get mutator exists for an attribute.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasGetMutator($key)
+ {
+ return method_exists($this, 'get'.Str::studly($key).'Attribute');
+ }
+
+ /**
+ * Get the value of an attribute using its mutator.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function mutateAttribute($key, $value)
+ {
+ return $this->{'get'.Str::studly($key).'Attribute'}($value);
+ }
+
+ /**
+ * Get the value of an attribute using its mutator for array conversion.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function mutateAttributeForArray($key, $value)
+ {
+ $value = $this->mutateAttribute($key, $value);
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }
+
+ /**
+ * Determine whether an attribute should be cast to a native type.
+ *
+ * @param string $key
+ * @return bool
+ */
+ protected function hasCast($key)
+ {
+ return array_key_exists($key, $this->casts);
+ }
+
+ /**
+ * Determine whether a value is Date / DateTime castable for inbound manipulation.
+ *
+ * @param string $key
+ * @return bool
+ */
+ protected function isDateCastable($key)
+ {
+ return $this->hasCast($key) &&
+ in_array($this->getCastType($key), ['date', 'datetime'], true);
+ }
+
+ /**
+ * Determine whether a value is JSON castable for inbound manipulation.
+ *
+ * @param string $key
+ * @return bool
+ */
+ protected function isJsonCastable($key)
+ {
+ return $this->hasCast($key) &&
+ in_array($this->getCastType($key), ['array', 'json', 'object', 'collection'], true);
+ }
+
+ /**
+ * Get the type of cast for a model attribute.
+ *
+ * @param string $key
+ * @return string
+ */
+ protected function getCastType($key)
+ {
+ return trim(strtolower($this->casts[$key]));
+ }
+
+ /**
+ * Cast an attribute to a native PHP type.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function castAttribute($key, $value)
+ {
+ if (is_null($value)) {
+ return $value;
+ }
+
+ switch ($this->getCastType($key)) {
+ case 'int':
+ case 'integer':
+ return (int) $value;
+ case 'real':
+ case 'float':
+ case 'double':
+ return (float) $value;
+ case 'string':
+ return (string) $value;
+ case 'bool':
+ case 'boolean':
+ return (bool) $value;
+ case 'object':
+ return $this->fromJson($value, true);
+ case 'array':
+ case 'json':
+ return $this->fromJson($value);
+ case 'collection':
+ return new BaseCollection($this->fromJson($value));
+ case 'date':
+ case 'datetime':
+ return $this->asDateTime($value);
+ default:
+ return $value;
+ }
+ }
+
+ /**
+ * Set a given attribute on the model.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return $this
+ */
+ public function setAttribute($key, $value)
+ {
+ // First we will check for the presence of a mutator for the set operation
+ // which simply lets the developers tweak the attribute as it is set on
+ // the model, such as "json_encoding" an listing of data for storage.
+ if ($this->hasSetMutator($key)) {
+ $method = 'set'.Str::studly($key).'Attribute';
+
+ return $this->{$method}($value);
+ }
+
+ // If an attribute is listed as a "date", we'll convert it from a DateTime
+ // instance into a form proper for storage on the database tables using
+ // the connection grammar's date format. We will auto set the values.
+ elseif ($value && (in_array($key, $this->getDates()) || $this->isDateCastable($key))) {
+ $value = $this->fromDateTime($value);
+ }
+
+ if ($this->isJsonCastable($key) && ! is_null($value)) {
+ $value = $this->asJson($value);
+ }
+
+ $this->attributes[$key] = $value;
+
+ return $this;
+ }
+
+ /**
+ * Determine if a set mutator exists for an attribute.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasSetMutator($key)
+ {
+ return method_exists($this, 'set'.Str::studly($key).'Attribute');
+ }
+
+ /**
+ * Get the attributes that should be converted to dates.
+ *
+ * @return array
+ */
+ public function getDates()
+ {
+ $defaults = [static::CREATED_AT, static::UPDATED_AT];
+
+ return $this->timestamps ? array_merge($this->dates, $defaults) : $this->dates;
+ }
+
+ /**
+ * Convert a DateTime to a storable string.
+ *
+ * @param \DateTime|int $value
+ * @return string
+ */
+ public function fromDateTime($value)
+ {
+ $format = $this->getDateFormat();
+
+ $value = $this->asDateTime($value);
+
+ return $value->format($format);
+ }
+
+ /**
+ * Return a timestamp as DateTime object.
+ *
+ * @param mixed $value
+ * @return \Carbon\Carbon
+ */
+ protected function asDateTime($value)
+ {
+ // If this value is already a Carbon instance, we shall just return it as is.
+ // This prevents us having to reinstantiate a Carbon instance when we know
+ // it already is one, which wouldn't be fulfilled by the DateTime check.
+ if ($value instanceof Carbon) {
+ return $value;
+ }
+
+ // If the value is already a DateTime instance, we will just skip the rest of
+ // these checks since they will be a waste of time, and hinder performance
+ // when checking the field. We will just return the DateTime right away.
+ if ($value instanceof DateTime) {
+ return Carbon::instance($value);
+ }
+
+ // If this value is an integer, we will assume it is a UNIX timestamp's value
+ // and format a Carbon object from this timestamp. This allows flexibility
+ // when defining your date fields as they might be UNIX timestamps here.
+ if (is_numeric($value)) {
+ return Carbon::createFromTimestamp($value);
+ }
+
+ // If the value is in simply year, month, day format, we will instantiate the
+ // Carbon instances from that format. Again, this provides for simple date
+ // fields on the database, while still supporting Carbonized conversion.
+ if (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $value)) {
+ return Carbon::createFromFormat('Y-m-d', $value)->startOfDay();
+ }
+
+ // Finally, we will just assume this date is in the format used by default on
+ // the database connection and use that format to create the Carbon object
+ // that is returned back out to the developers after we convert it here.
+ return Carbon::createFromFormat($this->getDateFormat(), $value);
+ }
+
+ /**
+ * Prepare a date for array / JSON serialization.
+ *
+ * @param \DateTime $date
+ * @return string
+ */
+ protected function serializeDate(DateTime $date)
+ {
+ return $date->format($this->getDateFormat());
+ }
+
+ /**
+ * Get the format for database stored dates.
+ *
+ * @return string
+ */
+ protected function getDateFormat()
+ {
+ return $this->dateFormat ?: $this->getConnection()->getQueryGrammar()->getDateFormat();
+ }
+
+ /**
+ * Set the date format used by the model.
+ *
+ * @param string $format
+ * @return $this
+ */
+ public function setDateFormat($format)
+ {
+ $this->dateFormat = $format;
+
+ return $this;
+ }
+
+ /**
+ * Encode the given value as JSON.
+ *
+ * @param mixed $value
+ * @return string
+ */
+ protected function asJson($value)
+ {
+ return json_encode($value);
+ }
+
+ /**
+ * Decode the given JSON back into an array or object.
+ *
+ * @param string $value
+ * @param bool $asObject
+ * @return mixed
+ */
+ public function fromJson($value, $asObject = false)
+ {
+ return json_decode($value, ! $asObject);
+ }
+
+ /**
+ * Clone the model into a new, non-existing instance.
+ *
+ * @param array|null $except
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function replicate(array $except = null)
+ {
+ $except = $except ?: [
+ $this->getKeyName(),
+ $this->getCreatedAtColumn(),
+ $this->getUpdatedAtColumn(),
+ ];
+
+ $attributes = Arr::except($this->attributes, $except);
+
+ with($instance = new static)->setRawAttributes($attributes);
+
+ return $instance->setRelations($this->relations);
+ }
+
+ /**
+ * Get all of the current attributes on the model.
+ *
+ * @return array
+ */
+ public function getAttributes()
+ {
+ return $this->attributes;
+ }
+
+ /**
+ * Set the array of model attributes. No checking is done.
+ *
+ * @param array $attributes
+ * @param bool $sync
+ * @return $this
+ */
+ public function setRawAttributes(array $attributes, $sync = false)
+ {
+ $this->attributes = $attributes;
+
+ if ($sync) {
+ $this->syncOriginal();
+ }
+
+ return $this;
+ }
+
+ /**
+ * Get the model's original attribute values.
+ *
+ * @param string|null $key
+ * @param mixed $default
+ * @return array
+ */
+ public function getOriginal($key = null, $default = null)
+ {
+ return Arr::get($this->original, $key, $default);
+ }
+
+ /**
+ * Sync the original attributes with the current.
+ *
+ * @return $this
+ */
+ public function syncOriginal()
+ {
+ $this->original = $this->attributes;
+
+ return $this;
+ }
+
+ /**
+ * Sync a single original attribute with its current value.
+ *
+ * @param string $attribute
+ * @return $this
+ */
+ public function syncOriginalAttribute($attribute)
+ {
+ $this->original[$attribute] = $this->attributes[$attribute];
+
+ return $this;
+ }
+
+ /**
+ * Determine if the model or given attribute(s) have been modified.
+ *
+ * @param array|string|null $attributes
+ * @return bool
+ */
+ public function isDirty($attributes = null)
+ {
+ $dirty = $this->getDirty();
+
+ if (is_null($attributes)) {
+ return count($dirty) > 0;
+ }
+
+ if (! is_array($attributes)) {
+ $attributes = func_get_args();
+ }
+
+ foreach ($attributes as $attribute) {
+ if (array_key_exists($attribute, $dirty)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Get the attributes that have been changed since last sync.
+ *
+ * @return array
+ */
+ public function getDirty()
+ {
+ $dirty = [];
+
+ foreach ($this->attributes as $key => $value) {
+ if (! array_key_exists($key, $this->original)) {
+ $dirty[$key] = $value;
+ } elseif ($value !== $this->original[$key] &&
+ ! $this->originalIsNumericallyEquivalent($key)) {
+ $dirty[$key] = $value;
+ }
+ }
+
+ return $dirty;
+ }
+
+ /**
+ * Determine if the new and old values for a given key are numerically equivalent.
+ *
+ * @param string $key
+ * @return bool
+ */
+ protected function originalIsNumericallyEquivalent($key)
+ {
+ $current = $this->attributes[$key];
+
+ $original = $this->original[$key];
+
+ return is_numeric($current) && is_numeric($original) && strcmp((string) $current, (string) $original) === 0;
+ }
+
+ /**
+ * Get all the loaded relations for the instance.
+ *
+ * @return array
+ */
+ public function getRelations()
+ {
+ return $this->relations;
+ }
+
+ /**
+ * Get a specified relationship.
+ *
+ * @param string $relation
+ * @return mixed
+ */
+ public function getRelation($relation)
+ {
+ return $this->relations[$relation];
+ }
+
+ /**
+ * Determine if the given relation is loaded.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function relationLoaded($key)
+ {
+ return array_key_exists($key, $this->relations);
+ }
+
+ /**
+ * Set the specific relationship in the model.
+ *
+ * @param string $relation
+ * @param mixed $value
+ * @return $this
+ */
+ public function setRelation($relation, $value)
+ {
+ $this->relations[$relation] = $value;
+
+ return $this;
+ }
+
+ /**
+ * Set the entire relations array on the model.
+ *
+ * @param array $relations
+ * @return $this
+ */
+ public function setRelations(array $relations)
+ {
+ $this->relations = $relations;
+
+ return $this;
+ }
+
+ /**
+ * Get the database connection for the model.
+ *
+ * @return \Illuminate\Database\Connection
+ */
+ public function getConnection()
+ {
+ return static::resolveConnection($this->connection);
+ }
+
+ /**
+ * Get the current connection name for the model.
+ *
+ * @return string
+ */
+ public function getConnectionName()
+ {
+ return $this->connection;
+ }
+
+ /**
+ * Set the connection associated with the model.
+ *
+ * @param string $name
+ * @return $this
+ */
+ public function setConnection($name)
+ {
+ $this->connection = $name;
+
+ return $this;
+ }
+
+ /**
+ * Resolve a connection instance.
+ *
+ * @param string|null $connection
+ * @return \Illuminate\Database\Connection
+ */
+ public static function resolveConnection($connection = null)
+ {
+ return static::$resolver->connection($connection);
+ }
+
+ /**
+ * Get the connection resolver instance.
+ *
+ * @return \Illuminate\Database\ConnectionResolverInterface
+ */
+ public static function getConnectionResolver()
+ {
+ return static::$resolver;
+ }
+
+ /**
+ * Set the connection resolver instance.
+ *
+ * @param \Illuminate\Database\ConnectionResolverInterface $resolver
+ * @return void
+ */
+ public static function setConnectionResolver(Resolver $resolver)
+ {
+ static::$resolver = $resolver;
+ }
+
+ /**
+ * Unset the connection resolver for models.
+ *
+ * @return void
+ */
+ public static function unsetConnectionResolver()
+ {
+ static::$resolver = null;
+ }
+
+ /**
+ * Get the event dispatcher instance.
+ *
+ * @return \Illuminate\Contracts\Events\Dispatcher
+ */
+ public static function getEventDispatcher()
+ {
+ return static::$dispatcher;
+ }
+
+ /**
+ * Set the event dispatcher instance.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
+ * @return void
+ */
+ public static function setEventDispatcher(Dispatcher $dispatcher)
+ {
+ static::$dispatcher = $dispatcher;
+ }
+
+ /**
+ * Unset the event dispatcher for models.
+ *
+ * @return void
+ */
+ public static function unsetEventDispatcher()
+ {
+ static::$dispatcher = null;
+ }
+
+ /**
+ * Get the mutated attributes for a given instance.
+ *
+ * @return array
+ */
+ public function getMutatedAttributes()
+ {
+ $class = get_class($this);
+
+ if (! isset(static::$mutatorCache[$class])) {
+ static::cacheMutatedAttributes($class);
+ }
+
+ return static::$mutatorCache[$class];
+ }
+
+ /**
+ * Extract and cache all the mutated attributes of a class.
+ *
+ * @param string $class
+ * @return void
+ */
+ public static function cacheMutatedAttributes($class)
+ {
+ $mutatedAttributes = [];
+
+ // Here we will extract all of the mutated attributes so that we can quickly
+ // spin through them after we export models to their array form, which we
+ // need to be fast. This'll let us know the attributes that can mutate.
+ if (preg_match_all('/(?<=^|;)get([^;]+?)Attribute(;|$)/', implode(';', get_class_methods($class)), $matches)) {
+ foreach ($matches[1] as $match) {
+ if (static::$snakeAttributes) {
+ $match = Str::snake($match);
+ }
+
+ $mutatedAttributes[] = lcfirst($match);
+ }
+ }
+
+ static::$mutatorCache[$class] = $mutatedAttributes;
+ }
+
+ /**
+ * Dynamically retrieve attributes on the model.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function __get($key)
+ {
+ return $this->getAttribute($key);
+ }
+
+ /**
+ * Dynamically set attributes on the model.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ $this->setAttribute($key, $value);
+ }
+
+ /**
+ * Determine if the given attribute exists.
+ *
+ * @param mixed $offset
+ * @return bool
+ */
+ public function offsetExists($offset)
+ {
+ return isset($this->$offset);
+ }
+
+ /**
+ * Get the value for a given offset.
+ *
+ * @param mixed $offset
+ * @return mixed
+ */
+ public function offsetGet($offset)
+ {
+ return $this->$offset;
+ }
+
+ /**
+ * Set the value for a given offset.
+ *
+ * @param mixed $offset
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($offset, $value)
+ {
+ $this->$offset = $value;
+ }
+
+ /**
+ * Unset the value for a given offset.
+ *
+ * @param mixed $offset
+ * @return void
+ */
+ public function offsetUnset($offset)
+ {
+ unset($this->$offset);
+ }
+
+ /**
+ * Determine if an attribute or relation exists on the model.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function __isset($key)
+ {
+ if (isset($this->attributes[$key]) || isset($this->relations[$key])) {
+ return true;
+ }
+
+ if (method_exists($this, $key) && $this->$key && isset($this->relations[$key])) {
+ return true;
+ }
+
+ return $this->hasGetMutator($key) && ! is_null($this->getAttributeValue($key));
+ }
+
+ /**
+ * Unset an attribute on the model.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function __unset($key)
+ {
+ unset($this->attributes[$key], $this->relations[$key]);
+ }
+
+ /**
+ * Handle dynamic method calls into the model.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ if (in_array($method, ['increment', 'decrement'])) {
+ return call_user_func_array([$this, $method], $parameters);
+ }
+
+ $query = $this->newQuery();
+
+ return call_user_func_array([$query, $method], $parameters);
+ }
+
+ /**
+ * Handle dynamic static method calls into the method.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public static function __callStatic($method, $parameters)
+ {
+ $instance = new static;
+
+ return call_user_func_array([$instance, $method], $parameters);
+ }
+
+ /**
+ * Convert the model to its string representation.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->toJson();
+ }
+
+ /**
+ * When a model is being unserialized, check if it needs to be booted.
+ *
+ * @return void
+ */
+ public function __wakeup()
+ {
+ $this->bootIfNotBooted();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ModelNotFoundException.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ModelNotFoundException.php
index 84be36e..102683a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ModelNotFoundException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ModelNotFoundException.php
@@ -1,39 +1,40 @@
-model = $model;
+namespace Illuminate\Database\Eloquent;
- $this->message = "No query results for model [{$model}].";
-
- return $this;
- }
-
- /**
- * Get the affected Eloquent model.
- *
- * @return string
- */
- public function getModel()
- {
- return $this->model;
- }
+use RuntimeException;
+class ModelNotFoundException extends RuntimeException
+{
+ /**
+ * Name of the affected Eloquent model.
+ *
+ * @var string
+ */
+ protected $model;
+
+ /**
+ * Set the affected Eloquent model.
+ *
+ * @param string $model
+ * @return $this
+ */
+ public function setModel($model)
+ {
+ $this->model = $model;
+
+ $this->message = "No query results for model [{$model}].";
+
+ return $this;
+ }
+
+ /**
+ * Get the affected Eloquent model.
+ *
+ * @return string
+ */
+ public function getModel()
+ {
+ return $this->model;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/QueueEntityResolver.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/QueueEntityResolver.php
index 2dc2be5..0e630c7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/QueueEntityResolver.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/QueueEntityResolver.php
@@ -1,27 +1,27 @@
-find($id);
-
- if ($instance)
- {
- return $instance;
- }
+class QueueEntityResolver implements EntityResolverContract
+{
+ /**
+ * Resolve the entity for the given ID.
+ *
+ * @param string $type
+ * @param mixed $id
+ * @return mixed
+ */
+ public function resolve($type, $id)
+ {
+ $instance = (new $type)->find($id);
- throw new EntityNotFoundException($type, $id);
- }
+ if ($instance) {
+ return $instance;
+ }
+ throw new EntityNotFoundException($type, $id);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
index 2e1d01e..968749f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -1,308 +1,308 @@
-otherKey = $otherKey;
- $this->relation = $relation;
- $this->foreignKey = $foreignKey;
-
- parent::__construct($query, $parent);
- }
-
- /**
- * Get the results of the relationship.
- *
- * @return mixed
- */
- public function getResults()
- {
- return $this->query->first();
- }
-
- /**
- * Set the base constraints on the relation query.
- *
- * @return void
- */
- public function addConstraints()
- {
- if (static::$constraints)
- {
- // For belongs to relationships, which are essentially the inverse of has one
- // or has many relationships, we need to actually query on the primary key
- // of the related models matching on the foreign key that's on a parent.
- $table = $this->related->getTable();
-
- $this->query->where($table.'.'.$this->otherKey, '=', $this->parent->{$this->foreignKey});
- }
- }
-
- /**
- * Add the constraints for a relationship count query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQuery(Builder $query, Builder $parent)
- {
- if ($parent->getQuery()->from == $query->getQuery()->from)
- {
- return $this->getRelationCountQueryForSelfRelation($query, $parent);
- }
-
- $query->select(new Expression('count(*)'));
-
- $otherKey = $this->wrap($query->getModel()->getTable().'.'.$this->otherKey);
-
- return $query->where($this->getQualifiedForeignKey(), '=', new Expression($otherKey));
- }
-
- /**
- * Add the constraints for a relationship count query on the same table.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQueryForSelfRelation(Builder $query, Builder $parent)
- {
- $query->select(new Expression('count(*)'));
-
- $query->from($query->getModel()->getTable().' as '.$hash = $this->getRelationCountHash());
-
- $key = $this->wrap($this->getQualifiedForeignKey());
-
- return $query->where($hash.'.'.$query->getModel()->getKeyName(), '=', new Expression($key));
- }
-
- /**
- * Get a relationship join table hash.
- *
- * @return string
- */
- public function getRelationCountHash()
- {
- return 'self_'.md5(microtime(true));
- }
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- public function addEagerConstraints(array $models)
- {
- // We'll grab the primary key name of the related models since it could be set to
- // a non-standard name and not "id". We will then construct the constraint for
- // our eagerly loading query so it returns the proper models from execution.
- $key = $this->related->getTable().'.'.$this->otherKey;
-
- $this->query->whereIn($key, $this->getEagerModelKeys($models));
- }
-
- /**
- * Gather the keys from an array of related models.
- *
- * @param array $models
- * @return array
- */
- protected function getEagerModelKeys(array $models)
- {
- $keys = array();
-
- // First we need to gather all of the keys from the parent models so we know what
- // to query for via the eager loading query. We will add them to an array then
- // execute a "where in" statement to gather up all of those related records.
- foreach ($models as $model)
- {
- if ( ! is_null($value = $model->{$this->foreignKey}))
- {
- $keys[] = $value;
- }
- }
-
- // If there are no keys that were not null we will just return an array with 0 in
- // it so the query doesn't fail, but will not return any results, which should
- // be what this developer is expecting in a case where this happens to them.
- if (count($keys) == 0)
- {
- return array(0);
- }
-
- return array_values(array_unique($keys));
- }
-
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- public function initRelation(array $models, $relation)
- {
- foreach ($models as $model)
- {
- $model->setRelation($relation, null);
- }
-
- return $models;
- }
-
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- $foreign = $this->foreignKey;
-
- $other = $this->otherKey;
-
- // First we will get to build a dictionary of the child models by their primary
- // key of the relationship, then we can easily match the children back onto
- // the parents using that dictionary and the primary key of the children.
- $dictionary = array();
-
- foreach ($results as $result)
- {
- $dictionary[$result->getAttribute($other)] = $result;
- }
-
- // Once we have the dictionary constructed, we can loop through all the parents
- // and match back onto their children using these keys of the dictionary and
- // the primary key of the children to map them onto the correct instances.
- foreach ($models as $model)
- {
- if (isset($dictionary[$model->$foreign]))
- {
- $model->setRelation($relation, $dictionary[$model->$foreign]);
- }
- }
-
- return $models;
- }
-
- /**
- * Associate the model instance to the given parent.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function associate(Model $model)
- {
- $this->parent->setAttribute($this->foreignKey, $model->getAttribute($this->otherKey));
-
- return $this->parent->setRelation($this->relation, $model);
- }
-
- /**
- * Dissociate previously associated model from the given parent.
- *
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function dissociate()
- {
- $this->parent->setAttribute($this->foreignKey, null);
-
- return $this->parent->setRelation($this->relation, null);
- }
-
- /**
- * Update the parent model on the relationship.
- *
- * @param array $attributes
- * @return mixed
- */
- public function update(array $attributes)
- {
- $instance = $this->getResults();
-
- return $instance->fill($attributes)->save();
- }
-
- /**
- * Get the foreign key of the relationship.
- *
- * @return string
- */
- public function getForeignKey()
- {
- return $this->foreignKey;
- }
-
- /**
- * Get the fully qualified foreign key of the relationship.
- *
- * @return string
- */
- 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;
- }
-
+class BelongsTo extends Relation
+{
+ /**
+ * The foreign key of the parent model.
+ *
+ * @var string
+ */
+ protected $foreignKey;
+
+ /**
+ * The associated key on the parent model.
+ *
+ * @var string
+ */
+ protected $otherKey;
+
+ /**
+ * The name of the relationship.
+ *
+ * @var string
+ */
+ protected $relation;
+
+ /**
+ * Create a new belongs to relationship instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @param string $relation
+ * @return void
+ */
+ public function __construct(Builder $query, Model $parent, $foreignKey, $otherKey, $relation)
+ {
+ $this->otherKey = $otherKey;
+ $this->relation = $relation;
+ $this->foreignKey = $foreignKey;
+
+ parent::__construct($query, $parent);
+ }
+
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ return $this->query->first();
+ }
+
+ /**
+ * Set the base constraints on the relation query.
+ *
+ * @return void
+ */
+ public function addConstraints()
+ {
+ if (static::$constraints) {
+ // For belongs to relationships, which are essentially the inverse of has one
+ // or has many relationships, we need to actually query on the primary key
+ // of the related models matching on the foreign key that's on a parent.
+ $table = $this->related->getTable();
+
+ $this->query->where($table.'.'.$this->otherKey, '=', $this->parent->{$this->foreignKey});
+ }
+ }
+
+ /**
+ * Add the constraints for a relationship count query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQuery(Builder $query, Builder $parent)
+ {
+ if ($parent->getQuery()->from == $query->getQuery()->from) {
+ return $this->getRelationCountQueryForSelfRelation($query, $parent);
+ }
+
+ $query->select(new Expression('count(*)'));
+
+ $otherKey = $this->wrap($query->getModel()->getTable().'.'.$this->otherKey);
+
+ return $query->where($this->getQualifiedForeignKey(), '=', new Expression($otherKey));
+ }
+
+ /**
+ * Add the constraints for a relationship count query on the same table.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQueryForSelfRelation(Builder $query, Builder $parent)
+ {
+ $query->select(new Expression('count(*)'));
+
+ $query->from($query->getModel()->getTable().' as '.$hash = $this->getRelationCountHash());
+
+ $query->getModel()->setTable($hash);
+
+ $key = $this->wrap($this->getQualifiedForeignKey());
+
+ return $query->where($hash.'.'.$query->getModel()->getKeyName(), '=', new Expression($key));
+ }
+
+ /**
+ * Get a relationship join table hash.
+ *
+ * @return string
+ */
+ public function getRelationCountHash()
+ {
+ return 'self_'.md5(microtime(true));
+ }
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ public function addEagerConstraints(array $models)
+ {
+ // We'll grab the primary key name of the related models since it could be set to
+ // a non-standard name and not "id". We will then construct the constraint for
+ // our eagerly loading query so it returns the proper models from execution.
+ $key = $this->related->getTable().'.'.$this->otherKey;
+
+ $this->query->whereIn($key, $this->getEagerModelKeys($models));
+ }
+
+ /**
+ * Gather the keys from an array of related models.
+ *
+ * @param array $models
+ * @return array
+ */
+ protected function getEagerModelKeys(array $models)
+ {
+ $keys = [];
+
+ // First we need to gather all of the keys from the parent models so we know what
+ // to query for via the eager loading query. We will add them to an array then
+ // execute a "where in" statement to gather up all of those related records.
+ foreach ($models as $model) {
+ if (! is_null($value = $model->{$this->foreignKey})) {
+ $keys[] = $value;
+ }
+ }
+
+ // If there are no keys that were not null we will just return an array with 0 in
+ // it so the query doesn't fail, but will not return any results, which should
+ // be what this developer is expecting in a case where this happens to them.
+ if (count($keys) == 0) {
+ return [0];
+ }
+
+ return array_values(array_unique($keys));
+ }
+
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ public function initRelation(array $models, $relation)
+ {
+ foreach ($models as $model) {
+ $model->setRelation($relation, null);
+ }
+
+ return $models;
+ }
+
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ $foreign = $this->foreignKey;
+
+ $other = $this->otherKey;
+
+ // First we will get to build a dictionary of the child models by their primary
+ // key of the relationship, then we can easily match the children back onto
+ // the parents using that dictionary and the primary key of the children.
+ $dictionary = [];
+
+ foreach ($results as $result) {
+ $dictionary[$result->getAttribute($other)] = $result;
+ }
+
+ // Once we have the dictionary constructed, we can loop through all the parents
+ // and match back onto their children using these keys of the dictionary and
+ // the primary key of the children to map them onto the correct instances.
+ foreach ($models as $model) {
+ if (isset($dictionary[$model->$foreign])) {
+ $model->setRelation($relation, $dictionary[$model->$foreign]);
+ }
+ }
+
+ return $models;
+ }
+
+ /**
+ * Associate the model instance to the given parent.
+ *
+ * @param \Illuminate\Database\Eloquent\Model|int $model
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function associate($model)
+ {
+ $otherKey = ($model instanceof Model ? $model->getAttribute($this->otherKey) : $model);
+
+ $this->parent->setAttribute($this->foreignKey, $otherKey);
+
+ if ($model instanceof Model) {
+ $this->parent->setRelation($this->relation, $model);
+ }
+
+ return $this->parent;
+ }
+
+ /**
+ * Dissociate previously associated model from the given parent.
+ *
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function dissociate()
+ {
+ $this->parent->setAttribute($this->foreignKey, null);
+
+ return $this->parent->setRelation($this->relation, null);
+ }
+
+ /**
+ * Update the parent model on the relationship.
+ *
+ * @param array $attributes
+ * @return mixed
+ */
+ public function update(array $attributes)
+ {
+ $instance = $this->getResults();
+
+ return $instance->fill($attributes)->save();
+ }
+
+ /**
+ * Get the foreign key of the relationship.
+ *
+ * @return string
+ */
+ public function getForeignKey()
+ {
+ return $this->foreignKey;
+ }
+
+ /**
+ * Get the fully qualified foreign key of the relationship.
+ *
+ * @return string
+ */
+ 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/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
index 8b9d2a1..809e1e7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -1,1230 +1,1255 @@
-table = $table;
- $this->otherKey = $otherKey;
- $this->foreignKey = $foreignKey;
- $this->relationName = $relationName;
-
- parent::__construct($query, $parent);
- }
-
- /**
- * Get the results of the relationship.
- *
- * @return mixed
- */
- public function getResults()
- {
- return $this->get();
- }
-
- /**
- * Set a where clause for a pivot table column.
- *
- * @param string $column
- * @param string $operator
- * @param mixed $value
- * @param string $boolean
- * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
- */
- public function wherePivot($column, $operator = null, $value = null, $boolean = 'and')
- {
- $this->pivotWheres[] = func_get_args();
-
- return $this->where($this->table.'.'.$column, $operator, $value, $boolean);
- }
-
- /**
- * Set an or where clause for a pivot table column.
- *
- * @param string $column
- * @param string $operator
- * @param mixed $value
- * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
- */
- public function orWherePivot($column, $operator = null, $value = null)
- {
- return $this->wherePivot($column, $operator, $value, 'or');
- }
-
- /**
- * Execute the query and get the first result.
- *
- * @param array $columns
- * @return mixed
- */
- public function first($columns = array('*'))
- {
- $results = $this->take(1)->get($columns);
-
- return count($results) > 0 ? $results->first() : null;
- }
-
- /**
- * Execute the query and get the first result or throw an exception.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model|static
- *
- * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
- */
- public function firstOrFail($columns = array('*'))
- {
- if ( ! is_null($model = $this->first($columns))) return $model;
-
- throw new ModelNotFoundException;
- }
-
- /**
- * Execute the query as a "select" statement.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public function get($columns = array('*'))
- {
- // First we'll add the proper select columns onto the query so it is run with
- // the proper columns. Then, we will get the results and hydrate out pivot
- // models with the result of those columns as a separate model relation.
- $columns = $this->query->getQuery()->columns ? array() : $columns;
-
- $select = $this->getSelectColumns($columns);
-
- $models = $this->query->addSelect($select)->getModels();
-
- $this->hydratePivotRelation($models);
-
- // If we actually found models we will also eager load any relationships that
- // have been specified as needing to be eager loaded. This will solve the
- // n + 1 query problem for the developer and also increase performance.
- if (count($models) > 0)
- {
- $models = $this->query->eagerLoadRelations($models);
- }
-
- return $this->related->newCollection($models);
- }
-
- /**
- * Get a paginator for the "select" statement.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
- */
- public function paginate($perPage = null, $columns = array('*'))
- {
- $this->query->addSelect($this->getSelectColumns($columns));
-
- $paginator = $this->query->paginate($perPage, $columns);
-
- $this->hydratePivotRelation($paginator->items());
-
- return $paginator;
- }
-
- /**
- * Paginate the given query into a simple paginator.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\Paginator
- */
- public function simplePaginate($perPage = null, $columns = array('*'))
- {
- $this->query->addSelect($this->getSelectColumns($columns));
-
- $paginator = $this->query->simplePaginate($perPage, $columns);
-
- $this->hydratePivotRelation($paginator->items());
-
- return $paginator;
- }
-
- /**
- * Chunk the results of the query.
- *
- * @param int $count
- * @param callable $callback
- * @return void
- */
- public function chunk($count, callable $callback)
- {
- $this->query->addSelect($this->getSelectColumns());
-
- $this->query->chunk($count, function($results) use ($callback)
- {
- $this->hydratePivotRelation($results->all());
-
- call_user_func($callback, $results);
- });
- }
-
- /**
- * Hydrate the pivot table relationship on the models.
- *
- * @param array $models
- * @return void
- */
- protected function hydratePivotRelation(array $models)
- {
- // To hydrate the pivot relationship, we will just gather the pivot attributes
- // and create a new Pivot model, which is basically a dynamic model that we
- // will set the attributes, table, and connections on so it they be used.
- foreach ($models as $model)
- {
- $pivot = $this->newExistingPivot($this->cleanPivotAttributes($model));
-
- $model->setRelation('pivot', $pivot);
- }
- }
-
- /**
- * Get the pivot attributes from a model.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return array
- */
- protected function cleanPivotAttributes(Model $model)
- {
- $values = array();
-
- foreach ($model->getAttributes() as $key => $value)
- {
- // To get the pivots attributes we will just take any of the attributes which
- // begin with "pivot_" and add those to this arrays, as well as unsetting
- // them from the parent's models since they exist in a different table.
- if (strpos($key, 'pivot_') === 0)
- {
- $values[substr($key, 6)] = $value;
-
- unset($model->$key);
- }
- }
-
- return $values;
- }
-
- /**
- * Set the base constraints on the relation query.
- *
- * @return void
- */
- public function addConstraints()
- {
- $this->setJoin();
-
- if (static::$constraints) $this->setWhere();
- }
-
- /**
- * Add the constraints for a relationship count query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQuery(Builder $query, Builder $parent)
- {
- if ($parent->getQuery()->from == $query->getQuery()->from)
- {
- return $this->getRelationCountQueryForSelfJoin($query, $parent);
- }
-
- $this->setJoin($query);
-
- return parent::getRelationCountQuery($query, $parent);
- }
-
- /**
- * Add the constraints for a relationship count query on the same table.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQueryForSelfJoin(Builder $query, Builder $parent)
- {
- $query->select(new Expression('count(*)'));
-
- $query->from($this->table.' as '.$hash = $this->getRelationCountHash());
-
- $key = $this->wrap($this->getQualifiedParentKeyName());
-
- return $query->where($hash.'.'.$this->foreignKey, '=', new Expression($key));
- }
-
- /**
- * Get a relationship join table hash.
- *
- * @return string
- */
- public function getRelationCountHash()
- {
- return 'self_'.md5(microtime(true));
- }
-
- /**
- * Set the select clause for the relation query.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
- */
- protected function getSelectColumns(array $columns = array('*'))
- {
- if ($columns == array('*'))
- {
- $columns = array($this->related->getTable().'.*');
- }
-
- return array_merge($columns, $this->getAliasedPivotColumns());
- }
-
- /**
- * Get the pivot columns for the relation.
- *
- * @return array
- */
- protected function getAliasedPivotColumns()
- {
- $defaults = array($this->foreignKey, $this->otherKey);
-
- // We need to alias all of the pivot columns with the "pivot_" prefix so we
- // can easily extract them out of the models and put them into the pivot
- // relationships when they are retrieved and hydrated into the models.
- $columns = array();
-
- foreach (array_merge($defaults, $this->pivotColumns) as $column)
- {
- $columns[] = $this->table.'.'.$column.' as pivot_'.$column;
- }
-
- return array_unique($columns);
- }
-
- /**
- * Determine whether the given column is defined as a pivot column.
- *
- * @param string $column
- * @return bool
- */
- protected function hasPivotColumn($column)
- {
- return in_array($column, $this->pivotColumns);
- }
-
- /**
- * Set the join clause for the relation query.
- *
- * @param \Illuminate\Database\Eloquent\Builder|null
- * @return $this
- */
- protected function setJoin($query = null)
- {
- $query = $query ?: $this->query;
-
- // We need to join to the intermediate table on the related model's primary
- // key column with the intermediate table's foreign key for the related
- // model instance. Then we can set the "where" for the parent models.
- $baseTable = $this->related->getTable();
-
- $key = $baseTable.'.'.$this->related->getKeyName();
-
- $query->join($this->table, $key, '=', $this->getOtherKey());
-
- return $this;
- }
-
- /**
- * Set the where clause for the relation query.
- *
- * @return $this
- */
- protected function setWhere()
- {
- $foreign = $this->getForeignKey();
-
- $this->query->where($foreign, '=', $this->parent->getKey());
-
- return $this;
- }
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- public function addEagerConstraints(array $models)
- {
- $this->query->whereIn($this->getForeignKey(), $this->getKeys($models));
- }
-
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- public function initRelation(array $models, $relation)
- {
- foreach ($models as $model)
- {
- $model->setRelation($relation, $this->related->newCollection());
- }
-
- return $models;
- }
-
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- $dictionary = $this->buildDictionary($results);
-
- // Once we have an array dictionary of child objects we can easily match the
- // children back to their parent using the dictionary and the keys on the
- // the parent models. Then we will return the hydrated models back out.
- foreach ($models as $model)
- {
- if (isset($dictionary[$key = $model->getKey()]))
- {
- $collection = $this->related->newCollection($dictionary[$key]);
-
- $model->setRelation($relation, $collection);
- }
- }
-
- return $models;
- }
-
- /**
- * Build model dictionary keyed by the relation's foreign key.
- *
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @return array
- */
- protected function buildDictionary(Collection $results)
- {
- $foreign = $this->foreignKey;
-
- // First we will build a dictionary of child models keyed by the foreign key
- // of the relation so that we will easily and quickly match them to their
- // parents without having a possibly slow inner loops for every models.
- $dictionary = array();
-
- foreach ($results as $result)
- {
- $dictionary[$result->pivot->$foreign][] = $result;
- }
-
- return $dictionary;
- }
-
- /**
- * Touch all of the related models for the relationship.
- *
- * E.g.: Touch all roles associated with this user.
- *
- * @return void
- */
- public function touch()
- {
- $key = $this->getRelated()->getKeyName();
-
- $columns = $this->getRelatedFreshUpdate();
-
- // If we actually have IDs for the relation, we will run the query to update all
- // the related model's timestamps, to make sure these all reflect the changes
- // to the parent models. This will help us keep any caching synced up here.
- $ids = $this->getRelatedIds();
-
- if (count($ids) > 0)
- {
- $this->getRelated()->newQuery()->whereIn($key, $ids)->update($columns);
- }
- }
-
- /**
- * Get all of the IDs for the related models.
- *
- * @return array
- */
- public function getRelatedIds()
- {
- $related = $this->getRelated();
-
- $fullKey = $related->getQualifiedKeyName();
-
- return $this->getQuery()->select($fullKey)->lists($related->getKeyName());
- }
-
- /**
- * Save a new model and attach it to the parent model.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @param array $joining
- * @param bool $touch
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function save(Model $model, array $joining = array(), $touch = true)
- {
- $model->save(array('touch' => false));
-
- $this->attach($model->getKey(), $joining, $touch);
-
- return $model;
- }
-
- /**
- * Save an array of new models and attach them to the parent model.
- *
- * @param array $models
- * @param array $joinings
- * @return array
- */
- public function saveMany(array $models, array $joinings = array())
- {
- foreach ($models as $key => $model)
- {
- $this->save($model, (array) array_get($joinings, $key), false);
- }
-
- $this->touchIfTouching();
-
- return $models;
- }
-
- /**
- * Find a related model by its primary key.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|null
- */
- public function find($id, $columns = ['*'])
- {
- if (is_array($id))
- {
- return $this->findMany($id, $columns);
- }
-
- $this->where($this->getRelated()->getQualifiedKeyName(), '=', $id);
-
- return $this->first($columns);
- }
-
- /**
- * Find multiple related models by their primary keys.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public function findMany($ids, $columns = ['*'])
- {
- if (empty($ids)) return $this->getRelated()->newCollection();
-
- $this->whereIn($this->getRelated()->getQualifiedKeyName(), $ids);
-
- return $this->get($columns);
- }
-
- /**
- * Find a related model by its primary key or return new instance of the related model.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model
- */
- public function findOrNew($id, $columns = ['*'])
- {
- if (is_null($instance = $this->find($id, $columns)))
- {
- $instance = $this->getRelated()->newInstance();
- }
-
- return $instance;
- }
-
- /**
- * Get the first related model record matching the attributes or instantiate it.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function firstOrNew(array $attributes)
- {
- if (is_null($instance = $this->where($attributes)->first()))
- {
- $instance = $this->related->newInstance($attributes);
- }
-
- return $instance;
- }
-
- /**
- * Get the first related record matching the attributes or create it.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function firstOrCreate(array $attributes, array $joining = [], $touch = true)
- {
- if (is_null($instance = $this->where($attributes)->first()))
- {
- $instance = $this->create($attributes, $joining, $touch);
- }
-
- return $instance;
- }
-
- /**
- * Create or update a related record matching the attributes, and fill it with values.
- *
- * @param array $attributes
- * @param array $values
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function updateOrCreate(array $attributes, array $values = [], array $joining = [], $touch = true)
- {
- if (is_null($instance = $this->where($attributes)->first()))
- {
- return $this->create($values, $joining, $touch);
- }
-
- $instance->fill($values);
-
- $instance->save(['touch' => false]);
-
- return $instance;
- }
-
- /**
- * Create a new instance of the related model.
- *
- * @param array $attributes
- * @param array $joining
- * @param bool $touch
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function create(array $attributes, array $joining = array(), $touch = true)
- {
- $instance = $this->related->newInstance($attributes);
-
- // Once we save the related model, we need to attach it to the base model via
- // through intermediate table so we'll use the existing "attach" method to
- // accomplish this which will insert the record and any more attributes.
- $instance->save(array('touch' => false));
-
- $this->attach($instance->getKey(), $joining, $touch);
-
- return $instance;
- }
-
- /**
- * Create an array of new instances of the related models.
- *
- * @param array $records
- * @param array $joinings
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function createMany(array $records, array $joinings = array())
- {
- $instances = array();
-
- foreach ($records as $key => $record)
- {
- $instances[] = $this->create($record, (array) array_get($joinings, $key), false);
- }
-
- $this->touchIfTouching();
-
- return $instances;
- }
-
- /**
- * Sync the intermediate tables with a list of IDs or collection of models.
- *
- * @param array $ids
- * @param bool $detaching
- * @return array
- */
- public function sync($ids, $detaching = true)
- {
- $changes = array(
- 'attached' => array(), 'detached' => array(), 'updated' => array(),
- );
-
- if ($ids instanceof Collection) $ids = $ids->modelKeys();
-
- // First we need to attach any of the associated models that are not currently
- // in this joining table. We'll spin through the given IDs, checking to see
- // if they exist in the array of current ones, and if not we will insert.
- $current = $this->newPivotQuery()->lists($this->otherKey);
-
- $records = $this->formatSyncList($ids);
-
- $detach = array_diff($current, array_keys($records));
-
- // Next, we will take the differences of the currents and given IDs and detach
- // all of the entities that exist in the "current" array but are not in the
- // the array of the IDs given to the method which will complete the sync.
- if ($detaching && count($detach) > 0)
- {
- $this->detach($detach);
-
- $changes['detached'] = (array) array_map(function($v) { return (int) $v; }, $detach);
- }
-
- // Now we are finally ready to attach the new records. Note that we'll disable
- // touching until after the entire operation is complete so we don't fire a
- // ton of touch operations until we are totally done syncing the records.
- $changes = array_merge(
- $changes, $this->attachNew($records, $current, false)
- );
-
- if (count($changes['attached']) || count($changes['updated']))
- {
- $this->touchIfTouching();
- }
-
- return $changes;
- }
-
- /**
- * Format the sync list so that it is keyed by ID.
- *
- * @param array $records
- * @return array
- */
- protected function formatSyncList(array $records)
- {
- $results = array();
-
- foreach ($records as $id => $attributes)
- {
- if ( ! is_array($attributes))
- {
- list($id, $attributes) = array($attributes, array());
- }
-
- $results[$id] = $attributes;
- }
-
- return $results;
- }
-
- /**
- * Attach all of the IDs that aren't in the current array.
- *
- * @param array $records
- * @param array $current
- * @param bool $touch
- * @return array
- */
- protected function attachNew(array $records, array $current, $touch = true)
- {
- $changes = array('attached' => array(), 'updated' => array());
-
- foreach ($records as $id => $attributes)
- {
- // If the ID is not in the list of existing pivot IDs, we will insert a new pivot
- // record, otherwise, we will just update this existing record on this joining
- // table, so that the developers will easily update these records pain free.
- if ( ! in_array($id, $current))
- {
- $this->attach($id, $attributes, $touch);
-
- $changes['attached'][] = (int) $id;
- }
-
- // Now we'll try to update an existing pivot record with the attributes that were
- // given to the method. If the model is actually updated we will add it to the
- // list of updated pivot records so we return them back out to the consumer.
- elseif (count($attributes) > 0 &&
- $this->updateExistingPivot($id, $attributes, $touch))
- {
- $changes['updated'][] = (int) $id;
- }
- }
-
- return $changes;
- }
-
- /**
- * Update an existing pivot record on the table.
- *
- * @param mixed $id
- * @param array $attributes
- * @param bool $touch
- * @return void
- */
- public function updateExistingPivot($id, array $attributes, $touch = true)
- {
- if (in_array($this->updatedAt(), $this->pivotColumns))
- {
- $attributes = $this->setTimestampsOnAttach($attributes, true);
- }
-
- $updated = $this->newPivotStatementForId($id)->update($attributes);
-
- if ($touch) $this->touchIfTouching();
-
- return $updated;
- }
-
- /**
- * Attach a model to the parent.
- *
- * @param mixed $id
- * @param array $attributes
- * @param bool $touch
- * @return void
- */
- public function attach($id, array $attributes = array(), $touch = true)
- {
- if ($id instanceof Model) $id = $id->getKey();
-
- $query = $this->newPivotStatement();
-
- $query->insert($this->createAttachRecords((array) $id, $attributes));
-
- if ($touch) $this->touchIfTouching();
- }
-
- /**
- * Create an array of records to insert into the pivot table.
- *
- * @param array $ids
- * @param array $attributes
- * @return array
- */
- protected function createAttachRecords($ids, array $attributes)
- {
- $records = array();
-
- $timed = ($this->hasPivotColumn($this->createdAt()) ||
- $this->hasPivotColumn($this->updatedAt()));
-
- // To create the attachment records, we will simply spin through the IDs given
- // and create a new record to insert for each ID. Each ID may actually be a
- // key in the array, with extra attributes to be placed in other columns.
- foreach ($ids as $key => $value)
- {
- $records[] = $this->attacher($key, $value, $attributes, $timed);
- }
-
- return $records;
- }
-
- /**
- * Create a full attachment record payload.
- *
- * @param int $key
- * @param mixed $value
- * @param array $attributes
- * @param bool $timed
- * @return array
- */
- protected function attacher($key, $value, $attributes, $timed)
- {
- list($id, $extra) = $this->getAttachId($key, $value, $attributes);
-
- // To create the attachment records, we will simply spin through the IDs given
- // and create a new record to insert for each ID. Each ID may actually be a
- // key in the array, with extra attributes to be placed in other columns.
- $record = $this->createAttachRecord($id, $timed);
-
- return array_merge($record, $extra);
- }
-
- /**
- * Get the attach record ID and extra attributes.
- *
- * @param mixed $key
- * @param mixed $value
- * @param array $attributes
- * @return array
- */
- protected function getAttachId($key, $value, array $attributes)
- {
- if (is_array($value))
- {
- return array($key, array_merge($value, $attributes));
- }
-
- return array($value, $attributes);
- }
-
- /**
- * Create a new pivot attachment record.
- *
- * @param int $id
- * @param bool $timed
- * @return array
- */
- protected function createAttachRecord($id, $timed)
- {
- $record[$this->foreignKey] = $this->parent->getKey();
-
- $record[$this->otherKey] = $id;
-
- // If the record needs to have creation and update timestamps, we will make
- // them by calling the parent model's "freshTimestamp" method which will
- // provide us with a fresh timestamp in this model's preferred format.
- if ($timed)
- {
- $record = $this->setTimestampsOnAttach($record);
- }
-
- return $record;
- }
-
- /**
- * Set the creation and update timestamps on an attach record.
- *
- * @param array $record
- * @param bool $exists
- * @return array
- */
- protected function setTimestampsOnAttach(array $record, $exists = false)
- {
- $fresh = $this->parent->freshTimestamp();
-
- if ( ! $exists && $this->hasPivotColumn($this->createdAt()))
- {
- $record[$this->createdAt()] = $fresh;
- }
-
- if ($this->hasPivotColumn($this->updatedAt()))
- {
- $record[$this->updatedAt()] = $fresh;
- }
-
- return $record;
- }
-
- /**
- * Detach models from the relationship.
- *
- * @param int|array $ids
- * @param bool $touch
- * @return int
- */
- public function detach($ids = array(), $touch = true)
- {
- if ($ids instanceof Model) $ids = (array) $ids->getKey();
-
- $query = $this->newPivotQuery();
-
- // If associated IDs were passed to the method we will only delete those
- // associations, otherwise all of the association ties will be broken.
- // We'll return the numbers of affected rows when we do the deletes.
- $ids = (array) $ids;
-
- if (count($ids) > 0)
- {
- $query->whereIn($this->otherKey, (array) $ids);
- }
-
- if ($touch) $this->touchIfTouching();
-
- // Once we have all of the conditions set on the statement, we are ready
- // to run the delete on the pivot table. Then, if the touch parameter
- // is true, we will go ahead and touch all related models to sync.
- $results = $query->delete();
-
- return $results;
- }
-
- /**
- * If we're touching the parent model, touch.
- *
- * @return void
- */
- public function touchIfTouching()
- {
- if ($this->touchingParent()) $this->getParent()->touch();
-
- if ($this->getParent()->touches($this->relationName)) $this->touch();
- }
-
- /**
- * Determine if we should touch the parent on sync.
- *
- * @return bool
- */
- protected function touchingParent()
- {
- return $this->getRelated()->touches($this->guessInverseRelation());
- }
-
- /**
- * Attempt to guess the name of the inverse of the relation.
- *
- * @return string
- */
- protected function guessInverseRelation()
- {
- return camel_case(str_plural(class_basename($this->getParent())));
- }
-
- /**
- * Create a new query builder for the pivot table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function newPivotQuery()
- {
- $query = $this->newPivotStatement();
-
- foreach ($this->pivotWheres as $whereArgs)
- {
- call_user_func_array([$query, 'where'], $whereArgs);
- }
-
- return $query->where($this->foreignKey, $this->parent->getKey());
- }
-
- /**
- * Get a new plain query builder for the pivot table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- public function newPivotStatement()
- {
- return $this->query->getQuery()->newQuery()->from($this->table);
- }
-
- /**
- * Get a new pivot statement for a given "other" ID.
- *
- * @param mixed $id
- * @return \Illuminate\Database\Query\Builder
- */
- public function newPivotStatementForId($id)
- {
- return $this->newPivotQuery()->where($this->otherKey, $id);
- }
-
- /**
- * Create a new pivot model instance.
- *
- * @param array $attributes
- * @param bool $exists
- * @return \Illuminate\Database\Eloquent\Relations\Pivot
- */
- public function newPivot(array $attributes = array(), $exists = false)
- {
- $pivot = $this->related->newPivot($this->parent, $attributes, $this->table, $exists);
-
- return $pivot->setPivotKeys($this->foreignKey, $this->otherKey);
- }
-
- /**
- * Create a new existing pivot model instance.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Relations\Pivot
- */
- public function newExistingPivot(array $attributes = array())
- {
- return $this->newPivot($attributes, true);
- }
-
- /**
- * Set the columns on the pivot table to retrieve.
- *
- * @param mixed $columns
- * @return $this
- */
- public function withPivot($columns)
- {
- $columns = is_array($columns) ? $columns : func_get_args();
-
- $this->pivotColumns = array_merge($this->pivotColumns, $columns);
-
- return $this;
- }
-
- /**
- * Specify that the pivot table has creation and update timestamps.
- *
- * @param mixed $createdAt
- * @param mixed $updatedAt
- * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
- */
- public function withTimestamps($createdAt = null, $updatedAt = null)
- {
- $this->pivotCreatedAt = $createdAt;
- $this->pivotUpdatedAt = $updatedAt;
-
- return $this->withPivot($this->createdAt(), $this->updatedAt());
- }
-
- /**
- * Get the name of the "created at" column.
- *
- * @return string
- */
- public function createdAt()
- {
- return $this->pivotCreatedAt ?: $this->parent->getCreatedAtColumn();
- }
-
- /**
- * Get the name of the "updated at" column.
- *
- * @return string
- */
- public function updatedAt()
- {
- return $this->pivotUpdatedAt ?: $this->parent->getUpdatedAtColumn();
- }
-
- /**
- * Get the related model's updated at column name.
- *
- * @return string
- */
- public function getRelatedFreshUpdate()
- {
- return array($this->related->getUpdatedAtColumn() => $this->related->freshTimestamp());
- }
-
- /**
- * Get the key for comparing against the parent key in "has" query.
- *
- * @return string
- */
- public function getHasCompareKey()
- {
- return $this->getForeignKey();
- }
-
- /**
- * Get the fully qualified foreign key for the relation.
- *
- * @return string
- */
- public function getForeignKey()
- {
- return $this->table.'.'.$this->foreignKey;
- }
-
- /**
- * Get the fully qualified "other key" for the relation.
- *
- * @return string
- */
- public function getOtherKey()
- {
- return $this->table.'.'.$this->otherKey;
- }
-
- /**
- * Get the intermediate table for the relationship.
- *
- * @return string
- */
- public function getTable()
- {
- return $this->table;
- }
-
- /**
- * Get the relationship name for the relationship.
- *
- * @return string
- */
- public function getRelationName()
- {
- return $this->relationName;
- }
-
+class BelongsToMany extends Relation
+{
+ /**
+ * The intermediate table for the relation.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * The foreign key of the parent model.
+ *
+ * @var string
+ */
+ protected $foreignKey;
+
+ /**
+ * The associated key of the relation.
+ *
+ * @var string
+ */
+ protected $otherKey;
+
+ /**
+ * The "name" of the relationship.
+ *
+ * @var string
+ */
+ protected $relationName;
+
+ /**
+ * The pivot table columns to retrieve.
+ *
+ * @var array
+ */
+ protected $pivotColumns = [];
+
+ /**
+ * Any pivot table restrictions.
+ *
+ * @var array
+ */
+ protected $pivotWheres = [];
+
+ /**
+ * The custom pivot table column for the created_at timestamp.
+ *
+ * @var string
+ */
+ protected $pivotCreatedAt;
+
+ /**
+ * The custom pivot table column for the updated_at timestamp.
+ *
+ * @var string
+ */
+ protected $pivotUpdatedAt;
+
+ /**
+ * Create a new belongs to many relationship instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param string $table
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @param string $relationName
+ * @return void
+ */
+ public function __construct(Builder $query, Model $parent, $table, $foreignKey, $otherKey, $relationName = null)
+ {
+ $this->table = $table;
+ $this->otherKey = $otherKey;
+ $this->foreignKey = $foreignKey;
+ $this->relationName = $relationName;
+
+ parent::__construct($query, $parent);
+ }
+
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ return $this->get();
+ }
+
+ /**
+ * Set a where clause for a pivot table column.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param mixed $value
+ * @param string $boolean
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+ */
+ public function wherePivot($column, $operator = null, $value = null, $boolean = 'and')
+ {
+ $this->pivotWheres[] = func_get_args();
+
+ return $this->where($this->table.'.'.$column, $operator, $value, $boolean);
+ }
+
+ /**
+ * Set an or where clause for a pivot table column.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param mixed $value
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+ */
+ public function orWherePivot($column, $operator = null, $value = null)
+ {
+ return $this->wherePivot($column, $operator, $value, 'or');
+ }
+
+ /**
+ * Execute the query and get the first result.
+ *
+ * @param array $columns
+ * @return mixed
+ */
+ public function first($columns = ['*'])
+ {
+ $results = $this->take(1)->get($columns);
+
+ return count($results) > 0 ? $results->first() : null;
+ }
+
+ /**
+ * Execute the query and get the first result or throw an exception.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|static
+ *
+ * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+ */
+ public function firstOrFail($columns = ['*'])
+ {
+ if (! is_null($model = $this->first($columns))) {
+ return $model;
+ }
+
+ throw new ModelNotFoundException;
+ }
+
+ /**
+ * Execute the query as a "select" statement.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public function get($columns = ['*'])
+ {
+ // First we'll add the proper select columns onto the query so it is run with
+ // the proper columns. Then, we will get the results and hydrate out pivot
+ // models with the result of those columns as a separate model relation.
+ $columns = $this->query->getQuery()->columns ? [] : $columns;
+
+ $select = $this->getSelectColumns($columns);
+
+ $models = $this->query->addSelect($select)->getModels();
+
+ $this->hydratePivotRelation($models);
+
+ // If we actually found models we will also eager load any relationships that
+ // have been specified as needing to be eager loaded. This will solve the
+ // n + 1 query problem for the developer and also increase performance.
+ if (count($models) > 0) {
+ $models = $this->query->eagerLoadRelations($models);
+ }
+
+ return $this->related->newCollection($models);
+ }
+
+ /**
+ * Get a paginator for the "select" statement.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @param int|null $page
+ * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+ */
+ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)
+ {
+ $this->query->addSelect($this->getSelectColumns($columns));
+
+ $paginator = $this->query->paginate($perPage, $columns, $pageName, $page);
+
+ $this->hydratePivotRelation($paginator->items());
+
+ return $paginator;
+ }
+
+ /**
+ * Paginate the given query into a simple paginator.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @return \Illuminate\Contracts\Pagination\Paginator
+ */
+ public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page')
+ {
+ $this->query->addSelect($this->getSelectColumns($columns));
+
+ $paginator = $this->query->simplePaginate($perPage, $columns, $pageName);
+
+ $this->hydratePivotRelation($paginator->items());
+
+ return $paginator;
+ }
+
+ /**
+ * Chunk the results of the query.
+ *
+ * @param int $count
+ * @param callable $callback
+ * @return bool
+ */
+ public function chunk($count, callable $callback)
+ {
+ $this->query->addSelect($this->getSelectColumns());
+
+ return $this->query->chunk($count, function ($results) use ($callback) {
+ $this->hydratePivotRelation($results->all());
+
+ return $callback($results);
+ });
+ }
+
+ /**
+ * Hydrate the pivot table relationship on the models.
+ *
+ * @param array $models
+ * @return void
+ */
+ protected function hydratePivotRelation(array $models)
+ {
+ // To hydrate the pivot relationship, we will just gather the pivot attributes
+ // and create a new Pivot model, which is basically a dynamic model that we
+ // will set the attributes, table, and connections on so it they be used.
+ foreach ($models as $model) {
+ $pivot = $this->newExistingPivot($this->cleanPivotAttributes($model));
+
+ $model->setRelation('pivot', $pivot);
+ }
+ }
+
+ /**
+ * Get the pivot attributes from a model.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return array
+ */
+ protected function cleanPivotAttributes(Model $model)
+ {
+ $values = [];
+
+ foreach ($model->getAttributes() as $key => $value) {
+ // To get the pivots attributes we will just take any of the attributes which
+ // begin with "pivot_" and add those to this arrays, as well as unsetting
+ // them from the parent's models since they exist in a different table.
+ if (strpos($key, 'pivot_') === 0) {
+ $values[substr($key, 6)] = $value;
+
+ unset($model->$key);
+ }
+ }
+
+ return $values;
+ }
+
+ /**
+ * Set the base constraints on the relation query.
+ *
+ * @return void
+ */
+ public function addConstraints()
+ {
+ $this->setJoin();
+
+ if (static::$constraints) {
+ $this->setWhere();
+ }
+ }
+
+ /**
+ * Add the constraints for a relationship count query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQuery(Builder $query, Builder $parent)
+ {
+ if ($parent->getQuery()->from == $query->getQuery()->from) {
+ return $this->getRelationCountQueryForSelfJoin($query, $parent);
+ }
+
+ $this->setJoin($query);
+
+ return parent::getRelationCountQuery($query, $parent);
+ }
+
+ /**
+ * Add the constraints for a relationship count query on the same table.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQueryForSelfJoin(Builder $query, Builder $parent)
+ {
+ $query->select(new Expression('count(*)'));
+
+ $query->from($this->related->getTable().' as '.$hash = $this->getRelationCountHash());
+
+ $this->related->setTable($hash);
+
+ $this->setJoin($query);
+
+ return parent::getRelationCountQuery($query, $parent);
+ }
+
+ /**
+ * Get a relationship join table hash.
+ *
+ * @return string
+ */
+ public function getRelationCountHash()
+ {
+ return 'self_'.md5(microtime(true));
+ }
+
+ /**
+ * Set the select clause for the relation query.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+ */
+ protected function getSelectColumns(array $columns = ['*'])
+ {
+ if ($columns == ['*']) {
+ $columns = [$this->related->getTable().'.*'];
+ }
+
+ return array_merge($columns, $this->getAliasedPivotColumns());
+ }
+
+ /**
+ * Get the pivot columns for the relation.
+ *
+ * @return array
+ */
+ protected function getAliasedPivotColumns()
+ {
+ $defaults = [$this->foreignKey, $this->otherKey];
+
+ // We need to alias all of the pivot columns with the "pivot_" prefix so we
+ // can easily extract them out of the models and put them into the pivot
+ // relationships when they are retrieved and hydrated into the models.
+ $columns = [];
+
+ foreach (array_merge($defaults, $this->pivotColumns) as $column) {
+ $columns[] = $this->table.'.'.$column.' as pivot_'.$column;
+ }
+
+ return array_unique($columns);
+ }
+
+ /**
+ * Determine whether the given column is defined as a pivot column.
+ *
+ * @param string $column
+ * @return bool
+ */
+ protected function hasPivotColumn($column)
+ {
+ return in_array($column, $this->pivotColumns);
+ }
+
+ /**
+ * Set the join clause for the relation query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder|null $query
+ * @return $this
+ */
+ protected function setJoin($query = null)
+ {
+ $query = $query ?: $this->query;
+
+ // We need to join to the intermediate table on the related model's primary
+ // key column with the intermediate table's foreign key for the related
+ // model instance. Then we can set the "where" for the parent models.
+ $baseTable = $this->related->getTable();
+
+ $key = $baseTable.'.'.$this->related->getKeyName();
+
+ $query->join($this->table, $key, '=', $this->getOtherKey());
+
+ return $this;
+ }
+
+ /**
+ * Set the where clause for the relation query.
+ *
+ * @return $this
+ */
+ protected function setWhere()
+ {
+ $foreign = $this->getForeignKey();
+
+ $this->query->where($foreign, '=', $this->parent->getKey());
+
+ return $this;
+ }
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ public function addEagerConstraints(array $models)
+ {
+ $this->query->whereIn($this->getForeignKey(), $this->getKeys($models));
+ }
+
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ public function initRelation(array $models, $relation)
+ {
+ foreach ($models as $model) {
+ $model->setRelation($relation, $this->related->newCollection());
+ }
+
+ return $models;
+ }
+
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ $dictionary = $this->buildDictionary($results);
+
+ // Once we have an array dictionary of child objects we can easily match the
+ // children back to their parent using the dictionary and the keys on the
+ // the parent models. Then we will return the hydrated models back out.
+ foreach ($models as $model) {
+ if (isset($dictionary[$key = $model->getKey()])) {
+ $collection = $this->related->newCollection($dictionary[$key]);
+
+ $model->setRelation($relation, $collection);
+ }
+ }
+
+ return $models;
+ }
+
+ /**
+ * Build model dictionary keyed by the relation's foreign key.
+ *
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @return array
+ */
+ protected function buildDictionary(Collection $results)
+ {
+ $foreign = $this->foreignKey;
+
+ // First we will build a dictionary of child models keyed by the foreign key
+ // of the relation so that we will easily and quickly match them to their
+ // parents without having a possibly slow inner loops for every models.
+ $dictionary = [];
+
+ foreach ($results as $result) {
+ $dictionary[$result->pivot->$foreign][] = $result;
+ }
+
+ return $dictionary;
+ }
+
+ /**
+ * Touch all of the related models for the relationship.
+ *
+ * E.g.: Touch all roles associated with this user.
+ *
+ * @return void
+ */
+ public function touch()
+ {
+ $key = $this->getRelated()->getKeyName();
+
+ $columns = $this->getRelatedFreshUpdate();
+
+ // If we actually have IDs for the relation, we will run the query to update all
+ // the related model's timestamps, to make sure these all reflect the changes
+ // to the parent models. This will help us keep any caching synced up here.
+ $ids = $this->getRelatedIds();
+
+ if (count($ids) > 0) {
+ $this->getRelated()->newQuery()->whereIn($key, $ids)->update($columns);
+ }
+ }
+
+ /**
+ * Get all of the IDs for the related models.
+ *
+ * @return \Illuminate\Support\Collection
+ */
+ public function getRelatedIds()
+ {
+ $related = $this->getRelated();
+
+ $fullKey = $related->getQualifiedKeyName();
+
+ return $this->getQuery()->select($fullKey)->lists($related->getKeyName());
+ }
+
+ /**
+ * Save a new model and attach it to the parent model.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @param array $joining
+ * @param bool $touch
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function save(Model $model, array $joining = [], $touch = true)
+ {
+ $model->save(['touch' => false]);
+
+ $this->attach($model->getKey(), $joining, $touch);
+
+ return $model;
+ }
+
+ /**
+ * Save an array of new models and attach them to the parent model.
+ *
+ * @param \Illuminate\Support\Collection|array $models
+ * @param array $joinings
+ * @return array
+ */
+ public function saveMany($models, array $joinings = [])
+ {
+ foreach ($models as $key => $model) {
+ $this->save($model, (array) Arr::get($joinings, $key), false);
+ }
+
+ $this->touchIfTouching();
+
+ return $models;
+ }
+
+ /**
+ * Find a related model by its primary key.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|null
+ */
+ public function find($id, $columns = ['*'])
+ {
+ if (is_array($id)) {
+ return $this->findMany($id, $columns);
+ }
+
+ $this->where($this->getRelated()->getQualifiedKeyName(), '=', $id);
+
+ return $this->first($columns);
+ }
+
+ /**
+ * Find multiple related models by their primary keys.
+ *
+ * @param mixed $ids
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public function findMany($ids, $columns = ['*'])
+ {
+ if (empty($ids)) {
+ return $this->getRelated()->newCollection();
+ }
+
+ $this->whereIn($this->getRelated()->getQualifiedKeyName(), $ids);
+
+ return $this->get($columns);
+ }
+
+ /**
+ * Find a related model by its primary key or throw an exception.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection
+ *
+ * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+ */
+ public function findOrFail($id, $columns = ['*'])
+ {
+ $result = $this->find($id, $columns);
+
+ if (is_array($id)) {
+ if (count($result) == count(array_unique($id))) {
+ return $result;
+ }
+ } elseif (! is_null($result)) {
+ return $result;
+ }
+
+ throw (new ModelNotFoundException)->setModel(get_class($this->parent));
+ }
+
+ /**
+ * Find a related model by its primary key or return new instance of the related model.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model
+ */
+ public function findOrNew($id, $columns = ['*'])
+ {
+ if (is_null($instance = $this->find($id, $columns))) {
+ $instance = $this->getRelated()->newInstance();
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Get the first related model record matching the attributes or instantiate it.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrNew(array $attributes)
+ {
+ if (is_null($instance = $this->where($attributes)->first())) {
+ $instance = $this->related->newInstance($attributes);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Get the first related record matching the attributes or create it.
+ *
+ * @param array $attributes
+ * @param array $joining
+ * @param bool $touch
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrCreate(array $attributes, array $joining = [], $touch = true)
+ {
+ if (is_null($instance = $this->where($attributes)->first())) {
+ $instance = $this->create($attributes, $joining, $touch);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Create or update a related record matching the attributes, and fill it with values.
+ *
+ * @param array $attributes
+ * @param array $values
+ * @param array $joining
+ * @param bool $touch
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function updateOrCreate(array $attributes, array $values = [], array $joining = [], $touch = true)
+ {
+ if (is_null($instance = $this->where($attributes)->first())) {
+ return $this->create($values, $joining, $touch);
+ }
+
+ $instance->fill($values);
+
+ $instance->save(['touch' => false]);
+
+ return $instance;
+ }
+
+ /**
+ * Create a new instance of the related model.
+ *
+ * @param array $attributes
+ * @param array $joining
+ * @param bool $touch
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function create(array $attributes, array $joining = [], $touch = true)
+ {
+ $instance = $this->related->newInstance($attributes);
+
+ // Once we save the related model, we need to attach it to the base model via
+ // through intermediate table so we'll use the existing "attach" method to
+ // accomplish this which will insert the record and any more attributes.
+ $instance->save(['touch' => false]);
+
+ $this->attach($instance->getKey(), $joining, $touch);
+
+ return $instance;
+ }
+
+ /**
+ * Create an array of new instances of the related models.
+ *
+ * @param array $records
+ * @param array $joinings
+ * @return array
+ */
+ public function createMany(array $records, array $joinings = [])
+ {
+ $instances = [];
+
+ foreach ($records as $key => $record) {
+ $instances[] = $this->create($record, (array) Arr::get($joinings, $key), false);
+ }
+
+ $this->touchIfTouching();
+
+ return $instances;
+ }
+
+ /**
+ * Sync the intermediate tables with a list of IDs or collection of models.
+ *
+ * @param \Illuminate\Database\Eloquent\Collection|array $ids
+ * @param bool $detaching
+ * @return array
+ */
+ public function sync($ids, $detaching = true)
+ {
+ $changes = [
+ 'attached' => [], 'detached' => [], 'updated' => [],
+ ];
+
+ if ($ids instanceof Collection) {
+ $ids = $ids->modelKeys();
+ }
+
+ // First we need to attach any of the associated models that are not currently
+ // in this joining table. We'll spin through the given IDs, checking to see
+ // if they exist in the array of current ones, and if not we will insert.
+ $current = $this->newPivotQuery()->lists($this->otherKey);
+
+ $records = $this->formatSyncList($ids);
+
+ $detach = array_diff($current, array_keys($records));
+
+ // Next, we will take the differences of the currents and given IDs and detach
+ // all of the entities that exist in the "current" array but are not in the
+ // the array of the IDs given to the method which will complete the sync.
+ if ($detaching && count($detach) > 0) {
+ $this->detach($detach);
+
+ $changes['detached'] = (array) array_map(function ($v) {
+ return is_numeric($v) ? (int) $v : (string) $v;
+ }, $detach);
+ }
+
+ // Now we are finally ready to attach the new records. Note that we'll disable
+ // touching until after the entire operation is complete so we don't fire a
+ // ton of touch operations until we are totally done syncing the records.
+ $changes = array_merge(
+ $changes, $this->attachNew($records, $current, false)
+ );
+
+ if (count($changes['attached']) || count($changes['updated'])) {
+ $this->touchIfTouching();
+ }
+
+ return $changes;
+ }
+
+ /**
+ * Format the sync list so that it is keyed by ID.
+ *
+ * @param array $records
+ * @return array
+ */
+ protected function formatSyncList(array $records)
+ {
+ $results = [];
+
+ foreach ($records as $id => $attributes) {
+ if (! is_array($attributes)) {
+ list($id, $attributes) = [$attributes, []];
+ }
+
+ $results[$id] = $attributes;
+ }
+
+ return $results;
+ }
+
+ /**
+ * Attach all of the IDs that aren't in the current array.
+ *
+ * @param array $records
+ * @param array $current
+ * @param bool $touch
+ * @return array
+ */
+ protected function attachNew(array $records, array $current, $touch = true)
+ {
+ $changes = ['attached' => [], 'updated' => []];
+
+ foreach ($records as $id => $attributes) {
+ // If the ID is not in the list of existing pivot IDs, we will insert a new pivot
+ // record, otherwise, we will just update this existing record on this joining
+ // table, so that the developers will easily update these records pain free.
+ if (! in_array($id, $current)) {
+ $this->attach($id, $attributes, $touch);
+
+ $changes['attached'][] = is_numeric($id) ? (int) $id : (string) $id;
+ }
+
+ // Now we'll try to update an existing pivot record with the attributes that were
+ // given to the method. If the model is actually updated we will add it to the
+ // list of updated pivot records so we return them back out to the consumer.
+ elseif (count($attributes) > 0 &&
+ $this->updateExistingPivot($id, $attributes, $touch)) {
+ $changes['updated'][] = is_numeric($id) ? (int) $id : (string) $id;
+ }
+ }
+
+ return $changes;
+ }
+
+ /**
+ * Update an existing pivot record on the table.
+ *
+ * @param mixed $id
+ * @param array $attributes
+ * @param bool $touch
+ * @return int
+ */
+ public function updateExistingPivot($id, array $attributes, $touch = true)
+ {
+ if (in_array($this->updatedAt(), $this->pivotColumns)) {
+ $attributes = $this->setTimestampsOnAttach($attributes, true);
+ }
+
+ $updated = $this->newPivotStatementForId($id)->update($attributes);
+
+ if ($touch) {
+ $this->touchIfTouching();
+ }
+
+ return $updated;
+ }
+
+ /**
+ * Attach a model to the parent.
+ *
+ * @param mixed $id
+ * @param array $attributes
+ * @param bool $touch
+ * @return void
+ */
+ public function attach($id, array $attributes = [], $touch = true)
+ {
+ if ($id instanceof Model) {
+ $id = $id->getKey();
+ }
+
+ $query = $this->newPivotStatement();
+
+ $query->insert($this->createAttachRecords((array) $id, $attributes));
+
+ if ($touch) {
+ $this->touchIfTouching();
+ }
+ }
+
+ /**
+ * Create an array of records to insert into the pivot table.
+ *
+ * @param array $ids
+ * @param array $attributes
+ * @return array
+ */
+ protected function createAttachRecords($ids, array $attributes)
+ {
+ $records = [];
+
+ $timed = ($this->hasPivotColumn($this->createdAt()) ||
+ $this->hasPivotColumn($this->updatedAt()));
+
+ // To create the attachment records, we will simply spin through the IDs given
+ // and create a new record to insert for each ID. Each ID may actually be a
+ // key in the array, with extra attributes to be placed in other columns.
+ foreach ($ids as $key => $value) {
+ $records[] = $this->attacher($key, $value, $attributes, $timed);
+ }
+
+ return $records;
+ }
+
+ /**
+ * Create a full attachment record payload.
+ *
+ * @param int $key
+ * @param mixed $value
+ * @param array $attributes
+ * @param bool $timed
+ * @return array
+ */
+ protected function attacher($key, $value, $attributes, $timed)
+ {
+ list($id, $extra) = $this->getAttachId($key, $value, $attributes);
+
+ // To create the attachment records, we will simply spin through the IDs given
+ // and create a new record to insert for each ID. Each ID may actually be a
+ // key in the array, with extra attributes to be placed in other columns.
+ $record = $this->createAttachRecord($id, $timed);
+
+ return array_merge($record, $extra);
+ }
+
+ /**
+ * Get the attach record ID and extra attributes.
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @param array $attributes
+ * @return array
+ */
+ protected function getAttachId($key, $value, array $attributes)
+ {
+ if (is_array($value)) {
+ return [$key, array_merge($value, $attributes)];
+ }
+
+ return [$value, $attributes];
+ }
+
+ /**
+ * Create a new pivot attachment record.
+ *
+ * @param int $id
+ * @param bool $timed
+ * @return array
+ */
+ protected function createAttachRecord($id, $timed)
+ {
+ $record[$this->foreignKey] = $this->parent->getKey();
+
+ $record[$this->otherKey] = $id;
+
+ // If the record needs to have creation and update timestamps, we will make
+ // them by calling the parent model's "freshTimestamp" method which will
+ // provide us with a fresh timestamp in this model's preferred format.
+ if ($timed) {
+ $record = $this->setTimestampsOnAttach($record);
+ }
+
+ return $record;
+ }
+
+ /**
+ * Set the creation and update timestamps on an attach record.
+ *
+ * @param array $record
+ * @param bool $exists
+ * @return array
+ */
+ protected function setTimestampsOnAttach(array $record, $exists = false)
+ {
+ $fresh = $this->parent->freshTimestamp();
+
+ if (! $exists && $this->hasPivotColumn($this->createdAt())) {
+ $record[$this->createdAt()] = $fresh;
+ }
+
+ if ($this->hasPivotColumn($this->updatedAt())) {
+ $record[$this->updatedAt()] = $fresh;
+ }
+
+ return $record;
+ }
+
+ /**
+ * Detach models from the relationship.
+ *
+ * @param int|array $ids
+ * @param bool $touch
+ * @return int
+ */
+ public function detach($ids = [], $touch = true)
+ {
+ if ($ids instanceof Model) {
+ $ids = (array) $ids->getKey();
+ }
+
+ $query = $this->newPivotQuery();
+
+ // If associated IDs were passed to the method we will only delete those
+ // associations, otherwise all of the association ties will be broken.
+ // We'll return the numbers of affected rows when we do the deletes.
+ $ids = (array) $ids;
+
+ if (count($ids) > 0) {
+ $query->whereIn($this->otherKey, (array) $ids);
+ }
+
+ // Once we have all of the conditions set on the statement, we are ready
+ // to run the delete on the pivot table. Then, if the touch parameter
+ // is true, we will go ahead and touch all related models to sync.
+ $results = $query->delete();
+
+ if ($touch) {
+ $this->touchIfTouching();
+ }
+
+ return $results;
+ }
+
+ /**
+ * If we're touching the parent model, touch.
+ *
+ * @return void
+ */
+ public function touchIfTouching()
+ {
+ if ($this->touchingParent()) {
+ $this->getParent()->touch();
+ }
+
+ if ($this->getParent()->touches($this->relationName)) {
+ $this->touch();
+ }
+ }
+
+ /**
+ * Determine if we should touch the parent on sync.
+ *
+ * @return bool
+ */
+ protected function touchingParent()
+ {
+ return $this->getRelated()->touches($this->guessInverseRelation());
+ }
+
+ /**
+ * Attempt to guess the name of the inverse of the relation.
+ *
+ * @return string
+ */
+ protected function guessInverseRelation()
+ {
+ return Str::camel(Str::plural(class_basename($this->getParent())));
+ }
+
+ /**
+ * Create a new query builder for the pivot table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function newPivotQuery()
+ {
+ $query = $this->newPivotStatement();
+
+ foreach ($this->pivotWheres as $whereArgs) {
+ call_user_func_array([$query, 'where'], $whereArgs);
+ }
+
+ return $query->where($this->foreignKey, $this->parent->getKey());
+ }
+
+ /**
+ * Get a new plain query builder for the pivot table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function newPivotStatement()
+ {
+ return $this->query->getQuery()->newQuery()->from($this->table);
+ }
+
+ /**
+ * Get a new pivot statement for a given "other" ID.
+ *
+ * @param mixed $id
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function newPivotStatementForId($id)
+ {
+ return $this->newPivotQuery()->where($this->otherKey, $id);
+ }
+
+ /**
+ * Create a new pivot model instance.
+ *
+ * @param array $attributes
+ * @param bool $exists
+ * @return \Illuminate\Database\Eloquent\Relations\Pivot
+ */
+ public function newPivot(array $attributes = [], $exists = false)
+ {
+ $pivot = $this->related->newPivot($this->parent, $attributes, $this->table, $exists);
+
+ return $pivot->setPivotKeys($this->foreignKey, $this->otherKey);
+ }
+
+ /**
+ * Create a new existing pivot model instance.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Relations\Pivot
+ */
+ public function newExistingPivot(array $attributes = [])
+ {
+ return $this->newPivot($attributes, true);
+ }
+
+ /**
+ * Set the columns on the pivot table to retrieve.
+ *
+ * @param array|mixed $columns
+ * @return $this
+ */
+ public function withPivot($columns)
+ {
+ $columns = is_array($columns) ? $columns : func_get_args();
+
+ $this->pivotColumns = array_merge($this->pivotColumns, $columns);
+
+ return $this;
+ }
+
+ /**
+ * Specify that the pivot table has creation and update timestamps.
+ *
+ * @param mixed $createdAt
+ * @param mixed $updatedAt
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+ */
+ public function withTimestamps($createdAt = null, $updatedAt = null)
+ {
+ $this->pivotCreatedAt = $createdAt;
+ $this->pivotUpdatedAt = $updatedAt;
+
+ return $this->withPivot($this->createdAt(), $this->updatedAt());
+ }
+
+ /**
+ * Get the name of the "created at" column.
+ *
+ * @return string
+ */
+ public function createdAt()
+ {
+ return $this->pivotCreatedAt ?: $this->parent->getCreatedAtColumn();
+ }
+
+ /**
+ * Get the name of the "updated at" column.
+ *
+ * @return string
+ */
+ public function updatedAt()
+ {
+ return $this->pivotUpdatedAt ?: $this->parent->getUpdatedAtColumn();
+ }
+
+ /**
+ * Get the related model's updated at column name.
+ *
+ * @return string
+ */
+ public function getRelatedFreshUpdate()
+ {
+ return [$this->related->getUpdatedAtColumn() => $this->related->freshTimestamp()];
+ }
+
+ /**
+ * Get the key for comparing against the parent key in "has" query.
+ *
+ * @return string
+ */
+ public function getHasCompareKey()
+ {
+ return $this->getForeignKey();
+ }
+
+ /**
+ * Get the fully qualified foreign key for the relation.
+ *
+ * @return string
+ */
+ public function getForeignKey()
+ {
+ return $this->table.'.'.$this->foreignKey;
+ }
+
+ /**
+ * Get the fully qualified "other key" for the relation.
+ *
+ * @return string
+ */
+ public function getOtherKey()
+ {
+ return $this->table.'.'.$this->otherKey;
+ }
+
+ /**
+ * Get the intermediate table for the relationship.
+ *
+ * @return string
+ */
+ public function getTable()
+ {
+ return $this->table;
+ }
+
+ /**
+ * Get the relationship name for the relationship.
+ *
+ * @return string
+ */
+ public function getRelationName()
+ {
+ return $this->relationName;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php
index 159a658..6149e47 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php
@@ -1,47 +1,47 @@
-query->get();
- }
+use Illuminate\Database\Eloquent\Collection;
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- public function initRelation(array $models, $relation)
- {
- foreach ($models as $model)
- {
- $model->setRelation($relation, $this->related->newCollection());
- }
+class HasMany extends HasOneOrMany
+{
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ return $this->query->get();
+ }
- return $models;
- }
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ public function initRelation(array $models, $relation)
+ {
+ foreach ($models as $model) {
+ $model->setRelation($relation, $this->related->newCollection());
+ }
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- return $this->matchMany($models, $results, $relation);
- }
+ return $models;
+ }
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ return $this->matchMany($models, $results, $relation);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
index 220a095..2ae4eea 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -1,340 +1,410 @@
-firstKey = $firstKey;
- $this->secondKey = $secondKey;
- $this->farParent = $farParent;
-
- parent::__construct($query, $parent);
- }
-
- /**
- * Set the base constraints on the relation query.
- *
- * @return void
- */
- public function addConstraints()
- {
- $parentTable = $this->parent->getTable();
-
- $this->setJoin();
-
- if (static::$constraints)
- {
- $this->query->where($parentTable.'.'.$this->firstKey, '=', $this->farParent->getKey());
- }
- }
-
- /**
- * Add the constraints for a relationship count query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQuery(Builder $query, Builder $parent)
- {
- $parentTable = $this->parent->getTable();
-
- $this->setJoin($query);
-
- $query->select(new Expression('count(*)'));
-
- $key = $this->wrap($parentTable.'.'.$this->firstKey);
-
- return $query->where($this->getHasCompareKey(), '=', new Expression($key));
- }
-
- /**
- * Set the join clause on the query.
- *
- * @param \Illuminate\Database\Eloquent\Builder|null $query
- * @return void
- */
- protected function setJoin(Builder $query = null)
- {
- $query = $query ?: $this->query;
-
- $foreignKey = $this->related->getTable().'.'.$this->secondKey;
-
- $query->join($this->parent->getTable(), $this->getQualifiedParentKeyName(), '=', $foreignKey);
-
- if ($this->parentSoftDeletes())
- {
- $query->whereNull($this->parent->getQualifiedDeletedAtColumn());
- }
- }
-
- /**
- * Determine whether close parent of the relation uses Soft Deletes.
- *
- * @return bool
- */
- public function parentSoftDeletes()
- {
- return in_array('Illuminate\Database\Eloquent\SoftDeletes', class_uses_recursive(get_class($this->parent)));
- }
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- public function addEagerConstraints(array $models)
- {
- $table = $this->parent->getTable();
-
- $this->query->whereIn($table.'.'.$this->firstKey, $this->getKeys($models));
- }
-
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- public function initRelation(array $models, $relation)
- {
- foreach ($models as $model)
- {
- $model->setRelation($relation, $this->related->newCollection());
- }
-
- return $models;
- }
-
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- $dictionary = $this->buildDictionary($results);
-
- // Once we have the dictionary we can simply spin through the parent models to
- // link them up with their children using the keyed dictionary to make the
- // matching very convenient and easy work. Then we'll just return them.
- foreach ($models as $model)
- {
- $key = $model->getKey();
-
- if (isset($dictionary[$key]))
- {
- $value = $this->related->newCollection($dictionary[$key]);
-
- $model->setRelation($relation, $value);
- }
- }
-
- return $models;
- }
-
- /**
- * Build model dictionary keyed by the relation's foreign key.
- *
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @return array
- */
- protected function buildDictionary(Collection $results)
- {
- $dictionary = [];
-
- $foreign = $this->firstKey;
-
- // First we will create a dictionary of models keyed by the foreign key of the
- // relationship as this will allow us to quickly access all of the related
- // models without having to do nested looping which will be quite slow.
- foreach ($results as $result)
- {
- $dictionary[$result->{$foreign}][] = $result;
- }
-
- return $dictionary;
- }
-
- /**
- * Get the results of the relationship.
- *
- * @return mixed
- */
- public function getResults()
- {
- return $this->get();
- }
-
- /**
- * Execute the query and get the first related model.
- *
- * @param array $columns
- * @return mixed
- */
- public function first($columns = ['*'])
- {
- $results = $this->take(1)->get($columns);
-
- return count($results) > 0 ? $results->first() : null;
- }
-
- /**
- * Find a related model by its primary key.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|null
- */
- public function find($id, $columns = ['*'])
- {
- if (is_array($id))
- {
- return $this->findMany($id, $columns);
- }
-
- $this->where($this->getRelated()->getQualifiedKeyName(), '=', $id);
-
- return $this->first($columns);
- }
-
- /**
- * Find multiple related models by their primary keys.
- *
- * @param mixed $ids
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public function findMany($ids, $columns = ['*'])
- {
- if (empty($ids)) return $this->getRelated()->newCollection();
-
- $this->whereIn($this->getRelated()->getQualifiedKeyName(), $ids);
-
- return $this->get($columns);
- }
-
- /**
- * Execute the query as a "select" statement.
- *
- * @param array $columns
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public function get($columns = ['*'])
- {
- // First we'll add the proper select columns onto the query so it is run with
- // the proper columns. Then, we will get the results and hydrate out pivot
- // models with the result of those columns as a separate model relation.
- $columns = $this->query->getQuery()->columns ? [] : $columns;
-
- $select = $this->getSelectColumns($columns);
-
- $models = $this->query->addSelect($select)->getModels();
-
- // If we actually found models we will also eager load any relationships that
- // have been specified as needing to be eager loaded. This will solve the
- // n + 1 query problem for the developer and also increase performance.
- if (count($models) > 0)
- {
- $models = $this->query->eagerLoadRelations($models);
- }
-
- return $this->related->newCollection($models);
- }
-
- /**
- * Set the select clause for the relation query.
- *
- * @param array $columns
- * @return array
- */
- protected function getSelectColumns(array $columns = ['*'])
- {
- if ($columns == ['*'])
- {
- $columns = [$this->related->getTable().'.*'];
- }
-
- return array_merge($columns, [$this->parent->getTable().'.'.$this->firstKey]);
- }
-
- /**
- * Get a paginator for the "select" statement.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
- */
- public function paginate($perPage = null, $columns = ['*'])
- {
- $this->query->addSelect($this->getSelectColumns($columns));
-
- return $this->query->paginate($perPage, $columns);
- }
-
- /**
- * Paginate the given query into a simple paginator.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\Paginator
- */
- public function simplePaginate($perPage = null, $columns = ['*'])
- {
- $this->query->addSelect($this->getSelectColumns($columns));
-
- return $this->query->simplePaginate($perPage, $columns);
- }
-
- /**
- * Get the key for comparing against the parent key in "has" query.
- *
- * @return string
- */
- public function getHasCompareKey()
- {
- return $this->farParent->getQualifiedKeyName();
- }
-
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class HasManyThrough extends Relation
+{
+ /**
+ * The distance parent model instance.
+ *
+ * @var \Illuminate\Database\Eloquent\Model
+ */
+ protected $farParent;
+
+ /**
+ * The near key on the relationship.
+ *
+ * @var string
+ */
+ protected $firstKey;
+
+ /**
+ * The far key on the relationship.
+ *
+ * @var string
+ */
+ protected $secondKey;
+
+ /**
+ * The local key on the relationship.
+ *
+ * @var string
+ */
+ protected $localKey;
+
+ /**
+ * Create a new has many through relationship instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $farParent
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param string $firstKey
+ * @param string $secondKey
+ * @param string $localKey
+ * @return void
+ */
+ public function __construct(Builder $query, Model $farParent, Model $parent, $firstKey, $secondKey, $localKey)
+ {
+ $this->localKey = $localKey;
+ $this->firstKey = $firstKey;
+ $this->secondKey = $secondKey;
+ $this->farParent = $farParent;
+
+ parent::__construct($query, $parent);
+ }
+
+ /**
+ * Set the base constraints on the relation query.
+ *
+ * @return void
+ */
+ public function addConstraints()
+ {
+ $parentTable = $this->parent->getTable();
+
+ $localValue = $this->farParent[$this->localKey];
+
+ $this->setJoin();
+
+ if (static::$constraints) {
+ $this->query->where($parentTable.'.'.$this->firstKey, '=', $localValue);
+ }
+ }
+
+ /**
+ * Add the constraints for a relationship count query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQuery(Builder $query, Builder $parent)
+ {
+ $parentTable = $this->parent->getTable();
+
+ $this->setJoin($query);
+
+ $query->select(new Expression('count(*)'));
+
+ $key = $this->wrap($parentTable.'.'.$this->firstKey);
+
+ return $query->where($this->getHasCompareKey(), '=', new Expression($key));
+ }
+
+ /**
+ * Set the join clause on the query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder|null $query
+ * @return void
+ */
+ protected function setJoin(Builder $query = null)
+ {
+ $query = $query ?: $this->query;
+
+ $foreignKey = $this->related->getTable().'.'.$this->secondKey;
+
+ $query->join($this->parent->getTable(), $this->getQualifiedParentKeyName(), '=', $foreignKey);
+
+ if ($this->parentSoftDeletes()) {
+ $query->whereNull($this->parent->getQualifiedDeletedAtColumn());
+ }
+ }
+
+ /**
+ * Determine whether close parent of the relation uses Soft Deletes.
+ *
+ * @return bool
+ */
+ public function parentSoftDeletes()
+ {
+ return in_array('Illuminate\Database\Eloquent\SoftDeletes', class_uses_recursive(get_class($this->parent)));
+ }
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ public function addEagerConstraints(array $models)
+ {
+ $table = $this->parent->getTable();
+
+ $this->query->whereIn($table.'.'.$this->firstKey, $this->getKeys($models));
+ }
+
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ public function initRelation(array $models, $relation)
+ {
+ foreach ($models as $model) {
+ $model->setRelation($relation, $this->related->newCollection());
+ }
+
+ return $models;
+ }
+
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ $dictionary = $this->buildDictionary($results);
+
+ // Once we have the dictionary we can simply spin through the parent models to
+ // link them up with their children using the keyed dictionary to make the
+ // matching very convenient and easy work. Then we'll just return them.
+ foreach ($models as $model) {
+ $key = $model->getKey();
+
+ if (isset($dictionary[$key])) {
+ $value = $this->related->newCollection($dictionary[$key]);
+
+ $model->setRelation($relation, $value);
+ }
+ }
+
+ return $models;
+ }
+
+ /**
+ * Build model dictionary keyed by the relation's foreign key.
+ *
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @return array
+ */
+ protected function buildDictionary(Collection $results)
+ {
+ $dictionary = [];
+
+ $foreign = $this->firstKey;
+
+ // First we will create a dictionary of models keyed by the foreign key of the
+ // relationship as this will allow us to quickly access all of the related
+ // models without having to do nested looping which will be quite slow.
+ foreach ($results as $result) {
+ $dictionary[$result->{$foreign}][] = $result;
+ }
+
+ return $dictionary;
+ }
+
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ return $this->get();
+ }
+
+ /**
+ * Execute the query and get the first related model.
+ *
+ * @param array $columns
+ * @return mixed
+ */
+ public function first($columns = ['*'])
+ {
+ $results = $this->take(1)->get($columns);
+
+ return count($results) > 0 ? $results->first() : null;
+ }
+
+ /**
+ * Execute the query and get the first result or throw an exception.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|static
+ *
+ * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+ */
+ public function firstOrFail($columns = ['*'])
+ {
+ if (! is_null($model = $this->first($columns))) {
+ return $model;
+ }
+
+ throw new ModelNotFoundException;
+ }
+
+ /**
+ * Find a related model by its primary key.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|null
+ */
+ public function find($id, $columns = ['*'])
+ {
+ if (is_array($id)) {
+ return $this->findMany($id, $columns);
+ }
+
+ $this->where($this->getRelated()->getQualifiedKeyName(), '=', $id);
+
+ return $this->first($columns);
+ }
+
+ /**
+ * Find multiple related models by their primary keys.
+ *
+ * @param mixed $ids
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public function findMany($ids, $columns = ['*'])
+ {
+ if (empty($ids)) {
+ return $this->getRelated()->newCollection();
+ }
+
+ $this->whereIn($this->getRelated()->getQualifiedKeyName(), $ids);
+
+ return $this->get($columns);
+ }
+
+ /**
+ * Find a related model by its primary key or throw an exception.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection
+ *
+ * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+ */
+ public function findOrFail($id, $columns = ['*'])
+ {
+ $result = $this->find($id, $columns);
+
+ if (is_array($id)) {
+ if (count($result) == count(array_unique($id))) {
+ return $result;
+ }
+ } elseif (! is_null($result)) {
+ return $result;
+ }
+
+ throw (new ModelNotFoundException)->setModel(get_class($this->parent));
+ }
+
+ /**
+ * Execute the query as a "select" statement.
+ *
+ * @param array $columns
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public function get($columns = ['*'])
+ {
+ // First we'll add the proper select columns onto the query so it is run with
+ // the proper columns. Then, we will get the results and hydrate out pivot
+ // models with the result of those columns as a separate model relation.
+ $columns = $this->query->getQuery()->columns ? [] : $columns;
+
+ $select = $this->getSelectColumns($columns);
+
+ $models = $this->query->addSelect($select)->getModels();
+
+ // If we actually found models we will also eager load any relationships that
+ // have been specified as needing to be eager loaded. This will solve the
+ // n + 1 query problem for the developer and also increase performance.
+ if (count($models) > 0) {
+ $models = $this->query->eagerLoadRelations($models);
+ }
+
+ return $this->related->newCollection($models);
+ }
+
+ /**
+ * Set the select clause for the relation query.
+ *
+ * @param array $columns
+ * @return array
+ */
+ protected function getSelectColumns(array $columns = ['*'])
+ {
+ if ($columns == ['*']) {
+ $columns = [$this->related->getTable().'.*'];
+ }
+
+ return array_merge($columns, [$this->parent->getTable().'.'.$this->firstKey]);
+ }
+
+ /**
+ * Get a paginator for the "select" statement.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @param int $page
+ * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+ */
+ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)
+ {
+ $this->query->addSelect($this->getSelectColumns($columns));
+
+ return $this->query->paginate($perPage, $columns, $pageName, $page);
+ }
+
+ /**
+ * Paginate the given query into a simple paginator.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @return \Illuminate\Contracts\Pagination\Paginator
+ */
+ public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page')
+ {
+ $this->query->addSelect($this->getSelectColumns($columns));
+
+ return $this->query->simplePaginate($perPage, $columns, $pageName);
+ }
+
+ /**
+ * Get the key for comparing against the parent key in "has" query.
+ *
+ * @return string
+ */
+ public function getHasCompareKey()
+ {
+ return $this->farParent->getQualifiedKeyName();
+ }
+
+ /**
+ * Get the qualified foreign key on the related model.
+ *
+ * @return string
+ */
+ public function getForeignKey()
+ {
+ return $this->related->getTable().'.'.$this->secondKey;
+ }
+
+ /**
+ * Get the qualified foreign key on the "through" model.
+ *
+ * @return string
+ */
+ public function getThroughKey()
+ {
+ return $this->parent->getTable().'.'.$this->firstKey;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOne.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOne.php
index fd0f9a0..52ad2a6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOne.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOne.php
@@ -1,47 +1,47 @@
-query->first();
- }
+use Illuminate\Database\Eloquent\Collection;
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- public function initRelation(array $models, $relation)
- {
- foreach ($models as $model)
- {
- $model->setRelation($relation, null);
- }
+class HasOne extends HasOneOrMany
+{
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ return $this->query->first();
+ }
- return $models;
- }
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ public function initRelation(array $models, $relation)
+ {
+ foreach ($models as $model) {
+ $model->setRelation($relation, null);
+ }
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- return $this->matchOne($models, $results, $relation);
- }
+ return $models;
+ }
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ return $this->matchOne($models, $results, $relation);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
index 475b10d..dcf4de6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -1,410 +1,405 @@
-localKey = $localKey;
- $this->foreignKey = $foreignKey;
-
- parent::__construct($query, $parent);
- }
-
- /**
- * Set the base constraints on the relation query.
- *
- * @return void
- */
- public function addConstraints()
- {
- if (static::$constraints)
- {
- $this->query->where($this->foreignKey, '=', $this->getParentKey());
-
- $this->query->whereNotNull($this->foreignKey);
- }
- }
-
- /**
- * Add the constraints for a relationship count query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQuery(Builder $query, Builder $parent)
- {
- if ($parent->getQuery()->from == $query->getQuery()->from)
- {
- return $this->getRelationCountQueryForSelfRelation($query, $parent);
- }
-
- return parent::getRelationCountQuery($query, $parent);
- }
-
- /**
- * Add the constraints for a relationship count query on the same table.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQueryForSelfRelation(Builder $query, Builder $parent)
- {
- $query->select(new Expression('count(*)'));
-
- $query->from($query->getModel()->getTable().' as '.$hash = $this->getRelationCountHash());
-
- $key = $this->wrap($this->getQualifiedParentKeyName());
-
- return $query->where($hash.'.'.$this->getPlainForeignKey(), '=', new Expression($key));
- }
-
- /**
- * Get a relationship join table hash.
- *
- * @return string
- */
- public function getRelationCountHash()
- {
- return 'self_'.md5(microtime(true));
- }
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- public function addEagerConstraints(array $models)
- {
- $this->query->whereIn($this->foreignKey, $this->getKeys($models, $this->localKey));
- }
-
- /**
- * Match the eagerly loaded results to their single parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function matchOne(array $models, Collection $results, $relation)
- {
- return $this->matchOneOrMany($models, $results, $relation, 'one');
- }
-
- /**
- * Match the eagerly loaded results to their many parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function matchMany(array $models, Collection $results, $relation)
- {
- return $this->matchOneOrMany($models, $results, $relation, 'many');
- }
-
- /**
- * Match the eagerly loaded results to their many parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @param string $type
- * @return array
- */
- protected function matchOneOrMany(array $models, Collection $results, $relation, $type)
- {
- $dictionary = $this->buildDictionary($results);
-
- // Once we have the dictionary we can simply spin through the parent models to
- // link them up with their children using the keyed dictionary to make the
- // matching very convenient and easy work. Then we'll just return them.
- foreach ($models as $model)
- {
- $key = $model->getAttribute($this->localKey);
-
- if (isset($dictionary[$key]))
- {
- $value = $this->getRelationValue($dictionary, $key, $type);
-
- $model->setRelation($relation, $value);
- }
- }
-
- return $models;
- }
-
- /**
- * Get the value of a relationship by one or many type.
- *
- * @param array $dictionary
- * @param string $key
- * @param string $type
- * @return mixed
- */
- protected function getRelationValue(array $dictionary, $key, $type)
- {
- $value = $dictionary[$key];
-
- return $type == 'one' ? reset($value) : $this->related->newCollection($value);
- }
-
- /**
- * Build model dictionary keyed by the relation's foreign key.
- *
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @return array
- */
- protected function buildDictionary(Collection $results)
- {
- $dictionary = array();
-
- $foreign = $this->getPlainForeignKey();
-
- // First we will create a dictionary of models keyed by the foreign key of the
- // relationship as this will allow us to quickly access all of the related
- // models without having to do nested looping which will be quite slow.
- foreach ($results as $result)
- {
- $dictionary[$result->{$foreign}][] = $result;
- }
-
- return $dictionary;
- }
-
- /**
- * Attach a model instance to the parent model.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function save(Model $model)
- {
- $model->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
-
- return $model->save() ? $model : false;
- }
-
- /**
- * Attach an array of models to the parent instance.
- *
- * @param array $models
- * @return array
- */
- public function saveMany(array $models)
- {
- array_walk($models, array($this, 'save'));
-
- return $models;
- }
-
- /**
- * Find a model by its primary key or return new instance of the related model.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model
- */
- public function findOrNew($id, $columns = ['*'])
- {
- if (is_null($instance = $this->find($id, $columns)))
- {
- $instance = $this->related->newInstance();
-
- $instance->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
- }
-
- return $instance;
- }
-
- /**
- * Get the first related model record matching the attributes or instantiate it.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function firstOrNew(array $attributes)
- {
- if (is_null($instance = $this->where($attributes)->first()))
- {
- $instance = $this->related->newInstance($attributes);
-
- $instance->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
- }
-
- return $instance;
- }
-
- /**
- * Get the first related record matching the attributes or create it.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function firstOrCreate(array $attributes)
- {
- if (is_null($instance = $this->where($attributes)->first()))
- {
- $instance = $this->create($attributes);
- }
-
- return $instance;
- }
-
- /**
- * Create or update a related record matching the attributes, and fill it with values.
- *
- * @param array $attributes
- * @param array $values
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function updateOrCreate(array $attributes, array $values = [])
- {
- $instance = $this->firstOrNew($attributes);
-
- $instance->fill($values);
-
- $instance->save();
-
- return $instance;
- }
-
- /**
- * Create a new instance of the related model.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function create(array $attributes)
- {
- // Here we will set the raw attributes to avoid hitting the "fill" method so
- // that we do not have to worry about a mass accessor rules blocking sets
- // on the models. Otherwise, some of these attributes will not get set.
- $instance = $this->related->newInstance($attributes);
-
- $instance->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
-
- $instance->save();
-
- return $instance;
- }
-
- /**
- * Create an array of new instances of the related model.
- *
- * @param array $records
- * @return array
- */
- public function createMany(array $records)
- {
- $instances = array();
-
- foreach ($records as $record)
- {
- $instances[] = $this->create($record);
- }
-
- return $instances;
- }
-
- /**
- * Perform an update on all the related models.
- *
- * @param array $attributes
- * @return int
- */
- public function update(array $attributes)
- {
- if ($this->related->usesTimestamps())
- {
- $attributes[$this->relatedUpdatedAt()] = $this->related->freshTimestampString();
- }
-
- return $this->query->update($attributes);
- }
-
- /**
- * Get the key for comparing against the parent key in "has" query.
- *
- * @return string
- */
- public function getHasCompareKey()
- {
- return $this->getForeignKey();
- }
-
- /**
- * Get the foreign key for the relationship.
- *
- * @return string
- */
- public function getForeignKey()
- {
- return $this->foreignKey;
- }
-
- /**
- * Get the plain foreign key.
- *
- * @return string
- */
- public function getPlainForeignKey()
- {
- $segments = explode('.', $this->getForeignKey());
-
- return $segments[count($segments) - 1];
- }
-
- /**
- * Get the key value of the parent's local key.
- *
- * @return mixed
- */
- public function getParentKey()
- {
- return $this->parent->getAttribute($this->localKey);
- }
-
- /**
- * Get the fully qualified parent key name.
- *
- * @return string
- */
- public function getQualifiedParentKeyName()
- {
- return $this->parent->getTable().'.'.$this->localKey;
- }
-
+abstract class HasOneOrMany extends Relation
+{
+ /**
+ * The foreign key of the parent model.
+ *
+ * @var string
+ */
+ protected $foreignKey;
+
+ /**
+ * The local key of the parent model.
+ *
+ * @var string
+ */
+ protected $localKey;
+
+ /**
+ * Create a new has one or many relationship instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param string $foreignKey
+ * @param string $localKey
+ * @return void
+ */
+ public function __construct(Builder $query, Model $parent, $foreignKey, $localKey)
+ {
+ $this->localKey = $localKey;
+ $this->foreignKey = $foreignKey;
+
+ parent::__construct($query, $parent);
+ }
+
+ /**
+ * Set the base constraints on the relation query.
+ *
+ * @return void
+ */
+ public function addConstraints()
+ {
+ if (static::$constraints) {
+ $this->query->where($this->foreignKey, '=', $this->getParentKey());
+
+ $this->query->whereNotNull($this->foreignKey);
+ }
+ }
+
+ /**
+ * Add the constraints for a relationship count query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQuery(Builder $query, Builder $parent)
+ {
+ if ($parent->getQuery()->from == $query->getQuery()->from) {
+ return $this->getRelationCountQueryForSelfRelation($query, $parent);
+ }
+
+ return parent::getRelationCountQuery($query, $parent);
+ }
+
+ /**
+ * Add the constraints for a relationship count query on the same table.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQueryForSelfRelation(Builder $query, Builder $parent)
+ {
+ $query->select(new Expression('count(*)'));
+
+ $query->from($query->getModel()->getTable().' as '.$hash = $this->getRelationCountHash());
+
+ $query->getModel()->setTable($hash);
+
+ $key = $this->wrap($this->getQualifiedParentKeyName());
+
+ return $query->where($hash.'.'.$this->getPlainForeignKey(), '=', new Expression($key));
+ }
+
+ /**
+ * Get a relationship join table hash.
+ *
+ * @return string
+ */
+ public function getRelationCountHash()
+ {
+ return 'self_'.md5(microtime(true));
+ }
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ public function addEagerConstraints(array $models)
+ {
+ $this->query->whereIn($this->foreignKey, $this->getKeys($models, $this->localKey));
+ }
+
+ /**
+ * Match the eagerly loaded results to their single parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function matchOne(array $models, Collection $results, $relation)
+ {
+ return $this->matchOneOrMany($models, $results, $relation, 'one');
+ }
+
+ /**
+ * Match the eagerly loaded results to their many parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function matchMany(array $models, Collection $results, $relation)
+ {
+ return $this->matchOneOrMany($models, $results, $relation, 'many');
+ }
+
+ /**
+ * Match the eagerly loaded results to their many parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @param string $type
+ * @return array
+ */
+ protected function matchOneOrMany(array $models, Collection $results, $relation, $type)
+ {
+ $dictionary = $this->buildDictionary($results);
+
+ // Once we have the dictionary we can simply spin through the parent models to
+ // link them up with their children using the keyed dictionary to make the
+ // matching very convenient and easy work. Then we'll just return them.
+ foreach ($models as $model) {
+ $key = $model->getAttribute($this->localKey);
+
+ if (isset($dictionary[$key])) {
+ $value = $this->getRelationValue($dictionary, $key, $type);
+
+ $model->setRelation($relation, $value);
+ }
+ }
+
+ return $models;
+ }
+
+ /**
+ * Get the value of a relationship by one or many type.
+ *
+ * @param array $dictionary
+ * @param string $key
+ * @param string $type
+ * @return mixed
+ */
+ protected function getRelationValue(array $dictionary, $key, $type)
+ {
+ $value = $dictionary[$key];
+
+ return $type == 'one' ? reset($value) : $this->related->newCollection($value);
+ }
+
+ /**
+ * Build model dictionary keyed by the relation's foreign key.
+ *
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @return array
+ */
+ protected function buildDictionary(Collection $results)
+ {
+ $dictionary = [];
+
+ $foreign = $this->getPlainForeignKey();
+
+ // First we will create a dictionary of models keyed by the foreign key of the
+ // relationship as this will allow us to quickly access all of the related
+ // models without having to do nested looping which will be quite slow.
+ foreach ($results as $result) {
+ $dictionary[$result->{$foreign}][] = $result;
+ }
+
+ return $dictionary;
+ }
+
+ /**
+ * Attach a model instance to the parent model.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return \Illuminate\Database\Eloquent\Model|false
+ */
+ public function save(Model $model)
+ {
+ $model->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
+
+ return $model->save() ? $model : false;
+ }
+
+ /**
+ * Attach a collection of models to the parent instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Collection|array $models
+ * @return \Illuminate\Database\Eloquent\Collection|array
+ */
+ public function saveMany($models)
+ {
+ foreach ($models as $model) {
+ $this->save($model);
+ }
+
+ return $models;
+ }
+
+ /**
+ * Find a model by its primary key or return new instance of the related model.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model
+ */
+ public function findOrNew($id, $columns = ['*'])
+ {
+ if (is_null($instance = $this->find($id, $columns))) {
+ $instance = $this->related->newInstance();
+
+ $instance->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Get the first related model record matching the attributes or instantiate it.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrNew(array $attributes)
+ {
+ if (is_null($instance = $this->where($attributes)->first())) {
+ $instance = $this->related->newInstance($attributes);
+
+ $instance->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Get the first related record matching the attributes or create it.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrCreate(array $attributes)
+ {
+ if (is_null($instance = $this->where($attributes)->first())) {
+ $instance = $this->create($attributes);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Create or update a related record matching the attributes, and fill it with values.
+ *
+ * @param array $attributes
+ * @param array $values
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function updateOrCreate(array $attributes, array $values = [])
+ {
+ $instance = $this->firstOrNew($attributes);
+
+ $instance->fill($values);
+
+ $instance->save();
+
+ return $instance;
+ }
+
+ /**
+ * Create a new instance of the related model.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function create(array $attributes)
+ {
+ // Here we will set the raw attributes to avoid hitting the "fill" method so
+ // that we do not have to worry about a mass accessor rules blocking sets
+ // on the models. Otherwise, some of these attributes will not get set.
+ $instance = $this->related->newInstance($attributes);
+
+ $instance->setAttribute($this->getPlainForeignKey(), $this->getParentKey());
+
+ $instance->save();
+
+ return $instance;
+ }
+
+ /**
+ * Create an array of new instances of the related model.
+ *
+ * @param array $records
+ * @return array
+ */
+ public function createMany(array $records)
+ {
+ $instances = [];
+
+ foreach ($records as $record) {
+ $instances[] = $this->create($record);
+ }
+
+ return $instances;
+ }
+
+ /**
+ * Perform an update on all the related models.
+ *
+ * @param array $attributes
+ * @return int
+ */
+ public function update(array $attributes)
+ {
+ if ($this->related->usesTimestamps()) {
+ $attributes[$this->relatedUpdatedAt()] = $this->related->freshTimestampString();
+ }
+
+ return $this->query->update($attributes);
+ }
+
+ /**
+ * Get the key for comparing against the parent key in "has" query.
+ *
+ * @return string
+ */
+ public function getHasCompareKey()
+ {
+ return $this->getForeignKey();
+ }
+
+ /**
+ * Get the foreign key for the relationship.
+ *
+ * @return string
+ */
+ public function getForeignKey()
+ {
+ return $this->foreignKey;
+ }
+
+ /**
+ * Get the plain foreign key.
+ *
+ * @return string
+ */
+ public function getPlainForeignKey()
+ {
+ $segments = explode('.', $this->getForeignKey());
+
+ return $segments[count($segments) - 1];
+ }
+
+ /**
+ * Get the key value of the parent's local key.
+ *
+ * @return mixed
+ */
+ public function getParentKey()
+ {
+ return $this->parent->getAttribute($this->localKey);
+ }
+
+ /**
+ * Get the fully qualified parent key name.
+ *
+ * @return string
+ */
+ public function getQualifiedParentKeyName()
+ {
+ return $this->parent->getTable().'.'.$this->localKey;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
index 1abdf37..e2a5c5a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
@@ -1,47 +1,47 @@
-query->get();
- }
+use Illuminate\Database\Eloquent\Collection;
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- public function initRelation(array $models, $relation)
- {
- foreach ($models as $model)
- {
- $model->setRelation($relation, $this->related->newCollection());
- }
+class MorphMany extends MorphOneOrMany
+{
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ return $this->query->get();
+ }
- return $models;
- }
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ public function initRelation(array $models, $relation)
+ {
+ foreach ($models as $model) {
+ $model->setRelation($relation, $this->related->newCollection());
+ }
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- return $this->matchMany($models, $results, $relation);
- }
+ return $models;
+ }
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ return $this->matchMany($models, $results, $relation);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOne.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOne.php
index fdebc24..339a68c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOne.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOne.php
@@ -1,47 +1,47 @@
-query->first();
- }
+use Illuminate\Database\Eloquent\Collection;
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- public function initRelation(array $models, $relation)
- {
- foreach ($models as $model)
- {
- $model->setRelation($relation, null);
- }
+class MorphOne extends MorphOneOrMany
+{
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ return $this->query->first();
+ }
- return $models;
- }
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ public function initRelation(array $models, $relation)
+ {
+ foreach ($models as $model) {
+ $model->setRelation($relation, null);
+ }
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- return $this->matchOne($models, $results, $relation);
- }
+ return $models;
+ }
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ return $this->matchOne($models, $results, $relation);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
index 844ed78..658452c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
@@ -1,236 +1,233 @@
-morphType = $type;
-
- $this->morphClass = $parent->getMorphClass();
-
- parent::__construct($query, $parent, $id, $localKey);
- }
-
- /**
- * Set the base constraints on the relation query.
- *
- * @return void
- */
- public function addConstraints()
- {
- if (static::$constraints)
- {
- parent::addConstraints();
-
- $this->query->where($this->morphType, $this->morphClass);
- }
- }
-
- /**
- * Get the relationship count query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQuery(Builder $query, Builder $parent)
- {
- $query = parent::getRelationCountQuery($query, $parent);
-
- return $query->where($this->morphType, $this->morphClass);
- }
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- public function addEagerConstraints(array $models)
- {
- parent::addEagerConstraints($models);
-
- $this->query->where($this->morphType, $this->morphClass);
- }
-
- /**
- * Attach a model instance to the parent model.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function save(Model $model)
- {
- $model->setAttribute($this->getPlainMorphType(), $this->morphClass);
-
- return parent::save($model);
- }
-
- /**
- * Find a related model by its primary key or return new instance of the related model.
- *
- * @param mixed $id
- * @param array $columns
- * @return \Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model
- */
- public function findOrNew($id, $columns = ['*'])
- {
- if (is_null($instance = $this->find($id, $columns)))
- {
- $instance = $this->related->newInstance();
-
- // When saving a polymorphic relationship, we need to set not only the foreign
- // key, but also the foreign key type, which is typically the class name of
- // the parent model. This makes the polymorphic item unique in the table.
- $this->setForeignAttributesForCreate($instance);
- }
-
- return $instance;
- }
-
- /**
- * Get the first related model record matching the attributes or instantiate it.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function firstOrNew(array $attributes)
- {
- if (is_null($instance = $this->where($attributes)->first()))
- {
- $instance = $this->related->newInstance($attributes);
-
- // When saving a polymorphic relationship, we need to set not only the foreign
- // key, but also the foreign key type, which is typically the class name of
- // the parent model. This makes the polymorphic item unique in the table.
- $this->setForeignAttributesForCreate($instance);
- }
-
- return $instance;
- }
-
- /**
- * Get the first related record matching the attributes or create it.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function firstOrCreate(array $attributes)
- {
- if (is_null($instance = $this->where($attributes)->first()))
- {
- $instance = $this->create($attributes);
- }
-
- return $instance;
- }
-
- /**
- * Create or update a related record matching the attributes, and fill it with values.
- *
- * @param array $attributes
- * @param array $values
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function updateOrCreate(array $attributes, array $values = [])
- {
- $instance = $this->firstOrNew($attributes);
-
- $instance->fill($values);
-
- $instance->save();
-
- return $instance;
- }
-
- /**
- * Create a new instance of the related model.
- *
- * @param array $attributes
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function create(array $attributes)
- {
- $instance = $this->related->newInstance($attributes);
-
- // When saving a polymorphic relationship, we need to set not only the foreign
- // key, but also the foreign key type, which is typically the class name of
- // the parent model. This makes the polymorphic item unique in the table.
- $this->setForeignAttributesForCreate($instance);
-
- $instance->save();
-
- return $instance;
- }
-
- /**
- * Set the foreign ID and type for creating a related model.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return void
- */
- protected function setForeignAttributesForCreate(Model $model)
- {
- $model->{$this->getPlainForeignKey()} = $this->getParentKey();
-
- $model->{last(explode('.', $this->morphType))} = $this->morphClass;
- }
-
- /**
- * Get the foreign key "type" name.
- *
- * @return string
- */
- public function getMorphType()
- {
- return $this->morphType;
- }
-
- /**
- * Get the plain morph type name without the table.
- *
- * @return string
- */
- public function getPlainMorphType()
- {
- return last(explode('.', $this->morphType));
- }
-
- /**
- * Get the class name of the parent model.
- *
- * @return string
- */
- public function getMorphClass()
- {
- return $this->morphClass;
- }
-
+abstract class MorphOneOrMany extends HasOneOrMany
+{
+ /**
+ * The foreign key type for the relationship.
+ *
+ * @var string
+ */
+ protected $morphType;
+
+ /**
+ * The class name of the parent model.
+ *
+ * @var string
+ */
+ protected $morphClass;
+
+ /**
+ * Create a new morph one or many relationship instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param string $type
+ * @param string $id
+ * @param string $localKey
+ * @return void
+ */
+ public function __construct(Builder $query, Model $parent, $type, $id, $localKey)
+ {
+ $this->morphType = $type;
+
+ $this->morphClass = $parent->getMorphClass();
+
+ parent::__construct($query, $parent, $id, $localKey);
+ }
+
+ /**
+ * Set the base constraints on the relation query.
+ *
+ * @return void
+ */
+ public function addConstraints()
+ {
+ if (static::$constraints) {
+ parent::addConstraints();
+
+ $this->query->where($this->morphType, $this->morphClass);
+ }
+ }
+
+ /**
+ * Get the relationship count query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQuery(Builder $query, Builder $parent)
+ {
+ $query = parent::getRelationCountQuery($query, $parent);
+
+ return $query->where($this->morphType, $this->morphClass);
+ }
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ public function addEagerConstraints(array $models)
+ {
+ parent::addEagerConstraints($models);
+
+ $this->query->where($this->morphType, $this->morphClass);
+ }
+
+ /**
+ * Attach a model instance to the parent model.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function save(Model $model)
+ {
+ $model->setAttribute($this->getPlainMorphType(), $this->morphClass);
+
+ return parent::save($model);
+ }
+
+ /**
+ * Find a related model by its primary key or return new instance of the related model.
+ *
+ * @param mixed $id
+ * @param array $columns
+ * @return \Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model
+ */
+ public function findOrNew($id, $columns = ['*'])
+ {
+ if (is_null($instance = $this->find($id, $columns))) {
+ $instance = $this->related->newInstance();
+
+ // When saving a polymorphic relationship, we need to set not only the foreign
+ // key, but also the foreign key type, which is typically the class name of
+ // the parent model. This makes the polymorphic item unique in the table.
+ $this->setForeignAttributesForCreate($instance);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Get the first related model record matching the attributes or instantiate it.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrNew(array $attributes)
+ {
+ if (is_null($instance = $this->where($attributes)->first())) {
+ $instance = $this->related->newInstance($attributes);
+
+ // When saving a polymorphic relationship, we need to set not only the foreign
+ // key, but also the foreign key type, which is typically the class name of
+ // the parent model. This makes the polymorphic item unique in the table.
+ $this->setForeignAttributesForCreate($instance);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Get the first related record matching the attributes or create it.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function firstOrCreate(array $attributes)
+ {
+ if (is_null($instance = $this->where($attributes)->first())) {
+ $instance = $this->create($attributes);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Create or update a related record matching the attributes, and fill it with values.
+ *
+ * @param array $attributes
+ * @param array $values
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function updateOrCreate(array $attributes, array $values = [])
+ {
+ $instance = $this->firstOrNew($attributes);
+
+ $instance->fill($values);
+
+ $instance->save();
+
+ return $instance;
+ }
+
+ /**
+ * Create a new instance of the related model.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function create(array $attributes)
+ {
+ $instance = $this->related->newInstance($attributes);
+
+ // When saving a polymorphic relationship, we need to set not only the foreign
+ // key, but also the foreign key type, which is typically the class name of
+ // the parent model. This makes the polymorphic item unique in the table.
+ $this->setForeignAttributesForCreate($instance);
+
+ $instance->save();
+
+ return $instance;
+ }
+
+ /**
+ * Set the foreign ID and type for creating a related model.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return void
+ */
+ protected function setForeignAttributesForCreate(Model $model)
+ {
+ $model->{$this->getPlainForeignKey()} = $this->getParentKey();
+
+ $model->{last(explode('.', $this->morphType))} = $this->morphClass;
+ }
+
+ /**
+ * Get the foreign key "type" name.
+ *
+ * @return string
+ */
+ public function getMorphType()
+ {
+ return $this->morphType;
+ }
+
+ /**
+ * Get the plain morph type name without the table.
+ *
+ * @return string
+ */
+ public function getPlainMorphType()
+ {
+ return last(explode('.', $this->morphType));
+ }
+
+ /**
+ * Get the class name of the parent model.
+ *
+ * @return string
+ */
+ public function getMorphClass()
+ {
+ return $this->morphClass;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php
index fe8c644..b7a2f34 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php
@@ -1,78 +1,79 @@
-where($this->morphType, $this->morphClass);
+ /**
+ * The value of the polymorphic relation.
+ *
+ * Explicitly define this so it's not included in saved attributes.
+ *
+ * @var string
+ */
+ protected $morphClass;
- return parent::setKeysForSaveQuery($query);
- }
+ /**
+ * Set the keys for a save update query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ protected function setKeysForSaveQuery(Builder $query)
+ {
+ $query->where($this->morphType, $this->morphClass);
- /**
- * Delete the pivot model record from the database.
- *
- * @return int
- */
- public function delete()
- {
- $query = $this->getDeleteQuery();
+ return parent::setKeysForSaveQuery($query);
+ }
- $query->where($this->morphType, $this->morphClass);
+ /**
+ * Delete the pivot model record from the database.
+ *
+ * @return int
+ */
+ public function delete()
+ {
+ $query = $this->getDeleteQuery();
- return $query->delete();
- }
+ $query->where($this->morphType, $this->morphClass);
- /**
- * Set the morph type for the pivot.
- *
- * @param string $morphType
- * @return $this
- */
- public function setMorphType($morphType)
- {
- $this->morphType = $morphType;
+ return $query->delete();
+ }
- return $this;
- }
+ /**
+ * Set the morph type for the pivot.
+ *
+ * @param string $morphType
+ * @return $this
+ */
+ public function setMorphType($morphType)
+ {
+ $this->morphType = $morphType;
- /**
- * Set the morph class for the pivot.
- *
- * @param string $morphClass
- * @return \Illuminate\Database\Eloquent\Relations\MorphPivot
- */
- public function setMorphClass($morphClass)
- {
- $this->morphClass = $morphClass;
+ return $this;
+ }
- return $this;
- }
+ /**
+ * Set the morph class for the pivot.
+ *
+ * @param string $morphClass
+ * @return \Illuminate\Database\Eloquent\Relations\MorphPivot
+ */
+ public function setMorphClass($morphClass)
+ {
+ $this->morphClass = $morphClass;
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
index 1d9821d..94b6feb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -1,273 +1,268 @@
-morphType = $type;
-
- parent::__construct($query, $parent, $foreignKey, $otherKey, $relation);
- }
-
- /**
- * Get the results of the relationship.
- *
- * @return mixed
- */
- public function getResults()
- {
- if ( ! $this->otherKey) return;
-
- return $this->query->first();
- }
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- public function addEagerConstraints(array $models)
- {
- $this->buildDictionary($this->models = Collection::make($models));
- }
-
- /**
- * Build a dictionary with the models.
- *
- * @param \Illuminate\Database\Eloquent\Collection $models
- * @return void
- */
- protected function buildDictionary(Collection $models)
- {
- foreach ($models as $model)
- {
- if ($model->{$this->morphType})
- {
- $this->dictionary[$model->{$this->morphType}][$model->{$this->foreignKey}][] = $model;
- }
- }
- }
-
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- public function match(array $models, Collection $results, $relation)
- {
- return $models;
- }
-
- /**
- * Associate the model instance to the given parent.
- *
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function associate(Model $model)
- {
- $this->parent->setAttribute($this->foreignKey, $model->getKey());
-
- $this->parent->setAttribute($this->morphType, $model->getMorphClass());
-
- return $this->parent->setRelation($this->relation, $model);
- }
-
- /**
- * Dissociate previously associated model from the given parent.
- *
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function dissociate()
- {
- $this->parent->setAttribute($this->foreignKey, null);
-
- $this->parent->setAttribute($this->morphType, null);
-
- return $this->parent->setRelation($this->relation, null);
- }
-
- /**
- * Get the results of the relationship.
- *
- * Called via eager load method of Eloquent query builder.
- *
- * @return mixed
- */
- public function getEager()
- {
- foreach (array_keys($this->dictionary) as $type)
- {
- $this->matchToMorphParents($type, $this->getResultsByType($type));
- }
-
- return $this->models;
- }
-
- /**
- * Match the results for a given type to their parents.
- *
- * @param string $type
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @return void
- */
- protected function matchToMorphParents($type, Collection $results)
- {
- foreach ($results as $result)
- {
- if (isset($this->dictionary[$type][$result->getKey()]))
- {
- foreach ($this->dictionary[$type][$result->getKey()] as $model)
- {
- $model->setRelation($this->relation, $result);
- }
- }
- }
- }
-
- /**
- * Get all of the relation results for a type.
- *
- * @param string $type
- * @return \Illuminate\Database\Eloquent\Collection
- */
- protected function getResultsByType($type)
- {
- $instance = $this->createModelByType($type);
-
- $key = $instance->getKeyName();
-
- $query = $instance->newQuery();
-
- $query = $this->useWithTrashed($query);
-
- return $query->whereIn($key, $this->gatherKeysByType($type)->all())->get();
- }
-
- /**
- * Gather all of the foreign keys for a given type.
- *
- * @param string $type
- * @return array
- */
- protected function gatherKeysByType($type)
- {
- $foreign = $this->foreignKey;
-
- return BaseCollection::make($this->dictionary[$type])->map(function($models) use ($foreign)
- {
- return head($models)->{$foreign};
-
- })->unique();
- }
-
- /**
- * Create a new model instance by type.
- *
- * @param string $type
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function createModelByType($type)
- {
- return new $type;
- }
-
- /**
- * Get the foreign key "type" name.
- *
- * @return string
- */
- public function getMorphType()
- {
- return $this->morphType;
- }
-
- /**
- * Get the dictionary used by the relationship.
- *
- * @return array
- */
- public function getDictionary()
- {
- return $this->dictionary;
- }
-
- /**
- * Fetch soft-deleted model instances with query.
- *
- * @return $this
- */
- public function withTrashed()
- {
- $this->withTrashed = true;
-
- $this->query = $this->useWithTrashed($this->query);
-
- return $this;
- }
-
- /**
- * Return trashed models with query if told so.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @return \Illuminate\Database\Eloquent\Builder
- */
- protected function useWithTrashed(Builder $query)
- {
- if ($this->withTrashed && $query->getMacro('withTrashed') !== null)
- {
- return $query->withTrashed();
- }
-
- return $query;
- }
+class MorphTo extends BelongsTo
+{
+ /**
+ * The type of the polymorphic relation.
+ *
+ * @var string
+ */
+ protected $morphType;
+
+ /**
+ * The models whose relations are being eager loaded.
+ *
+ * @var \Illuminate\Database\Eloquent\Collection
+ */
+ protected $models;
+
+ /**
+ * All of the models keyed by ID.
+ *
+ * @var array
+ */
+ protected $dictionary = [];
+
+ /*
+ * Indicates if soft-deleted model instances should be fetched.
+ *
+ * @var bool
+ */
+ protected $withTrashed = false;
+
+ /**
+ * Create a new morph to relationship instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @param string $type
+ * @param string $relation
+ * @return void
+ */
+ public function __construct(Builder $query, Model $parent, $foreignKey, $otherKey, $type, $relation)
+ {
+ $this->morphType = $type;
+
+ parent::__construct($query, $parent, $foreignKey, $otherKey, $relation);
+ }
+
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ public function getResults()
+ {
+ if (! $this->otherKey) {
+ return;
+ }
+
+ return $this->query->first();
+ }
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ public function addEagerConstraints(array $models)
+ {
+ $this->buildDictionary($this->models = Collection::make($models));
+ }
+
+ /**
+ * Build a dictionary with the models.
+ *
+ * @param \Illuminate\Database\Eloquent\Collection $models
+ * @return void
+ */
+ protected function buildDictionary(Collection $models)
+ {
+ foreach ($models as $model) {
+ if ($model->{$this->morphType}) {
+ $this->dictionary[$model->{$this->morphType}][$model->{$this->foreignKey}][] = $model;
+ }
+ }
+ }
+
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ public function match(array $models, Collection $results, $relation)
+ {
+ return $models;
+ }
+
+ /**
+ * Associate the model instance to the given parent.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function associate($model)
+ {
+ $this->parent->setAttribute($this->foreignKey, $model->getKey());
+
+ $this->parent->setAttribute($this->morphType, $model->getMorphClass());
+
+ return $this->parent->setRelation($this->relation, $model);
+ }
+
+ /**
+ * Dissociate previously associated model from the given parent.
+ *
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function dissociate()
+ {
+ $this->parent->setAttribute($this->foreignKey, null);
+
+ $this->parent->setAttribute($this->morphType, null);
+
+ return $this->parent->setRelation($this->relation, null);
+ }
+
+ /**
+ * Get the results of the relationship.
+ *
+ * Called via eager load method of Eloquent query builder.
+ *
+ * @return mixed
+ */
+ public function getEager()
+ {
+ foreach (array_keys($this->dictionary) as $type) {
+ $this->matchToMorphParents($type, $this->getResultsByType($type));
+ }
+
+ return $this->models;
+ }
+
+ /**
+ * Match the results for a given type to their parents.
+ *
+ * @param string $type
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @return void
+ */
+ protected function matchToMorphParents($type, Collection $results)
+ {
+ foreach ($results as $result) {
+ if (isset($this->dictionary[$type][$result->getKey()])) {
+ foreach ($this->dictionary[$type][$result->getKey()] as $model) {
+ $model->setRelation($this->relation, $result);
+ }
+ }
+ }
+ }
+
+ /**
+ * Get all of the relation results for a type.
+ *
+ * @param string $type
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ protected function getResultsByType($type)
+ {
+ $instance = $this->createModelByType($type);
+
+ $key = $instance->getTable().'.'.$instance->getKeyName();
+
+ $query = $instance->newQuery()->with($this->getQuery()->getEagerLoads());
+
+ $query = $this->useWithTrashed($query);
+
+ return $query->whereIn($key, $this->gatherKeysByType($type)->all())->get();
+ }
+
+ /**
+ * Gather all of the foreign keys for a given type.
+ *
+ * @param string $type
+ * @return array
+ */
+ protected function gatherKeysByType($type)
+ {
+ $foreign = $this->foreignKey;
+
+ return collect($this->dictionary[$type])->map(function ($models) use ($foreign) {
+ return head($models)->{$foreign};
+ })->values()->unique();
+ }
+
+ /**
+ * Create a new model instance by type.
+ *
+ * @param string $type
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function createModelByType($type)
+ {
+ $class = $this->parent->getActualClassNameForMorph($type);
+
+ return new $class;
+ }
+
+ /**
+ * Get the foreign key "type" name.
+ *
+ * @return string
+ */
+ public function getMorphType()
+ {
+ return $this->morphType;
+ }
+
+ /**
+ * Get the dictionary used by the relationship.
+ *
+ * @return array
+ */
+ public function getDictionary()
+ {
+ return $this->dictionary;
+ }
+
+ /**
+ * Fetch soft-deleted model instances with query.
+ *
+ * @return $this
+ */
+ public function withTrashed()
+ {
+ $this->withTrashed = true;
+
+ $this->query = $this->useWithTrashed($this->query);
+
+ return $this;
+ }
+
+ /**
+ * Return trashed models with query if told so.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ protected function useWithTrashed(Builder $query)
+ {
+ if ($this->withTrashed && $query->getMacro('withTrashed') !== null) {
+ return $query->withTrashed();
+ }
+
+ return $query;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
index 18d970d..373005d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
@@ -1,158 +1,160 @@
-inverse = $inverse;
- $this->morphType = $name.'_type';
- $this->morphClass = $inverse ? $query->getModel()->getMorphClass() : $parent->getMorphClass();
-
- parent::__construct($query, $parent, $table, $foreignKey, $otherKey, $relationName);
- }
-
- /**
- * Set the where clause for the relation query.
- *
- * @return $this
- */
- protected function setWhere()
- {
- parent::setWhere();
-
- $this->query->where($this->table.'.'.$this->morphType, $this->morphClass);
-
- return $this;
- }
-
- /**
- * Add the constraints for a relationship count query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQuery(Builder $query, Builder $parent)
- {
- $query = parent::getRelationCountQuery($query, $parent);
-
- return $query->where($this->table.'.'.$this->morphType, $this->morphClass);
- }
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- public function addEagerConstraints(array $models)
- {
- parent::addEagerConstraints($models);
-
- $this->query->where($this->table.'.'.$this->morphType, $this->morphClass);
- }
-
- /**
- * Create a new pivot attachment record.
- *
- * @param int $id
- * @param bool $timed
- * @return array
- */
- protected function createAttachRecord($id, $timed)
- {
- $record = parent::createAttachRecord($id, $timed);
-
- return array_add($record, $this->morphType, $this->morphClass);
- }
-
- /**
- * Create a new query builder for the pivot table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function newPivotQuery()
- {
- $query = parent::newPivotQuery();
-
- return $query->where($this->morphType, $this->morphClass);
- }
-
- /**
- * Create a new pivot model instance.
- *
- * @param array $attributes
- * @param bool $exists
- * @return \Illuminate\Database\Eloquent\Relations\Pivot
- */
- public function newPivot(array $attributes = array(), $exists = false)
- {
- $pivot = new MorphPivot($this->parent, $attributes, $this->table, $exists);
-
- $pivot->setPivotKeys($this->foreignKey, $this->otherKey)
- ->setMorphType($this->morphType)
- ->setMorphClass($this->morphClass);
-
- return $pivot;
- }
-
- /**
- * Get the foreign key "type" name.
- *
- * @return string
- */
- public function getMorphType()
- {
- return $this->morphType;
- }
-
- /**
- * Get the class name of the parent model.
- *
- * @return string
- */
- public function getMorphClass()
- {
- return $this->morphClass;
- }
-
+class MorphToMany extends BelongsToMany
+{
+ /**
+ * The type of the polymorphic relation.
+ *
+ * @var string
+ */
+ protected $morphType;
+
+ /**
+ * The class name of the morph type constraint.
+ *
+ * @var string
+ */
+ protected $morphClass;
+
+ /**
+ * Indicates if we are connecting the inverse of the relation.
+ *
+ * This primarily affects the morphClass constraint.
+ *
+ * @var bool
+ */
+ protected $inverse;
+
+ /**
+ * Create a new morph to many relationship instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param string $name
+ * @param string $table
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @param string $relationName
+ * @param bool $inverse
+ * @return void
+ */
+ public function __construct(Builder $query, Model $parent, $name, $table, $foreignKey, $otherKey, $relationName = null, $inverse = false)
+ {
+ $this->inverse = $inverse;
+ $this->morphType = $name.'_type';
+ $this->morphClass = $inverse ? $query->getModel()->getMorphClass() : $parent->getMorphClass();
+
+ parent::__construct($query, $parent, $table, $foreignKey, $otherKey, $relationName);
+ }
+
+ /**
+ * Set the where clause for the relation query.
+ *
+ * @return $this
+ */
+ protected function setWhere()
+ {
+ parent::setWhere();
+
+ $this->query->where($this->table.'.'.$this->morphType, $this->morphClass);
+
+ return $this;
+ }
+
+ /**
+ * Add the constraints for a relationship count query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQuery(Builder $query, Builder $parent)
+ {
+ $query = parent::getRelationCountQuery($query, $parent);
+
+ return $query->where($this->table.'.'.$this->morphType, $this->morphClass);
+ }
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ public function addEagerConstraints(array $models)
+ {
+ parent::addEagerConstraints($models);
+
+ $this->query->where($this->table.'.'.$this->morphType, $this->morphClass);
+ }
+
+ /**
+ * Create a new pivot attachment record.
+ *
+ * @param int $id
+ * @param bool $timed
+ * @return array
+ */
+ protected function createAttachRecord($id, $timed)
+ {
+ $record = parent::createAttachRecord($id, $timed);
+
+ return Arr::add($record, $this->morphType, $this->morphClass);
+ }
+
+ /**
+ * Create a new query builder for the pivot table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function newPivotQuery()
+ {
+ $query = parent::newPivotQuery();
+
+ return $query->where($this->morphType, $this->morphClass);
+ }
+
+ /**
+ * Create a new pivot model instance.
+ *
+ * @param array $attributes
+ * @param bool $exists
+ * @return \Illuminate\Database\Eloquent\Relations\Pivot
+ */
+ public function newPivot(array $attributes = [], $exists = false)
+ {
+ $pivot = new MorphPivot($this->parent, $attributes, $this->table, $exists);
+
+ $pivot->setPivotKeys($this->foreignKey, $this->otherKey)
+ ->setMorphType($this->morphType)
+ ->setMorphClass($this->morphClass);
+
+ return $pivot;
+ }
+
+ /**
+ * Get the foreign key "type" name.
+ *
+ * @return string
+ */
+ public function getMorphType()
+ {
+ return $this->morphType;
+ }
+
+ /**
+ * Get the class name of the parent model.
+ *
+ * @return string
+ */
+ public function getMorphClass()
+ {
+ return $this->morphClass;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php
index da1e28d..4d80279 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php
@@ -1,173 +1,174 @@
-forceFill($attributes);
-
- $this->syncOriginal();
-
- $this->setTable($table);
-
- $this->setConnection($parent->getConnectionName());
-
- // We store off the parent instance so we will access the timestamp column names
- // for the model, since the pivot model timestamps aren't easily configurable
- // from the developer's point of view. We can use the parents to get these.
- $this->parent = $parent;
-
- $this->exists = $exists;
-
- $this->timestamps = $this->hasTimestampAttributes();
- }
-
- /**
- * Set the keys for a save update query.
- *
- * @param \Illuminate\Database\Eloquent\Builder
- * @return \Illuminate\Database\Eloquent\Builder
- */
- protected function setKeysForSaveQuery(Builder $query)
- {
- $query->where($this->foreignKey, $this->getAttribute($this->foreignKey));
-
- return $query->where($this->otherKey, $this->getAttribute($this->otherKey));
- }
-
- /**
- * Delete the pivot model record from the database.
- *
- * @return int
- */
- public function delete()
- {
- return $this->getDeleteQuery()->delete();
- }
-
- /**
- * Get the query builder for a delete operation on the pivot.
- *
- * @return \Illuminate\Database\Eloquent\Builder
- */
- protected function getDeleteQuery()
- {
- $foreign = $this->getAttribute($this->foreignKey);
-
- $query = $this->newQuery()->where($this->foreignKey, $foreign);
-
- return $query->where($this->otherKey, $this->getAttribute($this->otherKey));
- }
-
- /**
- * Get the foreign key column name.
- *
- * @return string
- */
- public function getForeignKey()
- {
- return $this->foreignKey;
- }
-
- /**
- * Get the "other key" column name.
- *
- * @return string
- */
- public function getOtherKey()
- {
- return $this->otherKey;
- }
-
- /**
- * Set the key names for the pivot model instance.
- *
- * @param string $foreignKey
- * @param string $otherKey
- * @return $this
- */
- public function setPivotKeys($foreignKey, $otherKey)
- {
- $this->foreignKey = $foreignKey;
-
- $this->otherKey = $otherKey;
-
- return $this;
- }
-
- /**
- * Determine if the pivot model has timestamp attributes.
- *
- * @return bool
- */
- public function hasTimestampAttributes()
- {
- return array_key_exists($this->getCreatedAtColumn(), $this->attributes);
- }
-
- /**
- * Get the name of the "created at" column.
- *
- * @return string
- */
- public function getCreatedAtColumn()
- {
- return $this->parent->getCreatedAtColumn();
- }
-
- /**
- * Get the name of the "updated at" column.
- *
- * @return string
- */
- public function getUpdatedAtColumn()
- {
- return $this->parent->getUpdatedAtColumn();
- }
-
+class Pivot extends Model
+{
+ /**
+ * The parent model of the relationship.
+ *
+ * @var \Illuminate\Database\Eloquent\Model
+ */
+ protected $parent;
+
+ /**
+ * The name of the foreign key column.
+ *
+ * @var string
+ */
+ protected $foreignKey;
+
+ /**
+ * The name of the "other key" column.
+ *
+ * @var string
+ */
+ protected $otherKey;
+
+ /**
+ * The attributes that aren't mass assignable.
+ *
+ * @var array
+ */
+ protected $guarded = [];
+
+ /**
+ * Create a new pivot model instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @param array $attributes
+ * @param string $table
+ * @param bool $exists
+ * @return void
+ */
+ public function __construct(Model $parent, $attributes, $table, $exists = false)
+ {
+ parent::__construct();
+
+ // The pivot model is a "dynamic" model since we will set the tables dynamically
+ // for the instance. This allows it work for any intermediate tables for the
+ // many to many relationship that are defined by this developer's classes.
+ $this->setTable($table);
+
+ $this->setConnection($parent->getConnectionName());
+
+ $this->forceFill($attributes);
+
+ $this->syncOriginal();
+
+ // We store off the parent instance so we will access the timestamp column names
+ // for the model, since the pivot model timestamps aren't easily configurable
+ // from the developer's point of view. We can use the parents to get these.
+ $this->parent = $parent;
+
+ $this->exists = $exists;
+
+ $this->timestamps = $this->hasTimestampAttributes();
+ }
+
+ /**
+ * Set the keys for a save update query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ protected function setKeysForSaveQuery(Builder $query)
+ {
+ $query->where($this->foreignKey, $this->getAttribute($this->foreignKey));
+
+ return $query->where($this->otherKey, $this->getAttribute($this->otherKey));
+ }
+
+ /**
+ * Delete the pivot model record from the database.
+ *
+ * @return int
+ */
+ public function delete()
+ {
+ return $this->getDeleteQuery()->delete();
+ }
+
+ /**
+ * Get the query builder for a delete operation on the pivot.
+ *
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ protected function getDeleteQuery()
+ {
+ $foreign = $this->getAttribute($this->foreignKey);
+
+ $query = $this->newQuery()->where($this->foreignKey, $foreign);
+
+ return $query->where($this->otherKey, $this->getAttribute($this->otherKey));
+ }
+
+ /**
+ * Get the foreign key column name.
+ *
+ * @return string
+ */
+ public function getForeignKey()
+ {
+ return $this->foreignKey;
+ }
+
+ /**
+ * Get the "other key" column name.
+ *
+ * @return string
+ */
+ public function getOtherKey()
+ {
+ return $this->otherKey;
+ }
+
+ /**
+ * Set the key names for the pivot model instance.
+ *
+ * @param string $foreignKey
+ * @param string $otherKey
+ * @return $this
+ */
+ public function setPivotKeys($foreignKey, $otherKey)
+ {
+ $this->foreignKey = $foreignKey;
+
+ $this->otherKey = $otherKey;
+
+ return $this;
+ }
+
+ /**
+ * Determine if the pivot model has timestamp attributes.
+ *
+ * @return bool
+ */
+ public function hasTimestampAttributes()
+ {
+ return array_key_exists($this->getCreatedAtColumn(), $this->attributes);
+ }
+
+ /**
+ * Get the name of the "created at" column.
+ *
+ * @return string
+ */
+ public function getCreatedAtColumn()
+ {
+ return $this->parent->getCreatedAtColumn();
+ }
+
+ /**
+ * Get the name of the "updated at" column.
+ *
+ * @return string
+ */
+ public function getUpdatedAtColumn()
+ {
+ return $this->parent->getUpdatedAtColumn();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
index 9525af0..739cd37 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -1,290 +1,348 @@
-query = $query;
- $this->parent = $parent;
- $this->related = $query->getModel();
-
- $this->addConstraints();
- }
-
- /**
- * Set the base constraints on the relation query.
- *
- * @return void
- */
- abstract public function addConstraints();
-
- /**
- * Set the constraints for an eager load of the relation.
- *
- * @param array $models
- * @return void
- */
- abstract public function addEagerConstraints(array $models);
-
- /**
- * Initialize the relation on a set of models.
- *
- * @param array $models
- * @param string $relation
- * @return array
- */
- abstract public function initRelation(array $models, $relation);
-
- /**
- * Match the eagerly loaded results to their parents.
- *
- * @param array $models
- * @param \Illuminate\Database\Eloquent\Collection $results
- * @param string $relation
- * @return array
- */
- abstract public function match(array $models, Collection $results, $relation);
-
- /**
- * Get the results of the relationship.
- *
- * @return mixed
- */
- abstract public function getResults();
-
- /**
- * Get the relationship for eager loading.
- *
- * @return \Illuminate\Database\Eloquent\Collection
- */
- public function getEager()
- {
- return $this->get();
- }
-
- /**
- * Touch all of the related models for the relationship.
- *
- * @return void
- */
- public function touch()
- {
- $column = $this->getRelated()->getUpdatedAtColumn();
-
- $this->rawUpdate(array($column => $this->getRelated()->freshTimestampString()));
- }
-
- /**
- * Run a raw update against the base query.
- *
- * @param array $attributes
- * @return int
- */
- public function rawUpdate(array $attributes = array())
- {
- return $this->query->update($attributes);
- }
-
- /**
- * Add the constraints for a relationship count query.
- *
- * @param \Illuminate\Database\Eloquent\Builder $query
- * @param \Illuminate\Database\Eloquent\Builder $parent
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getRelationCountQuery(Builder $query, Builder $parent)
- {
- $query->select(new Expression('count(*)'));
-
- $key = $this->wrap($this->getQualifiedParentKeyName());
-
- return $query->where($this->getHasCompareKey(), '=', new Expression($key));
- }
-
- /**
- * Run a callback with constraints disabled on the relation.
- *
- * @param \Closure $callback
- * @return mixed
- */
- public static function noConstraints(Closure $callback)
- {
- $previous = static::$constraints;
-
- static::$constraints = false;
-
- // When resetting the relation where clause, we want to shift the first element
- // off of the bindings, leaving only the constraints that the developers put
- // as "extra" on the relationships, and not original relation constraints.
- $results = call_user_func($callback);
-
- static::$constraints = $previous;
-
- return $results;
- }
-
- /**
- * Get all of the primary keys for an array of models.
- *
- * @param array $models
- * @param string $key
- * @return array
- */
- protected function getKeys(array $models, $key = null)
- {
- return array_unique(array_values(array_map(function($value) use ($key)
- {
- return $key ? $value->getAttribute($key) : $value->getKey();
-
- }, $models)));
- }
-
- /**
- * Get the underlying query for the relation.
- *
- * @return \Illuminate\Database\Eloquent\Builder
- */
- public function getQuery()
- {
- return $this->query;
- }
-
- /**
- * Get the base query builder driving the Eloquent builder.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- public function getBaseQuery()
- {
- return $this->query->getQuery();
- }
-
- /**
- * Get the parent model of the relation.
- *
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function getParent()
- {
- return $this->parent;
- }
-
- /**
- * Get the fully qualified parent key name.
- *
- * @return string
- */
- public function getQualifiedParentKeyName()
- {
- return $this->parent->getQualifiedKeyName();
- }
-
- /**
- * Get the related model of the relation.
- *
- * @return \Illuminate\Database\Eloquent\Model
- */
- public function getRelated()
- {
- return $this->related;
- }
-
- /**
- * Get the name of the "created at" column.
- *
- * @return string
- */
- public function createdAt()
- {
- return $this->parent->getCreatedAtColumn();
- }
-
- /**
- * Get the name of the "updated at" column.
- *
- * @return string
- */
- public function updatedAt()
- {
- return $this->parent->getUpdatedAtColumn();
- }
-
- /**
- * Get the name of the related model's "updated at" column.
- *
- * @return string
- */
- public function relatedUpdatedAt()
- {
- return $this->related->getUpdatedAtColumn();
- }
-
- /**
- * Wrap the given value with the parent query's grammar.
- *
- * @param string $value
- * @return string
- */
- public function wrap($value)
- {
- return $this->parent->newQueryWithoutScopes()->getQuery()->getGrammar()->wrap($value);
- }
-
- /**
- * Handle dynamic method calls to the relationship.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- $result = call_user_func_array(array($this->query, $method), $parameters);
-
- if ($result === $this->query) return $this;
-
- return $result;
- }
-
+abstract class Relation
+{
+ /**
+ * The Eloquent query builder instance.
+ *
+ * @var \Illuminate\Database\Eloquent\Builder
+ */
+ protected $query;
+
+ /**
+ * The parent model instance.
+ *
+ * @var \Illuminate\Database\Eloquent\Model
+ */
+ protected $parent;
+
+ /**
+ * The related model instance.
+ *
+ * @var \Illuminate\Database\Eloquent\Model
+ */
+ protected $related;
+
+ /**
+ * Indicates if the relation is adding constraints.
+ *
+ * @var bool
+ */
+ protected static $constraints = true;
+
+ /**
+ * An array to map class names to their morph names in database.
+ *
+ * @var array
+ */
+ protected static $morphMap = [];
+
+ /**
+ * Create a new relation instance.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Model $parent
+ * @return void
+ */
+ public function __construct(Builder $query, Model $parent)
+ {
+ $this->query = $query;
+ $this->parent = $parent;
+ $this->related = $query->getModel();
+
+ $this->addConstraints();
+ }
+
+ /**
+ * Set the base constraints on the relation query.
+ *
+ * @return void
+ */
+ abstract public function addConstraints();
+
+ /**
+ * Set the constraints for an eager load of the relation.
+ *
+ * @param array $models
+ * @return void
+ */
+ abstract public function addEagerConstraints(array $models);
+
+ /**
+ * Initialize the relation on a set of models.
+ *
+ * @param array $models
+ * @param string $relation
+ * @return array
+ */
+ abstract public function initRelation(array $models, $relation);
+
+ /**
+ * Match the eagerly loaded results to their parents.
+ *
+ * @param array $models
+ * @param \Illuminate\Database\Eloquent\Collection $results
+ * @param string $relation
+ * @return array
+ */
+ abstract public function match(array $models, Collection $results, $relation);
+
+ /**
+ * Get the results of the relationship.
+ *
+ * @return mixed
+ */
+ abstract public function getResults();
+
+ /**
+ * Get the relationship for eager loading.
+ *
+ * @return \Illuminate\Database\Eloquent\Collection
+ */
+ public function getEager()
+ {
+ return $this->get();
+ }
+
+ /**
+ * Touch all of the related models for the relationship.
+ *
+ * @return void
+ */
+ public function touch()
+ {
+ $column = $this->getRelated()->getUpdatedAtColumn();
+
+ $this->rawUpdate([$column => $this->getRelated()->freshTimestampString()]);
+ }
+
+ /**
+ * Run a raw update against the base query.
+ *
+ * @param array $attributes
+ * @return int
+ */
+ public function rawUpdate(array $attributes = [])
+ {
+ return $this->query->update($attributes);
+ }
+
+ /**
+ * Add the constraints for a relationship count query.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param \Illuminate\Database\Eloquent\Builder $parent
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getRelationCountQuery(Builder $query, Builder $parent)
+ {
+ $query->select(new Expression('count(*)'));
+
+ $key = $this->wrap($this->getQualifiedParentKeyName());
+
+ return $query->where($this->getHasCompareKey(), '=', new Expression($key));
+ }
+
+ /**
+ * Run a callback with constraints disabled on the relation.
+ *
+ * @param \Closure $callback
+ * @return mixed
+ */
+ public static function noConstraints(Closure $callback)
+ {
+ $previous = static::$constraints;
+
+ static::$constraints = false;
+
+ // When resetting the relation where clause, we want to shift the first element
+ // off of the bindings, leaving only the constraints that the developers put
+ // as "extra" on the relationships, and not original relation constraints.
+ try {
+ $results = call_user_func($callback);
+ } finally {
+ static::$constraints = $previous;
+ }
+
+ return $results;
+ }
+
+ /**
+ * Get all of the primary keys for an array of models.
+ *
+ * @param array $models
+ * @param string $key
+ * @return array
+ */
+ protected function getKeys(array $models, $key = null)
+ {
+ return array_unique(array_values(array_map(function ($value) use ($key) {
+ return $key ? $value->getAttribute($key) : $value->getKey();
+ }, $models)));
+ }
+
+ /**
+ * Get the underlying query for the relation.
+ *
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function getQuery()
+ {
+ return $this->query;
+ }
+
+ /**
+ * Get the base query builder driving the Eloquent builder.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function getBaseQuery()
+ {
+ return $this->query->getQuery();
+ }
+
+ /**
+ * Get the parent model of the relation.
+ *
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function getParent()
+ {
+ return $this->parent;
+ }
+
+ /**
+ * Get the fully qualified parent key name.
+ *
+ * @return string
+ */
+ public function getQualifiedParentKeyName()
+ {
+ return $this->parent->getQualifiedKeyName();
+ }
+
+ /**
+ * Get the related model of the relation.
+ *
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function getRelated()
+ {
+ return $this->related;
+ }
+
+ /**
+ * Get the name of the "created at" column.
+ *
+ * @return string
+ */
+ public function createdAt()
+ {
+ return $this->parent->getCreatedAtColumn();
+ }
+
+ /**
+ * Get the name of the "updated at" column.
+ *
+ * @return string
+ */
+ public function updatedAt()
+ {
+ return $this->parent->getUpdatedAtColumn();
+ }
+
+ /**
+ * Get the name of the related model's "updated at" column.
+ *
+ * @return string
+ */
+ public function relatedUpdatedAt()
+ {
+ return $this->related->getUpdatedAtColumn();
+ }
+
+ /**
+ * Wrap the given value with the parent query's grammar.
+ *
+ * @param string $value
+ * @return string
+ */
+ public function wrap($value)
+ {
+ return $this->parent->newQueryWithoutScopes()->getQuery()->getGrammar()->wrap($value);
+ }
+
+ /**
+ * Set or get the morph map for polymorphic relations.
+ *
+ * @param array|null $map
+ * @param bool $merge
+ * @return array
+ */
+ public static function morphMap(array $map = null, $merge = true)
+ {
+ $map = static::buildMorphMapFromModels($map);
+
+ if (is_array($map)) {
+ static::$morphMap = $merge ? array_merge(static::$morphMap, $map) : $map;
+ }
+
+ return static::$morphMap;
+ }
+
+ /**
+ * Builds a table-keyed array from model class names.
+ *
+ * @param string[]|null $models
+ * @return array|null
+ */
+ protected static function buildMorphMapFromModels(array $models = null)
+ {
+ if (is_null($models) || Arr::isAssoc($models)) {
+ return $models;
+ }
+
+ $tables = array_map(function ($model) {
+ return (new $model)->getTable();
+ }, $models);
+
+ return array_combine($tables, $models);
+ }
+
+ /**
+ * Handle dynamic method calls to the relationship.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ $result = call_user_func_array([$this->query, $method], $parameters);
+
+ if ($result === $this->query) {
+ return $this;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Force a clone of the underlying query builder when cloning.
+ *
+ * @return void
+ */
+ public function __clone()
+ {
+ $this->query = clone $this->query;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ScopeInterface.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ScopeInterface.php
index 7cc1349..fac2ca2 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ScopeInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/ScopeInterface.php
@@ -1,24 +1,25 @@
-forceDeleting = true;
-
- $this->delete();
-
- $this->forceDeleting = false;
- }
-
- /**
- * Perform the actual delete query on this model instance.
- *
- * @return void
- */
- protected function performDeleteOnModel()
- {
- if ($this->forceDeleting)
- {
- return $this->withTrashed()->where($this->getKeyName(), $this->getKey())->forceDelete();
- }
-
- return $this->runSoftDelete();
- }
-
- /**
- * Perform the actual delete query on this model instance.
- *
- * @return void
- */
- protected function runSoftDelete()
- {
- $query = $this->newQuery()->where($this->getKeyName(), $this->getKey());
-
- $this->{$this->getDeletedAtColumn()} = $time = $this->freshTimestamp();
-
- $query->update(array($this->getDeletedAtColumn() => $this->fromDateTime($time)));
- }
-
- /**
- * Restore a soft-deleted model instance.
- *
- * @return bool|null
- */
- public function restore()
- {
- // If the restoring event does not return false, we will proceed with this
- // restore operation. Otherwise, we bail out so the developer will stop
- // the restore totally. We will clear the deleted timestamp and save.
- if ($this->fireModelEvent('restoring') === false)
- {
- return false;
- }
-
- $this->{$this->getDeletedAtColumn()} = null;
-
- // Once we have saved the model, we will fire the "restored" event so this
- // developer will do anything they need to after a restore operation is
- // totally finished. Then we will return the result of the save call.
- $this->exists = true;
-
- $result = $this->save();
-
- $this->fireModelEvent('restored', false);
-
- return $result;
- }
-
- /**
- * Determine if the model instance has been soft-deleted.
- *
- * @return bool
- */
- public function trashed()
- {
- return ! is_null($this->{$this->getDeletedAtColumn()});
- }
-
- /**
- * Get a new query builder that includes soft deletes.
- *
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public static function withTrashed()
- {
- return (new static)->newQueryWithoutScope(new SoftDeletingScope);
- }
-
- /**
- * Get a new query builder that only includes soft deletes.
- *
- * @return \Illuminate\Database\Eloquent\Builder|static
- */
- public static function onlyTrashed()
- {
- $instance = new static;
-
- $column = $instance->getQualifiedDeletedAtColumn();
-
- return $instance->newQueryWithoutScope(new SoftDeletingScope)->whereNotNull($column);
- }
-
- /**
- * Register a restoring model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @return void
- */
- public static function restoring($callback)
- {
- static::registerModelEvent('restoring', $callback);
- }
-
- /**
- * Register a restored model event with the dispatcher.
- *
- * @param \Closure|string $callback
- * @return void
- */
- public static function restored($callback)
- {
- static::registerModelEvent('restored', $callback);
- }
-
- /**
- * Get the name of the "deleted at" column.
- *
- * @return string
- */
- public function getDeletedAtColumn()
- {
- return defined('static::DELETED_AT') ? static::DELETED_AT : 'deleted_at';
- }
-
- /**
- * Get the fully qualified "deleted at" column.
- *
- * @return string
- */
- public function getQualifiedDeletedAtColumn()
- {
- return $this->getTable().'.'.$this->getDeletedAtColumn();
- }
-
+forceDeleting = true;
+
+ $this->delete();
+
+ $this->forceDeleting = false;
+ }
+
+ /**
+ * Perform the actual delete query on this model instance.
+ *
+ * @return mixed
+ */
+ protected function performDeleteOnModel()
+ {
+ if ($this->forceDeleting) {
+ return $this->newQueryWithoutScopes()->where($this->getKeyName(), $this->getKey())->forceDelete();
+ }
+
+ return $this->runSoftDelete();
+ }
+
+ /**
+ * Perform the actual delete query on this model instance.
+ *
+ * @return void
+ */
+ protected function runSoftDelete()
+ {
+ $query = $this->newQueryWithoutScopes()->where($this->getKeyName(), $this->getKey());
+
+ $this->{$this->getDeletedAtColumn()} = $time = $this->freshTimestamp();
+
+ $query->update([$this->getDeletedAtColumn() => $this->fromDateTime($time)]);
+ }
+
+ /**
+ * Restore a soft-deleted model instance.
+ *
+ * @return bool|null
+ */
+ public function restore()
+ {
+ // If the restoring event does not return false, we will proceed with this
+ // restore operation. Otherwise, we bail out so the developer will stop
+ // the restore totally. We will clear the deleted timestamp and save.
+ if ($this->fireModelEvent('restoring') === false) {
+ return false;
+ }
+
+ $this->{$this->getDeletedAtColumn()} = null;
+
+ // Once we have saved the model, we will fire the "restored" event so this
+ // developer will do anything they need to after a restore operation is
+ // totally finished. Then we will return the result of the save call.
+ $this->exists = true;
+
+ $result = $this->save();
+
+ $this->fireModelEvent('restored', false);
+
+ return $result;
+ }
+
+ /**
+ * Determine if the model instance has been soft-deleted.
+ *
+ * @return bool
+ */
+ public function trashed()
+ {
+ return ! is_null($this->{$this->getDeletedAtColumn()});
+ }
+
+ /**
+ * Get a new query builder that includes soft deletes.
+ *
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public static function withTrashed()
+ {
+ return (new static)->newQueryWithoutScope(new SoftDeletingScope);
+ }
+
+ /**
+ * Get a new query builder that only includes soft deletes.
+ *
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public static function onlyTrashed()
+ {
+ $instance = new static;
+
+ $column = $instance->getQualifiedDeletedAtColumn();
+
+ return $instance->newQueryWithoutScope(new SoftDeletingScope)->whereNotNull($column);
+ }
+
+ /**
+ * Register a restoring model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @return void
+ */
+ public static function restoring($callback)
+ {
+ static::registerModelEvent('restoring', $callback);
+ }
+
+ /**
+ * Register a restored model event with the dispatcher.
+ *
+ * @param \Closure|string $callback
+ * @return void
+ */
+ public static function restored($callback)
+ {
+ static::registerModelEvent('restored', $callback);
+ }
+
+ /**
+ * Get the name of the "deleted at" column.
+ *
+ * @return string
+ */
+ public function getDeletedAtColumn()
+ {
+ return defined('static::DELETED_AT') ? static::DELETED_AT : 'deleted_at';
+ }
+
+ /**
+ * Get the fully qualified "deleted at" column.
+ *
+ * @return string
+ */
+ public function getQualifiedDeletedAtColumn()
+ {
+ return $this->getTable().'.'.$this->getDeletedAtColumn();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php
index ea6d46e..f8786cf 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php
@@ -1,164 +1,155 @@
-whereNull($model->getQualifiedDeletedAtColumn());
-
- $this->extend($builder);
- }
-
- /**
- * Remove the scope from the given Eloquent query builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @param \Illuminate\Database\Eloquent\Model $model
- * @return void
- */
- public function remove(Builder $builder, Model $model)
- {
- $column = $model->getQualifiedDeletedAtColumn();
-
- $query = $builder->getQuery();
-
- $query->wheres = collect($query->wheres)->reject(function($where) use ($column)
- {
- return $this->isSoftDeleteConstraint($where, $column);
- })->values()->all();
- }
-
- /**
- * Extend the query builder with the needed functions.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return void
- */
- public function extend(Builder $builder)
- {
- foreach ($this->extensions as $extension)
- {
- $this->{"add{$extension}"}($builder);
- }
-
- $builder->onDelete(function(Builder $builder)
- {
- $column = $this->getDeletedAtColumn($builder);
-
- return $builder->update(array(
- $column => $builder->getModel()->freshTimestampString(),
- ));
- });
- }
-
- /**
- * Get the "deleted at" column for the builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return string
- */
- protected function getDeletedAtColumn(Builder $builder)
- {
- if (count($builder->getQuery()->joins) > 0)
- {
- return $builder->getModel()->getQualifiedDeletedAtColumn();
- }
- else
- {
- return $builder->getModel()->getDeletedAtColumn();
- }
- }
-
- /**
- * Add the force delete extension to the builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return void
- */
- protected function addForceDelete(Builder $builder)
- {
- $builder->macro('forceDelete', function(Builder $builder)
- {
- return $builder->getQuery()->delete();
- });
- }
-
- /**
- * Add the restore extension to the builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return void
- */
- protected function addRestore(Builder $builder)
- {
- $builder->macro('restore', function(Builder $builder)
- {
- $builder->withTrashed();
-
- return $builder->update(array($builder->getModel()->getDeletedAtColumn() => null));
- });
- }
-
- /**
- * Add the with-trashed extension to the builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return void
- */
- protected function addWithTrashed(Builder $builder)
- {
- $builder->macro('withTrashed', function(Builder $builder)
- {
- $this->remove($builder, $builder->getModel());
-
- return $builder;
- });
- }
-
- /**
- * Add the only-trashed extension to the builder.
- *
- * @param \Illuminate\Database\Eloquent\Builder $builder
- * @return void
- */
- protected function addOnlyTrashed(Builder $builder)
- {
- $builder->macro('onlyTrashed', function(Builder $builder)
- {
- $model = $builder->getModel();
-
- $this->remove($builder, $model);
-
- $builder->getQuery()->whereNotNull($model->getQualifiedDeletedAtColumn());
-
- return $builder;
- });
- }
-
- /**
- * Determine if the given where clause is a soft delete constraint.
- *
- * @param array $where
- * @param string $column
- * @return bool
- */
- protected function isSoftDeleteConstraint(array $where, $column)
- {
- return $where['type'] == 'Null' && $where['column'] == $column;
- }
-
+whereNull($model->getQualifiedDeletedAtColumn());
+
+ $this->extend($builder);
+ }
+
+ /**
+ * Remove the scope from the given Eloquent query builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return void
+ */
+ public function remove(Builder $builder, Model $model)
+ {
+ $column = $model->getQualifiedDeletedAtColumn();
+
+ $query = $builder->getQuery();
+
+ $query->wheres = collect($query->wheres)->reject(function ($where) use ($column) {
+ return $this->isSoftDeleteConstraint($where, $column);
+ })->values()->all();
+ }
+
+ /**
+ * Extend the query builder with the needed functions.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return void
+ */
+ public function extend(Builder $builder)
+ {
+ foreach ($this->extensions as $extension) {
+ $this->{"add{$extension}"}($builder);
+ }
+
+ $builder->onDelete(function (Builder $builder) {
+ $column = $this->getDeletedAtColumn($builder);
+
+ return $builder->update([
+ $column => $builder->getModel()->freshTimestampString(),
+ ]);
+ });
+ }
+
+ /**
+ * Get the "deleted at" column for the builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return string
+ */
+ protected function getDeletedAtColumn(Builder $builder)
+ {
+ if (count($builder->getQuery()->joins) > 0) {
+ return $builder->getModel()->getQualifiedDeletedAtColumn();
+ } else {
+ return $builder->getModel()->getDeletedAtColumn();
+ }
+ }
+
+ /**
+ * Add the force delete extension to the builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return void
+ */
+ protected function addForceDelete(Builder $builder)
+ {
+ $builder->macro('forceDelete', function (Builder $builder) {
+ return $builder->getQuery()->delete();
+ });
+ }
+
+ /**
+ * Add the restore extension to the builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return void
+ */
+ protected function addRestore(Builder $builder)
+ {
+ $builder->macro('restore', function (Builder $builder) {
+ $builder->withTrashed();
+
+ return $builder->update([$builder->getModel()->getDeletedAtColumn() => null]);
+ });
+ }
+
+ /**
+ * Add the with-trashed extension to the builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return void
+ */
+ protected function addWithTrashed(Builder $builder)
+ {
+ $builder->macro('withTrashed', function (Builder $builder) {
+ $this->remove($builder, $builder->getModel());
+
+ return $builder;
+ });
+ }
+
+ /**
+ * Add the only-trashed extension to the builder.
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $builder
+ * @return void
+ */
+ protected function addOnlyTrashed(Builder $builder)
+ {
+ $builder->macro('onlyTrashed', function (Builder $builder) {
+ $model = $builder->getModel();
+
+ $this->remove($builder, $model);
+
+ $builder->getQuery()->whereNotNull($model->getQualifiedDeletedAtColumn());
+
+ return $builder;
+ });
+ }
+
+ /**
+ * Determine if the given where clause is a soft delete constraint.
+ *
+ * @param array $where
+ * @param string $column
+ * @return bool
+ */
+ protected function isSoftDeleteConstraint(array $where, $column)
+ {
+ return $where['type'] == 'Null' && $where['column'] == $column;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Grammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Grammar.php
index c3db236..71645d8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Grammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Grammar.php
@@ -1,184 +1,188 @@
-isExpression($table)) return $this->getValue($table);
-
- return $this->wrap($this->tablePrefix.$table, true);
- }
-
- /**
- * Wrap a value in keyword identifiers.
- *
- * @param string $value
- * @param bool $prefixAlias
- * @return string
- */
- public function wrap($value, $prefixAlias = false)
- {
- if ($this->isExpression($value)) return $this->getValue($value);
-
- // If the value being wrapped has a column alias we will need to separate out
- // the pieces so we can wrap each of the segments of the expression on it
- // own, and then joins them both back together with the "as" connector.
- if (strpos(strtolower($value), ' as ') !== false)
- {
- $segments = explode(' ', $value);
-
- if ($prefixAlias) $segments[2] = $this->tablePrefix.$segments[2];
-
- return $this->wrap($segments[0]).' as '.$this->wrapValue($segments[2]);
- }
-
- $wrapped = array();
-
- $segments = explode('.', $value);
-
- // If the value is not an aliased table expression, we'll just wrap it like
- // normal, so if there is more than one segment, we will wrap the first
- // segments as if it was a table and the rest as just regular values.
- foreach ($segments as $key => $segment)
- {
- if ($key == 0 && count($segments) > 1)
- {
- $wrapped[] = $this->wrapTable($segment);
- }
- else
- {
- $wrapped[] = $this->wrapValue($segment);
- }
- }
-
- return implode('.', $wrapped);
- }
-
- /**
- * Wrap a single string in keyword identifiers.
- *
- * @param string $value
- * @return string
- */
- protected function wrapValue($value)
- {
- if ($value === '*') return $value;
-
- return '"'.str_replace('"', '""', $value).'"';
- }
-
- /**
- * Convert an array of column names into a delimited string.
- *
- * @param array $columns
- * @return string
- */
- public function columnize(array $columns)
- {
- return implode(', ', array_map(array($this, 'wrap'), $columns));
- }
-
- /**
- * Create query parameter place-holders for an array.
- *
- * @param array $values
- * @return string
- */
- public function parameterize(array $values)
- {
- return implode(', ', array_map(array($this, 'parameter'), $values));
- }
-
- /**
- * Get the appropriate query parameter place-holder for a value.
- *
- * @param mixed $value
- * @return string
- */
- public function parameter($value)
- {
- return $this->isExpression($value) ? $this->getValue($value) : '?';
- }
-
- /**
- * Get the value of a raw expression.
- *
- * @param \Illuminate\Database\Query\Expression $expression
- * @return string
- */
- public function getValue($expression)
- {
- return $expression->getValue();
- }
-
- /**
- * Determine if the given value is a raw expression.
- *
- * @param mixed $value
- * @return bool
- */
- public function isExpression($value)
- {
- return $value instanceof Expression;
- }
-
- /**
- * Get the format for database stored dates.
- *
- * @return string
- */
- public function getDateFormat()
- {
- return 'Y-m-d H:i:s';
- }
-
- /**
- * Get the grammar's table prefix.
- *
- * @return string
- */
- public function getTablePrefix()
- {
- return $this->tablePrefix;
- }
-
- /**
- * Set the grammar's table prefix.
- *
- * @param string $prefix
- * @return $this
- */
- public function setTablePrefix($prefix)
- {
- $this->tablePrefix = $prefix;
-
- return $this;
- }
+use Illuminate\Database\Query\Expression;
+abstract class Grammar
+{
+ /**
+ * The grammar table prefix.
+ *
+ * @var string
+ */
+ protected $tablePrefix = '';
+
+ /**
+ * Wrap an array of values.
+ *
+ * @param array $values
+ * @return array
+ */
+ public function wrapArray(array $values)
+ {
+ return array_map([$this, 'wrap'], $values);
+ }
+
+ /**
+ * Wrap a table in keyword identifiers.
+ *
+ * @param \Illuminate\Database\Query\Expression|string $table
+ * @return string
+ */
+ public function wrapTable($table)
+ {
+ if ($this->isExpression($table)) {
+ return $this->getValue($table);
+ }
+
+ return $this->wrap($this->tablePrefix.$table, true);
+ }
+
+ /**
+ * Wrap a value in keyword identifiers.
+ *
+ * @param \Illuminate\Database\Query\Expression|string $value
+ * @param bool $prefixAlias
+ * @return string
+ */
+ public function wrap($value, $prefixAlias = false)
+ {
+ if ($this->isExpression($value)) {
+ return $this->getValue($value);
+ }
+
+ // If the value being wrapped has a column alias we will need to separate out
+ // the pieces so we can wrap each of the segments of the expression on it
+ // own, and then joins them both back together with the "as" connector.
+ if (strpos(strtolower($value), ' as ') !== false) {
+ $segments = explode(' ', $value);
+
+ if ($prefixAlias) {
+ $segments[2] = $this->tablePrefix.$segments[2];
+ }
+
+ return $this->wrap($segments[0]).' as '.$this->wrapValue($segments[2]);
+ }
+
+ $wrapped = [];
+
+ $segments = explode('.', $value);
+
+ // If the value is not an aliased table expression, we'll just wrap it like
+ // normal, so if there is more than one segment, we will wrap the first
+ // segments as if it was a table and the rest as just regular values.
+ foreach ($segments as $key => $segment) {
+ if ($key == 0 && count($segments) > 1) {
+ $wrapped[] = $this->wrapTable($segment);
+ } else {
+ $wrapped[] = $this->wrapValue($segment);
+ }
+ }
+
+ return implode('.', $wrapped);
+ }
+
+ /**
+ * Wrap a single string in keyword identifiers.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function wrapValue($value)
+ {
+ if ($value === '*') {
+ return $value;
+ }
+
+ return '"'.str_replace('"', '""', $value).'"';
+ }
+
+ /**
+ * Convert an array of column names into a delimited string.
+ *
+ * @param array $columns
+ * @return string
+ */
+ public function columnize(array $columns)
+ {
+ return implode(', ', array_map([$this, 'wrap'], $columns));
+ }
+
+ /**
+ * Create query parameter place-holders for an array.
+ *
+ * @param array $values
+ * @return string
+ */
+ public function parameterize(array $values)
+ {
+ return implode(', ', array_map([$this, 'parameter'], $values));
+ }
+
+ /**
+ * Get the appropriate query parameter place-holder for a value.
+ *
+ * @param mixed $value
+ * @return string
+ */
+ public function parameter($value)
+ {
+ return $this->isExpression($value) ? $this->getValue($value) : '?';
+ }
+
+ /**
+ * Get the value of a raw expression.
+ *
+ * @param \Illuminate\Database\Query\Expression $expression
+ * @return string
+ */
+ public function getValue($expression)
+ {
+ return $expression->getValue();
+ }
+
+ /**
+ * Determine if the given value is a raw expression.
+ *
+ * @param mixed $value
+ * @return bool
+ */
+ public function isExpression($value)
+ {
+ return $value instanceof Expression;
+ }
+
+ /**
+ * Get the format for database stored dates.
+ *
+ * @return string
+ */
+ public function getDateFormat()
+ {
+ return 'Y-m-d H:i:s';
+ }
+
+ /**
+ * Get the grammar's table prefix.
+ *
+ * @return string
+ */
+ public function getTablePrefix()
+ {
+ return $this->tablePrefix;
+ }
+
+ /**
+ * Set the grammar's table prefix.
+ *
+ * @param string $prefix
+ * @return $this
+ */
+ public function setTablePrefix($prefix)
+ {
+ $this->tablePrefix = $prefix;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php
index aeca8c5..ffcea49 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php
@@ -1,226 +1,221 @@
-registerRepository();
-
- // Once we have registered the migrator instance we will go ahead and register
- // all of the migration related commands that are used by the "Artisan" CLI
- // so that they may be easily accessed for registering with the consoles.
- $this->registerMigrator();
-
- $this->registerCommands();
- }
-
- /**
- * Register the migration repository service.
- *
- * @return void
- */
- protected function registerRepository()
- {
- $this->app->singleton('migration.repository', function($app)
- {
- $table = $app['config']['database.migrations'];
-
- return new DatabaseMigrationRepository($app['db'], $table);
- });
- }
-
- /**
- * Register the migrator service.
- *
- * @return void
- */
- protected function registerMigrator()
- {
- // The migrator is responsible for actually running and rollback the migration
- // files in the application. We'll pass in our database connection resolver
- // so the migrator can resolve any of these connections when it needs to.
- $this->app->singleton('migrator', function($app)
- {
- $repository = $app['migration.repository'];
-
- return new Migrator($repository, $app['db'], $app['files']);
- });
- }
-
- /**
- * Register all of the migration commands.
- *
- * @return void
- */
- protected function registerCommands()
- {
- $commands = array('Migrate', 'Rollback', 'Reset', 'Refresh', 'Install', 'Make', 'Status');
-
- // We'll simply spin through the list of commands that are migration related
- // and register each one of them with an application container. They will
- // be resolved in the Artisan start file and registered on the console.
- foreach ($commands as $command)
- {
- $this->{'register'.$command.'Command'}();
- }
-
- // Once the commands are registered in the application IoC container we will
- // register them with the Artisan start event so that these are available
- // when the Artisan application actually starts up and is getting used.
- $this->commands(
- 'command.migrate', 'command.migrate.make',
- 'command.migrate.install', 'command.migrate.rollback',
- 'command.migrate.reset', 'command.migrate.refresh',
- 'command.migrate.status'
- );
- }
-
- /**
- * Register the "migrate" migration command.
- *
- * @return void
- */
- protected function registerMigrateCommand()
- {
- $this->app->singleton('command.migrate', function($app)
- {
- return new MigrateCommand($app['migrator']);
- });
- }
-
- /**
- * Register the "rollback" migration command.
- *
- * @return void
- */
- protected function registerRollbackCommand()
- {
- $this->app->singleton('command.migrate.rollback', function($app)
- {
- return new RollbackCommand($app['migrator']);
- });
- }
-
- /**
- * Register the "reset" migration command.
- *
- * @return void
- */
- protected function registerResetCommand()
- {
- $this->app->singleton('command.migrate.reset', function($app)
- {
- return new ResetCommand($app['migrator']);
- });
- }
-
- /**
- * Register the "refresh" migration command.
- *
- * @return void
- */
- protected function registerRefreshCommand()
- {
- $this->app->singleton('command.migrate.refresh', function()
- {
- return new RefreshCommand;
- });
- }
-
- protected function registerStatusCommand()
- {
- $this->app->singleton('command.migrate.status', function($app)
- {
- return new StatusCommand($app['migrator']);
- });
- }
-
- /**
- * Register the "install" migration command.
- *
- * @return void
- */
- protected function registerInstallCommand()
- {
- $this->app->singleton('command.migrate.install', function($app)
- {
- return new InstallCommand($app['migration.repository']);
- });
- }
-
- /**
- * Register the "make" migration command.
- *
- * @return void
- */
- protected function registerMakeCommand()
- {
- $this->registerCreator();
-
- $this->app->singleton('command.migrate.make', function($app)
- {
- // Once we have the migration creator registered, we will create the command
- // and inject the creator. The creator is responsible for the actual file
- // creation of the migrations, and may be extended by these developers.
- $creator = $app['migration.creator'];
-
- $composer = $app['composer'];
-
- return new MigrateMakeCommand($creator, $composer);
- });
- }
-
- /**
- * Register the migration creator.
- *
- * @return void
- */
- protected function registerCreator()
- {
- $this->app->singleton('migration.creator', function($app)
- {
- return new MigrationCreator($app['files']);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array(
- 'migrator', 'migration.repository', 'command.migrate',
- 'command.migrate.rollback', 'command.migrate.reset',
- 'command.migrate.refresh', 'command.migrate.install',
- 'command.migrate.status', 'migration.creator',
- 'command.migrate.make',
- );
- }
-
+class MigrationServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerRepository();
+
+ // Once we have registered the migrator instance we will go ahead and register
+ // all of the migration related commands that are used by the "Artisan" CLI
+ // so that they may be easily accessed for registering with the consoles.
+ $this->registerMigrator();
+
+ $this->registerCommands();
+ }
+
+ /**
+ * Register the migration repository service.
+ *
+ * @return void
+ */
+ protected function registerRepository()
+ {
+ $this->app->singleton('migration.repository', function ($app) {
+ $table = $app['config']['database.migrations'];
+
+ return new DatabaseMigrationRepository($app['db'], $table);
+ });
+ }
+
+ /**
+ * Register the migrator service.
+ *
+ * @return void
+ */
+ protected function registerMigrator()
+ {
+ // The migrator is responsible for actually running and rollback the migration
+ // files in the application. We'll pass in our database connection resolver
+ // so the migrator can resolve any of these connections when it needs to.
+ $this->app->singleton('migrator', function ($app) {
+ $repository = $app['migration.repository'];
+
+ return new Migrator($repository, $app['db'], $app['files']);
+ });
+ }
+
+ /**
+ * Register all of the migration commands.
+ *
+ * @return void
+ */
+ protected function registerCommands()
+ {
+ $commands = ['Migrate', 'Rollback', 'Reset', 'Refresh', 'Install', 'Make', 'Status'];
+
+ // We'll simply spin through the list of commands that are migration related
+ // and register each one of them with an application container. They will
+ // be resolved in the Artisan start file and registered on the console.
+ foreach ($commands as $command) {
+ $this->{'register'.$command.'Command'}();
+ }
+
+ // Once the commands are registered in the application IoC container we will
+ // register them with the Artisan start event so that these are available
+ // when the Artisan application actually starts up and is getting used.
+ $this->commands(
+ 'command.migrate', 'command.migrate.make',
+ 'command.migrate.install', 'command.migrate.rollback',
+ 'command.migrate.reset', 'command.migrate.refresh',
+ 'command.migrate.status'
+ );
+ }
+
+ /**
+ * Register the "migrate" migration command.
+ *
+ * @return void
+ */
+ protected function registerMigrateCommand()
+ {
+ $this->app->singleton('command.migrate', function ($app) {
+ return new MigrateCommand($app['migrator']);
+ });
+ }
+
+ /**
+ * Register the "rollback" migration command.
+ *
+ * @return void
+ */
+ protected function registerRollbackCommand()
+ {
+ $this->app->singleton('command.migrate.rollback', function ($app) {
+ return new RollbackCommand($app['migrator']);
+ });
+ }
+
+ /**
+ * Register the "reset" migration command.
+ *
+ * @return void
+ */
+ protected function registerResetCommand()
+ {
+ $this->app->singleton('command.migrate.reset', function ($app) {
+ return new ResetCommand($app['migrator']);
+ });
+ }
+
+ /**
+ * Register the "refresh" migration command.
+ *
+ * @return void
+ */
+ protected function registerRefreshCommand()
+ {
+ $this->app->singleton('command.migrate.refresh', function () {
+ return new RefreshCommand;
+ });
+ }
+
+ /**
+ * Register the "status" migration command.
+ *
+ * @return void
+ */
+ protected function registerStatusCommand()
+ {
+ $this->app->singleton('command.migrate.status', function ($app) {
+ return new StatusCommand($app['migrator']);
+ });
+ }
+
+ /**
+ * Register the "install" migration command.
+ *
+ * @return void
+ */
+ protected function registerInstallCommand()
+ {
+ $this->app->singleton('command.migrate.install', function ($app) {
+ return new InstallCommand($app['migration.repository']);
+ });
+ }
+
+ /**
+ * Register the "make" migration command.
+ *
+ * @return void
+ */
+ protected function registerMakeCommand()
+ {
+ $this->registerCreator();
+
+ $this->app->singleton('command.migrate.make', function ($app) {
+ // Once we have the migration creator registered, we will create the command
+ // and inject the creator. The creator is responsible for the actual file
+ // creation of the migrations, and may be extended by these developers.
+ $creator = $app['migration.creator'];
+
+ $composer = $app['composer'];
+
+ return new MigrateMakeCommand($creator, $composer);
+ });
+ }
+
+ /**
+ * Register the migration creator.
+ *
+ * @return void
+ */
+ protected function registerCreator()
+ {
+ $this->app->singleton('migration.creator', function ($app) {
+ return new MigrationCreator($app['files']);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'migrator', 'migration.repository', 'command.migrate',
+ 'command.migrate.rollback', 'command.migrate.reset',
+ 'command.migrate.refresh', 'command.migrate.install',
+ 'command.migrate.status', 'migration.creator',
+ 'command.migrate.make',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php
index 8894710..13f3da4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php
@@ -1,181 +1,184 @@
-table = $table;
- $this->resolver = $resolver;
- }
-
- /**
- * Get the ran migrations.
- *
- * @return array
- */
- public function getRan()
- {
- return $this->table()->lists('migration');
- }
-
- /**
- * Get the last migration batch.
- *
- * @return array
- */
- public function getLast()
- {
- $query = $this->table()->where('batch', $this->getLastBatchNumber());
-
- return $query->orderBy('migration', 'desc')->get();
- }
-
- /**
- * Log that a migration was run.
- *
- * @param string $file
- * @param int $batch
- * @return void
- */
- public function log($file, $batch)
- {
- $record = array('migration' => $file, 'batch' => $batch);
-
- $this->table()->insert($record);
- }
-
- /**
- * Remove a migration from the log.
- *
- * @param object $migration
- * @return void
- */
- public function delete($migration)
- {
- $this->table()->where('migration', $migration->migration)->delete();
- }
-
- /**
- * Get the next migration batch number.
- *
- * @return int
- */
- public function getNextBatchNumber()
- {
- return $this->getLastBatchNumber() + 1;
- }
-
- /**
- * Get the last migration batch number.
- *
- * @return int
- */
- public function getLastBatchNumber()
- {
- return $this->table()->max('batch');
- }
-
- /**
- * Create the migration repository data store.
- *
- * @return void
- */
- public function createRepository()
- {
- $schema = $this->getConnection()->getSchemaBuilder();
-
- $schema->create($this->table, function($table)
- {
- // The migrations table is responsible for keeping track of which of the
- // migrations have actually run for the application. We'll create the
- // table to hold the migration file's path as well as the batch ID.
- $table->string('migration');
-
- $table->integer('batch');
- });
- }
-
- /**
- * Determine if the migration repository exists.
- *
- * @return bool
- */
- public function repositoryExists()
- {
- $schema = $this->getConnection()->getSchemaBuilder();
-
- return $schema->hasTable($this->table);
- }
-
- /**
- * Get a query builder for the migration table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function table()
- {
- return $this->getConnection()->table($this->table);
- }
-
- /**
- * Get the connection resolver instance.
- *
- * @return \Illuminate\Database\ConnectionResolverInterface
- */
- public function getConnectionResolver()
- {
- return $this->resolver;
- }
-
- /**
- * Resolve the database connection instance.
- *
- * @return \Illuminate\Database\Connection
- */
- public function getConnection()
- {
- return $this->resolver->connection($this->connection);
- }
-
- /**
- * Set the information source to gather data.
- *
- * @param string $name
- * @return void
- */
- public function setSource($name)
- {
- $this->connection = $name;
- }
+use Illuminate\Database\ConnectionResolverInterface as Resolver;
+class DatabaseMigrationRepository implements MigrationRepositoryInterface
+{
+ /**
+ * The database connection resolver instance.
+ *
+ * @var \Illuminate\Database\ConnectionResolverInterface
+ */
+ protected $resolver;
+
+ /**
+ * The name of the migration table.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * The name of the database connection to use.
+ *
+ * @var string
+ */
+ protected $connection;
+
+ /**
+ * Create a new database migration repository instance.
+ *
+ * @param \Illuminate\Database\ConnectionResolverInterface $resolver
+ * @param string $table
+ * @return void
+ */
+ public function __construct(Resolver $resolver, $table)
+ {
+ $this->table = $table;
+ $this->resolver = $resolver;
+ }
+
+ /**
+ * Get the ran migrations.
+ *
+ * @return array
+ */
+ public function getRan()
+ {
+ return $this->table()
+ ->orderBy('batch', 'asc')
+ ->orderBy('migration', 'asc')
+ ->lists('migration');
+ }
+
+ /**
+ * Get the last migration batch.
+ *
+ * @return array
+ */
+ public function getLast()
+ {
+ $query = $this->table()->where('batch', $this->getLastBatchNumber());
+
+ return $query->orderBy('migration', 'desc')->get();
+ }
+
+ /**
+ * Log that a migration was run.
+ *
+ * @param string $file
+ * @param int $batch
+ * @return void
+ */
+ public function log($file, $batch)
+ {
+ $record = ['migration' => $file, 'batch' => $batch];
+
+ $this->table()->insert($record);
+ }
+
+ /**
+ * Remove a migration from the log.
+ *
+ * @param object $migration
+ * @return void
+ */
+ public function delete($migration)
+ {
+ $this->table()->where('migration', $migration->migration)->delete();
+ }
+
+ /**
+ * Get the next migration batch number.
+ *
+ * @return int
+ */
+ public function getNextBatchNumber()
+ {
+ return $this->getLastBatchNumber() + 1;
+ }
+
+ /**
+ * Get the last migration batch number.
+ *
+ * @return int
+ */
+ public function getLastBatchNumber()
+ {
+ return $this->table()->max('batch');
+ }
+
+ /**
+ * Create the migration repository data store.
+ *
+ * @return void
+ */
+ public function createRepository()
+ {
+ $schema = $this->getConnection()->getSchemaBuilder();
+
+ $schema->create($this->table, function ($table) {
+ // The migrations table is responsible for keeping track of which of the
+ // migrations have actually run for the application. We'll create the
+ // table to hold the migration file's path as well as the batch ID.
+ $table->string('migration');
+
+ $table->integer('batch');
+ });
+ }
+
+ /**
+ * Determine if the migration repository exists.
+ *
+ * @return bool
+ */
+ public function repositoryExists()
+ {
+ $schema = $this->getConnection()->getSchemaBuilder();
+
+ return $schema->hasTable($this->table);
+ }
+
+ /**
+ * Get a query builder for the migration table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function table()
+ {
+ return $this->getConnection()->table($this->table);
+ }
+
+ /**
+ * Get the connection resolver instance.
+ *
+ * @return \Illuminate\Database\ConnectionResolverInterface
+ */
+ public function getConnectionResolver()
+ {
+ return $this->resolver;
+ }
+
+ /**
+ * Resolve the database connection instance.
+ *
+ * @return \Illuminate\Database\Connection
+ */
+ public function getConnection()
+ {
+ return $this->resolver->connection($this->connection);
+ }
+
+ /**
+ * Set the information source to gather data.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setSource($name)
+ {
+ $this->connection = $name;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migration.php b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migration.php
index eb75d14..699154c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migration.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migration.php
@@ -1,22 +1,23 @@
-connection;
- }
+abstract class Migration
+{
+ /**
+ * The name of the database connection to use.
+ *
+ * @var string
+ */
+ protected $connection;
+ /**
+ * Get the migration connection name.
+ *
+ * @return string
+ */
+ public function getConnection()
+ {
+ return $this->connection;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php
index e70b627..beacfe1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php
@@ -1,183 +1,181 @@
-files = $files;
- }
-
- /**
- * Create a new migration at the given path.
- *
- * @param string $name
- * @param string $path
- * @param string $table
- * @param bool $create
- * @return string
- */
- public function create($name, $path, $table = null, $create = false)
- {
- $path = $this->getPath($name, $path);
-
- // First we will get the stub file for the migration, which serves as a type
- // of template for the migration. Once we have those we will populate the
- // various place-holders, save the file, and run the post create event.
- $stub = $this->getStub($table, $create);
-
- $this->files->put($path, $this->populateStub($name, $stub, $table));
-
- $this->firePostCreateHooks();
-
- return $path;
- }
-
- /**
- * Get the migration stub file.
- *
- * @param string $table
- * @param bool $create
- * @return string
- */
- protected function getStub($table, $create)
- {
- if (is_null($table))
- {
- return $this->files->get($this->getStubPath().'/blank.stub');
- }
-
- // We also have stubs for creating new tables and modifying existing tables
- // to save the developer some typing when they are creating a new tables
- // or modifying existing tables. We'll grab the appropriate stub here.
- else
- {
- $stub = $create ? 'create.stub' : 'update.stub';
-
- return $this->files->get($this->getStubPath()."/{$stub}");
- }
- }
-
- /**
- * Populate the place-holders in the migration stub.
- *
- * @param string $name
- * @param string $stub
- * @param string $table
- * @return string
- */
- protected function populateStub($name, $stub, $table)
- {
- $stub = str_replace('{{class}}', $this->getClassName($name), $stub);
-
- // Here we will replace the table place-holders with the table specified by
- // the developer, which is useful for quickly creating a tables creation
- // or update migration from the console instead of typing it manually.
- if ( ! is_null($table))
- {
- $stub = str_replace('{{table}}', $table, $stub);
- }
-
- return $stub;
- }
-
- /**
- * Get the class name of a migration name.
- *
- * @param string $name
- * @return string
- */
- protected function getClassName($name)
- {
- return studly_case($name);
- }
-
- /**
- * Fire the registered post create hooks.
- *
- * @return void
- */
- protected function firePostCreateHooks()
- {
- foreach ($this->postCreate as $callback)
- {
- call_user_func($callback);
- }
- }
-
- /**
- * Register a post migration create hook.
- *
- * @param \Closure $callback
- * @return void
- */
- public function afterCreate(Closure $callback)
- {
- $this->postCreate[] = $callback;
- }
-
- /**
- * Get the full path name to the migration.
- *
- * @param string $name
- * @param string $path
- * @return string
- */
- protected function getPath($name, $path)
- {
- return $path.'/'.$this->getDatePrefix().'_'.$name.'.php';
- }
-
- /**
- * Get the date prefix for the migration.
- *
- * @return string
- */
- protected function getDatePrefix()
- {
- return date('Y_m_d_His');
- }
-
- /**
- * Get the path to the stubs.
- *
- * @return string
- */
- public function getStubPath()
- {
- return __DIR__.'/stubs';
- }
-
- /**
- * Get the filesystem instance.
- *
- * @return \Illuminate\Filesystem\Filesystem
- */
- public function getFilesystem()
- {
- return $this->files;
- }
-
+class MigrationCreator
+{
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * The registered post create hooks.
+ *
+ * @var array
+ */
+ protected $postCreate = [];
+
+ /**
+ * Create a new migration creator instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Filesystem $files)
+ {
+ $this->files = $files;
+ }
+
+ /**
+ * Create a new migration at the given path.
+ *
+ * @param string $name
+ * @param string $path
+ * @param string $table
+ * @param bool $create
+ * @return string
+ */
+ public function create($name, $path, $table = null, $create = false)
+ {
+ $path = $this->getPath($name, $path);
+
+ // First we will get the stub file for the migration, which serves as a type
+ // of template for the migration. Once we have those we will populate the
+ // various place-holders, save the file, and run the post create event.
+ $stub = $this->getStub($table, $create);
+
+ $this->files->put($path, $this->populateStub($name, $stub, $table));
+
+ $this->firePostCreateHooks();
+
+ return $path;
+ }
+
+ /**
+ * Get the migration stub file.
+ *
+ * @param string $table
+ * @param bool $create
+ * @return string
+ */
+ protected function getStub($table, $create)
+ {
+ if (is_null($table)) {
+ return $this->files->get($this->getStubPath().'/blank.stub');
+ }
+
+ // We also have stubs for creating new tables and modifying existing tables
+ // to save the developer some typing when they are creating a new tables
+ // or modifying existing tables. We'll grab the appropriate stub here.
+ else {
+ $stub = $create ? 'create.stub' : 'update.stub';
+
+ return $this->files->get($this->getStubPath()."/{$stub}");
+ }
+ }
+
+ /**
+ * Populate the place-holders in the migration stub.
+ *
+ * @param string $name
+ * @param string $stub
+ * @param string $table
+ * @return string
+ */
+ protected function populateStub($name, $stub, $table)
+ {
+ $stub = str_replace('DummyClass', $this->getClassName($name), $stub);
+
+ // Here we will replace the table place-holders with the table specified by
+ // the developer, which is useful for quickly creating a tables creation
+ // or update migration from the console instead of typing it manually.
+ if (! is_null($table)) {
+ $stub = str_replace('DummyTable', $table, $stub);
+ }
+
+ return $stub;
+ }
+
+ /**
+ * Get the class name of a migration name.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function getClassName($name)
+ {
+ return Str::studly($name);
+ }
+
+ /**
+ * Fire the registered post create hooks.
+ *
+ * @return void
+ */
+ protected function firePostCreateHooks()
+ {
+ foreach ($this->postCreate as $callback) {
+ call_user_func($callback);
+ }
+ }
+
+ /**
+ * Register a post migration create hook.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ public function afterCreate(Closure $callback)
+ {
+ $this->postCreate[] = $callback;
+ }
+
+ /**
+ * Get the full path name to the migration.
+ *
+ * @param string $name
+ * @param string $path
+ * @return string
+ */
+ protected function getPath($name, $path)
+ {
+ return $path.'/'.$this->getDatePrefix().'_'.$name.'.php';
+ }
+
+ /**
+ * Get the date prefix for the migration.
+ *
+ * @return string
+ */
+ protected function getDatePrefix()
+ {
+ return date('Y_m_d_His');
+ }
+
+ /**
+ * Get the path to the stubs.
+ *
+ * @return string
+ */
+ public function getStubPath()
+ {
+ return __DIR__.'/stubs';
+ }
+
+ /**
+ * Get the filesystem instance.
+ *
+ * @return \Illuminate\Filesystem\Filesystem
+ */
+ public function getFilesystem()
+ {
+ return $this->files;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php
index dfafa15..5450a7a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php
@@ -1,65 +1,66 @@
-files = $files;
- $this->resolver = $resolver;
- $this->repository = $repository;
- }
-
- /**
- * Run the outstanding migrations at a given path.
- *
- * @param string $path
- * @param bool $pretend
- * @return void
- */
- public function run($path, $pretend = false)
- {
- $this->notes = array();
-
- $files = $this->getMigrationFiles($path);
-
- // Once we grab all of the migration files for the path, we will compare them
- // against the migrations that have already been run for this package then
- // run each of the outstanding migrations against a database connection.
- $ran = $this->repository->getRan();
-
- $migrations = array_diff($files, $ran);
-
- $this->requireFiles($path, $migrations);
-
- $this->runMigrationList($migrations, $pretend);
- }
-
- /**
- * Run an array of migrations.
- *
- * @param array $migrations
- * @param bool $pretend
- * @return void
- */
- public function runMigrationList($migrations, $pretend = false)
- {
- // First we will just make sure that there are any migrations to run. If there
- // aren't, we will just make a note of it to the developer so they're aware
- // that all of the migrations have been run against this database system.
- if (count($migrations) == 0)
- {
- $this->note('Nothing to migrate.');
-
- return;
- }
-
- $batch = $this->repository->getNextBatchNumber();
-
- // Once we have the array of migrations, we will spin through them and run the
- // migrations "up" so the changes are made to the databases. We'll then log
- // that the migration was run so we don't repeat it next time we execute.
- foreach ($migrations as $file)
- {
- $this->runUp($file, $batch, $pretend);
- }
- }
-
- /**
- * Run "up" a migration instance.
- *
- * @param string $file
- * @param int $batch
- * @param bool $pretend
- * @return void
- */
- protected function runUp($file, $batch, $pretend)
- {
- // First we will resolve a "real" instance of the migration class from this
- // migration file name. Once we have the instances we can run the actual
- // command such as "up" or "down", or we can just simulate the action.
- $migration = $this->resolve($file);
-
- if ($pretend)
- {
- return $this->pretendToRun($migration, 'up');
- }
-
- $migration->up();
-
- // Once we have run a migrations class, we will log that it was run in this
- // repository so that we don't try to run it next time we do a migration
- // in the application. A migration repository keeps the migrate order.
- $this->repository->log($file, $batch);
-
- $this->note("Migrated: $file");
- }
-
- /**
- * Rollback the last migration operation.
- *
- * @param bool $pretend
- * @return int
- */
- public function rollback($pretend = false)
- {
- $this->notes = array();
-
- // We want to pull in the last batch of migrations that ran on the previous
- // migration operation. We'll then reverse those migrations and run each
- // of them "down" to reverse the last migration "operation" which ran.
- $migrations = $this->repository->getLast();
-
- if (count($migrations) == 0)
- {
- $this->note('Nothing to rollback.');
-
- return count($migrations);
- }
-
- // We need to reverse these migrations so that they are "downed" in reverse
- // to what they run on "up". It lets us backtrack through the migrations
- // and properly reverse the entire database schema operation that ran.
- foreach ($migrations as $migration)
- {
- $this->runDown((object) $migration, $pretend);
- }
-
- return count($migrations);
- }
-
- /**
- * Rolls all of the currently applied migrations back.
- *
- * @param bool $pretend
- * @return int
- */
- public function reset($pretend = false)
- {
- $this->notes = [];
-
- $migrations = array_reverse($this->repository->getRan());
-
- if (count($migrations) == 0)
- {
- $this->note('Nothing to rollback.');
-
- return count($migrations);
- }
-
- foreach ($migrations as $migration)
- {
- $this->runDown((object) ['migration' => $migration], $pretend);
- }
-
- return count($migrations);
- }
-
- /**
- * Run "down" a migration instance.
- *
- * @param object $migration
- * @param bool $pretend
- * @return void
- */
- protected function runDown($migration, $pretend)
- {
- $file = $migration->migration;
-
- // First we will get the file name of the migration so we can resolve out an
- // instance of the migration. Once we get an instance we can either run a
- // pretend execution of the migration or we can run the real migration.
- $instance = $this->resolve($file);
-
- if ($pretend)
- {
- return $this->pretendToRun($instance, 'down');
- }
-
- $instance->down();
-
- // Once we have successfully run the migration "down" we will remove it from
- // the migration repository so it will be considered to have not been run
- // by the application then will be able to fire by any later operation.
- $this->repository->delete($migration);
-
- $this->note("Rolled back: $file");
- }
-
- /**
- * Get all of the migration files in a given path.
- *
- * @param string $path
- * @return array
- */
- public function getMigrationFiles($path)
- {
- $files = $this->files->glob($path.'/*_*.php');
-
- // Once we have the array of files in the directory we will just remove the
- // extension and take the basename of the file which is all we need when
- // finding the migrations that haven't been run against the databases.
- if ($files === false) return array();
-
- $files = array_map(function($file)
- {
- return str_replace('.php', '', basename($file));
-
- }, $files);
-
- // Once we have all of the formatted file names we will sort them and since
- // they all start with a timestamp this should give us the migrations in
- // the order they were actually created by the application developers.
- sort($files);
-
- return $files;
- }
-
- /**
- * Require in all the migration files in a given path.
- *
- * @param string $path
- * @param array $files
- * @return void
- */
- public function requireFiles($path, array $files)
- {
- foreach ($files as $file) $this->files->requireOnce($path.'/'.$file.'.php');
- }
-
- /**
- * Pretend to run the migrations.
- *
- * @param object $migration
- * @param string $method
- * @return void
- */
- protected function pretendToRun($migration, $method)
- {
- foreach ($this->getQueries($migration, $method) as $query)
- {
- $name = get_class($migration);
-
- $this->note("{$name}: {$query['query']}");
- }
- }
-
- /**
- * Get all of the queries that would be run for a migration.
- *
- * @param object $migration
- * @param string $method
- * @return array
- */
- protected function getQueries($migration, $method)
- {
- $connection = $migration->getConnection();
-
- // Now that we have the connections we can resolve it and pretend to run the
- // queries against the database returning the array of raw SQL statements
- // that would get fired against the database system for this migration.
- $db = $this->resolveConnection($connection);
-
- return $db->pretend(function() use ($migration, $method)
- {
- $migration->$method();
- });
- }
-
- /**
- * Resolve a migration instance from a file.
- *
- * @param string $file
- * @return object
- */
- public function resolve($file)
- {
- $file = implode('_', array_slice(explode('_', $file), 4));
-
- $class = studly_case($file);
-
- return new $class;
- }
-
- /**
- * Raise a note event for the migrator.
- *
- * @param string $message
- * @return void
- */
- protected function note($message)
- {
- $this->notes[] = $message;
- }
-
- /**
- * Get the notes for the last operation.
- *
- * @return array
- */
- public function getNotes()
- {
- return $this->notes;
- }
-
- /**
- * Resolve the database connection instance.
- *
- * @param string $connection
- * @return \Illuminate\Database\Connection
- */
- public function resolveConnection($connection)
- {
- return $this->resolver->connection($connection);
- }
-
- /**
- * Set the default connection name.
- *
- * @param string $name
- * @return void
- */
- public function setConnection($name)
- {
- if ( ! is_null($name))
- {
- $this->resolver->setDefaultConnection($name);
- }
-
- $this->repository->setSource($name);
-
- $this->connection = $name;
- }
-
- /**
- * Get the migration repository instance.
- *
- * @return \Illuminate\Database\Migrations\MigrationRepositoryInterface
- */
- public function getRepository()
- {
- return $this->repository;
- }
-
- /**
- * Determine if the migration repository exists.
- *
- * @return bool
- */
- public function repositoryExists()
- {
- return $this->repository->repositoryExists();
- }
-
- /**
- * Get the file system instance.
- *
- * @return \Illuminate\Filesystem\Filesystem
- */
- public function getFilesystem()
- {
- return $this->files;
- }
-
+ {
+ $this->files = $files;
+ $this->resolver = $resolver;
+ $this->repository = $repository;
+ }
+
+ /**
+ * Run the outstanding migrations at a given path.
+ *
+ * @param string $path
+ * @param bool $pretend
+ * @return void
+ */
+ public function run($path, $pretend = false)
+ {
+ $this->notes = [];
+
+ $files = $this->getMigrationFiles($path);
+
+ // Once we grab all of the migration files for the path, we will compare them
+ // against the migrations that have already been run for this package then
+ // run each of the outstanding migrations against a database connection.
+ $ran = $this->repository->getRan();
+
+ $migrations = array_diff($files, $ran);
+
+ $this->requireFiles($path, $migrations);
+
+ $this->runMigrationList($migrations, $pretend);
+ }
+
+ /**
+ * Run an array of migrations.
+ *
+ * @param array $migrations
+ * @param bool $pretend
+ * @return void
+ */
+ public function runMigrationList($migrations, $pretend = false)
+ {
+ // First we will just make sure that there are any migrations to run. If there
+ // aren't, we will just make a note of it to the developer so they're aware
+ // that all of the migrations have been run against this database system.
+ if (count($migrations) == 0) {
+ $this->note('Nothing to migrate.');
+
+ return;
+ }
+
+ $batch = $this->repository->getNextBatchNumber();
+
+ // Once we have the array of migrations, we will spin through them and run the
+ // migrations "up" so the changes are made to the databases. We'll then log
+ // that the migration was run so we don't repeat it next time we execute.
+ foreach ($migrations as $file) {
+ $this->runUp($file, $batch, $pretend);
+ }
+ }
+
+ /**
+ * Run "up" a migration instance.
+ *
+ * @param string $file
+ * @param int $batch
+ * @param bool $pretend
+ * @return void
+ */
+ protected function runUp($file, $batch, $pretend)
+ {
+ // First we will resolve a "real" instance of the migration class from this
+ // migration file name. Once we have the instances we can run the actual
+ // command such as "up" or "down", or we can just simulate the action.
+ $migration = $this->resolve($file);
+
+ if ($pretend) {
+ return $this->pretendToRun($migration, 'up');
+ }
+
+ $migration->up();
+
+ // Once we have run a migrations class, we will log that it was run in this
+ // repository so that we don't try to run it next time we do a migration
+ // in the application. A migration repository keeps the migrate order.
+ $this->repository->log($file, $batch);
+
+ $this->note("Migrated: $file");
+ }
+
+ /**
+ * Rollback the last migration operation.
+ *
+ * @param bool $pretend
+ * @return int
+ */
+ public function rollback($pretend = false)
+ {
+ $this->notes = [];
+
+ // We want to pull in the last batch of migrations that ran on the previous
+ // migration operation. We'll then reverse those migrations and run each
+ // of them "down" to reverse the last migration "operation" which ran.
+ $migrations = $this->repository->getLast();
+
+ $count = count($migrations);
+
+ if ($count === 0) {
+ $this->note('Nothing to rollback.');
+ } else {
+ // We need to reverse these migrations so that they are "downed" in reverse
+ // to what they run on "up". It lets us backtrack through the migrations
+ // and properly reverse the entire database schema operation that ran.
+ foreach ($migrations as $migration) {
+ $this->runDown((object) $migration, $pretend);
+ }
+ }
+
+ return $count;
+ }
+
+ /**
+ * Rolls all of the currently applied migrations back.
+ *
+ * @param bool $pretend
+ * @return int
+ */
+ public function reset($pretend = false)
+ {
+ $this->notes = [];
+
+ $migrations = array_reverse($this->repository->getRan());
+
+ $count = count($migrations);
+
+ if ($count === 0) {
+ $this->note('Nothing to rollback.');
+ } else {
+ foreach ($migrations as $migration) {
+ $this->runDown((object) ['migration' => $migration], $pretend);
+ }
+ }
+
+ return $count;
+ }
+
+ /**
+ * Run "down" a migration instance.
+ *
+ * @param object $migration
+ * @param bool $pretend
+ * @return void
+ */
+ protected function runDown($migration, $pretend)
+ {
+ $file = $migration->migration;
+
+ // First we will get the file name of the migration so we can resolve out an
+ // instance of the migration. Once we get an instance we can either run a
+ // pretend execution of the migration or we can run the real migration.
+ $instance = $this->resolve($file);
+
+ if ($pretend) {
+ return $this->pretendToRun($instance, 'down');
+ }
+
+ $instance->down();
+
+ // Once we have successfully run the migration "down" we will remove it from
+ // the migration repository so it will be considered to have not been run
+ // by the application then will be able to fire by any later operation.
+ $this->repository->delete($migration);
+
+ $this->note("Rolled back: $file");
+ }
+
+ /**
+ * Get all of the migration files in a given path.
+ *
+ * @param string $path
+ * @return array
+ */
+ public function getMigrationFiles($path)
+ {
+ $files = $this->files->glob($path.'/*_*.php');
+
+ // Once we have the array of files in the directory we will just remove the
+ // extension and take the basename of the file which is all we need when
+ // finding the migrations that haven't been run against the databases.
+ if ($files === false) {
+ return [];
+ }
+
+ $files = array_map(function ($file) {
+ return str_replace('.php', '', basename($file));
+ }, $files);
+
+ // Once we have all of the formatted file names we will sort them and since
+ // they all start with a timestamp this should give us the migrations in
+ // the order they were actually created by the application developers.
+ sort($files);
+
+ return $files;
+ }
+
+ /**
+ * Require in all the migration files in a given path.
+ *
+ * @param string $path
+ * @param array $files
+ * @return void
+ */
+ public function requireFiles($path, array $files)
+ {
+ foreach ($files as $file) {
+ $this->files->requireOnce($path.'/'.$file.'.php');
+ }
+ }
+
+ /**
+ * Pretend to run the migrations.
+ *
+ * @param object $migration
+ * @param string $method
+ * @return void
+ */
+ protected function pretendToRun($migration, $method)
+ {
+ foreach ($this->getQueries($migration, $method) as $query) {
+ $name = get_class($migration);
+
+ $this->note("{$name}: {$query['query']}");
+ }
+ }
+
+ /**
+ * Get all of the queries that would be run for a migration.
+ *
+ * @param object $migration
+ * @param string $method
+ * @return array
+ */
+ protected function getQueries($migration, $method)
+ {
+ $connection = $migration->getConnection();
+
+ // Now that we have the connections we can resolve it and pretend to run the
+ // queries against the database returning the array of raw SQL statements
+ // that would get fired against the database system for this migration.
+ $db = $this->resolveConnection($connection);
+
+ return $db->pretend(function () use ($migration, $method) {
+ $migration->$method();
+ });
+ }
+
+ /**
+ * Resolve a migration instance from a file.
+ *
+ * @param string $file
+ * @return object
+ */
+ public function resolve($file)
+ {
+ $file = implode('_', array_slice(explode('_', $file), 4));
+
+ $class = Str::studly($file);
+
+ return new $class;
+ }
+
+ /**
+ * Raise a note event for the migrator.
+ *
+ * @param string $message
+ * @return void
+ */
+ protected function note($message)
+ {
+ $this->notes[] = $message;
+ }
+
+ /**
+ * Get the notes for the last operation.
+ *
+ * @return array
+ */
+ public function getNotes()
+ {
+ return $this->notes;
+ }
+
+ /**
+ * Resolve the database connection instance.
+ *
+ * @param string $connection
+ * @return \Illuminate\Database\Connection
+ */
+ public function resolveConnection($connection)
+ {
+ return $this->resolver->connection($connection);
+ }
+
+ /**
+ * Set the default connection name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setConnection($name)
+ {
+ if (! is_null($name)) {
+ $this->resolver->setDefaultConnection($name);
+ }
+
+ $this->repository->setSource($name);
+
+ $this->connection = $name;
+ }
+
+ /**
+ * Get the migration repository instance.
+ *
+ * @return \Illuminate\Database\Migrations\MigrationRepositoryInterface
+ */
+ public function getRepository()
+ {
+ return $this->repository;
+ }
+
+ /**
+ * Determine if the migration repository exists.
+ *
+ * @return bool
+ */
+ public function repositoryExists()
+ {
+ return $this->repository->repositoryExists();
+ }
+
+ /**
+ * Get the file system instance.
+ *
+ * @return \Illuminate\Filesystem\Filesystem
+ */
+ public function getFilesystem()
+ {
+ return $this->files;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/blank.stub b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/blank.stub
index a711201..4ff5ee5 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/blank.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/blank.stub
@@ -3,26 +3,25 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
-class {{class}} extends Migration {
-
- /**
- * Run the migrations.
- *
- * @return void
- */
- public function up()
- {
- //
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- //
- }
+class DummyClass extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ //
+ }
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub
index 0f15b3e..d7320ea 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub
@@ -3,30 +3,28 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
-class {{class}} extends Migration {
-
- /**
- * Run the migrations.
- *
- * @return void
- */
- public function up()
- {
- Schema::create('{{table}}', function(Blueprint $table)
- {
- $table->increments('id');
- $table->timestamps();
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::drop('{{table}}');
- }
+class DummyClass extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('DummyTable', function (Blueprint $table) {
+ $table->increments('id');
+ $table->timestamps();
+ });
+ }
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('DummyTable');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/update.stub b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/update.stub
index cc2c904..8114a81 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/update.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/update.stub
@@ -3,32 +3,29 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
-class {{class}} extends Migration {
-
- /**
- * Run the migrations.
- *
- * @return void
- */
- public function up()
- {
- Schema::table('{{table}}', function(Blueprint $table)
- {
- //
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::table('{{table}}', function(Blueprint $table)
- {
- //
- });
- }
+class DummyClass extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('DummyTable', function (Blueprint $table) {
+ //
+ });
+ }
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('DummyTable', function (Blueprint $table) {
+ //
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php b/application/vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php
index 77e6863..446426d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php
@@ -1,4 +1,6 @@
-schemaGrammar)) { $this->useDefaultSchemaGrammar(); }
-
- return new MySqlBuilder($this);
- }
-
- /**
- * Get the default query grammar instance.
- *
- * @return \Illuminate\Database\Query\Grammars\MySqlGrammar
- */
- protected function getDefaultQueryGrammar()
- {
- return $this->withTablePrefix(new QueryGrammar);
- }
-
- /**
- * Get the default schema grammar instance.
- *
- * @return \Illuminate\Database\Schema\Grammars\MySqlGrammar
- */
- protected function getDefaultSchemaGrammar()
- {
- return $this->withTablePrefix(new SchemaGrammar);
- }
-
- /**
- * Get the default post processor instance.
- *
- * @return \Illuminate\Database\Query\Processors\Processor
- */
- protected function getDefaultPostProcessor()
- {
- return new MySqlProcessor;
- }
-
- /**
- * Get the Doctrine DBAL driver.
- *
- * @return \Doctrine\DBAL\Driver\PDOMySql\Driver
- */
- protected function getDoctrineDriver()
- {
- return new DoctrineDriver;
- }
+class MySqlConnection extends Connection
+{
+ /**
+ * Get a schema builder instance for the connection.
+ *
+ * @return \Illuminate\Database\Schema\MySqlBuilder
+ */
+ public function getSchemaBuilder()
+ {
+ if (is_null($this->schemaGrammar)) {
+ $this->useDefaultSchemaGrammar();
+ }
+
+ return new MySqlBuilder($this);
+ }
+
+ /**
+ * Get the default query grammar instance.
+ *
+ * @return \Illuminate\Database\Query\Grammars\MySqlGrammar
+ */
+ protected function getDefaultQueryGrammar()
+ {
+ return $this->withTablePrefix(new QueryGrammar);
+ }
+
+ /**
+ * Get the default schema grammar instance.
+ *
+ * @return \Illuminate\Database\Schema\Grammars\MySqlGrammar
+ */
+ protected function getDefaultSchemaGrammar()
+ {
+ return $this->withTablePrefix(new SchemaGrammar);
+ }
+
+ /**
+ * Get the default post processor instance.
+ *
+ * @return \Illuminate\Database\Query\Processors\MySqlProcessor
+ */
+ protected function getDefaultPostProcessor()
+ {
+ return new MySqlProcessor;
+ }
+ /**
+ * Get the Doctrine DBAL driver.
+ *
+ * @return \Doctrine\DBAL\Driver\PDOMySql\Driver
+ */
+ protected function getDoctrineDriver()
+ {
+ return new DoctrineDriver;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/PostgresConnection.php b/application/vendor/laravel/framework/src/Illuminate/Database/PostgresConnection.php
index 56b6c4e..779888d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/PostgresConnection.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/PostgresConnection.php
@@ -1,50 +1,66 @@
-withTablePrefix(new QueryGrammar);
- }
-
- /**
- * Get the default schema grammar instance.
- *
- * @return \Illuminate\Database\Schema\Grammars\PostgresGrammar
- */
- protected function getDefaultSchemaGrammar()
- {
- return $this->withTablePrefix(new SchemaGrammar);
- }
-
- /**
- * Get the default post processor instance.
- *
- * @return \Illuminate\Database\Query\Processors\PostgresProcessor
- */
- protected function getDefaultPostProcessor()
- {
- return new PostgresProcessor;
- }
-
- /**
- * Get the Doctrine DBAL driver.
- *
- * @return \Doctrine\DBAL\Driver\PDOPgSql\Driver
- */
- protected function getDoctrineDriver()
- {
- return new DoctrineDriver;
- }
+class PostgresConnection extends Connection
+{
+ /**
+ * Get a schema builder instance for the connection.
+ *
+ * @return \Illuminate\Database\Schema\PostgresBuilder
+ */
+ public function getSchemaBuilder()
+ {
+ if (is_null($this->schemaGrammar)) {
+ $this->useDefaultSchemaGrammar();
+ }
+
+ return new PostgresBuilder($this);
+ }
+
+ /**
+ * Get the default query grammar instance.
+ *
+ * @return \Illuminate\Database\Query\Grammars\PostgresGrammar
+ */
+ protected function getDefaultQueryGrammar()
+ {
+ return $this->withTablePrefix(new QueryGrammar);
+ }
+
+ /**
+ * Get the default schema grammar instance.
+ *
+ * @return \Illuminate\Database\Schema\Grammars\PostgresGrammar
+ */
+ protected function getDefaultSchemaGrammar()
+ {
+ return $this->withTablePrefix(new SchemaGrammar);
+ }
+
+ /**
+ * Get the default post processor instance.
+ *
+ * @return \Illuminate\Database\Query\Processors\PostgresProcessor
+ */
+ protected function getDefaultPostProcessor()
+ {
+ return new PostgresProcessor;
+ }
+ /**
+ * Get the Doctrine DBAL driver.
+ *
+ * @return \Doctrine\DBAL\Driver\PDOPgSql\Driver
+ */
+ protected function getDoctrineDriver()
+ {
+ return new DoctrineDriver;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
index 84190c5..929ec01 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
@@ -1,2002 +1,2125 @@
- [],
- 'join' => [],
- 'where' => [],
- 'having' => [],
- 'order' => [],
- );
-
- /**
- * An aggregate function and column to be run.
- *
- * @var array
- */
- public $aggregate;
-
- /**
- * The columns that should be returned.
- *
- * @var array
- */
- public $columns;
-
- /**
- * Indicates if the query returns distinct results.
- *
- * @var bool
- */
- public $distinct = false;
-
- /**
- * The table which the query is targeting.
- *
- * @var string
- */
- public $from;
-
- /**
- * The table joins for the query.
- *
- * @var array
- */
- public $joins;
-
- /**
- * The where constraints for the query.
- *
- * @var array
- */
- public $wheres;
-
- /**
- * The groupings for the query.
- *
- * @var array
- */
- public $groups;
-
- /**
- * The having constraints for the query.
- *
- * @var array
- */
- public $havings;
-
- /**
- * The orderings for the query.
- *
- * @var array
- */
- public $orders;
-
- /**
- * The maximum number of records to return.
- *
- * @var int
- */
- public $limit;
-
- /**
- * The number of records to skip.
- *
- * @var int
- */
- public $offset;
-
- /**
- * The query union statements.
- *
- * @var array
- */
- public $unions;
-
- /**
- * The maximum number of union records to return.
- *
- * @var int
- */
- public $unionLimit;
-
- /**
- * The number of union records to skip.
- *
- * @var int
- */
- public $unionOffset;
-
- /**
- * The orderings for the union query.
- *
- * @var array
- */
- public $unionOrders;
-
- /**
- * Indicates whether row locking is being used.
- *
- * @var string|bool
- */
- public $lock;
-
- /**
- * The field backups currently in use.
- *
- * @var array
- */
- protected $backups = [];
-
- /**
- * All of the available clause operators.
- *
- * @var array
- */
- protected $operators = array(
- '=', '<', '>', '<=', '>=', '<>', '!=',
- 'like', 'like binary', 'not like', 'between', 'ilike',
- '&', '|', '^', '<<', '>>',
- 'rlike', 'regexp', 'not regexp',
- '~', '~*', '!~', '!~*', 'similar to',
- 'not similar to',
- );
-
- /**
- * Whether use write pdo for select.
- *
- * @var bool
- */
- protected $useWritePdo = false;
-
- /**
- * Create a new query builder instance.
- *
- * @param \Illuminate\Database\ConnectionInterface $connection
- * @param \Illuminate\Database\Query\Grammars\Grammar $grammar
- * @param \Illuminate\Database\Query\Processors\Processor $processor
- * @return void
- */
- public function __construct(ConnectionInterface $connection,
+class Builder
+{
+ use Macroable {
+ __call as macroCall;
+ }
+
+ /**
+ * The database connection instance.
+ *
+ * @var \Illuminate\Database\Connection
+ */
+ protected $connection;
+
+ /**
+ * The database query grammar instance.
+ *
+ * @var \Illuminate\Database\Query\Grammars\Grammar
+ */
+ protected $grammar;
+
+ /**
+ * The database query post processor instance.
+ *
+ * @var \Illuminate\Database\Query\Processors\Processor
+ */
+ protected $processor;
+
+ /**
+ * The current query value bindings.
+ *
+ * @var array
+ */
+ protected $bindings = [
+ 'select' => [],
+ 'join' => [],
+ 'where' => [],
+ 'having' => [],
+ 'order' => [],
+ 'union' => [],
+ ];
+
+ /**
+ * An aggregate function and column to be run.
+ *
+ * @var array
+ */
+ public $aggregate;
+
+ /**
+ * The columns that should be returned.
+ *
+ * @var array
+ */
+ public $columns;
+
+ /**
+ * Indicates if the query returns distinct results.
+ *
+ * @var bool
+ */
+ public $distinct = false;
+
+ /**
+ * The table which the query is targeting.
+ *
+ * @var string
+ */
+ public $from;
+
+ /**
+ * The table joins for the query.
+ *
+ * @var array
+ */
+ public $joins;
+
+ /**
+ * The where constraints for the query.
+ *
+ * @var array
+ */
+ public $wheres;
+
+ /**
+ * The groupings for the query.
+ *
+ * @var array
+ */
+ public $groups;
+
+ /**
+ * The having constraints for the query.
+ *
+ * @var array
+ */
+ public $havings;
+
+ /**
+ * The orderings for the query.
+ *
+ * @var array
+ */
+ public $orders;
+
+ /**
+ * The maximum number of records to return.
+ *
+ * @var int
+ */
+ public $limit;
+
+ /**
+ * The number of records to skip.
+ *
+ * @var int
+ */
+ public $offset;
+
+ /**
+ * The query union statements.
+ *
+ * @var array
+ */
+ public $unions;
+
+ /**
+ * The maximum number of union records to return.
+ *
+ * @var int
+ */
+ public $unionLimit;
+
+ /**
+ * The number of union records to skip.
+ *
+ * @var int
+ */
+ public $unionOffset;
+
+ /**
+ * The orderings for the union query.
+ *
+ * @var array
+ */
+ public $unionOrders;
+
+ /**
+ * Indicates whether row locking is being used.
+ *
+ * @var string|bool
+ */
+ public $lock;
+
+ /**
+ * The field backups currently in use.
+ *
+ * @var array
+ */
+ protected $backups = [];
+
+ /**
+ * The binding backups currently in use.
+ *
+ * @var array
+ */
+ protected $bindingBackups = [];
+
+ /**
+ * All of the available clause operators.
+ *
+ * @var array
+ */
+ protected $operators = [
+ '=', '<', '>', '<=', '>=', '<>', '!=',
+ 'like', 'like binary', 'not like', 'between', 'ilike',
+ '&', '|', '^', '<<', '>>',
+ 'rlike', 'regexp', 'not regexp',
+ '~', '~*', '!~', '!~*', 'similar to',
+ 'not similar to',
+ ];
+
+ /**
+ * Whether use write pdo for select.
+ *
+ * @var bool
+ */
+ protected $useWritePdo = false;
+
+ /**
+ * Create a new query builder instance.
+ *
+ * @param \Illuminate\Database\ConnectionInterface $connection
+ * @param \Illuminate\Database\Query\Grammars\Grammar $grammar
+ * @param \Illuminate\Database\Query\Processors\Processor $processor
+ * @return void
+ */
+ public function __construct(ConnectionInterface $connection,
Grammar $grammar,
Processor $processor)
- {
- $this->grammar = $grammar;
- $this->processor = $processor;
- $this->connection = $connection;
- }
-
- /**
- * Set the columns to be selected.
- *
- * @param array $columns
- * @return $this
- */
- public function select($columns = array('*'))
- {
- $this->columns = is_array($columns) ? $columns : func_get_args();
-
- return $this;
- }
-
- /**
- * Add a new "raw" select expression to the query.
- *
- * @param string $expression
- * @param array $bindings
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function selectRaw($expression, array $bindings = array())
- {
- $this->addSelect(new Expression($expression));
-
- if ($bindings)
- {
- $this->addBinding($bindings, 'select');
- }
-
- return $this;
- }
-
- /**
- * Add a subselect expression to the query.
- *
- * @param \Closure|\Illuminate\Database\Query\Builder|string $query
- * @param string $as
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function selectSub($query, $as)
- {
- if ($query instanceof Closure)
- {
- $callback = $query;
-
- $callback($query = $this->newQuery());
- }
-
- if ($query instanceof Builder)
- {
- $bindings = $query->getBindings();
-
- $query = $query->toSql();
- }
- elseif (is_string($query))
- {
- $bindings = [];
- }
- else
- {
- throw new InvalidArgumentException;
- }
-
- return $this->selectRaw('('.$query.') as '.$this->grammar->wrap($as), $bindings);
- }
-
- /**
- * Add a new select column to the query.
- *
- * @param mixed $column
- * @return $this
- */
- public function addSelect($column)
- {
- $column = is_array($column) ? $column : func_get_args();
-
- $this->columns = array_merge((array) $this->columns, $column);
-
- return $this;
- }
-
- /**
- * Force the query to only return distinct results.
- *
- * @return $this
- */
- public function distinct()
- {
- $this->distinct = true;
-
- return $this;
- }
-
- /**
- * Set the table which the query is targeting.
- *
- * @param string $table
- * @return $this
- */
- public function from($table)
- {
- $this->from = $table;
-
- return $this;
- }
-
- /**
- * Add a join clause to the query.
- *
- * @param string $table
- * @param string $one
- * @param string $operator
- * @param string $two
- * @param string $type
- * @param bool $where
- * @return $this
- */
- public function join($table, $one, $operator = null, $two = null, $type = 'inner', $where = false)
- {
- // If the first "column" of the join is really a Closure instance the developer
- // is trying to build a join with a complex "on" clause containing more than
- // one condition, so we'll add the join and call a Closure with the query.
- if ($one instanceof Closure)
- {
- $this->joins[] = new JoinClause($type, $table);
-
- call_user_func($one, end($this->joins));
- }
-
- // If the column is simply a string, we can assume the join simply has a basic
- // "on" clause with a single condition. So we will just build the join with
- // this simple join clauses attached to it. There is not a join callback.
- else
- {
- $join = new JoinClause($type, $table);
-
- $this->joins[] = $join->on(
- $one, $operator, $two, 'and', $where
- );
- }
-
- return $this;
- }
-
- /**
- * Add a "join where" clause to the query.
- *
- * @param string $table
- * @param string $one
- * @param string $operator
- * @param string $two
- * @param string $type
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function joinWhere($table, $one, $operator, $two, $type = 'inner')
- {
- return $this->join($table, $one, $operator, $two, $type, true);
- }
-
- /**
- * Add a left join to the query.
- *
- * @param string $table
- * @param string $first
- * @param string $operator
- * @param string $second
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function leftJoin($table, $first, $operator = null, $second = null)
- {
- return $this->join($table, $first, $operator, $second, 'left');
- }
-
- /**
- * Add a "join where" clause to the query.
- *
- * @param string $table
- * @param string $one
- * @param string $operator
- * @param string $two
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function leftJoinWhere($table, $one, $operator, $two)
- {
- return $this->joinWhere($table, $one, $operator, $two, 'left');
- }
-
- /**
- * Add a right join to the query.
- *
- * @param string $table
- * @param string $first
- * @param string $operator
- * @param string $second
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function rightJoin($table, $first, $operator = null, $second = null)
- {
- return $this->join($table, $first, $operator, $second, 'right');
- }
-
- /**
- * Add a "right join where" clause to the query.
- *
- * @param string $table
- * @param string $one
- * @param string $operator
- * @param string $two
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function rightJoinWhere($table, $one, $operator, $two)
- {
- return $this->joinWhere($table, $one, $operator, $two, 'right');
- }
-
- /**
- * Add a basic where clause to the query.
- *
- * @param string|array|\Closure $column
- * @param string $operator
- * @param mixed $value
- * @param string $boolean
- * @return $this
- *
- * @throws \InvalidArgumentException
- */
- public function where($column, $operator = null, $value = null, $boolean = 'and')
- {
- // If the column is an array, we will assume it is an array of key-value pairs
- // and can add them each as a where clause. We will maintain the boolean we
- // received when the method was called and pass it into the nested where.
- if (is_array($column))
- {
- return $this->whereNested(function($query) use ($column)
- {
- foreach ($column as $key => $value)
- {
- $query->where($key, '=', $value);
- }
- }, $boolean);
- }
-
- // Here we will make some assumptions about the operator. If only 2 values are
- // passed to the method, we will assume that the operator is an equals sign
- // and keep going. Otherwise, we'll require the operator to be passed in.
- if (func_num_args() == 2)
- {
- list($value, $operator) = array($operator, '=');
- }
- elseif ($this->invalidOperatorAndValue($operator, $value))
- {
- throw new InvalidArgumentException("Illegal operator and value combination.");
- }
-
- // If the columns is actually a Closure instance, we will assume the developer
- // wants to begin a nested where statement which is wrapped in parenthesis.
- // We'll add that Closure to the query then return back out immediately.
- if ($column instanceof Closure)
- {
- return $this->whereNested($column, $boolean);
- }
-
- // If the given operator is not found in the list of valid operators we will
- // assume that the developer is just short-cutting the '=' operators and
- // we will set the operators to '=' and set the values appropriately.
- if ( ! in_array(strtolower($operator), $this->operators, true))
- {
- list($value, $operator) = array($operator, '=');
- }
-
- // If the value is a Closure, it means the developer is performing an entire
- // sub-select within the query and we will need to compile the sub-select
- // within the where clause to get the appropriate query record results.
- if ($value instanceof Closure)
- {
- return $this->whereSub($column, $operator, $value, $boolean);
- }
-
- // If the value is "null", we will just assume the developer wants to add a
- // where null clause to the query. So, we will allow a short-cut here to
- // that method for convenience so the developer doesn't have to check.
- if (is_null($value))
- {
- return $this->whereNull($column, $boolean, $operator != '=');
- }
-
- // Now that we are working with just a simple query we can put the elements
- // in our array and add the query binding to our array of bindings that
- // will be bound to each SQL statements when it is finally executed.
- $type = 'Basic';
-
- $this->wheres[] = compact('type', 'column', 'operator', 'value', 'boolean');
-
- if ( ! $value instanceof Expression)
- {
- $this->addBinding($value, 'where');
- }
-
- return $this;
- }
-
- /**
- * Add an "or where" clause to the query.
- *
- * @param string $column
- * @param string $operator
- * @param mixed $value
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhere($column, $operator = null, $value = null)
- {
- return $this->where($column, $operator, $value, 'or');
- }
-
- /**
- * Determine if the given operator and value combination is legal.
- *
- * @param string $operator
- * @param mixed $value
- * @return bool
- */
- protected function invalidOperatorAndValue($operator, $value)
- {
- $isOperator = in_array($operator, $this->operators);
-
- return $isOperator && $operator != '=' && is_null($value);
- }
-
- /**
- * Add a raw where clause to the query.
- *
- * @param string $sql
- * @param array $bindings
- * @param string $boolean
- * @return $this
- */
- public function whereRaw($sql, array $bindings = array(), $boolean = 'and')
- {
- $type = 'raw';
-
- $this->wheres[] = compact('type', 'sql', 'boolean');
-
- $this->addBinding($bindings, 'where');
-
- return $this;
- }
-
- /**
- * Add a raw or where clause to the query.
- *
- * @param string $sql
- * @param array $bindings
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereRaw($sql, array $bindings = array())
- {
- return $this->whereRaw($sql, $bindings, 'or');
- }
-
- /**
- * Add a where between statement to the query.
- *
- * @param string $column
- * @param array $values
- * @param string $boolean
- * @param bool $not
- * @return $this
- */
- public function whereBetween($column, array $values, $boolean = 'and', $not = false)
- {
- $type = 'between';
-
- $this->wheres[] = compact('column', 'type', 'boolean', 'not');
-
- $this->addBinding($values, 'where');
-
- return $this;
- }
-
- /**
- * Add an or where between statement to the query.
- *
- * @param string $column
- * @param array $values
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereBetween($column, array $values)
- {
- return $this->whereBetween($column, $values, 'or');
- }
-
- /**
- * Add a where not between statement to the query.
- *
- * @param string $column
- * @param array $values
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereNotBetween($column, array $values, $boolean = 'and')
- {
- return $this->whereBetween($column, $values, $boolean, true);
- }
-
- /**
- * Add an or where not between statement to the query.
- *
- * @param string $column
- * @param array $values
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereNotBetween($column, array $values)
- {
- return $this->whereNotBetween($column, $values, 'or');
- }
-
- /**
- * Add a nested where statement to the query.
- *
- * @param \Closure $callback
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereNested(Closure $callback, $boolean = 'and')
- {
- // To handle nested queries we'll actually create a brand new query instance
- // and pass it off to the Closure that we have. The Closure can simply do
- // do whatever it wants to a query then we will store it for compiling.
- $query = $this->newQuery();
-
- $query->from($this->from);
-
- call_user_func($callback, $query);
-
- return $this->addNestedWhereQuery($query, $boolean);
- }
-
- /**
- * Add another query builder as a nested where to the query builder.
- *
- * @param \Illuminate\Database\Query\Builder|static $query
- * @param string $boolean
- * @return $this
- */
- public function addNestedWhereQuery($query, $boolean = 'and')
- {
- if (count($query->wheres))
- {
- $type = 'Nested';
-
- $this->wheres[] = compact('type', 'query', 'boolean');
-
- $this->mergeBindings($query);
- }
-
- return $this;
- }
-
- /**
- * Add a full sub-select to the query.
- *
- * @param string $column
- * @param string $operator
- * @param \Closure $callback
- * @param string $boolean
- * @return $this
- */
- protected function whereSub($column, $operator, Closure $callback, $boolean)
- {
- $type = 'Sub';
-
- $query = $this->newQuery();
-
- // Once we have the query instance we can simply execute it so it can add all
- // of the sub-select's conditions to itself, and then we can cache it off
- // in the array of where clauses for the "main" parent query instance.
- call_user_func($callback, $query);
-
- $this->wheres[] = compact('type', 'column', 'operator', 'query', 'boolean');
-
- $this->mergeBindings($query);
-
- return $this;
- }
-
- /**
- * Add an exists clause to the query.
- *
- * @param \Closure $callback
- * @param string $boolean
- * @param bool $not
- * @return $this
- */
- public function whereExists(Closure $callback, $boolean = 'and', $not = false)
- {
- $type = $not ? 'NotExists' : 'Exists';
-
- $query = $this->newQuery();
-
- // Similar to the sub-select clause, we will create a new query instance so
- // the developer may cleanly specify the entire exists query and we will
- // compile the whole thing in the grammar and insert it into the SQL.
- call_user_func($callback, $query);
-
- $this->wheres[] = compact('type', 'operator', 'query', 'boolean');
-
- $this->mergeBindings($query);
-
- return $this;
- }
-
- /**
- * Add an or exists clause to the query.
- *
- * @param \Closure $callback
- * @param bool $not
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereExists(Closure $callback, $not = false)
- {
- return $this->whereExists($callback, 'or', $not);
- }
-
- /**
- * Add a where not exists clause to the query.
- *
- * @param \Closure $callback
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereNotExists(Closure $callback, $boolean = 'and')
- {
- return $this->whereExists($callback, $boolean, true);
- }
-
- /**
- * Add a where not exists clause to the query.
- *
- * @param \Closure $callback
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereNotExists(Closure $callback)
- {
- return $this->orWhereExists($callback, true);
- }
-
- /**
- * Add a "where in" clause to the query.
- *
- * @param string $column
- * @param mixed $values
- * @param string $boolean
- * @param bool $not
- * @return $this
- */
- public function whereIn($column, $values, $boolean = 'and', $not = false)
- {
- $type = $not ? 'NotIn' : 'In';
-
- // If the value of the where in clause is actually a Closure, we will assume that
- // the developer is using a full sub-select for this "in" statement, and will
- // execute those Closures, then we can re-construct the entire sub-selects.
- if ($values instanceof Closure)
- {
- return $this->whereInSub($column, $values, $boolean, $not);
- }
-
- $this->wheres[] = compact('type', 'column', 'values', 'boolean');
-
- $this->addBinding($values, 'where');
-
- return $this;
- }
-
- /**
- * Add an "or where in" clause to the query.
- *
- * @param string $column
- * @param mixed $values
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereIn($column, $values)
- {
- return $this->whereIn($column, $values, 'or');
- }
-
- /**
- * Add a "where not in" clause to the query.
- *
- * @param string $column
- * @param mixed $values
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereNotIn($column, $values, $boolean = 'and')
- {
- return $this->whereIn($column, $values, $boolean, true);
- }
-
- /**
- * Add an "or where not in" clause to the query.
- *
- * @param string $column
- * @param mixed $values
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereNotIn($column, $values)
- {
- return $this->whereNotIn($column, $values, 'or');
- }
-
- /**
- * Add a where in with a sub-select to the query.
- *
- * @param string $column
- * @param \Closure $callback
- * @param string $boolean
- * @param bool $not
- * @return $this
- */
- protected function whereInSub($column, Closure $callback, $boolean, $not)
- {
- $type = $not ? 'NotInSub' : 'InSub';
-
- // To create the exists sub-select, we will actually create a query and call the
- // provided callback with the query so the developer may set any of the query
- // conditions they want for the in clause, then we'll put it in this array.
- call_user_func($callback, $query = $this->newQuery());
-
- $this->wheres[] = compact('type', 'column', 'query', 'boolean');
-
- $this->mergeBindings($query);
-
- return $this;
- }
-
- /**
- * Add a "where null" clause to the query.
- *
- * @param string $column
- * @param string $boolean
- * @param bool $not
- * @return $this
- */
- public function whereNull($column, $boolean = 'and', $not = false)
- {
- $type = $not ? 'NotNull' : 'Null';
-
- $this->wheres[] = compact('type', 'column', 'boolean');
-
- return $this;
- }
-
- /**
- * Add an "or where null" clause to the query.
- *
- * @param string $column
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereNull($column)
- {
- return $this->whereNull($column, 'or');
- }
-
- /**
- * Add a "where not null" clause to the query.
- *
- * @param string $column
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereNotNull($column, $boolean = 'and')
- {
- return $this->whereNull($column, $boolean, true);
- }
-
- /**
- * Add an "or where not null" clause to the query.
- *
- * @param string $column
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orWhereNotNull($column)
- {
- return $this->whereNotNull($column, 'or');
- }
-
- /**
- * Add a "where date" statement to the query.
- *
- * @param string $column
- * @param string $operator
- * @param int $value
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereDate($column, $operator, $value, $boolean = 'and')
- {
- return $this->addDateBasedWhere('Date', $column, $operator, $value, $boolean);
- }
-
- /**
- * Add a "where day" statement to the query.
- *
- * @param string $column
- * @param string $operator
- * @param int $value
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereDay($column, $operator, $value, $boolean = 'and')
- {
- return $this->addDateBasedWhere('Day', $column, $operator, $value, $boolean);
- }
-
- /**
- * Add a "where month" statement to the query.
- *
- * @param string $column
- * @param string $operator
- * @param int $value
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereMonth($column, $operator, $value, $boolean = 'and')
- {
- return $this->addDateBasedWhere('Month', $column, $operator, $value, $boolean);
- }
-
- /**
- * Add a "where year" statement to the query.
- *
- * @param string $column
- * @param string $operator
- * @param int $value
- * @param string $boolean
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function whereYear($column, $operator, $value, $boolean = 'and')
- {
- return $this->addDateBasedWhere('Year', $column, $operator, $value, $boolean);
- }
-
- /**
- * Add a date based (year, month, day) statement to the query.
- *
- * @param string $type
- * @param string $column
- * @param string $operator
- * @param int $value
- * @param string $boolean
- * @return $this
- */
- protected function addDateBasedWhere($type, $column, $operator, $value, $boolean = 'and')
- {
- $this->wheres[] = compact('column', 'type', 'boolean', 'operator', 'value');
-
- $this->addBinding($value, 'where');
-
- return $this;
- }
-
- /**
- * Handles dynamic "where" clauses to the query.
- *
- * @param string $method
- * @param string $parameters
- * @return $this
- */
- public function dynamicWhere($method, $parameters)
- {
- $finder = substr($method, 5);
-
- $segments = preg_split('/(And|Or)(?=[A-Z])/', $finder, -1, PREG_SPLIT_DELIM_CAPTURE);
-
- // The connector variable will determine which connector will be used for the
- // query condition. We will change it as we come across new boolean values
- // in the dynamic method strings, which could contain a number of these.
- $connector = 'and';
-
- $index = 0;
-
- foreach ($segments as $segment)
- {
- // If the segment is not a boolean connector, we can assume it is a column's name
- // and we will add it to the query as a new constraint as a where clause, then
- // we can keep iterating through the dynamic method string's segments again.
- if ($segment != 'And' && $segment != 'Or')
- {
- $this->addDynamic($segment, $connector, $parameters, $index);
-
- $index++;
- }
-
- // Otherwise, we will store the connector so we know how the next where clause we
- // find in the query should be connected to the previous ones, meaning we will
- // have the proper boolean connector to connect the next where clause found.
- else
- {
- $connector = $segment;
- }
- }
-
- return $this;
- }
-
- /**
- * Add a single dynamic where clause statement to the query.
- *
- * @param string $segment
- * @param string $connector
- * @param array $parameters
- * @param int $index
- * @return void
- */
- protected function addDynamic($segment, $connector, $parameters, $index)
- {
- // Once we have parsed out the columns and formatted the boolean operators we
- // are ready to add it to this query as a where clause just like any other
- // clause on the query. Then we'll increment the parameter index values.
- $bool = strtolower($connector);
-
- $this->where(snake_case($segment), '=', $parameters[$index], $bool);
- }
-
- /**
- * Add a "group by" clause to the query.
- *
- * @param array|string $column,...
- * @return $this
- */
- public function groupBy()
- {
- foreach (func_get_args() as $arg)
- {
- $this->groups = array_merge((array) $this->groups, is_array($arg) ? $arg : [$arg]);
- }
-
- return $this;
- }
-
- /**
- * Add a "having" clause to the query.
- *
- * @param string $column
- * @param string $operator
- * @param string $value
- * @param string $boolean
- * @return $this
- */
- public function having($column, $operator = null, $value = null, $boolean = 'and')
- {
- $type = 'basic';
-
- $this->havings[] = compact('type', 'column', 'operator', 'value', 'boolean');
-
- if ( ! $value instanceof Expression)
- {
- $this->addBinding($value, 'having');
- }
-
- return $this;
- }
-
- /**
- * Add a "or having" clause to the query.
- *
- * @param string $column
- * @param string $operator
- * @param string $value
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orHaving($column, $operator = null, $value = null)
- {
- return $this->having($column, $operator, $value, 'or');
- }
-
- /**
- * Add a raw having clause to the query.
- *
- * @param string $sql
- * @param array $bindings
- * @param string $boolean
- * @return $this
- */
- public function havingRaw($sql, array $bindings = array(), $boolean = 'and')
- {
- $type = 'raw';
-
- $this->havings[] = compact('type', 'sql', 'boolean');
-
- $this->addBinding($bindings, 'having');
-
- return $this;
- }
-
- /**
- * Add a raw or having clause to the query.
- *
- * @param string $sql
- * @param array $bindings
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function orHavingRaw($sql, array $bindings = array())
- {
- return $this->havingRaw($sql, $bindings, 'or');
- }
-
- /**
- * Add an "order by" clause to the query.
- *
- * @param string $column
- * @param string $direction
- * @return $this
- */
- public function orderBy($column, $direction = 'asc')
- {
- $property = $this->unions ? 'unionOrders' : 'orders';
- $direction = strtolower($direction) == 'asc' ? 'asc' : 'desc';
-
- $this->{$property}[] = compact('column', 'direction');
-
- return $this;
- }
-
- /**
- * Add an "order by" clause for a timestamp to the query.
- *
- * @param string $column
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function latest($column = 'created_at')
- {
- return $this->orderBy($column, 'desc');
- }
-
- /**
- * Add an "order by" clause for a timestamp to the query.
- *
- * @param string $column
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function oldest($column = 'created_at')
- {
- return $this->orderBy($column, 'asc');
- }
-
- /**
- * Add a raw "order by" clause to the query.
- *
- * @param string $sql
- * @param array $bindings
- * @return $this
- */
- public function orderByRaw($sql, $bindings = array())
- {
- $type = 'raw';
-
- $this->orders[] = compact('type', 'sql');
-
- $this->addBinding($bindings, 'order');
-
- return $this;
- }
-
- /**
- * Set the "offset" value of the query.
- *
- * @param int $value
- * @return $this
- */
- public function offset($value)
- {
- $property = $this->unions ? 'unionOffset' : 'offset';
-
- $this->$property = max(0, $value);
-
- return $this;
- }
-
- /**
- * Alias to set the "offset" value of the query.
- *
- * @param int $value
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function skip($value)
- {
- return $this->offset($value);
- }
-
- /**
- * Set the "limit" value of the query.
- *
- * @param int $value
- * @return $this
- */
- public function limit($value)
- {
- $property = $this->unions ? 'unionLimit' : 'limit';
-
- if ($value > 0) $this->$property = $value;
-
- return $this;
- }
-
- /**
- * Alias to set the "limit" value of the query.
- *
- * @param int $value
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function take($value)
- {
- return $this->limit($value);
- }
-
- /**
- * Set the limit and offset for a given page.
- *
- * @param int $page
- * @param int $perPage
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function forPage($page, $perPage = 15)
- {
- return $this->skip(($page - 1) * $perPage)->take($perPage);
- }
-
- /**
- * Add a union statement to the query.
- *
- * @param \Illuminate\Database\Query\Builder|\Closure $query
- * @param bool $all
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function union($query, $all = false)
- {
- if ($query instanceof Closure)
- {
- call_user_func($query, $query = $this->newQuery());
- }
-
- $this->unions[] = compact('query', 'all');
-
- return $this->mergeBindings($query);
- }
-
- /**
- * Add a union all statement to the query.
- *
- * @param \Illuminate\Database\Query\Builder|\Closure $query
- * @return \Illuminate\Database\Query\Builder|static
- */
- public function unionAll($query)
- {
- return $this->union($query, true);
- }
-
- /**
- * Lock the selected rows in the table.
- *
- * @param bool $value
- * @return $this
- */
- public function lock($value = true)
- {
- $this->lock = $value;
-
- return $this;
- }
-
- /**
- * Lock the selected rows in the table for updating.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- public function lockForUpdate()
- {
- return $this->lock(true);
- }
-
- /**
- * Share lock the selected rows in the table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- public function sharedLock()
- {
- return $this->lock(false);
- }
-
- /**
- * Get the SQL representation of the query.
- *
- * @return string
- */
- public function toSql()
- {
- return $this->grammar->compileSelect($this);
- }
-
- /**
- * Execute a query for a single record by ID.
- *
- * @param int $id
- * @param array $columns
- * @return mixed|static
- */
- public function find($id, $columns = array('*'))
- {
- return $this->where('id', '=', $id)->first($columns);
- }
-
- /**
- * Pluck a single column's value from the first result of a query.
- *
- * @param string $column
- * @return mixed
- */
- public function pluck($column)
- {
- $result = (array) $this->first(array($column));
-
- return count($result) > 0 ? reset($result) : null;
- }
-
- /**
- * Execute the query and get the first result.
- *
- * @param array $columns
- * @return mixed|static
- */
- public function first($columns = array('*'))
- {
- $results = $this->take(1)->get($columns);
-
- return count($results) > 0 ? reset($results) : null;
- }
-
- /**
- * Execute the query as a "select" statement.
- *
- * @param array $columns
- * @return array|static[]
- */
- public function get($columns = array('*'))
- {
- return $this->getFresh($columns);
- }
-
- /**
- * Execute the query as a fresh "select" statement.
- *
- * @param array $columns
- * @return array|static[]
- */
- public function getFresh($columns = array('*'))
- {
- if (is_null($this->columns)) $this->columns = $columns;
-
- return $this->processor->processSelect($this, $this->runSelect());
- }
-
- /**
- * Run the query as a "select" statement against the connection.
- *
- * @return array
- */
- protected function runSelect()
- {
- return $this->connection->select($this->toSql(), $this->getBindings(), ! $this->useWritePdo);
- }
-
- /**
- * Paginate the given query into a simple paginator.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
- */
- public function paginate($perPage = 15, $columns = ['*'])
- {
- $page = Paginator::resolveCurrentPage();
-
- $total = $this->getCountForPagination($columns);
-
- $results = $this->forPage($page, $perPage)->get($columns);
-
- return new LengthAwarePaginator($results, $total, $perPage, $page, [
- 'path' => Paginator::resolveCurrentPath(),
- ]);
- }
-
- /**
- * Get a paginator only supporting simple next and previous links.
- *
- * This is more efficient on larger data-sets, etc.
- *
- * @param int $perPage
- * @param array $columns
- * @return \Illuminate\Contracts\Pagination\Paginator
- */
- public function simplePaginate($perPage = 15, $columns = ['*'])
- {
- $page = Paginator::resolveCurrentPage();
-
- $this->skip(($page - 1) * $perPage)->take($perPage + 1);
-
- return new Paginator($this->get($columns), $perPage, $page, [
- 'path' => Paginator::resolveCurrentPath(),
- ]);
- }
-
- /**
- * Get the count of the total records for the paginator.
- *
- * @param array $columns
- * @return int
- */
- public function getCountForPagination($columns = ['*'])
- {
- $this->backupFieldsForCount();
-
- $this->aggregate = ['function' => 'count', 'columns' => $columns];
-
- $results = $this->get();
-
- $this->aggregate = null;
-
- $this->restoreFieldsForCount();
-
- if (isset($this->groups)) return count($results);
-
- return isset($results[0]) ? (int) array_change_key_case((array) $results[0])['aggregate'] : 0;
- }
-
- /**
- * Backup some fields for the pagination count.
- *
- * @return void
- */
- protected function backupFieldsForCount()
- {
- foreach (['orders', 'limit', 'offset', 'columns'] as $field)
- {
- $this->backups[$field] = $this->{$field};
-
- $this->{$field} = null;
- }
- }
-
- /**
- * Restore some fields after the pagination count.
- *
- * @return void
- */
- protected function restoreFieldsForCount()
- {
- foreach (['orders', 'limit', 'offset', 'columns'] as $field)
- {
- $this->{$field} = $this->backups[$field];
- }
-
- $this->backups = [];
- }
-
- /**
- * Chunk the results of the query.
- *
- * @param int $count
- * @param callable $callback
- * @return void
- */
- public function chunk($count, callable $callback)
- {
- $results = $this->forPage($page = 1, $count)->get();
-
- while (count($results) > 0)
- {
- // On each chunk result set, we will pass them to the callback and then let the
- // developer take care of everything within the callback, which allows us to
- // keep the memory low for spinning through large result sets for working.
- if (call_user_func($callback, $results) === false)
- {
- break;
- }
-
- $page++;
-
- $results = $this->forPage($page, $count)->get();
- }
- }
-
- /**
- * Get an array with the values of a given column.
- *
- * @param string $column
- * @param string $key
- * @return array
- */
- public function lists($column, $key = null)
- {
- $columns = $this->getListSelect($column, $key);
-
- $results = new Collection($this->get($columns));
-
- return $results->lists($columns[0], array_get($columns, 1));
- }
-
- /**
- * Get the columns that should be used in a list array.
- *
- * @param string $column
- * @param string $key
- * @return array
- */
- protected function getListSelect($column, $key)
- {
- $select = is_null($key) ? array($column) : array($column, $key);
-
- // If the selected column contains a "dot", we will remove it so that the list
- // operation can run normally. Specifying the table is not needed, since we
- // really want the names of the columns as it is in this resulting array.
- return array_map(function($column)
- {
- $dot = strpos($column, '.');
-
- return $dot === false ? $column : substr($column, $dot + 1);
- }, $select);
- }
-
- /**
- * Concatenate values of a given column as a string.
- *
- * @param string $column
- * @param string $glue
- * @return string
- */
- public function implode($column, $glue = null)
- {
- if (is_null($glue)) return implode($this->lists($column));
-
- return implode($glue, $this->lists($column));
- }
-
- /**
- * Determine if any rows exist for the current query.
- *
- * @return bool
- */
- public function exists()
- {
- $limit = $this->limit;
-
- $result = $this->limit(1)->count() > 0;
-
- $this->limit($limit);
-
- return $result;
- }
-
- /**
- * Retrieve the "count" result of the query.
- *
- * @param string $columns
- * @return int
- */
- public function count($columns = '*')
- {
- if ( ! is_array($columns))
- {
- $columns = array($columns);
- }
-
- return (int) $this->aggregate(__FUNCTION__, $columns);
- }
-
- /**
- * Retrieve the minimum value of a given column.
- *
- * @param string $column
- * @return float|int
- */
- public function min($column)
- {
- return $this->aggregate(__FUNCTION__, array($column));
- }
-
- /**
- * Retrieve the maximum value of a given column.
- *
- * @param string $column
- * @return float|int
- */
- public function max($column)
- {
- return $this->aggregate(__FUNCTION__, array($column));
- }
-
- /**
- * Retrieve the sum of the values of a given column.
- *
- * @param string $column
- * @return float|int
- */
- public function sum($column)
- {
- $result = $this->aggregate(__FUNCTION__, array($column));
-
- return $result ?: 0;
- }
-
- /**
- * Retrieve the average of the values of a given column.
- *
- * @param string $column
- * @return float|int
- */
- public function avg($column)
- {
- return $this->aggregate(__FUNCTION__, array($column));
- }
-
- /**
- * Execute an aggregate function on the database.
- *
- * @param string $function
- * @param array $columns
- * @return float|int
- */
- public function aggregate($function, $columns = array('*'))
- {
- $this->aggregate = compact('function', 'columns');
-
- $previousColumns = $this->columns;
-
- $results = $this->get($columns);
-
- // Once we have executed the query, we will reset the aggregate property so
- // that more select queries can be executed against the database without
- // the aggregate value getting in the way when the grammar builds it.
- $this->aggregate = null;
-
- $this->columns = $previousColumns;
-
- if (isset($results[0]))
- {
- $result = array_change_key_case((array) $results[0]);
-
- return $result['aggregate'];
- }
- }
-
- /**
- * Insert a new record into the database.
- *
- * @param array $values
- * @return bool
- */
- public function insert(array $values)
- {
- if (empty($values)) return true;
-
- // Since every insert gets treated like a batch insert, we will make sure the
- // bindings are structured in a way that is convenient for building these
- // inserts statements by verifying the elements are actually an array.
- if ( ! is_array(reset($values)))
- {
- $values = array($values);
- }
-
- // Since every insert gets treated like a batch insert, we will make sure the
- // bindings are structured in a way that is convenient for building these
- // inserts statements by verifying the elements are actually an array.
- else
- {
- foreach ($values as $key => $value)
- {
- ksort($value); $values[$key] = $value;
- }
- }
-
- // We'll treat every insert like a batch insert so we can easily insert each
- // of the records into the database consistently. This will make it much
- // easier on the grammars to just handle one type of record insertion.
- $bindings = array();
-
- foreach ($values as $record)
- {
- foreach ($record as $value)
- {
- $bindings[] = $value;
- }
- }
-
- $sql = $this->grammar->compileInsert($this, $values);
-
- // Once we have compiled the insert statement's SQL we can execute it on the
- // connection and return a result as a boolean success indicator as that
- // is the same type of result returned by the raw connection instance.
- $bindings = $this->cleanBindings($bindings);
-
- return $this->connection->insert($sql, $bindings);
- }
-
- /**
- * Insert a new record and get the value of the primary key.
- *
- * @param array $values
- * @param string $sequence
- * @return int
- */
- public function insertGetId(array $values, $sequence = null)
- {
- $sql = $this->grammar->compileInsertGetId($this, $values, $sequence);
-
- $values = $this->cleanBindings($values);
-
- return $this->processor->processInsertGetId($this, $sql, $values, $sequence);
- }
-
- /**
- * Update a record in the database.
- *
- * @param array $values
- * @return int
- */
- public function update(array $values)
- {
- $bindings = array_values(array_merge($values, $this->getBindings()));
-
- $sql = $this->grammar->compileUpdate($this, $values);
-
- return $this->connection->update($sql, $this->cleanBindings($bindings));
- }
-
- /**
- * Increment a column's value by a given amount.
- *
- * @param string $column
- * @param int $amount
- * @param array $extra
- * @return int
- */
- public function increment($column, $amount = 1, array $extra = array())
- {
- $wrapped = $this->grammar->wrap($column);
-
- $columns = array_merge(array($column => $this->raw("$wrapped + $amount")), $extra);
-
- return $this->update($columns);
- }
-
- /**
- * Decrement a column's value by a given amount.
- *
- * @param string $column
- * @param int $amount
- * @param array $extra
- * @return int
- */
- public function decrement($column, $amount = 1, array $extra = array())
- {
- $wrapped = $this->grammar->wrap($column);
-
- $columns = array_merge(array($column => $this->raw("$wrapped - $amount")), $extra);
-
- return $this->update($columns);
- }
-
- /**
- * Delete a record from the database.
- *
- * @param mixed $id
- * @return int
- */
- public function delete($id = null)
- {
- // If an ID is passed to the method, we will set the where clause to check
- // the ID to allow developers to simply and quickly remove a single row
- // from their database without manually specifying the where clauses.
- if ( ! is_null($id)) $this->where('id', '=', $id);
-
- $sql = $this->grammar->compileDelete($this);
-
- return $this->connection->delete($sql, $this->getBindings());
- }
-
- /**
- * Run a truncate statement on the table.
- *
- * @return void
- */
- public function truncate()
- {
- foreach ($this->grammar->compileTruncate($this) as $sql => $bindings)
- {
- $this->connection->statement($sql, $bindings);
- }
- }
-
- /**
- * Get a new instance of the query builder.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- public function newQuery()
- {
- return new Builder($this->connection, $this->grammar, $this->processor);
- }
-
- /**
- * Merge an array of where clauses and bindings.
- *
- * @param array $wheres
- * @param array $bindings
- * @return void
- */
- public function mergeWheres($wheres, $bindings)
- {
- $this->wheres = array_merge((array) $this->wheres, (array) $wheres);
-
- $this->bindings['where'] = array_values(array_merge($this->bindings['where'], (array) $bindings));
- }
-
- /**
- * Remove all of the expressions from a list of bindings.
- *
- * @param array $bindings
- * @return array
- */
- protected function cleanBindings(array $bindings)
- {
- return array_values(array_filter($bindings, function($binding)
- {
- return ! $binding instanceof Expression;
- }));
- }
-
- /**
- * Create a raw database expression.
- *
- * @param mixed $value
- * @return \Illuminate\Database\Query\Expression
- */
- public function raw($value)
- {
- return $this->connection->raw($value);
- }
-
- /**
- * Get the current query value bindings in a flattened array.
- *
- * @return array
- */
- public function getBindings()
- {
- return array_flatten($this->bindings);
- }
-
- /**
- * Get the raw array of bindings.
- *
- * @return array
- */
- public function getRawBindings()
- {
- return $this->bindings;
- }
-
- /**
- * Set the bindings on the query builder.
- *
- * @param array $bindings
- * @param string $type
- * @return $this
- *
- * @throws \InvalidArgumentException
- */
- public function setBindings(array $bindings, $type = 'where')
- {
- if ( ! array_key_exists($type, $this->bindings))
- {
- throw new InvalidArgumentException("Invalid binding type: {$type}.");
- }
-
- $this->bindings[$type] = $bindings;
-
- return $this;
- }
-
- /**
- * Add a binding to the query.
- *
- * @param mixed $value
- * @param string $type
- * @return $this
- *
- * @throws \InvalidArgumentException
- */
- public function addBinding($value, $type = 'where')
- {
- if ( ! array_key_exists($type, $this->bindings))
- {
- throw new InvalidArgumentException("Invalid binding type: {$type}.");
- }
-
- if (is_array($value))
- {
- $this->bindings[$type] = array_values(array_merge($this->bindings[$type], $value));
- }
- else
- {
- $this->bindings[$type][] = $value;
- }
-
- return $this;
- }
-
- /**
- * Merge an array of bindings into our bindings.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return $this
- */
- public function mergeBindings(Builder $query)
- {
- $this->bindings = array_merge_recursive($this->bindings, $query->bindings);
-
- return $this;
- }
-
- /**
- * Get the database connection instance.
- *
- * @return \Illuminate\Database\ConnectionInterface
- */
- public function getConnection()
- {
- return $this->connection;
- }
-
- /**
- * Get the database query processor instance.
- *
- * @return \Illuminate\Database\Query\Processors\Processor
- */
- public function getProcessor()
- {
- return $this->processor;
- }
-
- /**
- * Get the query grammar instance.
- *
- * @return \Illuminate\Database\Grammar
- */
- public function getGrammar()
- {
- return $this->grammar;
- }
-
- /**
- * Use the write pdo for query.
- *
- * @return $this
- */
- public function useWritePdo()
- {
- $this->useWritePdo = true;
-
- return $this;
- }
-
- /**
- * Handle dynamic method calls into the method.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- *
- * @throws \BadMethodCallException
- */
- public function __call($method, $parameters)
- {
- if (starts_with($method, 'where'))
- {
- return $this->dynamicWhere($method, $parameters);
- }
-
- $className = get_class($this);
-
- throw new BadMethodCallException("Call to undefined method {$className}::{$method}()");
- }
-
+ {
+ $this->grammar = $grammar;
+ $this->processor = $processor;
+ $this->connection = $connection;
+ }
+
+ /**
+ * Set the columns to be selected.
+ *
+ * @param array|mixed $columns
+ * @return $this
+ */
+ public function select($columns = ['*'])
+ {
+ $this->columns = is_array($columns) ? $columns : func_get_args();
+
+ return $this;
+ }
+
+ /**
+ * Add a new "raw" select expression to the query.
+ *
+ * @param string $expression
+ * @param array $bindings
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function selectRaw($expression, array $bindings = [])
+ {
+ $this->addSelect(new Expression($expression));
+
+ if ($bindings) {
+ $this->addBinding($bindings, 'select');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a subselect expression to the query.
+ *
+ * @param \Closure|\Illuminate\Database\Query\Builder|string $query
+ * @param string $as
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function selectSub($query, $as)
+ {
+ if ($query instanceof Closure) {
+ $callback = $query;
+
+ $callback($query = $this->newQuery());
+ }
+
+ if ($query instanceof self) {
+ $bindings = $query->getBindings();
+
+ $query = $query->toSql();
+ } elseif (is_string($query)) {
+ $bindings = [];
+ } else {
+ throw new InvalidArgumentException;
+ }
+
+ return $this->selectRaw('('.$query.') as '.$this->grammar->wrap($as), $bindings);
+ }
+
+ /**
+ * Add a new select column to the query.
+ *
+ * @param array|mixed $column
+ * @return $this
+ */
+ public function addSelect($column)
+ {
+ $column = is_array($column) ? $column : func_get_args();
+
+ $this->columns = array_merge((array) $this->columns, $column);
+
+ return $this;
+ }
+
+ /**
+ * Force the query to only return distinct results.
+ *
+ * @return $this
+ */
+ public function distinct()
+ {
+ $this->distinct = true;
+
+ return $this;
+ }
+
+ /**
+ * Set the table which the query is targeting.
+ *
+ * @param string $table
+ * @return $this
+ */
+ public function from($table)
+ {
+ $this->from = $table;
+
+ return $this;
+ }
+
+ /**
+ * Add a join clause to the query.
+ *
+ * @param string $table
+ * @param string $one
+ * @param string $operator
+ * @param string $two
+ * @param string $type
+ * @param bool $where
+ * @return $this
+ */
+ public function join($table, $one, $operator = null, $two = null, $type = 'inner', $where = false)
+ {
+ // If the first "column" of the join is really a Closure instance the developer
+ // is trying to build a join with a complex "on" clause containing more than
+ // one condition, so we'll add the join and call a Closure with the query.
+ if ($one instanceof Closure) {
+ $join = new JoinClause($type, $table);
+
+ call_user_func($one, $join);
+
+ $this->joins[] = $join;
+
+ $this->addBinding($join->bindings, 'join');
+ }
+
+ // If the column is simply a string, we can assume the join simply has a basic
+ // "on" clause with a single condition. So we will just build the join with
+ // this simple join clauses attached to it. There is not a join callback.
+ else {
+ $join = new JoinClause($type, $table);
+
+ $this->joins[] = $join->on(
+ $one, $operator, $two, 'and', $where
+ );
+
+ $this->addBinding($join->bindings, 'join');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a "join where" clause to the query.
+ *
+ * @param string $table
+ * @param string $one
+ * @param string $operator
+ * @param string $two
+ * @param string $type
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function joinWhere($table, $one, $operator, $two, $type = 'inner')
+ {
+ return $this->join($table, $one, $operator, $two, $type, true);
+ }
+
+ /**
+ * Add a left join to the query.
+ *
+ * @param string $table
+ * @param string $first
+ * @param string $operator
+ * @param string $second
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function leftJoin($table, $first, $operator = null, $second = null)
+ {
+ return $this->join($table, $first, $operator, $second, 'left');
+ }
+
+ /**
+ * Add a "join where" clause to the query.
+ *
+ * @param string $table
+ * @param string $one
+ * @param string $operator
+ * @param string $two
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function leftJoinWhere($table, $one, $operator, $two)
+ {
+ return $this->joinWhere($table, $one, $operator, $two, 'left');
+ }
+
+ /**
+ * Add a right join to the query.
+ *
+ * @param string $table
+ * @param string $first
+ * @param string $operator
+ * @param string $second
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function rightJoin($table, $first, $operator = null, $second = null)
+ {
+ return $this->join($table, $first, $operator, $second, 'right');
+ }
+
+ /**
+ * Add a "right join where" clause to the query.
+ *
+ * @param string $table
+ * @param string $one
+ * @param string $operator
+ * @param string $two
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function rightJoinWhere($table, $one, $operator, $two)
+ {
+ return $this->joinWhere($table, $one, $operator, $two, 'right');
+ }
+
+ /**
+ * Add a basic where clause to the query.
+ *
+ * @param string|array|\Closure $column
+ * @param string $operator
+ * @param mixed $value
+ * @param string $boolean
+ * @return $this
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function where($column, $operator = null, $value = null, $boolean = 'and')
+ {
+ // If the column is an array, we will assume it is an array of key-value pairs
+ // and can add them each as a where clause. We will maintain the boolean we
+ // received when the method was called and pass it into the nested where.
+ if (is_array($column)) {
+ return $this->whereNested(function ($query) use ($column) {
+ foreach ($column as $key => $value) {
+ $query->where($key, '=', $value);
+ }
+ }, $boolean);
+ }
+
+ // Here we will make some assumptions about the operator. If only 2 values are
+ // passed to the method, we will assume that the operator is an equals sign
+ // and keep going. Otherwise, we'll require the operator to be passed in.
+ if (func_num_args() == 2) {
+ list($value, $operator) = [$operator, '='];
+ } elseif ($this->invalidOperatorAndValue($operator, $value)) {
+ throw new InvalidArgumentException('Illegal operator and value combination.');
+ }
+
+ // If the columns is actually a Closure instance, we will assume the developer
+ // wants to begin a nested where statement which is wrapped in parenthesis.
+ // We'll add that Closure to the query then return back out immediately.
+ if ($column instanceof Closure) {
+ return $this->whereNested($column, $boolean);
+ }
+
+ // If the given operator is not found in the list of valid operators we will
+ // assume that the developer is just short-cutting the '=' operators and
+ // we will set the operators to '=' and set the values appropriately.
+ if (! in_array(strtolower($operator), $this->operators, true)) {
+ list($value, $operator) = [$operator, '='];
+ }
+
+ // If the value is a Closure, it means the developer is performing an entire
+ // sub-select within the query and we will need to compile the sub-select
+ // within the where clause to get the appropriate query record results.
+ if ($value instanceof Closure) {
+ return $this->whereSub($column, $operator, $value, $boolean);
+ }
+
+ // If the value is "null", we will just assume the developer wants to add a
+ // where null clause to the query. So, we will allow a short-cut here to
+ // that method for convenience so the developer doesn't have to check.
+ if (is_null($value)) {
+ return $this->whereNull($column, $boolean, $operator != '=');
+ }
+
+ // Now that we are working with just a simple query we can put the elements
+ // in our array and add the query binding to our array of bindings that
+ // will be bound to each SQL statements when it is finally executed.
+ $type = 'Basic';
+
+ $this->wheres[] = compact('type', 'column', 'operator', 'value', 'boolean');
+
+ if (! $value instanceof Expression) {
+ $this->addBinding($value, 'where');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add an "or where" clause to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param mixed $value
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhere($column, $operator = null, $value = null)
+ {
+ return $this->where($column, $operator, $value, 'or');
+ }
+
+ /**
+ * Determine if the given operator and value combination is legal.
+ *
+ * @param string $operator
+ * @param mixed $value
+ * @return bool
+ */
+ protected function invalidOperatorAndValue($operator, $value)
+ {
+ $isOperator = in_array($operator, $this->operators);
+
+ return $isOperator && $operator != '=' && is_null($value);
+ }
+
+ /**
+ * Add a raw where clause to the query.
+ *
+ * @param string $sql
+ * @param array $bindings
+ * @param string $boolean
+ * @return $this
+ */
+ public function whereRaw($sql, array $bindings = [], $boolean = 'and')
+ {
+ $type = 'raw';
+
+ $this->wheres[] = compact('type', 'sql', 'boolean');
+
+ $this->addBinding($bindings, 'where');
+
+ return $this;
+ }
+
+ /**
+ * Add a raw or where clause to the query.
+ *
+ * @param string $sql
+ * @param array $bindings
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereRaw($sql, array $bindings = [])
+ {
+ return $this->whereRaw($sql, $bindings, 'or');
+ }
+
+ /**
+ * Add a where between statement to the query.
+ *
+ * @param string $column
+ * @param array $values
+ * @param string $boolean
+ * @param bool $not
+ * @return $this
+ */
+ public function whereBetween($column, array $values, $boolean = 'and', $not = false)
+ {
+ $type = 'between';
+
+ $this->wheres[] = compact('column', 'type', 'boolean', 'not');
+
+ $this->addBinding($values, 'where');
+
+ return $this;
+ }
+
+ /**
+ * Add an or where between statement to the query.
+ *
+ * @param string $column
+ * @param array $values
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereBetween($column, array $values)
+ {
+ return $this->whereBetween($column, $values, 'or');
+ }
+
+ /**
+ * Add a where not between statement to the query.
+ *
+ * @param string $column
+ * @param array $values
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereNotBetween($column, array $values, $boolean = 'and')
+ {
+ return $this->whereBetween($column, $values, $boolean, true);
+ }
+
+ /**
+ * Add an or where not between statement to the query.
+ *
+ * @param string $column
+ * @param array $values
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereNotBetween($column, array $values)
+ {
+ return $this->whereNotBetween($column, $values, 'or');
+ }
+
+ /**
+ * Add a nested where statement to the query.
+ *
+ * @param \Closure $callback
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereNested(Closure $callback, $boolean = 'and')
+ {
+ // To handle nested queries we'll actually create a brand new query instance
+ // and pass it off to the Closure that we have. The Closure can simply do
+ // do whatever it wants to a query then we will store it for compiling.
+ $query = $this->newQuery();
+
+ $query->from($this->from);
+
+ call_user_func($callback, $query);
+
+ return $this->addNestedWhereQuery($query, $boolean);
+ }
+
+ /**
+ * Add another query builder as a nested where to the query builder.
+ *
+ * @param \Illuminate\Database\Query\Builder|static $query
+ * @param string $boolean
+ * @return $this
+ */
+ public function addNestedWhereQuery($query, $boolean = 'and')
+ {
+ if (count($query->wheres)) {
+ $type = 'Nested';
+
+ $this->wheres[] = compact('type', 'query', 'boolean');
+
+ $this->addBinding($query->getBindings(), 'where');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a full sub-select to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param \Closure $callback
+ * @param string $boolean
+ * @return $this
+ */
+ protected function whereSub($column, $operator, Closure $callback, $boolean)
+ {
+ $type = 'Sub';
+
+ $query = $this->newQuery();
+
+ // Once we have the query instance we can simply execute it so it can add all
+ // of the sub-select's conditions to itself, and then we can cache it off
+ // in the array of where clauses for the "main" parent query instance.
+ call_user_func($callback, $query);
+
+ $this->wheres[] = compact('type', 'column', 'operator', 'query', 'boolean');
+
+ $this->addBinding($query->getBindings(), 'where');
+
+ return $this;
+ }
+
+ /**
+ * Add an exists clause to the query.
+ *
+ * @param \Closure $callback
+ * @param string $boolean
+ * @param bool $not
+ * @return $this
+ */
+ public function whereExists(Closure $callback, $boolean = 'and', $not = false)
+ {
+ $type = $not ? 'NotExists' : 'Exists';
+
+ $query = $this->newQuery();
+
+ // Similar to the sub-select clause, we will create a new query instance so
+ // the developer may cleanly specify the entire exists query and we will
+ // compile the whole thing in the grammar and insert it into the SQL.
+ call_user_func($callback, $query);
+
+ $this->wheres[] = compact('type', 'operator', 'query', 'boolean');
+
+ $this->addBinding($query->getBindings(), 'where');
+
+ return $this;
+ }
+
+ /**
+ * Add an or exists clause to the query.
+ *
+ * @param \Closure $callback
+ * @param bool $not
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereExists(Closure $callback, $not = false)
+ {
+ return $this->whereExists($callback, 'or', $not);
+ }
+
+ /**
+ * Add a where not exists clause to the query.
+ *
+ * @param \Closure $callback
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereNotExists(Closure $callback, $boolean = 'and')
+ {
+ return $this->whereExists($callback, $boolean, true);
+ }
+
+ /**
+ * Add a where not exists clause to the query.
+ *
+ * @param \Closure $callback
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereNotExists(Closure $callback)
+ {
+ return $this->orWhereExists($callback, true);
+ }
+
+ /**
+ * Add a "where in" clause to the query.
+ *
+ * @param string $column
+ * @param mixed $values
+ * @param string $boolean
+ * @param bool $not
+ * @return $this
+ */
+ public function whereIn($column, $values, $boolean = 'and', $not = false)
+ {
+ $type = $not ? 'NotIn' : 'In';
+
+ if ($values instanceof static) {
+ return $this->whereInExistingQuery(
+ $column, $values, $boolean, $not
+ );
+ }
+
+ // If the value of the where in clause is actually a Closure, we will assume that
+ // the developer is using a full sub-select for this "in" statement, and will
+ // execute those Closures, then we can re-construct the entire sub-selects.
+ if ($values instanceof Closure) {
+ return $this->whereInSub($column, $values, $boolean, $not);
+ }
+
+ if ($values instanceof Arrayable) {
+ $values = $values->toArray();
+ }
+
+ $this->wheres[] = compact('type', 'column', 'values', 'boolean');
+
+ $this->addBinding($values, 'where');
+
+ return $this;
+ }
+
+ /**
+ * Add an "or where in" clause to the query.
+ *
+ * @param string $column
+ * @param mixed $values
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereIn($column, $values)
+ {
+ return $this->whereIn($column, $values, 'or');
+ }
+
+ /**
+ * Add a "where not in" clause to the query.
+ *
+ * @param string $column
+ * @param mixed $values
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereNotIn($column, $values, $boolean = 'and')
+ {
+ return $this->whereIn($column, $values, $boolean, true);
+ }
+
+ /**
+ * Add an "or where not in" clause to the query.
+ *
+ * @param string $column
+ * @param mixed $values
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereNotIn($column, $values)
+ {
+ return $this->whereNotIn($column, $values, 'or');
+ }
+
+ /**
+ * Add a where in with a sub-select to the query.
+ *
+ * @param string $column
+ * @param \Closure $callback
+ * @param string $boolean
+ * @param bool $not
+ * @return $this
+ */
+ protected function whereInSub($column, Closure $callback, $boolean, $not)
+ {
+ $type = $not ? 'NotInSub' : 'InSub';
+
+ // To create the exists sub-select, we will actually create a query and call the
+ // provided callback with the query so the developer may set any of the query
+ // conditions they want for the in clause, then we'll put it in this array.
+ call_user_func($callback, $query = $this->newQuery());
+
+ $this->wheres[] = compact('type', 'column', 'query', 'boolean');
+
+ $this->addBinding($query->getBindings(), 'where');
+
+ return $this;
+ }
+
+ /**
+ * Add a external sub-select to the query.
+ *
+ * @param string $column
+ * @param \Illuminate\Database\Query\Builder|static $query
+ * @param string $boolean
+ * @param bool $not
+ * @return $this
+ */
+ protected function whereInExistingQuery($column, $query, $boolean, $not)
+ {
+ $type = $not ? 'NotInSub' : 'InSub';
+
+ $this->wheres[] = compact('type', 'column', 'query', 'boolean');
+
+ $this->addBinding($query->getBindings(), 'where');
+
+ return $this;
+ }
+
+ /**
+ * Add a "where null" clause to the query.
+ *
+ * @param string $column
+ * @param string $boolean
+ * @param bool $not
+ * @return $this
+ */
+ public function whereNull($column, $boolean = 'and', $not = false)
+ {
+ $type = $not ? 'NotNull' : 'Null';
+
+ $this->wheres[] = compact('type', 'column', 'boolean');
+
+ return $this;
+ }
+
+ /**
+ * Add an "or where null" clause to the query.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereNull($column)
+ {
+ return $this->whereNull($column, 'or');
+ }
+
+ /**
+ * Add a "where not null" clause to the query.
+ *
+ * @param string $column
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereNotNull($column, $boolean = 'and')
+ {
+ return $this->whereNull($column, $boolean, true);
+ }
+
+ /**
+ * Add an "or where not null" clause to the query.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orWhereNotNull($column)
+ {
+ return $this->whereNotNull($column, 'or');
+ }
+
+ /**
+ * Add a "where date" statement to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param int $value
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereDate($column, $operator, $value, $boolean = 'and')
+ {
+ return $this->addDateBasedWhere('Date', $column, $operator, $value, $boolean);
+ }
+
+ /**
+ * Add a "where day" statement to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param int $value
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereDay($column, $operator, $value, $boolean = 'and')
+ {
+ return $this->addDateBasedWhere('Day', $column, $operator, $value, $boolean);
+ }
+
+ /**
+ * Add a "where month" statement to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param int $value
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereMonth($column, $operator, $value, $boolean = 'and')
+ {
+ return $this->addDateBasedWhere('Month', $column, $operator, $value, $boolean);
+ }
+
+ /**
+ * Add a "where year" statement to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param int $value
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function whereYear($column, $operator, $value, $boolean = 'and')
+ {
+ return $this->addDateBasedWhere('Year', $column, $operator, $value, $boolean);
+ }
+
+ /**
+ * Add a date based (year, month, day) statement to the query.
+ *
+ * @param string $type
+ * @param string $column
+ * @param string $operator
+ * @param int $value
+ * @param string $boolean
+ * @return $this
+ */
+ protected function addDateBasedWhere($type, $column, $operator, $value, $boolean = 'and')
+ {
+ $this->wheres[] = compact('column', 'type', 'boolean', 'operator', 'value');
+
+ $this->addBinding($value, 'where');
+
+ return $this;
+ }
+
+ /**
+ * Handles dynamic "where" clauses to the query.
+ *
+ * @param string $method
+ * @param string $parameters
+ * @return $this
+ */
+ public function dynamicWhere($method, $parameters)
+ {
+ $finder = substr($method, 5);
+
+ $segments = preg_split('/(And|Or)(?=[A-Z])/', $finder, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+ // The connector variable will determine which connector will be used for the
+ // query condition. We will change it as we come across new boolean values
+ // in the dynamic method strings, which could contain a number of these.
+ $connector = 'and';
+
+ $index = 0;
+
+ foreach ($segments as $segment) {
+ // If the segment is not a boolean connector, we can assume it is a column's name
+ // and we will add it to the query as a new constraint as a where clause, then
+ // we can keep iterating through the dynamic method string's segments again.
+ if ($segment != 'And' && $segment != 'Or') {
+ $this->addDynamic($segment, $connector, $parameters, $index);
+
+ $index++;
+ }
+
+ // Otherwise, we will store the connector so we know how the next where clause we
+ // find in the query should be connected to the previous ones, meaning we will
+ // have the proper boolean connector to connect the next where clause found.
+ else {
+ $connector = $segment;
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a single dynamic where clause statement to the query.
+ *
+ * @param string $segment
+ * @param string $connector
+ * @param array $parameters
+ * @param int $index
+ * @return void
+ */
+ protected function addDynamic($segment, $connector, $parameters, $index)
+ {
+ // Once we have parsed out the columns and formatted the boolean operators we
+ // are ready to add it to this query as a where clause just like any other
+ // clause on the query. Then we'll increment the parameter index values.
+ $bool = strtolower($connector);
+
+ $this->where(Str::snake($segment), '=', $parameters[$index], $bool);
+ }
+
+ /**
+ * Add a "group by" clause to the query.
+ *
+ * @param array|string $column,...
+ * @return $this
+ */
+ public function groupBy()
+ {
+ foreach (func_get_args() as $arg) {
+ $this->groups = array_merge((array) $this->groups, is_array($arg) ? $arg : [$arg]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a "having" clause to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param string $value
+ * @param string $boolean
+ * @return $this
+ */
+ public function having($column, $operator = null, $value = null, $boolean = 'and')
+ {
+ $type = 'basic';
+
+ $this->havings[] = compact('type', 'column', 'operator', 'value', 'boolean');
+
+ if (! $value instanceof Expression) {
+ $this->addBinding($value, 'having');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a "or having" clause to the query.
+ *
+ * @param string $column
+ * @param string $operator
+ * @param string $value
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orHaving($column, $operator = null, $value = null)
+ {
+ return $this->having($column, $operator, $value, 'or');
+ }
+
+ /**
+ * Add a raw having clause to the query.
+ *
+ * @param string $sql
+ * @param array $bindings
+ * @param string $boolean
+ * @return $this
+ */
+ public function havingRaw($sql, array $bindings = [], $boolean = 'and')
+ {
+ $type = 'raw';
+
+ $this->havings[] = compact('type', 'sql', 'boolean');
+
+ $this->addBinding($bindings, 'having');
+
+ return $this;
+ }
+
+ /**
+ * Add a raw or having clause to the query.
+ *
+ * @param string $sql
+ * @param array $bindings
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function orHavingRaw($sql, array $bindings = [])
+ {
+ return $this->havingRaw($sql, $bindings, 'or');
+ }
+
+ /**
+ * Add an "order by" clause to the query.
+ *
+ * @param string $column
+ * @param string $direction
+ * @return $this
+ */
+ public function orderBy($column, $direction = 'asc')
+ {
+ $property = $this->unions ? 'unionOrders' : 'orders';
+ $direction = strtolower($direction) == 'asc' ? 'asc' : 'desc';
+
+ $this->{$property}[] = compact('column', 'direction');
+
+ return $this;
+ }
+
+ /**
+ * Add an "order by" clause for a timestamp to the query.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function latest($column = 'created_at')
+ {
+ return $this->orderBy($column, 'desc');
+ }
+
+ /**
+ * Add an "order by" clause for a timestamp to the query.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function oldest($column = 'created_at')
+ {
+ return $this->orderBy($column, 'asc');
+ }
+
+ /**
+ * Add a raw "order by" clause to the query.
+ *
+ * @param string $sql
+ * @param array $bindings
+ * @return $this
+ */
+ public function orderByRaw($sql, $bindings = [])
+ {
+ $property = $this->unions ? 'unionOrders' : 'orders';
+
+ $type = 'raw';
+
+ $this->{$property}[] = compact('type', 'sql');
+
+ $this->addBinding($bindings, 'order');
+
+ return $this;
+ }
+
+ /**
+ * Set the "offset" value of the query.
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function offset($value)
+ {
+ $property = $this->unions ? 'unionOffset' : 'offset';
+
+ $this->$property = max(0, $value);
+
+ return $this;
+ }
+
+ /**
+ * Alias to set the "offset" value of the query.
+ *
+ * @param int $value
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function skip($value)
+ {
+ return $this->offset($value);
+ }
+
+ /**
+ * Set the "limit" value of the query.
+ *
+ * @param int $value
+ * @return $this
+ */
+ public function limit($value)
+ {
+ $property = $this->unions ? 'unionLimit' : 'limit';
+
+ if ($value >= 0) {
+ $this->$property = $value;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Alias to set the "limit" value of the query.
+ *
+ * @param int $value
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function take($value)
+ {
+ return $this->limit($value);
+ }
+
+ /**
+ * Set the limit and offset for a given page.
+ *
+ * @param int $page
+ * @param int $perPage
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function forPage($page, $perPage = 15)
+ {
+ return $this->skip(($page - 1) * $perPage)->take($perPage);
+ }
+
+ /**
+ * Add a union statement to the query.
+ *
+ * @param \Illuminate\Database\Query\Builder|\Closure $query
+ * @param bool $all
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function union($query, $all = false)
+ {
+ if ($query instanceof Closure) {
+ call_user_func($query, $query = $this->newQuery());
+ }
+
+ $this->unions[] = compact('query', 'all');
+
+ $this->addBinding($query->getBindings(), 'union');
+
+ return $this;
+ }
+
+ /**
+ * Add a union all statement to the query.
+ *
+ * @param \Illuminate\Database\Query\Builder|\Closure $query
+ * @return \Illuminate\Database\Query\Builder|static
+ */
+ public function unionAll($query)
+ {
+ return $this->union($query, true);
+ }
+
+ /**
+ * Lock the selected rows in the table.
+ *
+ * @param bool $value
+ * @return $this
+ */
+ public function lock($value = true)
+ {
+ $this->lock = $value;
+
+ if ($this->lock) {
+ $this->useWritePdo();
+ }
+
+ return $this;
+ }
+
+ /**
+ * Lock the selected rows in the table for updating.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function lockForUpdate()
+ {
+ return $this->lock(true);
+ }
+
+ /**
+ * Share lock the selected rows in the table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function sharedLock()
+ {
+ return $this->lock(false);
+ }
+
+ /**
+ * Get the SQL representation of the query.
+ *
+ * @return string
+ */
+ public function toSql()
+ {
+ return $this->grammar->compileSelect($this);
+ }
+
+ /**
+ * Execute a query for a single record by ID.
+ *
+ * @param int $id
+ * @param array $columns
+ * @return mixed|static
+ */
+ public function find($id, $columns = ['*'])
+ {
+ return $this->where('id', '=', $id)->first($columns);
+ }
+
+ /**
+ * Get a single column's value from the first result of a query.
+ *
+ * @param string $column
+ * @return mixed
+ */
+ public function value($column)
+ {
+ $result = (array) $this->first([$column]);
+
+ return count($result) > 0 ? reset($result) : null;
+ }
+
+ /**
+ * Get a single column's value from the first result of a query.
+ *
+ * This is an alias for the "value" method.
+ *
+ * @param string $column
+ * @return mixed
+ *
+ * @deprecated since version 5.1.
+ */
+ public function pluck($column)
+ {
+ return $this->value($column);
+ }
+
+ /**
+ * Execute the query and get the first result.
+ *
+ * @param array $columns
+ * @return mixed|static
+ */
+ public function first($columns = ['*'])
+ {
+ $results = $this->take(1)->get($columns);
+
+ return count($results) > 0 ? reset($results) : null;
+ }
+
+ /**
+ * Execute the query as a "select" statement.
+ *
+ * @param array $columns
+ * @return array|static[]
+ */
+ public function get($columns = ['*'])
+ {
+ if (is_null($this->columns)) {
+ $this->columns = $columns;
+ }
+
+ return $this->processor->processSelect($this, $this->runSelect());
+ }
+
+ /**
+ * Execute the query as a fresh "select" statement.
+ *
+ * @param array $columns
+ * @return array|static[]
+ *
+ * @deprecated since version 5.1. Use get instead.
+ */
+ public function getFresh($columns = ['*'])
+ {
+ return $this->get($columns);
+ }
+
+ /**
+ * Run the query as a "select" statement against the connection.
+ *
+ * @return array
+ */
+ protected function runSelect()
+ {
+ return $this->connection->select($this->toSql(), $this->getBindings(), ! $this->useWritePdo);
+ }
+
+ /**
+ * Paginate the given query into a simple paginator.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @param int|null $page
+ * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+ */
+ public function paginate($perPage = 15, $columns = ['*'], $pageName = 'page', $page = null)
+ {
+ $page = $page ?: Paginator::resolveCurrentPage($pageName);
+
+ $total = $this->getCountForPagination($columns);
+
+ $results = $this->forPage($page, $perPage)->get($columns);
+
+ return new LengthAwarePaginator($results, $total, $perPage, $page, [
+ 'path' => Paginator::resolveCurrentPath(),
+ 'pageName' => $pageName,
+ ]);
+ }
+
+ /**
+ * Get a paginator only supporting simple next and previous links.
+ *
+ * This is more efficient on larger data-sets, etc.
+ *
+ * @param int $perPage
+ * @param array $columns
+ * @param string $pageName
+ * @return \Illuminate\Contracts\Pagination\Paginator
+ */
+ public function simplePaginate($perPage = 15, $columns = ['*'], $pageName = 'page')
+ {
+ $page = Paginator::resolveCurrentPage($pageName);
+
+ $this->skip(($page - 1) * $perPage)->take($perPage + 1);
+
+ return new Paginator($this->get($columns), $perPage, $page, [
+ 'path' => Paginator::resolveCurrentPath(),
+ 'pageName' => $pageName,
+ ]);
+ }
+
+ /**
+ * Get the count of the total records for the paginator.
+ *
+ * @param array $columns
+ * @return int
+ */
+ public function getCountForPagination($columns = ['*'])
+ {
+ $this->backupFieldsForCount();
+
+ $this->aggregate = ['function' => 'count', 'columns' => $this->clearSelectAliases($columns)];
+
+ $results = $this->get();
+
+ $this->aggregate = null;
+
+ $this->restoreFieldsForCount();
+
+ if (isset($this->groups)) {
+ return count($results);
+ }
+
+ return isset($results[0]) ? (int) array_change_key_case((array) $results[0])['aggregate'] : 0;
+ }
+
+ /**
+ * Backup some fields for the pagination count.
+ *
+ * @return void
+ */
+ protected function backupFieldsForCount()
+ {
+ foreach (['orders', 'limit', 'offset', 'columns'] as $field) {
+ $this->backups[$field] = $this->{$field};
+
+ $this->{$field} = null;
+ }
+
+ foreach (['order', 'select'] as $key) {
+ $this->bindingBackups[$key] = $this->bindings[$key];
+
+ $this->bindings[$key] = [];
+ }
+ }
+
+ /**
+ * Remove the column aliases since they will break count queries.
+ *
+ * @param array $columns
+ * @return array
+ */
+ protected function clearSelectAliases(array $columns)
+ {
+ return array_map(function ($column) {
+ return is_string($column) && ($aliasPosition = strpos(strtolower($column), ' as ')) !== false
+ ? substr($column, 0, $aliasPosition) : $column;
+ }, $columns);
+ }
+
+ /**
+ * Restore some fields after the pagination count.
+ *
+ * @return void
+ */
+ protected function restoreFieldsForCount()
+ {
+ foreach (['orders', 'limit', 'offset', 'columns'] as $field) {
+ $this->{$field} = $this->backups[$field];
+ }
+
+ foreach (['order', 'select'] as $key) {
+ $this->bindings[$key] = $this->bindingBackups[$key];
+ }
+
+ $this->backups = [];
+ $this->bindingBackups = [];
+ }
+
+ /**
+ * Chunk the results of the query.
+ *
+ * @param int $count
+ * @param callable $callback
+ * @return bool
+ */
+ public function chunk($count, callable $callback)
+ {
+ $results = $this->forPage($page = 1, $count)->get();
+
+ while (count($results) > 0) {
+ // On each chunk result set, we will pass them to the callback and then let the
+ // developer take care of everything within the callback, which allows us to
+ // keep the memory low for spinning through large result sets for working.
+ if (call_user_func($callback, $results) === false) {
+ return false;
+ }
+
+ $page++;
+
+ $results = $this->forPage($page, $count)->get();
+ }
+
+ return true;
+ }
+
+ /**
+ * Get an array with the values of a given column.
+ *
+ * @param string $column
+ * @param string|null $key
+ * @return array
+ */
+ public function lists($column, $key = null)
+ {
+ $results = $this->get(is_null($key) ? [$column] : [$column, $key]);
+
+ // If the columns are qualified with a table or have an alias, we cannot use
+ // those directly in the "pluck" operations since the results from the DB
+ // are only keyed by the column itself. We'll strip the table out here.
+ return Arr::pluck(
+ $results,
+ $this->stripTableForPluck($column),
+ $this->stripTableForPluck($key)
+ );
+ }
+
+ /**
+ * Strip off the table name or alias from a column identifier.
+ *
+ * @param string $column
+ * @return string|null
+ */
+ protected function stripTableForPluck($column)
+ {
+ return is_null($column) ? $column : last(preg_split('~\.| ~', $column));
+ }
+
+ /**
+ * Concatenate values of a given column as a string.
+ *
+ * @param string $column
+ * @param string $glue
+ * @return string
+ */
+ public function implode($column, $glue = '')
+ {
+ return implode($glue, $this->lists($column));
+ }
+
+ /**
+ * Determine if any rows exist for the current query.
+ *
+ * @return bool
+ */
+ public function exists()
+ {
+ $sql = $this->grammar->compileExists($this);
+
+ $results = $this->connection->select($sql, $this->getBindings(), ! $this->useWritePdo);
+
+ if (isset($results[0])) {
+ $results = (array) $results[0];
+
+ return (bool) $results['exists'];
+ }
+
+ return false;
+ }
+
+ /**
+ * Retrieve the "count" result of the query.
+ *
+ * @param string $columns
+ * @return int
+ */
+ public function count($columns = '*')
+ {
+ if (! is_array($columns)) {
+ $columns = [$columns];
+ }
+
+ return (int) $this->aggregate(__FUNCTION__, $columns);
+ }
+
+ /**
+ * Retrieve the minimum value of a given column.
+ *
+ * @param string $column
+ * @return mixed
+ */
+ public function min($column)
+ {
+ return $this->aggregate(__FUNCTION__, [$column]);
+ }
+
+ /**
+ * Retrieve the maximum value of a given column.
+ *
+ * @param string $column
+ * @return mixed
+ */
+ public function max($column)
+ {
+ return $this->aggregate(__FUNCTION__, [$column]);
+ }
+
+ /**
+ * Retrieve the sum of the values of a given column.
+ *
+ * @param string $column
+ * @return mixed
+ */
+ public function sum($column)
+ {
+ return $this->aggregate(__FUNCTION__, [$column]);
+ }
+
+ /**
+ * Retrieve the average of the values of a given column.
+ *
+ * @param string $column
+ * @return mixed
+ */
+ public function avg($column)
+ {
+ return $this->aggregate(__FUNCTION__, [$column]);
+ }
+
+ /**
+ * Alias for the "avg" method.
+ *
+ * @param string $column
+ * @return mixed
+ */
+ public function average($column)
+ {
+ return $this->avg($column);
+ }
+
+ /**
+ * Execute an aggregate function on the database.
+ *
+ * @param string $function
+ * @param array $columns
+ * @return mixed
+ */
+ public function aggregate($function, $columns = ['*'])
+ {
+ $this->aggregate = compact('function', 'columns');
+
+ $previousColumns = $this->columns;
+
+ // We will also back up the select bindings since the select clause will be
+ // removed when performing the aggregate function. Once the query is run
+ // we will add the bindings back onto this query so they can get used.
+ $previousSelectBindings = $this->bindings['select'];
+
+ $this->bindings['select'] = [];
+
+ $results = $this->get($columns);
+
+ // Once we have executed the query, we will reset the aggregate property so
+ // that more select queries can be executed against the database without
+ // the aggregate value getting in the way when the grammar builds it.
+ $this->aggregate = null;
+
+ $this->columns = $previousColumns;
+
+ $this->bindings['select'] = $previousSelectBindings;
+
+ if (isset($results[0])) {
+ return array_change_key_case((array) $results[0])['aggregate'];
+ }
+ }
+
+ /**
+ * Execute a numeric aggregate function on the database.
+ *
+ * @param string $function
+ * @param array $columns
+ * @return float|int
+ */
+ public function numericAggregate($function, $columns = ['*'])
+ {
+ $result = $this->aggregate($function, $columns);
+
+ if (! $result) {
+ return 0;
+ }
+
+ if (is_int($result) || is_float($result)) {
+ return $result;
+ }
+
+ if (strpos((string) $result, '.') === false) {
+ return (int) $result;
+ }
+
+ return (float) $result;
+ }
+
+ /**
+ * Insert a new record into the database.
+ *
+ * @param array $values
+ * @return bool
+ */
+ public function insert(array $values)
+ {
+ if (empty($values)) {
+ return true;
+ }
+
+ // Since every insert gets treated like a batch insert, we will make sure the
+ // bindings are structured in a way that is convenient for building these
+ // inserts statements by verifying the elements are actually an array.
+ if (! is_array(reset($values))) {
+ $values = [$values];
+ }
+
+ // Since every insert gets treated like a batch insert, we will make sure the
+ // bindings are structured in a way that is convenient for building these
+ // inserts statements by verifying the elements are actually an array.
+ else {
+ foreach ($values as $key => $value) {
+ ksort($value);
+ $values[$key] = $value;
+ }
+ }
+
+ // We'll treat every insert like a batch insert so we can easily insert each
+ // of the records into the database consistently. This will make it much
+ // easier on the grammars to just handle one type of record insertion.
+ $bindings = [];
+
+ foreach ($values as $record) {
+ foreach ($record as $value) {
+ $bindings[] = $value;
+ }
+ }
+
+ $sql = $this->grammar->compileInsert($this, $values);
+
+ // Once we have compiled the insert statement's SQL we can execute it on the
+ // connection and return a result as a boolean success indicator as that
+ // is the same type of result returned by the raw connection instance.
+ $bindings = $this->cleanBindings($bindings);
+
+ return $this->connection->insert($sql, $bindings);
+ }
+
+ /**
+ * Insert a new record and get the value of the primary key.
+ *
+ * @param array $values
+ * @param string $sequence
+ * @return int
+ */
+ public function insertGetId(array $values, $sequence = null)
+ {
+ $sql = $this->grammar->compileInsertGetId($this, $values, $sequence);
+
+ $values = $this->cleanBindings($values);
+
+ return $this->processor->processInsertGetId($this, $sql, $values, $sequence);
+ }
+
+ /**
+ * Update a record in the database.
+ *
+ * @param array $values
+ * @return int
+ */
+ public function update(array $values)
+ {
+ $bindings = array_values(array_merge($values, $this->getBindings()));
+
+ $sql = $this->grammar->compileUpdate($this, $values);
+
+ return $this->connection->update($sql, $this->cleanBindings($bindings));
+ }
+
+ /**
+ * Increment a column's value by a given amount.
+ *
+ * @param string $column
+ * @param int $amount
+ * @param array $extra
+ * @return int
+ */
+ public function increment($column, $amount = 1, array $extra = [])
+ {
+ if (! is_numeric($amount)) {
+ throw new InvalidArgumentException('Non-numeric value passed to increment method.');
+ }
+
+ $wrapped = $this->grammar->wrap($column);
+
+ $columns = array_merge([$column => $this->raw("$wrapped + $amount")], $extra);
+
+ return $this->update($columns);
+ }
+
+ /**
+ * Decrement a column's value by a given amount.
+ *
+ * @param string $column
+ * @param int $amount
+ * @param array $extra
+ * @return int
+ */
+ public function decrement($column, $amount = 1, array $extra = [])
+ {
+ if (! is_numeric($amount)) {
+ throw new InvalidArgumentException('Non-numeric value passed to decrement method.');
+ }
+
+ $wrapped = $this->grammar->wrap($column);
+
+ $columns = array_merge([$column => $this->raw("$wrapped - $amount")], $extra);
+
+ return $this->update($columns);
+ }
+
+ /**
+ * Delete a record from the database.
+ *
+ * @param mixed $id
+ * @return int
+ */
+ public function delete($id = null)
+ {
+ // If an ID is passed to the method, we will set the where clause to check
+ // the ID to allow developers to simply and quickly remove a single row
+ // from their database without manually specifying the where clauses.
+ if (! is_null($id)) {
+ $this->where('id', '=', $id);
+ }
+
+ $sql = $this->grammar->compileDelete($this);
+
+ return $this->connection->delete($sql, $this->getBindings());
+ }
+
+ /**
+ * Run a truncate statement on the table.
+ *
+ * @return void
+ */
+ public function truncate()
+ {
+ foreach ($this->grammar->compileTruncate($this) as $sql => $bindings) {
+ $this->connection->statement($sql, $bindings);
+ }
+ }
+
+ /**
+ * Get a new instance of the query builder.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ public function newQuery()
+ {
+ return new static($this->connection, $this->grammar, $this->processor);
+ }
+
+ /**
+ * Merge an array of where clauses and bindings.
+ *
+ * @param array $wheres
+ * @param array $bindings
+ * @return void
+ */
+ public function mergeWheres($wheres, $bindings)
+ {
+ $this->wheres = array_merge((array) $this->wheres, (array) $wheres);
+
+ $this->bindings['where'] = array_values(array_merge($this->bindings['where'], (array) $bindings));
+ }
+
+ /**
+ * Remove all of the expressions from a list of bindings.
+ *
+ * @param array $bindings
+ * @return array
+ */
+ protected function cleanBindings(array $bindings)
+ {
+ return array_values(array_filter($bindings, function ($binding) {
+ return ! $binding instanceof Expression;
+ }));
+ }
+
+ /**
+ * Create a raw database expression.
+ *
+ * @param mixed $value
+ * @return \Illuminate\Database\Query\Expression
+ */
+ public function raw($value)
+ {
+ return $this->connection->raw($value);
+ }
+
+ /**
+ * Get the current query value bindings in a flattened array.
+ *
+ * @return array
+ */
+ public function getBindings()
+ {
+ return Arr::flatten($this->bindings);
+ }
+
+ /**
+ * Get the raw array of bindings.
+ *
+ * @return array
+ */
+ public function getRawBindings()
+ {
+ return $this->bindings;
+ }
+
+ /**
+ * Set the bindings on the query builder.
+ *
+ * @param array $bindings
+ * @param string $type
+ * @return $this
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function setBindings(array $bindings, $type = 'where')
+ {
+ if (! array_key_exists($type, $this->bindings)) {
+ throw new InvalidArgumentException("Invalid binding type: {$type}.");
+ }
+
+ $this->bindings[$type] = $bindings;
+
+ return $this;
+ }
+
+ /**
+ * Add a binding to the query.
+ *
+ * @param mixed $value
+ * @param string $type
+ * @return $this
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function addBinding($value, $type = 'where')
+ {
+ if (! array_key_exists($type, $this->bindings)) {
+ throw new InvalidArgumentException("Invalid binding type: {$type}.");
+ }
+
+ if (is_array($value)) {
+ $this->bindings[$type] = array_values(array_merge($this->bindings[$type], $value));
+ } else {
+ $this->bindings[$type][] = $value;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Merge an array of bindings into our bindings.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return $this
+ */
+ public function mergeBindings(Builder $query)
+ {
+ $this->bindings = array_merge_recursive($this->bindings, $query->bindings);
+
+ return $this;
+ }
+
+ /**
+ * Get the database connection instance.
+ *
+ * @return \Illuminate\Database\ConnectionInterface
+ */
+ public function getConnection()
+ {
+ return $this->connection;
+ }
+
+ /**
+ * Get the database query processor instance.
+ *
+ * @return \Illuminate\Database\Query\Processors\Processor
+ */
+ public function getProcessor()
+ {
+ return $this->processor;
+ }
+
+ /**
+ * Get the query grammar instance.
+ *
+ * @return \Illuminate\Database\Query\Grammars\Grammar
+ */
+ public function getGrammar()
+ {
+ return $this->grammar;
+ }
+
+ /**
+ * Use the write pdo for query.
+ *
+ * @return $this
+ */
+ public function useWritePdo()
+ {
+ $this->useWritePdo = true;
+
+ return $this;
+ }
+
+ /**
+ * Handle dynamic method calls into the method.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ *
+ * @throws \BadMethodCallException
+ */
+ public function __call($method, $parameters)
+ {
+ if (static::hasMacro($method)) {
+ return $this->macroCall($method, $parameters);
+ }
+
+ if (Str::startsWith($method, 'where')) {
+ return $this->dynamicWhere($method, $parameters);
+ }
+
+ $className = get_class($this);
+
+ throw new BadMethodCallException("Call to undefined method {$className}::{$method}()");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Expression.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Expression.php
index 68d2236..de69029 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Expression.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Expression.php
@@ -1,43 +1,44 @@
-value = $value;
- }
+ /**
+ * Create a new raw query expression.
+ *
+ * @param mixed $value
+ * @return void
+ */
+ public function __construct($value)
+ {
+ $this->value = $value;
+ }
- /**
- * Get the value of the expression.
- *
- * @return mixed
- */
- public function getValue()
- {
- return $this->value;
- }
-
- /**
- * Get the value of the expression.
- *
- * @return string
- */
- public function __toString()
- {
- return (string) $this->getValue();
- }
+ /**
+ * Get the value of the expression.
+ *
+ * @return mixed
+ */
+ public function getValue()
+ {
+ return $this->value;
+ }
+ /**
+ * Get the value of the expression.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return (string) $this->getValue();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php
index 36a8c42..5a871ad 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php
@@ -1,761 +1,825 @@
-columns)) $query->columns = array('*');
-
- return trim($this->concatenate($this->compileComponents($query)));
- }
-
- /**
- * Compile the components necessary for a select clause.
- *
- * @param \Illuminate\Database\Query\Builder
- * @return array
- */
- protected function compileComponents(Builder $query)
- {
- $sql = array();
-
- foreach ($this->selectComponents as $component)
- {
- // To compile the query, we'll spin through each component of the query and
- // see if that component exists. If it does we'll just call the compiler
- // function for the component which is responsible for making the SQL.
- if ( ! is_null($query->$component))
- {
- $method = 'compile'.ucfirst($component);
-
- $sql[$component] = $this->$method($query, $query->$component);
- }
- }
-
- return $sql;
- }
-
- /**
- * Compile an aggregated select clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $aggregate
- * @return string
- */
- protected function compileAggregate(Builder $query, $aggregate)
- {
- $column = $this->columnize($aggregate['columns']);
-
- // If the query has a "distinct" constraint and we're not asking for all columns
- // we need to prepend "distinct" onto the column name so that the query takes
- // it into account when it performs the aggregating operations on the data.
- if ($query->distinct && $column !== '*')
- {
- $column = 'distinct '.$column;
- }
-
- return 'select '.$aggregate['function'].'('.$column.') as aggregate';
- }
-
- /**
- * Compile the "select *" portion of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $columns
- * @return string
- */
- protected function compileColumns(Builder $query, $columns)
- {
- // If the query is actually performing an aggregating select, we will let that
- // compiler handle the building of the select clauses, as it will need some
- // more syntax that is best handled by that function to keep things neat.
- if ( ! is_null($query->aggregate)) return;
-
- $select = $query->distinct ? 'select distinct ' : 'select ';
-
- return $select.$this->columnize($columns);
- }
-
- /**
- * Compile the "from" portion of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param string $table
- * @return string
- */
- protected function compileFrom(Builder $query, $table)
- {
- return 'from '.$this->wrapTable($table);
- }
-
- /**
- * Compile the "join" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $joins
- * @return string
- */
- protected function compileJoins(Builder $query, $joins)
- {
- $sql = array();
-
- $query->setBindings(array(), 'join');
-
- foreach ($joins as $join)
- {
- $table = $this->wrapTable($join->table);
-
- // First we need to build all of the "on" clauses for the join. There may be many
- // of these clauses so we will need to iterate through each one and build them
- // separately, then we'll join them up into a single string when we're done.
- $clauses = array();
-
- foreach ($join->clauses as $clause)
- {
- $clauses[] = $this->compileJoinConstraint($clause);
- }
-
- foreach ($join->bindings as $binding)
- {
- $query->addBinding($binding, 'join');
- }
-
- // Once we have constructed the clauses, we'll need to take the boolean connector
- // off of the first clause as it obviously will not be required on that clause
- // because it leads the rest of the clauses, thus not requiring any boolean.
- $clauses[0] = $this->removeLeadingBoolean($clauses[0]);
-
- $clauses = implode(' ', $clauses);
-
- $type = $join->type;
-
- // Once we have everything ready to go, we will just concatenate all the parts to
- // build the final join statement SQL for the query and we can then return the
- // final clause back to the callers as a single, stringified join statement.
- $sql[] = "$type join $table on $clauses";
- }
-
- return implode(' ', $sql);
- }
-
- /**
- * Create a join clause constraint segment.
- *
- * @param array $clause
- * @return string
- */
- protected function compileJoinConstraint(array $clause)
- {
- $first = $this->wrap($clause['first']);
-
- $second = $clause['where'] ? '?' : $this->wrap($clause['second']);
-
- return "{$clause['boolean']} $first {$clause['operator']} $second";
- }
-
- /**
- * Compile the "where" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- protected function compileWheres(Builder $query)
- {
- $sql = array();
-
- if (is_null($query->wheres)) return '';
-
- // Each type of where clauses has its own compiler function which is responsible
- // for actually creating the where clauses SQL. This helps keep the code nice
- // and maintainable since each clause has a very small method that it uses.
- foreach ($query->wheres as $where)
- {
- $method = "where{$where['type']}";
-
- $sql[] = $where['boolean'].' '.$this->$method($query, $where);
- }
-
- // If we actually have some where clauses, we will strip off the first boolean
- // operator, which is added by the query builders for convenience so we can
- // avoid checking for the first clauses in each of the compilers methods.
- if (count($sql) > 0)
- {
- $sql = implode(' ', $sql);
-
- return 'where '.$this->removeLeadingBoolean($sql);
- }
-
- return '';
- }
-
- /**
- * Compile a nested where clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereNested(Builder $query, $where)
- {
- $nested = $where['query'];
-
- return '('.substr($this->compileWheres($nested), 6).')';
- }
-
- /**
- * Compile a where condition with a sub-select.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereSub(Builder $query, $where)
- {
- $select = $this->compileSelect($where['query']);
-
- return $this->wrap($where['column']).' '.$where['operator']." ($select)";
- }
-
- /**
- * Compile a basic where clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereBasic(Builder $query, $where)
- {
- $value = $this->parameter($where['value']);
-
- return $this->wrap($where['column']).' '.$where['operator'].' '.$value;
- }
-
- /**
- * Compile a "between" where clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereBetween(Builder $query, $where)
- {
- $between = $where['not'] ? 'not between' : 'between';
-
- return $this->wrap($where['column']).' '.$between.' ? and ?';
- }
-
- /**
- * Compile a where exists clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereExists(Builder $query, $where)
- {
- return 'exists ('.$this->compileSelect($where['query']).')';
- }
-
- /**
- * Compile a where exists clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereNotExists(Builder $query, $where)
- {
- return 'not exists ('.$this->compileSelect($where['query']).')';
- }
-
- /**
- * Compile a "where in" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereIn(Builder $query, $where)
- {
- if (empty($where['values'])) return '0 = 1';
-
- $values = $this->parameterize($where['values']);
-
- return $this->wrap($where['column']).' in ('.$values.')';
- }
-
- /**
- * Compile a "where not in" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereNotIn(Builder $query, $where)
- {
- if (empty($where['values'])) return '1 = 1';
-
- $values = $this->parameterize($where['values']);
-
- return $this->wrap($where['column']).' not in ('.$values.')';
- }
-
- /**
- * Compile a where in sub-select clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereInSub(Builder $query, $where)
- {
- $select = $this->compileSelect($where['query']);
-
- return $this->wrap($where['column']).' in ('.$select.')';
- }
-
- /**
- * Compile a where not in sub-select clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereNotInSub(Builder $query, $where)
- {
- $select = $this->compileSelect($where['query']);
-
- return $this->wrap($where['column']).' not in ('.$select.')';
- }
-
- /**
- * Compile a "where null" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereNull(Builder $query, $where)
- {
- return $this->wrap($where['column']).' is null';
- }
-
- /**
- * Compile a "where not null" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereNotNull(Builder $query, $where)
- {
- return $this->wrap($where['column']).' is not null';
- }
-
- /**
- * Compile a "where date" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereDate(Builder $query, $where)
- {
- return $this->dateBasedWhere('date', $query, $where);
- }
-
- /**
- * Compile a "where day" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereDay(Builder $query, $where)
- {
- return $this->dateBasedWhere('day', $query, $where);
- }
-
- /**
- * Compile a "where month" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereMonth(Builder $query, $where)
- {
- return $this->dateBasedWhere('month', $query, $where);
- }
-
- /**
- * Compile a "where year" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereYear(Builder $query, $where)
- {
- return $this->dateBasedWhere('year', $query, $where);
- }
-
- /**
- * Compile a date based where clause.
- *
- * @param string $type
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function dateBasedWhere($type, Builder $query, $where)
- {
- $value = $this->parameter($where['value']);
-
- return $type.'('.$this->wrap($where['column']).') '.$where['operator'].' '.$value;
- }
-
- /**
- * Compile a raw where clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereRaw(Builder $query, $where)
- {
- return $where['sql'];
- }
-
- /**
- * Compile the "group by" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $groups
- * @return string
- */
- protected function compileGroups(Builder $query, $groups)
- {
- return 'group by '.$this->columnize($groups);
- }
-
- /**
- * Compile the "having" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $havings
- * @return string
- */
- protected function compileHavings(Builder $query, $havings)
- {
- $sql = implode(' ', array_map(array($this, 'compileHaving'), $havings));
-
- return 'having '.$this->removeLeadingBoolean($sql);
- }
-
- /**
- * Compile a single having clause.
- *
- * @param array $having
- * @return string
- */
- protected function compileHaving(array $having)
- {
- // If the having clause is "raw", we can just return the clause straight away
- // without doing any more processing on it. Otherwise, we will compile the
- // clause into SQL based on the components that make it up from builder.
- if ($having['type'] === 'raw')
- {
- return $having['boolean'].' '.$having['sql'];
- }
-
- return $this->compileBasicHaving($having);
- }
-
- /**
- * Compile a basic having clause.
- *
- * @param array $having
- * @return string
- */
- protected function compileBasicHaving($having)
- {
- $column = $this->wrap($having['column']);
-
- $parameter = $this->parameter($having['value']);
-
- return $having['boolean'].' '.$column.' '.$having['operator'].' '.$parameter;
- }
-
- /**
- * Compile the "order by" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $orders
- * @return string
- */
- protected function compileOrders(Builder $query, $orders)
- {
- return 'order by '.implode(', ', array_map(function($order)
- {
- if (isset($order['sql'])) return $order['sql'];
-
- return $this->wrap($order['column']).' '.$order['direction'];
- }, $orders));
- }
-
- /**
- * Compile the "limit" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param int $limit
- * @return string
- */
- protected function compileLimit(Builder $query, $limit)
- {
- return 'limit '.(int) $limit;
- }
-
- /**
- * Compile the "offset" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param int $offset
- * @return string
- */
- protected function compileOffset(Builder $query, $offset)
- {
- return 'offset '.(int) $offset;
- }
-
- /**
- * Compile the "union" queries attached to the main query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- protected function compileUnions(Builder $query)
- {
- $sql = '';
-
- foreach ($query->unions as $union)
- {
- $sql .= $this->compileUnion($union);
- }
-
- if (isset($query->unionOrders))
- {
- $sql .= ' '.$this->compileOrders($query, $query->unionOrders);
- }
-
- if (isset($query->unionLimit))
- {
- $sql .= ' '.$this->compileLimit($query, $query->unionLimit);
- }
-
- if (isset($query->unionOffset))
- {
- $sql .= ' '.$this->compileOffset($query, $query->unionOffset);
- }
-
- return ltrim($sql);
- }
-
- /**
- * Compile a single union statement.
- *
- * @param array $union
- * @return string
- */
- protected function compileUnion(array $union)
- {
- $joiner = $union['all'] ? ' union all ' : ' union ';
-
- return $joiner.$union['query']->toSql();
- }
-
- /**
- * Compile an insert statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $values
- * @return string
- */
- public function compileInsert(Builder $query, array $values)
- {
- // Essentially we will force every insert to be treated as a batch insert which
- // simply makes creating the SQL easier for us since we can utilize the same
- // basic routine regardless of an amount of records given to us to insert.
- $table = $this->wrapTable($query->from);
-
- if ( ! is_array(reset($values)))
- {
- $values = array($values);
- }
-
- $columns = $this->columnize(array_keys(reset($values)));
-
- // We need to build a list of parameter place-holders of values that are bound
- // to the query. Each insert should have the exact same amount of parameter
- // bindings so we will loop through the record and parameterize them all.
- $parameters = array();
-
- foreach($values as $record)
- {
- $parameters[] = '('.$this->parameterize($record).')';
- }
-
- $parameters = implode(', ', $parameters);
-
- return "insert into $table ($columns) values $parameters";
- }
-
- /**
- * Compile an insert and get ID statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $values
- * @param string $sequence
- * @return string
- */
- public function compileInsertGetId(Builder $query, $values, $sequence)
- {
- return $this->compileInsert($query, $values);
- }
-
- /**
- * Compile an update statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $values
- * @return string
- */
- public function compileUpdate(Builder $query, $values)
- {
- $table = $this->wrapTable($query->from);
-
- // Each one of the columns in the update statements needs to be wrapped in the
- // keyword identifiers, also a place-holder needs to be created for each of
- // the values in the list of bindings so we can make the sets statements.
- $columns = array();
-
- foreach ($values as $key => $value)
- {
- $columns[] = $this->wrap($key).' = '.$this->parameter($value);
- }
-
- $columns = implode(', ', $columns);
-
- // If the query has any "join" clauses, we will setup the joins on the builder
- // and compile them so we can attach them to this update, as update queries
- // can get join statements to attach to other tables when they're needed.
- if (isset($query->joins))
- {
- $joins = ' '.$this->compileJoins($query, $query->joins);
- }
- else
- {
- $joins = '';
- }
-
- // Of course, update queries may also be constrained by where clauses so we'll
- // need to compile the where clauses and attach it to the query so only the
- // intended records are updated by the SQL statements we generate to run.
- $where = $this->compileWheres($query);
-
- return trim("update {$table}{$joins} set $columns $where");
- }
-
- /**
- * Compile a delete statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- public function compileDelete(Builder $query)
- {
- $table = $this->wrapTable($query->from);
-
- $where = is_array($query->wheres) ? $this->compileWheres($query) : '';
-
- return trim("delete from $table ".$where);
- }
-
- /**
- * Compile a truncate table statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return array
- */
- public function compileTruncate(Builder $query)
- {
- return array('truncate '.$this->wrapTable($query->from) => array());
- }
-
- /**
- * Compile the lock into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param bool|string $value
- * @return string
- */
- protected function compileLock(Builder $query, $value)
- {
- return is_string($value) ? $value : '';
- }
-
- /**
- * Concatenate an array of segments, removing empties.
- *
- * @param array $segments
- * @return string
- */
- protected function concatenate($segments)
- {
- return implode(' ', array_filter($segments, function($value)
- {
- return (string) $value !== '';
- }));
- }
-
- /**
- * Remove the leading boolean from a statement.
- *
- * @param string $value
- * @return string
- */
- protected function removeLeadingBoolean($value)
- {
- return preg_replace('/and |or /', '', $value, 1);
- }
-
+class Grammar extends BaseGrammar
+{
+ /**
+ * The components that make up a select clause.
+ *
+ * @var array
+ */
+ protected $selectComponents = [
+ 'aggregate',
+ 'columns',
+ 'from',
+ 'joins',
+ 'wheres',
+ 'groups',
+ 'havings',
+ 'orders',
+ 'limit',
+ 'offset',
+ 'unions',
+ 'lock',
+ ];
+
+ /**
+ * Compile a select query into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ public function compileSelect(Builder $query)
+ {
+ if (is_null($query->columns)) {
+ $query->columns = ['*'];
+ }
+
+ return trim($this->concatenate($this->compileComponents($query)));
+ }
+
+ /**
+ * Compile the components necessary for a select clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return array
+ */
+ protected function compileComponents(Builder $query)
+ {
+ $sql = [];
+
+ foreach ($this->selectComponents as $component) {
+ // To compile the query, we'll spin through each component of the query and
+ // see if that component exists. If it does we'll just call the compiler
+ // function for the component which is responsible for making the SQL.
+ if (! is_null($query->$component)) {
+ $method = 'compile'.ucfirst($component);
+
+ $sql[$component] = $this->$method($query, $query->$component);
+ }
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Compile an aggregated select clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $aggregate
+ * @return string
+ */
+ protected function compileAggregate(Builder $query, $aggregate)
+ {
+ $column = $this->columnize($aggregate['columns']);
+
+ // If the query has a "distinct" constraint and we're not asking for all columns
+ // we need to prepend "distinct" onto the column name so that the query takes
+ // it into account when it performs the aggregating operations on the data.
+ if ($query->distinct && $column !== '*') {
+ $column = 'distinct '.$column;
+ }
+
+ return 'select '.$aggregate['function'].'('.$column.') as aggregate';
+ }
+
+ /**
+ * Compile the "select *" portion of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $columns
+ * @return string|null
+ */
+ protected function compileColumns(Builder $query, $columns)
+ {
+ // If the query is actually performing an aggregating select, we will let that
+ // compiler handle the building of the select clauses, as it will need some
+ // more syntax that is best handled by that function to keep things neat.
+ if (! is_null($query->aggregate)) {
+ return;
+ }
+
+ $select = $query->distinct ? 'select distinct ' : 'select ';
+
+ return $select.$this->columnize($columns);
+ }
+
+ /**
+ * Compile the "from" portion of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param string $table
+ * @return string
+ */
+ protected function compileFrom(Builder $query, $table)
+ {
+ return 'from '.$this->wrapTable($table);
+ }
+
+ /**
+ * Compile the "join" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $joins
+ * @return string
+ */
+ protected function compileJoins(Builder $query, $joins)
+ {
+ $sql = [];
+
+ foreach ($joins as $join) {
+ $table = $this->wrapTable($join->table);
+
+ // First we need to build all of the "on" clauses for the join. There may be many
+ // of these clauses so we will need to iterate through each one and build them
+ // separately, then we'll join them up into a single string when we're done.
+ $clauses = [];
+
+ foreach ($join->clauses as $clause) {
+ $clauses[] = $this->compileJoinConstraint($clause);
+ }
+
+ // Once we have constructed the clauses, we'll need to take the boolean connector
+ // off of the first clause as it obviously will not be required on that clause
+ // because it leads the rest of the clauses, thus not requiring any boolean.
+ $clauses[0] = $this->removeLeadingBoolean($clauses[0]);
+
+ $clauses = implode(' ', $clauses);
+
+ $type = $join->type;
+
+ // Once we have everything ready to go, we will just concatenate all the parts to
+ // build the final join statement SQL for the query and we can then return the
+ // final clause back to the callers as a single, stringified join statement.
+ $sql[] = "$type join $table on $clauses";
+ }
+
+ return implode(' ', $sql);
+ }
+
+ /**
+ * Create a join clause constraint segment.
+ *
+ * @param array $clause
+ * @return string
+ */
+ protected function compileJoinConstraint(array $clause)
+ {
+ if ($clause['nested']) {
+ return $this->compileNestedJoinConstraint($clause);
+ }
+
+ $first = $this->wrap($clause['first']);
+
+ if ($clause['where']) {
+ if ($clause['operator'] === 'in' || $clause['operator'] === 'not in') {
+ $second = '('.implode(', ', array_fill(0, $clause['second'], '?')).')';
+ } else {
+ $second = '?';
+ }
+ } else {
+ $second = $this->wrap($clause['second']);
+ }
+
+ return "{$clause['boolean']} $first {$clause['operator']} $second";
+ }
+
+ /**
+ * Create a nested join clause constraint segment.
+ *
+ * @param array $clause
+ * @return string
+ */
+ protected function compileNestedJoinConstraint(array $clause)
+ {
+ $clauses = [];
+
+ foreach ($clause['join']->clauses as $nestedClause) {
+ $clauses[] = $this->compileJoinConstraint($nestedClause);
+ }
+
+ $clauses[0] = $this->removeLeadingBoolean($clauses[0]);
+
+ $clauses = implode(' ', $clauses);
+
+ return "{$clause['boolean']} ({$clauses})";
+ }
+
+ /**
+ * Compile the "where" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ protected function compileWheres(Builder $query)
+ {
+ $sql = [];
+
+ if (is_null($query->wheres)) {
+ return '';
+ }
+
+ // Each type of where clauses has its own compiler function which is responsible
+ // for actually creating the where clauses SQL. This helps keep the code nice
+ // and maintainable since each clause has a very small method that it uses.
+ foreach ($query->wheres as $where) {
+ $method = "where{$where['type']}";
+
+ $sql[] = $where['boolean'].' '.$this->$method($query, $where);
+ }
+
+ // If we actually have some where clauses, we will strip off the first boolean
+ // operator, which is added by the query builders for convenience so we can
+ // avoid checking for the first clauses in each of the compilers methods.
+ if (count($sql) > 0) {
+ $sql = implode(' ', $sql);
+
+ return 'where '.$this->removeLeadingBoolean($sql);
+ }
+
+ return '';
+ }
+
+ /**
+ * Compile a nested where clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereNested(Builder $query, $where)
+ {
+ $nested = $where['query'];
+
+ return '('.substr($this->compileWheres($nested), 6).')';
+ }
+
+ /**
+ * Compile a where condition with a sub-select.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereSub(Builder $query, $where)
+ {
+ $select = $this->compileSelect($where['query']);
+
+ return $this->wrap($where['column']).' '.$where['operator']." ($select)";
+ }
+
+ /**
+ * Compile a basic where clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereBasic(Builder $query, $where)
+ {
+ $value = $this->parameter($where['value']);
+
+ return $this->wrap($where['column']).' '.$where['operator'].' '.$value;
+ }
+
+ /**
+ * Compile a "between" where clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereBetween(Builder $query, $where)
+ {
+ $between = $where['not'] ? 'not between' : 'between';
+
+ return $this->wrap($where['column']).' '.$between.' ? and ?';
+ }
+
+ /**
+ * Compile a where exists clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereExists(Builder $query, $where)
+ {
+ return 'exists ('.$this->compileSelect($where['query']).')';
+ }
+
+ /**
+ * Compile a where exists clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereNotExists(Builder $query, $where)
+ {
+ return 'not exists ('.$this->compileSelect($where['query']).')';
+ }
+
+ /**
+ * Compile a "where in" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereIn(Builder $query, $where)
+ {
+ if (empty($where['values'])) {
+ return '0 = 1';
+ }
+
+ $values = $this->parameterize($where['values']);
+
+ return $this->wrap($where['column']).' in ('.$values.')';
+ }
+
+ /**
+ * Compile a "where not in" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereNotIn(Builder $query, $where)
+ {
+ if (empty($where['values'])) {
+ return '1 = 1';
+ }
+
+ $values = $this->parameterize($where['values']);
+
+ return $this->wrap($where['column']).' not in ('.$values.')';
+ }
+
+ /**
+ * Compile a where in sub-select clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereInSub(Builder $query, $where)
+ {
+ $select = $this->compileSelect($where['query']);
+
+ return $this->wrap($where['column']).' in ('.$select.')';
+ }
+
+ /**
+ * Compile a where not in sub-select clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereNotInSub(Builder $query, $where)
+ {
+ $select = $this->compileSelect($where['query']);
+
+ return $this->wrap($where['column']).' not in ('.$select.')';
+ }
+
+ /**
+ * Compile a "where null" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereNull(Builder $query, $where)
+ {
+ return $this->wrap($where['column']).' is null';
+ }
+
+ /**
+ * Compile a "where not null" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereNotNull(Builder $query, $where)
+ {
+ return $this->wrap($where['column']).' is not null';
+ }
+
+ /**
+ * Compile a "where date" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereDate(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('date', $query, $where);
+ }
+
+ /**
+ * Compile a "where day" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereDay(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('day', $query, $where);
+ }
+
+ /**
+ * Compile a "where month" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereMonth(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('month', $query, $where);
+ }
+
+ /**
+ * Compile a "where year" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereYear(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('year', $query, $where);
+ }
+
+ /**
+ * Compile a date based where clause.
+ *
+ * @param string $type
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function dateBasedWhere($type, Builder $query, $where)
+ {
+ $value = $this->parameter($where['value']);
+
+ return $type.'('.$this->wrap($where['column']).') '.$where['operator'].' '.$value;
+ }
+
+ /**
+ * Compile a raw where clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereRaw(Builder $query, $where)
+ {
+ return $where['sql'];
+ }
+
+ /**
+ * Compile the "group by" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $groups
+ * @return string
+ */
+ protected function compileGroups(Builder $query, $groups)
+ {
+ return 'group by '.$this->columnize($groups);
+ }
+
+ /**
+ * Compile the "having" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $havings
+ * @return string
+ */
+ protected function compileHavings(Builder $query, $havings)
+ {
+ $sql = implode(' ', array_map([$this, 'compileHaving'], $havings));
+
+ return 'having '.$this->removeLeadingBoolean($sql);
+ }
+
+ /**
+ * Compile a single having clause.
+ *
+ * @param array $having
+ * @return string
+ */
+ protected function compileHaving(array $having)
+ {
+ // If the having clause is "raw", we can just return the clause straight away
+ // without doing any more processing on it. Otherwise, we will compile the
+ // clause into SQL based on the components that make it up from builder.
+ if ($having['type'] === 'raw') {
+ return $having['boolean'].' '.$having['sql'];
+ }
+
+ return $this->compileBasicHaving($having);
+ }
+
+ /**
+ * Compile a basic having clause.
+ *
+ * @param array $having
+ * @return string
+ */
+ protected function compileBasicHaving($having)
+ {
+ $column = $this->wrap($having['column']);
+
+ $parameter = $this->parameter($having['value']);
+
+ return $having['boolean'].' '.$column.' '.$having['operator'].' '.$parameter;
+ }
+
+ /**
+ * Compile the "order by" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $orders
+ * @return string
+ */
+ protected function compileOrders(Builder $query, $orders)
+ {
+ return 'order by '.implode(', ', array_map(function ($order) {
+ if (isset($order['sql'])) {
+ return $order['sql'];
+ }
+
+ return $this->wrap($order['column']).' '.$order['direction'];
+ }, $orders));
+ }
+
+ /**
+ * Compile the "limit" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param int $limit
+ * @return string
+ */
+ protected function compileLimit(Builder $query, $limit)
+ {
+ return 'limit '.(int) $limit;
+ }
+
+ /**
+ * Compile the "offset" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param int $offset
+ * @return string
+ */
+ protected function compileOffset(Builder $query, $offset)
+ {
+ return 'offset '.(int) $offset;
+ }
+
+ /**
+ * Compile the "union" queries attached to the main query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ protected function compileUnions(Builder $query)
+ {
+ $sql = '';
+
+ foreach ($query->unions as $union) {
+ $sql .= $this->compileUnion($union);
+ }
+
+ if (isset($query->unionOrders)) {
+ $sql .= ' '.$this->compileOrders($query, $query->unionOrders);
+ }
+
+ if (isset($query->unionLimit)) {
+ $sql .= ' '.$this->compileLimit($query, $query->unionLimit);
+ }
+
+ if (isset($query->unionOffset)) {
+ $sql .= ' '.$this->compileOffset($query, $query->unionOffset);
+ }
+
+ return ltrim($sql);
+ }
+
+ /**
+ * Compile a single union statement.
+ *
+ * @param array $union
+ * @return string
+ */
+ protected function compileUnion(array $union)
+ {
+ $joiner = $union['all'] ? ' union all ' : ' union ';
+
+ return $joiner.$union['query']->toSql();
+ }
+
+ /**
+ * Compile an exists statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ public function compileExists(Builder $query)
+ {
+ $select = $this->compileSelect($query);
+
+ return "select exists($select) as {$this->wrap('exists')}";
+ }
+
+ /**
+ * Compile an insert statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @return string
+ */
+ public function compileInsert(Builder $query, array $values)
+ {
+ // Essentially we will force every insert to be treated as a batch insert which
+ // simply makes creating the SQL easier for us since we can utilize the same
+ // basic routine regardless of an amount of records given to us to insert.
+ $table = $this->wrapTable($query->from);
+
+ if (! is_array(reset($values))) {
+ $values = [$values];
+ }
+
+ $columns = $this->columnize(array_keys(reset($values)));
+
+ // We need to build a list of parameter place-holders of values that are bound
+ // to the query. Each insert should have the exact same amount of parameter
+ // bindings so we will loop through the record and parameterize them all.
+ $parameters = [];
+
+ foreach ($values as $record) {
+ $parameters[] = '('.$this->parameterize($record).')';
+ }
+
+ $parameters = implode(', ', $parameters);
+
+ return "insert into $table ($columns) values $parameters";
+ }
+
+ /**
+ * Compile an insert and get ID statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @param string $sequence
+ * @return string
+ */
+ public function compileInsertGetId(Builder $query, $values, $sequence)
+ {
+ return $this->compileInsert($query, $values);
+ }
+
+ /**
+ * Compile an update statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @return string
+ */
+ public function compileUpdate(Builder $query, $values)
+ {
+ $table = $this->wrapTable($query->from);
+
+ // Each one of the columns in the update statements needs to be wrapped in the
+ // keyword identifiers, also a place-holder needs to be created for each of
+ // the values in the list of bindings so we can make the sets statements.
+ $columns = [];
+
+ foreach ($values as $key => $value) {
+ $columns[] = $this->wrap($key).' = '.$this->parameter($value);
+ }
+
+ $columns = implode(', ', $columns);
+
+ // If the query has any "join" clauses, we will setup the joins on the builder
+ // and compile them so we can attach them to this update, as update queries
+ // can get join statements to attach to other tables when they're needed.
+ if (isset($query->joins)) {
+ $joins = ' '.$this->compileJoins($query, $query->joins);
+ } else {
+ $joins = '';
+ }
+
+ // Of course, update queries may also be constrained by where clauses so we'll
+ // need to compile the where clauses and attach it to the query so only the
+ // intended records are updated by the SQL statements we generate to run.
+ $where = $this->compileWheres($query);
+
+ return trim("update {$table}{$joins} set $columns $where");
+ }
+
+ /**
+ * Compile a delete statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ public function compileDelete(Builder $query)
+ {
+ $table = $this->wrapTable($query->from);
+
+ $where = is_array($query->wheres) ? $this->compileWheres($query) : '';
+
+ return trim("delete from $table ".$where);
+ }
+
+ /**
+ * Compile a truncate table statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return array
+ */
+ public function compileTruncate(Builder $query)
+ {
+ return ['truncate '.$this->wrapTable($query->from) => []];
+ }
+
+ /**
+ * Compile the lock into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param bool|string $value
+ * @return string
+ */
+ protected function compileLock(Builder $query, $value)
+ {
+ return is_string($value) ? $value : '';
+ }
+
+ /**
+ * Determine if the grammar supports savepoints.
+ *
+ * @return bool
+ */
+ public function supportsSavepoints()
+ {
+ return true;
+ }
+
+ /**
+ * Compile the SQL statement to define a savepoint.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function compileSavepoint($name)
+ {
+ return 'SAVEPOINT '.$name;
+ }
+
+ /**
+ * Compile the SQL statement to execute a savepoint rollback.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function compileSavepointRollBack($name)
+ {
+ return 'ROLLBACK TO SAVEPOINT '.$name;
+ }
+
+ /**
+ * Concatenate an array of segments, removing empties.
+ *
+ * @param array $segments
+ * @return string
+ */
+ protected function concatenate($segments)
+ {
+ return implode(' ', array_filter($segments, function ($value) {
+ return (string) $value !== '';
+ }));
+ }
+
+ /**
+ * Remove the leading boolean from a statement.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function removeLeadingBoolean($value)
+ {
+ return preg_replace('/and |or /i', '', $value, 1);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
index b6a1dbd..e48221c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
@@ -1,144 +1,141 @@
-unions)
- {
- $sql = '('.$sql.') '.$this->compileUnions($query);
- }
-
- return $sql;
- }
-
- /**
- * Compile a single union statement.
- *
- * @param array $union
- * @return string
- */
- protected function compileUnion(array $union)
- {
- $joiner = $union['all'] ? ' union all ' : ' union ';
-
- return $joiner.'('.$union['query']->toSql().')';
- }
-
- /**
- * Compile the lock into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param bool|string $value
- * @return string
- */
- protected function compileLock(Builder $query, $value)
- {
- if (is_string($value)) return $value;
-
- return $value ? 'for update' : 'lock in share mode';
- }
-
- /**
- * Compile an update statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $values
- * @return string
- */
- public function compileUpdate(Builder $query, $values)
- {
- $sql = parent::compileUpdate($query, $values);
-
- if (isset($query->orders))
- {
- $sql .= ' '.$this->compileOrders($query, $query->orders);
- }
-
- if (isset($query->limit))
- {
- $sql .= ' '.$this->compileLimit($query, $query->limit);
- }
-
- return rtrim($sql);
- }
-
- /**
- * Compile a delete statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- public function compileDelete(Builder $query)
- {
- $table = $this->wrapTable($query->from);
-
- $where = is_array($query->wheres) ? $this->compileWheres($query) : '';
-
- if (isset($query->joins))
- {
- $joins = ' '.$this->compileJoins($query, $query->joins);
-
- $sql = trim("delete $table from {$table}{$joins} $where");
- }
- else
- {
- $sql = trim("delete from $table $where");
- }
-
- if (isset($query->orders))
- {
- $sql .= ' '.$this->compileOrders($query, $query->orders);
- }
-
- if (isset($query->limit))
- {
- $sql .= ' '.$this->compileLimit($query, $query->limit);
- }
-
- return $sql;
- }
-
- /**
- * Wrap a single string in keyword identifiers.
- *
- * @param string $value
- * @return string
- */
- protected function wrapValue($value)
- {
- if ($value === '*') return $value;
-
- return '`'.str_replace('`', '``', $value).'`';
- }
+use Illuminate\Database\Query\Builder;
+class MySqlGrammar extends Grammar
+{
+ /**
+ * The components that make up a select clause.
+ *
+ * @var array
+ */
+ protected $selectComponents = [
+ 'aggregate',
+ 'columns',
+ 'from',
+ 'joins',
+ 'wheres',
+ 'groups',
+ 'havings',
+ 'orders',
+ 'limit',
+ 'offset',
+ 'lock',
+ ];
+
+ /**
+ * Compile a select query into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ public function compileSelect(Builder $query)
+ {
+ $sql = parent::compileSelect($query);
+
+ if ($query->unions) {
+ $sql = '('.$sql.') '.$this->compileUnions($query);
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Compile a single union statement.
+ *
+ * @param array $union
+ * @return string
+ */
+ protected function compileUnion(array $union)
+ {
+ $joiner = $union['all'] ? ' union all ' : ' union ';
+
+ return $joiner.'('.$union['query']->toSql().')';
+ }
+
+ /**
+ * Compile the lock into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param bool|string $value
+ * @return string
+ */
+ protected function compileLock(Builder $query, $value)
+ {
+ if (is_string($value)) {
+ return $value;
+ }
+
+ return $value ? 'for update' : 'lock in share mode';
+ }
+
+ /**
+ * Compile an update statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @return string
+ */
+ public function compileUpdate(Builder $query, $values)
+ {
+ $sql = parent::compileUpdate($query, $values);
+
+ if (isset($query->orders)) {
+ $sql .= ' '.$this->compileOrders($query, $query->orders);
+ }
+
+ if (isset($query->limit)) {
+ $sql .= ' '.$this->compileLimit($query, $query->limit);
+ }
+
+ return rtrim($sql);
+ }
+
+ /**
+ * Compile a delete statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ public function compileDelete(Builder $query)
+ {
+ $table = $this->wrapTable($query->from);
+
+ $where = is_array($query->wheres) ? $this->compileWheres($query) : '';
+
+ if (isset($query->joins)) {
+ $joins = ' '.$this->compileJoins($query, $query->joins);
+
+ $sql = trim("delete $table from {$table}{$joins} $where");
+ } else {
+ $sql = trim("delete from $table $where");
+
+ if (isset($query->orders)) {
+ $sql .= ' '.$this->compileOrders($query, $query->orders);
+ }
+
+ if (isset($query->limit)) {
+ $sql .= ' '.$this->compileLimit($query, $query->limit);
+ }
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Wrap a single string in keyword identifiers.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function wrapValue($value)
+ {
+ if ($value === '*') {
+ return $value;
+ }
+
+ return '`'.str_replace('`', '``', $value).'`';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php
index 7a8df9c..5582649 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php
@@ -1,174 +1,245 @@
-', '<=', '>=', '<>', '!=',
- 'like', 'not like', 'between', 'ilike',
- '&', '|', '#', '<<', '>>',
- );
-
- /**
- * Compile the lock into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param bool|string $value
- * @return string
- */
- protected function compileLock(Builder $query, $value)
- {
- if (is_string($value)) return $value;
-
- return $value ? 'for update' : 'for share';
- }
-
- /**
- * Compile an update statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $values
- * @return string
- */
- public function compileUpdate(Builder $query, $values)
- {
- $table = $this->wrapTable($query->from);
-
- // Each one of the columns in the update statements needs to be wrapped in the
- // keyword identifiers, also a place-holder needs to be created for each of
- // the values in the list of bindings so we can make the sets statements.
- $columns = $this->compileUpdateColumns($values);
-
- $from = $this->compileUpdateFrom($query);
-
- $where = $this->compileUpdateWheres($query);
-
- return trim("update {$table} set {$columns}{$from} $where");
- }
-
- /**
- * Compile the columns for the update statement.
- *
- * @param array $values
- * @return string
- */
- protected function compileUpdateColumns($values)
- {
- $columns = array();
-
- // When gathering the columns for an update statement, we'll wrap each of the
- // columns and convert it to a parameter value. Then we will concatenate a
- // list of the columns that can be added into this update query clauses.
- foreach ($values as $key => $value)
- {
- $columns[] = $this->wrap($key).' = '.$this->parameter($value);
- }
-
- return implode(', ', $columns);
- }
-
- /**
- * Compile the "from" clause for an update with a join.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- protected function compileUpdateFrom(Builder $query)
- {
- if ( ! isset($query->joins)) return '';
-
- $froms = array();
-
- // When using Postgres, updates with joins list the joined tables in the from
- // clause, which is different than other systems like MySQL. Here, we will
- // compile out the tables that are joined and add them to a from clause.
- foreach ($query->joins as $join)
- {
- $froms[] = $this->wrapTable($join->table);
- }
-
- if (count($froms) > 0) return ' from '.implode(', ', $froms);
- }
-
- /**
- * Compile the additional where clauses for updates with joins.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- protected function compileUpdateWheres(Builder $query)
- {
- $baseWhere = $this->compileWheres($query);
-
- if ( ! isset($query->joins)) return $baseWhere;
-
- // Once we compile the join constraints, we will either use them as the where
- // clause or append them to the existing base where clauses. If we need to
- // strip the leading boolean we will do so when using as the only where.
- $joinWhere = $this->compileUpdateJoinWheres($query);
-
- if (trim($baseWhere) == '')
- {
- return 'where '.$this->removeLeadingBoolean($joinWhere);
- }
-
- return $baseWhere.' '.$joinWhere;
- }
-
- /**
- * Compile the "join" clauses for an update.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- protected function compileUpdateJoinWheres(Builder $query)
- {
- $joinWheres = array();
-
- // Here we will just loop through all of the join constraints and compile them
- // all out then implode them. This should give us "where" like syntax after
- // everything has been built and then we will join it to the real wheres.
- foreach ($query->joins as $join)
- {
- foreach ($join->clauses as $clause)
- {
- $joinWheres[] = $this->compileJoinConstraint($clause);
- }
- }
-
- return implode(' ', $joinWheres);
- }
-
- /**
- * Compile an insert and get ID statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $values
- * @param string $sequence
- * @return string
- */
- public function compileInsertGetId(Builder $query, $values, $sequence)
- {
- if (is_null($sequence)) $sequence = 'id';
-
- return $this->compileInsert($query, $values).' returning '.$this->wrap($sequence);
- }
-
- /**
- * Compile a truncate table statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return array
- */
- public function compileTruncate(Builder $query)
- {
- return array('truncate '.$this->wrapTable($query->from).' restart identity' => array());
- }
+use Illuminate\Database\Query\Builder;
+class PostgresGrammar extends Grammar
+{
+ /**
+ * All of the available clause operators.
+ *
+ * @var array
+ */
+ protected $operators = [
+ '=', '<', '>', '<=', '>=', '<>', '!=',
+ 'like', 'not like', 'between', 'ilike',
+ '&', '|', '#', '<<', '>>',
+ ];
+
+ /**
+ * Compile the lock into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param bool|string $value
+ * @return string
+ */
+ protected function compileLock(Builder $query, $value)
+ {
+ if (is_string($value)) {
+ return $value;
+ }
+
+ return $value ? 'for update' : 'for share';
+ }
+
+ /**
+ * Compile a "where date" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereDate(Builder $query, $where)
+ {
+ $value = $this->parameter($where['value']);
+
+ return $this->wrap($where['column']).' '.$where['operator'].' '.$value.'::date';
+ }
+
+ /**
+ * Compile a "where day" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereDay(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('day', $query, $where);
+ }
+
+ /**
+ * Compile a "where month" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereMonth(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('month', $query, $where);
+ }
+
+ /**
+ * Compile a "where year" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereYear(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('year', $query, $where);
+ }
+
+ /**
+ * Compile a date based where clause.
+ *
+ * @param string $type
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function dateBasedWhere($type, Builder $query, $where)
+ {
+ $value = $this->parameter($where['value']);
+
+ return 'extract('.$type.' from '.$this->wrap($where['column']).') '.$where['operator'].' '.$value;
+ }
+
+ /**
+ * Compile an update statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @return string
+ */
+ public function compileUpdate(Builder $query, $values)
+ {
+ $table = $this->wrapTable($query->from);
+
+ // Each one of the columns in the update statements needs to be wrapped in the
+ // keyword identifiers, also a place-holder needs to be created for each of
+ // the values in the list of bindings so we can make the sets statements.
+ $columns = $this->compileUpdateColumns($values);
+
+ $from = $this->compileUpdateFrom($query);
+
+ $where = $this->compileUpdateWheres($query);
+
+ return trim("update {$table} set {$columns}{$from} $where");
+ }
+
+ /**
+ * Compile the columns for the update statement.
+ *
+ * @param array $values
+ * @return string
+ */
+ protected function compileUpdateColumns($values)
+ {
+ $columns = [];
+
+ // When gathering the columns for an update statement, we'll wrap each of the
+ // columns and convert it to a parameter value. Then we will concatenate a
+ // list of the columns that can be added into this update query clauses.
+ foreach ($values as $key => $value) {
+ $columns[] = $this->wrap($key).' = '.$this->parameter($value);
+ }
+
+ return implode(', ', $columns);
+ }
+
+ /**
+ * Compile the "from" clause for an update with a join.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string|null
+ */
+ protected function compileUpdateFrom(Builder $query)
+ {
+ if (! isset($query->joins)) {
+ return '';
+ }
+
+ $froms = [];
+
+ // When using Postgres, updates with joins list the joined tables in the from
+ // clause, which is different than other systems like MySQL. Here, we will
+ // compile out the tables that are joined and add them to a from clause.
+ foreach ($query->joins as $join) {
+ $froms[] = $this->wrapTable($join->table);
+ }
+
+ if (count($froms) > 0) {
+ return ' from '.implode(', ', $froms);
+ }
+ }
+
+ /**
+ * Compile the additional where clauses for updates with joins.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ protected function compileUpdateWheres(Builder $query)
+ {
+ $baseWhere = $this->compileWheres($query);
+
+ if (! isset($query->joins)) {
+ return $baseWhere;
+ }
+
+ // Once we compile the join constraints, we will either use them as the where
+ // clause or append them to the existing base where clauses. If we need to
+ // strip the leading boolean we will do so when using as the only where.
+ $joinWhere = $this->compileUpdateJoinWheres($query);
+
+ if (trim($baseWhere) == '') {
+ return 'where '.$this->removeLeadingBoolean($joinWhere);
+ }
+
+ return $baseWhere.' '.$joinWhere;
+ }
+
+ /**
+ * Compile the "join" clauses for an update.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ protected function compileUpdateJoinWheres(Builder $query)
+ {
+ $joinWheres = [];
+
+ // Here we will just loop through all of the join constraints and compile them
+ // all out then implode them. This should give us "where" like syntax after
+ // everything has been built and then we will join it to the real wheres.
+ foreach ($query->joins as $join) {
+ foreach ($join->clauses as $clause) {
+ $joinWheres[] = $this->compileJoinConstraint($clause);
+ }
+ }
+
+ return implode(' ', $joinWheres);
+ }
+
+ /**
+ * Compile an insert and get ID statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @param string $sequence
+ * @return string
+ */
+ public function compileInsertGetId(Builder $query, $values, $sequence)
+ {
+ if (is_null($sequence)) {
+ $sequence = 'id';
+ }
+
+ return $this->compileInsert($query, $values).' returning '.$this->wrap($sequence);
+ }
+
+ /**
+ * Compile a truncate table statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return array
+ */
+ public function compileTruncate(Builder $query)
+ {
+ return ['truncate '.$this->wrapTable($query->from).' restart identity' => []];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
index 9e47042..dd1f9c0 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
@@ -1,130 +1,140 @@
-', '<=', '>=', '<>', '!=',
- 'like', 'not like', 'between', 'ilike',
- '&', '|', '<<', '>>',
- );
-
- /**
- * Compile an insert statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $values
- * @return string
- */
- public function compileInsert(Builder $query, array $values)
- {
- // Essentially we will force every insert to be treated as a batch insert which
- // simply makes creating the SQL easier for us since we can utilize the same
- // basic routine regardless of an amount of records given to us to insert.
- $table = $this->wrapTable($query->from);
-
- if ( ! is_array(reset($values)))
- {
- $values = array($values);
- }
-
- // If there is only one record being inserted, we will just use the usual query
- // grammar insert builder because no special syntax is needed for the single
- // row inserts in SQLite. However, if there are multiples, we'll continue.
- if (count($values) == 1)
- {
- return parent::compileInsert($query, reset($values));
- }
-
- $names = $this->columnize(array_keys(reset($values)));
-
- $columns = array();
-
- // SQLite requires us to build the multi-row insert as a listing of select with
- // unions joining them together. So we'll build out this list of columns and
- // then join them all together with select unions to complete the queries.
- foreach (array_keys(reset($values)) as $column)
- {
- $columns[] = '? as '.$this->wrap($column);
- }
-
- $columns = array_fill(0, count($values), implode(', ', $columns));
-
- return "insert into $table ($names) select ".implode(' union all select ', $columns);
- }
-
- /**
- * Compile a truncate table statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return array
- */
- public function compileTruncate(Builder $query)
- {
- $sql = array('delete from sqlite_sequence where name = ?' => array($query->from));
-
- $sql['delete from '.$this->wrapTable($query->from)] = array();
-
- return $sql;
- }
-
- /**
- * Compile a "where day" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereDay(Builder $query, $where)
- {
- return $this->dateBasedWhere('%d', $query, $where);
- }
-
- /**
- * Compile a "where month" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereMonth(Builder $query, $where)
- {
- return $this->dateBasedWhere('%m', $query, $where);
- }
-
- /**
- * Compile a "where year" clause.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function whereYear(Builder $query, $where)
- {
- return $this->dateBasedWhere('%Y', $query, $where);
- }
-
- /**
- * Compile a date based where clause.
- *
- * @param string $type
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $where
- * @return string
- */
- protected function dateBasedWhere($type, Builder $query, $where)
- {
- $value = str_pad($where['value'], 2, '0', STR_PAD_LEFT);
-
- $value = $this->parameter($value);
-
- return 'strftime(\''.$type.'\', '.$this->wrap($where['column']).') '.$where['operator'].' '.$value;
- }
+use Illuminate\Database\Query\Builder;
+class SQLiteGrammar extends Grammar
+{
+ /**
+ * All of the available clause operators.
+ *
+ * @var array
+ */
+ protected $operators = [
+ '=', '<', '>', '<=', '>=', '<>', '!=',
+ 'like', 'not like', 'between', 'ilike',
+ '&', '|', '<<', '>>',
+ ];
+
+ /**
+ * Compile an insert statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @return string
+ */
+ public function compileInsert(Builder $query, array $values)
+ {
+ // Essentially we will force every insert to be treated as a batch insert which
+ // simply makes creating the SQL easier for us since we can utilize the same
+ // basic routine regardless of an amount of records given to us to insert.
+ $table = $this->wrapTable($query->from);
+
+ if (! is_array(reset($values))) {
+ $values = [$values];
+ }
+
+ // If there is only one record being inserted, we will just use the usual query
+ // grammar insert builder because no special syntax is needed for the single
+ // row inserts in SQLite. However, if there are multiples, we'll continue.
+ if (count($values) == 1) {
+ return parent::compileInsert($query, reset($values));
+ }
+
+ $names = $this->columnize(array_keys(reset($values)));
+
+ $columns = [];
+
+ // SQLite requires us to build the multi-row insert as a listing of select with
+ // unions joining them together. So we'll build out this list of columns and
+ // then join them all together with select unions to complete the queries.
+ foreach (array_keys(reset($values)) as $column) {
+ $columns[] = '? as '.$this->wrap($column);
+ }
+
+ $columns = array_fill(0, count($values), implode(', ', $columns));
+
+ return "insert into $table ($names) select ".implode(' union all select ', $columns);
+ }
+
+ /**
+ * Compile a truncate table statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return array
+ */
+ public function compileTruncate(Builder $query)
+ {
+ $sql = ['delete from sqlite_sequence where name = ?' => [$query->from]];
+
+ $sql['delete from '.$this->wrapTable($query->from)] = [];
+
+ return $sql;
+ }
+
+ /**
+ * Compile a "where date" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereDate(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('%Y-%m-%d', $query, $where);
+ }
+
+ /**
+ * Compile a "where day" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereDay(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('%d', $query, $where);
+ }
+
+ /**
+ * Compile a "where month" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereMonth(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('%m', $query, $where);
+ }
+
+ /**
+ * Compile a "where year" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereYear(Builder $query, $where)
+ {
+ return $this->dateBasedWhere('%Y', $query, $where);
+ }
+
+ /**
+ * Compile a date based where clause.
+ *
+ * @param string $type
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function dateBasedWhere($type, Builder $query, $where)
+ {
+ $value = str_pad($where['value'], 2, '0', STR_PAD_LEFT);
+
+ $value = $this->parameter($value);
+
+ return 'strftime(\''.$type.'\', '.$this->wrap($where['column']).') '.$where['operator'].' '.$value;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
index 24fd428..b36e94c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
@@ -1,224 +1,344 @@
-', '<=', '>=', '!<', '!>', '<>', '!=',
- 'like', 'not like', 'between', 'ilike',
- '&', '&=', '|', '|=', '^', '^=',
- );
-
- /**
- * Compile a select query into SQL.
- *
- * @param \Illuminate\Database\Query\Builder
- * @return string
- */
- public function compileSelect(Builder $query)
- {
- $components = $this->compileComponents($query);
-
- // If an offset is present on the query, we will need to wrap the query in
- // a big "ANSI" offset syntax block. This is very nasty compared to the
- // other database systems but is necessary for implementing features.
- if ($query->offset > 0)
- {
- return $this->compileAnsiOffset($query, $components);
- }
-
- return $this->concatenate($components);
- }
-
- /**
- * Compile the "select *" portion of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $columns
- * @return string
- */
- protected function compileColumns(Builder $query, $columns)
- {
- if ( ! is_null($query->aggregate)) return;
-
- $select = $query->distinct ? 'select distinct ' : 'select ';
-
- // If there is a limit on the query, but not an offset, we will add the top
- // clause to the query, which serves as a "limit" type clause within the
- // SQL Server system similar to the limit keywords available in MySQL.
- if ($query->limit > 0 && $query->offset <= 0)
- {
- $select .= 'top '.$query->limit.' ';
- }
-
- return $select.$this->columnize($columns);
- }
-
- /**
- * Compile the "from" portion of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param string $table
- * @return string
- */
- protected function compileFrom(Builder $query, $table)
- {
- $from = parent::compileFrom($query, $table);
-
- if (is_string($query->lock)) return $from.' '.$query->lock;
-
- if ( ! is_null($query->lock))
- {
- return $from.' with(rowlock,'.($query->lock ? 'updlock,' : '').'holdlock)';
- }
-
- return $from;
- }
-
- /**
- * Create a full ANSI offset clause for the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param array $components
- * @return string
- */
- protected function compileAnsiOffset(Builder $query, $components)
- {
- // An ORDER BY clause is required to make this offset query work, so if one does
- // not exist we'll just create a dummy clause to trick the database and so it
- // does not complain about the queries for not having an "order by" clause.
- if ( ! isset($components['orders']))
- {
- $components['orders'] = 'order by (select 0)';
- }
-
- // We need to add the row number to the query so we can compare it to the offset
- // and limit values given for the statements. So we will add an expression to
- // the "select" that will give back the row numbers on each of the records.
- $orderings = $components['orders'];
-
- $components['columns'] .= $this->compileOver($orderings);
-
- unset($components['orders']);
-
- // Next we need to calculate the constraints that should be placed on the query
- // to get the right offset and limit from our query but if there is no limit
- // set we will just handle the offset only since that is all that matters.
- $constraint = $this->compileRowConstraint($query);
-
- $sql = $this->concatenate($components);
-
- // We are now ready to build the final SQL query so we'll create a common table
- // expression from the query and get the records with row numbers within our
- // given limit and offset value that we just put on as a query constraint.
- return $this->compileTableExpression($sql, $constraint);
- }
-
- /**
- * Compile the over statement for a table expression.
- *
- * @param string $orderings
- * @return string
- */
- protected function compileOver($orderings)
- {
- return ", row_number() over ({$orderings}) as row_num";
- }
-
- /**
- * Compile the limit / offset row constraint for a query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return string
- */
- protected function compileRowConstraint($query)
- {
- $start = $query->offset + 1;
-
- if ($query->limit > 0)
- {
- $finish = $query->offset + $query->limit;
-
- return "between {$start} and {$finish}";
- }
-
- return ">= {$start}";
- }
-
- /**
- * Compile a common table expression for a query.
- *
- * @param string $sql
- * @param string $constraint
- * @return string
- */
- protected function compileTableExpression($sql, $constraint)
- {
- return "select * from ({$sql}) as temp_table where row_num {$constraint}";
- }
-
- /**
- * Compile the "limit" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param int $limit
- * @return string
- */
- protected function compileLimit(Builder $query, $limit)
- {
- return '';
- }
-
- /**
- * Compile the "offset" portions of the query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param int $offset
- * @return string
- */
- protected function compileOffset(Builder $query, $offset)
- {
- return '';
- }
-
- /**
- * Compile a truncate table statement into SQL.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @return array
- */
- public function compileTruncate(Builder $query)
- {
- return array('truncate table '.$this->wrapTable($query->from) => array());
- }
-
- /**
- * Get the format for database stored dates.
- *
- * @return string
- */
- public function getDateFormat()
- {
- return 'Y-m-d H:i:s.000';
- }
-
- /**
- * Wrap a single string in keyword identifiers.
- *
- * @param string $value
- * @return string
- */
- protected function wrapValue($value)
- {
- if ($value === '*') return $value;
-
- return '['.str_replace(']', ']]', $value).']';
- }
+use Illuminate\Database\Query\Builder;
+class SqlServerGrammar extends Grammar
+{
+ /**
+ * All of the available clause operators.
+ *
+ * @var array
+ */
+ protected $operators = [
+ '=', '<', '>', '<=', '>=', '!<', '!>', '<>', '!=',
+ 'like', 'not like', 'between', 'ilike',
+ '&', '&=', '|', '|=', '^', '^=',
+ ];
+
+ /**
+ * Compile a select query into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ public function compileSelect(Builder $query)
+ {
+ if (is_null($query->columns)) {
+ $query->columns = ['*'];
+ }
+
+ $components = $this->compileComponents($query);
+
+ // If an offset is present on the query, we will need to wrap the query in
+ // a big "ANSI" offset syntax block. This is very nasty compared to the
+ // other database systems but is necessary for implementing features.
+ if ($query->offset > 0) {
+ return $this->compileAnsiOffset($query, $components);
+ }
+
+ return $this->concatenate($components);
+ }
+
+ /**
+ * Compile the "select *" portion of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $columns
+ * @return string|null
+ */
+ protected function compileColumns(Builder $query, $columns)
+ {
+ if (! is_null($query->aggregate)) {
+ return;
+ }
+
+ $select = $query->distinct ? 'select distinct ' : 'select ';
+
+ // If there is a limit on the query, but not an offset, we will add the top
+ // clause to the query, which serves as a "limit" type clause within the
+ // SQL Server system similar to the limit keywords available in MySQL.
+ if ($query->limit > 0 && $query->offset <= 0) {
+ $select .= 'top '.$query->limit.' ';
+ }
+
+ return $select.$this->columnize($columns);
+ }
+
+ /**
+ * Compile the "from" portion of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param string $table
+ * @return string
+ */
+ protected function compileFrom(Builder $query, $table)
+ {
+ $from = parent::compileFrom($query, $table);
+
+ if (is_string($query->lock)) {
+ return $from.' '.$query->lock;
+ }
+
+ if (! is_null($query->lock)) {
+ return $from.' with(rowlock,'.($query->lock ? 'updlock,' : '').'holdlock)';
+ }
+
+ return $from;
+ }
+
+ /**
+ * Create a full ANSI offset clause for the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $components
+ * @return string
+ */
+ protected function compileAnsiOffset(Builder $query, $components)
+ {
+ // An ORDER BY clause is required to make this offset query work, so if one does
+ // not exist we'll just create a dummy clause to trick the database and so it
+ // does not complain about the queries for not having an "order by" clause.
+ if (! isset($components['orders'])) {
+ $components['orders'] = 'order by (select 0)';
+ }
+
+ // We need to add the row number to the query so we can compare it to the offset
+ // and limit values given for the statements. So we will add an expression to
+ // the "select" that will give back the row numbers on each of the records.
+ $orderings = $components['orders'];
+
+ $components['columns'] .= $this->compileOver($orderings);
+
+ unset($components['orders']);
+
+ // Next we need to calculate the constraints that should be placed on the query
+ // to get the right offset and limit from our query but if there is no limit
+ // set we will just handle the offset only since that is all that matters.
+ $constraint = $this->compileRowConstraint($query);
+
+ $sql = $this->concatenate($components);
+
+ // We are now ready to build the final SQL query so we'll create a common table
+ // expression from the query and get the records with row numbers within our
+ // given limit and offset value that we just put on as a query constraint.
+ return $this->compileTableExpression($sql, $constraint);
+ }
+
+ /**
+ * Compile the over statement for a table expression.
+ *
+ * @param string $orderings
+ * @return string
+ */
+ protected function compileOver($orderings)
+ {
+ return ", row_number() over ({$orderings}) as row_num";
+ }
+
+ /**
+ * Compile the limit / offset row constraint for a query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ protected function compileRowConstraint($query)
+ {
+ $start = $query->offset + 1;
+
+ if ($query->limit > 0) {
+ $finish = $query->offset + $query->limit;
+
+ return "between {$start} and {$finish}";
+ }
+
+ return ">= {$start}";
+ }
+
+ /**
+ * Compile a common table expression for a query.
+ *
+ * @param string $sql
+ * @param string $constraint
+ * @return string
+ */
+ protected function compileTableExpression($sql, $constraint)
+ {
+ return "select * from ({$sql}) as temp_table where row_num {$constraint}";
+ }
+
+ /**
+ * Compile the "limit" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param int $limit
+ * @return string
+ */
+ protected function compileLimit(Builder $query, $limit)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the "offset" portions of the query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param int $offset
+ * @return string
+ */
+ protected function compileOffset(Builder $query, $offset)
+ {
+ return '';
+ }
+
+ /**
+ * Compile a truncate table statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return array
+ */
+ public function compileTruncate(Builder $query)
+ {
+ return ['truncate table '.$this->wrapTable($query->from) => []];
+ }
+
+ /**
+ * Compile an exists statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @return string
+ */
+ public function compileExists(Builder $query)
+ {
+ $existsQuery = clone $query;
+
+ $existsQuery->columns = [];
+
+ return $this->compileSelect($existsQuery->selectRaw('1 [exists]')->limit(1));
+ }
+
+ /**
+ * Compile a "where date" clause.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $where
+ * @return string
+ */
+ protected function whereDate(Builder $query, $where)
+ {
+ $value = $this->parameter($where['value']);
+
+ return 'cast('.$this->wrap($where['column']).' as date) '.$where['operator'].' '.$value;
+ }
+
+ /**
+ * Determine if the grammar supports savepoints.
+ *
+ * @return bool
+ */
+ public function supportsSavepoints()
+ {
+ return false;
+ }
+
+ /**
+ * Get the format for database stored dates.
+ *
+ * @return string
+ */
+ public function getDateFormat()
+ {
+ return 'Y-m-d H:i:s.000';
+ }
+
+ /**
+ * Wrap a single string in keyword identifiers.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function wrapValue($value)
+ {
+ if ($value === '*') {
+ return $value;
+ }
+
+ return '['.str_replace(']', ']]', $value).']';
+ }
+
+ /**
+ * Compile an update statement into SQL.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $values
+ * @return string
+ */
+ public function compileUpdate(Builder $query, $values)
+ {
+ $table = $alias = $this->wrapTable($query->from);
+
+ if (strpos(strtolower($table), '] as [') !== false) {
+ $segments = explode('] as [', $table);
+
+ $alias = '['.$segments[1];
+ }
+
+ // Each one of the columns in the update statements needs to be wrapped in the
+ // keyword identifiers, also a place-holder needs to be created for each of
+ // the values in the list of bindings so we can make the sets statements.
+ $columns = [];
+
+ foreach ($values as $key => $value) {
+ $columns[] = $this->wrap($key).' = '.$this->parameter($value);
+ }
+
+ $columns = implode(', ', $columns);
+
+ // If the query has any "join" clauses, we will setup the joins on the builder
+ // and compile them so we can attach them to this update, as update queries
+ // can get join statements to attach to other tables when they're needed.
+ if (isset($query->joins)) {
+ $joins = ' '.$this->compileJoins($query, $query->joins);
+ } else {
+ $joins = '';
+ }
+
+ // Of course, update queries may also be constrained by where clauses so we'll
+ // need to compile the where clauses and attach it to the query so only the
+ // intended records are updated by the SQL statements we generate to run.
+ $where = $this->compileWheres($query);
+
+ if (! empty($joins)) {
+ return trim("update {$alias} set {$columns} from {$table}{$joins} {$where}");
+ }
+
+ return trim("update {$table}{$joins} set $columns $where");
+ }
+
+ /**
+ * Wrap a table in keyword identifiers.
+ *
+ * @param \Illuminate\Database\Query\Expression|string $table
+ * @return string
+ */
+ public function wrapTable($table)
+ {
+ return $this->wrapTableValuedFunction(parent::wrapTable($table));
+ }
+
+ /**
+ * Wrap a table in keyword identifiers.
+ *
+ * @param string $table
+ * @return string
+ */
+ protected function wrapTableValuedFunction($table)
+ {
+ if (preg_match('/^(.+?)(\(.*?\))]$/', $table, $matches) === 1) {
+ $table = $matches[1].']'.$matches[2];
+ }
+
+ return $table;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/JoinClause.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/JoinClause.php
index ea571d3..29ce036 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/JoinClause.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/JoinClause.php
@@ -1,151 +1,253 @@
-type = $type;
- $this->table = $table;
- }
-
- /**
- * Add an "on" clause to the join.
- *
- * @param string $first
- * @param string $operator
- * @param string $second
- * @param string $boolean
- * @param bool $where
- * @return $this
- */
- public function on($first, $operator, $second, $boolean = 'and', $where = false)
- {
- $this->clauses[] = compact('first', 'operator', 'second', 'boolean', 'where');
-
- if ($where) $this->bindings[] = $second;
-
- return $this;
- }
-
- /**
- * Add an "or on" clause to the join.
- *
- * @param string $first
- * @param string $operator
- * @param string $second
- * @return \Illuminate\Database\Query\JoinClause
- */
- public function orOn($first, $operator, $second)
- {
- return $this->on($first, $operator, $second, 'or');
- }
-
- /**
- * Add an "on where" clause to the join.
- *
- * @param string $first
- * @param string $operator
- * @param string $second
- * @param string $boolean
- * @return \Illuminate\Database\Query\JoinClause
- */
- public function where($first, $operator, $second, $boolean = 'and')
- {
- return $this->on($first, $operator, $second, $boolean, true);
- }
-
- /**
- * Add an "or on where" clause to the join.
- *
- * @param string $first
- * @param string $operator
- * @param string $second
- * @return \Illuminate\Database\Query\JoinClause
- */
- public function orWhere($first, $operator, $second)
- {
- return $this->on($first, $operator, $second, 'or', true);
- }
-
- /**
- * Add an "on where is null" clause to the join.
- *
- * @param string $column
- * @param string $boolean
- * @return \Illuminate\Database\Query\JoinClause
- */
- public function whereNull($column, $boolean = 'and')
- {
- return $this->on($column, 'is', new Expression('null'), $boolean, false);
- }
-
- /**
- * Add an "or on where is null" clause to the join.
- *
- * @param string $column
- * @return \Illuminate\Database\Query\JoinClause
- */
- public function orWhereNull($column)
- {
- return $this->whereNull($column, 'or');
- }
-
- /**
- * Add an "on where is not null" clause to the join.
- *
- * @param string $column
- * @param string $boolean
- * @return \Illuminate\Database\Query\JoinClause
- */
- public function whereNotNull($column, $boolean = 'and')
- {
- return $this->on($column, 'is', new Expression('not null'), $boolean, false);
- }
-
- /**
- * Add an "or on where is not null" clause to the join.
- *
- * @param string $column
- * @return \Illuminate\Database\Query\JoinClause
- */
- public function orWhereNotNull($column)
- {
- return $this->whereNotNull($column, 'or');
- }
-
+type = $type;
+ $this->table = $table;
+ }
+
+ /**
+ * Add an "on" clause to the join.
+ *
+ * On clauses can be chained, e.g.
+ *
+ * $join->on('contacts.user_id', '=', 'users.id')
+ * ->on('contacts.info_id', '=', 'info.id')
+ *
+ * will produce the following SQL:
+ *
+ * on `contacts`.`user_id` = `users`.`id` and `contacts`.`info_id` = `info`.`id`
+ *
+ * @param \Closure|string $first
+ * @param string|null $operator
+ * @param string|null $second
+ * @param string $boolean
+ * @param bool $where
+ * @return $this
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function on($first, $operator = null, $second = null, $boolean = 'and', $where = false)
+ {
+ if ($first instanceof Closure) {
+ return $this->nest($first, $boolean);
+ }
+
+ if (func_num_args() < 3) {
+ throw new InvalidArgumentException('Not enough arguments for the on clause.');
+ }
+
+ if ($where) {
+ $this->bindings[] = $second;
+ }
+
+ if ($where && ($operator === 'in' || $operator === 'not in') && is_array($second)) {
+ $second = count($second);
+ }
+
+ $nested = false;
+
+ $this->clauses[] = compact('first', 'operator', 'second', 'boolean', 'where', 'nested');
+
+ return $this;
+ }
+
+ /**
+ * Add an "or on" clause to the join.
+ *
+ * @param \Closure|string $first
+ * @param string|null $operator
+ * @param string|null $second
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function orOn($first, $operator = null, $second = null)
+ {
+ return $this->on($first, $operator, $second, 'or');
+ }
+
+ /**
+ * Add an "on where" clause to the join.
+ *
+ * @param \Closure|string $first
+ * @param string|null $operator
+ * @param string|null $second
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function where($first, $operator = null, $second = null, $boolean = 'and')
+ {
+ return $this->on($first, $operator, $second, $boolean, true);
+ }
+
+ /**
+ * Add an "or on where" clause to the join.
+ *
+ * @param \Closure|string $first
+ * @param string|null $operator
+ * @param string|null $second
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function orWhere($first, $operator = null, $second = null)
+ {
+ return $this->on($first, $operator, $second, 'or', true);
+ }
+
+ /**
+ * Add an "on where is null" clause to the join.
+ *
+ * @param string $column
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function whereNull($column, $boolean = 'and')
+ {
+ return $this->on($column, 'is', new Expression('null'), $boolean, false);
+ }
+
+ /**
+ * Add an "or on where is null" clause to the join.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function orWhereNull($column)
+ {
+ return $this->whereNull($column, 'or');
+ }
+
+ /**
+ * Add an "on where is not null" clause to the join.
+ *
+ * @param string $column
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function whereNotNull($column, $boolean = 'and')
+ {
+ return $this->on($column, 'is', new Expression('not null'), $boolean, false);
+ }
+
+ /**
+ * Add an "or on where is not null" clause to the join.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function orWhereNotNull($column)
+ {
+ return $this->whereNotNull($column, 'or');
+ }
+
+ /**
+ * Add an "on where in (...)" clause to the join.
+ *
+ * @param string $column
+ * @param array $values
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function whereIn($column, array $values)
+ {
+ return $this->on($column, 'in', $values, 'and', true);
+ }
+
+ /**
+ * Add an "on where not in (...)" clause to the join.
+ *
+ * @param string $column
+ * @param array $values
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function whereNotIn($column, array $values)
+ {
+ return $this->on($column, 'not in', $values, 'and', true);
+ }
+
+ /**
+ * Add an "or on where in (...)" clause to the join.
+ *
+ * @param string $column
+ * @param array $values
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function orWhereIn($column, array $values)
+ {
+ return $this->on($column, 'in', $values, 'or', true);
+ }
+
+ /**
+ * Add an "or on where not in (...)" clause to the join.
+ *
+ * @param string $column
+ * @param array $values
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function orWhereNotIn($column, array $values)
+ {
+ return $this->on($column, 'not in', $values, 'or', true);
+ }
+
+ /**
+ * Add a nested where statement to the query.
+ *
+ * @param \Closure $callback
+ * @param string $boolean
+ * @return \Illuminate\Database\Query\JoinClause
+ */
+ public function nest(Closure $callback, $boolean = 'and')
+ {
+ $join = new static($this->type, $this->table);
+
+ $callback($join);
+
+ if (count($join->clauses)) {
+ $nested = true;
+
+ $this->clauses[] = compact('nested', 'join', 'boolean');
+ $this->bindings = array_merge($this->bindings, $join->bindings);
+ }
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php
index 1e45ce7..a8a9a6c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php
@@ -1,23 +1,23 @@
-column_name;
- };
-
- return array_map($mapping, $results);
- }
+ return $r->column_name;
+ };
+ return array_map($mapping, $results);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/PostgresProcessor.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/PostgresProcessor.php
index 775dc8e..ab350cb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/PostgresProcessor.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/PostgresProcessor.php
@@ -1,47 +1,47 @@
-getConnection()->selectFromWriteConnection($sql, $values);
-
- $sequence = $sequence ?: 'id';
-
- $result = (array) $results[0];
+namespace Illuminate\Database\Query\Processors;
- $id = $result[$sequence];
-
- return is_numeric($id) ? (int) $id : $id;
- }
-
- /**
- * Process the results of a column listing query.
- *
- * @param array $results
- * @return array
- */
- public function processColumnListing($results)
- {
- $mapping = function($r)
- {
- $r = (object) $r;
-
- return $r->column_name;
- };
-
- return array_map($mapping, $results);
- }
+use Illuminate\Database\Query\Builder;
+class PostgresProcessor extends Processor
+{
+ /**
+ * Process an "insert get ID" query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param string $sql
+ * @param array $values
+ * @param string $sequence
+ * @return int
+ */
+ public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
+ {
+ $results = $query->getConnection()->selectFromWriteConnection($sql, $values);
+
+ $sequence = $sequence ?: 'id';
+
+ $result = (array) $results[0];
+
+ $id = $result[$sequence];
+
+ return is_numeric($id) ? (int) $id : $id;
+ }
+
+ /**
+ * Process the results of a column listing query.
+ *
+ * @param array $results
+ * @return array
+ */
+ public function processColumnListing($results)
+ {
+ $mapping = function ($r) {
+ $r = (object) $r;
+
+ return $r->column_name;
+ };
+
+ return array_map($mapping, $results);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php
index b960092..f78429f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php
@@ -1,48 +1,49 @@
-getConnection()->insert($sql, $values);
+namespace Illuminate\Database\Query\Processors;
- $id = $query->getConnection()->getPdo()->lastInsertId($sequence);
-
- return is_numeric($id) ? (int) $id : $id;
- }
-
- /**
- * Process the results of a column listing query.
- *
- * @param array $results
- * @return array
- */
- public function processColumnListing($results)
- {
- return $results;
- }
+use Illuminate\Database\Query\Builder;
+class Processor
+{
+ /**
+ * Process the results of a "select" query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param array $results
+ * @return array
+ */
+ public function processSelect(Builder $query, $results)
+ {
+ return $results;
+ }
+
+ /**
+ * Process an "insert get ID" query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param string $sql
+ * @param array $values
+ * @param string $sequence
+ * @return int
+ */
+ public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
+ {
+ $query->getConnection()->insert($sql, $values);
+
+ $id = $query->getConnection()->getPdo()->lastInsertId($sequence);
+
+ return is_numeric($id) ? (int) $id : $id;
+ }
+
+ /**
+ * Process the results of a column listing query.
+ *
+ * @param array $results
+ * @return array
+ */
+ public function processColumnListing($results)
+ {
+ return $results;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SQLiteProcessor.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SQLiteProcessor.php
index b1d8e0a..e4a8950 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SQLiteProcessor.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SQLiteProcessor.php
@@ -1,23 +1,23 @@
-name;
- };
-
- return array_map($mapping, $results);
- }
+ return $r->name;
+ };
+ return array_map($mapping, $results);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php
index 38bc25c..447a9c6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php
@@ -1,41 +1,43 @@
-getConnection()->insert($sql, $values);
-
- $id = $query->getConnection()->getPdo()->lastInsertId();
-
- return is_numeric($id) ? (int) $id : $id;
- }
-
- /**
- * Process the results of a column listing query.
- *
- * @param array $results
- * @return array
- */
- public function processColumnListing($results)
- {
- $mapping = function($r)
- {
- return $r->name;
- };
-
- return array_map($mapping, $results);
- }
+use Illuminate\Database\Query\Builder;
+class SqlServerProcessor extends Processor
+{
+ /**
+ * Process an "insert get ID" query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param string $sql
+ * @param array $values
+ * @param string $sequence
+ * @return int
+ */
+ public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
+ {
+ $query->getConnection()->insert($sql, $values);
+
+ $id = $query->getConnection()->getPdo()->lastInsertId();
+
+ return is_numeric($id) ? (int) $id : $id;
+ }
+
+ /**
+ * Process the results of a column listing query.
+ *
+ * @param array $results
+ * @return array
+ */
+ public function processColumnListing($results)
+ {
+ $mapping = function ($r) {
+ $r = (object) $r;
+
+ return $r->name;
+ };
+
+ return array_map($mapping, $results);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/QueryException.php b/application/vendor/laravel/framework/src/Illuminate/Database/QueryException.php
index e3f9cf2..922570b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/QueryException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/QueryException.php
@@ -1,78 +1,78 @@
-sql = $sql;
- $this->bindings = $bindings;
- $this->previous = $previous;
- $this->code = $previous->getCode();
- $this->message = $this->formatMessage($sql, $bindings, $previous);
+ /**
+ * Create a new query exception instance.
+ *
+ * @param string $sql
+ * @param array $bindings
+ * @param \Exception $previous
+ * @return void
+ */
+ public function __construct($sql, array $bindings, $previous)
+ {
+ parent::__construct('', 0, $previous);
- if ($previous instanceof PDOException)
- {
- $this->errorInfo = $previous->errorInfo;
- }
- }
+ $this->sql = $sql;
+ $this->bindings = $bindings;
+ $this->previous = $previous;
+ $this->code = $previous->getCode();
+ $this->message = $this->formatMessage($sql, $bindings, $previous);
- /**
- * Format the SQL error message.
- *
- * @param string $sql
- * @param array $bindings
- * @param \Exception $previous
- * @return string
- */
- protected function formatMessage($sql, $bindings, $previous)
- {
- return $previous->getMessage().' (SQL: '.str_replace_array('\?', $bindings, $sql).')';
- }
+ if ($previous instanceof PDOException) {
+ $this->errorInfo = $previous->errorInfo;
+ }
+ }
- /**
- * Get the SQL for the query.
- *
- * @return string
- */
- public function getSql()
- {
- return $this->sql;
- }
+ /**
+ * Format the SQL error message.
+ *
+ * @param string $sql
+ * @param array $bindings
+ * @param \Exception $previous
+ * @return string
+ */
+ protected function formatMessage($sql, $bindings, $previous)
+ {
+ return $previous->getMessage().' (SQL: '.str_replace_array('\?', $bindings, $sql).')';
+ }
- /**
- * Get the bindings for the query.
- *
- * @return array
- */
- public function getBindings()
- {
- return $this->bindings;
- }
+ /**
+ * Get the SQL for the query.
+ *
+ * @return string
+ */
+ public function getSql()
+ {
+ return $this->sql;
+ }
+ /**
+ * Get the bindings for the query.
+ *
+ * @return array
+ */
+ public function getBindings()
+ {
+ return $this->bindings;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/README.md b/application/vendor/laravel/framework/src/Illuminate/Database/README.md
index 315c51a..1675a93 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/README.md
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/README.md
@@ -12,14 +12,14 @@ use Illuminate\Database\Capsule\Manager as Capsule;
$capsule = new Capsule;
$capsule->addConnection([
- 'driver' => 'mysql',
- 'host' => 'localhost',
- 'database' => 'database',
- 'username' => 'root',
- 'password' => 'password',
- 'charset' => 'utf8',
- 'collation' => 'utf8_unicode_ci',
- 'prefix' => '',
+ 'driver' => 'mysql',
+ 'host' => 'localhost',
+ 'database' => 'database',
+ 'username' => 'root',
+ 'password' => 'password',
+ 'charset' => 'utf8',
+ 'collation' => 'utf8_unicode_ci',
+ 'prefix' => '',
]);
// Set the event dispatcher used by Eloquent models... (optional)
@@ -53,9 +53,9 @@ $results = Capsule::select('select * from users where id = ?', array(1));
```PHP
Capsule::schema()->create('users', function($table)
{
- $table->increments('id');
- $table->string('email')->unique();
- $table->timestamps();
+ $table->increments('id');
+ $table->string('email')->unique();
+ $table->timestamps();
});
```
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/SQLiteConnection.php b/application/vendor/laravel/framework/src/Illuminate/Database/SQLiteConnection.php
index 37978ab..b32786c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/SQLiteConnection.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/SQLiteConnection.php
@@ -1,50 +1,51 @@
-withTablePrefix(new QueryGrammar);
- }
-
- /**
- * Get the default schema grammar instance.
- *
- * @return \Illuminate\Database\Schema\Grammars\SQLiteGrammar
- */
- protected function getDefaultSchemaGrammar()
- {
- return $this->withTablePrefix(new SchemaGrammar);
- }
+class SQLiteConnection extends Connection
+{
+ /**
+ * Get the default query grammar instance.
+ *
+ * @return \Illuminate\Database\Query\Grammars\SQLiteGrammar
+ */
+ protected function getDefaultQueryGrammar()
+ {
+ return $this->withTablePrefix(new QueryGrammar);
+ }
- /**
- * Get the default post processor instance.
- *
- * @return \Illuminate\Database\Query\Processors\Processor
- */
- protected function getDefaultPostProcessor()
- {
- return new SQLiteProcessor;
- }
+ /**
+ * Get the default schema grammar instance.
+ *
+ * @return \Illuminate\Database\Schema\Grammars\SQLiteGrammar
+ */
+ protected function getDefaultSchemaGrammar()
+ {
+ return $this->withTablePrefix(new SchemaGrammar);
+ }
- /**
- * Get the Doctrine DBAL driver.
- *
- * @return \Doctrine\DBAL\Driver\PDOSqlite\Driver
- */
- protected function getDoctrineDriver()
- {
- return new DoctrineDriver;
- }
+ /**
+ * Get the default post processor instance.
+ *
+ * @return \Illuminate\Database\Query\Processors\SQLiteProcessor
+ */
+ protected function getDefaultPostProcessor()
+ {
+ return new SQLiteProcessor;
+ }
+ /**
+ * Get the Doctrine DBAL driver.
+ *
+ * @return \Doctrine\DBAL\Driver\PDOSqlite\Driver
+ */
+ protected function getDoctrineDriver()
+ {
+ return new DoctrineDriver;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php
index 4968406..9786fcb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php
@@ -1,923 +1,1040 @@
-table = $table;
-
- if ( ! is_null($callback)) $callback($this);
- }
-
- /**
- * Execute the blueprint against the database.
- *
- * @param \Illuminate\Database\Connection $connection
- * @param \Illuminate\Database\Schema\Grammars\Grammar $grammar
- * @return void
- */
- public function build(Connection $connection, Grammar $grammar)
- {
- foreach ($this->toSql($connection, $grammar) as $statement)
- {
- $connection->statement($statement);
- }
- }
-
- /**
- * Get the raw SQL statements for the blueprint.
- *
- * @param \Illuminate\Database\Connection $connection
- * @param \Illuminate\Database\Schema\Grammars\Grammar $grammar
- * @return array
- */
- public function toSql(Connection $connection, Grammar $grammar)
- {
- $this->addImpliedCommands();
-
- $statements = array();
-
- // Each type of command has a corresponding compiler function on the schema
- // grammar which is used to build the necessary SQL statements to build
- // the blueprint element, so we'll just call that compilers function.
- foreach ($this->commands as $command)
- {
- $method = 'compile'.ucfirst($command->name);
-
- if (method_exists($grammar, $method))
- {
- if ( ! is_null($sql = $grammar->$method($this, $command, $connection)))
- {
- $statements = array_merge($statements, (array) $sql);
- }
- }
- }
-
- return $statements;
- }
-
- /**
- * Add the commands that are implied by the blueprint.
- *
- * @return void
- */
- protected function addImpliedCommands()
- {
- if (count($this->getAddedColumns()) > 0 && ! $this->creating())
- {
- array_unshift($this->commands, $this->createCommand('add'));
- }
-
- if (count($this->getChangedColumns()) > 0 && ! $this->creating())
- {
- array_unshift($this->commands, $this->createCommand('change'));
- }
-
- $this->addFluentIndexes();
- }
-
- /**
- * Add the index commands fluently specified on columns.
- *
- * @return void
- */
- protected function addFluentIndexes()
- {
- foreach ($this->columns as $column)
- {
- foreach (array('primary', 'unique', 'index') as $index)
- {
- // If the index has been specified on the given column, but is simply
- // equal to "true" (boolean), no name has been specified for this
- // index, so we will simply call the index methods without one.
- if ($column->$index === true)
- {
- $this->$index($column->name);
-
- continue 2;
- }
-
- // If the index has been specified on the column and it is something
- // other than boolean true, we will assume a name was provided on
- // the index specification, and pass in the name to the method.
- elseif (isset($column->$index))
- {
- $this->$index($column->name, $column->$index);
-
- continue 2;
- }
- }
- }
- }
-
- /**
- * Determine if the blueprint has a create command.
- *
- * @return bool
- */
- protected function creating()
- {
- foreach ($this->commands as $command)
- {
- if ($command->name == 'create') return true;
- }
-
- return false;
- }
-
- /**
- * Indicate that the table needs to be created.
- *
- * @return \Illuminate\Support\Fluent
- */
- public function create()
- {
- return $this->addCommand('create');
- }
-
- /**
- * Indicate that the table should be dropped.
- *
- * @return \Illuminate\Support\Fluent
- */
- public function drop()
- {
- return $this->addCommand('drop');
- }
-
- /**
- * Indicate that the table should be dropped if it exists.
- *
- * @return \Illuminate\Support\Fluent
- */
- public function dropIfExists()
- {
- return $this->addCommand('dropIfExists');
- }
-
- /**
- * Indicate that the given columns should be dropped.
- *
- * @param string|array $columns
- * @return \Illuminate\Support\Fluent
- */
- public function dropColumn($columns)
- {
- $columns = is_array($columns) ? $columns : (array) func_get_args();
-
- return $this->addCommand('dropColumn', compact('columns'));
- }
-
- /**
- * Indicate that the given columns should be renamed.
- *
- * @param string $from
- * @param string $to
- * @return \Illuminate\Support\Fluent
- */
- public function renameColumn($from, $to)
- {
- return $this->addCommand('renameColumn', compact('from', 'to'));
- }
-
- /**
- * Indicate that the given primary key should be dropped.
- *
- * @param string|array $index
- * @return \Illuminate\Support\Fluent
- */
- public function dropPrimary($index = null)
- {
- return $this->dropIndexCommand('dropPrimary', 'primary', $index);
- }
-
- /**
- * Indicate that the given unique key should be dropped.
- *
- * @param string|array $index
- * @return \Illuminate\Support\Fluent
- */
- public function dropUnique($index)
- {
- return $this->dropIndexCommand('dropUnique', 'unique', $index);
- }
-
- /**
- * Indicate that the given index should be dropped.
- *
- * @param string|array $index
- * @return \Illuminate\Support\Fluent
- */
- public function dropIndex($index)
- {
- return $this->dropIndexCommand('dropIndex', 'index', $index);
- }
-
- /**
- * Indicate that the given foreign key should be dropped.
- *
- * @param string $index
- * @return \Illuminate\Support\Fluent
- */
- public function dropForeign($index)
- {
- return $this->dropIndexCommand('dropForeign', 'foreign', $index);
- }
-
- /**
- * Indicate that the timestamp columns should be dropped.
- *
- * @return void
- */
- public function dropTimestamps()
- {
- $this->dropColumn('created_at', 'updated_at');
- }
-
- /**
- * Indicate that the soft delete column should be dropped.
- *
- * @return void
- */
- public function dropSoftDeletes()
- {
- $this->dropColumn('deleted_at');
- }
-
- /**
- * Rename the table to a given name.
- *
- * @param string $to
- * @return \Illuminate\Support\Fluent
- */
- public function rename($to)
- {
- return $this->addCommand('rename', compact('to'));
- }
-
- /**
- * Specify the primary key(s) for the table.
- *
- * @param string|array $columns
- * @param string $name
- * @return \Illuminate\Support\Fluent
- */
- public function primary($columns, $name = null)
- {
- return $this->indexCommand('primary', $columns, $name);
- }
-
- /**
- * Specify a unique index for the table.
- *
- * @param string|array $columns
- * @param string $name
- * @return \Illuminate\Support\Fluent
- */
- public function unique($columns, $name = null)
- {
- return $this->indexCommand('unique', $columns, $name);
- }
-
- /**
- * Specify an index for the table.
- *
- * @param string|array $columns
- * @param string $name
- * @return \Illuminate\Support\Fluent
- */
- public function index($columns, $name = null)
- {
- return $this->indexCommand('index', $columns, $name);
- }
-
- /**
- * Specify a foreign key for the table.
- *
- * @param string|array $columns
- * @param string $name
- * @return \Illuminate\Support\Fluent
- */
- public function foreign($columns, $name = null)
- {
- return $this->indexCommand('foreign', $columns, $name);
- }
-
- /**
- * Create a new auto-incrementing integer column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function increments($column)
- {
- return $this->unsignedInteger($column, true);
- }
-
- /**
- * Create a new auto-incrementing big integer column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function bigIncrements($column)
- {
- return $this->unsignedBigInteger($column, true);
- }
-
- /**
- * Create a new char column on the table.
- *
- * @param string $column
- * @param int $length
- * @return \Illuminate\Support\Fluent
- */
- public function char($column, $length = 255)
- {
- return $this->addColumn('char', $column, compact('length'));
- }
-
- /**
- * Create a new string column on the table.
- *
- * @param string $column
- * @param int $length
- * @return \Illuminate\Support\Fluent
- */
- public function string($column, $length = 255)
- {
- return $this->addColumn('string', $column, compact('length'));
- }
-
- /**
- * Create a new text column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function text($column)
- {
- return $this->addColumn('text', $column);
- }
-
- /**
- * Create a new medium text column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function mediumText($column)
- {
- return $this->addColumn('mediumText', $column);
- }
-
- /**
- * Create a new long text column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function longText($column)
- {
- return $this->addColumn('longText', $column);
- }
-
- /**
- * Create a new integer column on the table.
- *
- * @param string $column
- * @param bool $autoIncrement
- * @param bool $unsigned
- * @return \Illuminate\Support\Fluent
- */
- public function integer($column, $autoIncrement = false, $unsigned = false)
- {
- return $this->addColumn('integer', $column, compact('autoIncrement', 'unsigned'));
- }
-
- /**
- * Create a new big integer column on the table.
- *
- * @param string $column
- * @param bool $autoIncrement
- * @param bool $unsigned
- * @return \Illuminate\Support\Fluent
- */
- public function bigInteger($column, $autoIncrement = false, $unsigned = false)
- {
- return $this->addColumn('bigInteger', $column, compact('autoIncrement', 'unsigned'));
- }
-
- /**
- * Create a new medium integer column on the table.
- *
- * @param string $column
- * @param bool $autoIncrement
- * @param bool $unsigned
- * @return \Illuminate\Support\Fluent
- */
- public function mediumInteger($column, $autoIncrement = false, $unsigned = false)
- {
- return $this->addColumn('mediumInteger', $column, compact('autoIncrement', 'unsigned'));
- }
-
- /**
- * Create a new tiny integer column on the table.
- *
- * @param string $column
- * @param bool $autoIncrement
- * @param bool $unsigned
- * @return \Illuminate\Support\Fluent
- */
- public function tinyInteger($column, $autoIncrement = false, $unsigned = false)
- {
- return $this->addColumn('tinyInteger', $column, compact('autoIncrement', 'unsigned'));
- }
-
- /**
- * Create a new small integer column on the table.
- *
- * @param string $column
- * @param bool $autoIncrement
- * @param bool $unsigned
- * @return \Illuminate\Support\Fluent
- */
- public function smallInteger($column, $autoIncrement = false, $unsigned = false)
- {
- return $this->addColumn('smallInteger', $column, compact('autoIncrement', 'unsigned'));
- }
-
- /**
- * Create a new unsigned integer column on the table.
- *
- * @param string $column
- * @param bool $autoIncrement
- * @return \Illuminate\Support\Fluent
- */
- public function unsignedInteger($column, $autoIncrement = false)
- {
- return $this->integer($column, $autoIncrement, true);
- }
-
- /**
- * Create a new unsigned big integer column on the table.
- *
- * @param string $column
- * @param bool $autoIncrement
- * @return \Illuminate\Support\Fluent
- */
- public function unsignedBigInteger($column, $autoIncrement = false)
- {
- return $this->bigInteger($column, $autoIncrement, true);
- }
-
- /**
- * Create a new float column on the table.
- *
- * @param string $column
- * @param int $total
- * @param int $places
- * @return \Illuminate\Support\Fluent
- */
- public function float($column, $total = 8, $places = 2)
- {
- return $this->addColumn('float', $column, compact('total', 'places'));
- }
-
- /**
- * Create a new double column on the table.
- *
- * @param string $column
- * @param int|null $total
- * @param int|null $places
- * @return \Illuminate\Support\Fluent
- */
- public function double($column, $total = null, $places = null)
- {
- return $this->addColumn('double', $column, compact('total', 'places'));
- }
-
- /**
- * Create a new decimal column on the table.
- *
- * @param string $column
- * @param int $total
- * @param int $places
- * @return \Illuminate\Support\Fluent
- */
- public function decimal($column, $total = 8, $places = 2)
- {
- return $this->addColumn('decimal', $column, compact('total', 'places'));
- }
-
- /**
- * Create a new boolean column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function boolean($column)
- {
- return $this->addColumn('boolean', $column);
- }
-
- /**
- * Create a new enum column on the table.
- *
- * @param string $column
- * @param array $allowed
- * @return \Illuminate\Support\Fluent
- */
- public function enum($column, array $allowed)
- {
- return $this->addColumn('enum', $column, compact('allowed'));
- }
-
- /**
- * Create a new json column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function json($column)
- {
- return $this->addColumn('json', $column);
- }
-
- /**
- * Create a new jsonb column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function jsonb($column)
- {
- return $this->addColumn('jsonb', $column);
- }
-
- /**
- * Create a new date column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function date($column)
- {
- return $this->addColumn('date', $column);
- }
-
- /**
- * Create a new date-time column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function dateTime($column)
- {
- return $this->addColumn('dateTime', $column);
- }
-
- /**
- * Create a new date-time column (with time zone) on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function dateTimeTz($column)
- {
- return $this->addColumn('dateTimeTz', $column);
- }
-
- /**
- * Create a new time column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function time($column)
- {
- return $this->addColumn('time', $column);
- }
-
- /**
- * Create a new time column (with time zone) on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function timeTz($column)
- {
- return $this->addColumn('timeTz', $column);
- }
-
- /**
- * Create a new timestamp column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function timestamp($column)
- {
- return $this->addColumn('timestamp', $column);
- }
-
- /**
- * Create a new timestamp (with time zone) column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function timestampTz($column)
- {
- return $this->addColumn('timestampTz', $column);
- }
-
- /**
- * Add nullable creation and update timestamps to the table.
- *
- * @return void
- */
- public function nullableTimestamps()
- {
- $this->timestamp('created_at')->nullable();
-
- $this->timestamp('updated_at')->nullable();
- }
-
- /**
- * Add creation and update timestamps to the table.
- *
- * @return void
- */
- public function timestamps()
- {
- $this->timestamp('created_at');
-
- $this->timestamp('updated_at');
- }
-
- /**
- * Add a "deleted at" timestamp for the table.
- *
- * @return \Illuminate\Support\Fluent
- */
- public function softDeletes()
- {
- return $this->timestamp('deleted_at')->nullable();
- }
-
- /**
- * Create a new binary column on the table.
- *
- * @param string $column
- * @return \Illuminate\Support\Fluent
- */
- public function binary($column)
- {
- return $this->addColumn('binary', $column);
- }
-
- /**
- * Add the proper columns for a polymorphic table.
- *
- * @param string $name
- * @param string|null $indexName
- * @return void
- */
- public function morphs($name, $indexName = null)
- {
- $this->unsignedInteger("{$name}_id");
-
- $this->string("{$name}_type");
-
- $this->index(array("{$name}_id", "{$name}_type"), $indexName);
- }
-
- /**
- * Adds the `remember_token` column to the table.
- *
- * @return \Illuminate\Support\Fluent
- */
- public function rememberToken()
- {
- return $this->string('remember_token', 100)->nullable();
- }
-
- /**
- * Create a new drop index command on the blueprint.
- *
- * @param string $command
- * @param string $type
- * @param string|array $index
- * @return \Illuminate\Support\Fluent
- */
- protected function dropIndexCommand($command, $type, $index)
- {
- $columns = array();
-
- // If the given "index" is actually an array of columns, the developer means
- // to drop an index merely by specifying the columns involved without the
- // conventional name, so we will build the index name from the columns.
- if (is_array($index))
- {
- $columns = $index;
-
- $index = $this->createIndexName($type, $columns);
- }
-
- return $this->indexCommand($command, $columns, $index);
- }
-
- /**
- * Add a new index command to the blueprint.
- *
- * @param string $type
- * @param string|array $columns
- * @param string $index
- * @return \Illuminate\Support\Fluent
- */
- protected function indexCommand($type, $columns, $index)
- {
- $columns = (array) $columns;
-
- // If no name was specified for this index, we will create one using a basic
- // convention of the table name, followed by the columns, followed by an
- // index type, such as primary or index, which makes the index unique.
- if (is_null($index))
- {
- $index = $this->createIndexName($type, $columns);
- }
-
- return $this->addCommand($type, compact('index', 'columns'));
- }
-
- /**
- * Create a default index name for the table.
- *
- * @param string $type
- * @param array $columns
- * @return string
- */
- protected function createIndexName($type, array $columns)
- {
- $index = strtolower($this->table.'_'.implode('_', $columns).'_'.$type);
-
- return str_replace(array('-', '.'), '_', $index);
- }
-
- /**
- * Add a new column to the blueprint.
- *
- * @param string $type
- * @param string $name
- * @param array $parameters
- * @return \Illuminate\Support\Fluent
- */
- protected function addColumn($type, $name, array $parameters = array())
- {
- $attributes = array_merge(compact('type', 'name'), $parameters);
-
- $this->columns[] = $column = new Fluent($attributes);
-
- return $column;
- }
-
- /**
- * Remove a column from the schema blueprint.
- *
- * @param string $name
- * @return $this
- */
- public function removeColumn($name)
- {
- $this->columns = array_values(array_filter($this->columns, function($c) use ($name)
- {
- return $c['attributes']['name'] != $name;
- }));
-
- return $this;
- }
-
- /**
- * Add a new command to the blueprint.
- *
- * @param string $name
- * @param array $parameters
- * @return \Illuminate\Support\Fluent
- */
- protected function addCommand($name, array $parameters = array())
- {
- $this->commands[] = $command = $this->createCommand($name, $parameters);
-
- return $command;
- }
-
- /**
- * Create a new Fluent command.
- *
- * @param string $name
- * @param array $parameters
- * @return \Illuminate\Support\Fluent
- */
- protected function createCommand($name, array $parameters = array())
- {
- return new Fluent(array_merge(compact('name'), $parameters));
- }
-
- /**
- * Get the table the blueprint describes.
- *
- * @return string
- */
- public function getTable()
- {
- return $this->table;
- }
-
- /**
- * Get the columns on the blueprint.
- *
- * @return array
- */
- public function getColumns()
- {
- return $this->columns;
- }
-
- /**
- * Get the commands on the blueprint.
- *
- * @return array
- */
- public function getCommands()
- {
- return $this->commands;
- }
-
- /**
- * Get the columns on the blueprint that should be added.
- *
- * @return array
- */
- public function getAddedColumns()
- {
- return array_filter($this->columns, function($column)
- {
- return !$column->change;
- });
- }
-
- /**
- * Get the columns on the blueprint that should be changed.
- *
- * @return array
- */
- public function getChangedColumns()
- {
- return array_filter($this->columns, function($column)
- {
- return !!$column->change;
- });
- }
-
+class Blueprint
+{
+ /**
+ * The table the blueprint describes.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * The columns that should be added to the table.
+ *
+ * @var array
+ */
+ protected $columns = [];
+
+ /**
+ * The commands that should be run for the table.
+ *
+ * @var array
+ */
+ protected $commands = [];
+
+ /**
+ * The storage engine that should be used for the table.
+ *
+ * @var string
+ */
+ public $engine;
+
+ /**
+ * The default character set that should be used for the table.
+ */
+ public $charset;
+
+ /**
+ * The collation that should be used for the table.
+ */
+ public $collation;
+
+ /**
+ * Whether to make the table temporary.
+ *
+ * @var bool
+ */
+ public $temporary = false;
+
+ /**
+ * Create a new schema blueprint.
+ *
+ * @param string $table
+ * @param \Closure|null $callback
+ * @return void
+ */
+ public function __construct($table, Closure $callback = null)
+ {
+ $this->table = $table;
+
+ if (! is_null($callback)) {
+ $callback($this);
+ }
+ }
+
+ /**
+ * Execute the blueprint against the database.
+ *
+ * @param \Illuminate\Database\Connection $connection
+ * @param \Illuminate\Database\Schema\Grammars\Grammar $grammar
+ * @return void
+ */
+ public function build(Connection $connection, Grammar $grammar)
+ {
+ foreach ($this->toSql($connection, $grammar) as $statement) {
+ $connection->statement($statement);
+ }
+ }
+
+ /**
+ * Get the raw SQL statements for the blueprint.
+ *
+ * @param \Illuminate\Database\Connection $connection
+ * @param \Illuminate\Database\Schema\Grammars\Grammar $grammar
+ * @return array
+ */
+ public function toSql(Connection $connection, Grammar $grammar)
+ {
+ $this->addImpliedCommands();
+
+ $statements = [];
+
+ // Each type of command has a corresponding compiler function on the schema
+ // grammar which is used to build the necessary SQL statements to build
+ // the blueprint element, so we'll just call that compilers function.
+ foreach ($this->commands as $command) {
+ $method = 'compile'.ucfirst($command->name);
+
+ if (method_exists($grammar, $method)) {
+ if (! is_null($sql = $grammar->$method($this, $command, $connection))) {
+ $statements = array_merge($statements, (array) $sql);
+ }
+ }
+ }
+
+ return $statements;
+ }
+
+ /**
+ * Add the commands that are implied by the blueprint.
+ *
+ * @return void
+ */
+ protected function addImpliedCommands()
+ {
+ if (count($this->getAddedColumns()) > 0 && ! $this->creating()) {
+ array_unshift($this->commands, $this->createCommand('add'));
+ }
+
+ if (count($this->getChangedColumns()) > 0 && ! $this->creating()) {
+ array_unshift($this->commands, $this->createCommand('change'));
+ }
+
+ $this->addFluentIndexes();
+ }
+
+ /**
+ * Add the index commands fluently specified on columns.
+ *
+ * @return void
+ */
+ protected function addFluentIndexes()
+ {
+ foreach ($this->columns as $column) {
+ foreach (['primary', 'unique', 'index'] as $index) {
+ // If the index has been specified on the given column, but is simply
+ // equal to "true" (boolean), no name has been specified for this
+ // index, so we will simply call the index methods without one.
+ if ($column->$index === true) {
+ $this->$index($column->name);
+
+ continue 2;
+ }
+
+ // If the index has been specified on the column and it is something
+ // other than boolean true, we will assume a name was provided on
+ // the index specification, and pass in the name to the method.
+ elseif (isset($column->$index)) {
+ $this->$index($column->name, $column->$index);
+
+ continue 2;
+ }
+ }
+ }
+ }
+
+ /**
+ * Determine if the blueprint has a create command.
+ *
+ * @return bool
+ */
+ protected function creating()
+ {
+ foreach ($this->commands as $command) {
+ if ($command->name == 'create') {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Indicate that the table needs to be created.
+ *
+ * @return \Illuminate\Support\Fluent
+ */
+ public function create()
+ {
+ return $this->addCommand('create');
+ }
+
+ /**
+ * Indicate that the table needs to be temporary.
+ *
+ * @return void
+ */
+ public function temporary()
+ {
+ $this->temporary = true;
+ }
+
+ /**
+ * Indicate that the table should be dropped.
+ *
+ * @return \Illuminate\Support\Fluent
+ */
+ public function drop()
+ {
+ return $this->addCommand('drop');
+ }
+
+ /**
+ * Indicate that the table should be dropped if it exists.
+ *
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dropIfExists()
+ {
+ return $this->addCommand('dropIfExists');
+ }
+
+ /**
+ * Indicate that the given columns should be dropped.
+ *
+ * @param array|mixed $columns
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dropColumn($columns)
+ {
+ $columns = is_array($columns) ? $columns : (array) func_get_args();
+
+ return $this->addCommand('dropColumn', compact('columns'));
+ }
+
+ /**
+ * Indicate that the given columns should be renamed.
+ *
+ * @param string $from
+ * @param string $to
+ * @return \Illuminate\Support\Fluent
+ */
+ public function renameColumn($from, $to)
+ {
+ return $this->addCommand('renameColumn', compact('from', 'to'));
+ }
+
+ /**
+ * Indicate that the given primary key should be dropped.
+ *
+ * @param string|array $index
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dropPrimary($index = null)
+ {
+ return $this->dropIndexCommand('dropPrimary', 'primary', $index);
+ }
+
+ /**
+ * Indicate that the given unique key should be dropped.
+ *
+ * @param string|array $index
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dropUnique($index)
+ {
+ return $this->dropIndexCommand('dropUnique', 'unique', $index);
+ }
+
+ /**
+ * Indicate that the given index should be dropped.
+ *
+ * @param string|array $index
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dropIndex($index)
+ {
+ return $this->dropIndexCommand('dropIndex', 'index', $index);
+ }
+
+ /**
+ * Indicate that the given foreign key should be dropped.
+ *
+ * @param string $index
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dropForeign($index)
+ {
+ return $this->dropIndexCommand('dropForeign', 'foreign', $index);
+ }
+
+ /**
+ * Indicate that the timestamp columns should be dropped.
+ *
+ * @return void
+ */
+ public function dropTimestamps()
+ {
+ $this->dropColumn('created_at', 'updated_at');
+ }
+
+ /**
+ * Indicate that the timestamp columns should be dropped.
+ *
+ * @return void
+ */
+ public function dropTimestampsTz()
+ {
+ $this->dropTimestamps();
+ }
+
+ /**
+ * Indicate that the soft delete column should be dropped.
+ *
+ * @return void
+ */
+ public function dropSoftDeletes()
+ {
+ $this->dropColumn('deleted_at');
+ }
+
+ /**
+ * Indicate that the remember token column should be dropped.
+ *
+ * @return void
+ */
+ public function dropRememberToken()
+ {
+ $this->dropColumn('remember_token');
+ }
+
+ /**
+ * Rename the table to a given name.
+ *
+ * @param string $to
+ * @return \Illuminate\Support\Fluent
+ */
+ public function rename($to)
+ {
+ return $this->addCommand('rename', compact('to'));
+ }
+
+ /**
+ * Specify the primary key(s) for the table.
+ *
+ * @param string|array $columns
+ * @param string $name
+ * @return \Illuminate\Support\Fluent
+ */
+ public function primary($columns, $name = null)
+ {
+ return $this->indexCommand('primary', $columns, $name);
+ }
+
+ /**
+ * Specify a unique index for the table.
+ *
+ * @param string|array $columns
+ * @param string $name
+ * @return \Illuminate\Support\Fluent
+ */
+ public function unique($columns, $name = null)
+ {
+ return $this->indexCommand('unique', $columns, $name);
+ }
+
+ /**
+ * Specify an index for the table.
+ *
+ * @param string|array $columns
+ * @param string $name
+ * @return \Illuminate\Support\Fluent
+ */
+ public function index($columns, $name = null)
+ {
+ return $this->indexCommand('index', $columns, $name);
+ }
+
+ /**
+ * Specify a foreign key for the table.
+ *
+ * @param string|array $columns
+ * @param string $name
+ * @return \Illuminate\Support\Fluent
+ */
+ public function foreign($columns, $name = null)
+ {
+ return $this->indexCommand('foreign', $columns, $name);
+ }
+
+ /**
+ * Create a new auto-incrementing integer (4-byte) column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function increments($column)
+ {
+ return $this->unsignedInteger($column, true);
+ }
+
+ /**
+ * Create a new auto-incrementing small integer (2-byte) column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function smallIncrements($column)
+ {
+ return $this->unsignedSmallInteger($column, true);
+ }
+
+ /**
+ * Create a new auto-incrementing medium integer (3-byte) column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function mediumIncrements($column)
+ {
+ return $this->unsignedMediumInteger($column, true);
+ }
+
+ /**
+ * Create a new auto-incrementing big integer (8-byte) column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function bigIncrements($column)
+ {
+ return $this->unsignedBigInteger($column, true);
+ }
+
+ /**
+ * Create a new char column on the table.
+ *
+ * @param string $column
+ * @param int $length
+ * @return \Illuminate\Support\Fluent
+ */
+ public function char($column, $length = 255)
+ {
+ return $this->addColumn('char', $column, compact('length'));
+ }
+
+ /**
+ * Create a new string column on the table.
+ *
+ * @param string $column
+ * @param int $length
+ * @return \Illuminate\Support\Fluent
+ */
+ public function string($column, $length = 255)
+ {
+ return $this->addColumn('string', $column, compact('length'));
+ }
+
+ /**
+ * Create a new text column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function text($column)
+ {
+ return $this->addColumn('text', $column);
+ }
+
+ /**
+ * Create a new medium text column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function mediumText($column)
+ {
+ return $this->addColumn('mediumText', $column);
+ }
+
+ /**
+ * Create a new long text column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function longText($column)
+ {
+ return $this->addColumn('longText', $column);
+ }
+
+ /**
+ * Create a new integer (4-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @param bool $unsigned
+ * @return \Illuminate\Support\Fluent
+ */
+ public function integer($column, $autoIncrement = false, $unsigned = false)
+ {
+ return $this->addColumn('integer', $column, compact('autoIncrement', 'unsigned'));
+ }
+
+ /**
+ * Create a new tiny integer (1-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @param bool $unsigned
+ * @return \Illuminate\Support\Fluent
+ */
+ public function tinyInteger($column, $autoIncrement = false, $unsigned = false)
+ {
+ return $this->addColumn('tinyInteger', $column, compact('autoIncrement', 'unsigned'));
+ }
+
+ /**
+ * Create a new small integer (2-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @param bool $unsigned
+ * @return \Illuminate\Support\Fluent
+ */
+ public function smallInteger($column, $autoIncrement = false, $unsigned = false)
+ {
+ return $this->addColumn('smallInteger', $column, compact('autoIncrement', 'unsigned'));
+ }
+
+ /**
+ * Create a new medium integer (3-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @param bool $unsigned
+ * @return \Illuminate\Support\Fluent
+ */
+ public function mediumInteger($column, $autoIncrement = false, $unsigned = false)
+ {
+ return $this->addColumn('mediumInteger', $column, compact('autoIncrement', 'unsigned'));
+ }
+
+ /**
+ * Create a new big integer (8-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @param bool $unsigned
+ * @return \Illuminate\Support\Fluent
+ */
+ public function bigInteger($column, $autoIncrement = false, $unsigned = false)
+ {
+ return $this->addColumn('bigInteger', $column, compact('autoIncrement', 'unsigned'));
+ }
+
+ /**
+ * Create a new unsigned tiny integer (1-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @return \Illuminate\Support\Fluent
+ */
+ public function unsignedTinyInteger($column, $autoIncrement = false)
+ {
+ return $this->tinyInteger($column, $autoIncrement, true);
+ }
+
+ /**
+ * Create a new unsigned small integer (2-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @return \Illuminate\Support\Fluent
+ */
+ public function unsignedSmallInteger($column, $autoIncrement = false)
+ {
+ return $this->smallInteger($column, $autoIncrement, true);
+ }
+
+ /**
+ * Create a new unsigned medium integer (3-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @return \Illuminate\Support\Fluent
+ */
+ public function unsignedMediumInteger($column, $autoIncrement = false)
+ {
+ return $this->mediumInteger($column, $autoIncrement, true);
+ }
+
+ /**
+ * Create a new unsigned integer (4-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @return \Illuminate\Support\Fluent
+ */
+ public function unsignedInteger($column, $autoIncrement = false)
+ {
+ return $this->integer($column, $autoIncrement, true);
+ }
+
+ /**
+ * Create a new unsigned big integer (8-byte) column on the table.
+ *
+ * @param string $column
+ * @param bool $autoIncrement
+ * @return \Illuminate\Support\Fluent
+ */
+ public function unsignedBigInteger($column, $autoIncrement = false)
+ {
+ return $this->bigInteger($column, $autoIncrement, true);
+ }
+
+ /**
+ * Create a new float column on the table.
+ *
+ * @param string $column
+ * @param int $total
+ * @param int $places
+ * @return \Illuminate\Support\Fluent
+ */
+ public function float($column, $total = 8, $places = 2)
+ {
+ return $this->addColumn('float', $column, compact('total', 'places'));
+ }
+
+ /**
+ * Create a new double column on the table.
+ *
+ * @param string $column
+ * @param int|null $total
+ * @param int|null $places
+ * @return \Illuminate\Support\Fluent
+ */
+ public function double($column, $total = null, $places = null)
+ {
+ return $this->addColumn('double', $column, compact('total', 'places'));
+ }
+
+ /**
+ * Create a new decimal column on the table.
+ *
+ * @param string $column
+ * @param int $total
+ * @param int $places
+ * @return \Illuminate\Support\Fluent
+ */
+ public function decimal($column, $total = 8, $places = 2)
+ {
+ return $this->addColumn('decimal', $column, compact('total', 'places'));
+ }
+
+ /**
+ * Create a new boolean column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function boolean($column)
+ {
+ return $this->addColumn('boolean', $column);
+ }
+
+ /**
+ * Create a new enum column on the table.
+ *
+ * @param string $column
+ * @param array $allowed
+ * @return \Illuminate\Support\Fluent
+ */
+ public function enum($column, array $allowed)
+ {
+ return $this->addColumn('enum', $column, compact('allowed'));
+ }
+
+ /**
+ * Create a new json column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function json($column)
+ {
+ return $this->addColumn('json', $column);
+ }
+
+ /**
+ * Create a new jsonb column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function jsonb($column)
+ {
+ return $this->addColumn('jsonb', $column);
+ }
+
+ /**
+ * Create a new date column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function date($column)
+ {
+ return $this->addColumn('date', $column);
+ }
+
+ /**
+ * Create a new date-time column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dateTime($column)
+ {
+ return $this->addColumn('dateTime', $column);
+ }
+
+ /**
+ * Create a new date-time column (with time zone) on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function dateTimeTz($column)
+ {
+ return $this->addColumn('dateTimeTz', $column);
+ }
+
+ /**
+ * Create a new time column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function time($column)
+ {
+ return $this->addColumn('time', $column);
+ }
+
+ /**
+ * Create a new time column (with time zone) on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function timeTz($column)
+ {
+ return $this->addColumn('timeTz', $column);
+ }
+
+ /**
+ * Create a new timestamp column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function timestamp($column)
+ {
+ return $this->addColumn('timestamp', $column);
+ }
+
+ /**
+ * Create a new timestamp (with time zone) column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function timestampTz($column)
+ {
+ return $this->addColumn('timestampTz', $column);
+ }
+
+ /**
+ * Add nullable creation and update timestamps to the table.
+ *
+ * @return void
+ */
+ public function nullableTimestamps()
+ {
+ $this->timestamp('created_at')->nullable();
+
+ $this->timestamp('updated_at')->nullable();
+ }
+
+ /**
+ * Add creation and update timestamps to the table.
+ *
+ * @return void
+ */
+ public function timestamps()
+ {
+ $this->timestamp('created_at');
+
+ $this->timestamp('updated_at');
+ }
+
+ /**
+ * Add creation and update timestampTz columns to the table.
+ *
+ * @return void
+ */
+ public function timestampsTz()
+ {
+ $this->timestampTz('created_at');
+
+ $this->timestampTz('updated_at');
+ }
+
+ /**
+ * Add a "deleted at" timestamp for the table.
+ *
+ * @return \Illuminate\Support\Fluent
+ */
+ public function softDeletes()
+ {
+ return $this->timestamp('deleted_at')->nullable();
+ }
+
+ /**
+ * Create a new binary column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function binary($column)
+ {
+ return $this->addColumn('binary', $column);
+ }
+
+ /**
+ * Create a new uuid column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Support\Fluent
+ */
+ public function uuid($column)
+ {
+ return $this->addColumn('uuid', $column);
+ }
+
+ /**
+ * Add the proper columns for a polymorphic table.
+ *
+ * @param string $name
+ * @param string|null $indexName
+ * @return void
+ */
+ public function morphs($name, $indexName = null)
+ {
+ $this->unsignedInteger("{$name}_id");
+
+ $this->string("{$name}_type");
+
+ $this->index(["{$name}_id", "{$name}_type"], $indexName);
+ }
+
+ /**
+ * Adds the `remember_token` column to the table.
+ *
+ * @return \Illuminate\Support\Fluent
+ */
+ public function rememberToken()
+ {
+ return $this->string('remember_token', 100)->nullable();
+ }
+
+ /**
+ * Create a new drop index command on the blueprint.
+ *
+ * @param string $command
+ * @param string $type
+ * @param string|array $index
+ * @return \Illuminate\Support\Fluent
+ */
+ protected function dropIndexCommand($command, $type, $index)
+ {
+ $columns = [];
+
+ // If the given "index" is actually an array of columns, the developer means
+ // to drop an index merely by specifying the columns involved without the
+ // conventional name, so we will build the index name from the columns.
+ if (is_array($index)) {
+ $columns = $index;
+
+ $index = $this->createIndexName($type, $columns);
+ }
+
+ return $this->indexCommand($command, $columns, $index);
+ }
+
+ /**
+ * Add a new index command to the blueprint.
+ *
+ * @param string $type
+ * @param string|array $columns
+ * @param string $index
+ * @return \Illuminate\Support\Fluent
+ */
+ protected function indexCommand($type, $columns, $index)
+ {
+ $columns = (array) $columns;
+
+ // If no name was specified for this index, we will create one using a basic
+ // convention of the table name, followed by the columns, followed by an
+ // index type, such as primary or index, which makes the index unique.
+ if (is_null($index)) {
+ $index = $this->createIndexName($type, $columns);
+ }
+
+ return $this->addCommand($type, compact('index', 'columns'));
+ }
+
+ /**
+ * Create a default index name for the table.
+ *
+ * @param string $type
+ * @param array $columns
+ * @return string
+ */
+ protected function createIndexName($type, array $columns)
+ {
+ $index = strtolower($this->table.'_'.implode('_', $columns).'_'.$type);
+
+ return str_replace(['-', '.'], '_', $index);
+ }
+
+ /**
+ * Add a new column to the blueprint.
+ *
+ * @param string $type
+ * @param string $name
+ * @param array $parameters
+ * @return \Illuminate\Support\Fluent
+ */
+ public function addColumn($type, $name, array $parameters = [])
+ {
+ $attributes = array_merge(compact('type', 'name'), $parameters);
+
+ $this->columns[] = $column = new Fluent($attributes);
+
+ return $column;
+ }
+
+ /**
+ * Remove a column from the schema blueprint.
+ *
+ * @param string $name
+ * @return $this
+ */
+ public function removeColumn($name)
+ {
+ $this->columns = array_values(array_filter($this->columns, function ($c) use ($name) {
+ return $c['attributes']['name'] != $name;
+ }));
+
+ return $this;
+ }
+
+ /**
+ * Add a new command to the blueprint.
+ *
+ * @param string $name
+ * @param array $parameters
+ * @return \Illuminate\Support\Fluent
+ */
+ protected function addCommand($name, array $parameters = [])
+ {
+ $this->commands[] = $command = $this->createCommand($name, $parameters);
+
+ return $command;
+ }
+
+ /**
+ * Create a new Fluent command.
+ *
+ * @param string $name
+ * @param array $parameters
+ * @return \Illuminate\Support\Fluent
+ */
+ protected function createCommand($name, array $parameters = [])
+ {
+ return new Fluent(array_merge(compact('name'), $parameters));
+ }
+
+ /**
+ * Get the table the blueprint describes.
+ *
+ * @return string
+ */
+ public function getTable()
+ {
+ return $this->table;
+ }
+
+ /**
+ * Get the columns on the blueprint.
+ *
+ * @return array
+ */
+ public function getColumns()
+ {
+ return $this->columns;
+ }
+
+ /**
+ * Get the commands on the blueprint.
+ *
+ * @return array
+ */
+ public function getCommands()
+ {
+ return $this->commands;
+ }
+
+ /**
+ * Get the columns on the blueprint that should be added.
+ *
+ * @return array
+ */
+ public function getAddedColumns()
+ {
+ return array_filter($this->columns, function ($column) {
+ return ! $column->change;
+ });
+ }
+
+ /**
+ * Get the columns on the blueprint that should be changed.
+ *
+ * @return array
+ */
+ public function getChangedColumns()
+ {
+ return array_filter($this->columns, function ($column) {
+ return (bool) $column->change;
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
index cd7521d..5e10b42 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
@@ -1,242 +1,243 @@
-connection = $connection;
- $this->grammar = $connection->getSchemaGrammar();
- }
-
- /**
- * Determine if the given table exists.
- *
- * @param string $table
- * @return bool
- */
- public function hasTable($table)
- {
- $sql = $this->grammar->compileTableExists();
-
- $table = $this->connection->getTablePrefix().$table;
-
- return count($this->connection->select($sql, array($table))) > 0;
- }
-
- /**
- * Determine if the given table has a given column.
- *
- * @param string $table
- * @param string $column
- * @return bool
- */
- public function hasColumn($table, $column)
- {
- $column = strtolower($column);
-
- return in_array($column, array_map('strtolower', $this->getColumnListing($table)));
- }
-
- /**
- * Determine if the given table has given columns.
- *
- * @param string $table
- * @param array $columns
- * @return bool
- */
- public function hasColumns($table, array $columns)
- {
- $tableColumns = array_map('strtolower', $this->getColumnListing($table));
-
- foreach ($columns as $column)
- {
- if ( ! in_array(strtolower($column), $tableColumns)) return false;
- }
-
- return true;
- }
-
- /**
- * Get the column listing for a given table.
- *
- * @param string $table
- * @return array
- */
- public function getColumnListing($table)
- {
- $table = $this->connection->getTablePrefix().$table;
-
- $results = $this->connection->select($this->grammar->compileColumnExists($table));
-
- return $this->connection->getPostProcessor()->processColumnListing($results);
- }
-
- /**
- * Modify a table on the schema.
- *
- * @param string $table
- * @param \Closure $callback
- * @return \Illuminate\Database\Schema\Blueprint
- */
- public function table($table, Closure $callback)
- {
- $this->build($this->createBlueprint($table, $callback));
- }
-
- /**
- * Create a new table on the schema.
- *
- * @param string $table
- * @param \Closure $callback
- * @return \Illuminate\Database\Schema\Blueprint
- */
- public function create($table, Closure $callback)
- {
- $blueprint = $this->createBlueprint($table);
-
- $blueprint->create();
-
- $callback($blueprint);
-
- $this->build($blueprint);
- }
-
- /**
- * Drop a table from the schema.
- *
- * @param string $table
- * @return \Illuminate\Database\Schema\Blueprint
- */
- public function drop($table)
- {
- $blueprint = $this->createBlueprint($table);
-
- $blueprint->drop();
-
- $this->build($blueprint);
- }
-
- /**
- * Drop a table from the schema if it exists.
- *
- * @param string $table
- * @return \Illuminate\Database\Schema\Blueprint
- */
- public function dropIfExists($table)
- {
- $blueprint = $this->createBlueprint($table);
-
- $blueprint->dropIfExists();
-
- $this->build($blueprint);
- }
-
- /**
- * Rename a table on the schema.
- *
- * @param string $from
- * @param string $to
- * @return \Illuminate\Database\Schema\Blueprint
- */
- public function rename($from, $to)
- {
- $blueprint = $this->createBlueprint($from);
-
- $blueprint->rename($to);
-
- $this->build($blueprint);
- }
-
- /**
- * Execute the blueprint to build / modify the table.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @return void
- */
- protected function build(Blueprint $blueprint)
- {
- $blueprint->build($this->connection, $this->grammar);
- }
-
- /**
- * Create a new command set with a Closure.
- *
- * @param string $table
- * @param \Closure|null $callback
- * @return \Illuminate\Database\Schema\Blueprint
- */
- protected function createBlueprint($table, Closure $callback = null)
- {
- if (isset($this->resolver))
- {
- return call_user_func($this->resolver, $table, $callback);
- }
-
- return new Blueprint($table, $callback);
- }
-
- /**
- * Get the database connection instance.
- *
- * @return \Illuminate\Database\Connection
- */
- public function getConnection()
- {
- return $this->connection;
- }
-
- /**
- * Set the database connection instance.
- *
- * @param \Illuminate\Database\Connection
- * @return $this
- */
- public function setConnection(Connection $connection)
- {
- $this->connection = $connection;
-
- return $this;
- }
-
- /**
- * Set the Schema Blueprint resolver callback.
- *
- * @param \Closure $resolver
- * @return void
- */
- public function blueprintResolver(Closure $resolver)
- {
- $this->resolver = $resolver;
- }
-
+class Builder
+{
+ /**
+ * The database connection instance.
+ *
+ * @var \Illuminate\Database\Connection
+ */
+ protected $connection;
+
+ /**
+ * The schema grammar instance.
+ *
+ * @var \Illuminate\Database\Schema\Grammars\Grammar
+ */
+ protected $grammar;
+
+ /**
+ * The Blueprint resolver callback.
+ *
+ * @var \Closure
+ */
+ protected $resolver;
+
+ /**
+ * Create a new database Schema manager.
+ *
+ * @param \Illuminate\Database\Connection $connection
+ * @return void
+ */
+ public function __construct(Connection $connection)
+ {
+ $this->connection = $connection;
+ $this->grammar = $connection->getSchemaGrammar();
+ }
+
+ /**
+ * Determine if the given table exists.
+ *
+ * @param string $table
+ * @return bool
+ */
+ public function hasTable($table)
+ {
+ $sql = $this->grammar->compileTableExists();
+
+ $table = $this->connection->getTablePrefix().$table;
+
+ return count($this->connection->select($sql, [$table])) > 0;
+ }
+
+ /**
+ * Determine if the given table has a given column.
+ *
+ * @param string $table
+ * @param string $column
+ * @return bool
+ */
+ public function hasColumn($table, $column)
+ {
+ $column = strtolower($column);
+
+ return in_array($column, array_map('strtolower', $this->getColumnListing($table)));
+ }
+
+ /**
+ * Determine if the given table has given columns.
+ *
+ * @param string $table
+ * @param array $columns
+ * @return bool
+ */
+ public function hasColumns($table, array $columns)
+ {
+ $tableColumns = array_map('strtolower', $this->getColumnListing($table));
+
+ foreach ($columns as $column) {
+ if (! in_array(strtolower($column), $tableColumns)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Get the column listing for a given table.
+ *
+ * @param string $table
+ * @return array
+ */
+ public function getColumnListing($table)
+ {
+ $table = $this->connection->getTablePrefix().$table;
+
+ $results = $this->connection->select($this->grammar->compileColumnExists($table));
+
+ return $this->connection->getPostProcessor()->processColumnListing($results);
+ }
+
+ /**
+ * Modify a table on the schema.
+ *
+ * @param string $table
+ * @param \Closure $callback
+ * @return \Illuminate\Database\Schema\Blueprint
+ */
+ public function table($table, Closure $callback)
+ {
+ $this->build($this->createBlueprint($table, $callback));
+ }
+
+ /**
+ * Create a new table on the schema.
+ *
+ * @param string $table
+ * @param \Closure $callback
+ * @return \Illuminate\Database\Schema\Blueprint
+ */
+ public function create($table, Closure $callback)
+ {
+ $blueprint = $this->createBlueprint($table);
+
+ $blueprint->create();
+
+ $callback($blueprint);
+
+ $this->build($blueprint);
+ }
+
+ /**
+ * Drop a table from the schema.
+ *
+ * @param string $table
+ * @return \Illuminate\Database\Schema\Blueprint
+ */
+ public function drop($table)
+ {
+ $blueprint = $this->createBlueprint($table);
+
+ $blueprint->drop();
+
+ $this->build($blueprint);
+ }
+
+ /**
+ * Drop a table from the schema if it exists.
+ *
+ * @param string $table
+ * @return \Illuminate\Database\Schema\Blueprint
+ */
+ public function dropIfExists($table)
+ {
+ $blueprint = $this->createBlueprint($table);
+
+ $blueprint->dropIfExists();
+
+ $this->build($blueprint);
+ }
+
+ /**
+ * Rename a table on the schema.
+ *
+ * @param string $from
+ * @param string $to
+ * @return \Illuminate\Database\Schema\Blueprint
+ */
+ public function rename($from, $to)
+ {
+ $blueprint = $this->createBlueprint($from);
+
+ $blueprint->rename($to);
+
+ $this->build($blueprint);
+ }
+
+ /**
+ * Execute the blueprint to build / modify the table.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @return void
+ */
+ protected function build(Blueprint $blueprint)
+ {
+ $blueprint->build($this->connection, $this->grammar);
+ }
+
+ /**
+ * Create a new command set with a Closure.
+ *
+ * @param string $table
+ * @param \Closure|null $callback
+ * @return \Illuminate\Database\Schema\Blueprint
+ */
+ protected function createBlueprint($table, Closure $callback = null)
+ {
+ if (isset($this->resolver)) {
+ return call_user_func($this->resolver, $table, $callback);
+ }
+
+ return new Blueprint($table, $callback);
+ }
+
+ /**
+ * Get the database connection instance.
+ *
+ * @return \Illuminate\Database\Connection
+ */
+ public function getConnection()
+ {
+ return $this->connection;
+ }
+
+ /**
+ * Set the database connection instance.
+ *
+ * @param \Illuminate\Database\Connection $connection
+ * @return $this
+ */
+ public function setConnection(Connection $connection)
+ {
+ $this->connection = $connection;
+
+ return $this;
+ }
+
+ /**
+ * Set the Schema Blueprint resolver callback.
+ *
+ * @param \Closure $resolver
+ * @return void
+ */
+ public function blueprintResolver(Closure $resolver)
+ {
+ $this->resolver = $resolver;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php
index 5857daa..9dbc170 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php
@@ -1,5 +1,8 @@
-getDoctrineSchemaManager();
-
- $table = $this->getTablePrefix().$blueprint->getTable();
-
- $column = $connection->getDoctrineColumn($table, $command->from);
-
- $tableDiff = $this->getRenamedDiff($blueprint, $command, $column, $schema);
-
- return (array) $schema->getDatabasePlatform()->getAlterTableSQL($tableDiff);
- }
-
- /**
- * Get a new column instance with the new column name.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @param \Doctrine\DBAL\Schema\Column $column
- * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
- * @return \Doctrine\DBAL\Schema\TableDiff
- */
- protected function getRenamedDiff(Blueprint $blueprint, Fluent $command, Column $column, SchemaManager $schema)
- {
- $tableDiff = $this->getDoctrineTableDiff($blueprint, $schema);
-
- return $this->setRenamedColumns($tableDiff, $command, $column);
- }
-
- /**
- * Set the renamed columns on the table diff.
- *
- * @param \Doctrine\DBAL\Schema\TableDiff $tableDiff
- * @param \Illuminate\Support\Fluent $command
- * @param \Doctrine\DBAL\Schema\Column $column
- * @return \Doctrine\DBAL\Schema\TableDiff
- */
- protected function setRenamedColumns(TableDiff $tableDiff, Fluent $command, Column $column)
- {
- $newColumn = new Column($command->to, $column->getType(), $column->toArray());
-
- $tableDiff->renamedColumns = array($command->from => $newColumn);
-
- return $tableDiff;
- }
-
- /**
- * Compile a foreign key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileForeign(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- $on = $this->wrapTable($command->on);
-
- // We need to prepare several of the elements of the foreign key definition
- // before we can create the SQL, such as wrapping the tables and convert
- // an array of columns to comma-delimited strings for the SQL queries.
- $columns = $this->columnize($command->columns);
-
- $onColumns = $this->columnize((array) $command->references);
-
- $sql = "alter table {$table} add constraint {$command->index} ";
-
- $sql .= "foreign key ({$columns}) references {$on} ({$onColumns})";
-
- // Once we have the basic foreign key creation statement constructed we can
- // build out the syntax for what should happen on an update or delete of
- // the affected columns, which will get something like "cascade", etc.
- if ( ! is_null($command->onDelete))
- {
- $sql .= " on delete {$command->onDelete}";
- }
-
- if ( ! is_null($command->onUpdate))
- {
- $sql .= " on update {$command->onUpdate}";
- }
-
- return $sql;
- }
-
- /**
- * Compile the blueprint's column definitions.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @return array
- */
- protected function getColumns(Blueprint $blueprint)
- {
- $columns = array();
-
- foreach ($blueprint->getAddedColumns() as $column)
- {
- // Each of the column types have their own compiler functions which are tasked
- // with turning the column definition into its SQL format for this platform
- // used by the connection. The column's modifiers are compiled and added.
- $sql = $this->wrap($column).' '.$this->getType($column);
-
- $columns[] = $this->addModifiers($sql, $blueprint, $column);
- }
-
- return $columns;
- }
-
- /**
- * Add the column modifiers to the definition.
- *
- * @param string $sql
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function addModifiers($sql, Blueprint $blueprint, Fluent $column)
- {
- foreach ($this->modifiers as $modifier)
- {
- if (method_exists($this, $method = "modify{$modifier}"))
- {
- $sql .= $this->{$method}($blueprint, $column);
- }
- }
-
- return $sql;
- }
-
- /**
- * Get the primary key command if it exists on the blueprint.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param string $name
- * @return \Illuminate\Support\Fluent|null
- */
- protected function getCommandByName(Blueprint $blueprint, $name)
- {
- $commands = $this->getCommandsByName($blueprint, $name);
-
- if (count($commands) > 0)
- {
- return reset($commands);
- }
- }
-
- /**
- * Get all of the commands with a given name.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param string $name
- * @return array
- */
- protected function getCommandsByName(Blueprint $blueprint, $name)
- {
- return array_filter($blueprint->getCommands(), function($value) use ($name)
- {
- return $value->name == $name;
- });
- }
-
- /**
- * Get the SQL for the column data type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function getType(Fluent $column)
- {
- return $this->{"type".ucfirst($column->type)}($column);
- }
-
- /**
- * Add a prefix to an array of values.
- *
- * @param string $prefix
- * @param array $values
- * @return array
- */
- public function prefixArray($prefix, array $values)
- {
- return array_map(function($value) use ($prefix)
- {
- return $prefix.' '.$value;
-
- }, $values);
- }
-
- /**
- * Wrap a table in keyword identifiers.
- *
- * @param mixed $table
- * @return string
- */
- public function wrapTable($table)
- {
- if ($table instanceof Blueprint) $table = $table->getTable();
-
- return parent::wrapTable($table);
- }
-
- /**
- * {@inheritdoc}
- */
- public function wrap($value, $prefixAlias = false)
- {
- if ($value instanceof Fluent) $value = $value->name;
-
- return parent::wrap($value, $prefixAlias);
- }
-
- /**
- * Format a value so that it can be used in "default" clauses.
- *
- * @param mixed $value
- * @return string
- */
- protected function getDefaultValue($value)
- {
- if ($value instanceof Expression) return $value;
-
- if (is_bool($value)) return "'".(int) $value."'";
-
- return "'".strval($value)."'";
- }
-
- /**
- * Create an empty Doctrine DBAL TableDiff from the Blueprint.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
- * @return \Doctrine\DBAL\Schema\TableDiff
- */
- protected function getDoctrineTableDiff(Blueprint $blueprint, SchemaManager $schema)
- {
- $table = $this->getTablePrefix().$blueprint->getTable();
-
- $tableDiff = new TableDiff($table);
-
- $tableDiff->fromTable = $schema->listTableDetails($table);
-
- return $tableDiff;
- }
-
- /**
- * Compile a change column command into a series of SQL statements.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @param \Illuminate\Database\Connection $connection
- * @return array
- */
- public function compileChange(Blueprint $blueprint, Fluent $command, Connection $connection)
- {
- $schema = $connection->getDoctrineSchemaManager();
-
- $tableDiff = $this->getChangedDiff($blueprint, $schema);
-
- if ($tableDiff !== false)
- {
- return (array) $schema->getDatabasePlatform()->getAlterTableSQL($tableDiff);
- }
-
- return [];
- }
-
- /**
- * Get the Doctrine table difference for the given changes.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
- * @return \Doctrine\DBAL\Schema\TableDiff|bool
- */
- protected function getChangedDiff(Blueprint $blueprint, SchemaManager $schema)
- {
- $table = $schema->listTableDetails($this->getTablePrefix().$blueprint->getTable());
-
- return (new Comparator)->diffTable($table, $this->getTableWithColumnChanges($blueprint, $table));
- }
-
- /**
- * Get a copy of the given Doctrine table after making the column changes.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Doctrine\DBAL\Schema\Table $table
- * @return \Doctrine\DBAL\Schema\TableDiff
- */
- protected function getTableWithColumnChanges(Blueprint $blueprint, Table $table)
- {
- $table = clone $table;
-
- foreach($blueprint->getChangedColumns() as $fluent)
- {
- $column = $this->getDoctrineColumnForChange($table, $fluent);
-
- // Here we will spin through each fluent column definition and map it to the proper
- // Doctrine column definitions, which is necessasry because Laravel and Doctrine
- // use some different terminology for various column attributes on the tables.
- foreach ($fluent->getAttributes() as $key => $value)
- {
- if ( ! is_null($option = $this->mapFluentOptionToDoctrine($key)))
- {
- if (method_exists($column, $method = 'set'.ucfirst($option)))
- {
- $column->{$method}($this->mapFluentValueToDoctrine($option, $value));
- }
- }
- }
- }
-
- return $table;
- }
-
- /**
- * Get the Doctrine column instance for a column change.
- *
- * @param \Doctrine\DBAL\Schema\Table $table
- * @param \Illuminate\Support\Fluent $fluent
- * @return \Doctrine\DBAL\Schema\Column
- */
- protected function getDoctrineColumnForChange(Table $table, Fluent $fluent)
- {
- return $table->changeColumn(
- $fluent['name'], $this->getDoctrineColumnChangeOptions($fluent)
- )->getColumn($fluent['name']);
- }
-
- /**
- * Get the Doctrine column change options.
- *
- * @param \Illuminate\Support\Fluent $fluent
- * @return array
- */
- protected function getDoctrineColumnChangeOptions(Fluent $fluent)
- {
- $options = ['type' => $this->getDoctrineColumnType($fluent['type'])];
-
- if (in_array($fluent['type'], ['text', 'mediumText', 'longText']))
- {
- $options['length'] = $this->calculateDoctrineTextLength($fluent['type']);
- }
-
- return $options;
- }
-
- /**
- * Get the doctrine column type.
- *
- * @param string $type
- * @return \Doctrine\DBAL\Types\Type
- */
- protected function getDoctrineColumnType($type)
- {
- $type = strtolower($type);
-
- switch ($type) {
- case 'biginteger':
- $type = 'bigint';
- break;
- case 'smallinteger':
- $type = 'smallint';
- break;
- case 'mediumtext':
- case 'longtext':
- $type = 'text';
- break;
- }
-
- return Type::getType($type);
- }
-
- /**
- * Calculate the proper column length to force the Doctrine text type.
- *
- * @param string $type
- * @return int
- */
- protected function calculateDoctrineTextLength($type)
- {
- switch ($type)
- {
- case 'mediumText':
- return 65535 + 1;
-
- case 'longText':
- return 16777215 + 1;
-
- default:
- return 255 + 1;
- }
- }
-
- /**
- * Get the matching Doctrine option for a given Fluent attribute name.
- *
- * @param string $attribute
- * @return string
- */
- protected function mapFluentOptionToDoctrine($attribute)
- {
- switch($attribute)
- {
- case 'type':
- case 'name':
- return;
-
- case 'nullable':
- return 'notnull';
-
- case 'total':
- return 'precision';
-
- case 'places':
- return 'scale';
-
- default:
- return $attribute;
- }
- }
-
- /**
- * Get the matching Doctrine value for a given Fluent attribute.
- *
- * @param string $option
- * @param mixed $value
- * @return mixed
- */
- protected function mapFluentValueToDoctrine($option, $value)
- {
- return $option == 'notnull' ? ! $value : $value;
- }
-
+abstract class Grammar extends BaseGrammar
+{
+ /**
+ * Compile a rename column command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @param \Illuminate\Database\Connection $connection
+ * @return array
+ */
+ public function compileRenameColumn(Blueprint $blueprint, Fluent $command, Connection $connection)
+ {
+ $schema = $connection->getDoctrineSchemaManager();
+
+ $table = $this->getTablePrefix().$blueprint->getTable();
+
+ $column = $connection->getDoctrineColumn($table, $command->from);
+
+ $tableDiff = $this->getRenamedDiff($blueprint, $command, $column, $schema);
+
+ return (array) $schema->getDatabasePlatform()->getAlterTableSQL($tableDiff);
+ }
+
+ /**
+ * Get a new column instance with the new column name.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @param \Doctrine\DBAL\Schema\Column $column
+ * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
+ * @return \Doctrine\DBAL\Schema\TableDiff
+ */
+ protected function getRenamedDiff(Blueprint $blueprint, Fluent $command, Column $column, SchemaManager $schema)
+ {
+ $tableDiff = $this->getDoctrineTableDiff($blueprint, $schema);
+
+ return $this->setRenamedColumns($tableDiff, $command, $column);
+ }
+
+ /**
+ * Set the renamed columns on the table diff.
+ *
+ * @param \Doctrine\DBAL\Schema\TableDiff $tableDiff
+ * @param \Illuminate\Support\Fluent $command
+ * @param \Doctrine\DBAL\Schema\Column $column
+ * @return \Doctrine\DBAL\Schema\TableDiff
+ */
+ protected function setRenamedColumns(TableDiff $tableDiff, Fluent $command, Column $column)
+ {
+ $newColumn = new Column($command->to, $column->getType(), $column->toArray());
+
+ $tableDiff->renamedColumns = [$command->from => $newColumn];
+
+ return $tableDiff;
+ }
+
+ /**
+ * Compile a foreign key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileForeign(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ $on = $this->wrapTable($command->on);
+
+ // We need to prepare several of the elements of the foreign key definition
+ // before we can create the SQL, such as wrapping the tables and convert
+ // an array of columns to comma-delimited strings for the SQL queries.
+ $columns = $this->columnize($command->columns);
+
+ $onColumns = $this->columnize((array) $command->references);
+
+ $sql = "alter table {$table} add constraint {$command->index} ";
+
+ $sql .= "foreign key ({$columns}) references {$on} ({$onColumns})";
+
+ // Once we have the basic foreign key creation statement constructed we can
+ // build out the syntax for what should happen on an update or delete of
+ // the affected columns, which will get something like "cascade", etc.
+ if (! is_null($command->onDelete)) {
+ $sql .= " on delete {$command->onDelete}";
+ }
+
+ if (! is_null($command->onUpdate)) {
+ $sql .= " on update {$command->onUpdate}";
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Compile the blueprint's column definitions.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @return array
+ */
+ protected function getColumns(Blueprint $blueprint)
+ {
+ $columns = [];
+
+ foreach ($blueprint->getAddedColumns() as $column) {
+ // Each of the column types have their own compiler functions which are tasked
+ // with turning the column definition into its SQL format for this platform
+ // used by the connection. The column's modifiers are compiled and added.
+ $sql = $this->wrap($column).' '.$this->getType($column);
+
+ $columns[] = $this->addModifiers($sql, $blueprint, $column);
+ }
+
+ return $columns;
+ }
+
+ /**
+ * Add the column modifiers to the definition.
+ *
+ * @param string $sql
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function addModifiers($sql, Blueprint $blueprint, Fluent $column)
+ {
+ foreach ($this->modifiers as $modifier) {
+ if (method_exists($this, $method = "modify{$modifier}")) {
+ $sql .= $this->{$method}($blueprint, $column);
+ }
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Get the primary key command if it exists on the blueprint.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param string $name
+ * @return \Illuminate\Support\Fluent|null
+ */
+ protected function getCommandByName(Blueprint $blueprint, $name)
+ {
+ $commands = $this->getCommandsByName($blueprint, $name);
+
+ if (count($commands) > 0) {
+ return reset($commands);
+ }
+ }
+
+ /**
+ * Get all of the commands with a given name.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param string $name
+ * @return array
+ */
+ protected function getCommandsByName(Blueprint $blueprint, $name)
+ {
+ return array_filter($blueprint->getCommands(), function ($value) use ($name) {
+ return $value->name == $name;
+ });
+ }
+
+ /**
+ * Get the SQL for the column data type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function getType(Fluent $column)
+ {
+ return $this->{'type'.ucfirst($column->type)}($column);
+ }
+
+ /**
+ * Add a prefix to an array of values.
+ *
+ * @param string $prefix
+ * @param array $values
+ * @return array
+ */
+ public function prefixArray($prefix, array $values)
+ {
+ return array_map(function ($value) use ($prefix) {
+ return $prefix.' '.$value;
+ }, $values);
+ }
+
+ /**
+ * Wrap a table in keyword identifiers.
+ *
+ * @param mixed $table
+ * @return string
+ */
+ public function wrapTable($table)
+ {
+ if ($table instanceof Blueprint) {
+ $table = $table->getTable();
+ }
+
+ return parent::wrapTable($table);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function wrap($value, $prefixAlias = false)
+ {
+ if ($value instanceof Fluent) {
+ $value = $value->name;
+ }
+
+ return parent::wrap($value, $prefixAlias);
+ }
+
+ /**
+ * Format a value so that it can be used in "default" clauses.
+ *
+ * @param mixed $value
+ * @return string
+ */
+ protected function getDefaultValue($value)
+ {
+ if ($value instanceof Expression) {
+ return $value;
+ }
+
+ if (is_bool($value)) {
+ return "'".(int) $value."'";
+ }
+
+ return "'".strval($value)."'";
+ }
+
+ /**
+ * Create an empty Doctrine DBAL TableDiff from the Blueprint.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
+ * @return \Doctrine\DBAL\Schema\TableDiff
+ */
+ protected function getDoctrineTableDiff(Blueprint $blueprint, SchemaManager $schema)
+ {
+ $table = $this->getTablePrefix().$blueprint->getTable();
+
+ $tableDiff = new TableDiff($table);
+
+ $tableDiff->fromTable = $schema->listTableDetails($table);
+
+ return $tableDiff;
+ }
+
+ /**
+ * Compile a change column command into a series of SQL statements.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @param \Illuminate\Database\Connection $connection
+ * @return array
+ */
+ public function compileChange(Blueprint $blueprint, Fluent $command, Connection $connection)
+ {
+ if (! $connection->isDoctrineAvailable()) {
+ throw new RuntimeException(sprintf(
+ 'Changing columns for table "%s" requires Doctrine DBAL; install "doctrine/dbal".',
+ $blueprint->getTable()
+ ));
+ }
+
+ $schema = $connection->getDoctrineSchemaManager();
+
+ $tableDiff = $this->getChangedDiff($blueprint, $schema);
+
+ if ($tableDiff !== false) {
+ return (array) $schema->getDatabasePlatform()->getAlterTableSQL($tableDiff);
+ }
+
+ return [];
+ }
+
+ /**
+ * Get the Doctrine table difference for the given changes.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
+ * @return \Doctrine\DBAL\Schema\TableDiff|bool
+ */
+ protected function getChangedDiff(Blueprint $blueprint, SchemaManager $schema)
+ {
+ $table = $schema->listTableDetails($this->getTablePrefix().$blueprint->getTable());
+
+ return (new Comparator)->diffTable($table, $this->getTableWithColumnChanges($blueprint, $table));
+ }
+
+ /**
+ * Get a copy of the given Doctrine table after making the column changes.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Doctrine\DBAL\Schema\Table $table
+ * @return \Doctrine\DBAL\Schema\TableDiff
+ */
+ protected function getTableWithColumnChanges(Blueprint $blueprint, Table $table)
+ {
+ $table = clone $table;
+
+ foreach ($blueprint->getChangedColumns() as $fluent) {
+ $column = $this->getDoctrineColumnForChange($table, $fluent);
+
+ // Here we will spin through each fluent column definition and map it to the proper
+ // Doctrine column definitions - which is necessary because Laravel and Doctrine
+ // use some different terminology for various column attributes on the tables.
+ foreach ($fluent->getAttributes() as $key => $value) {
+ if (! is_null($option = $this->mapFluentOptionToDoctrine($key))) {
+ if (method_exists($column, $method = 'set'.ucfirst($option))) {
+ $column->{$method}($this->mapFluentValueToDoctrine($option, $value));
+ }
+ }
+ }
+ }
+
+ return $table;
+ }
+
+ /**
+ * Get the Doctrine column instance for a column change.
+ *
+ * @param \Doctrine\DBAL\Schema\Table $table
+ * @param \Illuminate\Support\Fluent $fluent
+ * @return \Doctrine\DBAL\Schema\Column
+ */
+ protected function getDoctrineColumnForChange(Table $table, Fluent $fluent)
+ {
+ return $table->changeColumn(
+ $fluent['name'], $this->getDoctrineColumnChangeOptions($fluent)
+ )->getColumn($fluent['name']);
+ }
+
+ /**
+ * Get the Doctrine column change options.
+ *
+ * @param \Illuminate\Support\Fluent $fluent
+ * @return array
+ */
+ protected function getDoctrineColumnChangeOptions(Fluent $fluent)
+ {
+ $options = ['type' => $this->getDoctrineColumnType($fluent['type'])];
+
+ if (in_array($fluent['type'], ['text', 'mediumText', 'longText'])) {
+ $options['length'] = $this->calculateDoctrineTextLength($fluent['type']);
+ }
+
+ return $options;
+ }
+
+ /**
+ * Get the doctrine column type.
+ *
+ * @param string $type
+ * @return \Doctrine\DBAL\Types\Type
+ */
+ protected function getDoctrineColumnType($type)
+ {
+ $type = strtolower($type);
+
+ switch ($type) {
+ case 'biginteger':
+ $type = 'bigint';
+ break;
+ case 'smallinteger':
+ $type = 'smallint';
+ break;
+ case 'mediumtext':
+ case 'longtext':
+ $type = 'text';
+ break;
+ }
+
+ return Type::getType($type);
+ }
+
+ /**
+ * Calculate the proper column length to force the Doctrine text type.
+ *
+ * @param string $type
+ * @return int
+ */
+ protected function calculateDoctrineTextLength($type)
+ {
+ switch ($type) {
+ case 'mediumText':
+ return 65535 + 1;
+ case 'longText':
+ return 16777215 + 1;
+ default:
+ return 255 + 1;
+ }
+ }
+
+ /**
+ * Get the matching Doctrine option for a given Fluent attribute name.
+ *
+ * @param string $attribute
+ * @return string|null
+ */
+ protected function mapFluentOptionToDoctrine($attribute)
+ {
+ switch ($attribute) {
+ case 'type':
+ case 'name':
+ return;
+ case 'nullable':
+ return 'notnull';
+ case 'total':
+ return 'precision';
+ case 'places':
+ return 'scale';
+ default:
+ return $attribute;
+ }
+ }
+
+ /**
+ * Get the matching Doctrine value for a given Fluent attribute.
+ *
+ * @param string $option
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function mapFluentValueToDoctrine($option, $value)
+ {
+ return $option == 'notnull' ? ! $value : $value;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
index 014dd8a..3687882 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
@@ -1,652 +1,721 @@
-getColumns($blueprint));
-
- $sql = 'create table '.$this->wrapTable($blueprint)." ($columns)";
-
- // Once we have the primary SQL, we can add the encoding option to the SQL for
- // the table. Then, we can check if a storage engine has been supplied for
- // the table. If so, we will add the engine declaration to the SQL query.
- $sql = $this->compileCreateEncoding($sql, $connection);
-
- if (isset($blueprint->engine))
- {
- $sql .= ' engine = '.$blueprint->engine;
- }
-
- return $sql;
- }
-
- /**
- * Append the character set specifications to a command.
- *
- * @param string $sql
- * @param \Illuminate\Database\Connection $connection
- * @return string
- */
- protected function compileCreateEncoding($sql, Connection $connection)
- {
- if ( ! is_null($charset = $connection->getConfig('charset')))
- {
- $sql .= ' default character set '.$charset;
- }
-
- if ( ! is_null($collation = $connection->getConfig('collation')))
- {
- $sql .= ' collate '.$collation;
- }
-
- return $sql;
- }
-
- /**
- * Compile an add column command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileAdd(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- $columns = $this->prefixArray('add', $this->getColumns($blueprint));
-
- return 'alter table '.$table.' '.implode(', ', $columns);
- }
-
- /**
- * Compile a primary key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compilePrimary(Blueprint $blueprint, Fluent $command)
- {
- $command->name(null);
-
- return $this->compileKey($blueprint, $command, 'primary key');
- }
-
- /**
- * Compile a unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileUnique(Blueprint $blueprint, Fluent $command)
- {
- return $this->compileKey($blueprint, $command, 'unique');
- }
-
- /**
- * Compile a plain index key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileIndex(Blueprint $blueprint, Fluent $command)
- {
- return $this->compileKey($blueprint, $command, 'index');
- }
-
- /**
- * Compile an index creation command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @param string $type
- * @return string
- */
- protected function compileKey(Blueprint $blueprint, Fluent $command, $type)
- {
- $columns = $this->columnize($command->columns);
-
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} add {$type} {$command->index}($columns)";
- }
-
- /**
- * Compile a drop table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDrop(Blueprint $blueprint, Fluent $command)
- {
- return 'drop table '.$this->wrapTable($blueprint);
- }
-
- /**
- * Compile a drop table (if exists) command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
- {
- return 'drop table if exists '.$this->wrapTable($blueprint);
- }
-
- /**
- * Compile a drop column command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropColumn(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->prefixArray('drop', $this->wrapArray($command->columns));
-
- $table = $this->wrapTable($blueprint);
-
- return 'alter table '.$table.' '.implode(', ', $columns);
- }
-
- /**
- * Compile a drop primary key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
- {
- return 'alter table '.$this->wrapTable($blueprint).' drop primary key';
- }
-
- /**
- * Compile a drop unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropUnique(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} drop index {$command->index}";
- }
-
- /**
- * Compile a drop index command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIndex(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} drop index {$command->index}";
- }
-
- /**
- * Compile a drop foreign key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropForeign(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} drop foreign key {$command->index}";
- }
-
- /**
- * Compile a rename table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileRename(Blueprint $blueprint, Fluent $command)
- {
- $from = $this->wrapTable($blueprint);
-
- return "rename table {$from} to ".$this->wrapTable($command->to);
- }
-
- /**
- * Create the column definition for a char type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeChar(Fluent $column)
- {
- return "char({$column->length})";
- }
-
- /**
- * Create the column definition for a string type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeString(Fluent $column)
- {
- return "varchar({$column->length})";
- }
-
- /**
- * Create the column definition for a text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeText(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a medium text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumText(Fluent $column)
- {
- return 'mediumtext';
- }
-
- /**
- * Create the column definition for a long text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeLongText(Fluent $column)
- {
- return 'longtext';
- }
-
- /**
- * Create the column definition for a big integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBigInteger(Fluent $column)
- {
- return 'bigint';
- }
-
- /**
- * Create the column definition for a integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeInteger(Fluent $column)
- {
- return 'int';
- }
-
- /**
- * Create the column definition for a medium integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumInteger(Fluent $column)
- {
- return 'mediumint';
- }
-
- /**
- * Create the column definition for a tiny integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTinyInteger(Fluent $column)
- {
- return 'tinyint';
- }
-
- /**
- * Create the column definition for a small integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeSmallInteger(Fluent $column)
- {
- return 'smallint';
- }
-
- /**
- * Create the column definition for a float type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeFloat(Fluent $column)
- {
- return $this->typeDouble($column);
- }
-
- /**
- * Create the column definition for a double type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDouble(Fluent $column)
- {
- if ($column->total && $column->places)
- {
- return "double({$column->total}, {$column->places})";
- }
-
- return 'double';
- }
-
- /**
- * Create the column definition for a decimal type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDecimal(Fluent $column)
- {
- return "decimal({$column->total}, {$column->places})";
- }
-
- /**
- * Create the column definition for a boolean type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBoolean(Fluent $column)
- {
- return 'tinyint(1)';
- }
-
- /**
- * Create the column definition for an enum type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeEnum(Fluent $column)
- {
- return "enum('".implode("', '", $column->allowed)."')";
- }
-
- /**
- * Create the column definition for a json type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJson(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a jsonb type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJsonb(Fluent $column)
- {
- return "text";
- }
-
- /**
- * Create the column definition for a date type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDate(Fluent $column)
- {
- return 'date';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTime(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTimeTz(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTime(Fluent $column)
- {
- return 'time';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimeTz(Fluent $column)
- {
- return 'time';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestamp(Fluent $column)
- {
- if ( ! $column->nullable) return 'timestamp default 0';
-
- return 'timestamp';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestampTz(Fluent $column)
- {
- if ( ! $column->nullable) return 'timestamp default 0';
-
- return 'timestamp';
- }
-
- /**
- * Create the column definition for a binary type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBinary(Fluent $column)
- {
- return 'blob';
- }
-
- /**
- * Get the SQL for an unsigned column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyUnsigned(Blueprint $blueprint, Fluent $column)
- {
- if ($column->unsigned) return ' unsigned';
- }
-
- /**
- * Get the SQL for a nullable column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyNullable(Blueprint $blueprint, Fluent $column)
- {
- return $column->nullable ? ' null' : ' not null';
- }
-
- /**
- * Get the SQL for a default column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyDefault(Blueprint $blueprint, Fluent $column)
- {
- if ( ! is_null($column->default))
- {
- return " default ".$this->getDefaultValue($column->default);
- }
- }
-
- /**
- * Get the SQL for an auto-increment column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
- {
- if (in_array($column->type, $this->serials) && $column->autoIncrement)
- {
- return ' auto_increment primary key';
- }
- }
-
- /**
- * Get the SQL for an "after" column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyAfter(Blueprint $blueprint, Fluent $column)
- {
- if ( ! is_null($column->after))
- {
- return ' after '.$this->wrap($column->after);
- }
- }
-
- /**
- * Get the SQL for an "comment" column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyComment(Blueprint $blueprint, Fluent $column)
- {
- if ( ! is_null($column->comment))
- {
- return ' comment "'.$column->comment.'"';
- }
- }
-
- /**
- * Wrap a single string in keyword identifiers.
- *
- * @param string $value
- * @return string
- */
- protected function wrapValue($value)
- {
- if ($value === '*') return $value;
-
- return '`'.str_replace('`', '``', $value).'`';
- }
-
+class MySqlGrammar extends Grammar
+{
+ /**
+ * The possible column modifiers.
+ *
+ * @var array
+ */
+ protected $modifiers = ['Unsigned', 'Charset', 'Collate', 'Nullable', 'Default', 'Increment', 'Comment', 'After', 'First'];
+
+ /**
+ * The possible column serials.
+ *
+ * @var array
+ */
+ protected $serials = ['bigInteger', 'integer', 'mediumInteger', 'smallInteger', 'tinyInteger'];
+
+ /**
+ * Compile the query to determine the list of tables.
+ *
+ * @return string
+ */
+ public function compileTableExists()
+ {
+ return 'select * from information_schema.tables where table_schema = ? and table_name = ?';
+ }
+
+ /**
+ * Compile the query to determine the list of columns.
+ *
+ * @return string
+ */
+ public function compileColumnExists()
+ {
+ return 'select column_name from information_schema.columns where table_schema = ? and table_name = ?';
+ }
+
+ /**
+ * Compile a create table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @param \Illuminate\Database\Connection $connection
+ * @return string
+ */
+ public function compileCreate(Blueprint $blueprint, Fluent $command, Connection $connection)
+ {
+ $columns = implode(', ', $this->getColumns($blueprint));
+
+ $sql = $blueprint->temporary ? 'create temporary' : 'create';
+
+ $sql .= ' table '.$this->wrapTable($blueprint)." ($columns)";
+
+ // Once we have the primary SQL, we can add the encoding option to the SQL for
+ // the table. Then, we can check if a storage engine has been supplied for
+ // the table. If so, we will add the engine declaration to the SQL query.
+ $sql = $this->compileCreateEncoding($sql, $connection, $blueprint);
+
+ if (isset($blueprint->engine)) {
+ $sql .= ' engine = '.$blueprint->engine;
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Append the character set specifications to a command.
+ *
+ * @param string $sql
+ * @param \Illuminate\Database\Connection $connection
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @return string
+ */
+ protected function compileCreateEncoding($sql, Connection $connection, Blueprint $blueprint)
+ {
+ if (isset($blueprint->charset)) {
+ $sql .= ' default character set '.$blueprint->charset;
+ } elseif (! is_null($charset = $connection->getConfig('charset'))) {
+ $sql .= ' default character set '.$charset;
+ }
+
+ if (isset($blueprint->collation)) {
+ $sql .= ' collate '.$blueprint->collation;
+ } elseif (! is_null($collation = $connection->getConfig('collation'))) {
+ $sql .= ' collate '.$collation;
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Compile an add column command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileAdd(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ $columns = $this->prefixArray('add', $this->getColumns($blueprint));
+
+ return 'alter table '.$table.' '.implode(', ', $columns);
+ }
+
+ /**
+ * Compile a primary key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compilePrimary(Blueprint $blueprint, Fluent $command)
+ {
+ $command->name(null);
+
+ return $this->compileKey($blueprint, $command, 'primary key');
+ }
+
+ /**
+ * Compile a unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileUnique(Blueprint $blueprint, Fluent $command)
+ {
+ return $this->compileKey($blueprint, $command, 'unique');
+ }
+
+ /**
+ * Compile a plain index key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileIndex(Blueprint $blueprint, Fluent $command)
+ {
+ return $this->compileKey($blueprint, $command, 'index');
+ }
+
+ /**
+ * Compile an index creation command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @param string $type
+ * @return string
+ */
+ protected function compileKey(Blueprint $blueprint, Fluent $command, $type)
+ {
+ $columns = $this->columnize($command->columns);
+
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} add {$type} `{$command->index}`($columns)";
+ }
+
+ /**
+ * Compile a drop table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDrop(Blueprint $blueprint, Fluent $command)
+ {
+ return 'drop table '.$this->wrapTable($blueprint);
+ }
+
+ /**
+ * Compile a drop table (if exists) command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
+ {
+ return 'drop table if exists '.$this->wrapTable($blueprint);
+ }
+
+ /**
+ * Compile a drop column command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropColumn(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->prefixArray('drop', $this->wrapArray($command->columns));
+
+ $table = $this->wrapTable($blueprint);
+
+ return 'alter table '.$table.' '.implode(', ', $columns);
+ }
+
+ /**
+ * Compile a drop primary key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
+ {
+ return 'alter table '.$this->wrapTable($blueprint).' drop primary key';
+ }
+
+ /**
+ * Compile a drop unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropUnique(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} drop index `{$command->index}`";
+ }
+
+ /**
+ * Compile a drop index command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} drop index `{$command->index}`";
+ }
+
+ /**
+ * Compile a drop foreign key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropForeign(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} drop foreign key `{$command->index}`";
+ }
+
+ /**
+ * Compile a rename table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileRename(Blueprint $blueprint, Fluent $command)
+ {
+ $from = $this->wrapTable($blueprint);
+
+ return "rename table {$from} to ".$this->wrapTable($command->to);
+ }
+
+ /**
+ * Create the column definition for a char type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeChar(Fluent $column)
+ {
+ return "char({$column->length})";
+ }
+
+ /**
+ * Create the column definition for a string type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeString(Fluent $column)
+ {
+ return "varchar({$column->length})";
+ }
+
+ /**
+ * Create the column definition for a text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeText(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a medium text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumText(Fluent $column)
+ {
+ return 'mediumtext';
+ }
+
+ /**
+ * Create the column definition for a long text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeLongText(Fluent $column)
+ {
+ return 'longtext';
+ }
+
+ /**
+ * Create the column definition for a big integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBigInteger(Fluent $column)
+ {
+ return 'bigint';
+ }
+
+ /**
+ * Create the column definition for a integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeInteger(Fluent $column)
+ {
+ return 'int';
+ }
+
+ /**
+ * Create the column definition for a medium integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumInteger(Fluent $column)
+ {
+ return 'mediumint';
+ }
+
+ /**
+ * Create the column definition for a tiny integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTinyInteger(Fluent $column)
+ {
+ return 'tinyint';
+ }
+
+ /**
+ * Create the column definition for a small integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeSmallInteger(Fluent $column)
+ {
+ return 'smallint';
+ }
+
+ /**
+ * Create the column definition for a float type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeFloat(Fluent $column)
+ {
+ return $this->typeDouble($column);
+ }
+
+ /**
+ * Create the column definition for a double type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDouble(Fluent $column)
+ {
+ if ($column->total && $column->places) {
+ return "double({$column->total}, {$column->places})";
+ }
+
+ return 'double';
+ }
+
+ /**
+ * Create the column definition for a decimal type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDecimal(Fluent $column)
+ {
+ return "decimal({$column->total}, {$column->places})";
+ }
+
+ /**
+ * Create the column definition for a boolean type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBoolean(Fluent $column)
+ {
+ return 'tinyint(1)';
+ }
+
+ /**
+ * Create the column definition for an enum type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeEnum(Fluent $column)
+ {
+ return "enum('".implode("', '", $column->allowed)."')";
+ }
+
+ /**
+ * Create the column definition for a json type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJson(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a jsonb type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJsonb(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a date type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDate(Fluent $column)
+ {
+ return 'date';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTime(Fluent $column)
+ {
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTimeTz(Fluent $column)
+ {
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTime(Fluent $column)
+ {
+ return 'time';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimeTz(Fluent $column)
+ {
+ return 'time';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestamp(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'timestamp default CURRENT_TIMESTAMP';
+ }
+
+ if (! $column->nullable && $column->default === null) {
+ return 'timestamp default 0';
+ }
+
+ return 'timestamp';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestampTz(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'timestamp default CURRENT_TIMESTAMP';
+ }
+
+ if (! $column->nullable && $column->default === null) {
+ return 'timestamp default 0';
+ }
+
+ return 'timestamp';
+ }
+
+ /**
+ * Create the column definition for a binary type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBinary(Fluent $column)
+ {
+ return 'blob';
+ }
+
+ /**
+ * Create the column definition for a uuid type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeUuid(Fluent $column)
+ {
+ return 'char(36)';
+ }
+
+ /**
+ * Get the SQL for an unsigned column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyUnsigned(Blueprint $blueprint, Fluent $column)
+ {
+ if ($column->unsigned) {
+ return ' unsigned';
+ }
+ }
+
+ /**
+ * Get the SQL for a character set column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyCharset(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->charset)) {
+ return ' character set '.$column->charset;
+ }
+ }
+
+ /**
+ * Get the SQL for a collation column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyCollate(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->collation)) {
+ return ' collate '.$column->collation;
+ }
+ }
+
+ /**
+ * Get the SQL for a nullable column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyNullable(Blueprint $blueprint, Fluent $column)
+ {
+ return $column->nullable ? ' null' : ' not null';
+ }
+
+ /**
+ * Get the SQL for a default column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->default)) {
+ return ' default '.$this->getDefaultValue($column->default);
+ }
+ }
+
+ /**
+ * Get the SQL for an auto-increment column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
+ {
+ if (in_array($column->type, $this->serials) && $column->autoIncrement) {
+ return ' auto_increment primary key';
+ }
+ }
+
+ /**
+ * Get the SQL for a "first" column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyFirst(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->first)) {
+ return ' first';
+ }
+ }
+
+ /**
+ * Get the SQL for an "after" column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyAfter(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->after)) {
+ return ' after '.$this->wrap($column->after);
+ }
+ }
+
+ /**
+ * Get the SQL for a "comment" column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyComment(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->comment)) {
+ return ' comment "'.$column->comment.'"';
+ }
+ }
+
+ /**
+ * Wrap a single string in keyword identifiers.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function wrapValue($value)
+ {
+ if ($value === '*') {
+ return $value;
+ }
+
+ return '`'.str_replace('`', '``', $value).'`';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
index b24d99d..aad33f1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
@@ -1,544 +1,568 @@
-getColumns($blueprint));
-
- return 'create table '.$this->wrapTable($blueprint)." ($columns)";
- }
-
- /**
- * Compile a create table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileAdd(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- $columns = $this->prefixArray('add column', $this->getColumns($blueprint));
-
- return 'alter table '.$table.' '.implode(', ', $columns);
- }
-
- /**
- * Compile a primary key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compilePrimary(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->columnize($command->columns);
-
- return 'alter table '.$this->wrapTable($blueprint)." add primary key ({$columns})";
- }
-
- /**
- * Compile a unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileUnique(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- $columns = $this->columnize($command->columns);
-
- return "alter table $table add constraint {$command->index} unique ($columns)";
- }
-
- /**
- * Compile a plain index key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileIndex(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->columnize($command->columns);
-
- return "create index {$command->index} on ".$this->wrapTable($blueprint)." ({$columns})";
- }
-
- /**
- * Compile a drop table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDrop(Blueprint $blueprint, Fluent $command)
- {
- return 'drop table '.$this->wrapTable($blueprint);
- }
-
- /**
- * Compile a drop table (if exists) command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
- {
- return 'drop table if exists '.$this->wrapTable($blueprint);
- }
-
- /**
- * Compile a drop column command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropColumn(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->prefixArray('drop column', $this->wrapArray($command->columns));
-
- $table = $this->wrapTable($blueprint);
-
- return 'alter table '.$table.' '.implode(', ', $columns);
- }
-
- /**
- * Compile a drop primary key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
- {
- $table = $blueprint->getTable();
-
- return 'alter table '.$this->wrapTable($blueprint)." drop constraint {$table}_pkey";
- }
-
- /**
- * Compile a drop unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropUnique(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} drop constraint {$command->index}";
- }
-
- /**
- * Compile a drop index command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIndex(Blueprint $blueprint, Fluent $command)
- {
- return "drop index {$command->index}";
- }
-
- /**
- * Compile a drop foreign key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropForeign(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} drop constraint {$command->index}";
- }
-
- /**
- * Compile a rename table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileRename(Blueprint $blueprint, Fluent $command)
- {
- $from = $this->wrapTable($blueprint);
-
- return "alter table {$from} rename to ".$this->wrapTable($command->to);
- }
-
- /**
- * Create the column definition for a char type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeChar(Fluent $column)
- {
- return "char({$column->length})";
- }
-
- /**
- * Create the column definition for a string type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeString(Fluent $column)
- {
- return "varchar({$column->length})";
- }
-
- /**
- * Create the column definition for a text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeText(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a medium text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumText(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a long text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeLongText(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeInteger(Fluent $column)
- {
- return $column->autoIncrement ? 'serial' : 'integer';
- }
-
- /**
- * Create the column definition for a big integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBigInteger(Fluent $column)
- {
- return $column->autoIncrement ? 'bigserial' : 'bigint';
- }
-
- /**
- * Create the column definition for a medium integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumInteger(Fluent $column)
- {
- return $column->autoIncrement ? 'serial' : 'integer';
- }
-
- /**
- * Create the column definition for a tiny integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTinyInteger(Fluent $column)
- {
- return $column->autoIncrement ? 'smallserial' : 'smallint';
- }
-
- /**
- * Create the column definition for a small integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeSmallInteger(Fluent $column)
- {
- return $column->autoIncrement ? 'smallserial' : 'smallint';
- }
-
- /**
- * Create the column definition for a float type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeFloat(Fluent $column)
- {
- return $this->typeDouble($column);
- }
-
- /**
- * Create the column definition for a double type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDouble(Fluent $column)
- {
- return 'double precision';
- }
-
- /**
- * Create the column definition for a decimal type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDecimal(Fluent $column)
- {
- return "decimal({$column->total}, {$column->places})";
- }
-
- /**
- * Create the column definition for a boolean type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBoolean(Fluent $column)
- {
- return 'boolean';
- }
-
- /**
- * Create the column definition for an enum type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeEnum(Fluent $column)
- {
- $allowed = array_map(function($a) { return "'".$a."'"; }, $column->allowed);
-
- return "varchar(255) check (\"{$column->name}\" in (".implode(', ', $allowed)."))";
- }
-
- /**
- * Create the column definition for a json type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJson(Fluent $column)
- {
- return "json";
- }
-
- /**
- * Create the column definition for a jsonb type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJsonb(Fluent $column)
- {
- return "jsonb";
- }
-
- /**
- * Create the column definition for a date type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDate(Fluent $column)
- {
- return 'date';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTime(Fluent $column)
- {
- return 'timestamp(0) without time zone';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTimeTz(Fluent $column)
- {
- return 'timestamp(0) with time zone';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTime(Fluent $column)
- {
- return 'time(0) without time zone';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimeTz(Fluent $column)
- {
- return 'time(0) with time zone';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestamp(Fluent $column)
- {
- return 'timestamp(0) without time zone';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestampTz(Fluent $column)
- {
- return 'timestamp(0) with time zone';
- }
-
- /**
- * Create the column definition for a binary type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBinary(Fluent $column)
- {
- return 'bytea';
- }
-
- /**
- * Get the SQL for a nullable column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyNullable(Blueprint $blueprint, Fluent $column)
- {
- return $column->nullable ? ' null' : ' not null';
- }
-
- /**
- * Get the SQL for a default column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyDefault(Blueprint $blueprint, Fluent $column)
- {
- if ( ! is_null($column->default))
- {
- return " default ".$this->getDefaultValue($column->default);
- }
- }
-
- /**
- * Get the SQL for an auto-increment column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
- {
- if (in_array($column->type, $this->serials) && $column->autoIncrement)
- {
- return ' primary key';
- }
- }
-
+class PostgresGrammar extends Grammar
+{
+ /**
+ * The possible column modifiers.
+ *
+ * @var array
+ */
+ protected $modifiers = ['Increment', 'Nullable', 'Default'];
+
+ /**
+ * The columns available as serials.
+ *
+ * @var array
+ */
+ protected $serials = ['bigInteger', 'integer', 'mediumInteger', 'smallInteger', 'tinyInteger'];
+
+ /**
+ * Compile the query to determine if a table exists.
+ *
+ * @return string
+ */
+ public function compileTableExists()
+ {
+ return 'select * from information_schema.tables where table_schema = ? and table_name = ?';
+ }
+
+ /**
+ * Compile the query to determine the list of columns.
+ *
+ * @param string $table
+ * @return string
+ */
+ public function compileColumnExists($table)
+ {
+ return "select column_name from information_schema.columns where table_name = '$table'";
+ }
+
+ /**
+ * Compile a create table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileCreate(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = implode(', ', $this->getColumns($blueprint));
+
+ $sql = $blueprint->temporary ? 'create temporary' : 'create';
+
+ $sql .= ' table '.$this->wrapTable($blueprint)." ($columns)";
+
+ return $sql;
+ }
+
+ /**
+ * Compile a create table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileAdd(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ $columns = $this->prefixArray('add column', $this->getColumns($blueprint));
+
+ return 'alter table '.$table.' '.implode(', ', $columns);
+ }
+
+ /**
+ * Compile a primary key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compilePrimary(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->columnize($command->columns);
+
+ return 'alter table '.$this->wrapTable($blueprint)." add primary key ({$columns})";
+ }
+
+ /**
+ * Compile a unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileUnique(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ $columns = $this->columnize($command->columns);
+
+ return "alter table $table add constraint {$command->index} unique ($columns)";
+ }
+
+ /**
+ * Compile a plain index key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileIndex(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->columnize($command->columns);
+
+ return "create index {$command->index} on ".$this->wrapTable($blueprint)." ({$columns})";
+ }
+
+ /**
+ * Compile a drop table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDrop(Blueprint $blueprint, Fluent $command)
+ {
+ return 'drop table '.$this->wrapTable($blueprint);
+ }
+
+ /**
+ * Compile a drop table (if exists) command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
+ {
+ return 'drop table if exists '.$this->wrapTable($blueprint);
+ }
+
+ /**
+ * Compile a drop column command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropColumn(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->prefixArray('drop column', $this->wrapArray($command->columns));
+
+ $table = $this->wrapTable($blueprint);
+
+ return 'alter table '.$table.' '.implode(', ', $columns);
+ }
+
+ /**
+ * Compile a drop primary key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $blueprint->getTable();
+
+ return 'alter table '.$this->wrapTable($blueprint)." drop constraint {$table}_pkey";
+ }
+
+ /**
+ * Compile a drop unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropUnique(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} drop constraint {$command->index}";
+ }
+
+ /**
+ * Compile a drop index command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
+ {
+ return "drop index {$command->index}";
+ }
+
+ /**
+ * Compile a drop foreign key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropForeign(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} drop constraint {$command->index}";
+ }
+
+ /**
+ * Compile a rename table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileRename(Blueprint $blueprint, Fluent $command)
+ {
+ $from = $this->wrapTable($blueprint);
+
+ return "alter table {$from} rename to ".$this->wrapTable($command->to);
+ }
+
+ /**
+ * Create the column definition for a char type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeChar(Fluent $column)
+ {
+ return "char({$column->length})";
+ }
+
+ /**
+ * Create the column definition for a string type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeString(Fluent $column)
+ {
+ return "varchar({$column->length})";
+ }
+
+ /**
+ * Create the column definition for a text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeText(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a medium text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumText(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a long text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeLongText(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeInteger(Fluent $column)
+ {
+ return $column->autoIncrement ? 'serial' : 'integer';
+ }
+
+ /**
+ * Create the column definition for a big integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBigInteger(Fluent $column)
+ {
+ return $column->autoIncrement ? 'bigserial' : 'bigint';
+ }
+
+ /**
+ * Create the column definition for a medium integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumInteger(Fluent $column)
+ {
+ return $column->autoIncrement ? 'serial' : 'integer';
+ }
+
+ /**
+ * Create the column definition for a tiny integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTinyInteger(Fluent $column)
+ {
+ return $column->autoIncrement ? 'smallserial' : 'smallint';
+ }
+
+ /**
+ * Create the column definition for a small integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeSmallInteger(Fluent $column)
+ {
+ return $column->autoIncrement ? 'smallserial' : 'smallint';
+ }
+
+ /**
+ * Create the column definition for a float type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeFloat(Fluent $column)
+ {
+ return $this->typeDouble($column);
+ }
+
+ /**
+ * Create the column definition for a double type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDouble(Fluent $column)
+ {
+ return 'double precision';
+ }
+
+ /**
+ * Create the column definition for a decimal type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDecimal(Fluent $column)
+ {
+ return "decimal({$column->total}, {$column->places})";
+ }
+
+ /**
+ * Create the column definition for a boolean type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBoolean(Fluent $column)
+ {
+ return 'boolean';
+ }
+
+ /**
+ * Create the column definition for an enum type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeEnum(Fluent $column)
+ {
+ $allowed = array_map(function ($a) {
+ return "'".$a."'";
+ }, $column->allowed);
+
+ return "varchar(255) check (\"{$column->name}\" in (".implode(', ', $allowed).'))';
+ }
+
+ /**
+ * Create the column definition for a json type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJson(Fluent $column)
+ {
+ return 'json';
+ }
+
+ /**
+ * Create the column definition for a jsonb type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJsonb(Fluent $column)
+ {
+ return 'jsonb';
+ }
+
+ /**
+ * Create the column definition for a date type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDate(Fluent $column)
+ {
+ return 'date';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTime(Fluent $column)
+ {
+ return 'timestamp(0) without time zone';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTimeTz(Fluent $column)
+ {
+ return 'timestamp(0) with time zone';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTime(Fluent $column)
+ {
+ return 'time(0) without time zone';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimeTz(Fluent $column)
+ {
+ return 'time(0) with time zone';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestamp(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'timestamp(0) without time zone default CURRENT_TIMESTAMP(0)';
+ }
+
+ return 'timestamp(0) without time zone';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestampTz(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'timestamp(0) with time zone default CURRENT_TIMESTAMP(0)';
+ }
+
+ return 'timestamp(0) with time zone';
+ }
+
+ /**
+ * Create the column definition for a binary type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBinary(Fluent $column)
+ {
+ return 'bytea';
+ }
+
+ /**
+ * Create the column definition for a uuid type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeUuid(Fluent $column)
+ {
+ return 'uuid';
+ }
+
+ /**
+ * Get the SQL for a nullable column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyNullable(Blueprint $blueprint, Fluent $column)
+ {
+ return $column->nullable ? ' null' : ' not null';
+ }
+
+ /**
+ * Get the SQL for a default column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->default)) {
+ return ' default '.$this->getDefaultValue($column->default);
+ }
+ }
+
+ /**
+ * Get the SQL for an auto-increment column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
+ {
+ if (in_array($column->type, $this->serials) && $column->autoIncrement) {
+ return ' primary key';
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
index 25daa74..a257de7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
@@ -1,611 +1,625 @@
-getColumns($blueprint));
-
- $sql = 'create table '.$this->wrapTable($blueprint)." ($columns";
-
- // SQLite forces primary keys to be added when the table is initially created
- // so we will need to check for a primary key commands and add the columns
- // to the table's declaration here so they can be created on the tables.
- $sql .= (string) $this->addForeignKeys($blueprint);
-
- $sql .= (string) $this->addPrimaryKeys($blueprint);
-
- return $sql.')';
- }
-
- /**
- * Get the foreign key syntax for a table creation statement.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @return string|null
- */
- protected function addForeignKeys(Blueprint $blueprint)
- {
- $sql = '';
-
- $foreigns = $this->getCommandsByName($blueprint, 'foreign');
-
- // Once we have all the foreign key commands for the table creation statement
- // we'll loop through each of them and add them to the create table SQL we
- // are building, since SQLite needs foreign keys on the tables creation.
- foreach ($foreigns as $foreign)
- {
- $sql .= $this->getForeignKey($foreign);
-
- if ( ! is_null($foreign->onDelete))
- {
- $sql .= " on delete {$foreign->onDelete}";
- }
-
- if ( ! is_null($foreign->onUpdate))
- {
- $sql .= " on update {$foreign->onUpdate}";
- }
- }
-
- return $sql;
- }
-
- /**
- * Get the SQL for the foreign key.
- *
- * @param \Illuminate\Support\Fluent $foreign
- * @return string
- */
- protected function getForeignKey($foreign)
- {
- $on = $this->wrapTable($foreign->on);
-
- // We need to columnize the columns that the foreign key is being defined for
- // so that it is a properly formatted list. Once we have done this, we can
- // return the foreign key SQL declaration to the calling method for use.
- $columns = $this->columnize($foreign->columns);
-
- $onColumns = $this->columnize((array) $foreign->references);
-
- return ", foreign key($columns) references $on($onColumns)";
- }
-
- /**
- * Get the primary key syntax for a table creation statement.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @return string|null
- */
- protected function addPrimaryKeys(Blueprint $blueprint)
- {
- $primary = $this->getCommandByName($blueprint, 'primary');
-
- if ( ! is_null($primary))
- {
- $columns = $this->columnize($primary->columns);
-
- return ", primary key ({$columns})";
- }
- }
-
- /**
- * Compile alter table commands for adding columns.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return array
- */
- public function compileAdd(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- $columns = $this->prefixArray('add column', $this->getColumns($blueprint));
-
- $statements = array();
-
- foreach ($columns as $column)
- {
- $statements[] = 'alter table '.$table.' '.$column;
- }
-
- return $statements;
- }
-
- /**
- * Compile a unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileUnique(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->columnize($command->columns);
-
- $table = $this->wrapTable($blueprint);
-
- return "create unique index {$command->index} on {$table} ({$columns})";
- }
-
- /**
- * Compile a plain index key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileIndex(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->columnize($command->columns);
-
- $table = $this->wrapTable($blueprint);
-
- return "create index {$command->index} on {$table} ({$columns})";
- }
-
- /**
- * Compile a foreign key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileForeign(Blueprint $blueprint, Fluent $command)
- {
- // Handled on table creation...
- }
-
- /**
- * Compile a drop table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDrop(Blueprint $blueprint, Fluent $command)
- {
- return 'drop table '.$this->wrapTable($blueprint);
- }
-
- /**
- * Compile a drop table (if exists) command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
- {
- return 'drop table if exists '.$this->wrapTable($blueprint);
- }
-
- /**
- * Compile a drop column command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @param \Illuminate\Database\Connection $connection
- * @return array
- */
- public function compileDropColumn(Blueprint $blueprint, Fluent $command, Connection $connection)
- {
- $schema = $connection->getDoctrineSchemaManager();
-
- $tableDiff = $this->getDoctrineTableDiff($blueprint, $schema);
-
- foreach ($command->columns as $name)
- {
- $column = $connection->getDoctrineColumn($blueprint->getTable(), $name);
-
- $tableDiff->removedColumns[$name] = $column;
- }
-
- return (array) $schema->getDatabasePlatform()->getAlterTableSQL($tableDiff);
- }
-
- /**
- * Compile a drop unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropUnique(Blueprint $blueprint, Fluent $command)
- {
- return "drop index {$command->index}";
- }
-
- /**
- * Compile a drop index command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIndex(Blueprint $blueprint, Fluent $command)
- {
- return "drop index {$command->index}";
- }
-
- /**
- * Compile a rename table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileRename(Blueprint $blueprint, Fluent $command)
- {
- $from = $this->wrapTable($blueprint);
-
- return "alter table {$from} rename to ".$this->wrapTable($command->to);
- }
-
- /**
- * Create the column definition for a char type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeChar(Fluent $column)
- {
- return 'varchar';
- }
-
- /**
- * Create the column definition for a string type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeString(Fluent $column)
- {
- return 'varchar';
- }
-
- /**
- * Create the column definition for a text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeText(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a medium text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumText(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a long text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeLongText(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeInteger(Fluent $column)
- {
- return 'integer';
- }
-
- /**
- * Create the column definition for a big integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBigInteger(Fluent $column)
- {
- return 'integer';
- }
-
- /**
- * Create the column definition for a medium integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumInteger(Fluent $column)
- {
- return 'integer';
- }
-
- /**
- * Create the column definition for a tiny integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTinyInteger(Fluent $column)
- {
- return 'integer';
- }
-
- /**
- * Create the column definition for a small integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeSmallInteger(Fluent $column)
- {
- return 'integer';
- }
-
- /**
- * Create the column definition for a float type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeFloat(Fluent $column)
- {
- return 'float';
- }
-
- /**
- * Create the column definition for a double type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDouble(Fluent $column)
- {
- return 'float';
- }
-
- /**
- * Create the column definition for a decimal type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDecimal(Fluent $column)
- {
- return 'numeric';
- }
-
- /**
- * Create the column definition for a boolean type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBoolean(Fluent $column)
- {
- return 'tinyint';
- }
-
- /**
- * Create the column definition for an enum type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeEnum(Fluent $column)
- {
- return 'varchar';
- }
-
- /**
- * Create the column definition for a json type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJson(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a jsonb type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJsonb(Fluent $column)
- {
- return 'text';
- }
-
- /**
- * Create the column definition for a date type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDate(Fluent $column)
- {
- return 'date';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTime(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * Note: "SQLite does not have a storage class set aside for storing dates and/or times."
- * @link https://www.sqlite.org/datatype3.html
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTimeTz(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTime(Fluent $column)
- {
- return 'time';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimeTz(Fluent $column)
- {
- return 'time';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestamp(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestampTz(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a binary type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBinary(Fluent $column)
- {
- return 'blob';
- }
-
- /**
- * Get the SQL for a nullable column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyNullable(Blueprint $blueprint, Fluent $column)
- {
- return $column->nullable ? ' null' : ' not null';
- }
-
- /**
- * Get the SQL for a default column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyDefault(Blueprint $blueprint, Fluent $column)
- {
- if ( ! is_null($column->default))
- {
- return " default ".$this->getDefaultValue($column->default);
- }
- }
-
- /**
- * Get the SQL for an auto-increment column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
- {
- if (in_array($column->type, $this->serials) && $column->autoIncrement)
- {
- return ' primary key autoincrement';
- }
- }
-
+class SQLiteGrammar extends Grammar
+{
+ /**
+ * The possible column modifiers.
+ *
+ * @var array
+ */
+ protected $modifiers = ['Nullable', 'Default', 'Increment'];
+
+ /**
+ * The columns available as serials.
+ *
+ * @var array
+ */
+ protected $serials = ['bigInteger', 'integer', 'mediumInteger', 'smallInteger', 'tinyInteger'];
+
+ /**
+ * Compile the query to determine if a table exists.
+ *
+ * @return string
+ */
+ public function compileTableExists()
+ {
+ return "select * from sqlite_master where type = 'table' and name = ?";
+ }
+
+ /**
+ * Compile the query to determine the list of columns.
+ *
+ * @param string $table
+ * @return string
+ */
+ public function compileColumnExists($table)
+ {
+ return 'pragma table_info('.str_replace('.', '__', $table).')';
+ }
+
+ /**
+ * Compile a create table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileCreate(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = implode(', ', $this->getColumns($blueprint));
+
+ $sql = $blueprint->temporary ? 'create temporary' : 'create';
+
+ $sql .= ' table '.$this->wrapTable($blueprint)." ($columns";
+
+ // SQLite forces primary keys to be added when the table is initially created
+ // so we will need to check for a primary key commands and add the columns
+ // to the table's declaration here so they can be created on the tables.
+ $sql .= (string) $this->addForeignKeys($blueprint);
+
+ $sql .= (string) $this->addPrimaryKeys($blueprint);
+
+ return $sql.')';
+ }
+
+ /**
+ * Get the foreign key syntax for a table creation statement.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @return string|null
+ */
+ protected function addForeignKeys(Blueprint $blueprint)
+ {
+ $sql = '';
+
+ $foreigns = $this->getCommandsByName($blueprint, 'foreign');
+
+ // Once we have all the foreign key commands for the table creation statement
+ // we'll loop through each of them and add them to the create table SQL we
+ // are building, since SQLite needs foreign keys on the tables creation.
+ foreach ($foreigns as $foreign) {
+ $sql .= $this->getForeignKey($foreign);
+
+ if (! is_null($foreign->onDelete)) {
+ $sql .= " on delete {$foreign->onDelete}";
+ }
+
+ if (! is_null($foreign->onUpdate)) {
+ $sql .= " on update {$foreign->onUpdate}";
+ }
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Get the SQL for the foreign key.
+ *
+ * @param \Illuminate\Support\Fluent $foreign
+ * @return string
+ */
+ protected function getForeignKey($foreign)
+ {
+ $on = $this->wrapTable($foreign->on);
+
+ // We need to columnize the columns that the foreign key is being defined for
+ // so that it is a properly formatted list. Once we have done this, we can
+ // return the foreign key SQL declaration to the calling method for use.
+ $columns = $this->columnize($foreign->columns);
+
+ $onColumns = $this->columnize((array) $foreign->references);
+
+ return ", foreign key($columns) references $on($onColumns)";
+ }
+
+ /**
+ * Get the primary key syntax for a table creation statement.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @return string|null
+ */
+ protected function addPrimaryKeys(Blueprint $blueprint)
+ {
+ $primary = $this->getCommandByName($blueprint, 'primary');
+
+ if (! is_null($primary)) {
+ $columns = $this->columnize($primary->columns);
+
+ return ", primary key ({$columns})";
+ }
+ }
+
+ /**
+ * Compile alter table commands for adding columns.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return array
+ */
+ public function compileAdd(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ $columns = $this->prefixArray('add column', $this->getColumns($blueprint));
+
+ $statements = [];
+
+ foreach ($columns as $column) {
+ $statements[] = 'alter table '.$table.' '.$column;
+ }
+
+ return $statements;
+ }
+
+ /**
+ * Compile a unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileUnique(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->columnize($command->columns);
+
+ $table = $this->wrapTable($blueprint);
+
+ return "create unique index {$command->index} on {$table} ({$columns})";
+ }
+
+ /**
+ * Compile a plain index key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileIndex(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->columnize($command->columns);
+
+ $table = $this->wrapTable($blueprint);
+
+ return "create index {$command->index} on {$table} ({$columns})";
+ }
+
+ /**
+ * Compile a foreign key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileForeign(Blueprint $blueprint, Fluent $command)
+ {
+ // Handled on table creation...
+ }
+
+ /**
+ * Compile a drop table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDrop(Blueprint $blueprint, Fluent $command)
+ {
+ return 'drop table '.$this->wrapTable($blueprint);
+ }
+
+ /**
+ * Compile a drop table (if exists) command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
+ {
+ return 'drop table if exists '.$this->wrapTable($blueprint);
+ }
+
+ /**
+ * Compile a drop column command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @param \Illuminate\Database\Connection $connection
+ * @return array
+ */
+ public function compileDropColumn(Blueprint $blueprint, Fluent $command, Connection $connection)
+ {
+ $schema = $connection->getDoctrineSchemaManager();
+
+ $tableDiff = $this->getDoctrineTableDiff($blueprint, $schema);
+
+ foreach ($command->columns as $name) {
+ $column = $connection->getDoctrineColumn($blueprint->getTable(), $name);
+
+ $tableDiff->removedColumns[$name] = $column;
+ }
+
+ return (array) $schema->getDatabasePlatform()->getAlterTableSQL($tableDiff);
+ }
+
+ /**
+ * Compile a drop unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropUnique(Blueprint $blueprint, Fluent $command)
+ {
+ return "drop index {$command->index}";
+ }
+
+ /**
+ * Compile a drop index command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
+ {
+ return "drop index {$command->index}";
+ }
+
+ /**
+ * Compile a rename table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileRename(Blueprint $blueprint, Fluent $command)
+ {
+ $from = $this->wrapTable($blueprint);
+
+ return "alter table {$from} rename to ".$this->wrapTable($command->to);
+ }
+
+ /**
+ * Create the column definition for a char type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeChar(Fluent $column)
+ {
+ return 'varchar';
+ }
+
+ /**
+ * Create the column definition for a string type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeString(Fluent $column)
+ {
+ return 'varchar';
+ }
+
+ /**
+ * Create the column definition for a text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeText(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a medium text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumText(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a long text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeLongText(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeInteger(Fluent $column)
+ {
+ return 'integer';
+ }
+
+ /**
+ * Create the column definition for a big integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBigInteger(Fluent $column)
+ {
+ return 'integer';
+ }
+
+ /**
+ * Create the column definition for a medium integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumInteger(Fluent $column)
+ {
+ return 'integer';
+ }
+
+ /**
+ * Create the column definition for a tiny integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTinyInteger(Fluent $column)
+ {
+ return 'integer';
+ }
+
+ /**
+ * Create the column definition for a small integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeSmallInteger(Fluent $column)
+ {
+ return 'integer';
+ }
+
+ /**
+ * Create the column definition for a float type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeFloat(Fluent $column)
+ {
+ return 'float';
+ }
+
+ /**
+ * Create the column definition for a double type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDouble(Fluent $column)
+ {
+ return 'float';
+ }
+
+ /**
+ * Create the column definition for a decimal type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDecimal(Fluent $column)
+ {
+ return 'numeric';
+ }
+
+ /**
+ * Create the column definition for a boolean type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBoolean(Fluent $column)
+ {
+ return 'tinyint(1)';
+ }
+
+ /**
+ * Create the column definition for an enum type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeEnum(Fluent $column)
+ {
+ return 'varchar';
+ }
+
+ /**
+ * Create the column definition for a json type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJson(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a jsonb type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJsonb(Fluent $column)
+ {
+ return 'text';
+ }
+
+ /**
+ * Create the column definition for a date type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDate(Fluent $column)
+ {
+ return 'date';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTime(Fluent $column)
+ {
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * Note: "SQLite does not have a storage class set aside for storing dates and/or times."
+ * @link https://www.sqlite.org/datatype3.html
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTimeTz(Fluent $column)
+ {
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTime(Fluent $column)
+ {
+ return 'time';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimeTz(Fluent $column)
+ {
+ return 'time';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestamp(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'datetime default CURRENT_TIMESTAMP';
+ }
+
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestampTz(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'datetime default CURRENT_TIMESTAMP';
+ }
+
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a binary type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBinary(Fluent $column)
+ {
+ return 'blob';
+ }
+
+ /**
+ * Create the column definition for a uuid type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeUuid(Fluent $column)
+ {
+ return 'varchar';
+ }
+
+ /**
+ * Get the SQL for a nullable column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyNullable(Blueprint $blueprint, Fluent $column)
+ {
+ return $column->nullable ? ' null' : ' not null';
+ }
+
+ /**
+ * Get the SQL for a default column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->default)) {
+ return ' default '.$this->getDefaultValue($column->default);
+ }
+ }
+
+ /**
+ * Get the SQL for an auto-increment column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
+ {
+ if (in_array($column->type, $this->serials) && $column->autoIncrement) {
+ return ' primary key autoincrement';
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
index 49f94f1..ba5d245 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -1,552 +1,570 @@
-getColumns($blueprint));
-
- return 'create table '.$this->wrapTable($blueprint)." ($columns)";
- }
-
- /**
- * Compile a create table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileAdd(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- $columns = $this->getColumns($blueprint);
-
- return 'alter table '.$table.' add '.implode(', ', $columns);
- }
-
- /**
- * Compile a primary key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compilePrimary(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->columnize($command->columns);
-
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} add constraint {$command->index} primary key ({$columns})";
- }
-
- /**
- * Compile a unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileUnique(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->columnize($command->columns);
-
- $table = $this->wrapTable($blueprint);
-
- return "create unique index {$command->index} on {$table} ({$columns})";
- }
-
- /**
- * Compile a plain index key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileIndex(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->columnize($command->columns);
-
- $table = $this->wrapTable($blueprint);
-
- return "create index {$command->index} on {$table} ({$columns})";
- }
-
- /**
- * Compile a drop table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDrop(Blueprint $blueprint, Fluent $command)
- {
- return 'drop table '.$this->wrapTable($blueprint);
- }
-
- /**
- * Compile a drop table (if exists) command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
- {
- return 'if exists (select * from INFORMATION_SCHEMA.TABLES where TABLE_NAME = \''.$blueprint->getTable().'\') drop table '.$blueprint->getTable();
- }
-
- /**
- * Compile a drop column command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropColumn(Blueprint $blueprint, Fluent $command)
- {
- $columns = $this->wrapArray($command->columns);
-
- $table = $this->wrapTable($blueprint);
-
- return 'alter table '.$table.' drop column '.implode(', ', $columns);
- }
-
- /**
- * Compile a drop primary key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} drop constraint {$command->index}";
- }
-
- /**
- * Compile a drop unique key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropUnique(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "drop index {$command->index} on {$table}";
- }
-
- /**
- * Compile a drop index command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropIndex(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "drop index {$command->index} on {$table}";
- }
-
- /**
- * Compile a drop foreign key command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileDropForeign(Blueprint $blueprint, Fluent $command)
- {
- $table = $this->wrapTable($blueprint);
-
- return "alter table {$table} drop constraint {$command->index}";
- }
-
- /**
- * Compile a rename table command.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $command
- * @return string
- */
- public function compileRename(Blueprint $blueprint, Fluent $command)
- {
- $from = $this->wrapTable($blueprint);
-
- return "sp_rename {$from}, ".$this->wrapTable($command->to);
- }
-
- /**
- * Create the column definition for a char type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeChar(Fluent $column)
- {
- return "nchar({$column->length})";
- }
-
- /**
- * Create the column definition for a string type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeString(Fluent $column)
- {
- return "nvarchar({$column->length})";
- }
-
- /**
- * Create the column definition for a text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeText(Fluent $column)
- {
- return 'nvarchar(max)';
- }
-
- /**
- * Create the column definition for a medium text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumText(Fluent $column)
- {
- return 'nvarchar(max)';
- }
-
- /**
- * Create the column definition for a long text type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeLongText(Fluent $column)
- {
- return 'nvarchar(max)';
- }
-
- /**
- * Create the column definition for a integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeInteger(Fluent $column)
- {
- return 'int';
- }
-
- /**
- * Create the column definition for a big integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBigInteger(Fluent $column)
- {
- return 'bigint';
- }
-
- /**
- * Create the column definition for a medium integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeMediumInteger(Fluent $column)
- {
- return 'int';
- }
-
- /**
- * Create the column definition for a tiny integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTinyInteger(Fluent $column)
- {
- return 'tinyint';
- }
-
- /**
- * Create the column definition for a small integer type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeSmallInteger(Fluent $column)
- {
- return 'smallint';
- }
-
- /**
- * Create the column definition for a float type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeFloat(Fluent $column)
- {
- return 'float';
- }
-
- /**
- * Create the column definition for a double type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDouble(Fluent $column)
- {
- return 'float';
- }
-
- /**
- * Create the column definition for a decimal type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDecimal(Fluent $column)
- {
- return "decimal({$column->total}, {$column->places})";
- }
-
- /**
- * Create the column definition for a boolean type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBoolean(Fluent $column)
- {
- return 'bit';
- }
-
- /**
- * Create the column definition for an enum type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeEnum(Fluent $column)
- {
- return 'nvarchar(255)';
- }
-
- /**
- * Create the column definition for a json type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJson(Fluent $column)
- {
- return 'nvarchar(max)';
- }
-
- /**
- * Create the column definition for a jsonb type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeJsonb(Fluent $column)
- {
- return 'nvarchar(max)';
- }
-
- /**
- * Create the column definition for a date type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDate(Fluent $column)
- {
- return 'date';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTime(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a date-time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeDateTimeTz(Fluent $column)
- {
- return 'datetimeoffset(0)';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTime(Fluent $column)
- {
- return 'time';
- }
-
- /**
- * Create the column definition for a time type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimeTz(Fluent $column)
- {
- return 'time';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestamp(Fluent $column)
- {
- return 'datetime';
- }
-
- /**
- * Create the column definition for a timestamp type.
- *
- * @link https://msdn.microsoft.com/en-us/library/bb630289(v=sql.120).aspx
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeTimestampTz(Fluent $column)
- {
- return 'datetimeoffset(0)';
- }
-
- /**
- * Create the column definition for a binary type.
- *
- * @param \Illuminate\Support\Fluent $column
- * @return string
- */
- protected function typeBinary(Fluent $column)
- {
- return 'varbinary(max)';
- }
-
- /**
- * Get the SQL for a nullable column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyNullable(Blueprint $blueprint, Fluent $column)
- {
- return $column->nullable ? ' null' : ' not null';
- }
-
- /**
- * Get the SQL for a default column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyDefault(Blueprint $blueprint, Fluent $column)
- {
- if ( ! is_null($column->default))
- {
- return " default ".$this->getDefaultValue($column->default);
- }
- }
-
- /**
- * Get the SQL for an auto-increment column modifier.
- *
- * @param \Illuminate\Database\Schema\Blueprint $blueprint
- * @param \Illuminate\Support\Fluent $column
- * @return string|null
- */
- protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
- {
- if (in_array($column->type, $this->serials) && $column->autoIncrement)
- {
- return ' identity primary key';
- }
- }
-
+ }
+
+ /**
+ * Compile a create table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileCreate(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = implode(', ', $this->getColumns($blueprint));
+
+ return 'create table '.$this->wrapTable($blueprint)." ($columns)";
+ }
+
+ /**
+ * Compile a create table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileAdd(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ $columns = $this->getColumns($blueprint);
+
+ return 'alter table '.$table.' add '.implode(', ', $columns);
+ }
+
+ /**
+ * Compile a primary key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compilePrimary(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->columnize($command->columns);
+
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} add constraint {$command->index} primary key ({$columns})";
+ }
+
+ /**
+ * Compile a unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileUnique(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->columnize($command->columns);
+
+ $table = $this->wrapTable($blueprint);
+
+ return "create unique index {$command->index} on {$table} ({$columns})";
+ }
+
+ /**
+ * Compile a plain index key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileIndex(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->columnize($command->columns);
+
+ $table = $this->wrapTable($blueprint);
+
+ return "create index {$command->index} on {$table} ({$columns})";
+ }
+
+ /**
+ * Compile a drop table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDrop(Blueprint $blueprint, Fluent $command)
+ {
+ return 'drop table '.$this->wrapTable($blueprint);
+ }
+
+ /**
+ * Compile a drop table (if exists) command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
+ {
+ return 'if exists (select * from INFORMATION_SCHEMA.TABLES where TABLE_NAME = \''.$blueprint->getTable().'\') drop table '.$blueprint->getTable();
+ }
+
+ /**
+ * Compile a drop column command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropColumn(Blueprint $blueprint, Fluent $command)
+ {
+ $columns = $this->wrapArray($command->columns);
+
+ $table = $this->wrapTable($blueprint);
+
+ return 'alter table '.$table.' drop column '.implode(', ', $columns);
+ }
+
+ /**
+ * Compile a drop primary key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropPrimary(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} drop constraint {$command->index}";
+ }
+
+ /**
+ * Compile a drop unique key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropUnique(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "drop index {$command->index} on {$table}";
+ }
+
+ /**
+ * Compile a drop index command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropIndex(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "drop index {$command->index} on {$table}";
+ }
+
+ /**
+ * Compile a drop foreign key command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileDropForeign(Blueprint $blueprint, Fluent $command)
+ {
+ $table = $this->wrapTable($blueprint);
+
+ return "alter table {$table} drop constraint {$command->index}";
+ }
+
+ /**
+ * Compile a rename table command.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $command
+ * @return string
+ */
+ public function compileRename(Blueprint $blueprint, Fluent $command)
+ {
+ $from = $this->wrapTable($blueprint);
+
+ return "sp_rename {$from}, ".$this->wrapTable($command->to);
+ }
+
+ /**
+ * Create the column definition for a char type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeChar(Fluent $column)
+ {
+ return "nchar({$column->length})";
+ }
+
+ /**
+ * Create the column definition for a string type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeString(Fluent $column)
+ {
+ return "nvarchar({$column->length})";
+ }
+
+ /**
+ * Create the column definition for a text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeText(Fluent $column)
+ {
+ return 'nvarchar(max)';
+ }
+
+ /**
+ * Create the column definition for a medium text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumText(Fluent $column)
+ {
+ return 'nvarchar(max)';
+ }
+
+ /**
+ * Create the column definition for a long text type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeLongText(Fluent $column)
+ {
+ return 'nvarchar(max)';
+ }
+
+ /**
+ * Create the column definition for a integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeInteger(Fluent $column)
+ {
+ return 'int';
+ }
+
+ /**
+ * Create the column definition for a big integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBigInteger(Fluent $column)
+ {
+ return 'bigint';
+ }
+
+ /**
+ * Create the column definition for a medium integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMediumInteger(Fluent $column)
+ {
+ return 'int';
+ }
+
+ /**
+ * Create the column definition for a tiny integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTinyInteger(Fluent $column)
+ {
+ return 'tinyint';
+ }
+
+ /**
+ * Create the column definition for a small integer type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeSmallInteger(Fluent $column)
+ {
+ return 'smallint';
+ }
+
+ /**
+ * Create the column definition for a float type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeFloat(Fluent $column)
+ {
+ return 'float';
+ }
+
+ /**
+ * Create the column definition for a double type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDouble(Fluent $column)
+ {
+ return 'float';
+ }
+
+ /**
+ * Create the column definition for a decimal type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDecimal(Fluent $column)
+ {
+ return "decimal({$column->total}, {$column->places})";
+ }
+
+ /**
+ * Create the column definition for a boolean type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBoolean(Fluent $column)
+ {
+ return 'bit';
+ }
+
+ /**
+ * Create the column definition for an enum type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeEnum(Fluent $column)
+ {
+ return 'nvarchar(255)';
+ }
+
+ /**
+ * Create the column definition for a json type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJson(Fluent $column)
+ {
+ return 'nvarchar(max)';
+ }
+
+ /**
+ * Create the column definition for a jsonb type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeJsonb(Fluent $column)
+ {
+ return 'nvarchar(max)';
+ }
+
+ /**
+ * Create the column definition for a date type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDate(Fluent $column)
+ {
+ return 'date';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTime(Fluent $column)
+ {
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a date-time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeDateTimeTz(Fluent $column)
+ {
+ return 'datetimeoffset(0)';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTime(Fluent $column)
+ {
+ return 'time';
+ }
+
+ /**
+ * Create the column definition for a time type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimeTz(Fluent $column)
+ {
+ return 'time';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestamp(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'datetime default CURRENT_TIMESTAMP';
+ }
+
+ return 'datetime';
+ }
+
+ /**
+ * Create the column definition for a timestamp type.
+ *
+ * @link https://msdn.microsoft.com/en-us/library/bb630289(v=sql.120).aspx
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeTimestampTz(Fluent $column)
+ {
+ if ($column->useCurrent) {
+ return 'datetimeoffset(0) default CURRENT_TIMESTAMP';
+ }
+
+ return 'datetimeoffset(0)';
+ }
+
+ /**
+ * Create the column definition for a binary type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeBinary(Fluent $column)
+ {
+ return 'varbinary(max)';
+ }
+
+ /**
+ * Create the column definition for a uuid type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeUuid(Fluent $column)
+ {
+ return 'uniqueidentifier';
+ }
+
+ /**
+ * Get the SQL for a nullable column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyNullable(Blueprint $blueprint, Fluent $column)
+ {
+ return $column->nullable ? ' null' : ' not null';
+ }
+
+ /**
+ * Get the SQL for a default column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
+ {
+ if (! is_null($column->default)) {
+ return ' default '.$this->getDefaultValue($column->default);
+ }
+ }
+
+ /**
+ * Get the SQL for an auto-increment column modifier.
+ *
+ * @param \Illuminate\Database\Schema\Blueprint $blueprint
+ * @param \Illuminate\Support\Fluent $column
+ * @return string|null
+ */
+ protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
+ {
+ if (in_array($column->type, $this->serials) && $column->autoIncrement) {
+ return ' identity primary key';
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
index 7472681..e0b0ade 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
@@ -1,41 +1,42 @@
-grammar->compileTableExists();
+class MySqlBuilder extends Builder
+{
+ /**
+ * Determine if the given table exists.
+ *
+ * @param string $table
+ * @return bool
+ */
+ public function hasTable($table)
+ {
+ $sql = $this->grammar->compileTableExists();
- $database = $this->connection->getDatabaseName();
+ $database = $this->connection->getDatabaseName();
- $table = $this->connection->getTablePrefix().$table;
+ $table = $this->connection->getTablePrefix().$table;
- return count($this->connection->select($sql, array($database, $table))) > 0;
- }
+ return count($this->connection->select($sql, [$database, $table])) > 0;
+ }
- /**
- * Get the column listing for a given table.
- *
- * @param string $table
- * @return array
- */
- public function getColumnListing($table)
- {
- $sql = $this->grammar->compileColumnExists();
+ /**
+ * Get the column listing for a given table.
+ *
+ * @param string $table
+ * @return array
+ */
+ public function getColumnListing($table)
+ {
+ $sql = $this->grammar->compileColumnExists();
- $database = $this->connection->getDatabaseName();
+ $database = $this->connection->getDatabaseName();
- $table = $this->connection->getTablePrefix().$table;
+ $table = $this->connection->getTablePrefix().$table;
- $results = $this->connection->select($sql, array($database, $table));
-
- return $this->connection->getPostProcessor()->processColumnListing($results);
- }
+ $results = $this->connection->select($sql, [$database, $table]);
+ return $this->connection->getPostProcessor()->processColumnListing($results);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php
new file mode 100644
index 0000000..da3fd60
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php
@@ -0,0 +1,25 @@
+grammar->compileTableExists();
+
+ $schema = $this->connection->getConfig('schema');
+
+ $schema = $schema ? $schema : 'public';
+
+ $table = $this->connection->getTablePrefix().$table;
+
+ return count($this->connection->select($sql, [$schema, $table])) > 0;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php
index 26fe80c..3a97cde 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php
@@ -1,55 +1,69 @@
-registerSeedCommand();
-
- $this->app->singleton('seeder', function()
- {
- return new Seeder;
- });
-
- $this->commands('command.seed');
- }
-
- /**
- * Register the seed console command.
- *
- * @return void
- */
- protected function registerSeedCommand()
- {
- $this->app->singleton('command.seed', function($app)
- {
- return new SeedCommand($app['db']);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array('seeder', 'command.seed');
- }
+use Illuminate\Database\Console\Seeds\SeedCommand;
+use Illuminate\Database\Console\Seeds\SeederMakeCommand;
+
+class SeedServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerSeedCommand();
+
+ $this->registerMakeCommand();
+
+ $this->app->singleton('seeder', function () {
+ return new Seeder;
+ });
+
+ $this->commands('command.seed', 'command.seeder.make');
+ }
+
+ /**
+ * Register the seed console command.
+ *
+ * @return void
+ */
+ protected function registerSeedCommand()
+ {
+ $this->app->singleton('command.seed', function ($app) {
+ return new SeedCommand($app['db']);
+ });
+ }
+
+ /**
+ * Register the seeder generator command.
+ *
+ * @return void
+ */
+ protected function registerMakeCommand()
+ {
+ $this->app->singleton('command.seeder.make', function ($app) {
+ return new SeederMakeCommand($app['files'], $app['composer']);
+ });
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['seeder', 'command.seed', 'command.seeder.make'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/Seeder.php b/application/vendor/laravel/framework/src/Illuminate/Database/Seeder.php
index 7fe4c6b..4e29c16 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/Seeder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/Seeder.php
@@ -1,101 +1,97 @@
-resolve($class)->run();
-
- if (isset($this->command))
- {
- $this->command->getOutput()->writeln("Seeded: $class");
- }
- }
-
- /**
- * Resolve an instance of the given seeder class.
- *
- * @param string $class
- * @return \Illuminate\Database\Seeder
- */
- protected function resolve($class)
- {
- if (isset($this->container))
- {
- $instance = $this->container->make($class);
-
- $instance->setContainer($this->container);
- }
- else
- {
- $instance = new $class;
- }
-
- if (isset($this->command))
- {
- $instance->setCommand($this->command);
- }
-
- return $instance;
- }
-
- /**
- * Set the IoC container instance.
- *
- * @param \Illuminate\Container\Container $container
- * @return $this
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
-
- return $this;
- }
-
- /**
- * Set the console command instance.
- *
- * @param \Illuminate\Console\Command $command
- * @return $this
- */
- public function setCommand(Command $command)
- {
- $this->command = $command;
-
- return $this;
- }
-
+class Seeder
+{
+ /**
+ * The container instance.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The console command instance.
+ *
+ * @var \Illuminate\Console\Command
+ */
+ protected $command;
+
+ /**
+ * Run the database seeds.
+ *
+ * @return void
+ */
+ public function run()
+ {
+ //
+ }
+
+ /**
+ * Seed the given connection from the given path.
+ *
+ * @param string $class
+ * @return void
+ */
+ public function call($class)
+ {
+ $this->resolve($class)->run();
+
+ if (isset($this->command)) {
+ $this->command->getOutput()->writeln("Seeded: $class");
+ }
+ }
+
+ /**
+ * Resolve an instance of the given seeder class.
+ *
+ * @param string $class
+ * @return \Illuminate\Database\Seeder
+ */
+ protected function resolve($class)
+ {
+ if (isset($this->container)) {
+ $instance = $this->container->make($class);
+
+ $instance->setContainer($this->container);
+ } else {
+ $instance = new $class;
+ }
+
+ if (isset($this->command)) {
+ $instance->setCommand($this->command);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Set the IoC container instance.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @return $this
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+
+ return $this;
+ }
+
+ /**
+ * Set the console command instance.
+ *
+ * @param \Illuminate\Console\Command $command
+ * @return $this
+ */
+ public function setCommand(Command $command)
+ {
+ $this->command = $command;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/SqlServerConnection.php b/application/vendor/laravel/framework/src/Illuminate/Database/SqlServerConnection.php
index 523f759..fa097e2 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/SqlServerConnection.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/SqlServerConnection.php
@@ -1,92 +1,95 @@
-getDriverName() == 'sqlsrv')
- {
- return parent::transaction($callback);
- }
+class SqlServerConnection extends Connection
+{
+ /**
+ * Execute a Closure within a transaction.
+ *
+ * @param \Closure $callback
+ * @return mixed
+ *
+ * @throws \Throwable
+ */
+ public function transaction(Closure $callback)
+ {
+ if ($this->getDriverName() == 'sqlsrv') {
+ return parent::transaction($callback);
+ }
- $this->pdo->exec('BEGIN TRAN');
+ $this->pdo->exec('BEGIN TRAN');
- // We'll simply execute the given callback within a try / catch block
- // and if we catch any exception we can rollback the transaction
- // so that none of the changes are persisted to the database.
- try
- {
- $result = $callback($this);
+ // We'll simply execute the given callback within a try / catch block
+ // and if we catch any exception we can rollback the transaction
+ // so that none of the changes are persisted to the database.
+ try {
+ $result = $callback($this);
- $this->pdo->exec('COMMIT TRAN');
- }
+ $this->pdo->exec('COMMIT TRAN');
+ }
- // If we catch an exception, we will roll back so nothing gets messed
- // up in the database. Then we'll re-throw the exception so it can
- // be handled how the developer sees fit for their applications.
- catch (Exception $e)
- {
- $this->pdo->exec('ROLLBACK TRAN');
+ // If we catch an exception, we will roll back so nothing gets messed
+ // up in the database. Then we'll re-throw the exception so it can
+ // be handled how the developer sees fit for their applications.
+ catch (Exception $e) {
+ $this->pdo->exec('ROLLBACK TRAN');
- throw $e;
- }
+ throw $e;
+ } catch (Throwable $e) {
+ $this->pdo->exec('ROLLBACK TRAN');
- return $result;
- }
+ throw $e;
+ }
- /**
- * Get the default query grammar instance.
- *
- * @return \Illuminate\Database\Query\Grammars\SqlServerGrammar
- */
- protected function getDefaultQueryGrammar()
- {
- return $this->withTablePrefix(new QueryGrammar);
- }
+ return $result;
+ }
- /**
- * Get the default schema grammar instance.
- *
- * @return \Illuminate\Database\Schema\Grammars\SqlServerGrammar
- */
- protected function getDefaultSchemaGrammar()
- {
- return $this->withTablePrefix(new SchemaGrammar);
- }
+ /**
+ * Get the default query grammar instance.
+ *
+ * @return \Illuminate\Database\Query\Grammars\SqlServerGrammar
+ */
+ protected function getDefaultQueryGrammar()
+ {
+ return $this->withTablePrefix(new QueryGrammar);
+ }
- /**
- * Get the default post processor instance.
- *
- * @return \Illuminate\Database\Query\Processors\Processor
- */
- protected function getDefaultPostProcessor()
- {
- return new SqlServerProcessor;
- }
+ /**
+ * Get the default schema grammar instance.
+ *
+ * @return \Illuminate\Database\Schema\Grammars\SqlServerGrammar
+ */
+ protected function getDefaultSchemaGrammar()
+ {
+ return $this->withTablePrefix(new SchemaGrammar);
+ }
- /**
- * Get the Doctrine DBAL Driver.
- *
- * @return \Doctrine\DBAL\Driver\PDOSqlsrv\Driver
- */
- protected function getDoctrineDriver()
- {
- return new DoctrineDriver;
- }
+ /**
+ * Get the default post processor instance.
+ *
+ * @return \Illuminate\Database\Query\Processors\SqlServerProcessor
+ */
+ protected function getDefaultPostProcessor()
+ {
+ return new SqlServerProcessor;
+ }
+ /**
+ * Get the Doctrine DBAL driver.
+ *
+ * @return \Doctrine\DBAL\Driver\PDOSqlsrv\Driver
+ */
+ protected function getDoctrineDriver()
+ {
+ return new DoctrineDriver;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Database/composer.json b/application/vendor/laravel/framework/src/Illuminate/Database/composer.json
index ac8320c..26c462a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Database/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Database/composer.json
@@ -15,11 +15,11 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/container": "5.0.*",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "nesbot/carbon": "~1.0"
+ "php": ">=5.5.9",
+ "illuminate/container": "5.1.*",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "nesbot/carbon": "~1.19"
},
"autoload": {
"psr-4": {
@@ -28,14 +28,16 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
"doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
- "illuminate/console": "Required to use the database commands (5.0.*).",
- "illuminate/events": "Required to use the observers with Eloquent (5.0.*).",
- "illuminate/filesystem": "Required to use the migrations (5.0.*)."
+ "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
+ "illuminate/console": "Required to use the database commands (5.1.*).",
+ "illuminate/events": "Required to use the observers with Eloquent (5.1.*).",
+ "illuminate/filesystem": "Required to use the migrations (5.1.*).",
+ "illuminate/pagination": "Required to paginate the result set (5.1.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Encryption/BaseEncrypter.php b/application/vendor/laravel/framework/src/Illuminate/Encryption/BaseEncrypter.php
new file mode 100644
index 0000000..1d427af
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Encryption/BaseEncrypter.php
@@ -0,0 +1,82 @@
+key);
+ }
+
+ /**
+ * Get the JSON array from the given payload.
+ *
+ * @param string $payload
+ * @return array
+ *
+ * @throws \Illuminate\Contracts\Encryption\DecryptException
+ */
+ protected function getJsonPayload($payload)
+ {
+ $payload = json_decode(base64_decode($payload), true);
+
+ // If the payload is not valid JSON or does not have the proper keys set we will
+ // assume it is invalid and bail out of the routine since we will not be able
+ // to decrypt the given value. We'll also check the MAC for this encryption.
+ if (! $payload || $this->invalidPayload($payload)) {
+ throw new DecryptException('The payload is invalid.');
+ }
+
+ if (! $this->validMac($payload)) {
+ throw new DecryptException('The MAC is invalid.');
+ }
+
+ return $payload;
+ }
+
+ /**
+ * Verify that the encryption payload is valid.
+ *
+ * @param array|mixed $data
+ * @return bool
+ */
+ protected function invalidPayload($data)
+ {
+ return ! is_array($data) || ! isset($data['iv']) || ! isset($data['value']) || ! isset($data['mac']);
+ }
+
+ /**
+ * Determine if the MAC for the given payload is valid.
+ *
+ * @param array $payload
+ * @return bool
+ *
+ * @throws \RuntimeException
+ */
+ protected function validMac(array $payload)
+ {
+ $bytes = Str::randomBytes(16);
+
+ $calcMac = hash_hmac('sha256', $this->hash($payload['iv'], $payload['value']), $bytes, true);
+
+ return Str::equals(hash_hmac('sha256', $payload['mac'], $bytes, true), $calcMac);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php b/application/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
index 7d5544c..71a0ddc 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
@@ -1,306 +1,119 @@
-key = (string) $key;
- }
-
- /**
- * Encrypt the given value.
- *
- * @param string $value
- * @return string
- */
- public function encrypt($value)
- {
- $iv = mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
-
- $value = base64_encode($this->padAndMcrypt($value, $iv));
-
- // Once we have the encrypted value we will go ahead base64_encode the input
- // vector and create the MAC for the encrypted value so we can verify its
- // authenticity. Then, we'll JSON encode the data in a "payload" array.
- $mac = $this->hash($iv = base64_encode($iv), $value);
-
- return base64_encode(json_encode(compact('iv', 'value', 'mac')));
- }
-
- /**
- * Pad and use mcrypt on the given value and input vector.
- *
- * @param string $value
- * @param string $iv
- * @return string
- */
- protected function padAndMcrypt($value, $iv)
- {
- $value = $this->addPadding(serialize($value));
-
- return mcrypt_encrypt($this->cipher, $this->key, $value, $this->mode, $iv);
- }
-
- /**
- * Decrypt the given value.
- *
- * @param string $payload
- * @return string
- */
- public function decrypt($payload)
- {
- $payload = $this->getJsonPayload($payload);
-
- // We'll go ahead and remove the PKCS7 padding from the encrypted value before
- // we decrypt it. Once we have the de-padded value, we will grab the vector
- // and decrypt the data, passing back the unserialized from of the value.
- $value = base64_decode($payload['value']);
-
- $iv = base64_decode($payload['iv']);
-
- return unserialize($this->stripPadding($this->mcryptDecrypt($value, $iv)));
- }
-
- /**
- * Run the mcrypt decryption routine for the value.
- *
- * @param string $value
- * @param string $iv
- * @return string
- *
- * @throws \Exception
- */
- protected function mcryptDecrypt($value, $iv)
- {
- try
- {
- return mcrypt_decrypt($this->cipher, $this->key, $value, $this->mode, $iv);
- }
- catch (Exception $e)
- {
- throw new DecryptException($e->getMessage());
- }
- }
-
- /**
- * Get the JSON array from the given payload.
- *
- * @param string $payload
- * @return array
- *
- * @throws \Illuminate\Contracts\Encryption\DecryptException
- */
- protected function getJsonPayload($payload)
- {
- $payload = json_decode(base64_decode($payload), true);
-
- // If the payload is not valid JSON or does not have the proper keys set we will
- // assume it is invalid and bail out of the routine since we will not be able
- // to decrypt the given value. We'll also check the MAC for this encryption.
- if ( ! $payload || $this->invalidPayload($payload))
- {
- throw new DecryptException('Invalid data.');
- }
-
- if ( ! $this->validMac($payload))
- {
- throw new DecryptException('MAC is invalid.');
- }
-
- return $payload;
- }
-
- /**
- * Determine if the MAC for the given payload is valid.
- *
- * @param array $payload
- * @return bool
- *
- * @throws \RuntimeException
- */
- protected function validMac(array $payload)
- {
- $bytes = (new SecureRandom)->nextBytes(16);
-
- $calcMac = hash_hmac('sha256', $this->hash($payload['iv'], $payload['value']), $bytes, true);
-
- return StringUtils::equals(hash_hmac('sha256', $payload['mac'], $bytes, true), $calcMac);
- }
-
- /**
- * Create a MAC for the given value.
- *
- * @param string $iv
- * @param string $value
- * @return string
- */
- protected function hash($iv, $value)
- {
- return hash_hmac('sha256', $iv.$value, $this->key);
- }
-
- /**
- * Add PKCS7 padding to a given value.
- *
- * @param string $value
- * @return string
- */
- protected function addPadding($value)
- {
- $pad = $this->block - (strlen($value) % $this->block);
-
- return $value.str_repeat(chr($pad), $pad);
- }
-
- /**
- * Remove the padding from the given value.
- *
- * @param string $value
- * @return string
- */
- protected function stripPadding($value)
- {
- $pad = ord($value[($len = strlen($value)) - 1]);
-
- return $this->paddingIsValid($pad, $value) ? substr($value, 0, $len - $pad) : $value;
- }
-
- /**
- * Determine if the given padding for a value is valid.
- *
- * @param string $pad
- * @param string $value
- * @return bool
- */
- protected function paddingIsValid($pad, $value)
- {
- $beforePad = strlen($value) - $pad;
-
- return substr($value, $beforePad) == str_repeat(substr($value, -1), $pad);
- }
-
- /**
- * Verify that the encryption payload is valid.
- *
- * @param array|mixed $data
- * @return bool
- */
- protected function invalidPayload($data)
- {
- return ! is_array($data) || ! isset($data['iv']) || ! isset($data['value']) || ! isset($data['mac']);
- }
-
- /**
- * Get the IV size for the cipher.
- *
- * @return int
- */
- protected function getIvSize()
- {
- return mcrypt_get_iv_size($this->cipher, $this->mode);
- }
-
- /**
- * Get the random data source available for the OS.
- *
- * @return int
- */
- protected function getRandomizer()
- {
- if (defined('MCRYPT_DEV_URANDOM')) return MCRYPT_DEV_URANDOM;
-
- if (defined('MCRYPT_DEV_RANDOM')) return MCRYPT_DEV_RANDOM;
-
- mt_srand();
-
- return MCRYPT_RAND;
- }
-
- /**
- * Set the encryption key.
- *
- * @param string $key
- * @return void
- */
- public function setKey($key)
- {
- $this->key = (string) $key;
- }
-
- /**
- * Set the encryption cipher.
- *
- * @param string $cipher
- * @return void
- */
- public function setCipher($cipher)
- {
- $this->cipher = $cipher;
-
- $this->updateBlockSize();
- }
-
- /**
- * Set the encryption mode.
- *
- * @param string $mode
- * @return void
- */
- public function setMode($mode)
- {
- $this->mode = $mode;
-
- $this->updateBlockSize();
- }
-
- /**
- * Update the block size for the current cipher and mode.
- *
- * @return void
- */
- protected function updateBlockSize()
- {
- $this->block = mcrypt_get_iv_size($this->cipher, $this->mode);
- }
-
+class Encrypter extends BaseEncrypter implements EncrypterContract
+{
+ /**
+ * The algorithm used for encryption.
+ *
+ * @var string
+ */
+ protected $cipher;
+
+ /**
+ * Create a new encrypter instance.
+ *
+ * @param string $key
+ * @param string $cipher
+ * @return void
+ *
+ * @throws \RuntimeException
+ */
+ public function __construct($key, $cipher = 'AES-128-CBC')
+ {
+ $key = (string) $key;
+
+ if (static::supported($key, $cipher)) {
+ $this->key = $key;
+ $this->cipher = $cipher;
+ } else {
+ throw new RuntimeException('The only supported ciphers are AES-128-CBC and AES-256-CBC with the correct key lengths.');
+ }
+ }
+
+ /**
+ * Determine if the given key and cipher combination is valid.
+ *
+ * @param string $key
+ * @param string $cipher
+ * @return bool
+ */
+ public static function supported($key, $cipher)
+ {
+ $length = mb_strlen($key, '8bit');
+
+ return ($cipher === 'AES-128-CBC' && $length === 16) || ($cipher === 'AES-256-CBC' && $length === 32);
+ }
+
+ /**
+ * Encrypt the given value.
+ *
+ * @param string $value
+ * @return string
+ *
+ * @throws \Illuminate\Contracts\Encryption\EncryptException
+ */
+ public function encrypt($value)
+ {
+ $iv = Str::randomBytes($this->getIvSize());
+
+ $value = \openssl_encrypt(serialize($value), $this->cipher, $this->key, 0, $iv);
+
+ if ($value === false) {
+ throw new EncryptException('Could not encrypt the data.');
+ }
+
+ // Once we have the encrypted value we will go ahead base64_encode the input
+ // vector and create the MAC for the encrypted value so we can verify its
+ // authenticity. Then, we'll JSON encode the data in a "payload" array.
+ $mac = $this->hash($iv = base64_encode($iv), $value);
+
+ $json = json_encode(compact('iv', 'value', 'mac'));
+
+ if (! is_string($json)) {
+ throw new EncryptException('Could not encrypt the data.');
+ }
+
+ return base64_encode($json);
+ }
+
+ /**
+ * Decrypt the given value.
+ *
+ * @param string $payload
+ * @return string
+ *
+ * @throws \Illuminate\Contracts\Encryption\DecryptException
+ */
+ public function decrypt($payload)
+ {
+ $payload = $this->getJsonPayload($payload);
+
+ $iv = base64_decode($payload['iv']);
+
+ $decrypted = \openssl_decrypt($payload['value'], $this->cipher, $this->key, 0, $iv);
+
+ if ($decrypted === false) {
+ throw new DecryptException('Could not decrypt the data.');
+ }
+
+ return unserialize($decrypted);
+ }
+
+ /**
+ * Get the IV size for the cipher.
+ *
+ * @return int
+ */
+ protected function getIvSize()
+ {
+ return 16;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php
index 7ceb86c..a0b9491 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php
@@ -1,27 +1,33 @@
-app->singleton('encrypter', function($app)
- {
- $encrypter = new Encrypter($app['config']['app.key']);
+class EncryptionServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('encrypter', function ($app) {
+ $config = $app->make('config')->get('app');
- if ($app['config']->has('app.cipher'))
- {
- $encrypter->setCipher($app['config']['app.cipher']);
- }
+ $key = $config['key'];
- return $encrypter;
- });
- }
+ $cipher = $config['cipher'];
+ if (Encrypter::supported($key, $cipher)) {
+ return new Encrypter($key, $cipher);
+ } elseif (McryptEncrypter::supported($key, $cipher)) {
+ return new McryptEncrypter($key, $cipher);
+ } else {
+ throw new RuntimeException('No supported encrypter found. The cipher and / or key length are invalid.');
+ }
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Encryption/InvalidKeyException.php b/application/vendor/laravel/framework/src/Illuminate/Encryption/InvalidKeyException.php
deleted file mode 100644
index 1f1ef0c..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Encryption/InvalidKeyException.php
+++ /dev/null
@@ -1,5 +0,0 @@
-key = $key;
+ $this->cipher = $cipher;
+ $this->block = mcrypt_get_iv_size($this->cipher, MCRYPT_MODE_CBC);
+ } else {
+ throw new RuntimeException('The only supported ciphers are MCRYPT_RIJNDAEL_128 and MCRYPT_RIJNDAEL_256.');
+ }
+ }
+
+ /**
+ * Determine if the given key and cipher combination is valid.
+ *
+ * @param string $key
+ * @param string $cipher
+ * @return bool
+ */
+ public static function supported($key, $cipher)
+ {
+ return defined('MCRYPT_RIJNDAEL_128') &&
+ ($cipher === MCRYPT_RIJNDAEL_128 || $cipher === MCRYPT_RIJNDAEL_256);
+ }
+
+ /**
+ * Encrypt the given value.
+ *
+ * @param string $value
+ * @return string
+ *
+ * @throws \Illuminate\Contracts\Encryption\EncryptException
+ */
+ public function encrypt($value)
+ {
+ $iv = mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
+
+ $value = base64_encode($this->padAndMcrypt($value, $iv));
+
+ // Once we have the encrypted value we will go ahead base64_encode the input
+ // vector and create the MAC for the encrypted value so we can verify its
+ // authenticity. Then, we'll JSON encode the data in a "payload" array.
+ $mac = $this->hash($iv = base64_encode($iv), $value);
+
+ $json = json_encode(compact('iv', 'value', 'mac'));
+
+ if (! is_string($json)) {
+ throw new EncryptException('Could not encrypt the data.');
+ }
+
+ return base64_encode($json);
+ }
+
+ /**
+ * Pad and use mcrypt on the given value and input vector.
+ *
+ * @param string $value
+ * @param string $iv
+ * @return string
+ */
+ protected function padAndMcrypt($value, $iv)
+ {
+ $value = $this->addPadding(serialize($value));
+
+ return mcrypt_encrypt($this->cipher, $this->key, $value, MCRYPT_MODE_CBC, $iv);
+ }
+
+ /**
+ * Decrypt the given value.
+ *
+ * @param string $payload
+ * @return string
+ */
+ public function decrypt($payload)
+ {
+ $payload = $this->getJsonPayload($payload);
+
+ // We'll go ahead and remove the PKCS7 padding from the encrypted value before
+ // we decrypt it. Once we have the de-padded value, we will grab the vector
+ // and decrypt the data, passing back the unserialized from of the value.
+ $value = base64_decode($payload['value']);
+
+ $iv = base64_decode($payload['iv']);
+
+ return unserialize($this->stripPadding($this->mcryptDecrypt($value, $iv)));
+ }
+
+ /**
+ * Run the mcrypt decryption routine for the value.
+ *
+ * @param string $value
+ * @param string $iv
+ * @return string
+ *
+ * @throws \Illuminate\Contracts\Encryption\DecryptException
+ */
+ protected function mcryptDecrypt($value, $iv)
+ {
+ try {
+ return mcrypt_decrypt($this->cipher, $this->key, $value, MCRYPT_MODE_CBC, $iv);
+ } catch (Exception $e) {
+ throw new DecryptException($e->getMessage());
+ }
+ }
+
+ /**
+ * Add PKCS7 padding to a given value.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function addPadding($value)
+ {
+ $pad = $this->block - (strlen($value) % $this->block);
+
+ return $value.str_repeat(chr($pad), $pad);
+ }
+
+ /**
+ * Remove the padding from the given value.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function stripPadding($value)
+ {
+ $pad = ord($value[($len = strlen($value)) - 1]);
+
+ return $this->paddingIsValid($pad, $value) ? substr($value, 0, $len - $pad) : $value;
+ }
+
+ /**
+ * Determine if the given padding for a value is valid.
+ *
+ * @param string $pad
+ * @param string $value
+ * @return bool
+ */
+ protected function paddingIsValid($pad, $value)
+ {
+ $beforePad = strlen($value) - $pad;
+
+ return substr($value, $beforePad) == str_repeat(substr($value, -1), $pad);
+ }
+
+ /**
+ * Get the IV size for the cipher.
+ *
+ * @return int
+ */
+ protected function getIvSize()
+ {
+ return mcrypt_get_iv_size($this->cipher, MCRYPT_MODE_CBC);
+ }
+
+ /**
+ * Get the random data source available for the OS.
+ *
+ * @return int
+ */
+ protected function getRandomizer()
+ {
+ if (defined('MCRYPT_DEV_URANDOM')) {
+ return MCRYPT_DEV_URANDOM;
+ }
+
+ if (defined('MCRYPT_DEV_RANDOM')) {
+ return MCRYPT_DEV_RANDOM;
+ }
+
+ mt_srand();
+
+ return MCRYPT_RAND;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Encryption/composer.json b/application/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
index 08f4320..0b52c2a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
@@ -14,11 +14,12 @@
}
],
"require": {
- "php": ">=5.4.0",
+ "php": ">=5.5.9",
+ "ext-mbstring": "*",
"ext-openssl": "*",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/security-core": "2.6.*"
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "paragonie/random_compat": "~1.4"
},
"autoload": {
"psr-4": {
@@ -27,7 +28,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Events/CallQueuedHandler.php b/application/vendor/laravel/framework/src/Illuminate/Events/CallQueuedHandler.php
index 105baf8..b182cd8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Events/CallQueuedHandler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Events/CallQueuedHandler.php
@@ -1,82 +1,80 @@
-container = $container;
- }
+class CallQueuedHandler
+{
+ /**
+ * The container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
- /**
- * Handle the queued job.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param array $data
- * @return void
- */
- public function call(Job $job, array $data)
- {
- $handler = $this->setJobInstanceIfNecessary(
- $job, $this->container->make($data['class'])
- );
+ /**
+ * Create a new job instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function __construct(Container $container)
+ {
+ $this->container = $container;
+ }
- call_user_func_array(
- [$handler, $data['method']], unserialize($data['data'])
- );
+ /**
+ * Handle the queued job.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param array $data
+ * @return void
+ */
+ public function call(Job $job, array $data)
+ {
+ $handler = $this->setJobInstanceIfNecessary(
+ $job, $this->container->make($data['class'])
+ );
- if ( ! $job->isDeletedOrReleased())
- {
- $job->delete();
- }
- }
+ call_user_func_array(
+ [$handler, $data['method']], unserialize($data['data'])
+ );
- /**
- * Set the job instance of the given class if necessary.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param mixed $instance
- * @return mixed
- */
- protected function setJobInstanceIfNecessary(Job $job, $instance)
- {
- if (in_array('Illuminate\Queue\InteractsWithQueue', class_uses_recursive(get_class($instance))))
- {
- $instance->setJob($job);
- }
+ if (! $job->isDeletedOrReleased()) {
+ $job->delete();
+ }
+ }
- return $instance;
- }
+ /**
+ * Set the job instance of the given class if necessary.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param mixed $instance
+ * @return mixed
+ */
+ protected function setJobInstanceIfNecessary(Job $job, $instance)
+ {
+ if (in_array('Illuminate\Queue\InteractsWithQueue', class_uses_recursive(get_class($instance)))) {
+ $instance->setJob($job);
+ }
- /**
- * Call the failed method on the job instance.
- *
- * @param array $data
- * @return void
- */
- public function failed(array $data)
- {
- $handler = $this->container->make($data['class']);
+ return $instance;
+ }
- if (method_exists($handler, 'failed'))
- {
- call_user_func_array([$handler, 'failed'], unserialize($data['data']));
- }
- }
+ /**
+ * Call the failed method on the job instance.
+ *
+ * @param array $data
+ * @return void
+ */
+ public function failed(array $data)
+ {
+ $handler = $this->container->make($data['class']);
+ if (method_exists($handler, 'failed')) {
+ call_user_func_array([$handler, 'failed'], unserialize($data['data']));
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php b/application/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php
index bccbd3a..63dc899 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php
@@ -1,486 +1,503 @@
-container = $container ?: new Container;
- }
-
- /**
- * Register an event listener with the dispatcher.
- *
- * @param string|array $events
- * @param mixed $listener
- * @param int $priority
- * @return void
- */
- public function listen($events, $listener, $priority = 0)
- {
- foreach ((array) $events as $event)
- {
- if (str_contains($event, '*'))
- {
- $this->setupWildcardListen($event, $listener);
- }
- else
- {
- $this->listeners[$event][$priority][] = $this->makeListener($listener);
-
- unset($this->sorted[$event]);
- }
- }
- }
-
- /**
- * Setup a wildcard listener callback.
- *
- * @param string $event
- * @param mixed $listener
- * @return void
- */
- protected function setupWildcardListen($event, $listener)
- {
- $this->wildcards[$event][] = $this->makeListener($listener);
- }
-
- /**
- * Determine if a given event has listeners.
- *
- * @param string $eventName
- * @return bool
- */
- public function hasListeners($eventName)
- {
- return isset($this->listeners[$eventName]);
- }
-
- /**
- * Register an event and payload to be fired later.
- *
- * @param string $event
- * @param array $payload
- * @return void
- */
- public function push($event, $payload = array())
- {
- $this->listen($event.'_pushed', function() use ($event, $payload)
- {
- $this->fire($event, $payload);
- });
- }
-
- /**
- * Register an event subscriber with the dispatcher.
- *
- * @param object|string $subscriber
- * @return void
- */
- public function subscribe($subscriber)
- {
- $subscriber = $this->resolveSubscriber($subscriber);
-
- $subscriber->subscribe($this);
- }
-
- /**
- * Resolve the subscriber instance.
- *
- * @param object|string $subscriber
- * @return mixed
- */
- protected function resolveSubscriber($subscriber)
- {
- if (is_string($subscriber))
- {
- return $this->container->make($subscriber);
- }
-
- return $subscriber;
- }
-
- /**
- * Fire an event until the first non-null response is returned.
- *
- * @param string $event
- * @param array $payload
- * @return mixed
- */
- public function until($event, $payload = array())
- {
- return $this->fire($event, $payload, true);
- }
-
- /**
- * Flush a set of pushed events.
- *
- * @param string $event
- * @return void
- */
- public function flush($event)
- {
- $this->fire($event.'_pushed');
- }
-
- /**
- * Get the event that is currently firing.
- *
- * @return string
- */
- public function firing()
- {
- return last($this->firing);
- }
-
- /**
- * Fire an event and call the listeners.
- *
- * @param string|object $event
- * @param mixed $payload
- * @param bool $halt
- * @return array|null
- */
- public function fire($event, $payload = array(), $halt = false)
- {
- // When the given "event" is actually an object we will assume it is an event
- // object and use the class as the event name and this event itself as the
- // payload to the handler, which makes object based events quite simple.
- if (is_object($event))
- {
- list($payload, $event) = [[$event], get_class($event)];
- }
-
- $responses = array();
-
- // If an array is not given to us as the payload, we will turn it into one so
- // we can easily use call_user_func_array on the listeners, passing in the
- // payload to each of them so that they receive each of these arguments.
- if ( ! is_array($payload)) $payload = array($payload);
-
- $this->firing[] = $event;
-
- foreach ($this->getListeners($event) as $listener)
- {
- $response = call_user_func_array($listener, $payload);
-
- // If a response is returned from the listener and event halting is enabled
- // we will just return this response, and not call the rest of the event
- // listeners. Otherwise we will add the response on the response list.
- if ( ! is_null($response) && $halt)
- {
- array_pop($this->firing);
-
- return $response;
- }
-
- // If a boolean false is returned from a listener, we will stop propagating
- // the event to any further listeners down in the chain, else we keep on
- // looping through the listeners and firing every one in our sequence.
- if ($response === false) break;
-
- $responses[] = $response;
- }
-
- array_pop($this->firing);
-
- return $halt ? null : $responses;
- }
-
- /**
- * Get all of the listeners for a given event name.
- *
- * @param string $eventName
- * @return array
- */
- public function getListeners($eventName)
- {
- $wildcards = $this->getWildcardListeners($eventName);
-
- if ( ! isset($this->sorted[$eventName]))
- {
- $this->sortListeners($eventName);
- }
-
- return array_merge($this->sorted[$eventName], $wildcards);
- }
-
- /**
- * Get the wildcard listeners for the event.
- *
- * @param string $eventName
- * @return array
- */
- protected function getWildcardListeners($eventName)
- {
- $wildcards = array();
-
- foreach ($this->wildcards as $key => $listeners)
- {
- if (str_is($key, $eventName)) $wildcards = array_merge($wildcards, $listeners);
- }
-
- return $wildcards;
- }
-
- /**
- * Sort the listeners for a given event by priority.
- *
- * @param string $eventName
- * @return array
- */
- protected function sortListeners($eventName)
- {
- $this->sorted[$eventName] = array();
-
- // If listeners exist for the given event, we will sort them by the priority
- // so that we can call them in the correct order. We will cache off these
- // sorted event listeners so we do not have to re-sort on every events.
- if (isset($this->listeners[$eventName]))
- {
- krsort($this->listeners[$eventName]);
-
- $this->sorted[$eventName] = call_user_func_array(
- 'array_merge', $this->listeners[$eventName]
- );
- }
- }
-
- /**
- * Register an event listener with the dispatcher.
- *
- * @param mixed $listener
- * @return mixed
- */
- public function makeListener($listener)
- {
- return is_string($listener) ? $this->createClassListener($listener) : $listener;
- }
-
- /**
- * Create a class based listener using the IoC container.
- *
- * @param mixed $listener
- * @return \Closure
- */
- public function createClassListener($listener)
- {
- $container = $this->container;
-
- return function() use ($listener, $container)
- {
- return call_user_func_array(
- $this->createClassCallable($listener, $container), func_get_args()
- );
- };
- }
-
- /**
- * Create the class based event callable.
- *
- * @param string $listener
- * @param \Illuminate\Container\Container $container
- * @return callable
- */
- protected function createClassCallable($listener, $container)
- {
- list($class, $method) = $this->parseClassCallable($listener);
-
- if ($this->handlerShouldBeQueued($class))
- {
- return $this->createQueuedHandlerCallable($class, $method);
- }
- else
- {
- return array($container->make($class), $method);
- }
- }
-
- /**
- * Parse the class listener into class and method.
- *
- * @param string $listener
- * @return array
- */
- protected function parseClassCallable($listener)
- {
- $segments = explode('@', $listener);
-
- return [$segments[0], count($segments) == 2 ? $segments[1] : 'handle'];
- }
-
- /**
- * Determine if the event handler class should be queued.
- *
- * @param string $class
- * @return bool
- */
- protected function handlerShouldBeQueued($class)
- {
- try
- {
- return (new ReflectionClass($class))->implementsInterface(
- 'Illuminate\Contracts\Queue\ShouldBeQueued'
- );
- }
- catch (Exception $e)
- {
- return false;
- }
- }
-
- /**
- * Create a callable for putting an event handler on the queue.
- *
- * @param string $class
- * @param string $method
- * @return \Closure
- */
- protected function createQueuedHandlerCallable($class, $method)
- {
- return function() use ($class, $method)
- {
- $arguments = $this->cloneArgumentsForQueueing(func_get_args());
-
- if (method_exists($class, 'queue'))
- {
- $this->callQueueMethodOnHandler($class, $method, $arguments);
- }
- else
- {
- $this->resolveQueue()->push('Illuminate\Events\CallQueuedHandler@call', [
- 'class' => $class, 'method' => $method, 'data' => serialize($arguments),
- ]);
- }
- };
- }
-
- /**
- * Clone the given arguments for queueing.
- *
- * @param array $arguments
- * @return array
- */
- protected function cloneArgumentsForQueueing(array $arguments)
- {
- return array_map(function($a) { return is_object($a) ? clone $a : $a; }, $arguments);
- }
-
- /**
- * Call the queue method on the handler class.
- *
- * @param string $class
- * @param string $method
- * @param array $arguments
- * @return void
- */
- protected function callQueueMethodOnHandler($class, $method, $arguments)
- {
- $handler = (new ReflectionClass($class))->newInstanceWithoutConstructor();
-
- $handler->queue($this->resolveQueue(), 'Illuminate\Events\CallQueuedHandler@call', [
- 'class' => $class, 'method' => $method, 'data' => serialize($arguments),
- ]);
- }
-
- /**
- * Remove a set of listeners from the dispatcher.
- *
- * @param string $event
- * @return void
- */
- public function forget($event)
- {
- unset($this->listeners[$event], $this->sorted[$event]);
- }
-
- /**
- * Forget all of the pushed listeners.
- *
- * @return void
- */
- public function forgetPushed()
- {
- foreach ($this->listeners as $key => $value)
- {
- if (ends_with($key, '_pushed')) $this->forget($key);
- }
- }
-
- /**
- * Get the queue implementation from the resolver.
- *
- * @return \Illuminate\Contracts\Queue\Queue
- */
- protected function resolveQueue()
- {
- return call_user_func($this->queueResolver);
- }
-
- /**
- * Set the queue resolver implementation.
- *
- * @param callable $resolver
- * @return $this
- */
- public function setQueueResolver(callable $resolver)
- {
- $this->queueResolver = $resolver;
-
- return $this;
- }
-
+class Dispatcher implements DispatcherContract
+{
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The registered event listeners.
+ *
+ * @var array
+ */
+ protected $listeners = [];
+
+ /**
+ * The wildcard listeners.
+ *
+ * @var array
+ */
+ protected $wildcards = [];
+
+ /**
+ * The sorted event listeners.
+ *
+ * @var array
+ */
+ protected $sorted = [];
+
+ /**
+ * The event firing stack.
+ *
+ * @var array
+ */
+ protected $firing = [];
+
+ /**
+ * The queue resolver instance.
+ *
+ * @var callable
+ */
+ protected $queueResolver;
+
+ /**
+ * Create a new event dispatcher instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container|null $container
+ * @return void
+ */
+ public function __construct(ContainerContract $container = null)
+ {
+ $this->container = $container ?: new Container;
+ }
+
+ /**
+ * Register an event listener with the dispatcher.
+ *
+ * @param string|array $events
+ * @param mixed $listener
+ * @param int $priority
+ * @return void
+ */
+ public function listen($events, $listener, $priority = 0)
+ {
+ foreach ((array) $events as $event) {
+ if (Str::contains($event, '*')) {
+ $this->setupWildcardListen($event, $listener);
+ } else {
+ $this->listeners[$event][$priority][] = $this->makeListener($listener);
+
+ unset($this->sorted[$event]);
+ }
+ }
+ }
+
+ /**
+ * Setup a wildcard listener callback.
+ *
+ * @param string $event
+ * @param mixed $listener
+ * @return void
+ */
+ protected function setupWildcardListen($event, $listener)
+ {
+ $this->wildcards[$event][] = $this->makeListener($listener);
+ }
+
+ /**
+ * Determine if a given event has listeners.
+ *
+ * @param string $eventName
+ * @return bool
+ */
+ public function hasListeners($eventName)
+ {
+ return isset($this->listeners[$eventName]) || isset($this->wildcards[$eventName]);
+ }
+
+ /**
+ * Register an event and payload to be fired later.
+ *
+ * @param string $event
+ * @param array $payload
+ * @return void
+ */
+ public function push($event, $payload = [])
+ {
+ $this->listen($event.'_pushed', function () use ($event, $payload) {
+ $this->fire($event, $payload);
+ });
+ }
+
+ /**
+ * Register an event subscriber with the dispatcher.
+ *
+ * @param object|string $subscriber
+ * @return void
+ */
+ public function subscribe($subscriber)
+ {
+ $subscriber = $this->resolveSubscriber($subscriber);
+
+ $subscriber->subscribe($this);
+ }
+
+ /**
+ * Resolve the subscriber instance.
+ *
+ * @param object|string $subscriber
+ * @return mixed
+ */
+ protected function resolveSubscriber($subscriber)
+ {
+ if (is_string($subscriber)) {
+ return $this->container->make($subscriber);
+ }
+
+ return $subscriber;
+ }
+
+ /**
+ * Fire an event until the first non-null response is returned.
+ *
+ * @param string|object $event
+ * @param array $payload
+ * @return mixed
+ */
+ public function until($event, $payload = [])
+ {
+ return $this->fire($event, $payload, true);
+ }
+
+ /**
+ * Flush a set of pushed events.
+ *
+ * @param string $event
+ * @return void
+ */
+ public function flush($event)
+ {
+ $this->fire($event.'_pushed');
+ }
+
+ /**
+ * Get the event that is currently firing.
+ *
+ * @return string
+ */
+ public function firing()
+ {
+ return last($this->firing);
+ }
+
+ /**
+ * Fire an event and call the listeners.
+ *
+ * @param string|object $event
+ * @param mixed $payload
+ * @param bool $halt
+ * @return array|null
+ */
+ public function fire($event, $payload = [], $halt = false)
+ {
+ // When the given "event" is actually an object we will assume it is an event
+ // object and use the class as the event name and this event itself as the
+ // payload to the handler, which makes object based events quite simple.
+ if (is_object($event)) {
+ list($payload, $event) = [[$event], get_class($event)];
+ }
+
+ $responses = [];
+
+ // If an array is not given to us as the payload, we will turn it into one so
+ // we can easily use call_user_func_array on the listeners, passing in the
+ // payload to each of them so that they receive each of these arguments.
+ if (! is_array($payload)) {
+ $payload = [$payload];
+ }
+
+ $this->firing[] = $event;
+
+ if (isset($payload[0]) && $payload[0] instanceof ShouldBroadcast) {
+ $this->broadcastEvent($payload[0]);
+ }
+
+ foreach ($this->getListeners($event) as $listener) {
+ $response = call_user_func_array($listener, $payload);
+
+ // If a response is returned from the listener and event halting is enabled
+ // we will just return this response, and not call the rest of the event
+ // listeners. Otherwise we will add the response on the response list.
+ if (! is_null($response) && $halt) {
+ array_pop($this->firing);
+
+ return $response;
+ }
+
+ // If a boolean false is returned from a listener, we will stop propagating
+ // the event to any further listeners down in the chain, else we keep on
+ // looping through the listeners and firing every one in our sequence.
+ if ($response === false) {
+ break;
+ }
+
+ $responses[] = $response;
+ }
+
+ array_pop($this->firing);
+
+ return $halt ? null : $responses;
+ }
+
+ /**
+ * Broadcast the given event class.
+ *
+ * @param \Illuminate\Contracts\Broadcasting\ShouldBroadcast $event
+ * @return void
+ */
+ protected function broadcastEvent($event)
+ {
+ if ($this->queueResolver) {
+ $connection = $event instanceof ShouldBroadcastNow ? 'sync' : null;
+
+ $queue = method_exists($event, 'onQueue') ? $event->onQueue() : null;
+
+ $this->resolveQueue()->connection($connection)->pushOn($queue, 'Illuminate\Broadcasting\BroadcastEvent', [
+ 'event' => serialize(clone $event),
+ ]);
+ }
+ }
+
+ /**
+ * Get all of the listeners for a given event name.
+ *
+ * @param string $eventName
+ * @return array
+ */
+ public function getListeners($eventName)
+ {
+ $wildcards = $this->getWildcardListeners($eventName);
+
+ if (! isset($this->sorted[$eventName])) {
+ $this->sortListeners($eventName);
+ }
+
+ return array_merge($this->sorted[$eventName], $wildcards);
+ }
+
+ /**
+ * Get the wildcard listeners for the event.
+ *
+ * @param string $eventName
+ * @return array
+ */
+ protected function getWildcardListeners($eventName)
+ {
+ $wildcards = [];
+
+ foreach ($this->wildcards as $key => $listeners) {
+ if (Str::is($key, $eventName)) {
+ $wildcards = array_merge($wildcards, $listeners);
+ }
+ }
+
+ return $wildcards;
+ }
+
+ /**
+ * Sort the listeners for a given event by priority.
+ *
+ * @param string $eventName
+ * @return array
+ */
+ protected function sortListeners($eventName)
+ {
+ $this->sorted[$eventName] = [];
+
+ // If listeners exist for the given event, we will sort them by the priority
+ // so that we can call them in the correct order. We will cache off these
+ // sorted event listeners so we do not have to re-sort on every events.
+ if (isset($this->listeners[$eventName])) {
+ krsort($this->listeners[$eventName]);
+
+ $this->sorted[$eventName] = call_user_func_array(
+ 'array_merge', $this->listeners[$eventName]
+ );
+ }
+ }
+
+ /**
+ * Register an event listener with the dispatcher.
+ *
+ * @param mixed $listener
+ * @return mixed
+ */
+ public function makeListener($listener)
+ {
+ return is_string($listener) ? $this->createClassListener($listener) : $listener;
+ }
+
+ /**
+ * Create a class based listener using the IoC container.
+ *
+ * @param mixed $listener
+ * @return \Closure
+ */
+ public function createClassListener($listener)
+ {
+ $container = $this->container;
+
+ return function () use ($listener, $container) {
+ return call_user_func_array(
+ $this->createClassCallable($listener, $container), func_get_args()
+ );
+ };
+ }
+
+ /**
+ * Create the class based event callable.
+ *
+ * @param string $listener
+ * @param \Illuminate\Container\Container $container
+ * @return callable
+ */
+ protected function createClassCallable($listener, $container)
+ {
+ list($class, $method) = $this->parseClassCallable($listener);
+
+ if ($this->handlerShouldBeQueued($class)) {
+ return $this->createQueuedHandlerCallable($class, $method);
+ } else {
+ return [$container->make($class), $method];
+ }
+ }
+
+ /**
+ * Parse the class listener into class and method.
+ *
+ * @param string $listener
+ * @return array
+ */
+ protected function parseClassCallable($listener)
+ {
+ $segments = explode('@', $listener);
+
+ return [$segments[0], count($segments) == 2 ? $segments[1] : 'handle'];
+ }
+
+ /**
+ * Determine if the event handler class should be queued.
+ *
+ * @param string $class
+ * @return bool
+ */
+ protected function handlerShouldBeQueued($class)
+ {
+ try {
+ return (new ReflectionClass($class))->implementsInterface(
+ 'Illuminate\Contracts\Queue\ShouldQueue'
+ );
+ } catch (Exception $e) {
+ return false;
+ }
+ }
+
+ /**
+ * Create a callable for putting an event handler on the queue.
+ *
+ * @param string $class
+ * @param string $method
+ * @return \Closure
+ */
+ protected function createQueuedHandlerCallable($class, $method)
+ {
+ return function () use ($class, $method) {
+ $arguments = $this->cloneArgumentsForQueueing(func_get_args());
+
+ if (method_exists($class, 'queue')) {
+ $this->callQueueMethodOnHandler($class, $method, $arguments);
+ } else {
+ $this->resolveQueue()->push('Illuminate\Events\CallQueuedHandler@call', [
+ 'class' => $class, 'method' => $method, 'data' => serialize($arguments),
+ ]);
+ }
+ };
+ }
+
+ /**
+ * Clone the given arguments for queueing.
+ *
+ * @param array $arguments
+ * @return array
+ */
+ protected function cloneArgumentsForQueueing(array $arguments)
+ {
+ return array_map(function ($a) {
+ return is_object($a) ? clone $a : $a;
+ }, $arguments);
+ }
+
+ /**
+ * Call the queue method on the handler class.
+ *
+ * @param string $class
+ * @param string $method
+ * @param array $arguments
+ * @return void
+ */
+ protected function callQueueMethodOnHandler($class, $method, $arguments)
+ {
+ $handler = (new ReflectionClass($class))->newInstanceWithoutConstructor();
+
+ $handler->queue($this->resolveQueue(), 'Illuminate\Events\CallQueuedHandler@call', [
+ 'class' => $class, 'method' => $method, 'data' => serialize($arguments),
+ ]);
+ }
+
+ /**
+ * Remove a set of listeners from the dispatcher.
+ *
+ * @param string $event
+ * @return void
+ */
+ public function forget($event)
+ {
+ if (Str::contains($event, '*')) {
+ unset($this->wildcards[$event]);
+ } else {
+ unset($this->listeners[$event], $this->sorted[$event]);
+ }
+ }
+
+ /**
+ * Forget all of the pushed listeners.
+ *
+ * @return void
+ */
+ public function forgetPushed()
+ {
+ foreach ($this->listeners as $key => $value) {
+ if (Str::endsWith($key, '_pushed')) {
+ $this->forget($key);
+ }
+ }
+ }
+
+ /**
+ * Get the queue implementation from the resolver.
+ *
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ protected function resolveQueue()
+ {
+ return call_user_func($this->queueResolver);
+ }
+
+ /**
+ * Set the queue resolver implementation.
+ *
+ * @param callable $resolver
+ * @return $this
+ */
+ public function setQueueResolver(callable $resolver)
+ {
+ $this->queueResolver = $resolver;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php
index 4d80c5a..54c24cd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php
@@ -1,23 +1,22 @@
-app->singleton('events', function($app)
- {
- return (new Dispatcher($app))->setQueueResolver(function() use ($app)
- {
- return $app->make('Illuminate\Contracts\Queue\Queue');
- });
- });
- }
+use Illuminate\Support\ServiceProvider;
+class EventServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('events', function ($app) {
+ return (new Dispatcher($app))->setQueueResolver(function () use ($app) {
+ return $app->make('Illuminate\Contracts\Queue\Factory');
+ });
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Events/composer.json b/application/vendor/laravel/framework/src/Illuminate/Events/composer.json
index 3c1bfe2..4cbe705 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Events/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Events/composer.json
@@ -14,10 +14,10 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/container": "5.0.*",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*"
+ "php": ">=5.5.9",
+ "illuminate/container": "5.1.*",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*"
},
"autoload": {
"psr-4": {
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Filesystem/ClassFinder.php b/application/vendor/laravel/framework/src/Illuminate/Filesystem/ClassFinder.php
index d8076b7..84f2c24 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Filesystem/ClassFinder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Filesystem/ClassFinder.php
@@ -1,157 +1,145 @@
-in($directory)->name('*.php') as $file)
- {
- $classes[] = $this->findClass($file->getRealPath());
- }
-
- return array_filter($classes);
- }
-
- /**
- * Extract the class name from the file at the given path.
- *
- * @param string $path
- * @return string|null
- */
- public function findClass($path)
- {
- $namespace = null;
-
- $tokens = token_get_all(file_get_contents($path));
-
- foreach ($tokens as $key => $token)
- {
- if ($this->tokenIsNamespace($token))
- {
- $namespace = $this->getNamespace($key + 2, $tokens);
- }
- elseif ($this->tokenIsClassOrInterface($token))
- {
- return ltrim($namespace.'\\'.$this->getClass($key + 2, $tokens), '\\');
- }
- }
- }
-
- /**
- * Find the namespace in the tokens starting at a given key.
- *
- * @param int $key
- * @param array $tokens
- * @return string
- */
- protected function getNamespace($key, array $tokens)
- {
- $namespace = null;
-
- $tokenCount = count($tokens);
-
- for ($i = $key; $i < $tokenCount; $i++)
- {
- if ($this->isPartOfNamespace($tokens[$i]))
- {
- $namespace .= $tokens[$i][1];
- }
- elseif ($tokens[$i] == ';')
- {
- return $namespace;
- }
- }
- }
-
- /**
- * Find the class in the tokens starting at a given key.
- *
- * @param int $key
- * @param array $tokens
- * @return string
- */
- protected function getClass($key, array $tokens)
- {
- $class = null;
-
- $tokenCount = count($tokens);
-
- for ($i = $key; $i < $tokenCount; $i++)
- {
- if ($this->isPartOfClass($tokens[$i]))
- {
- $class .= $tokens[$i][1];
- }
- elseif ($this->isWhitespace($tokens[$i]))
- {
- return $class;
- }
- }
- }
-
- /**
- * Determine if the given token is a namespace keyword.
- *
- * @param array|string $token
- * @return bool
- */
- protected function tokenIsNamespace($token)
- {
- return is_array($token) && $token[0] == T_NAMESPACE;
- }
-
- /**
- * Determine if the given token is a class or interface keyword.
- *
- * @param array|string $token
- * @return bool
- */
- protected function tokenIsClassOrInterface($token)
- {
- return is_array($token) && ($token[0] == T_CLASS || $token[0] == T_INTERFACE);
- }
-
- /**
- * Determine if the given token is part of the namespace.
- *
- * @param array|string $token
- * @return bool
- */
- protected function isPartOfNamespace($token)
- {
- return is_array($token) && ($token[0] == T_STRING || $token[0] == T_NS_SEPARATOR);
- }
-
- /**
- * Determine if the given token is part of the class.
- *
- * @param array|string $token
- * @return bool
- */
- protected function isPartOfClass($token)
- {
- return is_array($token) && $token[0] == T_STRING;
- }
-
- /**
- * Determine if the given token is whitespace.
- *
- * @param array|string $token
- * @return bool
- */
- protected function isWhitespace($token)
- {
- return is_array($token) && $token[0] == T_WHITESPACE;
- }
+use Symfony\Component\Finder\Finder;
+class ClassFinder
+{
+ /**
+ * Find all the class and interface names in a given directory.
+ *
+ * @param string $directory
+ * @return array
+ */
+ public function findClasses($directory)
+ {
+ $classes = [];
+
+ foreach (Finder::create()->in($directory)->name('*.php') as $file) {
+ $classes[] = $this->findClass($file->getRealPath());
+ }
+
+ return array_filter($classes);
+ }
+
+ /**
+ * Extract the class name from the file at the given path.
+ *
+ * @param string $path
+ * @return string|null
+ */
+ public function findClass($path)
+ {
+ $namespace = null;
+
+ $tokens = token_get_all(file_get_contents($path));
+
+ foreach ($tokens as $key => $token) {
+ if ($this->tokenIsNamespace($token)) {
+ $namespace = $this->getNamespace($key + 2, $tokens);
+ } elseif ($this->tokenIsClassOrInterface($token)) {
+ return ltrim($namespace.'\\'.$this->getClass($key + 2, $tokens), '\\');
+ }
+ }
+ }
+
+ /**
+ * Find the namespace in the tokens starting at a given key.
+ *
+ * @param int $key
+ * @param array $tokens
+ * @return string|null
+ */
+ protected function getNamespace($key, array $tokens)
+ {
+ $namespace = null;
+
+ $tokenCount = count($tokens);
+
+ for ($i = $key; $i < $tokenCount; $i++) {
+ if ($this->isPartOfNamespace($tokens[$i])) {
+ $namespace .= $tokens[$i][1];
+ } elseif ($tokens[$i] == ';') {
+ return $namespace;
+ }
+ }
+ }
+
+ /**
+ * Find the class in the tokens starting at a given key.
+ *
+ * @param int $key
+ * @param array $tokens
+ * @return string|null
+ */
+ protected function getClass($key, array $tokens)
+ {
+ $class = null;
+
+ $tokenCount = count($tokens);
+
+ for ($i = $key; $i < $tokenCount; $i++) {
+ if ($this->isPartOfClass($tokens[$i])) {
+ $class .= $tokens[$i][1];
+ } elseif ($this->isWhitespace($tokens[$i])) {
+ return $class;
+ }
+ }
+ }
+
+ /**
+ * Determine if the given token is a namespace keyword.
+ *
+ * @param array|string $token
+ * @return bool
+ */
+ protected function tokenIsNamespace($token)
+ {
+ return is_array($token) && $token[0] == T_NAMESPACE;
+ }
+
+ /**
+ * Determine if the given token is a class or interface keyword.
+ *
+ * @param array|string $token
+ * @return bool
+ */
+ protected function tokenIsClassOrInterface($token)
+ {
+ return is_array($token) && ($token[0] == T_CLASS || $token[0] == T_INTERFACE);
+ }
+
+ /**
+ * Determine if the given token is part of the namespace.
+ *
+ * @param array|string $token
+ * @return bool
+ */
+ protected function isPartOfNamespace($token)
+ {
+ return is_array($token) && ($token[0] == T_STRING || $token[0] == T_NS_SEPARATOR);
+ }
+
+ /**
+ * Determine if the given token is part of the class.
+ *
+ * @param array|string $token
+ * @return bool
+ */
+ protected function isPartOfClass($token)
+ {
+ return is_array($token) && $token[0] == T_STRING;
+ }
+
+ /**
+ * Determine if the given token is whitespace.
+ *
+ * @param array|string $token
+ * @return bool
+ */
+ protected function isWhitespace($token)
+ {
+ return is_array($token) && $token[0] == T_WHITESPACE;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php b/application/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
index b04bc9c..11eb46c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
@@ -1,4 +1,6 @@
-isFile($path)) return file_get_contents($path);
-
- throw new FileNotFoundException("File does not exist at path {$path}");
- }
-
- /**
- * Get the returned value of a file.
- *
- * @param string $path
- * @return mixed
- *
- * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
- */
- public function getRequire($path)
- {
- if ($this->isFile($path)) return require $path;
-
- throw new FileNotFoundException("File does not exist at path {$path}");
- }
-
- /**
- * Require the given file once.
- *
- * @param string $file
- * @return mixed
- */
- public function requireOnce($file)
- {
- require_once $file;
- }
-
- /**
- * Write the contents of a file.
- *
- * @param string $path
- * @param string $contents
- * @param bool $lock
- * @return int
- */
- public function put($path, $contents, $lock = false)
- {
- return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
- }
-
- /**
- * Prepend to a file.
- *
- * @param string $path
- * @param string $data
- * @return int
- */
- public function prepend($path, $data)
- {
- if ($this->exists($path))
- {
- return $this->put($path, $data.$this->get($path));
- }
-
- return $this->put($path, $data);
- }
-
- /**
- * Append to a file.
- *
- * @param string $path
- * @param string $data
- * @return int
- */
- public function append($path, $data)
- {
- return file_put_contents($path, $data, FILE_APPEND);
- }
-
- /**
- * Delete the file at a given path.
- *
- * @param string|array $paths
- * @return bool
- */
- public function delete($paths)
- {
- $paths = is_array($paths) ? $paths : func_get_args();
-
- $success = true;
-
- foreach ($paths as $path)
- {
- try
- {
- if ( ! @unlink($path))
- {
- $success = false;
- }
- }
- catch (ErrorException $e)
- {
- $success = false;
- }
- }
-
- return $success;
- }
-
- /**
- * Move a file to a new location.
- *
- * @param string $path
- * @param string $target
- * @return bool
- */
- public function move($path, $target)
- {
- return rename($path, $target);
- }
-
- /**
- * Copy a file to a new location.
- *
- * @param string $path
- * @param string $target
- * @return bool
- */
- public function copy($path, $target)
- {
- return copy($path, $target);
- }
-
- /**
- * Extract the file name from a file path.
- *
- * @param string $path
- * @return string
- */
- public function name($path)
- {
- return pathinfo($path, PATHINFO_FILENAME);
- }
-
- /**
- * Extract the file extension from a file path.
- *
- * @param string $path
- * @return string
- */
- public function extension($path)
- {
- return pathinfo($path, PATHINFO_EXTENSION);
- }
-
- /**
- * Get the file type of a given file.
- *
- * @param string $path
- * @return string
- */
- public function type($path)
- {
- return filetype($path);
- }
-
- /**
- * Get the mime-type of a given file.
- *
- * @param string $path
- * @return string|false
- */
- public function mimeType($path)
- {
- return finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
- }
-
- /**
- * Get the file size of a given file.
- *
- * @param string $path
- * @return int
- */
- public function size($path)
- {
- return filesize($path);
- }
-
- /**
- * Get the file's last modification time.
- *
- * @param string $path
- * @return int
- */
- public function lastModified($path)
- {
- return filemtime($path);
- }
-
- /**
- * Determine if the given path is a directory.
- *
- * @param string $directory
- * @return bool
- */
- public function isDirectory($directory)
- {
- return is_dir($directory);
- }
-
- /**
- * Determine if the given path is writable.
- *
- * @param string $path
- * @return bool
- */
- public function isWritable($path)
- {
- return is_writable($path);
- }
-
- /**
- * Determine if the given path is a file.
- *
- * @param string $file
- * @return bool
- */
- public function isFile($file)
- {
- return is_file($file);
- }
-
- /**
- * Find path names matching a given pattern.
- *
- * @param string $pattern
- * @param int $flags
- * @return array
- */
- public function glob($pattern, $flags = 0)
- {
- return glob($pattern, $flags);
- }
-
- /**
- * Get an array of all files in a directory.
- *
- * @param string $directory
- * @return array
- */
- public function files($directory)
- {
- $glob = glob($directory.'/*');
-
- if ($glob === false) return array();
-
- // To get the appropriate files, we'll simply glob the directory and filter
- // out any "files" that are not truly files so we do not end up with any
- // directories in our list, but only true files within the directory.
- return array_filter($glob, function($file)
- {
- return filetype($file) == 'file';
- });
- }
-
- /**
- * Get all of the files from the given directory (recursive).
- *
- * @param string $directory
- * @return array
- */
- public function allFiles($directory)
- {
- return iterator_to_array(Finder::create()->files()->in($directory), false);
- }
-
- /**
- * Get all of the directories within a given directory.
- *
- * @param string $directory
- * @return array
- */
- public function directories($directory)
- {
- $directories = array();
-
- foreach (Finder::create()->in($directory)->directories()->depth(0) as $dir)
- {
- $directories[] = $dir->getPathname();
- }
-
- return $directories;
- }
-
- /**
- * Create a directory.
- *
- * @param string $path
- * @param int $mode
- * @param bool $recursive
- * @param bool $force
- * @return bool
- */
- public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
- {
- if ($force)
- {
- return @mkdir($path, $mode, $recursive);
- }
-
- return mkdir($path, $mode, $recursive);
- }
-
- /**
- * Copy a directory from one location to another.
- *
- * @param string $directory
- * @param string $destination
- * @param int $options
- * @return bool
- */
- public function copyDirectory($directory, $destination, $options = null)
- {
- if ( ! $this->isDirectory($directory)) return false;
-
- $options = $options ?: FilesystemIterator::SKIP_DOTS;
-
- // If the destination directory does not actually exist, we will go ahead and
- // create it recursively, which just gets the destination prepared to copy
- // the files over. Once we make the directory we'll proceed the copying.
- if ( ! $this->isDirectory($destination))
- {
- $this->makeDirectory($destination, 0777, true);
- }
-
- $items = new FilesystemIterator($directory, $options);
-
- foreach ($items as $item)
- {
- // As we spin through items, we will check to see if the current file is actually
- // a directory or a file. When it is actually a directory we will need to call
- // back into this function recursively to keep copying these nested folders.
- $target = $destination.'/'.$item->getBasename();
-
- if ($item->isDir())
- {
- $path = $item->getPathname();
-
- if ( ! $this->copyDirectory($path, $target, $options)) return false;
- }
-
- // If the current items is just a regular file, we will just copy this to the new
- // location and keep looping. If for some reason the copy fails we'll bail out
- // and return false, so the developer is aware that the copy process failed.
- else
- {
- if ( ! $this->copy($item->getPathname(), $target)) return false;
- }
- }
-
- return true;
- }
-
- /**
- * Recursively delete a directory.
- *
- * The directory itself may be optionally preserved.
- *
- * @param string $directory
- * @param bool $preserve
- * @return bool
- */
- public function deleteDirectory($directory, $preserve = false)
- {
- if ( ! $this->isDirectory($directory)) return false;
-
- $items = new FilesystemIterator($directory);
-
- foreach ($items as $item)
- {
- // If the item is a directory, we can just recurse into the function and
- // delete that sub-directory otherwise we'll just delete the file and
- // keep iterating through each file until the directory is cleaned.
- if ($item->isDir() && ! $item->isLink())
- {
- $this->deleteDirectory($item->getPathname());
- }
-
- // If the item is just a file, we can go ahead and delete it since we're
- // just looping through and waxing all of the files in this directory
- // and calling directories recursively, so we delete the real path.
- else
- {
- $this->delete($item->getPathname());
- }
- }
-
- if ( ! $preserve) @rmdir($directory);
-
- return true;
- }
-
- /**
- * Empty the specified directory of all files and folders.
- *
- * @param string $directory
- * @return bool
- */
- public function cleanDirectory($directory)
- {
- return $this->deleteDirectory($directory, true);
- }
-
+class Filesystem
+{
+ use Macroable;
+
+ /**
+ * Determine if a file or directory exists.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function exists($path)
+ {
+ return file_exists($path);
+ }
+
+ /**
+ * Get the contents of a file.
+ *
+ * @param string $path
+ * @return string
+ *
+ * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+ */
+ public function get($path)
+ {
+ if ($this->isFile($path)) {
+ return file_get_contents($path);
+ }
+
+ throw new FileNotFoundException("File does not exist at path {$path}");
+ }
+
+ /**
+ * Get the returned value of a file.
+ *
+ * @param string $path
+ * @return mixed
+ *
+ * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+ */
+ public function getRequire($path)
+ {
+ if ($this->isFile($path)) {
+ return require $path;
+ }
+
+ throw new FileNotFoundException("File does not exist at path {$path}");
+ }
+
+ /**
+ * Require the given file once.
+ *
+ * @param string $file
+ * @return mixed
+ */
+ public function requireOnce($file)
+ {
+ require_once $file;
+ }
+
+ /**
+ * Write the contents of a file.
+ *
+ * @param string $path
+ * @param string $contents
+ * @param bool $lock
+ * @return int
+ */
+ public function put($path, $contents, $lock = false)
+ {
+ return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
+ }
+
+ /**
+ * Prepend to a file.
+ *
+ * @param string $path
+ * @param string $data
+ * @return int
+ */
+ public function prepend($path, $data)
+ {
+ if ($this->exists($path)) {
+ return $this->put($path, $data.$this->get($path));
+ }
+
+ return $this->put($path, $data);
+ }
+
+ /**
+ * Append to a file.
+ *
+ * @param string $path
+ * @param string $data
+ * @return int
+ */
+ public function append($path, $data)
+ {
+ return file_put_contents($path, $data, FILE_APPEND);
+ }
+
+ /**
+ * Delete the file at a given path.
+ *
+ * @param string|array $paths
+ * @return bool
+ */
+ public function delete($paths)
+ {
+ $paths = is_array($paths) ? $paths : func_get_args();
+
+ $success = true;
+
+ foreach ($paths as $path) {
+ try {
+ if (! @unlink($path)) {
+ $success = false;
+ }
+ } catch (ErrorException $e) {
+ $success = false;
+ }
+ }
+
+ return $success;
+ }
+
+ /**
+ * Move a file to a new location.
+ *
+ * @param string $path
+ * @param string $target
+ * @return bool
+ */
+ public function move($path, $target)
+ {
+ return rename($path, $target);
+ }
+
+ /**
+ * Copy a file to a new location.
+ *
+ * @param string $path
+ * @param string $target
+ * @return bool
+ */
+ public function copy($path, $target)
+ {
+ return copy($path, $target);
+ }
+
+ /**
+ * Extract the file name from a file path.
+ *
+ * @param string $path
+ * @return string
+ */
+ public function name($path)
+ {
+ return pathinfo($path, PATHINFO_FILENAME);
+ }
+
+ /**
+ * Extract the file extension from a file path.
+ *
+ * @param string $path
+ * @return string
+ */
+ public function extension($path)
+ {
+ return pathinfo($path, PATHINFO_EXTENSION);
+ }
+
+ /**
+ * Get the file type of a given file.
+ *
+ * @param string $path
+ * @return string
+ */
+ public function type($path)
+ {
+ return filetype($path);
+ }
+
+ /**
+ * Get the mime-type of a given file.
+ *
+ * @param string $path
+ * @return string|false
+ */
+ public function mimeType($path)
+ {
+ return finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
+ }
+
+ /**
+ * Get the file size of a given file.
+ *
+ * @param string $path
+ * @return int
+ */
+ public function size($path)
+ {
+ return filesize($path);
+ }
+
+ /**
+ * Get the file's last modification time.
+ *
+ * @param string $path
+ * @return int
+ */
+ public function lastModified($path)
+ {
+ return filemtime($path);
+ }
+
+ /**
+ * Determine if the given path is a directory.
+ *
+ * @param string $directory
+ * @return bool
+ */
+ public function isDirectory($directory)
+ {
+ return is_dir($directory);
+ }
+
+ /**
+ * Determine if the given path is writable.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isWritable($path)
+ {
+ return is_writable($path);
+ }
+
+ /**
+ * Determine if the given path is a file.
+ *
+ * @param string $file
+ * @return bool
+ */
+ public function isFile($file)
+ {
+ return is_file($file);
+ }
+
+ /**
+ * Find path names matching a given pattern.
+ *
+ * @param string $pattern
+ * @param int $flags
+ * @return array
+ */
+ public function glob($pattern, $flags = 0)
+ {
+ return glob($pattern, $flags);
+ }
+
+ /**
+ * Get an array of all files in a directory.
+ *
+ * @param string $directory
+ * @return array
+ */
+ public function files($directory)
+ {
+ $glob = glob($directory.'/*');
+
+ if ($glob === false) {
+ return [];
+ }
+
+ // To get the appropriate files, we'll simply glob the directory and filter
+ // out any "files" that are not truly files so we do not end up with any
+ // directories in our list, but only true files within the directory.
+ return array_filter($glob, function ($file) {
+ return filetype($file) == 'file';
+ });
+ }
+
+ /**
+ * Get all of the files from the given directory (recursive).
+ *
+ * @param string $directory
+ * @return array
+ */
+ public function allFiles($directory)
+ {
+ return iterator_to_array(Finder::create()->files()->in($directory), false);
+ }
+
+ /**
+ * Get all of the directories within a given directory.
+ *
+ * @param string $directory
+ * @return array
+ */
+ public function directories($directory)
+ {
+ $directories = [];
+
+ foreach (Finder::create()->in($directory)->directories()->depth(0) as $dir) {
+ $directories[] = $dir->getPathname();
+ }
+
+ return $directories;
+ }
+
+ /**
+ * Create a directory.
+ *
+ * @param string $path
+ * @param int $mode
+ * @param bool $recursive
+ * @param bool $force
+ * @return bool
+ */
+ public function makeDirectory($path, $mode = 0755, $recursive = false, $force = false)
+ {
+ if ($force) {
+ return @mkdir($path, $mode, $recursive);
+ }
+
+ return mkdir($path, $mode, $recursive);
+ }
+
+ /**
+ * Copy a directory from one location to another.
+ *
+ * @param string $directory
+ * @param string $destination
+ * @param int $options
+ * @return bool
+ */
+ public function copyDirectory($directory, $destination, $options = null)
+ {
+ if (! $this->isDirectory($directory)) {
+ return false;
+ }
+
+ $options = $options ?: FilesystemIterator::SKIP_DOTS;
+
+ // If the destination directory does not actually exist, we will go ahead and
+ // create it recursively, which just gets the destination prepared to copy
+ // the files over. Once we make the directory we'll proceed the copying.
+ if (! $this->isDirectory($destination)) {
+ $this->makeDirectory($destination, 0777, true);
+ }
+
+ $items = new FilesystemIterator($directory, $options);
+
+ foreach ($items as $item) {
+ // As we spin through items, we will check to see if the current file is actually
+ // a directory or a file. When it is actually a directory we will need to call
+ // back into this function recursively to keep copying these nested folders.
+ $target = $destination.'/'.$item->getBasename();
+
+ if ($item->isDir()) {
+ $path = $item->getPathname();
+
+ if (! $this->copyDirectory($path, $target, $options)) {
+ return false;
+ }
+ }
+
+ // If the current items is just a regular file, we will just copy this to the new
+ // location and keep looping. If for some reason the copy fails we'll bail out
+ // and return false, so the developer is aware that the copy process failed.
+ else {
+ if (! $this->copy($item->getPathname(), $target)) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Recursively delete a directory.
+ *
+ * The directory itself may be optionally preserved.
+ *
+ * @param string $directory
+ * @param bool $preserve
+ * @return bool
+ */
+ public function deleteDirectory($directory, $preserve = false)
+ {
+ if (! $this->isDirectory($directory)) {
+ return false;
+ }
+
+ $items = new FilesystemIterator($directory);
+
+ foreach ($items as $item) {
+ // If the item is a directory, we can just recurse into the function and
+ // delete that sub-directory otherwise we'll just delete the file and
+ // keep iterating through each file until the directory is cleaned.
+ if ($item->isDir() && ! $item->isLink()) {
+ $this->deleteDirectory($item->getPathname());
+ }
+
+ // If the item is just a file, we can go ahead and delete it since we're
+ // just looping through and waxing all of the files in this directory
+ // and calling directories recursively, so we delete the real path.
+ else {
+ $this->delete($item->getPathname());
+ }
+ }
+
+ if (! $preserve) {
+ @rmdir($directory);
+ }
+
+ return true;
+ }
+
+ /**
+ * Empty the specified directory of all files and folders.
+ *
+ * @param string $directory
+ * @return bool
+ */
+ public function cleanDirectory($directory)
+ {
+ return $this->deleteDirectory($directory, true);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php b/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php
index cf10ced..bb92370 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -1,332 +1,352 @@
-driver = $driver;
- }
-
- /**
- * Determine if a file exists.
- *
- * @param string $path
- * @return bool
- */
- public function exists($path)
- {
- return $this->driver->has($path);
- }
-
- /**
- * Get the contents of a file.
- *
- * @param string $path
- * @return string
- *
- * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
- */
- public function get($path)
- {
- try
- {
- return $this->driver->read($path);
- }
- catch (FileNotFoundException $e)
- {
- throw new ContractFileNotFoundException($path, $e->getCode(), $e);
- }
- }
-
- /**
- * Write the contents of a file.
- *
- * @param string $path
- * @param string|resource $contents
- * @param string $visibility
- * @return bool
- */
- public function put($path, $contents, $visibility = null)
- {
- $config = ['visibility' => $this->parseVisibility($visibility)];
-
- if (is_resource($contents))
- {
- return $this->driver->putStream($path, $contents, $config);
- }
- else
- {
- return $this->driver->put($path, $contents, $config);
- }
- }
-
- /**
- * Get the visibility for the given path.
- *
- * @param string $path
- * @return string
- */
- public function getVisibility($path)
- {
- if ($this->driver->getVisibility($path) == AdapterInterface::VISIBILITY_PUBLIC)
- {
- return FilesystemContract::VISIBILITY_PUBLIC;
- }
-
- return FilesystemContract::VISIBILITY_PRIVATE;
- }
-
- /**
- * Set the visibility for the given path.
- *
- * @param string $path
- * @param string $visibility
- * @return void
- */
- public function setVisibility($path, $visibility)
- {
- return $this->driver->setVisibility($path, $this->parseVisibility($visibility));
- }
-
- /**
- * Prepend to a file.
- *
- * @param string $path
- * @param string $data
- * @return int
- */
- public function prepend($path, $data)
- {
- return $this->put($path, $data.PHP_EOL.$this->get($path));
- }
-
- /**
- * Append to a file.
- *
- * @param string $path
- * @param string $data
- * @return int
- */
- public function append($path, $data)
- {
- return $this->put($path, $this->get($path).PHP_EOL.$data);
- }
-
- /**
- * Delete the file at a given path.
- *
- * @param string|array $paths
- * @return bool
- */
- public function delete($paths)
- {
- $paths = is_array($paths) ? $paths : func_get_args();
-
- foreach ($paths as $path)
- {
- $this->driver->delete($path);
- }
-
- return true;
- }
-
- /**
- * Copy a file to a new location.
- *
- * @param string $from
- * @param string $to
- * @return bool
- */
- public function copy($from, $to)
- {
- return $this->driver->copy($from, $to);
- }
-
- /**
- * Move a file to a new location.
- *
- * @param string $from
- * @param string $to
- * @return bool
- */
- public function move($from, $to)
- {
- return $this->driver->rename($from, $to);
- }
-
- /**
- * Get the file size of a given file.
- *
- * @param string $path
- * @return int
- */
- public function size($path)
- {
- return $this->driver->getSize($path);
- }
-
- /**
- * Get the mime-type of a given file.
- *
- * @param string $path
- * @return string|false
- */
- public function mimeType($path)
- {
- return $this->driver->getMimetype($path);
- }
-
- /**
- * Get the file's last modification time.
- *
- * @param string $path
- * @return int
- */
- public function lastModified($path)
- {
- return $this->driver->getTimestamp($path);
- }
-
- /**
- * Get an array of all files in a directory.
- *
- * @param string|null $directory
- * @param bool $recursive
- * @return array
- */
- public function files($directory = null, $recursive = false)
- {
- $contents = $this->driver->listContents($directory, $recursive);
-
- return $this->filterContentsByType($contents, 'file');
- }
-
- /**
- * Get all of the files from the given directory (recursive).
- *
- * @param string|null $directory
- * @return array
- */
- public function allFiles($directory = null)
- {
- return $this->files($directory, true);
- }
-
- /**
- * Get all of the directories within a given directory.
- *
- * @param string|null $directory
- * @param bool $recursive
- * @return array
- */
- public function directories($directory = null, $recursive = false)
- {
- $contents = $this->driver->listContents($directory, $recursive);
-
- return $this->filterContentsByType($contents, 'dir');
- }
-
- /**
- * Get all (recursive) of the directories within a given directory.
- *
- * @param string|null $directory
- * @return array
- */
- public function allDirectories($directory = null)
- {
- return $this->directories($directory, true);
- }
-
- /**
- * Create a directory.
- *
- * @param string $path
- * @return bool
- */
- public function makeDirectory($path)
- {
- return $this->driver->createDir($path);
- }
-
- /**
- * Recursively delete a directory.
- *
- * @param string $directory
- * @return bool
- */
- public function deleteDirectory($directory)
- {
- return $this->driver->deleteDir($directory);
- }
-
- /**
- * Get the Flysystem driver.
- *
- * @return \League\Flysystem\FilesystemInterface
- */
- public function getDriver()
- {
- return $this->driver;
- }
-
- /**
- * Filter directory contents by type.
- *
- * @param array $contents
- * @param string $type
- * @return array
- */
- protected function filterContentsByType($contents, $type)
- {
- return Collection::make($contents)
- ->where('type', $type)
- ->fetch('path')
- ->values()->all();
- }
-
- /**
- * Parse the given visibility value.
- *
- * @param string|null $visibility
- * @return string
- * @throws \InvalidArgumentException
- */
- protected function parseVisibility($visibility)
- {
- if (is_null($visibility)) return;
-
- switch ($visibility)
- {
- case FilesystemContract::VISIBILITY_PUBLIC:
- return AdapterInterface::VISIBILITY_PUBLIC;
-
- case FilesystemContract::VISIBILITY_PRIVATE:
- return AdapterInterface::VISIBILITY_PRIVATE;
- }
-
- throw new InvalidArgumentException('Unknown visibility: '.$visibility);
- }
-
+class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
+{
+ /**
+ * The Flysystem filesystem implementation.
+ *
+ * @var \League\Flysystem\FilesystemInterface
+ */
+ protected $driver;
+
+ /**
+ * Create a new filesystem adapter instance.
+ *
+ * @param \League\Flysystem\FilesystemInterface $driver
+ * @return void
+ */
+ public function __construct(FilesystemInterface $driver)
+ {
+ $this->driver = $driver;
+ }
+
+ /**
+ * Determine if a file exists.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function exists($path)
+ {
+ return $this->driver->has($path);
+ }
+
+ /**
+ * Get the contents of a file.
+ *
+ * @param string $path
+ * @return string
+ *
+ * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+ */
+ public function get($path)
+ {
+ try {
+ return $this->driver->read($path);
+ } catch (FileNotFoundException $e) {
+ throw new ContractFileNotFoundException($path, $e->getCode(), $e);
+ }
+ }
+
+ /**
+ * Write the contents of a file.
+ *
+ * @param string $path
+ * @param string|resource $contents
+ * @param string $visibility
+ * @return bool
+ */
+ public function put($path, $contents, $visibility = null)
+ {
+ if ($visibility = $this->parseVisibility($visibility)) {
+ $config = ['visibility' => $visibility];
+ } else {
+ $config = [];
+ }
+
+ if (is_resource($contents)) {
+ return $this->driver->putStream($path, $contents, $config);
+ } else {
+ return $this->driver->put($path, $contents, $config);
+ }
+ }
+
+ /**
+ * Get the visibility for the given path.
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getVisibility($path)
+ {
+ if ($this->driver->getVisibility($path) == AdapterInterface::VISIBILITY_PUBLIC) {
+ return FilesystemContract::VISIBILITY_PUBLIC;
+ }
+
+ return FilesystemContract::VISIBILITY_PRIVATE;
+ }
+
+ /**
+ * Set the visibility for the given path.
+ *
+ * @param string $path
+ * @param string $visibility
+ * @return void
+ */
+ public function setVisibility($path, $visibility)
+ {
+ return $this->driver->setVisibility($path, $this->parseVisibility($visibility));
+ }
+
+ /**
+ * Prepend to a file.
+ *
+ * @param string $path
+ * @param string $data
+ * @return int
+ */
+ public function prepend($path, $data)
+ {
+ if ($this->exists($path)) {
+ return $this->put($path, $data.PHP_EOL.$this->get($path));
+ }
+
+ return $this->put($path, $data);
+ }
+
+ /**
+ * Append to a file.
+ *
+ * @param string $path
+ * @param string $data
+ * @return int
+ */
+ public function append($path, $data)
+ {
+ if ($this->exists($path)) {
+ return $this->put($path, $this->get($path).PHP_EOL.$data);
+ }
+
+ return $this->put($path, $data);
+ }
+
+ /**
+ * Delete the file at a given path.
+ *
+ * @param string|array $paths
+ * @return bool
+ */
+ public function delete($paths)
+ {
+ $paths = is_array($paths) ? $paths : func_get_args();
+
+ foreach ($paths as $path) {
+ $this->driver->delete($path);
+ }
+
+ return true;
+ }
+
+ /**
+ * Copy a file to a new location.
+ *
+ * @param string $from
+ * @param string $to
+ * @return bool
+ */
+ public function copy($from, $to)
+ {
+ return $this->driver->copy($from, $to);
+ }
+
+ /**
+ * Move a file to a new location.
+ *
+ * @param string $from
+ * @param string $to
+ * @return bool
+ */
+ public function move($from, $to)
+ {
+ return $this->driver->rename($from, $to);
+ }
+
+ /**
+ * Get the file size of a given file.
+ *
+ * @param string $path
+ * @return int
+ */
+ public function size($path)
+ {
+ return $this->driver->getSize($path);
+ }
+
+ /**
+ * Get the mime-type of a given file.
+ *
+ * @param string $path
+ * @return string|false
+ */
+ public function mimeType($path)
+ {
+ return $this->driver->getMimetype($path);
+ }
+
+ /**
+ * Get the file's last modification time.
+ *
+ * @param string $path
+ * @return int
+ */
+ public function lastModified($path)
+ {
+ return $this->driver->getTimestamp($path);
+ }
+
+ /**
+ * Get an array of all files in a directory.
+ *
+ * @param string|null $directory
+ * @param bool $recursive
+ * @return array
+ */
+ public function files($directory = null, $recursive = false)
+ {
+ $contents = $this->driver->listContents($directory, $recursive);
+
+ return $this->filterContentsByType($contents, 'file');
+ }
+
+ /**
+ * Get all of the files from the given directory (recursive).
+ *
+ * @param string|null $directory
+ * @return array
+ */
+ public function allFiles($directory = null)
+ {
+ return $this->files($directory, true);
+ }
+
+ /**
+ * Get all of the directories within a given directory.
+ *
+ * @param string|null $directory
+ * @param bool $recursive
+ * @return array
+ */
+ public function directories($directory = null, $recursive = false)
+ {
+ $contents = $this->driver->listContents($directory, $recursive);
+
+ return $this->filterContentsByType($contents, 'dir');
+ }
+
+ /**
+ * Get all (recursive) of the directories within a given directory.
+ *
+ * @param string|null $directory
+ * @return array
+ */
+ public function allDirectories($directory = null)
+ {
+ return $this->directories($directory, true);
+ }
+
+ /**
+ * Create a directory.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function makeDirectory($path)
+ {
+ return $this->driver->createDir($path);
+ }
+
+ /**
+ * Recursively delete a directory.
+ *
+ * @param string $directory
+ * @return bool
+ */
+ public function deleteDirectory($directory)
+ {
+ return $this->driver->deleteDir($directory);
+ }
+
+ /**
+ * Get the Flysystem driver.
+ *
+ * @return \League\Flysystem\FilesystemInterface
+ */
+ public function getDriver()
+ {
+ return $this->driver;
+ }
+
+ /**
+ * Filter directory contents by type.
+ *
+ * @param array $contents
+ * @param string $type
+ * @return array
+ */
+ protected function filterContentsByType($contents, $type)
+ {
+ return Collection::make($contents)
+ ->where('type', $type)
+ ->pluck('path')
+ ->values()
+ ->all();
+ }
+
+ /**
+ * Parse the given visibility value.
+ *
+ * @param string|null $visibility
+ * @return string|null
+ * @throws \InvalidArgumentException
+ */
+ protected function parseVisibility($visibility)
+ {
+ if (is_null($visibility)) {
+ return;
+ }
+
+ switch ($visibility) {
+ case FilesystemContract::VISIBILITY_PUBLIC:
+ return AdapterInterface::VISIBILITY_PUBLIC;
+ case FilesystemContract::VISIBILITY_PRIVATE:
+ return AdapterInterface::VISIBILITY_PRIVATE;
+ }
+
+ throw new InvalidArgumentException('Unknown visibility: '.$visibility);
+ }
+
+ /**
+ * Pass dynamic methods call onto Flysystem.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ *
+ * @throws \BadMethodCallException
+ */
+ public function __call($method, array $parameters)
+ {
+ return call_user_func_array([$this->driver, $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php b/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php
index be6aa4a..961c624 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php
@@ -1,235 +1,304 @@
-app = $app;
- }
-
- /**
- * Get a filesystem instance.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Filesystem\Filesystem
- */
- public function drive($name = null)
- {
- return $this->disk($name);
- }
-
- /**
- * Get a filesystem instance.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Filesystem\Filesystem
- */
- public function disk($name = null)
- {
- $name = $name ?: $this->getDefaultDriver();
-
- return $this->disks[$name] = $this->get($name);
- }
-
- /**
- * Attempt to get the disk from the local cache.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Filesystem\Filesystem
- */
- protected function get($name)
- {
- return isset($this->disks[$name]) ? $this->disks[$name] : $this->resolve($name);
- }
-
- /**
- * Resolve the given disk.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Filesystem\Filesystem
- */
- protected function resolve($name)
- {
- $config = $this->getConfig($name);
-
- if (isset($this->customCreators[$config['driver']]))
- {
- return $this->callCustomCreator($config);
- }
-
- return $this->{"create".ucfirst($config['driver'])."Driver"}($config);
- }
-
- /**
- * Call a custom driver creator.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Filesystem\Filesystem
- */
- protected function callCustomCreator(array $config)
- {
- $driver = $this->customCreators[$config['driver']]($this->app, $config);
-
- if ($driver instanceof FilesystemInterface)
- {
- return $this->adapt($driver);
- }
-
- return $driver;
- }
-
- /**
- * Create an instance of the local driver.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Filesystem\Filesystem
- */
- public function createLocalDriver(array $config)
- {
- return $this->adapt(new Flysystem(new LocalAdapter($config['root'])));
- }
-
- /**
- * Create an instance of the Amazon S3 driver.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Filesystem\Cloud
- */
- public function createS3Driver(array $config)
- {
- $s3Config = array_only($config, ['key', 'region', 'secret', 'signature', 'base_url']);
-
- return $this->adapt(
- new Flysystem(new S3Adapter(S3Client::factory($s3Config), $config['bucket']))
- );
- }
-
- /**
- * Create an instance of the Rackspace driver.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Filesystem\Cloud
- */
- public function createRackspaceDriver(array $config)
- {
- $client = new Rackspace($config['endpoint'], [
- 'username' => $config['username'], 'apiKey' => $config['key'],
- ]);
-
- return $this->adapt(new Flysystem(
- new RackspaceAdapter($this->getRackspaceContainer($client, $config))
- ));
- }
-
- /**
- * Get the Rackspace Cloud Files container.
- *
- * @param Rackspace $client
- * @param array $config
- * @return \OpenCloud\ObjectStore\Resource\Container
- */
- protected function getRackspaceContainer(Rackspace $client, array $config)
- {
- $urlType = array_get($config, 'url_type');
-
- $store = $client->objectStoreService('cloudFiles', $config['region'], $urlType);
-
- return $store->getContainer($config['container']);
- }
-
- /**
- * Adapt the filesystem implementation.
- *
- * @param \League\Flysystem\FilesystemInterface $filesystem
- * @return \Illuminate\Contracts\Filesystem\Filesystem
- */
- protected function adapt(FilesystemInterface $filesystem)
- {
- return new FilesystemAdapter($filesystem);
- }
-
- /**
- * Get the filesystem connection configuration.
- *
- * @param string $name
- * @return array
- */
- protected function getConfig($name)
- {
- return $this->app['config']["filesystems.disks.{$name}"];
- }
-
- /**
- * Get the default driver name.
- *
- * @return string
- */
- public function getDefaultDriver()
- {
- return $this->app['config']['filesystems.default'];
- }
-
- /**
- * Register a custom driver creator Closure.
- *
- * @param string $driver
- * @param \Closure $callback
- * @return $this
- */
- public function extend($driver, Closure $callback)
- {
- $this->customCreators[$driver] = $callback;
-
- return $this;
- }
-
- /**
- * Dynamically call the default driver instance.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array(array($this->disk(), $method), $parameters);
- }
+class FilesystemManager implements FactoryContract
+{
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The array of resolved filesystem drivers.
+ *
+ * @var array
+ */
+ protected $disks = [];
+
+ /**
+ * The registered custom driver creators.
+ *
+ * @var array
+ */
+ protected $customCreators = [];
+
+ /**
+ * Create a new filesystem manager instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function __construct($app)
+ {
+ $this->app = $app;
+ }
+
+ /**
+ * Get a filesystem instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ */
+ public function drive($name = null)
+ {
+ return $this->disk($name);
+ }
+
+ /**
+ * Get a filesystem instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ */
+ public function disk($name = null)
+ {
+ $name = $name ?: $this->getDefaultDriver();
+
+ return $this->disks[$name] = $this->get($name);
+ }
+
+ /**
+ * Attempt to get the disk from the local cache.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ */
+ protected function get($name)
+ {
+ return isset($this->disks[$name]) ? $this->disks[$name] : $this->resolve($name);
+ }
+
+ /**
+ * Resolve the given disk.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function resolve($name)
+ {
+ $config = $this->getConfig($name);
+
+ if (isset($this->customCreators[$config['driver']])) {
+ return $this->callCustomCreator($config);
+ }
+
+ $driverMethod = 'create'.ucfirst($config['driver']).'Driver';
+
+ if (method_exists($this, $driverMethod)) {
+ return $this->{$driverMethod}($config);
+ } else {
+ throw new InvalidArgumentException("Driver [{$config['driver']}] not supported.");
+ }
+ }
+
+ /**
+ * Call a custom driver creator.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ */
+ protected function callCustomCreator(array $config)
+ {
+ $driver = $this->customCreators[$config['driver']]($this->app, $config);
+
+ if ($driver instanceof FilesystemInterface) {
+ return $this->adapt($driver);
+ }
+
+ return $driver;
+ }
+
+ /**
+ * Create an instance of the local driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ */
+ public function createLocalDriver(array $config)
+ {
+ $permissions = isset($config['permissions']) ? $config['permissions'] : [];
+
+ $links = Arr::get($config, 'links') === 'skip'
+ ? LocalAdapter::SKIP_LINKS
+ : LocalAdapter::DISALLOW_LINKS;
+
+ return $this->adapt($this->createFlysystem(new LocalAdapter(
+ $config['root'], LOCK_EX, $links, $permissions
+ ), $config));
+ }
+
+ /**
+ * Create an instance of the ftp driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ */
+ public function createFtpDriver(array $config)
+ {
+ $ftpConfig = Arr::only($config, [
+ 'host', 'username', 'password', 'port', 'root', 'passive', 'ssl', 'timeout',
+ ]);
+
+ return $this->adapt($this->createFlysystem(
+ new FtpAdapter($ftpConfig), $config
+ ));
+ }
+
+ /**
+ * Create an instance of the Amazon S3 driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Filesystem\Cloud
+ */
+ public function createS3Driver(array $config)
+ {
+ $s3Config = $this->formatS3Config($config);
+
+ $root = isset($s3Config['root']) ? $s3Config['root'] : null;
+
+ return $this->adapt($this->createFlysystem(
+ new S3Adapter(new S3Client($s3Config), $s3Config['bucket'], $root), $config
+ ));
+ }
+
+ /**
+ * Format the given S3 configuration with the default options.
+ *
+ * @param array $config
+ * @return array
+ */
+ protected function formatS3Config(array $config)
+ {
+ $config += ['version' => 'latest'];
+
+ if ($config['key'] && $config['secret']) {
+ $config['credentials'] = Arr::only($config, ['key', 'secret']);
+ }
+
+ return $config;
+ }
+
+ /**
+ * Create an instance of the Rackspace driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Filesystem\Cloud
+ */
+ public function createRackspaceDriver(array $config)
+ {
+ $client = new Rackspace($config['endpoint'], [
+ 'username' => $config['username'], 'apiKey' => $config['key'],
+ ]);
+
+ return $this->adapt($this->createFlysystem(
+ new RackspaceAdapter($this->getRackspaceContainer($client, $config)), $config
+ ));
+ }
+
+ /**
+ * Get the Rackspace Cloud Files container.
+ *
+ * @param \OpenCloud\Rackspace $client
+ * @param array $config
+ * @return \OpenCloud\ObjectStore\Resource\Container
+ */
+ protected function getRackspaceContainer(Rackspace $client, array $config)
+ {
+ $urlType = Arr::get($config, 'url_type');
+
+ $store = $client->objectStoreService('cloudFiles', $config['region'], $urlType);
+
+ return $store->getContainer($config['container']);
+ }
+
+ /**
+ * Create a Flysystem instance with the given adapter.
+ *
+ * @param \League\Flysystem\AdapterInterface $adapter
+ * @param array $config
+ * @return \League\Flysystem\FlysystemInterface
+ */
+ protected function createFlysystem(AdapterInterface $adapter, array $config)
+ {
+ $config = Arr::only($config, ['visibility', 'disable_asserts']);
+
+ return new Flysystem($adapter, count($config) > 0 ? $config : null);
+ }
+
+ /**
+ * Adapt the filesystem implementation.
+ *
+ * @param \League\Flysystem\FilesystemInterface $filesystem
+ * @return \Illuminate\Contracts\Filesystem\Filesystem
+ */
+ protected function adapt(FilesystemInterface $filesystem)
+ {
+ return new FilesystemAdapter($filesystem);
+ }
+
+ /**
+ * Get the filesystem connection configuration.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function getConfig($name)
+ {
+ return $this->app['config']["filesystems.disks.{$name}"];
+ }
+
+ /**
+ * Get the default driver name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['filesystems.default'];
+ }
+
+ /**
+ * Register a custom driver creator Closure.
+ *
+ * @param string $driver
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function extend($driver, Closure $callback)
+ {
+ $this->customCreators[$driver] = $callback;
+
+ return $this;
+ }
+ /**
+ * Dynamically call the default driver instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->disk(), $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php
index c2170b0..6932270 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php
@@ -1,82 +1,82 @@
-registerNativeFilesystem();
+use Illuminate\Support\ServiceProvider;
- $this->registerFlysystem();
- }
+class FilesystemServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerNativeFilesystem();
- /**
- * Register the native filesystem implementation.
- *
- * @return void
- */
- protected function registerNativeFilesystem()
- {
- $this->app->singleton('files', function() { return new Filesystem; });
- }
+ $this->registerFlysystem();
+ }
- /**
- * Register the driver based filesystem.
- *
- * @return void
- */
- protected function registerFlysystem()
- {
- $this->registerManager();
+ /**
+ * Register the native filesystem implementation.
+ *
+ * @return void
+ */
+ protected function registerNativeFilesystem()
+ {
+ $this->app->singleton('files', function () {
+ return new Filesystem;
+ });
+ }
- $this->app->singleton('filesystem.disk', function()
- {
- return $this->app['filesystem']->disk($this->getDefaultDriver());
- });
+ /**
+ * Register the driver based filesystem.
+ *
+ * @return void
+ */
+ protected function registerFlysystem()
+ {
+ $this->registerManager();
- $this->app->singleton('filesystem.cloud', function()
- {
- return $this->app['filesystem']->disk($this->getCloudDriver());
- });
- }
+ $this->app->singleton('filesystem.disk', function () {
+ return $this->app['filesystem']->disk($this->getDefaultDriver());
+ });
- /**
- * Register the filesystem manager.
- *
- * @return void
- */
- protected function registerManager()
- {
- $this->app->singleton('filesystem', function()
- {
- return new FilesystemManager($this->app);
- });
- }
+ $this->app->singleton('filesystem.cloud', function () {
+ return $this->app['filesystem']->disk($this->getCloudDriver());
+ });
+ }
- /**
- * Get the default file driver.
- *
- * @return string
- */
- protected function getDefaultDriver()
- {
- return $this->app['config']['filesystems.default'];
- }
+ /**
+ * Register the filesystem manager.
+ *
+ * @return void
+ */
+ protected function registerManager()
+ {
+ $this->app->singleton('filesystem', function () {
+ return new FilesystemManager($this->app);
+ });
+ }
- /**
- * Get the default cloud based file driver.
- *
- * @return string
- */
- protected function getCloudDriver()
- {
- return $this->app['config']['filesystems.cloud'];
- }
+ /**
+ * Get the default file driver.
+ *
+ * @return string
+ */
+ protected function getDefaultDriver()
+ {
+ return $this->app['config']['filesystems.default'];
+ }
+ /**
+ * Get the default cloud based file driver.
+ *
+ * @return string
+ */
+ protected function getCloudDriver()
+ {
+ return $this->app['config']['filesystems.cloud'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json b/application/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json
index fa07dca..a00fa40 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json
@@ -14,11 +14,10 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/finder": "2.6.*",
- "league/flysystem": "~1.0"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/finder": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -27,11 +26,12 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "league/flysystem-aws-s3-v2": "Required to use the Flysystem S3 driver (~1.0).",
+ "league/flysystem": "Required to use the Flysystem local and FTP drivers (~1.0).",
+ "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0)."
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php
index bd08417..c0fabc7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php
@@ -1,167 +1,168 @@
-aliases = $aliases;
- }
-
- /**
- * Get or create the singleton alias loader instance.
- *
- * @param array $aliases
- * @return \Illuminate\Foundation\AliasLoader
- */
- public static function getInstance(array $aliases = array())
- {
- if (is_null(static::$instance)) return static::$instance = new static($aliases);
-
- $aliases = array_merge(static::$instance->getAliases(), $aliases);
-
- static::$instance->setAliases($aliases);
-
- return static::$instance;
- }
-
- /**
- * Load a class alias if it is registered.
- *
- * @param string $alias
- * @return void
- */
- public function load($alias)
- {
- if (isset($this->aliases[$alias]))
- {
- return class_alias($this->aliases[$alias], $alias);
- }
- }
-
- /**
- * Add an alias to the loader.
- *
- * @param string $class
- * @param string $alias
- * @return void
- */
- public function alias($class, $alias)
- {
- $this->aliases[$class] = $alias;
- }
-
- /**
- * Register the loader on the auto-loader stack.
- *
- * @return void
- */
- public function register()
- {
- if ( ! $this->registered)
- {
- $this->prependToLoaderStack();
-
- $this->registered = true;
- }
- }
-
- /**
- * Prepend the load method to the auto-loader stack.
- *
- * @return void
- */
- protected function prependToLoaderStack()
- {
- spl_autoload_register(array($this, 'load'), true, true);
- }
-
- /**
- * Get the registered aliases.
- *
- * @return array
- */
- public function getAliases()
- {
- return $this->aliases;
- }
-
- /**
- * Set the registered aliases.
- *
- * @param array $aliases
- * @return void
- */
- public function setAliases(array $aliases)
- {
- $this->aliases = $aliases;
- }
-
- /**
- * Indicates if the loader has been registered.
- *
- * @return bool
- */
- public function isRegistered()
- {
- return $this->registered;
- }
-
- /**
- * Set the "registered" state of the loader.
- *
- * @param bool $value
- * @return void
- */
- public function setRegistered($value)
- {
- $this->registered = $value;
- }
-
- /**
- * Set the value of the singleton alias loader.
- *
- * @param \Illuminate\Foundation\AliasLoader $loader
- * @return void
- */
- public static function setInstance($loader)
- {
- static::$instance = $loader;
- }
-
- /**
- * Clone method.
- *
- * @return void
- */
- private function __clone()
- {
- //
- }
-
+aliases = $aliases;
+ }
+
+ /**
+ * Get or create the singleton alias loader instance.
+ *
+ * @param array $aliases
+ * @return \Illuminate\Foundation\AliasLoader
+ */
+ public static function getInstance(array $aliases = [])
+ {
+ if (is_null(static::$instance)) {
+ return static::$instance = new static($aliases);
+ }
+
+ $aliases = array_merge(static::$instance->getAliases(), $aliases);
+
+ static::$instance->setAliases($aliases);
+
+ return static::$instance;
+ }
+
+ /**
+ * Load a class alias if it is registered.
+ *
+ * @param string $alias
+ * @return bool|null
+ */
+ public function load($alias)
+ {
+ if (isset($this->aliases[$alias])) {
+ return class_alias($this->aliases[$alias], $alias);
+ }
+ }
+
+ /**
+ * Add an alias to the loader.
+ *
+ * @param string $class
+ * @param string $alias
+ * @return void
+ */
+ public function alias($class, $alias)
+ {
+ $this->aliases[$class] = $alias;
+ }
+
+ /**
+ * Register the loader on the auto-loader stack.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ if (! $this->registered) {
+ $this->prependToLoaderStack();
+
+ $this->registered = true;
+ }
+ }
+
+ /**
+ * Prepend the load method to the auto-loader stack.
+ *
+ * @return void
+ */
+ protected function prependToLoaderStack()
+ {
+ spl_autoload_register([$this, 'load'], true, true);
+ }
+
+ /**
+ * Get the registered aliases.
+ *
+ * @return array
+ */
+ public function getAliases()
+ {
+ return $this->aliases;
+ }
+
+ /**
+ * Set the registered aliases.
+ *
+ * @param array $aliases
+ * @return void
+ */
+ public function setAliases(array $aliases)
+ {
+ $this->aliases = $aliases;
+ }
+
+ /**
+ * Indicates if the loader has been registered.
+ *
+ * @return bool
+ */
+ public function isRegistered()
+ {
+ return $this->registered;
+ }
+
+ /**
+ * Set the "registered" state of the loader.
+ *
+ * @param bool $value
+ * @return void
+ */
+ public function setRegistered($value)
+ {
+ $this->registered = $value;
+ }
+
+ /**
+ * Set the value of the singleton alias loader.
+ *
+ * @param \Illuminate\Foundation\AliasLoader $loader
+ * @return void
+ */
+ public static function setInstance($loader)
+ {
+ static::$instance = $loader;
+ }
+
+ /**
+ * Clone method.
+ *
+ * @return void
+ */
+ private function __clone()
+ {
+ //
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Application.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
index 502a73f..b890434 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
@@ -1,6 +1,11 @@
-registerBaseBindings();
-
- $this->registerBaseServiceProviders();
-
- $this->registerCoreContainerAliases();
-
- if ($basePath) $this->setBasePath($basePath);
- }
-
- /**
- * Get the version number of the application.
- *
- * @return string
- */
- public function version()
- {
- return static::VERSION;
- }
-
- /**
- * Register the basic bindings into the container.
- *
- * @return void
- */
- protected function registerBaseBindings()
- {
- static::setInstance($this);
-
- $this->instance('app', $this);
-
- $this->instance('Illuminate\Container\Container', $this);
- }
-
- /**
- * Register all of the base service providers.
- *
- * @return void
- */
- protected function registerBaseServiceProviders()
- {
- $this->register(new EventServiceProvider($this));
-
- $this->register(new RoutingServiceProvider($this));
- }
-
- /**
- * Run the given array of bootstrap classes.
- *
- * @param array $bootstrappers
- * @return void
- */
- public function bootstrapWith(array $bootstrappers)
- {
- $this->hasBeenBootstrapped = true;
-
- foreach ($bootstrappers as $bootstrapper)
- {
- $this['events']->fire('bootstrapping: '.$bootstrapper, [$this]);
-
- $this->make($bootstrapper)->bootstrap($this);
-
- $this['events']->fire('bootstrapped: '.$bootstrapper, [$this]);
- }
- }
-
- /**
- * Register a callback to run after loading the environment.
- *
- * @param \Closure $callback
- * @return void
- */
- public function afterLoadingEnvironment(Closure $callback)
- {
- return $this->afterBootstrapping(
- 'Illuminate\Foundation\Bootstrap\DetectEnvironment', $callback
- );
- }
-
- /**
- * Register a callback to run before a bootstrapper.
- *
- * @param string $bootstrapper
- * @param Closure $callback
- * @return void
- */
- public function beforeBootstrapping($bootstrapper, Closure $callback)
- {
- $this['events']->listen('bootstrapping: '.$bootstrapper, $callback);
- }
-
- /**
- * Register a callback to run after a bootstrapper.
- *
- * @param string $bootstrapper
- * @param Closure $callback
- * @return void
- */
- public function afterBootstrapping($bootstrapper, Closure $callback)
- {
- $this['events']->listen('bootstrapped: '.$bootstrapper, $callback);
- }
-
- /**
- * Determine if the application has been bootstrapped before.
- *
- * @return bool
- */
- public function hasBeenBootstrapped()
- {
- return $this->hasBeenBootstrapped;
- }
-
- /**
- * Set the base path for the application.
- *
- * @param string $basePath
- * @return $this
- */
- public function setBasePath($basePath)
- {
- $this->basePath = $basePath;
-
- $this->bindPathsInContainer();
-
- return $this;
- }
-
- /**
- * Bind all of the application paths in the container.
- *
- * @return void
- */
- protected function bindPathsInContainer()
- {
- $this->instance('path', $this->path());
-
- foreach (['base', 'config', 'database', 'lang', 'public', 'storage'] as $path)
- {
- $this->instance('path.'.$path, $this->{$path.'Path'}());
- }
- }
-
- /**
- * Get the path to the application "app" directory.
- *
- * @return string
- */
- public function path()
- {
- return $this->basePath.DIRECTORY_SEPARATOR.'app';
- }
-
- /**
- * Get the base path of the Laravel installation.
- *
- * @return string
- */
- public function basePath()
- {
- return $this->basePath;
- }
-
- /**
- * Get the path to the application configuration files.
- *
- * @return string
- */
- public function configPath()
- {
- return $this->basePath.DIRECTORY_SEPARATOR.'config';
- }
-
- /**
- * Get the path to the database directory.
- *
- * @return string
- */
- public function databasePath()
- {
- return $this->databasePath ?: $this->basePath.DIRECTORY_SEPARATOR.'database';
- }
-
- /**
- * Set the database directory.
- *
- * @param string $path
- * @return $this
- */
- public function useDatabasePath($path)
- {
- $this->databasePath = $path;
-
- $this->instance('path.database', $path);
-
- return $this;
- }
-
- /**
- * Get the path to the language files.
- *
- * @return string
- */
- public function langPath()
- {
- return $this->basePath.DIRECTORY_SEPARATOR.'resources'.DIRECTORY_SEPARATOR.'lang';
- }
-
- /**
- * Get the path to the public / web directory.
- *
- * @return string
- */
- public function publicPath()
- {
- return $this->basePath.DIRECTORY_SEPARATOR.'public';
- }
-
- /**
- * Get the path to the storage directory.
- *
- * @return string
- */
- public function storagePath()
- {
- return $this->storagePath ?: $this->basePath.DIRECTORY_SEPARATOR.'storage';
- }
-
- /**
- * Set the storage directory.
- *
- * @param string $path
- * @return $this
- */
- public function useStoragePath($path)
- {
- $this->storagePath = $path;
-
- $this->instance('path.storage', $path);
-
- return $this;
- }
-
- /**
- * Set the environment file to be loaded during bootstrapping.
- *
- * @param string $file
- * @return $this
- */
- public function loadEnvironmentFrom($file)
- {
- $this->environmentFile = $file;
-
- return $this;
- }
-
- /**
- * Get the environment file the application is using.
- *
- * @return string
- */
- public function environmentFile()
- {
- return $this->environmentFile ?: '.env';
- }
-
- /**
- * Get or check the current application environment.
- *
- * @param mixed
- * @return string
- */
- public function environment()
- {
- if (func_num_args() > 0)
- {
- $patterns = is_array(func_get_arg(0)) ? func_get_arg(0) : func_get_args();
-
- foreach ($patterns as $pattern)
- {
- if (str_is($pattern, $this['env']))
- {
- return true;
- }
- }
-
- return false;
- }
-
- return $this['env'];
- }
-
- /**
- * Determine if application is in local environment.
- *
- * @return bool
- */
- public function isLocal()
- {
- return $this['env'] == 'local';
- }
-
- /**
- * Detect the application's current environment.
- *
- * @param \Closure $callback
- * @return string
- */
- public function detectEnvironment(Closure $callback)
- {
- $args = isset($_SERVER['argv']) ? $_SERVER['argv'] : null;
-
- return $this['env'] = (new EnvironmentDetector())->detect($callback, $args);
- }
-
- /**
- * Determine if we are running in the console.
- *
- * @return bool
- */
- public function runningInConsole()
- {
- return php_sapi_name() == 'cli';
- }
-
- /**
- * Determine if we are running unit tests.
- *
- * @return bool
- */
- public function runningUnitTests()
- {
- return $this['env'] == 'testing';
- }
-
- /**
- * Register all of the configured providers.
- *
- * @return void
- */
- public function registerConfiguredProviders()
- {
- $manifestPath = $this->getCachedServicesPath();
-
- (new ProviderRepository($this, new Filesystem, $manifestPath))
- ->load($this->config['app.providers']);
- }
-
- /**
- * Register a service provider with the application.
- *
- * @param \Illuminate\Support\ServiceProvider|string $provider
- * @param array $options
- * @param bool $force
- * @return \Illuminate\Support\ServiceProvider
- */
- public function register($provider, $options = array(), $force = false)
- {
- if ($registered = $this->getProvider($provider) && ! $force)
- {
- return $registered;
- }
-
- // If the given "provider" is a string, we will resolve it, passing in the
- // application instance automatically for the developer. This is simply
- // a more convenient way of specifying your service provider classes.
- if (is_string($provider))
- {
- $provider = $this->resolveProviderClass($provider);
- }
-
- $provider->register();
-
- // Once we have registered the service we will iterate through the options
- // and set each of them on the application so they will be available on
- // the actual loading of the service objects and for developer usage.
- foreach ($options as $key => $value)
- {
- $this[$key] = $value;
- }
-
- $this->markAsRegistered($provider);
-
- // If the application has already booted, we will call this boot method on
- // the provider class so it has an opportunity to do its boot logic and
- // will be ready for any usage by the developer's application logics.
- if ($this->booted)
- {
- $this->bootProvider($provider);
- }
-
- return $provider;
- }
-
- /**
- * Get the registered service provider instance if it exists.
- *
- * @param \Illuminate\Support\ServiceProvider|string $provider
- * @return \Illuminate\Support\ServiceProvider|null
- */
- public function getProvider($provider)
- {
- $name = is_string($provider) ? $provider : get_class($provider);
-
- return array_first($this->serviceProviders, function($key, $value) use ($name)
- {
- return $value instanceof $name;
- });
- }
-
- /**
- * Resolve a service provider instance from the class name.
- *
- * @param string $provider
- * @return \Illuminate\Support\ServiceProvider
- */
- public function resolveProviderClass($provider)
- {
- return new $provider($this);
- }
-
- /**
- * Mark the given provider as registered.
- *
- * @param \Illuminate\Support\ServiceProvider
- * @return void
- */
- protected function markAsRegistered($provider)
- {
- $this['events']->fire($class = get_class($provider), array($provider));
-
- $this->serviceProviders[] = $provider;
-
- $this->loadedProviders[$class] = true;
- }
-
- /**
- * Load and boot all of the remaining deferred providers.
- *
- * @return void
- */
- public function loadDeferredProviders()
- {
- // We will simply spin through each of the deferred providers and register each
- // one and boot them if the application has booted. This should make each of
- // the remaining services available to this application for immediate use.
- foreach ($this->deferredServices as $service => $provider)
- {
- $this->loadDeferredProvider($service);
- }
-
- $this->deferredServices = array();
- }
-
- /**
- * Load the provider for a deferred service.
- *
- * @param string $service
- * @return void
- */
- public function loadDeferredProvider($service)
- {
- if ( ! isset($this->deferredServices[$service]))
- {
- return;
- }
-
- $provider = $this->deferredServices[$service];
-
- // If the service provider has not already been loaded and registered we can
- // register it with the application and remove the service from this list
- // of deferred services, since it will already be loaded on subsequent.
- if ( ! isset($this->loadedProviders[$provider]))
- {
- $this->registerDeferredProvider($provider, $service);
- }
- }
-
- /**
- * Register a deferred provider and service.
- *
- * @param string $provider
- * @param string $service
- * @return void
- */
- public function registerDeferredProvider($provider, $service = null)
- {
- // Once the provider that provides the deferred service has been registered we
- // will remove it from our local list of the deferred services with related
- // providers so that this container does not try to resolve it out again.
- if ($service) unset($this->deferredServices[$service]);
-
- $this->register($instance = new $provider($this));
-
- if ( ! $this->booted)
- {
- $this->booting(function() use ($instance)
- {
- $this->bootProvider($instance);
- });
- }
- }
-
- /**
- * Resolve the given type from the container.
- *
- * (Overriding Container::make)
- *
- * @param string $abstract
- * @param array $parameters
- * @return mixed
- */
- public function make($abstract, $parameters = array())
- {
- $abstract = $this->getAlias($abstract);
-
- if (isset($this->deferredServices[$abstract]))
- {
- $this->loadDeferredProvider($abstract);
- }
-
- return parent::make($abstract, $parameters);
- }
-
- /**
- * Determine if the given abstract type has been bound.
- *
- * (Overriding Container::bound)
- *
- * @param string $abstract
- * @return bool
- */
- public function bound($abstract)
- {
- return isset($this->deferredServices[$abstract]) || parent::bound($abstract);
- }
-
- /**
- * Determine if the application has booted.
- *
- * @return bool
- */
- public function isBooted()
- {
- return $this->booted;
- }
-
- /**
- * Boot the application's service providers.
- *
- * @return void
- */
- public function boot()
- {
- if ($this->booted) return;
-
- // Once the application has booted we will also fire some "booted" callbacks
- // for any listeners that need to do work after this initial booting gets
- // finished. This is useful when ordering the boot-up processes we run.
- $this->fireAppCallbacks($this->bootingCallbacks);
-
- array_walk($this->serviceProviders, function($p) {
- $this->bootProvider($p);
- });
-
- $this->booted = true;
-
- $this->fireAppCallbacks($this->bootedCallbacks);
- }
-
- /**
- * Boot the given service provider.
- *
- * @param \Illuminate\Support\ServiceProvider $provider
- * @return void
- */
- protected function bootProvider(ServiceProvider $provider)
- {
- if (method_exists($provider, 'boot'))
- {
- return $this->call([$provider, 'boot']);
- }
- }
-
- /**
- * Register a new boot listener.
- *
- * @param mixed $callback
- * @return void
- */
- public function booting($callback)
- {
- $this->bootingCallbacks[] = $callback;
- }
-
- /**
- * Register a new "booted" listener.
- *
- * @param mixed $callback
- * @return void
- */
- public function booted($callback)
- {
- $this->bootedCallbacks[] = $callback;
-
- if ($this->isBooted()) $this->fireAppCallbacks(array($callback));
- }
-
- /**
- * {@inheritdoc}
- */
- public function handle(SymfonyRequest $request, $type = self::MASTER_REQUEST, $catch = true)
- {
- return $this['Illuminate\Contracts\Http\Kernel']->handle(Request::createFromBase($request));
- }
-
- /**
- * Determine if the application configuration is cached.
- *
- * @return bool
- */
- public function configurationIsCached()
- {
- return $this['files']->exists($this->getCachedConfigPath());
- }
-
- /**
- * Get the path to the configuration cache file.
- *
- * @return string
- */
- public function getCachedConfigPath()
- {
- if ($this->vendorIsWritableForOptimizations())
- {
- return $this->basePath().'/vendor/config.php';
- }
- else
- {
- return $this['path.storage'].'/framework/config.php';
- }
- }
-
- /**
- * Determine if the application routes are cached.
- *
- * @return bool
- */
- public function routesAreCached()
- {
- return $this['files']->exists($this->getCachedRoutesPath());
- }
-
- /**
- * Get the path to the routes cache file.
- *
- * @return string
- */
- public function getCachedRoutesPath()
- {
- if ($this->vendorIsWritableForOptimizations())
- {
- return $this->basePath().'/vendor/routes.php';
- }
- else
- {
- return $this['path.storage'].'/framework/routes.php';
- }
- }
-
- /**
- * Get the path to the cached "compiled.php" file.
- *
- * @return string
- */
- public function getCachedCompilePath()
- {
- if ($this->vendorIsWritableForOptimizations())
- {
- return $this->basePath().'/vendor/compiled.php';
- }
- else
- {
- return $this->storagePath().'/framework/compiled.php';
- }
- }
-
- /**
- * Get the path to the cached services.json file.
- *
- * @return string
- */
- public function getCachedServicesPath()
- {
- if ($this->vendorIsWritableForOptimizations())
- {
- return $this->basePath().'/vendor/services.json';
- }
- else
- {
- return $this->storagePath().'/framework/services.json';
- }
- }
-
- /**
- * Determine if vendor path is writable.
- *
- * @return bool
- */
- public function vendorIsWritableForOptimizations()
- {
- if ($this->useStoragePathForOptimizations) return false;
-
- return is_writable($this->basePath().'/vendor');
- }
-
- /**
- * Determines if storage directory should be used for optimizations.
- *
- * @param bool $value
- * @return $this
- */
- public function useStoragePathForOptimizations($value = true)
- {
- $this->useStoragePathForOptimizations = $value;
-
- return $this;
- }
-
- /**
- * Call the booting callbacks for the application.
- *
- * @param array $callbacks
- * @return void
- */
- protected function fireAppCallbacks(array $callbacks)
- {
- foreach ($callbacks as $callback)
- {
- call_user_func($callback, $this);
- }
- }
-
- /**
- * Determine if the application is currently down for maintenance.
- *
- * @return bool
- */
- public function isDownForMaintenance()
- {
- return file_exists($this->storagePath().DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR.'down');
- }
-
- /**
- * Register a maintenance mode event listener.
- *
- * @param \Closure $callback
- * @return void
- */
- public function down(Closure $callback)
- {
- $this['events']->listen('illuminate.app.down', $callback);
- }
-
- /**
- * Throw an HttpException with the given data.
- *
- * @param int $code
- * @param string $message
- * @param array $headers
- * @return void
- *
- * @throws \Symfony\Component\HttpKernel\Exception\HttpException
- */
- public function abort($code, $message = '', array $headers = array())
- {
- if ($code == 404)
- {
- throw new NotFoundHttpException($message);
- }
-
- throw new HttpException($code, $message, null, $headers);
- }
-
- /**
- * Register a terminating callback with the application.
- *
- * @param \Closure $callback
- * @return $this
- */
- public function terminating(Closure $callback)
- {
- $this->terminatingCallbacks[] = $callback;
-
- return $this;
- }
-
- /**
- * Terminate the application.
- *
- * @return void
- */
- public function terminate()
- {
- foreach ($this->terminatingCallbacks as $terminating)
- {
- $this->call($terminating);
- }
- }
-
- /**
- * Get the service providers that have been loaded.
- *
- * @return array
- */
- public function getLoadedProviders()
- {
- return $this->loadedProviders;
- }
-
- /**
- * Get the application's deferred services.
- *
- * @return array
- */
- public function getDeferredServices()
- {
- return $this->deferredServices;
- }
-
- /**
- * Set the application's deferred services.
- *
- * @param array $services
- * @return void
- */
- public function setDeferredServices(array $services)
- {
- $this->deferredServices = $services;
- }
-
- /**
- * Add an array of services to the application's deferred services.
- *
- * @param array $services
- * @return void
- */
- public function addDeferredServices(array $services)
- {
- $this->deferredServices = array_merge($this->deferredServices, $services);
- }
-
- /**
- * Determine if the given service is a deferred service.
- *
- * @param string $service
- * @return bool
- */
- public function isDeferredService($service)
- {
- return isset($this->deferredServices[$service]);
- }
-
- /**
- * 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.
- *
- * @return void
- */
- public function registerCoreContainerAliases()
- {
- $aliases = array(
- 'app' => ['Illuminate\Foundation\Application', 'Illuminate\Contracts\Container\Container', 'Illuminate\Contracts\Foundation\Application'],
- 'artisan' => ['Illuminate\Console\Application', 'Illuminate\Contracts\Console\Application'],
- 'auth' => 'Illuminate\Auth\AuthManager',
- 'auth.driver' => ['Illuminate\Auth\Guard', 'Illuminate\Contracts\Auth\Guard'],
- 'auth.password.tokens' => 'Illuminate\Auth\Passwords\TokenRepositoryInterface',
- 'blade.compiler' => 'Illuminate\View\Compilers\BladeCompiler',
- 'cache' => ['Illuminate\Cache\CacheManager', 'Illuminate\Contracts\Cache\Factory'],
- 'cache.store' => ['Illuminate\Cache\Repository', 'Illuminate\Contracts\Cache\Repository'],
- 'config' => ['Illuminate\Config\Repository', 'Illuminate\Contracts\Config\Repository'],
- 'cookie' => ['Illuminate\Cookie\CookieJar', 'Illuminate\Contracts\Cookie\Factory', 'Illuminate\Contracts\Cookie\QueueingFactory'],
- 'encrypter' => ['Illuminate\Encryption\Encrypter', 'Illuminate\Contracts\Encryption\Encrypter'],
- 'db' => 'Illuminate\Database\DatabaseManager',
- 'events' => ['Illuminate\Events\Dispatcher', 'Illuminate\Contracts\Events\Dispatcher'],
- 'files' => 'Illuminate\Filesystem\Filesystem',
- 'filesystem' => ['Illuminate\Filesystem\FilesystemManager', 'Illuminate\Contracts\Filesystem\Factory'],
- 'filesystem.disk' => 'Illuminate\Contracts\Filesystem\Filesystem',
- 'filesystem.cloud' => 'Illuminate\Contracts\Filesystem\Cloud',
- 'hash' => 'Illuminate\Contracts\Hashing\Hasher',
- 'translator' => ['Illuminate\Translation\Translator', 'Symfony\Component\Translation\TranslatorInterface'],
- 'log' => ['Illuminate\Log\Writer', 'Illuminate\Contracts\Logging\Log', 'Psr\Log\LoggerInterface'],
- 'mailer' => ['Illuminate\Mail\Mailer', 'Illuminate\Contracts\Mail\Mailer', 'Illuminate\Contracts\Mail\MailQueue'],
- 'paginator' => 'Illuminate\Pagination\Factory',
- 'auth.password' => ['Illuminate\Auth\Passwords\PasswordBroker', 'Illuminate\Contracts\Auth\PasswordBroker'],
- 'queue' => ['Illuminate\Queue\QueueManager', 'Illuminate\Contracts\Queue\Factory', 'Illuminate\Contracts\Queue\Monitor'],
- 'queue.connection' => 'Illuminate\Contracts\Queue\Queue',
- 'redirect' => 'Illuminate\Routing\Redirector',
- 'redis' => ['Illuminate\Redis\Database', 'Illuminate\Contracts\Redis\Database'],
- 'request' => 'Illuminate\Http\Request',
- 'router' => ['Illuminate\Routing\Router', 'Illuminate\Contracts\Routing\Registrar'],
- 'session' => 'Illuminate\Session\SessionManager',
- 'session.store' => ['Illuminate\Session\Store', 'Symfony\Component\HttpFoundation\Session\SessionInterface'],
- 'url' => ['Illuminate\Routing\UrlGenerator', 'Illuminate\Contracts\Routing\UrlGenerator'],
- 'validator' => ['Illuminate\Validation\Factory', 'Illuminate\Contracts\Validation\Factory'],
- 'view' => ['Illuminate\View\Factory', 'Illuminate\Contracts\View\Factory'],
- );
-
- foreach ($aliases as $key => $aliases)
- {
- foreach ((array) $aliases as $alias)
- {
- $this->alias($key, $alias);
- }
- }
- }
-
- /**
- * Flush the container of all bindings and resolved instances.
- *
- * @return void
- */
- public function flush()
- {
- parent::flush();
-
- $this->loadedProviders = [];
- }
-
+class Application extends Container implements ApplicationContract, HttpKernelInterface
+{
+ /**
+ * The Laravel framework version.
+ *
+ * @var string
+ */
+ const VERSION = '5.1.46 (LTS)';
+
+ /**
+ * The base path for the Laravel installation.
+ *
+ * @var string
+ */
+ protected $basePath;
+
+ /**
+ * Indicates if the application has been bootstrapped before.
+ *
+ * @var bool
+ */
+ protected $hasBeenBootstrapped = false;
+
+ /**
+ * Indicates if the application has "booted".
+ *
+ * @var bool
+ */
+ protected $booted = false;
+
+ /**
+ * The array of booting callbacks.
+ *
+ * @var array
+ */
+ protected $bootingCallbacks = [];
+
+ /**
+ * The array of booted callbacks.
+ *
+ * @var array
+ */
+ protected $bootedCallbacks = [];
+
+ /**
+ * The array of terminating callbacks.
+ *
+ * @var array
+ */
+ protected $terminatingCallbacks = [];
+
+ /**
+ * All of the registered service providers.
+ *
+ * @var array
+ */
+ protected $serviceProviders = [];
+
+ /**
+ * The names of the loaded service providers.
+ *
+ * @var array
+ */
+ protected $loadedProviders = [];
+
+ /**
+ * The deferred services and their providers.
+ *
+ * @var array
+ */
+ protected $deferredServices = [];
+
+ /**
+ * A custom callback used to configure Monolog.
+ *
+ * @var callable|null
+ */
+ protected $monologConfigurator;
+
+ /**
+ * The custom database path defined by the developer.
+ *
+ * @var string
+ */
+ protected $databasePath;
+
+ /**
+ * The custom storage path defined by the developer.
+ *
+ * @var string
+ */
+ protected $storagePath;
+
+ /**
+ * The custom environment path defined by the developer.
+ *
+ * @var string
+ */
+ protected $environmentPath;
+
+ /**
+ * The environment file to load during bootstrapping.
+ *
+ * @var string
+ */
+ protected $environmentFile = '.env';
+
+ /**
+ * The application namespace.
+ *
+ * @var string
+ */
+ protected $namespace = null;
+
+ /**
+ * Create a new Illuminate application instance.
+ *
+ * @param string|null $basePath
+ * @return void
+ */
+ public function __construct($basePath = null)
+ {
+ $this->registerBaseBindings();
+
+ $this->registerBaseServiceProviders();
+
+ $this->registerCoreContainerAliases();
+
+ if ($basePath) {
+ $this->setBasePath($basePath);
+ }
+ }
+
+ /**
+ * Get the version number of the application.
+ *
+ * @return string
+ */
+ public function version()
+ {
+ return static::VERSION;
+ }
+
+ /**
+ * Register the basic bindings into the container.
+ *
+ * @return void
+ */
+ protected function registerBaseBindings()
+ {
+ static::setInstance($this);
+
+ $this->instance('app', $this);
+
+ $this->instance('Illuminate\Container\Container', $this);
+ }
+
+ /**
+ * Register all of the base service providers.
+ *
+ * @return void
+ */
+ protected function registerBaseServiceProviders()
+ {
+ $this->register(new EventServiceProvider($this));
+
+ $this->register(new RoutingServiceProvider($this));
+ }
+
+ /**
+ * Run the given array of bootstrap classes.
+ *
+ * @param array $bootstrappers
+ * @return void
+ */
+ public function bootstrapWith(array $bootstrappers)
+ {
+ $this->hasBeenBootstrapped = true;
+
+ foreach ($bootstrappers as $bootstrapper) {
+ $this['events']->fire('bootstrapping: '.$bootstrapper, [$this]);
+
+ $this->make($bootstrapper)->bootstrap($this);
+
+ $this['events']->fire('bootstrapped: '.$bootstrapper, [$this]);
+ }
+ }
+
+ /**
+ * Register a callback to run after loading the environment.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ public function afterLoadingEnvironment(Closure $callback)
+ {
+ return $this->afterBootstrapping(
+ 'Illuminate\Foundation\Bootstrap\DetectEnvironment', $callback
+ );
+ }
+
+ /**
+ * Register a callback to run before a bootstrapper.
+ *
+ * @param string $bootstrapper
+ * @param Closure $callback
+ * @return void
+ */
+ public function beforeBootstrapping($bootstrapper, Closure $callback)
+ {
+ $this['events']->listen('bootstrapping: '.$bootstrapper, $callback);
+ }
+
+ /**
+ * Register a callback to run after a bootstrapper.
+ *
+ * @param string $bootstrapper
+ * @param Closure $callback
+ * @return void
+ */
+ public function afterBootstrapping($bootstrapper, Closure $callback)
+ {
+ $this['events']->listen('bootstrapped: '.$bootstrapper, $callback);
+ }
+
+ /**
+ * Determine if the application has been bootstrapped before.
+ *
+ * @return bool
+ */
+ public function hasBeenBootstrapped()
+ {
+ return $this->hasBeenBootstrapped;
+ }
+
+ /**
+ * Set the base path for the application.
+ *
+ * @param string $basePath
+ * @return $this
+ */
+ public function setBasePath($basePath)
+ {
+ $this->basePath = rtrim($basePath, '\/');
+
+ $this->bindPathsInContainer();
+
+ return $this;
+ }
+
+ /**
+ * Bind all of the application paths in the container.
+ *
+ * @return void
+ */
+ protected function bindPathsInContainer()
+ {
+ $this->instance('path', $this->path());
+
+ foreach (['base', 'config', 'database', 'lang', 'public', 'storage'] as $path) {
+ $this->instance('path.'.$path, $this->{$path.'Path'}());
+ }
+ }
+
+ /**
+ * Get the path to the application "app" directory.
+ *
+ * @return string
+ */
+ public function path()
+ {
+ return $this->basePath.DIRECTORY_SEPARATOR.'app';
+ }
+
+ /**
+ * Get the base path of the Laravel installation.
+ *
+ * @return string
+ */
+ public function basePath()
+ {
+ return $this->basePath;
+ }
+
+ /**
+ * Get the path to the application configuration files.
+ *
+ * @return string
+ */
+ public function configPath()
+ {
+ return $this->basePath.DIRECTORY_SEPARATOR.'config';
+ }
+
+ /**
+ * Get the path to the database directory.
+ *
+ * @return string
+ */
+ public function databasePath()
+ {
+ return $this->databasePath ?: $this->basePath.DIRECTORY_SEPARATOR.'database';
+ }
+
+ /**
+ * Set the database directory.
+ *
+ * @param string $path
+ * @return $this
+ */
+ public function useDatabasePath($path)
+ {
+ $this->databasePath = $path;
+
+ $this->instance('path.database', $path);
+
+ return $this;
+ }
+
+ /**
+ * Get the path to the language files.
+ *
+ * @return string
+ */
+ public function langPath()
+ {
+ return $this->basePath.DIRECTORY_SEPARATOR.'resources'.DIRECTORY_SEPARATOR.'lang';
+ }
+
+ /**
+ * Get the path to the public / web directory.
+ *
+ * @return string
+ */
+ public function publicPath()
+ {
+ return $this->basePath.DIRECTORY_SEPARATOR.'public';
+ }
+
+ /**
+ * Get the path to the storage directory.
+ *
+ * @return string
+ */
+ public function storagePath()
+ {
+ return $this->storagePath ?: $this->basePath.DIRECTORY_SEPARATOR.'storage';
+ }
+
+ /**
+ * Set the storage directory.
+ *
+ * @param string $path
+ * @return $this
+ */
+ public function useStoragePath($path)
+ {
+ $this->storagePath = $path;
+
+ $this->instance('path.storage', $path);
+
+ return $this;
+ }
+
+ /**
+ * Get the path to the environment file directory.
+ *
+ * @return string
+ */
+ public function environmentPath()
+ {
+ return $this->environmentPath ?: $this->basePath;
+ }
+
+ /**
+ * Set the directory for the environment file.
+ *
+ * @param string $path
+ * @return $this
+ */
+ public function useEnvironmentPath($path)
+ {
+ $this->environmentPath = $path;
+
+ return $this;
+ }
+
+ /**
+ * Set the environment file to be loaded during bootstrapping.
+ *
+ * @param string $file
+ * @return $this
+ */
+ public function loadEnvironmentFrom($file)
+ {
+ $this->environmentFile = $file;
+
+ return $this;
+ }
+
+ /**
+ * Get the environment file the application is using.
+ *
+ * @return string
+ */
+ public function environmentFile()
+ {
+ return $this->environmentFile ?: '.env';
+ }
+
+ /**
+ * Get or check the current application environment.
+ *
+ * @param mixed
+ * @return string
+ */
+ public function environment()
+ {
+ if (func_num_args() > 0) {
+ $patterns = is_array(func_get_arg(0)) ? func_get_arg(0) : func_get_args();
+
+ foreach ($patterns as $pattern) {
+ if (Str::is($pattern, $this['env'])) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ return $this['env'];
+ }
+
+ /**
+ * Determine if application is in local environment.
+ *
+ * @return bool
+ */
+ public function isLocal()
+ {
+ return $this['env'] == 'local';
+ }
+
+ /**
+ * Detect the application's current environment.
+ *
+ * @param \Closure $callback
+ * @return string
+ */
+ public function detectEnvironment(Closure $callback)
+ {
+ $args = isset($_SERVER['argv']) ? $_SERVER['argv'] : null;
+
+ return $this['env'] = (new EnvironmentDetector())->detect($callback, $args);
+ }
+
+ /**
+ * Determine if we are running in the console.
+ *
+ * @return bool
+ */
+ public function runningInConsole()
+ {
+ return php_sapi_name() == 'cli';
+ }
+
+ /**
+ * Determine if we are running unit tests.
+ *
+ * @return bool
+ */
+ public function runningUnitTests()
+ {
+ return $this['env'] == 'testing';
+ }
+
+ /**
+ * Register all of the configured providers.
+ *
+ * @return void
+ */
+ public function registerConfiguredProviders()
+ {
+ $manifestPath = $this->getCachedServicesPath();
+
+ (new ProviderRepository($this, new Filesystem, $manifestPath))
+ ->load($this->config['app.providers']);
+ }
+
+ /**
+ * Register a service provider with the application.
+ *
+ * @param \Illuminate\Support\ServiceProvider|string $provider
+ * @param array $options
+ * @param bool $force
+ * @return \Illuminate\Support\ServiceProvider
+ */
+ public function register($provider, $options = [], $force = false)
+ {
+ if (($registered = $this->getProvider($provider)) && ! $force) {
+ return $registered;
+ }
+
+ // If the given "provider" is a string, we will resolve it, passing in the
+ // application instance automatically for the developer. This is simply
+ // a more convenient way of specifying your service provider classes.
+ if (is_string($provider)) {
+ $provider = $this->resolveProviderClass($provider);
+ }
+
+ $provider->register();
+
+ // Once we have registered the service we will iterate through the options
+ // and set each of them on the application so they will be available on
+ // the actual loading of the service objects and for developer usage.
+ foreach ($options as $key => $value) {
+ $this[$key] = $value;
+ }
+
+ $this->markAsRegistered($provider);
+
+ // If the application has already booted, we will call this boot method on
+ // the provider class so it has an opportunity to do its boot logic and
+ // will be ready for any usage by the developer's application logics.
+ if ($this->booted) {
+ $this->bootProvider($provider);
+ }
+
+ return $provider;
+ }
+
+ /**
+ * Get the registered service provider instance if it exists.
+ *
+ * @param \Illuminate\Support\ServiceProvider|string $provider
+ * @return \Illuminate\Support\ServiceProvider|null
+ */
+ public function getProvider($provider)
+ {
+ $name = is_string($provider) ? $provider : get_class($provider);
+
+ return Arr::first($this->serviceProviders, function ($key, $value) use ($name) {
+ return $value instanceof $name;
+ });
+ }
+
+ /**
+ * Resolve a service provider instance from the class name.
+ *
+ * @param string $provider
+ * @return \Illuminate\Support\ServiceProvider
+ */
+ public function resolveProviderClass($provider)
+ {
+ return new $provider($this);
+ }
+
+ /**
+ * Mark the given provider as registered.
+ *
+ * @param \Illuminate\Support\ServiceProvider $provider
+ * @return void
+ */
+ protected function markAsRegistered($provider)
+ {
+ $this['events']->fire($class = get_class($provider), [$provider]);
+
+ $this->serviceProviders[] = $provider;
+
+ $this->loadedProviders[$class] = true;
+ }
+
+ /**
+ * Load and boot all of the remaining deferred providers.
+ *
+ * @return void
+ */
+ public function loadDeferredProviders()
+ {
+ // We will simply spin through each of the deferred providers and register each
+ // one and boot them if the application has booted. This should make each of
+ // the remaining services available to this application for immediate use.
+ foreach ($this->deferredServices as $service => $provider) {
+ $this->loadDeferredProvider($service);
+ }
+
+ $this->deferredServices = [];
+ }
+
+ /**
+ * Load the provider for a deferred service.
+ *
+ * @param string $service
+ * @return void
+ */
+ public function loadDeferredProvider($service)
+ {
+ if (! isset($this->deferredServices[$service])) {
+ return;
+ }
+
+ $provider = $this->deferredServices[$service];
+
+ // If the service provider has not already been loaded and registered we can
+ // register it with the application and remove the service from this list
+ // of deferred services, since it will already be loaded on subsequent.
+ if (! isset($this->loadedProviders[$provider])) {
+ $this->registerDeferredProvider($provider, $service);
+ }
+ }
+
+ /**
+ * Register a deferred provider and service.
+ *
+ * @param string $provider
+ * @param string $service
+ * @return void
+ */
+ public function registerDeferredProvider($provider, $service = null)
+ {
+ // Once the provider that provides the deferred service has been registered we
+ // will remove it from our local list of the deferred services with related
+ // providers so that this container does not try to resolve it out again.
+ if ($service) {
+ unset($this->deferredServices[$service]);
+ }
+
+ $this->register($instance = new $provider($this));
+
+ if (! $this->booted) {
+ $this->booting(function () use ($instance) {
+ $this->bootProvider($instance);
+ });
+ }
+ }
+
+ /**
+ * Resolve the given type from the container.
+ *
+ * (Overriding Container::make)
+ *
+ * @param string $abstract
+ * @param array $parameters
+ * @return mixed
+ */
+ public function make($abstract, array $parameters = [])
+ {
+ $abstract = $this->getAlias($abstract);
+
+ if (isset($this->deferredServices[$abstract])) {
+ $this->loadDeferredProvider($abstract);
+ }
+
+ return parent::make($abstract, $parameters);
+ }
+
+ /**
+ * Determine if the given abstract type has been bound.
+ *
+ * (Overriding Container::bound)
+ *
+ * @param string $abstract
+ * @return bool
+ */
+ public function bound($abstract)
+ {
+ return isset($this->deferredServices[$abstract]) || parent::bound($abstract);
+ }
+
+ /**
+ * Determine if the application has booted.
+ *
+ * @return bool
+ */
+ public function isBooted()
+ {
+ return $this->booted;
+ }
+
+ /**
+ * Boot the application's service providers.
+ *
+ * @return void
+ */
+ public function boot()
+ {
+ if ($this->booted) {
+ return;
+ }
+
+ // Once the application has booted we will also fire some "booted" callbacks
+ // for any listeners that need to do work after this initial booting gets
+ // finished. This is useful when ordering the boot-up processes we run.
+ $this->fireAppCallbacks($this->bootingCallbacks);
+
+ array_walk($this->serviceProviders, function ($p) {
+ $this->bootProvider($p);
+ });
+
+ $this->booted = true;
+
+ $this->fireAppCallbacks($this->bootedCallbacks);
+ }
+
+ /**
+ * Boot the given service provider.
+ *
+ * @param \Illuminate\Support\ServiceProvider $provider
+ * @return mixed
+ */
+ protected function bootProvider(ServiceProvider $provider)
+ {
+ if (method_exists($provider, 'boot')) {
+ return $this->call([$provider, 'boot']);
+ }
+ }
+
+ /**
+ * Register a new boot listener.
+ *
+ * @param mixed $callback
+ * @return void
+ */
+ public function booting($callback)
+ {
+ $this->bootingCallbacks[] = $callback;
+ }
+
+ /**
+ * Register a new "booted" listener.
+ *
+ * @param mixed $callback
+ * @return void
+ */
+ public function booted($callback)
+ {
+ $this->bootedCallbacks[] = $callback;
+
+ if ($this->isBooted()) {
+ $this->fireAppCallbacks([$callback]);
+ }
+ }
+
+ /**
+ * Call the booting callbacks for the application.
+ *
+ * @param array $callbacks
+ * @return void
+ */
+ protected function fireAppCallbacks(array $callbacks)
+ {
+ foreach ($callbacks as $callback) {
+ call_user_func($callback, $this);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(SymfonyRequest $request, $type = self::MASTER_REQUEST, $catch = true)
+ {
+ return $this['Illuminate\Contracts\Http\Kernel']->handle(Request::createFromBase($request));
+ }
+
+ /**
+ * Determine if middleware has been disabled for the application.
+ *
+ * @return bool
+ */
+ public function shouldSkipMiddleware()
+ {
+ return $this->bound('middleware.disable') &&
+ $this->make('middleware.disable') === true;
+ }
+
+ /**
+ * Determine if the application configuration is cached.
+ *
+ * @return bool
+ */
+ public function configurationIsCached()
+ {
+ return $this['files']->exists($this->getCachedConfigPath());
+ }
+
+ /**
+ * Get the path to the configuration cache file.
+ *
+ * @return string
+ */
+ public function getCachedConfigPath()
+ {
+ return $this->basePath().'/bootstrap/cache/config.php';
+ }
+
+ /**
+ * Determine if the application routes are cached.
+ *
+ * @return bool
+ */
+ public function routesAreCached()
+ {
+ return $this['files']->exists($this->getCachedRoutesPath());
+ }
+
+ /**
+ * Get the path to the routes cache file.
+ *
+ * @return string
+ */
+ public function getCachedRoutesPath()
+ {
+ return $this->basePath().'/bootstrap/cache/routes.php';
+ }
+
+ /**
+ * Get the path to the cached "compiled.php" file.
+ *
+ * @return string
+ */
+ public function getCachedCompilePath()
+ {
+ return $this->basePath().'/bootstrap/cache/compiled.php';
+ }
+
+ /**
+ * Get the path to the cached services.json file.
+ *
+ * @return string
+ */
+ public function getCachedServicesPath()
+ {
+ return $this->basePath().'/bootstrap/cache/services.json';
+ }
+
+ /**
+ * Determine if the application is currently down for maintenance.
+ *
+ * @return bool
+ */
+ public function isDownForMaintenance()
+ {
+ return file_exists($this->storagePath().'/framework/down');
+ }
+
+ /**
+ * Throw an HttpException with the given data.
+ *
+ * @param int $code
+ * @param string $message
+ * @param array $headers
+ * @return void
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+ */
+ public function abort($code, $message = '', array $headers = [])
+ {
+ if ($code == 404) {
+ throw new NotFoundHttpException($message);
+ }
+
+ throw new HttpException($code, $message, null, $headers);
+ }
+
+ /**
+ * Register a terminating callback with the application.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function terminating(Closure $callback)
+ {
+ $this->terminatingCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Terminate the application.
+ *
+ * @return void
+ */
+ public function terminate()
+ {
+ foreach ($this->terminatingCallbacks as $terminating) {
+ $this->call($terminating);
+ }
+ }
+
+ /**
+ * Get the service providers that have been loaded.
+ *
+ * @return array
+ */
+ public function getLoadedProviders()
+ {
+ return $this->loadedProviders;
+ }
+
+ /**
+ * Get the application's deferred services.
+ *
+ * @return array
+ */
+ public function getDeferredServices()
+ {
+ return $this->deferredServices;
+ }
+
+ /**
+ * Set the application's deferred services.
+ *
+ * @param array $services
+ * @return void
+ */
+ public function setDeferredServices(array $services)
+ {
+ $this->deferredServices = $services;
+ }
+
+ /**
+ * Add an array of services to the application's deferred services.
+ *
+ * @param array $services
+ * @return void
+ */
+ public function addDeferredServices(array $services)
+ {
+ $this->deferredServices = array_merge($this->deferredServices, $services);
+ }
+
+ /**
+ * Determine if the given service is a deferred service.
+ *
+ * @param string $service
+ * @return bool
+ */
+ public function isDeferredService($service)
+ {
+ return isset($this->deferredServices[$service]);
+ }
+
+ /**
+ * Define a callback to be used to configure Monolog.
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function configureMonologUsing(callable $callback)
+ {
+ $this->monologConfigurator = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Determine if the application has a custom Monolog configurator.
+ *
+ * @return bool
+ */
+ public function hasMonologConfigurator()
+ {
+ return ! is_null($this->monologConfigurator);
+ }
+
+ /**
+ * Get the custom Monolog configurator for the application.
+ *
+ * @return callable
+ */
+ public function getMonologConfigurator()
+ {
+ return $this->monologConfigurator;
+ }
+
+ /**
+ * 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', [$locale]);
+ }
+
+ /**
+ * Register the core class aliases in the container.
+ *
+ * @return void
+ */
+ public function registerCoreContainerAliases()
+ {
+ $aliases = [
+ 'app' => ['Illuminate\Foundation\Application', 'Illuminate\Contracts\Container\Container', 'Illuminate\Contracts\Foundation\Application'],
+ 'auth' => 'Illuminate\Auth\AuthManager',
+ 'auth.driver' => ['Illuminate\Auth\Guard', 'Illuminate\Contracts\Auth\Guard'],
+ 'auth.password.tokens' => 'Illuminate\Auth\Passwords\TokenRepositoryInterface',
+ 'blade.compiler' => 'Illuminate\View\Compilers\BladeCompiler',
+ 'cache' => ['Illuminate\Cache\CacheManager', 'Illuminate\Contracts\Cache\Factory'],
+ 'cache.store' => ['Illuminate\Cache\Repository', 'Illuminate\Contracts\Cache\Repository'],
+ 'config' => ['Illuminate\Config\Repository', 'Illuminate\Contracts\Config\Repository'],
+ 'cookie' => ['Illuminate\Cookie\CookieJar', 'Illuminate\Contracts\Cookie\Factory', 'Illuminate\Contracts\Cookie\QueueingFactory'],
+ 'encrypter' => ['Illuminate\Encryption\Encrypter', 'Illuminate\Contracts\Encryption\Encrypter'],
+ 'db' => 'Illuminate\Database\DatabaseManager',
+ 'db.connection' => ['Illuminate\Database\Connection', 'Illuminate\Database\ConnectionInterface'],
+ 'events' => ['Illuminate\Events\Dispatcher', 'Illuminate\Contracts\Events\Dispatcher'],
+ 'files' => 'Illuminate\Filesystem\Filesystem',
+ 'filesystem' => ['Illuminate\Filesystem\FilesystemManager', 'Illuminate\Contracts\Filesystem\Factory'],
+ 'filesystem.disk' => 'Illuminate\Contracts\Filesystem\Filesystem',
+ 'filesystem.cloud' => 'Illuminate\Contracts\Filesystem\Cloud',
+ 'hash' => 'Illuminate\Contracts\Hashing\Hasher',
+ 'translator' => ['Illuminate\Translation\Translator', 'Symfony\Component\Translation\TranslatorInterface'],
+ 'log' => ['Illuminate\Log\Writer', 'Illuminate\Contracts\Logging\Log', 'Psr\Log\LoggerInterface'],
+ 'mailer' => ['Illuminate\Mail\Mailer', 'Illuminate\Contracts\Mail\Mailer', 'Illuminate\Contracts\Mail\MailQueue'],
+ 'auth.password' => ['Illuminate\Auth\Passwords\PasswordBroker', 'Illuminate\Contracts\Auth\PasswordBroker'],
+ 'queue' => ['Illuminate\Queue\QueueManager', 'Illuminate\Contracts\Queue\Factory', 'Illuminate\Contracts\Queue\Monitor'],
+ 'queue.connection' => 'Illuminate\Contracts\Queue\Queue',
+ 'redirect' => 'Illuminate\Routing\Redirector',
+ 'redis' => ['Illuminate\Redis\Database', 'Illuminate\Contracts\Redis\Database'],
+ 'request' => 'Illuminate\Http\Request',
+ 'router' => ['Illuminate\Routing\Router', 'Illuminate\Contracts\Routing\Registrar'],
+ 'session' => 'Illuminate\Session\SessionManager',
+ 'session.store' => ['Illuminate\Session\Store', 'Symfony\Component\HttpFoundation\Session\SessionInterface'],
+ 'url' => ['Illuminate\Routing\UrlGenerator', 'Illuminate\Contracts\Routing\UrlGenerator'],
+ 'validator' => ['Illuminate\Validation\Factory', 'Illuminate\Contracts\Validation\Factory'],
+ 'view' => ['Illuminate\View\Factory', 'Illuminate\Contracts\View\Factory'],
+ ];
+
+ foreach ($aliases as $key => $aliases) {
+ foreach ((array) $aliases as $alias) {
+ $this->alias($key, $alias);
+ }
+ }
+ }
+
+ /**
+ * Flush the container of all bindings and resolved instances.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ parent::flush();
+
+ $this->loadedProviders = [];
+ }
+
+ /**
+ * Get the used kernel object.
+ *
+ * @return \Illuminate\Contracts\Console\Kernel|\Illuminate\Contracts\Http\Kernel
+ */
+ protected function getKernel()
+ {
+ $kernelContract = $this->runningInConsole()
+ ? 'Illuminate\Contracts\Console\Kernel'
+ : 'Illuminate\Contracts\Http\Kernel';
+
+ return $this->make($kernelContract);
+ }
+
+ /**
+ * Get the application namespace.
+ *
+ * @return string
+ *
+ * @throws \RuntimeException
+ */
+ public function getNamespace()
+ {
+ if (! is_null($this->namespace)) {
+ return $this->namespace;
+ }
+
+ $composer = json_decode(file_get_contents(base_path('composer.json')), true);
+
+ foreach ((array) data_get($composer, 'autoload.psr-4') as $namespace => $path) {
+ foreach ((array) $path as $pathChoice) {
+ if (realpath(app_path()) == realpath(base_path().'/'.$pathChoice)) {
+ return $this->namespace = $namespace;
+ }
+ }
+ }
+
+ throw new RuntimeException('Unable to detect application namespace.');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/Authorizable.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/Authorizable.php
new file mode 100644
index 0000000..9e8e33b
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/Authorizable.php
@@ -0,0 +1,44 @@
+forUser($this)->check($ability, $arguments);
+ }
+
+ /**
+ * Determine if the entity does not have a given ability.
+ *
+ * @param string $ability
+ * @param array|mixed $arguments
+ * @return bool
+ */
+ public function cant($ability, $arguments = [])
+ {
+ return ! $this->can($ability, $arguments);
+ }
+
+ /**
+ * Determine if the entity does not have a given ability.
+ *
+ * @param string $ability
+ * @param array|mixed $arguments
+ * @return bool
+ */
+ public function cannot($ability, $arguments = [])
+ {
+ return $this->cant($ability, $arguments);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
new file mode 100644
index 0000000..e3908f2
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
@@ -0,0 +1,96 @@
+parseAbilityAndArguments($ability, $arguments);
+
+ return $this->authorizeAtGate(app(Gate::class), $ability, $arguments);
+ }
+
+ /**
+ * Authorize a given action for a user.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable|mixed $user
+ * @param mixed $ability
+ * @param mixed|array $arguments
+ * @return \Illuminate\Auth\Access\Response
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+ */
+ public function authorizeForUser($user, $ability, $arguments = [])
+ {
+ list($ability, $arguments) = $this->parseAbilityAndArguments($ability, $arguments);
+
+ $gate = app(Gate::class)->forUser($user);
+
+ return $this->authorizeAtGate($gate, $ability, $arguments);
+ }
+
+ /**
+ * Authorize the request at the given gate.
+ *
+ * @param \Illuminate\Contracts\Auth\Access\Gate $gate
+ * @param mixed $ability
+ * @param mixed|array $arguments
+ * @return \Illuminate\Auth\Access\Response
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+ */
+ public function authorizeAtGate(Gate $gate, $ability, $arguments)
+ {
+ try {
+ return $gate->authorize($ability, $arguments);
+ } catch (UnauthorizedException $e) {
+ throw $this->createGateUnauthorizedException(
+ $ability, $arguments, $e->getMessage(), $e
+ );
+ }
+ }
+
+ /**
+ * Guesses the ability's name if it wasn't provided.
+ *
+ * @param mixed $ability
+ * @param mixed|array $arguments
+ * @return array
+ */
+ protected function parseAbilityAndArguments($ability, $arguments)
+ {
+ if (is_string($ability)) {
+ return [$ability, $arguments];
+ }
+
+ return [debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3)[2]['function'], $ability];
+ }
+
+ /**
+ * Throw an unauthorized exception based on gate results.
+ *
+ * @param string $ability
+ * @param mixed|array $arguments
+ * @param string $message
+ * @param \Exception $previousException
+ * @return \Symfony\Component\HttpKernel\Exception\HttpException
+ */
+ protected function createGateUnauthorizedException($ability, $arguments, $message = 'This action is unauthorized.', $previousException = null)
+ {
+ return new HttpException(403, $message, $previousException);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php
index 6320c69..32ce2c7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php
@@ -1,138 +1,10 @@
-registrar->validator($request->all());
-
- if ($validator->fails())
- {
- $this->throwValidationException(
- $request, $validator
- );
- }
-
- $this->auth->login($this->registrar->create($request->all()));
-
- return redirect($this->redirectPath());
- }
-
- /**
- * Show the application login form.
- *
- * @return \Illuminate\Http\Response
- */
- public function getLogin()
- {
- return view('auth.login');
- }
-
- /**
- * Handle a login request to the application.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Http\Response
- */
- public function postLogin(Request $request)
- {
- $this->validate($request, [
- 'email' => 'required|email', 'password' => 'required',
- ]);
-
- $credentials = $request->only('email', 'password');
-
- if ($this->auth->attempt($credentials, $request->has('remember')))
- {
- return redirect()->intended($this->redirectPath());
- }
-
- return redirect($this->loginPath())
- ->withInput($request->only('email', 'remember'))
- ->withErrors([
- 'email' => $this->getFailedLoginMessage(),
- ]);
- }
-
- /**
- * Get the failed login message.
- *
- * @return string
- */
- protected function getFailedLoginMessage()
- {
- return 'These credentials do not match our records.';
- }
-
- /**
- * Log the user out of the application.
- *
- * @return \Illuminate\Http\Response
- */
- public function getLogout()
- {
- $this->auth->logout();
-
- return redirect(property_exists($this, 'redirectAfterLogout') ? $this->redirectAfterLogout : '/');
- }
-
- /**
- * Get the post register / login redirect path.
- *
- * @return string
- */
- public function redirectPath()
- {
- if (property_exists($this, 'redirectPath'))
- {
- return $this->redirectPath;
- }
-
- return property_exists($this, 'redirectTo') ? $this->redirectTo : '/home';
- }
-
- /**
- * Get the path to the login route.
- *
- * @return string
- */
- public function loginPath()
- {
- return property_exists($this, 'loginPath') ? $this->loginPath : '/auth/login';
- }
+namespace Illuminate\Foundation\Auth;
+trait AuthenticatesAndRegistersUsers
+{
+ use AuthenticatesUsers, RegistersUsers {
+ AuthenticatesUsers::redirectPath insteadof RegistersUsers;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
new file mode 100644
index 0000000..2d1bc8c
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
@@ -0,0 +1,154 @@
+exists('auth.authenticate')) {
+ return view('auth.authenticate');
+ }
+
+ return view('auth.login');
+ }
+
+ /**
+ * Handle a login request to the application.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function postLogin(Request $request)
+ {
+ $this->validate($request, [
+ $this->loginUsername() => 'required', 'password' => 'required',
+ ]);
+
+ // If the class is using the ThrottlesLogins trait, we can automatically throttle
+ // the login attempts for this application. We'll key this by the username and
+ // the IP address of the client making these requests into this application.
+ $throttles = $this->isUsingThrottlesLoginsTrait();
+
+ if ($throttles && $this->hasTooManyLoginAttempts($request)) {
+ return $this->sendLockoutResponse($request);
+ }
+
+ $credentials = $this->getCredentials($request);
+
+ if (Auth::attempt($credentials, $request->has('remember'))) {
+ return $this->handleUserWasAuthenticated($request, $throttles);
+ }
+
+ // If the login attempt was unsuccessful we will increment the number of attempts
+ // to login and redirect the user back to the login form. Of course, when this
+ // user surpasses their maximum number of attempts they will get locked out.
+ if ($throttles) {
+ $this->incrementLoginAttempts($request);
+ }
+
+ return redirect($this->loginPath())
+ ->withInput($request->only($this->loginUsername(), 'remember'))
+ ->withErrors([
+ $this->loginUsername() => $this->getFailedLoginMessage(),
+ ]);
+ }
+
+ /**
+ * Send the response after the user was authenticated.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param bool $throttles
+ * @return \Illuminate\Http\Response
+ */
+ protected function handleUserWasAuthenticated(Request $request, $throttles)
+ {
+ if ($throttles) {
+ $this->clearLoginAttempts($request);
+ }
+
+ if (method_exists($this, 'authenticated')) {
+ return $this->authenticated($request, Auth::user());
+ }
+
+ return redirect()->intended($this->redirectPath());
+ }
+
+ /**
+ * Get the needed authorization credentials from the request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return array
+ */
+ protected function getCredentials(Request $request)
+ {
+ return $request->only($this->loginUsername(), 'password');
+ }
+
+ /**
+ * Get the failed login message.
+ *
+ * @return string
+ */
+ protected function getFailedLoginMessage()
+ {
+ return Lang::has('auth.failed')
+ ? Lang::get('auth.failed')
+ : 'These credentials do not match our records.';
+ }
+
+ /**
+ * Log the user out of the application.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function getLogout()
+ {
+ Auth::logout();
+
+ return redirect(property_exists($this, 'redirectAfterLogout') ? $this->redirectAfterLogout : '/');
+ }
+
+ /**
+ * Get the path to the login route.
+ *
+ * @return string
+ */
+ public function loginPath()
+ {
+ return property_exists($this, 'loginPath') ? $this->loginPath : '/auth/login';
+ }
+
+ /**
+ * Get the login username to be used by the controller.
+ *
+ * @return string
+ */
+ public function loginUsername()
+ {
+ return property_exists($this, 'username') ? $this->username : 'email';
+ }
+
+ /**
+ * Determine if the class is using the ThrottlesLogins trait.
+ *
+ * @return bool
+ */
+ protected function isUsingThrottlesLoginsTrait()
+ {
+ return in_array(
+ ThrottlesLogins::class, class_uses_recursive(get_class($this))
+ );
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php
new file mode 100644
index 0000000..99646a2
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php
@@ -0,0 +1,20 @@
+redirectPath;
+ }
+
+ return property_exists($this, 'redirectTo') ? $this->redirectTo : '/home';
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RegistersUsers.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RegistersUsers.php
new file mode 100644
index 0000000..496abd6
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RegistersUsers.php
@@ -0,0 +1,42 @@
+validator($request->all());
+
+ if ($validator->fails()) {
+ $this->throwValidationException(
+ $request, $validator
+ );
+ }
+
+ Auth::login($this->create($request->all()));
+
+ return redirect($this->redirectPath());
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php
index 52fec73..55d784d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php
@@ -1,139 +1,119 @@
-validate($request, ['email' => 'required|email']);
-
- $response = $this->passwords->sendResetLink($request->only('email'), function($m)
- {
- $m->subject($this->getEmailSubject());
- });
-
- switch ($response)
- {
- case PasswordBroker::RESET_LINK_SENT:
- return redirect()->back()->with('status', trans($response));
-
- case PasswordBroker::INVALID_USER:
- return redirect()->back()->withErrors(['email' => trans($response)]);
- }
- }
-
- /**
- * Get the e-mail subject line to be used for the reset link email.
- *
- * @return string
- */
- protected function getEmailSubject()
- {
- return isset($this->subject) ? $this->subject : 'Your Password Reset Link';
- }
-
- /**
- * Display the password reset view for the given token.
- *
- * @param string $token
- * @return Response
- */
- public function getReset($token = null)
- {
- if (is_null($token))
- {
- throw new NotFoundHttpException;
- }
-
- return view('auth.reset')->with('token', $token);
- }
-
- /**
- * Reset the given user's password.
- *
- * @param Request $request
- * @return Response
- */
- public function postReset(Request $request)
- {
- $this->validate($request, [
- 'token' => 'required',
- 'email' => 'required|email',
- 'password' => 'required|confirmed',
- ]);
-
- $credentials = $request->only(
- 'email', 'password', 'password_confirmation', 'token'
- );
-
- $response = $this->passwords->reset($credentials, function($user, $password)
- {
- $user->password = bcrypt($password);
-
- $user->save();
-
- $this->auth->login($user);
- });
-
- switch ($response)
- {
- case PasswordBroker::PASSWORD_RESET:
- return redirect($this->redirectPath());
-
- default:
- return redirect()->back()
- ->withInput($request->only('email'))
- ->withErrors(['email' => trans($response)]);
- }
- }
-
- /**
- * Get the post register / login redirect path.
- *
- * @return string
- */
- public function redirectPath()
- {
- if (property_exists($this, 'redirectPath'))
- {
- return $this->redirectPath;
- }
-
- return property_exists($this, 'redirectTo') ? $this->redirectTo : '/home';
- }
-
+trait ResetsPasswords
+{
+ use RedirectsUsers;
+
+ /**
+ * Display the form to request a password reset link.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function getEmail()
+ {
+ return view('auth.password');
+ }
+
+ /**
+ * Send a reset link to the given user.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function postEmail(Request $request)
+ {
+ $this->validate($request, ['email' => 'required|email']);
+
+ $response = Password::sendResetLink($request->only('email'), function (Message $message) {
+ $message->subject($this->getEmailSubject());
+ });
+
+ switch ($response) {
+ case Password::RESET_LINK_SENT:
+ return redirect()->back()->with('status', trans($response));
+ case Password::INVALID_USER:
+ return redirect()->back()->withErrors(['email' => trans($response)]);
+ }
+ }
+
+ /**
+ * Get the e-mail subject line to be used for the reset link email.
+ *
+ * @return string
+ */
+ protected function getEmailSubject()
+ {
+ return property_exists($this, 'subject') ? $this->subject : 'Your Password Reset Link';
+ }
+
+ /**
+ * Display the password reset view for the given token.
+ *
+ * @param string $token
+ * @return \Illuminate\Http\Response
+ */
+ public function getReset($token = null)
+ {
+ if (is_null($token)) {
+ throw new NotFoundHttpException;
+ }
+
+ return view('auth.reset')->with('token', $token);
+ }
+
+ /**
+ * Reset the given user's password.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function postReset(Request $request)
+ {
+ $this->validate($request, [
+ 'token' => 'required',
+ 'email' => 'required|email',
+ 'password' => 'required|confirmed|min:6',
+ ]);
+
+ $credentials = $request->only(
+ 'email', 'password', 'password_confirmation', 'token'
+ );
+
+ $response = Password::reset($credentials, function ($user, $password) {
+ $this->resetPassword($user, $password);
+ });
+
+ switch ($response) {
+ case Password::PASSWORD_RESET:
+ return redirect($this->redirectPath())->with('status', trans($response));
+ default:
+ return redirect()->back()
+ ->withInput($request->only('email'))
+ ->withErrors(['email' => trans($response)]);
+ }
+ }
+
+ /**
+ * Reset the given user's password.
+ *
+ * @param \Illuminate\Contracts\Auth\CanResetPassword $user
+ * @param string $password
+ * @return void
+ */
+ protected function resetPassword($user, $password)
+ {
+ $user->password = bcrypt($password);
+
+ $user->save();
+
+ Auth::login($user);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php
new file mode 100644
index 0000000..c382ce2
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php
@@ -0,0 +1,128 @@
+tooManyAttempts(
+ $this->getThrottleKey($request),
+ $this->maxLoginAttempts(), $this->lockoutTime() / 60
+ );
+ }
+
+ /**
+ * Increment the login attempts for the user.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return int
+ */
+ protected function incrementLoginAttempts(Request $request)
+ {
+ app(RateLimiter::class)->hit(
+ $this->getThrottleKey($request)
+ );
+ }
+
+ /**
+ * Determine how many retries are left for the user.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return int
+ */
+ protected function retriesLeft(Request $request)
+ {
+ $attempts = app(RateLimiter::class)->attempts(
+ $this->getThrottleKey($request)
+ );
+
+ return $this->maxLoginAttempts() - $attempts + 1;
+ }
+
+ /**
+ * Redirect the user after determining they are locked out.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ protected function sendLockoutResponse(Request $request)
+ {
+ $seconds = app(RateLimiter::class)->availableIn(
+ $this->getThrottleKey($request)
+ );
+
+ return redirect()->back()
+ ->withInput($request->only($this->loginUsername(), 'remember'))
+ ->withErrors([
+ $this->loginUsername() => $this->getLockoutErrorMessage($seconds),
+ ]);
+ }
+
+ /**
+ * Get the login lockout error message.
+ *
+ * @param int $seconds
+ * @return string
+ */
+ protected function getLockoutErrorMessage($seconds)
+ {
+ return Lang::has('auth.throttle')
+ ? Lang::get('auth.throttle', ['seconds' => $seconds])
+ : 'Too many login attempts. Please try again in '.$seconds.' seconds.';
+ }
+
+ /**
+ * Clear the login locks for the given user credentials.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return void
+ */
+ protected function clearLoginAttempts(Request $request)
+ {
+ app(RateLimiter::class)->clear(
+ $this->getThrottleKey($request)
+ );
+ }
+
+ /**
+ * Get the throttle key for the given request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return string
+ */
+ protected function getThrottleKey(Request $request)
+ {
+ return mb_strtolower($request->input($this->loginUsername())).'|'.$request->ip();
+ }
+
+ /**
+ * Get the maximum number of login attempts for delaying further attempts.
+ *
+ * @return int
+ */
+ protected function maxLoginAttempts()
+ {
+ return property_exists($this, 'maxLoginAttempts') ? $this->maxLoginAttempts : 5;
+ }
+
+ /**
+ * The number of seconds to delay further login attempts.
+ *
+ * @return int
+ */
+ protected function lockoutTime()
+ {
+ return property_exists($this, 'lockoutTime') ? $this->lockoutTime : 60;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php
index 58f8dc7..2c0bcb0 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php
@@ -1,18 +1,19 @@
-boot();
- }
+use Illuminate\Contracts\Foundation\Application;
+class BootProviders
+{
+ /**
+ * Bootstrap the given application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function bootstrap(Application $app)
+ {
+ $app->boot();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php
index 5da9808..8c75520 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php
@@ -1,108 +1,112 @@
-configureHandlers($app, $this->registerLogger($app));
-
- // Next, we will bind a Closure that resolves the PSR logger implementation
- // as this will grant us the ability to be interoperable with many other
- // libraries which are able to utilize the PSR standardized interface.
- $app->bind('Psr\Log\LoggerInterface', function($app)
- {
- return $app['log']->getMonolog();
- });
- }
+class ConfigureLogging
+{
+ /**
+ * Bootstrap the given application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function bootstrap(Application $app)
+ {
+ $log = $this->registerLogger($app);
- /**
- * Register the logger instance in the container.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @return \Illuminate\Log\Writer
- */
- protected function registerLogger(Application $app)
- {
- $app->instance('log', $log = new Writer(
- new Monolog($app->environment()), $app['events'])
- );
+ // If a custom Monolog configurator has been registered for the application
+ // we will call that, passing Monolog along. Otherwise, we will grab the
+ // the configurations for the log system and use it for configuration.
+ if ($app->hasMonologConfigurator()) {
+ call_user_func(
+ $app->getMonologConfigurator(), $log->getMonolog()
+ );
+ } else {
+ $this->configureHandlers($app, $log);
+ }
+ }
- return $log;
- }
+ /**
+ * Register the logger instance in the container.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return \Illuminate\Log\Writer
+ */
+ protected function registerLogger(Application $app)
+ {
+ $app->instance('log', $log = new Writer(
+ new Monolog($app->environment()), $app['events'])
+ );
- /**
- * Configure the Monolog handlers for the application.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @param \Illuminate\Log\Writer $log
- * @return void
- */
- protected function configureHandlers(Application $app, Writer $log)
- {
- $method = "configure".ucfirst($app['config']['app.log'])."Handler";
+ return $log;
+ }
- $this->{$method}($app, $log);
- }
+ /**
+ * Configure the Monolog handlers for the application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Log\Writer $log
+ * @return void
+ */
+ protected function configureHandlers(Application $app, Writer $log)
+ {
+ $method = 'configure'.ucfirst($app['config']['app.log']).'Handler';
- /**
- * Configure the Monolog handlers for the application.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @param \Illuminate\Log\Writer $log
- * @return void
- */
- protected function configureSingleHandler(Application $app, Writer $log)
- {
- $log->useFiles($app->storagePath().'/logs/laravel.log');
- }
+ $this->{$method}($app, $log);
+ }
- /**
- * Configure the Monolog handlers for the application.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @param \Illuminate\Log\Writer $log
- * @return void
- */
- protected function configureDailyHandler(Application $app, Writer $log)
- {
- $log->useDailyFiles(
- $app->storagePath().'/logs/laravel.log',
- $app->make('config')->get('app.log_max_files', 5)
- );
- }
+ /**
+ * Configure the Monolog handlers for the application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Log\Writer $log
+ * @return void
+ */
+ protected function configureSingleHandler(Application $app, Writer $log)
+ {
+ $log->useFiles($app->storagePath().'/logs/laravel.log');
+ }
- /**
- * Configure the Monolog handlers for the application.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @param \Illuminate\Log\Writer $log
- * @return void
- */
- protected function configureSyslogHandler(Application $app, Writer $log)
- {
- $log->useSyslog('laravel');
- }
+ /**
+ * Configure the Monolog handlers for the application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Log\Writer $log
+ * @return void
+ */
+ protected function configureDailyHandler(Application $app, Writer $log)
+ {
+ $log->useDailyFiles(
+ $app->storagePath().'/logs/laravel.log',
+ $app->make('config')->get('app.log_max_files', 5)
+ );
+ }
- /**
- * Configure the Monolog handlers for the application.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @param \Illuminate\Log\Writer $log
- * @return void
- */
- protected function configureErrorlogHandler(Application $app, Writer $log)
- {
- $log->useErrorLog();
- }
+ /**
+ * Configure the Monolog handlers for the application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Log\Writer $log
+ * @return void
+ */
+ protected function configureSyslogHandler(Application $app, Writer $log)
+ {
+ $log->useSyslog('laravel');
+ }
+ /**
+ * Configure the Monolog handlers for the application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Log\Writer $log
+ * @return void
+ */
+ protected function configureErrorlogHandler(Application $app, Writer $log)
+ {
+ $log->useErrorLog();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
index 600d7c5..4b44440 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php
@@ -1,32 +1,29 @@
-basePath(), $app->environmentFile());
- }
- catch (InvalidArgumentException $e)
- {
- //
- }
-
- $app->detectEnvironment(function()
- {
- return env('APP_ENV', 'production');
- });
- }
+class DetectEnvironment
+{
+ /**
+ * Bootstrap the given application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function bootstrap(Application $app)
+ {
+ try {
+ Dotenv::load($app->environmentPath(), $app->environmentFile());
+ } catch (InvalidArgumentException $e) {
+ //
+ }
+ $app->detectEnvironment(function () {
+ return env('APP_ENV', 'production');
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php
index f4625f9..4974e5c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php
@@ -1,155 +1,156 @@
-app = $app;
-
- error_reporting(-1);
-
- set_error_handler([$this, 'handleError']);
-
- set_exception_handler([$this, 'handleException']);
-
- register_shutdown_function([$this, 'handleShutdown']);
-
- if ( ! $app->environment('testing'))
- {
- ini_set('display_errors', 'Off');
- }
- }
-
- /**
- * Convert a PHP error to an ErrorException.
- *
- * @param int $level
- * @param string $message
- * @param string $file
- * @param int $line
- * @param array $context
- * @return void
- *
- * @throws \ErrorException
- */
- public function handleError($level, $message, $file = '', $line = 0, $context = array())
- {
- if (error_reporting() & $level)
- {
- throw new ErrorException($message, 0, $level, $file, $line);
- }
- }
-
- /**
- * Handle an uncaught exception from the application.
- *
- * Note: Most exceptions can be handled via the try / catch block in
- * the HTTP and Console kernels. But, fatal error exceptions must
- * be handled differently since they are not normal exceptions.
- *
- * @param \Exception $e
- * @return void
- */
- public function handleException($e)
- {
- $this->getExceptionHandler()->report($e);
-
- if ($this->app->runningInConsole())
- {
- $this->renderForConsole($e);
- }
- else
- {
- $this->renderHttpResponse($e);
- }
- }
-
- /**
- * Render an exception to the console.
- *
- * @param \Exception $e
- * @return void
- */
- protected function renderForConsole($e)
- {
- $this->getExceptionHandler()->renderForConsole(new ConsoleOutput, $e);
- }
-
- /**
- * Render an exception as an HTTP response and send it.
- *
- * @param \Exception $e
- * @return void
- */
- protected function renderHttpResponse($e)
- {
- $this->getExceptionHandler()->render($this->app['request'], $e)->send();
- }
-
- /**
- * Handle the PHP shutdown event.
- *
- * @return void
- */
- public function handleShutdown()
- {
- if ( ! is_null($error = error_get_last()) && $this->isFatal($error['type']))
- {
- $this->handleException($this->fatalExceptionFromError($error, 0));
- }
- }
-
- /**
- * Create a new fatal exception instance from an error array.
- *
- * @param array $error
- * @param int|null $traceOffset
- * @return \Symfony\Component\Debug\Exception\FatalErrorException
- */
- protected function fatalExceptionFromError(array $error, $traceOffset = null)
- {
- return new FatalErrorException(
- $error['message'], $error['type'], 0, $error['file'], $error['line'], $traceOffset
- );
- }
-
- /**
- * Determine if the error type is fatal.
- *
- * @param int $type
- * @return bool
- */
- protected function isFatal($type)
- {
- return in_array($type, [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE]);
- }
-
- /**
- * Get an instance of the exception handler.
- *
- * @return \Illuminate\Contracts\Debug\ExceptionHandler
- */
- protected function getExceptionHandler()
- {
- return $this->app->make('Illuminate\Contracts\Debug\ExceptionHandler');
- }
-
+use Symfony\Component\Debug\Exception\FatalThrowableError;
+
+class HandleExceptions
+{
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * Bootstrap the given application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function bootstrap(Application $app)
+ {
+ $this->app = $app;
+
+ error_reporting(-1);
+
+ set_error_handler([$this, 'handleError']);
+
+ set_exception_handler([$this, 'handleException']);
+
+ register_shutdown_function([$this, 'handleShutdown']);
+
+ if (! $app->environment('testing')) {
+ ini_set('display_errors', 'Off');
+ }
+ }
+
+ /**
+ * Convert a PHP error to an ErrorException.
+ *
+ * @param int $level
+ * @param string $message
+ * @param string $file
+ * @param int $line
+ * @param array $context
+ * @return void
+ *
+ * @throws \ErrorException
+ */
+ public function handleError($level, $message, $file = '', $line = 0, $context = [])
+ {
+ if (error_reporting() & $level) {
+ throw new ErrorException($message, 0, $level, $file, $line);
+ }
+ }
+
+ /**
+ * Handle an uncaught exception from the application.
+ *
+ * Note: Most exceptions can be handled via the try / catch block in
+ * the HTTP and Console kernels. But, fatal error exceptions must
+ * be handled differently since they are not normal exceptions.
+ *
+ * @param \Throwable $e
+ * @return void
+ */
+ public function handleException($e)
+ {
+ if (! $e instanceof Exception) {
+ $e = new FatalThrowableError($e);
+ }
+
+ $this->getExceptionHandler()->report($e);
+
+ if ($this->app->runningInConsole()) {
+ $this->renderForConsole($e);
+ } else {
+ $this->renderHttpResponse($e);
+ }
+ }
+
+ /**
+ * Render an exception to the console.
+ *
+ * @param \Exception $e
+ * @return void
+ */
+ protected function renderForConsole($e)
+ {
+ $this->getExceptionHandler()->renderForConsole(new ConsoleOutput, $e);
+ }
+
+ /**
+ * Render an exception as an HTTP response and send it.
+ *
+ * @param \Exception $e
+ * @return void
+ */
+ protected function renderHttpResponse($e)
+ {
+ $this->getExceptionHandler()->render($this->app['request'], $e)->send();
+ }
+
+ /**
+ * Handle the PHP shutdown event.
+ *
+ * @return void
+ */
+ public function handleShutdown()
+ {
+ if (! is_null($error = error_get_last()) && $this->isFatal($error['type'])) {
+ $this->handleException($this->fatalExceptionFromError($error, 0));
+ }
+ }
+
+ /**
+ * Create a new fatal exception instance from an error array.
+ *
+ * @param array $error
+ * @param int|null $traceOffset
+ * @return \Symfony\Component\Debug\Exception\FatalErrorException
+ */
+ protected function fatalExceptionFromError(array $error, $traceOffset = null)
+ {
+ return new FatalErrorException(
+ $error['message'], $error['type'], 0, $error['file'], $error['line'], $traceOffset
+ );
+ }
+
+ /**
+ * Determine if the error type is fatal.
+ *
+ * @param int $type
+ * @return bool
+ */
+ protected function isFatal($type)
+ {
+ return in_array($type, [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE]);
+ }
+
+ /**
+ * Get an instance of the exception handler.
+ *
+ * @return \Illuminate\Contracts\Debug\ExceptionHandler
+ */
+ protected function getExceptionHandler()
+ {
+ return $this->app->make('Illuminate\Contracts\Debug\ExceptionHandler');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
index 3cd8ca6..9f1c731 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
@@ -1,4 +1,6 @@
-getCachedConfigPath()))
- {
- $items = require $cached;
-
- $loadedFromCache = true;
- }
-
- $app->instance('config', $config = new Repository($items));
-
- // Next we will spin through all of the configuration files in the configuration
- // directory and load each one into the repository. This will make all of the
- // options available to the developer for use in various parts of this app.
- if ( ! isset($loadedFromCache))
- {
- $this->loadConfigurationFiles($app, $config);
- }
-
- date_default_timezone_set($config['app.timezone']);
-
- mb_internal_encoding('UTF-8');
- }
-
- /**
- * Load the configuration items from all of the files.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @param \Illuminate\Contracts\Config\Repository $config
- * @return void
- */
- protected function loadConfigurationFiles(Application $app, RepositoryContract $config)
- {
- foreach ($this->getConfigurationFiles($app) as $key => $path)
- {
- $config->set($key, require $path);
- }
- }
-
- /**
- * Get all of the configuration files for the application.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @return array
- */
- protected function getConfigurationFiles(Application $app)
- {
- $files = [];
-
- foreach (Finder::create()->files()->name('*.php')->in($app->configPath()) as $file)
- {
- $nesting = $this->getConfigurationNesting($file);
-
- $files[$nesting.basename($file->getRealPath(), '.php')] = $file->getRealPath();
- }
-
- return $files;
- }
-
- /**
- * Get the configuration file nesting path.
- *
- * @param \Symfony\Component\Finder\SplFileInfo $file
- * @return string
- */
- private function getConfigurationNesting(SplFileInfo $file)
- {
- $directory = dirname($file->getRealPath());
-
- if ($tree = trim(str_replace(config_path(), '', $directory), DIRECTORY_SEPARATOR))
- {
- $tree = str_replace(DIRECTORY_SEPARATOR, '.', $tree).'.';
- }
-
- return $tree;
- }
-
+class LoadConfiguration
+{
+ /**
+ * Bootstrap the given application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function bootstrap(Application $app)
+ {
+ $items = [];
+
+ // First we will see if we have a cache configuration file. If we do, we'll load
+ // the configuration items from that file so that it is very quick. Otherwise
+ // we will need to spin through every configuration file and load them all.
+ if (file_exists($cached = $app->getCachedConfigPath())) {
+ $items = require $cached;
+
+ $loadedFromCache = true;
+ }
+
+ $app->instance('config', $config = new Repository($items));
+
+ // Next we will spin through all of the configuration files in the configuration
+ // directory and load each one into the repository. This will make all of the
+ // options available to the developer for use in various parts of this app.
+ if (! isset($loadedFromCache)) {
+ $this->loadConfigurationFiles($app, $config);
+ }
+
+ date_default_timezone_set($config['app.timezone']);
+
+ mb_internal_encoding('UTF-8');
+ }
+
+ /**
+ * Load the configuration items from all of the files.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Contracts\Config\Repository $repository
+ * @return void
+ */
+ protected function loadConfigurationFiles(Application $app, RepositoryContract $repository)
+ {
+ foreach ($this->getConfigurationFiles($app) as $key => $path) {
+ $repository->set($key, require $path);
+ }
+ }
+
+ /**
+ * Get all of the configuration files for the application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return array
+ */
+ protected function getConfigurationFiles(Application $app)
+ {
+ $files = [];
+
+ $configPath = realpath($app->configPath());
+
+ foreach (Finder::create()->files()->name('*.php')->in($configPath) as $file) {
+ $nesting = $this->getConfigurationNesting($file, $configPath);
+
+ $files[$nesting.basename($file->getRealPath(), '.php')] = $file->getRealPath();
+ }
+
+ return $files;
+ }
+
+ /**
+ * Get the configuration file nesting path.
+ *
+ * @param \Symfony\Component\Finder\SplFileInfo $file
+ * @param string $configPath
+ * @return string
+ */
+ protected function getConfigurationNesting(SplFileInfo $file, $configPath)
+ {
+ $directory = dirname($file->getRealPath());
+
+ if ($tree = trim(str_replace($configPath, '', $directory), DIRECTORY_SEPARATOR)) {
+ $tree = str_replace(DIRECTORY_SEPARATOR, '.', $tree).'.';
+ }
+
+ return $tree;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php
index e626bab..7db2174 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php
@@ -1,24 +1,25 @@
-register();
- }
+ Facade::setFacadeApplication($app);
+ AliasLoader::getInstance($app->make('config')->get('app.aliases'))->register();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php
index 350e117..f18375c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php
@@ -1,18 +1,19 @@
-registerConfiguredProviders();
- }
+use Illuminate\Contracts\Foundation\Application;
+class RegisterProviders
+{
+ /**
+ * Bootstrap the given application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function bootstrap(Application $app)
+ {
+ $app->registerConfiguredProviders();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php
index 3ec6fab..ea9ef10 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php
@@ -1,21 +1,22 @@
-get('app.url', 'http://localhost');
-
- $app->instance('request', Request::create($url, 'GET', [], [], [], $_SERVER));
- }
+class SetRequestForConsole
+{
+ /**
+ * Bootstrap the given application.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function bootstrap(Application $app)
+ {
+ $url = $app->make('config')->get('app.url', 'http://localhost');
+ $app->instance('request', Request::create($url, 'GET', [], [], [], $_SERVER));
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesCommands.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesCommands.php
index d22a5d5..cc6678c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesCommands.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesCommands.php
@@ -1,43 +1,11 @@
-dispatch($command);
- }
-
- /**
- * Marshal a command and dispatch it to its appropriate handler.
- *
- * @param mixed $command
- * @param array $array
- * @return mixed
- */
- protected function dispatchFromArray($command, array $array)
- {
- return app('Illuminate\Contracts\Bus\Dispatcher')->dispatchFromArray($command, $array);
- }
-
- /**
- * Marshal a command and dispatch it to its appropriate handler.
- *
- * @param mixed $command
- * @param \ArrayAccess $source
- * @param array $extras
- * @return mixed
- */
- protected function dispatchFrom($command, ArrayAccess $source, $extras = [])
- {
- return app('Illuminate\Contracts\Bus\Dispatcher')->dispatchFrom($command, $source, $extras);
- }
+namespace Illuminate\Foundation\Bus;
+/**
+ * @deprecated since version 5.1. Use the DispatchesJobs trait directly.
+ */
+trait DispatchesCommands
+{
+ use DispatchesJobs;
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesJobs.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesJobs.php
new file mode 100644
index 0000000..7b486c1
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesJobs.php
@@ -0,0 +1,44 @@
+dispatch($job);
+ }
+
+ /**
+ * Marshal a job and dispatch it to its appropriate handler.
+ *
+ * @param mixed $job
+ * @param array $array
+ * @return mixed
+ */
+ protected function dispatchFromArray($job, array $array)
+ {
+ return app('Illuminate\Contracts\Bus\Dispatcher')->dispatchFromArray($job, $array);
+ }
+
+ /**
+ * Marshal a job and dispatch it to its appropriate handler.
+ *
+ * @param mixed $job
+ * @param \ArrayAccess $source
+ * @param array $extras
+ * @return mixed
+ */
+ protected function dispatchFrom($job, ArrayAccess $source, $extras = [])
+ {
+ return app('Illuminate\Contracts\Bus\Dispatcher')->dispatchFrom($job, $source, $extras);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Composer.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Composer.php
index abe7102..1027394 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Composer.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Composer.php
@@ -1,98 +1,106 @@
-files = $files;
+ $this->workingPath = $workingPath;
+ }
+
+ /**
+ * Regenerate the Composer autoloader files.
+ *
+ * @param string $extra
+ * @return void
+ */
+ public function dumpAutoloads($extra = '')
+ {
+ $process = $this->getProcess();
+
+ $process->setCommandLine(trim($this->findComposer().' dump-autoload '.$extra));
+
+ $process->run();
+ }
+
+ /**
+ * Regenerate the optimized Composer autoloader files.
+ *
+ * @return void
+ */
+ public function dumpOptimized()
+ {
+ $this->dumpAutoloads('--optimize');
+ }
+
+ /**
+ * Get the composer command for the environment.
+ *
+ * @return string
+ */
+ protected function findComposer()
+ {
+ if (! $this->files->exists($this->workingPath.'/composer.phar')) {
+ return 'composer';
+ }
+
+ $binary = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
+
+ if (defined('HHVM_VERSION')) {
+ $binary .= ' --php';
+ }
+
+ return "{$binary} composer.phar";
+ }
+
+ /**
+ * Get a new Symfony process instance.
+ *
+ * @return \Symfony\Component\Process\Process
+ */
+ protected function getProcess()
+ {
+ return (new Process('', $this->workingPath))->setTimeout(null);
+ }
-class Composer {
-
- /**
- * The filesystem instance.
- *
- * @var \Illuminate\Filesystem\Filesystem
- */
- protected $files;
-
- /**
- * The working path to regenerate from.
- *
- * @var string
- */
- protected $workingPath;
-
- /**
- * Create a new Composer manager instance.
- *
- * @param \Illuminate\Filesystem\Filesystem $files
- * @param string $workingPath
- * @return void
- */
- public function __construct(Filesystem $files, $workingPath = null)
- {
- $this->files = $files;
- $this->workingPath = $workingPath;
- }
-
- /**
- * Regenerate the Composer autoloader files.
- *
- * @param string $extra
- * @return void
- */
- public function dumpAutoloads($extra = '')
- {
- $process = $this->getProcess();
-
- $process->setCommandLine(trim($this->findComposer().' dump-autoload '.$extra));
-
- $process->run();
- }
-
- /**
- * Regenerate the optimized Composer autoloader files.
- *
- * @return void
- */
- public function dumpOptimized()
- {
- $this->dumpAutoloads('--optimize');
- }
-
- /**
- * Get the composer command for the environment.
- *
- * @return string
- */
- protected function findComposer()
- {
- if ($this->files->exists($this->workingPath.'/composer.phar'))
- {
- return '"'.PHP_BINARY.'" composer.phar';
- }
-
- return 'composer';
- }
-
- /**
- * Get a new Symfony process instance.
- *
- * @return \Symfony\Component\Process\Process
- */
- protected function getProcess()
- {
- return (new Process('', $this->workingPath))->setTimeout(null);
- }
-
- /**
- * Set the working path used by the class.
- *
- * @param string $path
- * @return $this
- */
- public function setWorkingPath($path)
- {
- $this->workingPath = realpath($path);
-
- return $this;
- }
+ /**
+ * Set the working path used by the class.
+ *
+ * @param string $path
+ * @return $this
+ */
+ public function setWorkingPath($path)
+ {
+ $this->workingPath = realpath($path);
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/ComposerScripts.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/ComposerScripts.php
new file mode 100644
index 0000000..604a0f8
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/ComposerScripts.php
@@ -0,0 +1,52 @@
+getComposer()->getConfig()->get('vendor-dir').'/autoload.php';
+
+ static::clearCompiled();
+ }
+
+ /**
+ * Handle the post-update Composer event.
+ *
+ * @param \Composer\Script\Event $event
+ * @return void
+ */
+ public static function postUpdate(Event $event)
+ {
+ require_once $event->getComposer()->getConfig()->get('vendor-dir').'/autoload.php';
+
+ static::clearCompiled();
+ }
+
+ /**
+ * Clear the cached Laravel bootstrapping files.
+ *
+ * @return void
+ */
+ protected static function clearCompiled()
+ {
+ $laravel = new Application(getcwd());
+
+ if (file_exists($compiledPath = $laravel->getCachedCompilePath())) {
+ @unlink($compiledPath);
+ }
+
+ if (file_exists($servicesPath = $laravel->getCachedServicesPath())) {
+ @unlink($servicesPath);
+ }
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php
index d6cf550..99a2798 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php
@@ -1,328 +1,329 @@
-files = $files;
- $this->composer = $composer;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->currentRoot = trim($this->getAppNamespace(), '\\');
-
- $this->setBootstrapNamespaces();
-
- $this->setAppDirectoryNamespace();
-
- $this->setConfigNamespaces();
-
- $this->setComposerNamespace();
-
- $this->setPhpSpecNamespace();
-
- $this->info('Application namespace set!');
-
- $this->composer->dumpAutoloads();
-
- $this->call('clear-compiled');
- }
-
- /**
- * Set the namespace on the files in the app directory.
- *
- * @return void
- */
- protected function setAppDirectoryNamespace()
- {
- $files = Finder::create()
+class AppNameCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'app:name';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Set the application namespace';
+
+ /**
+ * The Composer class instance.
+ *
+ * @var \Illuminate\Foundation\Composer
+ */
+ protected $composer;
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * Current root application namespace.
+ *
+ * @var string
+ */
+ protected $currentRoot;
+
+ /**
+ * Create a new key generator command.
+ *
+ * @param \Illuminate\Foundation\Composer $composer
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Composer $composer, Filesystem $files)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ $this->composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->currentRoot = trim($this->laravel->getNamespace(), '\\');
+
+ $this->setBootstrapNamespaces();
+
+ $this->setAppDirectoryNamespace();
+
+ $this->setConfigNamespaces();
+
+ $this->setComposerNamespace();
+
+ $this->setDatabaseFactoryNamespaces();
+
+ $this->setPhpSpecNamespace();
+
+ $this->info('Application namespace set!');
+
+ $this->composer->dumpAutoloads();
+
+ $this->call('clear-compiled');
+ }
+
+ /**
+ * Set the namespace on the files in the app directory.
+ *
+ * @return void
+ */
+ protected function setAppDirectoryNamespace()
+ {
+ $files = Finder::create()
->in($this->laravel['path'])
->name('*.php');
- foreach ($files as $file)
- {
- $this->replaceNamespace($file->getRealPath());
- }
- }
-
- /**
- * Replace the App namespace at the given path.
- *
- * @param string $path
- */
- protected function replaceNamespace($path)
- {
- $search = [
- 'namespace '.$this->currentRoot.';',
- $this->currentRoot.'\\',
- ];
-
- $replace = [
- 'namespace '.$this->argument('name').';',
- $this->argument('name').'\\',
- ];
-
- $this->replaceIn($path, $search, $replace);
- }
-
- /**
- * Set the bootstrap namespaces.
- *
- * @return void
- */
- protected function setBootstrapNamespaces()
- {
- $search = [
- $this->currentRoot.'\\Http',
- $this->currentRoot.'\\Console',
- $this->currentRoot.'\\Exceptions',
- ];
-
- $replace = [
- $this->argument('name').'\\Http',
- $this->argument('name').'\\Console',
- $this->argument('name').'\\Exceptions',
- ];
-
- $this->replaceIn($this->getBootstrapPath(), $search, $replace);
- }
-
- /**
- * Set the PSR-4 namespace in the Composer file.
- *
- * @return void
- */
- protected function setComposerNamespace()
- {
- $this->replaceIn(
- $this->getComposerPath(), $this->currentRoot.'\\\\', str_replace('\\', '\\\\', $this->argument('name')).'\\\\'
- );
- }
-
- /**
- * Set the namespace in the appropriate configuration files.
- *
- * @return void
- */
- protected function setConfigNamespaces()
- {
- $this->setAppConfigNamespaces();
-
- $this->setAuthConfigNamespace();
-
- $this->setServicesConfigNamespace();
- }
-
- /**
- * Set the application provider namespaces.
- *
- * @return void
- */
- protected function setAppConfigNamespaces()
- {
- $search = [
- $this->currentRoot.'\\Providers',
- $this->currentRoot.'\\Http\\Controllers\\',
- ];
-
- $replace = [
- $this->argument('name').'\\Providers',
- $this->argument('name').'\\Http\\Controllers\\',
- ];
-
- $this->replaceIn($this->getConfigPath('app'), $search, $replace);
- }
-
- /**
- * Set the authentication User namespace.
- *
- * @return void
- */
- protected function setAuthConfigNamespace()
- {
- $this->replaceIn(
- $this->getAuthConfigPath(), $this->currentRoot.'\\User', $this->argument('name').'\\User'
- );
- }
-
- /**
- * Set the services User namespace.
- *
- * @return void
- */
- protected function setServicesConfigNamespace()
- {
- $this->replaceIn(
- $this->getServicesConfigPath(), $this->currentRoot.'\\User', $this->argument('name').'\\User'
- );
- }
-
- /**
- * Set the PHPSpec configuration namespace.
- *
- * @return void
- */
- protected function setPhpSpecNamespace()
- {
- if ($this->files->exists($path = $this->getPhpSpecConfigPath()))
- {
- $this->replaceIn($path, $this->currentRoot, $this->argument('name'));
- }
- }
-
- /**
- * Replace the given string in the given file.
- *
- * @param string $path
- * @param string|array $search
- * @param string|array $replace
- * @return void
- */
- protected function replaceIn($path, $search, $replace)
- {
- $this->files->put($path, str_replace($search, $replace, $this->files->get($path)));
- }
-
- /**
- * Get the path to the Core User class.
- *
- * @return string
- */
- protected function getUserClassPath()
- {
- return $this->laravel['path'].'/Core/User.php';
- }
-
- /**
- * Get the path to the bootstrap/app.php file.
- *
- * @return string
- */
- protected function getBootstrapPath()
- {
- return $this->laravel->basePath().'/bootstrap/app.php';
- }
-
- /**
- * Get the path to the Composer.json file.
- *
- * @return string
- */
- protected function getComposerPath()
- {
- return $this->laravel->basePath().'/composer.json';
- }
-
- /**
- * Get the path to the given configuration file.
- *
- * @param string $name
- * @return string
- */
- protected function getConfigPath($name)
- {
- return $this->laravel['path.config'].'/'.$name.'.php';
- }
-
- /**
- * Get the path to the authentication configuration file.
- *
- * @return string
- */
- protected function getAuthConfigPath()
- {
- return $this->getConfigPath('auth');
- }
-
- /**
- * Get the path to the services configuration file.
- *
- * @return string
- */
- protected function getServicesConfigPath()
- {
- return $this->getConfigPath('services');
- }
-
- /**
- * Get the path to the PHPSpec configuration file.
- *
- * @return string
- */
- protected function getPhpSpecConfigPath()
- {
- return $this->laravel->basePath().'/phpspec.yml';
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('name', InputArgument::REQUIRED, 'The desired namespace.'),
- );
- }
-
+ foreach ($files as $file) {
+ $this->replaceNamespace($file->getRealPath());
+ }
+ }
+
+ /**
+ * Replace the App namespace at the given path.
+ *
+ * @param string $path
+ * @return void
+ */
+ protected function replaceNamespace($path)
+ {
+ $search = [
+ 'namespace '.$this->currentRoot.';',
+ $this->currentRoot.'\\',
+ ];
+
+ $replace = [
+ 'namespace '.$this->argument('name').';',
+ $this->argument('name').'\\',
+ ];
+
+ $this->replaceIn($path, $search, $replace);
+ }
+
+ /**
+ * Set the bootstrap namespaces.
+ *
+ * @return void
+ */
+ protected function setBootstrapNamespaces()
+ {
+ $search = [
+ $this->currentRoot.'\\Http',
+ $this->currentRoot.'\\Console',
+ $this->currentRoot.'\\Exceptions',
+ ];
+
+ $replace = [
+ $this->argument('name').'\\Http',
+ $this->argument('name').'\\Console',
+ $this->argument('name').'\\Exceptions',
+ ];
+
+ $this->replaceIn($this->getBootstrapPath(), $search, $replace);
+ }
+
+ /**
+ * Set the PSR-4 namespace in the Composer file.
+ *
+ * @return void
+ */
+ protected function setComposerNamespace()
+ {
+ $this->replaceIn(
+ $this->getComposerPath(), str_replace('\\', '\\\\', $this->currentRoot).'\\\\', str_replace('\\', '\\\\', $this->argument('name')).'\\\\'
+ );
+ }
+
+ /**
+ * Set the namespace in the appropriate configuration files.
+ *
+ * @return void
+ */
+ protected function setConfigNamespaces()
+ {
+ $this->setAppConfigNamespaces();
+
+ $this->setAuthConfigNamespace();
+
+ $this->setServicesConfigNamespace();
+ }
+
+ /**
+ * Set the application provider namespaces.
+ *
+ * @return void
+ */
+ protected function setAppConfigNamespaces()
+ {
+ $search = [
+ $this->currentRoot.'\\Providers',
+ $this->currentRoot.'\\Http\\Controllers\\',
+ ];
+
+ $replace = [
+ $this->argument('name').'\\Providers',
+ $this->argument('name').'\\Http\\Controllers\\',
+ ];
+
+ $this->replaceIn($this->getConfigPath('app'), $search, $replace);
+ }
+
+ /**
+ * Set the authentication User namespace.
+ *
+ * @return void
+ */
+ protected function setAuthConfigNamespace()
+ {
+ $this->replaceIn(
+ $this->getAuthConfigPath(), $this->currentRoot.'\\User', $this->argument('name').'\\User'
+ );
+ }
+
+ /**
+ * Set the services User namespace.
+ *
+ * @return void
+ */
+ protected function setServicesConfigNamespace()
+ {
+ $this->replaceIn(
+ $this->getServicesConfigPath(), $this->currentRoot.'\\User', $this->argument('name').'\\User'
+ );
+ }
+
+ /**
+ * Set the PHPSpec configuration namespace.
+ *
+ * @return void
+ */
+ protected function setPhpSpecNamespace()
+ {
+ if ($this->files->exists($path = $this->getPhpSpecConfigPath())) {
+ $this->replaceIn($path, $this->currentRoot, $this->argument('name'));
+ }
+ }
+
+ /**
+ * Set the namespace in database factory files.
+ *
+ * @return void
+ */
+ protected function setDatabaseFactoryNamespaces()
+ {
+ $this->replaceIn(
+ $this->laravel->databasePath().'/factories/ModelFactory.php', $this->currentRoot, $this->argument('name')
+ );
+ }
+
+ /**
+ * Replace the given string in the given file.
+ *
+ * @param string $path
+ * @param string|array $search
+ * @param string|array $replace
+ * @return void
+ */
+ protected function replaceIn($path, $search, $replace)
+ {
+ $this->files->put($path, str_replace($search, $replace, $this->files->get($path)));
+ }
+
+ /**
+ * Get the path to the bootstrap/app.php file.
+ *
+ * @return string
+ */
+ protected function getBootstrapPath()
+ {
+ return $this->laravel->basePath().'/bootstrap/app.php';
+ }
+
+ /**
+ * Get the path to the Composer.json file.
+ *
+ * @return string
+ */
+ protected function getComposerPath()
+ {
+ return $this->laravel->basePath().'/composer.json';
+ }
+
+ /**
+ * Get the path to the given configuration file.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function getConfigPath($name)
+ {
+ return $this->laravel['path.config'].'/'.$name.'.php';
+ }
+
+ /**
+ * Get the path to the authentication configuration file.
+ *
+ * @return string
+ */
+ protected function getAuthConfigPath()
+ {
+ return $this->getConfigPath('auth');
+ }
+
+ /**
+ * Get the path to the services configuration file.
+ *
+ * @return string
+ */
+ protected function getServicesConfigPath()
+ {
+ return $this->getConfigPath('services');
+ }
+
+ /**
+ * Get the path to the PHPSpec configuration file.
+ *
+ * @return string
+ */
+ protected function getPhpSpecConfigPath()
+ {
+ return $this->laravel->basePath().'/phpspec.yml';
+ }
+
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['name', InputArgument::REQUIRED, 'The desired namespace.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php
index fa78540..a2f3c34 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php
@@ -1,42 +1,41 @@
-laravel->getCachedCompilePath();
- $servicesPath = $this->laravel->getCachedServicesPath();
-
- if (file_exists($compiledPath))
- {
- @unlink($compiledPath);
- }
-
- if (file_exists($servicesPath))
- {
- @unlink($servicesPath);
- }
- }
+use Illuminate\Console\Command;
+class ClearCompiledCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'clear-compiled';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Remove the compiled class file';
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $compiledPath = $this->laravel->getCachedCompilePath();
+ $servicesPath = $this->laravel->getCachedServicesPath();
+
+ if (file_exists($compiledPath)) {
+ @unlink($compiledPath);
+ }
+
+ if (file_exists($servicesPath)) {
+ @unlink($servicesPath);
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/CommandMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/CommandMakeCommand.php
index d376007..d009dc2 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/CommandMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/CommandMakeCommand.php
@@ -1,97 +1,90 @@
-option('handler'))
- {
- $this->call('handler:command', [
- 'name' => $this->argument('name').'Handler',
- '--command' => $this->parseName($this->argument('name')),
- ]);
- }
- }
+ /**
+ * Execute the command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ parent::fire();
- /**
- * Get the stub file for the generator.
- *
- * @return string
- */
- protected function getStub()
- {
- if ($this->option('queued') && $this->option('handler'))
- {
- return __DIR__.'/stubs/command-queued-with-handler.stub';
- }
- elseif ($this->option('queued'))
- {
- return __DIR__.'/stubs/command-queued.stub';
- }
- elseif ($this->option('handler'))
- {
- return __DIR__.'/stubs/command-with-handler.stub';
- }
- else
- {
- return __DIR__.'/stubs/command.stub';
- }
- }
+ if ($this->option('handler')) {
+ $this->call('handler:command', [
+ 'name' => $this->argument('name').'Handler',
+ '--command' => $this->parseName($this->argument('name')),
+ ]);
+ }
+ }
- /**
- * Get the default namespace for the class.
- *
- * @param string $rootNamespace
- * @return string
- */
- protected function getDefaultNamespace($rootNamespace)
- {
- return $rootNamespace.'\Commands';
- }
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ if ($this->option('queued') && $this->option('handler')) {
+ return __DIR__.'/stubs/command-queued-with-handler.stub';
+ } elseif ($this->option('queued')) {
+ return __DIR__.'/stubs/command-queued.stub';
+ } elseif ($this->option('handler')) {
+ return __DIR__.'/stubs/command-with-handler.stub';
+ } else {
+ return __DIR__.'/stubs/command.stub';
+ }
+ }
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('handler', null, InputOption::VALUE_NONE, 'Indicates that handler class should be generated.'),
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace.'\Commands';
+ }
- array('queued', null, InputOption::VALUE_NONE, 'Indicates that command should be queued.'),
- );
- }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['handler', null, InputOption::VALUE_NONE, 'Indicates that handler class should be generated.'],
+ ['queued', null, InputOption::VALUE_NONE, 'Indicates that command should be queued.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php
index 431d0c2..2152cfa 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php
@@ -1,93 +1,75 @@
-files = $files;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->call('config:clear');
-
- $config = $this->setRealSessionDriver(
- $this->getFreshConfiguration()
- );
-
- $this->files->put(
- $this->laravel->getCachedConfigPath(), 'info('Configuration cached successfully!');
- }
-
- /**
- * Boot a fresh copy of the application configuration.
- *
- * @return array
- */
- protected function getFreshConfiguration()
- {
- $app = require $this->laravel->basePath().'/bootstrap/app.php';
-
- $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
-
- return $app['config']->all();
- }
-
- /**
- * Set the "real" session driver on the configuration array.
- *
- * Typically the SessionManager forces the driver to "array" in CLI environment.
- *
- * @param array $config
- * @return array
- */
- protected function setRealSessionDriver(array $config)
- {
- $session = require $this->laravel->configPath().'/session.php';
-
- $config['session']['driver'] = $session['driver'];
-
- return $config;
- }
-
+class ConfigCacheCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'config:cache';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a cache file for faster configuration loading';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * Create a new config cache command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Filesystem $files)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->call('config:clear');
+
+ $config = $this->getFreshConfiguration();
+
+ $this->files->put(
+ $this->laravel->getCachedConfigPath(), 'info('Configuration cached successfully!');
+ }
+
+ /**
+ * Boot a fresh copy of the application configuration.
+ *
+ * @return array
+ */
+ protected function getFreshConfiguration()
+ {
+ $app = require $this->laravel->basePath().'/bootstrap/app.php';
+
+ $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
+
+ return $app['config']->all();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigClearCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigClearCommand.php
index 0365c62..bb25a8e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigClearCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigClearCommand.php
@@ -1,54 +1,55 @@
-files = $files;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->files->delete($this->laravel->getCachedConfigPath());
-
- $this->info('Configuration cache cleared!');
- }
-
+class ConfigClearCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'config:clear';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Remove the configuration cache file';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * Create a new config clear command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Filesystem $files)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->files->delete($this->laravel->getCachedConfigPath());
+
+ $this->info('Configuration cache cleared!');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php
index da7e83b..f69a5d6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php
@@ -1,89 +1,90 @@
-option('command'), $stub);
- }
+ /**
+ * Replace the class name for the given stub.
+ *
+ * @param string $stub
+ * @param string $name
+ * @return string
+ */
+ protected function replaceClass($stub, $name)
+ {
+ $stub = parent::replaceClass($stub, $name);
- /**
- * Get the stub file for the generator.
- *
- * @return string
- */
- protected function getStub()
- {
- return __DIR__.'/stubs/console.stub';
- }
+ return str_replace('dummy:command', $this->option('command'), $stub);
+ }
- /**
- * Get the default namespace for the class.
- *
- * @param string $rootNamespace
- * @return string
- */
- protected function getDefaultNamespace($rootNamespace)
- {
- return $rootNamespace.'\Console\Commands';
- }
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ return __DIR__.'/stubs/console.stub';
+ }
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('name', InputArgument::REQUIRED, 'The name of the command.'),
- );
- }
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace.'\Console\Commands';
+ }
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('command', null, InputOption::VALUE_OPTIONAL, 'The terminal command that should be assigned.', 'command:name'),
- );
- }
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['name', InputArgument::REQUIRED, 'The name of the command.'],
+ ];
+ }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['command', null, InputOption::VALUE_OPTIONAL, 'The terminal command that should be assigned.', 'command:name'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php
index 317eaf8..05ad35b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php
@@ -1,33 +1,34 @@
-laravel->storagePath().'/framework/down');
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Put the application into maintenance mode';
- $this->comment('Application is now in maintenance mode.');
- }
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ touch($this->laravel->storagePath().'/framework/down');
+ $this->comment('Application is now in maintenance mode.');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EnvironmentCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EnvironmentCommand.php
index 5a12976..b227165 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EnvironmentCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EnvironmentCommand.php
@@ -1,31 +1,32 @@
-line('Current application environment: '.$this->laravel['env'].'');
- }
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Display the current framework environment';
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->line('Current application environment: '.$this->laravel['env'].'');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventGenerateCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventGenerateCommand.php
index b5ec2b3..f08ebdd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventGenerateCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventGenerateCommand.php
@@ -1,48 +1,51 @@
-laravel->getProvider(
- 'Illuminate\Foundation\Support\Providers\EventServiceProvider'
- );
-
- foreach ($provider->listens() as $event => $handlers)
- {
- if ( ! str_contains($event, '\\'))
- continue;
-
- $this->callSilent('make:event', ['name' => $event]);
-
- foreach ($handlers as $handler)
- {
- $this->callSilent('handler:event', ['name' => $handler, '--event' => $event]);
- }
- }
-
- $this->info('Events and handlers generated successfully!');
- }
+use Illuminate\Support\Str;
+use Illuminate\Console\Command;
+class EventGenerateCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'event:generate';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Generate the missing events and listeners based on registration';
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $provider = $this->laravel->getProvider(
+ 'Illuminate\Foundation\Support\Providers\EventServiceProvider'
+ );
+
+ foreach ($provider->listens() as $event => $listeners) {
+ if (! Str::contains($event, '\\')) {
+ continue;
+ }
+
+ $this->callSilent('make:event', ['name' => $event]);
+
+ foreach ($listeners as $listener) {
+ $listener = preg_replace('/@.+$/', '', $listener);
+
+ $this->callSilent('make:listener', ['name' => $listener, '--event' => $event]);
+ }
+ }
+
+ $this->info('Events and listeners generated successfully!');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventMakeCommand.php
index 0730125..f18719a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventMakeCommand.php
@@ -1,49 +1,61 @@
-confirmToProceed()) return;
-
- $files = new Filesystem;
-
- $files->deleteDirectory(app_path('Services'));
- $files->delete(base_path('resources/views/app.blade.php'));
- $files->delete(base_path('resources/views/home.blade.php'));
- $files->deleteDirectory(app_path('Http/Controllers/Auth'));
- $files->deleteDirectory(base_path('resources/views/auth'));
- $files->deleteDirectory(base_path('resources/views/emails'));
- $files->delete(app_path('Http/Controllers/HomeController.php'));
-
- $files->deleteDirectory(base_path('public/css'));
- $files->deleteDirectory(base_path('public/fonts'));
- $files->put(base_path('resources/assets/less/app.less'), ''.PHP_EOL);
- $files->deleteDirectory(base_path('resources/assets/less/bootstrap'));
-
- $files->delete(base_path('database/migrations/2014_10_12_000000_create_users_table.php'));
- $files->delete(base_path('database/migrations/2014_10_12_100000_create_password_resets_table.php'));
-
- $files->put(app_path('Http/routes.php'), $files->get(__DIR__.'/stubs/fresh-routes.stub'));
- $files->put(app_path('Providers/AppServiceProvider.php'), $files->get(__DIR__.'/stubs/fresh-app-provider.stub'));
-
- $this->info('Scaffolding removed! Enjoy your fresh start.');
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'),
- );
- }
-
-}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerCommandCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerCommandCommand.php
index f1da67d..33de193 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerCommandCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerCommandCommand.php
@@ -1,83 +1,84 @@
-option('command')), $stub
- );
+ /**
+ * Build the class with the given name.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function buildClass($name)
+ {
+ $stub = parent::buildClass($name);
- $stub = str_replace(
- '{{fullCommand}}', $this->option('command'), $stub
- );
+ $stub = str_replace(
+ 'DummyCommand', class_basename($this->option('command')), $stub
+ );
- return $stub;
- }
+ $stub = str_replace(
+ 'DummyFullCommand', $this->option('command'), $stub
+ );
- /**
- * Get the stub file for the generator.
- *
- * @return string
- */
- protected function getStub()
- {
- return __DIR__.'/stubs/command-handler.stub';
- }
+ return $stub;
+ }
- /**
- * Get the default namespace for the class.
- *
- * @param string $rootNamespace
- * @return string
- */
- protected function getDefaultNamespace($rootNamespace)
- {
- return $rootNamespace.'\Handlers\Commands';
- }
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ return __DIR__.'/stubs/command-handler.stub';
+ }
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('command', null, InputOption::VALUE_REQUIRED, 'The command class the handler handles.'),
- );
- }
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace.'\Handlers\Commands';
+ }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['command', null, InputOption::VALUE_REQUIRED, 'The command class the handler handles.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerEventCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerEventCommand.php
index 7e30941..341ffe0 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerEventCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/HandlerEventCommand.php
@@ -1,99 +1,97 @@
-option('event');
-
- if ( ! starts_with($event, $this->getAppNamespace()))
- {
- $event = $this->getAppNamespace().'Events\\'.$event;
- }
-
- $stub = str_replace(
- '{{event}}', class_basename($event), $stub
- );
-
- $stub = str_replace(
- '{{fullEvent}}', $event, $stub
- );
-
- return $stub;
- }
-
- /**
- * Get the stub file for the generator.
- *
- * @return string
- */
- protected function getStub()
- {
- if ($this->option('queued'))
- {
- return __DIR__.'/stubs/event-handler-queued.stub';
- }
- else
- {
- return __DIR__.'/stubs/event-handler.stub';
- }
- }
-
- /**
- * Get the default namespace for the class.
- *
- * @param string $rootNamespace
- * @return string
- */
- protected function getDefaultNamespace($rootNamespace)
- {
- return $rootNamespace.'\Handlers\Events';
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('event', null, InputOption::VALUE_REQUIRED, 'The event class the handler handles.'),
-
- array('queued', null, InputOption::VALUE_NONE, 'Indicates the event handler should be queued.'),
- );
- }
-
+class HandlerEventCommand extends GeneratorCommand
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'handler:event';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a new event handler class';
+
+ /**
+ * The type of class being generated.
+ *
+ * @var string
+ */
+ protected $type = 'Handler';
+
+ /**
+ * Build the class with the given name.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function buildClass($name)
+ {
+ $stub = parent::buildClass($name);
+
+ $event = $this->option('event');
+
+ if (! Str::startsWith($event, $this->laravel->getNamespace())) {
+ $event = $this->laravel->getNamespace().'Events\\'.$event;
+ }
+
+ $stub = str_replace(
+ 'DummyEvent', class_basename($event), $stub
+ );
+
+ $stub = str_replace(
+ 'DummyFullEvent', $event, $stub
+ );
+
+ return $stub;
+ }
+
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ if ($this->option('queued')) {
+ return __DIR__.'/stubs/event-handler-queued.stub';
+ } else {
+ return __DIR__.'/stubs/event-handler.stub';
+ }
+ }
+
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace.'\Handlers\Events';
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['event', null, InputOption::VALUE_REQUIRED, 'The event class the handler handles.'],
+
+ ['queued', null, InputOption::VALUE_NONE, 'Indicates the event handler should be queued.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/IlluminateCaster.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/IlluminateCaster.php
new file mode 100644
index 0000000..e555c82
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/IlluminateCaster.php
@@ -0,0 +1,97 @@
+$property();
+
+ if (! is_null($val)) {
+ $results[Caster::PREFIX_VIRTUAL.$property] = $val;
+ }
+ } catch (Exception $e) {
+ //
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Get an array representing the properties of a collection.
+ *
+ * @param \Illuminate\Support\Collection $collection
+ * @return array
+ */
+ public static function castCollection(Collection $collection)
+ {
+ return [
+ Caster::PREFIX_VIRTUAL.'all' => $collection->all(),
+ ];
+ }
+
+ /**
+ * Get an array representing the properties of a model.
+ *
+ * @param \Illuminate\Database\Eloquent\Model $model
+ * @return array
+ */
+ public static function castModel(Model $model)
+ {
+ $attributes = array_merge(
+ $model->getAttributes(), $model->getRelations()
+ );
+
+ $visible = array_flip(
+ $model->getVisible() ?: array_diff(array_keys($attributes), $model->getHidden())
+ );
+
+ $results = [];
+
+ foreach (array_intersect_key($attributes, $visible) as $key => $value) {
+ $results[(isset($visible[$key]) ? Caster::PREFIX_VIRTUAL : Caster::PREFIX_PROTECTED).$key] = $value;
+ }
+
+ return $results;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php
new file mode 100644
index 0000000..8e1aeee
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php
@@ -0,0 +1,67 @@
+option('queued')) {
+ return __DIR__.'/stubs/job-queued.stub';
+ } else {
+ return __DIR__.'/stubs/job.stub';
+ }
+ }
+
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace.'\Jobs';
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['queued', null, InputOption::VALUE_NONE, 'Indicates that job should be queued.'],
+ ];
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php
index 3d2e280..991588f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php
@@ -1,250 +1,264 @@
-app = $app;
- $this->events = $events;
-
- $this->app->booted(function()
- {
- $this->defineConsoleSchedule();
- });
- }
-
- /**
- * Define the application's command schedule.
- *
- * @return void
- */
- protected function defineConsoleSchedule()
- {
- $this->app->instance(
- 'Illuminate\Console\Scheduling\Schedule', $schedule = new Schedule
- );
-
- $this->schedule($schedule);
- }
-
- /**
- * Run the console application.
- *
- * @param \Symfony\Component\Console\Input\InputInterface $input
- * @param \Symfony\Component\Console\Output\OutputInterface $output
- * @return int
- */
- public function handle($input, $output = null)
- {
- try
- {
- $this->bootstrap();
-
- return $this->getArtisan()->run($input, $output);
- }
- catch (Exception $e)
- {
- $this->reportException($e);
-
- $this->renderException($output, $e);
-
- return 1;
- }
- }
-
- /**
- * Terminate the application.
- *
- * @param \Symfony\Component\Console\Input\InputInterface $input
- * @param int $status
- * @return void
- */
- public function terminate($input, $status)
- {
- $this->app->terminate();
- }
-
- /**
- * Define the application's command schedule.
- *
- * @param \Illuminate\Console\Scheduling\Schedule $schedule
- * @return void
- */
- protected function schedule(Schedule $schedule)
- {
- //
- }
-
- /**
- * Run an Artisan console command by name.
- *
- * @param string $command
- * @param array $parameters
- * @return int
- */
- public function call($command, array $parameters = array())
- {
- $this->bootstrap();
-
- // If we are calling a arbitary command from within the application, we will load
- // all of the available deferred providers which will make all of the commands
- // available to an application. Otherwise the command will not be available.
- $this->app->loadDeferredProviders();
-
- return $this->getArtisan()->call($command, $parameters);
- }
-
- /**
- * Queue the given console command.
- *
- * @param string $command
- * @param array $parameters
- * @return void
- */
- public function queue($command, array $parameters = array())
- {
- $this->app['Illuminate\Contracts\Queue\Queue']->push(
- 'Illuminate\Foundation\Console\QueuedJob', func_get_args()
- );
- }
-
- /**
- * Get all of the commands registered with the console.
- *
- * @return array
- */
- public function all()
- {
- $this->bootstrap();
-
- return $this->getArtisan()->all();
- }
-
- /**
- * Get the output for the last run command.
- *
- * @return string
- */
- public function output()
- {
- $this->bootstrap();
-
- return $this->getArtisan()->output();
- }
-
- /**
- * Bootstrap the application for HTTP requests.
- *
- * @return void
- */
- public function bootstrap()
- {
- if ( ! $this->app->hasBeenBootstrapped())
- {
- $this->app->bootstrapWith($this->bootstrappers());
- }
-
- $this->app->loadDeferredProviders();
- }
-
- /**
- * Get the Artisan application instance.
- *
- * @return \Illuminate\Console\Application
- */
- protected function getArtisan()
- {
- if (is_null($this->artisan))
- {
- return $this->artisan = (new Artisan($this->app, $this->events, $this->app->version()))
- ->resolveCommands($this->commands);
- }
-
- return $this->artisan;
- }
-
- /**
- * Get the bootstrap classes for the application.
- *
- * @return array
- */
- protected function bootstrappers()
- {
- return $this->bootstrappers;
- }
-
- /**
- * Report the exception to the exception handler.
- *
- * @param \Exception $e
- * @return void
- */
- protected function reportException(Exception $e)
- {
- $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->report($e);
- }
-
- /**
- * Report the exception to the exception handler.
- *
- * @param \Symfony\Component\Console\Output\OutputInterface $output
- * @param \Exception $e
- * @return void
- */
- protected function renderException($output, Exception $e)
- {
- $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->renderForConsole($output, $e);
- }
-
+use Symfony\Component\Debug\Exception\FatalThrowableError;
+
+class Kernel implements KernelContract
+{
+ /**
+ * The application implementation.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The event dispatcher implementation.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected $events;
+
+ /**
+ * The Artisan application instance.
+ *
+ * @var \Illuminate\Console\Application
+ */
+ protected $artisan;
+
+ /**
+ * The Artisan commands provided by the application.
+ *
+ * @var array
+ */
+ protected $commands = [];
+
+ /**
+ * The bootstrap classes for the application.
+ *
+ * @var array
+ */
+ protected $bootstrappers = [
+ 'Illuminate\Foundation\Bootstrap\DetectEnvironment',
+ 'Illuminate\Foundation\Bootstrap\LoadConfiguration',
+ 'Illuminate\Foundation\Bootstrap\ConfigureLogging',
+ 'Illuminate\Foundation\Bootstrap\HandleExceptions',
+ 'Illuminate\Foundation\Bootstrap\RegisterFacades',
+ 'Illuminate\Foundation\Bootstrap\SetRequestForConsole',
+ 'Illuminate\Foundation\Bootstrap\RegisterProviders',
+ 'Illuminate\Foundation\Bootstrap\BootProviders',
+ ];
+
+ /**
+ * Create a new console kernel instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @return void
+ */
+ public function __construct(Application $app, Dispatcher $events)
+ {
+ if (! defined('ARTISAN_BINARY')) {
+ define('ARTISAN_BINARY', 'artisan');
+ }
+
+ $this->app = $app;
+ $this->events = $events;
+
+ $this->app->booted(function () {
+ $this->defineConsoleSchedule();
+ });
+ }
+
+ /**
+ * Define the application's command schedule.
+ *
+ * @return void
+ */
+ protected function defineConsoleSchedule()
+ {
+ $this->app->instance(
+ 'Illuminate\Console\Scheduling\Schedule', $schedule = new Schedule
+ );
+
+ $this->schedule($schedule);
+ }
+
+ /**
+ * Run the console application.
+ *
+ * @param \Symfony\Component\Console\Input\InputInterface $input
+ * @param \Symfony\Component\Console\Output\OutputInterface $output
+ * @return int
+ */
+ public function handle($input, $output = null)
+ {
+ try {
+ $this->bootstrap();
+
+ return $this->getArtisan()->run($input, $output);
+ } catch (Exception $e) {
+ $this->reportException($e);
+
+ $this->renderException($output, $e);
+
+ return 1;
+ } catch (Throwable $e) {
+ $e = new FatalThrowableError($e);
+
+ $this->reportException($e);
+
+ $this->renderException($output, $e);
+
+ return 1;
+ }
+ }
+
+ /**
+ * Terminate the application.
+ *
+ * @param \Symfony\Component\Console\Input\InputInterface $input
+ * @param int $status
+ * @return void
+ */
+ public function terminate($input, $status)
+ {
+ $this->app->terminate();
+ }
+
+ /**
+ * Define the application's command schedule.
+ *
+ * @param \Illuminate\Console\Scheduling\Schedule $schedule
+ * @return void
+ */
+ protected function schedule(Schedule $schedule)
+ {
+ //
+ }
+
+ /**
+ * Run an Artisan console command by name.
+ *
+ * @param string $command
+ * @param array $parameters
+ * @return int
+ */
+ public function call($command, array $parameters = [])
+ {
+ $this->bootstrap();
+
+ return $this->getArtisan()->call($command, $parameters);
+ }
+
+ /**
+ * Queue the given console command.
+ *
+ * @param string $command
+ * @param array $parameters
+ * @return void
+ */
+ public function queue($command, array $parameters = [])
+ {
+ $this->app['Illuminate\Contracts\Queue\Queue']->push(
+ 'Illuminate\Foundation\Console\QueuedJob', func_get_args()
+ );
+ }
+
+ /**
+ * Get all of the commands registered with the console.
+ *
+ * @return array
+ */
+ public function all()
+ {
+ $this->bootstrap();
+
+ return $this->getArtisan()->all();
+ }
+
+ /**
+ * Get the output for the last run command.
+ *
+ * @return string
+ */
+ public function output()
+ {
+ $this->bootstrap();
+
+ return $this->getArtisan()->output();
+ }
+
+ /**
+ * Bootstrap the application for artisan commands.
+ *
+ * @return void
+ */
+ public function bootstrap()
+ {
+ if (! $this->app->hasBeenBootstrapped()) {
+ $this->app->bootstrapWith($this->bootstrappers());
+ }
+
+ // If we are calling an arbitrary command from within the application, we'll load
+ // all of the available deferred providers which will make all of the commands
+ // available to an application. Otherwise the command will not be available.
+ $this->app->loadDeferredProviders();
+ }
+
+ /**
+ * Get the Artisan application instance.
+ *
+ * @return \Illuminate\Console\Application
+ */
+ protected function getArtisan()
+ {
+ if (is_null($this->artisan)) {
+ return $this->artisan = (new Artisan($this->app, $this->events, $this->app->version()))
+ ->resolveCommands($this->commands);
+ }
+
+ return $this->artisan;
+ }
+
+ /**
+ * Get the bootstrap classes for the application.
+ *
+ * @return array
+ */
+ protected function bootstrappers()
+ {
+ return $this->bootstrappers;
+ }
+
+ /**
+ * Report the exception to the exception handler.
+ *
+ * @param \Exception $e
+ * @return void
+ */
+ protected function reportException(Exception $e)
+ {
+ $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->report($e);
+ }
+
+ /**
+ * Report the exception to the exception handler.
+ *
+ * @param \Symfony\Component\Console\Output\OutputInterface $output
+ * @param \Exception $e
+ * @return void
+ */
+ protected function renderException($output, Exception $e)
+ {
+ $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->renderForConsole($output, $e);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php
index 977a4ed..12d8bc9 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php
@@ -1,73 +1,77 @@
-getRandomKey();
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $key = $this->getRandomKey($this->laravel['config']['app.cipher']);
- if ($this->option('show'))
- {
- return $this->line(''.$key.'');
- }
+ if ($this->option('show')) {
+ return $this->line(''.$key.'');
+ }
- $path = base_path('.env');
+ $path = base_path('.env');
- if (file_exists($path))
- {
- file_put_contents($path, str_replace(
- $this->laravel['config']['app.key'], $key, file_get_contents($path)
- ));
- }
+ if (file_exists($path)) {
+ file_put_contents($path, str_replace(
+ 'APP_KEY='.$this->laravel['config']['app.key'], 'APP_KEY='.$key, file_get_contents($path)
+ ));
+ }
- $this->laravel['config']['app.key'] = $key;
+ $this->laravel['config']['app.key'] = $key;
- $this->info("Application key [$key] set successfully.");
- }
+ $this->info("Application key [$key] set successfully.");
+ }
- /**
- * Generate a random key for the application.
- *
- * @return string
- */
- protected function getRandomKey()
- {
- return Str::random(32);
- }
+ /**
+ * Generate a random key for the application.
+ *
+ * @param string $cipher
+ * @return string
+ */
+ protected function getRandomKey($cipher)
+ {
+ if ($cipher === 'AES-128-CBC') {
+ return Str::random(16);
+ }
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('show', null, InputOption::VALUE_NONE, 'Simply display the key instead of modifying files.'),
- );
- }
+ return Str::random(32);
+ }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['show', null, InputOption::VALUE_NONE, 'Simply display the key instead of modifying files.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php
new file mode 100644
index 0000000..62861df
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php
@@ -0,0 +1,111 @@
+option('event')) {
+ return $this->error('Missing required option: --event');
+ }
+
+ parent::fire();
+ }
+
+ /**
+ * Build the class with the given name.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function buildClass($name)
+ {
+ $stub = parent::buildClass($name);
+
+ $event = $this->option('event');
+
+ if (! Str::startsWith($event, $this->laravel->getNamespace())) {
+ $event = $this->laravel->getNamespace().'Events\\'.$event;
+ }
+
+ $stub = str_replace(
+ 'DummyEvent', class_basename($event), $stub
+ );
+
+ $stub = str_replace(
+ 'DummyFullEvent', $event, $stub
+ );
+
+ return $stub;
+ }
+
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ if ($this->option('queued')) {
+ return __DIR__.'/stubs/listener-queued.stub';
+ } else {
+ return __DIR__.'/stubs/listener.stub';
+ }
+ }
+
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace.'\Listeners';
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['event', null, InputOption::VALUE_REQUIRED, 'The event class being listened for.'],
+
+ ['queued', null, InputOption::VALUE_NONE, 'Indicates the event listener should be queued.'],
+ ];
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php
index caf3ea0..ea95a51 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php
@@ -1,80 +1,80 @@
-option('no-migration'))
- {
- $table = str_plural(snake_case(class_basename($this->argument('name'))));
+ /**
+ * The type of class being generated.
+ *
+ * @var string
+ */
+ protected $type = 'Model';
- $this->call('make:migration', ['name' => "create_{$table}_table", '--create' => $table]);
- }
- }
- }
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (parent::fire() !== false) {
+ if ($this->option('migration')) {
+ $table = Str::plural(Str::snake(class_basename($this->argument('name'))));
- /**
- * Get the stub file for the generator.
- *
- * @return string
- */
- protected function getStub()
- {
- return __DIR__.'/stubs/model.stub';
- }
+ $this->call('make:migration', ['name' => "create_{$table}_table", '--create' => $table]);
+ }
+ }
+ }
- /**
- * Get the default namespace for the class.
- *
- * @param string $rootNamespace
- * @return string
- */
- protected function getDefaultNamespace($rootNamespace)
- {
- return $rootNamespace;
- }
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ return __DIR__.'/stubs/model.stub';
+ }
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('no-migration', null, InputOption::VALUE_NONE, 'Do not create a new migration file.'),
- );
- }
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace;
+ }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['migration', 'm', InputOption::VALUE_NONE, 'Create a new migration file for the model.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php
index f2cec32..1f024e0 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Optimize/config.php
@@ -2,7 +2,7 @@
$basePath = $app['path.base'];
-return array_map('realpath', array(
+return [
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Container/ContextualBindingBuilder.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php',
@@ -11,11 +11,9 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Bus/HandlerResolver.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Pipeline/Pipeline.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Support/ResponsePreparer.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Logging/Log.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Exception/Handler.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Config/Repository.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Url/Generator.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Support/Arrayable.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Support/Jsonable.php',
@@ -23,13 +21,10 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/QueueingFactory.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/Encrypter.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/HttpKernel.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlRoutable.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Routing/Middleware.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Routing/TerminableMiddleware.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php',
@@ -37,14 +32,16 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/View/View.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Auth/Guard.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Contracts/Auth/UserProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Container/Container.php',
- $basePath.'/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php',
- $basePath.'/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/TerminableInterface.php',
+ $basePath.'/vendor/symfony/http-kernel/HttpKernelInterface.php',
+ $basePath.'/vendor/symfony/http-kernel/TerminableInterface.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Application.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php',
@@ -55,25 +52,27 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesAndRegistersUsers.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RegistersUsers.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Http/Request.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ServerBag.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/AcceptHeaderItem.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/AcceptHeader.php',
- $basePath.'/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php',
+ $basePath.'/vendor/symfony/http-foundation/Request.php',
+ $basePath.'/vendor/symfony/http-foundation/ParameterBag.php',
+ $basePath.'/vendor/symfony/http-foundation/FileBag.php',
+ $basePath.'/vendor/symfony/http-foundation/ServerBag.php',
+ $basePath.'/vendor/symfony/http-foundation/HeaderBag.php',
+ $basePath.'/vendor/symfony/http-foundation/Session/SessionInterface.php',
+ $basePath.'/vendor/symfony/http-foundation/Session/SessionBagInterface.php',
+ $basePath.'/vendor/symfony/http-foundation/Session/Attribute/AttributeBagInterface.php',
+ $basePath.'/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php',
+ $basePath.'/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php',
+ $basePath.'/vendor/symfony/http-foundation/AcceptHeaderItem.php',
+ $basePath.'/vendor/symfony/http-foundation/AcceptHeader.php',
+ $basePath.'/vendor/symfony/debug/ExceptionHandler.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php',
@@ -82,14 +81,14 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesCommands.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesJobs.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Providers/EventServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Routing/RouteServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php',
@@ -101,12 +100,9 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Support/Arr.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Support/Str.php',
- $basePath.'/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php',
- $basePath.'/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ErrorHandler.php',
+ $basePath.'/vendor/symfony/debug/ErrorHandler.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Config/Repository.php',
$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/Filesystem/Filesystem.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php',
@@ -120,10 +116,10 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Routing/Router.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Routing/Route.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php',
- $basePath.'/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php',
- $basePath.'/vendor/symfony/routing/Symfony/Component/Routing/RouteCompilerInterface.php',
- $basePath.'/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php',
- $basePath.'/vendor/symfony/routing/Symfony/Component/Routing/Route.php',
+ $basePath.'/vendor/symfony/routing/CompiledRoute.php',
+ $basePath.'/vendor/symfony/routing/RouteCompilerInterface.php',
+ $basePath.'/vendor/symfony/routing/RouteCompiler.php',
+ $basePath.'/vendor/symfony/routing/Route.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Routing/Controller.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Routing/ControllerInspector.php',
@@ -150,9 +146,9 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php',
+ $basePath.'/vendor/laravel/framework/src/Illuminate/Encryption/BaseEncrypter.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php',
- $basePath.'/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Log/Writer.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php',
$basePath.'/vendor/monolog/monolog/src/Monolog/Logger.php',
@@ -181,31 +177,32 @@
$basePath.'/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php',
+ $basePath.'/vendor/symfony/http-foundation/Response.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php',
$basePath.'/vendor/laravel/framework/src/Illuminate/Http/Response.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php',
- $basePath.'/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php',
- $basePath.'/vendor/symfony/security-core/Symfony/Component/Security/Core/Util/StringUtils.php',
- $basePath.'/vendor/symfony/security-core/Symfony/Component/Security/Core/Util/SecureRandomInterface.php',
- $basePath.'/vendor/symfony/security-core/Symfony/Component/Security/Core/Util/SecureRandom.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/SplFileInfo.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Expression/Regex.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Expression/ValueInterface.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Expression/Expression.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Iterator/FilterIterator.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Iterator/PathFilterIterator.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Shell/Shell.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Adapter/AdapterInterface.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Adapter/AbstractAdapter.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Adapter/GnuFindAdapter.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Adapter/PhpAdapter.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Adapter/BsdFindAdapter.php',
- $basePath.'/vendor/symfony/finder/Symfony/Component/Finder/Finder.php',
+ $basePath.'/vendor/symfony/http-foundation/ResponseHeaderBag.php',
+ $basePath.'/vendor/symfony/http-foundation/Cookie.php',
+ $basePath.'/vendor/symfony/finder/SplFileInfo.php',
+ $basePath.'/vendor/symfony/finder/Expression/Glob.php',
+ $basePath.'/vendor/symfony/finder/Expression/Regex.php',
+ $basePath.'/vendor/symfony/finder/Expression/ValueInterface.php',
+ $basePath.'/vendor/symfony/finder/Expression/Expression.php',
+ $basePath.'/vendor/symfony/finder/Iterator/FilterIterator.php',
+ $basePath.'/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php',
+ $basePath.'/vendor/symfony/finder/Iterator/PathFilterIterator.php',
+ $basePath.'/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php',
+ $basePath.'/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php',
+ $basePath.'/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php',
+ $basePath.'/vendor/symfony/finder/Iterator/FilenameFilterIterator.php',
+ $basePath.'/vendor/symfony/finder/Shell/Shell.php',
+ $basePath.'/vendor/symfony/finder/Adapter/AdapterInterface.php',
+ $basePath.'/vendor/symfony/finder/Adapter/AbstractAdapter.php',
+ $basePath.'/vendor/symfony/finder/Adapter/AbstractFindAdapter.php',
+ $basePath.'/vendor/symfony/finder/Adapter/GnuFindAdapter.php',
+ $basePath.'/vendor/symfony/finder/Adapter/PhpAdapter.php',
+ $basePath.'/vendor/symfony/finder/Adapter/BsdFindAdapter.php',
+ $basePath.'/vendor/symfony/finder/Finder.php',
+ $basePath.'/vendor/symfony/finder/Glob.php',
+ $basePath.'/vendor/vlucas/phpdotenv/src/Dotenv.php',
$basePath.'/vendor/nesbot/carbon/src/Carbon/Carbon.php',
-));
+];
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php
index 949ef89..4c74313 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php
@@ -1,135 +1,169 @@
-composer = $composer;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->info('Generating optimized class loader');
-
- if ($this->option('psr'))
- {
- $this->composer->dumpAutoloads();
- }
- else
- {
- $this->composer->dumpOptimized();
- }
-
- if ($this->option('force') || ! $this->laravel['config']['app.debug'])
- {
- $this->info('Compiling common classes');
-
- $this->compileClasses();
- }
- else
- {
- $this->call('clear-compiled');
- }
- }
-
- /**
- * Generate the compiled class file.
- *
- * @return void
- */
- protected function compileClasses()
- {
- $this->registerClassPreloaderCommand();
-
- $this->callSilent('compile', array(
- '--config' => implode(',', $this->getClassFiles()),
- '--output' => $this->laravel->getCachedCompilePath(),
- '--strip_comments' => 1,
- ));
- }
-
- /**
- * Get the classes that should be combined and compiled.
- *
- * @return array
- */
- protected function getClassFiles()
- {
- $app = $this->laravel;
-
- $core = require __DIR__.'/Optimize/config.php';
-
- $files = array_merge($core, $this->laravel['config']->get('compile.files', []));
-
- foreach ($this->laravel['config']->get('compile.providers', []) as $provider)
- {
- $files = array_merge($files, forward_static_call([$provider, 'compiles']));
- }
-
- return $files;
- }
-
- /**
- * Register the pre-compiler command instance with Artisan.
- *
- * @return void
- */
- protected function registerClassPreloaderCommand()
- {
- $this->getApplication()->add(new PreCompileCommand);
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('force', null, InputOption::VALUE_NONE, 'Force the compiled class file to be written.'),
-
- array('psr', null, InputOption::VALUE_NONE, 'Do not optimize Composer dump-autoload.'),
- );
- }
-
+use PhpParser\PrettyPrinter\Standard as PrettyPrinter;
+use ClassPreloader\Exceptions\VisitorExceptionInterface;
+
+class OptimizeCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'optimize';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Optimize the framework for better performance';
+
+ /**
+ * The composer instance.
+ *
+ * @var \Illuminate\Foundation\Composer
+ */
+ protected $composer;
+
+ /**
+ * Create a new optimize command instance.
+ *
+ * @param \Illuminate\Foundation\Composer $composer
+ * @return void
+ */
+ public function __construct(Composer $composer)
+ {
+ parent::__construct();
+
+ $this->composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->info('Generating optimized class loader');
+
+ if ($this->option('psr')) {
+ $this->composer->dumpAutoloads();
+ } else {
+ $this->composer->dumpOptimized();
+ }
+
+ if ($this->option('force') || ! $this->laravel['config']['app.debug']) {
+ $this->info('Compiling common classes');
+ $this->compileClasses();
+ } else {
+ $this->call('clear-compiled');
+ }
+ }
+
+ /**
+ * Generate the compiled class file.
+ *
+ * @return void
+ */
+ protected function compileClasses()
+ {
+ $preloader = $this->getClassPreloader();
+
+ $handle = $preloader->prepareOutput($this->laravel->getCachedCompilePath());
+
+ foreach ($this->getClassFiles() as $file) {
+ try {
+ fwrite($handle, $preloader->getCode($file, false)."\n");
+ } catch (SkipFileException $ex) {
+ // Class Preloader 2.x
+ } catch (VisitorExceptionInterface $e) {
+ // Class Preloader 3.x
+ }
+ }
+
+ fclose($handle);
+ }
+
+ /**
+ * Get the class preloader used by the command.
+ *
+ * @return \ClassPreloader\ClassPreloader
+ */
+ protected function getClassPreloader()
+ {
+ // Class Preloader 3.x
+ if (class_exists(Factory::class)) {
+ return (new Factory)->create(['skip' => true]);
+ }
+
+ // Class Preloader 2.x
+ return new ClassPreloader(new PrettyPrinter, new Parser(new Lexer), $this->getTraverser());
+ }
+
+ /**
+ * Get the node traverser used by the command.
+ *
+ * Note that this method is only called if we're using Class Preloader 2.x.
+ *
+ * @return \ClassPreloader\Parser\NodeTraverser
+ */
+ protected function getTraverser()
+ {
+ $traverser = new NodeTraverser;
+
+ $traverser->addVisitor(new DirVisitor(true));
+
+ $traverser->addVisitor(new FileVisitor(true));
+
+ return $traverser;
+ }
+
+ /**
+ * Get the classes that should be combined and compiled.
+ *
+ * @return array
+ */
+ protected function getClassFiles()
+ {
+ $app = $this->laravel;
+
+ $core = require __DIR__.'/Optimize/config.php';
+
+ $files = array_merge($core, $app['config']->get('compile.files', []));
+
+ foreach ($app['config']->get('compile.providers', []) as $provider) {
+ $files = array_merge($files, forward_static_call([$provider, 'compiles']));
+ }
+
+ return array_map('realpath', $files);
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['force', null, InputOption::VALUE_NONE, 'Force the compiled class file to be written.'],
+
+ ['psr', null, InputOption::VALUE_NONE, 'Do not optimize Composer dump-autoload.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php
new file mode 100644
index 0000000..e071ca7
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php
@@ -0,0 +1,50 @@
+kernel = $kernel;
- }
+class QueuedJob
+{
+ /**
+ * The kernel instance.
+ *
+ * @var \Illuminate\Contracts\Console\Kernel
+ */
+ protected $kernel;
- /**
- * Fire the job.
- *
- * @param \Illuminate\Queue\Jobs\Job
- * @param array $data
- * @return void
- */
- public function fire($job, $data)
- {
- call_user_func_array([$this->kernel, 'call'], $data);
+ /**
+ * Create a new job instance.
+ *
+ * @param \Illuminate\Contracts\Console\Kernel $kernel
+ * @return void
+ */
+ public function __construct(KernelContract $kernel)
+ {
+ $this->kernel = $kernel;
+ }
- $job->delete();
- }
+ /**
+ * Fire the job.
+ *
+ * @param \Illuminate\Queue\Jobs\Job $job
+ * @param array $data
+ * @return void
+ */
+ public function fire($job, $data)
+ {
+ call_user_func_array([$this->kernel, 'call'], $data);
+ $job->delete();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RequestMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RequestMakeCommand.php
index 6d4e08c..95b7a87 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RequestMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RequestMakeCommand.php
@@ -1,49 +1,50 @@
-files = $files;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->call('route:clear');
-
- $routes = $this->getFreshApplicationRoutes();
-
- if (count($routes) == 0)
- {
- return $this->error("Your application doesn't have any routes.");
- }
-
- foreach ($routes as $route)
- {
- $route->prepareForSerialization();
- }
-
- $this->files->put(
- $this->laravel->getCachedRoutesPath(), $this->buildRouteCacheFile($routes)
- );
-
- $this->info('Routes cached successfully!');
- }
-
- /**
- * Boot a fresh copy of the application and get the routes.
- *
- * @return \Illuminate\Routing\RouteCollection
- */
- protected function getFreshApplicationRoutes()
- {
- $app = require $this->laravel->basePath().'/bootstrap/app.php';
-
- $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
-
- return $app['router']->getRoutes();
- }
-
- /**
- * Build the route cache file.
- *
- * @param \Illuminate\Routing\RouteCollection $routes
- * @return string
- */
- protected function buildRouteCacheFile(RouteCollection $routes)
- {
- $stub = $this->files->get(__DIR__.'/stubs/routes.stub');
-
- return str_replace('{{routes}}', base64_encode(serialize($routes)), $stub);
- }
-
+class RouteCacheCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'route:cache';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a route cache file for faster route registration';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * Create a new route command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Filesystem $files)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->call('route:clear');
+
+ $routes = $this->getFreshApplicationRoutes();
+
+ if (count($routes) == 0) {
+ return $this->error("Your application doesn't have any routes.");
+ }
+
+ foreach ($routes as $route) {
+ $route->prepareForSerialization();
+ }
+
+ $this->files->put(
+ $this->laravel->getCachedRoutesPath(), $this->buildRouteCacheFile($routes)
+ );
+
+ $this->info('Routes cached successfully!');
+ }
+
+ /**
+ * Boot a fresh copy of the application and get the routes.
+ *
+ * @return \Illuminate\Routing\RouteCollection
+ */
+ protected function getFreshApplicationRoutes()
+ {
+ $app = require $this->laravel->basePath().'/bootstrap/app.php';
+
+ $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
+
+ return $app['router']->getRoutes();
+ }
+
+ /**
+ * Build the route cache file.
+ *
+ * @param \Illuminate\Routing\RouteCollection $routes
+ * @return string
+ */
+ protected function buildRouteCacheFile(RouteCollection $routes)
+ {
+ $stub = $this->files->get(__DIR__.'/stubs/routes.stub');
+
+ return str_replace('{{routes}}', base64_encode(serialize($routes)), $stub);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteClearCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteClearCommand.php
index 2be727f..a14b280 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteClearCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteClearCommand.php
@@ -1,54 +1,55 @@
-files = $files;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->files->delete($this->laravel->getCachedRoutesPath());
-
- $this->info('Route cache cleared!');
- }
-
+class RouteClearCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'route:clear';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Remove the route cache file';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * Create a new route clear command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Filesystem $files)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->files->delete($this->laravel->getCachedRoutesPath());
+
+ $this->info('Route cache cleared!');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php
index 1b2b951..463f3ab 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php
@@ -1,5 +1,9 @@
-router = $router;
- $this->routes = $router->getRoutes();
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- if (count($this->routes) == 0)
- {
- return $this->error("Your application doesn't have any routes.");
- }
-
- $this->displayRoutes($this->getRoutes());
- }
-
- /**
- * Compile the routes into a displayable format.
- *
- * @return array
- */
- protected function getRoutes()
- {
- $results = array();
-
- foreach ($this->routes as $route)
- {
- $results[] = $this->getRouteInformation($route);
- }
-
- return array_filter($results);
- }
-
- /**
- * Get the route information for a given route.
- *
- * @param \Illuminate\Routing\Route $route
- * @return array
- */
- protected function getRouteInformation(Route $route)
- {
- return $this->filterRoute(array(
- 'host' => $route->domain(),
- 'method' => implode('|', $route->methods()),
- 'uri' => $route->uri(),
- 'name' => $route->getName(),
- 'action' => $route->getActionName(),
- 'middleware' => $this->getMiddleware($route),
- ));
- }
-
- /**
- * Display the route information on the console.
- *
- * @param array $routes
- * @return void
- */
- protected function displayRoutes(array $routes)
- {
- $this->table($this->headers, $routes);
- }
-
- /**
- * Get before filters.
- *
- * @param \Illuminate\Routing\Route $route
- * @return string
- */
- protected function getMiddleware($route)
- {
- $middlewares = array_values($route->middleware());
-
- $middlewares = array_unique(
- array_merge($middlewares, $this->getPatternFilters($route))
- );
-
- $actionName = $route->getActionName();
-
- if ( ! empty($actionName) && $actionName !== 'Closure')
- {
- $middlewares = array_merge($middlewares, $this->getControllerMiddleware($actionName));
- }
-
- return implode(',', $middlewares);
- }
-
- /**
- * Get the middleware for the given Controller@action name.
- *
- * @param string $actionName
- * @return array
- */
- protected function getControllerMiddleware($actionName)
- {
- Controller::setRouter($this->laravel['router']);
-
- $segments = explode('@', $actionName);
-
- return $this->getControllerMiddlewareFromInstance(
- $this->laravel->make($segments[0]), $segments[1]
- );
- }
-
- /**
- * Get the middlewares for the given controller instance and method.
- *
- * @param \Illuminate\Routing\Controller $controller
- * @param string $method
- * @return array
- */
- protected function getControllerMiddlewareFromInstance($controller, $method)
- {
- $middleware = $this->router->getMiddleware();
-
- $results = [];
-
- foreach ($controller->getMiddleware() as $name => $options)
- {
- if ( ! $this->methodExcludedByOptions($method, $options))
- {
- $results[] = array_get($middleware, $name, $name);
- }
- }
-
- return $results;
- }
-
- /**
- * Determine if the given options exclude a particular method.
- *
- * @param string $method
- * @param array $options
- * @return bool
- */
- protected function methodExcludedByOptions($method, array $options)
- {
- return ( ! empty($options['only']) && ! in_array($method, (array) $options['only'])) ||
- ( ! empty($options['except']) && in_array($method, (array) $options['except']));
- }
-
- /**
- * Get all of the pattern filters matching the route.
- *
- * @param \Illuminate\Routing\Route $route
- * @return array
- */
- protected function getPatternFilters($route)
- {
- $patterns = array();
-
- foreach ($route->methods() as $method)
- {
- // For each method supported by the route we will need to gather up the patterned
- // filters for that method. We will then merge these in with the other filters
- // we have already gathered up then return them back out to these consumers.
- $inner = $this->getMethodPatterns($route->uri(), $method);
-
- $patterns = array_merge($patterns, array_keys($inner));
- }
-
- return $patterns;
- }
-
- /**
- * Get the pattern filters for a given URI and method.
- *
- * @param string $uri
- * @param string $method
- * @return array
- */
- protected function getMethodPatterns($uri, $method)
- {
- return $this->router->findPatternFilters(
- Request::create($uri, $method)
- );
- }
-
- /**
- * Filter the route by URI and / or name.
- *
- * @param array $route
- * @return array|null
- */
- protected function filterRoute(array $route)
- {
- if (($this->option('name') && ! str_contains($route['name'], $this->option('name'))) ||
- $this->option('path') && ! str_contains($route['uri'], $this->option('path')))
- {
- return;
- }
-
- return $route;
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('name', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by name.'),
-
- array('path', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by path.'),
- );
- }
-
+class RouteListCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'route:list';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'List all registered routes';
+
+ /**
+ * The router instance.
+ *
+ * @var \Illuminate\Routing\Router
+ */
+ protected $router;
+
+ /**
+ * An array of all the registered routes.
+ *
+ * @var \Illuminate\Routing\RouteCollection
+ */
+ protected $routes;
+
+ /**
+ * The table headers for the command.
+ *
+ * @var array
+ */
+ protected $headers = ['Domain', 'Method', 'URI', 'Name', 'Action', 'Middleware'];
+
+ /**
+ * Create a new route command instance.
+ *
+ * @param \Illuminate\Routing\Router $router
+ * @return void
+ */
+ public function __construct(Router $router)
+ {
+ parent::__construct();
+
+ $this->router = $router;
+ $this->routes = $router->getRoutes();
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if (count($this->routes) == 0) {
+ return $this->error("Your application doesn't have any routes.");
+ }
+
+ $this->displayRoutes($this->getRoutes());
+ }
+
+ /**
+ * Compile the routes into a displayable format.
+ *
+ * @return array
+ */
+ protected function getRoutes()
+ {
+ $results = [];
+
+ foreach ($this->routes as $route) {
+ $results[] = $this->getRouteInformation($route);
+ }
+
+ if ($sort = $this->option('sort')) {
+ $results = Arr::sort($results, function ($value) use ($sort) {
+ return $value[$sort];
+ });
+ }
+
+ if ($this->option('reverse')) {
+ $results = array_reverse($results);
+ }
+
+ return array_filter($results);
+ }
+
+ /**
+ * Get the route information for a given route.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return array
+ */
+ protected function getRouteInformation(Route $route)
+ {
+ return $this->filterRoute([
+ 'host' => $route->domain(),
+ 'method' => implode('|', $route->methods()),
+ 'uri' => $route->uri(),
+ 'name' => $route->getName(),
+ 'action' => $route->getActionName(),
+ 'middleware' => $this->getMiddleware($route),
+ ]);
+ }
+
+ /**
+ * Display the route information on the console.
+ *
+ * @param array $routes
+ * @return void
+ */
+ protected function displayRoutes(array $routes)
+ {
+ $this->table($this->headers, $routes);
+ }
+
+ /**
+ * Get before filters.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return string
+ */
+ protected function getMiddleware($route)
+ {
+ $middlewares = array_values($route->middleware());
+
+ $middlewares = array_unique(
+ array_merge($middlewares, $this->getPatternFilters($route))
+ );
+
+ $actionName = $route->getActionName();
+
+ if (! empty($actionName) && $actionName !== 'Closure') {
+ $middlewares = array_merge($middlewares, $this->getControllerMiddleware($actionName));
+ }
+
+ return implode(',', $middlewares);
+ }
+
+ /**
+ * Get the middleware for the given Controller@action name.
+ *
+ * @param string $actionName
+ * @return array
+ */
+ protected function getControllerMiddleware($actionName)
+ {
+ Controller::setRouter($this->laravel['router']);
+
+ $segments = explode('@', $actionName);
+
+ return $this->getControllerMiddlewareFromInstance(
+ $this->laravel->make($segments[0]), $segments[1]
+ );
+ }
+
+ /**
+ * Get the middlewares for the given controller instance and method.
+ *
+ * @param \Illuminate\Routing\Controller $controller
+ * @param string $method
+ * @return array
+ */
+ protected function getControllerMiddlewareFromInstance($controller, $method)
+ {
+ $middleware = $this->router->getMiddleware();
+
+ $results = [];
+
+ foreach ($controller->getMiddleware() as $name => $options) {
+ if (! $this->methodExcludedByOptions($method, $options)) {
+ $results[] = Arr::get($middleware, $name, $name);
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Determine if the given options exclude a particular method.
+ *
+ * @param string $method
+ * @param array $options
+ * @return bool
+ */
+ protected function methodExcludedByOptions($method, array $options)
+ {
+ return (! empty($options['only']) && ! in_array($method, (array) $options['only'])) ||
+ (! empty($options['except']) && in_array($method, (array) $options['except']));
+ }
+
+ /**
+ * Get all of the pattern filters matching the route.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return array
+ */
+ protected function getPatternFilters($route)
+ {
+ $patterns = [];
+
+ foreach ($route->methods() as $method) {
+ // For each method supported by the route we will need to gather up the patterned
+ // filters for that method. We will then merge these in with the other filters
+ // we have already gathered up then return them back out to these consumers.
+ $inner = $this->getMethodPatterns($route->uri(), $method);
+
+ $patterns = array_merge($patterns, array_keys($inner));
+ }
+
+ return $patterns;
+ }
+
+ /**
+ * Get the pattern filters for a given URI and method.
+ *
+ * @param string $uri
+ * @param string $method
+ * @return array
+ */
+ protected function getMethodPatterns($uri, $method)
+ {
+ return $this->router->findPatternFilters(
+ Request::create($uri, $method)
+ );
+ }
+
+ /**
+ * Filter the route by URI and / or name.
+ *
+ * @param array $route
+ * @return array|null
+ */
+ protected function filterRoute(array $route)
+ {
+ if (($this->option('name') && ! Str::contains($route['name'], $this->option('name'))) ||
+ $this->option('path') && ! Str::contains($route['uri'], $this->option('path')) ||
+ $this->option('method') && ! Str::contains($route['method'], $this->option('method'))) {
+ return;
+ }
+
+ return $route;
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['method', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by method.'],
+
+ ['name', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by name.'],
+
+ ['path', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by path.'],
+
+ ['reverse', 'r', InputOption::VALUE_NONE, 'Reverse the ordering of the routes.'],
+
+ ['sort', null, InputOption::VALUE_OPTIONAL, 'The column (host, method, uri, name, action, middleware) to sort by.', 'uri'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php
index 5bbb949..90e596e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php
@@ -1,56 +1,72 @@
-laravel->publicPath());
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ *
+ * @throws \Exception
+ */
+ public function fire()
+ {
+ chdir($this->laravel->publicPath());
- $host = $this->input->getOption('host');
+ $host = $this->input->getOption('host');
- $port = $this->input->getOption('port');
+ $port = $this->input->getOption('port');
- $base = $this->laravel->basePath();
+ $base = ProcessUtils::escapeArgument($this->laravel->basePath());
- $this->info("Laravel development server started on http://{$host}:{$port}/");
+ $binary = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
- passthru('"'.PHP_BINARY.'"'." -S {$host}:{$port} \"{$base}\"/server.php");
- }
+ $this->info("Laravel development server started on http://{$host}:{$port}/");
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('host', null, InputOption::VALUE_OPTIONAL, 'The host address to serve the application on.', 'localhost'),
+ if (defined('HHVM_VERSION')) {
+ if (version_compare(HHVM_VERSION, '3.8.0') >= 0) {
+ passthru("{$binary} -m server -v Server.Type=proxygen -v Server.SourceRoot={$base}/ -v Server.IP={$host} -v Server.Port={$port} -v Server.DefaultDocument=server.php -v Server.ErrorDocument404=server.php");
+ } else {
+ throw new Exception("HHVM's built-in server requires HHVM >= 3.8.0.");
+ }
+ } else {
+ passthru("{$binary} -S {$host}:{$port} {$base}/server.php");
+ }
+ }
- array('port', null, InputOption::VALUE_OPTIONAL, 'The port to serve the application on.', 8000),
- );
- }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['host', null, InputOption::VALUE_OPTIONAL, 'The host address to serve the application on.', 'localhost'],
+ ['port', null, InputOption::VALUE_OPTIONAL, 'The port to serve the application on.', 8000],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php
new file mode 100644
index 0000000..7f0efe8
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php
@@ -0,0 +1,63 @@
+laravel->getNamespace(), '', $name);
+
+ return $this->laravel['path.base'].'/tests/'.str_replace('\\', '/', $name).'.php';
+ }
+
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/EloquentModelPresenter.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/EloquentModelPresenter.php
deleted file mode 100644
index 6f68dc1..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/EloquentModelPresenter.php
+++ /dev/null
@@ -1,71 +0,0 @@
-getAttributes(), $value->getRelations());
-
- $visible = $value->getVisible();
-
- if (count($visible) === 0)
- {
- $visible = array_diff(array_keys($attributes), $value->getHidden());
- }
-
- if ( ! $this->showHidden($propertyFilter))
- {
- return array_intersect_key($attributes, array_flip($visible));
- }
-
- $properties = [];
-
- foreach ($attributes as $key => $value)
- {
- if ( ! in_array($key, $visible))
- {
- $key = sprintf('%s', $key);
- }
-
- $properties[$key] = $value;
- }
-
- return $properties;
- }
-
- /**
- * Decide whether to show hidden properties, based on a ReflectionProperty filter.
- *
- * @param int $propertyFilter
- * @return bool
- */
- protected function showHidden($propertyFilter)
- {
- return $propertyFilter & (ReflectionProperty::IS_PROTECTED | ReflectionProperty::IS_PRIVATE);
- }
-
-}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateApplicationPresenter.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateApplicationPresenter.php
deleted file mode 100644
index 233a5aa..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateApplicationPresenter.php
+++ /dev/null
@@ -1,72 +0,0 @@
-$property();
-
- if ( ! is_null($val)) $properties[$property] = $val;
- }
- catch (Exception $e)
- {
- //
- }
- }
-
- return $properties;
- }
-
-}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateCollectionPresenter.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateCollectionPresenter.php
deleted file mode 100644
index 58d3781..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateCollectionPresenter.php
+++ /dev/null
@@ -1,41 +0,0 @@
-all();
- }
-
-}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php
index 13edebc..68c48ae 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php
@@ -1,101 +1,100 @@
-getApplication()->setCatchExceptions(false);
-
- $config = new Configuration;
-
- $config->getPresenterManager()->addPresenters(
- $this->getPresenters()
- );
-
- $shell = new Shell($config);
- $shell->addCommands($this->getCommands());
- $shell->setIncludes($this->argument('include'));
-
- $shell->run();
- }
-
- /**
- * Get artisan commands to pass through to PsySH.
- *
- * @return array
- */
- protected function getCommands()
- {
- $commands = [];
-
- foreach ($this->getApplication()->all() as $name => $command)
- {
- if (in_array($name, $this->commandWhitelist)) $commands[] = $command;
- }
-
- return $commands;
- }
-
- /**
- * Get an array of Laravel tailored Presenters.
- *
- * @return array
- */
- protected function getPresenters()
- {
- return [
- new EloquentModelPresenter,
- new IlluminateCollectionPresenter,
- new IlluminateApplicationPresenter,
- ];
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return [
- ['include', InputArgument::IS_ARRAY, 'Include file(s) before starting tinker'],
- ];
- }
+class TinkerCommand extends Command
+{
+ /**
+ * artisan commands to include in the tinker shell.
+ *
+ * @var array
+ */
+ protected $commandWhitelist = [
+ 'clear-compiled', 'down', 'env', 'inspire', 'migrate', 'optimize', 'up',
+ ];
+
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'tinker';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Interact with your application';
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->getApplication()->setCatchExceptions(false);
+
+ $config = new Configuration;
+
+ $config->getPresenter()->addCasters(
+ $this->getCasters()
+ );
+
+ $shell = new Shell($config);
+ $shell->addCommands($this->getCommands());
+ $shell->setIncludes($this->argument('include'));
+
+ $shell->run();
+ }
+
+ /**
+ * Get artisan commands to pass through to PsySH.
+ *
+ * @return array
+ */
+ protected function getCommands()
+ {
+ $commands = [];
+
+ foreach ($this->getApplication()->all() as $name => $command) {
+ if (in_array($name, $this->commandWhitelist)) {
+ $commands[] = $command;
+ }
+ }
+
+ return $commands;
+ }
+
+ /**
+ * Get an array of Laravel tailored casters.
+ *
+ * @return array
+ */
+ protected function getCasters()
+ {
+ return [
+ 'Illuminate\Foundation\Application' => 'Illuminate\Foundation\Console\IlluminateCaster::castApplication',
+ 'Illuminate\Support\Collection' => 'Illuminate\Foundation\Console\IlluminateCaster::castCollection',
+ 'Illuminate\Database\Eloquent\Model' => 'Illuminate\Foundation\Console\IlluminateCaster::castModel',
+ ];
+ }
+
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['include', InputArgument::IS_ARRAY, 'Include file(s) before starting tinker'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php
index 2a2e10c..82d8385 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php
@@ -1,33 +1,34 @@
-laravel->storagePath().'/framework/down');
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Bring the application out of maintenance mode';
- $this->info('Application is now live.');
- }
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ @unlink($this->laravel->storagePath().'/framework/down');
+ $this->info('Application is now live.');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php
index 0dd4cf5..2bb2990 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php
@@ -1,175 +1,167 @@
-files = $files;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $paths = ServiceProvider::pathsToPublish(
- $this->option('provider'), $this->option('tag')
- );
-
- if (empty($paths))
- {
- return $this->comment("Nothing to publish.");
- }
-
- foreach ($paths as $from => $to)
- {
- if ($this->files->isFile($from))
- {
- $this->publishFile($from, $to);
- }
- elseif ($this->files->isDirectory($from))
- {
- $this->publishDirectory($from, $to);
- }
- else
- {
- $this->error("Can't locate path: <{$from}>");
- }
- }
-
- $this->info('Publishing Complete!');
- }
-
- /**
- * Publish the file to the given path.
- *
- * @param string $from
- * @param string $to
- * @return void
- */
- protected function publishFile($from, $to)
- {
- if ($this->files->exists($to) && ! $this->option('force'))
- {
- return;
- }
-
- $this->createParentDirectory(dirname($to));
-
- $this->files->copy($from, $to);
-
- $this->status($from, $to, 'File');
- }
-
- /**
- * Publish the directory to the given directory.
- *
- * @param string $from
- * @param string $to
- * @return void
- */
- protected function publishDirectory($from, $to)
- {
- $manager = new MountManager([
- 'from' => new Flysystem(new LocalAdapter($from)),
- 'to' => new Flysystem(new LocalAdapter($to)),
- ]);
-
- foreach ($manager->listContents('from://', true) as $file)
- {
- if ($file['type'] === 'file' && ( ! $manager->has('to://'.$file['path']) || $this->option('force')))
- {
- $manager->put('to://'.$file['path'], $manager->read('from://'.$file['path']));
- }
- }
-
- $this->status($from, $to, 'Directory');
- }
-
- /**
- * Create the directory to house the published files if needed.
- *
- * @param string $directory
- * @return void
- */
- protected function createParentDirectory($directory)
- {
- if ( ! $this->files->isDirectory($directory))
- {
- $this->files->makeDirectory($directory, 0755, true);
- }
- }
-
- /**
- * Write a status message to the console.
- *
- * @param string $from
- * @param string $to
- * @param string $type
- * @return void
- */
- protected function status($from, $to, $type)
- {
- $from = str_replace(base_path(), '', realpath($from));
-
- $to = str_replace(base_path(), '', realpath($to));
-
- $this->line('Copied '.$type.' ['.$from.'] To ['.$to.']');
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('force', null, InputOption::VALUE_NONE, 'Overwrite any existing files.'),
-
- array('provider', null, InputOption::VALUE_OPTIONAL, 'The service provider that has assets you want to publish.'),
-
- array('tag', null, InputOption::VALUE_OPTIONAL, 'The tag that has assets you want to publish.'),
- );
- }
-
+class VendorPublishCommand extends Command
+{
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * The console command signature.
+ *
+ * @var string
+ */
+ protected $signature = 'vendor:publish {--force : Overwrite any existing files.}
+ {--provider= : The service provider that has assets you want to publish.}
+ {--tag=* : One or many tags that have assets you want to publish.}';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Publish any publishable assets from vendor packages';
+
+ /**
+ * Create a new command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @return void
+ */
+ public function __construct(Filesystem $files)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $tags = $this->option('tag');
+
+ $tags = $tags ?: [null];
+
+ foreach ($tags as $tag) {
+ $this->publishTag($tag);
+ }
+ }
+
+ /**
+ * Publishes the assets for a tag.
+ *
+ * @param string $tag
+ * @return mixed
+ */
+ private function publishTag($tag)
+ {
+ $paths = ServiceProvider::pathsToPublish(
+ $this->option('provider'), $tag
+ );
+
+ if (empty($paths)) {
+ return $this->comment("Nothing to publish for tag [{$tag}].");
+ }
+
+ foreach ($paths as $from => $to) {
+ if ($this->files->isFile($from)) {
+ $this->publishFile($from, $to);
+ } elseif ($this->files->isDirectory($from)) {
+ $this->publishDirectory($from, $to);
+ } else {
+ $this->error("Can't locate path: <{$from}>");
+ }
+ }
+
+ $this->info("Publishing complete for tag [{$tag}]!");
+ }
+
+ /**
+ * Publish the file to the given path.
+ *
+ * @param string $from
+ * @param string $to
+ * @return void
+ */
+ protected function publishFile($from, $to)
+ {
+ if ($this->files->exists($to) && ! $this->option('force')) {
+ return;
+ }
+
+ $this->createParentDirectory(dirname($to));
+
+ $this->files->copy($from, $to);
+
+ $this->status($from, $to, 'File');
+ }
+
+ /**
+ * Publish the directory to the given directory.
+ *
+ * @param string $from
+ * @param string $to
+ * @return void
+ */
+ protected function publishDirectory($from, $to)
+ {
+ $manager = new MountManager([
+ 'from' => new Flysystem(new LocalAdapter($from)),
+ 'to' => new Flysystem(new LocalAdapter($to)),
+ ]);
+
+ foreach ($manager->listContents('from://', true) as $file) {
+ if ($file['type'] === 'file' && (! $manager->has('to://'.$file['path']) || $this->option('force'))) {
+ $manager->put('to://'.$file['path'], $manager->read('from://'.$file['path']));
+ }
+ }
+
+ $this->status($from, $to, 'Directory');
+ }
+
+ /**
+ * Create the directory to house the published files if needed.
+ *
+ * @param string $directory
+ * @return void
+ */
+ protected function createParentDirectory($directory)
+ {
+ if (! $this->files->isDirectory($directory)) {
+ $this->files->makeDirectory($directory, 0755, true);
+ }
+ }
+
+ /**
+ * Write a status message to the console.
+ *
+ * @param string $from
+ * @param string $to
+ * @param string $type
+ * @return void
+ */
+ protected function status($from, $to, $type)
+ {
+ $from = str_replace(base_path(), '', realpath($from));
+
+ $to = str_replace(base_path(), '', realpath($to));
+
+ $this->line('Copied '.$type.' ['.$from.'] To ['.$to.']');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php
new file mode 100644
index 0000000..c7e443e
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php
@@ -0,0 +1,64 @@
+files = $files;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $path = $this->laravel['config']['view.compiled'];
+
+ if (! $path) {
+ throw new RuntimeException('View path not found.');
+ }
+
+ foreach ($this->files->glob("{$path}/*") as $view) {
+ $this->files->delete($view);
+ }
+
+ $this->info('Compiled views cleared!');
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/command-handler.stub b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/command-handler.stub
index 888e1ab..8fdf3ee 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/command-handler.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/command-handler.stub
@@ -1,30 +1,30 @@
-setRoutes(
- unserialize(base64_decode('{{routes}}'))
+ unserialize(base64_decode('{{routes}}'))
);
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/test.stub b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/test.stub
new file mode 100644
index 0000000..4a2858d
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/test.stub
@@ -0,0 +1,18 @@
+assertTrue(true);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php
index a6e5aee..9acdca8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php
@@ -1,69 +1,69 @@
-detectConsoleEnvironment($callback, $consoleArgs);
- }
+use Closure;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
- return $this->detectWebEnvironment($callback);
- }
+class EnvironmentDetector
+{
+ /**
+ * Detect the application's current environment.
+ *
+ * @param \Closure $callback
+ * @param array|null $consoleArgs
+ * @return string
+ */
+ public function detect(Closure $callback, $consoleArgs = null)
+ {
+ if ($consoleArgs) {
+ return $this->detectConsoleEnvironment($callback, $consoleArgs);
+ }
- /**
- * Set the application environment for a web request.
- *
- * @param \Closure $callback
- * @return string
- */
- protected function detectWebEnvironment(Closure $callback)
- {
- return call_user_func($callback);
- }
+ return $this->detectWebEnvironment($callback);
+ }
- /**
- * Set the application environment from command-line arguments.
- *
- * @param \Closure $callback
- * @param array $args
- * @return string
- */
- protected function detectConsoleEnvironment(Closure $callback, array $args)
- {
- // First we will check if an environment argument was passed via console arguments
- // and if it was that automatically overrides as the environment. Otherwise, we
- // will check the environment as a "web" request like a typical HTTP request.
- if ( ! is_null($value = $this->getEnvironmentArgument($args)))
- {
- return head(array_slice(explode('=', $value), 1));
- }
+ /**
+ * Set the application environment for a web request.
+ *
+ * @param \Closure $callback
+ * @return string
+ */
+ protected function detectWebEnvironment(Closure $callback)
+ {
+ return call_user_func($callback);
+ }
- return $this->detectWebEnvironment($callback);
- }
+ /**
+ * Set the application environment from command-line arguments.
+ *
+ * @param \Closure $callback
+ * @param array $args
+ * @return string
+ */
+ protected function detectConsoleEnvironment(Closure $callback, array $args)
+ {
+ // First we will check if an environment argument was passed via console arguments
+ // and if it was that automatically overrides as the environment. Otherwise, we
+ // will check the environment as a "web" request like a typical HTTP request.
+ if (! is_null($value = $this->getEnvironmentArgument($args))) {
+ return head(array_slice(explode('=', $value), 1));
+ }
- /**
- * Get the environment argument from the console.
- *
- * @param array $args
- * @return string|null
- */
- protected function getEnvironmentArgument(array $args)
- {
- return array_first($args, function($k, $v)
- {
- return starts_with($v, '--env');
- });
- }
+ return $this->detectWebEnvironment($callback);
+ }
+ /**
+ * Get the environment argument from the console.
+ *
+ * @param array $args
+ * @return string|null
+ */
+ protected function getEnvironmentArgument(array $args)
+ {
+ return Arr::first($args, function ($k, $v) {
+ return Str::startsWith($v, '--env');
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php
index 603a51a..6c87455 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -1,139 +1,179 @@
-log = $log;
- }
-
- /**
- * Report or log an exception.
- *
- * @param \Exception $e
- * @return void
- */
- public function report(Exception $e)
- {
- if ($this->shouldntReport($e)) return;
-
- $this->log->error((string) $e);
- }
-
- /**
- * Determine if the exception should be reported.
- *
- * @param \Exception $e
- * @return bool
- */
- public function shouldReport(Exception $e)
- {
- return ! $this->shouldntReport($e);
- }
-
- /**
- * Determine if the exception is in the "do not report" list.
- *
- * @param \Exception $e
- * @return bool
- */
- protected function shouldntReport(Exception $e)
- {
- foreach ($this->dontReport as $type)
- {
- if ($e instanceof $type) return true;
- }
-
- return false;
- }
-
- /**
- * Render an exception into a response.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Exception $e
- * @return \Illuminate\Http\Response
- */
- public function render($request, Exception $e)
- {
- if ($this->isHttpException($e))
- {
- return $this->renderHttpException($e);
- }
- else
- {
- return (new SymfonyDisplayer(config('app.debug')))->createResponse($e);
- }
- }
-
- /**
- * Render an exception to the console.
- *
- * @param \Symfony\Component\Console\Output\OutputInterface $output
- * @param \Exception $e
- * @return void
- */
- public function renderForConsole($output, Exception $e)
- {
- (new ConsoleApplication)->renderException($e, $output);
- }
-
- /**
- * Render the given HttpException.
- *
- * @param \Symfony\Component\HttpKernel\Exception\HttpException $e
- * @return \Symfony\Component\HttpFoundation\Response
- */
- protected function renderHttpException(HttpException $e)
- {
- $status = $e->getStatusCode();
-
- if (view()->exists("errors.{$status}"))
- {
- return response()->view("errors.{$status}", [], $status);
- }
- else
- {
- return (new SymfonyDisplayer(config('app.debug')))->createResponse($e);
- }
- }
-
- /**
- * Determine if the given exception is an HTTP exception.
- *
- * @param \Exception $e
- * @return bool
- */
- protected function isHttpException(Exception $e)
- {
- return $e instanceof HttpException;
- }
-
+class Handler implements ExceptionHandlerContract
+{
+ /**
+ * The log implementation.
+ *
+ * @var \Psr\Log\LoggerInterface
+ */
+ protected $log;
+
+ /**
+ * A list of the exception types that should not be reported.
+ *
+ * @var array
+ */
+ protected $dontReport = [];
+
+ /**
+ * Create a new exception handler instance.
+ *
+ * @param \Psr\Log\LoggerInterface $log
+ * @return void
+ */
+ public function __construct(LoggerInterface $log)
+ {
+ $this->log = $log;
+ }
+
+ /**
+ * Report or log an exception.
+ *
+ * @param \Exception $e
+ * @return void
+ */
+ public function report(Exception $e)
+ {
+ if ($this->shouldReport($e)) {
+ $this->log->error($e);
+ }
+ }
+
+ /**
+ * Determine if the exception should be reported.
+ *
+ * @param \Exception $e
+ * @return bool
+ */
+ public function shouldReport(Exception $e)
+ {
+ return ! $this->shouldntReport($e);
+ }
+
+ /**
+ * Determine if the exception is in the "do not report" list.
+ *
+ * @param \Exception $e
+ * @return bool
+ */
+ protected function shouldntReport(Exception $e)
+ {
+ foreach ($this->dontReport as $type) {
+ if ($e instanceof $type) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Render an exception into a response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Exception $e
+ * @return \Illuminate\Http\Response
+ */
+ public function render($request, Exception $e)
+ {
+ if ($this->isUnauthorizedException($e)) {
+ $e = new HttpException(403, $e->getMessage());
+ }
+
+ if ($this->isHttpException($e)) {
+ return $this->toIlluminateResponse($this->renderHttpException($e), $e);
+ } else {
+ return $this->toIlluminateResponse($this->convertExceptionToResponse($e), $e);
+ }
+ }
+
+ /**
+ * Map exception into an illuminate response.
+ *
+ * @param \Symfony\Component\HttpFoundation\Response $response
+ * @param \Exception $e
+ * @return \Illuminate\Http\Response
+ */
+ protected function toIlluminateResponse($response, Exception $e)
+ {
+ $response = new Response($response->getContent(), $response->getStatusCode(), $response->headers->all());
+
+ $response->exception = $e;
+
+ return $response;
+ }
+
+ /**
+ * Render an exception to the console.
+ *
+ * @param \Symfony\Component\Console\Output\OutputInterface $output
+ * @param \Exception $e
+ * @return void
+ */
+ public function renderForConsole($output, Exception $e)
+ {
+ (new ConsoleApplication)->renderException($e, $output);
+ }
+
+ /**
+ * Render the given HttpException.
+ *
+ * @param \Symfony\Component\HttpKernel\Exception\HttpException $e
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ protected function renderHttpException(HttpException $e)
+ {
+ $status = $e->getStatusCode();
+
+ if (view()->exists("errors.{$status}")) {
+ return response()->view("errors.{$status}", ['exception' => $e], $status);
+ } else {
+ return $this->convertExceptionToResponse($e);
+ }
+ }
+
+ /**
+ * Convert the given exception into a Response instance.
+ *
+ * @param \Exception $e
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ protected function convertExceptionToResponse(Exception $e)
+ {
+ return (new SymfonyDisplayer(config('app.debug')))->createResponse($e);
+ }
+
+ /**
+ * Determine if the given exception is an access unauthorized exception.
+ *
+ * @param \Exception $e
+ * @return bool
+ */
+ protected function isUnauthorizedException(Exception $e)
+ {
+ return $e instanceof UnauthorizedException;
+ }
+
+ /**
+ * Determine if the given exception is an HTTP exception.
+ *
+ * @param \Exception $e
+ * @return bool
+ */
+ protected function isHttpException(Exception $e)
+ {
+ return $e instanceof HttpException;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php
index a364b3e..e390609 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php
@@ -1,233 +1,227 @@
-container->make('Illuminate\Validation\Factory');
-
- if (method_exists($this, 'validator'))
- {
- return $this->container->call([$this, 'validator'], compact('factory'));
- }
-
- return $factory->make(
- $this->all(), $this->container->call([$this, 'rules']), $this->messages(), $this->attributes()
- );
- }
-
- /**
- * Handle a failed validation attempt.
- *
- * @param \Illuminate\Validation\Validator $validator
- * @return mixed
- */
- protected function failedValidation(Validator $validator)
- {
- throw new HttpResponseException($this->response(
- $this->formatErrors($validator)
- ));
- }
-
- /**
- * Determine if the request passes the authorization check.
- *
- * @return bool
- */
- protected function passesAuthorization()
- {
- if (method_exists($this, 'authorize'))
- {
- return $this->container->call([$this, 'authorize']);
- }
-
- return false;
- }
-
- /**
- * Handle a failed authorization attempt.
- *
- * @return mixed
- */
- protected function failedAuthorization()
- {
- throw new HttpResponseException($this->forbiddenResponse());
- }
-
- /**
- * Get the proper failed validation response for the request.
- *
- * @param array $errors
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function response(array $errors)
- {
- if ($this->ajax() || $this->wantsJson())
- {
- return new JsonResponse($errors, 422);
- }
-
- return $this->redirector->to($this->getRedirectUrl())
+use Illuminate\Contracts\Validation\Factory as ValidationFactory;
+
+class FormRequest extends Request implements ValidatesWhenResolved
+{
+ use ValidatesWhenResolvedTrait;
+
+ /**
+ * The container instance.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The redirector instance.
+ *
+ * @var \Illuminate\Routing\Redirector
+ */
+ protected $redirector;
+
+ /**
+ * The URI to redirect to if validation fails.
+ *
+ * @var string
+ */
+ protected $redirect;
+
+ /**
+ * The route to redirect to if validation fails.
+ *
+ * @var string
+ */
+ protected $redirectRoute;
+
+ /**
+ * The controller action to redirect to if validation fails.
+ *
+ * @var string
+ */
+ protected $redirectAction;
+
+ /**
+ * The key to be used for the view error bag.
+ *
+ * @var string
+ */
+ protected $errorBag = 'default';
+
+ /**
+ * The input keys that should not be flashed on redirect.
+ *
+ * @var array
+ */
+ protected $dontFlash = ['password', 'password_confirmation'];
+
+ /**
+ * Get the validator instance for the request.
+ *
+ * @return \Illuminate\Contracts\Validation\Validator
+ */
+ protected function getValidatorInstance()
+ {
+ $factory = $this->container->make(ValidationFactory::class);
+
+ if (method_exists($this, 'validator')) {
+ return $this->container->call([$this, 'validator'], compact('factory'));
+ }
+
+ return $factory->make(
+ $this->all(), $this->container->call([$this, 'rules']), $this->messages(), $this->attributes()
+ );
+ }
+
+ /**
+ * Handle a failed validation attempt.
+ *
+ * @param \Illuminate\Contracts\Validation\Validator $validator
+ * @return mixed
+ */
+ protected function failedValidation(Validator $validator)
+ {
+ throw new HttpResponseException($this->response(
+ $this->formatErrors($validator)
+ ));
+ }
+
+ /**
+ * Determine if the request passes the authorization check.
+ *
+ * @return bool
+ */
+ protected function passesAuthorization()
+ {
+ if (method_exists($this, 'authorize')) {
+ return $this->container->call([$this, 'authorize']);
+ }
+
+ return false;
+ }
+
+ /**
+ * Handle a failed authorization attempt.
+ *
+ * @return mixed
+ */
+ protected function failedAuthorization()
+ {
+ throw new HttpResponseException($this->forbiddenResponse());
+ }
+
+ /**
+ * Get the proper failed validation response for the request.
+ *
+ * @param array $errors
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function response(array $errors)
+ {
+ if ($this->ajax() || $this->wantsJson()) {
+ return new JsonResponse($errors, 422);
+ }
+
+ return $this->redirector->to($this->getRedirectUrl())
->withInput($this->except($this->dontFlash))
->withErrors($errors, $this->errorBag);
- }
-
- /**
- * Get the response for a forbidden operation.
- *
- * @return \Illuminate\Http\Response
- */
- public function forbiddenResponse()
- {
- return new Response('Forbidden', 403);
- }
-
- /**
- * Format the errors from the given Validator instance.
- *
- * @param \Illuminate\Validation\Validator $validator
- * @return array
- */
- protected function formatErrors(Validator $validator)
- {
- return $validator->errors()->getMessages();
- }
-
- /**
- * Get the URL to redirect to on a validation error.
- *
- * @return string
- */
- protected function getRedirectUrl()
- {
- $url = $this->redirector->getUrlGenerator();
-
- if ($this->redirect)
- {
- return $url->to($this->redirect);
- }
- elseif ($this->redirectRoute)
- {
- return $url->route($this->redirectRoute);
- }
- elseif ($this->redirectAction)
- {
- return $url->action($this->redirectAction);
- }
-
- return $url->previous();
- }
-
- /**
- * Set the Redirector instance.
- *
- * @param \Illuminate\Routing\Redirector $redirector
- * @return \Illuminate\Foundation\Http\FormRequest
- */
- public function setRedirector(Redirector $redirector)
- {
- $this->redirector = $redirector;
-
- return $this;
- }
-
- /**
- * Set the container implementation.
- *
- * @param \Illuminate\Container\Container $container
- * @return $this
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
-
- return $this;
- }
-
- /**
- * Set custom messages for validator errors.
- *
- * @return array
- */
- public function messages()
- {
- return [];
- }
-
- /**
- * Set custom attributes for validator errors.
- *
- * @return array
- */
- public function attributes()
- {
- return [];
- }
-
+ }
+
+ /**
+ * Get the response for a forbidden operation.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function forbiddenResponse()
+ {
+ return new Response('Forbidden', 403);
+ }
+
+ /**
+ * Format the errors from the given Validator instance.
+ *
+ * @param \Illuminate\Contracts\Validation\Validator $validator
+ * @return array
+ */
+ protected function formatErrors(Validator $validator)
+ {
+ return $validator->getMessageBag()->toArray();
+ }
+
+ /**
+ * Get the URL to redirect to on a validation error.
+ *
+ * @return string
+ */
+ protected function getRedirectUrl()
+ {
+ $url = $this->redirector->getUrlGenerator();
+
+ if ($this->redirect) {
+ return $url->to($this->redirect);
+ } elseif ($this->redirectRoute) {
+ return $url->route($this->redirectRoute);
+ } elseif ($this->redirectAction) {
+ return $url->action($this->redirectAction);
+ }
+
+ return $url->previous();
+ }
+
+ /**
+ * Set the Redirector instance.
+ *
+ * @param \Illuminate\Routing\Redirector $redirector
+ * @return \Illuminate\Foundation\Http\FormRequest
+ */
+ public function setRedirector(Redirector $redirector)
+ {
+ $this->redirector = $redirector;
+
+ return $this;
+ }
+
+ /**
+ * Set the container implementation.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @return $this
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+
+ return $this;
+ }
+
+ /**
+ * Set custom messages for validator errors.
+ *
+ * @return array
+ */
+ public function messages()
+ {
+ return [];
+ }
+
+ /**
+ * Set custom attributes for validator errors.
+ *
+ * @return array
+ */
+ public function attributes()
+ {
+ return [];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php
index 4a919c3..f18e020 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php
@@ -1,261 +1,293 @@
-app = $app;
- $this->router = $router;
-
- foreach ($this->routeMiddleware as $key => $middleware)
- {
- $router->middleware($key, $middleware);
- }
- }
-
- /**
- * Handle an incoming HTTP request.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Http\Response
- */
- public function handle($request)
- {
- try
- {
- $response = $this->sendRequestThroughRouter($request);
- }
- catch (Exception $e)
- {
- $this->reportException($e);
-
- $response = $this->renderException($request, $e);
- }
-
- $this->app['events']->fire('kernel.handled', [$request, $response]);
-
- return $response;
- }
-
- /**
- * Send the given request through the middleware / router.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Http\Response
- */
- protected function sendRequestThroughRouter($request)
- {
- $this->app->instance('request', $request);
-
- Facade::clearResolvedInstance('request');
-
- $this->bootstrap();
-
- return (new Pipeline($this->app))
- ->send($request)
- ->through($this->middleware)
- ->then($this->dispatchToRouter());
- }
-
- /**
- * Call the terminate method on any terminable middleware.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Illuminate\Http\Response $response
- * @return void
- */
- public function terminate($request, $response)
- {
- $routeMiddlewares = $this->gatherRouteMiddlewares($request);
-
- foreach (array_merge($routeMiddlewares, $this->middleware) as $middleware)
- {
- $instance = $this->app->make($middleware);
-
- if ($instance instanceof TerminableMiddleware)
- {
- $instance->terminate($request, $response);
- }
- }
-
- $this->app->terminate();
- }
-
- /**
- * Gather the route middleware for the given request.
- *
- * @param \Illuminate\Http\Request $request
- * @return array
- */
- protected function gatherRouteMiddlewares($request)
- {
- if ($request->route())
- {
- return $this->router->gatherRouteMiddlewares($request->route());
- }
-
- return [];
- }
-
- /**
- * Add a new middleware to beginning of the stack if it does not already exist.
- *
- * @param string $middleware
- * @return $this
- */
- public function prependMiddleware($middleware)
- {
- if (array_search($middleware, $this->middleware) === false)
- {
- array_unshift($this->middleware, $middleware);
- }
-
- return $this;
- }
-
- /**
- * Add a new middleware to end of the stack if it does not already exist.
- *
- * @param string $middleware
- * @return $this
- */
- public function pushMiddleware($middleware)
- {
- if (array_search($middleware, $this->middleware) === false)
- {
- $this->middleware[] = $middleware;
- }
-
- return $this;
- }
-
- /**
- * Bootstrap the application for HTTP requests.
- *
- * @return void
- */
- public function bootstrap()
- {
- if ( ! $this->app->hasBeenBootstrapped())
- {
- $this->app->bootstrapWith($this->bootstrappers());
- }
- }
-
- /**
- * Get the route dispatcher callback.
- *
- * @return \Closure
- */
- protected function dispatchToRouter()
- {
- return function($request)
- {
- $this->app->instance('request', $request);
-
- return $this->router->dispatch($request);
- };
- }
-
- /**
- * Get the bootstrap classes for the application.
- *
- * @return array
- */
- protected function bootstrappers()
- {
- return $this->bootstrappers;
- }
-
- /**
- * Report the exception to the exception handler.
- *
- * @param \Exception $e
- * @return void
- */
- protected function reportException(Exception $e)
- {
- $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->report($e);
- }
-
- /**
- * Render the exception to a response.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Exception $e
- * @return \Symfony\Component\HttpFoundation\Response
- */
- protected function renderException($request, Exception $e)
- {
- return $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->render($request, $e);
- }
-
- /**
- * Get the Laravel application instance.
- *
- * @return \Illuminate\Contracts\Foundation\Application
- */
- public function getApplication()
- {
- return $this->app;
- }
-
+use Symfony\Component\Debug\Exception\FatalThrowableError;
+
+class Kernel implements KernelContract
+{
+ /**
+ * The application implementation.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The router instance.
+ *
+ * @var \Illuminate\Routing\Router
+ */
+ protected $router;
+
+ /**
+ * The bootstrap classes for the application.
+ *
+ * @var array
+ */
+ protected $bootstrappers = [
+ 'Illuminate\Foundation\Bootstrap\DetectEnvironment',
+ 'Illuminate\Foundation\Bootstrap\LoadConfiguration',
+ 'Illuminate\Foundation\Bootstrap\ConfigureLogging',
+ 'Illuminate\Foundation\Bootstrap\HandleExceptions',
+ 'Illuminate\Foundation\Bootstrap\RegisterFacades',
+ 'Illuminate\Foundation\Bootstrap\RegisterProviders',
+ 'Illuminate\Foundation\Bootstrap\BootProviders',
+ ];
+
+ /**
+ * The application's middleware stack.
+ *
+ * @var array
+ */
+ protected $middleware = [];
+
+ /**
+ * The application's route middleware.
+ *
+ * @var array
+ */
+ protected $routeMiddleware = [];
+
+ /**
+ * Create a new HTTP kernel instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Routing\Router $router
+ * @return void
+ */
+ public function __construct(Application $app, Router $router)
+ {
+ $this->app = $app;
+ $this->router = $router;
+
+ foreach ($this->routeMiddleware as $key => $middleware) {
+ $router->middleware($key, $middleware);
+ }
+ }
+
+ /**
+ * Handle an incoming HTTP request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function handle($request)
+ {
+ try {
+ $request->enableHttpMethodParameterOverride();
+
+ $response = $this->sendRequestThroughRouter($request);
+ } catch (Exception $e) {
+ $this->reportException($e);
+
+ $response = $this->renderException($request, $e);
+ } catch (Throwable $e) {
+ $e = new FatalThrowableError($e);
+
+ $this->reportException($e);
+
+ $response = $this->renderException($request, $e);
+ }
+
+ $this->app['events']->fire('kernel.handled', [$request, $response]);
+
+ return $response;
+ }
+
+ /**
+ * Send the given request through the middleware / router.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ protected function sendRequestThroughRouter($request)
+ {
+ $this->app->instance('request', $request);
+
+ Facade::clearResolvedInstance('request');
+
+ $this->bootstrap();
+
+ return (new Pipeline($this->app))
+ ->send($request)
+ ->through($this->app->shouldSkipMiddleware() ? [] : $this->middleware)
+ ->then($this->dispatchToRouter());
+ }
+
+ /**
+ * Call the terminate method on any terminable middleware.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Illuminate\Http\Response $response
+ * @return void
+ */
+ public function terminate($request, $response)
+ {
+ $middlewares = $this->app->shouldSkipMiddleware() ? [] : array_merge(
+ $this->gatherRouteMiddlewares($request),
+ $this->middleware
+ );
+
+ foreach ($middlewares as $middleware) {
+ list($name, $parameters) = $this->parseMiddleware($middleware);
+
+ $instance = $this->app->make($name);
+
+ if (method_exists($instance, 'terminate')) {
+ $instance->terminate($request, $response);
+ }
+ }
+
+ $this->app->terminate();
+ }
+
+ /**
+ * Gather the route middleware for the given request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return array
+ */
+ protected function gatherRouteMiddlewares($request)
+ {
+ if ($route = $request->route()) {
+ return $this->router->gatherRouteMiddlewares($route);
+ }
+
+ return [];
+ }
+
+ /**
+ * Parse a middleware string to get the name and parameters.
+ *
+ * @param string $middleware
+ * @return array
+ */
+ protected function parseMiddleware($middleware)
+ {
+ list($name, $parameters) = array_pad(explode(':', $middleware, 2), 2, []);
+
+ if (is_string($parameters)) {
+ $parameters = explode(',', $parameters);
+ }
+
+ return [$name, $parameters];
+ }
+
+ /**
+ * Add a new middleware to beginning of the stack if it does not already exist.
+ *
+ * @param string $middleware
+ * @return $this
+ */
+ public function prependMiddleware($middleware)
+ {
+ if (array_search($middleware, $this->middleware) === false) {
+ array_unshift($this->middleware, $middleware);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a new middleware to end of the stack if it does not already exist.
+ *
+ * @param string $middleware
+ * @return $this
+ */
+ public function pushMiddleware($middleware)
+ {
+ if (array_search($middleware, $this->middleware) === false) {
+ $this->middleware[] = $middleware;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Bootstrap the application for HTTP requests.
+ *
+ * @return void
+ */
+ public function bootstrap()
+ {
+ if (! $this->app->hasBeenBootstrapped()) {
+ $this->app->bootstrapWith($this->bootstrappers());
+ }
+ }
+
+ /**
+ * Get the route dispatcher callback.
+ *
+ * @return \Closure
+ */
+ protected function dispatchToRouter()
+ {
+ return function ($request) {
+ $this->app->instance('request', $request);
+
+ return $this->router->dispatch($request);
+ };
+ }
+
+ /**
+ * Determine if the kernel has a given middleware.
+ *
+ * @param string $middleware
+ * @return bool
+ */
+ public function hasMiddleware($middleware)
+ {
+ return in_array($middleware, $this->middleware);
+ }
+
+ /**
+ * Get the bootstrap classes for the application.
+ *
+ * @return array
+ */
+ protected function bootstrappers()
+ {
+ return $this->bootstrappers;
+ }
+
+ /**
+ * Report the exception to the exception handler.
+ *
+ * @param \Exception $e
+ * @return void
+ */
+ protected function reportException(Exception $e)
+ {
+ $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->report($e);
+ }
+
+ /**
+ * Render the exception to a response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Exception $e
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ protected function renderException($request, Exception $e)
+ {
+ return $this->app['Illuminate\Contracts\Debug\ExceptionHandler']->render($request, $e);
+ }
+
+ /**
+ * Get the Laravel application instance.
+ *
+ * @return \Illuminate\Contracts\Foundation\Application
+ */
+ public function getApplication()
+ {
+ return $this->app;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php
index 1253546..a5b0786 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php
@@ -1,45 +1,46 @@
-app = $app;
- }
+class CheckForMaintenanceMode
+{
+ /**
+ * The application implementation.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $app;
- /**
- * Handle an incoming request.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @return mixed
- */
- public function handle($request, Closure $next)
- {
- if ($this->app->isDownForMaintenance())
- {
- throw new HttpException(503);
- }
+ /**
+ * Create a new middleware instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function __construct(Application $app)
+ {
+ $this->app = $app;
+ }
- return $next($request);
- }
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+ */
+ public function handle($request, Closure $next)
+ {
+ if ($this->app->isDownForMaintenance()) {
+ throw new HttpException(503);
+ }
+ return $next($request);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
index 81dff73..9caf7fc 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
@@ -1,94 +1,131 @@
-encrypter = $encrypter;
- }
-
- /**
- * Handle an incoming request.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @return mixed
- *
- * @throws \Illuminate\Session\TokenMismatchException
- */
- public function handle($request, Closure $next)
- {
- if ($this->isReading($request) || $this->tokensMatch($request))
- {
- return $this->addCookieToResponse($request, $next($request));
- }
-
- throw new TokenMismatchException;
- }
-
- /**
- * Determine if the session and input CSRF tokens match.
- *
- * @param \Illuminate\Http\Request $request
- * @return bool
- */
- protected function tokensMatch($request)
- {
- $token = $request->input('_token') ?: $request->header('X-CSRF-TOKEN');
-
- if ( ! $token && $header = $request->header('X-XSRF-TOKEN'))
- {
- $token = $this->encrypter->decrypt($header);
- }
-
- return StringUtils::equals($request->session()->token(), $token);
- }
-
- /**
- * Add the CSRF token to the response cookies.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Illuminate\Http\Response $response
- * @return \Illuminate\Http\Response
- */
- protected function addCookieToResponse($request, $response)
- {
- $response->headers->setCookie(
- new Cookie('XSRF-TOKEN', $request->session()->token(), time() + 60 * 120, '/', null, false, false)
- );
-
- return $response;
- }
-
- /**
- * Determine if the HTTP request uses a ‘read’ verb.
- *
- * @param \Illuminate\Http\Request $request
- * @return bool
- */
- protected function isReading($request)
- {
- return in_array($request->method(), ['HEAD', 'GET', 'OPTIONS']);
- }
+class VerifyCsrfToken
+{
+ /**
+ * The encrypter implementation.
+ *
+ * @var \Illuminate\Contracts\Encryption\Encrypter
+ */
+ protected $encrypter;
+
+ /**
+ * The URIs that should be excluded from CSRF verification.
+ *
+ * @var array
+ */
+ protected $except = [];
+
+ /**
+ * Create a new middleware instance.
+ *
+ * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
+ * @return void
+ */
+ public function __construct(Encrypter $encrypter)
+ {
+ $this->encrypter = $encrypter;
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ *
+ * @throws \Illuminate\Session\TokenMismatchException
+ */
+ public function handle($request, Closure $next)
+ {
+ if ($this->isReading($request) || $this->shouldPassThrough($request) || $this->tokensMatch($request)) {
+ return $this->addCookieToResponse($request, $next($request));
+ }
+
+ throw new TokenMismatchException;
+ }
+
+ /**
+ * Determine if the request has a URI that should pass through CSRF verification.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ protected function shouldPassThrough($request)
+ {
+ foreach ($this->except as $except) {
+ if ($except !== '/') {
+ $except = trim($except, '/');
+ }
+
+ if ($request->is($except)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Determine if the session and input CSRF tokens match.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ protected function tokensMatch($request)
+ {
+ $sessionToken = $request->session()->token();
+
+ $token = $request->input('_token') ?: $request->header('X-CSRF-TOKEN');
+
+ if (! $token && $header = $request->header('X-XSRF-TOKEN')) {
+ $token = $this->encrypter->decrypt($header);
+ }
+
+ if (! is_string($sessionToken) || ! is_string($token)) {
+ return false;
+ }
+
+ return Str::equals($sessionToken, $token);
+ }
+
+ /**
+ * Add the CSRF token to the response cookies.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Illuminate\Http\Response $response
+ * @return \Illuminate\Http\Response
+ */
+ protected function addCookieToResponse($request, $response)
+ {
+ $config = config('session');
+
+ $response->headers->setCookie(
+ new Cookie(
+ 'XSRF-TOKEN', $request->session()->token(), time() + 60 * 120,
+ $config['path'], $config['domain'], $config['secure'], false
+ )
+ );
+
+ return $response;
+ }
+
+ /**
+ * Determine if the HTTP request uses a ‘read’ verb.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ protected function isReading($request)
+ {
+ return in_array($request->method(), ['HEAD', 'GET', 'OPTIONS']);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyPostSize.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyPostSize.php
index 00a114d..a3e0f55 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyPostSize.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyPostSize.php
@@ -1,53 +1,51 @@
-server('CONTENT_LENGTH') > $this->getPostMaxSize())
- {
- throw new PostTooLargeException;
- }
-
- return $next($request);
- }
-
- /**
- * Determine the server 'post_max_size' as bytes.
- *
- * @return int
- */
- protected function getPostMaxSize()
- {
- $postMaxSize = ini_get('post_max_size');
-
- switch (substr($postMaxSize, -1))
- {
- case 'M':
- case 'm':
- return (int) $postMaxSize * 1048576;
- case 'K':
- case 'k':
- return (int) $postMaxSize * 1024;
- case 'G':
- case 'g':
- return (int) $postMaxSize * 1073741824;
- }
-
- return (int) $postMaxSize;
- }
-
+class VerifyPostSize
+{
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ *
+ * @throws \Illuminate\Http\Exception\PostTooLargeException
+ */
+ public function handle($request, Closure $next)
+ {
+ if ($request->server('CONTENT_LENGTH') > $this->getPostMaxSize()) {
+ throw new PostTooLargeException;
+ }
+
+ return $next($request);
+ }
+
+ /**
+ * Determine the server 'post_max_size' as bytes.
+ *
+ * @return int
+ */
+ protected function getPostMaxSize()
+ {
+ $postMaxSize = ini_get('post_max_size');
+
+ switch (substr($postMaxSize, -1)) {
+ case 'M':
+ case 'm':
+ return (int) $postMaxSize * 1048576;
+ case 'K':
+ case 'k':
+ return (int) $postMaxSize * 1024;
+ case 'G':
+ case 'g':
+ return (int) $postMaxSize * 1073741824;
+ }
+
+ return (int) $postMaxSize;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php
index 7f10a81..7f56c4f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php
@@ -1,28 +1,32 @@
-random();
- }
+class Inspiring
+{
+ /**
+ * Get an inspiring quote.
+ *
+ * Taylor & Dayle made this commit from Jungfraujoch. (11,333 ft.)
+ *
+ * May McGinnis always control the board. #LaraconUS2015
+ *
+ * @return string
+ */
+ public static function quote()
+ {
+ return Collection::make([
+ 'When there is no desire, all things are at peace. - Laozi',
+ 'Simplicity is the ultimate sophistication. - Leonardo da Vinci',
+ 'Simplicity is the essence of happiness. - Cedric Bledsoe',
+ 'Smile, breathe, and go slowly. - Thich Nhat Hanh',
+ 'Simplicity is an acquired taste. - Katharine Gerould',
+ 'Well begun is half done. - Aristotle',
+ 'He who is contented is rich. - Laozi',
+ 'Very little is needed to make a happy life. - Marcus Antoninus',
+ ])->random();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php
index 6b14b98..6048de8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php
@@ -1,209 +1,205 @@
-app = $app;
- $this->files = $files;
- $this->manifestPath = $manifestPath;
- }
-
- /**
- * Register the application service providers.
- *
- * @param array $providers
- * @return void
- */
- public function load(array $providers)
- {
- $manifest = $this->loadManifest();
-
- // First we will load the service manifest, which contains information on all
- // service providers registered with the application and which services it
- // provides. This is used to know which services are "deferred" loaders.
- if ($this->shouldRecompile($manifest, $providers))
- {
- $manifest = $this->compileManifest($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($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.
- foreach ($manifest['eager'] as $provider)
- {
- $this->app->register($this->createProvider($provider));
- }
-
- $this->app->setDeferredServices($manifest['deferred']);
- }
-
- /**
- * Register the load events for the given provider.
- *
- * @param string $provider
- * @param array $events
- * @return void
- */
- protected function registerLoadEvents($provider, array $events)
- {
- if (count($events) < 1) return;
-
- $app = $this->app;
-
- $app->make('events')->listen($events, function() use ($app, $provider)
- {
- $app->register($provider);
- });
- }
-
- /**
- * Compile the application manifest file.
- *
- * @param array $providers
- * @return array
- */
- protected function compileManifest($providers)
- {
- // The service manifest should contain a list of all of the providers for
- // the application so we can compare it on each request to the service
- // and determine if the manifest should be recompiled or is current.
- $manifest = $this->freshManifest($providers);
-
- foreach ($providers as $provider)
- {
- $instance = $this->createProvider($provider);
-
- // When recompiling the service manifest, we will spin through each of the
- // providers and check if it's a deferred provider or not. If so we'll
- // add it's provided services to the manifest and note the provider.
- if ($instance->isDeferred())
- {
- foreach ($instance->provides() as $service)
- {
- $manifest['deferred'][$service] = $provider;
- }
-
- $manifest['when'][$provider] = $instance->when();
- }
-
- // If the service providers are not deferred, we will simply add it to an
- // array of eagerly loaded providers that will get registered on every
- // request to this application instead of "lazy" loading every time.
- else
- {
- $manifest['eager'][] = $provider;
- }
- }
-
- return $this->writeManifest($manifest);
- }
-
- /**
- * Create a new provider instance.
- *
- * @param string $provider
- * @return \Illuminate\Support\ServiceProvider
- */
- public function createProvider($provider)
- {
- return new $provider($this->app);
- }
-
- /**
- * Determine if the manifest should be compiled.
- *
- * @param array $manifest
- * @param array $providers
- * @return bool
- */
- public function shouldRecompile($manifest, $providers)
- {
- return is_null($manifest) || $manifest['providers'] != $providers;
- }
-
- /**
- * Load the service provider manifest JSON file.
- *
- * @return array
- */
- public function loadManifest()
- {
- // The service manifest is a file containing a JSON representation of every
- // service provided by the application and whether its provider is using
- // deferred loading or should be eagerly loaded on each request to us.
- if ($this->files->exists($this->manifestPath))
- {
- $manifest = json_decode($this->files->get($this->manifestPath), true);
-
- return array_merge(['when' => []], $manifest);
- }
- }
-
- /**
- * Write the service manifest file to disk.
- *
- * @param array $manifest
- * @return array
- */
- public function writeManifest($manifest)
- {
- $this->files->put(
- $this->manifestPath, json_encode($manifest, JSON_PRETTY_PRINT)
- );
-
- return $manifest;
- }
-
- /**
- * Create a fresh service manifest data structure.
- *
- * @param array $providers
- * @return array
- */
- protected function freshManifest(array $providers)
- {
- return ['providers' => $providers, 'eager' => [], 'deferred' => []];
- }
-
+class ProviderRepository
+{
+ /**
+ * The application implementation.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * The path to the manifest file.
+ *
+ * @var string
+ */
+ protected $manifestPath;
+
+ /**
+ * Create a new service repository instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param string $manifestPath
+ * @return void
+ */
+ public function __construct(ApplicationContract $app, Filesystem $files, $manifestPath)
+ {
+ $this->app = $app;
+ $this->files = $files;
+ $this->manifestPath = $manifestPath;
+ }
+
+ /**
+ * Register the application service providers.
+ *
+ * @param array $providers
+ * @return void
+ */
+ public function load(array $providers)
+ {
+ $manifest = $this->loadManifest();
+
+ // First we will load the service manifest, which contains information on all
+ // service providers registered with the application and which services it
+ // provides. This is used to know which services are "deferred" loaders.
+ if ($this->shouldRecompile($manifest, $providers)) {
+ $manifest = $this->compileManifest($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($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.
+ foreach ($manifest['eager'] as $provider) {
+ $this->app->register($this->createProvider($provider));
+ }
+
+ $this->app->addDeferredServices($manifest['deferred']);
+ }
+
+ /**
+ * Register the load events for the given provider.
+ *
+ * @param string $provider
+ * @param array $events
+ * @return void
+ */
+ protected function registerLoadEvents($provider, array $events)
+ {
+ if (count($events) < 1) {
+ return;
+ }
+
+ $app = $this->app;
+
+ $app->make('events')->listen($events, function () use ($app, $provider) {
+ $app->register($provider);
+ });
+ }
+
+ /**
+ * Compile the application manifest file.
+ *
+ * @param array $providers
+ * @return array
+ */
+ protected function compileManifest($providers)
+ {
+ // The service manifest should contain a list of all of the providers for
+ // the application so we can compare it on each request to the service
+ // and determine if the manifest should be recompiled or is current.
+ $manifest = $this->freshManifest($providers);
+
+ foreach ($providers as $provider) {
+ $instance = $this->createProvider($provider);
+
+ // When recompiling the service manifest, we will spin through each of the
+ // providers and check if it's a deferred provider or not. If so we'll
+ // add it's provided services to the manifest and note the provider.
+ if ($instance->isDeferred()) {
+ foreach ($instance->provides() as $service) {
+ $manifest['deferred'][$service] = $provider;
+ }
+
+ $manifest['when'][$provider] = $instance->when();
+ }
+
+ // If the service providers are not deferred, we will simply add it to an
+ // array of eagerly loaded providers that will get registered on every
+ // request to this application instead of "lazy" loading every time.
+ else {
+ $manifest['eager'][] = $provider;
+ }
+ }
+
+ return $this->writeManifest($manifest);
+ }
+
+ /**
+ * Create a new provider instance.
+ *
+ * @param string $provider
+ * @return \Illuminate\Support\ServiceProvider
+ */
+ public function createProvider($provider)
+ {
+ return new $provider($this->app);
+ }
+
+ /**
+ * Determine if the manifest should be compiled.
+ *
+ * @param array $manifest
+ * @param array $providers
+ * @return bool
+ */
+ public function shouldRecompile($manifest, $providers)
+ {
+ return is_null($manifest) || $manifest['providers'] != $providers;
+ }
+
+ /**
+ * Load the service provider manifest JSON file.
+ *
+ * @return array|null
+ */
+ public function loadManifest()
+ {
+ // The service manifest is a file containing a JSON representation of every
+ // service provided by the application and whether its provider is using
+ // deferred loading or should be eagerly loaded on each request to us.
+ if ($this->files->exists($this->manifestPath)) {
+ $manifest = json_decode($this->files->get($this->manifestPath), true);
+
+ if ($manifest) {
+ return array_merge(['when' => []], $manifest);
+ }
+ }
+ }
+
+ /**
+ * Write the service manifest file to disk.
+ *
+ * @param array $manifest
+ * @return array
+ */
+ public function writeManifest($manifest)
+ {
+ $this->files->put(
+ $this->manifestPath, json_encode($manifest, JSON_PRETTY_PRINT)
+ );
+
+ return array_merge(['when' => []], $manifest);
+ }
+
+ /**
+ * Create a fresh service manifest data structure.
+ *
+ * @param array $providers
+ * @return array
+ */
+ protected function freshManifest(array $providers)
+ {
+ return ['providers' => $providers, 'eager' => [], 'deferred' => []];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
index f0b1a49..f74448d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
@@ -1,16 +1,21 @@
- 'command.app.name',
- 'ClearCompiled' => 'command.clear-compiled',
- 'CommandMake' => 'command.command.make',
- 'ConfigCache' => 'command.config.cache',
- 'ConfigClear' => 'command.config.clear',
- 'ConsoleMake' => 'command.console.make',
- 'EventGenerate' => 'command.event.generate',
- 'EventMake' => 'command.event.make',
- 'Down' => 'command.down',
- 'Environment' => 'command.environment',
- 'Fresh' => 'command.fresh',
- 'HandlerCommand' => 'command.handler.command',
- 'HandlerEvent' => 'command.handler.event',
- 'KeyGenerate' => 'command.key.generate',
- 'ModelMake' => 'command.model.make',
- 'Optimize' => 'command.optimize',
- 'ProviderMake' => 'command.provider.make',
- 'RequestMake' => 'command.request.make',
- 'RouteCache' => 'command.route.cache',
- 'RouteClear' => 'command.route.clear',
- 'RouteList' => 'command.route.list',
- 'Serve' => 'command.serve',
- 'Tinker' => 'command.tinker',
- 'Up' => 'command.up',
- 'VendorPublish' => 'command.vendor.publish',
- ];
-
- /**
- * Register the service provider.
- *
- * @return void
- */
- public function register()
- {
- foreach (array_keys($this->commands) as $command)
- {
- $method = "register{$command}Command";
-
- call_user_func_array([$this, $method], []);
- }
-
- $this->commands(array_values($this->commands));
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerAppNameCommand()
- {
- $this->app->singleton('command.app.name', function($app)
- {
- return new AppNameCommand($app['composer'], $app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerClearCompiledCommand()
- {
- $this->app->singleton('command.clear-compiled', function()
- {
- return new ClearCompiledCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerCommandMakeCommand()
- {
- $this->app->singleton('command.command.make', function($app)
- {
- return new CommandMakeCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerConfigCacheCommand()
- {
- $this->app->singleton('command.config.cache', function($app)
- {
- return new ConfigCacheCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerConfigClearCommand()
- {
- $this->app->singleton('command.config.clear', function($app)
- {
- return new ConfigClearCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerConsoleMakeCommand()
- {
- $this->app->singleton('command.console.make', function($app)
- {
- return new ConsoleMakeCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerEventGenerateCommand()
- {
- $this->app->singleton('command.event.generate', function()
- {
- return new EventGenerateCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerEventMakeCommand()
- {
- $this->app->singleton('command.event.make', function($app)
- {
- return new EventMakeCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerDownCommand()
- {
- $this->app->singleton('command.down', function()
- {
- return new DownCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerEnvironmentCommand()
- {
- $this->app->singleton('command.environment', function()
- {
- return new EnvironmentCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerFreshCommand()
- {
- $this->app->singleton('command.fresh', function()
- {
- return new FreshCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerHandlerCommandCommand()
- {
- $this->app->singleton('command.handler.command', function($app)
- {
- return new HandlerCommandCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerHandlerEventCommand()
- {
- $this->app->singleton('command.handler.event', function($app)
- {
- return new HandlerEventCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerKeyGenerateCommand()
- {
- $this->app->singleton('command.key.generate', function()
- {
- return new KeyGenerateCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerModelMakeCommand()
- {
- $this->app->singleton('command.model.make', function($app)
- {
- return new ModelMakeCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerOptimizeCommand()
- {
- $this->app->singleton('command.optimize', function($app)
- {
- return new OptimizeCommand($app['composer']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerProviderMakeCommand()
- {
- $this->app->singleton('command.provider.make', function($app)
- {
- return new ProviderMakeCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerRequestMakeCommand()
- {
- $this->app->singleton('command.request.make', function($app)
- {
- return new RequestMakeCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerRouteCacheCommand()
- {
- $this->app->singleton('command.route.cache', function($app)
- {
- return new RouteCacheCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerRouteClearCommand()
- {
- $this->app->singleton('command.route.clear', function($app)
- {
- return new RouteClearCommand($app['files']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerRouteListCommand()
- {
- $this->app->singleton('command.route.list', function($app)
- {
- return new RouteListCommand($app['router']);
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerServeCommand()
- {
- $this->app->singleton('command.serve', function()
- {
- return new ServeCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerTinkerCommand()
- {
- $this->app->singleton('command.tinker', function()
- {
- return new TinkerCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerUpCommand()
- {
- $this->app->singleton('command.up', function()
- {
- return new UpCommand;
- });
- }
-
- /**
- * Register the command.
- *
- * @return void
- */
- protected function registerVendorPublishCommand()
- {
- $this->app->singleton('command.vendor.publish', function($app)
- {
- return new VendorPublishCommand($app['files']);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array_values($this->commands);
- }
-
+class ArtisanServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * The commands to be registered.
+ *
+ * @var array
+ */
+ protected $commands = [
+ 'AppName' => 'command.app.name',
+ 'ClearCompiled' => 'command.clear-compiled',
+ 'CommandMake' => 'command.command.make',
+ 'ConfigCache' => 'command.config.cache',
+ 'ConfigClear' => 'command.config.clear',
+ 'ConsoleMake' => 'command.console.make',
+ 'EventGenerate' => 'command.event.generate',
+ 'EventMake' => 'command.event.make',
+ 'Down' => 'command.down',
+ 'Environment' => 'command.environment',
+ 'HandlerCommand' => 'command.handler.command',
+ 'HandlerEvent' => 'command.handler.event',
+ 'JobMake' => 'command.job.make',
+ 'KeyGenerate' => 'command.key.generate',
+ 'ListenerMake' => 'command.listener.make',
+ 'ModelMake' => 'command.model.make',
+ 'Optimize' => 'command.optimize',
+ 'PolicyMake' => 'command.policy.make',
+ 'ProviderMake' => 'command.provider.make',
+ 'RequestMake' => 'command.request.make',
+ 'RouteCache' => 'command.route.cache',
+ 'RouteClear' => 'command.route.clear',
+ 'RouteList' => 'command.route.list',
+ 'Serve' => 'command.serve',
+ 'TestMake' => 'command.test.make',
+ 'Tinker' => 'command.tinker',
+ 'Up' => 'command.up',
+ 'VendorPublish' => 'command.vendor.publish',
+ 'ViewClear' => 'command.view.clear',
+ ];
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ foreach (array_keys($this->commands) as $command) {
+ $method = "register{$command}Command";
+
+ call_user_func_array([$this, $method], []);
+ }
+
+ $this->commands(array_values($this->commands));
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerAppNameCommand()
+ {
+ $this->app->singleton('command.app.name', function ($app) {
+ return new AppNameCommand($app['composer'], $app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerClearCompiledCommand()
+ {
+ $this->app->singleton('command.clear-compiled', function () {
+ return new ClearCompiledCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerCommandMakeCommand()
+ {
+ $this->app->singleton('command.command.make', function ($app) {
+ return new CommandMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerConfigCacheCommand()
+ {
+ $this->app->singleton('command.config.cache', function ($app) {
+ return new ConfigCacheCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerConfigClearCommand()
+ {
+ $this->app->singleton('command.config.clear', function ($app) {
+ return new ConfigClearCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerConsoleMakeCommand()
+ {
+ $this->app->singleton('command.console.make', function ($app) {
+ return new ConsoleMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerEventGenerateCommand()
+ {
+ $this->app->singleton('command.event.generate', function () {
+ return new EventGenerateCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerEventMakeCommand()
+ {
+ $this->app->singleton('command.event.make', function ($app) {
+ return new EventMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerDownCommand()
+ {
+ $this->app->singleton('command.down', function () {
+ return new DownCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerEnvironmentCommand()
+ {
+ $this->app->singleton('command.environment', function () {
+ return new EnvironmentCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerHandlerCommandCommand()
+ {
+ $this->app->singleton('command.handler.command', function ($app) {
+ return new HandlerCommandCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerHandlerEventCommand()
+ {
+ $this->app->singleton('command.handler.event', function ($app) {
+ return new HandlerEventCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerJobMakeCommand()
+ {
+ $this->app->singleton('command.job.make', function ($app) {
+ return new JobMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerKeyGenerateCommand()
+ {
+ $this->app->singleton('command.key.generate', function () {
+ return new KeyGenerateCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerListenerMakeCommand()
+ {
+ $this->app->singleton('command.listener.make', function ($app) {
+ return new ListenerMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerModelMakeCommand()
+ {
+ $this->app->singleton('command.model.make', function ($app) {
+ return new ModelMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerOptimizeCommand()
+ {
+ $this->app->singleton('command.optimize', function ($app) {
+ return new OptimizeCommand($app['composer']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerProviderMakeCommand()
+ {
+ $this->app->singleton('command.provider.make', function ($app) {
+ return new ProviderMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerRequestMakeCommand()
+ {
+ $this->app->singleton('command.request.make', function ($app) {
+ return new RequestMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerRouteCacheCommand()
+ {
+ $this->app->singleton('command.route.cache', function ($app) {
+ return new RouteCacheCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerRouteClearCommand()
+ {
+ $this->app->singleton('command.route.clear', function ($app) {
+ return new RouteClearCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerRouteListCommand()
+ {
+ $this->app->singleton('command.route.list', function ($app) {
+ return new RouteListCommand($app['router']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerServeCommand()
+ {
+ $this->app->singleton('command.serve', function () {
+ return new ServeCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerTestMakeCommand()
+ {
+ $this->app->singleton('command.test.make', function ($app) {
+ return new TestMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerTinkerCommand()
+ {
+ $this->app->singleton('command.tinker', function () {
+ return new TinkerCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerUpCommand()
+ {
+ $this->app->singleton('command.up', function () {
+ return new UpCommand;
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerVendorPublishCommand()
+ {
+ $this->app->singleton('command.vendor.publish', function ($app) {
+ return new VendorPublishCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerViewClearCommand()
+ {
+ $this->app->singleton('command.view.clear', function ($app) {
+ return new ViewClearCommand($app['files']);
+ });
+ }
+
+ /**
+ * Register the command.
+ *
+ * @return void
+ */
+ protected function registerPolicyMakeCommand()
+ {
+ $this->app->singleton('command.policy.make', function ($app) {
+ return new PolicyMakeCommand($app['files']);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return array_values($this->commands);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php
index ae29f5f..df68d3c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php
@@ -1,38 +1,38 @@
-app->singleton('composer', function($app)
- {
- return new Composer($app['files'], $app->basePath());
- });
- }
+class ComposerServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array('composer');
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('composer', function ($app) {
+ return new Composer($app['files'], $app->basePath());
+ });
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['composer'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php
index 35dde9d..9dc4a20 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php
@@ -1,30 +1,31 @@
-app['events']->listen('router.matched', function()
- {
- $this->app->resolving(function(FormRequest $request, $app)
- {
- $this->initializeRequest($request, $app['request']);
+class FormRequestServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ //
+ }
- $request->setContainer($app)
- ->setRedirector($app['Illuminate\Routing\Redirector']);
- });
- });
- }
+ /**
+ * Bootstrap the application events.
+ *
+ * @return void
+ */
+ public function boot()
+ {
+ $this->app['events']->listen('router.matched', function () {
+ $this->app->resolving(function (FormRequest $request, $app) {
+ $this->initializeRequest($request, $app['request']);
- /**
- * Initialize the form request with data from the given request.
- *
- * @param \Illuminate\Foundation\Http\FormRequest $form
- * @param \Symfony\Component\HttpFoundation\Request $current
- * @return void
- */
- protected function initializeRequest(FormRequest $form, Request $current)
- {
- $files = $current->files->all();
+ $request->setContainer($app)->setRedirector($app->make(Redirector::class));
+ });
+ });
+ }
- $files = is_array($files) ? array_filter($files) : $files;
+ /**
+ * Initialize the form request with data from the given request.
+ *
+ * @param \Illuminate\Foundation\Http\FormRequest $form
+ * @param \Symfony\Component\HttpFoundation\Request $current
+ * @return void
+ */
+ protected function initializeRequest(FormRequest $form, Request $current)
+ {
+ $files = $current->files->all();
- $form->initialize(
- $current->query->all(), $current->request->all(), $current->attributes->all(),
- $current->cookies->all(), $files, $current->server->all(), $current->getContent()
- );
+ $files = is_array($files) ? array_filter($files) : $files;
- if ($session = $current->getSession())
- {
- $form->setSession($session);
- }
+ $form->initialize(
+ $current->query->all(), $current->request->all(), $current->attributes->all(),
+ $current->cookies->all(), $files, $current->server->all(), $current->getContent()
+ );
- $form->setUserResolver($current->getUserResolver());
+ if ($session = $current->getSession()) {
+ $form->setSession($session);
+ }
- $form->setRouteResolver($current->getRouteResolver());
- }
+ $form->setUserResolver($current->getUserResolver());
+ $form->setRouteResolver($current->getRouteResolver());
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
index 51c783d..f1f4837 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
@@ -1,16 +1,17 @@
-policies as $key => $value) {
+ $gate->policy($key, $value);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function register()
+ {
+ //
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php
index 9d744ef..602a882 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php
@@ -1,62 +1,60 @@
-listen as $event => $listeners)
- {
- foreach ($listeners as $listener)
- {
- $events->listen($event, $listener);
- }
- }
-
- foreach ($this->subscribe as $subscriber)
- {
- $events->subscribe($subscriber);
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function register()
- {
- //
- }
-
- /**
- * Get the events and handlers.
- *
- * @return array
- */
- public function listens()
- {
- return $this->listen;
- }
-
+class EventServiceProvider extends ServiceProvider
+{
+ /**
+ * The event handler mappings for the application.
+ *
+ * @var array
+ */
+ protected $listen = [];
+
+ /**
+ * The subscriber classes to register.
+ *
+ * @var array
+ */
+ protected $subscribe = [];
+
+ /**
+ * Register the application's event listeners.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @return void
+ */
+ public function boot(DispatcherContract $events)
+ {
+ foreach ($this->listen as $event => $listeners) {
+ foreach ($listeners as $listener) {
+ $events->listen($event, $listener);
+ }
+ }
+
+ foreach ($this->subscribe as $subscriber) {
+ $events->subscribe($subscriber);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function register()
+ {
+ //
+ }
+
+ /**
+ * Get the events and handlers.
+ *
+ * @return array
+ */
+ public function listens()
+ {
+ return $this->listen;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
index 40d2ab4..21a69cb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
@@ -1,111 +1,115 @@
-setRootControllerNamespace();
+ /**
+ * Bootstrap any application services.
+ *
+ * @param \Illuminate\Routing\Router $router
+ * @return void
+ */
+ public function boot(Router $router)
+ {
+ $this->setRootControllerNamespace();
- if ($this->app->routesAreCached())
- {
- $this->loadCachedRoutes();
- }
- else
- {
- $this->loadRoutes();
- }
- }
+ if ($this->app->routesAreCached()) {
+ $this->loadCachedRoutes();
+ } else {
+ $this->loadRoutes();
- /**
- * Set the root controller namespace for the application.
- *
- * @return void
- */
- protected function setRootControllerNamespace()
- {
- if (is_null($this->namespace)) return;
+ $this->app->booted(function () use ($router) {
+ $router->getRoutes()->refreshNameLookups();
+ });
+ }
+ }
- $this->app['Illuminate\Contracts\Routing\UrlGenerator']
- ->setRootControllerNamespace($this->namespace);
- }
+ /**
+ * Set the root controller namespace for the application.
+ *
+ * @return void
+ */
+ protected function setRootControllerNamespace()
+ {
+ if (is_null($this->namespace)) {
+ return;
+ }
- /**
- * Load the cached routes for the application.
- *
- * @return void
- */
- protected function loadCachedRoutes()
- {
- $this->app->booted(function()
- {
- require $this->app->getCachedRoutesPath();
- });
- }
+ $this->app[UrlGenerator::class]->setRootControllerNamespace($this->namespace);
+ }
- /**
- * Load the application routes.
- *
- * @return void
- */
- protected function loadRoutes()
- {
- $this->app->call([$this, 'map']);
- }
+ /**
+ * Load the cached routes for the application.
+ *
+ * @return void
+ */
+ protected function loadCachedRoutes()
+ {
+ $this->app->booted(function () {
+ require $this->app->getCachedRoutesPath();
+ });
+ }
- /**
- * Load the standard routes file for the application.
- *
- * @param string $path
- * @return void
- */
- protected function loadRoutesFrom($path)
- {
- $router = $this->app['Illuminate\Routing\Router'];
+ /**
+ * Load the application routes.
+ *
+ * @return void
+ */
+ protected function loadRoutes()
+ {
+ $this->app->call([$this, 'map']);
+ }
- if (is_null($this->namespace)) return require $path;
+ /**
+ * Load the standard routes file for the application.
+ *
+ * @param string $path
+ * @return mixed
+ */
+ protected function loadRoutesFrom($path)
+ {
+ $router = $this->app->make(Router::class);
- $router->group(['namespace' => $this->namespace], function($router) use ($path)
- {
- require $path;
- });
- }
+ if (is_null($this->namespace)) {
+ return require $path;
+ }
- /**
- * Register the service provider.
- *
- * @return void
- */
- public function register()
- {
- //
- }
+ $router->group(['namespace' => $this->namespace], function (Router $router) use ($path) {
+ require $path;
+ });
+ }
- /**
- * Pass dynamic methods onto the router instance.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array([$this->app['router'], $method], $parameters);
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ //
+ }
+ /**
+ * Pass dynamic methods onto the router instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->app->make(Router::class), $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/ApplicationTrait.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/ApplicationTrait.php
index 5a16e56..f8d4450 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/ApplicationTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/ApplicationTrait.php
@@ -1,195 +1,314 @@
-app = $this->createApplication();
- }
-
- /**
- * Call the given URI and return the Response.
- *
- * @param string $method
- * @param string $uri
- * @param array $parameters
- * @param array $cookies
- * @param array $files
- * @param array $server
- * @param string $content
- * @return \Illuminate\Http\Response
- */
- public function call($method, $uri, $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
- {
- $request = Request::create($uri, $method, $parameters, $cookies, $files, $server, $content);
-
- return $this->response = $this->app->make('Illuminate\Contracts\Http\Kernel')->handle($request);
- }
-
- /**
- * Call the given HTTPS URI and return the Response.
- *
- * @param string $method
- * @param string $uri
- * @param array $parameters
- * @param array $cookies
- * @param array $files
- * @param array $server
- * @param string $content
- * @return \Illuminate\Http\Response
- */
- public function callSecure($method, $uri, $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
- {
- $uri = 'https://localhost/'.ltrim($uri, '/');
-
- return $this->response = $this->call($method, $uri, $parameters, $cookies, $files, $server, $content);
- }
-
- /**
- * Call a controller action and return the Response.
- *
- * @param string $method
- * @param string $action
- * @param array $wildcards
- * @param array $parameters
- * @param array $cookies
- * @param array $files
- * @param array $server
- * @param string $content
- * @return \Illuminate\Http\Response
- */
- public function action($method, $action, $wildcards = [], $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
- {
- $uri = $this->app['url']->action($action, $wildcards, true);
-
- return $this->response = $this->call($method, $uri, $parameters, $cookies, $files, $server, $content);
- }
-
- /**
- * Call a named route and return the Response.
- *
- * @param string $method
- * @param string $name
- * @param array $routeParameters
- * @param array $parameters
- * @param array $cookies
- * @param array $files
- * @param array $server
- * @param string $content
- * @return \Illuminate\Http\Response
- */
- public function route($method, $name, $routeParameters = [], $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
- {
- $uri = $this->app['url']->route($name, $routeParameters);
-
- return $this->response = $this->call($method, $uri, $parameters, $cookies, $files, $server, $content);
- }
-
- /**
- * Set the session to the given array.
- *
- * @param array $data
- * @return void
- */
- public function session(array $data)
- {
- $this->startSession();
-
- foreach ($data as $key => $value)
- {
- $this->app['session']->put($key, $value);
- }
- }
-
- /**
- * Flush all of the current session data.
- *
- * @return void
- */
- public function flushSession()
- {
- $this->startSession();
-
- $this->app['session']->flush();
- }
-
- /**
- * Start the session for the application.
- *
- * @return void
- */
- protected function startSession()
- {
- if ( ! $this->app['session']->isStarted())
- {
- $this->app['session']->start();
- }
- }
-
- /**
- * Set the currently logged in user for the application.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param string $driver
- * @return void
- */
- public function be(UserContract $user, $driver = null)
- {
- $this->app['auth']->driver($driver)->setUser($user);
- }
-
- /**
- * Seed a given database connection.
- *
- * @param string $class
- * @return void
- */
- public function seed($class = 'DatabaseSeeder')
- {
- $this->artisan('db:seed', ['--class' => $class]);
- }
-
- /**
- * Call artisan command and return code.
- *
- * @param string $command
- * @param array $parameters
- * @return int
- */
- public function artisan($command, $parameters = [])
- {
- return $this->code = $this->app['Illuminate\Contracts\Console\Kernel']->call($command, $parameters);
- }
+trait ApplicationTrait
+{
+ /**
+ * The Illuminate application instance.
+ *
+ * @var \Illuminate\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The last code returned by Artisan CLI.
+ *
+ * @var int
+ */
+ protected $code;
+
+ /**
+ * Refresh the application instance.
+ *
+ * @return void
+ */
+ protected function refreshApplication()
+ {
+ putenv('APP_ENV=testing');
+
+ $this->app = $this->createApplication();
+ }
+
+ /**
+ * Register an instance of an object in the container.
+ *
+ * @param string $abstract
+ * @param object $instance
+ * @return object
+ */
+ protected function instance($abstract, $instance)
+ {
+ $this->app->instance($abstract, $instance);
+
+ return $instance;
+ }
+
+ /**
+ * Specify a list of events that should be fired for the given operation.
+ *
+ * These events will be mocked, so that handlers will not actually be executed.
+ *
+ * @param array|mixed $events
+ * @return $this
+ */
+ public function expectsEvents($events)
+ {
+ $events = is_array($events) ? $events : func_get_args();
+
+ $mock = Mockery::spy('Illuminate\Contracts\Events\Dispatcher');
+
+ $mock->shouldReceive('fire')->andReturnUsing(function ($called) use (&$events) {
+ foreach ($events as $key => $event) {
+ if ((is_string($called) && $called === $event) ||
+ (is_string($called) && is_subclass_of($called, $event)) ||
+ (is_object($called) && $called instanceof $event)) {
+ unset($events[$key]);
+ }
+ }
+ });
+
+ $this->beforeApplicationDestroyed(function () use (&$events) {
+ if ($events) {
+ throw new Exception(
+ 'The following events were not fired: ['.implode(', ', $events).']'
+ );
+ }
+ });
+
+ $this->app->instance('events', $mock);
+
+ return $this;
+ }
+
+ /**
+ * Mock the event dispatcher so all events are silenced.
+ *
+ * @return $this
+ */
+ protected function withoutEvents()
+ {
+ $mock = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
+
+ $mock->shouldReceive('fire');
+
+ $this->app->instance('events', $mock);
+
+ return $this;
+ }
+
+ /**
+ * Specify a list of jobs that should be dispatched for the given operation.
+ *
+ * These jobs will be mocked, so that handlers will not actually be executed.
+ *
+ * @param array|mixed $jobs
+ * @return $this
+ */
+ protected function expectsJobs($jobs)
+ {
+ $jobs = is_array($jobs) ? $jobs : func_get_args();
+
+ $mock = Mockery::mock('Illuminate\Bus\Dispatcher[dispatch]', [$this->app]);
+
+ foreach ($jobs as $job) {
+ $mock->shouldReceive('dispatch')->atLeast()->once()
+ ->with(Mockery::type($job));
+ }
+
+ $this->app->instance(
+ 'Illuminate\Contracts\Bus\Dispatcher', $mock
+ );
+
+ return $this;
+ }
+
+ /**
+ * Set the session to the given array.
+ *
+ * @param array $data
+ * @return $this
+ */
+ public function withSession(array $data)
+ {
+ $this->session($data);
+
+ return $this;
+ }
+
+ /**
+ * Set the session to the given array.
+ *
+ * @param array $data
+ * @return void
+ */
+ public function session(array $data)
+ {
+ $this->startSession();
+
+ foreach ($data as $key => $value) {
+ $this->app['session']->put($key, $value);
+ }
+ }
+
+ /**
+ * Start the session for the application.
+ *
+ * @return void
+ */
+ protected function startSession()
+ {
+ if (! $this->app['session']->isStarted()) {
+ $this->app['session']->start();
+ }
+ }
+
+ /**
+ * Flush all of the current session data.
+ *
+ * @return void
+ */
+ public function flushSession()
+ {
+ $this->startSession();
+
+ $this->app['session']->flush();
+ }
+
+ /**
+ * Disable middleware for the test.
+ *
+ * @return $this
+ */
+ public function withoutMiddleware()
+ {
+ $this->app->instance('middleware.disable', true);
+
+ return $this;
+ }
+
+ /**
+ * Set the currently logged in user for the application.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string|null $driver
+ * @return $this
+ */
+ public function actingAs(UserContract $user, $driver = null)
+ {
+ $this->be($user, $driver);
+
+ return $this;
+ }
+
+ /**
+ * Set the currently logged in user for the application.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param string|null $driver
+ * @return void
+ */
+ public function be(UserContract $user, $driver = null)
+ {
+ $this->app['auth']->driver($driver)->setUser($user);
+ }
+
+ /**
+ * Assert that a given where condition exists in the database.
+ *
+ * @param string $table
+ * @param array $data
+ * @param string $connection
+ * @return $this
+ */
+ protected function seeInDatabase($table, array $data, $connection = null)
+ {
+ $database = $this->app->make('db');
+
+ $connection = $connection ?: $database->getDefaultConnection();
+
+ $count = $database->connection($connection)->table($table)->where($data)->count();
+
+ $this->assertGreaterThan(0, $count, sprintf(
+ 'Unable to find row in database table [%s] that matched attributes [%s].', $table, json_encode($data)
+ ));
+
+ return $this;
+ }
+
+ /**
+ * Assert that a given where condition does not exist in the database.
+ *
+ * @param string $table
+ * @param array $data
+ * @param string $connection
+ * @return $this
+ */
+ protected function missingFromDatabase($table, array $data, $connection = null)
+ {
+ return $this->notSeeInDatabase($table, $data, $connection);
+ }
+
+ /**
+ * Assert that a given where condition does not exist in the database.
+ *
+ * @param string $table
+ * @param array $data
+ * @param string $connection
+ * @return $this
+ */
+ protected function dontSeeInDatabase($table, array $data, $connection = null)
+ {
+ return $this->notSeeInDatabase($table, $data, $connection);
+ }
+
+ /**
+ * Assert that a given where condition does not exist in the database.
+ *
+ * @param string $table
+ * @param array $data
+ * @param string $connection
+ * @return $this
+ */
+ protected function notSeeInDatabase($table, array $data, $connection = null)
+ {
+ $database = $this->app->make('db');
+
+ $connection = $connection ?: $database->getDefaultConnection();
+
+ $count = $database->connection($connection)->table($table)->where($data)->count();
+
+ $this->assertEquals(0, $count, sprintf(
+ 'Found unexpected records in database table [%s] that matched attributes [%s].', $table, json_encode($data)
+ ));
+
+ return $this;
+ }
+
+ /**
+ * Seed a given database connection.
+ *
+ * @param string $class
+ * @return void
+ */
+ public function seed($class = 'DatabaseSeeder')
+ {
+ $this->artisan('db:seed', ['--class' => $class]);
+ }
+ /**
+ * Call artisan command and return code.
+ *
+ * @param string $command
+ * @param array $parameters
+ * @return int
+ */
+ public function artisan($command, $parameters = [])
+ {
+ return $this->code = $this->app['Illuminate\Contracts\Console\Kernel']->call($command, $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/AssertionsTrait.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/AssertionsTrait.php
index d6687ab..26b288e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/AssertionsTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/AssertionsTrait.php
@@ -1,218 +1,203 @@
-response->getStatusCode();
-
- return PHPUnit::assertTrue($this->response->isOk(), "Expected status code 200, got {$actual}.");
- }
-
- /**
- * Assert that the client response has a given code.
- *
- * @param int $code
- * @return void
- */
- public function assertResponseStatus($code)
- {
- $actual = $this->response->getStatusCode();
-
- return PHPUnit::assertEquals($code, $this->response->getStatusCode(), "Expected status code {$code}, got {$actual}.");
- }
-
- /**
- * Assert that the response view has a given piece of bound data.
- *
- * @param string|array $key
- * @param mixed $value
- * @return void
- */
- public function assertViewHas($key, $value = null)
- {
- if (is_array($key)) return $this->assertViewHasAll($key);
-
- if ( ! isset($this->response->original) || ! $this->response->original instanceof View)
- {
- return PHPUnit::assertTrue(false, 'The response was not a view.');
- }
-
- if (is_null($value))
- {
- PHPUnit::assertArrayHasKey($key, $this->response->original->getData());
- }
- else
- {
- PHPUnit::assertEquals($value, $this->response->original->$key);
- }
- }
-
- /**
- * Assert that the view has a given list of bound data.
- *
- * @param array $bindings
- * @return void
- */
- public function assertViewHasAll(array $bindings)
- {
- foreach ($bindings as $key => $value)
- {
- if (is_int($key))
- {
- $this->assertViewHas($value);
- }
- else
- {
- $this->assertViewHas($key, $value);
- }
- }
- }
-
- /**
- * Assert that the response view is missing a piece of bound data.
- *
- * @param string $key
- * @return void
- */
- public function assertViewMissing($key)
- {
- if ( ! isset($this->response->original) || ! $this->response->original instanceof View)
- {
- return PHPUnit::assertTrue(false, 'The response was not a view.');
- }
-
- PHPUnit::assertArrayNotHasKey($key, $this->response->original->getData());
- }
-
- /**
- * Assert whether the client was redirected to a given URI.
- *
- * @param string $uri
- * @param array $with
- * @return void
- */
- public function assertRedirectedTo($uri, $with = array())
- {
- PHPUnit::assertInstanceOf('Illuminate\Http\RedirectResponse', $this->response);
-
- PHPUnit::assertEquals($this->app['url']->to($uri), $this->response->headers->get('Location'));
-
- $this->assertSessionHasAll($with);
- }
-
- /**
- * Assert whether the client was redirected to a given route.
- *
- * @param string $name
- * @param array $parameters
- * @param array $with
- * @return void
- */
- public function assertRedirectedToRoute($name, $parameters = array(), $with = array())
- {
- $this->assertRedirectedTo($this->app['url']->route($name, $parameters), $with);
- }
-
- /**
- * Assert whether the client was redirected to a given action.
- *
- * @param string $name
- * @param array $parameters
- * @param array $with
- * @return void
- */
- public function assertRedirectedToAction($name, $parameters = array(), $with = array())
- {
- $this->assertRedirectedTo($this->app['url']->action($name, $parameters), $with);
- }
-
- /**
- * Assert that the session has a given list of values.
- *
- * @param string|array $key
- * @param mixed $value
- * @return void
- */
- public function assertSessionHas($key, $value = null)
- {
- if (is_array($key)) return $this->assertSessionHasAll($key);
-
- if (is_null($value))
- {
- PHPUnit::assertTrue($this->app['session.store']->has($key), "Session missing key: $key");
- }
- else
- {
- PHPUnit::assertEquals($value, $this->app['session.store']->get($key));
- }
- }
-
- /**
- * Assert that the session has a given list of values.
- *
- * @param array $bindings
- * @return void
- */
- public function assertSessionHasAll(array $bindings)
- {
- foreach ($bindings as $key => $value)
- {
- if (is_int($key))
- {
- $this->assertSessionHas($value);
- }
- else
- {
- $this->assertSessionHas($key, $value);
- }
- }
- }
-
- /**
- * Assert that the session has errors bound.
- *
- * @param string|array $bindings
- * @param mixed $format
- * @return void
- */
- public function assertSessionHasErrors($bindings = array(), $format = null)
- {
- $this->assertSessionHas('errors');
-
- $bindings = (array) $bindings;
-
- $errors = $this->app['session.store']->get('errors');
-
- foreach ($bindings as $key => $value)
- {
- if (is_int($key))
- {
- PHPUnit::assertTrue($errors->has($value), "Session missing error: $value");
- }
- else
- {
- PHPUnit::assertContains($value, $errors->get($key, $format));
- }
- }
- }
-
- /**
- * Assert that the session has old input.
- *
- * @return void
- */
- public function assertHasOldInput()
- {
- $this->assertSessionHas('_old_input');
- }
-
+trait AssertionsTrait
+{
+ /**
+ * Assert that the client response has an OK status code.
+ *
+ * @return void
+ */
+ public function assertResponseOk()
+ {
+ $actual = $this->response->getStatusCode();
+
+ return PHPUnit::assertTrue($this->response->isOk(), "Expected status code 200, got {$actual}.");
+ }
+
+ /**
+ * Assert that the client response has a given code.
+ *
+ * @param int $code
+ * @return void
+ */
+ public function assertResponseStatus($code)
+ {
+ $actual = $this->response->getStatusCode();
+
+ return PHPUnit::assertEquals($code, $this->response->getStatusCode(), "Expected status code {$code}, got {$actual}.");
+ }
+
+ /**
+ * Assert that the response view has a given piece of bound data.
+ *
+ * @param string|array $key
+ * @param mixed $value
+ * @return void
+ */
+ public function assertViewHas($key, $value = null)
+ {
+ if (is_array($key)) {
+ return $this->assertViewHasAll($key);
+ }
+
+ if (! isset($this->response->original) || ! $this->response->original instanceof View) {
+ return PHPUnit::assertTrue(false, 'The response was not a view.');
+ }
+
+ if (is_null($value)) {
+ PHPUnit::assertArrayHasKey($key, $this->response->original->getData());
+ } else {
+ PHPUnit::assertEquals($value, $this->response->original->$key);
+ }
+ }
+
+ /**
+ * Assert that the view has a given list of bound data.
+ *
+ * @param array $bindings
+ * @return void
+ */
+ public function assertViewHasAll(array $bindings)
+ {
+ foreach ($bindings as $key => $value) {
+ if (is_int($key)) {
+ $this->assertViewHas($value);
+ } else {
+ $this->assertViewHas($key, $value);
+ }
+ }
+ }
+
+ /**
+ * Assert that the response view is missing a piece of bound data.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function assertViewMissing($key)
+ {
+ if (! isset($this->response->original) || ! $this->response->original instanceof View) {
+ return PHPUnit::assertTrue(false, 'The response was not a view.');
+ }
+
+ PHPUnit::assertArrayNotHasKey($key, $this->response->original->getData());
+ }
+
+ /**
+ * Assert whether the client was redirected to a given URI.
+ *
+ * @param string $uri
+ * @param array $with
+ * @return void
+ */
+ public function assertRedirectedTo($uri, $with = [])
+ {
+ PHPUnit::assertInstanceOf('Illuminate\Http\RedirectResponse', $this->response);
+
+ PHPUnit::assertEquals($this->app['url']->to($uri), $this->response->headers->get('Location'));
+
+ $this->assertSessionHasAll($with);
+ }
+
+ /**
+ * Assert whether the client was redirected to a given route.
+ *
+ * @param string $name
+ * @param array $parameters
+ * @param array $with
+ * @return void
+ */
+ public function assertRedirectedToRoute($name, $parameters = [], $with = [])
+ {
+ $this->assertRedirectedTo($this->app['url']->route($name, $parameters), $with);
+ }
+
+ /**
+ * Assert whether the client was redirected to a given action.
+ *
+ * @param string $name
+ * @param array $parameters
+ * @param array $with
+ * @return void
+ */
+ public function assertRedirectedToAction($name, $parameters = [], $with = [])
+ {
+ $this->assertRedirectedTo($this->app['url']->action($name, $parameters), $with);
+ }
+
+ /**
+ * Assert that the session has a given value.
+ *
+ * @param string|array $key
+ * @param mixed $value
+ * @return void
+ */
+ public function assertSessionHas($key, $value = null)
+ {
+ if (is_array($key)) {
+ return $this->assertSessionHasAll($key);
+ }
+
+ if (is_null($value)) {
+ PHPUnit::assertTrue($this->app['session.store']->has($key), "Session missing key: $key");
+ } else {
+ PHPUnit::assertEquals($value, $this->app['session.store']->get($key));
+ }
+ }
+
+ /**
+ * Assert that the session has a given list of values.
+ *
+ * @param array $bindings
+ * @return void
+ */
+ public function assertSessionHasAll(array $bindings)
+ {
+ foreach ($bindings as $key => $value) {
+ if (is_int($key)) {
+ $this->assertSessionHas($value);
+ } else {
+ $this->assertSessionHas($key, $value);
+ }
+ }
+ }
+
+ /**
+ * Assert that the session has errors bound.
+ *
+ * @param string|array $bindings
+ * @param mixed $format
+ * @return void
+ */
+ public function assertSessionHasErrors($bindings = [], $format = null)
+ {
+ $this->assertSessionHas('errors');
+
+ $bindings = (array) $bindings;
+
+ $errors = $this->app['session.store']->get('errors');
+
+ foreach ($bindings as $key => $value) {
+ if (is_int($key)) {
+ PHPUnit::assertTrue($errors->has($value), "Session missing error: $value");
+ } else {
+ PHPUnit::assertContains($value, $errors->get($key, $format));
+ }
+ }
+ }
+
+ /**
+ * Assert that the session has old input.
+ *
+ * @return void
+ */
+ public function assertHasOldInput()
+ {
+ $this->assertSessionHas('_old_input');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/CrawlerTrait.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/CrawlerTrait.php
new file mode 100644
index 0000000..c3c59dd
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/CrawlerTrait.php
@@ -0,0 +1,520 @@
+ mb_strlen($content, '8bit'),
+ 'CONTENT_TYPE' => 'application/json',
+ 'Accept' => 'application/json',
+ ], $headers);
+
+ $this->call(
+ $method, $uri, [], [], [], $this->transformHeadersToServerVars($headers), $content
+ );
+
+ return $this;
+ }
+
+ /**
+ * Visit the given URI with a GET request.
+ *
+ * @param string $uri
+ * @param array $headers
+ * @return $this
+ */
+ public function get($uri, array $headers = [])
+ {
+ $server = $this->transformHeadersToServerVars($headers);
+
+ $this->call('GET', $uri, [], [], [], $server);
+
+ return $this;
+ }
+
+ /**
+ * Visit the given URI with a POST request.
+ *
+ * @param string $uri
+ * @param array $data
+ * @param array $headers
+ * @return $this
+ */
+ public function post($uri, array $data = [], array $headers = [])
+ {
+ $server = $this->transformHeadersToServerVars($headers);
+
+ $this->call('POST', $uri, $data, [], [], $server);
+
+ return $this;
+ }
+
+ /**
+ * Visit the given URI with a PUT request.
+ *
+ * @param string $uri
+ * @param array $data
+ * @param array $headers
+ * @return $this
+ */
+ public function put($uri, array $data = [], array $headers = [])
+ {
+ $server = $this->transformHeadersToServerVars($headers);
+
+ $this->call('PUT', $uri, $data, [], [], $server);
+
+ return $this;
+ }
+
+ /**
+ * Visit the given URI with a PATCH request.
+ *
+ * @param string $uri
+ * @param array $data
+ * @param array $headers
+ * @return $this
+ */
+ public function patch($uri, array $data = [], array $headers = [])
+ {
+ $server = $this->transformHeadersToServerVars($headers);
+
+ $this->call('PATCH', $uri, $data, [], [], $server);
+
+ return $this;
+ }
+
+ /**
+ * Visit the given URI with a DELETE request.
+ *
+ * @param string $uri
+ * @param array $data
+ * @param array $headers
+ * @return $this
+ */
+ public function delete($uri, array $data = [], array $headers = [])
+ {
+ $server = $this->transformHeadersToServerVars($headers);
+
+ $this->call('DELETE', $uri, $data, [], [], $server);
+
+ return $this;
+ }
+
+ /**
+ * Send the given request through the application.
+ *
+ * This method allows you to fully customize the entire Request object.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return $this
+ */
+ public function handle(Request $request)
+ {
+ $this->currentUri = $request->fullUrl();
+
+ $this->response = $this->app->prepareResponse($this->app->handle($request));
+
+ return $this;
+ }
+
+ /**
+ * Assert that the response contains JSON.
+ *
+ * @param array|null $data
+ * @return $this
+ */
+ protected function shouldReturnJson(array $data = null)
+ {
+ return $this->receiveJson($data);
+ }
+
+ /**
+ * Assert that the response contains JSON.
+ *
+ * @param array|null $data
+ * @return $this|null
+ */
+ protected function receiveJson($data = null)
+ {
+ $this->seeJson();
+
+ if (! is_null($data)) {
+ return $this->seeJson($data);
+ }
+ }
+
+ /**
+ * Assert that the response contains an exact JSON array.
+ *
+ * @param array $data
+ * @return $this
+ */
+ public function seeJsonEquals(array $data)
+ {
+ $actual = json_encode(Arr::sortRecursive(
+ json_decode($this->response->getContent(), true)
+ ));
+
+ $this->assertEquals(json_encode(Arr::sortRecursive($data)), $actual);
+
+ return $this;
+ }
+
+ /**
+ * Assert that the response contains JSON.
+ *
+ * @param array|null $data
+ * @param bool $negate
+ * @return $this
+ */
+ public function seeJson(array $data = null, $negate = false)
+ {
+ if (is_null($data)) {
+ $this->assertJson(
+ $this->response->getContent(), "JSON was not returned from [{$this->currentUri}]."
+ );
+
+ return $this;
+ }
+
+ return $this->seeJsonContains($data, $negate);
+ }
+
+ /**
+ * Assert that the response doesn't contain JSON.
+ *
+ * @param array|null $data
+ * @return $this
+ */
+ public function dontSeeJson(array $data = null)
+ {
+ return $this->seeJson($data, true);
+ }
+
+ /**
+ * Assert that the response contains the given JSON.
+ *
+ * @param array $data
+ * @param bool $negate
+ * @return $this
+ */
+ protected function seeJsonContains(array $data, $negate = false)
+ {
+ $method = $negate ? 'assertFalse' : 'assertTrue';
+
+ $actual = json_decode($this->response->getContent(), true);
+
+ if (is_null($actual) || $actual === false) {
+ return $this->fail('Invalid JSON was returned from the route. Perhaps an exception was thrown?');
+ }
+
+ $actual = json_encode(Arr::sortRecursive(
+ (array) $actual
+ ));
+
+ foreach (Arr::sortRecursive($data) as $key => $value) {
+ $expected = $this->formatToExpectedJson($key, $value);
+
+ $this->{$method}(
+ Str::contains($actual, $expected),
+ ($negate ? 'Found unexpected' : 'Unable to find')." JSON fragment [{$expected}] within [{$actual}]."
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Format the given key and value into a JSON string for expectation checks.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return string
+ */
+ protected function formatToExpectedJson($key, $value)
+ {
+ $expected = json_encode([$key => $value]);
+
+ if (Str::startsWith($expected, '{')) {
+ $expected = substr($expected, 1);
+ }
+
+ if (Str::endsWith($expected, '}')) {
+ $expected = substr($expected, 0, -1);
+ }
+
+ return $expected;
+ }
+
+ /**
+ * Asserts that the status code of the response matches the given code.
+ *
+ * @param int $status
+ * @return $this
+ */
+ protected function seeStatusCode($status)
+ {
+ $this->assertEquals($status, $this->response->getStatusCode());
+
+ return $this;
+ }
+
+ /**
+ * Asserts that the response contains the given header and equals the optional value.
+ *
+ * @param string $headerName
+ * @param mixed $value
+ * @return $this
+ */
+ protected function seeHeader($headerName, $value = null)
+ {
+ $headers = $this->response->headers;
+
+ $this->assertTrue($headers->has($headerName), "Header [{$headerName}] not present on response.");
+
+ if (! is_null($value)) {
+ $this->assertEquals(
+ $headers->get($headerName), $value,
+ "Header [{$headerName}] was found, but value [{$headers->get($headerName)}] does not match [{$value}]."
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Asserts that the response contains the given cookie and equals the optional value.
+ *
+ * @param string $cookieName
+ * @param mixed $value
+ * @return $this
+ */
+ protected function seeCookie($cookieName, $value = null)
+ {
+ $headers = $this->response->headers;
+
+ $exist = false;
+
+ foreach ($headers->getCookies() as $cookie) {
+ if ($cookie->getName() === $cookieName) {
+ $exist = true;
+ break;
+ }
+ }
+
+ $this->assertTrue($exist, "Cookie [{$cookieName}] not present on response.");
+
+ if (! is_null($value)) {
+ $this->assertEquals(
+ $cookie->getValue(), $value,
+ "Cookie [{$cookieName}] was found, but value [{$cookie->getValue()}] does not match [{$value}]."
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Define a set of server variables to be sent with the requests.
+ *
+ * @param array $server
+ * @return $this
+ */
+ protected function withServerVariables(array $server)
+ {
+ $this->serverVariables = $server;
+
+ return $this;
+ }
+
+ /**
+ * Call the given URI and return the Response.
+ *
+ * @param string $method
+ * @param string $uri
+ * @param array $parameters
+ * @param array $cookies
+ * @param array $files
+ * @param array $server
+ * @param string $content
+ * @return \Illuminate\Http\Response
+ */
+ public function call($method, $uri, $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
+ {
+ $kernel = $this->app->make('Illuminate\Contracts\Http\Kernel');
+
+ $this->currentUri = $this->prepareUrlForRequest($uri);
+
+ $request = Request::create(
+ $this->currentUri, $method, $parameters,
+ $cookies, $files, array_replace($this->serverVariables, $server), $content
+ );
+
+ $response = $kernel->handle($request);
+
+ $kernel->terminate($request, $response);
+
+ return $this->response = $response;
+ }
+
+ /**
+ * Call the given HTTPS URI and return the Response.
+ *
+ * @param string $method
+ * @param string $uri
+ * @param array $parameters
+ * @param array $cookies
+ * @param array $files
+ * @param array $server
+ * @param string $content
+ * @return \Illuminate\Http\Response
+ */
+ public function callSecure($method, $uri, $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
+ {
+ $uri = $this->app['url']->secure(ltrim($uri, '/'));
+
+ return $this->response = $this->call($method, $uri, $parameters, $cookies, $files, $server, $content);
+ }
+
+ /**
+ * Call a controller action and return the Response.
+ *
+ * @param string $method
+ * @param string $action
+ * @param array $wildcards
+ * @param array $parameters
+ * @param array $cookies
+ * @param array $files
+ * @param array $server
+ * @param string $content
+ * @return \Illuminate\Http\Response
+ */
+ public function action($method, $action, $wildcards = [], $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
+ {
+ $uri = $this->app['url']->action($action, $wildcards, true);
+
+ return $this->response = $this->call($method, $uri, $parameters, $cookies, $files, $server, $content);
+ }
+
+ /**
+ * Call a named route and return the Response.
+ *
+ * @param string $method
+ * @param string $name
+ * @param array $routeParameters
+ * @param array $parameters
+ * @param array $cookies
+ * @param array $files
+ * @param array $server
+ * @param string $content
+ * @return \Illuminate\Http\Response
+ */
+ public function route($method, $name, $routeParameters = [], $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
+ {
+ $uri = $this->app['url']->route($name, $routeParameters);
+
+ return $this->response = $this->call($method, $uri, $parameters, $cookies, $files, $server, $content);
+ }
+
+ /**
+ * Turn the given URI into a fully qualified URL.
+ *
+ * @param string $uri
+ * @return string
+ */
+ protected function prepareUrlForRequest($uri)
+ {
+ if (Str::startsWith($uri, '/')) {
+ $uri = substr($uri, 1);
+ }
+
+ if (! Str::startsWith($uri, 'http')) {
+ $uri = $this->baseUrl.'/'.$uri;
+ }
+
+ return trim($uri, '/');
+ }
+
+ /**
+ * Transform headers array to array of $_SERVER vars with HTTP_* format.
+ *
+ * @param array $headers
+ * @return array
+ */
+ protected function transformHeadersToServerVars(array $headers)
+ {
+ $server = [];
+ $prefix = 'HTTP_';
+
+ foreach ($headers as $name => $value) {
+ $name = strtr(strtoupper($name), '-', '_');
+
+ if (! starts_with($name, $prefix) && $name != 'CONTENT_TYPE') {
+ $name = $prefix.$name;
+ }
+
+ $server[$name] = $value;
+ }
+
+ return $server;
+ }
+
+ /**
+ * Dump the content from the last response.
+ *
+ * @return void
+ */
+ public function dump()
+ {
+ $content = $this->response->getContent();
+
+ $json = json_decode($content);
+
+ if (json_last_error() === JSON_ERROR_NONE) {
+ $content = $json;
+ }
+
+ dd($content);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseMigrations.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseMigrations.php
new file mode 100644
index 0000000..d53b34e
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseMigrations.php
@@ -0,0 +1,18 @@
+artisan('migrate');
+
+ $this->beforeApplicationDestroyed(function () {
+ $this->artisan('migrate:rollback');
+ });
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseTransactions.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseTransactions.php
new file mode 100644
index 0000000..e580f5a
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseTransactions.php
@@ -0,0 +1,18 @@
+app->make('db')->beginTransaction();
+
+ $this->beforeApplicationDestroyed(function () {
+ $this->app->make('db')->rollBack();
+ });
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/HttpException.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/HttpException.php
new file mode 100644
index 0000000..67d2b2f
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/HttpException.php
@@ -0,0 +1,10 @@
+makeRequest('GET', $uri);
+ }
+
+ /**
+ * Make a request to the application and create a Crawler instance.
+ *
+ * @param string $method
+ * @param string $uri
+ * @param array $parameters
+ * @param array $cookies
+ * @param array $files
+ * @return $this
+ */
+ protected function makeRequest($method, $uri, $parameters = [], $cookies = [], $files = [])
+ {
+ $uri = $this->prepareUrlForRequest($uri);
+
+ $this->call($method, $uri, $parameters, $cookies, $files);
+
+ $this->clearInputs()->followRedirects()->assertPageLoaded($uri);
+
+ $this->currentUri = $this->app->make('request')->fullUrl();
+
+ $this->crawler = new Crawler($this->response->getContent(), $this->currentUri);
+
+ return $this;
+ }
+
+ /**
+ * Make a request to the application using the given form.
+ *
+ * @param \Symfony\Component\DomCrawler\Form $form
+ * @param array $uploads
+ * @return $this
+ */
+ protected function makeRequestUsingForm(Form $form, array $uploads = [])
+ {
+ $files = $this->convertUploadsForTesting($form, $uploads);
+
+ return $this->makeRequest(
+ $form->getMethod(), $form->getUri(), $this->extractParametersFromForm($form), [], $files
+ );
+ }
+
+ /**
+ * Extract the parameters from the given form.
+ *
+ * @param \Symfony\Component\DomCrawler\Form $form
+ * @return array
+ */
+ protected function extractParametersFromForm(Form $form)
+ {
+ parse_str(http_build_query($form->getValues()), $parameters);
+
+ return $parameters;
+ }
+
+ /**
+ * Follow redirects from the last response.
+ *
+ * @return $this
+ */
+ protected function followRedirects()
+ {
+ while ($this->response->isRedirect()) {
+ $this->makeRequest('GET', $this->response->getTargetUrl());
+ }
+
+ return $this;
+ }
+
+ /**
+ * Clear the inputs for the current page.
+ *
+ * @return $this
+ */
+ protected function clearInputs()
+ {
+ $this->inputs = [];
+
+ $this->uploads = [];
+
+ return $this;
+ }
+
+ /**
+ * Assert that the current page matches a given URI.
+ *
+ * @param string $uri
+ * @return $this
+ */
+ protected function seePageIs($uri)
+ {
+ $this->assertPageLoaded($uri = $this->prepareUrlForRequest($uri));
+
+ $this->assertEquals(
+ $uri, $this->currentUri, "Did not land on expected page [{$uri}].\n"
+ );
+
+ return $this;
+ }
+
+ /**
+ * Assert that a given page successfully loaded.
+ *
+ * @param string $uri
+ * @param string|null $message
+ * @return void
+ */
+ protected function assertPageLoaded($uri, $message = null)
+ {
+ $status = $this->response->getStatusCode();
+
+ try {
+ $this->assertEquals(200, $status);
+ } catch (PHPUnitException $e) {
+ $message = $message ?: "A request to [{$uri}] failed. Received status code [{$status}].";
+
+ $responseException = isset($this->response->exception)
+ ? $this->response->exception : null;
+
+ throw new HttpException($message, null, $responseException);
+ }
+ }
+
+ /**
+ * Assert that a given string is seen on the page.
+ *
+ * @param string $text
+ * @param bool $negate
+ * @return $this
+ */
+ protected function see($text, $negate = false)
+ {
+ $method = $negate ? 'assertNotRegExp' : 'assertRegExp';
+
+ $rawPattern = preg_quote($text, '/');
+
+ $escapedPattern = preg_quote(e($text), '/');
+
+ $pattern = $rawPattern == $escapedPattern
+ ? $rawPattern : "({$rawPattern}|{$escapedPattern})";
+
+ $this->$method("/$pattern/i", $this->response->getContent());
+
+ return $this;
+ }
+
+ /**
+ * Assert that a given string is not seen on the page.
+ *
+ * @param string $text
+ * @return $this
+ */
+ protected function dontSee($text)
+ {
+ return $this->see($text, true);
+ }
+
+ /**
+ * Assert that a given string is seen inside an element.
+ *
+ * @param string $element
+ * @param string $text
+ * @param bool $negate
+ * @return $this
+ */
+ public function seeInElement($element, $text, $negate = false)
+ {
+ if ($negate) {
+ return $this->dontSeeInElement($element, $text);
+ }
+
+ $this->assertTrue(
+ $this->hasInElement($element, $text),
+ "Element [$element] should contain the expected text [{$text}]"
+ );
+
+ return $this;
+ }
+
+ /**
+ * Assert that a given string is not seen inside an element.
+ *
+ * @param string $element
+ * @param string $text
+ * @return $this
+ */
+ public function dontSeeInElement($element, $text)
+ {
+ $this->assertFalse(
+ $this->hasInElement($element, $text),
+ "Element [$element] should not contain the expected text [{$text}]"
+ );
+
+ return $this;
+ }
+
+ /**
+ * Check if the page contains text within the given element.
+ *
+ * @param string $element
+ * @param string $text
+ * @return bool
+ */
+ protected function hasInElement($element, $text)
+ {
+ $elements = $this->crawler->filter($element);
+
+ $rawPattern = preg_quote($text, '/');
+
+ $escapedPattern = preg_quote(e($text), '/');
+
+ $pattern = $rawPattern == $escapedPattern
+ ? $rawPattern : "({$rawPattern}|{$escapedPattern})";
+
+ foreach ($elements as $element) {
+ $element = new Crawler($element);
+
+ if (preg_match("/$pattern/i", $element->html())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Assert that a given link is seen on the page.
+ *
+ * @param string $text
+ * @param string|null $url
+ * @return $this
+ */
+ public function seeLink($text, $url = null)
+ {
+ $message = "No links were found with expected text [{$text}]";
+
+ if ($url) {
+ $message .= " and URL [{$url}]";
+ }
+
+ $this->assertTrue($this->hasLink($text, $url), "{$message}.");
+
+ return $this;
+ }
+
+ /**
+ * Assert that a given link is not seen on the page.
+ *
+ * @param string $text
+ * @param string|null $url
+ * @return $this
+ */
+ public function dontSeeLink($text, $url = null)
+ {
+ $message = "A link was found with expected text [{$text}]";
+
+ if ($url) {
+ $message .= " and URL [{$url}]";
+ }
+
+ $this->assertFalse($this->hasLink($text, $url), "{$message}.");
+
+ return $this;
+ }
+
+ /**
+ * Check if the page has a link with the given $text and optional $url.
+ *
+ * @param string $text
+ * @param string|null $url
+ * @return bool
+ */
+ protected function hasLink($text, $url = null)
+ {
+ $links = $this->crawler->selectLink($text);
+
+ if ($links->count() == 0) {
+ return false;
+ }
+
+ // If the URL is null, we assume the developer only wants to find a link
+ // with the given text regardless of the URL. So, if we find the link
+ // we will return true now. Otherwise, we look for the given URL.
+ if ($url == null) {
+ return true;
+ }
+
+ $url = $this->addRootToRelativeUrl($url);
+
+ foreach ($links as $link) {
+ if ($link->getAttribute('href') == $url) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Add a root if the URL is relative (helper method of the hasLink function).
+ *
+ * @param string $url
+ * @return string
+ */
+ protected function addRootToRelativeUrl($url)
+ {
+ if (! Str::startsWith($url, ['http', 'https'])) {
+ return $this->app->make('url')->to($url);
+ }
+
+ return $url;
+ }
+
+ /**
+ * Assert that an input field contains the given value.
+ *
+ * @param string $selector
+ * @param string $expected
+ * @return $this
+ */
+ public function seeInField($selector, $expected)
+ {
+ $this->assertSame(
+ $expected, $this->getInputOrTextAreaValue($selector),
+ "The field [{$selector}] does not contain the expected value [{$expected}]."
+ );
+
+ return $this;
+ }
+
+ /**
+ * Assert that an input field does not contain the given value.
+ *
+ * @param string $selector
+ * @param string $value
+ * @return $this
+ */
+ public function dontSeeInField($selector, $value)
+ {
+ $this->assertNotSame(
+ $this->getInputOrTextAreaValue($selector), $value,
+ "The input [{$selector}] should not contain the value [{$value}]."
+ );
+
+ return $this;
+ }
+
+ /**
+ * Assert that the given checkbox is selected.
+ *
+ * @param string $selector
+ * @return $this
+ */
+ public function seeIsChecked($selector)
+ {
+ $this->assertTrue(
+ $this->isChecked($selector),
+ "The checkbox [{$selector}] is not checked."
+ );
+
+ return $this;
+ }
+
+ /**
+ * Assert that the given checkbox is not selected.
+ *
+ * @param string $selector
+ * @return $this
+ */
+ public function dontSeeIsChecked($selector)
+ {
+ $this->assertFalse(
+ $this->isChecked($selector),
+ "The checkbox [{$selector}] is checked."
+ );
+
+ return $this;
+ }
+
+ /**
+ * Assert that the expected value is selected.
+ *
+ * @param string $selector
+ * @param string $expected
+ * @return $this
+ */
+ public function seeIsSelected($selector, $expected)
+ {
+ $this->assertEquals(
+ $expected, $this->getSelectedValue($selector),
+ "The field [{$selector}] does not contain the selected value [{$expected}]."
+ );
+
+ return $this;
+ }
+
+ /**
+ * Assert that the given value is not selected.
+ *
+ * @param string $selector
+ * @param string $value
+ * @return $this
+ */
+ public function dontSeeIsSelected($selector, $value)
+ {
+ $this->assertNotEquals(
+ $value, $this->getSelectedValue($selector),
+ "The field [{$selector}] contains the selected value [{$value}]."
+ );
+
+ return $this;
+ }
+
+ /**
+ * Get the value of an input or textarea.
+ *
+ * @param string $selector
+ * @return string
+ *
+ * @throws \Exception
+ */
+ protected function getInputOrTextAreaValue($selector)
+ {
+ $field = $this->filterByNameOrId($selector, ['input', 'textarea']);
+
+ if ($field->count() == 0) {
+ throw new Exception("There are no elements with the name or ID [$selector].");
+ }
+
+ $element = $field->nodeName();
+
+ if ($element == 'input') {
+ return $field->attr('value');
+ }
+
+ if ($element == 'textarea') {
+ return $field->text();
+ }
+
+ throw new Exception("Given selector [$selector] is not an input or textarea.");
+ }
+
+ /**
+ * Get the selected value of a select field or radio group.
+ *
+ * @param string $selector
+ * @return string|null
+ *
+ * @throws \Exception
+ */
+ protected function getSelectedValue($selector)
+ {
+ $field = $this->filterByNameOrId($selector);
+
+ if ($field->count() == 0) {
+ throw new Exception("There are no elements with the name or ID [$selector].");
+ }
+
+ $element = $field->nodeName();
+
+ if ($element == 'select') {
+ return $this->getSelectedValueFromSelect($field);
+ }
+
+ if ($element == 'input') {
+ return $this->getCheckedValueFromRadioGroup($field);
+ }
+
+ throw new Exception("Given selector [$selector] is not a select or radio group.");
+ }
+
+ /**
+ * Get the selected value from a select field.
+ *
+ * @param \Symfony\Component\DomCrawler\Crawler $field
+ * @return string|null
+ *
+ * @throws \Exception
+ */
+ protected function getSelectedValueFromSelect(Crawler $field)
+ {
+ if ($field->nodeName() !== 'select') {
+ throw new Exception('Given element is not a select element.');
+ }
+
+ foreach ($field->children() as $option) {
+ if ($option->hasAttribute('selected')) {
+ return $option->getAttribute('value');
+ }
+ }
+ }
+
+ /**
+ * Get the checked value from a radio group.
+ *
+ * @param \Symfony\Component\DomCrawler\Crawler $radioGroup
+ * @return string|null
+ *
+ * @throws \Exception
+ */
+ protected function getCheckedValueFromRadioGroup(Crawler $radioGroup)
+ {
+ if ($radioGroup->nodeName() !== 'input' || $radioGroup->attr('type') !== 'radio') {
+ throw new Exception('Given element is not a radio button.');
+ }
+
+ foreach ($radioGroup as $radio) {
+ if ($radio->hasAttribute('checked')) {
+ return $radio->getAttribute('value');
+ }
+ }
+ }
+
+ /**
+ * Return true if the given checkbox is checked, false otherwise.
+ *
+ * @param string $selector
+ * @return bool
+ *
+ * @throws \Exception
+ */
+ protected function isChecked($selector)
+ {
+ $checkbox = $this->filterByNameOrId($selector, "input[type='checkbox']");
+
+ if ($checkbox->count() == 0) {
+ throw new Exception("There are no checkbox elements with the name or ID [$selector].");
+ }
+
+ return $checkbox->attr('checked') !== null;
+ }
+
+ /**
+ * Click a link with the given body, name, or ID attribute.
+ *
+ * @param string $name
+ * @return $this
+ */
+ protected function click($name)
+ {
+ $link = $this->crawler->selectLink($name);
+
+ if (! count($link)) {
+ $link = $this->filterByNameOrId($name, 'a');
+
+ if (! count($link)) {
+ throw new InvalidArgumentException(
+ "Could not find a link with a body, name, or ID attribute of [{$name}]."
+ );
+ }
+ }
+
+ $this->visit($link->link()->getUri());
+
+ return $this;
+ }
+
+ /**
+ * Fill an input field with the given text.
+ *
+ * @param string $text
+ * @param string $element
+ * @return $this
+ */
+ protected function type($text, $element)
+ {
+ return $this->storeInput($element, $text);
+ }
+
+ /**
+ * Check a checkbox on the page.
+ *
+ * @param string $element
+ * @return $this
+ */
+ protected function check($element)
+ {
+ return $this->storeInput($element, true);
+ }
+
+ /**
+ * Uncheck a checkbox on the page.
+ *
+ * @param string $element
+ * @return $this
+ */
+ protected function uncheck($element)
+ {
+ return $this->storeInput($element, false);
+ }
+
+ /**
+ * Select an option from a drop-down.
+ *
+ * @param string $option
+ * @param string $element
+ * @return $this
+ */
+ protected function select($option, $element)
+ {
+ return $this->storeInput($element, $option);
+ }
+
+ /**
+ * Attach a file to a form field on the page.
+ *
+ * @param string $absolutePath
+ * @param string $element
+ * @return $this
+ */
+ protected function attach($absolutePath, $element)
+ {
+ $this->uploads[$element] = $absolutePath;
+
+ return $this->storeInput($element, $absolutePath);
+ }
+
+ /**
+ * Submit a form using the button with the given text value.
+ *
+ * @param string $buttonText
+ * @return $this
+ */
+ protected function press($buttonText)
+ {
+ return $this->submitForm($buttonText, $this->inputs, $this->uploads);
+ }
+
+ /**
+ * Submit a form on the page with the given input.
+ *
+ * @param string $buttonText
+ * @param array $inputs
+ * @param array $uploads
+ * @return $this
+ */
+ protected function submitForm($buttonText, $inputs = [], $uploads = [])
+ {
+ $this->makeRequestUsingForm($this->fillForm($buttonText, $inputs), $uploads);
+
+ return $this;
+ }
+
+ /**
+ * Fill the form with the given data.
+ *
+ * @param string $buttonText
+ * @param array $inputs
+ * @return \Symfony\Component\DomCrawler\Form
+ */
+ protected function fillForm($buttonText, $inputs = [])
+ {
+ if (! is_string($buttonText)) {
+ $inputs = $buttonText;
+
+ $buttonText = null;
+ }
+
+ return $this->getForm($buttonText)->setValues($inputs);
+ }
+
+ /**
+ * Get the form from the page with the given submit button text.
+ *
+ * @param string|null $buttonText
+ * @return \Symfony\Component\DomCrawler\Form
+ */
+ protected function getForm($buttonText = null)
+ {
+ try {
+ if ($buttonText) {
+ return $this->crawler->selectButton($buttonText)->form();
+ }
+
+ return $this->crawler->filter('form')->form();
+ } catch (InvalidArgumentException $e) {
+ throw new InvalidArgumentException(
+ "Could not find a form that has submit button [{$buttonText}]."
+ );
+ }
+ }
+
+ /**
+ * Store a form input in the local array.
+ *
+ * @param string $element
+ * @param string $text
+ * @return $this
+ */
+ protected function storeInput($element, $text)
+ {
+ $this->assertFilterProducesResults($element);
+
+ $element = str_replace('#', '', $element);
+
+ $this->inputs[$element] = $text;
+
+ return $this;
+ }
+
+ /**
+ * Assert that a filtered Crawler returns nodes.
+ *
+ * @param string $filter
+ * @return void
+ */
+ protected function assertFilterProducesResults($filter)
+ {
+ $crawler = $this->filterByNameOrId($filter);
+
+ if (! count($crawler)) {
+ throw new InvalidArgumentException(
+ "Nothing matched the filter [{$filter}] CSS query provided for [{$this->currentUri}]."
+ );
+ }
+ }
+
+ /**
+ * Filter elements according to the given name or ID attribute.
+ *
+ * @param string $name
+ * @param array|string $elements
+ * @return \Symfony\Component\DomCrawler\Crawler
+ */
+ protected function filterByNameOrId($name, $elements = '*')
+ {
+ $name = str_replace('#', '', $name);
+
+ $id = str_replace(['[', ']'], ['\\[', '\\]'], $name);
+
+ $elements = is_array($elements) ? $elements : [$elements];
+
+ array_walk($elements, function (&$element) use ($name, $id) {
+ $element = "{$element}#{$id}, {$element}[name='{$name}']";
+ });
+
+ return $this->crawler->filter(implode(', ', $elements));
+ }
+
+ /**
+ * Convert the given uploads to UploadedFile instances.
+ *
+ * @param \Symfony\Component\DomCrawler\Form $form
+ * @param array $uploads
+ * @return array
+ */
+ protected function convertUploadsForTesting(Form $form, array $uploads)
+ {
+ $files = $form->getFiles();
+
+ $names = array_keys($files);
+
+ $files = array_map(function (array $file, $name) use ($uploads) {
+ return isset($uploads[$name])
+ ? $this->getUploadedFileForTesting($file, $uploads, $name)
+ : $file;
+ }, $files, $names);
+
+ return array_combine($names, $files);
+ }
+
+ /**
+ * Create an UploadedFile instance for testing.
+ *
+ * @param array $file
+ * @param array $uploads
+ * @param string $name
+ * @return \Symfony\Component\HttpFoundation\File\UploadedFile
+ */
+ protected function getUploadedFileForTesting($file, $uploads, $name)
+ {
+ return new UploadedFile(
+ $file['tmp_name'], basename($uploads[$name]), $file['type'], $file['size'], $file['error'], true
+ );
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php
index 910ae9b..ffbbfae 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php
@@ -1,44 +1,76 @@
-app)
- {
- $this->refreshApplication();
- }
- }
-
- /**
- * Clean up the testing environment before the next test.
- *
- * @return void
- */
- public function tearDown()
- {
- if ($this->app)
- {
- $this->app->flush();
- }
- }
+abstract class TestCase extends PHPUnit_Framework_TestCase
+{
+ use ApplicationTrait, AssertionsTrait, CrawlerTrait;
+
+ /**
+ * The callbacks that should be run before the application is destroyed.
+ *
+ * @var array
+ */
+ protected $beforeApplicationDestroyedCallbacks = [];
+
+ /**
+ * Creates the application.
+ *
+ * Needs to be implemented by subclasses.
+ *
+ * @return \Symfony\Component\HttpKernel\HttpKernelInterface
+ */
+ abstract public function createApplication();
+
+ /**
+ * Setup the test environment.
+ *
+ * @return void
+ */
+ public function setUp()
+ {
+ if (! $this->app) {
+ $this->refreshApplication();
+ }
+ }
+
+ /**
+ * Clean up the testing environment before the next test.
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ if ($this->app) {
+ foreach ($this->beforeApplicationDestroyedCallbacks as $callback) {
+ call_user_func($callback);
+ }
+
+ $this->app->flush();
+
+ $this->app = null;
+ }
+
+ if (property_exists($this, 'serverVariables')) {
+ $this->serverVariables = [];
+ }
+
+ if (class_exists('Mockery')) {
+ Mockery::close();
+ }
+ }
+ /**
+ * Register a callback to be run before the application is destroyed.
+ *
+ * @param callable $callback
+ * @return void
+ */
+ protected function beforeApplicationDestroyed(callable $callback)
+ {
+ $this->beforeApplicationDestroyedCallbacks[] = $callback;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php
new file mode 100644
index 0000000..80bf471
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php
@@ -0,0 +1,20 @@
+withoutEvents();
+ } else {
+ throw new Exception('Unable to disable middleware. ApplicationTrait not used.');
+ }
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php
new file mode 100644
index 0000000..91d1bf5
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php
@@ -0,0 +1,20 @@
+withoutMiddleware();
+ } else {
+ throw new Exception('Unable to disable middleware. CrawlerTrait not used.');
+ }
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
index 372a000..c3f896b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
@@ -1,102 +1,150 @@
-getValidationFactory()->make($request->all(), $rules, $messages);
-
- if ($validator->fails())
- {
- $this->throwValidationException($request, $validator);
- }
- }
-
- /**
- * Throw the failed validation exception.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Illuminate\Contracts\Validation\Validator $validator
- * @return void
- */
- protected function throwValidationException(Request $request, $validator)
- {
- throw new HttpResponseException($this->buildFailedValidationResponse(
- $request, $this->formatValidationErrors($validator)
- ));
- }
-
- /**
- * Create the response for when a request fails validation.
- *
- * @param \Illuminate\Http\Request $request
- * @param array $errors
- * @return \Illuminate\Http\Response
- */
- protected function buildFailedValidationResponse(Request $request, array $errors)
- {
- if ($request->ajax() || $request->wantsJson())
- {
- return new JsonResponse($errors, 422);
- }
-
- return redirect()->to($this->getRedirectUrl())
- ->withInput($request->input())
- ->withErrors($errors, $this->errorBag());
- }
-
- /**
- * Format the validation errors to be returned.
- *
- * @param \Illuminate\Validation\Validator $validator
- * @return array
- */
- protected function formatValidationErrors(Validator $validator)
- {
- return $validator->errors()->getMessages();
- }
-
- /**
- * Get the URL we should redirect to.
- *
- * @return string
- */
- protected function getRedirectUrl()
- {
- return app('Illuminate\Routing\UrlGenerator')->previous();
- }
-
- /**
- * Get a validation factory instance.
- *
- * @return \Illuminate\Contracts\Validation\Factory
- */
- protected function getValidationFactory()
- {
- return app('Illuminate\Contracts\Validation\Factory');
- }
-
- /**
- * Get the key to be used for the view error bag.
- *
- * @return string
- */
- protected function errorBag()
- {
- return 'default';
- }
+trait ValidatesRequests
+{
+ /**
+ * The default error bag.
+ *
+ * @var string
+ */
+ protected $validatesRequestErrorBag;
+
+ /**
+ * Validate the given request with the given rules.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param array $rules
+ * @param array $messages
+ * @param array $customAttributes
+ * @return void
+ *
+ * @throws \Illuminate\Http\Exception\HttpResponseException
+ */
+ public function validate(Request $request, array $rules, array $messages = [], array $customAttributes = [])
+ {
+ $validator = $this->getValidationFactory()->make($request->all(), $rules, $messages, $customAttributes);
+
+ if ($validator->fails()) {
+ $this->throwValidationException($request, $validator);
+ }
+ }
+
+ /**
+ * Validate the given request with the given rules.
+ *
+ * @param string $errorBag
+ * @param \Illuminate\Http\Request $request
+ * @param array $rules
+ * @param array $messages
+ * @param array $customAttributes
+ * @return void
+ *
+ * @throws \Illuminate\Http\Exception\HttpResponseException
+ */
+ public function validateWithBag($errorBag, Request $request, array $rules, array $messages = [], array $customAttributes = [])
+ {
+ $this->withErrorBag($errorBag, function () use ($request, $rules, $messages, $customAttributes) {
+ $this->validate($request, $rules, $messages, $customAttributes);
+ });
+ }
+
+ /**
+ * Throw the failed validation exception.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Illuminate\Contracts\Validation\Validator $validator
+ * @return void
+ *
+ * @throws \Illuminate\Http\Exception\HttpResponseException
+ */
+ protected function throwValidationException(Request $request, $validator)
+ {
+ throw new HttpResponseException($this->buildFailedValidationResponse(
+ $request, $this->formatValidationErrors($validator)
+ ));
+ }
+
+ /**
+ * Create the response for when a request fails validation.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param array $errors
+ * @return \Illuminate\Http\Response
+ */
+ protected function buildFailedValidationResponse(Request $request, array $errors)
+ {
+ if ($request->ajax() || $request->wantsJson()) {
+ return new JsonResponse($errors, 422);
+ }
+
+ return redirect()->to($this->getRedirectUrl())
+ ->withInput($request->input())
+ ->withErrors($errors, $this->errorBag());
+ }
+
+ /**
+ * Format the validation errors to be returned.
+ *
+ * @param \Illuminate\Contracts\Validation\Validator $validator
+ * @return array
+ */
+ protected function formatValidationErrors(Validator $validator)
+ {
+ return $validator->errors()->getMessages();
+ }
+
+ /**
+ * Get the URL we should redirect to.
+ *
+ * @return string
+ */
+ protected function getRedirectUrl()
+ {
+ return app(UrlGenerator::class)->previous();
+ }
+
+ /**
+ * Get a validation factory instance.
+ *
+ * @return \Illuminate\Contracts\Validation\Factory
+ */
+ protected function getValidationFactory()
+ {
+ return app(Factory::class);
+ }
+
+ /**
+ * Execute a Closure within with a given error bag set as the default bag.
+ *
+ * @param string $errorBag
+ * @param callable $callback
+ * @return void
+ */
+ protected function withErrorBag($errorBag, callable $callback)
+ {
+ $this->validatesRequestErrorBag = $errorBag;
+
+ call_user_func($callback);
+
+ $this->validatesRequestErrorBag = null;
+ }
+ /**
+ * Get the key to be used for the view error bag.
+ *
+ * @return string
+ */
+ protected function errorBag()
+ {
+ return $this->validatesRequestErrorBag ?: 'default';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php b/application/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php
index 2f4e896..fa19a77 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php
@@ -1,679 +1,750 @@
abort($code, $message, $headers);
- }
-}
-
-if ( ! function_exists('action'))
-{
- /**
- * Generate a URL to a controller action.
- *
- * @param string $name
- * @param array $parameters
- * @param bool $absolute
- * @return string
- */
- function action($name, $parameters = array(), $absolute = true)
- {
- return app('url')->action($name, $parameters, $absolute);
- }
-}
-
-if ( ! function_exists('app'))
-{
- /**
- * Get the available container instance.
- *
- * @param string $make
- * @param array $parameters
- * @return mixed|\Illuminate\Foundation\Application
- */
- function app($make = null, $parameters = [])
- {
- if (is_null($make)) return Container::getInstance();
-
- return Container::getInstance()->make($make, $parameters);
- }
-}
-
-if ( ! function_exists('app_path'))
-{
- /**
- * Get the path to the application folder.
- *
- * @param string $path
- * @return string
- */
- function app_path($path = '')
- {
- return app('path').($path ? '/'.$path : $path);
- }
-}
-
-if ( ! function_exists('asset'))
-{
- /**
- * Generate an asset path for the application.
- *
- * @param string $path
- * @param bool $secure
- * @return string
- */
- function asset($path, $secure = null)
- {
- return app('url')->asset($path, $secure);
- }
-}
-
-if ( ! function_exists('auth'))
-{
- /**
- * Get the available auth instance.
- *
- * @return \Illuminate\Contracts\Auth\Guard
- */
- function auth()
- {
- return app('Illuminate\Contracts\Auth\Guard');
- }
-}
-
-if ( ! function_exists('base_path'))
-{
- /**
- * Get the path to the base of the install.
- *
- * @param string $path
- * @return string
- */
- function base_path($path = '')
- {
- return app()->basePath().($path ? '/'.$path : $path);
- }
-}
-
-if ( ! function_exists('back'))
-{
- /**
- * Create a new redirect response to the previous location.
- *
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- function back($status = 302, $headers = array())
- {
- return app('redirect')->back($status, $headers);
- }
-}
-
-if ( ! function_exists('bcrypt'))
-{
- /**
- * Hash the given value.
- *
- * @param string $value
- * @param array $options
- * @return string
- */
- function bcrypt($value, $options = array())
- {
- return app('hash')->make($value, $options);
- }
-}
-
-if ( ! function_exists('config'))
-{
- /**
- * Get / set the specified configuration value.
- *
- * If an array is passed as the key, we will assume you want to set an array of values.
- *
- * @param array|string $key
- * @param mixed $default
- * @return mixed
- */
- function config($key = null, $default = null)
- {
- if (is_null($key)) return app('config');
-
- if (is_array($key))
- {
- return app('config')->set($key);
- }
-
- return app('config')->get($key, $default);
- }
-}
-
-if ( ! function_exists('config_path'))
-{
- /**
- * Get the configuration path.
- *
- * @param string $path
- * @return string
- */
- function config_path($path = '')
- {
- return app()->make('path.config').($path ? '/'.$path : $path);
- }
-}
-
-if ( ! function_exists('cookie'))
-{
- /**
- * Create a new cookie instance.
- *
- * @param string $name
- * @param string $value
- * @param int $minutes
- * @param string $path
- * @param string $domain
- * @param bool $secure
- * @param bool $httpOnly
- * @return \Symfony\Component\HttpFoundation\Cookie
- */
- function cookie($name = null, $value = null, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true)
- {
- $cookie = app('Illuminate\Contracts\Cookie\Factory');
-
- if (is_null($name))
- {
- return $cookie;
- }
-
- return $cookie->make($name, $value, $minutes, $path, $domain, $secure, $httpOnly);
- }
-}
-
-if ( ! function_exists('csrf_token'))
-{
- /**
- * Get the CSRF token value.
- *
- * @return string
- *
- * @throws RuntimeException
- */
- function csrf_token()
- {
- $session = app('session');
-
- if (isset($session))
- {
- return $session->getToken();
- }
-
- throw new RuntimeException("Application session store not set.");
- }
-}
-
-if ( ! function_exists('database_path'))
-{
- /**
- * Get the database path.
- *
- * @param string $path
- * @return string
- */
- function database_path($path = '')
- {
- return app()->databasePath().($path ? '/'.$path : $path);
- }
-}
-
-if ( ! function_exists('delete'))
-{
- /**
- * Register a new DELETE route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- function delete($uri, $action)
- {
- return app('router')->delete($uri, $action);
- }
-}
-
-if ( ! function_exists('get'))
-{
- /**
- * Register a new GET route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- function get($uri, $action)
- {
- return app('router')->get($uri, $action);
- }
-}
-
-if ( ! function_exists('info'))
-{
- /**
- * Write some information to the log.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- function info($message, $context = array())
- {
- return app('log')->info($message, $context);
- }
-}
-
-if ( ! function_exists('logger'))
-{
- /**
- * Log a debug message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return null|\Illuminate\Contracts\Logging\Log
- */
- function logger($message = null, array $context = array())
- {
- if (is_null($message)) return app('log');
-
- return app('log')->debug($message, $context);
- }
-}
-
-if ( ! function_exists('old'))
-{
- /**
- * Retrieve an old input item.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- function old($key = null, $default = null)
- {
- return app('request')->old($key, $default);
- }
-}
-
-if ( ! function_exists('patch'))
-{
- /**
- * Register a new PATCH route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- function patch($uri, $action)
- {
- return app('router')->patch($uri, $action);
- }
-}
-
-if ( ! function_exists('post'))
-{
- /**
- * Register a new POST route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- function post($uri, $action)
- {
- return app('router')->post($uri, $action);
- }
-}
-
-if ( ! function_exists('put'))
-{
- /**
- * Register a new PUT route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- function put($uri, $action)
- {
- return app('router')->put($uri, $action);
- }
-}
-
-if ( ! function_exists('public_path'))
-{
- /**
- * Get the path to the public folder.
- *
- * @param string $path
- * @return string
- */
- function public_path($path = '')
- {
- return app()->make('path.public').($path ? '/'.$path : $path);
- }
-}
-
-if ( ! function_exists('redirect'))
-{
- /**
- * Get an instance of the redirector.
- *
- * @param string|null $to
- * @param int $status
- * @param array $headers
- * @param bool $secure
- * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
- */
- function redirect($to = null, $status = 302, $headers = array(), $secure = null)
- {
- if (is_null($to)) return app('redirect');
-
- return app('redirect')->to($to, $status, $headers, $secure);
- }
-}
-
-if ( ! function_exists('resource'))
-{
- /**
- * Route a resource to a controller.
- *
- * @param string $name
- * @param string $controller
- * @param array $options
- * @return void
- */
- function resource($name, $controller, array $options = [])
- {
- return app('router')->resource($name, $controller, $options);
- }
-}
-
-if ( ! function_exists('response'))
-{
- /**
- * Return a new response from the application.
- *
- * @param string $content
- * @param int $status
- * @param array $headers
- * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Routing\ResponseFactory
- */
- function response($content = '', $status = 200, array $headers = array())
- {
- $factory = app('Illuminate\Contracts\Routing\ResponseFactory');
-
- if (func_num_args() === 0)
- {
- return $factory;
- }
-
- return $factory->make($content, $status, $headers);
- }
-}
-
-if ( ! function_exists('route'))
-{
- /**
- * Generate a URL to a named route.
- *
- * @param string $name
- * @param array $parameters
- * @param bool $absolute
- * @param \Illuminate\Routing\Route $route
- * @return string
- */
- function route($name, $parameters = array(), $absolute = true, $route = null)
- {
- return app('url')->route($name, $parameters, $absolute, $route);
- }
-}
-
-if ( ! function_exists('secure_asset'))
-{
- /**
- * Generate an asset path for the application.
- *
- * @param string $path
- * @return string
- */
- function secure_asset($path)
- {
- return asset($path, true);
- }
-}
-
-if ( ! function_exists('secure_url'))
-{
- /**
- * Generate a HTTPS url for the application.
- *
- * @param string $path
- * @param mixed $parameters
- * @return string
- */
- function secure_url($path, $parameters = array())
- {
- return url($path, $parameters, true);
- }
-}
-
-if ( ! function_exists('session'))
-{
- /**
- * Get / set the specified session value.
- *
- * If an array is passed as the key, we will assume you want to set an array of values.
- *
- * @param array|string $key
- * @param mixed $default
- * @return mixed
- */
- function session($key = null, $default = null)
- {
- if (is_null($key)) return app('session');
-
- if (is_array($key)) return app('session')->put($key);
-
- return app('session')->get($key, $default);
- }
-}
-
-if ( ! function_exists('storage_path'))
-{
- /**
- * Get the path to the storage folder.
- *
- * @param string $path
- * @return string
- */
- function storage_path($path = '')
- {
- return app('path.storage').($path ? '/'.$path : $path);
- }
-}
-
-if ( ! function_exists('trans'))
-{
- /**
- * Translate the given message.
- *
- * @param string $id
- * @param array $parameters
- * @param string $domain
- * @param string $locale
- * @return string
- */
- function trans($id = null, $parameters = array(), $domain = 'messages', $locale = null)
- {
- if (is_null($id)) return app('translator');
-
- return app('translator')->trans($id, $parameters, $domain, $locale);
- }
-}
-
-if ( ! function_exists('trans_choice'))
-{
- /**
- * Translates the given message based on a count.
- *
- * @param string $id
- * @param int $number
- * @param array $parameters
- * @param string $domain
- * @param string $locale
- * @return string
- */
- function trans_choice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)
- {
- return app('translator')->transChoice($id, $number, $parameters, $domain, $locale);
- }
-}
-
-if ( ! function_exists('url'))
-{
- /**
- * Generate a url for the application.
- *
- * @param string $path
- * @param mixed $parameters
- * @param bool $secure
- * @return string
- */
- function url($path = null, $parameters = array(), $secure = null)
- {
- return app('Illuminate\Contracts\Routing\UrlGenerator')->to($path, $parameters, $secure);
- }
-}
-
-if ( ! function_exists('view'))
-{
- /**
- * Get the evaluated view contents for the given view.
- *
- * @param string $view
- * @param array $data
- * @param array $mergeData
- * @return \Illuminate\View\View
- */
- function view($view = null, $data = array(), $mergeData = array())
- {
- $factory = app('Illuminate\Contracts\View\Factory');
-
- if (func_num_args() === 0)
- {
- return $factory;
- }
-
- return $factory->make($view, $data, $mergeData);
- }
-}
-
-if ( ! function_exists('env'))
-{
- /**
- * Gets the value of an environment variable. Supports boolean, empty and null.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- function env($key, $default = null)
- {
- $value = getenv($key);
-
- if ($value === false) return value($default);
-
- switch (strtolower($value))
- {
- case 'true':
- case '(true)':
- return true;
-
- case 'false':
- case '(false)':
- return false;
-
- case 'empty':
- case '(empty)':
- return '';
-
- case 'null':
- case '(null)':
- return;
- }
-
- if (Str::startsWith($value, '"') && Str::endsWith($value, '"'))
- {
- return substr($value, 1, -1);
- }
-
- return $value;
- }
-}
-
-if ( ! function_exists('event'))
-{
- /**
- * Fire an event and call the listeners.
- *
- * @param string $event
- * @param mixed $payload
- * @param bool $halt
- * @return array|null
- */
- function event($event, $payload = array(), $halt = false)
- {
- return app('events')->fire($event, $payload, $halt);
- }
-}
-
-if ( ! function_exists('elixir'))
-{
- /**
- * Get the path to a versioned Elixir file.
- *
- * @param string $file
- * @return string
- */
- function elixir($file)
- {
- static $manifest = null;
-
- if (is_null($manifest))
- {
- $manifest = json_decode(file_get_contents(public_path().'/build/rev-manifest.json'), true);
- }
-
- if (isset($manifest[$file]))
- {
- return '/build/'.$manifest[$file];
- }
-
- throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
- }
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Contracts\Bus\Dispatcher;
+use Illuminate\Contracts\Auth\Access\Gate;
+use Illuminate\Contracts\Routing\UrlGenerator;
+use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Contracts\View\Factory as ViewFactory;
+use Illuminate\Contracts\Cookie\Factory as CookieFactory;
+use Illuminate\Database\Eloquent\Factory as EloquentFactory;
+
+if (! function_exists('abort')) {
+ /**
+ * Throw an HttpException with the given data.
+ *
+ * @param int $code
+ * @param string $message
+ * @param array $headers
+ * @return void
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+ * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+ */
+ function abort($code, $message = '', array $headers = [])
+ {
+ return app()->abort($code, $message, $headers);
+ }
+}
+
+if (! function_exists('action')) {
+ /**
+ * Generate a URL to a controller action.
+ *
+ * @param string $name
+ * @param array $parameters
+ * @param bool $absolute
+ * @return string
+ */
+ function action($name, $parameters = [], $absolute = true)
+ {
+ return app('url')->action($name, $parameters, $absolute);
+ }
+}
+
+if (! function_exists('app')) {
+ /**
+ * Get the available container instance.
+ *
+ * @param string $make
+ * @param array $parameters
+ * @return mixed|\Illuminate\Foundation\Application
+ */
+ function app($make = null, $parameters = [])
+ {
+ if (is_null($make)) {
+ return Container::getInstance();
+ }
+
+ return Container::getInstance()->make($make, $parameters);
+ }
+}
+
+if (! function_exists('app_path')) {
+ /**
+ * Get the path to the application folder.
+ *
+ * @param string $path
+ * @return string
+ */
+ function app_path($path = '')
+ {
+ return app('path').($path ? DIRECTORY_SEPARATOR.$path : $path);
+ }
+}
+
+if (! function_exists('asset')) {
+ /**
+ * Generate an asset path for the application.
+ *
+ * @param string $path
+ * @param bool $secure
+ * @return string
+ */
+ function asset($path, $secure = null)
+ {
+ return app('url')->asset($path, $secure);
+ }
+}
+
+if (! function_exists('auth')) {
+ /**
+ * Get the available auth instance.
+ *
+ * @return \Illuminate\Contracts\Auth\Guard
+ */
+ function auth()
+ {
+ return app(Guard::class);
+ }
+}
+
+if (! function_exists('back')) {
+ /**
+ * Create a new redirect response to the previous location.
+ *
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ function back($status = 302, $headers = [])
+ {
+ return app('redirect')->back($status, $headers);
+ }
+}
+
+if (! function_exists('base_path')) {
+ /**
+ * Get the path to the base of the install.
+ *
+ * @param string $path
+ * @return string
+ */
+ function base_path($path = '')
+ {
+ return app()->basePath().($path ? DIRECTORY_SEPARATOR.$path : $path);
+ }
+}
+
+if (! function_exists('bcrypt')) {
+ /**
+ * Hash the given value.
+ *
+ * @param string $value
+ * @param array $options
+ * @return string
+ */
+ function bcrypt($value, $options = [])
+ {
+ return app('hash')->make($value, $options);
+ }
+}
+
+if (! function_exists('config')) {
+ /**
+ * Get / set the specified configuration value.
+ *
+ * If an array is passed as the key, we will assume you want to set an array of values.
+ *
+ * @param array|string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function config($key = null, $default = null)
+ {
+ if (is_null($key)) {
+ return app('config');
+ }
+
+ if (is_array($key)) {
+ return app('config')->set($key);
+ }
+
+ return app('config')->get($key, $default);
+ }
+}
+
+if (! function_exists('config_path')) {
+ /**
+ * Get the configuration path.
+ *
+ * @param string $path
+ * @return string
+ */
+ function config_path($path = '')
+ {
+ return app()->make('path.config').($path ? DIRECTORY_SEPARATOR.$path : $path);
+ }
+}
+
+if (! function_exists('cookie')) {
+ /**
+ * Create a new cookie instance.
+ *
+ * @param string $name
+ * @param string $value
+ * @param int $minutes
+ * @param string $path
+ * @param string $domain
+ * @param bool $secure
+ * @param bool $httpOnly
+ * @return \Symfony\Component\HttpFoundation\Cookie
+ */
+ function cookie($name = null, $value = null, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true)
+ {
+ $cookie = app(CookieFactory::class);
+
+ if (is_null($name)) {
+ return $cookie;
+ }
+
+ return $cookie->make($name, $value, $minutes, $path, $domain, $secure, $httpOnly);
+ }
+}
+
+if (! function_exists('csrf_field')) {
+ /**
+ * Generate a CSRF token form field.
+ *
+ * @return string
+ */
+ function csrf_field()
+ {
+ return new Expression('');
+ }
+}
+
+if (! function_exists('csrf_token')) {
+ /**
+ * Get the CSRF token value.
+ *
+ * @return string
+ *
+ * @throws RuntimeException
+ */
+ function csrf_token()
+ {
+ $session = app('session');
+
+ if (isset($session)) {
+ return $session->getToken();
+ }
+
+ throw new RuntimeException('Application session store not set.');
+ }
+}
+
+if (! function_exists('database_path')) {
+ /**
+ * Get the database path.
+ *
+ * @param string $path
+ * @return string
+ */
+ function database_path($path = '')
+ {
+ return app()->databasePath().($path ? DIRECTORY_SEPARATOR.$path : $path);
+ }
+}
+
+if (! function_exists('delete')) {
+ /**
+ * Register a new DELETE route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ function delete($uri, $action)
+ {
+ return app('router')->delete($uri, $action);
+ }
+}
+
+if (! function_exists('dispatch')) {
+ /**
+ * Dispatch a job to its appropriate handler.
+ *
+ * @param mixed $job
+ * @return mixed
+ */
+ function dispatch($job)
+ {
+ return app(Dispatcher::class)->dispatch($job);
+ }
+}
+
+if (! function_exists('elixir')) {
+ /**
+ * Get the path to a versioned Elixir file.
+ *
+ * @param string $file
+ * @return string
+ *
+ * @throws \InvalidArgumentException
+ */
+ function elixir($file)
+ {
+ static $manifest = null;
+
+ if (is_null($manifest)) {
+ $manifest = json_decode(file_get_contents(public_path('build/rev-manifest.json')), true);
+ }
+
+ if (isset($manifest[$file])) {
+ return '/build/'.$manifest[$file];
+ }
+
+ throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
+ }
+}
+
+if (! function_exists('env')) {
+ /**
+ * Gets the value of an environment variable. Supports boolean, empty and null.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function env($key, $default = null)
+ {
+ $value = getenv($key);
+
+ if ($value === false) {
+ return value($default);
+ }
+
+ switch (strtolower($value)) {
+ case 'true':
+ case '(true)':
+ return true;
+ case 'false':
+ case '(false)':
+ return false;
+ case 'empty':
+ case '(empty)':
+ return '';
+ case 'null':
+ case '(null)':
+ return;
+ }
+
+ if (strlen($value) > 1 && Str::startsWith($value, '"') && Str::endsWith($value, '"')) {
+ return substr($value, 1, -1);
+ }
+
+ return $value;
+ }
+}
+
+if (! function_exists('event')) {
+ /**
+ * Fire an event and call the listeners.
+ *
+ * @param string|object $event
+ * @param mixed $payload
+ * @param bool $halt
+ * @return array|null
+ */
+ function event($event, $payload = [], $halt = false)
+ {
+ return app('events')->fire($event, $payload, $halt);
+ }
+}
+
+if (! function_exists('factory')) {
+ /**
+ * Create a model factory builder for a given class, name, and amount.
+ *
+ * @param dynamic class|class,name|class,amount|class,name,amount
+ * @return \Illuminate\Database\Eloquent\FactoryBuilder
+ */
+ function factory()
+ {
+ $factory = app(EloquentFactory::class);
+
+ $arguments = func_get_args();
+
+ if (isset($arguments[1]) && is_string($arguments[1])) {
+ return $factory->of($arguments[0], $arguments[1])->times(isset($arguments[2]) ? $arguments[2] : 1);
+ } elseif (isset($arguments[1])) {
+ return $factory->of($arguments[0])->times($arguments[1]);
+ } else {
+ return $factory->of($arguments[0]);
+ }
+ }
+}
+
+if (! function_exists('get')) {
+ /**
+ * Register a new GET route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ function get($uri, $action)
+ {
+ return app('router')->get($uri, $action);
+ }
+}
+
+if (! function_exists('info')) {
+ /**
+ * Write some information to the log.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ function info($message, $context = [])
+ {
+ return app('log')->info($message, $context);
+ }
+}
+
+if (! function_exists('logger')) {
+ /**
+ * Log a debug message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null|\Illuminate\Contracts\Logging\Log
+ */
+ function logger($message = null, array $context = [])
+ {
+ if (is_null($message)) {
+ return app('log');
+ }
+
+ return app('log')->debug($message, $context);
+ }
+}
+
+if (! function_exists('method_field')) {
+ /**
+ * Generate a form field to spoof the HTTP verb used by forms.
+ *
+ * @param string $method
+ * @return string
+ */
+ function method_field($method)
+ {
+ return new Expression('');
+ }
+}
+
+if (! function_exists('old')) {
+ /**
+ * Retrieve an old input item.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function old($key = null, $default = null)
+ {
+ return app('request')->old($key, $default);
+ }
+}
+
+if (! function_exists('patch')) {
+ /**
+ * Register a new PATCH route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ function patch($uri, $action)
+ {
+ return app('router')->patch($uri, $action);
+ }
+}
+
+if (! function_exists('policy')) {
+ /**
+ * Get a policy instance for a given class.
+ *
+ * @param object|string $class
+ * @return mixed
+ *
+ * @throws \InvalidArgumentException
+ */
+ function policy($class)
+ {
+ return app(Gate::class)->getPolicyFor($class);
+ }
+}
+
+if (! function_exists('post')) {
+ /**
+ * Register a new POST route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ function post($uri, $action)
+ {
+ return app('router')->post($uri, $action);
+ }
+}
+
+if (! function_exists('public_path')) {
+ /**
+ * Get the path to the public folder.
+ *
+ * @param string $path
+ * @return string
+ */
+ function public_path($path = '')
+ {
+ return app()->make('path.public').($path ? DIRECTORY_SEPARATOR.$path : $path);
+ }
+}
+
+if (! function_exists('put')) {
+ /**
+ * Register a new PUT route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ function put($uri, $action)
+ {
+ return app('router')->put($uri, $action);
+ }
+}
+
+if (! function_exists('redirect')) {
+ /**
+ * Get an instance of the redirector.
+ *
+ * @param string|null $to
+ * @param int $status
+ * @param array $headers
+ * @param bool $secure
+ * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
+ */
+ function redirect($to = null, $status = 302, $headers = [], $secure = null)
+ {
+ if (is_null($to)) {
+ return app('redirect');
+ }
+
+ return app('redirect')->to($to, $status, $headers, $secure);
+ }
+}
+
+if (! function_exists('request')) {
+ /**
+ * Get an instance of the current request or an input item from the request.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return \Illuminate\Http\Request|string|array
+ */
+ function request($key = null, $default = null)
+ {
+ if (is_null($key)) {
+ return app('request');
+ }
+
+ return app('request')->input($key, $default);
+ }
+}
+
+if (! function_exists('resource')) {
+ /**
+ * Route a resource to a controller.
+ *
+ * @param string $name
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ function resource($name, $controller, array $options = [])
+ {
+ return app('router')->resource($name, $controller, $options);
+ }
+}
+
+if (! function_exists('response')) {
+ /**
+ * Return a new response from the application.
+ *
+ * @param string $content
+ * @param int $status
+ * @param array $headers
+ * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Routing\ResponseFactory
+ */
+ function response($content = '', $status = 200, array $headers = [])
+ {
+ $factory = app(ResponseFactory::class);
+
+ if (func_num_args() === 0) {
+ return $factory;
+ }
+
+ return $factory->make($content, $status, $headers);
+ }
+}
+
+if (! function_exists('route')) {
+ /**
+ * Generate a URL to a named route.
+ *
+ * @param string $name
+ * @param array $parameters
+ * @param bool $absolute
+ * @param \Illuminate\Routing\Route $route
+ * @return string
+ */
+ function route($name, $parameters = [], $absolute = true, $route = null)
+ {
+ return app('url')->route($name, $parameters, $absolute, $route);
+ }
+}
+
+if (! function_exists('secure_asset')) {
+ /**
+ * Generate an asset path for the application.
+ *
+ * @param string $path
+ * @return string
+ */
+ function secure_asset($path)
+ {
+ return asset($path, true);
+ }
+}
+
+if (! function_exists('secure_url')) {
+ /**
+ * Generate a HTTPS url for the application.
+ *
+ * @param string $path
+ * @param mixed $parameters
+ * @return string
+ */
+ function secure_url($path, $parameters = [])
+ {
+ return url($path, $parameters, true);
+ }
+}
+
+if (! function_exists('session')) {
+ /**
+ * Get / set the specified session value.
+ *
+ * If an array is passed as the key, we will assume you want to set an array of values.
+ *
+ * @param array|string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function session($key = null, $default = null)
+ {
+ if (is_null($key)) {
+ return app('session');
+ }
+
+ if (is_array($key)) {
+ return app('session')->put($key);
+ }
+
+ return app('session')->get($key, $default);
+ }
+}
+
+if (! function_exists('storage_path')) {
+ /**
+ * Get the path to the storage folder.
+ *
+ * @param string $path
+ * @return string
+ */
+ function storage_path($path = '')
+ {
+ return app('path.storage').($path ? DIRECTORY_SEPARATOR.$path : $path);
+ }
+}
+
+if (! function_exists('trans')) {
+ /**
+ * Translate the given message.
+ *
+ * @param string $id
+ * @param array $parameters
+ * @param string $domain
+ * @param string $locale
+ * @return string
+ */
+ function trans($id = null, $parameters = [], $domain = 'messages', $locale = null)
+ {
+ if (is_null($id)) {
+ return app('translator');
+ }
+
+ return app('translator')->trans($id, $parameters, $domain, $locale);
+ }
+}
+
+if (! function_exists('trans_choice')) {
+ /**
+ * Translates the given message based on a count.
+ *
+ * @param string $id
+ * @param int $number
+ * @param array $parameters
+ * @param string $domain
+ * @param string $locale
+ * @return string
+ */
+ function trans_choice($id, $number, array $parameters = [], $domain = 'messages', $locale = null)
+ {
+ return app('translator')->transChoice($id, $number, $parameters, $domain, $locale);
+ }
+}
+
+if (! function_exists('url')) {
+ /**
+ * Generate a url for the application.
+ *
+ * @param string $path
+ * @param mixed $parameters
+ * @param bool $secure
+ * @return string
+ */
+ function url($path = null, $parameters = [], $secure = null)
+ {
+ return app(UrlGenerator::class)->to($path, $parameters, $secure);
+ }
+}
+
+if (! function_exists('view')) {
+ /**
+ * Get the evaluated view contents for the given view.
+ *
+ * @param string $view
+ * @param array $data
+ * @param array $mergeData
+ * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
+ */
+ function view($view = null, $data = [], $mergeData = [])
+ {
+ $factory = app(ViewFactory::class);
+
+ if (func_num_args() === 0) {
+ return $factory;
+ }
+
+ return $factory->make($view, $data, $mergeData);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php b/application/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php
index 2d38757..39acc88 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php
@@ -1,78 +1,82 @@
-rounds;
+ /**
+ * Hash the given value.
+ *
+ * @param string $value
+ * @param array $options
+ * @return string
+ *
+ * @throws \RuntimeException
+ */
+ public function make($value, array $options = [])
+ {
+ $cost = isset($options['rounds']) ? $options['rounds'] : $this->rounds;
- $hash = password_hash($value, PASSWORD_BCRYPT, array('cost' => $cost));
+ $hash = password_hash($value, PASSWORD_BCRYPT, ['cost' => $cost]);
- if ($hash === false)
- {
- throw new RuntimeException("Bcrypt hashing not supported.");
- }
+ if ($hash === false) {
+ throw new RuntimeException('Bcrypt hashing not supported.');
+ }
- return $hash;
- }
+ return $hash;
+ }
- /**
- * Check the given plain value against a hash.
- *
- * @param string $value
- * @param string $hashedValue
- * @param array $options
- * @return bool
- */
- public function check($value, $hashedValue, array $options = array())
- {
- return password_verify($value, $hashedValue);
- }
+ /**
+ * Check the given plain value against a hash.
+ *
+ * @param string $value
+ * @param string $hashedValue
+ * @param array $options
+ * @return bool
+ */
+ public function check($value, $hashedValue, array $options = [])
+ {
+ if (strlen($hashedValue) === 0) {
+ return false;
+ }
- /**
- * Check if the given hash has been hashed using the given options.
- *
- * @param string $hashedValue
- * @param array $options
- * @return bool
- */
- public function needsRehash($hashedValue, array $options = array())
- {
- $cost = isset($options['rounds']) ? $options['rounds'] : $this->rounds;
+ return password_verify($value, $hashedValue);
+ }
- return password_needs_rehash($hashedValue, PASSWORD_BCRYPT, array('cost' => $cost));
- }
+ /**
+ * Check if the given hash has been hashed using the given options.
+ *
+ * @param string $hashedValue
+ * @param array $options
+ * @return bool
+ */
+ public function needsRehash($hashedValue, array $options = [])
+ {
+ $cost = isset($options['rounds']) ? $options['rounds'] : $this->rounds;
- /**
- * Set the default password work factor.
- *
- * @param int $rounds
- * @return $this
- */
- public function setRounds($rounds)
- {
- $this->rounds = (int) $rounds;
+ return password_needs_rehash($hashedValue, PASSWORD_BCRYPT, ['cost' => $cost]);
+ }
- return $this;
- }
+ /**
+ * Set the default password work factor.
+ *
+ * @param int $rounds
+ * @return $this
+ */
+ public function setRounds($rounds)
+ {
+ $this->rounds = (int) $rounds;
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php
index 289b0ad..85581f4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php
@@ -1,34 +1,37 @@
-app->singleton('hash', function() { return new BcryptHasher; });
- }
+class HashServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array('hash');
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('hash', function () {
+ return new BcryptHasher;
+ });
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['hash'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Hashing/composer.json b/application/vendor/laravel/framework/src/Illuminate/Hashing/composer.json
index 95b4101..d2ccf86 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Hashing/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Hashing/composer.json
@@ -14,10 +14,9 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "ircmaxell/password-compat": "~1.0"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*"
},
"autoload": {
"psr-4": {
@@ -26,7 +25,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/Exception/HttpResponseException.php b/application/vendor/laravel/framework/src/Illuminate/Http/Exception/HttpResponseException.php
index 379aa0c..0dcf48a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/Exception/HttpResponseException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/Exception/HttpResponseException.php
@@ -1,36 +1,37 @@
-response = $response;
- }
+class HttpResponseException extends RuntimeException
+{
+ /**
+ * The underlying response instance.
+ *
+ * @var \Symfony\Component\HttpFoundation\Response
+ */
+ protected $response;
- /**
- * Get the underlying response instance.
- *
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function getResponse()
- {
- return $this->response;
- }
+ /**
+ * Create a new HTTP response exception instance.
+ *
+ * @param \Symfony\Component\HttpFoundation\Response $response
+ * @return void
+ */
+ public function __construct(Response $response)
+ {
+ $this->response = $response;
+ }
+ /**
+ * Get the underlying response instance.
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function getResponse()
+ {
+ return $this->response;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/Exception/PostTooLargeException.php b/application/vendor/laravel/framework/src/Illuminate/Http/Exception/PostTooLargeException.php
index 94db3f1..f0b7a67 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/Exception/PostTooLargeException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/Exception/PostTooLargeException.php
@@ -1,5 +1,10 @@
-jsonOptions = $options;
+ /**
+ * The json encoding options.
+ *
+ * @var int
+ */
+ protected $jsonOptions;
- parent::__construct($data, $status, $headers);
- }
+ /**
+ * Constructor.
+ *
+ * @param mixed $data
+ * @param int $status
+ * @param array $headers
+ * @param int $options
+ */
+ public function __construct($data = null, $status = 200, $headers = [], $options = 0)
+ {
+ $this->jsonOptions = $options;
- /**
- * Get the json_decoded data from the response.
- *
- * @param bool $assoc
- * @param int $depth
- * @return mixed
- */
- public function getData($assoc = false, $depth = 512)
- {
- return json_decode($this->data, $assoc, $depth);
- }
+ parent::__construct($data, $status, $headers);
+ }
- /**
- * {@inheritdoc}
- */
- public function setData($data = array())
- {
- $this->data = $data instanceof Jsonable
- ? $data->toJson($this->jsonOptions)
- : json_encode($data, $this->jsonOptions);
+ /**
+ * Get the json_decoded data from the response.
+ *
+ * @param bool $assoc
+ * @param int $depth
+ * @return mixed
+ */
+ public function getData($assoc = false, $depth = 512)
+ {
+ return json_decode($this->data, $assoc, $depth);
+ }
- return $this->update();
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function setData($data = [])
+ {
+ $this->data = $data instanceof Jsonable
+ ? $data->toJson($this->jsonOptions)
+ : json_encode($data, $this->jsonOptions);
- /**
- * Get the JSON encoding options.
- *
- * @return int
- */
- public function getJsonOptions()
- {
- return $this->jsonOptions;
- }
+ return $this->update();
+ }
- /**
- * Set the JSON encoding options.
- *
- * @param int $options
- * @return mixed
- */
- public function setJsonOptions($options)
- {
- $this->jsonOptions = $options;
+ /**
+ * Get the JSON encoding options.
+ *
+ * @return int
+ */
+ public function getJsonOptions()
+ {
+ return $this->jsonOptions;
+ }
- return $this->setData($this->getData());
- }
+ /**
+ * Set the JSON encoding options.
+ *
+ * @param int $options
+ * @return mixed
+ */
+ public function setJsonOptions($options)
+ {
+ $this->jsonOptions = $options;
+ return $this->setData($this->getData());
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/Middleware/CheckResponseForModifications.php b/application/vendor/laravel/framework/src/Illuminate/Http/Middleware/CheckResponseForModifications.php
new file mode 100644
index 0000000..2a93e21
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/Middleware/CheckResponseForModifications.php
@@ -0,0 +1,27 @@
+isNotModified($request);
+ }
+
+ return $response;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php b/application/vendor/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php
index b62a598..b5d3f3c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php
@@ -1,24 +1,24 @@
-headers->set('X-Frame-Options', 'SAMEORIGIN', false);
+class FrameGuard
+{
+ /**
+ * Handle the given request and get the response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return \Illuminate\Http\Response
+ */
+ public function handle($request, Closure $next)
+ {
+ $response = $next($request);
- return $response;
- }
+ $response->headers->set('X-Frame-Options', 'SAMEORIGIN', false);
+ return $response;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php b/application/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php
index db2e752..419314a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php
@@ -1,204 +1,215 @@
- $value];
-
- foreach ($key as $k => $v)
- {
- $this->session->flash($k, $v);
- }
-
- return $this;
- }
-
- /**
- * Add multiple cookies to the response.
- *
- * @param array $cookies
- * @return $this
- */
- public function withCookies(array $cookies)
- {
- foreach ($cookies as $cookie)
- {
- $this->headers->setCookie($cookie);
- }
-
- return $this;
- }
-
- /**
- * Flash an array of input to the session.
- *
- * @param array $input
- * @return $this
- */
- public function withInput(array $input = null)
- {
- $input = $input ?: $this->request->input();
-
- $this->session->flashInput($data = array_filter($input, $callback = function (&$value) use (&$callback)
- {
- if (is_array($value))
- {
- $value = array_filter($value, $callback);
- }
-
- return ! $value instanceof UploadedFile;
- }));
-
- return $this;
- }
-
- /**
- * Flash an array of input to the session.
- *
- * @param mixed string
- * @return $this
- */
- public function onlyInput()
- {
- return $this->withInput($this->request->only(func_get_args()));
- }
-
- /**
- * Flash an array of input to the session.
- *
- * @param mixed string
- * @return \Illuminate\Http\RedirectResponse
- */
- public function exceptInput()
- {
- return $this->withInput($this->request->except(func_get_args()));
- }
-
- /**
- * Flash a container of errors to the session.
- *
- * @param \Illuminate\Contracts\Support\MessageProvider|array|string $provider
- * @param string $key
- * @return $this
- */
- public function withErrors($provider, $key = 'default')
- {
- $value = $this->parseErrors($provider);
-
- $this->session->flash(
- 'errors', $this->session->get('errors', new ViewErrorBag)->put($key, $value)
- );
-
- return $this;
- }
-
- /**
- * Parse the given errors into an appropriate value.
- *
- * @param \Illuminate\Contracts\Support\MessageProvider|array|string $provider
- * @return \Illuminate\Support\MessageBag
- */
- protected function parseErrors($provider)
- {
- if ($provider instanceof MessageProvider)
- {
- return $provider->getMessageBag();
- }
-
- return new MessageBag((array) $provider);
- }
-
- /**
- * Get the request instance.
- *
- * @return \Illuminate\Http\Request
- */
- public function getRequest()
- {
- return $this->request;
- }
-
- /**
- * Set the request instance.
- *
- * @param \Illuminate\Http\Request $request
- * @return void
- */
- public function setRequest(Request $request)
- {
- $this->request = $request;
- }
-
- /**
- * Get the session store implementation.
- *
- * @return \Illuminate\Session\Store
- */
- public function getSession()
- {
- return $this->session;
- }
-
- /**
- * Set the session store implementation.
- *
- * @param \Illuminate\Session\Store $session
- * @return void
- */
- public function setSession(SessionStore $session)
- {
- $this->session = $session;
- }
-
- /**
- * Dynamically bind flash data in the session.
- *
- * @param string $method
- * @param array $parameters
- * @return void
- *
- * @throws \BadMethodCallException
- */
- public function __call($method, $parameters)
- {
- if (starts_with($method, 'with'))
- {
- return $this->with(snake_case(substr($method, 4)), $parameters[0]);
- }
-
- throw new BadMethodCallException("Method [$method] does not exist on Redirect.");
- }
-
+class RedirectResponse extends BaseRedirectResponse
+{
+ use ResponseTrait;
+
+ /**
+ * The request instance.
+ *
+ * @var \Illuminate\Http\Request
+ */
+ protected $request;
+
+ /**
+ * The session store implementation.
+ *
+ * @var \Illuminate\Session\Store
+ */
+ protected $session;
+
+ /**
+ * Flash a piece of data to the session.
+ *
+ * @param string|array $key
+ * @param mixed $value
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function with($key, $value = null)
+ {
+ $key = is_array($key) ? $key : [$key => $value];
+
+ foreach ($key as $k => $v) {
+ $this->session->flash($k, $v);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add multiple cookies to the response.
+ *
+ * @param array $cookies
+ * @return $this
+ */
+ public function withCookies(array $cookies)
+ {
+ foreach ($cookies as $cookie) {
+ $this->headers->setCookie($cookie);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Flash an array of input to the session.
+ *
+ * @param array $input
+ * @return $this
+ */
+ public function withInput(array $input = null)
+ {
+ $input = $input ?: $this->request->input();
+
+ $this->session->flashInput($this->removeFilesFromInput($input));
+
+ return $this;
+ }
+
+ /**
+ * Remove all uploaded files form the given input array.
+ *
+ * @param array $input
+ * @return array
+ */
+ protected function removeFilesFromInput(array $input)
+ {
+ foreach ($input as $key => $value) {
+ if (is_array($value)) {
+ $input[$key] = $this->removeFilesFromInput($value);
+ }
+
+ if ($value instanceof SymfonyUploadedFile) {
+ unset($input[$key]);
+ }
+ }
+
+ return $input;
+ }
+
+ /**
+ * Flash an array of input to the session.
+ *
+ * @param mixed string
+ * @return $this
+ */
+ public function onlyInput()
+ {
+ return $this->withInput($this->request->only(func_get_args()));
+ }
+
+ /**
+ * Flash an array of input to the session.
+ *
+ * @param mixed string
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function exceptInput()
+ {
+ return $this->withInput($this->request->except(func_get_args()));
+ }
+
+ /**
+ * Flash a container of errors to the session.
+ *
+ * @param \Illuminate\Contracts\Support\MessageProvider|array|string $provider
+ * @param string $key
+ * @return $this
+ */
+ public function withErrors($provider, $key = 'default')
+ {
+ $value = $this->parseErrors($provider);
+
+ $this->session->flash(
+ 'errors', $this->session->get('errors', new ViewErrorBag)->put($key, $value)
+ );
+
+ return $this;
+ }
+
+ /**
+ * Parse the given errors into an appropriate value.
+ *
+ * @param \Illuminate\Contracts\Support\MessageProvider|array|string $provider
+ * @return \Illuminate\Support\MessageBag
+ */
+ protected function parseErrors($provider)
+ {
+ if ($provider instanceof MessageProvider) {
+ return $provider->getMessageBag();
+ }
+
+ return new MessageBag((array) $provider);
+ }
+
+ /**
+ * Get the request instance.
+ *
+ * @return \Illuminate\Http\Request|null
+ */
+ public function getRequest()
+ {
+ return $this->request;
+ }
+
+ /**
+ * Set the request instance.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return void
+ */
+ public function setRequest(Request $request)
+ {
+ $this->request = $request;
+ }
+
+ /**
+ * Get the session store implementation.
+ *
+ * @return \Illuminate\Session\Store|null
+ */
+ public function getSession()
+ {
+ return $this->session;
+ }
+
+ /**
+ * Set the session store implementation.
+ *
+ * @param \Illuminate\Session\Store $session
+ * @return void
+ */
+ public function setSession(SessionStore $session)
+ {
+ $this->session = $session;
+ }
+
+ /**
+ * Dynamically bind flash data in the session.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return $this
+ *
+ * @throws \BadMethodCallException
+ */
+ public function __call($method, $parameters)
+ {
+ if (Str::startsWith($method, 'with')) {
+ return $this->with(Str::snake(substr($method, 4)), $parameters[0]);
+ }
+
+ throw new BadMethodCallException("Method [$method] does not exist on Redirect.");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/Request.php b/application/vendor/laravel/framework/src/Illuminate/Http/Request.php
index e0211cf..eaa382b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/Request.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/Request.php
@@ -1,793 +1,912 @@
-getMethod();
- }
-
- /**
- * Get the root URL for the application.
- *
- * @return string
- */
- public function root()
- {
- return rtrim($this->getSchemeAndHttpHost().$this->getBaseUrl(), '/');
- }
-
- /**
- * Get the URL (no query string) for the request.
- *
- * @return string
- */
- public function url()
- {
- return rtrim(preg_replace('/\?.*/', '', $this->getUri()), '/');
- }
-
- /**
- * Get the full URL for the request.
- *
- * @return string
- */
- public function fullUrl()
- {
- $query = $this->getQueryString();
-
- return $query ? $this->url().'?'.$query : $this->url();
- }
-
- /**
- * Get the current path info for the request.
- *
- * @return string
- */
- public function path()
- {
- $pattern = trim($this->getPathInfo(), '/');
-
- 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).
- *
- * @param int $index
- * @param mixed $default
- * @return string
- */
- public function segment($index, $default = null)
- {
- return array_get($this->segments(), $index - 1, $default);
- }
-
- /**
- * Get all of the segments for the request path.
- *
- * @return array
- */
- public function segments()
- {
- $segments = explode('/', $this->path());
-
- return array_values(array_filter($segments, function($v) { return $v != ''; }));
- }
-
- /**
- * Determine if the current request URI matches a pattern.
- *
- * @param mixed string
- * @return bool
- */
- public function is()
- {
- foreach (func_get_args() as $pattern)
- {
- if (str_is($pattern, urldecode($this->path())))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Determine if the request is the result of an AJAX call.
- *
- * @return bool
- */
- public function ajax()
- {
- return $this->isXmlHttpRequest();
- }
-
- /**
- * Determine if the request is the result of an PJAX call.
- *
- * @return bool
- */
- public function pjax()
- {
- return $this->headers->get('X-PJAX') == true;
- }
-
- /**
- * Determine if the request is over HTTPS.
- *
- * @return bool
- */
- public function secure()
- {
- return $this->isSecure();
- }
-
- /**
- * Returns the client IP address.
- *
- * @return string
- */
- public function ip()
- {
- return $this->getClientIp();
- }
-
- /**
- * Returns the client IP addresses.
- *
- * @return array
- */
- public function ips()
- {
- return $this->getClientIps();
- }
-
- /**
- * Determine if the request contains a given input item key.
- *
- * @param string|array $key
- * @return bool
- */
- public function exists($key)
- {
- $keys = is_array($key) ? $key : func_get_args();
-
- $input = $this->all();
-
- foreach ($keys as $value)
- {
- if ( ! array_key_exists($value, $input)) return false;
- }
-
- return true;
- }
-
- /**
- * Determine if the request contains a non-empty value for an input item.
- *
- * @param string|array $key
- * @return bool
- */
- public function has($key)
- {
- $keys = is_array($key) ? $key : func_get_args();
-
- foreach ($keys as $value)
- {
- if ($this->isEmptyString($value)) return false;
- }
-
- return true;
- }
-
- /**
- * Determine if the given input key is an empty string for "has".
- *
- * @param string $key
- * @return bool
- */
- protected function isEmptyString($key)
- {
- $boolOrArray = is_bool($this->input($key)) || is_array($this->input($key));
-
- return ! $boolOrArray && trim((string) $this->input($key)) === '';
- }
-
- /**
- * Get all of the input and files for the request.
- *
- * @return array
- */
- public function all()
- {
- return array_replace_recursive($this->input(), $this->files->all());
- }
-
- /**
- * Retrieve an input item from the request.
- *
- * @param string $key
- * @param mixed $default
- * @return string|array
- */
- public function input($key = null, $default = null)
- {
- $input = $this->getInputSource()->all() + $this->query->all();
-
- return array_get($input, $key, $default);
- }
-
- /**
- * Get a subset of the items from the input data.
- *
- * @param array $keys
- * @return array
- */
- public function only($keys)
- {
- $keys = is_array($keys) ? $keys : func_get_args();
-
- $results = [];
-
- $input = $this->all();
-
- foreach ($keys as $key)
- {
- array_set($results, $key, array_get($input, $key));
- }
-
- return $results;
- }
-
- /**
- * Get all of the input except for a specified array of items.
- *
- * @param array $keys
- * @return array
- */
- public function except($keys)
- {
- $keys = is_array($keys) ? $keys : func_get_args();
-
- $results = $this->all();
-
- array_forget($results, $keys);
-
- return $results;
- }
-
- /**
- * Retrieve a query string item from the request.
- *
- * @param string $key
- * @param mixed $default
- * @return string|array
- */
- public function query($key = null, $default = null)
- {
- return $this->retrieveItem('query', $key, $default);
- }
-
- /**
- * Determine if a cookie is set on the request.
- *
- * @param string $key
- * @return bool
- */
- public function hasCookie($key)
- {
- return ! is_null($this->cookie($key));
- }
-
- /**
- * Retrieve a cookie from the request.
- *
- * @param string $key
- * @param mixed $default
- * @return string|array
- */
- public function cookie($key = null, $default = null)
- {
- return $this->retrieveItem('cookies', $key, $default);
- }
-
- /**
- * Retrieve a file from the request.
- *
- * @param string $key
- * @param mixed $default
- * @return \Symfony\Component\HttpFoundation\File\UploadedFile|array
- */
- public function file($key = null, $default = null)
- {
- return array_get($this->files->all(), $key, $default);
- }
-
- /**
- * Determine if the uploaded data contains a file.
- *
- * @param string $key
- * @return bool
- */
- public function hasFile($key)
- {
- if ( ! is_array($files = $this->file($key))) $files = array($files);
-
- foreach ($files as $file)
- {
- if ($this->isValidFile($file)) return true;
- }
-
- return false;
- }
-
- /**
- * Check that the given file is a valid file instance.
- *
- * @param mixed $file
- * @return bool
- */
- protected function isValidFile($file)
- {
- return $file instanceof SplFileInfo && $file->getPath() != '';
- }
-
- /**
- * Retrieve a header from the request.
- *
- * @param string $key
- * @param mixed $default
- * @return string|array
- */
- public function header($key = null, $default = null)
- {
- return $this->retrieveItem('headers', $key, $default);
- }
-
- /**
- * Retrieve a server variable from the request.
- *
- * @param string $key
- * @param mixed $default
- * @return string|array
- */
- public function server($key = null, $default = null)
- {
- return $this->retrieveItem('server', $key, $default);
- }
-
- /**
- * Retrieve an old input item.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function old($key = null, $default = null)
- {
- return $this->session()->getOldInput($key, $default);
- }
-
- /**
- * Flash the input for the current request to the session.
- *
- * @param string $filter
- * @param array $keys
- * @return void
- */
- public function flash($filter = null, $keys = array())
- {
- $flash = ( ! is_null($filter)) ? $this->$filter($keys) : $this->input();
-
- $this->session()->flashInput($flash);
- }
-
- /**
- * Flash only some of the input to the session.
- *
- * @param mixed string
- * @return void
- */
- public function flashOnly($keys)
- {
- $keys = is_array($keys) ? $keys : func_get_args();
-
- return $this->flash('only', $keys);
- }
-
- /**
- * Flash only some of the input to the session.
- *
- * @param mixed string
- * @return void
- */
- public function flashExcept($keys)
- {
- $keys = is_array($keys) ? $keys : func_get_args();
-
- return $this->flash('except', $keys);
- }
-
- /**
- * Flush all of the old input from the session.
- *
- * @return void
- */
- public function flush()
- {
- $this->session()->flashInput(array());
- }
-
- /**
- * Retrieve a parameter item from a given source.
- *
- * @param string $source
- * @param string $key
- * @param mixed $default
- * @return string|array
- */
- protected function retrieveItem($source, $key, $default)
- {
- if (is_null($key))
- {
- return $this->$source->all();
- }
-
- return $this->$source->get($key, $default, true);
- }
-
- /**
- * Merge new input into the current request's input array.
- *
- * @param array $input
- * @return void
- */
- public function merge(array $input)
- {
- $this->getInputSource()->add($input);
- }
-
- /**
- * Replace the input for the current request.
- *
- * @param array $input
- * @return void
- */
- public function replace(array $input)
- {
- $this->getInputSource()->replace($input);
- }
-
- /**
- * Get the JSON payload for the request.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function json($key = null, $default = null)
- {
- if ( ! isset($this->json))
- {
- $this->json = new ParameterBag((array) json_decode($this->getContent(), true));
- }
-
- if (is_null($key)) return $this->json;
-
- return array_get($this->json->all(), $key, $default);
- }
-
- /**
- * Get the input source for the request.
- *
- * @return \Symfony\Component\HttpFoundation\ParameterBag
- */
- protected function getInputSource()
- {
- if ($this->isJson()) return $this->json();
-
- return $this->getMethod() == 'GET' ? $this->query : $this->request;
- }
-
- /**
- * Determine if the request is sending JSON.
- *
- * @return bool
- */
- public function isJson()
- {
- return str_contains($this->header('CONTENT_TYPE'), '/json');
- }
-
- /**
- * Determine if the current request is asking for JSON in return.
- *
- * @return bool
- */
- public function wantsJson()
- {
- $acceptable = $this->getAcceptableContentTypes();
-
- return isset($acceptable[0]) && $acceptable[0] == 'application/json';
- }
-
- /**
- * Get the data format expected in the response.
- *
- * @param string $default
- * @return string
- */
- public function format($default = 'html')
- {
- foreach ($this->getAcceptableContentTypes() as $type)
- {
- if ($format = $this->getFormat($type)) return $format;
- }
-
- return $default;
- }
-
- /**
- * Create an Illuminate request from a Symfony instance.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @return \Illuminate\Http\Request
- */
- public static function createFromBase(SymfonyRequest $request)
- {
- if ($request instanceof static) return $request;
-
- $content = $request->content;
-
- $request = (new static)->duplicate(
-
- $request->query->all(), $request->request->all(), $request->attributes->all(),
-
- $request->cookies->all(), $request->files->all(), $request->server->all()
- );
-
- $request->content = $content;
-
- $request->request = $request->getInputSource();
-
- return $request;
- }
-
- /**
- * {@inheritdoc}
- */
- public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
- {
- return parent::duplicate($query, $request, $attributes, $cookies, array_filter((array) $files), $server);
- }
-
- /**
- * Get the session associated with the request.
- *
- * @return \Illuminate\Session\Store
- *
- * @throws \RuntimeException
- */
- public function session()
- {
- if ( ! $this->hasSession())
- {
- throw new RuntimeException("Session store not set on request.");
- }
-
- return $this->getSession();
- }
-
- /**
- * Get the user making the request.
- *
- * @return mixed
- */
- public function user()
- {
- return call_user_func($this->getUserResolver());
- }
-
- /**
- * Get the route handling the request.
- *
- * @return \Illuminate\Routing\Route|null
- */
- public function route()
- {
- if (func_num_args() == 1)
- {
- return $this->route()->parameter(func_get_arg(0));
- }
- else
- {
- return call_user_func($this->getRouteResolver());
- }
- }
-
- /**
- * Get the user resolver callback.
- *
- * @return \Closure
- */
- public function getUserResolver()
- {
- return $this->userResolver ?: function() {};
- }
-
- /**
- * Set the user resolver callback.
- *
- * @param \Closure $callback
- * @return $this
- */
- public function setUserResolver(Closure $callback)
- {
- $this->userResolver = $callback;
-
- return $this;
- }
-
- /**
- * Get the route resolver callback.
- *
- * @return \Closure
- */
- public function getRouteResolver()
- {
- return $this->routeResolver ?: function() {};
- }
-
- /**
- * Set the route resolver callback.
- *
- * @param \Closure $callback
- * @return $this
- */
- public function setRouteResolver(Closure $callback)
- {
- $this->routeResolver = $callback;
-
- return $this;
- }
-
- /**
- * Determine if the given offset exists.
- *
- * @param string $offset
- * @return bool
- */
- public function offsetExists($offset)
- {
- return array_key_exists($offset, $this->all());
- }
-
- /**
- * Get the value at the given offset.
- *
- * @param string $offset
- * @return mixed
- */
- public function offsetGet($offset)
- {
- return $this->input($offset);
- }
-
- /**
- * Set the value at the given offset.
- *
- * @param string $offset
- * @param mixed $value
- * @return void
- */
- public function offsetSet($offset, $value)
- {
- return $this->getInputSource()->set($offset, $value);
- }
-
- /**
- * Remove the value at the given offset.
- *
- * @param string $offset
- * @return void
- */
- public function offsetUnset($offset)
- {
- return $this->getInputSource()->remove($offset);
- }
-
- /**
- * Get an input element from the request.
- *
- * @param string $key
- * @return mixed
- */
- public function __get($key)
- {
- $input = $this->input();
-
- if (array_key_exists($key, $input))
- {
- return $this->input($key);
- }
- elseif ( ! is_null($this->route()))
- {
- return $this->route()->parameter($key);
- }
- }
-
+class Request extends SymfonyRequest implements ArrayAccess
+{
+ /**
+ * The decoded JSON content for the request.
+ *
+ * @var string
+ */
+ protected $json;
+
+ /**
+ * The user resolver callback.
+ *
+ * @var \Closure
+ */
+ protected $userResolver;
+
+ /**
+ * The route resolver callback.
+ *
+ * @var \Closure
+ */
+ protected $routeResolver;
+
+ /**
+ * Create a new Illuminate HTTP request from server variables.
+ *
+ * @return static
+ */
+ public static function capture()
+ {
+ static::enableHttpMethodParameterOverride();
+
+ return static::createFromBase(SymfonyRequest::createFromGlobals());
+ }
+
+ /**
+ * Return the Request instance.
+ *
+ * @return $this
+ */
+ public function instance()
+ {
+ return $this;
+ }
+
+ /**
+ * Get the request method.
+ *
+ * @return string
+ */
+ public function method()
+ {
+ return $this->getMethod();
+ }
+
+ /**
+ * Get the root URL for the application.
+ *
+ * @return string
+ */
+ public function root()
+ {
+ return rtrim($this->getSchemeAndHttpHost().$this->getBaseUrl(), '/');
+ }
+
+ /**
+ * Get the URL (no query string) for the request.
+ *
+ * @return string
+ */
+ public function url()
+ {
+ return rtrim(preg_replace('/\?.*/', '', $this->getUri()), '/');
+ }
+
+ /**
+ * Get the full URL for the request.
+ *
+ * @return string
+ */
+ public function fullUrl()
+ {
+ $query = $this->getQueryString();
+
+ return $query ? $this->url().'?'.$query : $this->url();
+ }
+
+ /**
+ * Get the current path info for the request.
+ *
+ * @return string
+ */
+ public function path()
+ {
+ $pattern = trim($this->getPathInfo(), '/');
+
+ 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).
+ *
+ * @param int $index
+ * @param string|null $default
+ * @return string|null
+ */
+ public function segment($index, $default = null)
+ {
+ return Arr::get($this->segments(), $index - 1, $default);
+ }
+
+ /**
+ * Get all of the segments for the request path.
+ *
+ * @return array
+ */
+ public function segments()
+ {
+ $segments = explode('/', $this->path());
+
+ return array_values(array_filter($segments, function ($v) {
+ return $v != '';
+ }));
+ }
+
+ /**
+ * Determine if the current request URI matches a pattern.
+ *
+ * @param mixed string
+ * @return bool
+ */
+ public function is()
+ {
+ foreach (func_get_args() as $pattern) {
+ if (Str::is($pattern, urldecode($this->path()))) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Determine if the request is the result of an AJAX call.
+ *
+ * @return bool
+ */
+ public function ajax()
+ {
+ return $this->isXmlHttpRequest();
+ }
+
+ /**
+ * Determine if the request is the result of an PJAX call.
+ *
+ * @return bool
+ */
+ public function pjax()
+ {
+ return $this->headers->get('X-PJAX') == true;
+ }
+
+ /**
+ * Determine if the request is over HTTPS.
+ *
+ * @return bool
+ */
+ public function secure()
+ {
+ return $this->isSecure();
+ }
+
+ /**
+ * Returns the client IP address.
+ *
+ * @return string
+ */
+ public function ip()
+ {
+ return $this->getClientIp();
+ }
+
+ /**
+ * Returns the client IP addresses.
+ *
+ * @return array
+ */
+ public function ips()
+ {
+ return $this->getClientIps();
+ }
+
+ /**
+ * Determine if the request contains a given input item key.
+ *
+ * @param string|array $key
+ * @return bool
+ */
+ public function exists($key)
+ {
+ $keys = is_array($key) ? $key : func_get_args();
+
+ $input = $this->all();
+
+ foreach ($keys as $value) {
+ if (! array_key_exists($value, $input)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Determine if the request contains a non-empty value for an input item.
+ *
+ * @param string|array $key
+ * @return bool
+ */
+ public function has($key)
+ {
+ $keys = is_array($key) ? $key : func_get_args();
+
+ foreach ($keys as $value) {
+ if ($this->isEmptyString($value)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Determine if the given input key is an empty string for "has".
+ *
+ * @param string $key
+ * @return bool
+ */
+ protected function isEmptyString($key)
+ {
+ $value = $this->input($key);
+
+ $boolOrArray = is_bool($value) || is_array($value);
+
+ return ! $boolOrArray && trim((string) $value) === '';
+ }
+
+ /**
+ * Get all of the input and files for the request.
+ *
+ * @return array
+ */
+ public function all()
+ {
+ return array_replace_recursive($this->input(), $this->files->all());
+ }
+
+ /**
+ * Retrieve an input item from the request.
+ *
+ * @param string $key
+ * @param string|array|null $default
+ * @return string|array
+ */
+ public function input($key = null, $default = null)
+ {
+ $input = $this->getInputSource()->all() + $this->query->all();
+
+ return Arr::get($input, $key, $default);
+ }
+
+ /**
+ * Get a subset of the items from the input data.
+ *
+ * @param array $keys
+ * @return array
+ */
+ public function only($keys)
+ {
+ $keys = is_array($keys) ? $keys : func_get_args();
+
+ $results = [];
+
+ $input = $this->all();
+
+ foreach ($keys as $key) {
+ Arr::set($results, $key, Arr::get($input, $key));
+ }
+
+ return $results;
+ }
+
+ /**
+ * Get all of the input except for a specified array of items.
+ *
+ * @param array|mixed $keys
+ * @return array
+ */
+ public function except($keys)
+ {
+ $keys = is_array($keys) ? $keys : func_get_args();
+
+ $results = $this->all();
+
+ Arr::forget($results, $keys);
+
+ return $results;
+ }
+
+ /**
+ * Retrieve a query string item from the request.
+ *
+ * @param string $key
+ * @param string|array|null $default
+ * @return string|array
+ */
+ public function query($key = null, $default = null)
+ {
+ return $this->retrieveItem('query', $key, $default);
+ }
+
+ /**
+ * Determine if a cookie is set on the request.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasCookie($key)
+ {
+ return ! is_null($this->cookie($key));
+ }
+
+ /**
+ * Retrieve a cookie from the request.
+ *
+ * @param string $key
+ * @param string|array|null $default
+ * @return string|array
+ */
+ public function cookie($key = null, $default = null)
+ {
+ return $this->retrieveItem('cookies', $key, $default);
+ }
+
+ /**
+ * Retrieve a file from the request.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return \Symfony\Component\HttpFoundation\File\UploadedFile|array|null
+ */
+ public function file($key = null, $default = null)
+ {
+ return Arr::get($this->files->all(), $key, $default);
+ }
+
+ /**
+ * Determine if the uploaded data contains a file.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasFile($key)
+ {
+ if (! is_array($files = $this->file($key))) {
+ $files = [$files];
+ }
+
+ foreach ($files as $file) {
+ if ($this->isValidFile($file)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Check that the given file is a valid file instance.
+ *
+ * @param mixed $file
+ * @return bool
+ */
+ protected function isValidFile($file)
+ {
+ return $file instanceof SplFileInfo && $file->getPath() != '';
+ }
+
+ /**
+ * Retrieve a header from the request.
+ *
+ * @param string $key
+ * @param string|array|null $default
+ * @return string|array
+ */
+ public function header($key = null, $default = null)
+ {
+ return $this->retrieveItem('headers', $key, $default);
+ }
+
+ /**
+ * Retrieve a server variable from the request.
+ *
+ * @param string $key
+ * @param string|array|null $default
+ * @return string|array
+ */
+ public function server($key = null, $default = null)
+ {
+ return $this->retrieveItem('server', $key, $default);
+ }
+
+ /**
+ * Retrieve an old input item.
+ *
+ * @param string $key
+ * @param string|array|null $default
+ * @return string|array
+ */
+ public function old($key = null, $default = null)
+ {
+ return $this->session()->getOldInput($key, $default);
+ }
+
+ /**
+ * Flash the input for the current request to the session.
+ *
+ * @param string $filter
+ * @param array $keys
+ * @return void
+ */
+ public function flash($filter = null, $keys = [])
+ {
+ $flash = (! is_null($filter)) ? $this->$filter($keys) : $this->input();
+
+ $this->session()->flashInput($flash);
+ }
+
+ /**
+ * Flash only some of the input to the session.
+ *
+ * @param array|mixed $keys
+ * @return void
+ */
+ public function flashOnly($keys)
+ {
+ $keys = is_array($keys) ? $keys : func_get_args();
+
+ return $this->flash('only', $keys);
+ }
+
+ /**
+ * Flash only some of the input to the session.
+ *
+ * @param array|mixed $keys
+ * @return void
+ */
+ public function flashExcept($keys)
+ {
+ $keys = is_array($keys) ? $keys : func_get_args();
+
+ return $this->flash('except', $keys);
+ }
+
+ /**
+ * Flush all of the old input from the session.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->session()->flashInput([]);
+ }
+
+ /**
+ * Retrieve a parameter item from a given source.
+ *
+ * @param string $source
+ * @param string $key
+ * @param string|array|null $default
+ * @return string|array
+ */
+ protected function retrieveItem($source, $key, $default)
+ {
+ if (is_null($key)) {
+ return $this->$source->all();
+ }
+
+ return $this->$source->get($key, $default, true);
+ }
+
+ /**
+ * Merge new input into the current request's input array.
+ *
+ * @param array $input
+ * @return void
+ */
+ public function merge(array $input)
+ {
+ $this->getInputSource()->add($input);
+ }
+
+ /**
+ * Replace the input for the current request.
+ *
+ * @param array $input
+ * @return void
+ */
+ public function replace(array $input)
+ {
+ $this->getInputSource()->replace($input);
+ }
+
+ /**
+ * Get the JSON payload for the request.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function json($key = null, $default = null)
+ {
+ if (! isset($this->json)) {
+ $this->json = new ParameterBag((array) json_decode($this->getContent(), true));
+ }
+
+ if (is_null($key)) {
+ return $this->json;
+ }
+
+ return Arr::get($this->json->all(), $key, $default);
+ }
+
+ /**
+ * Get the input source for the request.
+ *
+ * @return \Symfony\Component\HttpFoundation\ParameterBag
+ */
+ protected function getInputSource()
+ {
+ if ($this->isJson()) {
+ return $this->json();
+ }
+
+ return $this->getRealMethod() == 'GET' ? $this->query : $this->request;
+ }
+
+ /**
+ * Determine if the given content types match.
+ *
+ * @param string $actual
+ * @param string $type
+ * @return bool
+ */
+ public static function matchesType($actual, $type)
+ {
+ if ($actual === $type) {
+ return true;
+ }
+
+ $split = explode('/', $actual);
+
+ return isset($split[1]) && preg_match('#'.preg_quote($split[0], '#').'/.+\+'.preg_quote($split[1], '#').'#', $type);
+ }
+
+ /**
+ * Determine if the request is sending JSON.
+ *
+ * @return bool
+ */
+ public function isJson()
+ {
+ return Str::contains($this->header('CONTENT_TYPE'), ['/json', '+json']);
+ }
+
+ /**
+ * Determine if the current request is asking for JSON in return.
+ *
+ * @return bool
+ */
+ public function wantsJson()
+ {
+ $acceptable = $this->getAcceptableContentTypes();
+
+ return isset($acceptable[0]) && Str::contains($acceptable[0], ['/json', '+json']);
+ }
+
+ /**
+ * Determines whether the current requests accepts a given content type.
+ *
+ * @param string|array $contentTypes
+ * @return bool
+ */
+ public function accepts($contentTypes)
+ {
+ $accepts = $this->getAcceptableContentTypes();
+
+ if (count($accepts) === 0) {
+ return true;
+ }
+
+ $types = (array) $contentTypes;
+
+ foreach ($accepts as $accept) {
+ if ($accept === '*/*' || $accept === '*') {
+ return true;
+ }
+
+ foreach ($types as $type) {
+ if ($this->matchesType($accept, $type) || $accept === strtok($type, '/').'/*') {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Return the most suitable content type from the given array based on content negotiation.
+ *
+ * @param string|array $contentTypes
+ * @return string|null
+ */
+ public function prefers($contentTypes)
+ {
+ $accepts = $this->getAcceptableContentTypes();
+
+ $contentTypes = (array) $contentTypes;
+
+ foreach ($accepts as $accept) {
+ if (in_array($accept, ['*/*', '*'])) {
+ return $contentTypes[0];
+ }
+
+ foreach ($contentTypes as $contentType) {
+ $type = $contentType;
+
+ if (! is_null($mimeType = $this->getMimeType($contentType))) {
+ $type = $mimeType;
+ }
+
+ if ($this->matchesType($type, $accept) || $accept === strtok($type, '/').'/*') {
+ return $contentType;
+ }
+ }
+ }
+ }
+
+ /**
+ * Determines whether a request accepts JSON.
+ *
+ * @return bool
+ */
+ public function acceptsJson()
+ {
+ return $this->accepts('application/json');
+ }
+
+ /**
+ * Determines whether a request accepts HTML.
+ *
+ * @return bool
+ */
+ public function acceptsHtml()
+ {
+ return $this->accepts('text/html');
+ }
+
+ /**
+ * Get the data format expected in the response.
+ *
+ * @param string $default
+ * @return string
+ */
+ public function format($default = 'html')
+ {
+ foreach ($this->getAcceptableContentTypes() as $type) {
+ if ($format = $this->getFormat($type)) {
+ return $format;
+ }
+ }
+
+ return $default;
+ }
+
+ /**
+ * Create an Illuminate request from a Symfony instance.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @return \Illuminate\Http\Request
+ */
+ public static function createFromBase(SymfonyRequest $request)
+ {
+ if ($request instanceof static) {
+ return $request;
+ }
+
+ $content = $request->content;
+
+ $request = (new static)->duplicate(
+
+ $request->query->all(), $request->request->all(), $request->attributes->all(),
+
+ $request->cookies->all(), $request->files->all(), $request->server->all()
+ );
+
+ $request->content = $content;
+
+ $request->request = $request->getInputSource();
+
+ return $request;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
+ {
+ return parent::duplicate($query, $request, $attributes, $cookies, array_filter((array) $files), $server);
+ }
+
+ /**
+ * Get the session associated with the request.
+ *
+ * @return \Illuminate\Session\Store
+ *
+ * @throws \RuntimeException
+ */
+ public function session()
+ {
+ if (! $this->hasSession()) {
+ throw new RuntimeException('Session store not set on request.');
+ }
+
+ return $this->getSession();
+ }
+
+ /**
+ * Get the user making the request.
+ *
+ * @return mixed
+ */
+ public function user()
+ {
+ return call_user_func($this->getUserResolver());
+ }
+
+ /**
+ * Get the route handling the request.
+ *
+ * @param string|null $param
+ *
+ * @return \Illuminate\Routing\Route|object|string
+ */
+ public function route($param = null)
+ {
+ $route = call_user_func($this->getRouteResolver());
+
+ if (is_null($route) || is_null($param)) {
+ return $route;
+ } else {
+ return $route->parameter($param);
+ }
+ }
+
+ /**
+ * Get the user resolver callback.
+ *
+ * @return \Closure
+ */
+ public function getUserResolver()
+ {
+ return $this->userResolver ?: function () {
+ //
+ };
+ }
+
+ /**
+ * Set the user resolver callback.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function setUserResolver(Closure $callback)
+ {
+ $this->userResolver = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Get the route resolver callback.
+ *
+ * @return \Closure
+ */
+ public function getRouteResolver()
+ {
+ return $this->routeResolver ?: function () {
+ //
+ };
+ }
+
+ /**
+ * Set the route resolver callback.
+ *
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function setRouteResolver(Closure $callback)
+ {
+ $this->routeResolver = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Determine if the given offset exists.
+ *
+ * @param string $offset
+ * @return bool
+ */
+ public function offsetExists($offset)
+ {
+ return array_key_exists($offset, $this->all());
+ }
+
+ /**
+ * Get the value at the given offset.
+ *
+ * @param string $offset
+ * @return mixed
+ */
+ public function offsetGet($offset)
+ {
+ return Arr::get($this->all(), $offset);
+ }
+
+ /**
+ * Set the value at the given offset.
+ *
+ * @param string $offset
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($offset, $value)
+ {
+ return $this->getInputSource()->set($offset, $value);
+ }
+
+ /**
+ * Remove the value at the given offset.
+ *
+ * @param string $offset
+ * @return void
+ */
+ public function offsetUnset($offset)
+ {
+ return $this->getInputSource()->remove($offset);
+ }
+
+ /**
+ * Check if an input element is set on the request.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function __isset($key)
+ {
+ return ! is_null($this->__get($key));
+ }
+
+ /**
+ * Get an input element from the request.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function __get($key)
+ {
+ $all = $this->all();
+
+ if (array_key_exists($key, $all)) {
+ return $all[$key];
+ } else {
+ return $this->route($key);
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/Response.php b/application/vendor/laravel/framework/src/Illuminate/Http/Response.php
index 5e61fe0..3c9299d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/Response.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/Response.php
@@ -1,86 +1,94 @@
-original = $content;
+ /**
+ * The exception that triggered the error response (if applicable).
+ *
+ * @var \Exception
+ */
+ public $exception;
- // If the content is "JSONable" we will set the appropriate header and convert
- // the content to JSON. This is useful when returning something like models
- // from routes that will be automatically transformed to their JSON form.
- if ($this->shouldBeJson($content))
- {
- $this->header('Content-Type', 'application/json');
+ /**
+ * Set the content on the response.
+ *
+ * @param mixed $content
+ * @return $this
+ */
+ public function setContent($content)
+ {
+ $this->original = $content;
- $content = $this->morphToJson($content);
- }
+ // If the content is "JSONable" we will set the appropriate header and convert
+ // the content to JSON. This is useful when returning something like models
+ // from routes that will be automatically transformed to their JSON form.
+ if ($this->shouldBeJson($content)) {
+ $this->header('Content-Type', 'application/json');
- // If this content implements the "Renderable" interface then we will call the
- // render method on the object so we will avoid any "__toString" exceptions
- // that might be thrown and have their errors obscured by PHP's handling.
- elseif ($content instanceof Renderable)
- {
- $content = $content->render();
- }
+ $content = $this->morphToJson($content);
+ }
- return parent::setContent($content);
- }
+ // If this content implements the "Renderable" interface then we will call the
+ // render method on the object so we will avoid any "__toString" exceptions
+ // that might be thrown and have their errors obscured by PHP's handling.
+ elseif ($content instanceof Renderable) {
+ $content = $content->render();
+ }
- /**
- * Morph the given content into JSON.
- *
- * @param mixed $content
- * @return string
- */
- protected function morphToJson($content)
- {
- if ($content instanceof Jsonable) return $content->toJson();
+ return parent::setContent($content);
+ }
- return json_encode($content);
- }
+ /**
+ * Morph the given content into JSON.
+ *
+ * @param mixed $content
+ * @return string
+ */
+ protected function morphToJson($content)
+ {
+ if ($content instanceof Jsonable) {
+ return $content->toJson();
+ }
- /**
- * Determine if the given content should be turned into JSON.
- *
- * @param mixed $content
- * @return bool
- */
- protected function shouldBeJson($content)
- {
- return $content instanceof Jsonable ||
- $content instanceof ArrayObject ||
- is_array($content);
- }
+ return json_encode($content);
+ }
- /**
- * Get the original response content.
- *
- * @return mixed
- */
- public function getOriginalContent()
- {
- return $this->original;
- }
+ /**
+ * Determine if the given content should be turned into JSON.
+ *
+ * @param mixed $content
+ * @return bool
+ */
+ protected function shouldBeJson($content)
+ {
+ return $content instanceof Jsonable ||
+ $content instanceof ArrayObject ||
+ is_array($content);
+ }
+ /**
+ * Get the original response content.
+ *
+ * @return mixed
+ */
+ public function getOriginalContent()
+ {
+ return $this->original;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php b/application/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php
index 2cfd9be..56ddc6a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php
@@ -1,35 +1,58 @@
-headers->set($key, $value, $replace);
-
- return $this;
- }
-
- /**
- * Add a cookie to the response.
- *
- * @param \Symfony\Component\HttpFoundation\Cookie $cookie
- * @return $this
- */
- public function withCookie(Cookie $cookie)
- {
- $this->headers->setCookie($cookie);
-
- return $this;
- }
+getStatusCode();
+ }
+
+ /**
+ * Get the content of the response.
+ *
+ * @return string
+ */
+ public function content()
+ {
+ return $this->getContent();
+ }
+
+ /**
+ * Set a header on the Response.
+ *
+ * @param string $key
+ * @param string $value
+ * @param bool $replace
+ * @return $this
+ */
+ public function header($key, $value, $replace = true)
+ {
+ $this->headers->set($key, $value, $replace);
+
+ return $this;
+ }
+
+ /**
+ * Add a cookie to the response.
+ *
+ * @param \Symfony\Component\HttpFoundation\Cookie|mixed $cookie
+ * @return $this
+ */
+ public function withCookie($cookie)
+ {
+ if (is_string($cookie) && function_exists('cookie')) {
+ $cookie = call_user_func_array('cookie', func_get_args());
+ }
+
+ $this->headers->setCookie($cookie);
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Http/composer.json b/application/vendor/laravel/framework/src/Illuminate/Http/composer.json
index 10a885b..a7bb6d3 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Http/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Http/composer.json
@@ -14,11 +14,11 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/session": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/http-foundation": "2.6.*",
- "symfony/http-kernel": "2.6.*"
+ "php": ">=5.5.9",
+ "illuminate/session": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/http-foundation": "2.7.*",
+ "symfony/http-kernel": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Log/Writer.php b/application/vendor/laravel/framework/src/Illuminate/Log/Writer.php
index 1932e3a..ae386d1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Log/Writer.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Log/Writer.php
@@ -1,13 +1,15 @@
- MonologLogger::DEBUG,
- 'info' => MonologLogger::INFO,
- 'notice' => MonologLogger::NOTICE,
- 'warning' => MonologLogger::WARNING,
- 'error' => MonologLogger::ERROR,
- 'critical' => MonologLogger::CRITICAL,
- 'alert' => MonologLogger::ALERT,
- 'emergency' => MonologLogger::EMERGENCY,
- ];
-
- /**
- * Create a new log writer instance.
- *
- * @param \Monolog\Logger $monolog
- * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
- * @return void
- */
- public function __construct(MonologLogger $monolog, Dispatcher $dispatcher = null)
- {
- $this->monolog = $monolog;
-
- if (isset($dispatcher))
- {
- $this->dispatcher = $dispatcher;
- }
- }
-
- /**
- * Log an emergency message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function emergency($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log an alert message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function alert($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log a critical message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function critical($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log an error message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function error($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log a warning message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function warning($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log a notice to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function notice($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log an informational message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function info($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log a debug message to the logs.
- *
- * @param string $message
- * @param array $context
- * @return void
- */
- public function debug($message, array $context = array())
- {
- return $this->writeLog(__FUNCTION__, $message, $context);
- }
-
- /**
- * Log a message to the logs.
- *
- * @param string $level
- * @param string $message
- * @param array $context
- * @return void
- */
- public function log($level, $message, array $context = array())
- {
- return $this->writeLog($level, $message, $context);
- }
-
- /**
- * Dynamically pass log calls into the writer.
- *
- * @param string $level
- * @param string $message
- * @param array $context
- * @return void
- */
- public function write($level, $message, array $context = array())
- {
- return $this->writeLog($level, $message, $context);
- }
-
- /**
- * Write a message to Monolog.
- *
- * @param string $level
- * @param string $message
- * @param array $context
- * @return void
- */
- protected function writeLog($level, $message, $context)
- {
- $this->fireLogEvent($level, $message = $this->formatMessage($message), $context);
-
- $this->monolog->{$level}($message, $context);
- }
-
- /**
- * Register a file log handler.
- *
- * @param string $path
- * @param string $level
- * @return void
- */
- public function useFiles($path, $level = 'debug')
- {
- $this->monolog->pushHandler($handler = new StreamHandler($path, $this->parseLevel($level)));
-
- $handler->setFormatter($this->getDefaultFormatter());
- }
-
- /**
- * Register a daily file log handler.
- *
- * @param string $path
- * @param int $days
- * @param string $level
- * @return void
- */
- public function useDailyFiles($path, $days = 0, $level = 'debug')
- {
- $this->monolog->pushHandler(
- $handler = new RotatingFileHandler($path, $days, $this->parseLevel($level))
- );
-
- $handler->setFormatter($this->getDefaultFormatter());
- }
-
- /**
- * Register a Syslog handler.
- *
- * @param string $name
- * @param string $level
- * @return void
- */
- public function useSyslog($name = 'laravel', $level = 'debug')
- {
- return $this->monolog->pushHandler(new SyslogHandler($name, LOG_USER, $level));
- }
-
- /**
- * Register an error_log handler.
- *
- * @param string $level
- * @param int $messageType
- * @return void
- */
- public function useErrorLog($level = 'debug', $messageType = ErrorLogHandler::OPERATING_SYSTEM)
- {
- $this->monolog->pushHandler(
- $handler = new ErrorLogHandler($messageType, $this->parseLevel($level))
- );
-
- $handler->setFormatter($this->getDefaultFormatter());
- }
-
- /**
- * Register a new callback handler for when a log event is triggered.
- *
- * @param \Closure $callback
- * @return void
- *
- * @throws \RuntimeException
- */
- public function listen(Closure $callback)
- {
- if ( ! isset($this->dispatcher))
- {
- throw new RuntimeException("Events dispatcher has not been set.");
- }
-
- $this->dispatcher->listen('illuminate.log', $callback);
- }
-
- /**
- * Fires a log event.
- *
- * @param string $level
- * @param string $message
- * @param array $context
- * @return void
- */
- protected function fireLogEvent($level, $message, array $context = array())
- {
- // If the event dispatcher is set, we will pass along the parameters to the
- // log listeners. These are useful for building profilers or other tools
- // that aggregate all of the log messages for a given "request" cycle.
- if (isset($this->dispatcher))
- {
- $this->dispatcher->fire('illuminate.log', compact('level', 'message', 'context'));
- }
- }
-
- /**
- * Format the parameters for the logger.
- *
- * @param mixed $message
- * @return void
- */
- protected function formatMessage($message)
- {
- if (is_array($message))
- {
- return var_export($message, true);
- }
- elseif ($message instanceof Jsonable)
- {
- return $message->toJson();
- }
- elseif ($message instanceof Arrayable)
- {
- return var_export($message->toArray(), true);
- }
-
- return $message;
- }
-
- /**
- * Parse the string level into a Monolog constant.
- *
- * @param string $level
- * @return int
- *
- * @throws \InvalidArgumentException
- */
- protected function parseLevel($level)
- {
- if (isset($this->levels[$level]))
- {
- return $this->levels[$level];
- }
-
- throw new InvalidArgumentException("Invalid log level.");
- }
-
- /**
- * Get the underlying Monolog instance.
- *
- * @return \Monolog\Logger
- */
- public function getMonolog()
- {
- return $this->monolog;
- }
-
- /**
- * Get a defaut Monolog formatter instance.
- *
- * @return \Monolog\Formatter\LineFormatter
- */
- protected function getDefaultFormatter()
- {
- return new LineFormatter(null, null, true, true);
- }
-
- /**
- * Get the event dispatcher instance.
- *
- * @return \Illuminate\Contracts\Events\Dispatcher
- */
- public function getEventDispatcher()
- {
- return $this->dispatcher;
- }
-
- /**
- * Set the event dispatcher instance.
- *
- * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
- * @return void
- */
- public function setEventDispatcher(Dispatcher $dispatcher)
- {
- $this->dispatcher = $dispatcher;
- }
-
+class Writer implements LogContract, PsrLoggerInterface
+{
+ /**
+ * The Monolog logger instance.
+ *
+ * @var \Monolog\Logger
+ */
+ protected $monolog;
+
+ /**
+ * The event dispatcher instance.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected $dispatcher;
+
+ /**
+ * The Log levels.
+ *
+ * @var array
+ */
+ protected $levels = [
+ 'debug' => MonologLogger::DEBUG,
+ 'info' => MonologLogger::INFO,
+ 'notice' => MonologLogger::NOTICE,
+ 'warning' => MonologLogger::WARNING,
+ 'error' => MonologLogger::ERROR,
+ 'critical' => MonologLogger::CRITICAL,
+ 'alert' => MonologLogger::ALERT,
+ 'emergency' => MonologLogger::EMERGENCY,
+ ];
+
+ /**
+ * Create a new log writer instance.
+ *
+ * @param \Monolog\Logger $monolog
+ * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
+ * @return void
+ */
+ public function __construct(MonologLogger $monolog, Dispatcher $dispatcher = null)
+ {
+ $this->monolog = $monolog;
+
+ if (isset($dispatcher)) {
+ $this->dispatcher = $dispatcher;
+ }
+ }
+
+ /**
+ * Log an emergency message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function emergency($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log an alert message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function alert($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log a critical message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function critical($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log an error message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function error($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log a warning message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function warning($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log a notice to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function notice($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log an informational message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function info($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log a debug message to the logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function debug($message, array $context = [])
+ {
+ return $this->writeLog(__FUNCTION__, $message, $context);
+ }
+
+ /**
+ * Log a message to the logs.
+ *
+ * @param string $level
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function log($level, $message, array $context = [])
+ {
+ return $this->writeLog($level, $message, $context);
+ }
+
+ /**
+ * Dynamically pass log calls into the writer.
+ *
+ * @param string $level
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ public function write($level, $message, array $context = [])
+ {
+ return $this->writeLog($level, $message, $context);
+ }
+
+ /**
+ * Write a message to Monolog.
+ *
+ * @param string $level
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ protected function writeLog($level, $message, $context)
+ {
+ $this->fireLogEvent($level, $message = $this->formatMessage($message), $context);
+
+ $this->monolog->{$level}($message, $context);
+ }
+
+ /**
+ * Register a file log handler.
+ *
+ * @param string $path
+ * @param string $level
+ * @return void
+ */
+ public function useFiles($path, $level = 'debug')
+ {
+ $this->monolog->pushHandler($handler = new StreamHandler($path, $this->parseLevel($level)));
+
+ $handler->setFormatter($this->getDefaultFormatter());
+ }
+
+ /**
+ * Register a daily file log handler.
+ *
+ * @param string $path
+ * @param int $days
+ * @param string $level
+ * @return void
+ */
+ public function useDailyFiles($path, $days = 0, $level = 'debug')
+ {
+ $this->monolog->pushHandler(
+ $handler = new RotatingFileHandler($path, $days, $this->parseLevel($level))
+ );
+
+ $handler->setFormatter($this->getDefaultFormatter());
+ }
+
+ /**
+ * Register a Syslog handler.
+ *
+ * @param string $name
+ * @param string $level
+ * @return \Psr\Log\LoggerInterface
+ */
+ public function useSyslog($name = 'laravel', $level = 'debug')
+ {
+ return $this->monolog->pushHandler(new SyslogHandler($name, LOG_USER, $level));
+ }
+
+ /**
+ * Register an error_log handler.
+ *
+ * @param string $level
+ * @param int $messageType
+ * @return void
+ */
+ public function useErrorLog($level = 'debug', $messageType = ErrorLogHandler::OPERATING_SYSTEM)
+ {
+ $this->monolog->pushHandler(
+ $handler = new ErrorLogHandler($messageType, $this->parseLevel($level))
+ );
+
+ $handler->setFormatter($this->getDefaultFormatter());
+ }
+
+ /**
+ * Register a new callback handler for when a log event is triggered.
+ *
+ * @param \Closure $callback
+ * @return void
+ *
+ * @throws \RuntimeException
+ */
+ public function listen(Closure $callback)
+ {
+ if (! isset($this->dispatcher)) {
+ throw new RuntimeException('Events dispatcher has not been set.');
+ }
+
+ $this->dispatcher->listen('illuminate.log', $callback);
+ }
+
+ /**
+ * Fires a log event.
+ *
+ * @param string $level
+ * @param string $message
+ * @param array $context
+ * @return void
+ */
+ protected function fireLogEvent($level, $message, array $context = [])
+ {
+ // If the event dispatcher is set, we will pass along the parameters to the
+ // log listeners. These are useful for building profilers or other tools
+ // that aggregate all of the log messages for a given "request" cycle.
+ if (isset($this->dispatcher)) {
+ $this->dispatcher->fire('illuminate.log', compact('level', 'message', 'context'));
+ }
+ }
+
+ /**
+ * Format the parameters for the logger.
+ *
+ * @param mixed $message
+ * @return mixed
+ */
+ protected function formatMessage($message)
+ {
+ if (is_array($message)) {
+ return var_export($message, true);
+ } elseif ($message instanceof Jsonable) {
+ return $message->toJson();
+ } elseif ($message instanceof Arrayable) {
+ return var_export($message->toArray(), true);
+ }
+
+ return $message;
+ }
+
+ /**
+ * Parse the string level into a Monolog constant.
+ *
+ * @param string $level
+ * @return int
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function parseLevel($level)
+ {
+ if (isset($this->levels[$level])) {
+ return $this->levels[$level];
+ }
+
+ throw new InvalidArgumentException('Invalid log level.');
+ }
+
+ /**
+ * Get the underlying Monolog instance.
+ *
+ * @return \Monolog\Logger
+ */
+ public function getMonolog()
+ {
+ return $this->monolog;
+ }
+
+ /**
+ * Get a defaut Monolog formatter instance.
+ *
+ * @return \Monolog\Formatter\LineFormatter
+ */
+ protected function getDefaultFormatter()
+ {
+ return new LineFormatter(null, null, true, true);
+ }
+
+ /**
+ * Get the event dispatcher instance.
+ *
+ * @return \Illuminate\Contracts\Events\Dispatcher
+ */
+ public function getEventDispatcher()
+ {
+ return $this->dispatcher;
+ }
+
+ /**
+ * Set the event dispatcher instance.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher
+ * @return void
+ */
+ public function setEventDispatcher(Dispatcher $dispatcher)
+ {
+ $this->dispatcher = $dispatcher;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Log/composer.json b/application/vendor/laravel/framework/src/Illuminate/Log/composer.json
index 129511a..f5bfc36 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Log/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Log/composer.json
@@ -14,9 +14,9 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
"monolog/monolog": "~1.11"
},
"autoload": {
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php
index a33302e..afb5e4b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php
@@ -1,119 +1,120 @@
-app->singleton('mailer', function($app)
- {
- $this->registerSwiftMailer();
-
- // Once we have create the mailer instance, we will set a container instance
- // on the mailer. This allows us to resolve mailer classes via containers
- // for maximum testability on said classes instead of passing Closures.
- $mailer = new Mailer(
- $app['view'], $app['swift.mailer'], $app['events']
- );
-
- $this->setMailerDependencies($mailer, $app);
-
- // If a "from" address is set, we will set it on the mailer so that all mail
- // messages sent by the applications will utilize the same "from" address
- // on each one, which makes the developer's life a lot more convenient.
- $from = $app['config']['mail.from'];
-
- if (is_array($from) && isset($from['address']))
- {
- $mailer->alwaysFrom($from['address'], $from['name']);
- }
-
- // Here we will determine if the mailer should be in "pretend" mode for this
- // environment, which will simply write out e-mail to the logs instead of
- // sending it over the web, which is useful for local dev environments.
- $pretend = $app['config']->get('mail.pretend', false);
-
- $mailer->pretend($pretend);
-
- return $mailer;
- });
- }
-
- /**
- * Set a few dependencies on the mailer instance.
- *
- * @param \Illuminate\Mail\Mailer $mailer
- * @param \Illuminate\Foundation\Application $app
- * @return void
- */
- protected function setMailerDependencies($mailer, $app)
- {
- $mailer->setContainer($app);
-
- if ($app->bound('Psr\Log\LoggerInterface'))
- {
- $mailer->setLogger($app->make('Psr\Log\LoggerInterface'));
- }
-
- if ($app->bound('queue'))
- {
- $mailer->setQueue($app['queue.connection']);
- }
- }
-
- /**
- * Register the Swift Mailer instance.
- *
- * @return void
- */
- public function registerSwiftMailer()
- {
- $this->registerSwiftTransport();
-
- // Once we have the transporter registered, we will register the actual Swift
- // mailer instance, passing in the transport instances, which allows us to
- // override this transporter instances during app start-up if necessary.
- $this->app['swift.mailer'] = $this->app->share(function($app)
- {
- return new Swift_Mailer($app['swift.transport']->driver());
- });
- }
-
- /**
- * Register the Swift Transport instance.
- *
- * @return void
- */
- protected function registerSwiftTransport()
- {
- $this->app['swift.transport'] = $this->app->share(function($app)
- {
- return new TransportManager($app);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return ['mailer', 'swift.mailer', 'swift.transport'];
- }
-
+class MailServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerSwiftMailer();
+
+ $this->app->singleton('mailer', function ($app) {
+ // Once we have create the mailer instance, we will set a container instance
+ // on the mailer. This allows us to resolve mailer classes via containers
+ // for maximum testability on said classes instead of passing Closures.
+ $mailer = new Mailer(
+ $app['view'], $app['swift.mailer'], $app['events']
+ );
+
+ $this->setMailerDependencies($mailer, $app);
+
+ // If a "from" address is set, we will set it on the mailer so that all mail
+ // messages sent by the applications will utilize the same "from" address
+ // on each one, which makes the developer's life a lot more convenient.
+ $from = $app['config']['mail.from'];
+
+ if (is_array($from) && isset($from['address'])) {
+ $mailer->alwaysFrom($from['address'], $from['name']);
+ }
+
+ $to = $app['config']['mail.to'];
+
+ if (is_array($to) && isset($to['address'])) {
+ $mailer->alwaysTo($to['address'], $to['name']);
+ }
+
+ // Here we will determine if the mailer should be in "pretend" mode for this
+ // environment, which will simply write out e-mail to the logs instead of
+ // sending it over the web, which is useful for local dev environments.
+ $pretend = $app['config']->get('mail.pretend', false);
+
+ $mailer->pretend($pretend);
+
+ return $mailer;
+ });
+ }
+
+ /**
+ * Set a few dependencies on the mailer instance.
+ *
+ * @param \Illuminate\Mail\Mailer $mailer
+ * @param \Illuminate\Foundation\Application $app
+ * @return void
+ */
+ protected function setMailerDependencies($mailer, $app)
+ {
+ $mailer->setContainer($app);
+
+ if ($app->bound('Psr\Log\LoggerInterface')) {
+ $mailer->setLogger($app->make('Psr\Log\LoggerInterface'));
+ }
+
+ if ($app->bound('queue')) {
+ $mailer->setQueue($app['queue.connection']);
+ }
+ }
+
+ /**
+ * Register the Swift Mailer instance.
+ *
+ * @return void
+ */
+ public function registerSwiftMailer()
+ {
+ $this->registerSwiftTransport();
+
+ // Once we have the transporter registered, we will register the actual Swift
+ // mailer instance, passing in the transport instances, which allows us to
+ // override this transporter instances during app start-up if necessary.
+ $this->app['swift.mailer'] = $this->app->share(function ($app) {
+ return new Swift_Mailer($app['swift.transport']->driver());
+ });
+ }
+
+ /**
+ * Register the Swift Transport instance.
+ *
+ * @return void
+ */
+ protected function registerSwiftTransport()
+ {
+ $this->app['swift.transport'] = $this->app->share(function ($app) {
+ return new TransportManager($app);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['mailer', 'swift.mailer', 'swift.transport'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php b/application/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php
index 9a26df8..1292a97 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php
@@ -1,10 +1,14 @@
-views = $views;
- $this->swift = $swift;
- $this->events = $events;
- }
-
- /**
- * Set the global from address and name.
- *
- * @param string $address
- * @param string $name
- * @return void
- */
- public function alwaysFrom($address, $name = null)
- {
- $this->from = compact('address', 'name');
- }
-
- /**
- * Send a new message when only a raw text part.
- *
- * @param string $text
- * @param mixed $callback
- * @return int
- */
- public function raw($text, $callback)
- {
- return $this->send(array('raw' => $text), [], $callback);
- }
-
- /**
- * Send a new message when only a plain part.
- *
- * @param string $view
- * @param array $data
- * @param mixed $callback
- * @return int
- */
- public function plain($view, array $data, $callback)
- {
- return $this->send(array('text' => $view), $data, $callback);
- }
-
- /**
- * Send a new message using a view.
- *
- * @param string|array $view
- * @param array $data
- * @param \Closure|string $callback
- * @return mixed
- */
- public function send($view, array $data, $callback)
- {
- $this->forceReconnection();
-
- // First we need to parse the view, which could either be a string or an array
- // containing both an HTML and plain text versions of the view which should
- // be used when sending an e-mail. We will extract both of them out here.
- list($view, $plain, $raw) = $this->parseView($view);
-
- $data['message'] = $message = $this->createMessage();
-
- $this->callMessageBuilder($callback, $message);
-
- // Once we have retrieved the view content for the e-mail we will set the body
- // of this message using the HTML type, which will provide a simple wrapper
- // to creating view based emails that are able to receive arrays of data.
- $this->addContent($message, $view, $plain, $raw, $data);
-
- $message = $message->getSwiftMessage();
-
- return $this->sendSwiftMessage($message);
- }
-
- /**
- * Queue a new e-mail message for sending.
- *
- * @param string|array $view
- * @param array $data
- * @param \Closure|string $callback
- * @param string $queue
- * @return mixed
- */
- public function queue($view, array $data, $callback, $queue = null)
- {
- $callback = $this->buildQueueCallable($callback);
-
- return $this->queue->push('mailer@handleQueuedMessage', compact('view', 'data', 'callback'), $queue);
- }
-
- /**
- * Queue a new e-mail message for sending on the given queue.
- *
- * @param string $queue
- * @param string|array $view
- * @param array $data
- * @param \Closure|string $callback
- * @return mixed
- */
- public function queueOn($queue, $view, array $data, $callback)
- {
- return $this->queue($view, $data, $callback, $queue);
- }
-
- /**
- * Queue a new e-mail message for sending after (n) seconds.
- *
- * @param int $delay
- * @param string|array $view
- * @param array $data
- * @param \Closure|string $callback
- * @param string $queue
- * @return mixed
- */
- public function later($delay, $view, array $data, $callback, $queue = null)
- {
- $callback = $this->buildQueueCallable($callback);
-
- return $this->queue->later($delay, 'mailer@handleQueuedMessage', compact('view', 'data', 'callback'), $queue);
- }
-
- /**
- * Queue a new e-mail message for sending after (n) seconds on the given queue.
- *
- * @param string $queue
- * @param int $delay
- * @param string|array $view
- * @param array $data
- * @param \Closure|string $callback
- * @return mixed
- */
- public function laterOn($queue, $delay, $view, array $data, $callback)
- {
- return $this->later($delay, $view, $data, $callback, $queue);
- }
-
- /**
- * Build the callable for a queued e-mail job.
- *
- * @param mixed $callback
- * @return mixed
- */
- protected function buildQueueCallable($callback)
- {
- if ( ! $callback instanceof Closure) return $callback;
-
- return (new Serializer)->serialize($callback);
- }
-
- /**
- * Handle a queued e-mail message job.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param array $data
- * @return void
- */
- public function handleQueuedMessage($job, $data)
- {
- $this->send($data['view'], $data['data'], $this->getQueuedCallable($data));
-
- $job->delete();
- }
-
- /**
- * Get the true callable for a queued e-mail message.
- *
- * @param array $data
- * @return mixed
- */
- protected function getQueuedCallable(array $data)
- {
- if (str_contains($data['callback'], 'SerializableClosure'))
- {
- return unserialize($data['callback'])->getClosure();
- }
-
- return $data['callback'];
- }
-
- /**
- * Force the transport to re-connect.
- *
- * This will prevent errors in daemon queue situations.
- *
- * @return void
- */
- protected function forceReconnection()
- {
- $this->getSwiftMailer()->getTransport()->stop();
- }
-
- /**
- * Add the content to a given message.
- *
- * @param \Illuminate\Mail\Message $message
- * @param string $view
- * @param string $plain
- * @param string $raw
- * @param array $data
- * @return void
- */
- protected function addContent($message, $view, $plain, $raw, $data)
- {
- if (isset($view))
- {
- $message->setBody($this->getView($view, $data), 'text/html');
- }
-
- if (isset($plain))
- {
- $message->addPart($this->getView($plain, $data), 'text/plain');
- }
-
- if (isset($raw))
- {
- $message->addPart($raw, 'text/plain');
- }
- }
-
- /**
- * Parse the given view name or array.
- *
- * @param string|array $view
- * @return array
- *
- * @throws \InvalidArgumentException
- */
- protected function parseView($view)
- {
- if (is_string($view)) return [$view, null, null];
-
- // If the given view is an array with numeric keys, we will just assume that
- // both a "pretty" and "plain" view were provided, so we will return this
- // array as is, since must should contain both views with numeric keys.
- if (is_array($view) && isset($view[0]))
- {
- return [$view[0], $view[1], null];
- }
-
- // If the view is an array, but doesn't contain numeric keys, we will assume
- // the the views are being explicitly specified and will extract them via
- // named keys instead, allowing the developers to use one or the other.
- elseif (is_array($view))
- {
- return [
- array_get($view, 'html'),
- array_get($view, 'text'),
- array_get($view, 'raw'),
- ];
- }
-
- throw new InvalidArgumentException("Invalid view.");
- }
-
- /**
- * Send a Swift Message instance.
- *
- * @param \Swift_Message $message
- * @return void
- */
- protected function sendSwiftMessage($message)
- {
- if ($this->events)
- {
- $this->events->fire('mailer.sending', array($message));
- }
-
- if ( ! $this->pretending)
- {
- return $this->swift->send($message, $this->failedRecipients);
- }
- elseif (isset($this->logger))
- {
- $this->logMessage($message);
- }
- }
-
- /**
- * Log that a message was sent.
- *
- * @param \Swift_Message $message
- * @return void
- */
- protected function logMessage($message)
- {
- $emails = implode(', ', array_keys((array) $message->getTo()));
-
- $this->logger->info("Pretending to mail message to: {$emails}");
- }
-
- /**
- * Call the provided message builder.
- *
- * @param \Closure|string $callback
- * @param \Illuminate\Mail\Message $message
- * @return mixed
- *
- * @throws \InvalidArgumentException
- */
- protected function callMessageBuilder($callback, $message)
- {
- if ($callback instanceof Closure)
- {
- return call_user_func($callback, $message);
- }
- elseif (is_string($callback))
- {
- return $this->container->make($callback)->mail($message);
- }
-
- throw new InvalidArgumentException("Callback is not valid.");
- }
-
- /**
- * Create a new message instance.
- *
- * @return \Illuminate\Mail\Message
- */
- protected function createMessage()
- {
- $message = new Message(new Swift_Message);
-
- // If a global from address has been specified we will set it on every message
- // instances so the developer does not have to repeat themselves every time
- // they create a new message. We will just go ahead and push the address.
- if (! empty($this->from['address']))
- {
- $message->from($this->from['address'], $this->from['name']);
- }
-
- return $message;
- }
-
- /**
- * Render the given view.
- *
- * @param string $view
- * @param array $data
- * @return \Illuminate\View\View
- */
- protected function getView($view, $data)
- {
- return $this->views->make($view, $data)->render();
- }
-
- /**
- * Tell the mailer to not really send messages.
- *
- * @param bool $value
- * @return void
- */
- public function pretend($value = true)
- {
- $this->pretending = $value;
- }
-
- /**
- * Check if the mailer is pretending to send messages.
- *
- * @return bool
- */
- public function isPretending()
- {
- return $this->pretending;
- }
-
- /**
- * Get the view factory instance.
- *
- * @return \Illuminate\Contracts\View\Factory
- */
- public function getViewFactory()
- {
- return $this->views;
- }
-
- /**
- * Get the Swift Mailer instance.
- *
- * @return \Swift_Mailer
- */
- public function getSwiftMailer()
- {
- return $this->swift;
- }
-
- /**
- * Get the array of failed recipients.
- *
- * @return array
- */
- public function failures()
- {
- return $this->failedRecipients;
- }
-
- /**
- * Set the Swift Mailer instance.
- *
- * @param \Swift_Mailer $swift
- * @return void
- */
- public function setSwiftMailer($swift)
- {
- $this->swift = $swift;
- }
-
- /**
- * Set the log writer instance.
- *
- * @param \Psr\Log\LoggerInterface $logger
- * @return $this
- */
- public function setLogger(LoggerInterface $logger)
- {
- $this->logger = $logger;
-
- return $this;
- }
-
- /**
- * Set the queue manager instance.
- *
- * @param \Illuminate\Contracts\Queue\Queue $queue
- * @return $this
- */
- public function setQueue(QueueContract $queue)
- {
- $this->queue = $queue;
-
- return $this;
- }
-
- /**
- * Set the IoC container instance.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
- }
-
+class Mailer implements MailerContract, MailQueueContract
+{
+ /**
+ * The view factory instance.
+ *
+ * @var \Illuminate\Contracts\View\Factory
+ */
+ protected $views;
+
+ /**
+ * The Swift Mailer instance.
+ *
+ * @var \Swift_Mailer
+ */
+ protected $swift;
+
+ /**
+ * The event dispatcher instance.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher|null
+ */
+ protected $events;
+
+ /**
+ * The global from address and name.
+ *
+ * @var array
+ */
+ protected $from;
+
+ /**
+ * The log writer instance.
+ *
+ * @var \Psr\Log\LoggerInterface
+ */
+ protected $logger;
+
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The queue implementation.
+ *
+ * @var \Illuminate\Contracts\Queue\Queue
+ */
+ protected $queue;
+
+ /**
+ * Indicates if the actual sending is disabled.
+ *
+ * @var bool
+ */
+ protected $pretending = false;
+
+ /**
+ * Array of failed recipients.
+ *
+ * @var array
+ */
+ protected $failedRecipients = [];
+
+ /**
+ * Create a new Mailer instance.
+ *
+ * @param \Illuminate\Contracts\View\Factory $views
+ * @param \Swift_Mailer $swift
+ * @param \Illuminate\Contracts\Events\Dispatcher|null $events
+ * @return void
+ */
+ public function __construct(Factory $views, Swift_Mailer $swift, Dispatcher $events = null)
+ {
+ $this->views = $views;
+ $this->swift = $swift;
+ $this->events = $events;
+ }
+
+ /**
+ * Set the global from address and name.
+ *
+ * @param string $address
+ * @param string|null $name
+ * @return void
+ */
+ public function alwaysFrom($address, $name = null)
+ {
+ $this->from = compact('address', 'name');
+ }
+
+ /**
+ * Set the global to address and name.
+ *
+ * @param string $address
+ * @param string|null $name
+ * @return void
+ */
+ public function alwaysTo($address, $name = null)
+ {
+ $this->to = compact('address', 'name');
+ }
+
+ /**
+ * Send a new message when only a raw text part.
+ *
+ * @param string $text
+ * @param mixed $callback
+ * @return int
+ */
+ public function raw($text, $callback)
+ {
+ return $this->send(['raw' => $text], [], $callback);
+ }
+
+ /**
+ * Send a new message when only a plain part.
+ *
+ * @param string $view
+ * @param array $data
+ * @param mixed $callback
+ * @return int
+ */
+ public function plain($view, array $data, $callback)
+ {
+ return $this->send(['text' => $view], $data, $callback);
+ }
+
+ /**
+ * Send a new message using a view.
+ *
+ * @param string|array $view
+ * @param array $data
+ * @param \Closure|string $callback
+ * @return void
+ */
+ public function send($view, array $data, $callback)
+ {
+ // First we need to parse the view, which could either be a string or an array
+ // containing both an HTML and plain text versions of the view which should
+ // be used when sending an e-mail. We will extract both of them out here.
+ list($view, $plain, $raw) = $this->parseView($view);
+
+ $data['message'] = $message = $this->createMessage();
+
+ // Once we have retrieved the view content for the e-mail we will set the body
+ // of this message using the HTML type, which will provide a simple wrapper
+ // to creating view based emails that are able to receive arrays of data.
+ $this->addContent($message, $view, $plain, $raw, $data);
+
+ $this->callMessageBuilder($callback, $message);
+
+ if (isset($this->to['address'])) {
+ $message->to($this->to['address'], $this->to['name'], true);
+ }
+
+ $message = $message->getSwiftMessage();
+
+ return $this->sendSwiftMessage($message);
+ }
+
+ /**
+ * Queue a new e-mail message for sending.
+ *
+ * @param string|array $view
+ * @param array $data
+ * @param \Closure|string $callback
+ * @param string|null $queue
+ * @return mixed
+ */
+ public function queue($view, array $data, $callback, $queue = null)
+ {
+ $callback = $this->buildQueueCallable($callback);
+
+ return $this->queue->push('mailer@handleQueuedMessage', compact('view', 'data', 'callback'), $queue);
+ }
+
+ /**
+ * Queue a new e-mail message for sending on the given queue.
+ *
+ * @param string $queue
+ * @param string|array $view
+ * @param array $data
+ * @param \Closure|string $callback
+ * @return mixed
+ */
+ public function onQueue($queue, $view, array $data, $callback)
+ {
+ return $this->queue($view, $data, $callback, $queue);
+ }
+
+ /**
+ * Queue a new e-mail message for sending on the given queue.
+ *
+ * This method didn't match rest of framework's "onQueue" phrasing. Added "onQueue".
+ *
+ * @param string $queue
+ * @param string|array $view
+ * @param array $data
+ * @param \Closure|string $callback
+ * @return mixed
+ */
+ public function queueOn($queue, $view, array $data, $callback)
+ {
+ return $this->onQueue($queue, $view, $data, $callback);
+ }
+
+ /**
+ * Queue a new e-mail message for sending after (n) seconds.
+ *
+ * @param int $delay
+ * @param string|array $view
+ * @param array $data
+ * @param \Closure|string $callback
+ * @param string|null $queue
+ * @return mixed
+ */
+ public function later($delay, $view, array $data, $callback, $queue = null)
+ {
+ $callback = $this->buildQueueCallable($callback);
+
+ return $this->queue->later($delay, 'mailer@handleQueuedMessage', compact('view', 'data', 'callback'), $queue);
+ }
+
+ /**
+ * Queue a new e-mail message for sending after (n) seconds on the given queue.
+ *
+ * @param string $queue
+ * @param int $delay
+ * @param string|array $view
+ * @param array $data
+ * @param \Closure|string $callback
+ * @return mixed
+ */
+ public function laterOn($queue, $delay, $view, array $data, $callback)
+ {
+ return $this->later($delay, $view, $data, $callback, $queue);
+ }
+
+ /**
+ * Build the callable for a queued e-mail job.
+ *
+ * @param mixed $callback
+ * @return mixed
+ */
+ protected function buildQueueCallable($callback)
+ {
+ if (! $callback instanceof Closure) {
+ return $callback;
+ }
+
+ return (new Serializer)->serialize($callback);
+ }
+
+ /**
+ * Handle a queued e-mail message job.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param array $data
+ * @return void
+ */
+ public function handleQueuedMessage($job, $data)
+ {
+ $this->send($data['view'], $data['data'], $this->getQueuedCallable($data));
+
+ $job->delete();
+ }
+
+ /**
+ * Get the true callable for a queued e-mail message.
+ *
+ * @param array $data
+ * @return mixed
+ */
+ protected function getQueuedCallable(array $data)
+ {
+ if (Str::contains($data['callback'], 'SerializableClosure')) {
+ return unserialize($data['callback'])->getClosure();
+ }
+
+ return $data['callback'];
+ }
+
+ /**
+ * Force the transport to re-connect.
+ *
+ * This will prevent errors in daemon queue situations.
+ *
+ * @return void
+ */
+ protected function forceReconnection()
+ {
+ $this->getSwiftMailer()->getTransport()->stop();
+ }
+
+ /**
+ * Add the content to a given message.
+ *
+ * @param \Illuminate\Mail\Message $message
+ * @param string $view
+ * @param string $plain
+ * @param string $raw
+ * @param array $data
+ * @return void
+ */
+ protected function addContent($message, $view, $plain, $raw, $data)
+ {
+ if (isset($view)) {
+ $message->setBody($this->getView($view, $data), 'text/html');
+ }
+
+ if (isset($plain)) {
+ $method = isset($view) ? 'addPart' : 'setBody';
+
+ $message->$method($this->getView($plain, $data), 'text/plain');
+ }
+
+ if (isset($raw)) {
+ $method = (isset($view) || isset($plain)) ? 'addPart' : 'setBody';
+
+ $message->$method($raw, 'text/plain');
+ }
+ }
+
+ /**
+ * Parse the given view name or array.
+ *
+ * @param string|array $view
+ * @return array
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function parseView($view)
+ {
+ if (is_string($view)) {
+ return [$view, null, null];
+ }
+
+ // If the given view is an array with numeric keys, we will just assume that
+ // both a "pretty" and "plain" view were provided, so we will return this
+ // array as is, since must should contain both views with numeric keys.
+ if (is_array($view) && isset($view[0])) {
+ return [$view[0], $view[1], null];
+ }
+
+ // If the view is an array, but doesn't contain numeric keys, we will assume
+ // the the views are being explicitly specified and will extract them via
+ // named keys instead, allowing the developers to use one or the other.
+ if (is_array($view)) {
+ return [
+ Arr::get($view, 'html'),
+ Arr::get($view, 'text'),
+ Arr::get($view, 'raw'),
+ ];
+ }
+
+ throw new InvalidArgumentException('Invalid view.');
+ }
+
+ /**
+ * Send a Swift Message instance.
+ *
+ * @param \Swift_Message $message
+ * @return void
+ */
+ protected function sendSwiftMessage($message)
+ {
+ if ($this->events) {
+ $this->events->fire('mailer.sending', [$message]);
+ }
+
+ if (! $this->pretending) {
+ try {
+ return $this->swift->send($message, $this->failedRecipients);
+ } finally {
+ $this->swift->getTransport()->stop();
+ }
+ } elseif (isset($this->logger)) {
+ $this->logMessage($message);
+ }
+ }
+
+ /**
+ * Log that a message was sent.
+ *
+ * @param \Swift_Message $message
+ * @return void
+ */
+ protected function logMessage($message)
+ {
+ $emails = implode(', ', array_keys((array) $message->getTo()));
+
+ $this->logger->info("Pretending to mail message to: {$emails}");
+ }
+
+ /**
+ * Call the provided message builder.
+ *
+ * @param \Closure|string $callback
+ * @param \Illuminate\Mail\Message $message
+ * @return mixed
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function callMessageBuilder($callback, $message)
+ {
+ if ($callback instanceof Closure) {
+ return call_user_func($callback, $message);
+ }
+
+ if (is_string($callback)) {
+ return $this->container->make($callback)->mail($message);
+ }
+
+ throw new InvalidArgumentException('Callback is not valid.');
+ }
+
+ /**
+ * Create a new message instance.
+ *
+ * @return \Illuminate\Mail\Message
+ */
+ protected function createMessage()
+ {
+ $message = new Message(new Swift_Message);
+
+ // If a global from address has been specified we will set it on every message
+ // instances so the developer does not have to repeat themselves every time
+ // they create a new message. We will just go ahead and push the address.
+ if (! empty($this->from['address'])) {
+ $message->from($this->from['address'], $this->from['name']);
+ }
+
+ return $message;
+ }
+
+ /**
+ * Render the given view.
+ *
+ * @param string $view
+ * @param array $data
+ * @return \Illuminate\View\View
+ */
+ protected function getView($view, $data)
+ {
+ return $this->views->make($view, $data)->render();
+ }
+
+ /**
+ * Tell the mailer to not really send messages.
+ *
+ * @param bool $value
+ * @return void
+ */
+ public function pretend($value = true)
+ {
+ $this->pretending = $value;
+ }
+
+ /**
+ * Check if the mailer is pretending to send messages.
+ *
+ * @return bool
+ */
+ public function isPretending()
+ {
+ return $this->pretending;
+ }
+
+ /**
+ * Get the view factory instance.
+ *
+ * @return \Illuminate\Contracts\View\Factory
+ */
+ public function getViewFactory()
+ {
+ return $this->views;
+ }
+
+ /**
+ * Get the Swift Mailer instance.
+ *
+ * @return \Swift_Mailer
+ */
+ public function getSwiftMailer()
+ {
+ return $this->swift;
+ }
+
+ /**
+ * Get the array of failed recipients.
+ *
+ * @return array
+ */
+ public function failures()
+ {
+ return $this->failedRecipients;
+ }
+
+ /**
+ * Set the Swift Mailer instance.
+ *
+ * @param \Swift_Mailer $swift
+ * @return void
+ */
+ public function setSwiftMailer($swift)
+ {
+ $this->swift = $swift;
+ }
+
+ /**
+ * Set the log writer instance.
+ *
+ * @param \Psr\Log\LoggerInterface $logger
+ * @return $this
+ */
+ public function setLogger(LoggerInterface $logger)
+ {
+ $this->logger = $logger;
+
+ return $this;
+ }
+
+ /**
+ * Set the queue manager instance.
+ *
+ * @param \Illuminate\Contracts\Queue\Queue $queue
+ * @return $this
+ */
+ public function setQueue(QueueContract $queue)
+ {
+ $this->queue = $queue;
+
+ return $this;
+ }
+
+ /**
+ * Set the IoC container instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/Message.php b/application/vendor/laravel/framework/src/Illuminate/Mail/Message.php
index 4085571..5dd1fa2 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/Message.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/Message.php
@@ -1,295 +1,296 @@
-swift = $swift;
- }
-
- /**
- * Add a "from" address to the message.
- *
- * @param string $address
- * @param string $name
- * @return $this
- */
- public function from($address, $name = null)
- {
- $this->swift->setFrom($address, $name);
-
- return $this;
- }
-
- /**
- * Set the "sender" of the message.
- *
- * @param string $address
- * @param string $name
- * @return $this
- */
- public function sender($address, $name = null)
- {
- $this->swift->setSender($address, $name);
-
- return $this;
- }
-
- /**
- * Set the "return path" of the message.
- *
- * @param string $address
- * @return $this
- */
- public function returnPath($address)
- {
- $this->swift->setReturnPath($address);
-
- return $this;
- }
-
- /**
- * Add a recipient to the message.
- *
- * @param string|array $address
- * @param string $name
- * @return $this
- */
- public function to($address, $name = null)
- {
- return $this->addAddresses($address, $name, 'To');
- }
-
- /**
- * Add a carbon copy to the message.
- *
- * @param string $address
- * @param string $name
- * @return $this
- */
- public function cc($address, $name = null)
- {
- return $this->addAddresses($address, $name, 'Cc');
- }
-
- /**
- * Add a blind carbon copy to the message.
- *
- * @param string $address
- * @param string $name
- * @return $this
- */
- public function bcc($address, $name = null)
- {
- return $this->addAddresses($address, $name, 'Bcc');
- }
-
- /**
- * Add a reply to address to the message.
- *
- * @param string $address
- * @param string $name
- * @return $this
- */
- public function replyTo($address, $name = null)
- {
- return $this->addAddresses($address, $name, 'ReplyTo');
- }
-
- /**
- * Add a recipient to the message.
- *
- * @param string|array $address
- * @param string $name
- * @param string $type
- * @return $this
- */
- protected function addAddresses($address, $name, $type)
- {
- if (is_array($address))
- {
- $this->swift->{"set{$type}"}($address, $name);
- }
- else
- {
- $this->swift->{"add{$type}"}($address, $name);
- }
-
- return $this;
- }
-
- /**
- * Set the subject of the message.
- *
- * @param string $subject
- * @return $this
- */
- public function subject($subject)
- {
- $this->swift->setSubject($subject);
-
- return $this;
- }
-
- /**
- * Set the message priority level.
- *
- * @param int $level
- * @return $this
- */
- public function priority($level)
- {
- $this->swift->setPriority($level);
-
- return $this;
- }
-
- /**
- * Attach a file to the message.
- *
- * @param string $file
- * @param array $options
- * @return $this
- */
- public function attach($file, array $options = array())
- {
- $attachment = $this->createAttachmentFromPath($file);
-
- return $this->prepAttachment($attachment, $options);
- }
-
- /**
- * Create a Swift Attachment instance.
- *
- * @param string $file
- * @return \Swift_Attachment
- */
- protected function createAttachmentFromPath($file)
- {
- return Swift_Attachment::fromPath($file);
- }
-
- /**
- * Attach in-memory data as an attachment.
- *
- * @param string $data
- * @param string $name
- * @param array $options
- * @return $this
- */
- public function attachData($data, $name, array $options = array())
- {
- $attachment = $this->createAttachmentFromData($data, $name);
-
- return $this->prepAttachment($attachment, $options);
- }
-
- /**
- * Create a Swift Attachment instance from data.
- *
- * @param string $data
- * @param string $name
- * @return \Swift_Attachment
- */
- protected function createAttachmentFromData($data, $name)
- {
- return Swift_Attachment::newInstance($data, $name);
- }
-
- /**
- * Embed a file in the message and get the CID.
- *
- * @param string $file
- * @return string
- */
- public function embed($file)
- {
- return $this->swift->embed(Swift_Image::fromPath($file));
- }
-
- /**
- * Embed in-memory data in the message and get the CID.
- *
- * @param string $data
- * @param string $name
- * @param string $contentType
- * @return string
- */
- public function embedData($data, $name, $contentType = null)
- {
- $image = Swift_Image::newInstance($data, $name, $contentType);
-
- return $this->swift->embed($image);
- }
-
- /**
- * Prepare and attach the given attachment.
- *
- * @param \Swift_Attachment $attachment
- * @param array $options
- * @return $this
- */
- protected function prepAttachment($attachment, $options = array())
- {
- // First we will check for a MIME type on the message, which instructs the
- // mail client on what type of attachment the file is so that it may be
- // downloaded correctly by the user. The MIME option is not required.
- if (isset($options['mime']))
- {
- $attachment->setContentType($options['mime']);
- }
-
- // If an alternative name was given as an option, we will set that on this
- // attachment so that it will be downloaded with the desired names from
- // the developer, otherwise the default file names will get assigned.
- if (isset($options['as']))
- {
- $attachment->setFilename($options['as']);
- }
-
- $this->swift->attach($attachment);
-
- return $this;
- }
-
- /**
- * Get the underlying Swift Message instance.
- *
- * @return \Swift_Message
- */
- public function getSwiftMessage()
- {
- return $this->swift;
- }
-
- /**
- * Dynamically pass missing methods to the Swift instance.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- $callable = array($this->swift, $method);
-
- return call_user_func_array($callable, $parameters);
- }
-
+class Message
+{
+ /**
+ * The Swift Message instance.
+ *
+ * @var \Swift_Message
+ */
+ protected $swift;
+
+ /**
+ * Create a new message instance.
+ *
+ * @param \Swift_Message $swift
+ * @return void
+ */
+ public function __construct($swift)
+ {
+ $this->swift = $swift;
+ }
+
+ /**
+ * Add a "from" address to the message.
+ *
+ * @param string $address
+ * @param string|null $name
+ * @return $this
+ */
+ public function from($address, $name = null)
+ {
+ $this->swift->setFrom($address, $name);
+
+ return $this;
+ }
+
+ /**
+ * Set the "sender" of the message.
+ *
+ * @param string $address
+ * @param string|null $name
+ * @return $this
+ */
+ public function sender($address, $name = null)
+ {
+ $this->swift->setSender($address, $name);
+
+ return $this;
+ }
+
+ /**
+ * Set the "return path" of the message.
+ *
+ * @param string $address
+ * @return $this
+ */
+ public function returnPath($address)
+ {
+ $this->swift->setReturnPath($address);
+
+ return $this;
+ }
+
+ /**
+ * Add a recipient to the message.
+ *
+ * @param string|array $address
+ * @param string|null $name
+ * @param bool $override
+ * @return $this
+ */
+ public function to($address, $name = null, $override = false)
+ {
+ if ($override) {
+ return $this->swift->setTo($address, $name);
+ }
+
+ return $this->addAddresses($address, $name, 'To');
+ }
+
+ /**
+ * Add a carbon copy to the message.
+ *
+ * @param string|array $address
+ * @param string|null $name
+ * @return $this
+ */
+ public function cc($address, $name = null)
+ {
+ return $this->addAddresses($address, $name, 'Cc');
+ }
+
+ /**
+ * Add a blind carbon copy to the message.
+ *
+ * @param string|array $address
+ * @param string|null $name
+ * @return $this
+ */
+ public function bcc($address, $name = null)
+ {
+ return $this->addAddresses($address, $name, 'Bcc');
+ }
+
+ /**
+ * Add a reply to address to the message.
+ *
+ * @param string $address
+ * @param string|null $name
+ * @return $this
+ */
+ public function replyTo($address, $name = null)
+ {
+ return $this->addAddresses($address, $name, 'ReplyTo');
+ }
+
+ /**
+ * Add a recipient to the message.
+ *
+ * @param string|array $address
+ * @param string $name
+ * @param string $type
+ * @return $this
+ */
+ protected function addAddresses($address, $name, $type)
+ {
+ if (is_array($address)) {
+ $this->swift->{"set{$type}"}($address, $name);
+ } else {
+ $this->swift->{"add{$type}"}($address, $name);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set the subject of the message.
+ *
+ * @param string $subject
+ * @return $this
+ */
+ public function subject($subject)
+ {
+ $this->swift->setSubject($subject);
+
+ return $this;
+ }
+
+ /**
+ * Set the message priority level.
+ *
+ * @param int $level
+ * @return $this
+ */
+ public function priority($level)
+ {
+ $this->swift->setPriority($level);
+
+ return $this;
+ }
+
+ /**
+ * Attach a file to the message.
+ *
+ * @param string $file
+ * @param array $options
+ * @return $this
+ */
+ public function attach($file, array $options = [])
+ {
+ $attachment = $this->createAttachmentFromPath($file);
+
+ return $this->prepAttachment($attachment, $options);
+ }
+
+ /**
+ * Create a Swift Attachment instance.
+ *
+ * @param string $file
+ * @return \Swift_Attachment
+ */
+ protected function createAttachmentFromPath($file)
+ {
+ return Swift_Attachment::fromPath($file);
+ }
+
+ /**
+ * Attach in-memory data as an attachment.
+ *
+ * @param string $data
+ * @param string $name
+ * @param array $options
+ * @return $this
+ */
+ public function attachData($data, $name, array $options = [])
+ {
+ $attachment = $this->createAttachmentFromData($data, $name);
+
+ return $this->prepAttachment($attachment, $options);
+ }
+
+ /**
+ * Create a Swift Attachment instance from data.
+ *
+ * @param string $data
+ * @param string $name
+ * @return \Swift_Attachment
+ */
+ protected function createAttachmentFromData($data, $name)
+ {
+ return Swift_Attachment::newInstance($data, $name);
+ }
+
+ /**
+ * Embed a file in the message and get the CID.
+ *
+ * @param string $file
+ * @return string
+ */
+ public function embed($file)
+ {
+ return $this->swift->embed(Swift_Image::fromPath($file));
+ }
+
+ /**
+ * Embed in-memory data in the message and get the CID.
+ *
+ * @param string $data
+ * @param string $name
+ * @param string|null $contentType
+ * @return string
+ */
+ public function embedData($data, $name, $contentType = null)
+ {
+ $image = Swift_Image::newInstance($data, $name, $contentType);
+
+ return $this->swift->embed($image);
+ }
+
+ /**
+ * Prepare and attach the given attachment.
+ *
+ * @param \Swift_Attachment $attachment
+ * @param array $options
+ * @return $this
+ */
+ protected function prepAttachment($attachment, $options = [])
+ {
+ // First we will check for a MIME type on the message, which instructs the
+ // mail client on what type of attachment the file is so that it may be
+ // downloaded correctly by the user. The MIME option is not required.
+ if (isset($options['mime'])) {
+ $attachment->setContentType($options['mime']);
+ }
+
+ // If an alternative name was given as an option, we will set that on this
+ // attachment so that it will be downloaded with the desired names from
+ // the developer, otherwise the default file names will get assigned.
+ if (isset($options['as'])) {
+ $attachment->setFilename($options['as']);
+ }
+
+ $this->swift->attach($attachment);
+
+ return $this;
+ }
+
+ /**
+ * Get the underlying Swift Message instance.
+ *
+ * @return \Swift_Message
+ */
+ public function getSwiftMessage()
+ {
+ return $this->swift;
+ }
+
+ /**
+ * Dynamically pass missing methods to the Swift instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ $callable = [$this->swift, $method];
+
+ return call_user_func_array($callable, $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php
index 1fe8136..9396d15 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/LogTransport.php
@@ -1,87 +1,55 @@
-logger = $logger;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isStarted()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function start()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function stop()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $this->logger->debug($this->getMimeEntityString($message));
- }
-
- /**
- * Get a loggable string out of a Swiftmailer entity.
- *
- * @param \Swift_Mime_MimeEntity $entity
- * @return string
- */
- protected function getMimeEntityString(Swift_Mime_MimeEntity $entity)
- {
- $string = (string) $entity->getHeaders().PHP_EOL.$entity->getBody();
-
- foreach ($entity->getChildren() as $children)
- {
- $string .= PHP_EOL.PHP_EOL.$this->getMimeEntityString($children);
- }
-
- return $string;
- }
-
- /**
- * {@inheritdoc}
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- //
- }
+class LogTransport extends Transport
+{
+ /**
+ * The Logger instance.
+ *
+ * @var \Psr\Log\LoggerInterface
+ */
+ protected $logger;
+
+ /**
+ * Create a new log transport instance.
+ *
+ * @param \Psr\Log\LoggerInterface $logger
+ * @return void
+ */
+ public function __construct(LoggerInterface $logger)
+ {
+ $this->logger = $logger;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+ {
+ $this->beforeSendPerformed($message);
+
+ $this->logger->debug($this->getMimeEntityString($message));
+ }
+
+ /**
+ * Get a loggable string out of a Swiftmailer entity.
+ *
+ * @param \Swift_Mime_MimeEntity $entity
+ * @return string
+ */
+ protected function getMimeEntityString(Swift_Mime_MimeEntity $entity)
+ {
+ $string = (string) $entity->getHeaders().PHP_EOL.$entity->getBody();
+
+ foreach ($entity->getChildren() as $children) {
+ $string .= PHP_EOL.PHP_EOL.$this->getMimeEntityString($children);
+ }
+
+ return $string;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php
index a902639..d9f8704 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php
@@ -1,168 +1,146 @@
-key = $key;
- $this->setDomain($domain);
- }
-
- /**
- * {@inheritdoc}
- */
- public function isStarted()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function start()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function stop()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $client = $this->getHttpClient();
-
- return $client->post($this->url, ['auth' => ['api', $this->key],
- 'body' => [
- 'to' => $this->getTo($message),
- 'message' => new PostFile('message', (string) $message),
- ],
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- //
- }
-
- /**
- * Get the "to" payload field for the API request.
- *
- * @param \Swift_Mime_Message $message
- * @return array
- */
- protected function getTo(Swift_Mime_Message $message)
- {
- $formatted = [];
-
- $contacts = array_merge(
- (array) $message->getTo(), (array) $message->getCc(), (array) $message->getBcc()
- );
-
- foreach ($contacts as $address => $display)
- {
- $formatted[] = $display ? $display." <$address>" : $address;
- }
-
- return implode(',', $formatted);
- }
-
- /**
- * Get a new HTTP client instance.
- *
- * @return \GuzzleHttp\Client
- */
- protected function getHttpClient()
- {
- return new Client;
- }
-
- /**
- * Get the API key being used by the transport.
- *
- * @return string
- */
- public function getKey()
- {
- return $this->key;
- }
-
- /**
- * Set the API key being used by the transport.
- *
- * @param string $key
- * @return void
- */
- public function setKey($key)
- {
- return $this->key = $key;
- }
-
- /**
- * Get the domain being used by the transport.
- *
- * @return string
- */
- public function getDomain()
- {
- return $this->domain;
- }
-
- /**
- * Set the domain being used by the transport.
- *
- * @param string $domain
- * @return void
- */
- public function setDomain($domain)
- {
- $this->url = 'https://api.mailgun.net/v2/'.$domain.'/messages.mime';
-
- return $this->domain = $domain;
- }
-
+use GuzzleHttp\ClientInterface;
+
+class MailgunTransport extends Transport
+{
+ /**
+ * Guzzle client instance.
+ *
+ * @var \GuzzleHttp\ClientInterface
+ */
+ protected $client;
+
+ /**
+ * The Mailgun API key.
+ *
+ * @var string
+ */
+ protected $key;
+
+ /**
+ * The Mailgun domain.
+ *
+ * @var string
+ */
+ protected $domain;
+
+ /**
+ * THe Mailgun API end-point.
+ *
+ * @var string
+ */
+ protected $url;
+
+ /**
+ * Create a new Mailgun transport instance.
+ *
+ * @param \GuzzleHttp\ClientInterface $client
+ * @param string $key
+ * @param string $domain
+ * @return void
+ */
+ public function __construct(ClientInterface $client, $key, $domain)
+ {
+ $this->key = $key;
+ $this->client = $client;
+ $this->setDomain($domain);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+ {
+ $this->beforeSendPerformed($message);
+
+ $options = ['auth' => ['api', $this->key]];
+
+ $to = $this->getTo($message);
+
+ $message->setBcc([]);
+
+ if (version_compare(ClientInterface::VERSION, '6') === 1) {
+ $options['multipart'] = [
+ ['name' => 'to', 'contents' => $to],
+ ['name' => 'message', 'contents' => $message->toString(), 'filename' => 'message.mime'],
+ ];
+ } else {
+ $options['body'] = [
+ 'to' => $to,
+ 'message' => new PostFile('message', $message->toString()),
+ ];
+ }
+
+ return $this->client->post($this->url, $options);
+ }
+
+ /**
+ * Get the "to" payload field for the API request.
+ *
+ * @param \Swift_Mime_Message $message
+ * @return array
+ */
+ protected function getTo(Swift_Mime_Message $message)
+ {
+ $formatted = [];
+
+ $contacts = array_merge(
+ (array) $message->getTo(), (array) $message->getCc(), (array) $message->getBcc()
+ );
+
+ foreach ($contacts as $address => $display) {
+ $formatted[] = $display ? $display." <$address>" : $address;
+ }
+
+ return implode(',', $formatted);
+ }
+
+ /**
+ * Get the API key being used by the transport.
+ *
+ * @return string
+ */
+ public function getKey()
+ {
+ return $this->key;
+ }
+
+ /**
+ * Set the API key being used by the transport.
+ *
+ * @param string $key
+ * @return string
+ */
+ public function setKey($key)
+ {
+ return $this->key = $key;
+ }
+
+ /**
+ * Get the domain being used by the transport.
+ *
+ * @return string
+ */
+ public function getDomain()
+ {
+ return $this->domain;
+ }
+
+ /**
+ * Set the domain being used by the transport.
+ *
+ * @param string $domain
+ * @return void
+ */
+ public function setDomain($domain)
+ {
+ $this->url = 'https://api.mailgun.net/v3/'.$domain.'/messages.mime';
+
+ return $this->domain = $domain;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php
index 809d96c..32f4e10 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php
@@ -1,138 +1,107 @@
-key = $key;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isStarted()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function start()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function stop()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $client = $this->getHttpClient();
-
- return $client->post('https://mandrillapp.com/api/1.0/messages/send-raw.json', [
- 'body' => [
- 'key' => $this->key,
- 'to' => $this->getToAddresses($message),
- 'raw_message' => (string) $message,
- 'async' => false,
- ],
- ]);
- }
-
- /**
- * Get all the addresses this message should be sent to.
- *
- * Note that Mandrill still respects CC, BCC headers in raw message itself.
- *
- * @param Swift_Mime_Message $message
- * @return array
- */
- protected function getToAddresses(Swift_Mime_Message $message)
- {
- $to = [];
-
- if ($message->getTo())
- {
- $to = array_merge($to, array_keys($message->getTo()));
- }
-
- if ($message->getCc())
- {
- $to = array_merge($to, array_keys($message->getCc()));
- }
-
- if ($message->getBcc())
- {
- $to = array_merge($to, array_keys($message->getBcc()));
- }
-
- return $to;
- }
-
- /**
- * {@inheritdoc}
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- //
- }
-
- /**
- * Get a new HTTP client instance.
- *
- * @return \GuzzleHttp\Client
- */
- protected function getHttpClient()
- {
- return new Client;
- }
-
- /**
- * Get the API key being used by the transport.
- *
- * @return string
- */
- public function getKey()
- {
- return $this->key;
- }
-
- /**
- * Set the API key being used by the transport.
- *
- * @param string $key
- * @return void
- */
- public function setKey($key)
- {
- return $this->key = $key;
- }
+namespace Illuminate\Mail\Transport;
+use Swift_Mime_Message;
+use GuzzleHttp\ClientInterface;
+
+class MandrillTransport extends Transport
+{
+ /**
+ * Guzzle client instance.
+ *
+ * @var \GuzzleHttp\ClientInterface
+ */
+ protected $client;
+
+ /**
+ * The Mandrill API key.
+ *
+ * @var string
+ */
+ protected $key;
+
+ /**
+ * Create a new Mandrill transport instance.
+ *
+ * @param \GuzzleHttp\ClientInterface $client
+ * @param string $key
+ * @return void
+ */
+ public function __construct(ClientInterface $client, $key)
+ {
+ $this->client = $client;
+ $this->key = $key;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+ {
+ $this->beforeSendPerformed($message);
+
+ $data = [
+ 'key' => $this->key,
+ 'to' => $this->getToAddresses($message),
+ 'raw_message' => $message->toString(),
+ 'async' => false,
+ ];
+
+ if (version_compare(ClientInterface::VERSION, '6') === 1) {
+ $options = ['form_params' => $data];
+ } else {
+ $options = ['body' => $data];
+ }
+
+ return $this->client->post('https://mandrillapp.com/api/1.0/messages/send-raw.json', $options);
+ }
+
+ /**
+ * Get all the addresses this message should be sent to.
+ *
+ * Note that Mandrill still respects CC, BCC headers in raw message itself.
+ *
+ * @param \Swift_Mime_Message $message
+ * @return array
+ */
+ protected function getToAddresses(Swift_Mime_Message $message)
+ {
+ $to = [];
+
+ if ($message->getTo()) {
+ $to = array_merge($to, array_keys($message->getTo()));
+ }
+
+ if ($message->getCc()) {
+ $to = array_merge($to, array_keys($message->getCc()));
+ }
+
+ if ($message->getBcc()) {
+ $to = array_merge($to, array_keys($message->getBcc()));
+ }
+
+ return $to;
+ }
+
+ /**
+ * Get the API key being used by the transport.
+ *
+ * @return string
+ */
+ public function getKey()
+ {
+ return $this->key;
+ }
+
+ /**
+ * Set the API key being used by the transport.
+ *
+ * @param string $key
+ * @return string
+ */
+ public function setKey($key)
+ {
+ return $this->key = $key;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php
index 118981a..63457ba 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php
@@ -1,96 +1,42 @@
-ses = $ses;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isStarted()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function start()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function stop()
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- return $this->ses->sendRawEmail([
- 'Source' => $message->getSender(),
- 'Destinations' => $this->getTo($message),
- 'RawMessage' => [
- 'Data' => base64_encode((string) $message),
- ],
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- //
- }
-
- /**
- * Get the "to" payload field for the API request.
- *
- * @param \Swift_Mime_Message $message
- * @return array
- */
- protected function getTo(Swift_Mime_Message $message)
- {
- $destinations = [];
-
- $contacts = array_merge(
- (array) $message->getTo(), (array) $message->getCc(), (array) $message->getBcc()
- );
-
- foreach ($contacts as $address => $display)
- {
- $destinations[] = $address;
- }
-
- return $destinations;
- }
+class SesTransport extends Transport
+{
+ /**
+ * The Amazon SES instance.
+ *
+ * @var \Aws\Ses\SesClient
+ */
+ protected $ses;
+
+ /**
+ * Create a new SES transport instance.
+ *
+ * @param \Aws\Ses\SesClient $ses
+ * @return void
+ */
+ public function __construct(SesClient $ses)
+ {
+ $this->ses = $ses;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+ {
+ $this->beforeSendPerformed($message);
+
+ return $this->ses->sendRawEmail([
+ 'Source' => key($message->getSender() ?: $message->getFrom()),
+ 'RawMessage' => [
+ 'Data' => $message->toString(),
+ ],
+ ]);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/Transport.php b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/Transport.php
new file mode 100644
index 0000000..eeca110
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/Transport/Transport.php
@@ -0,0 +1,70 @@
+plugins, $plugin);
+ }
+
+ /**
+ * Iterate through registered plugins and execute plugins' methods.
+ *
+ * @param \Swift_Mime_Message $message
+ * @return void
+ */
+ protected function beforeSendPerformed(Swift_Mime_Message $message)
+ {
+ $event = new Swift_Events_SendEvent($this, $message);
+
+ foreach ($this->plugins as $plugin) {
+ if (method_exists($plugin, 'beforeSendPerformed')) {
+ $plugin->beforeSendPerformed($event);
+ }
+ }
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php b/application/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php
index 13c9169..d638dcf 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php
@@ -1,138 +1,155 @@
-app['config']['mail'];
-
- // The Swift SMTP transport instance will allow us to use any SMTP backend
- // for delivering mail such as Sendgrid, Amazon SES, or a custom server
- // a developer has available. We will just pass this configured host.
- $transport = SmtpTransport::newInstance(
- $config['host'], $config['port']
- );
-
- if (isset($config['encryption']))
- {
- $transport->setEncryption($config['encryption']);
- }
-
- // Once we have the transport we will check for the presence of a username
- // and password. If we have it we will set the credentials on the Swift
- // transporter instance so that we'll properly authenticate delivery.
- if (isset($config['username']))
- {
- $transport->setUsername($config['username']);
-
- $transport->setPassword($config['password']);
- }
-
- return $transport;
- }
-
- /**
- * Create an instance of the Sendmail Swift Transport driver.
- *
- * @return \Swift_SendmailTransport
- */
- protected function createSendmailDriver()
- {
- $command = $this->app['config']['mail']['sendmail'];
-
- return SendmailTransport::newInstance($command);
- }
-
- /**
- * Create an instance of the Amazon SES Swift Transport driver.
- *
- * @return \Swift_SendmailTransport
- */
- protected function createSesDriver()
- {
- $sesClient = SesClient::factory($this->app['config']->get('services.ses', []));
-
- return new SesTransport($sesClient);
- }
-
- /**
- * Create an instance of the Mail Swift Transport driver.
- *
- * @return \Swift_MailTransport
- */
- protected function createMailDriver()
- {
- return MailTransport::newInstance();
- }
-
- /**
- * Create an instance of the Mailgun Swift Transport driver.
- *
- * @return \Illuminate\Mail\Transport\MailgunTransport
- */
- protected function createMailgunDriver()
- {
- $config = $this->app['config']->get('services.mailgun', array());
-
- return new MailgunTransport($config['secret'], $config['domain']);
- }
-
- /**
- * Create an instance of the Mandrill Swift Transport driver.
- *
- * @return \Illuminate\Mail\Transport\MandrillTransport
- */
- protected function createMandrillDriver()
- {
- $config = $this->app['config']->get('services.mandrill', array());
-
- return new MandrillTransport($config['secret']);
- }
-
- /**
- * Create an instance of the Log Swift Transport driver.
- *
- * @return \Illuminate\Mail\Transport\LogTransport
- */
- protected function createLogDriver()
- {
- return new LogTransport($this->app->make('Psr\Log\LoggerInterface'));
- }
-
- /**
- * Get the default cache driver name.
- *
- * @return string
- */
- public function getDefaultDriver()
- {
- return $this->app['config']['mail.driver'];
- }
-
- /**
- * Set the default cache driver name.
- *
- * @param string $name
- * @return void
- */
- public function setDefaultDriver($name)
- {
- $this->app['config']['mail.driver'] = $name;
- }
-
+class TransportManager extends Manager
+{
+ /**
+ * Create an instance of the SMTP Swift Transport driver.
+ *
+ * @return \Swift_SmtpTransport
+ */
+ protected function createSmtpDriver()
+ {
+ $config = $this->app['config']['mail'];
+
+ // The Swift SMTP transport instance will allow us to use any SMTP backend
+ // for delivering mail such as Sendgrid, Amazon SES, or a custom server
+ // a developer has available. We will just pass this configured host.
+ $transport = SmtpTransport::newInstance(
+ $config['host'], $config['port']
+ );
+
+ if (isset($config['encryption'])) {
+ $transport->setEncryption($config['encryption']);
+ }
+
+ // Once we have the transport we will check for the presence of a username
+ // and password. If we have it we will set the credentials on the Swift
+ // transporter instance so that we'll properly authenticate delivery.
+ if (isset($config['username'])) {
+ $transport->setUsername($config['username']);
+
+ $transport->setPassword($config['password']);
+ }
+
+ if (isset($config['stream'])) {
+ $transport->setStreamOptions($config['stream']);
+ }
+
+ return $transport;
+ }
+
+ /**
+ * Create an instance of the Sendmail Swift Transport driver.
+ *
+ * @return \Swift_SendmailTransport
+ */
+ protected function createSendmailDriver()
+ {
+ $command = $this->app['config']['mail']['sendmail'];
+
+ return SendmailTransport::newInstance($command);
+ }
+
+ /**
+ * Create an instance of the Amazon SES Swift Transport driver.
+ *
+ * @return \Swift_SendmailTransport
+ */
+ protected function createSesDriver()
+ {
+ $config = $this->app['config']->get('services.ses', []);
+
+ $config += [
+ 'version' => 'latest', 'service' => 'email',
+ ];
+
+ if ($config['key'] && $config['secret']) {
+ $config['credentials'] = Arr::only($config, ['key', 'secret']);
+ }
+
+ return new SesTransport(new SesClient($config));
+ }
+
+ /**
+ * Create an instance of the Mail Swift Transport driver.
+ *
+ * @return \Swift_MailTransport
+ */
+ protected function createMailDriver()
+ {
+ return MailTransport::newInstance();
+ }
+
+ /**
+ * Create an instance of the Mailgun Swift Transport driver.
+ *
+ * @return \Illuminate\Mail\Transport\MailgunTransport
+ */
+ protected function createMailgunDriver()
+ {
+ $config = $this->app['config']->get('services.mailgun', []);
+
+ $client = new HttpClient(Arr::get($config, 'guzzle', []));
+
+ return new MailgunTransport($client, $config['secret'], $config['domain']);
+ }
+
+ /**
+ * Create an instance of the Mandrill Swift Transport driver.
+ *
+ * @return \Illuminate\Mail\Transport\MandrillTransport
+ */
+ protected function createMandrillDriver()
+ {
+ $config = $this->app['config']->get('services.mandrill', []);
+
+ $client = new HttpClient(Arr::get($config, 'guzzle', []));
+
+ return new MandrillTransport($client, $config['secret']);
+ }
+
+ /**
+ * Create an instance of the Log Swift Transport driver.
+ *
+ * @return \Illuminate\Mail\Transport\LogTransport
+ */
+ protected function createLogDriver()
+ {
+ return new LogTransport($this->app->make('Psr\Log\LoggerInterface'));
+ }
+
+ /**
+ * Get the default cache driver name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['mail.driver'];
+ }
+
+ /**
+ * Set the default cache driver name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['mail.driver'] = $name;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Mail/composer.json b/application/vendor/laravel/framework/src/Illuminate/Mail/composer.json
index a8672b4..e59faa3 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Mail/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Mail/composer.json
@@ -14,10 +14,10 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/container": "5.0.*",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
+ "php": ">=5.5.9",
+ "illuminate/container": "5.1.*",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
"psr/log": "~1.0",
"swiftmailer/swiftmailer": "~5.1"
},
@@ -28,12 +28,13 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "aws/aws-sdk-php": "Required to use the SES mail driver (~2.4).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.0)."
+ "aws/aws-sdk-php": "Required to use the SES mail driver (~3.0).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.3|~6.0).",
+ "jeremeamia/superclosure": "Required to be able to serialize closures (~2.0)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
index e5dc49d..40a68ee 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
@@ -1,476 +1,487 @@
-= 1 && filter_var($page, FILTER_VALIDATE_INT) !== false;
- }
-
- /**
- * Create a range of pagination URLs.
- *
- * @param int $start
- * @param int $end
- * @return string
- */
- public function getUrlRange($start, $end)
- {
- $urls = [];
-
- for ($page = $start; $page <= $end; $page++)
- {
- $urls[$page] = $this->url($page);
- }
-
- return $urls;
- }
-
- /**
- * Get a URL for a given page number.
- *
- * @param int $page
- * @return string
- */
- public function url($page)
- {
- if ($page <= 0) $page = 1;
-
- // If we have any extra query string key / value pairs that need to be added
- // onto the URL, we will put them in query string form and then attach it
- // to the URL. This allows for extra information like sortings storage.
- $parameters = [$this->pageName => $page];
-
- if (count($this->query) > 0)
- {
- $parameters = array_merge($this->query, $parameters);
- }
-
- return $this->path.'?'
- .http_build_query($parameters, null, '&')
- .$this->buildFragment();
- }
-
- /**
- * Get the URL for the previous page.
- *
- * @return string|null
- */
- public function previousPageUrl()
- {
- if ($this->currentPage() > 1)
- {
- return $this->url($this->currentPage() - 1);
- }
- }
-
- /**
- * Get / set the URL fragment to be appended to URLs.
- *
- * @param string|null $fragment
- * @return $this|string|null
- */
- public function fragment($fragment = null)
- {
- if (is_null($fragment)) return $this->fragment;
-
- $this->fragment = $fragment;
-
- return $this;
- }
-
- /**
- * Add a set of query string values to the paginator.
- *
- * @param array|string $key
- * @param string|null $value
- * @return $this
- */
- public function appends($key, $value = null)
- {
- if (is_array($key)) return $this->appendArray($key);
-
- return $this->addQuery($key, $value);
- }
-
- /**
- * Add an array of query string values.
- *
- * @param array $keys
- * @return $this
- */
- protected function appendArray(array $keys)
- {
- foreach ($keys as $key => $value)
- {
- $this->addQuery($key, $value);
- }
-
- return $this;
- }
-
- /**
- * Add a query string value to the paginator.
- *
- * @param string $key
- * @param string $value
- * @return $this
- */
- public function addQuery($key, $value)
- {
- if ($key !== $this->pageName)
- {
- $this->query[$key] = $value;
- }
-
- return $this;
- }
-
- /**
- * Build the full fragment portion of a URL.
- *
- * @return string
- */
- protected function buildFragment()
- {
- return $this->fragment ? '#'.$this->fragment : '';
- }
-
- /**
- * Get the slice of items being paginated.
- *
- * @return array
- */
- public function items()
- {
- return $this->items->all();
- }
-
- /**
- * Get the number of the first item in the slice.
- *
- * @return int
- */
- public function firstItem()
- {
- return ($this->currentPage - 1) * $this->perPage + 1;
- }
-
- /**
- * Get the number of the last item in the slice.
- *
- * @return int
- */
- public function lastItem()
- {
- return $this->firstItem() + $this->count() - 1;
- }
-
- /**
- * Get the number of items shown per page.
- *
- * @return int
- */
- public function perPage()
- {
- return $this->perPage;
- }
-
- /**
- * Get the current page.
- *
- * @return int
- */
- public function currentPage()
- {
- return $this->currentPage;
- }
-
- /**
- * Determine if there are enough items to split into multiple pages.
- *
- * @return bool
- */
- public function hasPages()
- {
- return ! ($this->currentPage() == 1 && ! $this->hasMorePages());
- }
-
- /**
- * Resolve the current request path or return the default value.
- *
- * @param string $default
- * @return string
- */
- public static function resolveCurrentPath($default = '/')
- {
- if (isset(static::$currentPathResolver))
- {
- return call_user_func(static::$currentPathResolver);
- }
-
- return $default;
- }
-
- /**
- * Set the current request path resolver callback.
- *
- * @param \Closure $resolver
- * @return void
- */
- public static function currentPathResolver(Closure $resolver)
- {
- static::$currentPathResolver = $resolver;
- }
-
- /**
- * Resolve the current page or return the default value.
- *
- * @param int $default
- * @return int
- */
- public static function resolveCurrentPage($default = 1)
- {
- if (isset(static::$currentPageResolver))
- {
- return call_user_func(static::$currentPageResolver);
- }
-
- return $default;
- }
-
- /**
- * Set the current page resolver callback.
- *
- * @param \Closure $resolver
- * @return void
- */
- public static function currentPageResolver(Closure $resolver)
- {
- static::$currentPageResolver = $resolver;
- }
-
- /**
- * Set the default Presenter resolver.
- *
- * @param \Closure $resolver
- * @return void
- */
- public static function presenter(Closure $resolver)
- {
- static::$presenterResolver = $resolver;
- }
-
- /**
- * Set the query string variable used to store the page.
- *
- * @param string $name
- * @return $this
- */
- public function setPageName($name)
- {
- $this->pageName = $name;
-
- return $this;
- }
-
- /**
- * Set the base path to assign to all URLs.
- *
- * @param string $path
- * @return $this
- */
- public function setPath($path)
- {
- $this->path = $path;
-
- return $this;
- }
-
- /**
- * Get an iterator for the items.
- *
- * @return \ArrayIterator
- */
- public function getIterator()
- {
- return new ArrayIterator($this->items->all());
- }
-
- /**
- * Determine if the list of items is empty or not.
- *
- * @return bool
- */
- public function isEmpty()
- {
- return $this->items->isEmpty();
- }
-
- /**
- * Get the number of items for the current page.
- *
- * @return int
- */
- public function count()
- {
- return $this->items->count();
- }
-
- /**
- * Get the paginator's underlying collection.
- *
- * @return \Illuminate\Support\Collection
- */
- public function getCollection()
- {
- return $this->items;
- }
-
- /**
- * Determine if the given item exists.
- *
- * @param mixed $key
- * @return bool
- */
- public function offsetExists($key)
- {
- return $this->items->has($key);
- }
-
- /**
- * Get the item at the given offset.
- *
- * @param mixed $key
- * @return mixed
- */
- public function offsetGet($key)
- {
- return $this->items->get($key);
- }
-
- /**
- * Set the item at the given offset.
- *
- * @param mixed $key
- * @param mixed $value
- * @return void
- */
- public function offsetSet($key, $value)
- {
- $this->items->put($key, $value);
- }
-
- /**
- * Unset the item at the given key.
- *
- * @param mixed $key
- * @return void
- */
- public function offsetUnset($key)
- {
- $this->items->forget($key);
- }
-
- /**
- * Make dynamic calls into the collection.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array([$this->getCollection(), $method], $parameters);
- }
-
- /**
- * Render the contents of the paginator when casting to string.
- *
- * @return string
- */
- public function __toString()
- {
- return $this->render();
- }
-
+abstract class AbstractPaginator
+{
+ /**
+ * All of the items being paginated.
+ *
+ * @var \Illuminate\Support\Collection
+ */
+ protected $items;
+
+ /**
+ * The number of items to be shown per page.
+ *
+ * @var int
+ */
+ protected $perPage;
+
+ /**
+ * The current page being "viewed".
+ *
+ * @var int
+ */
+ protected $currentPage;
+
+ /**
+ * The base path to assign to all URLs.
+ *
+ * @var string
+ */
+ protected $path = '/';
+
+ /**
+ * The query parameters to add to all URLs.
+ *
+ * @var array
+ */
+ protected $query = [];
+
+ /**
+ * The URL fragment to add to all URLs.
+ *
+ * @var string|null
+ */
+ protected $fragment = null;
+
+ /**
+ * The query string variable used to store the page.
+ *
+ * @var string
+ */
+ protected $pageName = 'page';
+
+ /**
+ * The current page resolver callback.
+ *
+ * @var \Closure
+ */
+ protected static $currentPathResolver;
+
+ /**
+ * The current page resolver callback.
+ *
+ * @var \Closure
+ */
+ protected static $currentPageResolver;
+
+ /**
+ * The default presenter resolver.
+ *
+ * @var \Closure
+ */
+ protected static $presenterResolver;
+
+ /**
+ * Determine if the given value is a valid page number.
+ *
+ * @param int $page
+ * @return bool
+ */
+ protected function isValidPageNumber($page)
+ {
+ return $page >= 1 && filter_var($page, FILTER_VALIDATE_INT) !== false;
+ }
+
+ /**
+ * Create a range of pagination URLs.
+ *
+ * @param int $start
+ * @param int $end
+ * @return string
+ */
+ public function getUrlRange($start, $end)
+ {
+ $urls = [];
+
+ for ($page = $start; $page <= $end; $page++) {
+ $urls[$page] = $this->url($page);
+ }
+
+ return $urls;
+ }
+
+ /**
+ * Get a URL for a given page number.
+ *
+ * @param int $page
+ * @return string
+ */
+ public function url($page)
+ {
+ if ($page <= 0) {
+ $page = 1;
+ }
+
+ // If we have any extra query string key / value pairs that need to be added
+ // onto the URL, we will put them in query string form and then attach it
+ // to the URL. This allows for extra information like sortings storage.
+ $parameters = [$this->pageName => $page];
+
+ if (count($this->query) > 0) {
+ $parameters = array_merge($this->query, $parameters);
+ }
+
+ return $this->path.'?'
+ .http_build_query($parameters, '', '&')
+ .$this->buildFragment();
+ }
+
+ /**
+ * Get the URL for the previous page.
+ *
+ * @return string|null
+ */
+ public function previousPageUrl()
+ {
+ if ($this->currentPage() > 1) {
+ return $this->url($this->currentPage() - 1);
+ }
+ }
+
+ /**
+ * Get / set the URL fragment to be appended to URLs.
+ *
+ * @param string|null $fragment
+ * @return $this|string|null
+ */
+ public function fragment($fragment = null)
+ {
+ if (is_null($fragment)) {
+ return $this->fragment;
+ }
+
+ $this->fragment = $fragment;
+
+ return $this;
+ }
+
+ /**
+ * Add a set of query string values to the paginator.
+ *
+ * @param array|string $key
+ * @param string|null $value
+ * @return $this
+ */
+ public function appends($key, $value = null)
+ {
+ if (is_array($key)) {
+ return $this->appendArray($key);
+ }
+
+ return $this->addQuery($key, $value);
+ }
+
+ /**
+ * Add an array of query string values.
+ *
+ * @param array $keys
+ * @return $this
+ */
+ protected function appendArray(array $keys)
+ {
+ foreach ($keys as $key => $value) {
+ $this->addQuery($key, $value);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a query string value to the paginator.
+ *
+ * @param string $key
+ * @param string $value
+ * @return $this
+ */
+ public function addQuery($key, $value)
+ {
+ if ($key !== $this->pageName) {
+ $this->query[$key] = $value;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Build the full fragment portion of a URL.
+ *
+ * @return string
+ */
+ protected function buildFragment()
+ {
+ return $this->fragment ? '#'.$this->fragment : '';
+ }
+
+ /**
+ * Get the slice of items being paginated.
+ *
+ * @return array
+ */
+ public function items()
+ {
+ return $this->items->all();
+ }
+
+ /**
+ * Get the number of the first item in the slice.
+ *
+ * @return int
+ */
+ public function firstItem()
+ {
+ return ($this->currentPage - 1) * $this->perPage + 1;
+ }
+
+ /**
+ * Get the number of the last item in the slice.
+ *
+ * @return int
+ */
+ public function lastItem()
+ {
+ return $this->firstItem() + $this->count() - 1;
+ }
+
+ /**
+ * Get the number of items shown per page.
+ *
+ * @return int
+ */
+ public function perPage()
+ {
+ return $this->perPage;
+ }
+
+ /**
+ * Get the current page.
+ *
+ * @return int
+ */
+ public function currentPage()
+ {
+ return $this->currentPage;
+ }
+
+ /**
+ * Determine if there are enough items to split into multiple pages.
+ *
+ * @return bool
+ */
+ public function hasPages()
+ {
+ return ! ($this->currentPage() == 1 && ! $this->hasMorePages());
+ }
+
+ /**
+ * Resolve the current request path or return the default value.
+ *
+ * @param string $default
+ * @return string
+ */
+ public static function resolveCurrentPath($default = '/')
+ {
+ if (isset(static::$currentPathResolver)) {
+ return call_user_func(static::$currentPathResolver);
+ }
+
+ return $default;
+ }
+
+ /**
+ * Set the current request path resolver callback.
+ *
+ * @param \Closure $resolver
+ * @return void
+ */
+ public static function currentPathResolver(Closure $resolver)
+ {
+ static::$currentPathResolver = $resolver;
+ }
+
+ /**
+ * Resolve the current page or return the default value.
+ *
+ * @param string $pageName
+ * @param int $default
+ * @return int
+ */
+ public static function resolveCurrentPage($pageName = 'page', $default = 1)
+ {
+ if (isset(static::$currentPageResolver)) {
+ return call_user_func(static::$currentPageResolver, $pageName);
+ }
+
+ return $default;
+ }
+
+ /**
+ * Set the current page resolver callback.
+ *
+ * @param \Closure $resolver
+ * @return void
+ */
+ public static function currentPageResolver(Closure $resolver)
+ {
+ static::$currentPageResolver = $resolver;
+ }
+
+ /**
+ * Set the default Presenter resolver.
+ *
+ * @param \Closure $resolver
+ * @return void
+ */
+ public static function presenter(Closure $resolver)
+ {
+ static::$presenterResolver = $resolver;
+ }
+
+ /**
+ * Get the query string variable used to store the page.
+ *
+ * @return string
+ */
+ public function getPageName()
+ {
+ return $this->pageName;
+ }
+
+ /**
+ * Set the query string variable used to store the page.
+ *
+ * @param string $name
+ * @return $this
+ */
+ public function setPageName($name)
+ {
+ $this->pageName = $name;
+
+ return $this;
+ }
+
+ /**
+ * Set the base path to assign to all URLs.
+ *
+ * @param string $path
+ * @return $this
+ */
+ public function setPath($path)
+ {
+ $this->path = $path;
+
+ return $this;
+ }
+
+ /**
+ * Get an iterator for the items.
+ *
+ * @return \ArrayIterator
+ */
+ public function getIterator()
+ {
+ return new ArrayIterator($this->items->all());
+ }
+
+ /**
+ * Determine if the list of items is empty or not.
+ *
+ * @return bool
+ */
+ public function isEmpty()
+ {
+ return $this->items->isEmpty();
+ }
+
+ /**
+ * Get the number of items for the current page.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return $this->items->count();
+ }
+
+ /**
+ * Get the paginator's underlying collection.
+ *
+ * @return \Illuminate\Support\Collection
+ */
+ public function getCollection()
+ {
+ return $this->items;
+ }
+
+ /**
+ * Determine if the given item exists.
+ *
+ * @param mixed $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ return $this->items->has($key);
+ }
+
+ /**
+ * Get the item at the given offset.
+ *
+ * @param mixed $key
+ * @return mixed
+ */
+ public function offsetGet($key)
+ {
+ return $this->items->get($key);
+ }
+
+ /**
+ * Set the item at the given offset.
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($key, $value)
+ {
+ $this->items->put($key, $value);
+ }
+
+ /**
+ * Unset the item at the given key.
+ *
+ * @param mixed $key
+ * @return void
+ */
+ public function offsetUnset($key)
+ {
+ $this->items->forget($key);
+ }
+
+ /**
+ * Make dynamic calls into the collection.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->getCollection(), $method], $parameters);
+ }
+
+ /**
+ * Render the contents of the paginator when casting to string.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->render();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreeNextPreviousButtonRendererTrait.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreeNextPreviousButtonRendererTrait.php
index 1d9aef3..a8fda50 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreeNextPreviousButtonRendererTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreeNextPreviousButtonRendererTrait.php
@@ -1,49 +1,48 @@
-paginator->currentPage() <= 1)
- {
- return $this->getDisabledTextWrapper($text);
- }
-
- $url = $this->paginator->url(
- $this->paginator->currentPage() - 1
- );
-
- return $this->getPageLinkWrapper($url, $text, 'prev');
- }
-
- /**
- * Get the next page pagination element.
- *
- * @param string $text
- * @return string
- */
- protected function getNextButton($text = '»')
- {
- // If the current page is greater than or equal to the last page, it means we
- // can't go any further into the pages, as we're already on this last page
- // that is available, so we will make it the "next" link style disabled.
- if ( ! $this->paginator->hasMorePages())
- {
- return $this->getDisabledTextWrapper($text);
- }
-
- $url = $this->paginator->url($this->paginator->currentPage() + 1);
-
- return $this->getPageLinkWrapper($url, $text, 'next');
- }
-
+paginator->currentPage() <= 1) {
+ return $this->getDisabledTextWrapper($text);
+ }
+
+ $url = $this->paginator->url(
+ $this->paginator->currentPage() - 1
+ );
+
+ return $this->getPageLinkWrapper($url, $text, 'prev');
+ }
+
+ /**
+ * Get the next page pagination element.
+ *
+ * @param string $text
+ * @return string
+ */
+ public function getNextButton($text = '»')
+ {
+ // If the current page is greater than or equal to the last page, it means we
+ // can't go any further into the pages, as we're already on this last page
+ // that is available, so we will make it the "next" link style disabled.
+ if (! $this->paginator->hasMorePages()) {
+ return $this->getDisabledTextWrapper($text);
+ }
+
+ $url = $this->paginator->url($this->paginator->currentPage() + 1);
+
+ return $this->getPageLinkWrapper($url, $text, 'next');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreePresenter.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreePresenter.php
index cd3d252..21e647d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreePresenter.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/BootstrapThreePresenter.php
@@ -1,134 +1,134 @@
-paginator = $paginator;
- $this->window = is_null($window) ? UrlWindow::make($paginator) : $window->get();
- }
-
- /**
- * Determine if the underlying paginator being presented has pages to show.
- *
- * @return bool
- */
- public function hasPages()
- {
- return $this->paginator->hasPages();
- }
-
- /**
- * Convert the URL window into Bootstrap HTML.
- *
- * @return string
- */
- public function render()
- {
- if ($this->hasPages())
- {
- return sprintf(
- '',
- $this->getPreviousButton(),
- $this->getLinks(),
- $this->getNextButton()
- );
- }
-
- return '';
- }
-
- /**
- * Get HTML wrapper for an available page link.
- *
- * @param string $url
- * @param int $page
- * @param string|null $rel
- * @return string
- */
- protected function getAvailablePageWrapper($url, $page, $rel = null)
- {
- $rel = is_null($rel) ? '' : ' rel="'.$rel.'"';
-
- return ''.$page.'';
- }
-
- /**
- * Get HTML wrapper for disabled text.
- *
- * @param string $text
- * @return string
- */
- protected function getDisabledTextWrapper($text)
- {
- return ''.$text.'';
- }
-
- /**
- * Get HTML wrapper for active text.
- *
- * @param string $text
- * @return string
- */
- protected function getActivePageWrapper($text)
- {
- return ''.$text.'';
- }
-
- /**
- * Get a pagination "dot" element.
- *
- * @return string
- */
- protected function getDots()
- {
- return $this->getDisabledTextWrapper("...");
- }
-
- /**
- * Get the current page from the paginator.
- *
- * @return int
- */
- protected function currentPage()
- {
- return $this->paginator->currentPage();
- }
-
- /**
- * Get the last page from the paginator.
- *
- * @return int
- */
- protected function lastPage()
- {
- return $this->paginator->lastPage();
- }
-
+class BootstrapThreePresenter implements PresenterContract
+{
+ use BootstrapThreeNextPreviousButtonRendererTrait, UrlWindowPresenterTrait;
+
+ /**
+ * The paginator implementation.
+ *
+ * @var \Illuminate\Contracts\Pagination\Paginator
+ */
+ protected $paginator;
+
+ /**
+ * The URL window data structure.
+ *
+ * @var array
+ */
+ protected $window;
+
+ /**
+ * Create a new Bootstrap presenter instance.
+ *
+ * @param \Illuminate\Contracts\Pagination\Paginator $paginator
+ * @param \Illuminate\Pagination\UrlWindow|null $window
+ * @return void
+ */
+ public function __construct(PaginatorContract $paginator, UrlWindow $window = null)
+ {
+ $this->paginator = $paginator;
+ $this->window = is_null($window) ? UrlWindow::make($paginator) : $window->get();
+ }
+
+ /**
+ * Determine if the underlying paginator being presented has pages to show.
+ *
+ * @return bool
+ */
+ public function hasPages()
+ {
+ return $this->paginator->hasPages();
+ }
+
+ /**
+ * Convert the URL window into Bootstrap HTML.
+ *
+ * @return string
+ */
+ public function render()
+ {
+ if ($this->hasPages()) {
+ return sprintf(
+ '',
+ $this->getPreviousButton(),
+ $this->getLinks(),
+ $this->getNextButton()
+ );
+ }
+
+ return '';
+ }
+
+ /**
+ * Get HTML wrapper for an available page link.
+ *
+ * @param string $url
+ * @param int $page
+ * @param string|null $rel
+ * @return string
+ */
+ protected function getAvailablePageWrapper($url, $page, $rel = null)
+ {
+ $rel = is_null($rel) ? '' : ' rel="'.$rel.'"';
+
+ return ''.$page.'';
+ }
+
+ /**
+ * Get HTML wrapper for disabled text.
+ *
+ * @param string $text
+ * @return string
+ */
+ protected function getDisabledTextWrapper($text)
+ {
+ return ''.$text.'';
+ }
+
+ /**
+ * Get HTML wrapper for active text.
+ *
+ * @param string $text
+ * @return string
+ */
+ protected function getActivePageWrapper($text)
+ {
+ return ''.$text.'';
+ }
+
+ /**
+ * Get a pagination "dot" element.
+ *
+ * @return string
+ */
+ protected function getDots()
+ {
+ return $this->getDisabledTextWrapper('...');
+ }
+
+ /**
+ * Get the current page from the paginator.
+ *
+ * @return int
+ */
+ protected function currentPage()
+ {
+ return $this->paginator->currentPage();
+ }
+
+ /**
+ * Get the last page from the paginator.
+ *
+ * @return int
+ */
+ protected function lastPage()
+ {
+ return $this->paginator->lastPage();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/LengthAwarePaginator.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/LengthAwarePaginator.php
index 468505d..8c562e1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/LengthAwarePaginator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/LengthAwarePaginator.php
@@ -1,4 +1,6 @@
- $value)
- {
- $this->{$key} = $value;
- }
-
- $this->total = $total;
- $this->perPage = $perPage;
- $this->lastPage = (int) ceil($total / $perPage);
- $this->currentPage = $this->setCurrentPage($currentPage, $this->lastPage);
- $this->path = $this->path != '/' ? rtrim($this->path, '/').'/' : $this->path;
- $this->items = $items instanceof Collection ? $items : Collection::make($items);
- }
-
- /**
- * Get the current page for the request.
- *
- * @param int $currentPage
- * @param int $lastPage
- * @return int
- */
- protected function setCurrentPage($currentPage, $lastPage)
- {
- $currentPage = $currentPage ?: static::resolveCurrentPage();
-
- // The page number will get validated and adjusted if it either less than one
- // or greater than the last page available based on the count of the given
- // items array. If it's greater than the last, we'll give back the last.
- if (is_numeric($currentPage) && $currentPage > $lastPage)
- {
- return $lastPage > 0 ? $lastPage : 1;
- }
-
- return $this->isValidPageNumber($currentPage) ? (int) $currentPage : 1;
- }
-
- /**
- * Get the URL for the next page.
- *
- * @return string
- */
- public function nextPageUrl()
- {
- if ($this->lastPage() > $this->currentPage())
- {
- return $this->url($this->currentPage() + 1);
- }
- }
-
- /**
- * Determine if there are more items in the data source.
- *
- * @return bool
- */
- public function hasMorePages()
- {
- return $this->currentPage() < $this->lastPage();
- }
-
- /**
- * Get the total number of items being paginated.
- *
- * @return int
- */
- public function total()
- {
- return $this->total;
- }
-
- /**
- * Get the last page.
- *
- * @return int
- */
- public function lastPage()
- {
- return $this->lastPage;
- }
-
- /**
- * Render the paginator using the given presenter.
- *
- * @param \Illuminate\Contracts\Pagination\Presenter|null $presenter
- * @return string
- */
- public function render(Presenter $presenter = null)
- {
- if (is_null($presenter) && static::$presenterResolver)
- {
- $presenter = call_user_func(static::$presenterResolver, $this);
- }
-
- $presenter = $presenter ?: new BootstrapThreePresenter($this);
-
- return $presenter->render();
- }
-
- /**
- * Get the instance as an array.
- *
- * @return array
- */
- public function toArray()
- {
- return [
- 'total' => $this->total(),
- 'per_page' => $this->perPage(),
- 'current_page' => $this->currentPage(),
- 'last_page' => $this->lastPage(),
- 'next_page_url' => $this->nextPageUrl(),
- 'prev_page_url' => $this->previousPageUrl(),
- 'from' => $this->firstItem(),
- 'to' => $this->lastItem(),
- 'data' => $this->items->toArray(),
- ];
- }
-
- /**
- * Convert the object to its JSON representation.
- *
- * @param int $options
- * @return string
- */
- public function toJson($options = 0)
- {
- return json_encode($this->toArray(), $options);
- }
-
+class LengthAwarePaginator extends AbstractPaginator implements Arrayable, ArrayAccess, Countable, IteratorAggregate, Jsonable, LengthAwarePaginatorContract
+{
+ /**
+ * The total number of items before slicing.
+ *
+ * @var int
+ */
+ protected $total;
+
+ /**
+ * The last available page.
+ *
+ * @var int
+ */
+ protected $lastPage;
+
+ /**
+ * Create a new paginator instance.
+ *
+ * @param mixed $items
+ * @param int $total
+ * @param int $perPage
+ * @param int|null $currentPage
+ * @param array $options (path, query, fragment, pageName)
+ * @return void
+ */
+ public function __construct($items, $total, $perPage, $currentPage = null, array $options = [])
+ {
+ foreach ($options as $key => $value) {
+ $this->{$key} = $value;
+ }
+
+ $this->total = $total;
+ $this->perPage = $perPage;
+ $this->lastPage = (int) ceil($total / $perPage);
+ $this->path = $this->path != '/' ? rtrim($this->path, '/') : $this->path;
+ $this->currentPage = $this->setCurrentPage($currentPage, $this->lastPage);
+ $this->items = $items instanceof Collection ? $items : Collection::make($items);
+ }
+
+ /**
+ * Get the current page for the request.
+ *
+ * @param int $currentPage
+ * @param int $lastPage
+ * @return int
+ */
+ protected function setCurrentPage($currentPage, $lastPage)
+ {
+ $currentPage = $currentPage ?: static::resolveCurrentPage();
+
+ // The page number will get validated and adjusted if it either less than one
+ // or greater than the last page available based on the count of the given
+ // items array. If it's greater than the last, we'll give back the last.
+ if (is_numeric($currentPage) && $currentPage > $lastPage) {
+ return $lastPage > 0 ? $lastPage : 1;
+ }
+
+ return $this->isValidPageNumber($currentPage) ? (int) $currentPage : 1;
+ }
+
+ /**
+ * Get the URL for the next page.
+ *
+ * @return string|null
+ */
+ public function nextPageUrl()
+ {
+ if ($this->lastPage() > $this->currentPage()) {
+ return $this->url($this->currentPage() + 1);
+ }
+ }
+
+ /**
+ * Determine if there are more items in the data source.
+ *
+ * @return bool
+ */
+ public function hasMorePages()
+ {
+ return $this->currentPage() < $this->lastPage();
+ }
+
+ /**
+ * Get the total number of items being paginated.
+ *
+ * @return int
+ */
+ public function total()
+ {
+ return $this->total;
+ }
+
+ /**
+ * Get the last page.
+ *
+ * @return int
+ */
+ public function lastPage()
+ {
+ return $this->lastPage;
+ }
+
+ /**
+ * Render the paginator using the given presenter.
+ *
+ * @param \Illuminate\Contracts\Pagination\Presenter|null $presenter
+ * @return string
+ */
+ public function render(Presenter $presenter = null)
+ {
+ if (is_null($presenter) && static::$presenterResolver) {
+ $presenter = call_user_func(static::$presenterResolver, $this);
+ }
+
+ $presenter = $presenter ?: new BootstrapThreePresenter($this);
+
+ return $presenter->render();
+ }
+
+ /**
+ * Get the instance as an array.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ return [
+ 'total' => $this->total(),
+ 'per_page' => $this->perPage(),
+ 'current_page' => $this->currentPage(),
+ 'last_page' => $this->lastPage(),
+ 'next_page_url' => $this->nextPageUrl(),
+ 'prev_page_url' => $this->previousPageUrl(),
+ 'from' => $this->firstItem(),
+ 'to' => $this->lastItem(),
+ 'data' => $this->items->toArray(),
+ ];
+ }
+
+ /**
+ * Convert the object to its JSON representation.
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toJson($options = 0)
+ {
+ return json_encode($this->toArray(), $options);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php
index 980c5fe..48d3e2c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php
@@ -1,25 +1,30 @@
-app['request']->url();
+ });
- /**
- * Register the service provider.
- *
- * @return void
- */
- public function register()
- {
- Paginator::currentPathResolver(function()
- {
- return $this->app['request']->url();
- });
+ Paginator::currentPageResolver(function ($pageName = 'page') {
+ $page = $this->app['request']->input($pageName);
- Paginator::currentPageResolver(function()
- {
- return $this->app['request']->input('page');
- });
- }
+ if (filter_var($page, FILTER_VALIDATE_INT) !== false && (int) $page >= 1) {
+ return $page;
+ }
+ return 1;
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php
index 5f1fe97..6229f06 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php
@@ -1,4 +1,6 @@
- $value)
- {
- $this->{$key} = $value;
- }
-
- $this->perPage = $perPage;
- $this->currentPage = $this->setCurrentPage($currentPage);
- $this->path = $this->path != '/' ? rtrim($this->path, '/').'/' : $this->path;
- $this->items = $items instanceof Collection ? $items : Collection::make($items);
-
- $this->checkForMorePages();
- }
-
- /**
- * Get the current page for the request.
- *
- * @param int $currentPage
- * @return int
- */
- protected function setCurrentPage($currentPage)
- {
- $currentPage = $currentPage ?: static::resolveCurrentPage();
-
- return $this->isValidPageNumber($currentPage) ? (int) $currentPage : 1;
- }
-
- /**
- * Check for more pages. The last item will be sliced off.
- *
- * @return void
- */
- protected function checkForMorePages()
- {
- $this->hasMore = count($this->items) > ($this->perPage);
-
- $this->items = $this->items->slice(0, $this->perPage);
- }
-
- /**
- * Get the URL for the next page.
- *
- * @return string|null
- */
- public function nextPageUrl()
- {
- if ($this->hasMore)
- {
- return $this->url($this->currentPage() + 1);
- }
- }
-
- /**
- * Determine if there are more items in the data source.
- *
- * @return bool
- */
- public function hasMorePages()
- {
- return $this->hasMore;
- }
-
- /**
- * Render the paginator using the given presenter.
- *
- * @param \Illuminate\Contracts\Pagination\Presenter|null $presenter
- * @return string
- */
- public function render(Presenter $presenter = null)
- {
- if (is_null($presenter) && static::$presenterResolver)
- {
- $presenter = call_user_func(static::$presenterResolver, $this);
- }
-
- $presenter = $presenter ?: new SimpleBootstrapThreePresenter($this);
-
- return $presenter->render();
- }
-
- /**
- * Get the instance as an array.
- *
- * @return array
- */
- public function toArray()
- {
- return [
- 'per_page' => $this->perPage(), 'current_page' => $this->currentPage(),
- 'next_page_url' => $this->nextPageUrl(), 'prev_page_url' => $this->previousPageUrl(),
- 'from' => $this->firstItem(), 'to' => $this->lastItem(),
- 'data' => $this->items->toArray(),
- ];
- }
-
- /**
- * Convert the object to its JSON representation.
- *
- * @param int $options
- * @return string
- */
- public function toJson($options = 0)
- {
- return json_encode($this->toArray(), $options);
- }
-
+class Paginator extends AbstractPaginator implements Arrayable, ArrayAccess, Countable, IteratorAggregate, Jsonable, PaginatorContract
+{
+ /**
+ * Determine if there are more items in the data source.
+ *
+ * @return bool
+ */
+ protected $hasMore;
+
+ /**
+ * Create a new paginator instance.
+ *
+ * @param mixed $items
+ * @param int $perPage
+ * @param int|null $currentPage
+ * @param array $options (path, query, fragment, pageName)
+ * @return void
+ */
+ public function __construct($items, $perPage, $currentPage = null, array $options = [])
+ {
+ foreach ($options as $key => $value) {
+ $this->{$key} = $value;
+ }
+
+ $this->perPage = $perPage;
+ $this->currentPage = $this->setCurrentPage($currentPage);
+ $this->path = $this->path != '/' ? rtrim($this->path, '/') : $this->path;
+ $this->items = $items instanceof Collection ? $items : Collection::make($items);
+
+ $this->checkForMorePages();
+ }
+
+ /**
+ * Get the current page for the request.
+ *
+ * @param int $currentPage
+ * @return int
+ */
+ protected function setCurrentPage($currentPage)
+ {
+ $currentPage = $currentPage ?: static::resolveCurrentPage();
+
+ return $this->isValidPageNumber($currentPage) ? (int) $currentPage : 1;
+ }
+
+ /**
+ * Check for more pages. The last item will be sliced off.
+ *
+ * @return void
+ */
+ protected function checkForMorePages()
+ {
+ $this->hasMore = count($this->items) > ($this->perPage);
+
+ $this->items = $this->items->slice(0, $this->perPage);
+ }
+
+ /**
+ * Get the URL for the next page.
+ *
+ * @return string|null
+ */
+ public function nextPageUrl()
+ {
+ if ($this->hasMore) {
+ return $this->url($this->currentPage() + 1);
+ }
+ }
+
+ /**
+ * Determine if there are more items in the data source.
+ *
+ * @return bool
+ */
+ public function hasMorePages()
+ {
+ return $this->hasMore;
+ }
+
+ /**
+ * Render the paginator using the given presenter.
+ *
+ * @param \Illuminate\Contracts\Pagination\Presenter|null $presenter
+ * @return string
+ */
+ public function render(Presenter $presenter = null)
+ {
+ if (is_null($presenter) && static::$presenterResolver) {
+ $presenter = call_user_func(static::$presenterResolver, $this);
+ }
+
+ $presenter = $presenter ?: new SimpleBootstrapThreePresenter($this);
+
+ return $presenter->render();
+ }
+
+ /**
+ * Get the instance as an array.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ return [
+ 'per_page' => $this->perPage(), 'current_page' => $this->currentPage(),
+ 'next_page_url' => $this->nextPageUrl(), 'prev_page_url' => $this->previousPageUrl(),
+ 'from' => $this->firstItem(), 'to' => $this->lastItem(),
+ 'data' => $this->items->toArray(),
+ ];
+ }
+
+ /**
+ * Convert the object to its JSON representation.
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toJson($options = 0)
+ {
+ return json_encode($this->toArray(), $options);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/SimpleBootstrapThreePresenter.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/SimpleBootstrapThreePresenter.php
index be1851f..bbb2790 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/SimpleBootstrapThreePresenter.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/SimpleBootstrapThreePresenter.php
@@ -1,47 +1,47 @@
-paginator = $paginator;
- }
+use Illuminate\Contracts\Pagination\Paginator as PaginatorContract;
- /**
- * Determine if the underlying paginator being presented has pages to show.
- *
- * @return bool
- */
- public function hasPages()
- {
- return $this->paginator->hasPages() && count($this->paginator->items()) > 0;
- }
+class SimpleBootstrapThreePresenter extends BootstrapThreePresenter
+{
+ /**
+ * Create a simple Bootstrap 3 presenter.
+ *
+ * @param \Illuminate\Contracts\Pagination\Paginator $paginator
+ * @return void
+ */
+ public function __construct(PaginatorContract $paginator)
+ {
+ $this->paginator = $paginator;
+ }
- /**
- * Convert the URL window into Bootstrap HTML.
- *
- * @return string
- */
- public function render()
- {
- if ($this->hasPages())
- {
- return sprintf(
- '',
- $this->getPreviousButton(),
- $this->getNextButton()
- );
- }
+ /**
+ * Determine if the underlying paginator being presented has pages to show.
+ *
+ * @return bool
+ */
+ public function hasPages()
+ {
+ return $this->paginator->hasPages() && count($this->paginator->items()) > 0;
+ }
- return '';
- }
+ /**
+ * Convert the URL window into Bootstrap HTML.
+ *
+ * @return string
+ */
+ public function render()
+ {
+ if ($this->hasPages()) {
+ return sprintf(
+ '',
+ $this->getPreviousButton(),
+ $this->getNextButton()
+ );
+ }
+ return '';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
index e501aa6..655f646 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
@@ -1,225 +1,222 @@
-paginator = $paginator;
- }
-
- /**
- * Create a new URL window instance.
- *
- * @param \Illuminate\Contracts\Pagination\LengthAwarePaginator $paginator
- * @param int $onEachSide
- * @return array
- */
- public static function make(PaginatorContract $paginator, $onEachSide = 3)
- {
- return (new static($paginator))->get($onEachSide);
- }
-
- /**
- * Get the window of URLs to be shown.
- *
- * @param int $onEachSide
- * @return array
- */
- public function get($onEachSide = 3)
- {
- if ($this->paginator->lastPage() < ($onEachSide * 2) + 6)
- {
- return $this->getSmallSlider();
- }
-
- return $this->getUrlSlider($onEachSide);
- }
-
- /**
- * Get the slider of URLs there are not enough pages to slide.
- *
- * @return array
- */
- protected function getSmallSlider()
- {
- return [
- 'first' => $this->paginator->getUrlRange(1, $this->lastPage()),
- 'slider' => null,
- 'last' => null,
- ];
- }
-
- /**
- * Create a URL slider links.
- *
- * @param int $onEachSide
- * @return array
- */
- protected function getUrlSlider($onEachSide)
- {
- $window = $onEachSide * 2;
-
- if ( ! $this->hasPages())
- {
- return [
- 'first' => null,
- 'slider' => null,
- 'last' => null,
- ];
- }
-
- // If the current page is very close to the beginning of the page range, we will
- // just render the beginning of the page range, followed by the last 2 of the
- // links in this list, since we will not have room to create a full slider.
- if ($this->currentPage() <= $window)
- {
- return $this->getSliderTooCloseToBeginning($window);
- }
-
- // If the current page is close to the ending of the page range we will just get
- // this first couple pages, followed by a larger window of these ending pages
- // since we're too close to the end of the list to create a full on slider.
- elseif ($this->currentPage() > ($this->lastPage() - $window))
- {
- return $this->getSliderTooCloseToEnding($window);
- }
-
- // If we have enough room on both sides of the current page to build a slider we
- // will surround it with both the beginning and ending caps, with this window
- // of pages in the middle providing a Google style sliding paginator setup.
- return $this->getFullSlider($onEachSide);
- }
-
- /**
- * Get the slider of URLs when too close to beginning of window.
- *
- * @param int $window
- * @return array
- */
- protected function getSliderTooCloseToBeginning($window)
- {
- return [
- 'first' => $this->paginator->getUrlRange(1, $window + 2),
- 'slider' => null,
- 'last' => $this->getFinish(),
- ];
- }
-
- /**
- * Get the slider of URLs when too close to ending of window.
- *
- * @param int $window
- * @return array
- */
- protected function getSliderTooCloseToEnding($window)
- {
- $last = $this->paginator->getUrlRange(
- $this->lastPage() - ($window + 2),
- $this->lastPage()
- );
-
- return [
- 'first' => $this->getStart(),
- 'slider' => null,
- 'last' => $last,
- ];
- }
-
- /**
- * Get the slider of URLs when a full slider can be made.
- *
- * @param int $onEachSide
- * @return array
- */
- protected function getFullSlider($onEachSide)
- {
- return [
- 'first' => $this->getStart(),
- 'slider' => $this->getAdjacentUrlRange($onEachSide),
- 'last' => $this->getFinish(),
- ];
- }
-
- /**
- * Get the page range for the current page window.
- *
- * @param int $onEachSide
- * @return array
- */
- public function getAdjacentUrlRange($onEachSide)
- {
- return $this->paginator->getUrlRange(
- $this->currentPage() - $onEachSide,
- $this->currentPage() + $onEachSide
- );
- }
-
- /**
- * Get the starting URLs of a pagination slider.
- *
- * @return array
- */
- public function getStart()
- {
- return $this->paginator->getUrlRange(1, 2);
- }
-
- /**
- * Get the ending URLs of a pagination slider.
- *
- * @return array
- */
- public function getFinish()
- {
- return $this->paginator->getUrlRange(
- $this->lastPage() - 1,
- $this->lastPage()
- );
- }
-
- /**
- * Determine if the underlying paginator being presented has pages to show.
- *
- * @return bool
- */
- public function hasPages()
- {
- return $this->paginator->lastPage() > 1;
- }
-
- /**
- * Get the current page from the paginator.
- *
- * @return int
- */
- protected function currentPage()
- {
- return $this->paginator->currentPage();
- }
-
- /**
- * Get the last page from the paginator.
- *
- * @return int
- */
- protected function lastPage()
- {
- return $this->paginator->lastPage();
- }
+use Illuminate\Contracts\Pagination\LengthAwarePaginator as PaginatorContract;
+class UrlWindow
+{
+ /**
+ * The paginator implementation.
+ *
+ * @var \Illuminate\Contracts\Pagination\LengthAwarePaginator
+ */
+ protected $paginator;
+
+ /**
+ * Create a new URL window instance.
+ *
+ * @param \Illuminate\Contracts\Pagination\LengthAwarePaginator $paginator
+ * @return void
+ */
+ public function __construct(PaginatorContract $paginator)
+ {
+ $this->paginator = $paginator;
+ }
+
+ /**
+ * Create a new URL window instance.
+ *
+ * @param \Illuminate\Contracts\Pagination\LengthAwarePaginator $paginator
+ * @param int $onEachSide
+ * @return array
+ */
+ public static function make(PaginatorContract $paginator, $onEachSide = 3)
+ {
+ return (new static($paginator))->get($onEachSide);
+ }
+
+ /**
+ * Get the window of URLs to be shown.
+ *
+ * @param int $onEachSide
+ * @return array
+ */
+ public function get($onEachSide = 3)
+ {
+ if ($this->paginator->lastPage() < ($onEachSide * 2) + 6) {
+ return $this->getSmallSlider();
+ }
+
+ return $this->getUrlSlider($onEachSide);
+ }
+
+ /**
+ * Get the slider of URLs there are not enough pages to slide.
+ *
+ * @return array
+ */
+ protected function getSmallSlider()
+ {
+ return [
+ 'first' => $this->paginator->getUrlRange(1, $this->lastPage()),
+ 'slider' => null,
+ 'last' => null,
+ ];
+ }
+
+ /**
+ * Create a URL slider links.
+ *
+ * @param int $onEachSide
+ * @return array
+ */
+ protected function getUrlSlider($onEachSide)
+ {
+ $window = $onEachSide * 2;
+
+ if (! $this->hasPages()) {
+ return [
+ 'first' => null,
+ 'slider' => null,
+ 'last' => null,
+ ];
+ }
+
+ // If the current page is very close to the beginning of the page range, we will
+ // just render the beginning of the page range, followed by the last 2 of the
+ // links in this list, since we will not have room to create a full slider.
+ if ($this->currentPage() <= $window) {
+ return $this->getSliderTooCloseToBeginning($window);
+ }
+
+ // If the current page is close to the ending of the page range we will just get
+ // this first couple pages, followed by a larger window of these ending pages
+ // since we're too close to the end of the list to create a full on slider.
+ elseif ($this->currentPage() > ($this->lastPage() - $window)) {
+ return $this->getSliderTooCloseToEnding($window);
+ }
+
+ // If we have enough room on both sides of the current page to build a slider we
+ // will surround it with both the beginning and ending caps, with this window
+ // of pages in the middle providing a Google style sliding paginator setup.
+ return $this->getFullSlider($onEachSide);
+ }
+
+ /**
+ * Get the slider of URLs when too close to beginning of window.
+ *
+ * @param int $window
+ * @return array
+ */
+ protected function getSliderTooCloseToBeginning($window)
+ {
+ return [
+ 'first' => $this->paginator->getUrlRange(1, $window + 2),
+ 'slider' => null,
+ 'last' => $this->getFinish(),
+ ];
+ }
+
+ /**
+ * Get the slider of URLs when too close to ending of window.
+ *
+ * @param int $window
+ * @return array
+ */
+ protected function getSliderTooCloseToEnding($window)
+ {
+ $last = $this->paginator->getUrlRange(
+ $this->lastPage() - ($window + 2),
+ $this->lastPage()
+ );
+
+ return [
+ 'first' => $this->getStart(),
+ 'slider' => null,
+ 'last' => $last,
+ ];
+ }
+
+ /**
+ * Get the slider of URLs when a full slider can be made.
+ *
+ * @param int $onEachSide
+ * @return array
+ */
+ protected function getFullSlider($onEachSide)
+ {
+ return [
+ 'first' => $this->getStart(),
+ 'slider' => $this->getAdjacentUrlRange($onEachSide),
+ 'last' => $this->getFinish(),
+ ];
+ }
+
+ /**
+ * Get the page range for the current page window.
+ *
+ * @param int $onEachSide
+ * @return array
+ */
+ public function getAdjacentUrlRange($onEachSide)
+ {
+ return $this->paginator->getUrlRange(
+ $this->currentPage() - $onEachSide,
+ $this->currentPage() + $onEachSide
+ );
+ }
+
+ /**
+ * Get the starting URLs of a pagination slider.
+ *
+ * @return array
+ */
+ public function getStart()
+ {
+ return $this->paginator->getUrlRange(1, 2);
+ }
+
+ /**
+ * Get the ending URLs of a pagination slider.
+ *
+ * @return array
+ */
+ public function getFinish()
+ {
+ return $this->paginator->getUrlRange(
+ $this->lastPage() - 1,
+ $this->lastPage()
+ );
+ }
+
+ /**
+ * Determine if the underlying paginator being presented has pages to show.
+ *
+ * @return bool
+ */
+ public function hasPages()
+ {
+ return $this->paginator->lastPage() > 1;
+ }
+
+ /**
+ * Get the current page from the paginator.
+ *
+ * @return int
+ */
+ protected function currentPage()
+ {
+ return $this->paginator->currentPage();
+ }
+
+ /**
+ * Get the last page from the paginator.
+ *
+ * @return int
+ */
+ protected function lastPage()
+ {
+ return $this->paginator->lastPage();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindowPresenterTrait.php b/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindowPresenterTrait.php
index 1b13483..64a3397 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindowPresenterTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindowPresenterTrait.php
@@ -1,70 +1,66 @@
-window['first']))
- {
- $html .= $this->getUrlLinks($this->window['first']);
- }
+ if (is_array($this->window['first'])) {
+ $html .= $this->getUrlLinks($this->window['first']);
+ }
- if (is_array($this->window['slider']))
- {
- $html .= $this->getDots();
- $html .= $this->getUrlLinks($this->window['slider']);
- }
+ if (is_array($this->window['slider'])) {
+ $html .= $this->getDots();
+ $html .= $this->getUrlLinks($this->window['slider']);
+ }
- if (is_array($this->window['last']))
- {
- $html .= $this->getDots();
- $html .= $this->getUrlLinks($this->window['last']);
- }
+ if (is_array($this->window['last'])) {
+ $html .= $this->getDots();
+ $html .= $this->getUrlLinks($this->window['last']);
+ }
- return $html;
- }
+ return $html;
+ }
- /**
- * Get the links for the URLs in the given array.
- *
- * @param array $urls
- * @return string
- */
- protected function getUrlLinks(array $urls)
- {
- $html = '';
+ /**
+ * Get the links for the URLs in the given array.
+ *
+ * @param array $urls
+ * @return string
+ */
+ protected function getUrlLinks(array $urls)
+ {
+ $html = '';
- foreach ($urls as $page => $url)
- {
- $html .= $this->getPageLinkWrapper($url, $page);
- }
+ foreach ($urls as $page => $url) {
+ $html .= $this->getPageLinkWrapper($url, $page);
+ }
- return $html;
- }
+ return $html;
+ }
- /**
- * Get HTML wrapper for a page link.
- *
- * @param string $url
- * @param int $page
- * @param string|null $rel
- * @return string
- */
- protected function getPageLinkWrapper($url, $page, $rel = null)
- {
- if ($page == $this->paginator->currentPage())
- {
- return $this->getActivePageWrapper($page);
- }
-
- return $this->getAvailablePageWrapper($url, $page, $rel);
- }
+ /**
+ * Get HTML wrapper for a page link.
+ *
+ * @param string $url
+ * @param int $page
+ * @param string|null $rel
+ * @return string
+ */
+ protected function getPageLinkWrapper($url, $page, $rel = null)
+ {
+ if ($page == $this->paginator->currentPage()) {
+ return $this->getActivePageWrapper($page);
+ }
+ return $this->getAvailablePageWrapper($url, $page, $rel);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pagination/composer.json b/application/vendor/laravel/framework/src/Illuminate/Pagination/composer.json
index 9ac2f69..871c66e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pagination/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Pagination/composer.json
@@ -14,9 +14,9 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*"
},
"autoload": {
"psr-4": {
@@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pipeline/Hub.php b/application/vendor/laravel/framework/src/Illuminate/Pipeline/Hub.php
index 2ad1bd9..ed48df4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pipeline/Hub.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pipeline/Hub.php
@@ -1,73 +1,74 @@
-container = $container;
- }
+ /**
+ * All of the available pipelines.
+ *
+ * @var array
+ */
+ protected $pipelines = [];
- /**
- * Define the default named pipeline.
- *
- * @param \Closure $callback
- * @return void
- */
- public function defaults(Closure $callback)
- {
- return $this->pipeline('default', $callback);
- }
+ /**
+ * Create a new Depot instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function __construct(Container $container)
+ {
+ $this->container = $container;
+ }
- /**
- * Define a new named pipeline.
- *
- * @param string $name
- * @param \Closure $callback
- * @return void
- */
- public function pipeline($name, Closure $callback)
- {
- $this->pipelines[$name] = $callback;
- }
+ /**
+ * Define the default named pipeline.
+ *
+ * @param \Closure $callback
+ * @return void
+ */
+ public function defaults(Closure $callback)
+ {
+ return $this->pipeline('default', $callback);
+ }
- /**
- * Send an object through one of the available pipelines.
- *
- * @param mixed $object
- * @param string|null $pipeline
- * @return mixed
- */
- public function pipe($object, $pipeline = null)
- {
- $pipeline = $pipeline ?: 'default';
+ /**
+ * Define a new named pipeline.
+ *
+ * @param string $name
+ * @param \Closure $callback
+ * @return void
+ */
+ public function pipeline($name, Closure $callback)
+ {
+ $this->pipelines[$name] = $callback;
+ }
- return call_user_func(
- $this->pipelines[$pipeline], new Pipeline($this->container), $object
- );
- }
+ /**
+ * Send an object through one of the available pipelines.
+ *
+ * @param mixed $object
+ * @param string|null $pipeline
+ * @return mixed
+ */
+ public function pipe($object, $pipeline = null)
+ {
+ $pipeline = $pipeline ?: 'default';
+ return call_user_func(
+ $this->pipelines[$pipeline], new Pipeline($this->container), $object
+ );
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php b/application/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
index bfcc4e2..12aa6d7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
@@ -1,145 +1,159 @@
-container = $container;
- }
-
- /**
- * Set the object being sent through the pipeline.
- *
- * @param mixed $passable
- * @return $this
- */
- public function send($passable)
- {
- $this->passable = $passable;
-
- return $this;
- }
-
- /**
- * Set the array of pipes.
- *
- * @param dynamic|array $pipes
- * @return $this
- */
- public function through($pipes)
- {
- $this->pipes = is_array($pipes) ? $pipes : func_get_args();
-
- return $this;
- }
-
- /**
- * Set the method to call on the pipes.
- *
- * @param string $method
- * @return $this
- */
- public function via($method)
- {
- $this->method = $method;
-
- return $this;
- }
-
- /**
- * Run the pipeline with a final destination callback.
- *
- * @param \Closure $destination
- * @return mixed
- */
- public function then(Closure $destination)
- {
- $firstSlice = $this->getInitialSlice($destination);
-
- $pipes = array_reverse($this->pipes);
-
- return call_user_func(
- array_reduce($pipes, $this->getSlice(), $firstSlice), $this->passable
- );
- }
-
- /**
- * Get a Closure that represents a slice of the application onion.
- *
- * @return \Closure
- */
- protected function getSlice()
- {
- return function($stack, $pipe)
- {
- return function($passable) use ($stack, $pipe)
- {
- // If the pipe is an instance of a Closure, we will just call it directly but
- // otherwise we'll resolve the pipes out of the container and call it with
- // the appropriate method and arguments, returning the results back out.
- if ($pipe instanceof Closure)
- {
- return call_user_func($pipe, $passable, $stack);
- }
- else
- {
- return $this->container->make($pipe)
- ->{$this->method}($passable, $stack);
- }
- };
- };
- }
-
- /**
- * Get the initial slice to begin the stack call.
- *
- * @param \Closure $destination
- * @return \Closure
- */
- protected function getInitialSlice(Closure $destination)
- {
- return function($passable) use ($destination)
- {
- return call_user_func($destination, $passable);
- };
- }
-
+class Pipeline implements PipelineContract
+{
+ /**
+ * The container implementation.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The object being passed through the pipeline.
+ *
+ * @var mixed
+ */
+ protected $passable;
+
+ /**
+ * The array of class pipes.
+ *
+ * @var array
+ */
+ protected $pipes = [];
+
+ /**
+ * The method to call on each pipe.
+ *
+ * @var string
+ */
+ protected $method = 'handle';
+
+ /**
+ * Create a new class instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function __construct(Container $container)
+ {
+ $this->container = $container;
+ }
+
+ /**
+ * Set the object being sent through the pipeline.
+ *
+ * @param mixed $passable
+ * @return $this
+ */
+ public function send($passable)
+ {
+ $this->passable = $passable;
+
+ return $this;
+ }
+
+ /**
+ * Set the array of pipes.
+ *
+ * @param array|mixed $pipes
+ * @return $this
+ */
+ public function through($pipes)
+ {
+ $this->pipes = is_array($pipes) ? $pipes : func_get_args();
+
+ return $this;
+ }
+
+ /**
+ * Set the method to call on the pipes.
+ *
+ * @param string $method
+ * @return $this
+ */
+ public function via($method)
+ {
+ $this->method = $method;
+
+ return $this;
+ }
+
+ /**
+ * Run the pipeline with a final destination callback.
+ *
+ * @param \Closure $destination
+ * @return mixed
+ */
+ public function then(Closure $destination)
+ {
+ $firstSlice = $this->getInitialSlice($destination);
+
+ $pipes = array_reverse($this->pipes);
+
+ return call_user_func(
+ array_reduce($pipes, $this->getSlice(), $firstSlice), $this->passable
+ );
+ }
+
+ /**
+ * Get a Closure that represents a slice of the application onion.
+ *
+ * @return \Closure
+ */
+ protected function getSlice()
+ {
+ return function ($stack, $pipe) {
+ return function ($passable) use ($stack, $pipe) {
+ // If the pipe is an instance of a Closure, we will just call it directly but
+ // otherwise we'll resolve the pipes out of the container and call it with
+ // the appropriate method and arguments, returning the results back out.
+ if ($pipe instanceof Closure) {
+ return call_user_func($pipe, $passable, $stack);
+ } else {
+ list($name, $parameters) = $this->parsePipeString($pipe);
+
+ return call_user_func_array([$this->container->make($name), $this->method],
+ array_merge([$passable, $stack], $parameters));
+ }
+ };
+ };
+ }
+
+ /**
+ * Get the initial slice to begin the stack call.
+ *
+ * @param \Closure $destination
+ * @return \Closure
+ */
+ protected function getInitialSlice(Closure $destination)
+ {
+ return function ($passable) use ($destination) {
+ return call_user_func($destination, $passable);
+ };
+ }
+
+ /**
+ * Parse full pipe string to get name and parameters.
+ *
+ * @param string $pipe
+ * @return array
+ */
+ protected function parsePipeString($pipe)
+ {
+ list($name, $parameters) = array_pad(explode(':', $pipe, 2), 2, []);
+
+ if (is_string($parameters)) {
+ $parameters = explode(',', $parameters);
+ }
+
+ return [$name, $parameters];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php
index dccd250..aceaddf 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php
@@ -1,38 +1,39 @@
-app->singleton(
- 'Illuminate\Contracts\Pipeline\Hub', 'Illuminate\Pipeline\Hub'
- );
- }
+class PipelineServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return [
- 'Illuminate\Contracts\Pipeline\Hub',
- ];
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton(
+ 'Illuminate\Contracts\Pipeline\Hub', 'Illuminate\Pipeline\Hub'
+ );
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'Illuminate\Contracts\Pipeline\Hub',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json b/application/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json
index 97ef7ec..85b0734 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json
@@ -14,9 +14,9 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*"
},
"autoload": {
"psr-4": {
@@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
index 34f6780..ad090ac 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
@@ -1,143 +1,143 @@
-default = $default;
- $this->timeToRun = $timeToRun;
- $this->pheanstalk = $pheanstalk;
- }
-
- /**
- * Push a new job onto the queue.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function push($job, $data = '', $queue = null)
- {
- return $this->pushRaw($this->createPayload($job, $data), $queue);
- }
-
- /**
- * Push a raw payload onto the queue.
- *
- * @param string $payload
- * @param string $queue
- * @param array $options
- * @return mixed
- */
- public function pushRaw($payload, $queue = null, array $options = array())
- {
- return $this->pheanstalk->useTube($this->getQueue($queue))->put(
- $payload, Pheanstalk::DEFAULT_PRIORITY, Pheanstalk::DEFAULT_DELAY, $this->timeToRun
- );
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function later($delay, $job, $data = '', $queue = null)
- {
- $payload = $this->createPayload($job, $data);
-
- $pheanstalk = $this->pheanstalk->useTube($this->getQueue($queue));
-
- return $pheanstalk->put($payload, Pheanstalk::DEFAULT_PRIORITY, $this->getSeconds($delay), $this->timeToRun);
- }
-
- /**
- * Pop the next job off of the queue.
- *
- * @param string $queue
- * @return \Illuminate\Contracts\Queue\Job|null
- */
- public function pop($queue = null)
- {
- $queue = $this->getQueue($queue);
-
- $job = $this->pheanstalk->watchOnly($queue)->reserve(0);
-
- if ($job instanceof PheanstalkJob)
- {
- return new BeanstalkdJob($this->container, $this->pheanstalk, $job, $queue);
- }
- }
-
- /**
- * Delete a message from the Beanstalk queue.
- *
- * @param string $queue
- * @param string $id
- * @return void
- */
- public function deleteMessage($queue, $id)
- {
- $this->pheanstalk->useTube($this->getQueue($queue))->delete($id);
- }
-
- /**
- * Get the queue or return the default.
- *
- * @param string|null $queue
- * @return string
- */
- public function getQueue($queue)
- {
- return $queue ?: $this->default;
- }
-
- /**
- * Get the underlying Pheanstalk instance.
- *
- * @return \Pheanstalk_Pheanstalk
- */
- public function getPheanstalk()
- {
- return $this->pheanstalk;
- }
-
+class BeanstalkdQueue extends Queue implements QueueContract
+{
+ /**
+ * The Pheanstalk instance.
+ *
+ * @var \Pheanstalk\Pheanstalk
+ */
+ protected $pheanstalk;
+
+ /**
+ * The name of the default tube.
+ *
+ * @var string
+ */
+ protected $default;
+
+ /**
+ * The "time to run" for all pushed jobs.
+ *
+ * @var int
+ */
+ protected $timeToRun;
+
+ /**
+ * Create a new Beanstalkd queue instance.
+ *
+ * @param \Pheanstalk\Pheanstalk $pheanstalk
+ * @param string $default
+ * @param int $timeToRun
+ * @return void
+ */
+ public function __construct(Pheanstalk $pheanstalk, $default, $timeToRun)
+ {
+ $this->default = $default;
+ $this->timeToRun = $timeToRun;
+ $this->pheanstalk = $pheanstalk;
+ }
+
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function push($job, $data = '', $queue = null)
+ {
+ return $this->pushRaw($this->createPayload($job, $data), $queue);
+ }
+
+ /**
+ * Push a raw payload onto the queue.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @param array $options
+ * @return mixed
+ */
+ public function pushRaw($payload, $queue = null, array $options = [])
+ {
+ return $this->pheanstalk->useTube($this->getQueue($queue))->put(
+ $payload, Pheanstalk::DEFAULT_PRIORITY, Pheanstalk::DEFAULT_DELAY, $this->timeToRun
+ );
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function later($delay, $job, $data = '', $queue = null)
+ {
+ $payload = $this->createPayload($job, $data);
+
+ $pheanstalk = $this->pheanstalk->useTube($this->getQueue($queue));
+
+ return $pheanstalk->put($payload, Pheanstalk::DEFAULT_PRIORITY, $this->getSeconds($delay), $this->timeToRun);
+ }
+
+ /**
+ * Pop the next job off of the queue.
+ *
+ * @param string $queue
+ * @return \Illuminate\Contracts\Queue\Job|null
+ */
+ public function pop($queue = null)
+ {
+ $queue = $this->getQueue($queue);
+
+ $job = $this->pheanstalk->watchOnly($queue)->reserve(0);
+
+ if ($job instanceof PheanstalkJob) {
+ return new BeanstalkdJob($this->container, $this->pheanstalk, $job, $queue);
+ }
+ }
+
+ /**
+ * Delete a message from the Beanstalk queue.
+ *
+ * @param string $queue
+ * @param string $id
+ * @return void
+ */
+ public function deleteMessage($queue, $id)
+ {
+ $this->pheanstalk->useTube($this->getQueue($queue))->delete($id);
+ }
+
+ /**
+ * Get the queue or return the default.
+ *
+ * @param string|null $queue
+ * @return string
+ */
+ public function getQueue($queue)
+ {
+ return $queue ?: $this->default;
+ }
+
+ /**
+ * Get the underlying Pheanstalk instance.
+ *
+ * @return \Pheanstalk\Pheanstalk
+ */
+ public function getPheanstalk()
+ {
+ return $this->pheanstalk;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php b/application/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
index 30f1409..dc16c88 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
@@ -1,82 +1,80 @@
-dispatcher = $dispatcher;
- }
+class CallQueuedHandler
+{
+ /**
+ * The bus dispatcher implementation.
+ *
+ * @var \Illuminate\Contracts\Bus\Dispatcher
+ */
+ protected $dispatcher;
- /**
- * Handle the queued job.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param array $data
- * @return void
- */
- public function call(Job $job, array $data)
- {
- $command = $this->setJobInstanceIfNecessary(
- $job, unserialize($data['command'])
- );
+ /**
+ * Create a new handler instance.
+ *
+ * @param \Illuminate\Contracts\Bus\Dispatcher $dispatcher
+ * @return void
+ */
+ public function __construct(Dispatcher $dispatcher)
+ {
+ $this->dispatcher = $dispatcher;
+ }
- $this->dispatcher->dispatchNow($command, function($handler) use ($job)
- {
- $this->setJobInstanceIfNecessary($job, $handler);
- });
+ /**
+ * Handle the queued job.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param array $data
+ * @return void
+ */
+ public function call(Job $job, array $data)
+ {
+ $command = $this->setJobInstanceIfNecessary(
+ $job, unserialize($data['command'])
+ );
- if ( ! $job->isDeletedOrReleased())
- {
- $job->delete();
- }
- }
+ $this->dispatcher->dispatchNow($command, function ($handler) use ($job) {
+ $this->setJobInstanceIfNecessary($job, $handler);
+ });
- /**
- * Set the job instance of the given class if necessary.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param mixed $instance
- * @return mixed
- */
- protected function setJobInstanceIfNecessary(Job $job, $instance)
- {
- if (in_array('Illuminate\Queue\InteractsWithQueue', class_uses_recursive(get_class($instance))))
- {
- $instance->setJob($job);
- }
+ if (! $job->isDeletedOrReleased()) {
+ $job->delete();
+ }
+ }
- return $instance;
- }
+ /**
+ * Set the job instance of the given class if necessary.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param mixed $instance
+ * @return mixed
+ */
+ protected function setJobInstanceIfNecessary(Job $job, $instance)
+ {
+ if (in_array('Illuminate\Queue\InteractsWithQueue', class_uses_recursive(get_class($instance)))) {
+ $instance->setJob($job);
+ }
- /**
- * Call the failed method on the job instance.
- *
- * @return void
- */
- public function failed(array $data)
- {
- $handler = $this->dispatcher->resolveHandler($command = unserialize($data['command']));
+ return $instance;
+ }
- if (method_exists($handler, 'failed'))
- {
- call_user_func([$handler, 'failed'], $command);
- }
- }
+ /**
+ * Call the failed method on the job instance.
+ *
+ * @param array $data
+ * @return void
+ */
+ public function failed(array $data)
+ {
+ $handler = $this->dispatcher->resolveHandler($command = unserialize($data['command']));
+ if (method_exists($handler, 'failed')) {
+ call_user_func([$handler, 'failed'], $command);
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Capsule/Manager.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Capsule/Manager.php
index bc78a21..179be60 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Capsule/Manager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Capsule/Manager.php
@@ -1,182 +1,183 @@
-setupContainer($container ?: new Container);
-
- // Once we have the container setup, we will setup the default configuration
- // options in the container "config" bindings. This just makes this queue
- // manager behave correctly since all the correct binding are in place.
- $this->setupDefaultConfiguration();
-
- $this->setupManager();
-
- $this->registerConnectors();
- }
-
- /**
- * Setup the default queue configuration options.
- *
- * @return void
- */
- protected function setupDefaultConfiguration()
- {
- $this->container['config']['queue.default'] = 'default';
- }
-
- /**
- * Build the queue manager instance.
- *
- * @return void
- */
- protected function setupManager()
- {
- $this->manager = new QueueManager($this->container);
- }
-
- /**
- * Register the default connectors that the component ships with.
- *
- * @return void
- */
- protected function registerConnectors()
- {
- $provider = new QueueServiceProvider($this->container);
-
- $provider->registerConnectors($this->manager);
- }
-
- /**
- * Get a connection instance from the global manager.
- *
- * @param string $connection
- * @return \Illuminate\Contracts\Queue\Queue
- */
- public static function connection($connection = null)
- {
- return static::$instance->getConnection($connection);
- }
-
- /**
- * Push a new job onto the queue.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @param string $connection
- * @return mixed
- */
- public static function push($job, $data = '', $queue = null, $connection = null)
- {
- return static::$instance->connection($connection)->push($job, $data, $queue);
- }
-
- /**
- * Push a new an array of jobs onto the queue.
- *
- * @param array $jobs
- * @param mixed $data
- * @param string $queue
- * @param string $connection
- * @return mixed
- */
- public static function bulk($jobs, $data = '', $queue = null, $connection = null)
- {
- return static::$instance->connection($connection)->bulk($jobs, $data, $queue);
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @param string $connection
- * @return mixed
- */
- public static function later($delay, $job, $data = '', $queue = null, $connection = null)
- {
- return static::$instance->connection($connection)->later($delay, $job, $data, $queue);
- }
-
- /**
- * Get a registered connection instance.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Queue\Queue
- */
- public function getConnection($name = null)
- {
- return $this->manager->connection($name);
- }
-
- /**
- * Register a connection with the manager.
- *
- * @param array $config
- * @param string $name
- * @return void
- */
- public function addConnection(array $config, $name = 'default')
- {
- $this->container['config']["queue.connections.{$name}"] = $config;
- }
-
- /**
- * Get the queue manager instance.
- *
- * @return \Illuminate\Queue\QueueManager
- */
- public function getQueueManager()
- {
- return $this->manager;
- }
-
- /**
- * Pass dynamic instance methods to the manager.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array(array($this->manager, $method), $parameters);
- }
-
- /**
- * Dynamically pass methods to the default connection.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public static function __callStatic($method, $parameters)
- {
- return call_user_func_array(array(static::connection(), $method), $parameters);
- }
-
+class Manager
+{
+ use CapsuleManagerTrait;
+
+ /**
+ * The queue manager instance.
+ *
+ * @var \Illuminate\Queue\QueueManager
+ */
+ protected $manager;
+
+ /**
+ * Create a new queue capsule manager.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @return void
+ */
+ public function __construct(Container $container = null)
+ {
+ $this->setupContainer($container ?: new Container);
+
+ // Once we have the container setup, we will setup the default configuration
+ // options in the container "config" bindings. This just makes this queue
+ // manager behave correctly since all the correct binding are in place.
+ $this->setupDefaultConfiguration();
+
+ $this->setupManager();
+
+ $this->registerConnectors();
+ }
+
+ /**
+ * Setup the default queue configuration options.
+ *
+ * @return void
+ */
+ protected function setupDefaultConfiguration()
+ {
+ $this->container['config']['queue.default'] = 'default';
+ }
+
+ /**
+ * Build the queue manager instance.
+ *
+ * @return void
+ */
+ protected function setupManager()
+ {
+ $this->manager = new QueueManager($this->container);
+ }
+
+ /**
+ * Register the default connectors that the component ships with.
+ *
+ * @return void
+ */
+ protected function registerConnectors()
+ {
+ $provider = new QueueServiceProvider($this->container);
+
+ $provider->registerConnectors($this->manager);
+ }
+
+ /**
+ * Get a connection instance from the global manager.
+ *
+ * @param string $connection
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ public static function connection($connection = null)
+ {
+ return static::$instance->getConnection($connection);
+ }
+
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @param string $connection
+ * @return mixed
+ */
+ public static function push($job, $data = '', $queue = null, $connection = null)
+ {
+ return static::$instance->connection($connection)->push($job, $data, $queue);
+ }
+
+ /**
+ * Push a new an array of jobs onto the queue.
+ *
+ * @param array $jobs
+ * @param mixed $data
+ * @param string $queue
+ * @param string $connection
+ * @return mixed
+ */
+ public static function bulk($jobs, $data = '', $queue = null, $connection = null)
+ {
+ return static::$instance->connection($connection)->bulk($jobs, $data, $queue);
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @param string $connection
+ * @return mixed
+ */
+ public static function later($delay, $job, $data = '', $queue = null, $connection = null)
+ {
+ return static::$instance->connection($connection)->later($delay, $job, $data, $queue);
+ }
+
+ /**
+ * Get a registered connection instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ public function getConnection($name = null)
+ {
+ return $this->manager->connection($name);
+ }
+
+ /**
+ * Register a connection with the manager.
+ *
+ * @param array $config
+ * @param string $name
+ * @return void
+ */
+ public function addConnection(array $config, $name = 'default')
+ {
+ $this->container['config']["queue.connections.{$name}"] = $config;
+ }
+
+ /**
+ * Get the queue manager instance.
+ *
+ * @return \Illuminate\Queue\QueueManager
+ */
+ public function getQueueManager()
+ {
+ return $this->manager;
+ }
+
+ /**
+ * Pass dynamic instance methods to the manager.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->manager, $method], $parameters);
+ }
+
+ /**
+ * Dynamically pass methods to the default connection.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public static function __callStatic($method, $parameters)
+ {
+ return call_user_func_array([static::connection(), $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php
index a613807..1087415 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php
@@ -1,24 +1,26 @@
-connections = $connections;
- }
+class DatabaseConnector implements ConnectorInterface
+{
+ /**
+ * Database connections.
+ *
+ * @var \Illuminate\Database\ConnectionResolverInterface
+ */
+ protected $connections;
- /**
- * Establish a queue connection.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Queue\Queue
- */
- public function connect(array $config)
- {
- return new DatabaseQueue(
- $this->connections->connection(array_get($config, 'connection')),
- $config['table'],
- $config['queue'],
- array_get($config, 'expire', 60)
- );
- }
+ /**
+ * Create a new connector instance.
+ *
+ * @param \Illuminate\Database\ConnectionResolverInterface $connections
+ * @return void
+ */
+ public function __construct(ConnectionResolverInterface $connections)
+ {
+ $this->connections = $connections;
+ }
+ /**
+ * Establish a queue connection.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ public function connect(array $config)
+ {
+ return new DatabaseQueue(
+ $this->connections->connection(Arr::get($config, 'connection')),
+ $config['table'],
+ $config['queue'],
+ Arr::get($config, 'expire', 60)
+ );
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/IronConnector.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/IronConnector.php
index cf40d8b..d103c19 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/IronConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/IronConnector.php
@@ -1,59 +1,61 @@
-crypt = $crypt;
- $this->request = $request;
- }
-
- /**
- * Establish a queue connection.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Queue\Queue
- */
- public function connect(array $config)
- {
- $ironConfig = array('token' => $config['token'], 'project_id' => $config['project']);
-
- if (isset($config['host'])) $ironConfig['host'] = $config['host'];
-
- $iron = new IronMQ($ironConfig);
-
- if (isset($config['ssl_verifypeer']))
- {
- $iron->ssl_verifypeer = $config['ssl_verifypeer'];
- }
-
- return new IronQueue($iron, $this->request, $config['queue'], $config['encrypt']);
- }
-
+class IronConnector implements ConnectorInterface
+{
+ /**
+ * The encrypter instance.
+ *
+ * @var \Illuminate\Encryption\Encrypter
+ */
+ protected $crypt;
+
+ /**
+ * The current request instance.
+ *
+ * @var \Illuminate\Http\Request
+ */
+ protected $request;
+
+ /**
+ * Create a new Iron connector instance.
+ *
+ * @param \Illuminate\Contracts\Encryption\Encrypter $crypt
+ * @param \Illuminate\Http\Request $request
+ * @return void
+ */
+ public function __construct(EncrypterContract $crypt, Request $request)
+ {
+ $this->crypt = $crypt;
+ $this->request = $request;
+ }
+
+ /**
+ * Establish a queue connection.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ public function connect(array $config)
+ {
+ $ironConfig = ['token' => $config['token'], 'project_id' => $config['project']];
+
+ if (isset($config['host'])) {
+ $ironConfig['host'] = $config['host'];
+ }
+
+ $iron = new IronMQ($ironConfig);
+
+ if (isset($config['ssl_verifypeer'])) {
+ $iron->ssl_verifypeer = $config['ssl_verifypeer'];
+ }
+
+ return new IronQueue($iron, $this->request, $config['queue'], $config['encrypt']);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/NullConnector.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/NullConnector.php
index 9d3689d..39de480 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/NullConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/NullConnector.php
@@ -1,18 +1,19 @@
-redis = $redis;
- $this->connection = $connection;
- }
-
- /**
- * Establish a queue connection.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Queue\Queue
- */
- public function connect(array $config)
- {
- $queue = new RedisQueue(
- $this->redis, $config['queue'], array_get($config, 'connection', $this->connection)
- );
-
- $queue->setExpire(array_get($config, 'expire', 60));
-
- return $queue;
- }
-
+class RedisConnector implements ConnectorInterface
+{
+ /**
+ * The Redis database instance.
+ *
+ * @var \Illuminate\Redis\Database
+ */
+ protected $redis;
+
+ /**
+ * The connection name.
+ *
+ * @var string
+ */
+ protected $connection;
+
+ /**
+ * Create a new Redis queue connector instance.
+ *
+ * @param \Illuminate\Redis\Database $redis
+ * @param string|null $connection
+ * @return void
+ */
+ public function __construct(Database $redis, $connection = null)
+ {
+ $this->redis = $redis;
+ $this->connection = $connection;
+ }
+
+ /**
+ * Establish a queue connection.
+ *
+ * @param array $config
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ public function connect(array $config)
+ {
+ $queue = new RedisQueue(
+ $this->redis, $config['queue'], Arr::get($config, 'connection', $this->connection)
+ );
+
+ $queue->setExpire(Arr::get($config, 'expire', 60));
+
+ return $queue;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
index c161d47..4e8e5e6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
@@ -1,21 +1,46 @@
-getDefaultConfiguration($config);
- /**
- * Establish a queue connection.
- *
- * @param array $config
- * @return \Illuminate\Contracts\Queue\Queue
- */
- public function connect(array $config)
- {
- $sqs = SqsClient::factory($config);
+ if ($config['key'] && $config['secret']) {
+ $config['credentials'] = Arr::only($config, ['key', 'secret']);
+ }
- return new SqsQueue($sqs, $config['queue']);
- }
+ return new SqsQueue(
+ new SqsClient($config), $config['queue'], Arr::get($config, 'prefix', '')
+ );
+ }
+ /**
+ * Get the default configuration for SQS.
+ *
+ * @param array $config
+ * @return array
+ */
+ protected function getDefaultConfiguration(array $config)
+ {
+ return array_merge([
+ 'version' => 'latest',
+ 'http' => [
+ 'timeout' => 60,
+ 'connect_timeout' => 60,
+ ],
+ ], $config);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php
index 468d61b..4269b80 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php
@@ -1,18 +1,19 @@
-files = $files;
- $this->composer = $composer;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $fullPath = $this->createBaseMigration();
-
- $table = $this->laravel['config']['queue.failed.table'];
-
- $stub = str_replace(
- '{{table}}', $table, $this->files->get(__DIR__.'/stubs/failed_jobs.stub')
- );
-
- $this->files->put($fullPath, $stub);
-
- $this->info('Migration created successfully!');
-
- $this->composer->dumpAutoloads();
- }
-
- /**
- * Create a base migration file for the table.
- *
- * @return string
- */
- protected function createBaseMigration()
- {
- $name = 'create_failed_jobs_table';
-
- $path = $this->laravel->databasePath().'/migrations';
-
- return $this->laravel['migration.creator']->create($name, $path);
- }
-
+class FailedTableCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'queue:failed-table';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a migration for the failed queue jobs database table';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * @var \Illuminate\Foundation\Composer
+ */
+ protected $composer;
+
+ /**
+ * Create a new failed queue jobs table command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param \Illuminate\Foundation\Composer $composer
+ * @return void
+ */
+ public function __construct(Filesystem $files, Composer $composer)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ $this->composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $table = $this->laravel['config']['queue.failed.table'];
+
+ $tableClassName = Str::studly($table);
+
+ $fullPath = $this->createBaseMigration($table);
+
+ $stub = str_replace(
+ ['{{table}}', '{{tableClassName}}'], [$table, $tableClassName], $this->files->get(__DIR__.'/stubs/failed_jobs.stub')
+ );
+
+ $this->files->put($fullPath, $stub);
+
+ $this->info('Migration created successfully!');
+
+ $this->composer->dumpAutoloads();
+ }
+
+ /**
+ * Create a base migration file for the table.
+ *
+ * @param string $table
+ * @return string
+ */
+ protected function createBaseMigration($table = 'failed_jobs')
+ {
+ $name = 'create_'.$table.'_table';
+
+ $path = $this->laravel->databasePath().'/migrations';
+
+ return $this->laravel['migration.creator']->create($name, $path);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/FlushFailedCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/FlushFailedCommand.php
index 0ece99b..fc21093 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/FlushFailedCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/FlushFailedCommand.php
@@ -1,33 +1,34 @@
-laravel['queue.failer']->flush();
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Flush all of the failed queue jobs';
- $this->info('All failed jobs deleted successfully!');
- }
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->laravel['queue.failer']->flush();
+ $this->info('All failed jobs deleted successfully!');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php
index fef76f0..2a016cf 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php
@@ -1,51 +1,49 @@
-laravel['queue.failer']->forget($this->argument('id')))
- {
- $this->info('Failed job deleted successfully!');
- }
- else
- {
- $this->error('No failed job matches the given ID.');
- }
- }
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Delete a failed queue job';
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('id', InputArgument::REQUIRED, 'The ID of the failed job'),
- );
- }
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if ($this->laravel['queue.failer']->forget($this->argument('id'))) {
+ $this->info('Failed job deleted successfully!');
+ } else {
+ $this->error('No failed job matches the given ID.');
+ }
+ }
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['id', InputArgument::REQUIRED, 'The ID of the failed job'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListFailedCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListFailedCommand.php
index 03bc411..27b4df7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListFailedCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListFailedCommand.php
@@ -1,62 +1,113 @@
-laravel['queue.failer']->all() as $failed)
- {
- $rows[] = $this->parseFailedJob((array) $failed);
- }
-
- if (count($rows) == 0)
- {
- return $this->info('No failed jobs!');
- }
-
- $table = $this->getHelperSet()->get('table');
-
- $table->setHeaders(array('ID', 'Connection', 'Queue', 'Class', 'Failed At'))
- ->setRows($rows)
- ->render($this->output);
- }
-
- /**
- * Parse the failed job row.
- *
- * @param array $failed
- * @return array
- */
- protected function parseFailedJob(array $failed)
- {
- $row = array_values(array_except($failed, array('payload')));
-
- array_splice($row, 3, 0, array_get(json_decode($failed['payload'], true), 'job'));
-
- return $row;
- }
+class ListFailedCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'queue:failed';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'List all of the failed queue jobs';
+
+ /**
+ * The table headers for the command.
+ *
+ * @var array
+ */
+ protected $headers = ['ID', 'Connection', 'Queue', 'Class', 'Failed At'];
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $jobs = $this->getFailedJobs();
+
+ if (count($jobs) == 0) {
+ return $this->info('No failed jobs!');
+ }
+
+ $this->displayFailedJobs($jobs);
+ }
+
+ /**
+ * Compile the failed jobs into a displayable format.
+ *
+ * @return array
+ */
+ protected function getFailedJobs()
+ {
+ $results = [];
+
+ foreach ($this->laravel['queue.failer']->all() as $failed) {
+ $results[] = $this->parseFailedJob((array) $failed);
+ }
+
+ return array_filter($results);
+ }
+
+ /**
+ * Parse the failed job row.
+ *
+ * @param array $failed
+ * @return array
+ */
+ protected function parseFailedJob(array $failed)
+ {
+ $row = array_values(Arr::except($failed, ['payload']));
+
+ array_splice($row, 3, 0, $this->extractJobName($failed['payload']));
+
+ return $row;
+ }
+
+ /**
+ * Extract the failed job name from payload.
+ *
+ * @param string $payload
+ * @return string|null
+ */
+ private function extractJobName($payload)
+ {
+ $payload = json_decode($payload, true);
+
+ if ($payload && (! isset($payload['data']['command']))) {
+ return Arr::get($payload, 'job');
+ }
+
+ if ($payload && isset($payload['data']['command'])) {
+ preg_match('/"([^"]+)"/', $payload['data']['command'], $matches);
+
+ if (isset($matches[1])) {
+ return $matches[1];
+ } else {
+ return Arr::get($payload, 'job');
+ }
+ }
+ }
+ /**
+ * Display the failed jobs in the console.
+ *
+ * @param array $jobs
+ * @return void
+ */
+ protected function displayFailedJobs(array $jobs)
+ {
+ $this->table($this->headers, $jobs);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListenCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListenCommand.php
index 408d564..67de1d1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListenCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/ListenCommand.php
@@ -1,145 +1,144 @@
-listener = $listener;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $this->setListenerOptions();
-
- $delay = $this->input->getOption('delay');
-
- // The memory limit is the amount of memory we will allow the script to occupy
- // before killing it and letting a process manager restart it for us, which
- // is to protect us against any memory leaks that will be in the scripts.
- $memory = $this->input->getOption('memory');
-
- $connection = $this->input->getArgument('connection');
-
- $timeout = $this->input->getOption('timeout');
-
- // We need to get the right queue for the connection which is set in the queue
- // configuration file for the application. We will pull it based on the set
- // connection being run for the queue operation currently being executed.
- $queue = $this->getQueue($connection);
-
- $this->listener->listen(
- $connection, $queue, $delay, $memory, $timeout
- );
- }
-
- /**
- * Get the name of the queue connection to listen on.
- *
- * @param string $connection
- * @return string
- */
- protected function getQueue($connection)
- {
- if (is_null($connection))
- {
- $connection = $this->laravel['config']['queue.default'];
- }
-
- $queue = $this->laravel['config']->get("queue.connections.{$connection}.queue", 'default');
-
- return $this->input->getOption('queue') ?: $queue;
- }
-
- /**
- * Set the options on the queue listener.
- *
- * @return void
- */
- protected function setListenerOptions()
- {
- $this->listener->setEnvironment($this->laravel->environment());
-
- $this->listener->setSleep($this->option('sleep'));
-
- $this->listener->setMaxTries($this->option('tries'));
-
- $this->listener->setOutputHandler(function($type, $line)
- {
- $this->output->write($line);
- });
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('connection', InputArgument::OPTIONAL, 'The name of connection'),
- );
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('queue', null, InputOption::VALUE_OPTIONAL, 'The queue to listen on', null),
-
- array('delay', null, InputOption::VALUE_OPTIONAL, 'Amount of time to delay failed jobs', 0),
-
- array('memory', null, InputOption::VALUE_OPTIONAL, 'The memory limit in megabytes', 128),
-
- array('timeout', null, InputOption::VALUE_OPTIONAL, 'Seconds a job may run before timing out', 60),
-
- array('sleep', null, InputOption::VALUE_OPTIONAL, 'Seconds to wait before checking queue for jobs', 3),
-
- array('tries', null, InputOption::VALUE_OPTIONAL, 'Number of times to attempt a job before logging it failed', 0),
- );
- }
-
+class ListenCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'queue:listen';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Listen to a given queue';
+
+ /**
+ * The queue listener instance.
+ *
+ * @var \Illuminate\Queue\Listener
+ */
+ protected $listener;
+
+ /**
+ * Create a new queue listen command.
+ *
+ * @param \Illuminate\Queue\Listener $listener
+ * @return void
+ */
+ public function __construct(Listener $listener)
+ {
+ parent::__construct();
+
+ $this->listener = $listener;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->setListenerOptions();
+
+ $delay = $this->input->getOption('delay');
+
+ // The memory limit is the amount of memory we will allow the script to occupy
+ // before killing it and letting a process manager restart it for us, which
+ // is to protect us against any memory leaks that will be in the scripts.
+ $memory = $this->input->getOption('memory');
+
+ $connection = $this->input->getArgument('connection');
+
+ $timeout = $this->input->getOption('timeout');
+
+ // We need to get the right queue for the connection which is set in the queue
+ // configuration file for the application. We will pull it based on the set
+ // connection being run for the queue operation currently being executed.
+ $queue = $this->getQueue($connection);
+
+ $this->listener->listen(
+ $connection, $queue, $delay, $memory, $timeout
+ );
+ }
+
+ /**
+ * Get the name of the queue connection to listen on.
+ *
+ * @param string $connection
+ * @return string
+ */
+ protected function getQueue($connection)
+ {
+ if (is_null($connection)) {
+ $connection = $this->laravel['config']['queue.default'];
+ }
+
+ $queue = $this->laravel['config']->get("queue.connections.{$connection}.queue", 'default');
+
+ return $this->input->getOption('queue') ?: $queue;
+ }
+
+ /**
+ * Set the options on the queue listener.
+ *
+ * @return void
+ */
+ protected function setListenerOptions()
+ {
+ $this->listener->setEnvironment($this->laravel->environment());
+
+ $this->listener->setSleep($this->option('sleep'));
+
+ $this->listener->setMaxTries($this->option('tries'));
+
+ $this->listener->setOutputHandler(function ($type, $line) {
+ $this->output->write($line);
+ });
+ }
+
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['connection', InputArgument::OPTIONAL, 'The name of connection'],
+ ];
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['queue', null, InputOption::VALUE_OPTIONAL, 'The queue to listen on', null],
+
+ ['delay', null, InputOption::VALUE_OPTIONAL, 'Amount of time to delay failed jobs', 0],
+
+ ['memory', null, InputOption::VALUE_OPTIONAL, 'The memory limit in megabytes', 128],
+
+ ['timeout', null, InputOption::VALUE_OPTIONAL, 'Seconds a job may run before timing out', 60],
+
+ ['sleep', null, InputOption::VALUE_OPTIONAL, 'Seconds to wait before checking queue for jobs', 3],
+
+ ['tries', null, InputOption::VALUE_OPTIONAL, 'Number of times to attempt a job before logging it failed', 0],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php
index 7b8dda6..72ad27e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php
@@ -1,33 +1,34 @@
-laravel['cache']->forever('illuminate:queue:restart', time());
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Restart queue worker daemons after their current job';
- $this->info('Broadcasting queue restart signal.');
- }
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->laravel['cache']->forever('illuminate:queue:restart', time());
+ $this->info('Broadcasting queue restart signal.');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php
index 454b56d..703c8d5 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php
@@ -1,74 +1,97 @@
-laravel['queue.failer']->find($this->argument('id'));
-
- if ( ! is_null($failed))
- {
- $failed->payload = $this->resetAttempts($failed->payload);
-
- $this->laravel['queue']->connection($failed->connection)->pushRaw($failed->payload, $failed->queue);
-
- $this->laravel['queue.failer']->forget($failed->id);
-
- $this->info('The failed job has been pushed back onto the queue!');
- }
- else
- {
- $this->error('No failed job matches the given ID.');
- }
- }
-
- /**
- * Reset the payload attempts.
- *
- * @param string $payload
- * @return string
- */
- protected function resetAttempts($payload)
- {
- $payload = json_decode($payload, true);
-
- if (isset($payload['attempts'])) $payload['attempts'] = 0;
-
- return json_encode($payload);
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('id', InputArgument::REQUIRED, 'The ID of the failed job'),
- );
- }
+class RetryCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'queue:retry';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Retry a failed queue job';
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $ids = $this->argument('id');
+
+ if (count($ids) === 1 && $ids[0] === 'all') {
+ $ids = Arr::pluck($this->laravel['queue.failer']->all(), 'id');
+ }
+
+ foreach ($ids as $id) {
+ $this->retryJob($id);
+ }
+ }
+
+ /**
+ * Retry the queue job with the given ID.
+ *
+ * @param string $id
+ * @return void
+ */
+ protected function retryJob($id)
+ {
+ $failed = $this->laravel['queue.failer']->find($id);
+
+ if (! is_null($failed)) {
+ $failed = (object) $failed;
+
+ $failed->payload = $this->resetAttempts($failed->payload);
+
+ $this->laravel['queue']->connection($failed->connection)
+ ->pushRaw($failed->payload, $failed->queue);
+
+ $this->laravel['queue.failer']->forget($failed->id);
+
+ $this->info("The failed job [{$id}] has been pushed back onto the queue!");
+ } else {
+ $this->error("No failed job matches the given ID [{$id}].");
+ }
+ }
+
+ /**
+ * Reset the payload attempts.
+ *
+ * @param string $payload
+ * @return string
+ */
+ protected function resetAttempts($payload)
+ {
+ $payload = json_decode($payload, true);
+
+ if (isset($payload['attempts'])) {
+ $payload['attempts'] = 1;
+ }
+
+ return json_encode($payload);
+ }
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['id', InputArgument::IS_ARRAY, 'The ID of the failed job'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/SubscribeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/SubscribeCommand.php
index 0037cc2..a19be46 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/SubscribeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/SubscribeCommand.php
@@ -1,161 +1,162 @@
-laravel['queue']->connection();
-
- if ( ! $iron instanceof IronQueue)
- {
- throw new RuntimeException("Iron.io based queue must be default.");
- }
-
- $iron->getIron()->updateQueue($this->argument('queue'), $this->getQueueOptions());
-
- $this->line('Queue subscriber added: '.$this->argument('url').'');
- }
-
- /**
- * Get the queue options.
- *
- * @return array
- */
- protected function getQueueOptions()
- {
- return array(
- 'push_type' => $this->getPushType(), 'subscribers' => $this->getSubscriberList(),
- );
- }
-
- /**
- * Get the push type for the queue.
- *
- * @return string
- */
- protected function getPushType()
- {
- if ($this->option('type')) return $this->option('type');
-
- try
- {
- return $this->getQueue()->push_type;
- }
- catch (Exception $e)
- {
- return 'multicast';
- }
- }
-
- /**
- * Get the current subscribers for the queue.
- *
- * @return array
- */
- protected function getSubscriberList()
- {
- $subscribers = $this->getCurrentSubscribers();
-
- $url = $this->argument('url');
-
- if ( ! starts_with($url, ['http://', 'https://']))
- {
- $url = $this->laravel['url']->to($url);
- }
-
- $subscribers[] = array('url' => $url);
-
- return $subscribers;
- }
-
- /**
- * Get the current subscriber list.
- *
- * @return array
- */
- protected function getCurrentSubscribers()
- {
- try
- {
- return $this->getQueue()->subscribers;
- }
- catch (Exception $e)
- {
- return array();
- }
- }
-
- /**
- * Get the queue information from Iron.io.
- *
- * @return object
- */
- protected function getQueue()
- {
- if (isset($this->meta)) return $this->meta;
-
- return $this->meta = $this->laravel['queue']->getIron()->getQueue($this->argument('queue'));
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('queue', InputArgument::REQUIRED, 'The name of Iron.io queue.'),
-
- array('url', InputArgument::REQUIRED, 'The URL to be subscribed.'),
- );
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('type', null, InputOption::VALUE_OPTIONAL, 'The push type for the queue.'),
- );
- }
-
+/**
+ * @deprecated since version 5.1
+ */
+class SubscribeCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'queue:subscribe';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Subscribe a URL to an Iron.io push queue';
+
+ /**
+ * The queue meta information from Iron.io.
+ *
+ * @var object
+ */
+ protected $meta;
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ *
+ * @throws \RuntimeException
+ */
+ public function fire()
+ {
+ $iron = $this->laravel['queue']->connection();
+
+ if (! $iron instanceof IronQueue) {
+ throw new RuntimeException('Iron.io based queue must be default.');
+ }
+
+ $iron->getIron()->updateQueue($this->argument('queue'), $this->getQueueOptions());
+
+ $this->line('Queue subscriber added: '.$this->argument('url').'');
+ }
+
+ /**
+ * Get the queue options.
+ *
+ * @return array
+ */
+ protected function getQueueOptions()
+ {
+ return [
+ 'push_type' => $this->getPushType(), 'subscribers' => $this->getSubscriberList(),
+ ];
+ }
+
+ /**
+ * Get the push type for the queue.
+ *
+ * @return string
+ */
+ protected function getPushType()
+ {
+ if ($this->option('type')) {
+ return $this->option('type');
+ }
+
+ try {
+ return $this->getQueue()->push_type;
+ } catch (Exception $e) {
+ return 'multicast';
+ }
+ }
+
+ /**
+ * Get the current subscribers for the queue.
+ *
+ * @return array
+ */
+ protected function getSubscriberList()
+ {
+ $subscribers = $this->getCurrentSubscribers();
+
+ $url = $this->argument('url');
+
+ if (! Str::startsWith($url, ['http://', 'https://'])) {
+ $url = $this->laravel['url']->to($url);
+ }
+
+ $subscribers[] = ['url' => $url];
+
+ return $subscribers;
+ }
+
+ /**
+ * Get the current subscriber list.
+ *
+ * @return array
+ */
+ protected function getCurrentSubscribers()
+ {
+ try {
+ return $this->getQueue()->subscribers;
+ } catch (Exception $e) {
+ return [];
+ }
+ }
+
+ /**
+ * Get the queue information from Iron.io.
+ *
+ * @return object
+ */
+ protected function getQueue()
+ {
+ if (isset($this->meta)) {
+ return $this->meta;
+ }
+
+ return $this->meta = $this->laravel['queue']->getIron()->getQueue($this->argument('queue'));
+ }
+
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['queue', InputArgument::REQUIRED, 'The name of Iron.io queue.'],
+
+ ['url', InputArgument::REQUIRED, 'The URL to be subscribed.'],
+ ];
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['type', null, InputOption::VALUE_OPTIONAL, 'The push type for the queue.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php
index b14b450..f41d15c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php
@@ -1,85 +1,91 @@
-files = $files;
- $this->composer = $composer;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $fullPath = $this->createBaseMigration();
-
- $table = $this->laravel['config']['queue.connections.database.table'];
-
- $stub = str_replace(
- '{{table}}', $table, $this->files->get(__DIR__.'/stubs/jobs.stub')
- );
-
- $this->files->put($fullPath, $stub);
-
- $this->info('Migration created successfully!');
-
- $this->composer->dumpAutoloads();
- }
-
- /**
- * Create a base migration file for the table.
- *
- * @return string
- */
- protected function createBaseMigration()
- {
- $name = 'create_jobs_table';
-
- $path = $this->laravel->databasePath().'/migrations';
-
- return $this->laravel['migration.creator']->create($name, $path);
- }
-
+class TableCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'queue:table';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a migration for the queue jobs database table';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * @var \Illuminate\Foundation\Composer
+ */
+ protected $composer;
+
+ /**
+ * Create a new queue job table command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param \Illuminate\Foundation\Composer $composer
+ * @return void
+ */
+ public function __construct(Filesystem $files, Composer $composer)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ $this->composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $table = $this->laravel['config']['queue.connections.database.table'];
+
+ $tableClassName = Str::studly($table);
+
+ $fullPath = $this->createBaseMigration($table);
+
+ $stub = str_replace(
+ ['{{table}}', '{{tableClassName}}'], [$table, $tableClassName], $this->files->get(__DIR__.'/stubs/jobs.stub')
+ );
+
+ $this->files->put($fullPath, $stub);
+
+ $this->info('Migration created successfully!');
+
+ $this->composer->dumpAutoloads();
+ }
+
+ /**
+ * Create a base migration file for the table.
+ *
+ * @param string $table
+ * @return string
+ */
+ protected function createBaseMigration($table = 'jobs')
+ {
+ $name = 'create_'.$table.'_table';
+
+ $path = $this->laravel->databasePath().'/migrations';
+
+ return $this->laravel['migration.creator']->create($name, $path);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php
index 2dcd77e..586fa6e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php
@@ -1,4 +1,6 @@
-worker = $worker;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- if ($this->downForMaintenance() && ! $this->option('daemon'))
- {
- return $this->worker->sleep($this->option('sleep'));
- }
-
- $queue = $this->option('queue');
-
- $delay = $this->option('delay');
-
- // The memory limit is the amount of memory we will allow the script to occupy
- // before killing it and letting a process manager restart it for us, which
- // is to protect us against any memory leaks that will be in the scripts.
- $memory = $this->option('memory');
-
- $connection = $this->argument('connection');
-
- $response = $this->runWorker(
- $connection, $queue, $delay, $memory, $this->option('daemon')
- );
-
- // If a job was fired by the worker, we'll write the output out to the console
- // so that the developer can watch live while the queue runs in the console
- // window, which will also of get logged if stdout is logged out to disk.
- if ( ! is_null($response['job']))
- {
- $this->writeOutput($response['job'], $response['failed']);
- }
- }
-
- /**
- * Run the worker instance.
- *
- * @param string $connection
- * @param string $queue
- * @param int $delay
- * @param int $memory
- * @param bool $daemon
- * @return array
- */
- protected function runWorker($connection, $queue, $delay, $memory, $daemon = false)
- {
- if ($daemon)
- {
- $this->worker->setCache($this->laravel['cache']->driver());
-
- $this->worker->setDaemonExceptionHandler(
- $this->laravel['Illuminate\Contracts\Debug\ExceptionHandler']
- );
-
- return $this->worker->daemon(
- $connection, $queue, $delay, $memory,
- $this->option('sleep'), $this->option('tries')
- );
- }
-
- return $this->worker->pop(
- $connection, $queue, $delay,
- $this->option('sleep'), $this->option('tries')
- );
- }
-
- /**
- * Write the status output for the queue worker.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param bool $failed
- * @return void
- */
- protected function writeOutput(Job $job, $failed)
- {
- if ($failed)
- {
- $this->output->writeln('Failed: '.$job->getName());
- }
- else
- {
- $this->output->writeln('Processed: '.$job->getName());
- }
- }
-
- /**
- * Determine if the worker should run in maintenance mode.
- *
- * @return bool
- */
- protected function downForMaintenance()
- {
- if ($this->option('force')) return false;
-
- return $this->laravel->isDownForMaintenance();
- }
-
- /**
- * Get the console command arguments.
- *
- * @return array
- */
- protected function getArguments()
- {
- return array(
- array('connection', InputArgument::OPTIONAL, 'The name of connection', null),
- );
- }
-
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('queue', null, InputOption::VALUE_OPTIONAL, 'The queue to listen on'),
-
- array('daemon', null, InputOption::VALUE_NONE, 'Run the worker in daemon mode'),
-
- array('delay', null, InputOption::VALUE_OPTIONAL, 'Amount of time to delay failed jobs', 0),
-
- array('force', null, InputOption::VALUE_NONE, 'Force the worker to run even in maintenance mode'),
-
- array('memory', null, InputOption::VALUE_OPTIONAL, 'The memory limit in megabytes', 128),
-
- array('sleep', null, InputOption::VALUE_OPTIONAL, 'Number of seconds to sleep when no job is available', 3),
-
- array('tries', null, InputOption::VALUE_OPTIONAL, 'Number of times to attempt a job before logging it failed', 0),
- );
- }
-
+class WorkCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'queue:work';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Process the next job on a queue';
+
+ /**
+ * The queue worker instance.
+ *
+ * @var \Illuminate\Queue\Worker
+ */
+ protected $worker;
+
+ /**
+ * Create a new queue listen command.
+ *
+ * @param \Illuminate\Queue\Worker $worker
+ * @return void
+ */
+ public function __construct(Worker $worker)
+ {
+ parent::__construct();
+
+ $this->worker = $worker;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ if ($this->downForMaintenance() && ! $this->option('daemon')) {
+ return $this->worker->sleep($this->option('sleep'));
+ }
+
+ $queue = $this->option('queue');
+
+ $delay = $this->option('delay');
+
+ // The memory limit is the amount of memory we will allow the script to occupy
+ // before killing it and letting a process manager restart it for us, which
+ // is to protect us against any memory leaks that will be in the scripts.
+ $memory = $this->option('memory');
+
+ $connection = $this->argument('connection');
+
+ $response = $this->runWorker(
+ $connection, $queue, $delay, $memory, $this->option('daemon')
+ );
+
+ // If a job was fired by the worker, we'll write the output out to the console
+ // so that the developer can watch live while the queue runs in the console
+ // window, which will also of get logged if stdout is logged out to disk.
+ if (! is_null($response['job'])) {
+ $this->writeOutput($response['job'], $response['failed']);
+ }
+ }
+
+ /**
+ * Run the worker instance.
+ *
+ * @param string $connection
+ * @param string $queue
+ * @param int $delay
+ * @param int $memory
+ * @param bool $daemon
+ * @return array
+ */
+ protected function runWorker($connection, $queue, $delay, $memory, $daemon = false)
+ {
+ $this->worker->setDaemonExceptionHandler(
+ $this->laravel['Illuminate\Contracts\Debug\ExceptionHandler']
+ );
+
+ if ($daemon) {
+ $this->worker->setCache($this->laravel['cache']->driver());
+
+ return $this->worker->daemon(
+ $connection, $queue, $delay, $memory,
+ $this->option('sleep'), $this->option('tries')
+ );
+ }
+
+ return $this->worker->pop(
+ $connection, $queue, $delay,
+ $this->option('sleep'), $this->option('tries')
+ );
+ }
+
+ /**
+ * Write the status output for the queue worker.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param bool $failed
+ * @return void
+ */
+ protected function writeOutput(Job $job, $failed)
+ {
+ if ($failed) {
+ $this->output->writeln('Failed: '.$job->getName());
+ } else {
+ $this->output->writeln('Processed: '.$job->getName());
+ }
+ }
+
+ /**
+ * Determine if the worker should run in maintenance mode.
+ *
+ * @return bool
+ */
+ protected function downForMaintenance()
+ {
+ if ($this->option('force')) {
+ return false;
+ }
+
+ return $this->laravel->isDownForMaintenance();
+ }
+
+ /**
+ * Get the console command arguments.
+ *
+ * @return array
+ */
+ protected function getArguments()
+ {
+ return [
+ ['connection', InputArgument::OPTIONAL, 'The name of connection', null],
+ ];
+ }
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['queue', null, InputOption::VALUE_OPTIONAL, 'The queue to listen on'],
+
+ ['daemon', null, InputOption::VALUE_NONE, 'Run the worker in daemon mode'],
+
+ ['delay', null, InputOption::VALUE_OPTIONAL, 'Amount of time to delay failed jobs', 0],
+
+ ['force', null, InputOption::VALUE_NONE, 'Force the worker to run even in maintenance mode'],
+
+ ['memory', null, InputOption::VALUE_OPTIONAL, 'The memory limit in megabytes', 128],
+
+ ['sleep', null, InputOption::VALUE_OPTIONAL, 'Number of seconds to sleep when no job is available', 3],
+
+ ['tries', null, InputOption::VALUE_OPTIONAL, 'Number of times to attempt a job before logging it failed', 0],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/failed_jobs.stub b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/failed_jobs.stub
index 478ec40..06d00bd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/failed_jobs.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/failed_jobs.stub
@@ -3,33 +3,31 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
-class CreateFailedJobsTable extends Migration {
-
- /**
- * Run the migrations.
- *
- * @return void
- */
- public function up()
- {
- Schema::create('{{table}}', function(Blueprint $table)
- {
- $table->increments('id');
- $table->text('connection');
- $table->text('queue');
- $table->text('payload');
- $table->timestamp('failed_at');
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::drop('{{table}}');
- }
+class Create{{tableClassName}}Table extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('{{table}}', function (Blueprint $table) {
+ $table->increments('id');
+ $table->text('connection');
+ $table->text('queue');
+ $table->longText('payload');
+ $table->timestamp('failed_at')->useCurrent();
+ });
+ }
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('{{table}}');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/jobs.stub b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/jobs.stub
index 64ace3b..1866669 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/jobs.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Console/stubs/jobs.stub
@@ -3,36 +3,35 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
-class CreateJobsTable extends Migration {
-
- /**
- * Run the migrations.
- *
- * @return void
- */
- public function up()
- {
- Schema::create('{{table}}', function(Blueprint $table)
- {
- $table->bigIncrements('id');
- $table->string('queue');
- $table->text('payload');
- $table->tinyInteger('attempts')->unsigned();
- $table->tinyInteger('reserved')->unsigned();
- $table->unsignedInteger('reserved_at')->nullable();
- $table->unsignedInteger('available_at');
- $table->unsignedInteger('created_at');
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::drop('{{table}}');
- }
+class Create{{tableClassName}}Table extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('{{table}}', function (Blueprint $table) {
+ $table->bigIncrements('id');
+ $table->string('queue');
+ $table->longText('payload');
+ $table->tinyInteger('attempts')->unsigned();
+ $table->tinyInteger('reserved')->unsigned();
+ $table->unsignedInteger('reserved_at')->nullable();
+ $table->unsignedInteger('available_at');
+ $table->unsignedInteger('created_at');
+ $table->index(['queue', 'reserved', 'reserved_at']);
+ });
+ }
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('{{table}}');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/ConsoleServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Queue/ConsoleServiceProvider.php
index 0658cb2..395e686 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/ConsoleServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/ConsoleServiceProvider.php
@@ -1,76 +1,71 @@
-app->singleton('command.queue.table', function($app)
- {
- return new TableCommand($app['files'], $app['composer']);
- });
+class ConsoleServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- $this->app->singleton('command.queue.failed', function()
- {
- return new ListFailedCommand;
- });
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('command.queue.table', function ($app) {
+ return new TableCommand($app['files'], $app['composer']);
+ });
- $this->app->singleton('command.queue.retry', function()
- {
- return new RetryCommand;
- });
+ $this->app->singleton('command.queue.failed', function () {
+ return new ListFailedCommand;
+ });
- $this->app->singleton('command.queue.forget', function()
- {
- return new ForgetFailedCommand;
- });
+ $this->app->singleton('command.queue.retry', function () {
+ return new RetryCommand;
+ });
- $this->app->singleton('command.queue.flush', function()
- {
- return new FlushFailedCommand;
- });
+ $this->app->singleton('command.queue.forget', function () {
+ return new ForgetFailedCommand;
+ });
- $this->app->singleton('command.queue.failed-table', function($app)
- {
- return new FailedTableCommand($app['files'], $app['composer']);
- });
+ $this->app->singleton('command.queue.flush', function () {
+ return new FlushFailedCommand;
+ });
- $this->commands(
- 'command.queue.table', 'command.queue.failed', 'command.queue.retry',
- 'command.queue.forget', 'command.queue.flush', 'command.queue.failed-table'
- );
- }
+ $this->app->singleton('command.queue.failed-table', function ($app) {
+ return new FailedTableCommand($app['files'], $app['composer']);
+ });
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array(
- 'command.queue.table', 'command.queue.failed', 'command.queue.retry',
- 'command.queue.forget', 'command.queue.flush', 'command.queue.failed-table',
- );
- }
+ $this->commands(
+ 'command.queue.table', 'command.queue.failed', 'command.queue.retry',
+ 'command.queue.forget', 'command.queue.flush', 'command.queue.failed-table'
+ );
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'command.queue.table', 'command.queue.failed', 'command.queue.retry',
+ 'command.queue.forget', 'command.queue.flush', 'command.queue.failed-table',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php
index 3a7e7b8..7aa6db8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php
@@ -1,4 +1,6 @@
-table = $table;
- $this->expire = $expire;
- $this->default = $default;
- $this->database = $database;
- }
-
- /**
- * Push a new job onto the queue.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return void
- */
- public function push($job, $data = '', $queue = null)
- {
- return $this->pushToDatabase(0, $queue, $this->createPayload($job, $data));
- }
-
- /**
- * Push a raw payload onto the queue.
- *
- * @param string $payload
- * @param string $queue
- * @param array $options
- * @return mixed
- */
- public function pushRaw($payload, $queue = null, array $options = array())
- {
- return $this->pushToDatabase(0, $queue, $payload);
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return void
- */
- public function later($delay, $job, $data = '', $queue = null)
- {
- return $this->pushToDatabase($delay, $queue, $this->createPayload($job, $data));
- }
-
- /**
- * Release a reserved job back onto the queue.
- *
- * @param string $queue
- * @param \StdClass $job
- * @param int $delay
- * @return void
- */
- public function release($queue, $job, $delay)
- {
- return $this->pushToDatabase($delay, $queue, $job->payload, $job->attempts);
- }
-
- /**
- * Push a raw payload to the database with a given delay.
- *
- * @param \DateTime|int $delay
- * @param string|null $queue
- * @param string $payload
- * @param int $attempts
- * @return mixed
- */
- protected function pushToDatabase($delay, $queue, $payload, $attempts = 0)
- {
- $availableAt = $delay instanceof DateTime ? $delay : Carbon::now()->addSeconds($delay);
-
- return $this->database->table($this->table)->insertGetId([
- 'queue' => $this->getQueue($queue),
- 'payload' => $payload,
- 'attempts' => $attempts,
- 'reserved' => 0,
- 'reserved_at' => null,
- 'available_at' => $availableAt->getTimestamp(),
- 'created_at' => $this->getTime(),
- ]);
- }
-
- /**
- * Pop the next job off of the queue.
- *
- * @param string $queue
- * @return \Illuminate\Contracts\Queue\Job|null
- */
- public function pop($queue = null)
- {
- $queue = $this->getQueue($queue);
-
- if ( ! is_null($this->expire))
- {
- $this->releaseJobsThatHaveBeenReservedTooLong($queue);
- }
-
- if ($job = $this->getNextAvailableJob($queue))
- {
- $this->markJobAsReserved($job->id);
-
- $this->database->commit();
-
- return new DatabaseJob(
- $this->container, $this, $job, $queue
- );
- }
-
- $this->database->commit();
- }
-
- /**
- * Release the jobs that have been reserved for too long.
- *
- * @param string $queue
- * @return void
- */
- protected function releaseJobsThatHaveBeenReservedTooLong($queue)
- {
- $expired = Carbon::now()->subSeconds($this->expire)->getTimestamp();
-
- $this->database->table($this->table)
- ->where('queue', $this->getQueue($queue))
- ->where('reserved', 1)
- ->where('reserved_at', '<=', $expired)
- ->update([
- 'reserved' => 0,
- 'reserved_at' => null,
- 'attempts' => new Expression('attempts + 1'),
- ]);
- }
-
- /**
- * Get the next available job for the queue.
- *
- * @param string|null $queue
- * @return \StdClass|null
- */
- protected function getNextAvailableJob($queue)
- {
- $this->database->beginTransaction();
-
- $job = $this->database->table($this->table)
- ->lockForUpdate()
- ->where('queue', $this->getQueue($queue))
- ->where('reserved', 0)
- ->where('available_at', '<=', $this->getTime())
- ->orderBy('id', 'asc')
- ->first();
-
- return $job ? (object) $job : null;
- }
-
- /**
- * Mark the given job ID as reserved.
- *
- * @param string $id
- * @return void
- */
- protected function markJobAsReserved($id)
- {
- $this->database->table($this->table)->where('id', $id)->update([
- 'reserved' => 1, 'reserved_at' => $this->getTime(),
- ]);
- }
-
- /**
- * Delete a reserved job from the queue.
- *
- * @param string $queue
- * @param string $id
- * @return void
- */
- public function deleteReserved($queue, $id)
- {
- $this->database->table($this->table)->where('id', $id)->delete();
- }
-
- /**
- * Get the queue or return the default.
- *
- * @param string|null $queue
- * @return string
- */
- protected function getQueue($queue)
- {
- return $queue ?: $this->default;
- }
-
- /**
- * Get the underlying database instance.
- *
- * @return \Illuminate\Database\Connection
- */
- public function getDatabase()
- {
- return $this->database;
- }
-
- /**
- * Get the expiration time in seconds.
- *
- * @return int|null
- */
- public function getExpire()
- {
- return $this->expire;
- }
-
- /**
- * Set the expiration time in seconds.
- *
- * @param int|null $seconds
- * @return void
- */
- public function setExpire($seconds)
- {
- $this->expire = $seconds;
- }
+class DatabaseQueue extends Queue implements QueueContract
+{
+ /**
+ * The database connection instance.
+ *
+ * @var \Illuminate\Database\Connection
+ */
+ protected $database;
+
+ /**
+ * The database table that holds the jobs.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * The name of the default queue.
+ *
+ * @var string
+ */
+ protected $default;
+
+ /**
+ * The expiration time of a job.
+ *
+ * @var int|null
+ */
+ protected $expire = 60;
+
+ /**
+ * Create a new database queue instance.
+ *
+ * @param \Illuminate\Database\Connection $database
+ * @param string $table
+ * @param string $default
+ * @param int $expire
+ * @return void
+ */
+ public function __construct(Connection $database, $table, $default = 'default', $expire = 60)
+ {
+ $this->table = $table;
+ $this->expire = $expire;
+ $this->default = $default;
+ $this->database = $database;
+ }
+
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function push($job, $data = '', $queue = null)
+ {
+ return $this->pushToDatabase(0, $queue, $this->createPayload($job, $data));
+ }
+
+ /**
+ * Push a raw payload onto the queue.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @param array $options
+ * @return mixed
+ */
+ public function pushRaw($payload, $queue = null, array $options = [])
+ {
+ return $this->pushToDatabase(0, $queue, $payload);
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return void
+ */
+ public function later($delay, $job, $data = '', $queue = null)
+ {
+ return $this->pushToDatabase($delay, $queue, $this->createPayload($job, $data));
+ }
+
+ /**
+ * Push an array of jobs onto the queue.
+ *
+ * @param array $jobs
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function bulk($jobs, $data = '', $queue = null)
+ {
+ $queue = $this->getQueue($queue);
+
+ $availableAt = $this->getAvailableAt(0);
+
+ $records = array_map(function ($job) use ($queue, $data, $availableAt) {
+ return $this->buildDatabaseRecord(
+ $queue, $this->createPayload($job, $data), $availableAt
+ );
+ }, (array) $jobs);
+
+ return $this->database->table($this->table)->insert($records);
+ }
+
+ /**
+ * Release a reserved job back onto the queue.
+ *
+ * @param string $queue
+ * @param \StdClass $job
+ * @param int $delay
+ * @return mixed
+ */
+ public function release($queue, $job, $delay)
+ {
+ return $this->pushToDatabase($delay, $queue, $job->payload, $job->attempts);
+ }
+
+ /**
+ * Push a raw payload to the database with a given delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string|null $queue
+ * @param string $payload
+ * @param int $attempts
+ * @return mixed
+ */
+ protected function pushToDatabase($delay, $queue, $payload, $attempts = 0)
+ {
+ $attributes = $this->buildDatabaseRecord(
+ $this->getQueue($queue), $payload, $this->getAvailableAt($delay), $attempts
+ );
+
+ return $this->database->table($this->table)->insertGetId($attributes);
+ }
+
+ /**
+ * Pop the next job off of the queue.
+ *
+ * @param string $queue
+ * @return \Illuminate\Contracts\Queue\Job|null
+ */
+ public function pop($queue = null)
+ {
+ $queue = $this->getQueue($queue);
+
+ if (! is_null($this->expire)) {
+ $this->releaseJobsThatHaveBeenReservedTooLong($queue);
+ }
+
+ if ($job = $this->getNextAvailableJob($queue)) {
+ $this->markJobAsReserved($job->id);
+
+ $this->database->commit();
+
+ return new DatabaseJob(
+ $this->container, $this, $job, $queue
+ );
+ }
+
+ $this->database->commit();
+ }
+
+ /**
+ * Release the jobs that have been reserved for too long.
+ *
+ * @param string $queue
+ * @return void
+ */
+ protected function releaseJobsThatHaveBeenReservedTooLong($queue)
+ {
+ $expired = Carbon::now()->subSeconds($this->expire)->getTimestamp();
+
+ $this->database->table($this->table)
+ ->where('queue', $this->getQueue($queue))
+ ->where('reserved', 1)
+ ->where('reserved_at', '<=', $expired)
+ ->update([
+ 'reserved' => 0,
+ 'reserved_at' => null,
+ 'attempts' => new Expression('attempts + 1'),
+ ]);
+ }
+
+ /**
+ * Get the next available job for the queue.
+ *
+ * @param string|null $queue
+ * @return \StdClass|null
+ */
+ protected function getNextAvailableJob($queue)
+ {
+ $this->database->beginTransaction();
+
+ $job = $this->database->table($this->table)
+ ->lockForUpdate()
+ ->where('queue', $this->getQueue($queue))
+ ->where('reserved', 0)
+ ->where('available_at', '<=', $this->getTime())
+ ->orderBy('id', 'asc')
+ ->first();
+
+ return $job ? (object) $job : null;
+ }
+
+ /**
+ * Mark the given job ID as reserved.
+ *
+ * @param string $id
+ * @return void
+ */
+ protected function markJobAsReserved($id)
+ {
+ $this->database->table($this->table)->where('id', $id)->update([
+ 'reserved' => 1, 'reserved_at' => $this->getTime(),
+ ]);
+ }
+
+ /**
+ * Delete a reserved job from the queue.
+ *
+ * @param string $queue
+ * @param string $id
+ * @return void
+ */
+ public function deleteReserved($queue, $id)
+ {
+ $this->database->table($this->table)->where('id', $id)->delete();
+ }
+
+ /**
+ * Get the "available at" UNIX timestamp.
+ *
+ * @param \DateTime|int $delay
+ * @return int
+ */
+ protected function getAvailableAt($delay)
+ {
+ $availableAt = $delay instanceof DateTime ? $delay : Carbon::now()->addSeconds($delay);
+
+ return $availableAt->getTimestamp();
+ }
+
+ /**
+ * Create an array to insert for the given job.
+ *
+ * @param string|null $queue
+ * @param string $payload
+ * @param int $availableAt
+ * @param int $attempts
+ * @return array
+ */
+ protected function buildDatabaseRecord($queue, $payload, $availableAt, $attempts = 0)
+ {
+ return [
+ 'queue' => $queue,
+ 'payload' => $payload,
+ 'attempts' => $attempts,
+ 'reserved' => 0,
+ 'reserved_at' => null,
+ 'available_at' => $availableAt,
+ 'created_at' => $this->getTime(),
+ ];
+ }
+
+ /**
+ * Get the queue or return the default.
+ *
+ * @param string|null $queue
+ * @return string
+ */
+ protected function getQueue($queue)
+ {
+ return $queue ?: $this->default;
+ }
+
+ /**
+ * Get the underlying database instance.
+ *
+ * @return \Illuminate\Database\Connection
+ */
+ public function getDatabase()
+ {
+ return $this->database;
+ }
+
+ /**
+ * Get the expiration time in seconds.
+ *
+ * @return int|null
+ */
+ public function getExpire()
+ {
+ return $this->expire;
+ }
+ /**
+ * Set the expiration time in seconds.
+ *
+ * @param int|null $seconds
+ * @return void
+ */
+ public function setExpire($seconds)
+ {
+ $this->expire = $seconds;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php
index 1fbf6f1..5758627 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php
@@ -1,111 +1,112 @@
-table = $table;
- $this->resolver = $resolver;
- $this->database = $database;
- }
+ /**
+ * The database table.
+ *
+ * @var string
+ */
+ protected $table;
- /**
- * Log a failed job into storage.
- *
- * @param string $connection
- * @param string $queue
- * @param string $payload
- * @return void
- */
- public function log($connection, $queue, $payload)
- {
- $failed_at = Carbon::now();
+ /**
+ * Create a new database failed job provider.
+ *
+ * @param \Illuminate\Database\ConnectionResolverInterface $resolver
+ * @param string $database
+ * @param string $table
+ * @return void
+ */
+ public function __construct(ConnectionResolverInterface $resolver, $database, $table)
+ {
+ $this->table = $table;
+ $this->resolver = $resolver;
+ $this->database = $database;
+ }
- $this->getTable()->insert(compact('connection', 'queue', 'payload', 'failed_at'));
- }
+ /**
+ * Log a failed job into storage.
+ *
+ * @param string $connection
+ * @param string $queue
+ * @param string $payload
+ * @return void
+ */
+ public function log($connection, $queue, $payload)
+ {
+ $failed_at = Carbon::now();
- /**
- * Get a list of all of the failed jobs.
- *
- * @return array
- */
- public function all()
- {
- return $this->getTable()->orderBy('id', 'desc')->get();
- }
+ $this->getTable()->insert(compact('connection', 'queue', 'payload', 'failed_at'));
+ }
- /**
- * Get a single failed job.
- *
- * @param mixed $id
- * @return array
- */
- public function find($id)
- {
- return $this->getTable()->find($id);
- }
+ /**
+ * Get a list of all of the failed jobs.
+ *
+ * @return array
+ */
+ public function all()
+ {
+ return $this->getTable()->orderBy('id', 'desc')->get();
+ }
- /**
- * Delete a single failed job from storage.
- *
- * @param mixed $id
- * @return bool
- */
- public function forget($id)
- {
- return $this->getTable()->where('id', $id)->delete() > 0;
- }
+ /**
+ * Get a single failed job.
+ *
+ * @param mixed $id
+ * @return array
+ */
+ public function find($id)
+ {
+ return $this->getTable()->find($id);
+ }
- /**
- * Flush all of the failed jobs from storage.
- *
- * @return void
- */
- public function flush()
- {
- $this->getTable()->delete();
- }
+ /**
+ * Delete a single failed job from storage.
+ *
+ * @param mixed $id
+ * @return bool
+ */
+ public function forget($id)
+ {
+ return $this->getTable()->where('id', $id)->delete() > 0;
+ }
- /**
- * Get a new query builder instance for the table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function getTable()
- {
- return $this->resolver->connection($this->database)->table($this->table);
- }
+ /**
+ * Flush all of the failed jobs from storage.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->getTable()->delete();
+ }
+ /**
+ * Get a new query builder instance for the table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function getTable()
+ {
+ return $this->resolver->connection($this->database)->table($this->table);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/FailedJobProviderInterface.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/FailedJobProviderInterface.php
index 7db652e..1b207c0 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/FailedJobProviderInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Failed/FailedJobProviderInterface.php
@@ -1,45 +1,46 @@
-crypt = $crypt;
+ }
- /**
- * Create a new queued Closure job.
- *
- * @param \Illuminate\Contracts\Encryption\Encrypter $crypt
- * @return void
- */
- public function __construct(EncrypterContract $crypt)
- {
- $this->crypt = $crypt;
- }
-
- /**
- * Fire the Closure based queue job.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param array $data
- * @return void
- */
- public function fire($job, $data)
- {
- $closure = unserialize($this->crypt->decrypt($data['closure']));
-
- $closure($job);
- }
+ /**
+ * Fire the Closure based queue job.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param array $data
+ * @return void
+ */
+ public function fire($job, $data)
+ {
+ $closure = unserialize($this->crypt->decrypt($data['closure']));
+ $closure($job);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php
index 68bc09c..bf1e021 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php
@@ -1,64 +1,63 @@
-job)
- {
- return $this->job->delete();
- }
- }
+namespace Illuminate\Queue;
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- if ($this->job)
- {
- return $this->job->release($delay);
- }
- }
-
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- public function attempts()
- {
- return $this->job ? $this->job->attempts() : 1;
- }
-
- /**
- * Set the base queue job instance.
- *
- * @param \Illuminate\Contracts\Queue\Job
- * @return $this
- */
- public function setJob(JobContract $job)
- {
- $this->job = $job;
-
- return $this;
- }
+use Illuminate\Contracts\Queue\Job as JobContract;
+trait InteractsWithQueue
+{
+ /**
+ * The underlying queue job instance.
+ *
+ * @var \Illuminate\Contracts\Queue\Job
+ */
+ protected $job;
+
+ /**
+ * Delete the job from the queue.
+ *
+ * @return void
+ */
+ public function delete()
+ {
+ if ($this->job) {
+ return $this->job->delete();
+ }
+ }
+
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ if ($this->job) {
+ return $this->job->release($delay);
+ }
+ }
+
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ public function attempts()
+ {
+ return $this->job ? $this->job->attempts() : 1;
+ }
+
+ /**
+ * Set the base queue job instance.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @return $this
+ */
+ public function setJob(JobContract $job)
+ {
+ $this->job = $job;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/IronQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/IronQueue.php
index 48b113c..6831889 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/IronQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/IronQueue.php
@@ -1,259 +1,263 @@
-iron = $iron;
- $this->request = $request;
- $this->default = $default;
- $this->shouldEncrypt = $shouldEncrypt;
- }
-
- /**
- * Push a new job onto the queue.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function push($job, $data = '', $queue = null)
- {
- return $this->pushRaw($this->createPayload($job, $data, $queue), $queue);
- }
-
- /**
- * Push a raw payload onto the queue.
- *
- * @param string $payload
- * @param string $queue
- * @param array $options
- * @return mixed
- */
- public function pushRaw($payload, $queue = null, array $options = array())
- {
- if ($this->shouldEncrypt) $payload = $this->crypt->encrypt($payload);
-
- return $this->iron->postMessage($this->getQueue($queue), $payload, $options)->id;
- }
-
- /**
- * Push a raw payload onto the queue after encrypting the payload.
- *
- * @param string $payload
- * @param string $queue
- * @param int $delay
- * @return mixed
- */
- public function recreate($payload, $queue = null, $delay)
- {
- $options = array('delay' => $this->getSeconds($delay));
-
- return $this->pushRaw($payload, $queue, $options);
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function later($delay, $job, $data = '', $queue = null)
- {
- $delay = $this->getSeconds($delay);
-
- $payload = $this->createPayload($job, $data, $queue);
-
- return $this->pushRaw($payload, $queue, compact('delay'));
- }
-
- /**
- * Pop the next job off of the queue.
- *
- * @param string $queue
- * @return \Illuminate\Contracts\Queue\Job|null
- */
- public function pop($queue = null)
- {
- $queue = $this->getQueue($queue);
-
- $job = $this->iron->getMessage($queue);
-
- // If we were able to pop a message off of the queue, we will need to decrypt
- // the message body, as all Iron.io messages are encrypted, since the push
- // queues will be a security hazard to unsuspecting developers using it.
- if ( ! is_null($job))
- {
- $job->body = $this->parseJobBody($job->body);
-
- return new IronJob($this->container, $this, $job);
- }
- }
-
- /**
- * Delete a message from the Iron queue.
- *
- * @param string $queue
- * @param string $id
- * @return void
- */
- public function deleteMessage($queue, $id)
- {
- $this->iron->deleteMessage($queue, $id);
- }
-
- /**
- * Marshal a push queue request and fire the job.
- *
- * @return \Illuminate\Http\Response
- */
- public function marshal()
- {
- $this->createPushedIronJob($this->marshalPushedJob())->fire();
-
- return new Response('OK');
- }
-
- /**
- * Marshal out the pushed job and payload.
- *
- * @return object
- */
- protected function marshalPushedJob()
- {
- $r = $this->request;
-
- $body = $this->parseJobBody($r->getContent());
-
- return (object) array(
- 'id' => $r->header('iron-message-id'), 'body' => $body, 'pushed' => true,
- );
- }
-
- /**
- * Create a new IronJob for a pushed job.
- *
- * @param object $job
- * @return \Illuminate\Queue\Jobs\IronJob
- */
- protected function createPushedIronJob($job)
- {
- return new IronJob($this->container, $this, $job, true);
- }
-
- /**
- * Create a payload string from the given job and data.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return string
- */
- protected function createPayload($job, $data = '', $queue = null)
- {
- $payload = $this->setMeta(parent::createPayload($job, $data), 'attempts', 1);
-
- return $this->setMeta($payload, 'queue', $this->getQueue($queue));
- }
-
- /**
- * Parse the job body for firing.
- *
- * @param string $body
- * @return string
- */
- protected function parseJobBody($body)
- {
- return $this->shouldEncrypt ? $this->crypt->decrypt($body) : $body;
- }
-
- /**
- * Get the queue or return the default.
- *
- * @param string|null $queue
- * @return string
- */
- public function getQueue($queue)
- {
- return $queue ?: $this->default;
- }
-
- /**
- * Get the underlying IronMQ instance.
- *
- * @return \IronMQ
- */
- public function getIron()
- {
- return $this->iron;
- }
-
- /**
- * Get the request instance.
- *
- * @return \Symfony\Component\HttpFoundation\Request
- */
- public function getRequest()
- {
- return $this->request;
- }
-
- /**
- * Set the request instance.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @return void
- */
- public function setRequest(Request $request)
- {
- $this->request = $request;
- }
-
+class IronQueue extends Queue implements QueueContract
+{
+ /**
+ * The IronMQ instance.
+ *
+ * @var \IronMQ\IronMQ
+ */
+ protected $iron;
+
+ /**
+ * The current request instance.
+ *
+ * @var \Illuminate\Http\Request
+ */
+ protected $request;
+
+ /**
+ * The name of the default tube.
+ *
+ * @var string
+ */
+ protected $default;
+
+ /**
+ * Indicates if the messages should be encrypted.
+ *
+ * @var bool
+ */
+ protected $shouldEncrypt;
+
+ /**
+ * Create a new IronMQ queue instance.
+ *
+ * @param \IronMQ\IronMQ $iron
+ * @param \Illuminate\Http\Request $request
+ * @param string $default
+ * @param bool $shouldEncrypt
+ * @return void
+ */
+ public function __construct(IronMQ $iron, Request $request, $default, $shouldEncrypt = false)
+ {
+ $this->iron = $iron;
+ $this->request = $request;
+ $this->default = $default;
+ $this->shouldEncrypt = $shouldEncrypt;
+ }
+
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function push($job, $data = '', $queue = null)
+ {
+ return $this->pushRaw($this->createPayload($job, $data, $queue), $queue);
+ }
+
+ /**
+ * Push a raw payload onto the queue.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @param array $options
+ * @return mixed
+ */
+ public function pushRaw($payload, $queue = null, array $options = [])
+ {
+ if ($this->shouldEncrypt) {
+ $payload = $this->crypt->encrypt($payload);
+ }
+
+ return $this->iron->postMessage($this->getQueue($queue), $payload, $options)->id;
+ }
+
+ /**
+ * Push a raw payload onto the queue after encrypting the payload.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @param int $delay
+ * @return mixed
+ */
+ public function recreate($payload, $queue, $delay)
+ {
+ $options = ['delay' => $this->getSeconds($delay)];
+
+ return $this->pushRaw($payload, $queue, $options);
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function later($delay, $job, $data = '', $queue = null)
+ {
+ $delay = $this->getSeconds($delay);
+
+ $payload = $this->createPayload($job, $data, $queue);
+
+ return $this->pushRaw($payload, $queue, compact('delay'));
+ }
+
+ /**
+ * Pop the next job off of the queue.
+ *
+ * @param string $queue
+ * @return \Illuminate\Contracts\Queue\Job|null
+ */
+ public function pop($queue = null)
+ {
+ $queue = $this->getQueue($queue);
+
+ $job = $this->iron->getMessage($queue);
+
+ // If we were able to pop a message off of the queue, we will need to decrypt
+ // the message body, as all Iron.io messages are encrypted, since the push
+ // queues will be a security hazard to unsuspecting developers using it.
+ if (! is_null($job)) {
+ $job->body = $this->parseJobBody($job->body);
+
+ return new IronJob($this->container, $this, $job);
+ }
+ }
+
+ /**
+ * Delete a message from the Iron queue.
+ *
+ * @param string $queue
+ * @param string $id
+ * @return void
+ */
+ public function deleteMessage($queue, $id)
+ {
+ $this->iron->deleteMessage($queue, $id);
+ }
+
+ /**
+ * Marshal a push queue request and fire the job.
+ *
+ * @return \Illuminate\Http\Response
+ *
+ * @deprecated since version 5.1.
+ */
+ public function marshal()
+ {
+ $this->createPushedIronJob($this->marshalPushedJob())->fire();
+
+ return new Response('OK');
+ }
+
+ /**
+ * Marshal out the pushed job and payload.
+ *
+ * @return object
+ */
+ protected function marshalPushedJob()
+ {
+ $r = $this->request;
+
+ $body = $this->parseJobBody($r->getContent());
+
+ return (object) [
+ 'id' => $r->header('iron-message-id'), 'body' => $body, 'pushed' => true,
+ ];
+ }
+
+ /**
+ * Create a new IronJob for a pushed job.
+ *
+ * @param object $job
+ * @return \Illuminate\Queue\Jobs\IronJob
+ */
+ protected function createPushedIronJob($job)
+ {
+ return new IronJob($this->container, $this, $job, true);
+ }
+
+ /**
+ * Create a payload string from the given job and data.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return string
+ */
+ protected function createPayload($job, $data = '', $queue = null)
+ {
+ $payload = $this->setMeta(parent::createPayload($job, $data), 'attempts', 1);
+
+ return $this->setMeta($payload, 'queue', $this->getQueue($queue));
+ }
+
+ /**
+ * Parse the job body for firing.
+ *
+ * @param string $body
+ * @return string
+ */
+ protected function parseJobBody($body)
+ {
+ return $this->shouldEncrypt ? $this->crypt->decrypt($body) : $body;
+ }
+
+ /**
+ * Get the queue or return the default.
+ *
+ * @param string|null $queue
+ * @return string
+ */
+ public function getQueue($queue)
+ {
+ return $queue ?: $this->default;
+ }
+
+ /**
+ * Get the underlying IronMQ instance.
+ *
+ * @return \IronMQ\IronMQ
+ */
+ public function getIron()
+ {
+ return $this->iron;
+ }
+
+ /**
+ * Get the request instance.
+ *
+ * @return \Illuminate\Http\Request
+ */
+ public function getRequest()
+ {
+ return $this->request;
+ }
+
+ /**
+ * Set the request instance.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return void
+ */
+ public function setRequest(Request $request)
+ {
+ $this->request = $request;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/BeanstalkdJob.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/BeanstalkdJob.php
index c666927..be245b7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/BeanstalkdJob.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/BeanstalkdJob.php
@@ -1,153 +1,156 @@
-job = $job;
- $this->queue = $queue;
- $this->container = $container;
- $this->pheanstalk = $pheanstalk;
- }
-
- /**
- * Fire the job.
- *
- * @return void
- */
- public function fire()
- {
- $this->resolveAndFire(json_decode($this->getRawBody(), true));
- }
-
- /**
- * Get the raw body string for the job.
- *
- * @return string
- */
- public function getRawBody()
- {
- return $this->job->getData();
- }
-
- /**
- * Delete the job from the queue.
- *
- * @return void
- */
- public function delete()
- {
- parent::delete();
-
- $this->pheanstalk->delete($this->job);
- }
-
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- parent::release($delay);
-
- $priority = Pheanstalk::DEFAULT_PRIORITY;
-
- $this->pheanstalk->release($this->job, $priority, $delay);
- }
-
- /**
- * Bury the job in the queue.
- *
- * @return void
- */
- public function bury()
- {
- $this->pheanstalk->bury($this->job);
- }
-
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- public function attempts()
- {
- $stats = $this->pheanstalk->statsJob($this->job);
-
- return (int) $stats->reserves;
- }
-
- /**
- * Get the job identifier.
- *
- * @return string
- */
- public function getJobId()
- {
- return $this->job->getId();
- }
-
- /**
- * Get the IoC container instance.
- *
- * @return \Illuminate\Container\Container
- */
- public function getContainer()
- {
- return $this->container;
- }
-
- /**
- * Get the underlying Pheanstalk instance.
- *
- * @return \Pheanstalk_Pheanstalk
- */
- public function getPheanstalk()
- {
- return $this->pheanstalk;
- }
-
- /**
- * Get the underlying Pheanstalk job.
- *
- * @return PheanstalkJob
- */
- public function getPheanstalkJob()
- {
- return $this->job;
- }
-
+ {
+ $this->job = $job;
+ $this->queue = $queue;
+ $this->container = $container;
+ $this->pheanstalk = $pheanstalk;
+ }
+
+ /**
+ * Fire the job.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->resolveAndFire(json_decode($this->getRawBody(), true));
+ }
+
+ /**
+ * Get the raw body string for the job.
+ *
+ * @return string
+ */
+ public function getRawBody()
+ {
+ return $this->job->getData();
+ }
+
+ /**
+ * Delete the job from the queue.
+ *
+ * @return void
+ */
+ public function delete()
+ {
+ parent::delete();
+
+ $this->pheanstalk->delete($this->job);
+ }
+
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ parent::release($delay);
+
+ $priority = Pheanstalk::DEFAULT_PRIORITY;
+
+ $this->pheanstalk->release($this->job, $priority, $delay);
+ }
+
+ /**
+ * Bury the job in the queue.
+ *
+ * @return void
+ */
+ public function bury()
+ {
+ parent::release();
+
+ $this->pheanstalk->bury($this->job);
+ }
+
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ public function attempts()
+ {
+ $stats = $this->pheanstalk->statsJob($this->job);
+
+ return (int) $stats->reserves;
+ }
+
+ /**
+ * Get the job identifier.
+ *
+ * @return string
+ */
+ public function getJobId()
+ {
+ return $this->job->getId();
+ }
+
+ /**
+ * Get the IoC container instance.
+ *
+ * @return \Illuminate\Container\Container
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
+
+ /**
+ * Get the underlying Pheanstalk instance.
+ *
+ * @return \Pheanstalk\Pheanstalk
+ */
+ public function getPheanstalk()
+ {
+ return $this->pheanstalk;
+ }
+
+ /**
+ * Get the underlying Pheanstalk job.
+ *
+ * @return \Pheanstalk\Job
+ */
+ public function getPheanstalkJob()
+ {
+ return $this->job;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/DatabaseJob.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/DatabaseJob.php
index d28bd01..4bcc8eb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/DatabaseJob.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/DatabaseJob.php
@@ -1,138 +1,139 @@
-job = $job;
- $this->queue = $queue;
- $this->database = $database;
- $this->container = $container;
- $this->job->attempts = $this->job->attempts + 1;
- }
-
- /**
- * Fire the job.
- *
- * @return void
- */
- public function fire()
- {
- $this->resolveAndFire(json_decode($this->job->payload, true));
- }
-
- /**
- * Delete the job from the queue.
- *
- * @return void
- */
- public function delete()
- {
- parent::delete();
-
- $this->database->deleteReserved($this->queue, $this->job->id);
- }
-
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- parent::release($delay);
-
- $this->delete();
-
- $this->database->release($this->queue, $this->job, $delay);
- }
-
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- public function attempts()
- {
- return (int) $this->job->attempts;
- }
-
- /**
- * Get the job identifier.
- *
- * @return string
- */
- public function getJobId()
- {
- return $this->job->id;
- }
-
- /**
- * Get the raw body string for the job.
- *
- * @return string
- */
- public function getRawBody()
- {
- return $this->job->payload;
- }
-
- /**
- * Get the IoC container instance.
- *
- * @return \Illuminate\Container\Container
- */
- public function getContainer()
- {
- return $this->container;
- }
-
- /**
- * Get the underlying queue driver instance.
- *
- * @return \Illuminate\Queue\DatabaseQueue
- */
- public function getDatabaseQueue()
- {
- return $this->database;
- }
-
- /**
- * Get the underlying database job.
- *
- * @return \StdClass
- */
- public function getDatabaseJob()
- {
- return $this->job;
- }
-
+class DatabaseJob extends Job implements JobContract
+{
+ /**
+ * The database queue instance.
+ *
+ * @var \Illuminate\Queue\DatabaseQueue
+ */
+ protected $database;
+
+ /**
+ * The database job payload.
+ *
+ * @var \StdClass
+ */
+ protected $job;
+
+ /**
+ * Create a new job instance.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @param \Illuminate\Queue\DatabaseQueue $database
+ * @param \StdClass $job
+ * @param string $queue
+ * @return void
+ */
+ public function __construct(Container $container, DatabaseQueue $database, $job, $queue)
+ {
+ $this->job = $job;
+ $this->queue = $queue;
+ $this->database = $database;
+ $this->container = $container;
+ $this->job->attempts = $this->job->attempts + 1;
+ }
+
+ /**
+ * Fire the job.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->resolveAndFire(json_decode($this->job->payload, true));
+ }
+
+ /**
+ * Delete the job from the queue.
+ *
+ * @return void
+ */
+ public function delete()
+ {
+ parent::delete();
+
+ $this->database->deleteReserved($this->queue, $this->job->id);
+ }
+
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ parent::release($delay);
+
+ $this->delete();
+
+ $this->database->release($this->queue, $this->job, $delay);
+ }
+
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ public function attempts()
+ {
+ return (int) $this->job->attempts;
+ }
+
+ /**
+ * Get the job identifier.
+ *
+ * @return string
+ */
+ public function getJobId()
+ {
+ return $this->job->id;
+ }
+
+ /**
+ * Get the raw body string for the job.
+ *
+ * @return string
+ */
+ public function getRawBody()
+ {
+ return $this->job->payload;
+ }
+
+ /**
+ * Get the IoC container instance.
+ *
+ * @return \Illuminate\Container\Container
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
+
+ /**
+ * Get the underlying queue driver instance.
+ *
+ * @return \Illuminate\Queue\DatabaseQueue
+ */
+ public function getDatabaseQueue()
+ {
+ return $this->database;
+ }
+
+ /**
+ * Get the underlying database job.
+ *
+ * @return \StdClass
+ */
+ public function getDatabaseJob()
+ {
+ return $this->job;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/IronJob.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/IronJob.php
index 26717c9..6793bcd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/IronJob.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/IronJob.php
@@ -1,174 +1,180 @@
-job = $job;
- $this->iron = $iron;
- $this->pushed = $pushed;
- $this->container = $container;
- }
-
- /**
- * Fire the job.
- *
- * @return void
- */
- public function fire()
- {
- $this->resolveAndFire(json_decode($this->getRawBody(), true));
- }
-
- /**
- * Get the raw body string for the job.
- *
- * @return string
- */
- public function getRawBody()
- {
- return $this->job->body;
- }
-
- /**
- * Delete the job from the queue.
- *
- * @return void
- */
- public function delete()
- {
- parent::delete();
-
- if (isset($this->job->pushed)) return;
-
- $this->iron->deleteMessage($this->getQueue(), $this->job->id);
- }
-
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- parent::release($delay);
-
- if ( ! $this->pushed) $this->delete();
-
- $this->recreateJob($delay);
- }
-
- /**
- * Release a pushed job back onto the queue.
- *
- * @param int $delay
- * @return void
- */
- protected function recreateJob($delay)
- {
- $payload = json_decode($this->job->body, true);
-
- array_set($payload, 'attempts', array_get($payload, 'attempts', 1) + 1);
-
- $this->iron->recreate(json_encode($payload), $this->getQueue(), $delay);
- }
-
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- public function attempts()
- {
- return array_get(json_decode($this->job->body, true), 'attempts', 1);
- }
-
- /**
- * Get the job identifier.
- *
- * @return string
- */
- public function getJobId()
- {
- return $this->job->id;
- }
-
- /**
- * Get the IoC container instance.
- *
- * @return \Illuminate\Container\Container
- */
- public function getContainer()
- {
- return $this->container;
- }
-
- /**
- * Get the underlying Iron queue instance.
- *
- * @return \Illuminate\Queue\IronQueue
- */
- public function getIron()
- {
- return $this->iron;
- }
-
- /**
- * Get the underlying IronMQ job.
- *
- * @return array
- */
- public function getIronJob()
- {
- return $this->job;
- }
-
- /**
- * Get the name of the queue the job belongs to.
- *
- * @return string
- */
- public function getQueue()
- {
- return array_get(json_decode($this->job->body, true), 'queue');
- }
-
+ {
+ $this->job = $job;
+ $this->iron = $iron;
+ $this->pushed = $pushed;
+ $this->container = $container;
+ }
+
+ /**
+ * Fire the job.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->resolveAndFire(json_decode($this->getRawBody(), true));
+ }
+
+ /**
+ * Get the raw body string for the job.
+ *
+ * @return string
+ */
+ public function getRawBody()
+ {
+ return $this->job->body;
+ }
+
+ /**
+ * Delete the job from the queue.
+ *
+ * @return void
+ */
+ public function delete()
+ {
+ parent::delete();
+
+ if (isset($this->job->pushed)) {
+ return;
+ }
+
+ $this->iron->deleteMessage($this->getQueue(), $this->job->id);
+ }
+
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ parent::release($delay);
+
+ if (! $this->pushed) {
+ $this->delete();
+ }
+
+ $this->recreateJob($delay);
+ }
+
+ /**
+ * Release a pushed job back onto the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ protected function recreateJob($delay)
+ {
+ $payload = json_decode($this->job->body, true);
+
+ Arr::set($payload, 'attempts', Arr::get($payload, 'attempts', 1) + 1);
+
+ $this->iron->recreate(json_encode($payload), $this->getQueue(), $delay);
+ }
+
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ public function attempts()
+ {
+ return Arr::get(json_decode($this->job->body, true), 'attempts', 1);
+ }
+
+ /**
+ * Get the job identifier.
+ *
+ * @return string
+ */
+ public function getJobId()
+ {
+ return $this->job->id;
+ }
+
+ /**
+ * Get the IoC container instance.
+ *
+ * @return \Illuminate\Container\Container
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
+
+ /**
+ * Get the underlying Iron queue instance.
+ *
+ * @return \Illuminate\Queue\IronQueue
+ */
+ public function getIron()
+ {
+ return $this->iron;
+ }
+
+ /**
+ * Get the underlying IronMQ job.
+ *
+ * @return array
+ */
+ public function getIronJob()
+ {
+ return $this->job;
+ }
+
+ /**
+ * Get the name of the queue the job belongs to.
+ *
+ * @return string
+ */
+ public function getQueue()
+ {
+ return Arr::get(json_decode($this->job->body, true), 'queue');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php
index f8709a3..304bc9d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php
@@ -1,267 +1,270 @@
-deleted = true;
- }
-
- /**
- * Determine if the job has been deleted.
- *
- * @return bool
- */
- public function isDeleted()
- {
- return $this->deleted;
- }
-
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- $this->released = true;
- }
-
- /**
- * Determine if the job was released back into the queue.
- *
- * @return bool
- */
- public function isReleased()
- {
- return $this->released;
- }
-
- /**
- * Determine if the job has been deleted or released.
- *
- * @return bool
- */
- public function isDeletedOrReleased()
- {
- return $this->isDeleted() || $this->isReleased();
- }
-
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- abstract public function attempts();
-
- /**
- * Get the raw body string for the job.
- *
- * @return string
- */
- abstract public function getRawBody();
-
- /**
- * Resolve and fire the job handler method.
- *
- * @param array $payload
- * @return void
- */
- protected function resolveAndFire(array $payload)
- {
- list($class, $method) = $this->parseJob($payload['job']);
-
- $this->instance = $this->resolve($class);
-
- $this->instance->{$method}($this, $this->resolveQueueableEntities($payload['data']));
- }
-
- /**
- * Parse the job declaration into class and method.
- *
- * @param string $job
- * @return array
- */
- protected function parseJob($job)
- {
- $segments = explode('@', $job);
-
- return count($segments) > 1 ? $segments : array($segments[0], 'fire');
- }
-
- /**
- * Resolve the given job handler.
- *
- * @param string $class
- * @return mixed
- */
- protected function resolve($class)
- {
- return $this->container->make($class);
- }
-
- /**
- * Resolve all of the queueable entities in the given payload.
- *
- * @param mixed $data
- * @return mixed
- */
- protected function resolveQueueableEntities($data)
- {
- if (is_string($data))
- {
- return $this->resolveQueueableEntity($data);
- }
-
- if (is_array($data))
- {
- array_walk($data, function(&$d) { $d = $this->resolveQueueableEntity($d); });
- }
-
- return $data;
- }
-
- /**
- * Resolve a single queueable entity from the resolver.
- *
- * @param mixed $value
- * @return \Illuminate\Contracts\Queue\QueueableEntity
- */
- protected function resolveQueueableEntity($value)
- {
- if (is_string($value) && starts_with($value, '::entity::'))
- {
- list($marker, $type, $id) = explode('|', $value, 3);
-
- return $this->getEntityResolver()->resolve($type, $id);
- }
-
- return $value;
- }
-
- /**
- * Call the failed method on the job instance.
- *
- * @return void
- */
- public function failed()
- {
- $payload = json_decode($this->getRawBody(), true);
-
- list($class, $method) = $this->parseJob($payload['job']);
-
- $this->instance = $this->resolve($class);
-
- if (method_exists($this->instance, 'failed'))
- {
- $this->instance->failed($this->resolveQueueableEntities($payload['data']));
- }
- }
-
- /**
- * Get an entity resolver instance.
- *
- * @return \Illuminate\Contracts\Queue\EntityResolver
- */
- protected function getEntityResolver()
- {
- return $this->container->make('Illuminate\Contracts\Queue\EntityResolver');
- }
-
- /**
- * Calculate the number of seconds with the given delay.
- *
- * @param \DateTime|int $delay
- * @return int
- */
- protected function getSeconds($delay)
- {
- if ($delay instanceof DateTime)
- {
- return max(0, $delay->getTimestamp() - $this->getTime());
- }
-
- return (int) $delay;
- }
-
- /**
- * Get the current system time.
- *
- * @return int
- */
- protected function getTime()
- {
- return time();
- }
-
- /**
- * Get the name of the queued job class.
- *
- * @return string
- */
- public function getName()
- {
- return json_decode($this->getRawBody(), true)['job'];
- }
-
- /**
- * Get the name of the queue the job belongs to.
- *
- * @return string
- */
- public function getQueue()
- {
- return $this->queue;
- }
+namespace Illuminate\Queue\Jobs;
+use DateTime;
+use Illuminate\Support\Str;
+
+abstract class Job
+{
+ /**
+ * The job handler instance.
+ *
+ * @var mixed
+ */
+ protected $instance;
+
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The name of the queue the job belongs to.
+ *
+ * @var string
+ */
+ protected $queue;
+
+ /**
+ * Indicates if the job has been deleted.
+ *
+ * @var bool
+ */
+ protected $deleted = false;
+
+ /**
+ * Indicates if the job has been released.
+ *
+ * @var bool
+ */
+ protected $released = false;
+
+ /**
+ * Fire the job.
+ *
+ * @return void
+ */
+ abstract public function fire();
+
+ /**
+ * Delete the job from the queue.
+ *
+ * @return void
+ */
+ public function delete()
+ {
+ $this->deleted = true;
+ }
+
+ /**
+ * Determine if the job has been deleted.
+ *
+ * @return bool
+ */
+ public function isDeleted()
+ {
+ return $this->deleted;
+ }
+
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ $this->released = true;
+ }
+
+ /**
+ * Determine if the job was released back into the queue.
+ *
+ * @return bool
+ */
+ public function isReleased()
+ {
+ return $this->released;
+ }
+
+ /**
+ * Determine if the job has been deleted or released.
+ *
+ * @return bool
+ */
+ public function isDeletedOrReleased()
+ {
+ return $this->isDeleted() || $this->isReleased();
+ }
+
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ abstract public function attempts();
+
+ /**
+ * Get the raw body string for the job.
+ *
+ * @return string
+ */
+ abstract public function getRawBody();
+
+ /**
+ * Resolve and fire the job handler method.
+ *
+ * @param array $payload
+ * @return void
+ */
+ protected function resolveAndFire(array $payload)
+ {
+ list($class, $method) = $this->parseJob($payload['job']);
+
+ $this->instance = $this->resolve($class);
+
+ $this->instance->{$method}($this, $this->resolveQueueableEntities($payload['data']));
+ }
+
+ /**
+ * Parse the job declaration into class and method.
+ *
+ * @param string $job
+ * @return array
+ */
+ protected function parseJob($job)
+ {
+ $segments = explode('@', $job);
+
+ return count($segments) > 1 ? $segments : [$segments[0], 'fire'];
+ }
+
+ /**
+ * Resolve the given job handler.
+ *
+ * @param string $class
+ * @return mixed
+ */
+ protected function resolve($class)
+ {
+ return $this->container->make($class);
+ }
+
+ /**
+ * Resolve all of the queueable entities in the given payload.
+ *
+ * @param mixed $data
+ * @return mixed
+ */
+ protected function resolveQueueableEntities($data)
+ {
+ if (is_string($data)) {
+ return $this->resolveQueueableEntity($data);
+ }
+
+ if (is_array($data)) {
+ $data = array_map(function ($d) {
+ if (is_array($d)) {
+ return $this->resolveQueueableEntities($d);
+ }
+
+ return $this->resolveQueueableEntity($d);
+ }, $data);
+ }
+
+ return $data;
+ }
+
+ /**
+ * Resolve a single queueable entity from the resolver.
+ *
+ * @param mixed $value
+ * @return \Illuminate\Contracts\Queue\QueueableEntity
+ */
+ protected function resolveQueueableEntity($value)
+ {
+ if (is_string($value) && Str::startsWith($value, '::entity::')) {
+ list($marker, $type, $id) = explode('|', $value, 3);
+
+ return $this->getEntityResolver()->resolve($type, $id);
+ }
+
+ return $value;
+ }
+
+ /**
+ * Call the failed method on the job instance.
+ *
+ * @return void
+ */
+ public function failed()
+ {
+ $payload = json_decode($this->getRawBody(), true);
+
+ list($class, $method) = $this->parseJob($payload['job']);
+
+ $this->instance = $this->resolve($class);
+
+ if (method_exists($this->instance, 'failed')) {
+ $this->instance->failed($this->resolveQueueableEntities($payload['data']));
+ }
+ }
+
+ /**
+ * Get an entity resolver instance.
+ *
+ * @return \Illuminate\Contracts\Queue\EntityResolver
+ */
+ protected function getEntityResolver()
+ {
+ return $this->container->make('Illuminate\Contracts\Queue\EntityResolver');
+ }
+
+ /**
+ * Calculate the number of seconds with the given delay.
+ *
+ * @param \DateTime|int $delay
+ * @return int
+ */
+ protected function getSeconds($delay)
+ {
+ if ($delay instanceof DateTime) {
+ return max(0, $delay->getTimestamp() - $this->getTime());
+ }
+
+ return (int) $delay;
+ }
+
+ /**
+ * Get the current system time.
+ *
+ * @return int
+ */
+ protected function getTime()
+ {
+ return time();
+ }
+
+ /**
+ * Get the name of the queued job class.
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return json_decode($this->getRawBody(), true)['job'];
+ }
+
+ /**
+ * Get the name of the queue the job belongs to.
+ *
+ * @return string
+ */
+ public function getQueue()
+ {
+ return $this->queue;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/RedisJob.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/RedisJob.php
index 815b9bc..af9ca97 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/RedisJob.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/RedisJob.php
@@ -1,137 +1,139 @@
-job = $job;
- $this->redis = $redis;
- $this->queue = $queue;
- $this->container = $container;
- }
-
- /**
- * Fire the job.
- *
- * @return void
- */
- public function fire()
- {
- $this->resolveAndFire(json_decode($this->getRawBody(), true));
- }
-
- /**
- * Get the raw body string for the job.
- *
- * @return string
- */
- public function getRawBody()
- {
- return $this->job;
- }
-
- /**
- * Delete the job from the queue.
- *
- * @return void
- */
- public function delete()
- {
- parent::delete();
-
- $this->redis->deleteReserved($this->queue, $this->job);
- }
-
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- parent::release($delay);
-
- $this->delete();
-
- $this->redis->release($this->queue, $this->job, $delay, $this->attempts() + 1);
- }
-
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- public function attempts()
- {
- return array_get(json_decode($this->job, true), 'attempts');
- }
-
- /**
- * Get the job identifier.
- *
- * @return string
- */
- public function getJobId()
- {
- return array_get(json_decode($this->job, true), 'id');
- }
-
- /**
- * Get the IoC container instance.
- *
- * @return \Illuminate\Container\Container
- */
- public function getContainer()
- {
- return $this->container;
- }
-
- /**
- * Get the underlying queue driver instance.
- *
- * @return \Illuminate\Redis\Database
- */
- public function getRedisQueue()
- {
- return $this->redis;
- }
-
- /**
- * Get the underlying Redis job.
- *
- * @return string
- */
- public function getRedisJob()
- {
- return $this->job;
- }
-
+class RedisJob extends Job implements JobContract
+{
+ /**
+ * The Redis queue instance.
+ *
+ * @var \Illuminate\Queue\RedisQueue
+ */
+ protected $redis;
+
+ /**
+ * The Redis job payload.
+ *
+ * @var string
+ */
+ protected $job;
+
+ /**
+ * Create a new job instance.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @param \Illuminate\Queue\RedisQueue $redis
+ * @param string $job
+ * @param string $queue
+ * @return void
+ */
+ public function __construct(Container $container, RedisQueue $redis, $job, $queue)
+ {
+ $this->job = $job;
+ $this->redis = $redis;
+ $this->queue = $queue;
+ $this->container = $container;
+ }
+
+ /**
+ * Fire the job.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->resolveAndFire(json_decode($this->getRawBody(), true));
+ }
+
+ /**
+ * Get the raw body string for the job.
+ *
+ * @return string
+ */
+ public function getRawBody()
+ {
+ return $this->job;
+ }
+
+ /**
+ * Delete the job from the queue.
+ *
+ * @return void
+ */
+ public function delete()
+ {
+ parent::delete();
+
+ $this->redis->deleteReserved($this->queue, $this->job);
+ }
+
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ parent::release($delay);
+
+ $this->delete();
+
+ $this->redis->release($this->queue, $this->job, $delay, $this->attempts() + 1);
+ }
+
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ public function attempts()
+ {
+ return Arr::get(json_decode($this->job, true), 'attempts');
+ }
+
+ /**
+ * Get the job identifier.
+ *
+ * @return string
+ */
+ public function getJobId()
+ {
+ return Arr::get(json_decode($this->job, true), 'id');
+ }
+
+ /**
+ * Get the IoC container instance.
+ *
+ * @return \Illuminate\Container\Container
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
+
+ /**
+ * Get the underlying queue driver instance.
+ *
+ * @return \Illuminate\Redis\Database
+ */
+ public function getRedisQueue()
+ {
+ return $this->redis;
+ }
+
+ /**
+ * Get the underlying Redis job.
+ *
+ * @return string
+ */
+ public function getRedisJob()
+ {
+ return $this->job;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SqsJob.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SqsJob.php
index affcb30..b676a52 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SqsJob.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SqsJob.php
@@ -1,146 +1,147 @@
-sqs = $sqs;
- $this->job = $job;
- $this->queue = $queue;
- $this->container = $container;
- }
-
- /**
- * Fire the job.
- *
- * @return void
- */
- public function fire()
- {
- $this->resolveAndFire(json_decode($this->getRawBody(), true));
- }
-
- /**
- * Get the raw body string for the job.
- *
- * @return string
- */
- public function getRawBody()
- {
- return $this->job['Body'];
- }
-
- /**
- * Delete the job from the queue.
- *
- * @return void
- */
- public function delete()
- {
- parent::delete();
-
- $this->sqs->deleteMessage(array(
-
- 'QueueUrl' => $this->queue, 'ReceiptHandle' => $this->job['ReceiptHandle'],
-
- ));
- }
-
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- parent::release($delay);
-
- $this->sqs->changeMessageVisibility([
- 'QueueUrl' => $this->queue,
- 'ReceiptHandle' => $this->job['ReceiptHandle'],
- 'VisibilityTimeout' => $delay,
- ]);
- }
-
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- public function attempts()
- {
- return (int) $this->job['Attributes']['ApproximateReceiveCount'];
- }
-
- /**
- * Get the job identifier.
- *
- * @return string
- */
- public function getJobId()
- {
- return $this->job['MessageId'];
- }
-
- /**
- * Get the IoC container instance.
- *
- * @return \Illuminate\Container\Container
- */
- public function getContainer()
- {
- return $this->container;
- }
-
- /**
- * Get the underlying SQS client instance.
- *
- * @return \Aws\Sqs\SqsClient
- */
- public function getSqs()
- {
- return $this->sqs;
- }
-
- /**
- * Get the underlying raw SQS job.
- *
- * @return array
- */
- public function getSqsJob()
- {
- return $this->job;
- }
-
+ {
+ $this->sqs = $sqs;
+ $this->job = $job;
+ $this->queue = $queue;
+ $this->container = $container;
+ }
+
+ /**
+ * Fire the job.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->resolveAndFire(json_decode($this->getRawBody(), true));
+ }
+
+ /**
+ * Get the raw body string for the job.
+ *
+ * @return string
+ */
+ public function getRawBody()
+ {
+ return $this->job['Body'];
+ }
+
+ /**
+ * Delete the job from the queue.
+ *
+ * @return void
+ */
+ public function delete()
+ {
+ parent::delete();
+
+ $this->sqs->deleteMessage([
+
+ 'QueueUrl' => $this->queue, 'ReceiptHandle' => $this->job['ReceiptHandle'],
+
+ ]);
+ }
+
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ parent::release($delay);
+
+ $this->sqs->changeMessageVisibility([
+ 'QueueUrl' => $this->queue,
+ 'ReceiptHandle' => $this->job['ReceiptHandle'],
+ 'VisibilityTimeout' => $delay,
+ ]);
+ }
+
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ public function attempts()
+ {
+ return (int) $this->job['Attributes']['ApproximateReceiveCount'];
+ }
+
+ /**
+ * Get the job identifier.
+ *
+ * @return string
+ */
+ public function getJobId()
+ {
+ return $this->job['MessageId'];
+ }
+
+ /**
+ * Get the IoC container instance.
+ *
+ * @return \Illuminate\Container\Container
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
+
+ /**
+ * Get the underlying SQS client instance.
+ *
+ * @return \Aws\Sqs\SqsClient
+ */
+ public function getSqs()
+ {
+ return $this->sqs;
+ }
+
+ /**
+ * Get the underlying raw SQS job.
+ *
+ * @return array
+ */
+ public function getSqsJob()
+ {
+ return $this->job;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php
index 5ee0c4a..c1f2236 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php
@@ -1,86 +1,89 @@
-payload = $payload;
- $this->container = $container;
- }
+ /**
+ * The queue message data.
+ *
+ * @var string
+ */
+ protected $payload;
- /**
- * Fire the job.
- *
- * @return void
- */
- public function fire()
- {
- $this->resolveAndFire(json_decode($this->payload, true));
- }
+ /**
+ * Create a new job instance.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @param string $payload
+ * @param string $queue
+ * @return void
+ */
+ public function __construct(Container $container, $payload, $queue)
+ {
+ $this->queue = $queue;
+ $this->payload = $payload;
+ $this->container = $container;
+ }
- /**
- * Get the raw body string for the job.
- *
- * @return string
- */
- public function getRawBody()
- {
- return $this->payload;
- }
+ /**
+ * Fire the job.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->resolveAndFire(json_decode($this->payload, true));
+ }
- /**
- * Release the job back into the queue.
- *
- * @param int $delay
- * @return void
- */
- public function release($delay = 0)
- {
- parent::release($delay);
- }
+ /**
+ * Get the raw body string for the job.
+ *
+ * @return string
+ */
+ public function getRawBody()
+ {
+ return $this->payload;
+ }
- /**
- * Get the number of times the job has been attempted.
- *
- * @return int
- */
- public function attempts()
- {
- return 1;
- }
+ /**
+ * Release the job back into the queue.
+ *
+ * @param int $delay
+ * @return void
+ */
+ public function release($delay = 0)
+ {
+ parent::release($delay);
+ }
- /**
- * Get the job identifier.
- *
- * @return string
- */
- public function getJobId()
- {
- return '';
- }
+ /**
+ * Get the number of times the job has been attempted.
+ *
+ * @return int
+ */
+ public function attempts()
+ {
+ return 1;
+ }
+ /**
+ * Get the job identifier.
+ *
+ * @return string
+ */
+ public function getJobId()
+ {
+ return '';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Listener.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Listener.php
index 96a809f..b19d46c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Listener.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Listener.php
@@ -1,238 +1,265 @@
-commandPath = $commandPath;
+ $this->workerCommand = $this->buildWorkerCommand();
+ }
+
+ /**
+ * Build the environment specific worker command.
+ *
+ * @return string
+ */
+ protected function buildWorkerCommand()
+ {
+ $binary = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
+
+ if (defined('HHVM_VERSION')) {
+ $binary .= ' --php';
+ }
+
+ if (defined('ARTISAN_BINARY')) {
+ $artisan = ProcessUtils::escapeArgument(ARTISAN_BINARY);
+ } else {
+ $artisan = 'artisan';
+ }
+
+ $command = 'queue:work %s --queue=%s --delay=%s --memory=%s --sleep=%s --tries=%s';
+
+ return "{$binary} {$artisan} {$command}";
+ }
+
+ /**
+ * Listen to the given queue connection.
+ *
+ * @param string $connection
+ * @param string $queue
+ * @param string $delay
+ * @param string $memory
+ * @param int $timeout
+ * @return void
+ */
+ public function listen($connection, $queue, $delay, $memory, $timeout = 60)
+ {
+ $process = $this->makeProcess($connection, $queue, $delay, $memory, $timeout);
+
+ while (true) {
+ $this->runProcess($process, $memory);
+ }
+ }
+
+ /**
+ * Run the given process.
+ *
+ * @param \Symfony\Component\Process\Process $process
+ * @param int $memory
+ * @return void
+ */
+ public function runProcess(Process $process, $memory)
+ {
+ $process->run(function ($type, $line) {
+ $this->handleWorkerOutput($type, $line);
+ });
+
+ // Once we have run the job we'll go check if the memory limit has been
+ // exceeded for the script. If it has, we will kill this script so a
+ // process manager will restart this with a clean slate of memory.
+ if ($this->memoryExceeded($memory)) {
+ $this->stop();
+ }
+ }
+
+ /**
+ * Create a new Symfony process for the worker.
+ *
+ * @param string $connection
+ * @param string $queue
+ * @param int $delay
+ * @param int $memory
+ * @param int $timeout
+ * @return \Symfony\Component\Process\Process
+ */
+ public function makeProcess($connection, $queue, $delay, $memory, $timeout)
+ {
+ $string = $this->workerCommand;
+
+ // If the environment is set, we will append it to the command string so the
+ // workers will run under the specified environment. Otherwise, they will
+ // just run under the production environment which is not always right.
+ if (isset($this->environment)) {
+ $string .= ' --env='.ProcessUtils::escapeArgument($this->environment);
+ }
+
+ // Next, we will just format out the worker commands with all of the various
+ // options available for the command. This will produce the final command
+ // line that we will pass into a Symfony process object for processing.
+ $command = sprintf(
+ $string,
+ ProcessUtils::escapeArgument($connection),
+ ProcessUtils::escapeArgument($queue),
+ $delay,
+ $memory,
+ $this->sleep,
+ $this->maxTries
+ );
+
+ return new Process($command, $this->commandPath, null, null, $timeout);
+ }
+
+ /**
+ * Handle output from the worker process.
+ *
+ * @param int $type
+ * @param string $line
+ * @return void
+ */
+ protected function handleWorkerOutput($type, $line)
+ {
+ if (isset($this->outputHandler)) {
+ call_user_func($this->outputHandler, $type, $line);
+ }
+ }
+
+ /**
+ * Determine if the memory limit has been exceeded.
+ *
+ * @param int $memoryLimit
+ * @return bool
+ */
+ public function memoryExceeded($memoryLimit)
+ {
+ return (memory_get_usage() / 1024 / 1024) >= $memoryLimit;
+ }
+
+ /**
+ * Stop listening and bail out of the script.
+ *
+ * @return void
+ */
+ public function stop()
+ {
+ die;
+ }
+
+ /**
+ * Set the output handler callback.
+ *
+ * @param \Closure $outputHandler
+ * @return void
+ */
+ public function setOutputHandler(Closure $outputHandler)
+ {
+ $this->outputHandler = $outputHandler;
+ }
+
+ /**
+ * Get the current listener environment.
+ *
+ * @return string
+ */
+ public function getEnvironment()
+ {
+ return $this->environment;
+ }
+
+ /**
+ * Set the current environment.
+ *
+ * @param string $environment
+ * @return void
+ */
+ public function setEnvironment($environment)
+ {
+ $this->environment = $environment;
+ }
+
+ /**
+ * Get the amount of seconds to wait before polling the queue.
+ *
+ * @return int
+ */
+ public function getSleep()
+ {
+ return $this->sleep;
+ }
-class Listener {
-
- /**
- * The command working path.
- *
- * @var string
- */
- protected $commandPath;
-
- /**
- * The environment the workers should run under.
- *
- * @var string
- */
- protected $environment;
-
- /**
- * The amount of seconds to wait before polling the queue.
- *
- * @var int
- */
- protected $sleep = 3;
-
- /**
- * The amount of times to try a job before logging it failed.
- *
- * @var int
- */
- protected $maxTries = 0;
-
- /**
- * The queue worker command line.
- *
- * @var string
- */
- protected $workerCommand;
-
- /**
- * The output handler callback.
- *
- * @var \Closure|null
- */
- protected $outputHandler;
-
- /**
- * Create a new queue listener.
- *
- * @param string $commandPath
- * @return void
- */
- public function __construct($commandPath)
- {
- $this->commandPath = $commandPath;
- $this->workerCommand = '"'.PHP_BINARY.'" artisan queue:work %s --queue="%s" --delay=%s --memory=%s --sleep=%s --tries=%s';
- }
-
- /**
- * Listen to the given queue connection.
- *
- * @param string $connection
- * @param string $queue
- * @param string $delay
- * @param string $memory
- * @param int $timeout
- * @return void
- */
- public function listen($connection, $queue, $delay, $memory, $timeout = 60)
- {
- $process = $this->makeProcess($connection, $queue, $delay, $memory, $timeout);
-
- while (true)
- {
- $this->runProcess($process, $memory);
- }
- }
-
- /**
- * Run the given process.
- *
- * @param \Symfony\Component\Process\Process $process
- * @param int $memory
- * @return void
- */
- public function runProcess(Process $process, $memory)
- {
- $process->run(function($type, $line)
- {
- $this->handleWorkerOutput($type, $line);
- });
-
- // Once we have run the job we'll go check if the memory limit has been
- // exceeded for the script. If it has, we will kill this script so a
- // process manager will restart this with a clean slate of memory.
- if ($this->memoryExceeded($memory))
- {
- $this->stop();
- }
- }
-
- /**
- * Create a new Symfony process for the worker.
- *
- * @param string $connection
- * @param string $queue
- * @param int $delay
- * @param int $memory
- * @param int $timeout
- * @return \Symfony\Component\Process\Process
- */
- public function makeProcess($connection, $queue, $delay, $memory, $timeout)
- {
- $string = $this->workerCommand;
-
- // If the environment is set, we will append it to the command string so the
- // workers will run under the specified environment. Otherwise, they will
- // just run under the production environment which is not always right.
- if (isset($this->environment))
- {
- $string .= ' --env='.$this->environment;
- }
-
- // Next, we will just format out the worker commands with all of the various
- // options available for the command. This will produce the final command
- // line that we will pass into a Symfony process object for processing.
- $command = sprintf(
- $string, $connection, $queue, $delay,
- $memory, $this->sleep, $this->maxTries
- );
-
- return new Process($command, $this->commandPath, null, null, $timeout);
- }
-
- /**
- * Handle output from the worker process.
- *
- * @param int $type
- * @param string $line
- * @return void
- */
- protected function handleWorkerOutput($type, $line)
- {
- if (isset($this->outputHandler))
- {
- call_user_func($this->outputHandler, $type, $line);
- }
- }
-
- /**
- * Determine if the memory limit has been exceeded.
- *
- * @param int $memoryLimit
- * @return bool
- */
- public function memoryExceeded($memoryLimit)
- {
- return (memory_get_usage() / 1024 / 1024) >= $memoryLimit;
- }
-
- /**
- * Stop listening and bail out of the script.
- *
- * @return void
- */
- public function stop()
- {
- die;
- }
-
- /**
- * Set the output handler callback.
- *
- * @param \Closure $outputHandler
- * @return void
- */
- public function setOutputHandler(Closure $outputHandler)
- {
- $this->outputHandler = $outputHandler;
- }
-
- /**
- * Get the current listener environment.
- *
- * @return string
- */
- public function getEnvironment()
- {
- return $this->environment;
- }
-
- /**
- * Set the current environment.
- *
- * @param string $environment
- * @return void
- */
- public function setEnvironment($environment)
- {
- $this->environment = $environment;
- }
-
- /**
- * Get the amount of seconds to wait before polling the queue.
- *
- * @return int
- */
- public function getSleep()
- {
- return $this->sleep;
- }
-
- /**
- * Set the amount of seconds to wait before polling the queue.
- *
- * @param int $sleep
- * @return void
- */
- public function setSleep($sleep)
- {
- $this->sleep = $sleep;
- }
-
- /**
- * Set the amount of times to try a job before logging it failed.
- *
- * @param int $tries
- * @return void
- */
- public function setMaxTries($tries)
- {
- $this->maxTries = $tries;
- }
+ /**
+ * Set the amount of seconds to wait before polling the queue.
+ *
+ * @param int $sleep
+ * @return void
+ */
+ public function setSleep($sleep)
+ {
+ $this->sleep = $sleep;
+ }
+ /**
+ * Set the amount of times to try a job before logging it failed.
+ *
+ * @param int $tries
+ * @return void
+ */
+ public function setMaxTries($tries)
+ {
+ $this->maxTries = $tries;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/NullQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/NullQueue.php
index e8d92ef..bdef6cc 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/NullQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/NullQueue.php
@@ -1,58 +1,59 @@
-push($job, $data, $queue);
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param string $queue
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @return mixed
- */
- public function laterOn($queue, $delay, $job, $data = '')
- {
- return $this->later($delay, $job, $data, $queue);
- }
-
- /**
- * Marshal a push queue request and fire the job.
- *
- * @throws \RuntimeException
- */
- public function marshal()
- {
- throw new RuntimeException("Push queues only supported by Iron.");
- }
-
- /**
- * Push an array of jobs onto the queue.
- *
- * @param array $jobs
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function bulk($jobs, $data = '', $queue = null)
- {
- foreach ((array) $jobs as $job)
- {
- $this->push($job, $data, $queue);
- }
- }
-
- /**
- * Create a payload string from the given job and data.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return string
- */
- protected function createPayload($job, $data = '', $queue = null)
- {
- if ($job instanceof Closure)
- {
- return json_encode($this->createClosurePayload($job, $data));
- }
- elseif (is_object($job))
- {
- return json_encode([
- 'job' => 'Illuminate\Queue\CallQueuedHandler@call',
- 'data' => ['command' => serialize(clone $job)],
- ]);
- }
-
- return json_encode($this->createPlainPayload($job, $data));
- }
-
- /**
- * Create a typical, "plain" queue payload array.
- *
- * @param string $job
- * @param mixed $data
- * @return array
- */
- protected function createPlainPayload($job, $data)
- {
- return ['job' => $job, 'data' => $this->prepareQueueableEntities($data)];
- }
-
- /**
- * Prepare any queueable entities for storage in the queue.
- *
- * @param mixed $data
- * @return mixed
- */
- protected function prepareQueueableEntities($data)
- {
- if ($data instanceof QueueableEntity)
- {
- return $this->prepareQueueableEntity($data);
- }
-
- if (is_array($data))
- {
- array_walk($data, function(&$d) { $d = $this->prepareQueueableEntity($d); });
- }
-
- return $data;
- }
-
- /**
- * Prepare a single queueable entity for storage on the queue.
- *
- * @param mixed $value
- * @return mixed
- */
- protected function prepareQueueableEntity($value)
- {
- if ($value instanceof QueueableEntity)
- {
- return '::entity::|'.get_class($value).'|'.$value->getQueueableId();
- }
-
- return $value;
- }
-
- /**
- * Create a payload string for the given Closure job.
- *
- * @param \Closure $job
- * @param mixed $data
- * @return string
- */
- protected function createClosurePayload($job, $data)
- {
- $closure = $this->crypt->encrypt((new Serializer)->serialize($job));
-
- return ['job' => 'IlluminateQueueClosure', 'data' => compact('closure')];
- }
-
- /**
- * Set additional meta on a payload string.
- *
- * @param string $payload
- * @param string $key
- * @param string $value
- * @return string
- */
- protected function setMeta($payload, $key, $value)
- {
- $payload = json_decode($payload, true);
-
- return json_encode(array_set($payload, $key, $value));
- }
-
- /**
- * Calculate the number of seconds with the given delay.
- *
- * @param \DateTime|int $delay
- * @return int
- */
- protected function getSeconds($delay)
- {
- if ($delay instanceof DateTime)
- {
- return max(0, $delay->getTimestamp() - $this->getTime());
- }
-
- return (int) $delay;
- }
-
- /**
- * Get the current UNIX timestamp.
- *
- * @return int
- */
- protected function getTime()
- {
- return time();
- }
-
- /**
- * Set the IoC container instance.
- *
- * @param \Illuminate\Container\Container $container
- * @return void
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
- }
-
- /**
- * Set the encrypter instance.
- *
- * @param \Illuminate\Contracts\Encryption\Encrypter $crypt
- * @return void
- */
- public function setEncrypter(EncrypterContract $crypt)
- {
- $this->crypt = $crypt;
- }
-
+abstract class Queue
+{
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $queue
+ * @param string $job
+ * @param mixed $data
+ * @return mixed
+ */
+ public function pushOn($queue, $job, $data = '')
+ {
+ return $this->push($job, $data, $queue);
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param string $queue
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @return mixed
+ */
+ public function laterOn($queue, $delay, $job, $data = '')
+ {
+ return $this->later($delay, $job, $data, $queue);
+ }
+
+ /**
+ * Marshal a push queue request and fire the job.
+ *
+ * @throws \RuntimeException
+ *
+ * @deprecated since version 5.1.
+ */
+ public function marshal()
+ {
+ throw new RuntimeException('Push queues only supported by Iron.');
+ }
+
+ /**
+ * Push an array of jobs onto the queue.
+ *
+ * @param array $jobs
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function bulk($jobs, $data = '', $queue = null)
+ {
+ foreach ((array) $jobs as $job) {
+ $this->push($job, $data, $queue);
+ }
+ }
+
+ /**
+ * Create a payload string from the given job and data.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return string
+ */
+ protected function createPayload($job, $data = '', $queue = null)
+ {
+ if ($job instanceof Closure) {
+ return json_encode($this->createClosurePayload($job, $data));
+ } elseif (is_object($job)) {
+ return json_encode([
+ 'job' => 'Illuminate\Queue\CallQueuedHandler@call',
+ 'data' => ['command' => serialize(clone $job)],
+ ]);
+ }
+
+ return json_encode($this->createPlainPayload($job, $data));
+ }
+
+ /**
+ * Create a typical, "plain" queue payload array.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @return array
+ */
+ protected function createPlainPayload($job, $data)
+ {
+ return ['job' => $job, 'data' => $this->prepareQueueableEntities($data)];
+ }
+
+ /**
+ * Prepare any queueable entities for storage in the queue.
+ *
+ * @param mixed $data
+ * @return mixed
+ */
+ protected function prepareQueueableEntities($data)
+ {
+ if ($data instanceof QueueableEntity) {
+ return $this->prepareQueueableEntity($data);
+ }
+
+ if (is_array($data)) {
+ $data = array_map(function ($d) {
+ if (is_array($d)) {
+ return $this->prepareQueueableEntities($d);
+ }
+
+ return $this->prepareQueueableEntity($d);
+ }, $data);
+ }
+
+ return $data;
+ }
+
+ /**
+ * Prepare a single queueable entity for storage on the queue.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function prepareQueueableEntity($value)
+ {
+ if ($value instanceof QueueableEntity) {
+ return '::entity::|'.get_class($value).'|'.$value->getQueueableId();
+ }
+
+ return $value;
+ }
+
+ /**
+ * Create a payload string for the given Closure job.
+ *
+ * @param \Closure $job
+ * @param mixed $data
+ * @return string
+ */
+ protected function createClosurePayload($job, $data)
+ {
+ $closure = $this->crypt->encrypt((new Serializer)->serialize($job));
+
+ return ['job' => 'IlluminateQueueClosure', 'data' => compact('closure')];
+ }
+
+ /**
+ * Set additional meta on a payload string.
+ *
+ * @param string $payload
+ * @param string $key
+ * @param string $value
+ * @return string
+ */
+ protected function setMeta($payload, $key, $value)
+ {
+ $payload = json_decode($payload, true);
+
+ return json_encode(Arr::set($payload, $key, $value));
+ }
+
+ /**
+ * Calculate the number of seconds with the given delay.
+ *
+ * @param \DateTime|int $delay
+ * @return int
+ */
+ protected function getSeconds($delay)
+ {
+ if ($delay instanceof DateTime) {
+ return max(0, $delay->getTimestamp() - $this->getTime());
+ }
+
+ return (int) $delay;
+ }
+
+ /**
+ * Get the current UNIX timestamp.
+ *
+ * @return int
+ */
+ protected function getTime()
+ {
+ return time();
+ }
+
+ /**
+ * Set the IoC container instance.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @return void
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+ }
+
+ /**
+ * Set the encrypter instance.
+ *
+ * @param \Illuminate\Contracts\Encryption\Encrypter $crypt
+ * @return void
+ */
+ public function setEncrypter(EncrypterContract $crypt)
+ {
+ $this->crypt = $crypt;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/QueueManager.php b/application/vendor/laravel/framework/src/Illuminate/Queue/QueueManager.php
index 4f8f47a..cf91bbd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/QueueManager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/QueueManager.php
@@ -1,226 +1,243 @@
-app = $app;
- }
-
- /**
- * Register an event listener for the daemon queue loop.
- *
- * @param mixed $callback
- * @return void
- */
- public function looping($callback)
- {
- $this->app['events']->listen('illuminate.queue.looping', $callback);
- }
-
- /**
- * Register an event listener for the failed job event.
- *
- * @param mixed $callback
- * @return void
- */
- public function failing($callback)
- {
- $this->app['events']->listen('illuminate.queue.failed', $callback);
- }
-
- /**
- * Register an event listener for the daemon queue stopping.
- *
- * @param mixed $callback
- * @return void
- */
- public function stopping($callback)
- {
- $this->app['events']->listen('illuminate.queue.stopping', $callback);
- }
-
- /**
- * Determine if the driver is connected.
- *
- * @param string $name
- * @return bool
- */
- public function connected($name = null)
- {
- return isset($this->connections[$name ?: $this->getDefaultDriver()]);
- }
-
- /**
- * Resolve a queue connection instance.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Queue\Queue
- */
- public function connection($name = null)
- {
- $name = $name ?: $this->getDefaultDriver();
-
- // If the connection has not been resolved yet we will resolve it now as all
- // of the connections are resolved when they are actually needed so we do
- // not make any unnecessary connection to the various queue end-points.
- if ( ! isset($this->connections[$name]))
- {
- $this->connections[$name] = $this->resolve($name);
-
- $this->connections[$name]->setContainer($this->app);
-
- $this->connections[$name]->setEncrypter($this->app['encrypter']);
- }
-
- return $this->connections[$name];
- }
-
- /**
- * Resolve a queue connection.
- *
- * @param string $name
- * @return \Illuminate\Contracts\Queue\Queue
- */
- protected function resolve($name)
- {
- $config = $this->getConfig($name);
-
- return $this->getConnector($config['driver'])->connect($config);
- }
-
- /**
- * Get the connector for a given driver.
- *
- * @param string $driver
- * @return \Illuminate\Queue\Connectors\ConnectorInterface
- *
- * @throws \InvalidArgumentException
- */
- protected function getConnector($driver)
- {
- if (isset($this->connectors[$driver]))
- {
- return call_user_func($this->connectors[$driver]);
- }
-
- throw new InvalidArgumentException("No connector for [$driver]");
- }
-
- /**
- * Add a queue connection resolver.
- *
- * @param string $driver
- * @param \Closure $resolver
- * @return void
- */
- public function extend($driver, Closure $resolver)
- {
- return $this->addConnector($driver, $resolver);
- }
-
- /**
- * Add a queue connection resolver.
- *
- * @param string $driver
- * @param \Closure $resolver
- * @return void
- */
- public function addConnector($driver, Closure $resolver)
- {
- $this->connectors[$driver] = $resolver;
- }
-
- /**
- * Get the queue connection configuration.
- *
- * @param string $name
- * @return array
- */
- protected function getConfig($name)
- {
- return $this->app['config']["queue.connections.{$name}"];
- }
-
- /**
- * Get the name of the default queue connection.
- *
- * @return string
- */
- public function getDefaultDriver()
- {
- return $this->app['config']['queue.default'];
- }
-
- /**
- * Set the name of the default queue connection.
- *
- * @param string $name
- * @return void
- */
- public function setDefaultDriver($name)
- {
- $this->app['config']['queue.default'] = $name;
- }
-
- /**
- * Get the full name for the given connection.
- *
- * @param string $connection
- * @return string
- */
- public function getName($connection = null)
- {
- return $connection ?: $this->getDefaultDriver();
- }
-
- /**
- * Determine if the application is in maintenance mode.
- *
- * @return bool
- */
- public function isDownForMaintenance()
- {
- return $this->app->isDownForMaintenance();
- }
-
- /**
- * Dynamically pass calls to the default connection.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- $callable = array($this->connection(), $method);
-
- return call_user_func_array($callable, $parameters);
- }
-
+class QueueManager implements FactoryContract, MonitorContract
+{
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The array of resolved queue connections.
+ *
+ * @var array
+ */
+ protected $connections = [];
+
+ /**
+ * The array of resolved queue connectors.
+ *
+ * @var array
+ */
+ protected $connectors = [];
+
+ /**
+ * Create a new queue manager instance.
+ *
+ * @param \Illuminate\Foundation\Application $app
+ * @return void
+ */
+ public function __construct($app)
+ {
+ $this->app = $app;
+ }
+
+ /**
+ * Register an event listener for the after job event.
+ *
+ * @param mixed $callback
+ * @return void
+ */
+ public function after($callback)
+ {
+ $this->app['events']->listen('illuminate.queue.after', $callback);
+ }
+
+ /**
+ * Register an event listener for the daemon queue loop.
+ *
+ * @param mixed $callback
+ * @return void
+ */
+ public function looping($callback)
+ {
+ $this->app['events']->listen('illuminate.queue.looping', $callback);
+ }
+
+ /**
+ * Register an event listener for the failed job event.
+ *
+ * @param mixed $callback
+ * @return void
+ */
+ public function failing($callback)
+ {
+ $this->app['events']->listen('illuminate.queue.failed', $callback);
+ }
+
+ /**
+ * Register an event listener for the daemon queue stopping.
+ *
+ * @param mixed $callback
+ * @return void
+ */
+ public function stopping($callback)
+ {
+ $this->app['events']->listen('illuminate.queue.stopping', $callback);
+ }
+
+ /**
+ * Determine if the driver is connected.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function connected($name = null)
+ {
+ return isset($this->connections[$name ?: $this->getDefaultDriver()]);
+ }
+
+ /**
+ * Resolve a queue connection instance.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ public function connection($name = null)
+ {
+ $name = $name ?: $this->getDefaultDriver();
+
+ // If the connection has not been resolved yet we will resolve it now as all
+ // of the connections are resolved when they are actually needed so we do
+ // not make any unnecessary connection to the various queue end-points.
+ if (! isset($this->connections[$name])) {
+ $this->connections[$name] = $this->resolve($name);
+
+ $this->connections[$name]->setContainer($this->app);
+
+ $this->connections[$name]->setEncrypter($this->app['encrypter']);
+ }
+
+ return $this->connections[$name];
+ }
+
+ /**
+ * Resolve a queue connection.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Queue\Queue
+ */
+ protected function resolve($name)
+ {
+ $config = $this->getConfig($name);
+
+ return $this->getConnector($config['driver'])->connect($config);
+ }
+
+ /**
+ * Get the connector for a given driver.
+ *
+ * @param string $driver
+ * @return \Illuminate\Queue\Connectors\ConnectorInterface
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function getConnector($driver)
+ {
+ if (isset($this->connectors[$driver])) {
+ return call_user_func($this->connectors[$driver]);
+ }
+
+ throw new InvalidArgumentException("No connector for [$driver]");
+ }
+
+ /**
+ * Add a queue connection resolver.
+ *
+ * @param string $driver
+ * @param \Closure $resolver
+ * @return void
+ */
+ public function extend($driver, Closure $resolver)
+ {
+ return $this->addConnector($driver, $resolver);
+ }
+
+ /**
+ * Add a queue connection resolver.
+ *
+ * @param string $driver
+ * @param \Closure $resolver
+ * @return void
+ */
+ public function addConnector($driver, Closure $resolver)
+ {
+ $this->connectors[$driver] = $resolver;
+ }
+
+ /**
+ * Get the queue connection configuration.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function getConfig($name)
+ {
+ return $this->app['config']["queue.connections.{$name}"];
+ }
+
+ /**
+ * Get the name of the default queue connection.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['queue.default'];
+ }
+
+ /**
+ * Set the name of the default queue connection.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['queue.default'] = $name;
+ }
+
+ /**
+ * Get the full name for the given connection.
+ *
+ * @param string $connection
+ * @return string
+ */
+ public function getName($connection = null)
+ {
+ return $connection ?: $this->getDefaultDriver();
+ }
+
+ /**
+ * Determine if the application is in maintenance mode.
+ *
+ * @return bool
+ */
+ public function isDownForMaintenance()
+ {
+ return $this->app->isDownForMaintenance();
+ }
+
+ /**
+ * Dynamically pass calls to the default connection.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ $callable = [$this->connection(), $method];
+
+ return call_user_func_array($callable, $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php
index 1993a72..5957a89 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php
@@ -1,4 +1,6 @@
-registerManager();
-
- $this->registerWorker();
-
- $this->registerListener();
-
- $this->registerSubscriber();
-
- $this->registerFailedJobServices();
-
- $this->registerQueueClosure();
- }
-
- /**
- * Register the queue manager.
- *
- * @return void
- */
- protected function registerManager()
- {
- $this->app->singleton('queue', function($app)
- {
- // Once we have an instance of the queue manager, we will register the various
- // resolvers for the queue connectors. These connectors are responsible for
- // creating the classes that accept queue configs and instantiate queues.
- $manager = new QueueManager($app);
-
- $this->registerConnectors($manager);
-
- return $manager;
- });
-
- $this->app->singleton('queue.connection', function($app)
- {
- return $app['queue']->connection();
- });
- }
-
- /**
- * Register the queue worker.
- *
- * @return void
- */
- protected function registerWorker()
- {
- $this->registerWorkCommand();
-
- $this->registerRestartCommand();
-
- $this->app->singleton('queue.worker', function($app)
- {
- return new Worker($app['queue'], $app['queue.failer'], $app['events']);
- });
- }
-
- /**
- * Register the queue worker console command.
- *
- * @return void
- */
- protected function registerWorkCommand()
- {
- $this->app->singleton('command.queue.work', function($app)
- {
- return new WorkCommand($app['queue.worker']);
- });
-
- $this->commands('command.queue.work');
- }
-
- /**
- * Register the queue listener.
- *
- * @return void
- */
- protected function registerListener()
- {
- $this->registerListenCommand();
-
- $this->app->singleton('queue.listener', function($app)
- {
- return new Listener($app->basePath());
- });
- }
-
- /**
- * Register the queue listener console command.
- *
- * @return void
- */
- protected function registerListenCommand()
- {
- $this->app->singleton('command.queue.listen', function($app)
- {
- return new ListenCommand($app['queue.listener']);
- });
-
- $this->commands('command.queue.listen');
- }
-
- /**
- * Register the queue restart console command.
- *
- * @return void
- */
- public function registerRestartCommand()
- {
- $this->app->singleton('command.queue.restart', function()
- {
- return new RestartCommand;
- });
-
- $this->commands('command.queue.restart');
- }
-
- /**
- * Register the push queue subscribe command.
- *
- * @return void
- */
- protected function registerSubscriber()
- {
- $this->app->singleton('command.queue.subscribe', function()
- {
- return new SubscribeCommand;
- });
-
- $this->commands('command.queue.subscribe');
- }
-
- /**
- * Register the connectors on the queue manager.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- public function registerConnectors($manager)
- {
- foreach (array('Null', 'Sync', 'Database', 'Beanstalkd', 'Redis', 'Sqs', 'Iron') as $connector)
- {
- $this->{"register{$connector}Connector"}($manager);
- }
- }
-
- /**
- * Register the Null queue connector.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- protected function registerNullConnector($manager)
- {
- $manager->addConnector('null', function()
- {
- return new NullConnector;
- });
- }
-
- /**
- * Register the Sync queue connector.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- protected function registerSyncConnector($manager)
- {
- $manager->addConnector('sync', function()
- {
- return new SyncConnector;
- });
- }
-
- /**
- * Register the Beanstalkd queue connector.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- protected function registerBeanstalkdConnector($manager)
- {
- $manager->addConnector('beanstalkd', function()
- {
- return new BeanstalkdConnector;
- });
- }
-
- /**
- * Register the database queue connector.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- protected function registerDatabaseConnector($manager)
- {
- $manager->addConnector('database', function()
- {
- return new DatabaseConnector($this->app['db']);
- });
- }
-
- /**
- * Register the Redis queue connector.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- protected function registerRedisConnector($manager)
- {
- $app = $this->app;
-
- $manager->addConnector('redis', function() use ($app)
- {
- return new RedisConnector($app['redis']);
- });
- }
-
- /**
- * Register the Amazon SQS queue connector.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- protected function registerSqsConnector($manager)
- {
- $manager->addConnector('sqs', function()
- {
- return new SqsConnector;
- });
- }
-
- /**
- * Register the IronMQ queue connector.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- protected function registerIronConnector($manager)
- {
- $app = $this->app;
-
- $manager->addConnector('iron', function() use ($app)
- {
- return new IronConnector($app['encrypter'], $app['request']);
- });
-
- $this->registerIronRequestBinder();
- }
-
- /**
- * Register the request rebinding event for the Iron queue.
- *
- * @return void
- */
- protected function registerIronRequestBinder()
- {
- $this->app->rebinding('request', function($app, $request)
- {
- if ($app['queue']->connected('iron'))
- {
- $app['queue']->connection('iron')->setRequest($request);
- }
- });
- }
-
- /**
- * Register the failed job services.
- *
- * @return void
- */
- protected function registerFailedJobServices()
- {
- $this->app->singleton('queue.failer', function($app)
- {
- $config = $app['config']['queue.failed'];
-
- return new DatabaseFailedJobProvider($app['db'], $config['database'], $config['table']);
- });
- }
-
- /**
- * Register the Illuminate queued closure job.
- *
- * @return void
- */
- protected function registerQueueClosure()
- {
- $this->app->singleton('IlluminateQueueClosure', function($app)
- {
- return new IlluminateQueueClosure($app['encrypter']);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array(
- 'queue', 'queue.worker', 'queue.listener', 'queue.failer',
- 'command.queue.work', 'command.queue.listen', 'command.queue.restart',
- 'command.queue.subscribe', 'queue.connection',
- );
- }
-
+class QueueServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerManager();
+
+ $this->registerWorker();
+
+ $this->registerListener();
+
+ $this->registerSubscriber();
+
+ $this->registerFailedJobServices();
+
+ $this->registerQueueClosure();
+ }
+
+ /**
+ * Register the queue manager.
+ *
+ * @return void
+ */
+ protected function registerManager()
+ {
+ $this->app->singleton('queue', function ($app) {
+ // Once we have an instance of the queue manager, we will register the various
+ // resolvers for the queue connectors. These connectors are responsible for
+ // creating the classes that accept queue configs and instantiate queues.
+ $manager = new QueueManager($app);
+
+ $this->registerConnectors($manager);
+
+ return $manager;
+ });
+
+ $this->app->singleton('queue.connection', function ($app) {
+ return $app['queue']->connection();
+ });
+ }
+
+ /**
+ * Register the queue worker.
+ *
+ * @return void
+ */
+ protected function registerWorker()
+ {
+ $this->registerWorkCommand();
+
+ $this->registerRestartCommand();
+
+ $this->app->singleton('queue.worker', function ($app) {
+ return new Worker($app['queue'], $app['queue.failer'], $app['events']);
+ });
+ }
+
+ /**
+ * Register the queue worker console command.
+ *
+ * @return void
+ */
+ protected function registerWorkCommand()
+ {
+ $this->app->singleton('command.queue.work', function ($app) {
+ return new WorkCommand($app['queue.worker']);
+ });
+
+ $this->commands('command.queue.work');
+ }
+
+ /**
+ * Register the queue listener.
+ *
+ * @return void
+ */
+ protected function registerListener()
+ {
+ $this->registerListenCommand();
+
+ $this->app->singleton('queue.listener', function ($app) {
+ return new Listener($app->basePath());
+ });
+ }
+
+ /**
+ * Register the queue listener console command.
+ *
+ * @return void
+ */
+ protected function registerListenCommand()
+ {
+ $this->app->singleton('command.queue.listen', function ($app) {
+ return new ListenCommand($app['queue.listener']);
+ });
+
+ $this->commands('command.queue.listen');
+ }
+
+ /**
+ * Register the queue restart console command.
+ *
+ * @return void
+ */
+ public function registerRestartCommand()
+ {
+ $this->app->singleton('command.queue.restart', function () {
+ return new RestartCommand;
+ });
+
+ $this->commands('command.queue.restart');
+ }
+
+ /**
+ * Register the push queue subscribe command.
+ *
+ * @return void
+ */
+ protected function registerSubscriber()
+ {
+ $this->app->singleton('command.queue.subscribe', function () {
+ return new SubscribeCommand;
+ });
+
+ $this->commands('command.queue.subscribe');
+ }
+
+ /**
+ * Register the connectors on the queue manager.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ public function registerConnectors($manager)
+ {
+ foreach (['Null', 'Sync', 'Database', 'Beanstalkd', 'Redis', 'Sqs', 'Iron'] as $connector) {
+ $this->{"register{$connector}Connector"}($manager);
+ }
+ }
+
+ /**
+ * Register the Null queue connector.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ protected function registerNullConnector($manager)
+ {
+ $manager->addConnector('null', function () {
+ return new NullConnector;
+ });
+ }
+
+ /**
+ * Register the Sync queue connector.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ protected function registerSyncConnector($manager)
+ {
+ $manager->addConnector('sync', function () {
+ return new SyncConnector;
+ });
+ }
+
+ /**
+ * Register the Beanstalkd queue connector.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ protected function registerBeanstalkdConnector($manager)
+ {
+ $manager->addConnector('beanstalkd', function () {
+ return new BeanstalkdConnector;
+ });
+ }
+
+ /**
+ * Register the database queue connector.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ protected function registerDatabaseConnector($manager)
+ {
+ $manager->addConnector('database', function () {
+ return new DatabaseConnector($this->app['db']);
+ });
+ }
+
+ /**
+ * Register the Redis queue connector.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ protected function registerRedisConnector($manager)
+ {
+ $app = $this->app;
+
+ $manager->addConnector('redis', function () use ($app) {
+ return new RedisConnector($app['redis']);
+ });
+ }
+
+ /**
+ * Register the Amazon SQS queue connector.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ protected function registerSqsConnector($manager)
+ {
+ $manager->addConnector('sqs', function () {
+ return new SqsConnector;
+ });
+ }
+
+ /**
+ * Register the IronMQ queue connector.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ protected function registerIronConnector($manager)
+ {
+ $app = $this->app;
+
+ $manager->addConnector('iron', function () use ($app) {
+ return new IronConnector($app['encrypter'], $app['request']);
+ });
+
+ $this->registerIronRequestBinder();
+ }
+
+ /**
+ * Register the request rebinding event for the Iron queue.
+ *
+ * @return void
+ */
+ protected function registerIronRequestBinder()
+ {
+ $this->app->rebinding('request', function ($app, $request) {
+ if ($app['queue']->connected('iron')) {
+ $app['queue']->connection('iron')->setRequest($request);
+ }
+ });
+ }
+
+ /**
+ * Register the failed job services.
+ *
+ * @return void
+ */
+ protected function registerFailedJobServices()
+ {
+ $this->app->singleton('queue.failer', function ($app) {
+ $config = $app['config']['queue.failed'];
+
+ if (isset($config['table'])) {
+ return new DatabaseFailedJobProvider($app['db'], $config['database'], $config['table']);
+ } else {
+ return new NullFailedJobProvider;
+ }
+ });
+ }
+
+ /**
+ * Register the Illuminate queued closure job.
+ *
+ * @return void
+ */
+ protected function registerQueueClosure()
+ {
+ $this->app->singleton('IlluminateQueueClosure', function ($app) {
+ return new IlluminateQueueClosure($app['encrypter']);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'queue', 'queue.worker', 'queue.listener', 'queue.failer',
+ 'command.queue.work', 'command.queue.listen', 'command.queue.restart',
+ 'command.queue.subscribe', 'queue.connection',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php
index d349eb7..acd36ab 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php
@@ -1,320 +1,319 @@
-redis = $redis;
- $this->default = $default;
- $this->connection = $connection;
- }
-
- /**
- * Push a new job onto the queue.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return void
- */
- public function push($job, $data = '', $queue = null)
- {
- return $this->pushRaw($this->createPayload($job, $data), $queue);
- }
-
- /**
- * Push a raw payload onto the queue.
- *
- * @param string $payload
- * @param string $queue
- * @param array $options
- * @return mixed
- */
- public function pushRaw($payload, $queue = null, array $options = array())
- {
- $this->getConnection()->rpush($this->getQueue($queue), $payload);
-
- return array_get(json_decode($payload, true), 'id');
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return void
- */
- public function later($delay, $job, $data = '', $queue = null)
- {
- $payload = $this->createPayload($job, $data);
-
- $delay = $this->getSeconds($delay);
-
- $this->getConnection()->zadd($this->getQueue($queue).':delayed', $this->getTime() + $delay, $payload);
-
- return array_get(json_decode($payload, true), 'id');
- }
-
- /**
- * Release a reserved job back onto the queue.
- *
- * @param string $queue
- * @param string $payload
- * @param int $delay
- * @param int $attempts
- * @return void
- */
- public function release($queue, $payload, $delay, $attempts)
- {
- $payload = $this->setMeta($payload, 'attempts', $attempts);
-
- $this->getConnection()->zadd($this->getQueue($queue).':delayed', $this->getTime() + $delay, $payload);
- }
-
- /**
- * Pop the next job off of the queue.
- *
- * @param string $queue
- * @return \Illuminate\Contracts\Queue\Job|null
- */
- public function pop($queue = null)
- {
- $original = $queue ?: $this->default;
-
- $queue = $this->getQueue($queue);
-
- if ( ! is_null($this->expire))
- {
- $this->migrateAllExpiredJobs($queue);
- }
-
- $job = $this->getConnection()->lpop($queue);
-
- if ( ! is_null($job))
- {
- $this->getConnection()->zadd($queue.':reserved', $this->getTime() + $this->expire, $job);
-
- return new RedisJob($this->container, $this, $job, $original);
- }
- }
-
- /**
- * Delete a reserved job from the queue.
- *
- * @param string $queue
- * @param string $job
- * @return void
- */
- public function deleteReserved($queue, $job)
- {
- $this->getConnection()->zrem($this->getQueue($queue).':reserved', $job);
- }
-
- /**
- * Migrate all of the waiting jobs in the queue.
- *
- * @param string $queue
- * @return void
- */
- protected function migrateAllExpiredJobs($queue)
- {
- $this->migrateExpiredJobs($queue.':delayed', $queue);
-
- $this->migrateExpiredJobs($queue.':reserved', $queue);
- }
-
- /**
- * Migrate the delayed jobs that are ready to the regular queue.
- *
- * @param string $from
- * @param string $to
- * @return void
- */
- public function migrateExpiredJobs($from, $to)
- {
- $options = ['cas' => true, 'watch' => $from, 'retry' => 10];
-
- $this->getConnection()->transaction($options, function ($transaction) use ($from, $to)
- {
- // First we need to get all of jobs that have expired based on the current time
- // so that we can push them onto the main queue. After we get them we simply
- // remove them from this "delay" queues. All of this within a transaction.
- $jobs = $this->getExpiredJobs(
- $transaction, $from, $time = $this->getTime()
- );
-
- // If we actually found any jobs, we will remove them from the old queue and we
- // will insert them onto the new (ready) "queue". This means they will stand
- // ready to be processed by the queue worker whenever their turn comes up.
- if (count($jobs) > 0)
- {
- $this->removeExpiredJobs($transaction, $from, $time);
-
- $this->pushExpiredJobsOntoNewQueue($transaction, $to, $jobs);
- }
- });
- }
-
- /**
- * Get the expired jobs from a given queue.
- *
- * @param \Predis\Transaction\MultiExec $transaction
- * @param string $from
- * @param int $time
- * @return array
- */
- protected function getExpiredJobs($transaction, $from, $time)
- {
- return $transaction->zrangebyscore($from, '-inf', $time);
- }
-
- /**
- * Remove the expired jobs from a given queue.
- *
- * @param \Predis\Transaction\MultiExec $transaction
- * @param string $from
- * @param int $time
- * @return void
- */
- protected function removeExpiredJobs($transaction, $from, $time)
- {
- $transaction->multi();
-
- $transaction->zremrangebyscore($from, '-inf', $time);
- }
-
- /**
- * Push all of the given jobs onto another queue.
- *
- * @param \Predis\Transaction\MultiExec $transaction
- * @param string $to
- * @param array $jobs
- * @return void
- */
- protected function pushExpiredJobsOntoNewQueue($transaction, $to, $jobs)
- {
- call_user_func_array([$transaction, 'rpush'], array_merge([$to], $jobs));
- }
-
- /**
- * Create a payload string from the given job and data.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return string
- */
- protected function createPayload($job, $data = '', $queue = null)
- {
- $payload = parent::createPayload($job, $data);
-
- $payload = $this->setMeta($payload, 'id', $this->getRandomId());
-
- return $this->setMeta($payload, 'attempts', 1);
- }
-
- /**
- * Get a random ID string.
- *
- * @return string
- */
- protected function getRandomId()
- {
- return str_random(32);
- }
-
- /**
- * Get the queue or return the default.
- *
- * @param string|null $queue
- * @return string
- */
- protected function getQueue($queue)
- {
- return 'queues:'.($queue ?: $this->default);
- }
-
- /**
- * Get the connection for the queue.
- *
- * @return \Predis\ClientInterface
- */
- protected function getConnection()
- {
- return $this->redis->connection($this->connection);
- }
-
- /**
- * Get the underlying Redis instance.
- *
- * @return \Illuminate\Redis\Database
- */
- public function getRedis()
- {
- return $this->redis;
- }
-
- /**
- * Get the expiration time in seconds.
- *
- * @return int|null
- */
- public function getExpire()
- {
- return $this->expire;
- }
-
- /**
- * Set the expiration time in seconds.
- *
- * @param int|null $seconds
- * @return void
- */
- public function setExpire($seconds)
- {
- $this->expire = $seconds;
- }
-
+class RedisQueue extends Queue implements QueueContract
+{
+ /**
+ * The Redis database instance.
+ *
+ * @var \Illuminate\Redis\Database
+ */
+ protected $redis;
+
+ /**
+ * The connection name.
+ *
+ * @var string
+ */
+ protected $connection;
+
+ /**
+ * The name of the default queue.
+ *
+ * @var string
+ */
+ protected $default;
+
+ /**
+ * The expiration time of a job.
+ *
+ * @var int|null
+ */
+ protected $expire = 60;
+
+ /**
+ * Create a new Redis queue instance.
+ *
+ * @param \Illuminate\Redis\Database $redis
+ * @param string $default
+ * @param string $connection
+ * @return void
+ */
+ public function __construct(Database $redis, $default = 'default', $connection = null)
+ {
+ $this->redis = $redis;
+ $this->default = $default;
+ $this->connection = $connection;
+ }
+
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function push($job, $data = '', $queue = null)
+ {
+ return $this->pushRaw($this->createPayload($job, $data), $queue);
+ }
+
+ /**
+ * Push a raw payload onto the queue.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @param array $options
+ * @return mixed
+ */
+ public function pushRaw($payload, $queue = null, array $options = [])
+ {
+ $this->getConnection()->rpush($this->getQueue($queue), $payload);
+
+ return Arr::get(json_decode($payload, true), 'id');
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function later($delay, $job, $data = '', $queue = null)
+ {
+ $payload = $this->createPayload($job, $data);
+
+ $delay = $this->getSeconds($delay);
+
+ $this->getConnection()->zadd($this->getQueue($queue).':delayed', $this->getTime() + $delay, $payload);
+
+ return Arr::get(json_decode($payload, true), 'id');
+ }
+
+ /**
+ * Release a reserved job back onto the queue.
+ *
+ * @param string $queue
+ * @param string $payload
+ * @param int $delay
+ * @param int $attempts
+ * @return void
+ */
+ public function release($queue, $payload, $delay, $attempts)
+ {
+ $payload = $this->setMeta($payload, 'attempts', $attempts);
+
+ $this->getConnection()->zadd($this->getQueue($queue).':delayed', $this->getTime() + $delay, $payload);
+ }
+
+ /**
+ * Pop the next job off of the queue.
+ *
+ * @param string $queue
+ * @return \Illuminate\Contracts\Queue\Job|null
+ */
+ public function pop($queue = null)
+ {
+ $original = $queue ?: $this->default;
+
+ $queue = $this->getQueue($queue);
+
+ if (! is_null($this->expire)) {
+ $this->migrateAllExpiredJobs($queue);
+ }
+
+ $job = $this->getConnection()->lpop($queue);
+
+ if (! is_null($job)) {
+ $this->getConnection()->zadd($queue.':reserved', $this->getTime() + $this->expire, $job);
+
+ return new RedisJob($this->container, $this, $job, $original);
+ }
+ }
+
+ /**
+ * Delete a reserved job from the queue.
+ *
+ * @param string $queue
+ * @param string $job
+ * @return void
+ */
+ public function deleteReserved($queue, $job)
+ {
+ $this->getConnection()->zrem($this->getQueue($queue).':reserved', $job);
+ }
+
+ /**
+ * Migrate all of the waiting jobs in the queue.
+ *
+ * @param string $queue
+ * @return void
+ */
+ protected function migrateAllExpiredJobs($queue)
+ {
+ $this->migrateExpiredJobs($queue.':delayed', $queue);
+
+ $this->migrateExpiredJobs($queue.':reserved', $queue);
+ }
+
+ /**
+ * Migrate the delayed jobs that are ready to the regular queue.
+ *
+ * @param string $from
+ * @param string $to
+ * @return void
+ */
+ public function migrateExpiredJobs($from, $to)
+ {
+ $options = ['cas' => true, 'watch' => $from, 'retry' => 10];
+
+ $this->getConnection()->transaction($options, function ($transaction) use ($from, $to) {
+ // First we need to get all of jobs that have expired based on the current time
+ // so that we can push them onto the main queue. After we get them we simply
+ // remove them from this "delay" queues. All of this within a transaction.
+ $jobs = $this->getExpiredJobs(
+ $transaction, $from, $time = $this->getTime()
+ );
+
+ // If we actually found any jobs, we will remove them from the old queue and we
+ // will insert them onto the new (ready) "queue". This means they will stand
+ // ready to be processed by the queue worker whenever their turn comes up.
+ if (count($jobs) > 0) {
+ $this->removeExpiredJobs($transaction, $from, $time);
+
+ $this->pushExpiredJobsOntoNewQueue($transaction, $to, $jobs);
+ }
+ });
+ }
+
+ /**
+ * Get the expired jobs from a given queue.
+ *
+ * @param \Predis\Transaction\MultiExec $transaction
+ * @param string $from
+ * @param int $time
+ * @return array
+ */
+ protected function getExpiredJobs($transaction, $from, $time)
+ {
+ return $transaction->zrangebyscore($from, '-inf', $time);
+ }
+
+ /**
+ * Remove the expired jobs from a given queue.
+ *
+ * @param \Predis\Transaction\MultiExec $transaction
+ * @param string $from
+ * @param int $time
+ * @return void
+ */
+ protected function removeExpiredJobs($transaction, $from, $time)
+ {
+ $transaction->multi();
+
+ $transaction->zremrangebyscore($from, '-inf', $time);
+ }
+
+ /**
+ * Push all of the given jobs onto another queue.
+ *
+ * @param \Predis\Transaction\MultiExec $transaction
+ * @param string $to
+ * @param array $jobs
+ * @return void
+ */
+ protected function pushExpiredJobsOntoNewQueue($transaction, $to, $jobs)
+ {
+ call_user_func_array([$transaction, 'rpush'], array_merge([$to], $jobs));
+ }
+
+ /**
+ * Create a payload string from the given job and data.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return string
+ */
+ protected function createPayload($job, $data = '', $queue = null)
+ {
+ $payload = parent::createPayload($job, $data);
+
+ $payload = $this->setMeta($payload, 'id', $this->getRandomId());
+
+ return $this->setMeta($payload, 'attempts', 1);
+ }
+
+ /**
+ * Get a random ID string.
+ *
+ * @return string
+ */
+ protected function getRandomId()
+ {
+ return Str::random(32);
+ }
+
+ /**
+ * Get the queue or return the default.
+ *
+ * @param string|null $queue
+ * @return string
+ */
+ protected function getQueue($queue)
+ {
+ return 'queues:'.($queue ?: $this->default);
+ }
+
+ /**
+ * Get the connection for the queue.
+ *
+ * @return \Predis\ClientInterface
+ */
+ protected function getConnection()
+ {
+ return $this->redis->connection($this->connection);
+ }
+
+ /**
+ * Get the underlying Redis instance.
+ *
+ * @return \Illuminate\Redis\Database
+ */
+ public function getRedis()
+ {
+ return $this->redis;
+ }
+
+ /**
+ * Get the expiration time in seconds.
+ *
+ * @return int|null
+ */
+ public function getExpire()
+ {
+ return $this->expire;
+ }
+
+ /**
+ * Set the expiration time in seconds.
+ *
+ * @param int|null $seconds
+ * @return void
+ */
+ public function setExpire($seconds)
+ {
+ $this->expire = $seconds;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php b/application/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php
index 4d40354..9ad9cf7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php
@@ -1,81 +1,83 @@
-getProperties();
-
- foreach ($properties as $property)
- {
- $property->setValue($this, $this->getSerializedPropertyValue(
- $this->getPropertyValue($property)
- ));
- }
+trait SerializesModels
+{
+ /**
+ * Prepare the instance for serialization.
+ *
+ * @return array
+ */
+ public function __sleep()
+ {
+ $properties = (new ReflectionClass($this))->getProperties();
- return array_map(function($p) { return $p->getName(); }, $properties);
- }
+ foreach ($properties as $property) {
+ $property->setValue($this, $this->getSerializedPropertyValue(
+ $this->getPropertyValue($property)
+ ));
+ }
- /**
- * Restore the model after serialization.
- *
- * @return void
- */
- public function __wakeup()
- {
- foreach ((new ReflectionClass($this))->getProperties() as $property)
- {
- $property->setValue($this, $this->getRestoredPropertyValue(
- $this->getPropertyValue($property)
- ));
- }
- }
+ return array_map(function ($p) {
+ return $p->getName();
+ }, $properties);
+ }
- /**
- * Get the property value prepared for serialization.
- *
- * @param mixed $value
- * @return mixed
- */
- protected function getSerializedPropertyValue($value)
- {
- return $value instanceof QueueableEntity
- ? new ModelIdentifier(get_class($value), $value->getQueueableId()) : $value;
- }
+ /**
+ * Restore the model after serialization.
+ *
+ * @return void
+ */
+ public function __wakeup()
+ {
+ foreach ((new ReflectionClass($this))->getProperties() as $property) {
+ $property->setValue($this, $this->getRestoredPropertyValue(
+ $this->getPropertyValue($property)
+ ));
+ }
+ }
- /**
- * Get the restored property value after deserialization.
- *
- * @param mixed $value
- * @return mixed
- */
- protected function getRestoredPropertyValue($value)
- {
- return $value instanceof ModelIdentifier
- ? (new $value->class)->findOrFail($value->id) : $value;
- }
+ /**
+ * Get the property value prepared for serialization.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function getSerializedPropertyValue($value)
+ {
+ return $value instanceof QueueableEntity
+ ? new ModelIdentifier(get_class($value), $value->getQueueableId()) : $value;
+ }
- /**
- * Get the property value for the given property.
- *
- * @param \ReflectionProperty $property
- * @return mixed
- */
- protected function getPropertyValue(ReflectionProperty $property)
- {
- $property->setAccessible(true);
+ /**
+ * Get the restored property value after deserialization.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function getRestoredPropertyValue($value)
+ {
+ return $value instanceof ModelIdentifier
+ ? (new $value->class)->newQuery()->useWritePdo()->findOrFail($value->id)
+ : $value;
+ }
- return $property->getValue($this);
- }
+ /**
+ * Get the property value for the given property.
+ *
+ * @param \ReflectionProperty $property
+ * @return mixed
+ */
+ protected function getPropertyValue(ReflectionProperty $property)
+ {
+ $property->setAccessible(true);
+ return $property->getValue($this);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php
index 7bfd5d7..77609d1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php
@@ -1,127 +1,165 @@
-sqs = $sqs;
- $this->default = $default;
- }
-
- /**
- * Push a new job onto the queue.
- *
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function push($job, $data = '', $queue = null)
- {
- return $this->pushRaw($this->createPayload($job, $data), $queue);
- }
-
- /**
- * Push a raw payload onto the queue.
- *
- * @param string $payload
- * @param string $queue
- * @param array $options
- * @return mixed
- */
- public function pushRaw($payload, $queue = null, array $options = array())
- {
- $response = $this->sqs->sendMessage(array('QueueUrl' => $this->getQueue($queue), 'MessageBody' => $payload));
-
- return $response->get('MessageId');
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function later($delay, $job, $data = '', $queue = null)
- {
- $payload = $this->createPayload($job, $data);
-
- $delay = $this->getSeconds($delay);
-
- return $this->sqs->sendMessage(array(
-
- 'QueueUrl' => $this->getQueue($queue), 'MessageBody' => $payload, 'DelaySeconds' => $delay,
-
- ))->get('MessageId');
- }
-
- /**
- * Pop the next job off of the queue.
- *
- * @param string $queue
- * @return \Illuminate\Contracts\Queue\Job|null
- */
- public function pop($queue = null)
- {
- $queue = $this->getQueue($queue);
-
- $response = $this->sqs->receiveMessage(
- array('QueueUrl' => $queue, 'AttributeNames' => array('ApproximateReceiveCount'))
- );
-
- if (count($response['Messages']) > 0)
- {
- return new SqsJob($this->container, $this->sqs, $queue, $response['Messages'][0]);
- }
- }
-
- /**
- * Get the queue or return the default.
- *
- * @param string|null $queue
- * @return string
- */
- public function getQueue($queue)
- {
- return $queue ?: $this->default;
- }
-
- /**
- * Get the underlying SQS instance.
- *
- * @return \Aws\Sqs\SqsClient
- */
- public function getSqs()
- {
- return $this->sqs;
- }
-
+class SqsQueue extends Queue implements QueueContract
+{
+ /**
+ * The Amazon SQS instance.
+ *
+ * @var \Aws\Sqs\SqsClient
+ */
+ protected $sqs;
+
+ /**
+ * The name of the default tube.
+ *
+ * @var string
+ */
+ protected $default;
+
+ /**
+ * The sqs prefix url.
+ *
+ * @var string
+ */
+ protected $prefix;
+
+ /**
+ * The job creator callback.
+ *
+ * @var callable|null
+ */
+ protected $jobCreator;
+
+ /**
+ * Create a new Amazon SQS queue instance.
+ *
+ * @param \Aws\Sqs\SqsClient $sqs
+ * @param string $default
+ * @param string $prefix
+ * @return void
+ */
+ public function __construct(SqsClient $sqs, $default, $prefix = '')
+ {
+ $this->sqs = $sqs;
+ $this->prefix = $prefix;
+ $this->default = $default;
+ }
+
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function push($job, $data = '', $queue = null)
+ {
+ return $this->pushRaw($this->createPayload($job, $data), $queue);
+ }
+
+ /**
+ * Push a raw payload onto the queue.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @param array $options
+ * @return mixed
+ */
+ public function pushRaw($payload, $queue = null, array $options = [])
+ {
+ $response = $this->sqs->sendMessage(['QueueUrl' => $this->getQueue($queue), 'MessageBody' => $payload]);
+
+ return $response->get('MessageId');
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function later($delay, $job, $data = '', $queue = null)
+ {
+ $payload = $this->createPayload($job, $data);
+
+ $delay = $this->getSeconds($delay);
+
+ return $this->sqs->sendMessage([
+ 'QueueUrl' => $this->getQueue($queue), 'MessageBody' => $payload, 'DelaySeconds' => $delay,
+
+ ])->get('MessageId');
+ }
+
+ /**
+ * Pop the next job off of the queue.
+ *
+ * @param string $queue
+ * @return \Illuminate\Contracts\Queue\Job|null
+ */
+ public function pop($queue = null)
+ {
+ $queue = $this->getQueue($queue);
+
+ $response = $this->sqs->receiveMessage(
+ ['QueueUrl' => $queue, 'AttributeNames' => ['ApproximateReceiveCount']]
+ );
+
+ if (count($response['Messages']) > 0) {
+ if ($this->jobCreator) {
+ return call_user_func($this->jobCreator, $this->container, $this->sqs, $queue, $response);
+ } else {
+ return new SqsJob($this->container, $this->sqs, $queue, $response['Messages'][0]);
+ }
+ }
+ }
+
+ /**
+ * Define the job creator callback for the connection.
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function createJobsUsing(callable $callback)
+ {
+ $this->jobCreator = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Get the queue or return the default.
+ *
+ * @param string|null $queue
+ * @return string
+ */
+ public function getQueue($queue)
+ {
+ $queue = $queue ?: $this->default;
+
+ if (filter_var($queue, FILTER_VALIDATE_URL) !== false) {
+ return $queue;
+ }
+
+ return rtrim($this->prefix, '/').'/'.($queue);
+ }
+
+ /**
+ * Get the underlying SQS instance.
+ *
+ * @return \Aws\Sqs\SqsClient
+ */
+ public function getSqs()
+ {
+ return $this->sqs;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php b/application/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php
index ec01db7..36516db 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php
@@ -1,115 +1,135 @@
-resolveJob($this->createPayload($job, $data, $queue));
-
- try
- {
- $queueJob->fire();
- }
- catch(Exception $e)
- {
- $this->handleFailedJob($queueJob);
-
- throw $e;
- }
-
- return 0;
- }
-
- /**
- * Push a raw payload onto the queue.
- *
- * @param string $payload
- * @param string $queue
- * @param array $options
- * @return mixed
- */
- public function pushRaw($payload, $queue = null, array $options = array())
- {
- //
- }
-
- /**
- * Push a new job onto the queue after a delay.
- *
- * @param \DateTime|int $delay
- * @param string $job
- * @param mixed $data
- * @param string $queue
- * @return mixed
- */
- public function later($delay, $job, $data = '', $queue = null)
- {
- return $this->push($job, $data, $queue);
- }
-
- /**
- * Pop the next job off of the queue.
- *
- * @param string $queue
- * @return \Illuminate\Contracts\Queue\Job|null
- */
- public function pop($queue = null)
- {
- //
- }
-
- /**
- * Resolve a Sync job instance.
- *
- * @param string $payload
- * @return \Illuminate\Queue\Jobs\SyncJob
- */
- protected function resolveJob($payload)
- {
- return new SyncJob($this->container, $payload);
- }
-
- /**
- * Handle the failed job
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @return array
- */
- protected function handleFailedJob(Job $job)
- {
- $job->failed();
-
- $this->raiseFailedJobEvent($job);
- }
-
- /**
- * Raise the failed queue job event.
- *
- * @param \Illuminate\Contracts\Queue\Job $job
- * @return void
- */
- protected function raiseFailedJobEvent(Job $job)
- {
- $data = json_decode($job->getRawBody(), true);
-
- if($this->container->bound('events'))
- {
- $this->container['events']->fire('illuminate.queue.failed', array('sync', $job, $data));
- }
- }
+class SyncQueue extends Queue implements QueueContract
+{
+ /**
+ * Push a new job onto the queue.
+ *
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ * @throws \Throwable
+ */
+ public function push($job, $data = '', $queue = null)
+ {
+ $queueJob = $this->resolveJob($this->createPayload($job, $data, $queue), $queue);
+
+ try {
+ $queueJob->fire();
+
+ $this->raiseAfterJobEvent($queueJob);
+ } catch (Exception $e) {
+ $this->handleFailedJob($queueJob);
+
+ throw $e;
+ } catch (Throwable $e) {
+ $this->handleFailedJob($queueJob);
+
+ throw $e;
+ }
+
+ return 0;
+ }
+
+ /**
+ * Push a raw payload onto the queue.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @param array $options
+ * @return mixed
+ */
+ public function pushRaw($payload, $queue = null, array $options = [])
+ {
+ //
+ }
+
+ /**
+ * Push a new job onto the queue after a delay.
+ *
+ * @param \DateTime|int $delay
+ * @param string $job
+ * @param mixed $data
+ * @param string $queue
+ * @return mixed
+ */
+ public function later($delay, $job, $data = '', $queue = null)
+ {
+ return $this->push($job, $data, $queue);
+ }
+
+ /**
+ * Pop the next job off of the queue.
+ *
+ * @param string $queue
+ * @return \Illuminate\Contracts\Queue\Job|null
+ */
+ public function pop($queue = null)
+ {
+ //
+ }
+
+ /**
+ * Resolve a Sync job instance.
+ *
+ * @param string $payload
+ * @param string $queue
+ * @return \Illuminate\Queue\Jobs\SyncJob
+ */
+ protected function resolveJob($payload, $queue)
+ {
+ return new SyncJob($this->container, $payload, $queue);
+ }
+
+ /**
+ * Raise the after queue job event.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @return void
+ */
+ protected function raiseAfterJobEvent(Job $job)
+ {
+ $data = json_decode($job->getRawBody(), true);
+
+ if ($this->container->bound('events')) {
+ $this->container['events']->fire('illuminate.queue.after', ['sync', $job, $data]);
+ }
+ }
+
+ /**
+ * Handle the failed job.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @return array
+ */
+ protected function handleFailedJob(Job $job)
+ {
+ $job->failed();
+
+ $this->raiseFailedJobEvent($job);
+ }
+
+ /**
+ * Raise the failed queue job event.
+ *
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @return void
+ */
+ protected function raiseFailedJobEvent(Job $job)
+ {
+ $data = json_decode($job->getRawBody(), true);
+ if ($this->container->bound('events')) {
+ $this->container['events']->fire('illuminate.queue.failed', ['sync', $job, $data]);
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/Worker.php b/application/vendor/laravel/framework/src/Illuminate/Queue/Worker.php
index c1ffdc1..47bfc09 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/Worker.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/Worker.php
@@ -1,364 +1,394 @@
-failer = $failer;
- $this->events = $events;
- $this->manager = $manager;
- }
-
- /**
- * Listen to the given queue in a loop.
- *
- * @param string $connectionName
- * @param string $queue
- * @param int $delay
- * @param int $memory
- * @param int $sleep
- * @param int $maxTries
- * @return array
- */
- public function daemon($connectionName, $queue = null, $delay = 0, $memory = 128, $sleep = 3, $maxTries = 0)
- {
- $lastRestart = $this->getTimestampOfLastQueueRestart();
-
- while (true)
- {
- if ($this->daemonShouldRun())
- {
- $this->runNextJobForDaemon(
- $connectionName, $queue, $delay, $sleep, $maxTries
- );
- }
- else
- {
- $this->sleep($sleep);
- }
-
- if ($this->memoryExceeded($memory) || $this->queueShouldRestart($lastRestart))
- {
- $this->stop();
- }
- }
- }
-
- /**
- * Run the next job for the daemon worker.
- *
- * @param string $connectionName
- * @param string $queue
- * @param int $delay
- * @param int $sleep
- * @param int $maxTries
- * @return void
- */
- protected function runNextJobForDaemon($connectionName, $queue, $delay, $sleep, $maxTries)
- {
- try
- {
- $this->pop($connectionName, $queue, $delay, $sleep, $maxTries);
- }
- catch (Exception $e)
- {
- if ($this->exceptions) $this->exceptions->report($e);
- }
- }
-
- /**
- * Determine if the daemon should process on this iteration.
- *
- * @return bool
- */
- protected function daemonShouldRun()
- {
- if ($this->manager->isDownForMaintenance())
- {
- return false;
- }
-
- return $this->events->until('illuminate.queue.looping') !== false;
- }
-
- /**
- * Listen to the given queue.
- *
- * @param string $connectionName
- * @param string $queue
- * @param int $delay
- * @param int $sleep
- * @param int $maxTries
- * @return array
- */
- public function pop($connectionName, $queue = null, $delay = 0, $sleep = 3, $maxTries = 0)
- {
- $connection = $this->manager->connection($connectionName);
-
- $job = $this->getNextJob($connection, $queue);
-
- // If we're able to pull a job off of the stack, we will process it and
- // then immediately return back out. If there is no job on the queue
- // we will "sleep" the worker for the specified number of seconds.
- if ( ! is_null($job))
- {
- return $this->process(
- $this->manager->getName($connectionName), $job, $maxTries, $delay
- );
- }
-
- $this->sleep($sleep);
-
- return ['job' => null, 'failed' => false];
- }
-
- /**
- * Get the next job from the queue connection.
- *
- * @param \Illuminate\Queue\Queue $connection
- * @param string $queue
- * @return \Illuminate\Contracts\Queue\Job|null
- */
- protected function getNextJob($connection, $queue)
- {
- if (is_null($queue)) return $connection->pop();
-
- foreach (explode(',', $queue) as $queue)
- {
- if ( ! is_null($job = $connection->pop($queue))) return $job;
- }
- }
-
- /**
- * Process a given job from the queue.
- *
- * @param string $connection
- * @param \Illuminate\Contracts\Queue\Job $job
- * @param int $maxTries
- * @param int $delay
- * @return void
- *
- * @throws \Exception
- */
- public function process($connection, Job $job, $maxTries = 0, $delay = 0)
- {
- if ($maxTries > 0 && $job->attempts() > $maxTries)
- {
- return $this->logFailedJob($connection, $job);
- }
-
- try
- {
- // First we will fire off the job. Once it is done we will see if it will
- // be auto-deleted after processing and if so we will go ahead and run
- // the delete method on the job. Otherwise we will just keep moving.
- $job->fire();
-
- return ['job' => $job, 'failed' => false];
- }
-
- catch (Exception $e)
- {
- // If we catch an exception, we will attempt to release the job back onto
- // the queue so it is not lost. This will let is be retried at a later
- // time by another listener (or the same one). We will do that here.
- if ( ! $job->isDeleted()) $job->release($delay);
-
- throw $e;
- }
- }
-
- /**
- * Log a failed job into storage.
- *
- * @param string $connection
- * @param \Illuminate\Contracts\Queue\Job $job
- * @return array
- */
- protected function logFailedJob($connection, Job $job)
- {
- if ($this->failer)
- {
- $this->failer->log($connection, $job->getQueue(), $job->getRawBody());
-
- $job->delete();
-
- $job->failed();
-
- $this->raiseFailedJobEvent($connection, $job);
- }
-
- return ['job' => $job, 'failed' => true];
- }
-
- /**
- * Raise the failed queue job event.
- *
- * @param string $connection
- * @param \Illuminate\Contracts\Queue\Job $job
- * @return void
- */
- protected function raiseFailedJobEvent($connection, Job $job)
- {
- if ($this->events)
- {
- $data = json_decode($job->getRawBody(), true);
-
- $this->events->fire('illuminate.queue.failed', array($connection, $job, $data));
- }
- }
-
- /**
- * Determine if the memory limit has been exceeded.
- *
- * @param int $memoryLimit
- * @return bool
- */
- public function memoryExceeded($memoryLimit)
- {
- return (memory_get_usage() / 1024 / 1024) >= $memoryLimit;
- }
-
- /**
- * Stop listening and bail out of the script.
- *
- * @return void
- */
- public function stop()
- {
- $this->events->fire('illuminate.queue.stopping');
-
- die;
- }
-
- /**
- * Sleep the script for a given number of seconds.
- *
- * @param int $seconds
- * @return void
- */
- public function sleep($seconds)
- {
- sleep($seconds);
- }
-
- /**
- * Get the last queue restart timestamp, or null.
- *
- * @return int|null
- */
- protected function getTimestampOfLastQueueRestart()
- {
- if ($this->cache)
- {
- return $this->cache->get('illuminate:queue:restart');
- }
- }
-
- /**
- * Determine if the queue worker should restart.
- *
- * @param int|null $lastRestart
- * @return bool
- */
- protected function queueShouldRestart($lastRestart)
- {
- return $this->getTimestampOfLastQueueRestart() != $lastRestart;
- }
-
- /**
- * Set the exception handler to use in Daemon mode.
- *
- * @param \Illuminate\Contracts\Debug\ExceptionHandler $handler
- * @return void
- */
- public function setDaemonExceptionHandler(ExceptionHandler $handler)
- {
- $this->exceptions = $handler;
- }
-
- /**
- * Set the cache repository implementation.
- *
- * @param \Illuminate\Contracts\Cache\Repository $cache
- * @return void
- */
- public function setCache(CacheContract $cache)
- {
- $this->cache = $cache;
- }
-
- /**
- * Get the queue manager instance.
- *
- * @return \Illuminate\Queue\QueueManager
- */
- public function getManager()
- {
- return $this->manager;
- }
-
- /**
- * Set the queue manager instance.
- *
- * @param \Illuminate\Queue\QueueManager $manager
- * @return void
- */
- public function setManager(QueueManager $manager)
- {
- $this->manager = $manager;
- }
-
+ {
+ $this->failer = $failer;
+ $this->events = $events;
+ $this->manager = $manager;
+ }
+
+ /**
+ * Listen to the given queue in a loop.
+ *
+ * @param string $connectionName
+ * @param string $queue
+ * @param int $delay
+ * @param int $memory
+ * @param int $sleep
+ * @param int $maxTries
+ * @return array
+ */
+ public function daemon($connectionName, $queue = null, $delay = 0, $memory = 128, $sleep = 3, $maxTries = 0)
+ {
+ $lastRestart = $this->getTimestampOfLastQueueRestart();
+
+ while (true) {
+ if ($this->daemonShouldRun()) {
+ $this->runNextJobForDaemon(
+ $connectionName, $queue, $delay, $sleep, $maxTries
+ );
+ } else {
+ $this->sleep($sleep);
+ }
+
+ if ($this->memoryExceeded($memory) || $this->queueShouldRestart($lastRestart)) {
+ $this->stop();
+ }
+ }
+ }
+
+ /**
+ * Run the next job for the daemon worker.
+ *
+ * @param string $connectionName
+ * @param string $queue
+ * @param int $delay
+ * @param int $sleep
+ * @param int $maxTries
+ * @return void
+ */
+ protected function runNextJobForDaemon($connectionName, $queue, $delay, $sleep, $maxTries)
+ {
+ try {
+ $this->pop($connectionName, $queue, $delay, $sleep, $maxTries);
+ } catch (Exception $e) {
+ if ($this->exceptions) {
+ $this->exceptions->report($e);
+ }
+ } catch (Throwable $e) {
+ if ($this->exceptions) {
+ $this->exceptions->report(new FatalThrowableError($e));
+ }
+ }
+ }
+
+ /**
+ * Determine if the daemon should process on this iteration.
+ *
+ * @return bool
+ */
+ protected function daemonShouldRun()
+ {
+ if ($this->manager->isDownForMaintenance()) {
+ return false;
+ }
+
+ return $this->events->until('illuminate.queue.looping') !== false;
+ }
+
+ /**
+ * Listen to the given queue.
+ *
+ * @param string $connectionName
+ * @param string $queue
+ * @param int $delay
+ * @param int $sleep
+ * @param int $maxTries
+ * @return array
+ */
+ public function pop($connectionName, $queue = null, $delay = 0, $sleep = 3, $maxTries = 0)
+ {
+ try {
+ $connection = $this->manager->connection($connectionName);
+
+ $job = $this->getNextJob($connection, $queue);
+
+ // If we're able to pull a job off of the stack, we will process it and
+ // then immediately return back out. If there is no job on the queue
+ // we will "sleep" the worker for the specified number of seconds.
+ if (! is_null($job)) {
+ return $this->process(
+ $this->manager->getName($connectionName), $job, $maxTries, $delay
+ );
+ }
+ } catch (Exception $e) {
+ if ($this->exceptions) {
+ $this->exceptions->report($e);
+ }
+ } catch (Throwable $e) {
+ if ($this->exceptions) {
+ $this->exceptions->report(new FatalThrowableError($e));
+ }
+ }
+
+ $this->sleep($sleep);
+
+ return ['job' => null, 'failed' => false];
+ }
+
+ /**
+ * Get the next job from the queue connection.
+ *
+ * @param \Illuminate\Contracts\Queue\Queue $connection
+ * @param string $queue
+ * @return \Illuminate\Contracts\Queue\Job|null
+ */
+ protected function getNextJob($connection, $queue)
+ {
+ if (is_null($queue)) {
+ return $connection->pop();
+ }
+
+ foreach (explode(',', $queue) as $queue) {
+ if (! is_null($job = $connection->pop($queue))) {
+ return $job;
+ }
+ }
+ }
+
+ /**
+ * Process a given job from the queue.
+ *
+ * @param string $connection
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @param int $maxTries
+ * @param int $delay
+ * @return array|null
+ *
+ * @throws \Throwable
+ */
+ public function process($connection, Job $job, $maxTries = 0, $delay = 0)
+ {
+ if ($maxTries > 0 && $job->attempts() > $maxTries) {
+ return $this->logFailedJob($connection, $job);
+ }
+
+ try {
+ // First we will fire off the job. Once it is done we will see if it will
+ // be auto-deleted after processing and if so we will go ahead and run
+ // the delete method on the job. Otherwise we will just keep moving.
+ $job->fire();
+
+ $this->raiseAfterJobEvent($connection, $job);
+
+ return ['job' => $job, 'failed' => false];
+ } catch (Exception $e) {
+ // If we catch an exception, we will attempt to release the job back onto
+ // the queue so it is not lost. This will let is be retried at a later
+ // time by another listener (or the same one). We will do that here.
+ if (! $job->isDeleted()) {
+ $job->release($delay);
+ }
+
+ throw $e;
+ } catch (Throwable $e) {
+ if (! $job->isDeleted()) {
+ $job->release($delay);
+ }
+
+ throw $e;
+ }
+ }
+
+ /**
+ * Raise the after queue job event.
+ *
+ * @param string $connection
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @return void
+ */
+ protected function raiseAfterJobEvent($connection, Job $job)
+ {
+ if ($this->events) {
+ $data = json_decode($job->getRawBody(), true);
+
+ $this->events->fire('illuminate.queue.after', [$connection, $job, $data]);
+ }
+ }
+
+ /**
+ * Log a failed job into storage.
+ *
+ * @param string $connection
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @return array
+ */
+ protected function logFailedJob($connection, Job $job)
+ {
+ if ($this->failer) {
+ $this->failer->log($connection, $job->getQueue(), $job->getRawBody());
+
+ $job->delete();
+
+ $job->failed();
+
+ $this->raiseFailedJobEvent($connection, $job);
+ }
+
+ return ['job' => $job, 'failed' => true];
+ }
+
+ /**
+ * Raise the failed queue job event.
+ *
+ * @param string $connection
+ * @param \Illuminate\Contracts\Queue\Job $job
+ * @return void
+ */
+ protected function raiseFailedJobEvent($connection, Job $job)
+ {
+ if ($this->events) {
+ $data = json_decode($job->getRawBody(), true);
+
+ $this->events->fire('illuminate.queue.failed', [$connection, $job, $data]);
+ }
+ }
+
+ /**
+ * Determine if the memory limit has been exceeded.
+ *
+ * @param int $memoryLimit
+ * @return bool
+ */
+ public function memoryExceeded($memoryLimit)
+ {
+ return (memory_get_usage() / 1024 / 1024) >= $memoryLimit;
+ }
+
+ /**
+ * Stop listening and bail out of the script.
+ *
+ * @return void
+ */
+ public function stop()
+ {
+ $this->events->fire('illuminate.queue.stopping');
+
+ die;
+ }
+
+ /**
+ * Sleep the script for a given number of seconds.
+ *
+ * @param int $seconds
+ * @return void
+ */
+ public function sleep($seconds)
+ {
+ sleep($seconds);
+ }
+
+ /**
+ * Get the last queue restart timestamp, or null.
+ *
+ * @return int|null
+ */
+ protected function getTimestampOfLastQueueRestart()
+ {
+ if ($this->cache) {
+ return $this->cache->get('illuminate:queue:restart');
+ }
+ }
+
+ /**
+ * Determine if the queue worker should restart.
+ *
+ * @param int|null $lastRestart
+ * @return bool
+ */
+ protected function queueShouldRestart($lastRestart)
+ {
+ return $this->getTimestampOfLastQueueRestart() != $lastRestart;
+ }
+
+ /**
+ * Set the exception handler to use in Daemon mode.
+ *
+ * @param \Illuminate\Contracts\Debug\ExceptionHandler $handler
+ * @return void
+ */
+ public function setDaemonExceptionHandler(ExceptionHandler $handler)
+ {
+ $this->exceptions = $handler;
+ }
+
+ /**
+ * Set the cache repository implementation.
+ *
+ * @param \Illuminate\Contracts\Cache\Repository $cache
+ * @return void
+ */
+ public function setCache(CacheContract $cache)
+ {
+ $this->cache = $cache;
+ }
+
+ /**
+ * Get the queue manager instance.
+ *
+ * @return \Illuminate\Queue\QueueManager
+ */
+ public function getManager()
+ {
+ return $this->manager;
+ }
+
+ /**
+ * Set the queue manager instance.
+ *
+ * @param \Illuminate\Queue\QueueManager $manager
+ * @return void
+ */
+ public function setManager(QueueManager $manager)
+ {
+ $this->manager = $manager;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Queue/composer.json b/application/vendor/laravel/framework/src/Illuminate/Queue/composer.json
index 99c4a0d..84f2edd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Queue/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Queue/composer.json
@@ -14,14 +14,15 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/console": "5.0.*",
- "illuminate/contracts": "5.0.*",
- "illuminate/container": "5.0.*",
- "illuminate/http": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/process": "2.6.*",
- "nesbot/carbon": "~1.0"
+ "php": ">=5.5.9",
+ "illuminate/console": "5.1.*",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/container": "5.1.*",
+ "illuminate/http": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/process": "2.7.*",
+ "symfony/debug": "2.7.*",
+ "nesbot/carbon": "~1.19"
},
"autoload": {
"psr-4": {
@@ -33,13 +34,13 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "aws/aws-sdk-php": "Required to use the SQS queue driver (~2.4).",
- "illuminate/redis": "Required to use the redis queue driver (5.0.*).",
- "iron-io/iron_mq": "Required to use the iron queue driver (~1.5).",
+ "aws/aws-sdk-php": "Required to use the SQS queue driver (~3.0).",
+ "illuminate/redis": "Required to use the redis queue driver (5.1.*).",
+ "iron-io/iron_mq": "Required to use the iron queue driver (~2.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0)."
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Redis/Database.php b/application/vendor/laravel/framework/src/Illuminate/Redis/Database.php
index 2f9dc87..437427b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Redis/Database.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Redis/Database.php
@@ -1,138 +1,139 @@
-clients = $this->createAggregateClient($servers);
- }
- else
- {
- $this->clients = $this->createSingleClients($servers);
- }
- }
-
- /**
- * Create a new aggregate client supporting sharding.
- *
- * @param array $servers
- * @return array
- */
- protected function createAggregateClient(array $servers)
- {
- $servers = array_except($servers, array('cluster'));
-
- $options = $this->getClientOptions($servers);
-
- return array('default' => new Client(array_values($servers), $options));
- }
-
- /**
- * Create an array of single connection clients.
- *
- * @param array $servers
- * @return array
- */
- protected function createSingleClients(array $servers)
- {
- $clients = array();
-
- $options = $this->getClientOptions($servers);
-
- foreach ($servers as $key => $server)
- {
- $clients[$key] = new Client($server, $options);
- }
-
- return $clients;
- }
-
- /**
- * Get any client options from the configuration array.
- *
- * @param array $servers
- * @return array
- */
- protected function getClientOptions(array $servers)
- {
- return isset($servers['options']) ? (array) $servers['options'] : [];
- }
-
- /**
- * Get a specific Redis connection instance.
- *
- * @param string $name
- * @return \Predis\ClientInterface
- */
- public function connection($name = 'default')
- {
- return $this->clients[$name ?: 'default'];
- }
-
- /**
- * Run a command against the Redis database.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function command($method, array $parameters = array())
- {
- return call_user_func_array(array($this->clients['default'], $method), $parameters);
- }
-
- /**
- * Subscribe to a set of given channels for messages.
- *
- * @param array|string $channels
- * @param \Closure $callback
- * @param string $connection
- * @return void
- */
- public function subscribe($channels, Closure $callback, $connection = null)
- {
- $loop = $this->connection($connection)->pubSubLoop();
-
- call_user_func_array([$loop, 'subscribe'], (array) $channels);
-
- foreach ($loop as $message) {
- if ($message->kind === 'message') {
- call_user_func($callback, $message->payload, $message->channel);
- }
- }
-
- unset($loop);
- }
-
- /**
- * Dynamically make a Redis command.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return $this->command($method, $parameters);
- }
-
+class Database implements DatabaseContract
+{
+ /**
+ * The host address of the database.
+ *
+ * @var array
+ */
+ protected $clients;
+
+ /**
+ * Create a new Redis connection instance.
+ *
+ * @param array $servers
+ * @return void
+ */
+ public function __construct(array $servers = [])
+ {
+ $cluster = Arr::pull($servers, 'cluster');
+
+ $options = (array) Arr::pull($servers, 'options');
+
+ if ($cluster) {
+ $this->clients = $this->createAggregateClient($servers, $options);
+ } else {
+ $this->clients = $this->createSingleClients($servers, $options);
+ }
+ }
+
+ /**
+ * Create a new aggregate client supporting sharding.
+ *
+ * @param array $servers
+ * @param array $options
+ * @return array
+ */
+ protected function createAggregateClient(array $servers, array $options = [])
+ {
+ return ['default' => new Client(array_values($servers), $options)];
+ }
+
+ /**
+ * Create an array of single connection clients.
+ *
+ * @param array $servers
+ * @param array $options
+ * @return array
+ */
+ protected function createSingleClients(array $servers, array $options = [])
+ {
+ $clients = [];
+
+ foreach ($servers as $key => $server) {
+ $clients[$key] = new Client($server, $options);
+ }
+
+ return $clients;
+ }
+
+ /**
+ * Get a specific Redis connection instance.
+ *
+ * @param string $name
+ * @return \Predis\ClientInterface|null
+ */
+ public function connection($name = 'default')
+ {
+ return Arr::get($this->clients, $name ?: 'default');
+ }
+
+ /**
+ * Run a command against the Redis database.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function command($method, array $parameters = [])
+ {
+ return call_user_func_array([$this->clients['default'], $method], $parameters);
+ }
+
+ /**
+ * Subscribe to a set of given channels for messages.
+ *
+ * @param array|string $channels
+ * @param \Closure $callback
+ * @param string $connection
+ * @param string $method
+ * @return void
+ */
+ public function subscribe($channels, Closure $callback, $connection = null, $method = 'subscribe')
+ {
+ $loop = $this->connection($connection)->pubSubLoop();
+
+ call_user_func_array([$loop, $method], (array) $channels);
+
+ foreach ($loop as $message) {
+ if ($message->kind === 'message' || $message->kind === 'pmessage') {
+ call_user_func($callback, $message->payload, $message->channel);
+ }
+ }
+
+ unset($loop);
+ }
+
+ /**
+ * Subscribe to a set of given channels with wildcards.
+ *
+ * @param array|string $channels
+ * @param \Closure $callback
+ * @param string $connection
+ * @return void
+ */
+ public function psubscribe($channels, Closure $callback, $connection = null)
+ {
+ return $this->subscribe($channels, $callback, $connection, __FUNCTION__);
+ }
+
+ /**
+ * Dynamically make a Redis command.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return $this->command($method, $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php
index ae088b0..78e1cc1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php
@@ -1,37 +1,37 @@
-app->singleton('redis', function($app)
- {
- return new Database($app['config']['database.redis']);
- });
- }
+class RedisServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array('redis');
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('redis', function ($app) {
+ return new Database($app['config']['database.redis']);
+ });
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['redis'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Redis/composer.json b/application/vendor/laravel/framework/src/Illuminate/Redis/composer.json
index ed577c9..b78240b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Redis/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Redis/composer.json
@@ -14,9 +14,9 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
"predis/predis": "~1.0"
},
"autoload": {
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
index fd84c12..8ff71e8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
@@ -1,67 +1,67 @@
-option('plain'))
- {
- return __DIR__.'/stubs/controller.plain.stub';
- }
+ /**
+ * The type of class being generated.
+ *
+ * @var string
+ */
+ protected $type = 'Controller';
- return __DIR__.'/stubs/controller.stub';
- }
+ /**
+ * Get the stub file for the generator.
+ *
+ * @return string
+ */
+ protected function getStub()
+ {
+ if ($this->option('plain')) {
+ return __DIR__.'/stubs/controller.plain.stub';
+ }
- /**
- * Get the default namespace for the class.
- *
- * @param string $rootNamespace
- * @return string
- */
- protected function getDefaultNamespace($rootNamespace)
- {
- return $rootNamespace.'\Http\Controllers';
- }
+ return __DIR__.'/stubs/controller.stub';
+ }
- /**
- * Get the console command options.
- *
- * @return array
- */
- protected function getOptions()
- {
- return array(
- array('plain', null, InputOption::VALUE_NONE, 'Generate an empty controller class.'),
- );
- }
+ /**
+ * Get the default namespace for the class.
+ *
+ * @param string $rootNamespace
+ * @return string
+ */
+ protected function getDefaultNamespace($rootNamespace)
+ {
+ return $rootNamespace.'\Http\Controllers';
+ }
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['plain', null, InputOption::VALUE_NONE, 'Generate an empty controller class.'],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php
index 2ccc620..e41813d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php
@@ -1,49 +1,50 @@
-middleware[$middleware] = $options;
- }
-
- /**
- * Register a "before" filter on the controller.
- *
- * @param \Closure|string $filter
- * @param array $options
- * @return void
- */
- public function beforeFilter($filter, array $options = array())
- {
- $this->beforeFilters[] = $this->parseFilter($filter, $options);
- }
-
- /**
- * Register an "after" filter on the controller.
- *
- * @param \Closure|string $filter
- * @param array $options
- * @return void
- */
- public function afterFilter($filter, array $options = array())
- {
- $this->afterFilters[] = $this->parseFilter($filter, $options);
- }
-
- /**
- * Parse the given filter and options.
- *
- * @param \Closure|string $filter
- * @param array $options
- * @return array
- */
- protected function parseFilter($filter, array $options)
- {
- $parameters = array();
-
- $original = $filter;
-
- if ($filter instanceof Closure)
- {
- $filter = $this->registerClosureFilter($filter);
- }
- elseif ($this->isInstanceFilter($filter))
- {
- $filter = $this->registerInstanceFilter($filter);
- }
- else
- {
- list($filter, $parameters) = Route::parseFilter($filter);
- }
-
- return compact('original', 'filter', 'parameters', 'options');
- }
-
- /**
- * Register an anonymous controller filter Closure.
- *
- * @param \Closure $filter
- * @return string
- */
- protected function registerClosureFilter(Closure $filter)
- {
- $this->getRouter()->filter($name = spl_object_hash($filter), $filter);
-
- return $name;
- }
-
- /**
- * Register a controller instance method as a filter.
- *
- * @param string $filter
- * @return string
- */
- protected function registerInstanceFilter($filter)
- {
- $this->getRouter()->filter($filter, array($this, substr($filter, 1)));
-
- return $filter;
- }
-
- /**
- * Determine if a filter is a local method on the controller.
- *
- * @param mixed $filter
- * @return bool
- *
- * @throws \InvalidArgumentException
- */
- protected function isInstanceFilter($filter)
- {
- if (is_string($filter) && starts_with($filter, '@'))
- {
- if (method_exists($this, substr($filter, 1))) return true;
-
- throw new InvalidArgumentException("Filter method [$filter] does not exist.");
- }
-
- return false;
- }
-
- /**
- * Remove the given before filter.
- *
- * @param string $filter
- * @return void
- */
- public function forgetBeforeFilter($filter)
- {
- $this->beforeFilters = $this->removeFilter($filter, $this->getBeforeFilters());
- }
-
- /**
- * Remove the given after filter.
- *
- * @param string $filter
- * @return void
- */
- public function forgetAfterFilter($filter)
- {
- $this->afterFilters = $this->removeFilter($filter, $this->getAfterFilters());
- }
-
- /**
- * Remove the given controller filter from the provided filter array.
- *
- * @param string $removing
- * @param array $current
- * @return array
- */
- protected function removeFilter($removing, $current)
- {
- return array_filter($current, function($filter) use ($removing)
- {
- return $filter['original'] != $removing;
- });
- }
-
- /**
- * Get the middleware assigned to the controller.
- *
- * @return array
- */
- public function getMiddleware()
- {
- return $this->middleware;
- }
-
- /**
- * Get the registered "before" filters.
- *
- * @return array
- */
- public function getBeforeFilters()
- {
- return $this->beforeFilters;
- }
-
- /**
- * Get the registered "after" filters.
- *
- * @return array
- */
- public function getAfterFilters()
- {
- return $this->afterFilters;
- }
-
- /**
- * Get the router instance.
- *
- * @return \Illuminate\Routing\Router
- */
- public static function getRouter()
- {
- return static::$router;
- }
-
- /**
- * Set the router instance.
- *
- * @param \Illuminate\Routing\Router $router
- * @return void
- */
- public static function setRouter(Router $router)
- {
- static::$router = $router;
- }
-
- /**
- * Execute an action on the controller.
- *
- * @param string $method
- * @param array $parameters
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function callAction($method, $parameters)
- {
- return call_user_func_array(array($this, $method), $parameters);
- }
-
- /**
- * Handle calls to missing methods on the controller.
- *
- * @param array $parameters
- * @return mixed
- *
- * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
- */
- public function missingMethod($parameters = array())
- {
- throw new NotFoundHttpException("Controller method not found.");
- }
-
- /**
- * Handle calls to missing methods on the controller.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- *
- * @throws \BadMethodCallException
- */
- public function __call($method, $parameters)
- {
- throw new BadMethodCallException("Method [$method] does not exist.");
- }
-
+abstract class Controller
+{
+ /**
+ * The middleware registered on the controller.
+ *
+ * @var array
+ */
+ protected $middleware = [];
+
+ /**
+ * The "before" filters registered on the controller.
+ *
+ * @var array
+ */
+ protected $beforeFilters = [];
+
+ /**
+ * The "after" filters registered on the controller.
+ *
+ * @var array
+ */
+ protected $afterFilters = [];
+
+ /**
+ * The router instance.
+ *
+ * @var \Illuminate\Routing\Router
+ */
+ protected static $router;
+
+ /**
+ * Register middleware on the controller.
+ *
+ * @param string $middleware
+ * @param array $options
+ * @return void
+ */
+ public function middleware($middleware, array $options = [])
+ {
+ $this->middleware[$middleware] = $options;
+ }
+
+ /**
+ * Register a "before" filter on the controller.
+ *
+ * @param \Closure|string $filter
+ * @param array $options
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function beforeFilter($filter, array $options = [])
+ {
+ $this->beforeFilters[] = $this->parseFilter($filter, $options);
+ }
+
+ /**
+ * Register an "after" filter on the controller.
+ *
+ * @param \Closure|string $filter
+ * @param array $options
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function afterFilter($filter, array $options = [])
+ {
+ $this->afterFilters[] = $this->parseFilter($filter, $options);
+ }
+
+ /**
+ * Parse the given filter and options.
+ *
+ * @param \Closure|string $filter
+ * @param array $options
+ * @return array
+ */
+ protected function parseFilter($filter, array $options)
+ {
+ $parameters = [];
+
+ $original = $filter;
+
+ if ($filter instanceof Closure) {
+ $filter = $this->registerClosureFilter($filter);
+ } elseif ($this->isInstanceFilter($filter)) {
+ $filter = $this->registerInstanceFilter($filter);
+ } else {
+ list($filter, $parameters) = Route::parseFilter($filter);
+ }
+
+ return compact('original', 'filter', 'parameters', 'options');
+ }
+
+ /**
+ * Register an anonymous controller filter Closure.
+ *
+ * @param \Closure $filter
+ * @return string
+ */
+ protected function registerClosureFilter(Closure $filter)
+ {
+ $this->getRouter()->filter($name = spl_object_hash($filter), $filter);
+
+ return $name;
+ }
+
+ /**
+ * Register a controller instance method as a filter.
+ *
+ * @param string $filter
+ * @return string
+ */
+ protected function registerInstanceFilter($filter)
+ {
+ $this->getRouter()->filter($filter, [$this, substr($filter, 1)]);
+
+ return $filter;
+ }
+
+ /**
+ * Determine if a filter is a local method on the controller.
+ *
+ * @param mixed $filter
+ * @return bool
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function isInstanceFilter($filter)
+ {
+ if (is_string($filter) && Str::startsWith($filter, '@')) {
+ if (method_exists($this, substr($filter, 1))) {
+ return true;
+ }
+
+ throw new InvalidArgumentException("Filter method [$filter] does not exist.");
+ }
+
+ return false;
+ }
+
+ /**
+ * Remove the given before filter.
+ *
+ * @param string $filter
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function forgetBeforeFilter($filter)
+ {
+ $this->beforeFilters = $this->removeFilter($filter, $this->getBeforeFilters());
+ }
+
+ /**
+ * Remove the given after filter.
+ *
+ * @param string $filter
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function forgetAfterFilter($filter)
+ {
+ $this->afterFilters = $this->removeFilter($filter, $this->getAfterFilters());
+ }
+
+ /**
+ * Remove the given controller filter from the provided filter array.
+ *
+ * @param string $removing
+ * @param array $current
+ * @return array
+ */
+ protected function removeFilter($removing, $current)
+ {
+ return array_filter($current, function ($filter) use ($removing) {
+ return $filter['original'] != $removing;
+ });
+ }
+
+ /**
+ * Get the middleware assigned to the controller.
+ *
+ * @return array
+ */
+ public function getMiddleware()
+ {
+ return $this->middleware;
+ }
+
+ /**
+ * Get the registered "before" filters.
+ *
+ * @return array
+ *
+ * @deprecated since version 5.1.
+ */
+ public function getBeforeFilters()
+ {
+ return $this->beforeFilters;
+ }
+
+ /**
+ * Get the registered "after" filters.
+ *
+ * @return array
+ *
+ * @deprecated since version 5.1.
+ */
+ public function getAfterFilters()
+ {
+ return $this->afterFilters;
+ }
+
+ /**
+ * Get the router instance.
+ *
+ * @return \Illuminate\Routing\Router
+ */
+ public static function getRouter()
+ {
+ return static::$router;
+ }
+
+ /**
+ * Set the router instance.
+ *
+ * @param \Illuminate\Routing\Router $router
+ * @return void
+ */
+ public static function setRouter(Router $router)
+ {
+ static::$router = $router;
+ }
+
+ /**
+ * Execute an action on the controller.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function callAction($method, $parameters)
+ {
+ return call_user_func_array([$this, $method], $parameters);
+ }
+
+ /**
+ * Handle calls to missing methods on the controller.
+ *
+ * @param array $parameters
+ * @return mixed
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+ */
+ public function missingMethod($parameters = [])
+ {
+ throw new NotFoundHttpException('Controller method not found.');
+ }
+
+ /**
+ * Handle calls to missing methods on the controller.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ *
+ * @throws \BadMethodCallException
+ */
+ public function __call($method, $parameters)
+ {
+ throw new BadMethodCallException("Method [$method] does not exist.");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php b/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php
index 2923c5e..6482868 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php
@@ -1,297 +1,300 @@
-router = $router;
- $this->container = $container;
- }
-
- /**
- * Dispatch a request to a given controller and method.
- *
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @param string $controller
- * @param string $method
- * @return mixed
- */
- public function dispatch(Route $route, Request $request, $controller, $method)
- {
- // First we will make an instance of this controller via the IoC container instance
- // so that we can call the methods on it. We will also apply any "after" filters
- // to the route so that they will be run by the routers after this processing.
- $instance = $this->makeController($controller);
-
- $this->assignAfter($instance, $route, $request, $method);
-
- $response = $this->before($instance, $route, $request, $method);
-
- // If no before filters returned a response we'll call the method on the controller
- // to get the response to be returned to the router. We will then return it back
- // out for processing by this router and the after filters can be called then.
- if (is_null($response))
- {
- $response = $this->callWithinStack(
- $instance, $route, $request, $method
- );
- }
-
- return $response;
- }
-
- /**
- * Make a controller instance via the IoC container.
- *
- * @param string $controller
- * @return mixed
- */
- protected function makeController($controller)
- {
- Controller::setRouter($this->router);
-
- return $this->container->make($controller);
- }
-
- /**
- * Call the given controller instance method.
- *
- * @param \Illuminate\Routing\Controller $instance
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @param string $method
- * @return mixed
- */
- protected function callWithinStack($instance, $route, $request, $method)
- {
- $middleware = $this->getMiddleware($instance, $method);
-
- // Here we will make a stack onion instance to execute this request in, which gives
- // us the ability to define middlewares on controllers. We will return the given
- // response back out so that "after" filters can be run after the middlewares.
- return (new Pipeline($this->container))
- ->send($request)
- ->through($middleware)
- ->then(function($request) use ($instance, $route, $method)
- {
- return $this->call($instance, $route, $method);
- });
- }
-
- /**
- * Get the middleware for the controller instance.
- *
- * @param \Illuminate\Routing\Controller $instance
- * @param string $method
- * @return array
- */
- protected function getMiddleware($instance, $method)
- {
- $middleware = $this->router->getMiddleware();
-
- $results = [];
-
- foreach ($instance->getMiddleware() as $name => $options)
- {
- if ( ! $this->methodExcludedByOptions($method, $options))
- {
- $results[] = array_get($middleware, $name, $name);
- }
- }
-
- return $results;
- }
-
- /**
- * Determine if the given options exclude a particular method.
- *
- * @param string $method
- * @param array $options
- * @return bool
- */
- public function methodExcludedByOptions($method, array $options)
- {
- return ( ! empty($options['only']) && ! in_array($method, (array) $options['only'])) ||
- ( ! empty($options['except']) && in_array($method, (array) $options['except']));
- }
-
- /**
- * Call the given controller instance method.
- *
- * @param \Illuminate\Routing\Controller $instance
- * @param \Illuminate\Routing\Route $route
- * @param string $method
- * @return mixed
- */
- protected function call($instance, $route, $method)
- {
- $parameters = $this->resolveClassMethodDependencies(
- $route->parametersWithoutNulls(), $instance, $method
- );
-
- return $instance->callAction($method, $parameters);
- }
-
- /**
- * Call the "before" filters for the controller.
- *
- * @param \Illuminate\Routing\Controller $instance
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @param string $method
- * @return mixed
- */
- protected function before($instance, $route, $request, $method)
- {
- foreach ($instance->getBeforeFilters() as $filter)
- {
- if ($this->filterApplies($filter, $request, $method))
- {
- // Here we will just check if the filter applies. If it does we will call the filter
- // and return the responses if it isn't null. If it is null, we will keep hitting
- // them until we get a response or are finished iterating through this filters.
- $response = $this->callFilter($filter, $route, $request);
-
- if ( ! is_null($response)) return $response;
- }
- }
- }
-
- /**
- * Apply the applicable after filters to the route.
- *
- * @param \Illuminate\Routing\Controller $instance
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @param string $method
- * @return mixed
- */
- protected function assignAfter($instance, $route, $request, $method)
- {
- foreach ($instance->getAfterFilters() as $filter)
- {
- // If the filter applies, we will add it to the route, since it has already been
- // registered with the router by the controller, and will just let the normal
- // router take care of calling these filters so we do not duplicate logics.
- if ($this->filterApplies($filter, $request, $method))
- {
- $route->after($this->getAssignableAfter($filter));
- }
- }
- }
-
- /**
- * Get the assignable after filter for the route.
- *
- * @param \Closure|string $filter
- * @return string
- */
- protected function getAssignableAfter($filter)
- {
- if ($filter['original'] instanceof Closure) return $filter['filter'];
-
- return $filter['original'];
- }
-
- /**
- * Determine if the given filter applies to the request.
- *
- * @param array $filter
- * @param \Illuminate\Http\Request $request
- * @param string $method
- * @return bool
- */
- protected function filterApplies($filter, $request, $method)
- {
- foreach (array('Method', 'On') as $type)
- {
- if ($this->{"filterFails{$type}"}($filter, $request, $method))
- {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Determine if the filter fails the method constraints.
- *
- * @param array $filter
- * @param \Illuminate\Http\Request $request
- * @param string $method
- * @return bool
- */
- protected function filterFailsMethod($filter, $request, $method)
- {
- return $this->methodExcludedByOptions($method, $filter['options']);
- }
-
- /**
- * Determine if the filter fails the "on" constraint.
- *
- * @param array $filter
- * @param \Illuminate\Http\Request $request
- * @param string $method
- * @return bool
- */
- protected function filterFailsOn($filter, $request, $method)
- {
- $on = array_get($filter, 'options.on');
-
- if (is_null($on)) return false;
-
- // If the "on" is a string, we will explode it on the pipe so you can set any
- // amount of methods on the filter constraints and it will still work like
- // you specified an array. Then we will check if the method is in array.
- if (is_string($on)) $on = explode('|', $on);
-
- return ! in_array(strtolower($request->getMethod()), $on);
- }
-
- /**
- * Call the given controller filter method.
- *
- * @param array $filter
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- protected function callFilter($filter, $route, $request)
- {
- return $this->router->callRouteFilter(
- $filter['filter'], $filter['parameters'], $route, $request
- );
- }
-
+class ControllerDispatcher
+{
+ use RouteDependencyResolverTrait;
+
+ /**
+ * The router instance.
+ *
+ * @var \Illuminate\Routing\Router
+ */
+ protected $router;
+
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * Create a new controller dispatcher instance.
+ *
+ * @param \Illuminate\Routing\Router $router
+ * @param \Illuminate\Container\Container $container
+ * @return void
+ */
+ public function __construct(Router $router,
+ Container $container = null)
+ {
+ $this->router = $router;
+ $this->container = $container;
+ }
+
+ /**
+ * Dispatch a request to a given controller and method.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @param string $controller
+ * @param string $method
+ * @return mixed
+ */
+ public function dispatch(Route $route, Request $request, $controller, $method)
+ {
+ // First we will make an instance of this controller via the IoC container instance
+ // so that we can call the methods on it. We will also apply any "after" filters
+ // to the route so that they will be run by the routers after this processing.
+ $instance = $this->makeController($controller);
+
+ $this->assignAfter($instance, $route, $request, $method);
+
+ $response = $this->before($instance, $route, $request, $method);
+
+ // If no before filters returned a response we'll call the method on the controller
+ // to get the response to be returned to the router. We will then return it back
+ // out for processing by this router and the after filters can be called then.
+ if (is_null($response)) {
+ $response = $this->callWithinStack(
+ $instance, $route, $request, $method
+ );
+ }
+
+ return $response;
+ }
+
+ /**
+ * Make a controller instance via the IoC container.
+ *
+ * @param string $controller
+ * @return mixed
+ */
+ protected function makeController($controller)
+ {
+ Controller::setRouter($this->router);
+
+ return $this->container->make($controller);
+ }
+
+ /**
+ * Call the given controller instance method.
+ *
+ * @param \Illuminate\Routing\Controller $instance
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @param string $method
+ * @return mixed
+ */
+ protected function callWithinStack($instance, $route, $request, $method)
+ {
+ $shouldSkipMiddleware = $this->container->bound('middleware.disable') &&
+ $this->container->make('middleware.disable') === true;
+
+ $middleware = $shouldSkipMiddleware ? [] : $this->getMiddleware($instance, $method);
+
+ // Here we will make a stack onion instance to execute this request in, which gives
+ // us the ability to define middlewares on controllers. We will return the given
+ // response back out so that "after" filters can be run after the middlewares.
+ return (new Pipeline($this->container))
+ ->send($request)
+ ->through($middleware)
+ ->then(function ($request) use ($instance, $route, $method) {
+ return $this->router->prepareResponse(
+ $request, $this->call($instance, $route, $method)
+ );
+ });
+ }
+
+ /**
+ * Get the middleware for the controller instance.
+ *
+ * @param \Illuminate\Routing\Controller $instance
+ * @param string $method
+ * @return array
+ */
+ protected function getMiddleware($instance, $method)
+ {
+ $results = [];
+
+ foreach ($instance->getMiddleware() as $name => $options) {
+ if (! $this->methodExcludedByOptions($method, $options)) {
+ $results[] = $this->router->resolveMiddlewareClassName($name);
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Determine if the given options exclude a particular method.
+ *
+ * @param string $method
+ * @param array $options
+ * @return bool
+ */
+ public function methodExcludedByOptions($method, array $options)
+ {
+ return (isset($options['only']) && ! in_array($method, (array) $options['only'])) ||
+ (! empty($options['except']) && in_array($method, (array) $options['except']));
+ }
+
+ /**
+ * Call the given controller instance method.
+ *
+ * @param \Illuminate\Routing\Controller $instance
+ * @param \Illuminate\Routing\Route $route
+ * @param string $method
+ * @return mixed
+ */
+ protected function call($instance, $route, $method)
+ {
+ $parameters = $this->resolveClassMethodDependencies(
+ $route->parametersWithoutNulls(), $instance, $method
+ );
+
+ return $instance->callAction($method, $parameters);
+ }
+
+ /**
+ * Call the "before" filters for the controller.
+ *
+ * @param \Illuminate\Routing\Controller $instance
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @param string $method
+ * @return mixed
+ */
+ protected function before($instance, $route, $request, $method)
+ {
+ foreach ($instance->getBeforeFilters() as $filter) {
+ if ($this->filterApplies($filter, $request, $method)) {
+ // Here we will just check if the filter applies. If it does we will call the filter
+ // and return the responses if it isn't null. If it is null, we will keep hitting
+ // them until we get a response or are finished iterating through this filters.
+ $response = $this->callFilter($filter, $route, $request);
+
+ if (! is_null($response)) {
+ return $response;
+ }
+ }
+ }
+ }
+
+ /**
+ * Apply the applicable after filters to the route.
+ *
+ * @param \Illuminate\Routing\Controller $instance
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @param string $method
+ * @return mixed
+ */
+ protected function assignAfter($instance, $route, $request, $method)
+ {
+ foreach ($instance->getAfterFilters() as $filter) {
+ // If the filter applies, we will add it to the route, since it has already been
+ // registered with the router by the controller, and will just let the normal
+ // router take care of calling these filters so we do not duplicate logics.
+ if ($this->filterApplies($filter, $request, $method)) {
+ $route->after($this->getAssignableAfter($filter));
+ }
+ }
+ }
+
+ /**
+ * Get the assignable after filter for the route.
+ *
+ * @param \Closure|string $filter
+ * @return string
+ */
+ protected function getAssignableAfter($filter)
+ {
+ if ($filter['original'] instanceof Closure) {
+ return $filter['filter'];
+ }
+
+ return $filter['original'];
+ }
+
+ /**
+ * Determine if the given filter applies to the request.
+ *
+ * @param array $filter
+ * @param \Illuminate\Http\Request $request
+ * @param string $method
+ * @return bool
+ */
+ protected function filterApplies($filter, $request, $method)
+ {
+ foreach (['Method', 'On'] as $type) {
+ if ($this->{"filterFails{$type}"}($filter, $request, $method)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Determine if the filter fails the method constraints.
+ *
+ * @param array $filter
+ * @param \Illuminate\Http\Request $request
+ * @param string $method
+ * @return bool
+ */
+ protected function filterFailsMethod($filter, $request, $method)
+ {
+ return $this->methodExcludedByOptions($method, $filter['options']);
+ }
+
+ /**
+ * Determine if the filter fails the "on" constraint.
+ *
+ * @param array $filter
+ * @param \Illuminate\Http\Request $request
+ * @param string $method
+ * @return bool
+ */
+ protected function filterFailsOn($filter, $request, $method)
+ {
+ $on = Arr::get($filter, 'options.on');
+
+ if (is_null($on)) {
+ return false;
+ }
+
+ // If the "on" is a string, we will explode it on the pipe so you can set any
+ // amount of methods on the filter constraints and it will still work like
+ // you specified an array. Then we will check if the method is in array.
+ if (is_string($on)) {
+ $on = explode('|', $on);
+ }
+
+ return ! in_array(strtolower($request->getMethod()), $on);
+ }
+
+ /**
+ * Call the given controller filter method.
+ *
+ * @param array $filter
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ protected function callFilter($filter, $route, $request)
+ {
+ return $this->router->callRouteFilter(
+ $filter['filter'], $filter['parameters'], $route, $request
+ );
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerInspector.php b/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerInspector.php
index 32ffc7e..bf6ff39 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerInspector.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerInspector.php
@@ -1,132 +1,133 @@
-getMethods(ReflectionMethod::IS_PUBLIC);
-
- // To get the routable methods, we will simply spin through all methods on the
- // controller instance checking to see if it belongs to the given class and
- // is a publicly routable method. If so, we will add it to this listings.
- foreach ($methods as $method)
- {
- if ($this->isRoutable($method))
- {
- $data = $this->getMethodData($method, $prefix);
-
- $routable[$method->name][] = $data;
-
- // If the routable method is an index method, we will create a special index
- // route which is simply the prefix and the verb and does not contain any
- // the wildcard place-holders that each "typical" routes would contain.
- if ($data['plain'] == $prefix.'/index')
- {
- $routable[$method->name][] = $this->getIndexData($data, $prefix);
- }
- }
- }
-
- return $routable;
- }
-
- /**
- * Determine if the given controller method is routable.
- *
- * @param \ReflectionMethod $method
- * @return bool
- */
- public function isRoutable(ReflectionMethod $method)
- {
- if ($method->class == 'Illuminate\Routing\Controller') return false;
-
- return starts_with($method->name, $this->verbs);
- }
-
- /**
- * Get the method data for a given method.
- *
- * @param \ReflectionMethod $method
- * @param string $prefix
- * @return array
- */
- public function getMethodData(ReflectionMethod $method, $prefix)
- {
- $verb = $this->getVerb($name = $method->name);
-
- $uri = $this->addUriWildcards($plain = $this->getPlainUri($name, $prefix));
-
- return compact('verb', 'plain', 'uri');
- }
-
- /**
- * Get the routable data for an index method.
- *
- * @param array $data
- * @param string $prefix
- * @return array
- */
- protected function getIndexData($data, $prefix)
- {
- return array('verb' => $data['verb'], 'plain' => $prefix, 'uri' => $prefix);
- }
-
- /**
- * Extract the verb from a controller action.
- *
- * @param string $name
- * @return string
- */
- public function getVerb($name)
- {
- return head(explode('_', snake_case($name)));
- }
-
- /**
- * Determine the URI from the given method name.
- *
- * @param string $name
- * @param string $prefix
- * @return string
- */
- public function getPlainUri($name, $prefix)
- {
- return $prefix.'/'.implode('-', array_slice(explode('_', snake_case($name)), 1));
- }
-
- /**
- * Add wildcards to the given URI.
- *
- * @param string $uri
- * @return string
- */
- public function addUriWildcards($uri)
- {
- return $uri.'/{one?}/{two?}/{three?}/{four?}/{five?}';
- }
-
+use Illuminate\Support\Str;
+
+class ControllerInspector
+{
+ /**
+ * An array of HTTP verbs.
+ *
+ * @var array
+ */
+ protected $verbs = [
+ 'any', 'get', 'post', 'put', 'patch',
+ 'delete', 'head', 'options',
+ ];
+
+ /**
+ * Get the routable methods for a controller.
+ *
+ * @param string $controller
+ * @param string $prefix
+ * @return array
+ */
+ public function getRoutable($controller, $prefix)
+ {
+ $routable = [];
+
+ $reflection = new ReflectionClass($controller);
+
+ $methods = $reflection->getMethods(ReflectionMethod::IS_PUBLIC);
+
+ // To get the routable methods, we will simply spin through all methods on the
+ // controller instance checking to see if it belongs to the given class and
+ // is a publicly routable method. If so, we will add it to this listings.
+ foreach ($methods as $method) {
+ if ($this->isRoutable($method)) {
+ $data = $this->getMethodData($method, $prefix);
+
+ $routable[$method->name][] = $data;
+
+ // If the routable method is an index method, we will create a special index
+ // route which is simply the prefix and the verb and does not contain any
+ // the wildcard place-holders that each "typical" routes would contain.
+ if ($data['plain'] == $prefix.'/index') {
+ $routable[$method->name][] = $this->getIndexData($data, $prefix);
+ }
+ }
+ }
+
+ return $routable;
+ }
+
+ /**
+ * Determine if the given controller method is routable.
+ *
+ * @param \ReflectionMethod $method
+ * @return bool
+ */
+ public function isRoutable(ReflectionMethod $method)
+ {
+ if ($method->class == 'Illuminate\Routing\Controller') {
+ return false;
+ }
+
+ return Str::startsWith($method->name, $this->verbs);
+ }
+
+ /**
+ * Get the method data for a given method.
+ *
+ * @param \ReflectionMethod $method
+ * @param string $prefix
+ * @return array
+ */
+ public function getMethodData(ReflectionMethod $method, $prefix)
+ {
+ $verb = $this->getVerb($name = $method->name);
+
+ $uri = $this->addUriWildcards($plain = $this->getPlainUri($name, $prefix));
+
+ return compact('verb', 'plain', 'uri');
+ }
+
+ /**
+ * Get the routable data for an index method.
+ *
+ * @param array $data
+ * @param string $prefix
+ * @return array
+ */
+ protected function getIndexData($data, $prefix)
+ {
+ return ['verb' => $data['verb'], 'plain' => $prefix, 'uri' => $prefix];
+ }
+
+ /**
+ * Extract the verb from a controller action.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function getVerb($name)
+ {
+ return head(explode('_', Str::snake($name)));
+ }
+
+ /**
+ * Determine the URI from the given method name.
+ *
+ * @param string $name
+ * @param string $prefix
+ * @return string
+ */
+ public function getPlainUri($name, $prefix)
+ {
+ return $prefix.'/'.implode('-', array_slice(explode('_', Str::snake($name)), 1));
+ }
+
+ /**
+ * Add wildcards to the given URI.
+ *
+ * @param string $uri
+ * @return string
+ */
+ public function addUriWildcards($uri)
+ {
+ return $uri.'/{one?}/{two?}/{three?}/{four?}/{five?}';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerServiceProvider.php
index 029dc9e..ead0992 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/ControllerServiceProvider.php
@@ -1,20 +1,20 @@
-app->singleton('illuminate.route.dispatcher', function($app)
- {
- return new ControllerDispatcher($app['router'], $app);
- });
- }
+use Illuminate\Support\ServiceProvider;
+class ControllerServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('illuminate.route.dispatcher', function ($app) {
+ return new ControllerDispatcher($app['router'], $app);
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/GeneratorServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Routing/GeneratorServiceProvider.php
index f3edcd4..1b5bfea 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/GeneratorServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/GeneratorServiceProvider.php
@@ -1,68 +1,67 @@
-registerControllerGenerator();
+class GeneratorServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- $this->registerMiddlewareGenerator();
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerControllerGenerator();
- $this->commands('command.controller.make', 'command.middleware.make');
- }
+ $this->registerMiddlewareGenerator();
- /**
- * Register the controller generator command.
- *
- * @return void
- */
- protected function registerControllerGenerator()
- {
- $this->app->singleton('command.controller.make', function($app)
- {
- return new ControllerMakeCommand($app['files']);
- });
- }
+ $this->commands('command.controller.make', 'command.middleware.make');
+ }
- /**
- * Register the middleware generator command.
- *
- * @return void
- */
- protected function registerMiddlewareGenerator()
- {
- $this->app->singleton('command.middleware.make', function($app)
- {
- return new MiddlewareMakeCommand($app['files']);
- });
- }
+ /**
+ * Register the controller generator command.
+ *
+ * @return void
+ */
+ protected function registerControllerGenerator()
+ {
+ $this->app->singleton('command.controller.make', function ($app) {
+ return new ControllerMakeCommand($app['files']);
+ });
+ }
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array(
- 'command.controller.make', 'command.middleware.make',
- );
- }
+ /**
+ * Register the middleware generator command.
+ *
+ * @return void
+ */
+ protected function registerMiddlewareGenerator()
+ {
+ $this->app->singleton('command.middleware.make', function ($app) {
+ return new MiddlewareMakeCommand($app['files']);
+ });
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [
+ 'command.controller.make', 'command.middleware.make',
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php
index 5b74baa..76f9d87 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php
@@ -1,22 +1,25 @@
-getCompiled()->getHostRegex())) return true;
-
- return preg_match($route->getCompiled()->getHostRegex(), $request->getHost());
- }
+class HostValidator implements ValidatorInterface
+{
+ /**
+ * Validate a given rule against a route and request.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ public function matches(Route $route, Request $request)
+ {
+ if (is_null($route->getCompiled()->getHostRegex())) {
+ return true;
+ }
+ return preg_match($route->getCompiled()->getHostRegex(), $request->getHost());
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php
index 21bc65c..f9cf155 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php
@@ -1,20 +1,21 @@
-getMethod(), $route->methods());
- }
-
+class MethodValidator implements ValidatorInterface
+{
+ /**
+ * Validate a given rule against a route and request.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ public function matches(Route $route, Request $request)
+ {
+ return in_array($request->getMethod(), $route->methods());
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php
index e9e9b66..fd5d5af 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php
@@ -1,29 +1,27 @@
-httpOnly())
- {
- return ! $request->secure();
- }
- elseif ($route->secure())
- {
- return $request->secure();
- }
-
- return true;
- }
+class SchemeValidator implements ValidatorInterface
+{
+ /**
+ * Validate a given rule against a route and request.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ public function matches(Route $route, Request $request)
+ {
+ if ($route->httpOnly()) {
+ return ! $request->secure();
+ } elseif ($route->secure()) {
+ return $request->secure();
+ }
+ return true;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php
index 757bc4c..6a54d12 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php
@@ -1,22 +1,23 @@
-path() == '/' ? '/' : '/'.$request->path();
-
- return preg_match($route->getCompiled()->getRegex(), rawurldecode($path));
- }
+class UriValidator implements ValidatorInterface
+{
+ /**
+ * Validate a given rule against a route and request.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return bool
+ */
+ public function matches(Route $route, Request $request)
+ {
+ $path = $request->path() == '/' ? '/' : '/'.$request->path();
+ return preg_match($route->getCompiled()->getRegex(), rawurldecode($path));
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php
index d2ba1e5..0f178f1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php
@@ -1,17 +1,18 @@
-generator = $generator;
- }
-
- /**
- * Create a new redirect response to the "home" route.
- *
- * @param int $status
- * @return \Illuminate\Http\RedirectResponse
- */
- public function home($status = 302)
- {
- return $this->to($this->generator->route('home'), $status);
- }
-
- /**
- * Create a new redirect response to the previous location.
- *
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- public function back($status = 302, $headers = array())
- {
- $back = $this->generator->previous();
-
- return $this->createRedirect($back, $status, $headers);
- }
-
- /**
- * Create a new redirect response to the current URI.
- *
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- public function refresh($status = 302, $headers = array())
- {
- return $this->to($this->generator->getRequest()->path(), $status, $headers);
- }
-
- /**
- * Create a new redirect response, while putting the current URL in the session.
- *
- * @param string $path
- * @param int $status
- * @param array $headers
- * @param bool $secure
- * @return \Illuminate\Http\RedirectResponse
- */
- public function guest($path, $status = 302, $headers = array(), $secure = null)
- {
- $this->session->put('url.intended', $this->generator->full());
-
- return $this->to($path, $status, $headers, $secure);
- }
-
- /**
- * Create a new redirect response to the previously intended location.
- *
- * @param string $default
- * @param int $status
- * @param array $headers
- * @param bool $secure
- * @return \Illuminate\Http\RedirectResponse
- */
- public function intended($default = '/', $status = 302, $headers = array(), $secure = null)
- {
- $path = $this->session->pull('url.intended', $default);
-
- return $this->to($path, $status, $headers, $secure);
- }
-
- /**
- * Create a new redirect response to the given path.
- *
- * @param string $path
- * @param int $status
- * @param array $headers
- * @param bool $secure
- * @return \Illuminate\Http\RedirectResponse
- */
- public function to($path, $status = 302, $headers = array(), $secure = null)
- {
- $path = $this->generator->to($path, array(), $secure);
-
- return $this->createRedirect($path, $status, $headers);
- }
-
- /**
- * Create a new redirect response to an external URL (no validation).
- *
- * @param string $path
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- public function away($path, $status = 302, $headers = array())
- {
- return $this->createRedirect($path, $status, $headers);
- }
-
- /**
- * Create a new redirect response to the given HTTPS path.
- *
- * @param string $path
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- public function secure($path, $status = 302, $headers = array())
- {
- return $this->to($path, $status, $headers, true);
- }
-
- /**
- * Create a new redirect response to a named route.
- *
- * @param string $route
- * @param array $parameters
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- public function route($route, $parameters = array(), $status = 302, $headers = array())
- {
- $path = $this->generator->route($route, $parameters);
-
- return $this->to($path, $status, $headers);
- }
-
- /**
- * Create a new redirect response to a controller action.
- *
- * @param string $action
- * @param array $parameters
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- public function action($action, $parameters = array(), $status = 302, $headers = array())
- {
- $path = $this->generator->action($action, $parameters);
-
- return $this->to($path, $status, $headers);
- }
-
- /**
- * Create a new redirect response.
- *
- * @param string $path
- * @param int $status
- * @param array $headers
- * @return \Illuminate\Http\RedirectResponse
- */
- protected function createRedirect($path, $status, $headers)
- {
- $redirect = new RedirectResponse($path, $status, $headers);
-
- if (isset($this->session))
- {
- $redirect->setSession($this->session);
- }
-
- $redirect->setRequest($this->generator->getRequest());
-
- return $redirect;
- }
-
- /**
- * Get the URL generator instance.
- *
- * @return \Illuminate\Routing\UrlGenerator
- */
- public function getUrlGenerator()
- {
- return $this->generator;
- }
-
- /**
- * Set the active session store.
- *
- * @param \Illuminate\Session\Store $session
- * @return void
- */
- public function setSession(SessionStore $session)
- {
- $this->session = $session;
- }
-
+class Redirector
+{
+ /**
+ * The URL generator instance.
+ *
+ * @var \Illuminate\Routing\UrlGenerator
+ */
+ protected $generator;
+
+ /**
+ * The session store instance.
+ *
+ * @var \Illuminate\Session\Store
+ */
+ protected $session;
+
+ /**
+ * Create a new Redirector instance.
+ *
+ * @param \Illuminate\Routing\UrlGenerator $generator
+ * @return void
+ */
+ public function __construct(UrlGenerator $generator)
+ {
+ $this->generator = $generator;
+ }
+
+ /**
+ * Create a new redirect response to the "home" route.
+ *
+ * @param int $status
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function home($status = 302)
+ {
+ return $this->to($this->generator->route('home'), $status);
+ }
+
+ /**
+ * Create a new redirect response to the previous location.
+ *
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function back($status = 302, $headers = [])
+ {
+ $back = $this->generator->previous();
+
+ return $this->createRedirect($back, $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response to the current URI.
+ *
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function refresh($status = 302, $headers = [])
+ {
+ return $this->to($this->generator->getRequest()->path(), $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response, while putting the current URL in the session.
+ *
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @param bool $secure
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function guest($path, $status = 302, $headers = [], $secure = null)
+ {
+ $this->session->put('url.intended', $this->generator->full());
+
+ return $this->to($path, $status, $headers, $secure);
+ }
+
+ /**
+ * Create a new redirect response to the previously intended location.
+ *
+ * @param string $default
+ * @param int $status
+ * @param array $headers
+ * @param bool $secure
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function intended($default = '/', $status = 302, $headers = [], $secure = null)
+ {
+ $path = $this->session->pull('url.intended', $default);
+
+ return $this->to($path, $status, $headers, $secure);
+ }
+
+ /**
+ * Create a new redirect response to the given path.
+ *
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @param bool $secure
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function to($path, $status = 302, $headers = [], $secure = null)
+ {
+ $path = $this->generator->to($path, [], $secure);
+
+ return $this->createRedirect($path, $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response to an external URL (no validation).
+ *
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function away($path, $status = 302, $headers = [])
+ {
+ return $this->createRedirect($path, $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response to the given HTTPS path.
+ *
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function secure($path, $status = 302, $headers = [])
+ {
+ return $this->to($path, $status, $headers, true);
+ }
+
+ /**
+ * Create a new redirect response to a named route.
+ *
+ * @param string $route
+ * @param array $parameters
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function route($route, $parameters = [], $status = 302, $headers = [])
+ {
+ $path = $this->generator->route($route, $parameters);
+
+ return $this->to($path, $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response to a controller action.
+ *
+ * @param string $action
+ * @param array $parameters
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function action($action, $parameters = [], $status = 302, $headers = [])
+ {
+ $path = $this->generator->action($action, $parameters);
+
+ return $this->to($path, $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response.
+ *
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ protected function createRedirect($path, $status, $headers)
+ {
+ $redirect = new RedirectResponse($path, $status, $headers);
+
+ if (isset($this->session)) {
+ $redirect->setSession($this->session);
+ }
+
+ $redirect->setRequest($this->generator->getRequest());
+
+ return $redirect;
+ }
+
+ /**
+ * Get the URL generator instance.
+ *
+ * @return \Illuminate\Routing\UrlGenerator
+ */
+ public function getUrlGenerator()
+ {
+ return $this->generator;
+ }
+
+ /**
+ * Set the active session store.
+ *
+ * @param \Illuminate\Session\Store $session
+ * @return void
+ */
+ public function setSession(SessionStore $session)
+ {
+ $this->session = $session;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php b/application/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php
index 970d425..bd46c9a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php
@@ -1,392 +1,389 @@
-router = $router;
- }
-
- /**
- * Route a resource to a controller.
- *
- * @param string $name
- * @param string $controller
- * @param array $options
- * @return void
- */
- public function register($name, $controller, array $options = array())
- {
- // If the resource name contains a slash, we will assume the developer wishes to
- // register these resource routes with a prefix so we will set that up out of
- // the box so they don't have to mess with it. Otherwise, we will continue.
- if (str_contains($name, '/'))
- {
- $this->prefixedResource($name, $controller, $options);
-
- return;
- }
-
- // We need to extract the base resource from the resource name. Nested resources
- // are supported in the framework, but we need to know what name to use for a
- // place-holder on the route wildcards, which should be the base resources.
- $base = $this->getResourceWildcard(last(explode('.', $name)));
-
- $defaults = $this->resourceDefaults;
-
- foreach ($this->getResourceMethods($defaults, $options) as $m)
- {
- $this->{'addResource'.ucfirst($m)}($name, $base, $controller, $options);
- }
- }
-
- /**
- * Build a set of prefixed resource routes.
- *
- * @param string $name
- * @param string $controller
- * @param array $options
- * @return void
- */
- protected function prefixedResource($name, $controller, array $options)
- {
- list($name, $prefix) = $this->getResourcePrefix($name);
-
- // We need to extract the base resource from the resource name. Nested resources
- // are supported in the framework, but we need to know what name to use for a
- // place-holder on the route wildcards, which should be the base resources.
- $callback = function($me) use ($name, $controller, $options)
- {
- $me->resource($name, $controller, $options);
- };
-
- return $this->router->group(compact('prefix'), $callback);
- }
-
- /**
- * Extract the resource and prefix from a resource name.
- *
- * @param string $name
- * @return array
- */
- protected function getResourcePrefix($name)
- {
- $segments = explode('/', $name);
-
- // To get the prefix, we will take all of the name segments and implode them on
- // a slash. This will generate a proper URI prefix for us. Then we take this
- // last segment, which will be considered the final resources name we use.
- $prefix = implode('/', array_slice($segments, 0, -1));
-
- return array(end($segments), $prefix);
- }
-
- /**
- * Get the applicable resource methods.
- *
- * @param array $defaults
- * @param array $options
- * @return array
- */
- protected function getResourceMethods($defaults, $options)
- {
- if (isset($options['only']))
- {
- return array_intersect($defaults, (array) $options['only']);
- }
- elseif (isset($options['except']))
- {
- return array_diff($defaults, (array) $options['except']);
- }
-
- return $defaults;
- }
-
- /**
- * Get the base resource URI for a given resource.
- *
- * @param string $resource
- * @return string
- */
- public function getResourceUri($resource)
- {
- if ( ! str_contains($resource, '.')) return $resource;
-
- // Once we have built the base URI, we'll remove the wildcard holder for this
- // base resource name so that the individual route adders can suffix these
- // paths however they need to, as some do not have any wildcards at all.
- $segments = explode('.', $resource);
-
- $uri = $this->getNestedResourceUri($segments);
-
- return str_replace('/{'.$this->getResourceWildcard(last($segments)).'}', '', $uri);
- }
-
- /**
- * Get the URI for a nested resource segment array.
- *
- * @param array $segments
- * @return string
- */
- protected function getNestedResourceUri(array $segments)
- {
- // We will spin through the segments and create a place-holder for each of the
- // resource segments, as well as the resource itself. Then we should get an
- // entire string for the resource URI that contains all nested resources.
- return implode('/', array_map(function($s)
- {
- return $s.'/{'.$this->getResourceWildcard($s).'}';
-
- }, $segments));
- }
-
- /**
- * Get the action array for a resource route.
- *
- * @param string $resource
- * @param string $controller
- * @param string $method
- * @param array $options
- * @return array
- */
- protected function getResourceAction($resource, $controller, $method, $options)
- {
- $name = $this->getResourceName($resource, $method, $options);
-
- return array('as' => $name, 'uses' => $controller.'@'.$method);
- }
-
- /**
- * Get the name for a given resource.
- *
- * @param string $resource
- * @param string $method
- * @param array $options
- * @return string
- */
- protected function getResourceName($resource, $method, $options)
- {
- if (isset($options['names'][$method])) return $options['names'][$method];
-
- // If a global prefix has been assigned to all names for this resource, we will
- // grab that so we can prepend it onto the name when we create this name for
- // the resource action. Otherwise we'll just use an empty string for here.
- $prefix = isset($options['as']) ? $options['as'].'.' : '';
-
- if ( ! $this->router->hasGroupStack())
- {
- return $prefix.$resource.'.'.$method;
- }
-
- return $this->getGroupResourceName($prefix, $resource, $method);
- }
-
- /**
- * Get the resource name for a grouped resource.
- *
- * @param string $prefix
- * @param string $resource
- * @param string $method
- * @return string
- */
- protected function getGroupResourceName($prefix, $resource, $method)
- {
- $group = trim(str_replace('/', '.', $this->router->getLastGroupPrefix()), '.');
-
- if (empty($group))
- {
- return trim("{$prefix}{$resource}.{$method}", '.');
- }
-
- return trim("{$prefix}{$group}.{$resource}.{$method}", '.');
- }
-
- /**
- * Format a resource wildcard for usage.
- *
- * @param string $value
- * @return string
- */
- public function getResourceWildcard($value)
- {
- return str_replace('-', '_', $value);
- }
-
- /**
- * Add the index method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return \Illuminate\Routing\Route
- */
- protected function addResourceIndex($name, $base, $controller, $options)
- {
- $uri = $this->getResourceUri($name);
-
- $action = $this->getResourceAction($name, $controller, 'index', $options);
-
- return $this->router->get($uri, $action);
- }
-
- /**
- * Add the create method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return \Illuminate\Routing\Route
- */
- protected function addResourceCreate($name, $base, $controller, $options)
- {
- $uri = $this->getResourceUri($name).'/create';
-
- $action = $this->getResourceAction($name, $controller, 'create', $options);
-
- return $this->router->get($uri, $action);
- }
-
- /**
- * Add the store method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return \Illuminate\Routing\Route
- */
- protected function addResourceStore($name, $base, $controller, $options)
- {
- $uri = $this->getResourceUri($name);
-
- $action = $this->getResourceAction($name, $controller, 'store', $options);
-
- return $this->router->post($uri, $action);
- }
-
- /**
- * Add the show method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return \Illuminate\Routing\Route
- */
- protected function addResourceShow($name, $base, $controller, $options)
- {
- $uri = $this->getResourceUri($name).'/{'.$base.'}';
-
- $action = $this->getResourceAction($name, $controller, 'show', $options);
-
- return $this->router->get($uri, $action);
- }
-
- /**
- * Add the edit method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return \Illuminate\Routing\Route
- */
- protected function addResourceEdit($name, $base, $controller, $options)
- {
- $uri = $this->getResourceUri($name).'/{'.$base.'}/edit';
-
- $action = $this->getResourceAction($name, $controller, 'edit', $options);
-
- return $this->router->get($uri, $action);
- }
-
- /**
- * Add the update method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return void
- */
- protected function addResourceUpdate($name, $base, $controller, $options)
- {
- $this->addPutResourceUpdate($name, $base, $controller, $options);
-
- return $this->addPatchResourceUpdate($name, $base, $controller);
- }
-
- /**
- * Add the update method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return \Illuminate\Routing\Route
- */
- protected function addPutResourceUpdate($name, $base, $controller, $options)
- {
- $uri = $this->getResourceUri($name).'/{'.$base.'}';
-
- $action = $this->getResourceAction($name, $controller, 'update', $options);
-
- return $this->router->put($uri, $action);
- }
-
- /**
- * Add the update method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @return void
- */
- protected function addPatchResourceUpdate($name, $base, $controller)
- {
- $uri = $this->getResourceUri($name).'/{'.$base.'}';
-
- $this->router->patch($uri, $controller.'@update');
- }
-
- /**
- * Add the destroy method for a resourceful route.
- *
- * @param string $name
- * @param string $base
- * @param string $controller
- * @param array $options
- * @return \Illuminate\Routing\Route
- */
- protected function addResourceDestroy($name, $base, $controller, $options)
- {
- $uri = $this->getResourceUri($name).'/{'.$base.'}';
-
- $action = $this->getResourceAction($name, $controller, 'destroy', $options);
-
- return $this->router->delete($uri, $action);
- }
-
+router = $router;
+ }
+
+ /**
+ * Route a resource to a controller.
+ *
+ * @param string $name
+ * @param string $controller
+ * @param array $options
+ * @return void
+ */
+ public function register($name, $controller, array $options = [])
+ {
+ // If the resource name contains a slash, we will assume the developer wishes to
+ // register these resource routes with a prefix so we will set that up out of
+ // the box so they don't have to mess with it. Otherwise, we will continue.
+ if (Str::contains($name, '/')) {
+ $this->prefixedResource($name, $controller, $options);
+
+ return;
+ }
+
+ // We need to extract the base resource from the resource name. Nested resources
+ // are supported in the framework, but we need to know what name to use for a
+ // place-holder on the route wildcards, which should be the base resources.
+ $base = $this->getResourceWildcard(last(explode('.', $name)));
+
+ $defaults = $this->resourceDefaults;
+
+ foreach ($this->getResourceMethods($defaults, $options) as $m) {
+ $this->{'addResource'.ucfirst($m)}($name, $base, $controller, $options);
+ }
+ }
+
+ /**
+ * Build a set of prefixed resource routes.
+ *
+ * @param string $name
+ * @param string $controller
+ * @param array $options
+ * @return void
+ */
+ protected function prefixedResource($name, $controller, array $options)
+ {
+ list($name, $prefix) = $this->getResourcePrefix($name);
+
+ // We need to extract the base resource from the resource name. Nested resources
+ // are supported in the framework, but we need to know what name to use for a
+ // place-holder on the route wildcards, which should be the base resources.
+ $callback = function ($me) use ($name, $controller, $options) {
+ $me->resource($name, $controller, $options);
+ };
+
+ return $this->router->group(compact('prefix'), $callback);
+ }
+
+ /**
+ * Extract the resource and prefix from a resource name.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function getResourcePrefix($name)
+ {
+ $segments = explode('/', $name);
+
+ // To get the prefix, we will take all of the name segments and implode them on
+ // a slash. This will generate a proper URI prefix for us. Then we take this
+ // last segment, which will be considered the final resources name we use.
+ $prefix = implode('/', array_slice($segments, 0, -1));
+
+ return [end($segments), $prefix];
+ }
+
+ /**
+ * Get the applicable resource methods.
+ *
+ * @param array $defaults
+ * @param array $options
+ * @return array
+ */
+ protected function getResourceMethods($defaults, $options)
+ {
+ if (isset($options['only'])) {
+ return array_intersect($defaults, (array) $options['only']);
+ } elseif (isset($options['except'])) {
+ return array_diff($defaults, (array) $options['except']);
+ }
+
+ return $defaults;
+ }
+
+ /**
+ * Get the base resource URI for a given resource.
+ *
+ * @param string $resource
+ * @return string
+ */
+ public function getResourceUri($resource)
+ {
+ if (! Str::contains($resource, '.')) {
+ return $resource;
+ }
+
+ // Once we have built the base URI, we'll remove the wildcard holder for this
+ // base resource name so that the individual route adders can suffix these
+ // paths however they need to, as some do not have any wildcards at all.
+ $segments = explode('.', $resource);
+
+ $uri = $this->getNestedResourceUri($segments);
+
+ return str_replace('/{'.$this->getResourceWildcard(end($segments)).'}', '', $uri);
+ }
+
+ /**
+ * Get the URI for a nested resource segment array.
+ *
+ * @param array $segments
+ * @return string
+ */
+ protected function getNestedResourceUri(array $segments)
+ {
+ // We will spin through the segments and create a place-holder for each of the
+ // resource segments, as well as the resource itself. Then we should get an
+ // entire string for the resource URI that contains all nested resources.
+ return implode('/', array_map(function ($s) {
+ return $s.'/{'.$this->getResourceWildcard($s).'}';
+ }, $segments));
+ }
+
+ /**
+ * Get the action array for a resource route.
+ *
+ * @param string $resource
+ * @param string $controller
+ * @param string $method
+ * @param array $options
+ * @return array
+ */
+ protected function getResourceAction($resource, $controller, $method, $options)
+ {
+ $name = $this->getResourceName($resource, $method, $options);
+
+ return ['as' => $name, 'uses' => $controller.'@'.$method];
+ }
+
+ /**
+ * Get the name for a given resource.
+ *
+ * @param string $resource
+ * @param string $method
+ * @param array $options
+ * @return string
+ */
+ protected function getResourceName($resource, $method, $options)
+ {
+ if (isset($options['names'][$method])) {
+ return $options['names'][$method];
+ }
+
+ // If a global prefix has been assigned to all names for this resource, we will
+ // grab that so we can prepend it onto the name when we create this name for
+ // the resource action. Otherwise we'll just use an empty string for here.
+ $prefix = isset($options['as']) ? $options['as'].'.' : '';
+
+ if (! $this->router->hasGroupStack()) {
+ return $prefix.$resource.'.'.$method;
+ }
+
+ return $this->getGroupResourceName($prefix, $resource, $method);
+ }
+
+ /**
+ * Get the resource name for a grouped resource.
+ *
+ * @param string $prefix
+ * @param string $resource
+ * @param string $method
+ * @return string
+ */
+ protected function getGroupResourceName($prefix, $resource, $method)
+ {
+ $group = trim(str_replace('/', '.', $this->router->getLastGroupPrefix()), '.');
+
+ if (empty($group)) {
+ return trim("{$prefix}{$resource}.{$method}", '.');
+ }
+
+ return trim("{$prefix}{$group}.{$resource}.{$method}", '.');
+ }
+
+ /**
+ * Format a resource wildcard for usage.
+ *
+ * @param string $value
+ * @return string
+ */
+ public function getResourceWildcard($value)
+ {
+ return str_replace('-', '_', $value);
+ }
+
+ /**
+ * Add the index method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addResourceIndex($name, $base, $controller, $options)
+ {
+ $uri = $this->getResourceUri($name);
+
+ $action = $this->getResourceAction($name, $controller, 'index', $options);
+
+ return $this->router->get($uri, $action);
+ }
+
+ /**
+ * Add the create method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addResourceCreate($name, $base, $controller, $options)
+ {
+ $uri = $this->getResourceUri($name).'/create';
+
+ $action = $this->getResourceAction($name, $controller, 'create', $options);
+
+ return $this->router->get($uri, $action);
+ }
+
+ /**
+ * Add the store method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addResourceStore($name, $base, $controller, $options)
+ {
+ $uri = $this->getResourceUri($name);
+
+ $action = $this->getResourceAction($name, $controller, 'store', $options);
+
+ return $this->router->post($uri, $action);
+ }
+
+ /**
+ * Add the show method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addResourceShow($name, $base, $controller, $options)
+ {
+ $uri = $this->getResourceUri($name).'/{'.$base.'}';
+
+ $action = $this->getResourceAction($name, $controller, 'show', $options);
+
+ return $this->router->get($uri, $action);
+ }
+
+ /**
+ * Add the edit method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addResourceEdit($name, $base, $controller, $options)
+ {
+ $uri = $this->getResourceUri($name).'/{'.$base.'}/edit';
+
+ $action = $this->getResourceAction($name, $controller, 'edit', $options);
+
+ return $this->router->get($uri, $action);
+ }
+
+ /**
+ * Add the update method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return void
+ */
+ protected function addResourceUpdate($name, $base, $controller, $options)
+ {
+ $this->addPutResourceUpdate($name, $base, $controller, $options);
+
+ return $this->addPatchResourceUpdate($name, $base, $controller);
+ }
+
+ /**
+ * Add the update method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addPutResourceUpdate($name, $base, $controller, $options)
+ {
+ $uri = $this->getResourceUri($name).'/{'.$base.'}';
+
+ $action = $this->getResourceAction($name, $controller, 'update', $options);
+
+ return $this->router->put($uri, $action);
+ }
+
+ /**
+ * Add the update method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @return void
+ */
+ protected function addPatchResourceUpdate($name, $base, $controller)
+ {
+ $uri = $this->getResourceUri($name).'/{'.$base.'}';
+
+ $this->router->patch($uri, $controller.'@update');
+ }
+
+ /**
+ * Add the destroy method for a resourceful route.
+ *
+ * @param string $name
+ * @param string $base
+ * @param string $controller
+ * @param array $options
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addResourceDestroy($name, $base, $controller, $options)
+ {
+ $uri = $this->getResourceUri($name).'/{'.$base.'}';
+
+ $action = $this->getResourceAction($name, $controller, 'destroy', $options);
+
+ return $this->router->delete($uri, $action);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php b/application/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php
index 82b49e2..02e77cb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php
@@ -1,5 +1,8 @@
-view = $view;
- $this->redirector = $redirector;
- }
-
- /**
- * Return a new response from the application.
- *
- * @param string $content
- * @param int $status
- * @param array $headers
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function make($content = '', $status = 200, array $headers = array())
- {
- return new Response($content, $status, $headers);
- }
-
- /**
- * Return a new view response from the application.
- *
- * @param string $view
- * @param array $data
- * @param int $status
- * @param array $headers
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function view($view, $data = array(), $status = 200, array $headers = array())
- {
- return static::make($this->view->make($view, $data), $status, $headers);
- }
-
- /**
- * Return a new JSON response from the application.
- *
- * @param string|array $data
- * @param int $status
- * @param array $headers
- * @param int $options
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function json($data = array(), $status = 200, array $headers = array(), $options = 0)
- {
- if ($data instanceof Arrayable)
- {
- $data = $data->toArray();
- }
-
- return new JsonResponse($data, $status, $headers, $options);
- }
-
- /**
- * Return a new JSONP response from the application.
- *
- * @param string $callback
- * @param string|array $data
- * @param int $status
- * @param array $headers
- * @param int $options
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function jsonp($callback, $data = array(), $status = 200, array $headers = array(), $options = 0)
- {
- return $this->json($data, $status, $headers, $options)->setCallback($callback);
- }
-
- /**
- * Return a new streamed response from the application.
- *
- * @param \Closure $callback
- * @param int $status
- * @param array $headers
- * @return \Symfony\Component\HttpFoundation\StreamedResponse
- */
- public function stream($callback, $status = 200, array $headers = array())
- {
- return new StreamedResponse($callback, $status, $headers);
- }
-
- /**
- * Create a new file download response.
- *
- * @param \SplFileInfo|string $file
- * @param string $name
- * @param array $headers
- * @param null|string $disposition
- * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
- */
- public function download($file, $name = null, array $headers = array(), $disposition = 'attachment')
- {
- $response = new BinaryFileResponse($file, 200, $headers, true, $disposition);
-
- if ( ! is_null($name))
- {
- return $response->setContentDisposition($disposition, $name, str_replace('%', '', Str::ascii($name)));
- }
-
- return $response;
- }
-
- /**
- * Create a new redirect response to the given path.
- *
- * @param string $path
- * @param int $status
- * @param array $headers
- * @param bool $secure
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function redirectTo($path, $status = 302, $headers = array(), $secure = null)
- {
- return $this->redirector->to($path, $status, $headers, $secure);
- }
-
- /**
- * Create a new redirect response to a named route.
- *
- * @param string $route
- * @param array $parameters
- * @param int $status
- * @param array $headers
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function redirectToRoute($route, $parameters = array(), $status = 302, $headers = array())
- {
- return $this->redirector->route($route, $parameters, $status, $headers);
- }
-
- /**
- * Create a new redirect response to a controller action.
- *
- * @param string $action
- * @param array $parameters
- * @param int $status
- * @param array $headers
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function redirectToAction($action, $parameters = array(), $status = 302, $headers = array())
- {
- return $this->redirector->action($action, $parameters, $status, $headers);
- }
-
- /**
- * Create a new redirect response, while putting the current URL in the session.
- *
- * @param string $path
- * @param int $status
- * @param array $headers
- * @param bool $secure
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function redirectGuest($path, $status = 302, $headers = array(), $secure = null)
- {
- return $this->redirector->guest($path, $status, $headers, $secure);
- }
-
- /**
- * Create a new redirect response to the previously intended location.
- *
- * @param string $default
- * @param int $status
- * @param array $headers
- * @param bool $secure
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function redirectToIntended($default = '/', $status = 302, $headers = array(), $secure = null)
- {
- return $this->redirector->intended($default, $status, $headers, $secure);
- }
-
+class ResponseFactory implements FactoryContract
+{
+ use Macroable;
+
+ /**
+ * The view factory instance.
+ *
+ * @var \Illuminate\Contracts\View\Factory
+ */
+ protected $view;
+
+ /**
+ * The redirector instance.
+ *
+ * @var \Illuminate\Routing\Redirector
+ */
+ protected $redirector;
+
+ /**
+ * Create a new response factory instance.
+ *
+ * @param \Illuminate\Contracts\View\Factory $view
+ * @param \Illuminate\Routing\Redirector $redirector
+ * @return void
+ */
+ public function __construct(ViewFactory $view, Redirector $redirector)
+ {
+ $this->view = $view;
+ $this->redirector = $redirector;
+ }
+
+ /**
+ * Return a new response from the application.
+ *
+ * @param string $content
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\Response
+ */
+ public function make($content = '', $status = 200, array $headers = [])
+ {
+ return new Response($content, $status, $headers);
+ }
+
+ /**
+ * Return a new view response from the application.
+ *
+ * @param string $view
+ * @param array $data
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\Response
+ */
+ public function view($view, $data = [], $status = 200, array $headers = [])
+ {
+ return static::make($this->view->make($view, $data), $status, $headers);
+ }
+
+ /**
+ * Return a new JSON response from the application.
+ *
+ * @param string|array $data
+ * @param int $status
+ * @param array $headers
+ * @param int $options
+ * @return \Illuminate\Http\JsonResponse
+ */
+ public function json($data = [], $status = 200, array $headers = [], $options = 0)
+ {
+ if ($data instanceof Arrayable && ! $data instanceof JsonSerializable) {
+ $data = $data->toArray();
+ }
+
+ return new JsonResponse($data, $status, $headers, $options);
+ }
+
+ /**
+ * Return a new JSONP response from the application.
+ *
+ * @param string $callback
+ * @param string|array $data
+ * @param int $status
+ * @param array $headers
+ * @param int $options
+ * @return \Illuminate\Http\JsonResponse
+ */
+ public function jsonp($callback, $data = [], $status = 200, array $headers = [], $options = 0)
+ {
+ return $this->json($data, $status, $headers, $options)->setCallback($callback);
+ }
+
+ /**
+ * Return a new streamed response from the application.
+ *
+ * @param \Closure $callback
+ * @param int $status
+ * @param array $headers
+ * @return \Symfony\Component\HttpFoundation\StreamedResponse
+ */
+ public function stream($callback, $status = 200, array $headers = [])
+ {
+ return new StreamedResponse($callback, $status, $headers);
+ }
+
+ /**
+ * Create a new file download response.
+ *
+ * @param \SplFileInfo|string $file
+ * @param string $name
+ * @param array $headers
+ * @param string|null $disposition
+ * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+ */
+ public function download($file, $name = null, array $headers = [], $disposition = 'attachment')
+ {
+ $response = new BinaryFileResponse($file, 200, $headers, true, $disposition);
+
+ if (! is_null($name)) {
+ return $response->setContentDisposition($disposition, $name, str_replace('%', '', Str::ascii($name)));
+ }
+
+ return $response;
+ }
+
+ /**
+ * Create a new redirect response to the given path.
+ *
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @param bool|null $secure
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function redirectTo($path, $status = 302, $headers = [], $secure = null)
+ {
+ return $this->redirector->to($path, $status, $headers, $secure);
+ }
+
+ /**
+ * Create a new redirect response to a named route.
+ *
+ * @param string $route
+ * @param array $parameters
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function redirectToRoute($route, $parameters = [], $status = 302, $headers = [])
+ {
+ return $this->redirector->route($route, $parameters, $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response to a controller action.
+ *
+ * @param string $action
+ * @param array $parameters
+ * @param int $status
+ * @param array $headers
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function redirectToAction($action, $parameters = [], $status = 302, $headers = [])
+ {
+ return $this->redirector->action($action, $parameters, $status, $headers);
+ }
+
+ /**
+ * Create a new redirect response, while putting the current URL in the session.
+ *
+ * @param string $path
+ * @param int $status
+ * @param array $headers
+ * @param bool|null $secure
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function redirectGuest($path, $status = 302, $headers = [], $secure = null)
+ {
+ return $this->redirector->guest($path, $status, $headers, $secure);
+ }
+
+ /**
+ * Create a new redirect response to the previously intended location.
+ *
+ * @param string $default
+ * @param int $status
+ * @param array $headers
+ * @param bool|null $secure
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function redirectToIntended($default = '/', $status = 302, $headers = [], $secure = null)
+ {
+ return $this->redirector->intended($default, $status, $headers, $secure);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Route.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Route.php
index d7d3c41..cd4627a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Route.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Route.php
@@ -1,971 +1,1027 @@
-uri = $uri;
- $this->methods = (array) $methods;
- $this->action = $this->parseAction($action);
-
- if (in_array('GET', $this->methods) && ! in_array('HEAD', $this->methods))
- {
- $this->methods[] = 'HEAD';
- }
-
- if (isset($this->action['prefix']))
- {
- $this->prefix($this->action['prefix']);
- }
- }
-
- /**
- * Run the route action and return the response.
- *
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- public function run(Request $request)
- {
- $this->container = $this->container ?: new Container;
-
- try
- {
- if ( ! is_string($this->action['uses']))
- {
- return $this->runCallable($request);
- }
-
- if ($this->customDispatcherIsBound())
- {
- return $this->runWithCustomDispatcher($request);
- }
-
- return $this->runController($request);
- }
- catch (HttpResponseException $e)
- {
- return $e->getResponse();
- }
- }
-
- /**
- * Run the route action and return the response.
- *
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- protected function runCallable(Request $request)
- {
- $parameters = $this->resolveMethodDependencies(
- $this->parametersWithoutNulls(), new ReflectionFunction($this->action['uses'])
- );
-
- return call_user_func_array($this->action['uses'], $parameters);
- }
-
- /**
- * Run the route action and return the response.
- *
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- protected function runController(Request $request)
- {
- list($class, $method) = explode('@', $this->action['uses']);
-
- $parameters = $this->resolveClassMethodDependencies(
- $this->parametersWithoutNulls(), $class, $method
- );
-
- if ( ! method_exists($instance = $this->container->make($class), $method))
- {
- throw new NotFoundHttpException;
- }
-
- return call_user_func_array([$instance, $method], $parameters);
- }
-
- /**
- * Determine if a custom route dispatcher is bound in the container.
- *
- * @return bool
- */
- protected function customDispatcherIsBound()
- {
- return $this->container->bound('illuminate.route.dispatcher');
- }
-
- /**
- * Send the request and route to a custom dispatcher for handling.
- *
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- protected function runWithCustomDispatcher(Request $request)
- {
- list($class, $method) = explode('@', $this->action['uses']);
-
- $dispatcher = $this->container->make('illuminate.route.dispatcher');
-
- return $dispatcher->dispatch($this, $request, $class, $method);
- }
-
- /**
- * Determine if the route matches given request.
- *
- * @param \Illuminate\Http\Request $request
- * @param bool $includingMethod
- * @return bool
- */
- public function matches(Request $request, $includingMethod = true)
- {
- $this->compileRoute();
-
- foreach ($this->getValidators() as $validator)
- {
- if ( ! $includingMethod && $validator instanceof MethodValidator) continue;
-
- if ( ! $validator->matches($this, $request)) return false;
- }
-
- return true;
- }
-
- /**
- * Compile the route into a Symfony CompiledRoute instance.
- *
- * @return void
- */
- protected function compileRoute()
- {
- $optionals = $this->extractOptionalParameters();
-
- $uri = preg_replace('/\{(\w+?)\?\}/', '{$1}', $this->uri);
-
- $this->compiled = with(
-
- new SymfonyRoute($uri, $optionals, $this->wheres, array(), $this->domain() ?: '')
-
- )->compile();
- }
-
- /**
- * Get the optional parameters for the route.
- *
- * @return array
- */
- protected function extractOptionalParameters()
- {
- preg_match_all('/\{(\w+?)\?\}/', $this->uri, $matches);
-
- return isset($matches[1]) ? array_fill_keys($matches[1], null) : [];
- }
-
- /**
- * Get the middlewares attached to the route.
- *
- * @return array
- */
- public function middleware()
- {
- return (array) array_get($this->action, 'middleware', []);
- }
-
- /**
- * Get the "before" filters for the route.
- *
- * @return array
- */
- public function beforeFilters()
- {
- if ( ! isset($this->action['before'])) return array();
-
- return $this->parseFilters($this->action['before']);
- }
-
- /**
- * Get the "after" filters for the route.
- *
- * @return array
- */
- public function afterFilters()
- {
- if ( ! isset($this->action['after'])) return array();
-
- return $this->parseFilters($this->action['after']);
- }
-
- /**
- * Parse the given filter string.
- *
- * @param string $filters
- * @return array
- */
- public static function parseFilters($filters)
- {
- return array_build(static::explodeFilters($filters), function($key, $value)
- {
- return Route::parseFilter($value);
- });
- }
-
- /**
- * Turn the filters into an array if they aren't already.
- *
- * @param array|string $filters
- * @return array
- */
- protected static function explodeFilters($filters)
- {
- if (is_array($filters)) return static::explodeArrayFilters($filters);
-
- return array_map('trim', explode('|', $filters));
- }
-
- /**
- * Flatten out an array of filter declarations.
- *
- * @param array $filters
- * @return array
- */
- protected static function explodeArrayFilters(array $filters)
- {
- $results = array();
-
- foreach ($filters as $filter)
- {
- $results = array_merge($results, array_map('trim', explode('|', $filter)));
- }
-
- return $results;
- }
-
- /**
- * Parse the given filter into name and parameters.
- *
- * @param string $filter
- * @return array
- */
- public static function parseFilter($filter)
- {
- if ( ! str_contains($filter, ':')) return array($filter, array());
-
- return static::parseParameterFilter($filter);
- }
-
- /**
- * Parse a filter with parameters.
- *
- * @param string $filter
- * @return array
- */
- protected static function parseParameterFilter($filter)
- {
- list($name, $parameters) = explode(':', $filter, 2);
-
- return array($name, explode(',', $parameters));
- }
-
- /**
- * Determine a given parameter exists from the route.
- *
- * @param string $name
- * @return bool
- */
- public function hasParameter($name)
- {
- return array_key_exists($name, $this->parameters());
- }
-
- /**
- * Get a given parameter from the route.
- *
- * @param string $name
- * @param mixed $default
- * @return string|object
- */
- public function getParameter($name, $default = null)
- {
- return $this->parameter($name, $default);
- }
-
- /**
- * Get a given parameter from the route.
- *
- * @param string $name
- * @param mixed $default
- * @return string|object
- */
- public function parameter($name, $default = null)
- {
- return array_get($this->parameters(), $name, $default);
- }
-
- /**
- * Set a parameter to the given value.
- *
- * @param string $name
- * @param mixed $value
- * @return void
- */
- public function setParameter($name, $value)
- {
- $this->parameters();
-
- $this->parameters[$name] = $value;
- }
-
- /**
- * Unset a parameter on the route if it is set.
- *
- * @param string $name
- * @return void
- */
- public function forgetParameter($name)
- {
- $this->parameters();
-
- unset($this->parameters[$name]);
- }
-
- /**
- * Get the key / value list of parameters for the route.
- *
- * @return array
- *
- * @throws LogicException
- */
- public function parameters()
- {
- if (isset($this->parameters))
- {
- return array_map(function($value)
- {
- return is_string($value) ? rawurldecode($value) : $value;
-
- }, $this->parameters);
- }
-
- throw new LogicException("Route is not bound.");
- }
-
- /**
- * Get the key / value list of parameters without null values.
- *
- * @return array
- */
- public function parametersWithoutNulls()
- {
- return array_filter($this->parameters(), function($p) { return ! is_null($p); });
- }
-
- /**
- * Get all of the parameter names for the route.
- *
- * @return array
- */
- public function parameterNames()
- {
- if (isset($this->parameterNames)) return $this->parameterNames;
-
- return $this->parameterNames = $this->compileParameterNames();
- }
-
- /**
- * Get the parameter names for the route.
- *
- * @return array
- */
- protected function compileParameterNames()
- {
- preg_match_all('/\{(.*?)\}/', $this->domain().$this->uri, $matches);
-
- return array_map(function($m) { return trim($m, '?'); }, $matches[1]);
- }
-
- /**
- * Bind the route to a given request for execution.
- *
- * @param \Illuminate\Http\Request $request
- * @return $this
- */
- public function bind(Request $request)
- {
- $this->compileRoute();
-
- $this->bindParameters($request);
-
- return $this;
- }
-
- /**
- * Extract the parameter list from the request.
- *
- * @param \Illuminate\Http\Request $request
- * @return array
- */
- public function bindParameters(Request $request)
- {
- // 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(
-
- 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()))
- {
- $params = $this->bindHostParameters(
- $request, $params
- );
- }
-
- return $this->parameters = $this->replaceDefaults($params);
- }
-
- /**
- * Get the parameter matches for the path portion of the URI.
- *
- * @param \Illuminate\Http\Request $request
- * @return array
- */
- protected function bindPathParameters(Request $request)
- {
- preg_match($this->compiled->getRegex(), '/'.$request->decodedPath(), $matches);
-
- return $matches;
- }
-
- /**
- * Extract the parameter list from the host part of the request.
- *
- * @param \Illuminate\Http\Request $request
- * @param array $parameters
- * @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);
- }
-
- /**
- * Combine a set of parameter matches with the route's keys.
- *
- * @param array $matches
- * @return array
- */
- protected function matchToKeys(array $matches)
- {
- 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;
- });
- }
-
- /**
- * Replace null parameters with their defaults.
- *
- * @param array $parameters
- * @return array
- */
- protected function replaceDefaults(array $parameters)
- {
- foreach ($parameters as $key => &$value)
- {
- $value = isset($value) ? $value : array_get($this->defaults, $key);
- }
-
- return $parameters;
- }
-
- /**
- * Parse the route action into a standard array.
- *
- * @param callable|array $action
- * @return array
- */
- protected function parseAction($action)
- {
- // If the action is already a Closure instance, we will just set that instance
- // as the "uses" property, because there is nothing else we need to do when
- // it is available. Otherwise we will need to find it in the action list.
- if (is_callable($action))
- {
- return array('uses' => $action);
- }
-
- // If no "uses" property has been set, we will dig through the array to find a
- // Closure instance within this list. We will set the first Closure we come
- // across into the "uses" property that will get fired off by this route.
- elseif ( ! isset($action['uses']))
- {
- $action['uses'] = $this->findCallable($action);
- }
-
- return $action;
- }
-
- /**
- * Find the callable in an action array.
- *
- * @param array $action
- * @return callable
- */
- protected function findCallable(array $action)
- {
- return array_first($action, function($key, $value)
- {
- return is_callable($value) && is_numeric($key);
- });
- }
-
- /**
- * Get the route validators for the instance.
- *
- * @return array
- */
- public static function getValidators()
- {
- if (isset(static::$validators)) return static::$validators;
-
- // To match the route, we will use a chain of responsibility pattern with the
- // validator implementations. We will spin through each one making sure it
- // passes and then we will know if the route as a whole matches request.
- return static::$validators = array(
- new MethodValidator, new SchemeValidator,
- new HostValidator, new UriValidator,
- );
- }
-
- /**
- * Add before filters to the route.
- *
- * @param string $filters
- * @return $this
- */
- public function before($filters)
- {
- return $this->addFilters('before', $filters);
- }
-
- /**
- * Add after filters to the route.
- *
- * @param string $filters
- * @return $this
- */
- public function after($filters)
- {
- return $this->addFilters('after', $filters);
- }
-
- /**
- * Add the given filters to the route by type.
- *
- * @param string $type
- * @param string $filters
- * @return $this
- */
- protected function addFilters($type, $filters)
- {
- $filters = static::explodeFilters($filters);
-
- if (isset($this->action[$type]))
- {
- $existing = static::explodeFilters($this->action[$type]);
-
- $this->action[$type] = array_merge($existing, $filters);
- }
- else
- {
- $this->action[$type] = $filters;
- }
-
- return $this;
- }
-
- /**
- * Set a default value for the route.
- *
- * @param string $key
- * @param mixed $value
- * @return $this
- */
- public function defaults($key, $value)
- {
- $this->defaults[$key] = $value;
-
- return $this;
- }
-
- /**
- * Set a regular expression requirement on the route.
- *
- * @param array|string $name
- * @param string $expression
- * @return $this
- */
- public function where($name, $expression = null)
- {
- foreach ($this->parseWhere($name, $expression) as $name => $expression)
- {
- $this->wheres[$name] = $expression;
- }
-
- return $this;
- }
-
- /**
- * Parse arguments to the where method into an array.
- *
- * @param array|string $name
- * @param string $expression
- * @return array
- */
- protected function parseWhere($name, $expression)
- {
- return is_array($name) ? $name : array($name => $expression);
- }
-
- /**
- * Set a list of regular expression requirements on the route.
- *
- * @param array $wheres
- * @return $this
- */
- protected function whereArray(array $wheres)
- {
- foreach ($wheres as $name => $expression)
- {
- $this->where($name, $expression);
- }
-
- return $this;
- }
-
- /**
- * Add a prefix to the route URI.
- *
- * @param string $prefix
- * @return $this
- */
- public function prefix($prefix)
- {
- $this->uri = trim($prefix, '/').'/'.trim($this->uri, '/');
-
- return $this;
- }
-
- /**
- * Get the URI associated with the route.
- *
- * @return string
- */
- public function getPath()
- {
- return $this->uri();
- }
-
- /**
- * Get the URI associated with the route.
- *
- * @return string
- */
- public function uri()
- {
- return $this->uri;
- }
-
- /**
- * Get the HTTP verbs the route responds to.
- *
- * @return array
- */
- public function getMethods()
- {
- return $this->methods();
- }
-
- /**
- * Get the HTTP verbs the route responds to.
- *
- * @return array
- */
- 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, true);
- }
-
- /**
- * 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.
- *
- * @return bool
- */
- public function secure()
- {
- return in_array('https', $this->action, true);
- }
-
- /**
- * Get the domain defined for the route.
- *
- * @return string|null
- */
- public function domain()
- {
- return isset($this->action['domain']) ? $this->action['domain'] : null;
- }
-
- /**
- * Get the URI that the route responds to.
- *
- * @return string
- */
- public function getUri()
- {
- return $this->uri;
- }
-
- /**
- * Set the URI that the route responds to.
- *
- * @param string $uri
- * @return \Illuminate\Routing\Route
- */
- public function setUri($uri)
- {
- $this->uri = $uri;
-
- return $this;
- }
-
- /**
- * Get the prefix of the route instance.
- *
- * @return string
- */
- public function getPrefix()
- {
- return isset($this->action['prefix']) ? $this->action['prefix'] : null;
- }
-
- /**
- * Get the name of the route instance.
- *
- * @return string
- */
- public function getName()
- {
- return isset($this->action['as']) ? $this->action['as'] : null;
- }
-
- /**
- * Get the action name for the route.
- *
- * @return string
- */
- public function getActionName()
- {
- return isset($this->action['controller']) ? $this->action['controller'] : 'Closure';
- }
-
- /**
- * Get the action array for the route.
- *
- * @return array
- */
- public function getAction()
- {
- return $this->action;
- }
-
- /**
- * Set the action array for the route.
- *
- * @param array $action
- * @return $this
- */
- public function setAction(array $action)
- {
- $this->action = $action;
-
- return $this;
- }
-
- /**
- * Get the compiled version of the route.
- *
- * @return \Symfony\Component\Routing\CompiledRoute
- */
- public function getCompiled()
- {
- return $this->compiled;
- }
-
- /**
- * Set the container instance on the route.
- *
- * @param \Illuminate\Container\Container $container
- * @return $this
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
-
- return $this;
- }
-
- /**
- * Prepare the route instance for serialization.
- *
- * @return void
- *
- * @throws LogicException
- */
- public function prepareForSerialization()
- {
- if ($this->action['uses'] instanceof Closure)
- {
- throw new LogicException("Unable to prepare route [{$this->uri}] for serialization. Uses Closure.");
- }
-
- unset($this->container, $this->compiled);
- }
-
- /**
- * Dynamically access route parameters.
- *
- * @param string $key
- * @return mixed
- */
- public function __get($key)
- {
- return $this->parameter($key);
- }
-
+class Route
+{
+ use RouteDependencyResolverTrait;
+
+ /**
+ * The URI pattern the route responds to.
+ *
+ * @var string
+ */
+ protected $uri;
+
+ /**
+ * The HTTP methods the route responds to.
+ *
+ * @var array
+ */
+ protected $methods;
+
+ /**
+ * The route action array.
+ *
+ * @var array
+ */
+ protected $action;
+
+ /**
+ * The default values for the route.
+ *
+ * @var array
+ */
+ protected $defaults = [];
+
+ /**
+ * The regular expression requirements.
+ *
+ * @var array
+ */
+ protected $wheres = [];
+
+ /**
+ * The array of matched parameters.
+ *
+ * @var array
+ */
+ protected $parameters;
+
+ /**
+ * The parameter names for the route.
+ *
+ * @var array|null
+ */
+ protected $parameterNames;
+
+ /**
+ * The compiled version of the route.
+ *
+ * @var \Symfony\Component\Routing\CompiledRoute
+ */
+ protected $compiled;
+
+ /**
+ * The container instance used by the route.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The validators used by the routes.
+ *
+ * @var array
+ */
+ public static $validators;
+
+ /**
+ * Create a new Route instance.
+ *
+ * @param array $methods
+ * @param string $uri
+ * @param \Closure|array $action
+ * @return void
+ */
+ public function __construct($methods, $uri, $action)
+ {
+ $this->uri = $uri;
+ $this->methods = (array) $methods;
+ $this->action = $this->parseAction($action);
+
+ if (in_array('GET', $this->methods) && ! in_array('HEAD', $this->methods)) {
+ $this->methods[] = 'HEAD';
+ }
+
+ if (isset($this->action['prefix'])) {
+ $this->prefix($this->action['prefix']);
+ }
+ }
+
+ /**
+ * Run the route action and return the response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ public function run(Request $request)
+ {
+ $this->container = $this->container ?: new Container;
+
+ try {
+ if (! is_string($this->action['uses'])) {
+ return $this->runCallable($request);
+ }
+
+ if ($this->customDispatcherIsBound()) {
+ return $this->runWithCustomDispatcher($request);
+ }
+
+ return $this->runController($request);
+ } catch (HttpResponseException $e) {
+ return $e->getResponse();
+ }
+ }
+
+ /**
+ * Run the route action and return the response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ protected function runCallable(Request $request)
+ {
+ $parameters = $this->resolveMethodDependencies(
+ $this->parametersWithoutNulls(), new ReflectionFunction($this->action['uses'])
+ );
+
+ return call_user_func_array($this->action['uses'], $parameters);
+ }
+
+ /**
+ * Run the route action and return the response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+ */
+ protected function runController(Request $request)
+ {
+ list($class, $method) = explode('@', $this->action['uses']);
+
+ $parameters = $this->resolveClassMethodDependencies(
+ $this->parametersWithoutNulls(), $class, $method
+ );
+
+ if (! method_exists($instance = $this->container->make($class), $method)) {
+ throw new NotFoundHttpException;
+ }
+
+ return call_user_func_array([$instance, $method], $parameters);
+ }
+
+ /**
+ * Determine if a custom route dispatcher is bound in the container.
+ *
+ * @return bool
+ */
+ protected function customDispatcherIsBound()
+ {
+ return $this->container->bound('illuminate.route.dispatcher');
+ }
+
+ /**
+ * Send the request and route to a custom dispatcher for handling.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ protected function runWithCustomDispatcher(Request $request)
+ {
+ list($class, $method) = explode('@', $this->action['uses']);
+
+ $dispatcher = $this->container->make('illuminate.route.dispatcher');
+
+ return $dispatcher->dispatch($this, $request, $class, $method);
+ }
+
+ /**
+ * Determine if the route matches given request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param bool $includingMethod
+ * @return bool
+ */
+ public function matches(Request $request, $includingMethod = true)
+ {
+ $this->compileRoute();
+
+ foreach ($this->getValidators() as $validator) {
+ if (! $includingMethod && $validator instanceof MethodValidator) {
+ continue;
+ }
+
+ if (! $validator->matches($this, $request)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Compile the route into a Symfony CompiledRoute instance.
+ *
+ * @return void
+ */
+ protected function compileRoute()
+ {
+ $optionals = $this->extractOptionalParameters();
+
+ $uri = preg_replace('/\{(\w+?)\?\}/', '{$1}', $this->uri);
+
+ $this->compiled = with(
+
+ new SymfonyRoute($uri, $optionals, $this->wheres, [], $this->domain() ?: '')
+
+ )->compile();
+ }
+
+ /**
+ * Get the optional parameters for the route.
+ *
+ * @return array
+ */
+ protected function extractOptionalParameters()
+ {
+ preg_match_all('/\{(\w+?)\?\}/', $this->uri, $matches);
+
+ return isset($matches[1]) ? array_fill_keys($matches[1], null) : [];
+ }
+
+ /**
+ * Get or set the middlewares attached to the route.
+ *
+ * @param array|string|null $middleware
+ * @return $this|array
+ */
+ public function middleware($middleware = null)
+ {
+ if (is_null($middleware)) {
+ return (array) Arr::get($this->action, 'middleware', []);
+ }
+
+ if (is_string($middleware)) {
+ $middleware = [$middleware];
+ }
+
+ $this->action['middleware'] = array_merge(
+ (array) Arr::get($this->action, 'middleware', []), $middleware
+ );
+
+ return $this;
+ }
+
+ /**
+ * Get the "before" filters for the route.
+ *
+ * @return array
+ *
+ * @deprecated since version 5.1.
+ */
+ public function beforeFilters()
+ {
+ if (! isset($this->action['before'])) {
+ return [];
+ }
+
+ return $this->parseFilters($this->action['before']);
+ }
+
+ /**
+ * Get the "after" filters for the route.
+ *
+ * @return array
+ *
+ * @deprecated since version 5.1.
+ */
+ public function afterFilters()
+ {
+ if (! isset($this->action['after'])) {
+ return [];
+ }
+
+ return $this->parseFilters($this->action['after']);
+ }
+
+ /**
+ * Parse the given filter string.
+ *
+ * @param string $filters
+ * @return array
+ *
+ * @deprecated since version 5.1.
+ */
+ public static function parseFilters($filters)
+ {
+ return Arr::build(static::explodeFilters($filters), function ($key, $value) {
+ return Route::parseFilter($value);
+ });
+ }
+
+ /**
+ * Turn the filters into an array if they aren't already.
+ *
+ * @param array|string $filters
+ * @return array
+ */
+ protected static function explodeFilters($filters)
+ {
+ if (is_array($filters)) {
+ return static::explodeArrayFilters($filters);
+ }
+
+ return array_map('trim', explode('|', $filters));
+ }
+
+ /**
+ * Flatten out an array of filter declarations.
+ *
+ * @param array $filters
+ * @return array
+ */
+ protected static function explodeArrayFilters(array $filters)
+ {
+ $results = [];
+
+ foreach ($filters as $filter) {
+ $results = array_merge($results, array_map('trim', explode('|', $filter)));
+ }
+
+ return $results;
+ }
+
+ /**
+ * Parse the given filter into name and parameters.
+ *
+ * @param string $filter
+ * @return array
+ *
+ * @deprecated since version 5.1.
+ */
+ public static function parseFilter($filter)
+ {
+ if (! Str::contains($filter, ':')) {
+ return [$filter, []];
+ }
+
+ return static::parseParameterFilter($filter);
+ }
+
+ /**
+ * Parse a filter with parameters.
+ *
+ * @param string $filter
+ * @return array
+ */
+ protected static function parseParameterFilter($filter)
+ {
+ list($name, $parameters) = explode(':', $filter, 2);
+
+ return [$name, explode(',', $parameters)];
+ }
+
+ /**
+ * Determine a given parameter exists from the route.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasParameter($name)
+ {
+ return array_key_exists($name, $this->parameters());
+ }
+
+ /**
+ * Get a given parameter from the route.
+ *
+ * @param string $name
+ * @param mixed $default
+ * @return string|object
+ */
+ public function getParameter($name, $default = null)
+ {
+ return $this->parameter($name, $default);
+ }
+
+ /**
+ * Get a given parameter from the route.
+ *
+ * @param string $name
+ * @param mixed $default
+ * @return string|object
+ */
+ public function parameter($name, $default = null)
+ {
+ return Arr::get($this->parameters(), $name, $default);
+ }
+
+ /**
+ * Set a parameter to the given value.
+ *
+ * @param string $name
+ * @param mixed $value
+ * @return void
+ */
+ public function setParameter($name, $value)
+ {
+ $this->parameters();
+
+ $this->parameters[$name] = $value;
+ }
+
+ /**
+ * Unset a parameter on the route if it is set.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function forgetParameter($name)
+ {
+ $this->parameters();
+
+ unset($this->parameters[$name]);
+ }
+
+ /**
+ * Get the key / value list of parameters for the route.
+ *
+ * @return array
+ *
+ * @throws \LogicException
+ */
+ public function parameters()
+ {
+ if (isset($this->parameters)) {
+ return array_map(function ($value) {
+ return is_string($value) ? rawurldecode($value) : $value;
+ }, $this->parameters);
+ }
+
+ throw new LogicException('Route is not bound.');
+ }
+
+ /**
+ * Get the key / value list of parameters without null values.
+ *
+ * @return array
+ */
+ public function parametersWithoutNulls()
+ {
+ return array_filter($this->parameters(), function ($p) {
+ return ! is_null($p);
+ });
+ }
+
+ /**
+ * Get all of the parameter names for the route.
+ *
+ * @return array
+ */
+ public function parameterNames()
+ {
+ if (isset($this->parameterNames)) {
+ return $this->parameterNames;
+ }
+
+ return $this->parameterNames = $this->compileParameterNames();
+ }
+
+ /**
+ * Get the parameter names for the route.
+ *
+ * @return array
+ */
+ protected function compileParameterNames()
+ {
+ preg_match_all('/\{(.*?)\}/', $this->domain().$this->uri, $matches);
+
+ return array_map(function ($m) {
+ return trim($m, '?');
+ }, $matches[1]);
+ }
+
+ /**
+ * Bind the route to a given request for execution.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return $this
+ */
+ public function bind(Request $request)
+ {
+ $this->compileRoute();
+
+ $this->bindParameters($request);
+
+ return $this;
+ }
+
+ /**
+ * Extract the parameter list from the request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return array
+ */
+ public function bindParameters(Request $request)
+ {
+ // 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(
+
+ 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())) {
+ $params = $this->bindHostParameters(
+ $request, $params
+ );
+ }
+
+ return $this->parameters = $this->replaceDefaults($params);
+ }
+
+ /**
+ * Get the parameter matches for the path portion of the URI.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return array
+ */
+ protected function bindPathParameters(Request $request)
+ {
+ preg_match($this->compiled->getRegex(), '/'.$request->decodedPath(), $matches);
+
+ return $matches;
+ }
+
+ /**
+ * Extract the parameter list from the host part of the request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param array $parameters
+ * @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);
+ }
+
+ /**
+ * Combine a set of parameter matches with the route's keys.
+ *
+ * @param array $matches
+ * @return array
+ */
+ protected function matchToKeys(array $matches)
+ {
+ if (count($this->parameterNames()) == 0) {
+ return [];
+ }
+
+ $parameters = array_intersect_key($matches, array_flip($this->parameterNames()));
+
+ return array_filter($parameters, function ($value) {
+ return is_string($value) && strlen($value) > 0;
+ });
+ }
+
+ /**
+ * Replace null parameters with their defaults.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function replaceDefaults(array $parameters)
+ {
+ foreach ($parameters as $key => &$value) {
+ $value = isset($value) ? $value : Arr::get($this->defaults, $key);
+ }
+
+ foreach ($this->defaults as $key => $value) {
+ if (! isset($parameters[$key])) {
+ $parameters[$key] = $value;
+ }
+ }
+
+ return $parameters;
+ }
+
+ /**
+ * Parse the route action into a standard array.
+ *
+ * @param callable|array $action
+ * @return array
+ *
+ * @throws \UnexpectedValueException
+ */
+ protected function parseAction($action)
+ {
+ // If the action is already a Closure instance, we will just set that instance
+ // as the "uses" property, because there is nothing else we need to do when
+ // it is available. Otherwise we will need to find it in the action list.
+ if (is_callable($action)) {
+ return ['uses' => $action];
+ }
+
+ // If no "uses" property has been set, we will dig through the array to find a
+ // Closure instance within this list. We will set the first Closure we come
+ // across into the "uses" property that will get fired off by this route.
+ elseif (! isset($action['uses'])) {
+ $action['uses'] = $this->findCallable($action);
+ }
+
+ if (is_string($action['uses']) && ! Str::contains($action['uses'], '@')) {
+ throw new UnexpectedValueException(sprintf(
+ 'Invalid route action: [%s]', $action['uses']
+ ));
+ }
+
+ return $action;
+ }
+
+ /**
+ * Find the callable in an action array.
+ *
+ * @param array $action
+ * @return callable
+ */
+ protected function findCallable(array $action)
+ {
+ return Arr::first($action, function ($key, $value) {
+ return is_callable($value) && is_numeric($key);
+ });
+ }
+
+ /**
+ * Get the route validators for the instance.
+ *
+ * @return array
+ */
+ public static function getValidators()
+ {
+ if (isset(static::$validators)) {
+ return static::$validators;
+ }
+
+ // To match the route, we will use a chain of responsibility pattern with the
+ // validator implementations. We will spin through each one making sure it
+ // passes and then we will know if the route as a whole matches request.
+ return static::$validators = [
+ new MethodValidator, new SchemeValidator,
+ new HostValidator, new UriValidator,
+ ];
+ }
+
+ /**
+ * Add before filters to the route.
+ *
+ * @param string $filters
+ * @return $this
+ *
+ * @deprecated since version 5.1.
+ */
+ public function before($filters)
+ {
+ return $this->addFilters('before', $filters);
+ }
+
+ /**
+ * Add after filters to the route.
+ *
+ * @param string $filters
+ * @return $this
+ *
+ * @deprecated since version 5.1.
+ */
+ public function after($filters)
+ {
+ return $this->addFilters('after', $filters);
+ }
+
+ /**
+ * Add the given filters to the route by type.
+ *
+ * @param string $type
+ * @param string $filters
+ * @return $this
+ */
+ protected function addFilters($type, $filters)
+ {
+ $filters = static::explodeFilters($filters);
+
+ if (isset($this->action[$type])) {
+ $existing = static::explodeFilters($this->action[$type]);
+
+ $this->action[$type] = array_merge($existing, $filters);
+ } else {
+ $this->action[$type] = $filters;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set a default value for the route.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return $this
+ */
+ public function defaults($key, $value)
+ {
+ $this->defaults[$key] = $value;
+
+ return $this;
+ }
+
+ /**
+ * Set a regular expression requirement on the route.
+ *
+ * @param array|string $name
+ * @param string $expression
+ * @return $this
+ */
+ public function where($name, $expression = null)
+ {
+ foreach ($this->parseWhere($name, $expression) as $name => $expression) {
+ $this->wheres[$name] = $expression;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Parse arguments to the where method into an array.
+ *
+ * @param array|string $name
+ * @param string $expression
+ * @return array
+ */
+ protected function parseWhere($name, $expression)
+ {
+ return is_array($name) ? $name : [$name => $expression];
+ }
+
+ /**
+ * Set a list of regular expression requirements on the route.
+ *
+ * @param array $wheres
+ * @return $this
+ */
+ protected function whereArray(array $wheres)
+ {
+ foreach ($wheres as $name => $expression) {
+ $this->where($name, $expression);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a prefix to the route URI.
+ *
+ * @param string $prefix
+ * @return $this
+ */
+ public function prefix($prefix)
+ {
+ $uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
+
+ $this->uri = trim($uri, '/');
+
+ return $this;
+ }
+
+ /**
+ * Get the URI associated with the route.
+ *
+ * @return string
+ */
+ public function getPath()
+ {
+ return $this->uri();
+ }
+
+ /**
+ * Get the URI associated with the route.
+ *
+ * @return string
+ */
+ public function uri()
+ {
+ return $this->uri;
+ }
+
+ /**
+ * Get the HTTP verbs the route responds to.
+ *
+ * @return array
+ */
+ public function getMethods()
+ {
+ return $this->methods();
+ }
+
+ /**
+ * Get the HTTP verbs the route responds to.
+ *
+ * @return array
+ */
+ 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, true);
+ }
+
+ /**
+ * 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.
+ *
+ * @return bool
+ */
+ public function secure()
+ {
+ return in_array('https', $this->action, true);
+ }
+
+ /**
+ * Get the domain defined for the route.
+ *
+ * @return string|null
+ */
+ public function domain()
+ {
+ return isset($this->action['domain']) ? $this->action['domain'] : null;
+ }
+
+ /**
+ * Get the URI that the route responds to.
+ *
+ * @return string
+ */
+ public function getUri()
+ {
+ return $this->uri;
+ }
+
+ /**
+ * Set the URI that the route responds to.
+ *
+ * @param string $uri
+ * @return \Illuminate\Routing\Route
+ */
+ public function setUri($uri)
+ {
+ $this->uri = $uri;
+
+ return $this;
+ }
+
+ /**
+ * Get the prefix of the route instance.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return isset($this->action['prefix']) ? $this->action['prefix'] : null;
+ }
+
+ /**
+ * Get the name of the route instance.
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return isset($this->action['as']) ? $this->action['as'] : null;
+ }
+
+ /**
+ * Add or change the route name.
+ *
+ * @param string $name
+ * @return $this
+ */
+ public function name($name)
+ {
+ $this->action['as'] = isset($this->action['as']) ? $this->action['as'].$name : $name;
+
+ return $this;
+ }
+
+ /**
+ * Get the action name for the route.
+ *
+ * @return string
+ */
+ public function getActionName()
+ {
+ return isset($this->action['controller']) ? $this->action['controller'] : 'Closure';
+ }
+
+ /**
+ * Get the action array for the route.
+ *
+ * @return array
+ */
+ public function getAction()
+ {
+ return $this->action;
+ }
+
+ /**
+ * Set the action array for the route.
+ *
+ * @param array $action
+ * @return $this
+ */
+ public function setAction(array $action)
+ {
+ $this->action = $action;
+
+ return $this;
+ }
+
+ /**
+ * Get the compiled version of the route.
+ *
+ * @return \Symfony\Component\Routing\CompiledRoute
+ */
+ public function getCompiled()
+ {
+ return $this->compiled;
+ }
+
+ /**
+ * Set the container instance on the route.
+ *
+ * @param \Illuminate\Container\Container $container
+ * @return $this
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+
+ return $this;
+ }
+
+ /**
+ * Prepare the route instance for serialization.
+ *
+ * @return void
+ *
+ * @throws \LogicException
+ */
+ public function prepareForSerialization()
+ {
+ if ($this->action['uses'] instanceof Closure) {
+ throw new LogicException("Unable to prepare route [{$this->uri}] for serialization. Uses Closure.");
+ }
+
+ unset($this->container, $this->compiled);
+ }
+
+ /**
+ * Dynamically access route parameters.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function __get($key)
+ {
+ return $this->parameter($key);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php b/application/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php
index ebe74b6..4821a1f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php
@@ -1,302 +1,313 @@
-addToCollections($route);
-
- $this->addLookups($route);
-
- return $route;
- }
-
- /**
- * Add the given route to the arrays of routes.
- *
- * @param \Illuminate\Routing\Route $route
- * @return void
- */
- protected function addToCollections($route)
- {
- $domainAndUri = $route->domain().$route->getUri();
-
- foreach ($route->methods() as $method)
- {
- $this->routes[$method][$domainAndUri] = $route;
- }
-
- $this->allRoutes[$method.$domainAndUri] = $route;
- }
-
- /**
- * Add the route to any look-up tables if necessary.
- *
- * @param \Illuminate\Routing\Route $route
- * @return void
- */
- protected function addLookups($route)
- {
- // If the route has a name, we will add it to the name look-up table so that we
- // will quickly be able to find any route associate with a name and not have
- // to iterate through every route every time we need to perform a look-up.
- $action = $route->getAction();
-
- if (isset($action['as']))
- {
- $this->nameList[$action['as']] = $route;
- }
-
- // When the route is routing to a controller we will also store the action that
- // is used by the route. This will let us reverse route to controllers while
- // processing a request and easily generate URLs to the given controllers.
- if (isset($action['controller']))
- {
- $this->addToActionList($action, $route);
- }
- }
-
- /**
- * Add a route to the controller action dictionary.
- *
- * @param array $action
- * @param \Illuminate\Routing\Route $route
- * @return void
- */
- protected function addToActionList($action, $route)
- {
- $this->actionList[$action['controller']] = $route;
- }
-
- /**
- * Find the first route matching a given request.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Routing\Route
- *
- * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
- */
- public function match(Request $request)
- {
- $routes = $this->get($request->getMethod());
-
- // First, we will see if we can find a matching route for this current request
- // method. If we can, great, we can just return it so that it can be called
- // by the consumer. Otherwise we will check for routes with another verb.
- $route = $this->check($routes, $request);
-
- if ( ! is_null($route))
- {
- return $route->bind($request);
- }
-
- // If no route was found, we will check if a matching is route is specified on
- // another HTTP verb. If it is we will need to throw a MethodNotAllowed and
- // inform the user agent of which HTTP verb it should use for this route.
- $others = $this->checkForAlternateVerbs($request);
-
- if (count($others) > 0)
- {
- return $this->getRouteForMethods($request, $others);
- }
-
- throw new NotFoundHttpException;
- }
-
- /**
- * Determine if any routes match on another HTTP verb.
- *
- * @param \Illuminate\Http\Request $request
- * @return array
- */
- protected function checkForAlternateVerbs($request)
- {
- $methods = array_diff(Router::$verbs, array($request->getMethod()));
-
- // Here we will spin through all verbs except for the current request verb and
- // check to see if any routes respond to them. If they do, we will return a
- // proper error response with the correct headers on the response string.
- $others = array();
-
- foreach ($methods as $method)
- {
- if ( ! is_null($this->check($this->get($method), $request, false)))
- {
- $others[] = $method;
- }
- }
-
- return $others;
- }
-
- /**
- * Get a route (if necessary) that responds when other available methods are present.
- *
- * @param \Illuminate\Http\Request $request
- * @param array $methods
- * @return \Illuminate\Routing\Route
- *
- * @throws \Symfony\Component\Routing\Exception\MethodNotAllowedHttpException
- */
- protected function getRouteForMethods($request, array $methods)
- {
- if ($request->method() == 'OPTIONS')
- {
- return (new Route('OPTIONS', $request->path(), function() use ($methods)
- {
- return new Response('', 200, array('Allow' => implode(',', $methods)));
-
- }))->bind($request);
- }
-
- $this->methodNotAllowed($methods);
- }
-
- /**
- * Throw a method not allowed HTTP exception.
- *
- * @param array $others
- * @return void
- *
- * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
- */
- protected function methodNotAllowed(array $others)
- {
- throw new MethodNotAllowedHttpException($others);
- }
-
- /**
- * Determine if a route in the array matches the request.
- *
- * @param array $routes
- * @param \Illuminate\http\Request $request
- * @param bool $includingMethod
- * @return \Illuminate\Routing\Route|null
- */
- protected function check(array $routes, $request, $includingMethod = true)
- {
- return array_first($routes, function($key, $value) use ($request, $includingMethod)
- {
- return $value->matches($request, $includingMethod);
- });
- }
-
- /**
- * Get all of the routes in the collection.
- *
- * @param string|null $method
- * @return array
- */
- protected function get($method = null)
- {
- if (is_null($method)) return $this->getRoutes();
-
- return array_get($this->routes, $method, array());
- }
-
- /**
- * Determine if the route collection contains a given named route.
- *
- * @param string $name
- * @return bool
- */
- public function hasNamedRoute($name)
- {
- return ! is_null($this->getByName($name));
- }
-
- /**
- * Get a route instance by its name.
- *
- * @param string $name
- * @return \Illuminate\Routing\Route|null
- */
- public function getByName($name)
- {
- return isset($this->nameList[$name]) ? $this->nameList[$name] : null;
- }
-
- /**
- * Get a route instance by its controller action.
- *
- * @param string $action
- * @return \Illuminate\Routing\Route|null
- */
- public function getByAction($action)
- {
- return isset($this->actionList[$action]) ? $this->actionList[$action] : null;
- }
-
- /**
- * Get all of the routes in the collection.
- *
- * @return array
- */
- public function getRoutes()
- {
- return array_values($this->allRoutes);
- }
-
- /**
- * Get an iterator for the items.
- *
- * @return \ArrayIterator
- */
- public function getIterator()
- {
- return new ArrayIterator($this->getRoutes());
- }
-
- /**
- * Count the number of items in the collection.
- *
- * @return int
- */
- public function count()
- {
- return count($this->getRoutes());
- }
-
+class RouteCollection implements Countable, IteratorAggregate
+{
+ /**
+ * An array of the routes keyed by method.
+ *
+ * @var array
+ */
+ protected $routes = [];
+
+ /**
+ * An flattened array of all of the routes.
+ *
+ * @var array
+ */
+ protected $allRoutes = [];
+
+ /**
+ * A look-up table of routes by their names.
+ *
+ * @var array
+ */
+ protected $nameList = [];
+
+ /**
+ * A look-up table of routes by controller action.
+ *
+ * @var array
+ */
+ protected $actionList = [];
+
+ /**
+ * Add a Route instance to the collection.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return \Illuminate\Routing\Route
+ */
+ public function add(Route $route)
+ {
+ $this->addToCollections($route);
+
+ $this->addLookups($route);
+
+ return $route;
+ }
+
+ /**
+ * Add the given route to the arrays of routes.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return void
+ */
+ protected function addToCollections($route)
+ {
+ $domainAndUri = $route->domain().$route->getUri();
+
+ foreach ($route->methods() as $method) {
+ $this->routes[$method][$domainAndUri] = $route;
+ }
+
+ $this->allRoutes[$method.$domainAndUri] = $route;
+ }
+
+ /**
+ * Add the route to any look-up tables if necessary.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return void
+ */
+ protected function addLookups($route)
+ {
+ // If the route has a name, we will add it to the name look-up table so that we
+ // will quickly be able to find any route associate with a name and not have
+ // to iterate through every route every time we need to perform a look-up.
+ $action = $route->getAction();
+
+ if (isset($action['as'])) {
+ $this->nameList[$action['as']] = $route;
+ }
+
+ // When the route is routing to a controller we will also store the action that
+ // is used by the route. This will let us reverse route to controllers while
+ // processing a request and easily generate URLs to the given controllers.
+ if (isset($action['controller'])) {
+ $this->addToActionList($action, $route);
+ }
+ }
+
+ /**
+ * Refresh the name look-up table.
+ *
+ * This is done in case any names are fluently defined.
+ *
+ * @return void
+ */
+ public function refreshNameLookups()
+ {
+ $this->nameList = [];
+
+ foreach ($this->allRoutes as $route) {
+ if ($route->getName()) {
+ $this->nameList[$route->getName()] = $route;
+ }
+ }
+ }
+
+ /**
+ * Add a route to the controller action dictionary.
+ *
+ * @param array $action
+ * @param \Illuminate\Routing\Route $route
+ * @return void
+ */
+ protected function addToActionList($action, $route)
+ {
+ $this->actionList[trim($action['controller'], '\\')] = $route;
+ }
+
+ /**
+ * Find the first route matching a given request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Routing\Route
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+ */
+ public function match(Request $request)
+ {
+ $routes = $this->get($request->getMethod());
+
+ // First, we will see if we can find a matching route for this current request
+ // method. If we can, great, we can just return it so that it can be called
+ // by the consumer. Otherwise we will check for routes with another verb.
+ $route = $this->check($routes, $request);
+
+ if (! is_null($route)) {
+ return $route->bind($request);
+ }
+
+ // If no route was found we will now check if a matching route is specified by
+ // another HTTP verb. If it is we will need to throw a MethodNotAllowed and
+ // inform the user agent of which HTTP verb it should use for this route.
+ $others = $this->checkForAlternateVerbs($request);
+
+ if (count($others) > 0) {
+ return $this->getRouteForMethods($request, $others);
+ }
+
+ throw new NotFoundHttpException;
+ }
+
+ /**
+ * Determine if any routes match on another HTTP verb.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return array
+ */
+ protected function checkForAlternateVerbs($request)
+ {
+ $methods = array_diff(Router::$verbs, [$request->getMethod()]);
+
+ // Here we will spin through all verbs except for the current request verb and
+ // check to see if any routes respond to them. If they do, we will return a
+ // proper error response with the correct headers on the response string.
+ $others = [];
+
+ foreach ($methods as $method) {
+ if (! is_null($this->check($this->get($method), $request, false))) {
+ $others[] = $method;
+ }
+ }
+
+ return $others;
+ }
+
+ /**
+ * Get a route (if necessary) that responds when other available methods are present.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param array $methods
+ * @return \Illuminate\Routing\Route
+ *
+ * @throws \Symfony\Component\Routing\Exception\MethodNotAllowedHttpException
+ */
+ protected function getRouteForMethods($request, array $methods)
+ {
+ if ($request->method() == 'OPTIONS') {
+ return (new Route('OPTIONS', $request->path(), function () use ($methods) {
+ return new Response('', 200, ['Allow' => implode(',', $methods)]);
+ }))->bind($request);
+ }
+
+ $this->methodNotAllowed($methods);
+ }
+
+ /**
+ * Throw a method not allowed HTTP exception.
+ *
+ * @param array $others
+ * @return void
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
+ */
+ protected function methodNotAllowed(array $others)
+ {
+ throw new MethodNotAllowedHttpException($others);
+ }
+
+ /**
+ * Determine if a route in the array matches the request.
+ *
+ * @param array $routes
+ * @param \Illuminate\http\Request $request
+ * @param bool $includingMethod
+ * @return \Illuminate\Routing\Route|null
+ */
+ protected function check(array $routes, $request, $includingMethod = true)
+ {
+ return Arr::first($routes, function ($key, $value) use ($request, $includingMethod) {
+ return $value->matches($request, $includingMethod);
+ });
+ }
+
+ /**
+ * Get all of the routes in the collection.
+ *
+ * @param string|null $method
+ * @return array
+ */
+ protected function get($method = null)
+ {
+ if (is_null($method)) {
+ return $this->getRoutes();
+ }
+
+ return Arr::get($this->routes, $method, []);
+ }
+
+ /**
+ * Determine if the route collection contains a given named route.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasNamedRoute($name)
+ {
+ return ! is_null($this->getByName($name));
+ }
+
+ /**
+ * Get a route instance by its name.
+ *
+ * @param string $name
+ * @return \Illuminate\Routing\Route|null
+ */
+ public function getByName($name)
+ {
+ return isset($this->nameList[$name]) ? $this->nameList[$name] : null;
+ }
+
+ /**
+ * Get a route instance by its controller action.
+ *
+ * @param string $action
+ * @return \Illuminate\Routing\Route|null
+ */
+ public function getByAction($action)
+ {
+ return isset($this->actionList[$action]) ? $this->actionList[$action] : null;
+ }
+
+ /**
+ * Get all of the routes in the collection.
+ *
+ * @return array
+ */
+ public function getRoutes()
+ {
+ return array_values($this->allRoutes);
+ }
+
+ /**
+ * Get an iterator for the items.
+ *
+ * @return \ArrayIterator
+ */
+ public function getIterator()
+ {
+ return new ArrayIterator($this->getRoutes());
+ }
+
+ /**
+ * Count the number of items in the collection.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return count($this->getRoutes());
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php b/application/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php
index 088b23c..9ab742a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php
@@ -1,81 +1,149 @@
-resolveClassMethodDependencies([], $instance, $method)
+ );
+ }
+
+ /**
+ * Resolve the object method's type-hinted dependencies.
+ *
+ * @param array $parameters
+ * @param object $instance
+ * @param string $method
+ * @return array
+ */
+ protected function resolveClassMethodDependencies(array $parameters, $instance, $method)
+ {
+ if (! method_exists($instance, $method)) {
+ return $parameters;
+ }
+
+ return $this->resolveMethodDependencies(
+ $parameters, new ReflectionMethod($instance, $method)
+ );
+ }
+
+ /**
+ * Resolve the given method's type-hinted dependencies.
+ *
+ * @param array $parameters
+ * @param \ReflectionFunctionAbstract $reflector
+ * @return array
+ */
+ public function resolveMethodDependencies(array $parameters, ReflectionFunctionAbstract $reflector)
+ {
+ $originalParameters = $parameters;
-trait RouteDependencyResolverTrait {
+ foreach ($reflector->getParameters() as $key => $parameter) {
+ $instance = $this->transformDependency(
+ $parameter, $parameters, $originalParameters
+ );
- /**
- * Call a class method with the resolved dependencies.
- *
- * @param object $instance
- * @param string $method
- * @return mixed
- */
- protected function callWithDependencies($instance, $method)
- {
- return call_user_func_array(
- [$instance, $method], $this->resolveClassMethodDependencies([], $instance, $method)
- );
- }
+ if (! is_null($instance)) {
+ $this->spliceIntoParameters($parameters, $key, $instance);
+ }
+ }
- /**
- * Resolve the object method's type-hinted dependencies.
- *
- * @param array $parameters
- * @param object $instance
- * @param string $method
- * @return array
- */
- protected function resolveClassMethodDependencies(array $parameters, $instance, $method)
- {
- if ( ! method_exists($instance, $method)) return $parameters;
+ return $parameters;
+ }
- return $this->resolveMethodDependencies(
- $parameters, new ReflectionMethod($instance, $method)
- );
- }
+ /**
+ * Attempt to transform the given parameter into a class instance.
+ *
+ * @param \ReflectionParameter $parameter
+ * @param array $parameters
+ * @param array $originalParameters
+ * @return mixed
+ */
+ protected function transformDependency(ReflectionParameter $parameter, $parameters, $originalParameters)
+ {
+ $class = $parameter->getClass();
- /**
- * Resolve the given method's type-hinted dependencies.
- *
- * @param array $parameters
- * @param \ReflectionFunctionAbstract $reflector
- * @return array
- */
- public function resolveMethodDependencies(array $parameters, ReflectionFunctionAbstract $reflector)
- {
- foreach ($reflector->getParameters() as $key => $parameter)
- {
- // If the parameter has a type-hinted class, we will check to see if it is already in
- // the list of parameters. If it is we will just skip it as it is probably a model
- // binding and we do not want to mess with those; otherwise, we resolve it here.
- $class = $parameter->getClass();
+ // If the parameter has a type-hinted class, we will check to see if it is already in
+ // the list of parameters. If it is we will just skip it as it is probably a model
+ // binding and we do not want to mess with those; otherwise, we resolve it here.
+ if ($class && ! $this->alreadyInParameters($class->name, $parameters)) {
+ return $this->container->make($class->name);
+ }
+ }
- if ($class && ! $this->alreadyInParameters($class->name, $parameters))
- {
- array_splice(
- $parameters, $key, 0, [$this->container->make($class->name)]
- );
- }
- }
+ /**
+ * Determine if the given type-hinted class is an implict Eloquent binding.
+ *
+ * Must not already be resolved in the parameter list by an explicit model binding.
+ *
+ * @param \ReflectionClass $class
+ * @param array $parameters
+ * @return bool
+ */
+ protected function vacantEloquentParameter(ReflectionClass $class, array $parameters)
+ {
+ return $class->isSubclassOf(Model::class) &&
+ ! $this->alreadyInParameters($class->name, $parameters);
+ }
- return $parameters;
- }
+ /**
+ * Extract an implicit model binding's key out of the parameter list.
+ *
+ * @param \ReflectionParameter $parameter
+ * @param array $originalParameters
+ *
+ * @return mixed
+ */
+ protected function extractModelIdentifier(ReflectionParameter $parameter, array $originalParameters)
+ {
+ return Arr::first($originalParameters, function ($parameterKey) use ($parameter) {
+ return $parameterKey === $parameter->name;
+ });
+ }
- /**
- * Determine if an object of the given class is in a list of parameters.
- *
- * @param string $class
- * @param array $parameters
- * @return bool
- */
- protected function alreadyInParameters($class, array $parameters)
- {
- return ! is_null(array_first($parameters, function($key, $value) use ($class)
- {
- return $value instanceof $class;
- }));
- }
+ /**
+ * Determine if an object of the given class is in a list of parameters.
+ *
+ * @param string $class
+ * @param array $parameters
+ * @return bool
+ */
+ protected function alreadyInParameters($class, array $parameters)
+ {
+ return ! is_null(Arr::first($parameters, function ($key, $value) use ($class) {
+ return $value instanceof $class;
+ }));
+ }
+ /**
+ * Splice the given value into the parameter list.
+ *
+ * @param array $parameters
+ * @param string $key
+ * @param mixed $instance
+ * @return void
+ */
+ protected function spliceIntoParameters(array &$parameters, $key, $instance)
+ {
+ array_splice(
+ $parameters, $key, 0, [$instance]
+ );
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/Router.php b/application/vendor/laravel/framework/src/Illuminate/Routing/Router.php
index f9ef877..d6aacb4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/Router.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/Router.php
@@ -1,6 +1,10 @@
-events = $events;
- $this->routes = new RouteCollection;
- $this->container = $container ?: new Container;
- }
-
- /**
- * Register a new GET route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function get($uri, $action)
- {
- return $this->addRoute(['GET', 'HEAD'], $uri, $action);
- }
-
- /**
- * Register a new POST route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function post($uri, $action)
- {
- return $this->addRoute('POST', $uri, $action);
- }
-
- /**
- * Register a new PUT route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function put($uri, $action)
- {
- return $this->addRoute('PUT', $uri, $action);
- }
-
- /**
- * Register a new PATCH route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function patch($uri, $action)
- {
- return $this->addRoute('PATCH', $uri, $action);
- }
-
- /**
- * Register a new DELETE route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function delete($uri, $action)
- {
- return $this->addRoute('DELETE', $uri, $action);
- }
-
- /**
- * Register a new OPTIONS route with the router.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function options($uri, $action)
- {
- return $this->addRoute('OPTIONS', $uri, $action);
- }
-
- /**
- * Register a new route responding to all verbs.
- *
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function any($uri, $action)
- {
- $verbs = array('GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE');
-
- return $this->addRoute($verbs, $uri, $action);
- }
-
- /**
- * Register a new route with the given verbs.
- *
- * @param array|string $methods
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- public function match($methods, $uri, $action)
- {
- return $this->addRoute(array_map('strtoupper', (array) $methods), $uri, $action);
- }
-
- /**
- * Register an array of controllers with wildcard routing.
- *
- * @param array $controllers
- * @return void
- */
- public function controllers(array $controllers)
- {
- foreach ($controllers as $uri => $controller)
- {
- $this->controller($uri, $controller);
- }
- }
-
- /**
- * Route a controller to a URI with wildcard routing.
- *
- * @param string $uri
- * @param string $controller
- * @param array $names
- * @return void
- */
- public function controller($uri, $controller, $names = array())
- {
- $prepended = $controller;
-
- // First, we will check to see if a controller prefix has been registered in
- // the route group. If it has, we will need to prefix it before trying to
- // reflect into the class instance and pull out the method for routing.
- if ( ! empty($this->groupStack))
- {
- $prepended = $this->prependGroupUses($controller);
- }
-
- $routable = (new ControllerInspector)
- ->getRoutable($prepended, $uri);
-
- // When a controller is routed using this method, we use Reflection to parse
- // out all of the routable methods for the controller, then register each
- // route explicitly for the developers, so reverse routing is possible.
- foreach ($routable as $method => $routes)
- {
- foreach ($routes as $route)
- {
- $this->registerInspected($route, $controller, $method, $names);
- }
- }
-
- $this->addFallthroughRoute($controller, $uri);
- }
-
- /**
- * Register an inspected controller route.
- *
- * @param array $route
- * @param string $controller
- * @param string $method
- * @param array $names
- * @return void
- */
- protected function registerInspected($route, $controller, $method, &$names)
- {
- $action = array('uses' => $controller.'@'.$method);
-
- // If a given controller method has been named, we will assign the name to the
- // controller action array, which provides for a short-cut to method naming
- // so you don't have to define an individual route for these controllers.
- $action['as'] = array_get($names, $method);
-
- $this->{$route['verb']}($route['uri'], $action);
- }
-
- /**
- * Add a fallthrough route for a controller.
- *
- * @param string $controller
- * @param string $uri
- * @return void
- */
- protected function addFallthroughRoute($controller, $uri)
- {
- $missing = $this->any($uri.'/{_missing}', $controller.'@missingMethod');
-
- $missing->where('_missing', '(.*)');
- }
-
- /**
- * Register an array of resource controllers.
- *
- * @param array $resources
- * @return void
- */
- public function resources(array $resources)
- {
- foreach ($resources as $name => $controller)
- {
- $this->resource($name, $controller);
- }
- }
-
- /**
- * Route a resource to a controller.
- *
- * @param string $name
- * @param string $controller
- * @param array $options
- * @return void
- */
- public function resource($name, $controller, array $options = array())
- {
- if ($this->container && $this->container->bound('Illuminate\Routing\ResourceRegistrar'))
- {
- $registrar = $this->container->make('Illuminate\Routing\ResourceRegistrar');
- }
- else
- {
- $registrar = new ResourceRegistrar($this);
- }
-
- $registrar->register($name, $controller, $options);
- }
-
- /**
- * Create a route group with shared attributes.
- *
- * @param array $attributes
- * @param \Closure $callback
- * @return void
- */
- public function group(array $attributes, Closure $callback)
- {
- $this->updateGroupStack($attributes);
-
- // Once we have updated the group stack, we will execute the user Closure and
- // merge in the groups attributes when the route is created. After we have
- // run the callback, we will pop the attributes off of this group stack.
- call_user_func($callback, $this);
-
- array_pop($this->groupStack);
- }
-
- /**
- * Update the group stack with the given attributes.
- *
- * @param array $attributes
- * @return void
- */
- protected function updateGroupStack(array $attributes)
- {
- if ( ! empty($this->groupStack))
- {
- $attributes = $this->mergeGroup($attributes, last($this->groupStack));
- }
-
- $this->groupStack[] = $attributes;
- }
-
- /**
- * Merge the given array with the last group stack.
- *
- * @param array $new
- * @return array
- */
- public function mergeWithLastGroup($new)
- {
- return $this->mergeGroup($new, last($this->groupStack));
- }
-
- /**
- * Merge the given group attributes.
- *
- * @param array $new
- * @param array $old
- * @return array
- */
- public static function mergeGroup($new, $old)
- {
- $new['namespace'] = static::formatUsesPrefix($new, $old);
-
- $new['prefix'] = static::formatGroupPrefix($new, $old);
-
- if (isset($new['domain'])) unset($old['domain']);
-
- $new['where'] = array_merge(array_get($old, 'where', []), array_get($new, 'where', []));
-
- return array_merge_recursive(array_except($old, array('namespace', 'prefix', 'where')), $new);
- }
-
- /**
- * Format the uses prefix for the new group attributes.
- *
- * @param array $new
- * @param array $old
- * @return string
- */
- protected static function formatUsesPrefix($new, $old)
- {
- if (isset($new['namespace']) && isset($old['namespace']))
- {
- return trim(array_get($old, 'namespace'), '\\').'\\'.trim($new['namespace'], '\\');
- }
- elseif (isset($new['namespace']))
- {
- return trim($new['namespace'], '\\');
- }
-
- return array_get($old, 'namespace');
- }
-
- /**
- * Format the prefix for the new group attributes.
- *
- * @param array $new
- * @param array $old
- * @return string
- */
- protected static function formatGroupPrefix($new, $old)
- {
- if (isset($new['prefix']))
- {
- return trim(array_get($old, 'prefix'), '/').'/'.trim($new['prefix'], '/');
- }
-
- return array_get($old, 'prefix');
- }
-
- /**
- * Get the prefix from the last group on the stack.
- *
- * @return string
- */
- public function getLastGroupPrefix()
- {
- if ( ! empty($this->groupStack))
- {
- $last = end($this->groupStack);
-
- return isset($last['prefix']) ? $last['prefix'] : '';
- }
-
- return '';
- }
-
- /**
- * Add a route to the underlying route collection.
- *
- * @param array|string $methods
- * @param string $uri
- * @param \Closure|array|string $action
- * @return \Illuminate\Routing\Route
- */
- protected function addRoute($methods, $uri, $action)
- {
- return $this->routes->add($this->createRoute($methods, $uri, $action));
- }
-
- /**
- * Create a new route instance.
- *
- * @param array|string $methods
- * @param string $uri
- * @param mixed $action
- * @return \Illuminate\Routing\Route
- */
- protected function createRoute($methods, $uri, $action)
- {
- // If the route is routing to a controller we will parse the route action into
- // an acceptable array format before registering it and creating this route
- // instance itself. We need to build the Closure that will call this out.
- if ($this->actionReferencesController($action))
- {
- $action = $this->convertToControllerAction($action);
- }
-
- $route = $this->newRoute(
- $methods, $this->prefix($uri), $action
- );
-
- // If we have groups that need to be merged, we will merge them now after this
- // route has already been created and is ready to go. After we're done with
- // the merge we will be ready to return the route back out to the caller.
- if ($this->hasGroupStack())
- {
- $this->mergeGroupAttributesIntoRoute($route);
- }
-
- $this->addWhereClausesToRoute($route);
-
- return $route;
- }
-
- /**
- * Create a new Route object.
- *
- * @param array|string $methods
- * @param string $uri
- * @param mixed $action
- * @return \Illuminate\Routing\Route
- */
- protected function newRoute($methods, $uri, $action)
- {
- return (new Route($methods, $uri, $action))->setContainer($this->container);
- }
-
- /**
- * Prefix the given URI with the last prefix.
- *
- * @param string $uri
- * @return string
- */
- protected function prefix($uri)
- {
- return trim(trim($this->getLastGroupPrefix(), '/').'/'.trim($uri, '/'), '/') ?: '/';
- }
-
- /**
- * Add the necessary where clauses to the route based on its initial registration.
- *
- * @param \Illuminate\Routing\Route $route
- * @return \Illuminate\Routing\Route
- */
- protected function addWhereClausesToRoute($route)
- {
- $route->where(
- array_merge($this->patterns, array_get($route->getAction(), 'where', []))
- );
-
- return $route;
- }
-
- /**
- * Merge the group stack with the controller action.
- *
- * @param \Illuminate\Routing\Route $route
- * @return void
- */
- protected function mergeGroupAttributesIntoRoute($route)
- {
- $action = $this->mergeWithLastGroup($route->getAction());
-
- $route->setAction($action);
- }
-
- /**
- * Determine if the action is routing to a controller.
- *
- * @param array $action
- * @return bool
- */
- protected function actionReferencesController($action)
- {
- if ($action instanceof Closure) return false;
-
- return is_string($action) || is_string(array_get($action, 'uses'));
- }
-
- /**
- * Add a controller based route action to the action array.
- *
- * @param array|string $action
- * @return array
- */
- protected function convertToControllerAction($action)
- {
- if (is_string($action)) $action = array('uses' => $action);
-
- // Here we'll merge any group "uses" statement if necessary so that the action
- // has the proper clause for this property. Then we can simply set the name
- // of the controller on the action and return the action array for usage.
- if ( ! empty($this->groupStack))
- {
- $action['uses'] = $this->prependGroupUses($action['uses']);
- }
-
- // Here we will set this controller name on the action array just so we always
- // have a copy of it for reference if we need it. This can be used while we
- // search for a controller name or do some other type of fetch operation.
- $action['controller'] = $action['uses'];
-
- return $action;
- }
-
- /**
- * Prepend the last group uses onto the use clause.
- *
- * @param string $uses
- * @return string
- */
- protected function prependGroupUses($uses)
- {
- $group = last($this->groupStack);
-
- return isset($group['namespace']) && strpos($uses, '\\') !== 0 ? $group['namespace'].'\\'.$uses : $uses;
- }
-
- /**
- * Dispatch the request to the application.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Http\Response
- */
- public function dispatch(Request $request)
- {
- $this->currentRequest = $request;
-
- // If no response was returned from the before filter, we will call the proper
- // route instance to get the response. If no route is found a response will
- // still get returned based on why no routes were found for this request.
- $response = $this->callFilter('before', $request);
-
- if (is_null($response))
- {
- $response = $this->dispatchToRoute($request);
- }
-
- // Once this route has run and the response has been prepared, we will run the
- // after filter to do any last work on the response or for this application
- // before we will return the response back to the consuming code for use.
- $response = $this->prepareResponse($request, $response);
-
- $this->callFilter('after', $request, $response);
-
- return $response;
- }
-
- /**
- * Dispatch the request to a route and return the response.
- *
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- public function dispatchToRoute(Request $request)
- {
- // First we will find a route that matches this request. We will also set the
- // route resolver on the request so middlewares assigned to the route will
- // receive access to this route instance for checking of the parameters.
- $route = $this->findRoute($request);
-
- $request->setRouteResolver(function() use ($route)
- {
- return $route;
- });
-
- $this->events->fire('router.matched', [$route, $request]);
-
- // Once we have successfully matched the incoming request to a given route we
- // can call the before filters on that route. This works similar to global
- // filters in that if a response is returned we will not call the route.
- $response = $this->callRouteBefore($route, $request);
-
- if (is_null($response))
- {
- $response = $this->runRouteWithinStack(
- $route, $request
- );
- }
-
- $response = $this->prepareResponse($request, $response);
-
- // After we have a prepared response from the route or filter we will call to
- // the "after" filters to do any last minute processing on this request or
- // response object before the response is returned back to the consumer.
- $this->callRouteAfter($route, $request, $response);
-
- return $response;
- }
-
- /**
- * Run the given route within a Stack "onion" instance.
- *
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- protected function runRouteWithinStack(Route $route, Request $request)
- {
- $middleware = $this->gatherRouteMiddlewares($route);
-
- return (new Pipeline($this->container))
- ->send($request)
- ->through($middleware)
- ->then(function($request) use ($route)
- {
- return $this->prepareResponse(
- $request,
- $route->run($request)
- );
- });
- }
-
- /**
- * Gather the middleware for the given route.
- *
- * @param \Illuminate\Routing\Route $route
- * @return array
- */
- public function gatherRouteMiddlewares(Route $route)
- {
- return Collection::make($route->middleware())->map(function($m)
- {
- return Collection::make(array_get($this->middleware, $m, $m));
-
- })->collapse()->all();
- }
-
- /**
- * Find the route matching a given request.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Routing\Route
- */
- protected function findRoute($request)
- {
- $this->current = $route = $this->routes->match($request);
-
- $this->container->instance('Illuminate\Routing\Route', $route);
-
- return $this->substituteBindings($route);
- }
-
- /**
- * Substitute the route bindings onto the route.
- *
- * @param \Illuminate\Routing\Route $route
- * @return \Illuminate\Routing\Route
- */
- protected function substituteBindings($route)
- {
- foreach ($route->parameters() as $key => $value)
- {
- if (isset($this->binders[$key]))
- {
- $route->setParameter($key, $this->performBinding($key, $value, $route));
- }
- }
-
- return $route;
- }
-
- /**
- * Call the binding callback for the given key.
- *
- * @param string $key
- * @param string $value
- * @param \Illuminate\Routing\Route $route
- * @return mixed
- */
- protected function performBinding($key, $value, $route)
- {
- return call_user_func($this->binders[$key], $value, $route);
- }
-
- /**
- * Register a route matched event listener.
- *
- * @param string|callable $callback
- * @return void
- */
- public function matched($callback)
- {
- $this->events->listen('router.matched', $callback);
- }
-
- /**
- * Register a new "before" filter with the router.
- *
- * @param string|callable $callback
- * @return void
- */
- public function before($callback)
- {
- $this->addGlobalFilter('before', $callback);
- }
-
- /**
- * Register a new "after" filter with the router.
- *
- * @param string|callable $callback
- * @return void
- */
- public function after($callback)
- {
- $this->addGlobalFilter('after', $callback);
- }
-
- /**
- * Register a new global filter with the router.
- *
- * @param string $filter
- * @param string|callable $callback
- * @return void
- */
- protected function addGlobalFilter($filter, $callback)
- {
- $this->events->listen('router.'.$filter, $this->parseFilter($callback));
- }
-
- /**
- * Get all of the defined middleware short-hand names.
- *
- * @return array
- */
- public function getMiddleware()
- {
- return $this->middleware;
- }
-
- /**
- * Register a short-hand name for a middleware.
- *
- * @param string $name
- * @param string $class
- * @return $this
- */
- public function middleware($name, $class)
- {
- $this->middleware[$name] = $class;
-
- return $this;
- }
-
- /**
- * Register a new filter with the router.
- *
- * @param string $name
- * @param string|callable $callback
- * @return void
- */
- public function filter($name, $callback)
- {
- $this->events->listen('router.filter: '.$name, $this->parseFilter($callback));
- }
-
- /**
- * Parse the registered filter.
- *
- * @param callable|string $callback
- * @return mixed
- */
- protected function parseFilter($callback)
- {
- if (is_string($callback) && ! str_contains($callback, '@'))
- {
- return $callback.'@filter';
- }
-
- return $callback;
- }
-
- /**
- * Register a pattern-based filter with the router.
- *
- * @param string $pattern
- * @param string $name
- * @param array|null $methods
- * @return void
- */
- public function when($pattern, $name, $methods = null)
- {
- if ( ! is_null($methods)) $methods = array_map('strtoupper', (array) $methods);
-
- $this->patternFilters[$pattern][] = compact('name', 'methods');
- }
-
- /**
- * Register a regular expression based filter with the router.
- *
- * @param string $pattern
- * @param string $name
- * @param array|null $methods
- * @return void
- */
- public function whenRegex($pattern, $name, $methods = null)
- {
- if ( ! is_null($methods)) $methods = array_map('strtoupper', (array) $methods);
-
- $this->regexFilters[$pattern][] = compact('name', 'methods');
- }
-
- /**
- * Register a model binder for a wildcard.
- *
- * @param string $key
- * @param string $class
- * @param \Closure|null $callback
- * @return void
- *
- * @throws NotFoundHttpException
- */
- public function model($key, $class, Closure $callback = null)
- {
- $this->bind($key, function($value) use ($class, $callback)
- {
- if (is_null($value)) return;
-
- // For model binders, we will attempt to retrieve the models using the first
- // method on the model instance. If we cannot retrieve the models we'll
- // throw a not found exception otherwise we will return the instance.
- if ($model = (new $class)->find($value))
- {
- return $model;
- }
-
- // If a callback was supplied to the method we will call that to determine
- // what we should do when the model is not found. This just gives these
- // developer a little greater flexibility to decide what will happen.
- if ($callback instanceof Closure)
- {
- return call_user_func($callback, $value);
- }
-
- throw new NotFoundHttpException;
- });
- }
-
- /**
- * Add a new route parameter binder.
- *
- * @param string $key
- * @param string|callable $binder
- * @return void
- */
- public function bind($key, $binder)
- {
- if (is_string($binder))
- {
- $binder = $this->createClassBinding($binder);
- }
-
- $this->binders[str_replace('-', '_', $key)] = $binder;
- }
-
- /**
- * Create a class based binding using the IoC container.
- *
- * @param string $binding
- * @return \Closure
- */
- public function createClassBinding($binding)
- {
- return function($value, $route) use ($binding)
- {
- // If the binding has an @ sign, we will assume it's being used to delimit
- // the class name from the bind method name. This allows for bindings
- // to run multiple bind methods in a single class for convenience.
- $segments = explode('@', $binding);
-
- $method = count($segments) == 2 ? $segments[1] : 'bind';
-
- $callable = [$this->container->make($segments[0]), $method];
-
- return call_user_func($callable, $value, $route);
- };
- }
-
- /**
- * Set a global where pattern on all routes.
- *
- * @param string $key
- * @param string $pattern
- * @return void
- */
- public function pattern($key, $pattern)
- {
- $this->patterns[$key] = $pattern;
- }
-
- /**
- * Set a group of global where patterns on all routes.
- *
- * @param array $patterns
- * @return void
- */
- public function patterns($patterns)
- {
- foreach ($patterns as $key => $pattern)
- {
- $this->pattern($key, $pattern);
- }
- }
-
- /**
- * Call the given filter with the request and response.
- *
- * @param string $filter
- * @param \Illuminate\Http\Request $request
- * @param \Illuminate\Http\Response $response
- * @return mixed
- */
- protected function callFilter($filter, $request, $response = null)
- {
- return $this->events->until('router.'.$filter, array($request, $response));
- }
-
- /**
- * Call the given route's before filters.
- *
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- public function callRouteBefore($route, $request)
- {
- $response = $this->callPatternFilters($route, $request);
-
- return $response ?: $this->callAttachedBefores($route, $request);
- }
-
- /**
- * Call the pattern based filters for the request.
- *
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @return mixed|null
- */
- protected function callPatternFilters($route, $request)
- {
- foreach ($this->findPatternFilters($request) as $filter => $parameters)
- {
- $response = $this->callRouteFilter($filter, $parameters, $route, $request);
-
- if ( ! is_null($response)) return $response;
- }
- }
-
- /**
- * Find the patterned filters matching a request.
- *
- * @param \Illuminate\Http\Request $request
- * @return array
- */
- public function findPatternFilters($request)
- {
- $results = array();
-
- list($path, $method) = array($request->path(), $request->getMethod());
-
- foreach ($this->patternFilters as $pattern => $filters)
- {
- // To find the patterned middlewares for a request, we just need to check these
- // registered patterns against the path info for the current request to this
- // applications, and when it matches we will merge into these middlewares.
- if (str_is($pattern, $path))
- {
- $merge = $this->patternsByMethod($method, $filters);
-
- $results = array_merge($results, $merge);
- }
- }
-
- foreach ($this->regexFilters as $pattern => $filters)
- {
- // To find the patterned middlewares for a request, we just need to check these
- // registered patterns against the path info for the current request to this
- // applications, and when it matches we will merge into these middlewares.
- if (preg_match($pattern, $path))
- {
- $merge = $this->patternsByMethod($method, $filters);
-
- $results = array_merge($results, $merge);
- }
- }
-
- return $results;
- }
-
- /**
- * Filter pattern filters that don't apply to the request verb.
- *
- * @param string $method
- * @param array $filters
- * @return array
- */
- protected function patternsByMethod($method, $filters)
- {
- $results = array();
-
- foreach ($filters as $filter)
- {
- // The idea here is to check and see if the pattern filter applies to this HTTP
- // request based on the request methods. Pattern filters might be limited by
- // the request verb to make it simply to assign to the given verb at once.
- if ($this->filterSupportsMethod($filter, $method))
- {
- $parsed = Route::parseFilters($filter['name']);
-
- $results = array_merge($results, $parsed);
- }
- }
-
- return $results;
- }
-
- /**
- * Determine if the given pattern filters applies to a given method.
- *
- * @param array $filter
- * @param array $method
- * @return bool
- */
- protected function filterSupportsMethod($filter, $method)
- {
- $methods = $filter['methods'];
-
- return is_null($methods) || in_array($method, $methods);
- }
-
- /**
- * Call the given route's before (non-pattern) filters.
- *
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @return mixed
- */
- protected function callAttachedBefores($route, $request)
- {
- foreach ($route->beforeFilters() as $filter => $parameters)
- {
- $response = $this->callRouteFilter($filter, $parameters, $route, $request);
-
- if ( ! is_null($response)) return $response;
- }
- }
-
- /**
- * Call the given route's after filters.
- *
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @param \Illuminate\Http\Response $response
- * @return mixed
- */
- public function callRouteAfter($route, $request, $response)
- {
- foreach ($route->afterFilters() as $filter => $parameters)
- {
- $this->callRouteFilter($filter, $parameters, $route, $request, $response);
- }
- }
-
- /**
- * Call the given route filter.
- *
- * @param string $filter
- * @param array $parameters
- * @param \Illuminate\Routing\Route $route
- * @param \Illuminate\Http\Request $request
- * @param \Illuminate\Http\Response|null $response
- * @return mixed
- */
- public function callRouteFilter($filter, $parameters, $route, $request, $response = null)
- {
- $data = array_merge(array($route, $request, $response), $parameters);
-
- return $this->events->until('router.filter: '.$filter, $this->cleanFilterParameters($data));
- }
-
- /**
- * Clean the parameters being passed to a filter callback.
- *
- * @param array $parameters
- * @return array
- */
- protected function cleanFilterParameters(array $parameters)
- {
- return array_filter($parameters, function($p)
- {
- return ! is_null($p) && $p !== '';
- });
- }
-
- /**
- * Create a response instance from the given value.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @param mixed $response
- * @return \Illuminate\Http\Response
- */
- protected function prepareResponse($request, $response)
- {
- if ( ! $response instanceof SymfonyResponse)
- {
- $response = new Response($response);
- }
-
- return $response->prepare($request);
- }
-
- /**
- * Determine if the router currently has a group stack.
- *
- * @return bool
- */
- public function hasGroupStack()
- {
- return ! empty($this->groupStack);
- }
-
- /**
- * Get the current group stack for the router.
- *
- * @return array
- */
- public function getGroupStack()
- {
- return $this->groupStack;
- }
-
- /**
- * Get a route parameter for the current route.
- *
- * @param string $key
- * @param string $default
- * @return mixed
- */
- public function input($key, $default = null)
- {
- return $this->current()->parameter($key, $default);
- }
-
- /**
- * Get the currently dispatched route instance.
- *
- * @return \Illuminate\Routing\Route
- */
- public function getCurrentRoute()
- {
- return $this->current();
- }
-
- /**
- * Get the currently dispatched route instance.
- *
- * @return \Illuminate\Routing\Route
- */
- public function current()
- {
- return $this->current;
- }
-
- /**
- * Check if a route with the given name exists.
- *
- * @param string $name
- * @return bool
- */
- public function has($name)
- {
- return $this->routes->hasNamedRoute($name);
- }
-
- /**
- * Get the current route name.
- *
- * @return string|null
- */
- public function currentRouteName()
- {
- return $this->current() ? $this->current()->getName() : null;
- }
-
- /**
- * Alias for the "currentRouteNamed" method.
- *
- * @param mixed string
- * @return bool
- */
- public function is()
- {
- foreach (func_get_args() as $pattern)
- {
- if (str_is($pattern, $this->currentRouteName()))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Determine if the current route matches a given name.
- *
- * @param string $name
- * @return bool
- */
- public function currentRouteNamed($name)
- {
- return $this->current() ? $this->current()->getName() == $name : false;
- }
-
- /**
- * Get the current route action.
- *
- * @return string|null
- */
- public function currentRouteAction()
- {
- if ( ! $this->current()) return;
-
- $action = $this->current()->getAction();
-
- return isset($action['controller']) ? $action['controller'] : null;
- }
-
- /**
- * Alias for the "currentRouteUses" method.
- *
- * @param mixed string
- * @return bool
- */
- public function uses()
- {
- foreach (func_get_args() as $pattern)
- {
- if (str_is($pattern, $this->currentRouteAction()))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Determine if the current route action matches a given action.
- *
- * @param string $action
- * @return bool
- */
- public function currentRouteUses($action)
- {
- return $this->currentRouteAction() == $action;
- }
-
- /**
- * Get the request currently being dispatched.
- *
- * @return \Illuminate\Http\Request
- */
- public function getCurrentRequest()
- {
- return $this->currentRequest;
- }
-
- /**
- * Get the underlying route collection.
- *
- * @return \Illuminate\Routing\RouteCollection
- */
- public function getRoutes()
- {
- return $this->routes;
- }
-
- /**
- * Set the route collection instance.
- *
- * @param \Illuminate\Routing\RouteCollection $routes
- * @return void
- */
- public function setRoutes(RouteCollection $routes)
- {
- foreach ($routes as $route)
- {
- $route->setContainer($this->container);
- }
-
- $this->routes = $routes;
-
- $this->container->instance('routes', $this->routes);
- }
-
- /**
- * Get the global "where" patterns.
- *
- * @return array
- */
- public function getPatterns()
- {
- return $this->patterns;
- }
-
+class Router implements RegistrarContract
+{
+ use Macroable;
+
+ /**
+ * The event dispatcher instance.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected $events;
+
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The route collection instance.
+ *
+ * @var \Illuminate\Routing\RouteCollection
+ */
+ protected $routes;
+
+ /**
+ * The currently dispatched route instance.
+ *
+ * @var \Illuminate\Routing\Route
+ */
+ protected $current;
+
+ /**
+ * The request currently being dispatched.
+ *
+ * @var \Illuminate\Http\Request
+ */
+ protected $currentRequest;
+
+ /**
+ * All of the short-hand keys for middlewares.
+ *
+ * @var array
+ */
+ protected $middleware = [];
+
+ /**
+ * The registered pattern based filters.
+ *
+ * @var array
+ */
+ protected $patternFilters = [];
+
+ /**
+ * The registered regular expression based filters.
+ *
+ * @var array
+ */
+ protected $regexFilters = [];
+
+ /**
+ * The registered route value binders.
+ *
+ * @var array
+ */
+ protected $binders = [];
+
+ /**
+ * The globally available parameter patterns.
+ *
+ * @var array
+ */
+ protected $patterns = [];
+
+ /**
+ * The route group attribute stack.
+ *
+ * @var array
+ */
+ protected $groupStack = [];
+
+ /**
+ * All of the verbs supported by the router.
+ *
+ * @var array
+ */
+ public static $verbs = ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'];
+
+ /**
+ * Create a new Router instance.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @param \Illuminate\Container\Container $container
+ * @return void
+ */
+ public function __construct(Dispatcher $events, Container $container = null)
+ {
+ $this->events = $events;
+ $this->routes = new RouteCollection;
+ $this->container = $container ?: new Container;
+
+ $this->bind('_missing', function ($v) {
+ return explode('/', $v);
+ });
+ }
+
+ /**
+ * Register a new GET route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function get($uri, $action)
+ {
+ return $this->addRoute(['GET', 'HEAD'], $uri, $action);
+ }
+
+ /**
+ * Register a new POST route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function post($uri, $action)
+ {
+ return $this->addRoute('POST', $uri, $action);
+ }
+
+ /**
+ * Register a new PUT route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function put($uri, $action)
+ {
+ return $this->addRoute('PUT', $uri, $action);
+ }
+
+ /**
+ * Register a new PATCH route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function patch($uri, $action)
+ {
+ return $this->addRoute('PATCH', $uri, $action);
+ }
+
+ /**
+ * Register a new DELETE route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function delete($uri, $action)
+ {
+ return $this->addRoute('DELETE', $uri, $action);
+ }
+
+ /**
+ * Register a new OPTIONS route with the router.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function options($uri, $action)
+ {
+ return $this->addRoute('OPTIONS', $uri, $action);
+ }
+
+ /**
+ * Register a new route responding to all verbs.
+ *
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function any($uri, $action)
+ {
+ $verbs = ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'];
+
+ return $this->addRoute($verbs, $uri, $action);
+ }
+
+ /**
+ * Register a new route with the given verbs.
+ *
+ * @param array|string $methods
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ public function match($methods, $uri, $action)
+ {
+ return $this->addRoute(array_map('strtoupper', (array) $methods), $uri, $action);
+ }
+
+ /**
+ * Register an array of controllers with wildcard routing.
+ *
+ * @param array $controllers
+ * @return void
+ */
+ public function controllers(array $controllers)
+ {
+ foreach ($controllers as $uri => $controller) {
+ $this->controller($uri, $controller);
+ }
+ }
+
+ /**
+ * Route a controller to a URI with wildcard routing.
+ *
+ * @param string $uri
+ * @param string $controller
+ * @param array $names
+ * @return void
+ */
+ public function controller($uri, $controller, $names = [])
+ {
+ $prepended = $controller;
+
+ // First, we will check to see if a controller prefix has been registered in
+ // the route group. If it has, we will need to prefix it before trying to
+ // reflect into the class instance and pull out the method for routing.
+ if (! empty($this->groupStack)) {
+ $prepended = $this->prependGroupUses($controller);
+ }
+
+ $routable = (new ControllerInspector)
+ ->getRoutable($prepended, $uri);
+
+ // When a controller is routed using this method, we use Reflection to parse
+ // out all of the routable methods for the controller, then register each
+ // route explicitly for the developers, so reverse routing is possible.
+ foreach ($routable as $method => $routes) {
+ foreach ($routes as $route) {
+ $this->registerInspected($route, $controller, $method, $names);
+ }
+ }
+
+ $this->addFallthroughRoute($controller, $uri);
+ }
+
+ /**
+ * Register an inspected controller route.
+ *
+ * @param array $route
+ * @param string $controller
+ * @param string $method
+ * @param array $names
+ * @return void
+ */
+ protected function registerInspected($route, $controller, $method, &$names)
+ {
+ $action = ['uses' => $controller.'@'.$method];
+
+ // If a given controller method has been named, we will assign the name to the
+ // controller action array, which provides for a short-cut to method naming
+ // so you don't have to define an individual route for these controllers.
+ $action['as'] = Arr::get($names, $method);
+
+ $this->{$route['verb']}($route['uri'], $action);
+ }
+
+ /**
+ * Add a fallthrough route for a controller.
+ *
+ * @param string $controller
+ * @param string $uri
+ * @return void
+ */
+ protected function addFallthroughRoute($controller, $uri)
+ {
+ $missing = $this->any($uri.'/{_missing}', $controller.'@missingMethod');
+
+ $missing->where('_missing', '(.*)');
+ }
+
+ /**
+ * Register an array of resource controllers.
+ *
+ * @param array $resources
+ * @return void
+ */
+ public function resources(array $resources)
+ {
+ foreach ($resources as $name => $controller) {
+ $this->resource($name, $controller);
+ }
+ }
+
+ /**
+ * Route a resource to a controller.
+ *
+ * @param string $name
+ * @param string $controller
+ * @param array $options
+ * @return void
+ */
+ public function resource($name, $controller, array $options = [])
+ {
+ if ($this->container && $this->container->bound('Illuminate\Routing\ResourceRegistrar')) {
+ $registrar = $this->container->make('Illuminate\Routing\ResourceRegistrar');
+ } else {
+ $registrar = new ResourceRegistrar($this);
+ }
+
+ $registrar->register($name, $controller, $options);
+ }
+
+ /**
+ * Create a route group with shared attributes.
+ *
+ * @param array $attributes
+ * @param \Closure $callback
+ * @return void
+ */
+ public function group(array $attributes, Closure $callback)
+ {
+ $this->updateGroupStack($attributes);
+
+ // Once we have updated the group stack, we will execute the user Closure and
+ // merge in the groups attributes when the route is created. After we have
+ // run the callback, we will pop the attributes off of this group stack.
+ call_user_func($callback, $this);
+
+ array_pop($this->groupStack);
+ }
+
+ /**
+ * Update the group stack with the given attributes.
+ *
+ * @param array $attributes
+ * @return void
+ */
+ protected function updateGroupStack(array $attributes)
+ {
+ if (! empty($this->groupStack)) {
+ $attributes = $this->mergeGroup($attributes, end($this->groupStack));
+ }
+
+ $this->groupStack[] = $attributes;
+ }
+
+ /**
+ * Merge the given array with the last group stack.
+ *
+ * @param array $new
+ * @return array
+ */
+ public function mergeWithLastGroup($new)
+ {
+ return $this->mergeGroup($new, end($this->groupStack));
+ }
+
+ /**
+ * Merge the given group attributes.
+ *
+ * @param array $new
+ * @param array $old
+ * @return array
+ */
+ public static function mergeGroup($new, $old)
+ {
+ $new['namespace'] = static::formatUsesPrefix($new, $old);
+
+ $new['prefix'] = static::formatGroupPrefix($new, $old);
+
+ if (isset($new['domain'])) {
+ unset($old['domain']);
+ }
+
+ $new['where'] = array_merge(
+ isset($old['where']) ? $old['where'] : [],
+ isset($new['where']) ? $new['where'] : []
+ );
+
+ if (isset($old['as'])) {
+ $new['as'] = $old['as'].(isset($new['as']) ? $new['as'] : '');
+ }
+
+ return array_merge_recursive(Arr::except($old, ['namespace', 'prefix', 'where', 'as']), $new);
+ }
+
+ /**
+ * Format the uses prefix for the new group attributes.
+ *
+ * @param array $new
+ * @param array $old
+ * @return string|null
+ */
+ protected static function formatUsesPrefix($new, $old)
+ {
+ if (isset($new['namespace'])) {
+ return isset($old['namespace'])
+ ? trim($old['namespace'], '\\').'\\'.trim($new['namespace'], '\\')
+ : trim($new['namespace'], '\\');
+ }
+
+ return isset($old['namespace']) ? $old['namespace'] : null;
+ }
+
+ /**
+ * Format the prefix for the new group attributes.
+ *
+ * @param array $new
+ * @param array $old
+ * @return string|null
+ */
+ protected static function formatGroupPrefix($new, $old)
+ {
+ $oldPrefix = isset($old['prefix']) ? $old['prefix'] : null;
+
+ if (isset($new['prefix'])) {
+ return trim($oldPrefix, '/').'/'.trim($new['prefix'], '/');
+ }
+
+ return $oldPrefix;
+ }
+
+ /**
+ * Get the prefix from the last group on the stack.
+ *
+ * @return string
+ */
+ public function getLastGroupPrefix()
+ {
+ if (! empty($this->groupStack)) {
+ $last = end($this->groupStack);
+
+ return isset($last['prefix']) ? $last['prefix'] : '';
+ }
+
+ return '';
+ }
+
+ /**
+ * Add a route to the underlying route collection.
+ *
+ * @param array|string $methods
+ * @param string $uri
+ * @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addRoute($methods, $uri, $action)
+ {
+ return $this->routes->add($this->createRoute($methods, $uri, $action));
+ }
+
+ /**
+ * Create a new route instance.
+ *
+ * @param array|string $methods
+ * @param string $uri
+ * @param mixed $action
+ * @return \Illuminate\Routing\Route
+ */
+ protected function createRoute($methods, $uri, $action)
+ {
+ // If the route is routing to a controller we will parse the route action into
+ // an acceptable array format before registering it and creating this route
+ // instance itself. We need to build the Closure that will call this out.
+ if ($this->actionReferencesController($action)) {
+ $action = $this->convertToControllerAction($action);
+ }
+
+ $route = $this->newRoute(
+ $methods, $this->prefix($uri), $action
+ );
+
+ // If we have groups that need to be merged, we will merge them now after this
+ // route has already been created and is ready to go. After we're done with
+ // the merge we will be ready to return the route back out to the caller.
+ if ($this->hasGroupStack()) {
+ $this->mergeGroupAttributesIntoRoute($route);
+ }
+
+ $this->addWhereClausesToRoute($route);
+
+ return $route;
+ }
+
+ /**
+ * Create a new Route object.
+ *
+ * @param array|string $methods
+ * @param string $uri
+ * @param mixed $action
+ * @return \Illuminate\Routing\Route
+ */
+ protected function newRoute($methods, $uri, $action)
+ {
+ return (new Route($methods, $uri, $action))->setContainer($this->container);
+ }
+
+ /**
+ * Prefix the given URI with the last prefix.
+ *
+ * @param string $uri
+ * @return string
+ */
+ protected function prefix($uri)
+ {
+ return trim(trim($this->getLastGroupPrefix(), '/').'/'.trim($uri, '/'), '/') ?: '/';
+ }
+
+ /**
+ * Add the necessary where clauses to the route based on its initial registration.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return \Illuminate\Routing\Route
+ */
+ protected function addWhereClausesToRoute($route)
+ {
+ $where = isset($route->getAction()['where']) ? $route->getAction()['where'] : [];
+
+ $route->where(array_merge($this->patterns, $where));
+
+ return $route;
+ }
+
+ /**
+ * Merge the group stack with the controller action.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return void
+ */
+ protected function mergeGroupAttributesIntoRoute($route)
+ {
+ $action = $this->mergeWithLastGroup($route->getAction());
+
+ $route->setAction($action);
+ }
+
+ /**
+ * Determine if the action is routing to a controller.
+ *
+ * @param array $action
+ * @return bool
+ */
+ protected function actionReferencesController($action)
+ {
+ if ($action instanceof Closure) {
+ return false;
+ }
+
+ return is_string($action) || is_string(isset($action['uses']) ? $action['uses'] : null);
+ }
+
+ /**
+ * Add a controller based route action to the action array.
+ *
+ * @param array|string $action
+ * @return array
+ */
+ protected function convertToControllerAction($action)
+ {
+ if (is_string($action)) {
+ $action = ['uses' => $action];
+ }
+
+ // Here we'll merge any group "uses" statement if necessary so that the action
+ // has the proper clause for this property. Then we can simply set the name
+ // of the controller on the action and return the action array for usage.
+ if (! empty($this->groupStack)) {
+ $action['uses'] = $this->prependGroupUses($action['uses']);
+ }
+
+ // Here we will set this controller name on the action array just so we always
+ // have a copy of it for reference if we need it. This can be used while we
+ // search for a controller name or do some other type of fetch operation.
+ $action['controller'] = $action['uses'];
+
+ return $action;
+ }
+
+ /**
+ * Prepend the last group uses onto the use clause.
+ *
+ * @param string $uses
+ * @return string
+ */
+ protected function prependGroupUses($uses)
+ {
+ $group = end($this->groupStack);
+
+ return isset($group['namespace']) && strpos($uses, '\\') !== 0 ? $group['namespace'].'\\'.$uses : $uses;
+ }
+
+ /**
+ * Dispatch the request to the application.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function dispatch(Request $request)
+ {
+ $this->currentRequest = $request;
+
+ // If no response was returned from the before filter, we will call the proper
+ // route instance to get the response. If no route is found a response will
+ // still get returned based on why no routes were found for this request.
+ $response = $this->callFilter('before', $request);
+
+ if (is_null($response)) {
+ $response = $this->dispatchToRoute($request);
+ }
+
+ // Once this route has run and the response has been prepared, we will run the
+ // after filter to do any last work on the response or for this application
+ // before we will return the response back to the consuming code for use.
+ $response = $this->prepareResponse($request, $response);
+
+ $this->callFilter('after', $request, $response);
+
+ return $response;
+ }
+
+ /**
+ * Dispatch the request to a route and return the response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ public function dispatchToRoute(Request $request)
+ {
+ // First we will find a route that matches this request. We will also set the
+ // route resolver on the request so middlewares assigned to the route will
+ // receive access to this route instance for checking of the parameters.
+ $route = $this->findRoute($request);
+
+ $request->setRouteResolver(function () use ($route) {
+ return $route;
+ });
+
+ $this->events->fire('router.matched', [$route, $request]);
+
+ // Once we have successfully matched the incoming request to a given route we
+ // can call the before filters on that route. This works similar to global
+ // filters in that if a response is returned we will not call the route.
+ $response = $this->callRouteBefore($route, $request);
+
+ if (is_null($response)) {
+ $response = $this->runRouteWithinStack(
+ $route, $request
+ );
+ }
+
+ $response = $this->prepareResponse($request, $response);
+
+ // After we have a prepared response from the route or filter we will call to
+ // the "after" filters to do any last minute processing on this request or
+ // response object before the response is returned back to the consumer.
+ $this->callRouteAfter($route, $request, $response);
+
+ return $response;
+ }
+
+ /**
+ * Run the given route within a Stack "onion" instance.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ protected function runRouteWithinStack(Route $route, Request $request)
+ {
+ $shouldSkipMiddleware = $this->container->bound('middleware.disable') &&
+ $this->container->make('middleware.disable') === true;
+
+ $middleware = $shouldSkipMiddleware ? [] : $this->gatherRouteMiddlewares($route);
+
+ return (new Pipeline($this->container))
+ ->send($request)
+ ->through($middleware)
+ ->then(function ($request) use ($route) {
+ return $this->prepareResponse(
+ $request,
+ $route->run($request)
+ );
+ });
+ }
+
+ /**
+ * Gather the middleware for the given route.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return array
+ */
+ public function gatherRouteMiddlewares(Route $route)
+ {
+ return Collection::make($route->middleware())->map(function ($name) {
+ return Collection::make($this->resolveMiddlewareClassName($name));
+ })
+ ->collapse()->all();
+ }
+
+ /**
+ * Resolve the middleware name to a class name preserving passed parameters.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function resolveMiddlewareClassName($name)
+ {
+ $map = $this->middleware;
+
+ list($name, $parameters) = array_pad(explode(':', $name, 2), 2, null);
+
+ return (isset($map[$name]) ? $map[$name] : $name).($parameters !== null ? ':'.$parameters : '');
+ }
+
+ /**
+ * Find the route matching a given request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Routing\Route
+ */
+ protected function findRoute($request)
+ {
+ $this->current = $route = $this->routes->match($request);
+
+ $this->container->instance('Illuminate\Routing\Route', $route);
+
+ return $this->substituteBindings($route);
+ }
+
+ /**
+ * Substitute the route bindings onto the route.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return \Illuminate\Routing\Route
+ */
+ protected function substituteBindings($route)
+ {
+ foreach ($route->parameters() as $key => $value) {
+ if (isset($this->binders[$key])) {
+ $route->setParameter($key, $this->performBinding($key, $value, $route));
+ }
+ }
+
+ return $route;
+ }
+
+ /**
+ * Call the binding callback for the given key.
+ *
+ * @param string $key
+ * @param string $value
+ * @param \Illuminate\Routing\Route $route
+ * @return mixed
+ */
+ protected function performBinding($key, $value, $route)
+ {
+ return call_user_func($this->binders[$key], $value, $route);
+ }
+
+ /**
+ * Register a route matched event listener.
+ *
+ * @param string|callable $callback
+ * @return void
+ */
+ public function matched($callback)
+ {
+ $this->events->listen('router.matched', $callback);
+ }
+
+ /**
+ * Register a new "before" filter with the router.
+ *
+ * @param string|callable $callback
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function before($callback)
+ {
+ $this->addGlobalFilter('before', $callback);
+ }
+
+ /**
+ * Register a new "after" filter with the router.
+ *
+ * @param string|callable $callback
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function after($callback)
+ {
+ $this->addGlobalFilter('after', $callback);
+ }
+
+ /**
+ * Register a new global filter with the router.
+ *
+ * @param string $filter
+ * @param string|callable $callback
+ * @return void
+ */
+ protected function addGlobalFilter($filter, $callback)
+ {
+ $this->events->listen('router.'.$filter, $this->parseFilter($callback));
+ }
+
+ /**
+ * Get all of the defined middleware short-hand names.
+ *
+ * @return array
+ */
+ public function getMiddleware()
+ {
+ return $this->middleware;
+ }
+
+ /**
+ * Register a short-hand name for a middleware.
+ *
+ * @param string $name
+ * @param string $class
+ * @return $this
+ */
+ public function middleware($name, $class)
+ {
+ $this->middleware[$name] = $class;
+
+ return $this;
+ }
+
+ /**
+ * Register a new filter with the router.
+ *
+ * @param string $name
+ * @param string|callable $callback
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function filter($name, $callback)
+ {
+ $this->events->listen('router.filter: '.$name, $this->parseFilter($callback));
+ }
+
+ /**
+ * Parse the registered filter.
+ *
+ * @param callable|string $callback
+ * @return mixed
+ */
+ protected function parseFilter($callback)
+ {
+ if (is_string($callback) && ! Str::contains($callback, '@')) {
+ return $callback.'@filter';
+ }
+
+ return $callback;
+ }
+
+ /**
+ * Register a pattern-based filter with the router.
+ *
+ * @param string $pattern
+ * @param string $name
+ * @param array|null $methods
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function when($pattern, $name, $methods = null)
+ {
+ if (! is_null($methods)) {
+ $methods = array_map('strtoupper', (array) $methods);
+ }
+
+ $this->patternFilters[$pattern][] = compact('name', 'methods');
+ }
+
+ /**
+ * Register a regular expression based filter with the router.
+ *
+ * @param string $pattern
+ * @param string $name
+ * @param array|null $methods
+ * @return void
+ *
+ * @deprecated since version 5.1.
+ */
+ public function whenRegex($pattern, $name, $methods = null)
+ {
+ if (! is_null($methods)) {
+ $methods = array_map('strtoupper', (array) $methods);
+ }
+
+ $this->regexFilters[$pattern][] = compact('name', 'methods');
+ }
+
+ /**
+ * Register a model binder for a wildcard.
+ *
+ * @param string $key
+ * @param string $class
+ * @param \Closure|null $callback
+ * @return void
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+ */
+ public function model($key, $class, Closure $callback = null)
+ {
+ $this->bind($key, function ($value) use ($class, $callback) {
+ if (is_null($value)) {
+ return;
+ }
+
+ // For model binders, we will attempt to retrieve the models using the first
+ // method on the model instance. If we cannot retrieve the models we'll
+ // throw a not found exception otherwise we will return the instance.
+ $instance = $this->container->make($class);
+
+ if ($model = $instance->where($instance->getRouteKeyName(), $value)->first()) {
+ return $model;
+ }
+
+ // If a callback was supplied to the method we will call that to determine
+ // what we should do when the model is not found. This just gives these
+ // developer a little greater flexibility to decide what will happen.
+ if ($callback instanceof Closure) {
+ return call_user_func($callback, $value);
+ }
+
+ throw new NotFoundHttpException;
+ });
+ }
+
+ /**
+ * Add a new route parameter binder.
+ *
+ * @param string $key
+ * @param string|callable $binder
+ * @return void
+ */
+ public function bind($key, $binder)
+ {
+ if (is_string($binder)) {
+ $binder = $this->createClassBinding($binder);
+ }
+
+ $this->binders[str_replace('-', '_', $key)] = $binder;
+ }
+
+ /**
+ * Create a class based binding using the IoC container.
+ *
+ * @param string $binding
+ * @return \Closure
+ */
+ public function createClassBinding($binding)
+ {
+ return function ($value, $route) use ($binding) {
+ // If the binding has an @ sign, we will assume it's being used to delimit
+ // the class name from the bind method name. This allows for bindings
+ // to run multiple bind methods in a single class for convenience.
+ $segments = explode('@', $binding);
+
+ $method = count($segments) == 2 ? $segments[1] : 'bind';
+
+ $callable = [$this->container->make($segments[0]), $method];
+
+ return call_user_func($callable, $value, $route);
+ };
+ }
+
+ /**
+ * Set a global where pattern on all routes.
+ *
+ * @param string $key
+ * @param string $pattern
+ * @return void
+ */
+ public function pattern($key, $pattern)
+ {
+ $this->patterns[$key] = $pattern;
+ }
+
+ /**
+ * Set a group of global where patterns on all routes.
+ *
+ * @param array $patterns
+ * @return void
+ */
+ public function patterns($patterns)
+ {
+ foreach ($patterns as $key => $pattern) {
+ $this->pattern($key, $pattern);
+ }
+ }
+
+ /**
+ * Call the given filter with the request and response.
+ *
+ * @param string $filter
+ * @param \Illuminate\Http\Request $request
+ * @param \Illuminate\Http\Response $response
+ * @return mixed
+ */
+ protected function callFilter($filter, $request, $response = null)
+ {
+ return $this->events->until('router.'.$filter, [$request, $response]);
+ }
+
+ /**
+ * Call the given route's before filters.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ public function callRouteBefore($route, $request)
+ {
+ $response = $this->callPatternFilters($route, $request);
+
+ return $response ?: $this->callAttachedBefores($route, $request);
+ }
+
+ /**
+ * Call the pattern based filters for the request.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ protected function callPatternFilters($route, $request)
+ {
+ foreach ($this->findPatternFilters($request) as $filter => $parameters) {
+ $response = $this->callRouteFilter($filter, $parameters, $route, $request);
+
+ if (! is_null($response)) {
+ return $response;
+ }
+ }
+ }
+
+ /**
+ * Find the patterned filters matching a request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return array
+ *
+ * @deprecated since version 5.1.
+ */
+ public function findPatternFilters($request)
+ {
+ $results = [];
+
+ list($path, $method) = [$request->path(), $request->getMethod()];
+
+ foreach ($this->patternFilters as $pattern => $filters) {
+ // To find the patterned middlewares for a request, we just need to check these
+ // registered patterns against the path info for the current request to this
+ // applications, and when it matches we will merge into these middlewares.
+ if (Str::is($pattern, $path)) {
+ $merge = $this->patternsByMethod($method, $filters);
+
+ $results = array_merge($results, $merge);
+ }
+ }
+
+ foreach ($this->regexFilters as $pattern => $filters) {
+ // To find the patterned middlewares for a request, we just need to check these
+ // registered patterns against the path info for the current request to this
+ // applications, and when it matches we will merge into these middlewares.
+ if (preg_match($pattern, $path)) {
+ $merge = $this->patternsByMethod($method, $filters);
+
+ $results = array_merge($results, $merge);
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Filter pattern filters that don't apply to the request verb.
+ *
+ * @param string $method
+ * @param array $filters
+ * @return array
+ */
+ protected function patternsByMethod($method, $filters)
+ {
+ $results = [];
+
+ foreach ($filters as $filter) {
+ // The idea here is to check and see if the pattern filter applies to this HTTP
+ // request based on the request methods. Pattern filters might be limited by
+ // the request verb to make it simply to assign to the given verb at once.
+ if ($this->filterSupportsMethod($filter, $method)) {
+ $parsed = Route::parseFilters($filter['name']);
+
+ $results = array_merge($results, $parsed);
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Determine if the given pattern filters applies to a given method.
+ *
+ * @param array $filter
+ * @param array $method
+ * @return bool
+ */
+ protected function filterSupportsMethod($filter, $method)
+ {
+ $methods = $filter['methods'];
+
+ return is_null($methods) || in_array($method, $methods);
+ }
+
+ /**
+ * Call the given route's before (non-pattern) filters.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @return mixed
+ */
+ protected function callAttachedBefores($route, $request)
+ {
+ foreach ($route->beforeFilters() as $filter => $parameters) {
+ $response = $this->callRouteFilter($filter, $parameters, $route, $request);
+
+ if (! is_null($response)) {
+ return $response;
+ }
+ }
+ }
+
+ /**
+ * Call the given route's after filters.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @param \Illuminate\Http\Response $response
+ * @return mixed
+ *
+ * @deprecated since version 5.1.
+ */
+ public function callRouteAfter($route, $request, $response)
+ {
+ foreach ($route->afterFilters() as $filter => $parameters) {
+ $this->callRouteFilter($filter, $parameters, $route, $request, $response);
+ }
+ }
+
+ /**
+ * Call the given route filter.
+ *
+ * @param string $filter
+ * @param array $parameters
+ * @param \Illuminate\Routing\Route $route
+ * @param \Illuminate\Http\Request $request
+ * @param \Illuminate\Http\Response|null $response
+ * @return mixed
+ *
+ * @deprecated since version 5.1.
+ */
+ public function callRouteFilter($filter, $parameters, $route, $request, $response = null)
+ {
+ $data = array_merge([$route, $request, $response], $parameters);
+
+ return $this->events->until('router.filter: '.$filter, $this->cleanFilterParameters($data));
+ }
+
+ /**
+ * Clean the parameters being passed to a filter callback.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function cleanFilterParameters(array $parameters)
+ {
+ return array_filter($parameters, function ($p) {
+ return ! is_null($p) && $p !== '';
+ });
+ }
+
+ /**
+ * Create a response instance from the given value.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @param mixed $response
+ * @return \Illuminate\Http\Response
+ */
+ public function prepareResponse($request, $response)
+ {
+ if ($response instanceof PsrResponseInterface) {
+ $response = (new HttpFoundationFactory)->createResponse($response);
+ } elseif (! $response instanceof SymfonyResponse) {
+ $response = new Response($response);
+ }
+
+ return $response->prepare($request);
+ }
+
+ /**
+ * Determine if the router currently has a group stack.
+ *
+ * @return bool
+ */
+ public function hasGroupStack()
+ {
+ return ! empty($this->groupStack);
+ }
+
+ /**
+ * Get the current group stack for the router.
+ *
+ * @return array
+ */
+ public function getGroupStack()
+ {
+ return $this->groupStack;
+ }
+
+ /**
+ * Get a route parameter for the current route.
+ *
+ * @param string $key
+ * @param string $default
+ * @return mixed
+ */
+ public function input($key, $default = null)
+ {
+ return $this->current()->parameter($key, $default);
+ }
+
+ /**
+ * Get the currently dispatched route instance.
+ *
+ * @return \Illuminate\Routing\Route
+ */
+ public function getCurrentRoute()
+ {
+ return $this->current();
+ }
+
+ /**
+ * Get the currently dispatched route instance.
+ *
+ * @return \Illuminate\Routing\Route
+ */
+ public function current()
+ {
+ return $this->current;
+ }
+
+ /**
+ * Check if a route with the given name exists.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function has($name)
+ {
+ return $this->routes->hasNamedRoute($name);
+ }
+
+ /**
+ * Get the current route name.
+ *
+ * @return string|null
+ */
+ public function currentRouteName()
+ {
+ return $this->current() ? $this->current()->getName() : null;
+ }
+
+ /**
+ * Alias for the "currentRouteNamed" method.
+ *
+ * @param mixed string
+ * @return bool
+ */
+ public function is()
+ {
+ foreach (func_get_args() as $pattern) {
+ if (Str::is($pattern, $this->currentRouteName())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Determine if the current route matches a given name.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function currentRouteNamed($name)
+ {
+ return $this->current() ? $this->current()->getName() == $name : false;
+ }
+
+ /**
+ * Get the current route action.
+ *
+ * @return string|null
+ */
+ public function currentRouteAction()
+ {
+ if (! $this->current()) {
+ return;
+ }
+
+ $action = $this->current()->getAction();
+
+ return isset($action['controller']) ? $action['controller'] : null;
+ }
+
+ /**
+ * Alias for the "currentRouteUses" method.
+ *
+ * @param mixed string
+ * @return bool
+ */
+ public function uses()
+ {
+ foreach (func_get_args() as $pattern) {
+ if (Str::is($pattern, $this->currentRouteAction())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Determine if the current route action matches a given action.
+ *
+ * @param string $action
+ * @return bool
+ */
+ public function currentRouteUses($action)
+ {
+ return $this->currentRouteAction() == $action;
+ }
+
+ /**
+ * Get the request currently being dispatched.
+ *
+ * @return \Illuminate\Http\Request
+ */
+ public function getCurrentRequest()
+ {
+ return $this->currentRequest;
+ }
+
+ /**
+ * Get the underlying route collection.
+ *
+ * @return \Illuminate\Routing\RouteCollection
+ */
+ public function getRoutes()
+ {
+ return $this->routes;
+ }
+
+ /**
+ * Set the route collection instance.
+ *
+ * @param \Illuminate\Routing\RouteCollection $routes
+ * @return void
+ */
+ public function setRoutes(RouteCollection $routes)
+ {
+ foreach ($routes as $route) {
+ $route->setContainer($this->container);
+ }
+
+ $this->routes = $routes;
+
+ $this->container->instance('routes', $this->routes);
+ }
+
+ /**
+ * Get the global "where" patterns.
+ *
+ * @return array
+ */
+ public function getPatterns()
+ {
+ return $this->patterns;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php
index 1cdf592..e8e7bfb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php
@@ -1,124 +1,147 @@
-registerRouter();
-
- $this->registerUrlGenerator();
-
- $this->registerRedirector();
-
- $this->registerResponseFactory();
- }
-
- /**
- * Register the router instance.
- *
- * @return void
- */
- protected function registerRouter()
- {
- $this->app['router'] = $this->app->share(function($app)
- {
- return new Router($app['events'], $app);
- });
- }
-
- /**
- * Register the URL generator service.
- *
- * @return void
- */
- protected function registerUrlGenerator()
- {
- $this->app['url'] = $this->app->share(function($app)
- {
- $routes = $app['router']->getRoutes();
-
- // The URL generator needs the route collection that exists on the router.
- // Keep in mind this is an object, so we're passing by references here
- // and all the registered routes will be available to the generator.
- $app->instance('routes', $routes);
-
- $url = new UrlGenerator(
- $routes, $app->rebinding(
- 'request', $this->requestRebinder()
- )
- );
-
- $url->setSessionResolver(function()
- {
- return $this->app['session'];
- });
-
- // If the route collection is "rebound", for example, when the routes stay
- // cached for the application, we will need to rebind the routes on the
- // URL generator instance so it has the latest version of the routes.
- $app->rebinding('routes', function($app, $routes)
- {
- $app['url']->setRoutes($routes);
- });
-
- return $url;
- });
- }
-
- /**
- * Get the URL generator request rebinder.
- *
- * @return \Closure
- */
- protected function requestRebinder()
- {
- return function($app, $request)
- {
- $app['url']->setRequest($request);
- };
- }
-
- /**
- * Register the Redirector service.
- *
- * @return void
- */
- protected function registerRedirector()
- {
- $this->app['redirect'] = $this->app->share(function($app)
- {
- $redirector = new Redirector($app['url']);
-
- // If the session is set on the application instance, we'll inject it into
- // the redirector instance. This allows the redirect responses to allow
- // for the quite convenient "with" methods that flash to the session.
- if (isset($app['session.store']))
- {
- $redirector->setSession($app['session.store']);
- }
-
- return $redirector;
- });
- }
-
- /**
- * Register the response factory implementation.
- *
- * @return void
- */
- protected function registerResponseFactory()
- {
- $this->app->singleton('Illuminate\Contracts\Routing\ResponseFactory', function($app)
- {
- return new ResponseFactory($app['Illuminate\Contracts\View\Factory'], $app['redirect']);
- });
- }
+namespace Illuminate\Routing;
+use Illuminate\Support\ServiceProvider;
+use Zend\Diactoros\Response as PsrResponse;
+use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
+
+class RoutingServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerRouter();
+
+ $this->registerUrlGenerator();
+
+ $this->registerRedirector();
+
+ $this->registerPsrRequest();
+
+ $this->registerPsrResponse();
+
+ $this->registerResponseFactory();
+ }
+
+ /**
+ * Register the router instance.
+ *
+ * @return void
+ */
+ protected function registerRouter()
+ {
+ $this->app['router'] = $this->app->share(function ($app) {
+ return new Router($app['events'], $app);
+ });
+ }
+
+ /**
+ * Register the URL generator service.
+ *
+ * @return void
+ */
+ protected function registerUrlGenerator()
+ {
+ $this->app['url'] = $this->app->share(function ($app) {
+ $routes = $app['router']->getRoutes();
+
+ // The URL generator needs the route collection that exists on the router.
+ // Keep in mind this is an object, so we're passing by references here
+ // and all the registered routes will be available to the generator.
+ $app->instance('routes', $routes);
+
+ $url = new UrlGenerator(
+ $routes, $app->rebinding(
+ 'request', $this->requestRebinder()
+ )
+ );
+
+ $url->setSessionResolver(function () {
+ return $this->app['session'];
+ });
+
+ // If the route collection is "rebound", for example, when the routes stay
+ // cached for the application, we will need to rebind the routes on the
+ // URL generator instance so it has the latest version of the routes.
+ $app->rebinding('routes', function ($app, $routes) {
+ $app['url']->setRoutes($routes);
+ });
+
+ return $url;
+ });
+ }
+
+ /**
+ * Get the URL generator request rebinder.
+ *
+ * @return \Closure
+ */
+ protected function requestRebinder()
+ {
+ return function ($app, $request) {
+ $app['url']->setRequest($request);
+ };
+ }
+
+ /**
+ * Register the Redirector service.
+ *
+ * @return void
+ */
+ protected function registerRedirector()
+ {
+ $this->app['redirect'] = $this->app->share(function ($app) {
+ $redirector = new Redirector($app['url']);
+
+ // If the session is set on the application instance, we'll inject it into
+ // the redirector instance. This allows the redirect responses to allow
+ // for the quite convenient "with" methods that flash to the session.
+ if (isset($app['session.store'])) {
+ $redirector->setSession($app['session.store']);
+ }
+
+ return $redirector;
+ });
+ }
+
+ /**
+ * Register a binding for the PSR-7 request implementation.
+ *
+ * @return void
+ */
+ protected function registerPsrRequest()
+ {
+ $this->app->bind('Psr\Http\Message\ServerRequestInterface', function ($app) {
+ return (new DiactorosFactory)->createRequest($app->make('request'));
+ });
+ }
+
+ /**
+ * Register a binding for the PSR-7 response implementation.
+ *
+ * @return void
+ */
+ protected function registerPsrResponse()
+ {
+ $this->app->bind('Psr\Http\Message\ResponseInterface', function ($app) {
+ return new PsrResponse();
+ });
+ }
+
+ /**
+ * Register the response factory implementation.
+ *
+ * @return void
+ */
+ protected function registerResponseFactory()
+ {
+ $this->app->singleton('Illuminate\Contracts\Routing\ResponseFactory', function ($app) {
+ return new ResponseFactory($app['Illuminate\Contracts\View\Factory'], $app['redirect']);
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php b/application/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php
index 1da7803..c09c010 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php
@@ -1,711 +1,740 @@
- '/',
- '%40' => '@',
- '%3A' => ':',
- '%3B' => ';',
- '%2C' => ',',
- '%3D' => '=',
- '%2B' => '+',
- '%21' => '!',
- '%2A' => '*',
- '%7C' => '|',
- '%3F' => '?',
- '%26' => '&',
- '%23' => '#',
- '%25' => '%',
- );
-
- /**
- * Create a new URL Generator instance.
- *
- * @param \Illuminate\Routing\RouteCollection $routes
- * @param \Illuminate\Http\Request $request
- * @return void
- */
- public function __construct(RouteCollection $routes, Request $request)
- {
- $this->routes = $routes;
-
- $this->setRequest($request);
- }
-
- /**
- * Get the full URL for the current request.
- *
- * @return string
- */
- public function full()
- {
- return $this->request->fullUrl();
- }
-
- /**
- * Get the current URL for the request.
- *
- * @return string
- */
- public function current()
- {
- return $this->to($this->request->getPathInfo());
- }
-
- /**
- * Get the URL for the previous request.
- *
- * @return string
- */
- public function previous()
- {
- $referrer = $this->request->headers->get('referer');
-
- $url = $referrer ? $this->to($referrer) : $this->getPreviousUrlFromSession();
-
- return $url ?: $this->to('/');
- }
-
- /**
- * Generate a absolute URL to the given path.
- *
- * @param string $path
- * @param mixed $extra
- * @param bool|null $secure
- * @return string
- */
- public function to($path, $extra = array(), $secure = null)
- {
- // First we will check if the URL is already a valid URL. If it is we will not
- // try to generate a new one but will simply return the URL as is, which is
- // convenient since developers do not always have to check if it's valid.
- if ($this->isValidUrl($path)) return $path;
-
- $scheme = $this->getScheme($secure);
-
- $extra = $this->formatParameters($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
- // for passing the array of parameters to this URL as a list of segments.
- $root = $this->getRootUrl($scheme);
-
- return $this->trimUrl($root, $path, $tail);
- }
-
- /**
- * Generate a secure, absolute URL to the given path.
- *
- * @param string $path
- * @param array $parameters
- * @return string
- */
- public function secure($path, $parameters = array())
- {
- return $this->to($path, $parameters, true);
- }
-
- /**
- * Generate a URL to an application asset.
- *
- * @param string $path
- * @param bool|null $secure
- * @return string
- */
- public function asset($path, $secure = null)
- {
- if ($this->isValidUrl($path)) return $path;
-
- // Once we get the root URL, we will check to see if it contains an index.php
- // file in the paths. If it does, we will remove it since it is not needed
- // for asset paths, but only for routes to endpoints in the application.
- $root = $this->getRootUrl($this->getScheme($secure));
-
- return $this->removeIndex($root).'/'.trim($path, '/');
- }
-
- /**
- * Remove the index.php file from a path.
- *
- * @param string $root
- * @return string
- */
- protected function removeIndex($root)
- {
- $i = 'index.php';
-
- return str_contains($root, $i) ? str_replace('/'.$i, '', $root) : $root;
- }
-
- /**
- * Generate a URL to a secure asset.
- *
- * @param string $path
- * @return string
- */
- public function secureAsset($path)
- {
- return $this->asset($path, true);
- }
-
- /**
- * Get the scheme for a raw URL.
- *
- * @param bool|null $secure
- * @return string
- */
- protected function getScheme($secure)
- {
- if (is_null($secure))
- {
- if (is_null($this->cachedSchema))
- {
- $this->cachedSchema = $this->forceSchema ?: $this->request->getScheme().'://';
- }
-
- return $this->cachedSchema;
- }
-
- return $secure ? 'https://' : 'http://';
- }
-
- /**
- * Force the schema for URLs.
- *
- * @param string $schema
- * @return void
- */
- public function forceSchema($schema)
- {
- $this->cachedSchema = null;
-
- $this->forceSchema = $schema.'://';
- }
-
- /**
- * Get the URL to a named route.
- *
- * @param string $name
- * @param mixed $parameters
- * @param bool $absolute
- * @return string
- *
- * @throws \InvalidArgumentException
- */
- public function route($name, $parameters = array(), $absolute = true)
- {
- if ( ! is_null($route = $this->routes->getByName($name)))
- {
- return $this->toRoute($route, $parameters, $absolute);
- }
-
- throw new InvalidArgumentException("Route [{$name}] not defined.");
- }
-
- /**
- * Get the URL for a given route instance.
- *
- * @param \Illuminate\Routing\Route $route
- * @param mixed $parameters
- * @param bool $absolute
- * @return string
- */
- protected function toRoute($route, $parameters, $absolute)
- {
- $parameters = $this->formatParameters($parameters);
-
- $domain = $this->getRouteDomain($route, $parameters);
-
- $uri = strtr(rawurlencode($this->addQueryString($this->trimUrl(
- $root = $this->replaceRoot($route, $domain, $parameters),
- $this->replaceRouteParameters($route->uri(), $parameters)
- ), $parameters)), $this->dontEncode);
-
- return $absolute ? $uri : '/'.ltrim(str_replace($root, '', $uri), '/');
- }
-
- /**
- * Replace the parameters on the root path.
- *
- * @param \Illuminate\Routing\Route $route
- * @param string $domain
- * @param array $parameters
- * @return string
- */
- protected function replaceRoot($route, $domain, &$parameters)
- {
- return $this->replaceRouteParameters($this->getRouteRoot($route, $domain), $parameters);
- }
-
- /**
- * Replace all of the wildcard parameters for a route path.
- *
- * @param string $path
- * @param array $parameters
- * @return string
- */
- protected function replaceRouteParameters($path, array &$parameters)
- {
- if (count($parameters))
- {
- $path = preg_replace_sub(
- '/\{.*?\}/', $parameters, $this->replaceNamedParameters($path, $parameters)
- );
- }
-
- return trim(preg_replace('/\{.*?\?\}/', '', $path), '/');
- }
-
- /**
- * Replace all of the named parameters in the path.
- *
- * @param string $path
- * @param array $parameters
- * @return string
- */
- protected function replaceNamedParameters($path, &$parameters)
- {
- return preg_replace_callback('/\{(.*?)\??\}/', function($m) use (&$parameters)
- {
- return isset($parameters[$m[1]]) ? array_pull($parameters, $m[1]) : $m[0];
-
- }, $path);
- }
-
- /**
- * Add a query string to the URI.
- *
- * @param string $uri
- * @param array $parameters
- * @return mixed|string
- */
- protected function addQueryString($uri, array $parameters)
- {
- // If the URI has a fragment, we will move it to the end of the URI since it will
- // need to come after any query string that may be added to the URL else it is
- // not going to be available. We will remove it then append it back on here.
- if ( ! is_null($fragment = parse_url($uri, PHP_URL_FRAGMENT)))
- {
- $uri = preg_replace('/#.*/', '', $uri);
- }
-
- $uri .= $this->getRouteQueryString($parameters);
-
- return is_null($fragment) ? $uri : $uri."#{$fragment}";
- }
-
- /**
- * Format the array of URL parameters.
- *
- * @param mixed|array $parameters
- * @return array
- */
- protected function formatParameters($parameters)
- {
- return $this->replaceRoutableParameters($parameters);
- }
-
- /**
- * Replace UrlRoutable parameters with their route parameter.
- *
- * @param array $parameters
- * @return array
- */
- protected function replaceRoutableParameters($parameters = array())
- {
- $parameters = is_array($parameters) ? $parameters : array($parameters);
-
- foreach ($parameters as $key => $parameter)
- {
- if ($parameter instanceof UrlRoutable)
- {
- $parameters[$key] = $parameter->getRouteKey();
- }
- }
-
- return $parameters;
- }
-
- /**
- * Get the query string for a given route.
- *
- * @param array $parameters
- * @return string
- */
- 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)
- );
-
- // 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 make the initial query string if it wasn't started with strings.
- if (count($keyed) < count($parameters))
- {
- $query .= '&'.implode(
- '&', $this->getNumericParameters($parameters)
- );
- }
-
- return '?'.trim($query, '&');
- }
-
- /**
- * Get the string parameters from a given list.
- *
- * @param array $parameters
- * @return array
- */
- protected function getStringParameters(array $parameters)
- {
- return array_where($parameters, function($k, $v) { return is_string($k); });
- }
-
- /**
- * Get the numeric parameters from a given list.
- *
- * @param array $parameters
- * @return array
- */
- protected function getNumericParameters(array $parameters)
- {
- return array_where($parameters, function($k, $v) { return is_numeric($k); });
- }
-
- /**
- * Get the formatted domain for a given route.
- *
- * @param \Illuminate\Routing\Route $route
- * @param array $parameters
- * @return string
- */
- protected function getRouteDomain($route, &$parameters)
- {
- return $route->domain() ? $this->formatDomain($route, $parameters) : null;
- }
-
- /**
- * Format the domain and port for the route and request.
- *
- * @param \Illuminate\Routing\Route $route
- * @param array $parameters
- * @return string
- */
- protected function formatDomain($route, &$parameters)
- {
- return $this->addPortToDomain($this->getDomainAndScheme($route));
- }
-
- /**
- * Get the domain and scheme for the route.
- *
- * @param \Illuminate\Routing\Route $route
- * @return string
- */
- protected function getDomainAndScheme($route)
- {
- return $this->getRouteScheme($route).$route->domain();
- }
-
- /**
- * Add the port to the domain if necessary.
- *
- * @param string $domain
- * @return string
- */
- protected function addPortToDomain($domain)
- {
- if (in_array($this->request->getPort(), array('80', '443')))
- {
- return $domain;
- }
-
- return $domain.':'.$this->request->getPort();
- }
-
- /**
- * Get the root of the route URL.
- *
- * @param \Illuminate\Routing\Route $route
- * @param string $domain
- * @return string
- */
- protected function getRouteRoot($route, $domain)
- {
- return $this->getRootUrl($this->getRouteScheme($route), $domain);
- }
-
- /**
- * Get the scheme for the given route.
- *
- * @param \Illuminate\Routing\Route $route
- * @return string
- */
- protected function getRouteScheme($route)
- {
- if ($route->httpOnly())
- {
- return $this->getScheme(false);
- }
- elseif ($route->httpsOnly())
- {
- return $this->getScheme(true);
- }
-
- return $this->getScheme(null);
- }
-
- /**
- * Get the URL to a controller action.
- *
- * @param string $action
- * @param mixed $parameters
- * @param bool $absolute
- * @return string
- *
- * @throws \InvalidArgumentException
- */
- public function action($action, $parameters = array(), $absolute = true)
- {
- if ($this->rootNamespace && ! (strpos($action, '\\') === 0))
- {
- $action = $this->rootNamespace.'\\'.$action;
- }
- else
- {
- $action = trim($action, '\\');
- }
-
- if ( ! is_null($route = $this->routes->getByAction($action)))
- {
- return $this->toRoute($route, $parameters, $absolute);
- }
-
- throw new InvalidArgumentException("Action {$action} not defined.");
- }
-
- /**
- * Get the base URL for the request.
- *
- * @param string $scheme
- * @param string $root
- * @return string
- */
- protected function getRootUrl($scheme, $root = null)
- {
- if (is_null($root))
- {
- if (is_null($this->cachedRoot))
- {
- $this->cachedRoot = $this->forcedRoot ?: $this->request->root();
- }
-
- $root = $this->cachedRoot;
- }
-
- $start = starts_with($root, 'http://') ? 'http://' : 'https://';
-
- return preg_replace('~'.$start.'~', $scheme, $root, 1);
- }
-
- /**
- * Set the forced root URL.
- *
- * @param string $root
- * @return void
- */
- public function forceRootUrl($root)
- {
- $this->forcedRoot = rtrim($root, '/');
- $this->cachedRoot = null;
- }
-
- /**
- * Determine if the given path is a valid URL.
- *
- * @param string $path
- * @return bool
- */
- public function isValidUrl($path)
- {
- if (starts_with($path, ['#', '//', 'mailto:', 'tel:', 'http://', 'https://'])) return true;
-
- return filter_var($path, FILTER_VALIDATE_URL) !== false;
- }
-
- /**
- * Format the given URL segments into a single URL.
- *
- * @param string $root
- * @param string $path
- * @param string $tail
- * @return string
- */
- protected function trimUrl($root, $path, $tail = '')
- {
- return trim($root.'/'.trim($path.'/'.$tail, '/'), '/');
- }
-
- /**
- * Get the request instance.
- *
- * @return \Symfony\Component\HttpFoundation\Request
- */
- public function getRequest()
- {
- return $this->request;
- }
-
- /**
- * Set the current request instance.
- *
- * @param \Illuminate\Http\Request $request
- * @return void
- */
- public function setRequest(Request $request)
- {
- $this->request = $request;
-
- $this->cachedRoot = null;
- $this->cachedSchema = null;
- }
-
- /**
- * Set the route collection.
- *
- * @param \Illuminate\Routing\RouteCollection $routes
- * @return $this
- */
- public function setRoutes(RouteCollection $routes)
- {
- $this->routes = $routes;
-
- return $this;
- }
-
- /**
- * Get the previous URL from the session if possible.
- *
- * @return string|null
- */
- protected function getPreviousUrlFromSession()
- {
- $session = $this->getSession();
-
- return $session ? $session->previousUrl() : null;
- }
-
- /**
- * Get the session implementation from the resolver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function getSession()
- {
- return call_user_func($this->sessionResolver ?: function() {});
- }
-
- /**
- * Set the session resolver for the generator.
- *
- * @param callable $sessionResolver
- * @return $this
- */
- public function setSessionResolver(callable $sessionResolver)
- {
- $this->sessionResolver = $sessionResolver;
-
- return $this;
- }
-
- /**
- * Set the root controller namespace.
- *
- * @param string $rootNamespace
- * @return $this
- */
- public function setRootControllerNamespace($rootNamespace)
- {
- $this->rootNamespace = $rootNamespace;
-
- return $this;
- }
-
+class UrlGenerator implements UrlGeneratorContract
+{
+ use Macroable;
+
+ /**
+ * The route collection.
+ *
+ * @var \Illuminate\Routing\RouteCollection
+ */
+ protected $routes;
+
+ /**
+ * The request instance.
+ *
+ * @var \Illuminate\Http\Request
+ */
+ protected $request;
+
+ /**
+ * The forced URL root.
+ *
+ * @var string
+ */
+ protected $forcedRoot;
+
+ /**
+ * The forced schema for URLs.
+ *
+ * @var string
+ */
+ protected $forceSchema;
+
+ /**
+ * A cached copy of the URL root for the current request.
+ *
+ * @var string|null
+ */
+ protected $cachedRoot;
+
+ /**
+ * A cached copy of the URL schema for the current request.
+ *
+ * @var string|null
+ */
+ protected $cachedSchema;
+
+ /**
+ * The root namespace being applied to controller actions.
+ *
+ * @var string
+ */
+ protected $rootNamespace;
+
+ /**
+ * The session resolver callable.
+ *
+ * @var callable
+ */
+ protected $sessionResolver;
+
+ /**
+ * Characters that should not be URL encoded.
+ *
+ * @var array
+ */
+ protected $dontEncode = [
+ '%2F' => '/',
+ '%40' => '@',
+ '%3A' => ':',
+ '%3B' => ';',
+ '%2C' => ',',
+ '%3D' => '=',
+ '%2B' => '+',
+ '%21' => '!',
+ '%2A' => '*',
+ '%7C' => '|',
+ '%3F' => '?',
+ '%26' => '&',
+ '%23' => '#',
+ '%25' => '%',
+ ];
+
+ /**
+ * Create a new URL Generator instance.
+ *
+ * @param \Illuminate\Routing\RouteCollection $routes
+ * @param \Illuminate\Http\Request $request
+ * @return void
+ */
+ public function __construct(RouteCollection $routes, Request $request)
+ {
+ $this->routes = $routes;
+
+ $this->setRequest($request);
+ }
+
+ /**
+ * Get the full URL for the current request.
+ *
+ * @return string
+ */
+ public function full()
+ {
+ return $this->request->fullUrl();
+ }
+
+ /**
+ * Get the current URL for the request.
+ *
+ * @return string
+ */
+ public function current()
+ {
+ return $this->to($this->request->getPathInfo());
+ }
+
+ /**
+ * Get the URL for the previous request.
+ *
+ * @return string
+ */
+ public function previous()
+ {
+ $referrer = $this->request->headers->get('referer');
+
+ $url = $referrer ? $this->to($referrer) : $this->getPreviousUrlFromSession();
+
+ return $url ?: $this->to('/');
+ }
+
+ /**
+ * Generate an absolute URL to the given path.
+ *
+ * @param string $path
+ * @param mixed $extra
+ * @param bool|null $secure
+ * @return string
+ */
+ public function to($path, $extra = [], $secure = null)
+ {
+ // First we will check if the URL is already a valid URL. If it is we will not
+ // try to generate a new one but will simply return the URL as is, which is
+ // convenient since developers do not always have to check if it's valid.
+ if ($this->isValidUrl($path)) {
+ return $path;
+ }
+
+ $scheme = $this->getScheme($secure);
+
+ $extra = $this->formatParameters($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
+ // for passing the array of parameters to this URL as a list of segments.
+ $root = $this->getRootUrl($scheme);
+
+ if (($queryPosition = strpos($path, '?')) !== false) {
+ $query = substr($path, $queryPosition);
+ $path = substr($path, 0, $queryPosition);
+ } else {
+ $query = '';
+ }
+
+ return $this->trimUrl($root, $path, $tail).$query;
+ }
+
+ /**
+ * Generate a secure, absolute URL to the given path.
+ *
+ * @param string $path
+ * @param array $parameters
+ * @return string
+ */
+ public function secure($path, $parameters = [])
+ {
+ return $this->to($path, $parameters, true);
+ }
+
+ /**
+ * Generate a URL to an application asset.
+ *
+ * @param string $path
+ * @param bool|null $secure
+ * @return string
+ */
+ public function asset($path, $secure = null)
+ {
+ if ($this->isValidUrl($path)) {
+ return $path;
+ }
+
+ // Once we get the root URL, we will check to see if it contains an index.php
+ // file in the paths. If it does, we will remove it since it is not needed
+ // for asset paths, but only for routes to endpoints in the application.
+ $root = $this->getRootUrl($this->getScheme($secure));
+
+ return $this->removeIndex($root).'/'.trim($path, '/');
+ }
+
+ /**
+ * Generate a URL to an asset from a custom root domain such as CDN, etc.
+ *
+ * @param string $root
+ * @param string $path
+ * @param bool|null $secure
+ * @return string
+ */
+ public function assetFrom($root, $path, $secure = null)
+ {
+ // Once we get the root URL, we will check to see if it contains an index.php
+ // file in the paths. If it does, we will remove it since it is not needed
+ // for asset paths, but only for routes to endpoints in the application.
+ $root = $this->getRootUrl($this->getScheme($secure), $root);
+
+ return $this->removeIndex($root).'/'.trim($path, '/');
+ }
+
+ /**
+ * Remove the index.php file from a path.
+ *
+ * @param string $root
+ * @return string
+ */
+ protected function removeIndex($root)
+ {
+ $i = 'index.php';
+
+ return Str::contains($root, $i) ? str_replace('/'.$i, '', $root) : $root;
+ }
+
+ /**
+ * Generate a URL to a secure asset.
+ *
+ * @param string $path
+ * @return string
+ */
+ public function secureAsset($path)
+ {
+ return $this->asset($path, true);
+ }
+
+ /**
+ * Get the scheme for a raw URL.
+ *
+ * @param bool|null $secure
+ * @return string
+ */
+ protected function getScheme($secure)
+ {
+ if (is_null($secure)) {
+ if (is_null($this->cachedSchema)) {
+ $this->cachedSchema = $this->forceSchema ?: $this->request->getScheme().'://';
+ }
+
+ return $this->cachedSchema;
+ }
+
+ return $secure ? 'https://' : 'http://';
+ }
+
+ /**
+ * Force the schema for URLs.
+ *
+ * @param string $schema
+ * @return void
+ */
+ public function forceSchema($schema)
+ {
+ $this->cachedSchema = null;
+
+ $this->forceSchema = $schema.'://';
+ }
+
+ /**
+ * Get the URL to a named route.
+ *
+ * @param string $name
+ * @param mixed $parameters
+ * @param bool $absolute
+ * @return string
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function route($name, $parameters = [], $absolute = true)
+ {
+ if (! is_null($route = $this->routes->getByName($name))) {
+ return $this->toRoute($route, $parameters, $absolute);
+ }
+
+ throw new InvalidArgumentException("Route [{$name}] not defined.");
+ }
+
+ /**
+ * Get the URL for a given route instance.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param mixed $parameters
+ * @param bool $absolute
+ * @return string
+ */
+ protected function toRoute($route, $parameters, $absolute)
+ {
+ $parameters = $this->formatParameters($parameters);
+
+ $domain = $this->getRouteDomain($route, $parameters);
+
+ $uri = strtr(rawurlencode($this->addQueryString($this->trimUrl(
+ $root = $this->replaceRoot($route, $domain, $parameters),
+ $this->replaceRouteParameters($route->uri(), $parameters)
+ ), $parameters)), $this->dontEncode);
+
+ return $absolute ? $uri : '/'.ltrim(str_replace($root, '', $uri), '/');
+ }
+
+ /**
+ * Replace the parameters on the root path.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param string $domain
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRoot($route, $domain, &$parameters)
+ {
+ return $this->replaceRouteParameters($this->getRouteRoot($route, $domain), $parameters);
+ }
+
+ /**
+ * Replace all of the wildcard parameters for a route path.
+ *
+ * @param string $path
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRouteParameters($path, array &$parameters)
+ {
+ if (count($parameters)) {
+ $path = preg_replace_sub(
+ '/\{.*?\}/', $parameters, $this->replaceNamedParameters($path, $parameters)
+ );
+ }
+
+ return trim(preg_replace('/\{.*?\?\}/', '', $path), '/');
+ }
+
+ /**
+ * Replace all of the named parameters in the path.
+ *
+ * @param string $path
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceNamedParameters($path, &$parameters)
+ {
+ return preg_replace_callback('/\{(.*?)\??\}/', function ($m) use (&$parameters) {
+ return isset($parameters[$m[1]]) ? Arr::pull($parameters, $m[1]) : $m[0];
+ }, $path);
+ }
+
+ /**
+ * Add a query string to the URI.
+ *
+ * @param string $uri
+ * @param array $parameters
+ * @return mixed|string
+ */
+ protected function addQueryString($uri, array $parameters)
+ {
+ // If the URI has a fragment, we will move it to the end of the URI since it will
+ // need to come after any query string that may be added to the URL else it is
+ // not going to be available. We will remove it then append it back on here.
+ if (! is_null($fragment = parse_url($uri, PHP_URL_FRAGMENT))) {
+ $uri = preg_replace('/#.*/', '', $uri);
+ }
+
+ $uri .= $this->getRouteQueryString($parameters);
+
+ return is_null($fragment) ? $uri : $uri."#{$fragment}";
+ }
+
+ /**
+ * Format the array of URL parameters.
+ *
+ * @param mixed|array $parameters
+ * @return array
+ */
+ protected function formatParameters($parameters)
+ {
+ return $this->replaceRoutableParameters($parameters);
+ }
+
+ /**
+ * Replace UrlRoutable parameters with their route parameter.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function replaceRoutableParameters($parameters = [])
+ {
+ $parameters = is_array($parameters) ? $parameters : [$parameters];
+
+ foreach ($parameters as $key => $parameter) {
+ if ($parameter instanceof UrlRoutable) {
+ $parameters[$key] = $parameter->getRouteKey();
+ }
+ }
+
+ return $parameters;
+ }
+
+ /**
+ * Get the query string for a given route.
+ *
+ * @param array $parameters
+ * @return string
+ */
+ 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)
+ );
+
+ // 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 make the initial query string if it wasn't started with strings.
+ if (count($keyed) < count($parameters)) {
+ $query .= '&'.implode(
+ '&', $this->getNumericParameters($parameters)
+ );
+ }
+
+ return '?'.trim($query, '&');
+ }
+
+ /**
+ * Get the string parameters from a given list.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function getStringParameters(array $parameters)
+ {
+ return Arr::where($parameters, function ($k) {
+ return is_string($k);
+ });
+ }
+
+ /**
+ * Get the numeric parameters from a given list.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function getNumericParameters(array $parameters)
+ {
+ return Arr::where($parameters, function ($k) {
+ return is_numeric($k);
+ });
+ }
+
+ /**
+ * Get the formatted domain for a given route.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param array $parameters
+ * @return string
+ */
+ protected function getRouteDomain($route, &$parameters)
+ {
+ return $route->domain() ? $this->formatDomain($route, $parameters) : null;
+ }
+
+ /**
+ * Format the domain and port for the route and request.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param array $parameters
+ * @return string
+ */
+ protected function formatDomain($route, &$parameters)
+ {
+ return $this->addPortToDomain($this->getDomainAndScheme($route));
+ }
+
+ /**
+ * Get the domain and scheme for the route.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return string
+ */
+ protected function getDomainAndScheme($route)
+ {
+ return $this->getRouteScheme($route).$route->domain();
+ }
+
+ /**
+ * Add the port to the domain if necessary.
+ *
+ * @param string $domain
+ * @return string
+ */
+ protected function addPortToDomain($domain)
+ {
+ $secure = $this->request->isSecure();
+
+ $port = (int) $this->request->getPort();
+
+ if (($secure && $port === 443) || (! $secure && $port === 80)) {
+ return $domain;
+ }
+
+ return $domain.':'.$port;
+ }
+
+ /**
+ * Get the root of the route URL.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @param string $domain
+ * @return string
+ */
+ protected function getRouteRoot($route, $domain)
+ {
+ return $this->getRootUrl($this->getRouteScheme($route), $domain);
+ }
+
+ /**
+ * Get the scheme for the given route.
+ *
+ * @param \Illuminate\Routing\Route $route
+ * @return string
+ */
+ protected function getRouteScheme($route)
+ {
+ if ($route->httpOnly()) {
+ return $this->getScheme(false);
+ } elseif ($route->httpsOnly()) {
+ return $this->getScheme(true);
+ }
+
+ return $this->getScheme(null);
+ }
+
+ /**
+ * Get the URL to a controller action.
+ *
+ * @param string $action
+ * @param mixed $parameters
+ * @param bool $absolute
+ * @return string
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function action($action, $parameters = [], $absolute = true)
+ {
+ if ($this->rootNamespace && ! (strpos($action, '\\') === 0)) {
+ $action = $this->rootNamespace.'\\'.$action;
+ } else {
+ $action = trim($action, '\\');
+ }
+
+ if (! is_null($route = $this->routes->getByAction($action))) {
+ return $this->toRoute($route, $parameters, $absolute);
+ }
+
+ throw new InvalidArgumentException("Action {$action} not defined.");
+ }
+
+ /**
+ * Get the base URL for the request.
+ *
+ * @param string $scheme
+ * @param string $root
+ * @return string
+ */
+ protected function getRootUrl($scheme, $root = null)
+ {
+ if (is_null($root)) {
+ if (is_null($this->cachedRoot)) {
+ $this->cachedRoot = $this->forcedRoot ?: $this->request->root();
+ }
+
+ $root = $this->cachedRoot;
+ }
+
+ $start = Str::startsWith($root, 'http://') ? 'http://' : 'https://';
+
+ return preg_replace('~'.$start.'~', $scheme, $root, 1);
+ }
+
+ /**
+ * Set the forced root URL.
+ *
+ * @param string $root
+ * @return void
+ */
+ public function forceRootUrl($root)
+ {
+ $this->forcedRoot = rtrim($root, '/');
+ $this->cachedRoot = null;
+ }
+
+ /**
+ * Determine if the given path is a valid URL.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isValidUrl($path)
+ {
+ if (Str::startsWith($path, ['#', '//', 'mailto:', 'tel:', 'http://', 'https://'])) {
+ return true;
+ }
+
+ return filter_var($path, FILTER_VALIDATE_URL) !== false;
+ }
+
+ /**
+ * Format the given URL segments into a single URL.
+ *
+ * @param string $root
+ * @param string $path
+ * @param string $tail
+ * @return string
+ */
+ protected function trimUrl($root, $path, $tail = '')
+ {
+ return trim($root.'/'.trim($path.'/'.$tail, '/'), '/');
+ }
+
+ /**
+ * Get the request instance.
+ *
+ * @return \Illuminate\Http\Request
+ */
+ public function getRequest()
+ {
+ return $this->request;
+ }
+
+ /**
+ * Set the current request instance.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return void
+ */
+ public function setRequest(Request $request)
+ {
+ $this->request = $request;
+
+ $this->cachedRoot = null;
+ $this->cachedSchema = null;
+ }
+
+ /**
+ * Set the route collection.
+ *
+ * @param \Illuminate\Routing\RouteCollection $routes
+ * @return $this
+ */
+ public function setRoutes(RouteCollection $routes)
+ {
+ $this->routes = $routes;
+
+ return $this;
+ }
+
+ /**
+ * Get the previous URL from the session if possible.
+ *
+ * @return string|null
+ */
+ protected function getPreviousUrlFromSession()
+ {
+ $session = $this->getSession();
+
+ return $session ? $session->previousUrl() : null;
+ }
+
+ /**
+ * Get the session implementation from the resolver.
+ *
+ * @return \Illuminate\Session\Store|null
+ */
+ protected function getSession()
+ {
+ if ($this->sessionResolver) {
+ return call_user_func($this->sessionResolver);
+ }
+ }
+
+ /**
+ * Set the session resolver for the generator.
+ *
+ * @param callable $sessionResolver
+ * @return $this
+ */
+ public function setSessionResolver(callable $sessionResolver)
+ {
+ $this->sessionResolver = $sessionResolver;
+
+ return $this;
+ }
+
+ /**
+ * Set the root controller namespace.
+ *
+ * @param string $rootNamespace
+ * @return $this
+ */
+ public function setRootControllerNamespace($rootNamespace)
+ {
+ $this->rootNamespace = $rootNamespace;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Routing/composer.json b/application/vendor/laravel/framework/src/Illuminate/Routing/composer.json
index f2d2d1f..af0a63b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Routing/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Routing/composer.json
@@ -14,16 +14,16 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/container": "5.0.*",
- "illuminate/contracts": "5.0.*",
- "illuminate/http": "5.0.*",
- "illuminate/pipeline": "5.0.*",
- "illuminate/session": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/http-foundation": "2.6.*",
- "symfony/http-kernel": "2.6.*",
- "symfony/routing": "2.6.*"
+ "php": ">=5.5.9",
+ "illuminate/container": "5.1.*",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/http": "5.1.*",
+ "illuminate/pipeline": "5.1.*",
+ "illuminate/session": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/http-foundation": "2.7.*",
+ "symfony/http-kernel": "2.7.*",
+ "symfony/routing": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -32,11 +32,12 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "illuminate/console": "Required to use the make commands (5.0.*)."
+ "illuminate/console": "Required to use the make commands (5.1.*).",
+ "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/CacheBasedSessionHandler.php b/application/vendor/laravel/framework/src/Illuminate/Session/CacheBasedSessionHandler.php
index fce32e6..a2990bd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/CacheBasedSessionHandler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/CacheBasedSessionHandler.php
@@ -1,93 +1,94 @@
-cache = $cache;
- $this->minutes = $minutes;
- }
+ /**
+ * The number of minutes to store the data in the cache.
+ *
+ * @var int
+ */
+ protected $minutes;
- /**
- * {@inheritDoc}
- */
- public function open($savePath, $sessionName)
- {
- return true;
- }
+ /**
+ * Create a new cache driven handler instance.
+ *
+ * @param \Illuminate\Contracts\Cache\Repository $cache
+ * @param int $minutes
+ * @return void
+ */
+ public function __construct(CacheContract $cache, $minutes)
+ {
+ $this->cache = $cache;
+ $this->minutes = $minutes;
+ }
- /**
- * {@inheritDoc}
- */
- public function close()
- {
- return true;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function open($savePath, $sessionName)
+ {
+ return true;
+ }
- /**
- * {@inheritDoc}
- */
- public function read($sessionId)
- {
- return $this->cache->get($sessionId, '');
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function close()
+ {
+ return true;
+ }
- /**
- * {@inheritDoc}
- */
- public function write($sessionId, $data)
- {
- return $this->cache->put($sessionId, $data, $this->minutes);
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function read($sessionId)
+ {
+ return $this->cache->get($sessionId, '');
+ }
- /**
- * {@inheritDoc}
- */
- public function destroy($sessionId)
- {
- return $this->cache->forget($sessionId);
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function write($sessionId, $data)
+ {
+ return $this->cache->put($sessionId, $data, $this->minutes);
+ }
- /**
- * {@inheritDoc}
- */
- public function gc($lifetime)
- {
- return true;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function destroy($sessionId)
+ {
+ return $this->cache->forget($sessionId);
+ }
- /**
- * Get the underlying cache repository.
- *
- * @return \Illuminate\Contracts\Cache\Repository
- */
- public function getCache()
- {
- return $this->cache;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function gc($lifetime)
+ {
+ return true;
+ }
+ /**
+ * Get the underlying cache repository.
+ *
+ * @return \Illuminate\Contracts\Cache\Repository
+ */
+ public function getCache()
+ {
+ return $this->cache;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/CommandsServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Session/CommandsServiceProvider.php
index 9f9c897..9514c4f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/CommandsServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/CommandsServiceProvider.php
@@ -1,39 +1,40 @@
-app->singleton('command.session.database', function($app)
- {
- return new Console\SessionTableCommand($app['files'], $app['composer']);
- });
+class CommandsServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
- $this->commands('command.session.database');
- }
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('command.session.database', function ($app) {
+ return new SessionTableCommand($app['files'], $app['composer']);
+ });
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array('command.session.database');
- }
+ $this->commands('command.session.database');
+ }
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['command.session.database'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/Console/SessionTableCommand.php b/application/vendor/laravel/framework/src/Illuminate/Session/Console/SessionTableCommand.php
index 455b5fa..2290d3c 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/Console/SessionTableCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/Console/SessionTableCommand.php
@@ -1,80 +1,81 @@
-files = $files;
- $this->composer = $composer;
- }
-
- /**
- * Execute the console command.
- *
- * @return void
- */
- public function fire()
- {
- $fullPath = $this->createBaseMigration();
-
- $this->files->put($fullPath, $this->files->get(__DIR__.'/stubs/database.stub'));
-
- $this->info('Migration created successfully!');
-
- $this->composer->dumpAutoloads();
- }
-
- /**
- * Create a base migration file for the session.
- *
- * @return string
- */
- protected function createBaseMigration()
- {
- $name = 'create_session_table';
-
- $path = $this->laravel->databasePath().'/migrations';
-
- return $this->laravel['migration.creator']->create($name, $path);
- }
-
+class SessionTableCommand extends Command
+{
+ /**
+ * The console command name.
+ *
+ * @var string
+ */
+ protected $name = 'session:table';
+
+ /**
+ * The console command description.
+ *
+ * @var string
+ */
+ protected $description = 'Create a migration for the session database table';
+
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * @var \Illuminate\Foundation\Composer
+ */
+ protected $composer;
+
+ /**
+ * Create a new session table command instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param \Illuminate\Foundation\Composer $composer
+ * @return void
+ */
+ public function __construct(Filesystem $files, Composer $composer)
+ {
+ parent::__construct();
+
+ $this->files = $files;
+ $this->composer = $composer;
+ }
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $fullPath = $this->createBaseMigration();
+
+ $this->files->put($fullPath, $this->files->get(__DIR__.'/stubs/database.stub'));
+
+ $this->info('Migration created successfully!');
+
+ $this->composer->dumpAutoloads();
+ }
+
+ /**
+ * Create a base migration file for the session.
+ *
+ * @return string
+ */
+ protected function createBaseMigration()
+ {
+ $name = 'create_sessions_table';
+
+ $path = $this->laravel->databasePath().'/migrations';
+
+ return $this->laravel['migration.creator']->create($name, $path);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub b/application/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub
index 2aac433..0529755 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub
@@ -1,32 +1,31 @@
string('id')->unique();
- $t->text('payload');
- $t->integer('last_activity');
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::drop('sessions');
- }
+class CreateSessionsTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('sessions', function (Blueprint $table) {
+ $table->string('id')->unique();
+ $table->text('payload');
+ $table->integer('last_activity');
+ });
+ }
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('sessions');
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/CookieSessionHandler.php b/application/vendor/laravel/framework/src/Illuminate/Session/CookieSessionHandler.php
index 7fc6ffa..0a9bac6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/CookieSessionHandler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/CookieSessionHandler.php
@@ -1,95 +1,108 @@
-cookie = $cookie;
+ $this->minutes = $minutes;
+ }
- /**
- * Create a new cookie driven handler instance.
- *
- * @param \Illuminate\Contracts\Cookie\QueueingFactory $cookie
- * @param int $minutes
- * @return void
- */
- public function __construct(CookieJar $cookie, $minutes)
- {
- $this->cookie = $cookie;
- $this->minutes = $minutes;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function open($savePath, $sessionName)
+ {
+ return true;
+ }
- /**
- * {@inheritDoc}
- */
- public function open($savePath, $sessionName)
- {
- return true;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function close()
+ {
+ return true;
+ }
- /**
- * {@inheritDoc}
- */
- public function close()
- {
- return true;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function read($sessionId)
+ {
+ $value = $this->request->cookies->get($sessionId) ?: '';
- /**
- * {@inheritDoc}
- */
- public function read($sessionId)
- {
- return $this->request->cookies->get($sessionId) ?: '';
- }
+ if (! is_null($decoded = json_decode($value, true)) && is_array($decoded)) {
+ if (isset($decoded['expires']) && time() <= $decoded['expires']) {
+ return $decoded['data'];
+ }
+ }
- /**
- * {@inheritDoc}
- */
- public function write($sessionId, $data)
- {
- $this->cookie->queue($sessionId, $data, $this->minutes);
- }
+ return '';
+ }
- /**
- * {@inheritDoc}
- */
- public function destroy($sessionId)
- {
- $this->cookie->queue($this->cookie->forget($sessionId));
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function write($sessionId, $data)
+ {
+ $this->cookie->queue($sessionId, json_encode([
+ 'data' => $data,
+ 'expires' => Carbon::now()->addMinutes($this->minutes)->getTimestamp(),
+ ]), $this->minutes);
+ }
- /**
- * {@inheritDoc}
- */
- public function gc($lifetime)
- {
- return true;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function destroy($sessionId)
+ {
+ $this->cookie->queue($this->cookie->forget($sessionId));
+ }
- /**
- * Set the request instance.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @return void
- */
- public function setRequest(Request $request)
- {
- $this->request = $request;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function gc($lifetime)
+ {
+ return true;
+ }
+ /**
+ * Set the request instance.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @return void
+ */
+ public function setRequest(Request $request)
+ {
+ $this->request = $request;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/DatabaseSessionHandler.php b/application/vendor/laravel/framework/src/Illuminate/Session/DatabaseSessionHandler.php
index 15d4912..d08d1a1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/DatabaseSessionHandler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/DatabaseSessionHandler.php
@@ -1,133 +1,177 @@
-table = $table;
- $this->connection = $connection;
- }
-
- /**
- * {@inheritDoc}
- */
- public function open($savePath, $sessionName)
- {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public function close()
- {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public function read($sessionId)
- {
- $session = (object) $this->getQuery()->find($sessionId);
-
- if (isset($session->payload))
- {
- $this->exists = true;
-
- return base64_decode($session->payload);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public function write($sessionId, $data)
- {
- if ($this->exists)
- {
- $this->getQuery()->where('id', $sessionId)->update([
- 'payload' => base64_encode($data), 'last_activity' => time(),
- ]);
- }
- else
- {
- $this->getQuery()->insert([
- 'id' => $sessionId, 'payload' => base64_encode($data), 'last_activity' => time(),
- ]);
- }
-
- $this->exists = true;
- }
-
- /**
- * {@inheritDoc}
- */
- public function destroy($sessionId)
- {
- $this->getQuery()->where('id', $sessionId)->delete();
- }
-
- /**
- * {@inheritDoc}
- */
- public function gc($lifetime)
- {
- $this->getQuery()->where('last_activity', '<=', time() - $lifetime)->delete();
- }
-
- /**
- * Get a fresh query builder instance for the table.
- *
- * @return \Illuminate\Database\Query\Builder
- */
- protected function getQuery()
- {
- return $this->connection->table($this->table);
- }
-
- /**
- * Set the existence state for the session.
- *
- * @param bool $value
- * @return $this
- */
- public function setExists($value)
- {
- $this->exists = $value;
-
- return $this;
- }
-
+class DatabaseSessionHandler implements SessionHandlerInterface, ExistenceAwareInterface
+{
+ /**
+ * The database connection instance.
+ *
+ * @var \Illuminate\Database\ConnectionInterface
+ */
+ protected $connection;
+
+ /**
+ * The name of the session table.
+ *
+ * @var string
+ */
+ protected $table;
+
+ /**
+ * The number of minutes the session should be valid.
+ *
+ * @var int
+ */
+ protected $minutes;
+
+ /**
+ * The existence state of the session.
+ *
+ * @var bool
+ */
+ protected $exists;
+
+ /**
+ * Create a new database session handler instance.
+ *
+ * @param \Illuminate\Database\ConnectionInterface $connection
+ * @param string $table
+ * @param int $minutes
+ * @return void
+ */
+ public function __construct(ConnectionInterface $connection, $table, $minutes)
+ {
+ $this->table = $table;
+ $this->minutes = $minutes;
+ $this->connection = $connection;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function open($savePath, $sessionName)
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function close()
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function read($sessionId)
+ {
+ $session = (object) $this->getQuery()->find($sessionId);
+
+ if (isset($session->last_activity)) {
+ if ($session->last_activity < Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {
+ $this->exists = true;
+
+ return;
+ }
+ }
+
+ if (isset($session->payload)) {
+ $this->exists = true;
+
+ return base64_decode($session->payload);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function write($sessionId, $data)
+ {
+ if ($this->exists) {
+ $this->performUpdate($sessionId, $data);
+ } else {
+ $this->performInsert($sessionId, $data);
+ }
+
+ $this->exists = true;
+ }
+
+ /**
+ * Perform an insert operation on the session ID.
+ *
+ * @param string $sessionId
+ * @param string $data
+ * @return void
+ */
+ protected function performInsert($sessionId, $data)
+ {
+ try {
+ return $this->getQuery()->insert([
+ 'id' => $sessionId, 'payload' => base64_encode($data), 'last_activity' => time(),
+ ]);
+ } catch (QueryException $e) {
+ $this->performUpdate($sessionId, $data);
+ }
+ }
+
+ /**
+ * Perform an update operation on the session ID.
+ *
+ * @param string $sessionId
+ * @param string $data
+ * @return int
+ */
+ protected function performUpdate($sessionId, $data)
+ {
+ return $this->getQuery()->where('id', $sessionId)->update([
+ 'payload' => base64_encode($data), 'last_activity' => time(),
+ ]);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function destroy($sessionId)
+ {
+ $this->getQuery()->where('id', $sessionId)->delete();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function gc($lifetime)
+ {
+ $this->getQuery()->where('last_activity', '<=', time() - $lifetime)->delete();
+ }
+
+ /**
+ * Get a fresh query builder instance for the table.
+ *
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function getQuery()
+ {
+ return $this->connection->table($this->table);
+ }
+
+ /**
+ * Set the existence state for the session.
+ *
+ * @param bool $value
+ * @return $this
+ */
+ public function setExists($value)
+ {
+ $this->exists = $value;
+
+ return $this;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/EncryptedStore.php b/application/vendor/laravel/framework/src/Illuminate/Session/EncryptedStore.php
index edf34b8..9811d97 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/EncryptedStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/EncryptedStore.php
@@ -1,72 +1,69 @@
-encrypter = $encrypter;
-
- parent::__construct($name, $handler, $id);
+class EncryptedStore extends Store
+{
+ /**
+ * The encrypter instance.
+ *
+ * @var \Illuminate\Contracts\Encryption\Encrypter
+ */
+ protected $encrypter;
- }
+ /**
+ * Create a new session instance.
+ *
+ * @param string $name
+ * @param \SessionHandlerInterface $handler
+ * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
+ * @param string|null $id
+ * @return void
+ */
+ public function __construct($name, SessionHandlerInterface $handler, EncrypterContract $encrypter, $id = null)
+ {
+ $this->encrypter = $encrypter;
- /**
- * Prepare the raw string data from the session for unserialization.
- *
- * @param string $data
- * @return string
- */
- protected function prepareForUnserialize($data)
- {
- try
- {
- return $this->encrypter->decrypt($data);
- }
- catch (DecryptException $e)
- {
- return serialize([]);
- }
- }
+ parent::__construct($name, $handler, $id);
+ }
- /**
- * Prepare the serialized session data for storage.
- *
- * @param string $data
- * @return string
- */
- protected function prepareForStorage($data)
- {
- return $this->encrypter->encrypt($data);
- }
+ /**
+ * Prepare the raw string data from the session for unserialization.
+ *
+ * @param string $data
+ * @return string
+ */
+ protected function prepareForUnserialize($data)
+ {
+ try {
+ return $this->encrypter->decrypt($data);
+ } catch (DecryptException $e) {
+ return json_encode([]);
+ }
+ }
- /**
- * Get the encrypter instance.
- *
- * @return \Illuminate\Contracts\Encryption\Encrypter
- */
- public function getEncrypter()
- {
- return $this->encrypter;
- }
+ /**
+ * Prepare the serialized session data for storage.
+ *
+ * @param string $data
+ * @return string
+ */
+ protected function prepareForStorage($data)
+ {
+ return $this->encrypter->encrypt($data);
+ }
+ /**
+ * Get the encrypter instance.
+ *
+ * @return \Illuminate\Contracts\Encryption\Encrypter
+ */
+ public function getEncrypter()
+ {
+ return $this->encrypter;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/ExistenceAwareInterface.php b/application/vendor/laravel/framework/src/Illuminate/Session/ExistenceAwareInterface.php
index 8826531..4a6bd98 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/ExistenceAwareInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/ExistenceAwareInterface.php
@@ -1,13 +1,14 @@
-path = $path;
- $this->files = $files;
- }
+ /**
+ * The number of minutes the session should be valid.
+ *
+ * @var int
+ */
+ protected $minutes;
- /**
- * {@inheritDoc}
- */
- public function open($savePath, $sessionName)
- {
- return true;
- }
+ /**
+ * Create a new file driven handler instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param string $path
+ * @param int $minutes
+ * @return void
+ */
+ public function __construct(Filesystem $files, $path, $minutes)
+ {
+ $this->path = $path;
+ $this->files = $files;
+ $this->minutes = $minutes;
+ }
- /**
- * {@inheritDoc}
- */
- public function close()
- {
- return true;
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function open($savePath, $sessionName)
+ {
+ return true;
+ }
- /**
- * {@inheritDoc}
- */
- public function read($sessionId)
- {
- if ($this->files->exists($path = $this->path.'/'.$sessionId))
- {
- return $this->files->get($path);
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function close()
+ {
+ return true;
+ }
- return '';
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function read($sessionId)
+ {
+ if ($this->files->exists($path = $this->path.'/'.$sessionId)) {
+ if (filemtime($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {
+ return $this->files->get($path);
+ }
+ }
- /**
- * {@inheritDoc}
- */
- public function write($sessionId, $data)
- {
- $this->files->put($this->path.'/'.$sessionId, $data, true);
- }
+ return '';
+ }
- /**
- * {@inheritDoc}
- */
- public function destroy($sessionId)
- {
- $this->files->delete($this->path.'/'.$sessionId);
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function write($sessionId, $data)
+ {
+ $this->files->put($this->path.'/'.$sessionId, $data, true);
+ }
- /**
- * {@inheritDoc}
- */
- public function gc($lifetime)
- {
- $files = Finder::create()
- ->in($this->path)
- ->files()
- ->ignoreDotFiles(true)
- ->date('<= now - '.$lifetime.' seconds');
+ /**
+ * {@inheritdoc}
+ */
+ public function destroy($sessionId)
+ {
+ $this->files->delete($this->path.'/'.$sessionId);
+ }
- foreach ($files as $file)
- {
- $this->files->delete($file->getRealPath());
- }
- }
+ /**
+ * {@inheritdoc}
+ */
+ public function gc($lifetime)
+ {
+ $files = Finder::create()
+ ->in($this->path)
+ ->files()
+ ->ignoreDotFiles(true)
+ ->date('<= now - '.$lifetime.' seconds');
+ foreach ($files as $file) {
+ $this->files->delete($file->getRealPath());
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php b/application/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php
index 318e28f..5372024 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php
@@ -1,248 +1,244 @@
-manager = $manager;
- }
-
- /**
- * Handle an incoming request.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @return mixed
- */
- public function handle($request, Closure $next)
- {
- $this->sessionHandled = true;
-
- // 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 = $next($request);
-
- // Again, if the session has been configured we will need to close out the session
- // so that the attributes may be persisted to some storage medium. We will also
- // add the session identifier cookie to the application response headers now.
- if ($this->sessionConfigured())
- {
- $this->storeCurrentUrl($request, $session);
-
- $this->collectGarbage($session);
-
- $this->addCookieToResponse($response, $session);
- }
-
- return $response;
- }
-
- /**
- * Perform any final actions for the request lifecycle.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Symfony\Component\HttpFoundation\Response $response
- * @return void
- */
- public function terminate($request, $response)
- {
- if ($this->sessionHandled && $this->sessionConfigured() && ! $this->usingCookieSessions())
- {
- $this->manager->driver()->save();
- }
- }
-
- /**
- * Start the session for the given request.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Session\SessionInterface
- */
- protected function startSession(Request $request)
- {
- with($session = $this->getSession($request))->setRequestOnHandler($request);
-
- $session->start();
-
- return $session;
- }
-
- /**
- * Get the session implementation from the manager.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Session\SessionInterface
- */
- public function getSession(Request $request)
- {
- $session = $this->manager->driver();
-
- $session->setId($request->cookies->get($session->getName()));
-
- return $session;
- }
-
- /**
- * Store the current URL for the request if necessary.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Illuminate\Session\SessionInterface $session
- * @return void
- */
- protected function storeCurrentUrl(Request $request, $session)
- {
- if ($request->method() === 'GET' && $request->route() && ! $request->ajax())
- {
- $session->setPreviousUrl($request->fullUrl());
- }
- }
-
- /**
- * Remove the garbage from the session if necessary.
- *
- * @param \Illuminate\Session\SessionInterface $session
- * @return void
- */
- protected function collectGarbage(SessionInterface $session)
- {
- $config = $this->manager->getSessionConfig();
-
- // Here we will see if this request hits the garbage collection lottery by hitting
- // the odds needed to perform garbage collection on any given request. If we do
- // hit it, we'll call this handler to let it delete all the expired sessions.
- if ($this->configHitsLottery($config))
- {
- $session->getHandler()->gc($this->getSessionLifetimeInSeconds());
- }
- }
-
- /**
- * Determine if the configuration odds hit the lottery.
- *
- * @param array $config
- * @return bool
- */
- protected function configHitsLottery(array $config)
- {
- return mt_rand(1, $config['lottery'][1]) <= $config['lottery'][0];
- }
-
- /**
- * Add the session cookie to the application response.
- *
- * @param \Symfony\Component\HttpFoundation\Response $response
- * @param \Illuminate\Session\SessionInterface $session
- * @return void
- */
- protected function addCookieToResponse(Response $response, SessionInterface $session)
- {
- if ($this->usingCookieSessions())
- {
- $this->manager->driver()->save();
- }
-
- if ($this->sessionIsPersistent($config = $this->manager->getSessionConfig()))
- {
- $response->headers->setCookie(new Cookie(
- $session->getName(), $session->getId(), $this->getCookieExpirationDate(),
- $config['path'], $config['domain'], array_get($config, 'secure', false)
- ));
- }
- }
-
- /**
- * Get the session lifetime in seconds.
- *
- * @return int
- */
- protected function getSessionLifetimeInSeconds()
- {
- return array_get($this->manager->getSessionConfig(), 'lifetime') * 60;
- }
-
- /**
- * Get the cookie lifetime in seconds.
- *
- * @return int
- */
- protected function getCookieExpirationDate()
- {
- $config = $this->manager->getSessionConfig();
-
- return $config['expire_on_close'] ? 0 : Carbon::now()->addMinutes($config['lifetime']);
- }
-
- /**
- * Determine if a session driver has been configured.
- *
- * @return bool
- */
- protected function sessionConfigured()
- {
- return ! is_null(array_get($this->manager->getSessionConfig(), 'driver'));
- }
-
- /**
- * Determine if the configured session driver is persistent.
- *
- * @param array|null $config
- * @return bool
- */
- protected function sessionIsPersistent(array $config = null)
- {
- $config = $config ?: $this->manager->getSessionConfig();
-
- return ! in_array($config['driver'], array(null, 'array'));
- }
-
- /**
- * Determine if the session is using cookie sessions.
- *
- * @return bool
- */
- protected function usingCookieSessions()
- {
- if ( ! $this->sessionConfigured()) return false;
-
- return $this->manager->driver()->getHandler() instanceof CookieSessionHandler;
- }
+class StartSession
+{
+ /**
+ * The session manager.
+ *
+ * @var \Illuminate\Session\SessionManager
+ */
+ protected $manager;
+
+ /**
+ * Indicates if the session was handled for the current request.
+ *
+ * @var bool
+ */
+ protected $sessionHandled = false;
+
+ /**
+ * Create a new session middleware.
+ *
+ * @param \Illuminate\Session\SessionManager $manager
+ * @return void
+ */
+ public function __construct(SessionManager $manager)
+ {
+ $this->manager = $manager;
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ $this->sessionHandled = true;
+
+ // 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 = $next($request);
+
+ // Again, if the session has been configured we will need to close out the session
+ // so that the attributes may be persisted to some storage medium. We will also
+ // add the session identifier cookie to the application response headers now.
+ if ($this->sessionConfigured()) {
+ $this->storeCurrentUrl($request, $session);
+
+ $this->collectGarbage($session);
+
+ $this->addCookieToResponse($response, $session);
+ }
+
+ return $response;
+ }
+
+ /**
+ * Perform any final actions for the request lifecycle.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Symfony\Component\HttpFoundation\Response $response
+ * @return void
+ */
+ public function terminate($request, $response)
+ {
+ if ($this->sessionHandled && $this->sessionConfigured() && ! $this->usingCookieSessions()) {
+ $this->manager->driver()->save();
+ }
+ }
+
+ /**
+ * Start the session for the given request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Session\SessionInterface
+ */
+ protected function startSession(Request $request)
+ {
+ with($session = $this->getSession($request))->setRequestOnHandler($request);
+
+ $session->start();
+
+ return $session;
+ }
+
+ /**
+ * Get the session implementation from the manager.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Session\SessionInterface
+ */
+ public function getSession(Request $request)
+ {
+ $session = $this->manager->driver();
+
+ $session->setId($request->cookies->get($session->getName()));
+
+ return $session;
+ }
+
+ /**
+ * Store the current URL for the request if necessary.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Illuminate\Session\SessionInterface $session
+ * @return void
+ */
+ protected function storeCurrentUrl(Request $request, $session)
+ {
+ if ($request->method() === 'GET' && $request->route() && ! $request->ajax()) {
+ $session->setPreviousUrl($request->fullUrl());
+ }
+ }
+
+ /**
+ * Remove the garbage from the session if necessary.
+ *
+ * @param \Illuminate\Session\SessionInterface $session
+ * @return void
+ */
+ protected function collectGarbage(SessionInterface $session)
+ {
+ $config = $this->manager->getSessionConfig();
+
+ // Here we will see if this request hits the garbage collection lottery by hitting
+ // the odds needed to perform garbage collection on any given request. If we do
+ // hit it, we'll call this handler to let it delete all the expired sessions.
+ if ($this->configHitsLottery($config)) {
+ $session->getHandler()->gc($this->getSessionLifetimeInSeconds());
+ }
+ }
+
+ /**
+ * Determine if the configuration odds hit the lottery.
+ *
+ * @param array $config
+ * @return bool
+ */
+ protected function configHitsLottery(array $config)
+ {
+ return mt_rand(1, $config['lottery'][1]) <= $config['lottery'][0];
+ }
+
+ /**
+ * Add the session cookie to the application response.
+ *
+ * @param \Symfony\Component\HttpFoundation\Response $response
+ * @param \Illuminate\Session\SessionInterface $session
+ * @return void
+ */
+ protected function addCookieToResponse(Response $response, SessionInterface $session)
+ {
+ if ($this->usingCookieSessions()) {
+ $this->manager->driver()->save();
+ }
+
+ if ($this->sessionIsPersistent($config = $this->manager->getSessionConfig())) {
+ $response->headers->setCookie(new Cookie(
+ $session->getName(), $session->getId(), $this->getCookieExpirationDate(),
+ $config['path'], $config['domain'], Arr::get($config, 'secure', false)
+ ));
+ }
+ }
+
+ /**
+ * Get the session lifetime in seconds.
+ *
+ * @return int
+ */
+ protected function getSessionLifetimeInSeconds()
+ {
+ return Arr::get($this->manager->getSessionConfig(), 'lifetime') * 60;
+ }
+
+ /**
+ * Get the cookie lifetime in seconds.
+ *
+ * @return int
+ */
+ protected function getCookieExpirationDate()
+ {
+ $config = $this->manager->getSessionConfig();
+
+ return $config['expire_on_close'] ? 0 : Carbon::now()->addMinutes($config['lifetime']);
+ }
+
+ /**
+ * Determine if a session driver has been configured.
+ *
+ * @return bool
+ */
+ protected function sessionConfigured()
+ {
+ return ! is_null(Arr::get($this->manager->getSessionConfig(), 'driver'));
+ }
+
+ /**
+ * Determine if the configured session driver is persistent.
+ *
+ * @param array|null $config
+ * @return bool
+ */
+ protected function sessionIsPersistent(array $config = null)
+ {
+ $config = $config ?: $this->manager->getSessionConfig();
+
+ return ! in_array($config['driver'], [null, 'array']);
+ }
+
+ /**
+ * Determine if the session is using cookie sessions.
+ *
+ * @return bool
+ */
+ protected function usingCookieSessions()
+ {
+ if (! $this->sessionConfigured()) {
+ return false;
+ }
+
+ return $this->manager->driver()->getHandler() instanceof CookieSessionHandler;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php b/application/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php
index 43537d4..1d7f18d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php
@@ -1,30 +1,31 @@
-buildSession(parent::callCustomCreator($driver));
- }
-
- /**
- * Create an instance of the "array" session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createArrayDriver()
- {
- return $this->buildSession(new NullSessionHandler);
- }
-
- /**
- * Create an instance of the "cookie" session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createCookieDriver()
- {
- $lifetime = $this->app['config']['session.lifetime'];
-
- return $this->buildSession(new CookieSessionHandler($this->app['cookie'], $lifetime));
- }
-
- /**
- * Create an instance of the file session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createFileDriver()
- {
- return $this->createNativeDriver();
- }
-
- /**
- * Create an instance of the file session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createNativeDriver()
- {
- $path = $this->app['config']['session.files'];
-
- return $this->buildSession(new FileSessionHandler($this->app['files'], $path));
- }
-
- /**
- * Create an instance of the database session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createDatabaseDriver()
- {
- $connection = $this->getDatabaseConnection();
-
- $table = $this->app['config']['session.table'];
-
- return $this->buildSession(new DatabaseSessionHandler($connection, $table));
- }
-
- /**
- * Get the database connection for the database driver.
- *
- * @return \Illuminate\Database\Connection
- */
- protected function getDatabaseConnection()
- {
- $connection = $this->app['config']['session.connection'];
-
- return $this->app['db']->connection($connection);
- }
-
- /**
- * Create an instance of the APC session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createApcDriver()
- {
- return $this->createCacheBased('apc');
- }
-
- /**
- * Create an instance of the Memcached session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createMemcachedDriver()
- {
- return $this->createCacheBased('memcached');
- }
-
- /**
- * Create an instance of the Wincache session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createWincacheDriver()
- {
- return $this->createCacheBased('wincache');
- }
-
- /**
- * Create an instance of the Redis session driver.
- *
- * @return \Illuminate\Session\Store
- */
- protected function createRedisDriver()
- {
- $handler = $this->createCacheHandler('redis');
-
- $handler->getCache()->getStore()->setConnection($this->app['config']['session.connection']);
-
- return $this->buildSession($handler);
- }
-
- /**
- * Create an instance of a cache driven driver.
- *
- * @param string $driver
- * @return \Illuminate\Session\Store
- */
- protected function createCacheBased($driver)
- {
- return $this->buildSession($this->createCacheHandler($driver));
- }
-
- /**
- * Create the cache based session handler instance.
- *
- * @param string $driver
- * @return \Illuminate\Session\CacheBasedSessionHandler
- */
- protected function createCacheHandler($driver)
- {
- $minutes = $this->app['config']['session.lifetime'];
-
- return new CacheBasedSessionHandler($this->app['cache']->driver($driver), $minutes);
- }
-
- /**
- * Build the session instance.
- *
- * @param \SessionHandlerInterface $handler
- * @return \Illuminate\Session\Store
- */
- protected function buildSession($handler)
- {
- if ($this->app['config']['session.encrypt'])
- {
- return new EncryptedStore(
- $this->app['config']['session.cookie'], $handler, $this->app['encrypter']
- );
- }
- else
- {
- return new Store($this->app['config']['session.cookie'], $handler);
- }
- }
-
- /**
- * Get the session configuration.
- *
- * @return array
- */
- public function getSessionConfig()
- {
- return $this->app['config']['session'];
- }
-
- /**
- * Get the default session driver name.
- *
- * @return string
- */
- public function getDefaultDriver()
- {
- return $this->app['config']['session.driver'];
- }
-
- /**
- * Set the default session driver name.
- *
- * @param string $name
- * @return void
- */
- public function setDefaultDriver($name)
- {
- $this->app['config']['session.driver'] = $name;
- }
-
+class SessionManager extends Manager
+{
+ /**
+ * Call a custom driver creator.
+ *
+ * @param string $driver
+ * @return mixed
+ */
+ protected function callCustomCreator($driver)
+ {
+ return $this->buildSession(parent::callCustomCreator($driver));
+ }
+
+ /**
+ * Create an instance of the "array" session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createArrayDriver()
+ {
+ return $this->buildSession(new NullSessionHandler);
+ }
+
+ /**
+ * Create an instance of the "cookie" session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createCookieDriver()
+ {
+ $lifetime = $this->app['config']['session.lifetime'];
+
+ return $this->buildSession(new CookieSessionHandler($this->app['cookie'], $lifetime));
+ }
+
+ /**
+ * Create an instance of the file session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createFileDriver()
+ {
+ return $this->createNativeDriver();
+ }
+
+ /**
+ * Create an instance of the file session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createNativeDriver()
+ {
+ $path = $this->app['config']['session.files'];
+
+ $lifetime = $this->app['config']['session.lifetime'];
+
+ return $this->buildSession(new FileSessionHandler($this->app['files'], $path, $lifetime));
+ }
+
+ /**
+ * Create an instance of the database session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createDatabaseDriver()
+ {
+ $connection = $this->getDatabaseConnection();
+
+ $table = $this->app['config']['session.table'];
+
+ $lifetime = $this->app['config']['session.lifetime'];
+
+ return $this->buildSession(new DatabaseSessionHandler($connection, $table, $lifetime));
+ }
+
+ /**
+ * Get the database connection for the database driver.
+ *
+ * @return \Illuminate\Database\Connection
+ */
+ protected function getDatabaseConnection()
+ {
+ $connection = $this->app['config']['session.connection'];
+
+ return $this->app['db']->connection($connection);
+ }
+
+ /**
+ * Create an instance of the APC session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createApcDriver()
+ {
+ return $this->createCacheBased('apc');
+ }
+
+ /**
+ * Create an instance of the Memcached session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createMemcachedDriver()
+ {
+ return $this->createCacheBased('memcached');
+ }
+
+ /**
+ * Create an instance of the Wincache session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createWincacheDriver()
+ {
+ return $this->createCacheBased('wincache');
+ }
+
+ /**
+ * Create an instance of the Redis session driver.
+ *
+ * @return \Illuminate\Session\Store
+ */
+ protected function createRedisDriver()
+ {
+ $handler = $this->createCacheHandler('redis');
+
+ $handler->getCache()->getStore()->setConnection($this->app['config']['session.connection']);
+
+ return $this->buildSession($handler);
+ }
+
+ /**
+ * Create an instance of a cache driven driver.
+ *
+ * @param string $driver
+ * @return \Illuminate\Session\Store
+ */
+ protected function createCacheBased($driver)
+ {
+ return $this->buildSession($this->createCacheHandler($driver));
+ }
+
+ /**
+ * Create the cache based session handler instance.
+ *
+ * @param string $driver
+ * @return \Illuminate\Session\CacheBasedSessionHandler
+ */
+ protected function createCacheHandler($driver)
+ {
+ $minutes = $this->app['config']['session.lifetime'];
+
+ return new CacheBasedSessionHandler(clone $this->app['cache']->driver($driver), $minutes);
+ }
+
+ /**
+ * Build the session instance.
+ *
+ * @param \SessionHandlerInterface $handler
+ * @return \Illuminate\Session\Store
+ */
+ protected function buildSession($handler)
+ {
+ if ($this->app['config']['session.encrypt']) {
+ return new EncryptedStore(
+ $this->app['config']['session.cookie'], $handler, $this->app['encrypter']
+ );
+ } else {
+ return new Store($this->app['config']['session.cookie'], $handler);
+ }
+ }
+
+ /**
+ * Get the session configuration.
+ *
+ * @return array
+ */
+ public function getSessionConfig()
+ {
+ return $this->app['config']['session'];
+ }
+
+ /**
+ * Get the default session driver name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['session.driver'];
+ }
+
+ /**
+ * Set the default session driver name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['session.driver'] = $name;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php
index 8f89095..bc49ebc 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php
@@ -1,52 +1,51 @@
-registerSessionManager();
-
- $this->registerSessionDriver();
-
- $this->app->singleton('Illuminate\Session\Middleware\StartSession');
- }
-
- /**
- * Register the session manager instance.
- *
- * @return void
- */
- protected function registerSessionManager()
- {
- $this->app->singleton('session', function($app)
- {
- return new SessionManager($app);
- });
- }
-
- /**
- * Register the session driver instance.
- *
- * @return void
- */
- protected function registerSessionDriver()
- {
- $this->app->singleton('session.store', function($app)
- {
- // First, we will create the session manager which is responsible for the
- // creation of the various session drivers when they are needed by the
- // application instance, and will resolve them on a lazy load basis.
- $manager = $app['session'];
-
- return $manager->driver();
- });
- }
+use Illuminate\Support\ServiceProvider;
+class SessionServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerSessionManager();
+
+ $this->registerSessionDriver();
+
+ $this->app->singleton('Illuminate\Session\Middleware\StartSession');
+ }
+
+ /**
+ * Register the session manager instance.
+ *
+ * @return void
+ */
+ protected function registerSessionManager()
+ {
+ $this->app->singleton('session', function ($app) {
+ return new SessionManager($app);
+ });
+ }
+
+ /**
+ * Register the session driver instance.
+ *
+ * @return void
+ */
+ protected function registerSessionDriver()
+ {
+ $this->app->singleton('session.store', function ($app) {
+ // First, we will create the session manager which is responsible for the
+ // creation of the various session drivers when they are needed by the
+ // application instance, and will resolve them on a lazy load basis.
+ $manager = $app['session'];
+
+ return $manager->driver();
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/Store.php b/application/vendor/laravel/framework/src/Illuminate/Session/Store.php
index 2cf8e88..3419713 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/Store.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/Store.php
@@ -1,678 +1,699 @@
-setId($id);
- $this->name = $name;
- $this->handler = $handler;
- $this->metaBag = new MetadataBag;
- }
-
- /**
- * {@inheritdoc}
- */
- public function start()
- {
- $this->loadSession();
-
- if ( ! $this->has('_token')) $this->regenerateToken();
-
- return $this->started = true;
- }
-
- /**
- * Load the session data from the handler.
- *
- * @return void
- */
- protected function loadSession()
- {
- $this->attributes = array_merge($this->attributes, $this->readFromHandler());
-
- foreach (array_merge($this->bags, array($this->metaBag)) as $bag)
- {
- $this->initializeLocalBag($bag);
-
- $bag->initialize($this->bagData[$bag->getStorageKey()]);
- }
- }
-
- /**
- * Read the session data from the handler.
- *
- * @return array
- */
- protected function readFromHandler()
- {
- $data = $this->handler->read($this->getId());
-
- if ($data)
- {
- $data = @unserialize($this->prepareForUnserialize($data));
-
- if ($data !== false) return $data;
- }
-
- return [];
- }
-
- /**
- * Prepare the raw string data from the session for unserialization.
- *
- * @param string $data
- * @return string
- */
- protected function prepareForUnserialize($data)
- {
- return $data;
- }
-
- /**
- * Initialize a bag in storage if it doesn't exist.
- *
- * @param \Symfony\Component\HttpFoundation\Session\SessionBagInterface $bag
- * @return void
- */
- protected function initializeLocalBag($bag)
- {
- $this->bagData[$bag->getStorageKey()] = $this->pull($bag->getStorageKey(), []);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getId()
- {
- return $this->id;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setId($id)
- {
- if ( ! $this->isValidId($id))
- {
- $id = $this->generateSessionId();
- }
-
- $this->id = $id;
- }
-
- /**
- * Determine if this is a valid session ID.
- *
- * @param string $id
- * @return bool
- */
- public function isValidId($id)
- {
- return is_string($id) && preg_match('/^[a-f0-9]{40}$/', $id);
- }
-
- /**
- * Get a new, random session ID.
- *
- * @return string
- */
- protected function generateSessionId()
- {
- return sha1(uniqid('', true).str_random(25).microtime(true));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getName()
- {
- return $this->name;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setName($name)
- {
- $this->name = $name;
- }
-
- /**
- * {@inheritdoc}
- */
- public function invalidate($lifetime = null)
- {
- $this->clear();
-
- return $this->migrate(true, $lifetime);
- }
-
- /**
- * {@inheritdoc}
- */
- public function migrate($destroy = false, $lifetime = null)
- {
- if ($destroy) $this->handler->destroy($this->getId());
-
- $this->setExists(false);
-
- $this->id = $this->generateSessionId();
-
- return true;
- }
-
- /**
- * Generate a new session identifier.
- *
- * @param bool $destroy
- * @return bool
- */
- public function regenerate($destroy = false)
- {
- return $this->migrate($destroy);
- }
-
- /**
- * {@inheritdoc}
- */
- public function save()
- {
- $this->addBagDataToSession();
-
- $this->ageFlashData();
-
- $this->handler->write($this->getId(), $this->prepareForStorage(serialize($this->attributes)));
-
- $this->started = false;
- }
-
- /**
- * Prepare the serialized session data for storage.
- *
- * @param string $data
- * @return string
- */
- protected function prepareForStorage($data)
- {
- return $data;
- }
-
- /**
- * Merge all of the bag data into the session.
- *
- * @return void
- */
- protected function addBagDataToSession()
- {
- foreach (array_merge($this->bags, array($this->metaBag)) as $bag)
- {
- $this->put($bag->getStorageKey(), $this->bagData[$bag->getStorageKey()]);
- }
- }
-
- /**
- * Age the flash data for the session.
- *
- * @return void
- */
- public function ageFlashData()
- {
- foreach ($this->get('flash.old', array()) as $old) { $this->forget($old); }
-
- $this->put('flash.old', $this->get('flash.new', array()));
-
- $this->put('flash.new', array());
- }
-
- /**
- * {@inheritdoc}
- */
- public function has($name)
- {
- return ! is_null($this->get($name));
- }
-
- /**
- * {@inheritdoc}
- */
- public function get($name, $default = null)
- {
- return array_get($this->attributes, $name, $default);
- }
-
- /**
- * Get the value of a given key and then forget it.
- *
- * @param string $key
- * @param string $default
- * @return mixed
- */
- public function pull($key, $default = null)
- {
- return array_pull($this->attributes, $key, $default);
- }
-
- /**
- * Determine if the session contains old input.
- *
- * @param string $key
- * @return bool
- */
- public function hasOldInput($key = null)
- {
- $old = $this->getOldInput($key);
-
- return is_null($key) ? count($old) > 0 : ! is_null($old);
- }
-
- /**
- * Get the requested item from the flashed input array.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function getOldInput($key = null, $default = null)
- {
- $input = $this->get('_old_input', array());
-
- // Input that is flashed to the session can be easily retrieved by the
- // developer, making repopulating old forms and the like much more
- // convenient, since the request's previous input is available.
- return array_get($input, $key, $default);
- }
-
- /**
- * {@inheritdoc}
- */
- public function set($name, $value)
- {
- array_set($this->attributes, $name, $value);
- }
-
- /**
- * Put a key / value pair or array of key / value pairs in the session.
- *
- * @param string|array $key
- * @param mixed|null $value
- * @return void
- */
- public function put($key, $value = null)
- {
- if ( ! is_array($key)) $key = array($key => $value);
-
- foreach ($key as $arrayKey => $arrayValue)
- {
- $this->set($arrayKey, $arrayValue);
- }
- }
-
- /**
- * Push a value onto a session array.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function push($key, $value)
- {
- $array = $this->get($key, array());
-
- $array[] = $value;
-
- $this->put($key, $array);
- }
-
- /**
- * Flash a key / value pair to the session.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function flash($key, $value)
- {
- $this->put($key, $value);
-
- $this->push('flash.new', $key);
-
- $this->removeFromOldFlashData(array($key));
- }
-
- /**
- * Flash an input array to the session.
- *
- * @param array $value
- * @return void
- */
- public function flashInput(array $value)
- {
- $this->flash('_old_input', $value);
- }
-
- /**
- * Reflash all of the session flash data.
- *
- * @return void
- */
- public function reflash()
- {
- $this->mergeNewFlashes($this->get('flash.old', array()));
-
- $this->put('flash.old', array());
- }
-
- /**
- * Reflash a subset of the current flash data.
- *
- * @param array|mixed $keys
- * @return void
- */
- public function keep($keys = null)
- {
- $keys = is_array($keys) ? $keys : func_get_args();
-
- $this->mergeNewFlashes($keys);
-
- $this->removeFromOldFlashData($keys);
- }
-
- /**
- * Merge new flash keys into the new flash array.
- *
- * @param array $keys
- * @return void
- */
- protected function mergeNewFlashes(array $keys)
- {
- $values = array_unique(array_merge($this->get('flash.new', array()), $keys));
-
- $this->put('flash.new', $values);
- }
-
- /**
- * Remove the given keys from the old flash data.
- *
- * @param array $keys
- * @return void
- */
- protected function removeFromOldFlashData(array $keys)
- {
- $this->put('flash.old', array_diff($this->get('flash.old', array()), $keys));
- }
-
- /**
- * {@inheritdoc}
- */
- public function all()
- {
- return $this->attributes;
- }
-
- /**
- * {@inheritdoc}
- */
- public function replace(array $attributes)
- {
- $this->put($attributes);
- }
-
- /**
- * {@inheritdoc}
- */
- public function remove($name)
- {
- return array_pull($this->attributes, $name);
- }
-
- /**
- * Remove an item from the session.
- *
- * @param string $key
- * @return void
- */
- public function forget($key)
- {
- array_forget($this->attributes, $key);
- }
-
- /**
- * {@inheritdoc}
- */
- public function clear()
- {
- $this->attributes = array();
-
- foreach ($this->bags as $bag)
- {
- $bag->clear();
- }
- }
-
- /**
- * Remove all of the items from the session.
- *
- * @return void
- */
- public function flush()
- {
- $this->clear();
- }
-
- /**
- * {@inheritdoc}
- */
- public function isStarted()
- {
- return $this->started;
- }
-
- /**
- * {@inheritdoc}
- */
- public function registerBag(SessionBagInterface $bag)
- {
- $this->bags[$bag->getStorageKey()] = $bag;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getBag($name)
- {
- return array_get($this->bags, $name, function()
- {
- throw new InvalidArgumentException("Bag not registered.");
- });
- }
-
- /**
- * {@inheritdoc}
- */
- public function getMetadataBag()
- {
- return $this->metaBag;
- }
-
- /**
- * Get the raw bag data array for a given bag.
- *
- * @param string $name
- * @return array
- */
- public function getBagData($name)
- {
- return array_get($this->bagData, $name, array());
- }
-
- /**
- * Get the CSRF token value.
- *
- * @return string
- */
- public function token()
- {
- return $this->get('_token');
- }
-
- /**
- * Get the CSRF token value.
- *
- * @return string
- */
- public function getToken()
- {
- return $this->token();
- }
-
- /**
- * Regenerate the CSRF token value.
- *
- * @return void
- */
- public function regenerateToken()
- {
- $this->put('_token', str_random(40));
- }
-
- /**
- * Get the previous URL from the session.
- *
- * @return string|null
- */
- public function previousUrl()
- {
- return $this->get('_previous.url');
- }
-
- /**
- * Set the "previous" URL in the session.
- *
- * @param string $url
- * @return void
- */
- public function setPreviousUrl($url)
- {
- return $this->put('_previous.url', $url);
- }
-
- /**
- * Set the existence of the session on the handler if applicable.
- *
- * @param bool $value
- * @return void
- */
- public function setExists($value)
- {
- if ($this->handler instanceof ExistenceAwareInterface)
- {
- $this->handler->setExists($value);
- }
- }
-
- /**
- * Get the underlying session handler implementation.
- *
- * @return \SessionHandlerInterface
- */
- public function getHandler()
- {
- return $this->handler;
- }
-
- /**
- * Determine if the session handler needs a request.
- *
- * @return bool
- */
- public function handlerNeedsRequest()
- {
- return $this->handler instanceof CookieSessionHandler;
- }
-
- /**
- * Set the request on the handler instance.
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @return void
- */
- public function setRequestOnHandler(Request $request)
- {
- if ($this->handlerNeedsRequest())
- {
- $this->handler->setRequest($request);
- }
- }
-
+class Store implements SessionInterface
+{
+ /**
+ * The session ID.
+ *
+ * @var string
+ */
+ protected $id;
+
+ /**
+ * The session name.
+ *
+ * @var string
+ */
+ protected $name;
+
+ /**
+ * The session attributes.
+ *
+ * @var array
+ */
+ protected $attributes = [];
+
+ /**
+ * The session bags.
+ *
+ * @var array
+ */
+ protected $bags = [];
+
+ /**
+ * The meta-data bag instance.
+ *
+ * @var \Symfony\Component\HttpFoundation\Session\Storage\MetadataBag
+ */
+ protected $metaBag;
+
+ /**
+ * Local copies of the session bag data.
+ *
+ * @var array
+ */
+ protected $bagData = [];
+
+ /**
+ * The session handler implementation.
+ *
+ * @var \SessionHandlerInterface
+ */
+ protected $handler;
+
+ /**
+ * Session store started status.
+ *
+ * @var bool
+ */
+ protected $started = false;
+
+ /**
+ * Create a new session instance.
+ *
+ * @param string $name
+ * @param \SessionHandlerInterface $handler
+ * @param string|null $id
+ * @return void
+ */
+ public function __construct($name, SessionHandlerInterface $handler, $id = null)
+ {
+ $this->setId($id);
+ $this->name = $name;
+ $this->handler = $handler;
+ $this->metaBag = new MetadataBag;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function start()
+ {
+ $this->loadSession();
+
+ if (! $this->has('_token')) {
+ $this->regenerateToken();
+ }
+
+ return $this->started = true;
+ }
+
+ /**
+ * Load the session data from the handler.
+ *
+ * @return void
+ */
+ protected function loadSession()
+ {
+ $this->attributes = array_merge($this->attributes, $this->readFromHandler());
+
+ foreach (array_merge($this->bags, [$this->metaBag]) as $bag) {
+ $this->initializeLocalBag($bag);
+
+ $bag->initialize($this->bagData[$bag->getStorageKey()]);
+ }
+ }
+
+ /**
+ * Read the session data from the handler.
+ *
+ * @return array
+ */
+ protected function readFromHandler()
+ {
+ $data = $this->handler->read($this->getId());
+
+ if ($data) {
+ $data = @unserialize($this->prepareForUnserialize($data));
+
+ if ($data !== false && $data !== null && is_array($data)) {
+ return $data;
+ }
+ }
+
+ return [];
+ }
+
+ /**
+ * Prepare the raw string data from the session for unserialization.
+ *
+ * @param string $data
+ * @return string
+ */
+ protected function prepareForUnserialize($data)
+ {
+ return $data;
+ }
+
+ /**
+ * Initialize a bag in storage if it doesn't exist.
+ *
+ * @param \Symfony\Component\HttpFoundation\Session\SessionBagInterface $bag
+ * @return void
+ */
+ protected function initializeLocalBag($bag)
+ {
+ $this->bagData[$bag->getStorageKey()] = $this->pull($bag->getStorageKey(), []);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getId()
+ {
+ return $this->id;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setId($id)
+ {
+ if (! $this->isValidId($id)) {
+ $id = $this->generateSessionId();
+ }
+
+ $this->id = $id;
+ }
+
+ /**
+ * Determine if this is a valid session ID.
+ *
+ * @param string $id
+ * @return bool
+ */
+ public function isValidId($id)
+ {
+ return is_string($id) && preg_match('/^[a-f0-9]{40}$/', $id);
+ }
+
+ /**
+ * Get a new, random session ID.
+ *
+ * @return string
+ */
+ protected function generateSessionId()
+ {
+ return sha1(uniqid('', true).Str::random(25).microtime(true));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setName($name)
+ {
+ $this->name = $name;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function invalidate($lifetime = null)
+ {
+ $this->clear();
+
+ return $this->migrate(true, $lifetime);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function migrate($destroy = false, $lifetime = null)
+ {
+ if ($destroy) {
+ $this->handler->destroy($this->getId());
+ }
+
+ $this->setExists(false);
+
+ $this->id = $this->generateSessionId();
+
+ return true;
+ }
+
+ /**
+ * Generate a new session identifier.
+ *
+ * @param bool $destroy
+ * @return bool
+ */
+ public function regenerate($destroy = false)
+ {
+ return $this->migrate($destroy);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function save()
+ {
+ $this->addBagDataToSession();
+
+ $this->ageFlashData();
+
+ $this->handler->write($this->getId(), $this->prepareForStorage(serialize($this->attributes)));
+
+ $this->started = false;
+ }
+
+ /**
+ * Prepare the serialized session data for storage.
+ *
+ * @param string $data
+ * @return string
+ */
+ protected function prepareForStorage($data)
+ {
+ return $data;
+ }
+
+ /**
+ * Merge all of the bag data into the session.
+ *
+ * @return void
+ */
+ protected function addBagDataToSession()
+ {
+ foreach (array_merge($this->bags, [$this->metaBag]) as $bag) {
+ $key = $bag->getStorageKey();
+
+ if (isset($this->bagData[$key])) {
+ $this->put($key, $this->bagData[$key]);
+ }
+ }
+ }
+
+ /**
+ * Age the flash data for the session.
+ *
+ * @return void
+ */
+ public function ageFlashData()
+ {
+ $this->forget($this->get('flash.old', []));
+
+ $this->put('flash.old', $this->get('flash.new', []));
+
+ $this->put('flash.new', []);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function has($name)
+ {
+ return ! is_null($this->get($name));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get($name, $default = null)
+ {
+ return Arr::get($this->attributes, $name, $default);
+ }
+
+ /**
+ * Get the value of a given key and then forget it.
+ *
+ * @param string $key
+ * @param string $default
+ * @return mixed
+ */
+ public function pull($key, $default = null)
+ {
+ return Arr::pull($this->attributes, $key, $default);
+ }
+
+ /**
+ * Determine if the session contains old input.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasOldInput($key = null)
+ {
+ $old = $this->getOldInput($key);
+
+ return is_null($key) ? count($old) > 0 : ! is_null($old);
+ }
+
+ /**
+ * Get the requested item from the flashed input array.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function getOldInput($key = null, $default = null)
+ {
+ $input = $this->get('_old_input', []);
+
+ // Input that is flashed to the session can be easily retrieved by the
+ // developer, making repopulating old forms and the like much more
+ // convenient, since the request's previous input is available.
+ return Arr::get($input, $key, $default);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function set($name, $value)
+ {
+ Arr::set($this->attributes, $name, $value);
+ }
+
+ /**
+ * Put a key / value pair or array of key / value pairs in the session.
+ *
+ * @param string|array $key
+ * @param mixed $value
+ * @return void
+ */
+ public function put($key, $value = null)
+ {
+ if (! is_array($key)) {
+ $key = [$key => $value];
+ }
+
+ foreach ($key as $arrayKey => $arrayValue) {
+ $this->set($arrayKey, $arrayValue);
+ }
+ }
+
+ /**
+ * Push a value onto a session array.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function push($key, $value)
+ {
+ $array = $this->get($key, []);
+
+ $array[] = $value;
+
+ $this->put($key, $array);
+ }
+
+ /**
+ * Flash a key / value pair to the session.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function flash($key, $value)
+ {
+ $this->put($key, $value);
+
+ $this->push('flash.new', $key);
+
+ $this->removeFromOldFlashData([$key]);
+ }
+
+ /**
+ * Flash a key / value pair to the session
+ * for immediate use.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function now($key, $value)
+ {
+ $this->put($key, $value);
+
+ $this->push('flash.old', $key);
+ }
+
+ /**
+ * Flash an input array to the session.
+ *
+ * @param array $value
+ * @return void
+ */
+ public function flashInput(array $value)
+ {
+ $this->flash('_old_input', $value);
+ }
+
+ /**
+ * Reflash all of the session flash data.
+ *
+ * @return void
+ */
+ public function reflash()
+ {
+ $this->mergeNewFlashes($this->get('flash.old', []));
+
+ $this->put('flash.old', []);
+ }
+
+ /**
+ * Reflash a subset of the current flash data.
+ *
+ * @param array|mixed $keys
+ * @return void
+ */
+ public function keep($keys = null)
+ {
+ $keys = is_array($keys) ? $keys : func_get_args();
+
+ $this->mergeNewFlashes($keys);
+
+ $this->removeFromOldFlashData($keys);
+ }
+
+ /**
+ * Merge new flash keys into the new flash array.
+ *
+ * @param array $keys
+ * @return void
+ */
+ protected function mergeNewFlashes(array $keys)
+ {
+ $values = array_unique(array_merge($this->get('flash.new', []), $keys));
+
+ $this->put('flash.new', $values);
+ }
+
+ /**
+ * Remove the given keys from the old flash data.
+ *
+ * @param array $keys
+ * @return void
+ */
+ protected function removeFromOldFlashData(array $keys)
+ {
+ $this->put('flash.old', array_diff($this->get('flash.old', []), $keys));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function all()
+ {
+ return $this->attributes;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function replace(array $attributes)
+ {
+ $this->put($attributes);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function remove($name)
+ {
+ return Arr::pull($this->attributes, $name);
+ }
+
+ /**
+ * Remove one or many items from the session.
+ *
+ * @param string|array $keys
+ * @return void
+ */
+ public function forget($keys)
+ {
+ Arr::forget($this->attributes, $keys);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function clear()
+ {
+ $this->attributes = [];
+
+ foreach ($this->bags as $bag) {
+ $bag->clear();
+ }
+ }
+
+ /**
+ * Remove all of the items from the session.
+ *
+ * @return void
+ */
+ public function flush()
+ {
+ $this->clear();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isStarted()
+ {
+ return $this->started;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function registerBag(SessionBagInterface $bag)
+ {
+ $this->bags[$bag->getStorageKey()] = $bag;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getBag($name)
+ {
+ return Arr::get($this->bags, $name, function () {
+ throw new InvalidArgumentException('Bag not registered.');
+ });
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getMetadataBag()
+ {
+ return $this->metaBag;
+ }
+
+ /**
+ * Get the raw bag data array for a given bag.
+ *
+ * @param string $name
+ * @return array
+ */
+ public function getBagData($name)
+ {
+ return Arr::get($this->bagData, $name, []);
+ }
+
+ /**
+ * Get the CSRF token value.
+ *
+ * @return string
+ */
+ public function token()
+ {
+ return $this->get('_token');
+ }
+
+ /**
+ * Get the CSRF token value.
+ *
+ * @return string
+ */
+ public function getToken()
+ {
+ return $this->token();
+ }
+
+ /**
+ * Regenerate the CSRF token value.
+ *
+ * @return void
+ */
+ public function regenerateToken()
+ {
+ $this->put('_token', Str::random(40));
+ }
+
+ /**
+ * Get the previous URL from the session.
+ *
+ * @return string|null
+ */
+ public function previousUrl()
+ {
+ return $this->get('_previous.url');
+ }
+
+ /**
+ * Set the "previous" URL in the session.
+ *
+ * @param string $url
+ * @return void
+ */
+ public function setPreviousUrl($url)
+ {
+ return $this->put('_previous.url', $url);
+ }
+
+ /**
+ * Set the existence of the session on the handler if applicable.
+ *
+ * @param bool $value
+ * @return void
+ */
+ public function setExists($value)
+ {
+ if ($this->handler instanceof ExistenceAwareInterface) {
+ $this->handler->setExists($value);
+ }
+ }
+
+ /**
+ * Get the underlying session handler implementation.
+ *
+ * @return \SessionHandlerInterface
+ */
+ public function getHandler()
+ {
+ return $this->handler;
+ }
+
+ /**
+ * Determine if the session handler needs a request.
+ *
+ * @return bool
+ */
+ public function handlerNeedsRequest()
+ {
+ return $this->handler instanceof CookieSessionHandler;
+ }
+
+ /**
+ * Set the request on the handler instance.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * @return void
+ */
+ public function setRequestOnHandler(Request $request)
+ {
+ if ($this->handlerNeedsRequest()) {
+ $this->handler->setRequest($request);
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Session/TokenMismatchException.php b/application/vendor/laravel/framework/src/Illuminate/Session/TokenMismatchException.php
index a0a0060..98d99a1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Session/TokenMismatchException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Session/TokenMismatchException.php
@@ -1,5 +1,10 @@
-=5.4.0",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "nesbot/carbon": "~1.0",
- "symfony/finder": "2.6.*",
- "symfony/http-foundation": "2.6.*"
+ "php": ">=5.5.9",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "nesbot/carbon": "~1.19",
+ "symfony/finder": "2.7.*",
+ "symfony/http-foundation": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -28,11 +28,11 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "illuminate/console": "Required to use the session:table command (5.0.*)."
+ "illuminate/console": "Required to use the session:table command (5.1.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php
index 26bd250..ca5f9a8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php
@@ -1,53 +1,52 @@
-instances = [];
-
- foreach ($this->providers as $provider)
- {
- $this->instances[] = $this->app->register($provider);
- }
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- $provides = [];
-
- foreach ($this->providers as $provider)
- {
- $instance = $this->app->resolveProviderClass($provider);
-
- $provides = array_merge($provides, $instance->provides());
- }
-
- return $provides;
- }
-
+instances = [];
+
+ foreach ($this->providers as $provider) {
+ $this->instances[] = $this->app->register($provider);
+ }
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ $provides = [];
+
+ foreach ($this->providers as $provider) {
+ $instance = $this->app->resolveProviderClass($provider);
+
+ $provides = array_merge($provides, $instance->provides());
+ }
+
+ return $provides;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Arr.php b/application/vendor/laravel/framework/src/Illuminate/Support/Arr.php
index f0a708e..93e9569 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Arr.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Arr.php
@@ -1,407 +1,486 @@
- $value)
- {
- list($innerKey, $innerValue) = call_user_func($callback, $key, $value);
-
- $results[$innerKey] = $innerValue;
- }
-
- return $results;
- }
-
- /**
- * Collapse an array of arrays into a single array.
- *
- * @param array|\ArrayAccess $array
- * @return array
- */
- public static function collapse($array)
- {
- $results = [];
-
- foreach ($array as $values)
- {
- if ($values instanceof Collection) $values = $values->all();
-
- $results = array_merge($results, $values);
- }
-
- return $results;
- }
-
- /**
- * Divide an array into two arrays. One with keys and the other with values.
- *
- * @param array $array
- * @return array
- */
- public static function divide($array)
- {
- return [array_keys($array), array_values($array)];
- }
-
- /**
- * Flatten a multi-dimensional associative array with dots.
- *
- * @param array $array
- * @param string $prepend
- * @return array
- */
- public static function dot($array, $prepend = '')
- {
- $results = [];
-
- foreach ($array as $key => $value)
- {
- if (is_array($value))
- {
- $results = array_merge($results, static::dot($value, $prepend.$key.'.'));
- }
- else
- {
- $results[$prepend.$key] = $value;
- }
- }
-
- return $results;
- }
-
- /**
- * Get all of the given array except for a specified array of items.
- *
- * @param array $array
- * @param array|string $keys
- * @return array
- */
- public static function except($array, $keys)
- {
- static::forget($array, $keys);
-
- return $array;
- }
-
- /**
- * Fetch a flattened array of a nested array element.
- *
- * @param array $array
- * @param string $key
- * @return array
- */
- public static function fetch($array, $key)
- {
- foreach (explode('.', $key) as $segment)
- {
- $results = [];
-
- foreach ($array as $value)
- {
- if (array_key_exists($segment, $value = (array) $value))
- {
- $results[] = $value[$segment];
- }
- }
-
- $array = array_values($results);
- }
-
- return array_values($results);
- }
-
- /**
- * Return the first element in an array passing a given truth test.
- *
- * @param array $array
- * @param callable $callback
- * @param mixed $default
- * @return mixed
- */
- public static function first($array, callable $callback, $default = null)
- {
- foreach ($array as $key => $value)
- {
- if (call_user_func($callback, $key, $value)) return $value;
- }
-
- return value($default);
- }
-
- /**
- * Return the last element in an array passing a given truth test.
- *
- * @param array $array
- * @param callable $callback
- * @param mixed $default
- * @return mixed
- */
- public static function last($array, callable $callback, $default = null)
- {
- return static::first(array_reverse($array), $callback, $default);
- }
-
- /**
- * Flatten a multi-dimensional array into a single level.
- *
- * @param array $array
- * @return array
- */
- public static function flatten($array)
- {
- $return = [];
-
- array_walk_recursive($array, function($x) use (&$return) { $return[] = $x; });
-
- return $return;
- }
-
- /**
- * Remove one or many array items from a given array using "dot" notation.
- *
- * @param array $array
- * @param array|string $keys
- * @return void
- */
- public static function forget(&$array, $keys)
- {
- $original =& $array;
-
- foreach ((array) $keys as $key)
- {
- $parts = explode('.', $key);
-
- while (count($parts) > 1)
- {
- $part = array_shift($parts);
-
- if (isset($array[$part]) && is_array($array[$part]))
- {
- $array =& $array[$part];
- }
- }
-
- unset($array[array_shift($parts)]);
-
- // clean up after each pass
- $array =& $original;
- }
- }
-
- /**
- * Get an item from an array using "dot" notation.
- *
- * @param array $array
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public static function get($array, $key, $default = null)
- {
- if (is_null($key)) return $array;
-
- if (isset($array[$key])) return $array[$key];
-
- foreach (explode('.', $key) as $segment)
- {
- if ( ! is_array($array) || ! array_key_exists($segment, $array))
- {
- return value($default);
- }
-
- $array = $array[$segment];
- }
-
- return $array;
- }
-
- /**
- * Check if an item exists in an array using "dot" notation.
- *
- * @param array $array
- * @param string $key
- * @return bool
- */
- public static function has($array, $key)
- {
- if (empty($array) || is_null($key)) return false;
-
- if (array_key_exists($key, $array)) return true;
-
- foreach (explode('.', $key) as $segment)
- {
- if ( ! is_array($array) || ! array_key_exists($segment, $array))
- {
- return false;
- }
-
- $array = $array[$segment];
- }
-
- return true;
- }
-
- /**
- * Get a subset of the items from the given array.
- *
- * @param array $array
- * @param array|string $keys
- * @return array
- */
- public static function only($array, $keys)
- {
- return array_intersect_key($array, array_flip((array) $keys));
- }
-
- /**
- * Pluck an array of values from an array.
- *
- * @param array $array
- * @param string $value
- * @param string $key
- * @return array
- */
- public static function pluck($array, $value, $key = null)
- {
- $results = [];
-
- foreach ($array as $item)
- {
- $itemValue = data_get($item, $value);
-
- // If the key is "null", we will just append the value to the array and keep
- // looping. Otherwise we will key the array using the value of the key we
- // received from the developer. Then we'll return the final array form.
- if (is_null($key))
- {
- $results[] = $itemValue;
- }
- else
- {
- $itemKey = data_get($item, $key);
-
- $results[$itemKey] = $itemValue;
- }
- }
-
- return $results;
- }
-
- /**
- * Get a value from the array, and remove it.
- *
- * @param array $array
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public static function pull(&$array, $key, $default = null)
- {
- $value = static::get($array, $key, $default);
-
- static::forget($array, $key);
-
- return $value;
- }
-
- /**
- * Set an array item to a given value using "dot" notation.
- *
- * If no key is given to the method, the entire array will be replaced.
- *
- * @param array $array
- * @param string $key
- * @param mixed $value
- * @return array
- */
- public static function set(&$array, $key, $value)
- {
- if (is_null($key)) return $array = $value;
-
- $keys = explode('.', $key);
-
- while (count($keys) > 1)
- {
- $key = array_shift($keys);
-
- // If the key doesn't exist at this depth, we will just create an empty array
- // to hold the next value, allowing us to create the arrays to hold final
- // values at the correct depth. Then we'll keep digging into the array.
- if ( ! isset($array[$key]) || ! is_array($array[$key]))
- {
- $array[$key] = [];
- }
-
- $array =& $array[$key];
- }
-
- $array[array_shift($keys)] = $value;
-
- return $array;
- }
-
- /**
- * Sort the array using the given callback.
- *
- * @param array $array
- * @param callable $callback
- * @return array
- */
- public static function sort($array, callable $callback)
- {
- return Collection::make($array)->sortBy($callback)->all();
- }
-
- /**
- * Filter the array using the given callback.
- *
- * @param array $array
- * @param callable $callback
- * @return array
- */
- public static function where($array, callable $callback)
- {
- $filtered = [];
-
- foreach ($array as $key => $value)
- {
- if (call_user_func($callback, $key, $value)) $filtered[$key] = $value;
- }
-
- return $filtered;
- }
+use Illuminate\Support\Traits\Macroable;
+class Arr
+{
+ use Macroable;
+
+ /**
+ * Add an element to an array using "dot" notation if it doesn't exist.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $value
+ * @return array
+ */
+ public static function add($array, $key, $value)
+ {
+ if (is_null(static::get($array, $key))) {
+ static::set($array, $key, $value);
+ }
+
+ return $array;
+ }
+
+ /**
+ * Build a new array using a callback.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @return array
+ */
+ public static function build($array, callable $callback)
+ {
+ $results = [];
+
+ foreach ($array as $key => $value) {
+ list($innerKey, $innerValue) = call_user_func($callback, $key, $value);
+
+ $results[$innerKey] = $innerValue;
+ }
+
+ return $results;
+ }
+
+ /**
+ * Collapse an array of arrays into a single array.
+ *
+ * @param \ArrayAccess|array $array
+ * @return array
+ */
+ public static function collapse($array)
+ {
+ $results = [];
+
+ foreach ($array as $values) {
+ if ($values instanceof Collection) {
+ $values = $values->all();
+ }
+
+ $results = array_merge($results, $values);
+ }
+
+ return $results;
+ }
+
+ /**
+ * Divide an array into two arrays. One with keys and the other with values.
+ *
+ * @param array $array
+ * @return array
+ */
+ public static function divide($array)
+ {
+ return [array_keys($array), array_values($array)];
+ }
+
+ /**
+ * Flatten a multi-dimensional associative array with dots.
+ *
+ * @param array $array
+ * @param string $prepend
+ * @return array
+ */
+ public static function dot($array, $prepend = '')
+ {
+ $results = [];
+
+ foreach ($array as $key => $value) {
+ if (is_array($value)) {
+ $results = array_merge($results, static::dot($value, $prepend.$key.'.'));
+ } else {
+ $results[$prepend.$key] = $value;
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Get all of the given array except for a specified array of items.
+ *
+ * @param array $array
+ * @param array|string $keys
+ * @return array
+ */
+ public static function except($array, $keys)
+ {
+ static::forget($array, $keys);
+
+ return $array;
+ }
+
+ /**
+ * Fetch a flattened array of a nested array element.
+ *
+ * @param array $array
+ * @param string $key
+ * @return array
+ *
+ * @deprecated since version 5.1. Use pluck instead.
+ */
+ public static function fetch($array, $key)
+ {
+ foreach (explode('.', $key) as $segment) {
+ $results = [];
+
+ foreach ($array as $value) {
+ if (array_key_exists($segment, $value = (array) $value)) {
+ $results[] = $value[$segment];
+ }
+ }
+
+ $array = array_values($results);
+ }
+
+ return array_values($results);
+ }
+
+ /**
+ * Return the first element in an array passing a given truth test.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @param mixed $default
+ * @return mixed
+ */
+ public static function first($array, callable $callback, $default = null)
+ {
+ foreach ($array as $key => $value) {
+ if (call_user_func($callback, $key, $value)) {
+ return $value;
+ }
+ }
+
+ return value($default);
+ }
+
+ /**
+ * Return the last element in an array passing a given truth test.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @param mixed $default
+ * @return mixed
+ */
+ public static function last($array, callable $callback, $default = null)
+ {
+ return static::first(array_reverse($array), $callback, $default);
+ }
+
+ /**
+ * Flatten a multi-dimensional array into a single level.
+ *
+ * @param array $array
+ * @return array
+ */
+ public static function flatten($array)
+ {
+ $return = [];
+
+ array_walk_recursive($array, function ($x) use (&$return) {
+ $return[] = $x;
+ });
+
+ return $return;
+ }
+
+ /**
+ * Remove one or many array items from a given array using "dot" notation.
+ *
+ * @param array $array
+ * @param array|string $keys
+ * @return void
+ */
+ public static function forget(&$array, $keys)
+ {
+ $original = &$array;
+
+ $keys = (array) $keys;
+
+ if (count($keys) === 0) {
+ return;
+ }
+
+ foreach ($keys as $key) {
+ $parts = explode('.', $key);
+
+ while (count($parts) > 1) {
+ $part = array_shift($parts);
+
+ if (isset($array[$part]) && is_array($array[$part])) {
+ $array = &$array[$part];
+ } else {
+ $parts = [];
+ }
+ }
+
+ unset($array[array_shift($parts)]);
+
+ // clean up after each pass
+ $array = &$original;
+ }
+ }
+
+ /**
+ * Get an item from an array using "dot" notation.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public static function get($array, $key, $default = null)
+ {
+ if (is_null($key)) {
+ return $array;
+ }
+
+ if (isset($array[$key])) {
+ return $array[$key];
+ }
+
+ foreach (explode('.', $key) as $segment) {
+ if (! is_array($array) || ! array_key_exists($segment, $array)) {
+ return value($default);
+ }
+
+ $array = $array[$segment];
+ }
+
+ return $array;
+ }
+
+ /**
+ * Check if an item exists in an array using "dot" notation.
+ *
+ * @param array $array
+ * @param string $key
+ * @return bool
+ */
+ public static function has($array, $key)
+ {
+ if (empty($array) || is_null($key)) {
+ return false;
+ }
+
+ if (array_key_exists($key, $array)) {
+ return true;
+ }
+
+ foreach (explode('.', $key) as $segment) {
+ if (! is_array($array) || ! array_key_exists($segment, $array)) {
+ return false;
+ }
+
+ $array = $array[$segment];
+ }
+
+ return true;
+ }
+
+ /**
+ * Determines if an array is associative.
+ *
+ * An array is "associative" if it doesn't have sequential numerical keys beginning with zero.
+ *
+ * @param array $array
+ * @return bool
+ */
+ public static function isAssoc(array $array)
+ {
+ $keys = array_keys($array);
+
+ return array_keys($keys) !== $keys;
+ }
+
+ /**
+ * Get a subset of the items from the given array.
+ *
+ * @param array $array
+ * @param array|string $keys
+ * @return array
+ */
+ public static function only($array, $keys)
+ {
+ return array_intersect_key($array, array_flip((array) $keys));
+ }
+
+ /**
+ * Pluck an array of values from an array.
+ *
+ * @param array $array
+ * @param string|array $value
+ * @param string|array|null $key
+ * @return array
+ */
+ public static function pluck($array, $value, $key = null)
+ {
+ $results = [];
+
+ list($value, $key) = static::explodePluckParameters($value, $key);
+
+ foreach ($array as $item) {
+ $itemValue = data_get($item, $value);
+
+ // If the key is "null", we will just append the value to the array and keep
+ // looping. Otherwise we will key the array using the value of the key we
+ // received from the developer. Then we'll return the final array form.
+ if (is_null($key)) {
+ $results[] = $itemValue;
+ } else {
+ $itemKey = data_get($item, $key);
+
+ $results[$itemKey] = $itemValue;
+ }
+ }
+
+ return $results;
+ }
+
+ /**
+ * Explode the "value" and "key" arguments passed to "pluck".
+ *
+ * @param string|array $value
+ * @param string|array|null $key
+ * @return array
+ */
+ protected static function explodePluckParameters($value, $key)
+ {
+ $value = is_string($value) ? explode('.', $value) : $value;
+
+ $key = is_null($key) || is_array($key) ? $key : explode('.', $key);
+
+ return [$value, $key];
+ }
+
+ /**
+ * Push an item onto the beginning of an array.
+ *
+ * @param array $array
+ * @param mixed $value
+ * @param mixed $key
+ * @return array
+ */
+ public static function prepend($array, $value, $key = null)
+ {
+ if (is_null($key)) {
+ array_unshift($array, $value);
+ } else {
+ $array = [$key => $value] + $array;
+ }
+
+ return $array;
+ }
+
+ /**
+ * Get a value from the array, and remove it.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public static function pull(&$array, $key, $default = null)
+ {
+ $value = static::get($array, $key, $default);
+
+ static::forget($array, $key);
+
+ return $value;
+ }
+
+ /**
+ * Set an array item to a given value using "dot" notation.
+ *
+ * If no key is given to the method, the entire array will be replaced.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $value
+ * @return array
+ */
+ public static function set(&$array, $key, $value)
+ {
+ if (is_null($key)) {
+ return $array = $value;
+ }
+
+ $keys = explode('.', $key);
+
+ while (count($keys) > 1) {
+ $key = array_shift($keys);
+
+ // If the key doesn't exist at this depth, we will just create an empty array
+ // to hold the next value, allowing us to create the arrays to hold final
+ // values at the correct depth. Then we'll keep digging into the array.
+ if (! isset($array[$key]) || ! is_array($array[$key])) {
+ $array[$key] = [];
+ }
+
+ $array = &$array[$key];
+ }
+
+ $array[array_shift($keys)] = $value;
+
+ return $array;
+ }
+
+ /**
+ * Sort the array using the given callback.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @return array
+ */
+ public static function sort($array, callable $callback)
+ {
+ return Collection::make($array)->sortBy($callback)->all();
+ }
+
+ /**
+ * Recursively sort an array by keys and values.
+ *
+ * @param array $array
+ * @return array
+ */
+ public static function sortRecursive($array)
+ {
+ foreach ($array as &$value) {
+ if (is_array($value)) {
+ $value = static::sortRecursive($value);
+ }
+ }
+
+ if (static::isAssoc($array)) {
+ ksort($array);
+ } else {
+ sort($array);
+ }
+
+ return $array;
+ }
+
+ /**
+ * Filter the array using the given callback.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @return array
+ */
+ public static function where($array, callable $callback)
+ {
+ $filtered = [];
+
+ foreach ($array as $key => $value) {
+ if (call_user_func($callback, $key, $value)) {
+ $filtered[$key] = $value;
+ }
+ }
+
+ return $filtered;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/ClassLoader.php b/application/vendor/laravel/framework/src/Illuminate/Support/ClassLoader.php
index 88cbde6..6a8d235 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/ClassLoader.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/ClassLoader.php
@@ -1,107 +1,104 @@
-getArrayableItems($items);
-
- $this->items = (array) $items;
- }
-
- /**
- * Create a new collection instance if the value isn't one already.
- *
- * @param mixed $items
- * @return static
- */
- public static function make($items = null)
- {
- return new static($items);
- }
-
- /**
- * Get all of the items in the collection.
- *
- * @return array
- */
- public function all()
- {
- return $this->items;
- }
-
- /**
- * Collapse the collection of items into a single array.
- *
- * @return static
- */
- public function collapse()
- {
- return new static(array_collapse($this->items));
- }
-
- /**
- * Determine if an item exists in the collection.
- *
- * @param mixed $key
- * @param mixed $value
- * @return bool
- */
- public function contains($key, $value = null)
- {
- if (func_num_args() == 2)
- {
- return $this->contains(function($k, $item) use ($key, $value)
- {
- return data_get($item, $key) == $value;
- });
- }
-
- if ($this->useAsCallable($key))
- {
- return ! is_null($this->first($key));
- }
-
- return in_array($key, $this->items);
- }
-
- /**
- * Diff the collection with the given items.
- *
- * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array $items
- * @return static
- */
- public function diff($items)
- {
- return new static(array_diff($this->items, $this->getArrayableItems($items)));
- }
-
- /**
- * Execute a callback over each item.
- *
- * @param callable $callback
- * @return $this
- */
- public function each(callable $callback)
- {
- array_map($callback, $this->items);
-
- return $this;
- }
-
- /**
- * Fetch a nested element of the collection.
- *
- * @param string $key
- * @return static
- */
- public function fetch($key)
- {
- return new static(array_fetch($this->items, $key));
- }
-
- /**
- * Run a filter over each of the items.
- *
- * @param callable $callback
- * @return static
- */
- public function filter(callable $callback)
- {
- return new static(array_filter($this->items, $callback));
- }
-
- /**
- * Filter items by the given key value pair.
- *
- * @param string $key
- * @param mixed $value
- * @param bool $strict
- * @return static
- */
- public function where($key, $value, $strict = true)
- {
- return $this->filter(function($item) use ($key, $value, $strict)
- {
- return $strict ? data_get($item, $key) === $value
+class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate, Jsonable, JsonSerializable
+{
+ use Macroable;
+
+ /**
+ * The items contained in the collection.
+ *
+ * @var array
+ */
+ protected $items = [];
+
+ /**
+ * Create a new collection.
+ *
+ * @param mixed $items
+ * @return void
+ */
+ public function __construct($items = [])
+ {
+ $this->items = is_array($items) ? $items : $this->getArrayableItems($items);
+ }
+
+ /**
+ * Create a new collection instance if the value isn't one already.
+ *
+ * @param mixed $items
+ * @return static
+ */
+ public static function make($items = [])
+ {
+ return new static($items);
+ }
+
+ /**
+ * Get all of the items in the collection.
+ *
+ * @return array
+ */
+ public function all()
+ {
+ return $this->items;
+ }
+
+ /**
+ * Get the average value of a given key.
+ *
+ * @param string|null $key
+ * @return mixed
+ */
+ public function avg($key = null)
+ {
+ if ($count = $this->count()) {
+ return $this->sum($key) / $count;
+ }
+ }
+
+ /**
+ * Alias for the "avg" method.
+ *
+ * @param string|null $key
+ * @return mixed
+ */
+ public function average($key = null)
+ {
+ return $this->avg($key);
+ }
+
+ /**
+ * Collapse the collection of items into a single array.
+ *
+ * @return static
+ */
+ public function collapse()
+ {
+ return new static(Arr::collapse($this->items));
+ }
+
+ /**
+ * Determine if an item exists in the collection.
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @return bool
+ */
+ public function contains($key, $value = null)
+ {
+ if (func_num_args() == 2) {
+ return $this->contains(function ($k, $item) use ($key, $value) {
+ return data_get($item, $key) == $value;
+ });
+ }
+
+ if ($this->useAsCallable($key)) {
+ return ! is_null($this->first($key));
+ }
+
+ return in_array($key, $this->items);
+ }
+
+ /**
+ * Get the items in the collection that are not present in the given items.
+ *
+ * @param mixed $items
+ * @return static
+ */
+ public function diff($items)
+ {
+ return new static(array_diff($this->items, $this->getArrayableItems($items)));
+ }
+
+ /**
+ * Execute a callback over each item.
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function each(callable $callback)
+ {
+ foreach ($this->items as $key => $item) {
+ if ($callback($item, $key) === false) {
+ break;
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Create a new collection consisting of every n-th element.
+ *
+ * @param int $step
+ * @param int $offset
+ * @return static
+ */
+ public function every($step, $offset = 0)
+ {
+ $new = [];
+
+ $position = 0;
+
+ foreach ($this->items as $key => $item) {
+ if ($position % $step === $offset) {
+ $new[] = $item;
+ }
+
+ $position++;
+ }
+
+ return new static($new);
+ }
+
+ /**
+ * Get all items except for those with the specified keys.
+ *
+ * @param mixed $keys
+ * @return static
+ */
+ public function except($keys)
+ {
+ $keys = is_array($keys) ? $keys : func_get_args();
+
+ return new static(Arr::except($this->items, $keys));
+ }
+
+ /**
+ * Fetch a nested element of the collection.
+ *
+ * @param string $key
+ * @return static
+ *
+ * @deprecated since version 5.1. Use pluck instead.
+ */
+ public function fetch($key)
+ {
+ return new static(Arr::fetch($this->items, $key));
+ }
+
+ /**
+ * Run a filter over each of the items.
+ *
+ * @param callable|null $callback
+ * @return static
+ */
+ public function filter(callable $callback = null)
+ {
+ if ($callback) {
+ return new static(array_filter($this->items, $callback));
+ }
+
+ return new static(array_filter($this->items));
+ }
+
+ /**
+ * Filter items by the given key value pair.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param bool $strict
+ * @return static
+ */
+ public function where($key, $value, $strict = true)
+ {
+ return $this->filter(function ($item) use ($key, $value, $strict) {
+ return $strict ? data_get($item, $key) === $value
: data_get($item, $key) == $value;
- });
- }
-
- /**
- * Filter items by the given key value pair using loose comparison.
- *
- * @param string $key
- * @param mixed $value
- * @return static
- */
- public function whereLoose($key, $value)
- {
- return $this->where($key, $value, false);
- }
-
- /**
- * Get the first item from the collection.
- *
- * @param callable $callback
- * @param mixed $default
- * @return mixed|null
- */
- public function first(callable $callback = null, $default = null)
- {
- if (is_null($callback))
- {
- return count($this->items) > 0 ? reset($this->items) : null;
- }
-
- return array_first($this->items, $callback, $default);
- }
-
- /**
- * Get a flattened array of the items in the collection.
- *
- * @return static
- */
- public function flatten()
- {
- return new static(array_flatten($this->items));
- }
-
- /**
- * Flip the items in the collection.
- *
- * @return static
- */
- public function flip()
- {
- return new static(array_flip($this->items));
- }
-
- /**
- * Remove an item from the collection by key.
- *
- * @param mixed $key
- * @return void
- */
- public function forget($key)
- {
- $this->offsetUnset($key);
- }
-
- /**
- * Get an item from the collection by key.
- *
- * @param mixed $key
- * @param mixed $default
- * @return mixed
- */
- public function get($key, $default = null)
- {
- if ($this->offsetExists($key))
- {
- return $this->items[$key];
- }
-
- return value($default);
- }
-
- /**
- * Group an associative array by a field or using a callback.
- *
- * @param callable|string $groupBy
- * @return static
- */
- public function groupBy($groupBy)
- {
- if ( ! $this->useAsCallable($groupBy))
- {
- return $this->groupBy($this->valueRetriever($groupBy));
- }
-
- $results = [];
-
- foreach ($this->items as $key => $value)
- {
- $results[$groupBy($value, $key)][] = $value;
- }
-
- return new static($results);
- }
-
- /**
- * Key an associative array by a field or using a callback.
- *
- * @param callable|string $keyBy
- * @return static
- */
- public function keyBy($keyBy)
- {
- if ( ! $this->useAsCallable($keyBy))
- {
- return $this->keyBy($this->valueRetriever($keyBy));
- }
-
- $results = [];
-
- foreach ($this->items as $item)
- {
- $results[$keyBy($item)] = $item;
- }
-
- return new static($results);
- }
-
- /**
- * Determine if an item exists in the collection by key.
- *
- * @param mixed $key
- * @return bool
- */
- public function has($key)
- {
- return $this->offsetExists($key);
- }
-
- /**
- * Concatenate values of a given key as a string.
- *
- * @param string $value
- * @param string $glue
- * @return string
- */
- public function implode($value, $glue = null)
- {
- $first = $this->first();
-
- if (is_array($first) || is_object($first))
- {
- return implode($glue, $this->lists($value));
- }
-
- return implode($value, $this->items);
- }
-
- /**
- * Intersect the collection with the given items.
- *
- * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array $items
- * @return static
- */
- public function intersect($items)
- {
- return new static(array_intersect($this->items, $this->getArrayableItems($items)));
- }
-
- /**
- * Determine if the collection is empty or not.
- *
- * @return bool
- */
- public function isEmpty()
- {
- return empty($this->items);
- }
-
- /**
- * Determine if the given value is callable, but not a string.
- *
- * @param mixed $value
- * @return bool
- */
- protected function useAsCallable($value)
- {
- return ! is_string($value) && is_callable($value);
- }
-
- /**
- * Get the keys of the collection items.
- *
- * @return static
- */
- public function keys()
- {
- return new static(array_keys($this->items));
- }
-
- /**
- * Get the last item from the collection.
- *
- * @return mixed|null
- */
- public function last()
- {
- return count($this->items) > 0 ? end($this->items) : null;
- }
-
- /**
- * Get an array with the values of a given key.
- *
- * @param string $value
- * @param string $key
- * @return array
- */
- public function lists($value, $key = null)
- {
- return array_pluck($this->items, $value, $key);
- }
-
- /**
- * Run a map over each of the items.
- *
- * @param callable $callback
- * @return static
- */
- public function map(callable $callback)
- {
- return new static(array_map($callback, $this->items, array_keys($this->items)));
- }
-
- /**
- * Merge the collection with the given items.
- *
- * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array $items
- * @return static
- */
- public function merge($items)
- {
- return new static(array_merge($this->items, $this->getArrayableItems($items)));
- }
-
- /**
- * "Paginate" the collection by slicing it into a smaller collection.
- *
- * @param int $page
- * @param int $perPage
- * @return static
- */
- public function forPage($page, $perPage)
- {
- return $this->slice(($page - 1) * $perPage, $perPage);
- }
-
- /**
- * Get and remove the last item from the collection.
- *
- * @return mixed|null
- */
- public function pop()
- {
- return array_pop($this->items);
- }
-
- /**
- * Push an item onto the beginning of the collection.
- *
- * @param mixed $value
- * @return void
- */
- public function prepend($value)
- {
- array_unshift($this->items, $value);
- }
-
- /**
- * Push an item onto the end of the collection.
- *
- * @param mixed $value
- * @return void
- */
- public function push($value)
- {
- $this->offsetSet(null, $value);
- }
-
- /**
- * Pulls an item from the collection.
- *
- * @param mixed $key
- * @param mixed $default
- * @return mixed
- */
- public function pull($key, $default = null)
- {
- return array_pull($this->items, $key, $default);
- }
-
- /**
- * Put an item in the collection by key.
- *
- * @param mixed $key
- * @param mixed $value
- * @return void
- */
- public function put($key, $value)
- {
- $this->offsetSet($key, $value);
- }
-
- /**
- * Get one or more items randomly from the collection.
- *
- * @param int $amount
- * @return mixed
- */
- public function random($amount = 1)
- {
- if ($this->isEmpty()) return;
-
- $keys = array_rand($this->items, $amount);
-
- return is_array($keys) ? array_intersect_key($this->items, array_flip($keys)) : $this->items[$keys];
- }
-
- /**
- * Reduce the collection to a single value.
- *
- * @param callable $callback
- * @param mixed $initial
- * @return mixed
- */
- public function reduce(callable $callback, $initial = null)
- {
- return array_reduce($this->items, $callback, $initial);
- }
-
- /**
- * Create a collection of all elements that do not pass a given truth test.
- *
- * @param callable|mixed $callback
- * @return static
- */
- public function reject($callback)
- {
- if ($this->useAsCallable($callback))
- {
- return $this->filter(function($item) use ($callback)
- {
- return ! $callback($item);
- });
- }
-
- return $this->filter(function($item) use ($callback)
- {
- return $item != $callback;
- });
- }
-
- /**
- * Reverse items order.
- *
- * @return static
- */
- public function reverse()
- {
- return new static(array_reverse($this->items));
- }
-
- /**
- * Search the collection for a given value and return the corresponding key if successful.
- *
- * @param mixed $value
- * @param bool $strict
- * @return mixed
- */
- public function search($value, $strict = false)
- {
- if ( ! $this->useAsCallable($value))
- {
- return array_search($value, $this->items, $strict);
- }
-
- foreach ($this->items as $key => $item)
- {
- if ($value($item, $key)) return $key;
- }
-
- return false;
- }
-
- /**
- * Get and remove the first item from the collection.
- *
- * @return mixed|null
- */
- public function shift()
- {
- return array_shift($this->items);
- }
-
- /**
- * Shuffle the items in the collection.
- *
- * @return $this
- */
- public function shuffle()
- {
- shuffle($this->items);
-
- return $this;
- }
-
- /**
- * Slice the underlying collection array.
- *
- * @param int $offset
- * @param int $length
- * @param bool $preserveKeys
- * @return static
- */
- public function slice($offset, $length = null, $preserveKeys = false)
- {
- return new static(array_slice($this->items, $offset, $length, $preserveKeys));
- }
-
- /**
- * Chunk the underlying collection array.
- *
- * @param int $size
- * @param bool $preserveKeys
- * @return static
- */
- public function chunk($size, $preserveKeys = false)
- {
- $chunks = [];
-
- foreach (array_chunk($this->items, $size, $preserveKeys) as $chunk)
- {
- $chunks[] = new static($chunk);
- }
-
- return new static($chunks);
- }
-
- /**
- * Sort through each item with a callback.
- *
- * @param callable $callback
- * @return $this
- */
- public function sort(callable $callback)
- {
- uasort($this->items, $callback);
-
- return $this;
- }
-
- /**
- * Sort the collection using the given callback.
- *
- * @param callable|string $callback
- * @param int $options
- * @param bool $descending
- * @return $this
- */
- public function sortBy($callback, $options = SORT_REGULAR, $descending = false)
- {
- $results = [];
-
- if ( ! $this->useAsCallable($callback))
- {
- $callback = $this->valueRetriever($callback);
- }
-
- // First we will loop through the items and get the comparator from a callback
- // function which we were given. Then, we will sort the returned values and
- // and grab the corresponding values for the sorted keys from this array.
- foreach ($this->items as $key => $value)
- {
- $results[$key] = $callback($value, $key);
- }
-
- $descending ? arsort($results, $options)
+ });
+ }
+
+ /**
+ * Filter items by the given key value pair using loose comparison.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return static
+ */
+ public function whereLoose($key, $value)
+ {
+ return $this->where($key, $value, false);
+ }
+
+ /**
+ * Get the first item from the collection.
+ *
+ * @param callable|null $callback
+ * @param mixed $default
+ * @return mixed
+ */
+ public function first(callable $callback = null, $default = null)
+ {
+ if (is_null($callback)) {
+ return count($this->items) > 0 ? reset($this->items) : value($default);
+ }
+
+ return Arr::first($this->items, $callback, $default);
+ }
+
+ /**
+ * Get a flattened array of the items in the collection.
+ *
+ * @return static
+ */
+ public function flatten()
+ {
+ return new static(Arr::flatten($this->items));
+ }
+
+ /**
+ * Flip the items in the collection.
+ *
+ * @return static
+ */
+ public function flip()
+ {
+ return new static(array_flip($this->items));
+ }
+
+ /**
+ * Remove an item from the collection by key.
+ *
+ * @param string|array $keys
+ * @return $this
+ */
+ public function forget($keys)
+ {
+ foreach ((array) $keys as $key) {
+ $this->offsetUnset($key);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Get an item from the collection by key.
+ *
+ * @param mixed $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function get($key, $default = null)
+ {
+ if ($this->offsetExists($key)) {
+ return $this->items[$key];
+ }
+
+ return value($default);
+ }
+
+ /**
+ * Group an associative array by a field or using a callback.
+ *
+ * @param callable|string $groupBy
+ * @param bool $preserveKeys
+ * @return static
+ */
+ public function groupBy($groupBy, $preserveKeys = false)
+ {
+ $groupBy = $this->valueRetriever($groupBy);
+
+ $results = [];
+
+ foreach ($this->items as $key => $value) {
+ $groupKey = $groupBy($value, $key);
+
+ if (! array_key_exists($groupKey, $results)) {
+ $results[$groupKey] = new static;
+ }
+
+ $results[$groupKey]->offsetSet($preserveKeys ? $key : null, $value);
+ }
+
+ return new static($results);
+ }
+
+ /**
+ * Key an associative array by a field or using a callback.
+ *
+ * @param callable|string $keyBy
+ * @return static
+ */
+ public function keyBy($keyBy)
+ {
+ $keyBy = $this->valueRetriever($keyBy);
+
+ $results = [];
+
+ foreach ($this->items as $item) {
+ $results[$keyBy($item)] = $item;
+ }
+
+ return new static($results);
+ }
+
+ /**
+ * Determine if an item exists in the collection by key.
+ *
+ * @param mixed $key
+ * @return bool
+ */
+ public function has($key)
+ {
+ return $this->offsetExists($key);
+ }
+
+ /**
+ * Concatenate values of a given key as a string.
+ *
+ * @param string $value
+ * @param string $glue
+ * @return string
+ */
+ public function implode($value, $glue = null)
+ {
+ $first = $this->first();
+
+ if (is_array($first) || is_object($first)) {
+ return implode($glue, $this->pluck($value)->all());
+ }
+
+ return implode($value, $this->items);
+ }
+
+ /**
+ * Intersect the collection with the given items.
+ *
+ * @param mixed $items
+ * @return static
+ */
+ public function intersect($items)
+ {
+ return new static(array_intersect($this->items, $this->getArrayableItems($items)));
+ }
+
+ /**
+ * Determine if the collection is empty or not.
+ *
+ * @return bool
+ */
+ public function isEmpty()
+ {
+ return empty($this->items);
+ }
+
+ /**
+ * Determine if the given value is callable, but not a string.
+ *
+ * @param mixed $value
+ * @return bool
+ */
+ protected function useAsCallable($value)
+ {
+ return ! is_string($value) && is_callable($value);
+ }
+
+ /**
+ * Get the keys of the collection items.
+ *
+ * @return static
+ */
+ public function keys()
+ {
+ return new static(array_keys($this->items));
+ }
+
+ /**
+ * Get the last item from the collection.
+ *
+ * @param callable|null $callback
+ * @param mixed $default
+ * @return mixed
+ */
+ public function last(callable $callback = null, $default = null)
+ {
+ if (is_null($callback)) {
+ return count($this->items) > 0 ? end($this->items) : value($default);
+ }
+
+ return Arr::last($this->items, $callback, $default);
+ }
+
+ /**
+ * Get the values of a given key.
+ *
+ * @param string $value
+ * @param string|null $key
+ * @return static
+ */
+ public function pluck($value, $key = null)
+ {
+ return new static(Arr::pluck($this->items, $value, $key));
+ }
+
+ /**
+ * Alias for the "pluck" method.
+ *
+ * @param string $value
+ * @param string|null $key
+ * @return static
+ */
+ public function lists($value, $key = null)
+ {
+ return $this->pluck($value, $key);
+ }
+
+ /**
+ * Run a map over each of the items.
+ *
+ * @param callable $callback
+ * @return static
+ */
+ public function map(callable $callback)
+ {
+ $keys = array_keys($this->items);
+
+ $items = array_map($callback, $this->items, $keys);
+
+ return new static(array_combine($keys, $items));
+ }
+
+ /**
+ * Map a collection and flatten the result by a single level.
+ *
+ * @param callable $callback
+ * @return static
+ */
+ public function flatMap(callable $callback)
+ {
+ return $this->map($callback)->collapse();
+ }
+
+ /**
+ * Get the max value of a given key.
+ *
+ * @param string|null $key
+ * @return mixed
+ */
+ public function max($key = null)
+ {
+ return $this->reduce(function ($result, $item) use ($key) {
+ $value = data_get($item, $key);
+
+ return is_null($result) || $value > $result ? $value : $result;
+ });
+ }
+
+ /**
+ * Merge the collection with the given items.
+ *
+ * @param mixed $items
+ * @return static
+ */
+ public function merge($items)
+ {
+ return new static(array_merge($this->items, $this->getArrayableItems($items)));
+ }
+
+ /**
+ * Get the min value of a given key.
+ *
+ * @param string|null $key
+ * @return mixed
+ */
+ public function min($key = null)
+ {
+ return $this->reduce(function ($result, $item) use ($key) {
+ $value = data_get($item, $key);
+
+ return is_null($result) || $value < $result ? $value : $result;
+ });
+ }
+
+ /**
+ * Get the items with the specified keys.
+ *
+ * @param mixed $keys
+ * @return static
+ */
+ public function only($keys)
+ {
+ $keys = is_array($keys) ? $keys : func_get_args();
+
+ return new static(Arr::only($this->items, $keys));
+ }
+
+ /**
+ * "Paginate" the collection by slicing it into a smaller collection.
+ *
+ * @param int $page
+ * @param int $perPage
+ * @return static
+ */
+ public function forPage($page, $perPage)
+ {
+ return $this->slice(($page - 1) * $perPage, $perPage);
+ }
+
+ /**
+ * Get and remove the last item from the collection.
+ *
+ * @return mixed
+ */
+ public function pop()
+ {
+ return array_pop($this->items);
+ }
+
+ /**
+ * Push an item onto the beginning of the collection.
+ *
+ * @param mixed $value
+ * @param mixed $key
+ * @return $this
+ */
+ public function prepend($value, $key = null)
+ {
+ $this->items = Arr::prepend($this->items, $value, $key);
+
+ return $this;
+ }
+
+ /**
+ * Push an item onto the end of the collection.
+ *
+ * @param mixed $value
+ * @return $this
+ */
+ public function push($value)
+ {
+ $this->offsetSet(null, $value);
+
+ return $this;
+ }
+
+ /**
+ * Get and remove an item from the collection.
+ *
+ * @param mixed $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function pull($key, $default = null)
+ {
+ return Arr::pull($this->items, $key, $default);
+ }
+
+ /**
+ * Put an item in the collection by key.
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @return $this
+ */
+ public function put($key, $value)
+ {
+ $this->offsetSet($key, $value);
+
+ return $this;
+ }
+
+ /**
+ * Get one or more items randomly from the collection.
+ *
+ * @param int $amount
+ * @return mixed
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function random($amount = 1)
+ {
+ if ($amount > ($count = $this->count())) {
+ throw new InvalidArgumentException("You requested {$amount} items, but there are only {$count} items in the collection");
+ }
+
+ $keys = array_rand($this->items, $amount);
+
+ if ($amount == 1) {
+ return $this->items[$keys];
+ }
+
+ return new static(array_intersect_key($this->items, array_flip($keys)));
+ }
+
+ /**
+ * Reduce the collection to a single value.
+ *
+ * @param callable $callback
+ * @param mixed $initial
+ * @return mixed
+ */
+ public function reduce(callable $callback, $initial = null)
+ {
+ return array_reduce($this->items, $callback, $initial);
+ }
+
+ /**
+ * Create a collection of all elements that do not pass a given truth test.
+ *
+ * @param callable|mixed $callback
+ * @return static
+ */
+ public function reject($callback)
+ {
+ if ($this->useAsCallable($callback)) {
+ return $this->filter(function ($item) use ($callback) {
+ return ! $callback($item);
+ });
+ }
+
+ return $this->filter(function ($item) use ($callback) {
+ return $item != $callback;
+ });
+ }
+
+ /**
+ * Reverse items order.
+ *
+ * @return static
+ */
+ public function reverse()
+ {
+ return new static(array_reverse($this->items));
+ }
+
+ /**
+ * Search the collection for a given value and return the corresponding key if successful.
+ *
+ * @param mixed $value
+ * @param bool $strict
+ * @return mixed
+ */
+ public function search($value, $strict = false)
+ {
+ if (! $this->useAsCallable($value)) {
+ return array_search($value, $this->items, $strict);
+ }
+
+ foreach ($this->items as $key => $item) {
+ if (call_user_func($value, $item, $key)) {
+ return $key;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Get and remove the first item from the collection.
+ *
+ * @return mixed
+ */
+ public function shift()
+ {
+ return array_shift($this->items);
+ }
+
+ /**
+ * Shuffle the items in the collection.
+ *
+ * @return static
+ */
+ public function shuffle()
+ {
+ $items = $this->items;
+
+ shuffle($items);
+
+ return new static($items);
+ }
+
+ /**
+ * Slice the underlying collection array.
+ *
+ * @param int $offset
+ * @param int $length
+ * @param bool $preserveKeys
+ * @return static
+ */
+ public function slice($offset, $length = null, $preserveKeys = false)
+ {
+ return new static(array_slice($this->items, $offset, $length, $preserveKeys));
+ }
+
+ /**
+ * Chunk the underlying collection array.
+ *
+ * @param int $size
+ * @param bool $preserveKeys
+ * @return static
+ */
+ public function chunk($size, $preserveKeys = false)
+ {
+ $chunks = [];
+
+ foreach (array_chunk($this->items, $size, $preserveKeys) as $chunk) {
+ $chunks[] = new static($chunk);
+ }
+
+ return new static($chunks);
+ }
+
+ /**
+ * Sort through each item with a callback.
+ *
+ * @param callable|null $callback
+ * @return static
+ */
+ public function sort(callable $callback = null)
+ {
+ $items = $this->items;
+
+ $callback ? uasort($items, $callback) : uasort($items, function ($a, $b) {
+ if ($a == $b) {
+ return 0;
+ }
+
+ return ($a < $b) ? -1 : 1;
+ });
+
+ return new static($items);
+ }
+
+ /**
+ * Sort the collection using the given callback.
+ *
+ * @param callable|string $callback
+ * @param int $options
+ * @param bool $descending
+ * @return static
+ */
+ public function sortBy($callback, $options = SORT_REGULAR, $descending = false)
+ {
+ $results = [];
+
+ $callback = $this->valueRetriever($callback);
+
+ // First we will loop through the items and get the comparator from a callback
+ // function which we were given. Then, we will sort the returned values and
+ // and grab the corresponding values for the sorted keys from this array.
+ foreach ($this->items as $key => $value) {
+ $results[$key] = $callback($value, $key);
+ }
+
+ $descending ? arsort($results, $options)
: asort($results, $options);
- // Once we have sorted all of the keys in the array, we will loop through them
- // and grab the corresponding model so we can set the underlying items list
- // to the sorted version. Then we'll just return the collection instance.
- foreach (array_keys($results) as $key)
- {
- $results[$key] = $this->items[$key];
- }
-
- $this->items = $results;
-
- return $this;
- }
-
- /**
- * Sort the collection in descending order using the given callback.
- *
- * @param callable|string $callback
- * @param int $options
- * @return $this
- */
- public function sortByDesc($callback, $options = SORT_REGULAR)
- {
- return $this->sortBy($callback, $options, true);
- }
-
- /**
- * Splice portion of the underlying collection array.
- *
- * @param int $offset
- * @param int $length
- * @param mixed $replacement
- * @return static
- */
- public function splice($offset, $length = 0, $replacement = [])
- {
- return new static(array_splice($this->items, $offset, $length, $replacement));
- }
-
- /**
- * Get the sum of the given values.
- *
- * @param callable|string|null $callback
- * @return mixed
- */
- public function sum($callback = null)
- {
- if (is_null($callback))
- {
- return array_sum($this->items);
- }
-
- if ( ! $this->useAsCallable($callback))
- {
- $callback = $this->valueRetriever($callback);
- }
-
- return $this->reduce(function($result, $item) use ($callback)
- {
- return $result += $callback($item);
- }, 0);
- }
-
- /**
- * Take the first or last {$limit} items.
- *
- * @param int $limit
- * @return static
- */
- public function take($limit = null)
- {
- if ($limit < 0) return $this->slice($limit, abs($limit));
-
- return $this->slice(0, $limit);
- }
-
- /**
- * Transform each item in the collection using a callback.
- *
- * @param callable $callback
- * @return $this
- */
- public function transform(callable $callback)
- {
- $this->items = array_map($callback, $this->items);
-
- return $this;
- }
-
- /**
- * Return only unique items from the collection array.
- *
- * @return static
- */
- public function unique()
- {
- return new static(array_unique($this->items));
- }
-
- /**
- * Reset the keys on the underlying array.
- *
- * @return static
- */
- public function values()
- {
- return new static(array_values($this->items));
- }
-
- /**
- * Get a value retrieving callback.
- *
- * @param string $value
- * @return \Closure
- */
- protected function valueRetriever($value)
- {
- return function($item) use ($value)
- {
- return data_get($item, $value);
- };
- }
-
- /**
- * Get the collection of items as a plain array.
- *
- * @return array
- */
- public function toArray()
- {
- return array_map(function($value)
- {
- return $value instanceof Arrayable ? $value->toArray() : $value;
-
- }, $this->items);
- }
-
- /**
- * Convert the object into something JSON serializable.
- *
- * @return array
- */
- public function jsonSerialize()
- {
- return $this->toArray();
- }
-
- /**
- * Get the collection of items as JSON.
- *
- * @param int $options
- * @return string
- */
- public function toJson($options = 0)
- {
- return json_encode($this->toArray(), $options);
- }
-
- /**
- * Get an iterator for the items.
- *
- * @return \ArrayIterator
- */
- public function getIterator()
- {
- return new ArrayIterator($this->items);
- }
-
- /**
- * Get a CachingIterator instance.
- *
- * @param int $flags
- * @return \CachingIterator
- */
- public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING)
- {
- return new CachingIterator($this->getIterator(), $flags);
- }
-
- /**
- * Count the number of items in the collection.
- *
- * @return int
- */
- public function count()
- {
- return count($this->items);
- }
-
- /**
- * Determine if an item exists at an offset.
- *
- * @param mixed $key
- * @return bool
- */
- public function offsetExists($key)
- {
- return array_key_exists($key, $this->items);
- }
-
- /**
- * Get an item at a given offset.
- *
- * @param mixed $key
- * @return mixed
- */
- public function offsetGet($key)
- {
- return $this->items[$key];
- }
-
- /**
- * Set the item at a given offset.
- *
- * @param mixed $key
- * @param mixed $value
- * @return void
- */
- public function offsetSet($key, $value)
- {
- if (is_null($key))
- {
- $this->items[] = $value;
- }
- else
- {
- $this->items[$key] = $value;
- }
- }
-
- /**
- * Unset the item at a given offset.
- *
- * @param string $key
- * @return void
- */
- public function offsetUnset($key)
- {
- unset($this->items[$key]);
- }
-
- /**
- * Convert the collection to its string representation.
- *
- * @return string
- */
- public function __toString()
- {
- return $this->toJson();
- }
-
- /**
- * Results array of items from Collection or Arrayable.
- *
- * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array $items
- * @return array
- */
- protected function getArrayableItems($items)
- {
- if ($items instanceof Collection)
- {
- $items = $items->all();
- }
- elseif ($items instanceof Arrayable)
- {
- $items = $items->toArray();
- }
-
- return $items;
- }
-
+ // Once we have sorted all of the keys in the array, we will loop through them
+ // and grab the corresponding model so we can set the underlying items list
+ // to the sorted version. Then we'll just return the collection instance.
+ foreach (array_keys($results) as $key) {
+ $results[$key] = $this->items[$key];
+ }
+
+ return new static($results);
+ }
+
+ /**
+ * Sort the collection in descending order using the given callback.
+ *
+ * @param callable|string $callback
+ * @param int $options
+ * @return static
+ */
+ public function sortByDesc($callback, $options = SORT_REGULAR)
+ {
+ return $this->sortBy($callback, $options, true);
+ }
+
+ /**
+ * Splice a portion of the underlying collection array.
+ *
+ * @param int $offset
+ * @param int|null $length
+ * @param mixed $replacement
+ * @return static
+ */
+ public function splice($offset, $length = null, $replacement = [])
+ {
+ if (func_num_args() == 1) {
+ return new static(array_splice($this->items, $offset));
+ }
+
+ return new static(array_splice($this->items, $offset, $length, $replacement));
+ }
+
+ /**
+ * Get the sum of the given values.
+ *
+ * @param callable|string|null $callback
+ * @return mixed
+ */
+ public function sum($callback = null)
+ {
+ if (is_null($callback)) {
+ return array_sum($this->items);
+ }
+
+ $callback = $this->valueRetriever($callback);
+
+ return $this->reduce(function ($result, $item) use ($callback) {
+ return $result += $callback($item);
+ }, 0);
+ }
+
+ /**
+ * Take the first or last {$limit} items.
+ *
+ * @param int $limit
+ * @return static
+ */
+ public function take($limit)
+ {
+ if ($limit < 0) {
+ return $this->slice($limit, abs($limit));
+ }
+
+ return $this->slice(0, $limit);
+ }
+
+ /**
+ * Transform each item in the collection using a callback.
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function transform(callable $callback)
+ {
+ $this->items = $this->map($callback)->all();
+
+ return $this;
+ }
+
+ /**
+ * Return only unique items from the collection array.
+ *
+ * @param string|callable|null $key
+ * @return static
+ */
+ public function unique($key = null)
+ {
+ if (is_null($key)) {
+ return new static(array_unique($this->items, SORT_REGULAR));
+ }
+
+ $key = $this->valueRetriever($key);
+
+ $exists = [];
+
+ return $this->reject(function ($item) use ($key, &$exists) {
+ if (in_array($id = $key($item), $exists)) {
+ return true;
+ }
+
+ $exists[] = $id;
+ });
+ }
+
+ /**
+ * Reset the keys on the underlying array.
+ *
+ * @return static
+ */
+ public function values()
+ {
+ return new static(array_values($this->items));
+ }
+
+ /**
+ * Get a value retrieving callback.
+ *
+ * @param string $value
+ * @return callable
+ */
+ protected function valueRetriever($value)
+ {
+ if ($this->useAsCallable($value)) {
+ return $value;
+ }
+
+ return function ($item) use ($value) {
+ return data_get($item, $value);
+ };
+ }
+
+ /**
+ * Zip the collection together with one or more arrays.
+ *
+ * e.g. new Collection([1, 2, 3])->zip([4, 5, 6]);
+ * => [[1, 4], [2, 5], [3, 6]]
+ *
+ * @param mixed ...$items
+ * @return static
+ */
+ public function zip($items)
+ {
+ $arrayableItems = array_map(function ($items) {
+ return $this->getArrayableItems($items);
+ }, func_get_args());
+
+ $params = array_merge([function () {
+ return new static(func_get_args());
+ }, $this->items], $arrayableItems);
+
+ return new static(call_user_func_array('array_map', $params));
+ }
+
+ /**
+ * Get the collection of items as a plain array.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ return array_map(function ($value) {
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ }
+
+ /**
+ * Convert the object into something JSON serializable.
+ *
+ * @return array
+ */
+ public function jsonSerialize()
+ {
+ return $this->toArray();
+ }
+
+ /**
+ * Get the collection of items as JSON.
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toJson($options = 0)
+ {
+ return json_encode($this->toArray(), $options);
+ }
+
+ /**
+ * Get an iterator for the items.
+ *
+ * @return \ArrayIterator
+ */
+ public function getIterator()
+ {
+ return new ArrayIterator($this->items);
+ }
+
+ /**
+ * Get a CachingIterator instance.
+ *
+ * @param int $flags
+ * @return \CachingIterator
+ */
+ public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING)
+ {
+ return new CachingIterator($this->getIterator(), $flags);
+ }
+
+ /**
+ * Count the number of items in the collection.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return count($this->items);
+ }
+
+ /**
+ * Determine if an item exists at an offset.
+ *
+ * @param mixed $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ return array_key_exists($key, $this->items);
+ }
+
+ /**
+ * Get an item at a given offset.
+ *
+ * @param mixed $key
+ * @return mixed
+ */
+ public function offsetGet($key)
+ {
+ return $this->items[$key];
+ }
+
+ /**
+ * Set the item at a given offset.
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($key, $value)
+ {
+ if (is_null($key)) {
+ $this->items[] = $value;
+ } else {
+ $this->items[$key] = $value;
+ }
+ }
+
+ /**
+ * Unset the item at a given offset.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function offsetUnset($key)
+ {
+ unset($this->items[$key]);
+ }
+
+ /**
+ * Convert the collection to its string representation.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->toJson();
+ }
+
+ /**
+ * Results array of items from Collection or Arrayable.
+ *
+ * @param mixed $items
+ * @return array
+ */
+ protected function getArrayableItems($items)
+ {
+ if ($items instanceof self) {
+ return $items->all();
+ } elseif ($items instanceof Arrayable) {
+ return $items->toArray();
+ } elseif ($items instanceof Jsonable) {
+ return json_decode($items->toJson(), true);
+ }
+
+ return (array) $items;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Debug/Dumper.php b/application/vendor/laravel/framework/src/Illuminate/Support/Debug/Dumper.php
index f58b7ca..0c84a8b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Debug/Dumper.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Debug/Dumper.php
@@ -1,21 +1,26 @@
-dump((new VarCloner)->cloneVar($value));
- }
+class Dumper
+{
+ /**
+ * Dump a value with elegance.
+ *
+ * @param mixed $value
+ * @return void
+ */
+ public function dump($value)
+ {
+ if (class_exists(CliDumper::class)) {
+ $dumper = 'cli' === PHP_SAPI ? new CliDumper : new HtmlDumper;
+ $dumper->dump((new VarCloner)->cloneVar($value));
+ } else {
+ var_dump($value);
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php b/application/vendor/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php
index 263f5c5..5825ac8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php
@@ -1,28 +1,29 @@
- 'background-color:#fff; color:#222; line-height:1.2em; font-weight:normal; font:12px Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:100000',
- 'num' => 'color:#a71d5d',
- 'const' => 'color:#795da3',
- 'str' => 'color:#df5000',
- 'cchr' => 'color:#222',
- 'note' => 'color:#a71d5d',
- 'ref' => 'color:#a0a0a0',
- 'public' => 'color:#795da3',
- 'protected' => 'color:#795da3',
- 'private' => 'color:#795da3',
- 'meta' => 'color:#b729d9',
- 'key' => 'color:#df5000',
- 'index' => 'color:#a71d5d',
- );
+use Symfony\Component\VarDumper\Dumper\HtmlDumper as SymfonyHtmlDumper;
+class HtmlDumper extends SymfonyHtmlDumper
+{
+ /**
+ * Colour definitions for output.
+ *
+ * @var array
+ */
+ protected $styles = [
+ 'default' => 'background-color:#fff; color:#222; line-height:1.2em; font-weight:normal; font:12px Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:100000',
+ 'num' => 'color:#a71d5d',
+ 'const' => 'color:#795da3',
+ 'str' => 'color:#df5000',
+ 'cchr' => 'color:#222',
+ 'note' => 'color:#a71d5d',
+ 'ref' => 'color:#a0a0a0',
+ 'public' => 'color:#795da3',
+ 'protected' => 'color:#795da3',
+ 'private' => 'color:#795da3',
+ 'meta' => 'color:#b729d9',
+ 'key' => 'color:#df5000',
+ 'index' => 'color:#a71d5d',
+ ];
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/App.php b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/App.php
index 0ac6479..2675d56 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/App.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/App.php
@@ -1,18 +1,19 @@
-getEngineResolver()->resolve('blade')->getCompiler();
- }
-
+class Blade extends Facade
+{
+ /**
+ * Get the registered name of the component.
+ *
+ * @return string
+ */
+ protected static function getFacadeAccessor()
+ {
+ return static::$app['view']->getEngineResolver()->resolve('blade')->getCompiler();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php
index 7b133d1..7c42e9e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php
@@ -1,18 +1,19 @@
-cookie($key, null));
- }
-
- /**
- * Retrieve a cookie from the request.
- *
- * @param string $key
- * @param mixed $default
- * @return string
- */
- public static function get($key = null, $default = null)
- {
- return static::$app['request']->cookie($key, $default);
- }
+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));
+ }
- /**
- * Get the registered name of the component.
- *
- * @return string
- */
- protected static function getFacadeAccessor()
- {
- return 'cookie';
- }
+ /**
+ * Retrieve a cookie from the request.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return string
+ */
+ public static function get($key = null, $default = null)
+ {
+ return static::$app['request']->cookie($key, $default);
+ }
+ /**
+ * Get the registered name of the component.
+ *
+ * @return string
+ */
+ protected static function getFacadeAccessor()
+ {
+ return 'cookie';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
index ee78888..0eef08d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
@@ -1,18 +1,19 @@
-instance(static::getFacadeAccessor(), $instance);
- }
-
- /**
- * Initiate a mock expectation on the facade.
- *
- * @param mixed
- * @return \Mockery\Expectation
- */
- public static function shouldReceive()
- {
- $name = static::getFacadeAccessor();
-
- if (static::isMock())
- {
- $mock = static::$resolvedInstance[$name];
- }
- else
- {
- $mock = static::createFreshMockInstance($name);
- }
-
- return call_user_func_array(array($mock, 'shouldReceive'), func_get_args());
- }
-
- /**
- * Create a fresh mock instance for the given class.
- *
- * @param string $name
- * @return \Mockery\Expectation
- */
- protected static function createFreshMockInstance($name)
- {
- static::$resolvedInstance[$name] = $mock = static::createMockByName($name);
-
- if (isset(static::$app))
- {
- static::$app->instance($name, $mock);
- }
-
- return $mock;
- }
-
- /**
- * Create a fresh mock instance for the given class.
- *
- * @param string $name
- * @return \Mockery\Expectation
- */
- protected static function createMockByName($name)
- {
- $class = static::getMockableClass($name);
-
- return $class ? Mockery::mock($class) : Mockery::mock();
- }
-
- /**
- * Determines whether a mock is set as the instance of the facade.
- *
- * @return bool
- */
- protected static function isMock()
- {
- $name = static::getFacadeAccessor();
-
- return isset(static::$resolvedInstance[$name]) && static::$resolvedInstance[$name] instanceof MockInterface;
- }
-
- /**
- * Get the mockable class for the bound instance.
- *
- * @return string
- */
- protected static function getMockableClass()
- {
- if ($root = static::getFacadeRoot()) return get_class($root);
- }
-
- /**
- * Get the root object behind the facade.
- *
- * @return mixed
- */
- public static function getFacadeRoot()
- {
- return static::resolveFacadeInstance(static::getFacadeAccessor());
- }
-
- /**
- * Get the registered name of the component.
- *
- * @return string
- *
- * @throws \RuntimeException
- */
- protected static function getFacadeAccessor()
- {
- throw new RuntimeException("Facade does not implement getFacadeAccessor method.");
- }
-
- /**
- * Resolve the facade root instance from the container.
- *
- * @param string $name
- * @return mixed
- */
- protected static function resolveFacadeInstance($name)
- {
- if (is_object($name)) return $name;
-
- if (isset(static::$resolvedInstance[$name]))
- {
- return static::$resolvedInstance[$name];
- }
-
- return static::$resolvedInstance[$name] = static::$app[$name];
- }
-
- /**
- * Clear a resolved facade instance.
- *
- * @param string $name
- * @return void
- */
- public static function clearResolvedInstance($name)
- {
- unset(static::$resolvedInstance[$name]);
- }
-
- /**
- * Clear all of the resolved instances.
- *
- * @return void
- */
- public static function clearResolvedInstances()
- {
- static::$resolvedInstance = array();
- }
-
- /**
- * Get the application instance behind the facade.
- *
- * @return \Illuminate\Contracts\Foundation\Application
- */
- public static function getFacadeApplication()
- {
- return static::$app;
- }
-
- /**
- * Set the application instance.
- *
- * @param \Illuminate\Contracts\Foundation\Application $app
- * @return void
- */
- public static function setFacadeApplication($app)
- {
- static::$app = $app;
- }
-
- /**
- * Handle dynamic, static calls to the object.
- *
- * @param string $method
- * @param array $args
- * @return mixed
- */
- public static function __callStatic($method, $args)
- {
- $instance = static::getFacadeRoot();
-
- switch (count($args))
- {
- case 0:
- return $instance->$method();
-
- case 1:
- return $instance->$method($args[0]);
-
- case 2:
- return $instance->$method($args[0], $args[1]);
-
- case 3:
- return $instance->$method($args[0], $args[1], $args[2]);
-
- case 4:
- return $instance->$method($args[0], $args[1], $args[2], $args[3]);
-
- default:
- return call_user_func_array(array($instance, $method), $args);
- }
- }
-
+abstract class Facade
+{
+ /**
+ * The application instance being facaded.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected static $app;
+
+ /**
+ * The resolved object instances.
+ *
+ * @var array
+ */
+ protected static $resolvedInstance;
+
+ /**
+ * Hotswap the underlying instance behind the facade.
+ *
+ * @param mixed $instance
+ * @return void
+ */
+ public static function swap($instance)
+ {
+ static::$resolvedInstance[static::getFacadeAccessor()] = $instance;
+
+ static::$app->instance(static::getFacadeAccessor(), $instance);
+ }
+
+ /**
+ * Initiate a mock expectation on the facade.
+ *
+ * @param mixed
+ * @return \Mockery\Expectation
+ */
+ public static function shouldReceive()
+ {
+ $name = static::getFacadeAccessor();
+
+ if (static::isMock()) {
+ $mock = static::$resolvedInstance[$name];
+ } else {
+ $mock = static::createFreshMockInstance($name);
+ }
+
+ return call_user_func_array([$mock, 'shouldReceive'], func_get_args());
+ }
+
+ /**
+ * Create a fresh mock instance for the given class.
+ *
+ * @param string $name
+ * @return \Mockery\Expectation
+ */
+ protected static function createFreshMockInstance($name)
+ {
+ static::$resolvedInstance[$name] = $mock = static::createMockByName($name);
+
+ $mock->shouldAllowMockingProtectedMethods();
+
+ if (isset(static::$app)) {
+ static::$app->instance($name, $mock);
+ }
+
+ return $mock;
+ }
+
+ /**
+ * Create a fresh mock instance for the given class.
+ *
+ * @param string $name
+ * @return \Mockery\Expectation
+ */
+ protected static function createMockByName($name)
+ {
+ $class = static::getMockableClass($name);
+
+ return $class ? Mockery::mock($class) : Mockery::mock();
+ }
+
+ /**
+ * Determines whether a mock is set as the instance of the facade.
+ *
+ * @return bool
+ */
+ protected static function isMock()
+ {
+ $name = static::getFacadeAccessor();
+
+ return isset(static::$resolvedInstance[$name]) && static::$resolvedInstance[$name] instanceof MockInterface;
+ }
+
+ /**
+ * Get the mockable class for the bound instance.
+ *
+ * @return string|null
+ */
+ protected static function getMockableClass()
+ {
+ if ($root = static::getFacadeRoot()) {
+ return get_class($root);
+ }
+ }
+
+ /**
+ * Get the root object behind the facade.
+ *
+ * @return mixed
+ */
+ public static function getFacadeRoot()
+ {
+ return static::resolveFacadeInstance(static::getFacadeAccessor());
+ }
+
+ /**
+ * Get the registered name of the component.
+ *
+ * @return string
+ *
+ * @throws \RuntimeException
+ */
+ protected static function getFacadeAccessor()
+ {
+ throw new RuntimeException('Facade does not implement getFacadeAccessor method.');
+ }
+
+ /**
+ * Resolve the facade root instance from the container.
+ *
+ * @param string|object $name
+ * @return mixed
+ */
+ protected static function resolveFacadeInstance($name)
+ {
+ if (is_object($name)) {
+ return $name;
+ }
+
+ if (isset(static::$resolvedInstance[$name])) {
+ return static::$resolvedInstance[$name];
+ }
+
+ return static::$resolvedInstance[$name] = static::$app[$name];
+ }
+
+ /**
+ * Clear a resolved facade instance.
+ *
+ * @param string $name
+ * @return void
+ */
+ public static function clearResolvedInstance($name)
+ {
+ unset(static::$resolvedInstance[$name]);
+ }
+
+ /**
+ * Clear all of the resolved instances.
+ *
+ * @return void
+ */
+ public static function clearResolvedInstances()
+ {
+ static::$resolvedInstance = [];
+ }
+
+ /**
+ * Get the application instance behind the facade.
+ *
+ * @return \Illuminate\Contracts\Foundation\Application
+ */
+ public static function getFacadeApplication()
+ {
+ return static::$app;
+ }
+
+ /**
+ * Set the application instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public static function setFacadeApplication($app)
+ {
+ static::$app = $app;
+ }
+
+ /**
+ * Handle dynamic, static calls to the object.
+ *
+ * @param string $method
+ * @param array $args
+ * @return mixed
+ */
+ public static function __callStatic($method, $args)
+ {
+ $instance = static::getFacadeRoot();
+
+ if (! $instance) {
+ throw new RuntimeException('A facade root has not been set.');
+ }
+
+ switch (count($args)) {
+ case 0:
+ return $instance->$method();
+ case 1:
+ return $instance->$method($args[0]);
+ case 2:
+ return $instance->$method($args[0], $args[1]);
+ case 3:
+ return $instance->$method($args[0], $args[1], $args[2]);
+ case 4:
+ return $instance->$method($args[0], $args[1], $args[2], $args[3]);
+ default:
+ return call_user_func_array([$instance, $method], $args);
+ }
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php
index 122ffb2..0f81bf6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php
@@ -1,18 +1,19 @@
-input($key, $default);
- }
-
- /**
- * Get the registered name of the component.
- *
- * @return string
- */
- protected static function getFacadeAccessor()
- {
- return 'request';
- }
+class Input extends Facade
+{
+ /**
+ * Get an item from the input data.
+ *
+ * This method is used for all request verbs (GET, POST, PUT, and DELETE)
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public static function get($key = null, $default = null)
+ {
+ return static::$app['request']->input($key, $default);
+ }
+ /**
+ * Get the registered name of the component.
+ *
+ * @return string
+ */
+ protected static function getFacadeAccessor()
+ {
+ return 'request';
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
index 5496dfa..e5862b9 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
@@ -1,18 +1,19 @@
-connection($name)->getSchemaBuilder();
- }
-
- /**
- * Get the registered name of the component.
- *
- * @return string
- */
- protected static function getFacadeAccessor()
- {
- return static::$app['db']->connection()->getSchemaBuilder();
- }
+class Schema extends Facade
+{
+ /**
+ * Get a schema builder instance for a connection.
+ *
+ * @param string $name
+ * @return \Illuminate\Database\Schema\Builder
+ */
+ public static function connection($name)
+ {
+ return static::$app['db']->connection($name)->getSchemaBuilder();
+ }
+ /**
+ * Get a schema builder instance for the default connection.
+ *
+ * @return \Illuminate\Database\Schema\Builder
+ */
+ protected static function getFacadeAccessor()
+ {
+ return static::$app['db']->connection()->getSchemaBuilder();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php
index cde6a87..bc9b5fd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php
@@ -1,19 +1,20 @@
- $value)
- {
- $this->attributes[$key] = $value;
- }
- }
-
- /**
- * Get an attribute from the container.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function get($key, $default = null)
- {
- if (array_key_exists($key, $this->attributes))
- {
- return $this->attributes[$key];
- }
-
- return value($default);
- }
-
- /**
- * Get the attributes from the container.
- *
- * @return array
- */
- public function getAttributes()
- {
- return $this->attributes;
- }
-
- /**
- * Convert the Fluent instance to an array.
- *
- * @return array
- */
- public function toArray()
- {
- return $this->attributes;
- }
-
- /**
- * Convert the object into something JSON serializable.
- *
- * @return array
- */
- public function jsonSerialize()
- {
- return $this->toArray();
- }
-
- /**
- * Convert the Fluent instance to JSON.
- *
- * @param int $options
- * @return string
- */
- public function toJson($options = 0)
- {
- return json_encode($this->toArray(), $options);
- }
-
- /**
- * Determine if the given offset exists.
- *
- * @param string $offset
- * @return bool
- */
- public function offsetExists($offset)
- {
- return isset($this->{$offset});
- }
-
- /**
- * Get the value for a given offset.
- *
- * @param string $offset
- * @return mixed
- */
- public function offsetGet($offset)
- {
- return $this->{$offset};
- }
-
- /**
- * Set the value at the given offset.
- *
- * @param string $offset
- * @param mixed $value
- * @return void
- */
- public function offsetSet($offset, $value)
- {
- $this->{$offset} = $value;
- }
-
- /**
- * Unset the value at the given offset.
- *
- * @param string $offset
- * @return void
- */
- public function offsetUnset($offset)
- {
- unset($this->{$offset});
- }
-
- /**
- * Handle dynamic calls to the container to set attributes.
- *
- * @param string $method
- * @param array $parameters
- * @return $this
- */
- public function __call($method, $parameters)
- {
- $this->attributes[$method] = count($parameters) > 0 ? $parameters[0] : true;
-
- return $this;
- }
-
- /**
- * Dynamically retrieve the value of an attribute.
- *
- * @param string $key
- * @return mixed
- */
- public function __get($key)
- {
- return $this->get($key);
- }
-
- /**
- * Dynamically set the value of an attribute.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function __set($key, $value)
- {
- $this->attributes[$key] = $value;
- }
-
- /**
- * Dynamically check if an attribute is set.
- *
- * @param string $key
- * @return void
- */
- public function __isset($key)
- {
- return isset($this->attributes[$key]);
- }
-
- /**
- * Dynamically unset an attribute.
- *
- * @param string $key
- * @return void
- */
- public function __unset($key)
- {
- unset($this->attributes[$key]);
- }
-
+class Fluent implements ArrayAccess, Arrayable, Jsonable, JsonSerializable
+{
+ /**
+ * All of the attributes set on the container.
+ *
+ * @var array
+ */
+ protected $attributes = [];
+
+ /**
+ * Create a new fluent container instance.
+ *
+ * @param array|object $attributes
+ * @return void
+ */
+ public function __construct($attributes = [])
+ {
+ foreach ($attributes as $key => $value) {
+ $this->attributes[$key] = $value;
+ }
+ }
+
+ /**
+ * Get an attribute from the container.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function get($key, $default = null)
+ {
+ if (array_key_exists($key, $this->attributes)) {
+ return $this->attributes[$key];
+ }
+
+ return value($default);
+ }
+
+ /**
+ * Get the attributes from the container.
+ *
+ * @return array
+ */
+ public function getAttributes()
+ {
+ return $this->attributes;
+ }
+
+ /**
+ * Convert the Fluent instance to an array.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ return $this->attributes;
+ }
+
+ /**
+ * Convert the object into something JSON serializable.
+ *
+ * @return array
+ */
+ public function jsonSerialize()
+ {
+ return $this->toArray();
+ }
+
+ /**
+ * Convert the Fluent instance to JSON.
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toJson($options = 0)
+ {
+ return json_encode($this->toArray(), $options);
+ }
+
+ /**
+ * Determine if the given offset exists.
+ *
+ * @param string $offset
+ * @return bool
+ */
+ public function offsetExists($offset)
+ {
+ return isset($this->{$offset});
+ }
+
+ /**
+ * Get the value for a given offset.
+ *
+ * @param string $offset
+ * @return mixed
+ */
+ public function offsetGet($offset)
+ {
+ return $this->{$offset};
+ }
+
+ /**
+ * Set the value at the given offset.
+ *
+ * @param string $offset
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($offset, $value)
+ {
+ $this->{$offset} = $value;
+ }
+
+ /**
+ * Unset the value at the given offset.
+ *
+ * @param string $offset
+ * @return void
+ */
+ public function offsetUnset($offset)
+ {
+ unset($this->{$offset});
+ }
+
+ /**
+ * Handle dynamic calls to the container to set attributes.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return $this
+ */
+ public function __call($method, $parameters)
+ {
+ $this->attributes[$method] = count($parameters) > 0 ? $parameters[0] : true;
+
+ return $this;
+ }
+
+ /**
+ * Dynamically retrieve the value of an attribute.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function __get($key)
+ {
+ return $this->get($key);
+ }
+
+ /**
+ * Dynamically set the value of an attribute.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ $this->attributes[$key] = $value;
+ }
+
+ /**
+ * Dynamically check if an attribute is set.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function __isset($key)
+ {
+ return isset($this->attributes[$key]);
+ }
+
+ /**
+ * Dynamically unset an attribute.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function __unset($key)
+ {
+ unset($this->attributes[$key]);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/HtmlString.php b/application/vendor/laravel/framework/src/Illuminate/Support/HtmlString.php
new file mode 100644
index 0000000..8d246cf
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/HtmlString.php
@@ -0,0 +1,46 @@
+html = $html;
+ }
+
+ /**
+ * Get the the HTML string.
+ *
+ * @return string
+ */
+ public function toHtml()
+ {
+ return $this->html;
+ }
+
+ /**
+ * Get the the HTML string.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->toHtml();
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Manager.php b/application/vendor/laravel/framework/src/Illuminate/Support/Manager.php
index aee3c06..29154c6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Manager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Manager.php
@@ -1,142 +1,139 @@
-app = $app;
- }
-
- /**
- * Get the default driver name.
- *
- * @return string
- */
- abstract public function getDefaultDriver();
-
- /**
- * Get a driver instance.
- *
- * @param string $driver
- * @return mixed
- */
- public function driver($driver = null)
- {
- $driver = $driver ?: $this->getDefaultDriver();
-
- // If the given driver has not been created before, we will create the instances
- // here and cache it so we can return it next time very quickly. If there is
- // already a driver created by this name, we'll just return that instance.
- if ( ! isset($this->drivers[$driver]))
- {
- $this->drivers[$driver] = $this->createDriver($driver);
- }
-
- return $this->drivers[$driver];
- }
-
- /**
- * Create a new driver instance.
- *
- * @param string $driver
- * @return mixed
- *
- * @throws \InvalidArgumentException
- */
- protected function createDriver($driver)
- {
- $method = 'create'.ucfirst($driver).'Driver';
-
- // We'll check to see if a creator method exists for the given driver. If not we
- // will check for a custom driver creator, which allows developers to create
- // drivers using their own customized driver creator Closure to create it.
- if (isset($this->customCreators[$driver]))
- {
- return $this->callCustomCreator($driver);
- }
- elseif (method_exists($this, $method))
- {
- return $this->$method();
- }
-
- throw new InvalidArgumentException("Driver [$driver] not supported.");
- }
-
- /**
- * Call a custom driver creator.
- *
- * @param string $driver
- * @return mixed
- */
- protected function callCustomCreator($driver)
- {
- return $this->customCreators[$driver]($this->app);
- }
-
- /**
- * Register a custom driver creator Closure.
- *
- * @param string $driver
- * @param \Closure $callback
- * @return $this
- */
- public function extend($driver, Closure $callback)
- {
- $this->customCreators[$driver] = $callback;
-
- return $this;
- }
-
- /**
- * Get all of the created "drivers".
- *
- * @return array
- */
- public function getDrivers()
- {
- return $this->drivers;
- }
-
- /**
- * Dynamically call the default driver instance.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array(array($this->driver(), $method), $parameters);
- }
-
+abstract class Manager
+{
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The registered custom driver creators.
+ *
+ * @var array
+ */
+ protected $customCreators = [];
+
+ /**
+ * The array of created "drivers".
+ *
+ * @var array
+ */
+ protected $drivers = [];
+
+ /**
+ * Create a new manager instance.
+ *
+ * @param \Illuminate\Foundation\Application $app
+ * @return void
+ */
+ public function __construct($app)
+ {
+ $this->app = $app;
+ }
+
+ /**
+ * Get the default driver name.
+ *
+ * @return string
+ */
+ abstract public function getDefaultDriver();
+
+ /**
+ * Get a driver instance.
+ *
+ * @param string $driver
+ * @return mixed
+ */
+ public function driver($driver = null)
+ {
+ $driver = $driver ?: $this->getDefaultDriver();
+
+ // If the given driver has not been created before, we will create the instances
+ // here and cache it so we can return it next time very quickly. If there is
+ // already a driver created by this name, we'll just return that instance.
+ if (! isset($this->drivers[$driver])) {
+ $this->drivers[$driver] = $this->createDriver($driver);
+ }
+
+ return $this->drivers[$driver];
+ }
+
+ /**
+ * Create a new driver instance.
+ *
+ * @param string $driver
+ * @return mixed
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function createDriver($driver)
+ {
+ $method = 'create'.ucfirst($driver).'Driver';
+
+ // We'll check to see if a creator method exists for the given driver. If not we
+ // will check for a custom driver creator, which allows developers to create
+ // drivers using their own customized driver creator Closure to create it.
+ if (isset($this->customCreators[$driver])) {
+ return $this->callCustomCreator($driver);
+ } elseif (method_exists($this, $method)) {
+ return $this->$method();
+ }
+
+ throw new InvalidArgumentException("Driver [$driver] not supported.");
+ }
+
+ /**
+ * Call a custom driver creator.
+ *
+ * @param string $driver
+ * @return mixed
+ */
+ protected function callCustomCreator($driver)
+ {
+ return $this->customCreators[$driver]($this->app);
+ }
+
+ /**
+ * Register a custom driver creator Closure.
+ *
+ * @param string $driver
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function extend($driver, Closure $callback)
+ {
+ $this->customCreators[$driver] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Get all of the created "drivers".
+ *
+ * @return array
+ */
+ public function getDrivers()
+ {
+ return $this->drivers;
+ }
+
+ /**
+ * Dynamically call the default driver instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->driver(), $method], $parameters);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php b/application/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php
index 770d667..a58b154 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php
@@ -1,4 +1,6 @@
- $value)
- {
- $this->messages[$key] = (array) $value;
- }
- }
-
- /**
- * Get the keys present in the message bag.
- *
- * @return array
- */
- public function keys()
- {
- return array_keys($this->messages);
- }
-
- /**
- * Add a message to the bag.
- *
- * @param string $key
- * @param string $message
- * @return $this
- */
- public function add($key, $message)
- {
- if ($this->isUnique($key, $message))
- {
- $this->messages[$key][] = $message;
- }
-
- return $this;
- }
-
- /**
- * Merge a new array of messages into the bag.
- *
- * @param \Illuminate\Contracts\Support\MessageProvider|array $messages
- * @return $this
- */
- public function merge($messages)
- {
- if ($messages instanceof MessageProvider)
- {
- $messages = $messages->getMessageBag()->getMessages();
- }
-
- $this->messages = array_merge_recursive($this->messages, $messages);
-
- return $this;
- }
-
- /**
- * Determine if a key and message combination already exists.
- *
- * @param string $key
- * @param string $message
- * @return bool
- */
- protected function isUnique($key, $message)
- {
- $messages = (array) $this->messages;
-
- return ! isset($messages[$key]) || ! in_array($message, $messages[$key]);
- }
-
- /**
- * Determine if messages exist for a given key.
- *
- * @param string $key
- * @return bool
- */
- public function has($key = null)
- {
- return $this->first($key) !== '';
- }
-
- /**
- * Get the first message from the bag for a given key.
- *
- * @param string $key
- * @param string $format
- * @return string
- */
- public function first($key = null, $format = null)
- {
- $messages = is_null($key) ? $this->all($format) : $this->get($key, $format);
-
- return count($messages) > 0 ? $messages[0] : '';
- }
-
- /**
- * Get all of the messages from the bag for a given key.
- *
- * @param string $key
- * @param string $format
- * @return array
- */
- public function get($key, $format = null)
- {
- // If the message exists in the container, we will transform it and return
- // the message. Otherwise, we'll return an empty array since the entire
- // methods is to return back an array of messages in the first place.
- if (array_key_exists($key, $this->messages))
- {
- return $this->transform($this->messages[$key], $this->checkFormat($format), $key);
- }
-
- return array();
- }
-
- /**
- * Get all of the messages for every key in the bag.
- *
- * @param string $format
- * @return array
- */
- public function all($format = null)
- {
- $format = $this->checkFormat($format);
-
- $all = array();
-
- foreach ($this->messages as $key => $messages)
- {
- $all = array_merge($all, $this->transform($messages, $format, $key));
- }
-
- return $all;
- }
-
- /**
- * Format an array of messages.
- *
- * @param array $messages
- * @param string $format
- * @param string $messageKey
- * @return array
- */
- protected function transform($messages, $format, $messageKey)
- {
- $messages = (array) $messages;
-
- // We will simply spin through the given messages and transform each one
- // replacing the :message place holder with the real message allowing
- // the messages to be easily formatted to each developer's desires.
- $replace = array(':message', ':key');
-
- foreach ($messages as &$message)
- {
- $message = str_replace($replace, array($message, $messageKey), $format);
- }
-
- return $messages;
- }
-
- /**
- * Get the appropriate format based on the given format.
- *
- * @param string $format
- * @return string
- */
- protected function checkFormat($format)
- {
- return $format ?: $this->format;
- }
-
- /**
- * Get the raw messages in the container.
- *
- * @return array
- */
- public function getMessages()
- {
- return $this->messages;
- }
-
- /**
- * Get the messages for the instance.
- *
- * @return \Illuminate\Support\MessageBag
- */
- public function getMessageBag()
- {
- return $this;
- }
-
- /**
- * Get the default message format.
- *
- * @return string
- */
- public function getFormat()
- {
- return $this->format;
- }
-
- /**
- * Set the default message format.
- *
- * @param string $format
- * @return \Illuminate\Support\MessageBag
- */
- public function setFormat($format = ':message')
- {
- $this->format = $format;
-
- return $this;
- }
-
- /**
- * Determine if the message bag has any messages.
- *
- * @return bool
- */
- public function isEmpty()
- {
- return ! $this->any();
- }
-
- /**
- * Determine if the message bag has any messages.
- *
- * @return bool
- */
- public function any()
- {
- return $this->count() > 0;
- }
-
- /**
- * Get the number of messages in the container.
- *
- * @return int
- */
- public function count()
- {
- return count($this->messages, COUNT_RECURSIVE) - count($this->messages);
- }
-
- /**
- * Get the instance as an array.
- *
- * @return array
- */
- public function toArray()
- {
- return $this->getMessages();
- }
-
- /**
- * Convert the object into something JSON serializable.
- *
- * @return array
- */
- public function jsonSerialize()
- {
- return $this->toArray();
- }
-
- /**
- * Convert the object to its JSON representation.
- *
- * @param int $options
- * @return string
- */
- public function toJson($options = 0)
- {
- return json_encode($this->toArray(), $options);
- }
-
- /**
- * Convert the message bag to its string representation.
- *
- * @return string
- */
- public function __toString()
- {
- return $this->toJson();
- }
-
+class MessageBag implements Arrayable, Countable, Jsonable, JsonSerializable, MessageBagContract, MessageProvider
+{
+ /**
+ * All of the registered messages.
+ *
+ * @var array
+ */
+ protected $messages = [];
+
+ /**
+ * Default format for message output.
+ *
+ * @var string
+ */
+ protected $format = ':message';
+
+ /**
+ * Create a new message bag instance.
+ *
+ * @param array $messages
+ * @return void
+ */
+ public function __construct(array $messages = [])
+ {
+ foreach ($messages as $key => $value) {
+ $this->messages[$key] = (array) $value;
+ }
+ }
+
+ /**
+ * Get the keys present in the message bag.
+ *
+ * @return array
+ */
+ public function keys()
+ {
+ return array_keys($this->messages);
+ }
+
+ /**
+ * Add a message to the bag.
+ *
+ * @param string $key
+ * @param string $message
+ * @return $this
+ */
+ public function add($key, $message)
+ {
+ if ($this->isUnique($key, $message)) {
+ $this->messages[$key][] = $message;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Merge a new array of messages into the bag.
+ *
+ * @param \Illuminate\Contracts\Support\MessageProvider|array $messages
+ * @return $this
+ */
+ public function merge($messages)
+ {
+ if ($messages instanceof MessageProvider) {
+ $messages = $messages->getMessageBag()->getMessages();
+ }
+
+ $this->messages = array_merge_recursive($this->messages, $messages);
+
+ return $this;
+ }
+
+ /**
+ * Determine if a key and message combination already exists.
+ *
+ * @param string $key
+ * @param string $message
+ * @return bool
+ */
+ protected function isUnique($key, $message)
+ {
+ $messages = (array) $this->messages;
+
+ return ! isset($messages[$key]) || ! in_array($message, $messages[$key]);
+ }
+
+ /**
+ * Determine if messages exist for a given key.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function has($key = null)
+ {
+ return $this->first($key) !== '';
+ }
+
+ /**
+ * Get the first message from the bag for a given key.
+ *
+ * @param string $key
+ * @param string $format
+ * @return string
+ */
+ public function first($key = null, $format = null)
+ {
+ $messages = is_null($key) ? $this->all($format) : $this->get($key, $format);
+
+ return count($messages) > 0 ? $messages[0] : '';
+ }
+
+ /**
+ * Get all of the messages from the bag for a given key.
+ *
+ * @param string $key
+ * @param string $format
+ * @return array
+ */
+ public function get($key, $format = null)
+ {
+ // If the message exists in the container, we will transform it and return
+ // the message. Otherwise, we'll return an empty array since the entire
+ // methods is to return back an array of messages in the first place.
+ if (array_key_exists($key, $this->messages)) {
+ return $this->transform($this->messages[$key], $this->checkFormat($format), $key);
+ }
+
+ return [];
+ }
+
+ /**
+ * Get all of the messages for every key in the bag.
+ *
+ * @param string $format
+ * @return array
+ */
+ public function all($format = null)
+ {
+ $format = $this->checkFormat($format);
+
+ $all = [];
+
+ foreach ($this->messages as $key => $messages) {
+ $all = array_merge($all, $this->transform($messages, $format, $key));
+ }
+
+ return $all;
+ }
+
+ /**
+ * Format an array of messages.
+ *
+ * @param array $messages
+ * @param string $format
+ * @param string $messageKey
+ * @return array
+ */
+ protected function transform($messages, $format, $messageKey)
+ {
+ $messages = (array) $messages;
+
+ // We will simply spin through the given messages and transform each one
+ // replacing the :message place holder with the real message allowing
+ // the messages to be easily formatted to each developer's desires.
+ $replace = [':message', ':key'];
+
+ foreach ($messages as &$message) {
+ $message = str_replace($replace, [$message, $messageKey], $format);
+ }
+
+ return $messages;
+ }
+
+ /**
+ * Get the appropriate format based on the given format.
+ *
+ * @param string $format
+ * @return string
+ */
+ protected function checkFormat($format)
+ {
+ return $format ?: $this->format;
+ }
+
+ /**
+ * Get the raw messages in the container.
+ *
+ * @return array
+ */
+ public function getMessages()
+ {
+ return $this->messages;
+ }
+
+ /**
+ * Get the messages for the instance.
+ *
+ * @return \Illuminate\Support\MessageBag
+ */
+ public function getMessageBag()
+ {
+ return $this;
+ }
+
+ /**
+ * Get the default message format.
+ *
+ * @return string
+ */
+ public function getFormat()
+ {
+ return $this->format;
+ }
+
+ /**
+ * Set the default message format.
+ *
+ * @param string $format
+ * @return \Illuminate\Support\MessageBag
+ */
+ public function setFormat($format = ':message')
+ {
+ $this->format = $format;
+
+ return $this;
+ }
+
+ /**
+ * Determine if the message bag has any messages.
+ *
+ * @return bool
+ */
+ public function isEmpty()
+ {
+ return ! $this->any();
+ }
+
+ /**
+ * Determine if the message bag has any messages.
+ *
+ * @return bool
+ */
+ public function any()
+ {
+ return $this->count() > 0;
+ }
+
+ /**
+ * Get the number of messages in the container.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return count($this->messages, COUNT_RECURSIVE) - count($this->messages);
+ }
+
+ /**
+ * Get the instance as an array.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ return $this->getMessages();
+ }
+
+ /**
+ * Convert the object into something JSON serializable.
+ *
+ * @return array
+ */
+ public function jsonSerialize()
+ {
+ return $this->toArray();
+ }
+
+ /**
+ * Convert the object to its JSON representation.
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toJson($options = 0)
+ {
+ return json_encode($this->toArray(), $options);
+ }
+
+ /**
+ * Convert the message bag to its string representation.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->toJson();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php b/application/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php
index 6c3366e..a111985 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php
@@ -1,109 +1,104 @@
-parsed[$key]))
- {
- return $this->parsed[$key];
- }
-
- // If the key does not contain a double colon, it means the key is not in a
- // namespace, and is just a regular configuration item. Namespaces are a
- // tool for organizing configuration items for things such as modules.
- if (strpos($key, '::') === false)
- {
- $segments = explode('.', $key);
-
- $parsed = $this->parseBasicSegments($segments);
- }
- else
- {
- $parsed = $this->parseNamespacedSegments($key);
- }
-
- // Once we have the parsed array of this key's elements, such as its groups
- // and namespace, we will cache each array inside a simple list that has
- // the key and the parsed array for quick look-ups for later requests.
- return $this->parsed[$key] = $parsed;
- }
-
- /**
- * Parse an array of basic segments.
- *
- * @param array $segments
- * @return array
- */
- protected function parseBasicSegments(array $segments)
- {
- // The first segment in a basic array will always be the group, so we can go
- // ahead and grab that segment. If there is only one total segment we are
- // just pulling an entire group out of the array and not a single item.
- $group = $segments[0];
-
- if (count($segments) == 1)
- {
- return array(null, $group, null);
- }
-
- // If there is more than one segment in this group, it means we are pulling
- // a specific item out of a groups and will need to return the item name
- // as well as the group so we know which item to pull from the arrays.
- else
- {
- $item = implode('.', array_slice($segments, 1));
-
- return array(null, $group, $item);
- }
- }
-
- /**
- * Parse an array of namespaced segments.
- *
- * @param string $key
- * @return array
- */
- protected function parseNamespacedSegments($key)
- {
- list($namespace, $item) = explode('::', $key);
-
- // First we'll just explode the first segment to get the namespace and group
- // since the item should be in the remaining segments. Once we have these
- // two pieces of data we can proceed with parsing out the item's value.
- $itemSegments = explode('.', $item);
-
- $groupAndItem = array_slice($this->parseBasicSegments($itemSegments), 1);
-
- return array_merge(array($namespace), $groupAndItem);
- }
-
- /**
- * Set the parsed value of a key.
- *
- * @param string $key
- * @param array $parsed
- * @return void
- */
- public function setParsedKey($key, $parsed)
- {
- $this->parsed[$key] = $parsed;
- }
-
+parsed[$key])) {
+ return $this->parsed[$key];
+ }
+
+ // If the key does not contain a double colon, it means the key is not in a
+ // namespace, and is just a regular configuration item. Namespaces are a
+ // tool for organizing configuration items for things such as modules.
+ if (strpos($key, '::') === false) {
+ $segments = explode('.', $key);
+
+ $parsed = $this->parseBasicSegments($segments);
+ } else {
+ $parsed = $this->parseNamespacedSegments($key);
+ }
+
+ // Once we have the parsed array of this key's elements, such as its groups
+ // and namespace, we will cache each array inside a simple list that has
+ // the key and the parsed array for quick look-ups for later requests.
+ return $this->parsed[$key] = $parsed;
+ }
+
+ /**
+ * Parse an array of basic segments.
+ *
+ * @param array $segments
+ * @return array
+ */
+ protected function parseBasicSegments(array $segments)
+ {
+ // The first segment in a basic array will always be the group, so we can go
+ // ahead and grab that segment. If there is only one total segment we are
+ // just pulling an entire group out of the array and not a single item.
+ $group = $segments[0];
+
+ if (count($segments) == 1) {
+ return [null, $group, null];
+ }
+
+ // If there is more than one segment in this group, it means we are pulling
+ // a specific item out of a groups and will need to return the item name
+ // as well as the group so we know which item to pull from the arrays.
+ else {
+ $item = implode('.', array_slice($segments, 1));
+
+ return [null, $group, $item];
+ }
+ }
+
+ /**
+ * Parse an array of namespaced segments.
+ *
+ * @param string $key
+ * @return array
+ */
+ protected function parseNamespacedSegments($key)
+ {
+ list($namespace, $item) = explode('::', $key);
+
+ // First we'll just explode the first segment to get the namespace and group
+ // since the item should be in the remaining segments. Once we have these
+ // two pieces of data we can proceed with parsing out the item's value.
+ $itemSegments = explode('.', $item);
+
+ $groupAndItem = array_slice($this->parseBasicSegments($itemSegments), 1);
+
+ return array_merge([$namespace], $groupAndItem);
+ }
+
+ /**
+ * Set the parsed value of a key.
+ *
+ * @param string $key
+ * @param array $parsed
+ * @return void
+ */
+ public function setParsedKey($key, $parsed)
+ {
+ $this->parsed[$key] = $parsed;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php b/application/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php
index 8281dc8..7ba7a4d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php
@@ -1,103 +1,104 @@
-app = $app;
- }
-
- /**
- * Register the service provider.
- *
- * @return void
- */
- abstract public function register();
-
- /**
- * Merge the given configuration with the existing configuration.
- *
- * @param string $path
- * @param string $key
- * @return void
- */
- protected function mergeConfigFrom($path, $key)
- {
- $config = $this->app['config']->get($key, []);
-
- $this->app['config']->set($key, array_merge(require $path, $config));
- }
-
- /**
- * Register a view file namespace.
- *
- * @param string $path
- * @param string $namespace
- * @return void
- */
- protected function loadViewsFrom($path, $namespace)
- {
- if (is_dir($appPath = $this->app->basePath().'/resources/views/vendor/'.$namespace))
- {
- $this->app['view']->addNamespace($namespace, $appPath);
- }
-
- $this->app['view']->addNamespace($namespace, $path);
- }
-
- /**
- * Register a translation file namespace.
- *
- * @param string $path
- * @param string $namespace
- * @return void
- */
- protected function loadTranslationsFrom($path, $namespace)
- {
- $this->app['translator']->addNamespace($namespace, $path);
- }
-
- /**
- * Register paths to be published by the publish command.
- *
- * @param array $paths
- * @param string $group
- * @return void
- */
- protected function publishes(array $paths, $group = null)
- {
- $class = get_class($this);
-
- if ( ! array_key_exists($class, static::$publishes))
- {
- static::$publishes[$class] = [];
- }
-
- static::$publishes[$class] = array_merge(static::$publishes[$class], $paths);
-
- if ($group)
- {
- static::$publishGroups[$group] = $paths;
- }
- }
-
- /**
- * Get the paths to publish.
- *
- * @param string $provider
- * @param string $group
- * @return array
- */
- public static function pathsToPublish($provider = null, $group = null)
- {
- if ($group && array_key_exists($group, static::$publishGroups))
- {
- return static::$publishGroups[$group];
- }
-
- if ($provider && array_key_exists($provider, static::$publishes))
- {
- return static::$publishes[$provider];
- }
-
- if ($group || $provider)
- {
- return [];
- }
-
- $paths = [];
-
- foreach (static::$publishes as $class => $publish)
- {
- $paths = array_merge($paths, $publish);
- }
-
- return $paths;
- }
-
- /**
- * Register the package's custom Artisan commands.
- *
- * @param array $commands
- * @return void
- */
- public function commands($commands)
- {
- $commands = is_array($commands) ? $commands : func_get_args();
-
- // To register the commands with Artisan, we will grab each of the arguments
- // passed into the method and listen for Artisan "start" event which will
- // give us the Artisan console instance which we will give commands to.
- $events = $this->app['events'];
-
- $events->listen('artisan.start', function($artisan) use ($commands)
- {
- $artisan->resolveCommands($commands);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return [];
- }
-
- /**
- * Get the events that trigger this service provider to register.
- *
- * @return array
- */
- public function when()
- {
- return [];
- }
-
- /**
- * Determine if the provider is deferred.
- *
- * @return bool
- */
- public function isDeferred()
- {
- return $this->defer;
- }
-
- /**
- * Get a list of files that should be compiled for the package.
- *
- * @return array
- */
- public static function compiles()
- {
- return [];
- }
-
- /**
- * Dynamically handle missing method calls.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- if ($method == 'boot') return;
-
- throw new BadMethodCallException("Call to undefined method [{$method}]");
- }
+use BadMethodCallException;
+abstract class ServiceProvider
+{
+ /**
+ * The application instance.
+ *
+ * @var \Illuminate\Contracts\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = false;
+
+ /**
+ * The paths that should be published.
+ *
+ * @var array
+ */
+ protected static $publishes = [];
+
+ /**
+ * The paths that should be published by group.
+ *
+ * @var array
+ */
+ protected static $publishGroups = [];
+
+ /**
+ * Create a new service provider instance.
+ *
+ * @param \Illuminate\Contracts\Foundation\Application $app
+ * @return void
+ */
+ public function __construct($app)
+ {
+ $this->app = $app;
+ }
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ abstract public function register();
+
+ /**
+ * Merge the given configuration with the existing configuration.
+ *
+ * @param string $path
+ * @param string $key
+ * @return void
+ */
+ protected function mergeConfigFrom($path, $key)
+ {
+ $config = $this->app['config']->get($key, []);
+
+ $this->app['config']->set($key, array_merge(require $path, $config));
+ }
+
+ /**
+ * Register a view file namespace.
+ *
+ * @param string $path
+ * @param string $namespace
+ * @return void
+ */
+ protected function loadViewsFrom($path, $namespace)
+ {
+ if (is_dir($appPath = $this->app->basePath().'/resources/views/vendor/'.$namespace)) {
+ $this->app['view']->addNamespace($namespace, $appPath);
+ }
+
+ $this->app['view']->addNamespace($namespace, $path);
+ }
+
+ /**
+ * Register a translation file namespace.
+ *
+ * @param string $path
+ * @param string $namespace
+ * @return void
+ */
+ protected function loadTranslationsFrom($path, $namespace)
+ {
+ $this->app['translator']->addNamespace($namespace, $path);
+ }
+
+ /**
+ * Register paths to be published by the publish command.
+ *
+ * @param array $paths
+ * @param string $group
+ * @return void
+ */
+ protected function publishes(array $paths, $group = null)
+ {
+ $class = get_class($this);
+
+ if (! array_key_exists($class, static::$publishes)) {
+ static::$publishes[$class] = [];
+ }
+
+ static::$publishes[$class] = array_merge(static::$publishes[$class], $paths);
+
+ if ($group) {
+ if (! array_key_exists($group, static::$publishGroups)) {
+ static::$publishGroups[$group] = [];
+ }
+
+ static::$publishGroups[$group] = array_merge(static::$publishGroups[$group], $paths);
+ }
+ }
+
+ /**
+ * Get the paths to publish.
+ *
+ * @param string $provider
+ * @param string $group
+ * @return array
+ */
+ public static function pathsToPublish($provider = null, $group = null)
+ {
+ if ($provider && $group) {
+ if (empty(static::$publishes[$provider]) || empty(static::$publishGroups[$group])) {
+ return [];
+ }
+
+ return array_intersect(static::$publishes[$provider], static::$publishGroups[$group]);
+ }
+
+ if ($group && array_key_exists($group, static::$publishGroups)) {
+ return static::$publishGroups[$group];
+ }
+
+ if ($provider && array_key_exists($provider, static::$publishes)) {
+ return static::$publishes[$provider];
+ }
+
+ if ($group || $provider) {
+ return [];
+ }
+
+ $paths = [];
+
+ foreach (static::$publishes as $class => $publish) {
+ $paths = array_merge($paths, $publish);
+ }
+
+ return $paths;
+ }
+
+ /**
+ * Register the package's custom Artisan commands.
+ *
+ * @param array|mixed $commands
+ * @return void
+ */
+ public function commands($commands)
+ {
+ $commands = is_array($commands) ? $commands : func_get_args();
+
+ // To register the commands with Artisan, we will grab each of the arguments
+ // passed into the method and listen for Artisan "start" event which will
+ // give us the Artisan console instance which we will give commands to.
+ $events = $this->app['events'];
+
+ $events->listen('artisan.start', function ($artisan) use ($commands) {
+ $artisan->resolveCommands($commands);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return [];
+ }
+
+ /**
+ * Get the events that trigger this service provider to register.
+ *
+ * @return array
+ */
+ public function when()
+ {
+ return [];
+ }
+
+ /**
+ * Determine if the provider is deferred.
+ *
+ * @return bool
+ */
+ public function isDeferred()
+ {
+ return $this->defer;
+ }
+
+ /**
+ * Get a list of files that should be compiled for the package.
+ *
+ * @return array
+ */
+ public static function compiles()
+ {
+ return [];
+ }
+
+ /**
+ * Dynamically handle missing method calls.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ if ($method == 'boot') {
+ return;
+ }
+
+ throw new BadMethodCallException("Call to undefined method [{$method}]");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Str.php b/application/vendor/laravel/framework/src/Illuminate/Support/Str.php
index 37d0619..2c3a7cb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Str.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Str.php
@@ -1,392 +1,443 @@
-container = $container;
+ /**
+ * The container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
- if ( ! $this->container->bound('config'))
- {
- $this->container->instance('config', new Fluent);
- }
- }
+ /**
+ * Setup the IoC container instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ protected function setupContainer(Container $container)
+ {
+ $this->container = $container;
- /**
- * Make this capsule instance available globally.
- *
- * @return void
- */
- public function setAsGlobal()
- {
- static::$instance = $this;
- }
+ if (! $this->container->bound('config')) {
+ $this->container->instance('config', new Fluent);
+ }
+ }
- /**
- * Get the IoC container instance.
- *
- * @return \Illuminate\Contracts\Container\Container
- */
- public function getContainer()
- {
- return $this->container;
- }
+ /**
+ * Make this capsule instance available globally.
+ *
+ * @return void
+ */
+ public function setAsGlobal()
+ {
+ static::$instance = $this;
+ }
- /**
- * Set the IoC container instance.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
- }
+ /**
+ * Get the IoC container instance.
+ *
+ * @return \Illuminate\Contracts\Container\Container
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
+ /**
+ * Set the IoC container instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php b/application/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php
index 7e8ead5..a6a54fd 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php
@@ -1,90 +1,83 @@
-bindTo($this, get_class($this)), $parameters);
- }
- else
- {
- return call_user_func_array(static::$macros[$method], $parameters);
- }
- }
+ throw new BadMethodCallException("Method {$method} does not exist.");
+ }
- throw new BadMethodCallException("Method {$method} does not exist.");
- }
+ /**
+ * Dynamically handle calls to the class.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ *
+ * @throws \BadMethodCallException
+ */
+ public function __call($method, $parameters)
+ {
+ if (static::hasMacro($method)) {
+ if (static::$macros[$method] instanceof Closure) {
+ return call_user_func_array(static::$macros[$method]->bindTo($this, get_class($this)), $parameters);
+ } else {
+ return call_user_func_array(static::$macros[$method], $parameters);
+ }
+ }
+ throw new BadMethodCallException("Method {$method} does not exist.");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php b/application/vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php
index 23e7a1a..9fe3b96 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php
@@ -1,106 +1,107 @@
-bags[$key]);
- }
+class ViewErrorBag implements Countable
+{
+ /**
+ * The array of the view error bags.
+ *
+ * @var array
+ */
+ protected $bags = [];
- /**
- * Get a MessageBag instance from the bags.
- *
- * @param string $key
- * @return \Illuminate\Contracts\Support\MessageBag
- */
- public function getBag($key)
- {
- return array_get($this->bags, $key, new MessageBag);
- }
+ /**
+ * Checks if a named MessageBag exists in the bags.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasBag($key = 'default')
+ {
+ return isset($this->bags[$key]);
+ }
- /**
- * Get all the bags.
- *
- * @return array
- */
- public function getBags()
- {
- return $this->bags;
- }
+ /**
+ * Get a MessageBag instance from the bags.
+ *
+ * @param string $key
+ * @return \Illuminate\Contracts\Support\MessageBag
+ */
+ public function getBag($key)
+ {
+ return Arr::get($this->bags, $key) ?: new MessageBag;
+ }
- /**
- * Add a new MessageBag instance to the bags.
- *
- * @param string $key
- * @param \Illuminate\Contracts\Support\MessageBag $bag
- * @return $this
- */
- public function put($key, MessageBagContract $bag)
- {
- $this->bags[$key] = $bag;
+ /**
+ * Get all the bags.
+ *
+ * @return array
+ */
+ public function getBags()
+ {
+ return $this->bags;
+ }
- return $this;
- }
+ /**
+ * Add a new MessageBag instance to the bags.
+ *
+ * @param string $key
+ * @param \Illuminate\Contracts\Support\MessageBag $bag
+ * @return $this
+ */
+ public function put($key, MessageBagContract $bag)
+ {
+ $this->bags[$key] = $bag;
- /**
- * Get the number of messages in the default bag.
- *
- * @return int
- */
- public function count()
- {
- return $this->default->count();
- }
+ return $this;
+ }
- /**
- * Dynamically call methods on the default bag.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- */
- public function __call($method, $parameters)
- {
- return call_user_func_array(array($this->default, $method), $parameters);
- }
+ /**
+ * Get the number of messages in the default bag.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return $this->default->count();
+ }
- /**
- * Dynamically access a view error bag.
- *
- * @param string $key
- * @return \Illuminate\Contracts\Support\MessageBag
- */
- public function __get($key)
- {
- return array_get($this->bags, $key, new MessageBag);
- }
+ /**
+ * Dynamically call methods on the default bag.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ return call_user_func_array([$this->default, $method], $parameters);
+ }
- /**
- * Dynamically set a view error bag.
- *
- * @param string $key
- * @param \Illuminate\Contracts\Support\MessageBag $value
- * @return void
- */
- public function __set($key, $value)
- {
- array_set($this->bags, $key, $value);
- }
+ /**
+ * Dynamically access a view error bag.
+ *
+ * @param string $key
+ * @return \Illuminate\Contracts\Support\MessageBag
+ */
+ public function __get($key)
+ {
+ return $this->getBag($key);
+ }
+ /**
+ * Dynamically set a view error bag.
+ *
+ * @param string $key
+ * @param \Illuminate\Contracts\Support\MessageBag $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ $this->put($key, $value);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/composer.json b/application/vendor/laravel/framework/src/Illuminate/Support/composer.json
index b08c4d9..a96f06a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/composer.json
@@ -14,11 +14,12 @@
}
],
"require": {
- "php": ">=5.4.0",
+ "php": ">=5.5.9",
"ext-mbstring": "*",
- "illuminate/contracts": "5.0.*",
+ "illuminate/contracts": "5.1.*",
"doctrine/inflector": "~1.0",
- "danielstjules/stringy": "~1.8"
+ "danielstjules/stringy": "~1.8",
+ "paragonie/random_compat": "~1.4"
},
"autoload": {
"psr-4": {
@@ -30,12 +31,12 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
"jeremeamia/superclosure": "Required to be able to serialize closures (~2.0).",
- "symfony/var-dumper": "Required to use the dd function (2.6.*)."
+ "symfony/var-dumper": "Improves the dd function (2.7.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Support/helpers.php b/application/vendor/laravel/framework/src/Illuminate/Support/helpers.php
index 4405cc7..3ea27f5 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Support/helpers.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Support/helpers.php
@@ -4,797 +4,797 @@
use Illuminate\Support\Str;
use Illuminate\Support\Collection;
use Illuminate\Support\Debug\Dumper;
-
-if ( ! function_exists('append_config'))
-{
- /**
- * Assign high numeric IDs to a config item to force appending.
- *
- * @param array $array
- * @return array
- */
- function append_config(array $array)
- {
- $start = 9999;
-
- foreach ($array as $key => $value)
- {
- if (is_numeric($key))
- {
- $start++;
-
- $array[$start] = array_pull($array, $key);
- }
- }
-
- return $array;
- }
-}
-
-if ( ! function_exists('array_add'))
-{
- /**
- * Add an element to an array using "dot" notation if it doesn't exist.
- *
- * @param array $array
- * @param string $key
- * @param mixed $value
- * @return array
- */
- function array_add($array, $key, $value)
- {
- return Arr::add($array, $key, $value);
- }
-}
-
-if ( ! function_exists('array_build'))
-{
- /**
- * Build a new array using a callback.
- *
- * @param array $array
- * @param callable $callback
- * @return array
- */
- function array_build($array, callable $callback)
- {
- return Arr::build($array, $callback);
- }
-}
-
-if ( ! function_exists('array_collapse'))
-{
- /**
- * Collapse an array of arrays into a single array.
- *
- * @param array|\ArrayAccess $array
- * @return array
- */
- function array_collapse($array)
- {
- return Arr::collapse($array);
- }
-}
-
-if ( ! function_exists('array_divide'))
-{
- /**
- * Divide an array into two arrays. One with keys and the other with values.
- *
- * @param array $array
- * @return array
- */
- function array_divide($array)
- {
- return Arr::divide($array);
- }
-}
-
-if ( ! function_exists('array_dot'))
-{
- /**
- * Flatten a multi-dimensional associative array with dots.
- *
- * @param array $array
- * @param string $prepend
- * @return array
- */
- function array_dot($array, $prepend = '')
- {
- return Arr::dot($array, $prepend);
- }
-}
-
-if ( ! function_exists('array_except'))
-{
- /**
- * Get all of the given array except for a specified array of items.
- *
- * @param array $array
- * @param array|string $keys
- * @return array
- */
- function array_except($array, $keys)
- {
- return Arr::except($array, $keys);
- }
-}
-
-if ( ! function_exists('array_fetch'))
-{
- /**
- * Fetch a flattened array of a nested array element.
- *
- * @param array $array
- * @param string $key
- * @return array
- */
- function array_fetch($array, $key)
- {
- return Arr::fetch($array, $key);
- }
-}
-
-if ( ! function_exists('array_first'))
-{
- /**
- * Return the first element in an array passing a given truth test.
- *
- * @param array $array
- * @param callable $callback
- * @param mixed $default
- * @return mixed
- */
- function array_first($array, callable $callback, $default = null)
- {
- return Arr::first($array, $callback, $default);
- }
-}
-
-if ( ! function_exists('array_last'))
-{
- /**
- * Return the last element in an array passing a given truth test.
- *
- * @param array $array
- * @param callable $callback
- * @param mixed $default
- * @return mixed
- */
- function array_last($array, $callback, $default = null)
- {
- return Arr::last($array, $callback, $default);
- }
-}
-
-if ( ! function_exists('array_flatten'))
-{
- /**
- * Flatten a multi-dimensional array into a single level.
- *
- * @param array $array
- * @return array
- */
- function array_flatten($array)
- {
- return Arr::flatten($array);
- }
-}
-
-if ( ! function_exists('array_forget'))
-{
- /**
- * Remove one or many array items from a given array using "dot" notation.
- *
- * @param array $array
- * @param array|string $keys
- * @return void
- */
- function array_forget(&$array, $keys)
- {
- return Arr::forget($array, $keys);
- }
-}
-
-if ( ! function_exists('array_get'))
-{
- /**
- * Get an item from an array using "dot" notation.
- *
- * @param array $array
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- function array_get($array, $key, $default = null)
- {
- return Arr::get($array, $key, $default);
- }
-}
-
-if ( ! function_exists('array_has'))
-{
- /**
- * Check if an item exists in an array using "dot" notation.
- *
- * @param array $array
- * @param string $key
- * @return bool
- */
- function array_has($array, $key)
- {
- return Arr::has($array, $key);
- }
-}
-
-if ( ! function_exists('array_only'))
-{
- /**
- * Get a subset of the items from the given array.
- *
- * @param array $array
- * @param array|string $keys
- * @return array
- */
- function array_only($array, $keys)
- {
- return Arr::only($array, $keys);
- }
-}
-
-if ( ! function_exists('array_pluck'))
-{
- /**
- * Pluck an array of values from an array.
- *
- * @param array $array
- * @param string $value
- * @param string $key
- * @return array
- */
- function array_pluck($array, $value, $key = null)
- {
- return Arr::pluck($array, $value, $key);
- }
-}
-
-if ( ! function_exists('array_pull'))
-{
- /**
- * Get a value from the array, and remove it.
- *
- * @param array $array
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- function array_pull(&$array, $key, $default = null)
- {
- return Arr::pull($array, $key, $default);
- }
-}
-
-if ( ! function_exists('array_set'))
-{
- /**
- * Set an array item to a given value using "dot" notation.
- *
- * If no key is given to the method, the entire array will be replaced.
- *
- * @param array $array
- * @param string $key
- * @param mixed $value
- * @return array
- */
- function array_set(&$array, $key, $value)
- {
- return Arr::set($array, $key, $value);
- }
-}
-
-if ( ! function_exists('array_sort'))
-{
- /**
- * Sort the array using the given callback.
- *
- * @param array $array
- * @param callable $callback
- * @return array
- */
- function array_sort($array, callable $callback)
- {
- return Arr::sort($array, $callback);
- }
-}
-
-if ( ! function_exists('array_where'))
-{
- /**
- * Filter the array using the given callback.
- *
- * @param array $array
- * @param callable $callback
- * @return array
- */
- function array_where($array, callable $callback)
- {
- return Arr::where($array, $callback);
- }
-}
-
-if ( ! function_exists('camel_case'))
-{
- /**
- * Convert a value to camel case.
- *
- * @param string $value
- * @return string
- */
- function camel_case($value)
- {
- return Str::camel($value);
- }
-}
-
-if ( ! function_exists('class_basename'))
-{
- /**
- * Get the class "basename" of the given object / class.
- *
- * @param string|object $class
- * @return string
- */
- function class_basename($class)
- {
- $class = is_object($class) ? get_class($class) : $class;
-
- return basename(str_replace('\\', '/', $class));
- }
-}
-
-if ( ! function_exists('class_uses_recursive'))
-{
- /**
- * Returns all traits used by a class, its subclasses and trait of their traits.
- *
- * @param string $class
- * @return array
- */
- function class_uses_recursive($class)
- {
- $results = [];
-
- foreach (array_merge([$class => $class], class_parents($class)) as $class)
- {
- $results += trait_uses_recursive($class);
- }
-
- return array_unique($results);
- }
-}
-
-if ( ! function_exists('collect'))
-{
- /**
- * Create a collection from the given value.
- *
- * @param mixed $value
- * @return \Illuminate\Support\Collection
- */
- function collect($value = null)
- {
- return new Collection($value);
- }
-}
-
-if ( ! function_exists('data_get'))
-{
- /**
- * Get an item from an array or object using "dot" notation.
- *
- * @param mixed $target
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- function data_get($target, $key, $default = null)
- {
- if (is_null($key)) return $target;
-
- foreach (explode('.', $key) as $segment)
- {
- if (is_array($target))
- {
- if ( ! array_key_exists($segment, $target))
- {
- return value($default);
- }
-
- $target = $target[$segment];
- }
- elseif ($target instanceof ArrayAccess)
- {
- if ( ! isset($target[$segment]))
- {
- return value($default);
- }
-
- $target = $target[$segment];
- }
- elseif (is_object($target))
- {
- if ( ! isset($target->{$segment}))
- {
- return value($default);
- }
-
- $target = $target->{$segment};
- }
- else
- {
- return value($default);
- }
- }
-
- return $target;
- }
-}
-
-if ( ! function_exists('dd'))
-{
- /**
- * Dump the passed variables and end the script.
- *
- * @param mixed
- * @return void
- */
- function dd()
- {
- array_map(function($x) { (new Dumper)->dump($x); }, func_get_args());
-
- die;
- }
-}
-
-if ( ! function_exists('e'))
-{
- /**
- * Escape HTML entities in a string.
- *
- * @param string $value
- * @return string
- */
- function e($value)
- {
- return htmlentities($value, ENT_QUOTES, 'UTF-8', false);
- }
-}
-
-if ( ! function_exists('ends_with'))
-{
- /**
- * Determine if a given string ends with a given substring.
- *
- * @param string $haystack
- * @param string|array $needles
- * @return bool
- */
- function ends_with($haystack, $needles)
- {
- return Str::endsWith($haystack, $needles);
- }
-}
-
-if ( ! function_exists('head'))
-{
- /**
- * Get the first element of an array. Useful for method chaining.
- *
- * @param array $array
- * @return mixed
- */
- function head($array)
- {
- return reset($array);
- }
-}
-
-if ( ! function_exists('last'))
-{
- /**
- * Get the last element from an array.
- *
- * @param array $array
- * @return mixed
- */
- function last($array)
- {
- return end($array);
- }
-}
-
-if ( ! function_exists('object_get'))
-{
- /**
- * Get an item from an object using "dot" notation.
- *
- * @param object $object
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- function object_get($object, $key, $default = null)
- {
- if (is_null($key) || trim($key) == '') return $object;
-
- foreach (explode('.', $key) as $segment)
- {
- if ( ! is_object($object) || ! isset($object->{$segment}))
- {
- return value($default);
- }
-
- $object = $object->{$segment};
- }
-
- return $object;
- }
-}
-
-if ( ! function_exists('preg_replace_sub'))
-{
- /**
- * Replace a given pattern with each value in the array in sequentially.
- *
- * @param string $pattern
- * @param array $replacements
- * @param string $subject
- * @return string
- */
- function preg_replace_sub($pattern, &$replacements, $subject)
- {
- return preg_replace_callback($pattern, function($match) use (&$replacements)
- {
- foreach ($replacements as $key => $value)
- {
- return array_shift($replacements);
- }
-
- }, $subject);
- }
-}
-
-if ( ! function_exists('snake_case'))
-{
- /**
- * Convert a string to snake case.
- *
- * @param string $value
- * @param string $delimiter
- * @return string
- */
- function snake_case($value, $delimiter = '_')
- {
- return Str::snake($value, $delimiter);
- }
-}
-
-if ( ! function_exists('starts_with'))
-{
- /**
- * Determine if a given string starts with a given substring.
- *
- * @param string $haystack
- * @param string|array $needles
- * @return bool
- */
- function starts_with($haystack, $needles)
- {
- return Str::startsWith($haystack, $needles);
- }
-}
-
-if ( ! function_exists('str_contains'))
-{
- /**
- * Determine if a given string contains a given substring.
- *
- * @param string $haystack
- * @param string|array $needles
- * @return bool
- */
- function str_contains($haystack, $needles)
- {
- return Str::contains($haystack, $needles);
- }
-}
-
-if ( ! function_exists('str_finish'))
-{
- /**
- * Cap a string with a single instance of a given value.
- *
- * @param string $value
- * @param string $cap
- * @return string
- */
- function str_finish($value, $cap)
- {
- return Str::finish($value, $cap);
- }
-}
-
-if ( ! function_exists('str_is'))
-{
- /**
- * Determine if a given string matches a given pattern.
- *
- * @param string $pattern
- * @param string $value
- * @return bool
- */
- function str_is($pattern, $value)
- {
- return 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 Str::limit($value, $limit, $end);
- }
-}
-
-if ( ! function_exists('str_plural'))
-{
- /**
- * Get the plural form of an English word.
- *
- * @param string $value
- * @param int $count
- * @return string
- */
- function str_plural($value, $count = 2)
- {
- return Str::plural($value, $count);
- }
-}
-
-if ( ! function_exists('str_random'))
-{
- /**
- * Generate a more truly "random" alpha-numeric string.
- *
- * @param int $length
- * @return string
- *
- * @throws \RuntimeException
- */
- function str_random($length = 16)
- {
- return Str::random($length);
- }
-}
-
-if ( ! function_exists('str_replace_array'))
-{
- /**
- * Replace a given value in the string sequentially with an array.
- *
- * @param string $search
- * @param array $replace
- * @param string $subject
- * @return string
- */
- function str_replace_array($search, array $replace, $subject)
- {
- foreach ($replace as $value)
- {
- $subject = preg_replace('/'.$search.'/', $value, $subject, 1);
- }
-
- return $subject;
- }
-}
-
-if ( ! function_exists('str_singular'))
-{
- /**
- * Get the singular form of an English word.
- *
- * @param string $value
- * @return string
- */
- function str_singular($value)
- {
- return Str::singular($value);
- }
-}
-
-if ( ! function_exists('str_slug'))
-{
- /**
- * Generate a URL friendly "slug" from a given string.
- *
- * @param string $title
- * @param string $separator
- * @return string
- */
- function str_slug($title, $separator = '-')
- {
- return Str::slug($title, $separator);
- }
-}
-
-if ( ! function_exists('studly_case'))
-{
- /**
- * Convert a value to studly caps case.
- *
- * @param string $value
- * @return string
- */
- function studly_case($value)
- {
- return Str::studly($value);
- }
-}
-
-if ( ! function_exists('trait_uses_recursive'))
-{
- /**
- * Returns all traits used by a trait and its traits.
- *
- * @param string $trait
- * @return array
- */
- function trait_uses_recursive($trait)
- {
- $traits = class_uses($trait);
-
- foreach ($traits as $trait)
- {
- $traits += trait_uses_recursive($trait);
- }
-
- return $traits;
- }
-}
-
-if ( ! function_exists('value'))
-{
- /**
- * Return the default value of the given value.
- *
- * @param mixed $value
- * @return mixed
- */
- function value($value)
- {
- return $value instanceof Closure ? $value() : $value;
- }
-}
-
-if ( ! function_exists('with'))
-{
- /**
- * Return the given object. Useful for chaining.
- *
- * @param mixed $object
- * @return mixed
- */
- function with($object)
- {
- return $object;
- }
+use Illuminate\Contracts\Support\Htmlable;
+
+if (! function_exists('append_config')) {
+ /**
+ * Assign high numeric IDs to a config item to force appending.
+ *
+ * @param array $array
+ * @return array
+ */
+ function append_config(array $array)
+ {
+ $start = 9999;
+
+ foreach ($array as $key => $value) {
+ if (is_numeric($key)) {
+ $start++;
+
+ $array[$start] = Arr::pull($array, $key);
+ }
+ }
+
+ return $array;
+ }
+}
+
+if (! function_exists('array_add')) {
+ /**
+ * Add an element to an array using "dot" notation if it doesn't exist.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $value
+ * @return array
+ */
+ function array_add($array, $key, $value)
+ {
+ return Arr::add($array, $key, $value);
+ }
+}
+
+if (! function_exists('array_build')) {
+ /**
+ * Build a new array using a callback.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @return array
+ */
+ function array_build($array, callable $callback)
+ {
+ return Arr::build($array, $callback);
+ }
+}
+
+if (! function_exists('array_collapse')) {
+ /**
+ * Collapse an array of arrays into a single array.
+ *
+ * @param \ArrayAccess|array $array
+ * @return array
+ */
+ function array_collapse($array)
+ {
+ return Arr::collapse($array);
+ }
+}
+
+if (! function_exists('array_divide')) {
+ /**
+ * Divide an array into two arrays. One with keys and the other with values.
+ *
+ * @param array $array
+ * @return array
+ */
+ function array_divide($array)
+ {
+ return Arr::divide($array);
+ }
+}
+
+if (! function_exists('array_dot')) {
+ /**
+ * Flatten a multi-dimensional associative array with dots.
+ *
+ * @param array $array
+ * @param string $prepend
+ * @return array
+ */
+ function array_dot($array, $prepend = '')
+ {
+ return Arr::dot($array, $prepend);
+ }
+}
+
+if (! function_exists('array_except')) {
+ /**
+ * Get all of the given array except for a specified array of items.
+ *
+ * @param array $array
+ * @param array|string $keys
+ * @return array
+ */
+ function array_except($array, $keys)
+ {
+ return Arr::except($array, $keys);
+ }
+}
+
+if (! function_exists('array_fetch')) {
+ /**
+ * Fetch a flattened array of a nested array element.
+ *
+ * @param array $array
+ * @param string $key
+ * @return array
+ *
+ * @deprecated since version 5.1. Use array_pluck instead.
+ */
+ function array_fetch($array, $key)
+ {
+ return Arr::fetch($array, $key);
+ }
+}
+
+if (! function_exists('array_first')) {
+ /**
+ * Return the first element in an array passing a given truth test.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @param mixed $default
+ * @return mixed
+ */
+ function array_first($array, callable $callback, $default = null)
+ {
+ return Arr::first($array, $callback, $default);
+ }
+}
+
+if (! function_exists('array_flatten')) {
+ /**
+ * Flatten a multi-dimensional array into a single level.
+ *
+ * @param array $array
+ * @return array
+ */
+ function array_flatten($array)
+ {
+ return Arr::flatten($array);
+ }
+}
+
+if (! function_exists('array_forget')) {
+ /**
+ * Remove one or many array items from a given array using "dot" notation.
+ *
+ * @param array $array
+ * @param array|string $keys
+ * @return void
+ */
+ function array_forget(&$array, $keys)
+ {
+ return Arr::forget($array, $keys);
+ }
+}
+
+if (! function_exists('array_get')) {
+ /**
+ * Get an item from an array using "dot" notation.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function array_get($array, $key, $default = null)
+ {
+ return Arr::get($array, $key, $default);
+ }
+}
+
+if (! function_exists('array_has')) {
+ /**
+ * Check if an item exists in an array using "dot" notation.
+ *
+ * @param array $array
+ * @param string $key
+ * @return bool
+ */
+ function array_has($array, $key)
+ {
+ return Arr::has($array, $key);
+ }
+}
+
+if (! function_exists('array_last')) {
+ /**
+ * Return the last element in an array passing a given truth test.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @param mixed $default
+ * @return mixed
+ */
+ function array_last($array, $callback, $default = null)
+ {
+ return Arr::last($array, $callback, $default);
+ }
+}
+
+if (! function_exists('array_only')) {
+ /**
+ * Get a subset of the items from the given array.
+ *
+ * @param array $array
+ * @param array|string $keys
+ * @return array
+ */
+ function array_only($array, $keys)
+ {
+ return Arr::only($array, $keys);
+ }
+}
+
+if (! function_exists('array_pluck')) {
+ /**
+ * Pluck an array of values from an array.
+ *
+ * @param array $array
+ * @param string|array $value
+ * @param string|array|null $key
+ * @return array
+ */
+ function array_pluck($array, $value, $key = null)
+ {
+ return Arr::pluck($array, $value, $key);
+ }
+}
+
+if (! function_exists('array_prepend')) {
+ /**
+ * Push an item onto the beginning of an array.
+ *
+ * @param array $array
+ * @param mixed $value
+ * @param mixed $key
+ * @return array
+ */
+ function array_prepend($array, $value, $key = null)
+ {
+ return Arr::prepend($array, $value, $key);
+ }
+}
+
+if (! function_exists('array_pull')) {
+ /**
+ * Get a value from the array, and remove it.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function array_pull(&$array, $key, $default = null)
+ {
+ return Arr::pull($array, $key, $default);
+ }
+}
+
+if (! function_exists('array_set')) {
+ /**
+ * Set an array item to a given value using "dot" notation.
+ *
+ * If no key is given to the method, the entire array will be replaced.
+ *
+ * @param array $array
+ * @param string $key
+ * @param mixed $value
+ * @return array
+ */
+ function array_set(&$array, $key, $value)
+ {
+ return Arr::set($array, $key, $value);
+ }
+}
+
+if (! function_exists('array_sort')) {
+ /**
+ * Sort the array using the given callback.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @return array
+ */
+ function array_sort($array, callable $callback)
+ {
+ return Arr::sort($array, $callback);
+ }
+}
+
+if (! function_exists('array_sort_recursive')) {
+ /**
+ * Recursively sort an array by keys and values.
+ *
+ * @param array $array
+ * @return array
+ */
+ function array_sort_recursive($array)
+ {
+ return Arr::sortRecursive($array);
+ }
+}
+
+if (! function_exists('array_where')) {
+ /**
+ * Filter the array using the given callback.
+ *
+ * @param array $array
+ * @param callable $callback
+ * @return array
+ */
+ function array_where($array, callable $callback)
+ {
+ return Arr::where($array, $callback);
+ }
+}
+
+if (! function_exists('camel_case')) {
+ /**
+ * Convert a value to camel case.
+ *
+ * @param string $value
+ * @return string
+ */
+ function camel_case($value)
+ {
+ return Str::camel($value);
+ }
+}
+
+if (! function_exists('class_basename')) {
+ /**
+ * Get the class "basename" of the given object / class.
+ *
+ * @param string|object $class
+ * @return string
+ */
+ function class_basename($class)
+ {
+ $class = is_object($class) ? get_class($class) : $class;
+
+ return basename(str_replace('\\', '/', $class));
+ }
+}
+
+if (! function_exists('class_uses_recursive')) {
+ /**
+ * Returns all traits used by a class, its subclasses and trait of their traits.
+ *
+ * @param string $class
+ * @return array
+ */
+ function class_uses_recursive($class)
+ {
+ $results = [];
+
+ foreach (array_merge([$class => $class], class_parents($class)) as $class) {
+ $results += trait_uses_recursive($class);
+ }
+
+ return array_unique($results);
+ }
+}
+
+if (! function_exists('collect')) {
+ /**
+ * Create a collection from the given value.
+ *
+ * @param mixed $value
+ * @return \Illuminate\Support\Collection
+ */
+ function collect($value = null)
+ {
+ return new Collection($value);
+ }
+}
+
+if (! function_exists('data_get')) {
+ /**
+ * Get an item from an array or object using "dot" notation.
+ *
+ * @param mixed $target
+ * @param string|array $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function data_get($target, $key, $default = null)
+ {
+ if (is_null($key)) {
+ return $target;
+ }
+
+ $key = is_array($key) ? $key : explode('.', $key);
+
+ foreach ($key as $segment) {
+ if (is_array($target)) {
+ if (! array_key_exists($segment, $target)) {
+ return value($default);
+ }
+
+ $target = $target[$segment];
+ } elseif ($target instanceof ArrayAccess) {
+ if (! isset($target[$segment])) {
+ return value($default);
+ }
+
+ $target = $target[$segment];
+ } elseif (is_object($target)) {
+ if (! isset($target->{$segment})) {
+ return value($default);
+ }
+
+ $target = $target->{$segment};
+ } else {
+ return value($default);
+ }
+ }
+
+ return $target;
+ }
+}
+
+if (! function_exists('dd')) {
+ /**
+ * Dump the passed variables and end the script.
+ *
+ * @param mixed
+ * @return void
+ */
+ function dd()
+ {
+ array_map(function ($x) {
+ (new Dumper)->dump($x);
+ }, func_get_args());
+
+ die(1);
+ }
+}
+
+if (! function_exists('e')) {
+ /**
+ * Escape HTML entities in a string.
+ *
+ * @param \Illuminate\Contracts\Support\Htmlable|string $value
+ * @return string
+ */
+ function e($value)
+ {
+ if ($value instanceof Htmlable) {
+ return $value->toHtml();
+ }
+
+ return htmlentities($value, ENT_QUOTES, 'UTF-8', false);
+ }
+}
+
+if (! function_exists('ends_with')) {
+ /**
+ * Determine if a given string ends with a given substring.
+ *
+ * @param string $haystack
+ * @param string|array $needles
+ * @return bool
+ */
+ function ends_with($haystack, $needles)
+ {
+ return Str::endsWith($haystack, $needles);
+ }
+}
+
+if (! function_exists('head')) {
+ /**
+ * Get the first element of an array. Useful for method chaining.
+ *
+ * @param array $array
+ * @return mixed
+ */
+ function head($array)
+ {
+ return reset($array);
+ }
+}
+
+if (! function_exists('last')) {
+ /**
+ * Get the last element from an array.
+ *
+ * @param array $array
+ * @return mixed
+ */
+ function last($array)
+ {
+ return end($array);
+ }
+}
+
+if (! function_exists('object_get')) {
+ /**
+ * Get an item from an object using "dot" notation.
+ *
+ * @param object $object
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ function object_get($object, $key, $default = null)
+ {
+ if (is_null($key) || trim($key) == '') {
+ return $object;
+ }
+
+ foreach (explode('.', $key) as $segment) {
+ if (! is_object($object) || ! isset($object->{$segment})) {
+ return value($default);
+ }
+
+ $object = $object->{$segment};
+ }
+
+ return $object;
+ }
+}
+
+if (! function_exists('preg_replace_sub')) {
+ /**
+ * Replace a given pattern with each value in the array in sequentially.
+ *
+ * @param string $pattern
+ * @param array $replacements
+ * @param string $subject
+ * @return string
+ */
+ function preg_replace_sub($pattern, &$replacements, $subject)
+ {
+ return preg_replace_callback($pattern, function ($match) use (&$replacements) {
+ foreach ($replacements as $key => $value) {
+ return array_shift($replacements);
+ }
+ }, $subject);
+ }
+}
+
+if (! function_exists('snake_case')) {
+ /**
+ * Convert a string to snake case.
+ *
+ * @param string $value
+ * @param string $delimiter
+ * @return string
+ */
+ function snake_case($value, $delimiter = '_')
+ {
+ return Str::snake($value, $delimiter);
+ }
+}
+
+if (! function_exists('starts_with')) {
+ /**
+ * Determine if a given string starts with a given substring.
+ *
+ * @param string $haystack
+ * @param string|array $needles
+ * @return bool
+ */
+ function starts_with($haystack, $needles)
+ {
+ return Str::startsWith($haystack, $needles);
+ }
+}
+
+if (! function_exists('str_contains')) {
+ /**
+ * Determine if a given string contains a given substring.
+ *
+ * @param string $haystack
+ * @param string|array $needles
+ * @return bool
+ */
+ function str_contains($haystack, $needles)
+ {
+ return Str::contains($haystack, $needles);
+ }
+}
+
+if (! function_exists('str_finish')) {
+ /**
+ * Cap a string with a single instance of a given value.
+ *
+ * @param string $value
+ * @param string $cap
+ * @return string
+ */
+ function str_finish($value, $cap)
+ {
+ return Str::finish($value, $cap);
+ }
+}
+
+if (! function_exists('str_is')) {
+ /**
+ * Determine if a given string matches a given pattern.
+ *
+ * @param string $pattern
+ * @param string $value
+ * @return bool
+ */
+ function str_is($pattern, $value)
+ {
+ return 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 Str::limit($value, $limit, $end);
+ }
+}
+
+if (! function_exists('str_plural')) {
+ /**
+ * Get the plural form of an English word.
+ *
+ * @param string $value
+ * @param int $count
+ * @return string
+ */
+ function str_plural($value, $count = 2)
+ {
+ return Str::plural($value, $count);
+ }
+}
+
+if (! function_exists('str_random')) {
+ /**
+ * Generate a more truly "random" alpha-numeric string.
+ *
+ * @param int $length
+ * @return string
+ *
+ * @throws \RuntimeException
+ */
+ function str_random($length = 16)
+ {
+ return Str::random($length);
+ }
+}
+
+if (! function_exists('str_replace_array')) {
+ /**
+ * Replace a given value in the string sequentially with an array.
+ *
+ * @param string $search
+ * @param array $replace
+ * @param string $subject
+ * @return string
+ */
+ function str_replace_array($search, array $replace, $subject)
+ {
+ foreach ($replace as $value) {
+ $subject = preg_replace('/'.$search.'/', $value, $subject, 1);
+ }
+
+ return $subject;
+ }
+}
+
+if (! function_exists('str_singular')) {
+ /**
+ * Get the singular form of an English word.
+ *
+ * @param string $value
+ * @return string
+ */
+ function str_singular($value)
+ {
+ return Str::singular($value);
+ }
+}
+
+if (! function_exists('str_slug')) {
+ /**
+ * Generate a URL friendly "slug" from a given string.
+ *
+ * @param string $title
+ * @param string $separator
+ * @return string
+ */
+ function str_slug($title, $separator = '-')
+ {
+ return Str::slug($title, $separator);
+ }
+}
+
+if (! function_exists('studly_case')) {
+ /**
+ * Convert a value to studly caps case.
+ *
+ * @param string $value
+ * @return string
+ */
+ function studly_case($value)
+ {
+ return Str::studly($value);
+ }
+}
+
+if (! function_exists('title_case')) {
+ /**
+ * Convert a value to title case.
+ *
+ * @param string $value
+ * @return string
+ */
+ function title_case($value)
+ {
+ return Str::title($value);
+ }
+}
+
+if (! function_exists('trait_uses_recursive')) {
+ /**
+ * Returns all traits used by a trait and its traits.
+ *
+ * @param string $trait
+ * @return array
+ */
+ function trait_uses_recursive($trait)
+ {
+ $traits = class_uses($trait);
+
+ foreach ($traits as $trait) {
+ $traits += trait_uses_recursive($trait);
+ }
+
+ return $traits;
+ }
+}
+
+if (! function_exists('value')) {
+ /**
+ * Return the default value of the given value.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ function value($value)
+ {
+ return $value instanceof Closure ? $value() : $value;
+ }
+}
+
+if (! function_exists('windows_os')) {
+ /**
+ * Determine whether the current envrionment is Windows based.
+ *
+ * @return bool
+ */
+ function windows_os()
+ {
+ return strtolower(substr(PHP_OS, 0, 3)) === 'win';
+ }
+}
+
+if (! function_exists('with')) {
+ /**
+ * Return the given object. Useful for chaining.
+ *
+ * @param mixed $object
+ * @return mixed
+ */
+ function with($object)
+ {
+ return $object;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php b/application/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
index f455e60..835accc 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
@@ -1,130 +1,127 @@
-path = $path;
- $this->files = $files;
- }
-
- /**
- * Load the messages for the given locale.
- *
- * @param string $locale
- * @param string $group
- * @param string $namespace
- * @return array
- */
- public function load($locale, $group, $namespace = null)
- {
- if (is_null($namespace) || $namespace == '*')
- {
- return $this->loadPath($this->path, $locale, $group);
- }
-
- return $this->loadNamespaced($locale, $group, $namespace);
- }
-
- /**
- * Load a namespaced translation group.
- *
- * @param string $locale
- * @param string $group
- * @param string $namespace
- * @return array
- */
- protected function loadNamespaced($locale, $group, $namespace)
- {
- if (isset($this->hints[$namespace]))
- {
- $lines = $this->loadPath($this->hints[$namespace], $locale, $group);
-
- return $this->loadNamespaceOverrides($lines, $locale, $group, $namespace);
- }
-
- return array();
- }
-
- /**
- * Load a local namespaced translation group for overrides.
- *
- * @param array $lines
- * @param string $locale
- * @param string $group
- * @param string $namespace
- * @return array
- */
- protected function loadNamespaceOverrides(array $lines, $locale, $group, $namespace)
- {
- $file = "{$this->path}/packages/{$locale}/{$namespace}/{$group}.php";
-
- if ($this->files->exists($file))
- {
- return array_replace_recursive($lines, $this->files->getRequire($file));
- }
-
- return $lines;
- }
-
- /**
- * Load a locale from a given path.
- *
- * @param string $path
- * @param string $locale
- * @param string $group
- * @return array
- */
- protected function loadPath($path, $locale, $group)
- {
- if ($this->files->exists($full = "{$path}/{$locale}/{$group}.php"))
- {
- return $this->files->getRequire($full);
- }
-
- return array();
- }
-
- /**
- * Add a new namespace to the loader.
- *
- * @param string $namespace
- * @param string $hint
- * @return void
- */
- public function addNamespace($namespace, $hint)
- {
- $this->hints[$namespace] = $hint;
- }
+use Illuminate\Filesystem\Filesystem;
+class FileLoader implements LoaderInterface
+{
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * The default path for the loader.
+ *
+ * @var string
+ */
+ protected $path;
+
+ /**
+ * All of the namespace hints.
+ *
+ * @var array
+ */
+ protected $hints = [];
+
+ /**
+ * Create a new file loader instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param string $path
+ * @return void
+ */
+ public function __construct(Filesystem $files, $path)
+ {
+ $this->path = $path;
+ $this->files = $files;
+ }
+
+ /**
+ * Load the messages for the given locale.
+ *
+ * @param string $locale
+ * @param string $group
+ * @param string $namespace
+ * @return array
+ */
+ public function load($locale, $group, $namespace = null)
+ {
+ if (is_null($namespace) || $namespace == '*') {
+ return $this->loadPath($this->path, $locale, $group);
+ }
+
+ return $this->loadNamespaced($locale, $group, $namespace);
+ }
+
+ /**
+ * Load a namespaced translation group.
+ *
+ * @param string $locale
+ * @param string $group
+ * @param string $namespace
+ * @return array
+ */
+ protected function loadNamespaced($locale, $group, $namespace)
+ {
+ if (isset($this->hints[$namespace])) {
+ $lines = $this->loadPath($this->hints[$namespace], $locale, $group);
+
+ return $this->loadNamespaceOverrides($lines, $locale, $group, $namespace);
+ }
+
+ return [];
+ }
+
+ /**
+ * Load a local namespaced translation group for overrides.
+ *
+ * @param array $lines
+ * @param string $locale
+ * @param string $group
+ * @param string $namespace
+ * @return array
+ */
+ protected function loadNamespaceOverrides(array $lines, $locale, $group, $namespace)
+ {
+ $file = "{$this->path}/vendor/{$namespace}/{$locale}/{$group}.php";
+
+ if ($this->files->exists($file)) {
+ return array_replace_recursive($lines, $this->files->getRequire($file));
+ }
+
+ return $lines;
+ }
+
+ /**
+ * Load a locale from a given path.
+ *
+ * @param string $path
+ * @param string $locale
+ * @param string $group
+ * @return array
+ */
+ protected function loadPath($path, $locale, $group)
+ {
+ if ($this->files->exists($full = "{$path}/{$locale}/{$group}.php")) {
+ return $this->files->getRequire($full);
+ }
+
+ return [];
+ }
+
+ /**
+ * Add a new namespace to the loader.
+ *
+ * @param string $namespace
+ * @param string $hint
+ * @return void
+ */
+ public function addNamespace($namespace, $hint)
+ {
+ $this->hints[$namespace] = $hint;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php b/application/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php
index f0fbac5..9e45572 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php
@@ -1,24 +1,25 @@
-registerLoader();
-
- $this->app->singleton('translator', function($app)
- {
- $loader = $app['translation.loader'];
-
- // When registering the translator component, we'll need to set the default
- // locale as well as the fallback locale. So, we'll grab the application
- // configuration so we can easily get both of these values from there.
- $locale = $app['config']['app.locale'];
-
- $trans = new Translator($loader, $locale);
-
- $trans->setFallback($app['config']['app.fallback_locale']);
-
- return $trans;
- });
- }
-
- /**
- * Register the translation line loader.
- *
- * @return void
- */
- protected function registerLoader()
- {
- $this->app->singleton('translation.loader', function($app)
- {
- return new FileLoader($app['files'], $app['path.lang']);
- });
- }
-
- /**
- * Get the services provided by the provider.
- *
- * @return array
- */
- public function provides()
- {
- return array('translator', 'translation.loader');
- }
+use Illuminate\Support\ServiceProvider;
+class TranslationServiceProvider extends ServiceProvider
+{
+ /**
+ * Indicates if loading of the provider is deferred.
+ *
+ * @var bool
+ */
+ protected $defer = true;
+
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerLoader();
+
+ $this->app->singleton('translator', function ($app) {
+ $loader = $app['translation.loader'];
+
+ // When registering the translator component, we'll need to set the default
+ // locale as well as the fallback locale. So, we'll grab the application
+ // configuration so we can easily get both of these values from there.
+ $locale = $app['config']['app.locale'];
+
+ $trans = new Translator($loader, $locale);
+
+ $trans->setFallback($app['config']['app.fallback_locale']);
+
+ return $trans;
+ });
+ }
+
+ /**
+ * Register the translation line loader.
+ *
+ * @return void
+ */
+ protected function registerLoader()
+ {
+ $this->app->singleton('translation.loader', function ($app) {
+ return new FileLoader($app['files'], $app['path.lang']);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['translator', 'translation.loader'];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Translation/Translator.php b/application/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
index c5a3ace..62f09c7 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
@@ -1,365 +1,383 @@
-loader = $loader;
- $this->locale = $locale;
- }
-
- /**
- * Determine if a translation exists.
- *
- * @param string $key
- * @param string $locale
- * @return bool
- */
- public function has($key, $locale = null)
- {
- return $this->get($key, array(), $locale) !== $key;
- }
-
- /**
- * Get the translation for the given key.
- *
- * @param string $key
- * @param array $replace
- * @param string $locale
- * @return string
- */
- public function get($key, array $replace = array(), $locale = null)
- {
- list($namespace, $group, $item) = $this->parseKey($key);
-
- // Here we will get the locale that should be used for the language line. If one
- // was not passed, we will use the default locales which was given to us when
- // the translator was instantiated. Then, we can load the lines and return.
- foreach ($this->parseLocale($locale) as $locale)
- {
- $this->load($namespace, $group, $locale);
-
- $line = $this->getLine(
- $namespace, $group, $locale, $item, $replace
- );
-
- if ( ! is_null($line)) break;
- }
-
- // If the line doesn't exist, we will return back the key which was requested as
- // that will be quick to spot in the UI if language keys are wrong or missing
- // from the application's language files. Otherwise we can return the line.
- if ( ! isset($line)) return $key;
-
- return $line;
- }
-
- /**
- * Retrieve a language line out the loaded array.
- *
- * @param string $namespace
- * @param string $group
- * @param string $locale
- * @param string $item
- * @param array $replace
- * @return string|null
- */
- protected function getLine($namespace, $group, $locale, $item, array $replace)
- {
- $line = array_get($this->loaded[$namespace][$group][$locale], $item);
-
- if (is_string($line))
- {
- return $this->makeReplacements($line, $replace);
- }
- elseif (is_array($line) && count($line) > 0)
- {
- return $line;
- }
- }
-
- /**
- * Make the place-holder replacements on a line.
- *
- * @param string $line
- * @param array $replace
- * @return string
- */
- protected function makeReplacements($line, array $replace)
- {
- $replace = $this->sortReplacements($replace);
-
- foreach ($replace as $key => $value)
- {
- $line = str_replace(':'.$key, $value, $line);
- }
-
- return $line;
- }
-
- /**
- * Sort the replacements array.
- *
- * @param array $replace
- * @return array
- */
- protected function sortReplacements(array $replace)
- {
- return (new Collection($replace))->sortBy(function($value, $key)
- {
- return mb_strlen($key) * -1;
- });
- }
-
- /**
- * Get a translation according to an integer value.
- *
- * @param string $key
- * @param int $number
- * @param array $replace
- * @param string $locale
- * @return string
- */
- public function choice($key, $number, array $replace = array(), $locale = null)
- {
- $line = $this->get($key, $replace, $locale = $locale ?: $this->locale ?: $this->fallback);
-
- $replace['count'] = $number;
-
- return $this->makeReplacements($this->getSelector()->choose($line, $number, $locale), $replace);
- }
-
- /**
- * Get the translation for a given key.
- *
- * @param string $id
- * @param array $parameters
- * @param string $domain
- * @param string $locale
- * @return string
- */
- public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null)
- {
- return $this->get($id, $parameters, $locale);
- }
-
- /**
- * Get a translation according to an integer value.
- *
- * @param string $id
- * @param int $number
- * @param array $parameters
- * @param string $domain
- * @param string $locale
- * @return string
- */
- public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)
- {
- return $this->choice($id, $number, $parameters, $locale);
- }
-
- /**
- * Load the specified language group.
- *
- * @param string $namespace
- * @param string $group
- * @param string $locale
- * @return void
- */
- public function load($namespace, $group, $locale)
- {
- if ($this->isLoaded($namespace, $group, $locale)) return;
-
- // The loader is responsible for returning the array of language lines for the
- // given namespace, group, and locale. We'll set the lines in this array of
- // lines that have already been loaded so that we can easily access them.
- $lines = $this->loader->load($locale, $group, $namespace);
-
- $this->loaded[$namespace][$group][$locale] = $lines;
- }
-
- /**
- * Determine if the given group has been loaded.
- *
- * @param string $namespace
- * @param string $group
- * @param string $locale
- * @return bool
- */
- protected function isLoaded($namespace, $group, $locale)
- {
- return isset($this->loaded[$namespace][$group][$locale]);
- }
-
- /**
- * Add a new namespace to the loader.
- *
- * @param string $namespace
- * @param string $hint
- * @return void
- */
- public function addNamespace($namespace, $hint)
- {
- $this->loader->addNamespace($namespace, $hint);
- }
-
- /**
- * Parse a key into namespace, group, and item.
- *
- * @param string $key
- * @return array
- */
- public function parseKey($key)
- {
- $segments = parent::parseKey($key);
-
- if (is_null($segments[0])) $segments[0] = '*';
-
- return $segments;
- }
-
- /**
- * Get the array of locales to be checked.
- *
- * @param string|null $locale
- * @return array
- */
- protected function parseLocale($locale)
- {
- if ( ! is_null($locale))
- {
- return array_filter(array($locale, $this->fallback));
- }
-
- return array_filter(array($this->locale, $this->fallback));
- }
-
- /**
- * Get the message selector instance.
- *
- * @return \Symfony\Component\Translation\MessageSelector
- */
- public function getSelector()
- {
- if ( ! isset($this->selector))
- {
- $this->selector = new MessageSelector;
- }
-
- return $this->selector;
- }
-
- /**
- * Set the message selector instance.
- *
- * @param \Symfony\Component\Translation\MessageSelector $selector
- * @return void
- */
- public function setSelector(MessageSelector $selector)
- {
- $this->selector = $selector;
- }
-
- /**
- * Get the language line loader implementation.
- *
- * @return \Illuminate\Translation\LoaderInterface
- */
- public function getLoader()
- {
- return $this->loader;
- }
-
- /**
- * Get the default locale being used.
- *
- * @return string
- */
- public function locale()
- {
- return $this->getLocale();
- }
-
- /**
- * Get the default locale being used.
- *
- * @return string
- */
- public function getLocale()
- {
- return $this->locale;
- }
-
- /**
- * Set the default locale.
- *
- * @param string $locale
- * @return void
- */
- public function setLocale($locale)
- {
- $this->locale = $locale;
- }
-
- /**
- * Get the fallback locale being used.
- *
- * @return string
- */
- public function getFallback()
- {
- return $this->fallback;
- }
-
- /**
- * Set the fallback locale being used.
- *
- * @param string $fallback
- * @return void
- */
- public function setFallback($fallback)
- {
- $this->fallback = $fallback;
- }
-
+class Translator extends NamespacedItemResolver implements TranslatorInterface
+{
+ /**
+ * The loader implementation.
+ *
+ * @var \Illuminate\Translation\LoaderInterface
+ */
+ protected $loader;
+
+ /**
+ * The default locale being used by the translator.
+ *
+ * @var string
+ */
+ protected $locale;
+
+ /**
+ * The fallback locale used by the translator.
+ *
+ * @var string
+ */
+ protected $fallback;
+
+ /**
+ * The array of loaded translation groups.
+ *
+ * @var array
+ */
+ protected $loaded = [];
+
+ /**
+ * Create a new translator instance.
+ *
+ * @param \Illuminate\Translation\LoaderInterface $loader
+ * @param string $locale
+ * @return void
+ */
+ public function __construct(LoaderInterface $loader, $locale)
+ {
+ $this->loader = $loader;
+ $this->locale = $locale;
+ }
+
+ /**
+ * Determine if a translation exists for a given locale.
+ *
+ * @param string $key
+ * @param string|null $locale
+ * @return bool
+ */
+ public function hasForLocale($key, $locale = null)
+ {
+ return $this->has($key, $locale, false);
+ }
+
+ /**
+ * Determine if a translation exists.
+ *
+ * @param string $key
+ * @param string|null $locale
+ * @param bool $fallback
+ * @return bool
+ */
+ public function has($key, $locale = null, $fallback = true)
+ {
+ return $this->get($key, [], $locale, $fallback) !== $key;
+ }
+
+ /**
+ * Get the translation for the given key.
+ *
+ * @param string $key
+ * @param array $replace
+ * @param string|null $locale
+ * @param bool $fallback
+ * @return string
+ */
+ public function get($key, array $replace = [], $locale = null, $fallback = true)
+ {
+ list($namespace, $group, $item) = $this->parseKey($key);
+
+ // Here we will get the locale that should be used for the language line. If one
+ // was not passed, we will use the default locales which was given to us when
+ // the translator was instantiated. Then, we can load the lines and return.
+ $locales = $fallback ? $this->parseLocale($locale) : [$locale ?: $this->locale];
+
+ foreach ($locales as $locale) {
+ $this->load($namespace, $group, $locale);
+
+ $line = $this->getLine(
+ $namespace, $group, $locale, $item, $replace
+ );
+
+ if (! is_null($line)) {
+ break;
+ }
+ }
+
+ // If the line doesn't exist, we will return back the key which was requested as
+ // that will be quick to spot in the UI if language keys are wrong or missing
+ // from the application's language files. Otherwise we can return the line.
+ if (! isset($line)) {
+ return $key;
+ }
+
+ return $line;
+ }
+
+ /**
+ * Retrieve a language line out the loaded array.
+ *
+ * @param string $namespace
+ * @param string $group
+ * @param string $locale
+ * @param string $item
+ * @param array $replace
+ * @return string|array|null
+ */
+ protected function getLine($namespace, $group, $locale, $item, array $replace)
+ {
+ $line = Arr::get($this->loaded[$namespace][$group][$locale], $item);
+
+ if (is_string($line)) {
+ return $this->makeReplacements($line, $replace);
+ } elseif (is_array($line) && count($line) > 0) {
+ return $line;
+ }
+ }
+
+ /**
+ * Make the place-holder replacements on a line.
+ *
+ * @param string $line
+ * @param array $replace
+ * @return string
+ */
+ protected function makeReplacements($line, array $replace)
+ {
+ $replace = $this->sortReplacements($replace);
+
+ foreach ($replace as $key => $value) {
+ $line = str_replace(':'.$key, $value, $line);
+ }
+
+ return $line;
+ }
+
+ /**
+ * Sort the replacements array.
+ *
+ * @param array $replace
+ * @return array
+ */
+ protected function sortReplacements(array $replace)
+ {
+ return (new Collection($replace))->sortBy(function ($value, $key) {
+ return mb_strlen($key) * -1;
+ });
+ }
+
+ /**
+ * Get a translation according to an integer value.
+ *
+ * @param string $key
+ * @param int $number
+ * @param array $replace
+ * @param string $locale
+ * @return string
+ */
+ public function choice($key, $number, array $replace = [], $locale = null)
+ {
+ $line = $this->get($key, $replace, $locale = $locale ?: $this->locale ?: $this->fallback);
+
+ $replace['count'] = $number;
+
+ return $this->makeReplacements($this->getSelector()->choose($line, $number, $locale), $replace);
+ }
+
+ /**
+ * Get the translation for a given key.
+ *
+ * @param string $id
+ * @param array $parameters
+ * @param string $domain
+ * @param string $locale
+ * @return string
+ */
+ public function trans($id, array $parameters = [], $domain = 'messages', $locale = null)
+ {
+ return $this->get($id, $parameters, $locale);
+ }
+
+ /**
+ * Get a translation according to an integer value.
+ *
+ * @param string $id
+ * @param int $number
+ * @param array $parameters
+ * @param string $domain
+ * @param string $locale
+ * @return string
+ */
+ public function transChoice($id, $number, array $parameters = [], $domain = 'messages', $locale = null)
+ {
+ return $this->choice($id, $number, $parameters, $locale);
+ }
+
+ /**
+ * Load the specified language group.
+ *
+ * @param string $namespace
+ * @param string $group
+ * @param string $locale
+ * @return void
+ */
+ public function load($namespace, $group, $locale)
+ {
+ if ($this->isLoaded($namespace, $group, $locale)) {
+ return;
+ }
+
+ // The loader is responsible for returning the array of language lines for the
+ // given namespace, group, and locale. We'll set the lines in this array of
+ // lines that have already been loaded so that we can easily access them.
+ $lines = $this->loader->load($locale, $group, $namespace);
+
+ $this->loaded[$namespace][$group][$locale] = $lines;
+ }
+
+ /**
+ * Determine if the given group has been loaded.
+ *
+ * @param string $namespace
+ * @param string $group
+ * @param string $locale
+ * @return bool
+ */
+ protected function isLoaded($namespace, $group, $locale)
+ {
+ return isset($this->loaded[$namespace][$group][$locale]);
+ }
+
+ /**
+ * Add a new namespace to the loader.
+ *
+ * @param string $namespace
+ * @param string $hint
+ * @return void
+ */
+ public function addNamespace($namespace, $hint)
+ {
+ $this->loader->addNamespace($namespace, $hint);
+ }
+
+ /**
+ * Parse a key into namespace, group, and item.
+ *
+ * @param string $key
+ * @return array
+ */
+ public function parseKey($key)
+ {
+ $segments = parent::parseKey($key);
+
+ if (is_null($segments[0])) {
+ $segments[0] = '*';
+ }
+
+ return $segments;
+ }
+
+ /**
+ * Get the array of locales to be checked.
+ *
+ * @param string|null $locale
+ * @return array
+ */
+ protected function parseLocale($locale)
+ {
+ if (! is_null($locale)) {
+ return array_filter([$locale, $this->fallback]);
+ }
+
+ return array_filter([$this->locale, $this->fallback]);
+ }
+
+ /**
+ * Get the message selector instance.
+ *
+ * @return \Symfony\Component\Translation\MessageSelector
+ */
+ public function getSelector()
+ {
+ if (! isset($this->selector)) {
+ $this->selector = new MessageSelector;
+ }
+
+ return $this->selector;
+ }
+
+ /**
+ * Set the message selector instance.
+ *
+ * @param \Symfony\Component\Translation\MessageSelector $selector
+ * @return void
+ */
+ public function setSelector(MessageSelector $selector)
+ {
+ $this->selector = $selector;
+ }
+
+ /**
+ * Get the language line loader implementation.
+ *
+ * @return \Illuminate\Translation\LoaderInterface
+ */
+ public function getLoader()
+ {
+ return $this->loader;
+ }
+
+ /**
+ * Get the default locale being used.
+ *
+ * @return string
+ */
+ public function locale()
+ {
+ return $this->getLocale();
+ }
+
+ /**
+ * Get the default locale being used.
+ *
+ * @return string
+ */
+ public function getLocale()
+ {
+ return $this->locale;
+ }
+
+ /**
+ * Set the default locale.
+ *
+ * @param string $locale
+ * @return void
+ */
+ public function setLocale($locale)
+ {
+ $this->locale = $locale;
+ }
+
+ /**
+ * Get the fallback locale being used.
+ *
+ * @return string
+ */
+ public function getFallback()
+ {
+ return $this->fallback;
+ }
+
+ /**
+ * Set the fallback locale being used.
+ *
+ * @param string $fallback
+ * @return void
+ */
+ public function setFallback($fallback)
+ {
+ $this->fallback = $fallback;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Translation/composer.json b/application/vendor/laravel/framework/src/Illuminate/Translation/composer.json
index e5fea87..e3e355d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Translation/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Translation/composer.json
@@ -14,10 +14,10 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/filesystem": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/translation": "2.6.*"
+ "php": ">=5.5.9",
+ "illuminate/filesystem": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/translation": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php b/application/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php
index 2558f62..42aa353 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php
@@ -1,127 +1,120 @@
-db = $db;
- }
-
- /**
- * Count the number of objects in a collection having the given value.
- *
- * @param string $collection
- * @param string $column
- * @param string $value
- * @param int $excludeId
- * @param string $idColumn
- * @param array $extra
- * @return int
- */
- public function getCount($collection, $column, $value, $excludeId = null, $idColumn = null, array $extra = array())
- {
- $query = $this->table($collection)->where($column, '=', $value);
-
- if ( ! is_null($excludeId) && $excludeId != 'NULL')
- {
- $query->where($idColumn ?: 'id', '<>', $excludeId);
- }
-
- foreach ($extra as $key => $extraValue)
- {
- $this->addWhere($query, $key, $extraValue);
- }
+namespace Illuminate\Validation;
- return $query->count();
- }
-
- /**
- * Count the number of objects in a collection with the given values.
- *
- * @param string $collection
- * @param string $column
- * @param array $values
- * @param array $extra
- * @return int
- */
- public function getMultiCount($collection, $column, array $values, array $extra = array())
- {
- $query = $this->table($collection)->whereIn($column, $values);
-
- foreach ($extra as $key => $extraValue)
- {
- $this->addWhere($query, $key, $extraValue);
- }
-
- return $query->count();
- }
-
- /**
- * Add a "where" clause to the given query.
- *
- * @param \Illuminate\Database\Query\Builder $query
- * @param string $key
- * @param string $extraValue
- * @return void
- */
- protected function addWhere($query, $key, $extraValue)
- {
- if ($extraValue === 'NULL')
- {
- $query->whereNull($key);
- }
- elseif ($extraValue === 'NOT_NULL')
- {
- $query->whereNotNull($key);
- }
- else
- {
- $query->where($key, $extraValue);
- }
- }
-
- /**
- * Get a query builder for the given table.
- *
- * @param string $table
- * @return \Illuminate\Database\Query\Builder
- */
- protected function table($table)
- {
- return $this->db->connection($this->connection)->table($table);
- }
-
- /**
- * Set the connection to be used.
- *
- * @param string $connection
- * @return void
- */
- public function setConnection($connection)
- {
- $this->connection = $connection;
- }
+use Illuminate\Database\ConnectionResolverInterface;
+class DatabasePresenceVerifier implements PresenceVerifierInterface
+{
+ /**
+ * The database connection instance.
+ *
+ * @var \Illuminate\Database\ConnectionResolverInterface
+ */
+ protected $db;
+
+ /**
+ * The database connection to use.
+ *
+ * @var string
+ */
+ protected $connection = null;
+
+ /**
+ * Create a new database presence verifier.
+ *
+ * @param \Illuminate\Database\ConnectionResolverInterface $db
+ * @return void
+ */
+ public function __construct(ConnectionResolverInterface $db)
+ {
+ $this->db = $db;
+ }
+
+ /**
+ * Count the number of objects in a collection having the given value.
+ *
+ * @param string $collection
+ * @param string $column
+ * @param string $value
+ * @param int $excludeId
+ * @param string $idColumn
+ * @param array $extra
+ * @return int
+ */
+ public function getCount($collection, $column, $value, $excludeId = null, $idColumn = null, array $extra = [])
+ {
+ $query = $this->table($collection)->where($column, '=', $value);
+
+ if (! is_null($excludeId) && $excludeId != 'NULL') {
+ $query->where($idColumn ?: 'id', '<>', $excludeId);
+ }
+
+ foreach ($extra as $key => $extraValue) {
+ $this->addWhere($query, $key, $extraValue);
+ }
+
+ return $query->count();
+ }
+
+ /**
+ * Count the number of objects in a collection with the given values.
+ *
+ * @param string $collection
+ * @param string $column
+ * @param array $values
+ * @param array $extra
+ * @return int
+ */
+ public function getMultiCount($collection, $column, array $values, array $extra = [])
+ {
+ $query = $this->table($collection)->whereIn($column, $values);
+
+ foreach ($extra as $key => $extraValue) {
+ $this->addWhere($query, $key, $extraValue);
+ }
+
+ return $query->count();
+ }
+
+ /**
+ * Add a "where" clause to the given query.
+ *
+ * @param \Illuminate\Database\Query\Builder $query
+ * @param string $key
+ * @param string $extraValue
+ * @return void
+ */
+ protected function addWhere($query, $key, $extraValue)
+ {
+ if ($extraValue === 'NULL') {
+ $query->whereNull($key);
+ } elseif ($extraValue === 'NOT_NULL') {
+ $query->whereNotNull($key);
+ } else {
+ $query->where($key, $extraValue);
+ }
+ }
+
+ /**
+ * Get a query builder for the given table.
+ *
+ * @param string $table
+ * @return \Illuminate\Database\Query\Builder
+ */
+ protected function table($table)
+ {
+ return $this->db->connection($this->connection)->table($table)->useWritePdo();
+ }
+
+ /**
+ * Set the connection to be used.
+ *
+ * @param string $connection
+ * @return void
+ */
+ public function setConnection($connection)
+ {
+ $this->connection = $connection;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Validation/Factory.php b/application/vendor/laravel/framework/src/Illuminate/Validation/Factory.php
index b38624c..bbc5e22 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Validation/Factory.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Validation/Factory.php
@@ -1,238 +1,241 @@
-container = $container;
- $this->translator = $translator;
- }
-
- /**
- * Create a new Validator instance.
- *
- * @param array $data
- * @param array $rules
- * @param array $messages
- * @param array $customAttributes
- * @return \Illuminate\Validation\Validator
- */
- public function make(array $data, array $rules, array $messages = array(), array $customAttributes = array())
- {
- // The presence verifier is responsible for checking the unique and exists data
- // for the validator. It is behind an interface so that multiple versions of
- // it may be written besides database. We'll inject it into the validator.
- $validator = $this->resolve($data, $rules, $messages, $customAttributes);
-
- if ( ! is_null($this->verifier))
- {
- $validator->setPresenceVerifier($this->verifier);
- }
-
- // Next we'll set the IoC container instance of the validator, which is used to
- // resolve out class based validator extensions. If it is not set then these
- // types of extensions will not be possible on these validation instances.
- if ( ! is_null($this->container))
- {
- $validator->setContainer($this->container);
- }
-
- $this->addExtensions($validator);
-
- return $validator;
- }
-
- /**
- * Add the extensions to a validator instance.
- *
- * @param \Illuminate\Validation\Validator $validator
- * @return void
- */
- protected function addExtensions(Validator $validator)
- {
- $validator->addExtensions($this->extensions);
-
- // Next, we will add the implicit extensions, which are similar to the required
- // and accepted rule in that they are run even if the attributes is not in a
- // array of data that is given to a validator instances via instantiation.
- $implicit = $this->implicitExtensions;
-
- $validator->addImplicitExtensions($implicit);
-
- $validator->addReplacers($this->replacers);
-
- $validator->setFallbackMessages($this->fallbackMessages);
- }
-
- /**
- * Resolve a new Validator instance.
- *
- * @param array $data
- * @param array $rules
- * @param array $messages
- * @param array $customAttributes
- * @return \Illuminate\Validation\Validator
- */
- protected function resolve(array $data, array $rules, array $messages, array $customAttributes)
- {
- if (is_null($this->resolver))
- {
- return new Validator($this->translator, $data, $rules, $messages, $customAttributes);
- }
-
- return call_user_func($this->resolver, $this->translator, $data, $rules, $messages, $customAttributes);
- }
-
- /**
- * Register a custom validator extension.
- *
- * @param string $rule
- * @param \Closure|string $extension
- * @param string $message
- * @return void
- */
- public function extend($rule, $extension, $message = null)
- {
- $this->extensions[$rule] = $extension;
-
- if ($message) $this->fallbackMessages[snake_case($rule)] = $message;
- }
-
- /**
- * Register a custom implicit validator extension.
- *
- * @param string $rule
- * @param \Closure|string $extension
- * @param string $message
- * @return void
- */
- public function extendImplicit($rule, $extension, $message = null)
- {
- $this->implicitExtensions[$rule] = $extension;
-
- if ($message) $this->fallbackMessages[snake_case($rule)] = $message;
- }
-
- /**
- * Register a custom implicit validator message replacer.
- *
- * @param string $rule
- * @param \Closure|string $replacer
- * @return void
- */
- public function replacer($rule, $replacer)
- {
- $this->replacers[$rule] = $replacer;
- }
-
- /**
- * Set the Validator instance resolver.
- *
- * @param \Closure $resolver
- * @return void
- */
- public function resolver(Closure $resolver)
- {
- $this->resolver = $resolver;
- }
-
- /**
- * Get the Translator implementation.
- *
- * @return \Symfony\Component\Translation\TranslatorInterface
- */
- public function getTranslator()
- {
- return $this->translator;
- }
-
- /**
- * Get the Presence Verifier implementation.
- *
- * @return \Illuminate\Validation\PresenceVerifierInterface
- */
- public function getPresenceVerifier()
- {
- return $this->verifier;
- }
-
- /**
- * Set the Presence Verifier implementation.
- *
- * @param \Illuminate\Validation\PresenceVerifierInterface $presenceVerifier
- * @return void
- */
- public function setPresenceVerifier(PresenceVerifierInterface $presenceVerifier)
- {
- $this->verifier = $presenceVerifier;
- }
-
+class Factory implements FactoryContract
+{
+ /**
+ * The Translator implementation.
+ *
+ * @var \Symfony\Component\Translation\TranslatorInterface
+ */
+ protected $translator;
+
+ /**
+ * The Presence Verifier implementation.
+ *
+ * @var \Illuminate\Validation\PresenceVerifierInterface
+ */
+ protected $verifier;
+
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * All of the custom validator extensions.
+ *
+ * @var array
+ */
+ protected $extensions = [];
+
+ /**
+ * All of the custom implicit validator extensions.
+ *
+ * @var array
+ */
+ protected $implicitExtensions = [];
+
+ /**
+ * All of the custom validator message replacers.
+ *
+ * @var array
+ */
+ protected $replacers = [];
+
+ /**
+ * All of the fallback messages for custom rules.
+ *
+ * @var array
+ */
+ protected $fallbackMessages = [];
+
+ /**
+ * The Validator resolver instance.
+ *
+ * @var Closure
+ */
+ protected $resolver;
+
+ /**
+ * Create a new Validator factory instance.
+ *
+ * @param \Symfony\Component\Translation\TranslatorInterface $translator
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function __construct(TranslatorInterface $translator, Container $container = null)
+ {
+ $this->container = $container;
+ $this->translator = $translator;
+ }
+
+ /**
+ * Create a new Validator instance.
+ *
+ * @param array $data
+ * @param array $rules
+ * @param array $messages
+ * @param array $customAttributes
+ * @return \Illuminate\Validation\Validator
+ */
+ public function make(array $data, array $rules, array $messages = [], array $customAttributes = [])
+ {
+ // The presence verifier is responsible for checking the unique and exists data
+ // for the validator. It is behind an interface so that multiple versions of
+ // it may be written besides database. We'll inject it into the validator.
+ $validator = $this->resolve($data, $rules, $messages, $customAttributes);
+
+ if (! is_null($this->verifier)) {
+ $validator->setPresenceVerifier($this->verifier);
+ }
+
+ // Next we'll set the IoC container instance of the validator, which is used to
+ // resolve out class based validator extensions. If it is not set then these
+ // types of extensions will not be possible on these validation instances.
+ if (! is_null($this->container)) {
+ $validator->setContainer($this->container);
+ }
+
+ $this->addExtensions($validator);
+
+ return $validator;
+ }
+
+ /**
+ * Add the extensions to a validator instance.
+ *
+ * @param \Illuminate\Validation\Validator $validator
+ * @return void
+ */
+ protected function addExtensions(Validator $validator)
+ {
+ $validator->addExtensions($this->extensions);
+
+ // Next, we will add the implicit extensions, which are similar to the required
+ // and accepted rule in that they are run even if the attributes is not in a
+ // array of data that is given to a validator instances via instantiation.
+ $implicit = $this->implicitExtensions;
+
+ $validator->addImplicitExtensions($implicit);
+
+ $validator->addReplacers($this->replacers);
+
+ $validator->setFallbackMessages($this->fallbackMessages);
+ }
+
+ /**
+ * Resolve a new Validator instance.
+ *
+ * @param array $data
+ * @param array $rules
+ * @param array $messages
+ * @param array $customAttributes
+ * @return \Illuminate\Validation\Validator
+ */
+ protected function resolve(array $data, array $rules, array $messages, array $customAttributes)
+ {
+ if (is_null($this->resolver)) {
+ return new Validator($this->translator, $data, $rules, $messages, $customAttributes);
+ }
+
+ return call_user_func($this->resolver, $this->translator, $data, $rules, $messages, $customAttributes);
+ }
+
+ /**
+ * Register a custom validator extension.
+ *
+ * @param string $rule
+ * @param \Closure|string $extension
+ * @param string $message
+ * @return void
+ */
+ public function extend($rule, $extension, $message = null)
+ {
+ $this->extensions[$rule] = $extension;
+
+ if ($message) {
+ $this->fallbackMessages[Str::snake($rule)] = $message;
+ }
+ }
+
+ /**
+ * Register a custom implicit validator extension.
+ *
+ * @param string $rule
+ * @param \Closure|string $extension
+ * @param string $message
+ * @return void
+ */
+ public function extendImplicit($rule, $extension, $message = null)
+ {
+ $this->implicitExtensions[$rule] = $extension;
+
+ if ($message) {
+ $this->fallbackMessages[Str::snake($rule)] = $message;
+ }
+ }
+
+ /**
+ * Register a custom implicit validator message replacer.
+ *
+ * @param string $rule
+ * @param \Closure|string $replacer
+ * @return void
+ */
+ public function replacer($rule, $replacer)
+ {
+ $this->replacers[$rule] = $replacer;
+ }
+
+ /**
+ * Set the Validator instance resolver.
+ *
+ * @param \Closure $resolver
+ * @return void
+ */
+ public function resolver(Closure $resolver)
+ {
+ $this->resolver = $resolver;
+ }
+
+ /**
+ * Get the Translator implementation.
+ *
+ * @return \Symfony\Component\Translation\TranslatorInterface
+ */
+ public function getTranslator()
+ {
+ return $this->translator;
+ }
+
+ /**
+ * Get the Presence Verifier implementation.
+ *
+ * @return \Illuminate\Validation\PresenceVerifierInterface
+ */
+ public function getPresenceVerifier()
+ {
+ return $this->verifier;
+ }
+
+ /**
+ * Set the Presence Verifier implementation.
+ *
+ * @param \Illuminate\Validation\PresenceVerifierInterface $presenceVerifier
+ * @return void
+ */
+ public function setPresenceVerifier(PresenceVerifierInterface $presenceVerifier)
+ {
+ $this->verifier = $presenceVerifier;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php b/application/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php
index 32fd3f4..7449629 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php
@@ -1,29 +1,30 @@
-getValidatorInstance();
-
- if ( ! $this->passesAuthorization())
- {
- $this->failedAuthorization();
- }
- elseif ( ! $instance->passes())
- {
- $this->failedValidation($instance);
- }
- }
+trait ValidatesWhenResolvedTrait
+{
+ /**
+ * Validate the class instance.
+ *
+ * @return void
+ */
+ public function validate()
+ {
+ $instance = $this->getValidatorInstance();
- /**
- * Get the validator instance for the request.
- *
- * @return \Illuminate\Validation\Validator
- */
- protected function getValidatorInstance()
- {
- return $this->validator();
- }
+ if (! $this->passesAuthorization()) {
+ $this->failedAuthorization();
+ } elseif (! $instance->passes()) {
+ $this->failedValidation($instance);
+ }
+ }
- /**
- * Handle a failed validation attempt.
- *
- * @param \Illuminate\Validation\Validator $validator
- * @return mixed
- */
- protected function failedValidation(Validator $validator)
- {
- throw new ValidationException($validator);
- }
+ /**
+ * Get the validator instance for the request.
+ *
+ * @return \Illuminate\Validation\Validator
+ */
+ protected function getValidatorInstance()
+ {
+ return $this->validator();
+ }
- /**
- * Deteremine if the request passes the authorization check.
- *
- * @return bool
- */
- protected function passesAuthorization()
- {
- if (method_exists($this, 'authorize'))
- {
- return $this->authorize();
- }
+ /**
+ * Handle a failed validation attempt.
+ *
+ * @param \Illuminate\Validation\Validator $validator
+ * @return mixed
+ */
+ protected function failedValidation(Validator $validator)
+ {
+ throw new ValidationException($validator);
+ }
- return true;
- }
+ /**
+ * Determine if the request passes the authorization check.
+ *
+ * @return bool
+ */
+ protected function passesAuthorization()
+ {
+ if (method_exists($this, 'authorize')) {
+ return $this->authorize();
+ }
- /**
- * Handle a failed authorization attempt.
- *
- * @return mixed
- */
- protected function failedAuthorization()
- {
- throw new UnauthorizedException;
- }
+ return true;
+ }
+ /**
+ * Handle a failed authorization attempt.
+ *
+ * @return mixed
+ */
+ protected function failedAuthorization()
+ {
+ throw new UnauthorizedException;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php
index e22f743..5eaf08f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php
@@ -1,71 +1,68 @@
-registerValidationResolverHook();
-
- $this->registerPresenceVerifier();
+class ValidationServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerValidationResolverHook();
- $this->registerValidationFactory();
- }
+ $this->registerPresenceVerifier();
- /**
- * Register the "ValidatesWhenResolved" container hook.
- *
- * @return void
- */
- protected function registerValidationResolverHook()
- {
- $this->app->afterResolving(function(ValidatesWhenResolved $resolved)
- {
- $resolved->validate();
- });
- }
+ $this->registerValidationFactory();
+ }
- /**
- * Register the validation factory.
- *
- * @return void
- */
- protected function registerValidationFactory()
- {
- $this->app->singleton('validator', function($app)
- {
- $validator = new Factory($app['translator'], $app);
+ /**
+ * Register the "ValidatesWhenResolved" container hook.
+ *
+ * @return void
+ */
+ protected function registerValidationResolverHook()
+ {
+ $this->app->afterResolving(function (ValidatesWhenResolved $resolved) {
+ $resolved->validate();
+ });
+ }
- // The validation presence verifier is responsible for determining the existence
- // of values in a given data collection, typically a relational database or
- // other persistent data stores. And it is used to check for uniqueness.
- if (isset($app['validation.presence']))
- {
- $validator->setPresenceVerifier($app['validation.presence']);
- }
+ /**
+ * Register the validation factory.
+ *
+ * @return void
+ */
+ protected function registerValidationFactory()
+ {
+ $this->app->singleton('validator', function ($app) {
+ $validator = new Factory($app['translator'], $app);
- return $validator;
- });
- }
+ // The validation presence verifier is responsible for determining the existence
+ // of values in a given data collection, typically a relational database or
+ // other persistent data stores. And it is used to check for uniqueness.
+ if (isset($app['validation.presence'])) {
+ $validator->setPresenceVerifier($app['validation.presence']);
+ }
- /**
- * Register the database presence verifier.
- *
- * @return void
- */
- protected function registerPresenceVerifier()
- {
- $this->app->singleton('validation.presence', function($app)
- {
- return new DatabasePresenceVerifier($app['db']);
- });
- }
+ return $validator;
+ });
+ }
+ /**
+ * Register the database presence verifier.
+ *
+ * @return void
+ */
+ protected function registerPresenceVerifier()
+ {
+ $this->app->singleton('validation.presence', function ($app) {
+ return new DatabasePresenceVerifier($app['db']);
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Validation/Validator.php b/application/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
index 34d5cc4..9c5e74d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
@@ -1,12 +1,17 @@
-translator = $translator;
- $this->customMessages = $messages;
- $this->data = $this->parseData($data);
- $this->rules = $this->explodeRules($rules);
- $this->customAttributes = $customAttributes;
- }
-
- /**
- * Parse the data and hydrate the files array.
- *
- * @param array $data
- * @param string $arrayKey
- * @return array
- */
- protected function parseData(array $data, $arrayKey = null)
- {
- if (is_null($arrayKey))
- {
- $this->files = array();
- }
-
- foreach ($data as $key => $value)
- {
- $key = ($arrayKey) ? "$arrayKey.$key" : $key;
-
- // If this value is an instance of the HttpFoundation File class we will
- // remove it from the data array and add it to the files array, which
- // we use to conveniently separate out these files from other data.
- if ($value instanceof File)
- {
- $this->files[$key] = $value;
-
- unset($data[$key]);
- }
- elseif (is_array($value))
- {
- $this->parseData($value, $key);
- }
- }
-
- return $data;
- }
-
- /**
- * Explode the rules into an array of rules.
- *
- * @param string|array $rules
- * @return array
- */
- protected function explodeRules($rules)
- {
- foreach ($rules as $key => &$rule)
- {
- $rule = (is_string($rule)) ? explode('|', $rule) : $rule;
- }
-
- return $rules;
- }
-
- /**
- * After an after validation callback.
- *
- * @param callable|string $callback
- * @return $this
- */
- public function after($callback)
- {
- $this->after[] = function() use ($callback)
- {
- return call_user_func_array($callback, [$this]);
- };
-
- return $this;
- }
-
- /**
- * Add conditions to a given field based on a Closure.
- *
- * @param string $attribute
- * @param string|array $rules
- * @param callable $callback
- * @return void
- */
- public function sometimes($attribute, $rules, callable $callback)
- {
- $payload = new Fluent(array_merge($this->data, $this->files));
-
- if (call_user_func($callback, $payload))
- {
- foreach ((array) $attribute as $key)
- {
- $this->mergeRules($key, $rules);
- }
- }
- }
-
- /**
- * Define a set of rules that apply to each element in an array attribute.
- *
- * @param string $attribute
- * @param string|array $rules
- * @return void
- *
- * @throws \InvalidArgumentException
- */
- public function each($attribute, $rules)
- {
- $data = array_get($this->data, $attribute);
-
- if ( ! is_array($data))
- {
- if ($this->hasRule($attribute, 'Array')) return;
-
- throw new InvalidArgumentException('Attribute for each() must be an array.');
- }
-
- foreach ($data as $dataKey => $dataValue)
- {
- foreach ($rules as $ruleKey => $ruleValue)
- {
- if ( ! is_string($ruleKey))
- {
- $this->mergeRules("$attribute.$dataKey", $ruleValue);
- }
- else
- {
- $this->mergeRules("$attribute.$dataKey.$ruleKey", $ruleValue);
- }
- }
- }
- }
-
- /**
- * Merge additional rules into a given attribute.
- *
- * @param string $attribute
- * @param string|array $rules
- * @return void
- */
- public function mergeRules($attribute, $rules)
- {
- $current = isset($this->rules[$attribute]) ? $this->rules[$attribute] : [];
-
- $merge = head($this->explodeRules(array($rules)));
-
- $this->rules[$attribute] = array_merge($current, $merge);
- }
-
- /**
- * Determine if the data passes the validation rules.
- *
- * @return bool
- */
- public function passes()
- {
- $this->messages = new MessageBag;
-
- // We'll spin through each rule, validating the attributes attached to that
- // rule. Any error messages will be added to the containers with each of
- // the other error messages, returning true if we don't have messages.
- foreach ($this->rules as $attribute => $rules)
- {
- foreach ($rules as $rule)
- {
- $this->validate($attribute, $rule);
- }
- }
-
- // Here we will spin through all of the "after" hooks on this validator and
- // fire them off. This gives the callbacks a chance to perform all kinds
- // of other validation that needs to get wrapped up in this operation.
- foreach ($this->after as $after)
- {
- call_user_func($after);
- }
-
- return count($this->messages->all()) === 0;
- }
-
- /**
- * Determine if the data fails the validation rules.
- *
- * @return bool
- */
- public function fails()
- {
- return ! $this->passes();
- }
-
- /**
- * Validate a given attribute against a rule.
- *
- * @param string $attribute
- * @param string $rule
- * @return void
- */
- protected function validate($attribute, $rule)
- {
- list($rule, $parameters) = $this->parseRule($rule);
-
- if ($rule == '') return;
-
- // We will get the value for the given attribute from the array of data and then
- // verify that the attribute is indeed validatable. Unless the rule implies
- // that the attribute is required, rules are not run for missing values.
- $value = $this->getValue($attribute);
-
- $validatable = $this->isValidatable($rule, $attribute, $value);
-
- $method = "validate{$rule}";
-
- if ($validatable && ! $this->$method($attribute, $value, $parameters, $this))
- {
- $this->addFailure($attribute, $rule, $parameters);
- }
- }
-
- /**
- * Returns the data which was valid.
- *
- * @return array
- */
- public function valid()
- {
- if ( ! $this->messages) $this->passes();
-
- return array_diff_key($this->data, $this->messages()->toArray());
- }
-
- /**
- * Returns the data which was invalid.
- *
- * @return array
- */
- public function invalid()
- {
- if ( ! $this->messages) $this->passes();
-
- return array_intersect_key($this->data, $this->messages()->toArray());
- }
-
- /**
- * Get the value of a given attribute.
- *
- * @param string $attribute
- * @return mixed
- */
- protected function getValue($attribute)
- {
- if ( ! is_null($value = array_get($this->data, $attribute)))
- {
- return $value;
- }
- elseif ( ! is_null($value = array_get($this->files, $attribute)))
- {
- return $value;
- }
- }
-
- /**
- * Determine if the attribute is validatable.
- *
- * @param string $rule
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function isValidatable($rule, $attribute, $value)
- {
- return $this->presentOrRuleIsImplicit($rule, $attribute, $value) &&
+class Validator implements ValidatorContract
+{
+ /**
+ * The Translator implementation.
+ *
+ * @var \Symfony\Component\Translation\TranslatorInterface
+ */
+ protected $translator;
+
+ /**
+ * The Presence Verifier implementation.
+ *
+ * @var \Illuminate\Validation\PresenceVerifierInterface
+ */
+ protected $presenceVerifier;
+
+ /**
+ * The container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * The failed validation rules.
+ *
+ * @var array
+ */
+ protected $failedRules = [];
+
+ /**
+ * The message bag instance.
+ *
+ * @var \Illuminate\Support\MessageBag
+ */
+ protected $messages;
+
+ /**
+ * The data under validation.
+ *
+ * @var array
+ */
+ protected $data;
+
+ /**
+ * The files under validation.
+ *
+ * @var array
+ */
+ protected $files = [];
+
+ /**
+ * The rules to be applied to the data.
+ *
+ * @var array
+ */
+ protected $rules;
+
+ /**
+ * All of the registered "after" callbacks.
+ *
+ * @var array
+ */
+ protected $after = [];
+
+ /**
+ * The array of custom error messages.
+ *
+ * @var array
+ */
+ protected $customMessages = [];
+
+ /**
+ * The array of fallback error messages.
+ *
+ * @var array
+ */
+ protected $fallbackMessages = [];
+
+ /**
+ * The array of custom attribute names.
+ *
+ * @var array
+ */
+ protected $customAttributes = [];
+
+ /**
+ * The array of custom displayabled values.
+ *
+ * @var array
+ */
+ protected $customValues = [];
+
+ /**
+ * All of the custom validator extensions.
+ *
+ * @var array
+ */
+ protected $extensions = [];
+
+ /**
+ * All of the custom replacer extensions.
+ *
+ * @var array
+ */
+ protected $replacers = [];
+
+ /**
+ * The size related validation rules.
+ *
+ * @var array
+ */
+ protected $sizeRules = ['Size', 'Between', 'Min', 'Max'];
+
+ /**
+ * The numeric related validation rules.
+ *
+ * @var array
+ */
+ protected $numericRules = ['Numeric', 'Integer'];
+
+ /**
+ * The validation rules that imply the field is required.
+ *
+ * @var array
+ */
+ protected $implicitRules = [
+ 'Required', 'RequiredWith', 'RequiredWithAll', 'RequiredWithout', 'RequiredWithoutAll', 'RequiredIf', 'RequiredUnless', 'Accepted',
+ ];
+
+ /**
+ * Create a new Validator instance.
+ *
+ * @param \Symfony\Component\Translation\TranslatorInterface $translator
+ * @param array $data
+ * @param array $rules
+ * @param array $messages
+ * @param array $customAttributes
+ * @return void
+ */
+ public function __construct(TranslatorInterface $translator, array $data, array $rules, array $messages = [], array $customAttributes = [])
+ {
+ $this->translator = $translator;
+ $this->customMessages = $messages;
+ $this->data = $this->parseData($data);
+ $this->rules = $this->explodeRules($rules);
+ $this->customAttributes = $customAttributes;
+ }
+
+ /**
+ * Parse the data and hydrate the files array.
+ *
+ * @param array $data
+ * @param string $arrayKey
+ * @return array
+ */
+ protected function parseData(array $data, $arrayKey = null)
+ {
+ if (is_null($arrayKey)) {
+ $this->files = [];
+ }
+
+ foreach ($data as $key => $value) {
+ $key = ($arrayKey) ? "$arrayKey.$key" : $key;
+
+ // If this value is an instance of the HttpFoundation File class we will
+ // remove it from the data array and add it to the files array, which
+ // we use to conveniently separate out these files from other data.
+ if ($value instanceof File) {
+ $this->files[$key] = $value;
+
+ unset($data[$key]);
+ } elseif (is_array($value)) {
+ $this->parseData($value, $key);
+ }
+ }
+
+ return $data;
+ }
+
+ /**
+ * Explode the rules into an array of rules.
+ *
+ * @param string|array $rules
+ * @return array
+ */
+ protected function explodeRules($rules)
+ {
+ foreach ($rules as $key => &$rule) {
+ $rule = (is_string($rule)) ? explode('|', $rule) : $rule;
+ }
+
+ return $rules;
+ }
+
+ /**
+ * After an after validation callback.
+ *
+ * @param callable|string $callback
+ * @return $this
+ */
+ public function after($callback)
+ {
+ $this->after[] = function () use ($callback) {
+ return call_user_func_array($callback, [$this]);
+ };
+
+ return $this;
+ }
+
+ /**
+ * Add conditions to a given field based on a Closure.
+ *
+ * @param string $attribute
+ * @param string|array $rules
+ * @param callable $callback
+ * @return void
+ */
+ public function sometimes($attribute, $rules, callable $callback)
+ {
+ $payload = new Fluent(array_merge($this->data, $this->files));
+
+ if (call_user_func($callback, $payload)) {
+ foreach ((array) $attribute as $key) {
+ $this->mergeRules($key, $rules);
+ }
+ }
+ }
+
+ /**
+ * Define a set of rules that apply to each element in an array attribute.
+ *
+ * @param string $attribute
+ * @param string|array $rules
+ * @return void
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function each($attribute, $rules)
+ {
+ $data = Arr::get($this->data, $attribute);
+
+ if (! is_array($data)) {
+ if ($this->hasRule($attribute, 'Array')) {
+ return;
+ }
+
+ throw new InvalidArgumentException('Attribute for each() must be an array.');
+ }
+
+ foreach ($data as $dataKey => $dataValue) {
+ foreach ((array) $rules as $ruleKey => $ruleValue) {
+ if (! is_string($ruleKey)) {
+ $this->mergeRules("$attribute.$dataKey", $ruleValue);
+ } else {
+ $this->mergeRules("$attribute.$dataKey.$ruleKey", $ruleValue);
+ }
+ }
+ }
+ }
+
+ /**
+ * Merge additional rules into a given attribute.
+ *
+ * @param string $attribute
+ * @param string|array $rules
+ * @return void
+ */
+ public function mergeRules($attribute, $rules)
+ {
+ $current = isset($this->rules[$attribute]) ? $this->rules[$attribute] : [];
+
+ $merge = head($this->explodeRules([$rules]));
+
+ $this->rules[$attribute] = array_merge($current, $merge);
+ }
+
+ /**
+ * Determine if the data passes the validation rules.
+ *
+ * @return bool
+ */
+ public function passes()
+ {
+ $this->messages = new MessageBag;
+
+ // We'll spin through each rule, validating the attributes attached to that
+ // rule. Any error messages will be added to the containers with each of
+ // the other error messages, returning true if we don't have messages.
+ foreach ($this->rules as $attribute => $rules) {
+ foreach ($rules as $rule) {
+ $this->validate($attribute, $rule);
+ }
+ }
+
+ // Here we will spin through all of the "after" hooks on this validator and
+ // fire them off. This gives the callbacks a chance to perform all kinds
+ // of other validation that needs to get wrapped up in this operation.
+ foreach ($this->after as $after) {
+ call_user_func($after);
+ }
+
+ return count($this->messages->all()) === 0;
+ }
+
+ /**
+ * Determine if the data fails the validation rules.
+ *
+ * @return bool
+ */
+ public function fails()
+ {
+ return ! $this->passes();
+ }
+
+ /**
+ * Validate a given attribute against a rule.
+ *
+ * @param string $attribute
+ * @param string $rule
+ * @return void
+ */
+ protected function validate($attribute, $rule)
+ {
+ list($rule, $parameters) = $this->parseRule($rule);
+
+ if ($rule == '') {
+ return;
+ }
+
+ // We will get the value for the given attribute from the array of data and then
+ // verify that the attribute is indeed validatable. Unless the rule implies
+ // that the attribute is required, rules are not run for missing values.
+ $value = $this->getValue($attribute);
+
+ $validatable = $this->isValidatable($rule, $attribute, $value);
+
+ $method = "validate{$rule}";
+
+ if ($validatable && ! $this->$method($attribute, $value, $parameters, $this)) {
+ $this->addFailure($attribute, $rule, $parameters);
+ }
+ }
+
+ /**
+ * Returns the data which was valid.
+ *
+ * @return array
+ */
+ public function valid()
+ {
+ if (! $this->messages) {
+ $this->passes();
+ }
+
+ return array_diff_key($this->data, $this->messages()->toArray());
+ }
+
+ /**
+ * Returns the data which was invalid.
+ *
+ * @return array
+ */
+ public function invalid()
+ {
+ if (! $this->messages) {
+ $this->passes();
+ }
+
+ return array_intersect_key($this->data, $this->messages()->toArray());
+ }
+
+ /**
+ * Get the value of a given attribute.
+ *
+ * @param string $attribute
+ * @return mixed
+ */
+ protected function getValue($attribute)
+ {
+ if (! is_null($value = Arr::get($this->data, $attribute))) {
+ return $value;
+ } elseif (! is_null($value = Arr::get($this->files, $attribute))) {
+ return $value;
+ }
+ }
+
+ /**
+ * Determine if the attribute is validatable.
+ *
+ * @param string $rule
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function isValidatable($rule, $attribute, $value)
+ {
+ return $this->presentOrRuleIsImplicit($rule, $attribute, $value) &&
$this->passesOptionalCheck($attribute) &&
$this->hasNotFailedPreviousRuleIfPresenceRule($rule, $attribute);
- }
-
- /**
- * Determine if the field is present, or the rule implies required.
- *
- * @param string $rule
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function presentOrRuleIsImplicit($rule, $attribute, $value)
- {
- return $this->validateRequired($attribute, $value) || $this->isImplicit($rule);
- }
-
- /**
- * Determine if the attribute passes any optional check.
- *
- * @param string $attribute
- * @return bool
- */
- protected function passesOptionalCheck($attribute)
- {
- if ($this->hasRule($attribute, array('Sometimes')))
- {
- return array_key_exists($attribute, array_dot($this->data))
- || in_array($attribute, array_keys($this->data))
- || array_key_exists($attribute, $this->files);
- }
-
- return true;
- }
-
- /**
- * Determine if a given rule implies the attribute is required.
- *
- * @param string $rule
- * @return bool
- */
- protected function isImplicit($rule)
- {
- return in_array($rule, $this->implicitRules);
- }
-
- /**
- * Determine if it's a necessary presence validation.
- *
- * This is to avoid possible database type comparison errors.
- *
- * @param string $rule
- * @param string $attribute
- * @return bool
- */
- protected function hasNotFailedPreviousRuleIfPresenceRule($rule, $attribute)
- {
- return in_array($rule, ['Unique', 'Exists'])
- ? ! $this->messages->has($attribute) : true;
- }
-
- /**
- * Add a failed rule and error message to the collection.
- *
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return void
- */
- protected function addFailure($attribute, $rule, $parameters)
- {
- $this->addError($attribute, $rule, $parameters);
-
- $this->failedRules[$attribute][$rule] = $parameters;
- }
-
- /**
- * Add an error message to the validator's collection of messages.
- *
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return void
- */
- protected function addError($attribute, $rule, $parameters)
- {
- $message = $this->getMessage($attribute, $rule);
-
- $message = $this->doReplacements($message, $attribute, $rule, $parameters);
-
- $this->messages->add($attribute, $message);
- }
-
- /**
- * "Validate" optional attributes.
- *
- * Always returns true, just lets us put sometimes in rules.
- *
- * @return bool
- */
- protected function validateSometimes()
- {
- return true;
- }
-
- /**
- * Validate that a required attribute exists.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateRequired($attribute, $value)
- {
- if (is_null($value))
- {
- return false;
- }
- elseif (is_string($value) && trim($value) === '')
- {
- return false;
- }
- elseif ((is_array($value) || $value instanceof Countable) && count($value) < 1)
- {
- return false;
- }
- elseif ($value instanceof File)
- {
- return (string) $value->getPath() != '';
- }
-
- return true;
- }
-
- /**
- * Validate the given attribute is filled if it is present.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateFilled($attribute, $value)
- {
- if (array_key_exists($attribute, $this->data) || array_key_exists($attribute, $this->files))
- {
- return $this->validateRequired($attribute, $value);
- }
-
- return true;
- }
-
- /**
- * Determine if any of the given attributes fail the required test.
- *
- * @param array $attributes
- * @return bool
- */
- protected function anyFailingRequired(array $attributes)
- {
- foreach ($attributes as $key)
- {
- if ( ! $this->validateRequired($key, $this->getValue($key)))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Determine if all of the given attributes fail the required test.
- *
- * @param array $attributes
- * @return bool
- */
- protected function allFailingRequired(array $attributes)
- {
- foreach ($attributes as $key)
- {
- if ($this->validateRequired($key, $this->getValue($key)))
- {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Validate that an attribute exists when any other attribute exists.
- *
- * @param string $attribute
- * @param mixed $value
- * @param mixed $parameters
- * @return bool
- */
- protected function validateRequiredWith($attribute, $value, $parameters)
- {
- if ( ! $this->allFailingRequired($parameters))
- {
- return $this->validateRequired($attribute, $value);
- }
-
- return true;
- }
-
- /**
- * Validate that an attribute exists when all other attributes exists.
- *
- * @param string $attribute
- * @param mixed $value
- * @param mixed $parameters
- * @return bool
- */
- protected function validateRequiredWithAll($attribute, $value, $parameters)
- {
- if ( ! $this->anyFailingRequired($parameters))
- {
- return $this->validateRequired($attribute, $value);
- }
-
- return true;
- }
-
- /**
- * Validate that an attribute exists when another attribute does not.
- *
- * @param string $attribute
- * @param mixed $value
- * @param mixed $parameters
- * @return bool
- */
- protected function validateRequiredWithout($attribute, $value, $parameters)
- {
- if ($this->anyFailingRequired($parameters))
- {
- return $this->validateRequired($attribute, $value);
- }
-
- return true;
- }
-
- /**
- * Validate that an attribute exists when all other attributes do not.
- *
- * @param string $attribute
- * @param mixed $value
- * @param mixed $parameters
- * @return bool
- */
- protected function validateRequiredWithoutAll($attribute, $value, $parameters)
- {
- if ($this->allFailingRequired($parameters))
- {
- return $this->validateRequired($attribute, $value);
- }
-
- return true;
- }
-
- /**
- * Validate that an attribute exists when another attribute has a given value.
- *
- * @param string $attribute
- * @param mixed $value
- * @param mixed $parameters
- * @return bool
- */
- protected function validateRequiredIf($attribute, $value, $parameters)
- {
- $this->requireParameterCount(2, $parameters, 'required_if');
-
- $data = array_get($this->data, $parameters[0]);
-
- $values = array_slice($parameters, 1);
-
- if (in_array($data, $values))
- {
- return $this->validateRequired($attribute, $value);
- }
-
- return true;
- }
-
- /**
- * Get the number of attributes in a list that are present.
- *
- * @param array $attributes
- * @return int
- */
- protected function getPresentCount($attributes)
- {
- $count = 0;
-
- foreach ($attributes as $key)
- {
- if (array_get($this->data, $key) || array_get($this->files, $key))
- {
- $count++;
- }
- }
-
- return $count;
- }
-
- /**
- * Validate that an attribute has a matching confirmation.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateConfirmed($attribute, $value)
- {
- return $this->validateSame($attribute, $value, array($attribute.'_confirmation'));
- }
-
- /**
- * Validate that two attributes match.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateSame($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'same');
-
- $other = array_get($this->data, $parameters[0]);
-
- return isset($other) && $value == $other;
- }
-
- /**
- * Validate that an attribute is different from another attribute.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateDifferent($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'different');
-
- $other = array_get($this->data, $parameters[0]);
-
- return isset($other) && $value != $other;
- }
-
- /**
- * Validate that an attribute was "accepted".
- *
- * This validation rule implies the attribute is "required".
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateAccepted($attribute, $value)
- {
- $acceptable = array('yes', 'on', '1', 1, true, 'true');
-
- return $this->validateRequired($attribute, $value) && in_array($value, $acceptable, true);
- }
-
- /**
- * Validate that an attribute is an array.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateArray($attribute, $value)
- {
- return is_array($value);
- }
-
- /**
- * Validate that an attribute is a boolean.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateBoolean($attribute, $value)
- {
- $acceptable = array(true, false, 0, 1, '0', '1');
-
- return in_array($value, $acceptable, true);
- }
-
- /**
- * Validate that an attribute is an integer.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateInteger($attribute, $value)
- {
- return filter_var($value, FILTER_VALIDATE_INT) !== false;
- }
-
- /**
- * Validate that an attribute is numeric.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateNumeric($attribute, $value)
- {
- return is_numeric($value);
- }
-
- /**
- * Validate that an attribute is a string.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateString($attribute, $value)
- {
- return is_string($value);
- }
-
- /**
- * Validate that an attribute has a given number of digits.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateDigits($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'digits');
-
- return $this->validateNumeric($attribute, $value)
- && strlen((string) $value) == $parameters[0];
- }
-
- /**
- * Validate that an attribute is between a given number of digits.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateDigitsBetween($attribute, $value, $parameters)
- {
- $this->requireParameterCount(2, $parameters, 'digits_between');
-
- $length = strlen((string) $value);
-
- return $this->validateNumeric($attribute, $value)
- && $length >= $parameters[0] && $length <= $parameters[1];
- }
-
- /**
- * Validate the size of an attribute.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateSize($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'size');
-
- return $this->getSize($attribute, $value) == $parameters[0];
- }
-
- /**
- * Validate the size of an attribute is between a set of values.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateBetween($attribute, $value, $parameters)
- {
- $this->requireParameterCount(2, $parameters, 'between');
-
- $size = $this->getSize($attribute, $value);
-
- return $size >= $parameters[0] && $size <= $parameters[1];
- }
-
- /**
- * Validate the size of an attribute is greater than a minimum value.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateMin($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'min');
-
- return $this->getSize($attribute, $value) >= $parameters[0];
- }
-
- /**
- * Validate the size of an attribute is less than a maximum value.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateMax($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'max');
-
- if ($value instanceof UploadedFile && ! $value->isValid()) return false;
-
- return $this->getSize($attribute, $value) <= $parameters[0];
- }
-
- /**
- * Get the size of an attribute.
- *
- * @param string $attribute
- * @param mixed $value
- * @return mixed
- */
- protected function getSize($attribute, $value)
- {
- $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-
- // This method will determine if the attribute is a number, string, or file and
- // return the proper size accordingly. If it is a number, then number itself
- // is the size. If it is a file, we take kilobytes, and for a string the
- // entire length of the string will be considered the attribute size.
- if (is_numeric($value) && $hasNumeric)
- {
- return array_get($this->data, $attribute);
- }
- elseif (is_array($value))
- {
- return count($value);
- }
- elseif ($value instanceof File)
- {
- return $value->getSize() / 1024;
- }
-
- return mb_strlen($value);
- }
-
- /**
- * Validate an attribute is contained within a list of values.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateIn($attribute, $value, $parameters)
- {
- return in_array((string) $value, $parameters);
- }
-
- /**
- * Validate an attribute is not contained within a list of values.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateNotIn($attribute, $value, $parameters)
- {
- return ! $this->validateIn($attribute, $value, $parameters);
- }
-
- /**
- * Validate the uniqueness of an attribute value on a given database table.
- *
- * If a database column is not specified, the attribute will be used.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateUnique($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'unique');
-
- $table = $parameters[0];
-
- // The second parameter position holds the name of the column that needs to
- // be verified as unique. If this parameter isn't specified we will just
- // assume that this column to be verified shares the attribute's name.
- $column = isset($parameters[1]) ? $parameters[1] : $attribute;
-
- list($idColumn, $id) = array(null, null);
-
- if (isset($parameters[2]))
- {
- list($idColumn, $id) = $this->getUniqueIds($parameters);
-
- if (strtolower($id) == 'null') $id = null;
- }
-
- // The presence verifier is responsible for counting rows within this store
- // mechanism which might be a relational database or any other permanent
- // data store like Redis, etc. We will use it to determine uniqueness.
- $verifier = $this->getPresenceVerifier();
-
- $extra = $this->getUniqueExtra($parameters);
-
- return $verifier->getCount(
-
- $table, $column, $value, $id, $idColumn, $extra
-
- ) == 0;
- }
-
- /**
- * Get the excluded ID column and value for the unique rule.
- *
- * @param array $parameters
- * @return array
- */
- protected function getUniqueIds($parameters)
- {
- $idColumn = isset($parameters[3]) ? $parameters[3] : 'id';
-
- return array($idColumn, $parameters[2]);
- }
-
- /**
- * Get the extra conditions for a unique rule.
- *
- * @param array $parameters
- * @return array
- */
- protected function getUniqueExtra($parameters)
- {
- if (isset($parameters[4]))
- {
- return $this->getExtraConditions(array_slice($parameters, 4));
- }
-
- return array();
- }
-
- /**
- * Validate the existence of an attribute value in a database table.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateExists($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'exists');
-
- $table = $parameters[0];
-
- // The second parameter position holds the name of the column that should be
- // verified as existing. If this parameter is not specified we will guess
- // that the columns being "verified" shares the given attribute's name.
- $column = isset($parameters[1]) ? $parameters[1] : $attribute;
-
- $expected = (is_array($value)) ? count($value) : 1;
-
- return $this->getExistCount($table, $column, $value, $parameters) >= $expected;
- }
-
- /**
- * Get the number of records that exist in storage.
- *
- * @param string $table
- * @param string $column
- * @param mixed $value
- * @param array $parameters
- * @return int
- */
- protected function getExistCount($table, $column, $value, $parameters)
- {
- $verifier = $this->getPresenceVerifier();
-
- $extra = $this->getExtraExistConditions($parameters);
-
- if (is_array($value))
- {
- return $verifier->getMultiCount($table, $column, $value, $extra);
- }
-
- return $verifier->getCount($table, $column, $value, null, null, $extra);
- }
-
- /**
- * Get the extra exist conditions.
- *
- * @param array $parameters
- * @return array
- */
- protected function getExtraExistConditions(array $parameters)
- {
- return $this->getExtraConditions(array_values(array_slice($parameters, 2)));
- }
-
- /**
- * Get the extra conditions for a unique / exists rule.
- *
- * @param array $segments
- * @return array
- */
- protected function getExtraConditions(array $segments)
- {
- $extra = array();
-
- $count = count($segments);
-
- for ($i = 0; $i < $count; $i = $i + 2)
- {
- $extra[$segments[$i]] = $segments[$i + 1];
- }
-
- return $extra;
- }
-
- /**
- * Validate that an attribute is a valid IP.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateIp($attribute, $value)
- {
- return filter_var($value, FILTER_VALIDATE_IP) !== false;
- }
-
- /**
- * Validate that an attribute is a valid e-mail address.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateEmail($attribute, $value)
- {
- return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
- }
-
- /**
- * Validate that an attribute is a valid URL.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateUrl($attribute, $value)
- {
- return filter_var($value, FILTER_VALIDATE_URL) !== false;
- }
-
- /**
- * Validate that an attribute is an active URL.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateActiveUrl($attribute, $value)
- {
- $url = str_replace(array('http://', 'https://', 'ftp://'), '', strtolower($value));
-
- return checkdnsrr($url, 'A');
- }
-
- /**
- * Validate the MIME type of a file is an image MIME type.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateImage($attribute, $value)
- {
- return $this->validateMimes($attribute, $value, array('jpeg', 'png', 'gif', 'bmp', 'svg'));
- }
-
- /**
- * Validate the MIME type of a file upload attribute is in a set of MIME types.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateMimes($attribute, $value, $parameters)
- {
- if ( ! $this->isAValidFileInstance($value))
- {
- return false;
- }
-
- return $value->getPath() != '' && in_array($value->guessExtension(), $parameters);
- }
-
- /**
- * Check that the given value is a valid file instance.
- *
- * @param mixed $value
- * @return bool
- */
- protected function isAValidFileInstance($value)
- {
- if ($value instanceof UploadedFile && ! $value->isValid()) return false;
-
- return $value instanceof File;
- }
-
- /**
- * Validate that an attribute contains only alphabetic characters.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateAlpha($attribute, $value)
- {
- return preg_match('/^[\pL\pM]+$/u', $value);
- }
-
- /**
- * Validate that an attribute contains only alpha-numeric characters.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateAlphaNum($attribute, $value)
- {
- return preg_match('/^[\pL\pM\pN]+$/u', $value);
- }
-
- /**
- * Validate that an attribute contains only alpha-numeric characters, dashes, and underscores.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateAlphaDash($attribute, $value)
- {
- return preg_match('/^[\pL\pM\pN_-]+$/u', $value);
- }
-
- /**
- * Validate that an attribute passes a regular expression check.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateRegex($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'regex');
-
- return preg_match($parameters[0], $value);
- }
-
- /**
- * Validate that an attribute is a valid date.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateDate($attribute, $value)
- {
- if ($value instanceof DateTime) return true;
-
- if (strtotime($value) === false) return false;
-
- $date = date_parse($value);
-
- return checkdate($date['month'], $date['day'], $date['year']);
- }
-
- /**
- * Validate that an attribute matches a date format.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateDateFormat($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'date_format');
-
- $parsed = date_parse_from_format($parameters[0], $value);
-
- return $parsed['error_count'] === 0 && $parsed['warning_count'] === 0;
- }
-
- /**
- * Validate the date is before a given date.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateBefore($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'before');
-
- if ($format = $this->getDateFormat($attribute))
- {
- return $this->validateBeforeWithFormat($format, $value, $parameters);
- }
-
- if ( ! ($date = strtotime($parameters[0])))
- {
- return strtotime($value) < strtotime($this->getValue($parameters[0]));
- }
-
- return strtotime($value) < $date;
- }
-
- /**
- * Validate the date is before a given date with a given format.
- *
- * @param string $format
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateBeforeWithFormat($format, $value, $parameters)
- {
- $param = $this->getValue($parameters[0]) ?: $parameters[0];
-
- return $this->checkDateTimeOrder($format, $value, $param);
- }
-
- /**
- * Validate the date is after a given date.
- *
- * @param string $attribute
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateAfter($attribute, $value, $parameters)
- {
- $this->requireParameterCount(1, $parameters, 'after');
-
- if ($format = $this->getDateFormat($attribute))
- {
- return $this->validateAfterWithFormat($format, $value, $parameters);
- }
-
- if ( ! ($date = strtotime($parameters[0])))
- {
- return strtotime($value) > strtotime($this->getValue($parameters[0]));
- }
-
- return strtotime($value) > $date;
- }
-
- /**
- * Validate the date is after a given date with a given format.
- *
- * @param string $format
- * @param mixed $value
- * @param array $parameters
- * @return bool
- */
- protected function validateAfterWithFormat($format, $value, $parameters)
- {
- $param = $this->getValue($parameters[0]) ?: $parameters[0];
-
- return $this->checkDateTimeOrder($format, $param, $value);
- }
-
- /**
- * Given two date/time strings, check that one is after the other.
- *
- * @param string $format
- * @param string $before
- * @param string $after
- * @return bool
- */
- protected function checkDateTimeOrder($format, $before, $after)
- {
- $before = $this->getDateTimeWithOptionalFormat($format, $before);
-
- $after = $this->getDateTimeWithOptionalFormat($format, $after);
-
- return ($before && $after) && ($after > $before);
- }
-
- /**
- * Get a DateTime instance from a string.
- *
- * @param string $format
- * @param string $value
- * @return \DateTime|null
- */
- protected function getDateTimeWithOptionalFormat($format, $value)
- {
- $date = DateTime::createFromFormat($format, $value);
-
- if ($date) return $date;
-
- try
- {
- return new DateTime($value);
- }
- catch (Exception $e)
- {
- return;
- }
- }
-
- /**
- * Validate that an attribute is a valid timezone.
- *
- * @param string $attribute
- * @param mixed $value
- * @return bool
- */
- protected function validateTimezone($attribute, $value)
- {
- try
- {
- new DateTimeZone($value);
- }
- catch (Exception $e)
- {
- return false;
- }
-
- return true;
- }
-
- /**
- * Get the date format for an attribute if it has one.
- *
- * @param string $attribute
- * @return string|null
- */
- protected function getDateFormat($attribute)
- {
- if ($result = $this->getRule($attribute, 'DateFormat'))
- {
- return $result[1][0];
- }
- }
-
- /**
- * Get the validation message for an attribute and rule.
- *
- * @param string $attribute
- * @param string $rule
- * @return string
- */
- protected function getMessage($attribute, $rule)
- {
- $lowerRule = snake_case($rule);
-
- $inlineMessage = $this->getInlineMessage($attribute, $lowerRule);
-
- // First we will retrieve the custom message for the validation rule if one
- // exists. If a custom validation message is being used we'll return the
- // custom message, otherwise we'll keep searching for a valid message.
- if ( ! is_null($inlineMessage))
- {
- return $inlineMessage;
- }
-
- $customKey = "validation.custom.{$attribute}.{$lowerRule}";
-
- $customMessage = $this->translator->trans($customKey);
-
- // First we check for a custom defined validation message for the attribute
- // and rule. This allows the developer to specify specific messages for
- // only some attributes and rules that need to get specially formed.
- if ($customMessage !== $customKey)
- {
- return $customMessage;
- }
-
- // If the rule being validated is a "size" rule, we will need to gather the
- // specific error message for the type of attribute being validated such
- // as a number, file or string which all have different message types.
- elseif (in_array($rule, $this->sizeRules))
- {
- return $this->getSizeMessage($attribute, $rule);
- }
-
- // Finally, if no developer specified messages have been set, and no other
- // special messages apply for this rule, we will just pull the default
- // messages out of the translator service for this validation rule.
- $key = "validation.{$lowerRule}";
-
- if ($key != ($value = $this->translator->trans($key)))
- {
- return $value;
- }
-
- return $this->getInlineMessage(
- $attribute, $lowerRule, $this->fallbackMessages
- ) ?: $key;
- }
-
- /**
- * Get the inline message for a rule if it exists.
- *
- * @param string $attribute
- * @param string $lowerRule
- * @param array $source
- * @return string
- */
- protected function getInlineMessage($attribute, $lowerRule, $source = null)
- {
- $source = $source ?: $this->customMessages;
-
- $keys = array("{$attribute}.{$lowerRule}", $lowerRule);
-
- // First we will check for a custom message for an attribute specific rule
- // message for the fields, then we will check for a general custom line
- // that is not attribute specific. If we find either we'll return it.
- foreach ($keys as $key)
- {
- if (isset($source[$key])) return $source[$key];
- }
- }
-
- /**
- * Get the proper error message for an attribute and size rule.
- *
- * @param string $attribute
- * @param string $rule
- * @return string
- */
- protected function getSizeMessage($attribute, $rule)
- {
- $lowerRule = snake_case($rule);
-
- // There are three different types of size validations. The attribute may be
- // either a number, file, or string so we will check a few things to know
- // which type of value it is and return the correct line for that type.
- $type = $this->getAttributeType($attribute);
-
- $key = "validation.{$lowerRule}.{$type}";
-
- return $this->translator->trans($key);
- }
-
- /**
- * Get the data type of the given attribute.
- *
- * @param string $attribute
- * @return string
- */
- protected function getAttributeType($attribute)
- {
- // We assume that the attributes present in the file array are files so that
- // means that if the attribute does not have a numeric rule and the files
- // list doesn't have it we'll just consider it a string by elimination.
- if ($this->hasRule($attribute, $this->numericRules))
- {
- return 'numeric';
- }
- elseif ($this->hasRule($attribute, array('Array')))
- {
- return 'array';
- }
- elseif (array_key_exists($attribute, $this->files))
- {
- return 'file';
- }
-
- return 'string';
- }
-
- /**
- * Replace all error message place-holders with actual values.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function doReplacements($message, $attribute, $rule, $parameters)
- {
- $message = str_replace(':attribute', $this->getAttribute($attribute), $message);
-
- if (isset($this->replacers[snake_case($rule)]))
- {
- $message = $this->callReplacer($message, $attribute, snake_case($rule), $parameters);
- }
- elseif (method_exists($this, $replacer = "replace{$rule}"))
- {
- $message = $this->$replacer($message, $attribute, $rule, $parameters);
- }
-
- return $message;
- }
-
- /**
- * Transform an array of attributes to their displayable form.
- *
- * @param array $values
- * @return array
- */
- protected function getAttributeList(array $values)
- {
- $attributes = array();
-
- // For each attribute in the list we will simply get its displayable form as
- // this is convenient when replacing lists of parameters like some of the
- // replacement functions do when formatting out the validation message.
- foreach ($values as $key => $value)
- {
- $attributes[$key] = $this->getAttribute($value);
- }
-
- return $attributes;
- }
-
- /**
- * Get the displayable name of the attribute.
- *
- * @param string $attribute
- * @return string
- */
- protected function getAttribute($attribute)
- {
- // The developer may dynamically specify the array of custom attributes
- // on this Validator instance. If the attribute exists in this array
- // it takes precedence over all other ways we can pull attributes.
- if (isset($this->customAttributes[$attribute]))
- {
- return $this->customAttributes[$attribute];
- }
-
- $key = "validation.attributes.{$attribute}";
-
- // We allow for the developer to specify language lines for each of the
- // attributes allowing for more displayable counterparts of each of
- // the attributes. This provides the ability for simple formats.
- if (($line = $this->translator->trans($key)) !== $key)
- {
- return $line;
- }
-
- // If no language line has been specified for the attribute all of the
- // underscores are removed from the attribute name and that will be
- // used as default versions of the attribute's displayable names.
- return str_replace('_', ' ', snake_case($attribute));
- }
-
- /**
- * Get the displayable name of the value.
- *
- * @param string $attribute
- * @param mixed $value
- * @return string
- */
- public function getDisplayableValue($attribute, $value)
- {
- if (isset($this->customValues[$attribute][$value]))
- {
- return $this->customValues[$attribute][$value];
- }
-
- $key = "validation.values.{$attribute}.{$value}";
-
- if (($line = $this->translator->trans($key)) !== $key)
- {
- return $line;
- }
-
- return $value;
- }
-
- /**
- * Replace all place-holders for the between rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceBetween($message, $attribute, $rule, $parameters)
- {
- return str_replace(array(':min', ':max'), $parameters, $message);
- }
-
- /**
- * Replace all place-holders for the digits rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceDigits($message, $attribute, $rule, $parameters)
- {
- return str_replace(':digits', $parameters[0], $message);
- }
-
- /**
- * Replace all place-holders for the digits (between) rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceDigitsBetween($message, $attribute, $rule, $parameters)
- {
- return $this->replaceBetween($message, $attribute, $rule, $parameters);
- }
-
- /**
- * Replace all place-holders for the size rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceSize($message, $attribute, $rule, $parameters)
- {
- return str_replace(':size', $parameters[0], $message);
- }
-
- /**
- * Replace all place-holders for the min rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceMin($message, $attribute, $rule, $parameters)
- {
- return str_replace(':min', $parameters[0], $message);
- }
-
- /**
- * Replace all place-holders for the max rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceMax($message, $attribute, $rule, $parameters)
- {
- return str_replace(':max', $parameters[0], $message);
- }
-
- /**
- * Replace all place-holders for the in rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceIn($message, $attribute, $rule, $parameters)
- {
- foreach ($parameters as &$parameter)
- {
- $parameter = $this->getDisplayableValue($attribute, $parameter);
- }
-
- return str_replace(':values', implode(', ', $parameters), $message);
- }
-
- /**
- * Replace all place-holders for the not_in rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceNotIn($message, $attribute, $rule, $parameters)
- {
- return $this->replaceIn($message, $attribute, $rule, $parameters);
- }
-
- /**
- * Replace all place-holders for the mimes rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceMimes($message, $attribute, $rule, $parameters)
- {
- return str_replace(':values', implode(', ', $parameters), $message);
- }
-
- /**
- * Replace all place-holders for the required_with rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceRequiredWith($message, $attribute, $rule, $parameters)
- {
- $parameters = $this->getAttributeList($parameters);
-
- return str_replace(':values', implode(' / ', $parameters), $message);
- }
-
- /**
- * Replace all place-holders for the required_with_all rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceRequiredWithAll($message, $attribute, $rule, $parameters)
- {
- return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
- }
-
- /**
- * Replace all place-holders for the required_without rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceRequiredWithout($message, $attribute, $rule, $parameters)
- {
- return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
- }
-
- /**
- * Replace all place-holders for the required_without_all rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceRequiredWithoutAll($message, $attribute, $rule, $parameters)
- {
- return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
- }
-
- /**
- * Replace all place-holders for the required_if rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceRequiredIf($message, $attribute, $rule, $parameters)
- {
- $parameters[1] = $this->getDisplayableValue($parameters[0], array_get($this->data, $parameters[0]));
-
- $parameters[0] = $this->getAttribute($parameters[0]);
-
- return str_replace(array(':other', ':value'), $parameters, $message);
- }
-
- /**
- * Replace all place-holders for the same rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceSame($message, $attribute, $rule, $parameters)
- {
- return str_replace(':other', $this->getAttribute($parameters[0]), $message);
- }
-
- /**
- * Replace all place-holders for the different rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceDifferent($message, $attribute, $rule, $parameters)
- {
- return $this->replaceSame($message, $attribute, $rule, $parameters);
- }
-
- /**
- * Replace all place-holders for the date_format rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceDateFormat($message, $attribute, $rule, $parameters)
- {
- return str_replace(':format', $parameters[0], $message);
- }
-
- /**
- * Replace all place-holders for the before rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceBefore($message, $attribute, $rule, $parameters)
- {
- if ( ! (strtotime($parameters[0])))
- {
- return str_replace(':date', $this->getAttribute($parameters[0]), $message);
- }
-
- return str_replace(':date', $parameters[0], $message);
- }
-
- /**
- * Replace all place-holders for the after rule.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function replaceAfter($message, $attribute, $rule, $parameters)
- {
- return $this->replaceBefore($message, $attribute, $rule, $parameters);
- }
-
- /**
- * Determine if the given attribute has a rule in the given set.
- *
- * @param string $attribute
- * @param string|array $rules
- * @return bool
- */
- protected function hasRule($attribute, $rules)
- {
- return ! is_null($this->getRule($attribute, $rules));
- }
-
- /**
- * Get a rule and its parameters for a given attribute.
- *
- * @param string $attribute
- * @param string|array $rules
- * @return array|null
- */
- protected function getRule($attribute, $rules)
- {
- if ( ! array_key_exists($attribute, $this->rules))
- {
- return;
- }
-
- $rules = (array) $rules;
-
- foreach ($this->rules[$attribute] as $rule)
- {
- list($rule, $parameters) = $this->parseRule($rule);
-
- if (in_array($rule, $rules)) return [$rule, $parameters];
- }
- }
-
- /**
- * Extract the rule name and parameters from a rule.
- *
- * @param array|string $rules
- * @return array
- */
- protected function parseRule($rules)
- {
- if (is_array($rules))
- {
- return $this->parseArrayRule($rules);
- }
-
- return $this->parseStringRule($rules);
- }
-
- /**
- * Parse an array based rule.
- *
- * @param array $rules
- * @return array
- */
- protected function parseArrayRule(array $rules)
- {
- return array(studly_case(trim(array_get($rules, 0))), array_slice($rules, 1));
- }
-
- /**
- * Parse a string based rule.
- *
- * @param string $rules
- * @return array
- */
- protected function parseStringRule($rules)
- {
- $parameters = [];
-
- // The format for specifying validation rules and parameters follows an
- // easy {rule}:{parameters} formatting convention. For instance the
- // rule "Max:3" states that the value may only be three letters.
- if (strpos($rules, ':') !== false)
- {
- list($rules, $parameter) = explode(':', $rules, 2);
-
- $parameters = $this->parseParameters($rules, $parameter);
- }
-
- return array(studly_case(trim($rules)), $parameters);
- }
-
- /**
- * Parse a parameter list.
- *
- * @param string $rule
- * @param string $parameter
- * @return array
- */
- protected function parseParameters($rule, $parameter)
- {
- if (strtolower($rule) == 'regex') return array($parameter);
-
- return str_getcsv($parameter);
- }
-
- /**
- * Get the array of custom validator extensions.
- *
- * @return array
- */
- public function getExtensions()
- {
- return $this->extensions;
- }
-
- /**
- * Register an array of custom validator extensions.
- *
- * @param array $extensions
- * @return void
- */
- public function addExtensions(array $extensions)
- {
- if ($extensions)
- {
- $keys = array_map('snake_case', array_keys($extensions));
-
- $extensions = array_combine($keys, array_values($extensions));
- }
-
- $this->extensions = array_merge($this->extensions, $extensions);
- }
-
- /**
- * Register an array of custom implicit validator extensions.
- *
- * @param array $extensions
- * @return void
- */
- public function addImplicitExtensions(array $extensions)
- {
- $this->addExtensions($extensions);
-
- foreach ($extensions as $rule => $extension)
- {
- $this->implicitRules[] = studly_case($rule);
- }
- }
-
- /**
- * Register a custom validator extension.
- *
- * @param string $rule
- * @param \Closure|string $extension
- * @return void
- */
- public function addExtension($rule, $extension)
- {
- $this->extensions[snake_case($rule)] = $extension;
- }
-
- /**
- * Register a custom implicit validator extension.
- *
- * @param string $rule
- * @param \Closure|string $extension
- * @return void
- */
- public function addImplicitExtension($rule, $extension)
- {
- $this->addExtension($rule, $extension);
-
- $this->implicitRules[] = studly_case($rule);
- }
-
- /**
- * Get the array of custom validator message replacers.
- *
- * @return array
- */
- public function getReplacers()
- {
- return $this->replacers;
- }
-
- /**
- * Register an array of custom validator message replacers.
- *
- * @param array $replacers
- * @return void
- */
- public function addReplacers(array $replacers)
- {
- if ($replacers)
- {
- $keys = array_map('snake_case', array_keys($replacers));
-
- $replacers = array_combine($keys, array_values($replacers));
- }
-
- $this->replacers = array_merge($this->replacers, $replacers);
- }
-
- /**
- * Register a custom validator message replacer.
- *
- * @param string $rule
- * @param \Closure|string $replacer
- * @return void
- */
- public function addReplacer($rule, $replacer)
- {
- $this->replacers[snake_case($rule)] = $replacer;
- }
-
- /**
- * Get the data under validation.
- *
- * @return array
- */
- public function getData()
- {
- return $this->data;
- }
-
- /**
- * Set the data under validation.
- *
- * @param array $data
- * @return void
- */
- public function setData(array $data)
- {
- $this->data = $this->parseData($data);
- }
-
- /**
- * Get the validation rules.
- *
- * @return array
- */
- public function getRules()
- {
- return $this->rules;
- }
-
- /**
- * Set the validation rules.
- *
- * @param array $rules
- * @return $this
- */
- public function setRules(array $rules)
- {
- $this->rules = $this->explodeRules($rules);
-
- return $this;
- }
-
- /**
- * Set the custom attributes on the validator.
- *
- * @param array $attributes
- * @return $this
- */
- public function setAttributeNames(array $attributes)
- {
- $this->customAttributes = $attributes;
-
- return $this;
- }
-
- /**
- * Set the custom values on the validator.
- *
- * @param array $values
- * @return $this
- */
- public function setValueNames(array $values)
- {
- $this->customValues = $values;
-
- return $this;
- }
-
- /**
- * Get the files under validation.
- *
- * @return array
- */
- public function getFiles()
- {
- return $this->files;
- }
-
- /**
- * Set the files under validation.
- *
- * @param array $files
- * @return $this
- */
- public function setFiles(array $files)
- {
- $this->files = $files;
-
- return $this;
- }
-
- /**
- * Get the Presence Verifier implementation.
- *
- * @return \Illuminate\Validation\PresenceVerifierInterface
- *
- * @throws \RuntimeException
- */
- public function getPresenceVerifier()
- {
- if ( ! isset($this->presenceVerifier))
- {
- throw new RuntimeException("Presence verifier has not been set.");
- }
-
- return $this->presenceVerifier;
- }
-
- /**
- * Set the Presence Verifier implementation.
- *
- * @param \Illuminate\Validation\PresenceVerifierInterface $presenceVerifier
- * @return void
- */
- public function setPresenceVerifier(PresenceVerifierInterface $presenceVerifier)
- {
- $this->presenceVerifier = $presenceVerifier;
- }
-
- /**
- * Get the Translator implementation.
- *
- * @return \Symfony\Component\Translation\TranslatorInterface
- */
- public function getTranslator()
- {
- return $this->translator;
- }
-
- /**
- * Set the Translator implementation.
- *
- * @param \Symfony\Component\Translation\TranslatorInterface $translator
- * @return void
- */
- public function setTranslator(TranslatorInterface $translator)
- {
- $this->translator = $translator;
- }
-
- /**
- * Get the custom messages for the validator.
- *
- * @return array
- */
- public function getCustomMessages()
- {
- return $this->customMessages;
- }
-
- /**
- * Set the custom messages for the validator.
- *
- * @param array $messages
- * @return void
- */
- public function setCustomMessages(array $messages)
- {
- $this->customMessages = array_merge($this->customMessages, $messages);
- }
-
- /**
- * Get the custom attributes used by the validator.
- *
- * @return array
- */
- public function getCustomAttributes()
- {
- return $this->customAttributes;
- }
-
- /**
- * Add custom attributes to the validator.
- *
- * @param array $customAttributes
- * @return $this
- */
- public function addCustomAttributes(array $customAttributes)
- {
- $this->customAttributes = array_merge($this->customAttributes, $customAttributes);
-
- return $this;
- }
-
- /**
- * Get the custom values for the validator.
- *
- * @return array
- */
- public function getCustomValues()
- {
- return $this->customValues;
- }
-
- /**
- * Add the custom values for the validator.
- *
- * @param array $customValues
- * @return $this
- */
- public function addCustomValues(array $customValues)
- {
- $this->customValues = array_merge($this->customValues, $customValues);
-
- return $this;
- }
-
- /**
- * Get the fallback messages for the validator.
- *
- * @return array
- */
- public function getFallbackMessages()
- {
- return $this->fallbackMessages;
- }
-
- /**
- * Set the fallback messages for the validator.
- *
- * @param array $messages
- * @return void
- */
- public function setFallbackMessages(array $messages)
- {
- $this->fallbackMessages = $messages;
- }
-
- /**
- * Get the failed validation rules.
- *
- * @return array
- */
- public function failed()
- {
- return $this->failedRules;
- }
-
- /**
- * Get the message container for the validator.
- *
- * @return \Illuminate\Support\MessageBag
- */
- public function messages()
- {
- if ( ! $this->messages) $this->passes();
-
- return $this->messages;
- }
-
- /**
- * An alternative more semantic shortcut to the message container.
- *
- * @return \Illuminate\Support\MessageBag
- */
- public function errors()
- {
- return $this->messages();
- }
-
- /**
- * Get the messages for the instance.
- *
- * @return \Illuminate\Support\MessageBag
- */
- public function getMessageBag()
- {
- return $this->messages();
- }
-
- /**
- * Set the IoC container instance.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
- }
-
- /**
- * Call a custom validator extension.
- *
- * @param string $rule
- * @param array $parameters
- * @return bool
- */
- protected function callExtension($rule, $parameters)
- {
- $callback = $this->extensions[$rule];
-
- if ($callback instanceof Closure)
- {
- return call_user_func_array($callback, $parameters);
- }
- elseif (is_string($callback))
- {
- return $this->callClassBasedExtension($callback, $parameters);
- }
- }
-
- /**
- * Call a class based validator extension.
- *
- * @param string $callback
- * @param array $parameters
- * @return bool
- */
- protected function callClassBasedExtension($callback, $parameters)
- {
- list($class, $method) = explode('@', $callback);
-
- return call_user_func_array(array($this->container->make($class), $method), $parameters);
- }
-
- /**
- * Call a custom validator message replacer.
- *
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function callReplacer($message, $attribute, $rule, $parameters)
- {
- $callback = $this->replacers[$rule];
-
- if ($callback instanceof Closure)
- {
- return call_user_func_array($callback, func_get_args());
- }
- elseif (is_string($callback))
- {
- return $this->callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters);
- }
- }
-
- /**
- * Call a class based validator message replacer.
- *
- * @param string $callback
- * @param string $message
- * @param string $attribute
- * @param string $rule
- * @param array $parameters
- * @return string
- */
- protected function callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters)
- {
- list($class, $method) = explode('@', $callback);
-
- return call_user_func_array(array($this->container->make($class), $method), array_slice(func_get_args(), 1));
- }
-
- /**
- * Require a certain number of parameters to be present.
- *
- * @param int $count
- * @param array $parameters
- * @param string $rule
- * @return void
- * @throws \InvalidArgumentException
- */
- protected function requireParameterCount($count, $parameters, $rule)
- {
- if (count($parameters) < $count)
- {
- throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
- }
- }
-
- /**
- * Handle dynamic calls to class methods.
- *
- * @param string $method
- * @param array $parameters
- * @return mixed
- *
- * @throws \BadMethodCallException
- */
- public function __call($method, $parameters)
- {
- $rule = snake_case(substr($method, 8));
-
- if (isset($this->extensions[$rule]))
- {
- return $this->callExtension($rule, $parameters);
- }
-
- throw new BadMethodCallException("Method [$method] does not exist.");
- }
-
+ }
+
+ /**
+ * Determine if the field is present, or the rule implies required.
+ *
+ * @param string $rule
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function presentOrRuleIsImplicit($rule, $attribute, $value)
+ {
+ return $this->validateRequired($attribute, $value) || $this->isImplicit($rule);
+ }
+
+ /**
+ * Determine if the attribute passes any optional check.
+ *
+ * @param string $attribute
+ * @return bool
+ */
+ protected function passesOptionalCheck($attribute)
+ {
+ if ($this->hasRule($attribute, ['Sometimes'])) {
+ return array_key_exists($attribute, Arr::dot($this->data))
+ || in_array($attribute, array_keys($this->data))
+ || array_key_exists($attribute, $this->files);
+ }
+
+ return true;
+ }
+
+ /**
+ * Determine if a given rule implies the attribute is required.
+ *
+ * @param string $rule
+ * @return bool
+ */
+ protected function isImplicit($rule)
+ {
+ return in_array($rule, $this->implicitRules);
+ }
+
+ /**
+ * Determine if it's a necessary presence validation.
+ *
+ * This is to avoid possible database type comparison errors.
+ *
+ * @param string $rule
+ * @param string $attribute
+ * @return bool
+ */
+ protected function hasNotFailedPreviousRuleIfPresenceRule($rule, $attribute)
+ {
+ return in_array($rule, ['Unique', 'Exists'])
+ ? ! $this->messages->has($attribute) : true;
+ }
+
+ /**
+ * Add a failed rule and error message to the collection.
+ *
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return void
+ */
+ protected function addFailure($attribute, $rule, $parameters)
+ {
+ $this->addError($attribute, $rule, $parameters);
+
+ $this->failedRules[$attribute][$rule] = $parameters;
+ }
+
+ /**
+ * Add an error message to the validator's collection of messages.
+ *
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return void
+ */
+ protected function addError($attribute, $rule, $parameters)
+ {
+ $message = $this->getMessage($attribute, $rule);
+
+ $message = $this->doReplacements($message, $attribute, $rule, $parameters);
+
+ $this->messages->add($attribute, $message);
+ }
+
+ /**
+ * "Validate" optional attributes.
+ *
+ * Always returns true, just lets us put sometimes in rules.
+ *
+ * @return bool
+ */
+ protected function validateSometimes()
+ {
+ return true;
+ }
+
+ /**
+ * Validate that a required attribute exists.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateRequired($attribute, $value)
+ {
+ if (is_null($value)) {
+ return false;
+ } elseif (is_string($value) && trim($value) === '') {
+ return false;
+ } elseif ((is_array($value) || $value instanceof Countable) && count($value) < 1) {
+ return false;
+ } elseif ($value instanceof File) {
+ return (string) $value->getPath() != '';
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate the given attribute is filled if it is present.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateFilled($attribute, $value)
+ {
+ if (array_key_exists($attribute, $this->data) || array_key_exists($attribute, $this->files)) {
+ return $this->validateRequired($attribute, $value);
+ }
+
+ return true;
+ }
+
+ /**
+ * Determine if any of the given attributes fail the required test.
+ *
+ * @param array $attributes
+ * @return bool
+ */
+ protected function anyFailingRequired(array $attributes)
+ {
+ foreach ($attributes as $key) {
+ if (! $this->validateRequired($key, $this->getValue($key))) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Determine if all of the given attributes fail the required test.
+ *
+ * @param array $attributes
+ * @return bool
+ */
+ protected function allFailingRequired(array $attributes)
+ {
+ foreach ($attributes as $key) {
+ if ($this->validateRequired($key, $this->getValue($key))) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate that an attribute exists when any other attribute exists.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param mixed $parameters
+ * @return bool
+ */
+ protected function validateRequiredWith($attribute, $value, $parameters)
+ {
+ if (! $this->allFailingRequired($parameters)) {
+ return $this->validateRequired($attribute, $value);
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate that an attribute exists when all other attributes exists.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param mixed $parameters
+ * @return bool
+ */
+ protected function validateRequiredWithAll($attribute, $value, $parameters)
+ {
+ if (! $this->anyFailingRequired($parameters)) {
+ return $this->validateRequired($attribute, $value);
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate that an attribute exists when another attribute does not.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param mixed $parameters
+ * @return bool
+ */
+ protected function validateRequiredWithout($attribute, $value, $parameters)
+ {
+ if ($this->anyFailingRequired($parameters)) {
+ return $this->validateRequired($attribute, $value);
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate that an attribute exists when all other attributes do not.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param mixed $parameters
+ * @return bool
+ */
+ protected function validateRequiredWithoutAll($attribute, $value, $parameters)
+ {
+ if ($this->allFailingRequired($parameters)) {
+ return $this->validateRequired($attribute, $value);
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate that an attribute exists when another attribute has a given value.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param mixed $parameters
+ * @return bool
+ */
+ protected function validateRequiredIf($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(2, $parameters, 'required_if');
+
+ $data = Arr::get($this->data, $parameters[0]);
+
+ $values = array_slice($parameters, 1);
+
+ if (in_array($data, $values)) {
+ return $this->validateRequired($attribute, $value);
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate that an attribute exists when another attribute does not have a given value.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param mixed $parameters
+ * @return bool
+ */
+ protected function validateRequiredUnless($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(2, $parameters, 'required_unless');
+
+ $data = Arr::get($this->data, $parameters[0]);
+
+ $values = array_slice($parameters, 1);
+
+ if (! in_array($data, $values)) {
+ return $this->validateRequired($attribute, $value);
+ }
+
+ return true;
+ }
+
+ /**
+ * Get the number of attributes in a list that are present.
+ *
+ * @param array $attributes
+ * @return int
+ */
+ protected function getPresentCount($attributes)
+ {
+ $count = 0;
+
+ foreach ($attributes as $key) {
+ if (Arr::get($this->data, $key) || Arr::get($this->files, $key)) {
+ $count++;
+ }
+ }
+
+ return $count;
+ }
+
+ /**
+ * Validate that an attribute has a matching confirmation.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateConfirmed($attribute, $value)
+ {
+ return $this->validateSame($attribute, $value, [$attribute.'_confirmation']);
+ }
+
+ /**
+ * Validate that two attributes match.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateSame($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'same');
+
+ $other = Arr::get($this->data, $parameters[0]);
+
+ return isset($other) && $value === $other;
+ }
+
+ /**
+ * Validate that an attribute is different from another attribute.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateDifferent($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'different');
+
+ $other = Arr::get($this->data, $parameters[0]);
+
+ return isset($other) && $value !== $other;
+ }
+
+ /**
+ * Validate that an attribute was "accepted".
+ *
+ * This validation rule implies the attribute is "required".
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateAccepted($attribute, $value)
+ {
+ $acceptable = ['yes', 'on', '1', 1, true, 'true'];
+
+ return $this->validateRequired($attribute, $value) && in_array($value, $acceptable, true);
+ }
+
+ /**
+ * Validate that an attribute is an array.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateArray($attribute, $value)
+ {
+ return is_array($value);
+ }
+
+ /**
+ * Validate that an attribute is a boolean.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateBoolean($attribute, $value)
+ {
+ $acceptable = [true, false, 0, 1, '0', '1'];
+
+ return in_array($value, $acceptable, true);
+ }
+
+ /**
+ * Validate that an attribute is an integer.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateInteger($attribute, $value)
+ {
+ return filter_var($value, FILTER_VALIDATE_INT) !== false;
+ }
+
+ /**
+ * Validate that an attribute is numeric.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateNumeric($attribute, $value)
+ {
+ return is_numeric($value);
+ }
+
+ /**
+ * Validate that an attribute is a string.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateString($attribute, $value)
+ {
+ return is_string($value);
+ }
+
+ /**
+ * Validate the attribute is a valid JSON string.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateJson($attribute, $value)
+ {
+ json_decode($value);
+
+ return json_last_error() === JSON_ERROR_NONE;
+ }
+
+ /**
+ * Validate that an attribute has a given number of digits.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateDigits($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'digits');
+
+ return $this->validateNumeric($attribute, $value)
+ && strlen((string) $value) == $parameters[0];
+ }
+
+ /**
+ * Validate that an attribute is between a given number of digits.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateDigitsBetween($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(2, $parameters, 'digits_between');
+
+ $length = strlen((string) $value);
+
+ return $this->validateNumeric($attribute, $value)
+ && $length >= $parameters[0] && $length <= $parameters[1];
+ }
+
+ /**
+ * Validate the size of an attribute.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateSize($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'size');
+
+ return $this->getSize($attribute, $value) == $parameters[0];
+ }
+
+ /**
+ * Validate the size of an attribute is between a set of values.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateBetween($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(2, $parameters, 'between');
+
+ $size = $this->getSize($attribute, $value);
+
+ return $size >= $parameters[0] && $size <= $parameters[1];
+ }
+
+ /**
+ * Validate the size of an attribute is greater than a minimum value.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateMin($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'min');
+
+ return $this->getSize($attribute, $value) >= $parameters[0];
+ }
+
+ /**
+ * Validate the size of an attribute is less than a maximum value.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateMax($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'max');
+
+ if ($value instanceof UploadedFile && ! $value->isValid()) {
+ return false;
+ }
+
+ return $this->getSize($attribute, $value) <= $parameters[0];
+ }
+
+ /**
+ * Get the size of an attribute.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return mixed
+ */
+ protected function getSize($attribute, $value)
+ {
+ $hasNumeric = $this->hasRule($attribute, $this->numericRules);
+
+ // This method will determine if the attribute is a number, string, or file and
+ // return the proper size accordingly. If it is a number, then number itself
+ // is the size. If it is a file, we take kilobytes, and for a string the
+ // entire length of the string will be considered the attribute size.
+ if (is_numeric($value) && $hasNumeric) {
+ return $value;
+ } elseif (is_array($value)) {
+ return count($value);
+ } elseif ($value instanceof File) {
+ return $value->getSize() / 1024;
+ }
+
+ return mb_strlen($value);
+ }
+
+ /**
+ * Validate an attribute is contained within a list of values.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateIn($attribute, $value, $parameters)
+ {
+ if (is_array($value) && $this->hasRule($attribute, 'Array')) {
+ return count(array_diff($value, $parameters)) == 0;
+ }
+
+ return ! is_array($value) && in_array((string) $value, $parameters);
+ }
+
+ /**
+ * Validate an attribute is not contained within a list of values.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateNotIn($attribute, $value, $parameters)
+ {
+ return ! $this->validateIn($attribute, $value, $parameters);
+ }
+
+ /**
+ * Validate the uniqueness of an attribute value on a given database table.
+ *
+ * If a database column is not specified, the attribute will be used.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateUnique($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'unique');
+
+ list($connection, $table) = $this->parseTable($parameters[0]);
+
+ // The second parameter position holds the name of the column that needs to
+ // be verified as unique. If this parameter isn't specified we will just
+ // assume that this column to be verified shares the attribute's name.
+ $column = isset($parameters[1]) ? $parameters[1] : $attribute;
+
+ list($idColumn, $id) = [null, null];
+
+ if (isset($parameters[2])) {
+ list($idColumn, $id) = $this->getUniqueIds($parameters);
+
+ if (strtolower($id) == 'null') {
+ $id = null;
+ }
+ }
+
+ // The presence verifier is responsible for counting rows within this store
+ // mechanism which might be a relational database or any other permanent
+ // data store like Redis, etc. We will use it to determine uniqueness.
+ $verifier = $this->getPresenceVerifier();
+
+ if (! is_null($connection)) {
+ $verifier->setConnection($connection);
+ }
+
+ $extra = $this->getUniqueExtra($parameters);
+
+ return $verifier->getCount(
+ $table, $column, $value, $id, $idColumn, $extra
+
+ ) == 0;
+ }
+
+ /**
+ * Parse the connection / table for the unique / exists rules.
+ *
+ * @param string $table
+ * @return array
+ */
+ protected function parseTable($table)
+ {
+ return Str::contains($table, '.') ? explode('.', $table, 2) : [null, $table];
+ }
+
+ /**
+ * Get the excluded ID column and value for the unique rule.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function getUniqueIds($parameters)
+ {
+ $idColumn = isset($parameters[3]) ? $parameters[3] : 'id';
+
+ return [$idColumn, $parameters[2]];
+ }
+
+ /**
+ * Get the extra conditions for a unique rule.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function getUniqueExtra($parameters)
+ {
+ if (isset($parameters[4])) {
+ return $this->getExtraConditions(array_slice($parameters, 4));
+ }
+
+ return [];
+ }
+
+ /**
+ * Validate the existence of an attribute value in a database table.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateExists($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'exists');
+
+ list($connection, $table) = $this->parseTable($parameters[0]);
+
+ // The second parameter position holds the name of the column that should be
+ // verified as existing. If this parameter is not specified we will guess
+ // that the columns being "verified" shares the given attribute's name.
+ $column = isset($parameters[1]) ? $parameters[1] : $attribute;
+
+ $expected = (is_array($value)) ? count($value) : 1;
+
+ return $this->getExistCount($connection, $table, $column, $value, $parameters) >= $expected;
+ }
+
+ /**
+ * Get the number of records that exist in storage.
+ *
+ * @param mixed $connection
+ * @param string $table
+ * @param string $column
+ * @param mixed $value
+ * @param array $parameters
+ * @return int
+ */
+ protected function getExistCount($connection, $table, $column, $value, $parameters)
+ {
+ $verifier = $this->getPresenceVerifier();
+
+ if (! is_null($connection)) {
+ $verifier->setConnection($connection);
+ }
+
+ $extra = $this->getExtraExistConditions($parameters);
+
+ if (is_array($value)) {
+ return $verifier->getMultiCount($table, $column, $value, $extra);
+ }
+
+ return $verifier->getCount($table, $column, $value, null, null, $extra);
+ }
+
+ /**
+ * Get the extra exist conditions.
+ *
+ * @param array $parameters
+ * @return array
+ */
+ protected function getExtraExistConditions(array $parameters)
+ {
+ return $this->getExtraConditions(array_values(array_slice($parameters, 2)));
+ }
+
+ /**
+ * Get the extra conditions for a unique / exists rule.
+ *
+ * @param array $segments
+ * @return array
+ */
+ protected function getExtraConditions(array $segments)
+ {
+ $extra = [];
+
+ $count = count($segments);
+
+ for ($i = 0; $i < $count; $i = $i + 2) {
+ $extra[$segments[$i]] = $segments[$i + 1];
+ }
+
+ return $extra;
+ }
+
+ /**
+ * Validate that an attribute is a valid IP.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateIp($attribute, $value)
+ {
+ return filter_var($value, FILTER_VALIDATE_IP) !== false;
+ }
+
+ /**
+ * Validate that an attribute is a valid e-mail address.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateEmail($attribute, $value)
+ {
+ return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
+ }
+
+ /**
+ * Validate that an attribute is a valid URL.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateUrl($attribute, $value)
+ {
+ return filter_var($value, FILTER_VALIDATE_URL) !== false;
+ }
+
+ /**
+ * Validate that an attribute is an active URL.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateActiveUrl($attribute, $value)
+ {
+ if (! is_string($value)) {
+ return false;
+ }
+
+ if ($url = parse_url($value, PHP_URL_HOST)) {
+ return count(dns_get_record($url, DNS_A | DNS_AAAA)) > 0;
+ }
+
+ return false;
+ }
+
+ /**
+ * Validate the MIME type of a file is an image MIME type.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateImage($attribute, $value)
+ {
+ return $this->validateMimes($attribute, $value, ['jpeg', 'png', 'gif', 'bmp', 'svg']);
+ }
+
+ /**
+ * Validate the guessed extension of a file upload is in a set of file extensions.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateMimes($attribute, $value, $parameters)
+ {
+ if (! $this->isAValidFileInstance($value)) {
+ return false;
+ }
+
+ return $value->getPath() != '' && in_array($value->guessExtension(), $parameters);
+ }
+
+ /**
+ * Validate the MIME type of a file upload attribute is in a set of MIME types.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateMimetypes($attribute, $value, $parameters)
+ {
+ if (! $this->isAValidFileInstance($value)) {
+ return false;
+ }
+
+ return $value->getPath() != '' && in_array($value->getMimeType(), $parameters);
+ }
+
+ /**
+ * Check that the given value is a valid file instance.
+ *
+ * @param mixed $value
+ * @return bool
+ */
+ protected function isAValidFileInstance($value)
+ {
+ if ($value instanceof UploadedFile && ! $value->isValid()) {
+ return false;
+ }
+
+ return $value instanceof File;
+ }
+
+ /**
+ * Validate that an attribute contains only alphabetic characters.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateAlpha($attribute, $value)
+ {
+ return is_string($value) && preg_match('/^[\pL\pM]+$/u', $value);
+ }
+
+ /**
+ * Validate that an attribute contains only alpha-numeric characters.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateAlphaNum($attribute, $value)
+ {
+ if (! is_string($value) && ! is_numeric($value)) {
+ return false;
+ }
+
+ return preg_match('/^[\pL\pM\pN]+$/u', $value);
+ }
+
+ /**
+ * Validate that an attribute contains only alpha-numeric characters, dashes, and underscores.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateAlphaDash($attribute, $value)
+ {
+ if (! is_string($value) && ! is_numeric($value)) {
+ return false;
+ }
+
+ return preg_match('/^[\pL\pM\pN_-]+$/u', $value);
+ }
+
+ /**
+ * Validate that an attribute passes a regular expression check.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateRegex($attribute, $value, $parameters)
+ {
+ if (! is_string($value) && ! is_numeric($value)) {
+ return false;
+ }
+
+ $this->requireParameterCount(1, $parameters, 'regex');
+
+ return preg_match($parameters[0], $value);
+ }
+
+ /**
+ * Validate that an attribute is a valid date.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateDate($attribute, $value)
+ {
+ if ($value instanceof DateTime) {
+ return true;
+ }
+
+ if ((! is_string($value) && ! is_numeric($value)) || strtotime($value) === false) {
+ return false;
+ }
+
+ $date = date_parse($value);
+
+ return checkdate($date['month'], $date['day'], $date['year']);
+ }
+
+ /**
+ * Validate that an attribute matches a date format.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateDateFormat($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'date_format');
+
+ if (! is_string($value) && ! is_numeric($value)) {
+ return false;
+ }
+
+ $parsed = date_parse_from_format($parameters[0], $value);
+
+ return $parsed['error_count'] === 0 && $parsed['warning_count'] === 0;
+ }
+
+ /**
+ * Validate the date is before a given date.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateBefore($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'before');
+
+ if (! is_string($value) && ! is_numeric($value) && ! $value instanceof Carbon) {
+ return false;
+ }
+
+ if ($format = $this->getDateFormat($attribute)) {
+ return $this->validateBeforeWithFormat($format, $value, $parameters);
+ }
+
+ if (! ($date = strtotime($parameters[0]))) {
+ return strtotime($value) < strtotime($this->getValue($parameters[0]));
+ }
+
+ return strtotime($value) < $date;
+ }
+
+ /**
+ * Validate the date is before a given date with a given format.
+ *
+ * @param string $format
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateBeforeWithFormat($format, $value, $parameters)
+ {
+ $param = $this->getValue($parameters[0]) ?: $parameters[0];
+
+ return $this->checkDateTimeOrder($format, $value, $param);
+ }
+
+ /**
+ * Validate the date is after a given date.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateAfter($attribute, $value, $parameters)
+ {
+ $this->requireParameterCount(1, $parameters, 'after');
+
+ if (! is_string($value) && ! is_numeric($value) && ! $value instanceof Carbon) {
+ return false;
+ }
+
+ if ($format = $this->getDateFormat($attribute)) {
+ return $this->validateAfterWithFormat($format, $value, $parameters);
+ }
+
+ if (! ($date = strtotime($parameters[0]))) {
+ return strtotime($value) > strtotime($this->getValue($parameters[0]));
+ }
+
+ return strtotime($value) > $date;
+ }
+
+ /**
+ * Validate the date is after a given date with a given format.
+ *
+ * @param string $format
+ * @param mixed $value
+ * @param array $parameters
+ * @return bool
+ */
+ protected function validateAfterWithFormat($format, $value, $parameters)
+ {
+ $param = $this->getValue($parameters[0]) ?: $parameters[0];
+
+ return $this->checkDateTimeOrder($format, $param, $value);
+ }
+
+ /**
+ * Given two date/time strings, check that one is after the other.
+ *
+ * @param string $format
+ * @param string $before
+ * @param string $after
+ * @return bool
+ */
+ protected function checkDateTimeOrder($format, $before, $after)
+ {
+ $before = $this->getDateTimeWithOptionalFormat($format, $before);
+
+ $after = $this->getDateTimeWithOptionalFormat($format, $after);
+
+ return ($before && $after) && ($after > $before);
+ }
+
+ /**
+ * Get a DateTime instance from a string.
+ *
+ * @param string $format
+ * @param string $value
+ * @return \DateTime|null
+ */
+ protected function getDateTimeWithOptionalFormat($format, $value)
+ {
+ $date = DateTime::createFromFormat($format, $value);
+
+ if ($date) {
+ return $date;
+ }
+
+ try {
+ return new DateTime($value);
+ } catch (Exception $e) {
+ //
+ }
+ }
+
+ /**
+ * Validate that an attribute is a valid timezone.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ protected function validateTimezone($attribute, $value)
+ {
+ try {
+ new DateTimeZone($value);
+ } catch (Exception $e) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Get the date format for an attribute if it has one.
+ *
+ * @param string $attribute
+ * @return string|null
+ */
+ protected function getDateFormat($attribute)
+ {
+ if ($result = $this->getRule($attribute, 'DateFormat')) {
+ return $result[1][0];
+ }
+ }
+
+ /**
+ * Get the validation message for an attribute and rule.
+ *
+ * @param string $attribute
+ * @param string $rule
+ * @return string
+ */
+ protected function getMessage($attribute, $rule)
+ {
+ $lowerRule = Str::snake($rule);
+
+ $inlineMessage = $this->getInlineMessage($attribute, $lowerRule);
+
+ // First we will retrieve the custom message for the validation rule if one
+ // exists. If a custom validation message is being used we'll return the
+ // custom message, otherwise we'll keep searching for a valid message.
+ if (! is_null($inlineMessage)) {
+ return $inlineMessage;
+ }
+
+ $customKey = "validation.custom.{$attribute}.{$lowerRule}";
+
+ $customMessage = $this->translator->trans($customKey);
+
+ // First we check for a custom defined validation message for the attribute
+ // and rule. This allows the developer to specify specific messages for
+ // only some attributes and rules that need to get specially formed.
+ if ($customMessage !== $customKey) {
+ return $customMessage;
+ }
+
+ // If the rule being validated is a "size" rule, we will need to gather the
+ // specific error message for the type of attribute being validated such
+ // as a number, file or string which all have different message types.
+ elseif (in_array($rule, $this->sizeRules)) {
+ return $this->getSizeMessage($attribute, $rule);
+ }
+
+ // Finally, if no developer specified messages have been set, and no other
+ // special messages apply for this rule, we will just pull the default
+ // messages out of the translator service for this validation rule.
+ $key = "validation.{$lowerRule}";
+
+ if ($key != ($value = $this->translator->trans($key))) {
+ return $value;
+ }
+
+ return $this->getInlineMessage(
+ $attribute, $lowerRule, $this->fallbackMessages
+ ) ?: $key;
+ }
+
+ /**
+ * Get the inline message for a rule if it exists.
+ *
+ * @param string $attribute
+ * @param string $lowerRule
+ * @param array $source
+ * @return string|null
+ */
+ protected function getInlineMessage($attribute, $lowerRule, $source = null)
+ {
+ $source = $source ?: $this->customMessages;
+
+ $keys = ["{$attribute}.{$lowerRule}", $lowerRule];
+
+ // First we will check for a custom message for an attribute specific rule
+ // message for the fields, then we will check for a general custom line
+ // that is not attribute specific. If we find either we'll return it.
+ foreach ($keys as $key) {
+ if (isset($source[$key])) {
+ return $source[$key];
+ }
+ }
+ }
+
+ /**
+ * Get the proper error message for an attribute and size rule.
+ *
+ * @param string $attribute
+ * @param string $rule
+ * @return string
+ */
+ protected function getSizeMessage($attribute, $rule)
+ {
+ $lowerRule = Str::snake($rule);
+
+ // There are three different types of size validations. The attribute may be
+ // either a number, file, or string so we will check a few things to know
+ // which type of value it is and return the correct line for that type.
+ $type = $this->getAttributeType($attribute);
+
+ $key = "validation.{$lowerRule}.{$type}";
+
+ return $this->translator->trans($key);
+ }
+
+ /**
+ * Get the data type of the given attribute.
+ *
+ * @param string $attribute
+ * @return string
+ */
+ protected function getAttributeType($attribute)
+ {
+ // We assume that the attributes present in the file array are files so that
+ // means that if the attribute does not have a numeric rule and the files
+ // list doesn't have it we'll just consider it a string by elimination.
+ if ($this->hasRule($attribute, $this->numericRules)) {
+ return 'numeric';
+ } elseif ($this->hasRule($attribute, ['Array'])) {
+ return 'array';
+ } elseif (array_key_exists($attribute, $this->files)) {
+ return 'file';
+ }
+
+ return 'string';
+ }
+
+ /**
+ * Replace all error message place-holders with actual values.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function doReplacements($message, $attribute, $rule, $parameters)
+ {
+ $message = str_replace(':attribute', $this->getAttribute($attribute), $message);
+
+ if (isset($this->replacers[Str::snake($rule)])) {
+ $message = $this->callReplacer($message, $attribute, Str::snake($rule), $parameters);
+ } elseif (method_exists($this, $replacer = "replace{$rule}")) {
+ $message = $this->$replacer($message, $attribute, $rule, $parameters);
+ }
+
+ return $message;
+ }
+
+ /**
+ * Transform an array of attributes to their displayable form.
+ *
+ * @param array $values
+ * @return array
+ */
+ protected function getAttributeList(array $values)
+ {
+ $attributes = [];
+
+ // For each attribute in the list we will simply get its displayable form as
+ // this is convenient when replacing lists of parameters like some of the
+ // replacement functions do when formatting out the validation message.
+ foreach ($values as $key => $value) {
+ $attributes[$key] = $this->getAttribute($value);
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * Get the displayable name of the attribute.
+ *
+ * @param string $attribute
+ * @return string
+ */
+ protected function getAttribute($attribute)
+ {
+ // The developer may dynamically specify the array of custom attributes
+ // on this Validator instance. If the attribute exists in this array
+ // it takes precedence over all other ways we can pull attributes.
+ if (isset($this->customAttributes[$attribute])) {
+ return $this->customAttributes[$attribute];
+ }
+
+ $key = "validation.attributes.{$attribute}";
+
+ // We allow for the developer to specify language lines for each of the
+ // attributes allowing for more displayable counterparts of each of
+ // the attributes. This provides the ability for simple formats.
+ if (($line = $this->translator->trans($key)) !== $key) {
+ return $line;
+ }
+
+ // If no language line has been specified for the attribute all of the
+ // underscores are removed from the attribute name and that will be
+ // used as default versions of the attribute's displayable names.
+ return str_replace('_', ' ', Str::snake($attribute));
+ }
+
+ /**
+ * Get the displayable name of the value.
+ *
+ * @param string $attribute
+ * @param mixed $value
+ * @return string
+ */
+ public function getDisplayableValue($attribute, $value)
+ {
+ if (isset($this->customValues[$attribute][$value])) {
+ return $this->customValues[$attribute][$value];
+ }
+
+ $key = "validation.values.{$attribute}.{$value}";
+
+ if (($line = $this->translator->trans($key)) !== $key) {
+ return $line;
+ }
+
+ return $value;
+ }
+
+ /**
+ * Replace all place-holders for the between rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceBetween($message, $attribute, $rule, $parameters)
+ {
+ return str_replace([':min', ':max'], $parameters, $message);
+ }
+
+ /**
+ * Replace all place-holders for the digits rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceDigits($message, $attribute, $rule, $parameters)
+ {
+ return str_replace(':digits', $parameters[0], $message);
+ }
+
+ /**
+ * Replace all place-holders for the digits (between) rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceDigitsBetween($message, $attribute, $rule, $parameters)
+ {
+ return $this->replaceBetween($message, $attribute, $rule, $parameters);
+ }
+
+ /**
+ * Replace all place-holders for the size rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceSize($message, $attribute, $rule, $parameters)
+ {
+ return str_replace(':size', $parameters[0], $message);
+ }
+
+ /**
+ * Replace all place-holders for the min rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceMin($message, $attribute, $rule, $parameters)
+ {
+ return str_replace(':min', $parameters[0], $message);
+ }
+
+ /**
+ * Replace all place-holders for the max rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceMax($message, $attribute, $rule, $parameters)
+ {
+ return str_replace(':max', $parameters[0], $message);
+ }
+
+ /**
+ * Replace all place-holders for the in rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceIn($message, $attribute, $rule, $parameters)
+ {
+ foreach ($parameters as &$parameter) {
+ $parameter = $this->getDisplayableValue($attribute, $parameter);
+ }
+
+ return str_replace(':values', implode(', ', $parameters), $message);
+ }
+
+ /**
+ * Replace all place-holders for the not_in rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceNotIn($message, $attribute, $rule, $parameters)
+ {
+ return $this->replaceIn($message, $attribute, $rule, $parameters);
+ }
+
+ /**
+ * Replace all place-holders for the mimes rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceMimes($message, $attribute, $rule, $parameters)
+ {
+ return str_replace(':values', implode(', ', $parameters), $message);
+ }
+
+ /**
+ * Replace all place-holders for the required_with rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRequiredWith($message, $attribute, $rule, $parameters)
+ {
+ $parameters = $this->getAttributeList($parameters);
+
+ return str_replace(':values', implode(' / ', $parameters), $message);
+ }
+
+ /**
+ * Replace all place-holders for the required_with_all rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRequiredWithAll($message, $attribute, $rule, $parameters)
+ {
+ return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
+ }
+
+ /**
+ * Replace all place-holders for the required_without rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRequiredWithout($message, $attribute, $rule, $parameters)
+ {
+ return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
+ }
+
+ /**
+ * Replace all place-holders for the required_without_all rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRequiredWithoutAll($message, $attribute, $rule, $parameters)
+ {
+ return $this->replaceRequiredWith($message, $attribute, $rule, $parameters);
+ }
+
+ /**
+ * Replace all place-holders for the required_if rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRequiredIf($message, $attribute, $rule, $parameters)
+ {
+ $parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
+
+ $parameters[0] = $this->getAttribute($parameters[0]);
+
+ return str_replace([':other', ':value'], $parameters, $message);
+ }
+
+ /**
+ * Replace all place-holders for the required_unless rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceRequiredUnless($message, $attribute, $rule, $parameters)
+ {
+ $other = $this->getAttribute(array_shift($parameters));
+
+ return str_replace([':other', ':values'], [$other, implode(', ', $parameters)], $message);
+ }
+
+ /**
+ * Replace all place-holders for the same rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceSame($message, $attribute, $rule, $parameters)
+ {
+ return str_replace(':other', $this->getAttribute($parameters[0]), $message);
+ }
+
+ /**
+ * Replace all place-holders for the different rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceDifferent($message, $attribute, $rule, $parameters)
+ {
+ return $this->replaceSame($message, $attribute, $rule, $parameters);
+ }
+
+ /**
+ * Replace all place-holders for the date_format rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceDateFormat($message, $attribute, $rule, $parameters)
+ {
+ return str_replace(':format', $parameters[0], $message);
+ }
+
+ /**
+ * Replace all place-holders for the before rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceBefore($message, $attribute, $rule, $parameters)
+ {
+ if (! (strtotime($parameters[0]))) {
+ return str_replace(':date', $this->getAttribute($parameters[0]), $message);
+ }
+
+ return str_replace(':date', $parameters[0], $message);
+ }
+
+ /**
+ * Replace all place-holders for the after rule.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function replaceAfter($message, $attribute, $rule, $parameters)
+ {
+ return $this->replaceBefore($message, $attribute, $rule, $parameters);
+ }
+
+ /**
+ * Determine if the given attribute has a rule in the given set.
+ *
+ * @param string $attribute
+ * @param string|array $rules
+ * @return bool
+ */
+ protected function hasRule($attribute, $rules)
+ {
+ return ! is_null($this->getRule($attribute, $rules));
+ }
+
+ /**
+ * Get a rule and its parameters for a given attribute.
+ *
+ * @param string $attribute
+ * @param string|array $rules
+ * @return array|null
+ */
+ protected function getRule($attribute, $rules)
+ {
+ if (! array_key_exists($attribute, $this->rules)) {
+ return;
+ }
+
+ $rules = (array) $rules;
+
+ foreach ($this->rules[$attribute] as $rule) {
+ list($rule, $parameters) = $this->parseRule($rule);
+
+ if (in_array($rule, $rules)) {
+ return [$rule, $parameters];
+ }
+ }
+ }
+
+ /**
+ * Extract the rule name and parameters from a rule.
+ *
+ * @param array|string $rules
+ * @return array
+ */
+ protected function parseRule($rules)
+ {
+ if (is_array($rules)) {
+ $rules = $this->parseArrayRule($rules);
+ } else {
+ $rules = $this->parseStringRule($rules);
+ }
+
+ $rules[0] = $this->normalizeRule($rules[0]);
+
+ return $rules;
+ }
+
+ /**
+ * Parse an array based rule.
+ *
+ * @param array $rules
+ * @return array
+ */
+ protected function parseArrayRule(array $rules)
+ {
+ return [Str::studly(trim(Arr::get($rules, 0))), array_slice($rules, 1)];
+ }
+
+ /**
+ * Parse a string based rule.
+ *
+ * @param string $rules
+ * @return array
+ */
+ protected function parseStringRule($rules)
+ {
+ $parameters = [];
+
+ // The format for specifying validation rules and parameters follows an
+ // easy {rule}:{parameters} formatting convention. For instance the
+ // rule "Max:3" states that the value may only be three letters.
+ if (strpos($rules, ':') !== false) {
+ list($rules, $parameter) = explode(':', $rules, 2);
+
+ $parameters = $this->parseParameters($rules, $parameter);
+ }
+
+ return [Str::studly(trim($rules)), $parameters];
+ }
+
+ /**
+ * Parse a parameter list.
+ *
+ * @param string $rule
+ * @param string $parameter
+ * @return array
+ */
+ protected function parseParameters($rule, $parameter)
+ {
+ if (strtolower($rule) == 'regex') {
+ return [$parameter];
+ }
+
+ return str_getcsv($parameter);
+ }
+
+ /**
+ * Normalizes a rule so that we can accept short types.
+ *
+ * @param string $rule
+ * @return string
+ */
+ protected function normalizeRule($rule)
+ {
+ switch ($rule) {
+ case 'Int':
+ return 'Integer';
+ case 'Bool':
+ return 'Boolean';
+ default:
+ return $rule;
+ }
+ }
+
+ /**
+ * Get the array of custom validator extensions.
+ *
+ * @return array
+ */
+ public function getExtensions()
+ {
+ return $this->extensions;
+ }
+
+ /**
+ * Register an array of custom validator extensions.
+ *
+ * @param array $extensions
+ * @return void
+ */
+ public function addExtensions(array $extensions)
+ {
+ if ($extensions) {
+ $keys = array_map('\Illuminate\Support\Str::snake', array_keys($extensions));
+
+ $extensions = array_combine($keys, array_values($extensions));
+ }
+
+ $this->extensions = array_merge($this->extensions, $extensions);
+ }
+
+ /**
+ * Register an array of custom implicit validator extensions.
+ *
+ * @param array $extensions
+ * @return void
+ */
+ public function addImplicitExtensions(array $extensions)
+ {
+ $this->addExtensions($extensions);
+
+ foreach ($extensions as $rule => $extension) {
+ $this->implicitRules[] = Str::studly($rule);
+ }
+ }
+
+ /**
+ * Register a custom validator extension.
+ *
+ * @param string $rule
+ * @param \Closure|string $extension
+ * @return void
+ */
+ public function addExtension($rule, $extension)
+ {
+ $this->extensions[Str::snake($rule)] = $extension;
+ }
+
+ /**
+ * Register a custom implicit validator extension.
+ *
+ * @param string $rule
+ * @param \Closure|string $extension
+ * @return void
+ */
+ public function addImplicitExtension($rule, $extension)
+ {
+ $this->addExtension($rule, $extension);
+
+ $this->implicitRules[] = Str::studly($rule);
+ }
+
+ /**
+ * Get the array of custom validator message replacers.
+ *
+ * @return array
+ */
+ public function getReplacers()
+ {
+ return $this->replacers;
+ }
+
+ /**
+ * Register an array of custom validator message replacers.
+ *
+ * @param array $replacers
+ * @return void
+ */
+ public function addReplacers(array $replacers)
+ {
+ if ($replacers) {
+ $keys = array_map('\Illuminate\Support\Str::snake', array_keys($replacers));
+
+ $replacers = array_combine($keys, array_values($replacers));
+ }
+
+ $this->replacers = array_merge($this->replacers, $replacers);
+ }
+
+ /**
+ * Register a custom validator message replacer.
+ *
+ * @param string $rule
+ * @param \Closure|string $replacer
+ * @return void
+ */
+ public function addReplacer($rule, $replacer)
+ {
+ $this->replacers[Str::snake($rule)] = $replacer;
+ }
+
+ /**
+ * Get the data under validation.
+ *
+ * @return array
+ */
+ public function getData()
+ {
+ return $this->data;
+ }
+
+ /**
+ * Set the data under validation.
+ *
+ * @param array $data
+ * @return void
+ */
+ public function setData(array $data)
+ {
+ $this->data = $this->parseData($data);
+ }
+
+ /**
+ * Get the validation rules.
+ *
+ * @return array
+ */
+ public function getRules()
+ {
+ return $this->rules;
+ }
+
+ /**
+ * Set the validation rules.
+ *
+ * @param array $rules
+ * @return $this
+ */
+ public function setRules(array $rules)
+ {
+ $this->rules = $this->explodeRules($rules);
+
+ return $this;
+ }
+
+ /**
+ * Set the custom attributes on the validator.
+ *
+ * @param array $attributes
+ * @return $this
+ */
+ public function setAttributeNames(array $attributes)
+ {
+ $this->customAttributes = $attributes;
+
+ return $this;
+ }
+
+ /**
+ * Set the custom values on the validator.
+ *
+ * @param array $values
+ * @return $this
+ */
+ public function setValueNames(array $values)
+ {
+ $this->customValues = $values;
+
+ return $this;
+ }
+
+ /**
+ * Get the files under validation.
+ *
+ * @return array
+ */
+ public function getFiles()
+ {
+ return $this->files;
+ }
+
+ /**
+ * Set the files under validation.
+ *
+ * @param array $files
+ * @return $this
+ */
+ public function setFiles(array $files)
+ {
+ $this->files = $files;
+
+ return $this;
+ }
+
+ /**
+ * Get the Presence Verifier implementation.
+ *
+ * @return \Illuminate\Validation\PresenceVerifierInterface
+ *
+ * @throws \RuntimeException
+ */
+ public function getPresenceVerifier()
+ {
+ if (! isset($this->presenceVerifier)) {
+ throw new RuntimeException('Presence verifier has not been set.');
+ }
+
+ return $this->presenceVerifier;
+ }
+
+ /**
+ * Set the Presence Verifier implementation.
+ *
+ * @param \Illuminate\Validation\PresenceVerifierInterface $presenceVerifier
+ * @return void
+ */
+ public function setPresenceVerifier(PresenceVerifierInterface $presenceVerifier)
+ {
+ $this->presenceVerifier = $presenceVerifier;
+ }
+
+ /**
+ * Get the Translator implementation.
+ *
+ * @return \Symfony\Component\Translation\TranslatorInterface
+ */
+ public function getTranslator()
+ {
+ return $this->translator;
+ }
+
+ /**
+ * Set the Translator implementation.
+ *
+ * @param \Symfony\Component\Translation\TranslatorInterface $translator
+ * @return void
+ */
+ public function setTranslator(TranslatorInterface $translator)
+ {
+ $this->translator = $translator;
+ }
+
+ /**
+ * Get the custom messages for the validator.
+ *
+ * @return array
+ */
+ public function getCustomMessages()
+ {
+ return $this->customMessages;
+ }
+
+ /**
+ * Set the custom messages for the validator.
+ *
+ * @param array $messages
+ * @return void
+ */
+ public function setCustomMessages(array $messages)
+ {
+ $this->customMessages = array_merge($this->customMessages, $messages);
+ }
+
+ /**
+ * Get the custom attributes used by the validator.
+ *
+ * @return array
+ */
+ public function getCustomAttributes()
+ {
+ return $this->customAttributes;
+ }
+
+ /**
+ * Add custom attributes to the validator.
+ *
+ * @param array $customAttributes
+ * @return $this
+ */
+ public function addCustomAttributes(array $customAttributes)
+ {
+ $this->customAttributes = array_merge($this->customAttributes, $customAttributes);
+
+ return $this;
+ }
+
+ /**
+ * Get the custom values for the validator.
+ *
+ * @return array
+ */
+ public function getCustomValues()
+ {
+ return $this->customValues;
+ }
+
+ /**
+ * Add the custom values for the validator.
+ *
+ * @param array $customValues
+ * @return $this
+ */
+ public function addCustomValues(array $customValues)
+ {
+ $this->customValues = array_merge($this->customValues, $customValues);
+
+ return $this;
+ }
+
+ /**
+ * Get the fallback messages for the validator.
+ *
+ * @return array
+ */
+ public function getFallbackMessages()
+ {
+ return $this->fallbackMessages;
+ }
+
+ /**
+ * Set the fallback messages for the validator.
+ *
+ * @param array $messages
+ * @return void
+ */
+ public function setFallbackMessages(array $messages)
+ {
+ $this->fallbackMessages = $messages;
+ }
+
+ /**
+ * Get the failed validation rules.
+ *
+ * @return array
+ */
+ public function failed()
+ {
+ return $this->failedRules;
+ }
+
+ /**
+ * Get the message container for the validator.
+ *
+ * @return \Illuminate\Support\MessageBag
+ */
+ public function messages()
+ {
+ if (! $this->messages) {
+ $this->passes();
+ }
+
+ return $this->messages;
+ }
+
+ /**
+ * An alternative more semantic shortcut to the message container.
+ *
+ * @return \Illuminate\Support\MessageBag
+ */
+ public function errors()
+ {
+ return $this->messages();
+ }
+
+ /**
+ * Get the messages for the instance.
+ *
+ * @return \Illuminate\Support\MessageBag
+ */
+ public function getMessageBag()
+ {
+ return $this->messages();
+ }
+
+ /**
+ * Set the IoC container instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+ }
+
+ /**
+ * Call a custom validator extension.
+ *
+ * @param string $rule
+ * @param array $parameters
+ * @return bool|null
+ */
+ protected function callExtension($rule, $parameters)
+ {
+ $callback = $this->extensions[$rule];
+
+ if ($callback instanceof Closure) {
+ return call_user_func_array($callback, $parameters);
+ } elseif (is_string($callback)) {
+ return $this->callClassBasedExtension($callback, $parameters);
+ }
+ }
+
+ /**
+ * Call a class based validator extension.
+ *
+ * @param string $callback
+ * @param array $parameters
+ * @return bool
+ */
+ protected function callClassBasedExtension($callback, $parameters)
+ {
+ list($class, $method) = explode('@', $callback);
+
+ return call_user_func_array([$this->container->make($class), $method], $parameters);
+ }
+
+ /**
+ * Call a custom validator message replacer.
+ *
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string|null
+ */
+ protected function callReplacer($message, $attribute, $rule, $parameters)
+ {
+ $callback = $this->replacers[$rule];
+
+ if ($callback instanceof Closure) {
+ return call_user_func_array($callback, func_get_args());
+ } elseif (is_string($callback)) {
+ return $this->callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters);
+ }
+ }
+
+ /**
+ * Call a class based validator message replacer.
+ *
+ * @param string $callback
+ * @param string $message
+ * @param string $attribute
+ * @param string $rule
+ * @param array $parameters
+ * @return string
+ */
+ protected function callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters)
+ {
+ list($class, $method) = explode('@', $callback);
+
+ return call_user_func_array([$this->container->make($class), $method], array_slice(func_get_args(), 1));
+ }
+
+ /**
+ * Require a certain number of parameters to be present.
+ *
+ * @param int $count
+ * @param array $parameters
+ * @param string $rule
+ * @return void
+ * @throws \InvalidArgumentException
+ */
+ protected function requireParameterCount($count, $parameters, $rule)
+ {
+ if (count($parameters) < $count) {
+ throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
+ }
+ }
+
+ /**
+ * Handle dynamic calls to class methods.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ *
+ * @throws \BadMethodCallException
+ */
+ public function __call($method, $parameters)
+ {
+ $rule = Str::snake(substr($method, 8));
+
+ if (isset($this->extensions[$rule])) {
+ return $this->callExtension($rule, $parameters);
+ }
+
+ throw new BadMethodCallException("Method [$method] does not exist.");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Validation/composer.json b/application/vendor/laravel/framework/src/Illuminate/Validation/composer.json
index 2c25c0a..3733144 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Validation/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Validation/composer.json
@@ -14,12 +14,12 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/container": "5.0.*",
- "illuminate/contracts": "5.0.*",
- "illuminate/support": "5.0.*",
- "symfony/http-foundation": "2.6.*",
- "symfony/translation": "2.6.*"
+ "php": ">=5.5.9",
+ "illuminate/container": "5.1.*",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/http-foundation": "2.7.*",
+ "symfony/translation": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -28,11 +28,11 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"suggest": {
- "illuminate/database": "Required to use the database presence verifier (5.0.*)."
+ "illuminate/database": "Required to use the database presence verifier (5.1.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php b/application/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php
index a6d4940..c257a82 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -1,812 +1,889 @@
-setPath($path);
- }
-
- $contents = $this->compileString($this->files->get($this->getPath()));
-
- if ( ! is_null($this->cachePath))
- {
- $this->files->put($this->getCompiledPath($this->getPath()), $contents);
- }
- }
-
- /**
- * Get the path currently being compiled.
- *
- * @return string
- */
- public function getPath()
- {
- return $this->path;
- }
-
- /**
- * Set the path currently being compiled.
- *
- * @param string $path
- * @return void
- */
- public function setPath($path)
- {
- $this->path = $path;
- }
-
- /**
- * Compile the given Blade template contents.
- *
- * @param string $value
- * @return string
- */
- public function compileString($value)
- {
- $result = '';
-
- $this->footer = [];
-
- // Here we will loop through all of the tokens returned by the Zend lexer and
- // parse each one into the corresponding valid PHP. We will then have this
- // template as the correctly rendered PHP that can be rendered natively.
- foreach (token_get_all($value) as $token)
- {
- $result .= is_array($token) ? $this->parseToken($token) : $token;
- }
-
- // If there are any footer lines that need to get added to a template we will
- // add them here at the end of the template. This gets used mainly for the
- // template inheritance via the extends keyword that should be appended.
- if (count($this->footer) > 0)
- {
- $result = ltrim($result, PHP_EOL)
- .PHP_EOL.implode(PHP_EOL, array_reverse($this->footer));
- }
-
- return $result;
- }
-
- /**
- * Parse the tokens from the template.
- *
- * @param array $token
- * @return string
- */
- protected function parseToken($token)
- {
- list($id, $content) = $token;
-
- if ($id == T_INLINE_HTML)
- {
- foreach ($this->compilers as $type)
- {
- $content = $this->{"compile{$type}"}($content);
- }
- }
-
- return $content;
- }
-
- /**
- * Execute the user defined extensions.
- *
- * @param string $value
- * @return string
- */
- protected function compileExtensions($value)
- {
- foreach ($this->extensions as $compiler)
- {
- $value = call_user_func($compiler, $value, $this);
- }
-
- return $value;
- }
-
- /**
- * Compile Blade comments into valid PHP.
- *
- * @param string $value
- * @return string
- */
- protected function compileComments($value)
- {
- $pattern = sprintf('/%s--((.|\s)*?)--%s/', $this->contentTags[0], $this->contentTags[1]);
-
- return preg_replace($pattern, '', $value);
- }
-
- /**
- * Compile Blade echos into valid PHP.
- *
- * @param string $value
- * @return string
- */
- protected function compileEchos($value)
- {
- foreach ($this->getEchoMethods() as $method => $length)
- {
- $value = $this->$method($value);
- }
-
- return $value;
- }
-
- /**
- * Get the echo methods in the proper order for compilation.
- *
- * @return array
- */
- protected function getEchoMethods()
- {
- $methods = [
- "compileRawEchos" => strlen(stripcslashes($this->rawTags[0])),
- "compileEscapedEchos" => strlen(stripcslashes($this->escapedTags[0])),
- "compileRegularEchos" => strlen(stripcslashes($this->contentTags[0])),
- ];
-
- uksort($methods, function($method1, $method2) use ($methods)
- {
- // Ensure the longest tags are processed first
- if ($methods[$method1] > $methods[$method2]) return -1;
- if ($methods[$method1] < $methods[$method2]) return 1;
-
- // Otherwise give preference to raw tags (assuming they've overridden)
- if ($method1 === "compileRawEchos") return -1;
- if ($method2 === "compileRawEchos") return 1;
-
- if ($method1 === "compileEscapedEchos") return -1;
- if ($method2 === "compileEscapedEchos") return 1;
- });
-
- return $methods;
- }
-
- /**
- * Compile Blade statements that start with "@".
- *
- * @param string $value
- * @return mixed
- */
- protected function compileStatements($value)
- {
- $callback = function($match)
- {
- if (method_exists($this, $method = 'compile'.ucfirst($match[1])))
- {
- $match[0] = $this->$method(array_get($match, 3));
- }
-
- return isset($match[3]) ? $match[0] : $match[0].$match[2];
- };
-
- return preg_replace_callback('/\B@(\w+)([ \t]*)(\( ( (?>[^()]+) | (?3) )* \))?/x', $callback, $value);
- }
-
- /**
- * Compile the "raw" echo statements.
- *
- * @param string $value
- * @return string
- */
- protected function compileRawEchos($value)
- {
- $pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->rawTags[0], $this->rawTags[1]);
-
- $callback = function($matches)
- {
- $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
-
- return $matches[1] ? substr($matches[0], 1) : 'compileEchoDefaults($matches[2]).'; ?>'.$whitespace;
- };
-
- return preg_replace_callback($pattern, $callback, $value);
- }
-
- /**
- * Compile the "regular" echo statements.
- *
- * @param string $value
- * @return string
- */
- protected function compileRegularEchos($value)
- {
- $pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->contentTags[0], $this->contentTags[1]);
-
- $callback = function($matches)
- {
- $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
-
- $wrapped = sprintf($this->echoFormat, $this->compileEchoDefaults($matches[2]));
-
- return $matches[1] ? substr($matches[0], 1) : ''.$whitespace;
- };
-
- return preg_replace_callback($pattern, $callback, $value);
- }
-
- /**
- * Compile the escaped echo statements.
- *
- * @param string $value
- * @return string
- */
- protected function compileEscapedEchos($value)
- {
- $pattern = sprintf('/%s\s*(.+?)\s*%s(\r?\n)?/s', $this->escapedTags[0], $this->escapedTags[1]);
-
- $callback = function($matches)
- {
- $whitespace = empty($matches[2]) ? '' : $matches[2].$matches[2];
-
- return 'compileEchoDefaults($matches[1]).'); ?>'.$whitespace;
- };
-
- return preg_replace_callback($pattern, $callback, $value);
- }
-
- /**
- * Compile the default values for the echo statement.
- *
- * @param string $value
- * @return string
- */
- public function compileEchoDefaults($value)
- {
- return preg_replace('/^(?=\$)(.+?)(?:\s+or\s+)(.+?)$/s', 'isset($1) ? $1 : $2', $value);
- }
-
- /**
- * Compile the each statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEach($expression)
- {
- return "renderEach{$expression}; ?>";
- }
-
- /**
- * Compile the yield statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileYield($expression)
- {
- return "yieldContent{$expression}; ?>";
- }
-
- /**
- * Compile the show statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileShow($expression)
- {
- return "yieldSection(); ?>";
- }
-
- /**
- * Compile the section statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileSection($expression)
- {
- return "startSection{$expression}; ?>";
- }
-
- /**
- * Compile the append statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileAppend($expression)
- {
- return "appendSection(); ?>";
- }
-
- /**
- * Compile the end-section statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndsection($expression)
- {
- return "stopSection(); ?>";
- }
-
- /**
- * Compile the stop statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileStop($expression)
- {
- return "stopSection(); ?>";
- }
-
- /**
- * Compile the overwrite statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileOverwrite($expression)
- {
- return "stopSection(true); ?>";
- }
-
- /**
- * Compile the unless statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileUnless($expression)
- {
- return "";
- }
-
- /**
- * Compile the end unless statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndunless($expression)
- {
- return "";
- }
-
- /**
- * Compile the lang statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileLang($expression)
- {
- return "";
- }
-
- /**
- * Compile the choice statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileChoice($expression)
- {
- return "";
- }
-
- /**
- * Compile the else statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileElse($expression)
- {
- return "";
- }
-
- /**
- * Compile the for statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileFor($expression)
- {
- return "";
- }
-
- /**
- * Compile the foreach statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileForeach($expression)
- {
- return "";
- }
-
- /**
- * Compile the forelse statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileForelse($expression)
- {
- $empty = '$__empty_' . ++$this->forelseCounter;
-
- return "";
- }
-
- /**
- * Compile the if statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileIf($expression)
- {
- return "";
- }
-
- /**
- * Compile the else-if statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileElseif($expression)
- {
- return "";
- }
-
- /**
- * Compile the forelse statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEmpty($expression)
- {
- $empty = '$__empty_' . $this->forelseCounter--;
-
- return "";
- }
-
- /**
- * Compile the while statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileWhile($expression)
- {
- return "";
- }
-
- /**
- * Compile the end-while statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndwhile($expression)
- {
- return "";
- }
-
- /**
- * Compile the end-for statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndfor($expression)
- {
- return "";
- }
-
- /**
- * Compile the end-for-each statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndforeach($expression)
- {
- return "";
- }
-
- /**
- * Compile the end-if statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndif($expression)
- {
- return "";
- }
-
- /**
- * Compile the end-for-else statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndforelse($expression)
- {
- return "";
- }
-
- /**
- * Compile the extends statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileExtends($expression)
- {
- if (starts_with($expression, '('))
- {
- $expression = substr($expression, 1, -1);
- }
-
- $data = "make($expression, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
-
- $this->footer[] = $data;
-
- return '';
- }
-
- /**
- * Compile the include statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileInclude($expression)
- {
- if (starts_with($expression, '('))
- {
- $expression = substr($expression, 1, -1);
- }
-
- return "make($expression, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
- }
-
- /**
- * Compile the stack statements into the content.
- *
- * @param string $expression
- * @return string
- */
- protected function compileStack($expression)
- {
- return "yieldContent{$expression}; ?>";
- }
-
- /**
- * Compile the push statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compilePush($expression)
- {
- return "startSection{$expression}; ?>";
- }
-
- /**
- * Compile the endpush statements into valid PHP.
- *
- * @param string $expression
- * @return string
- */
- protected function compileEndpush($expression)
- {
- return "appendSection(); ?>";
- }
-
- /**
- * Register a custom Blade compiler.
- *
- * @param callable $compiler
- * @return void
- */
- public function extend(callable $compiler)
- {
- $this->extensions[] = $compiler;
- }
-
- /**
- * Get the regular expression for a generic Blade function.
- *
- * @param string $function
- * @return string
- */
- public function createMatcher($function)
- {
- return '/(?rawTags = array(preg_quote($openTag), preg_quote($closeTag));
- }
-
- /**
- * Sets the content tags used for the compiler.
- *
- * @param string $openTag
- * @param string $closeTag
- * @param bool $escaped
- * @return void
- */
- public function setContentTags($openTag, $closeTag, $escaped = false)
- {
- $property = ($escaped === true) ? 'escapedTags' : 'contentTags';
-
- $this->{$property} = array(preg_quote($openTag), preg_quote($closeTag));
- }
-
- /**
- * Sets the escaped content tags used for the compiler.
- *
- * @param string $openTag
- * @param string $closeTag
- * @return void
- */
- public function setEscapedContentTags($openTag, $closeTag)
- {
- $this->setContentTags($openTag, $closeTag, true);
- }
-
- /**
- * Gets the content tags used for the compiler.
- *
- * @return string
- */
- public function getContentTags()
- {
- return $this->getTags();
- }
-
- /**
- * Gets the escaped content tags used for the compiler.
- *
- * @return string
- */
- public function getEscapedContentTags()
- {
- return $this->getTags(true);
- }
-
- /**
- * Gets the tags used for the compiler.
- *
- * @param bool $escaped
- * @return array
- */
- protected function getTags($escaped = false)
- {
- $tags = $escaped ? $this->escapedTags : $this->contentTags;
-
- return array_map('stripcslashes', $tags);
- }
-
- /**
- * Set the echo format to be used by the compiler.
- *
- * @param string $format
- * @return void
- */
- public function setEchoFormat($format)
- {
- $this->echoFormat = $format;
- }
-
+setPath($path);
+ }
+
+ $contents = $this->compileString($this->files->get($this->getPath()));
+
+ if (! is_null($this->cachePath)) {
+ $this->files->put($this->getCompiledPath($this->getPath()), $contents);
+ }
+ }
+
+ /**
+ * Get the path currently being compiled.
+ *
+ * @return string
+ */
+ public function getPath()
+ {
+ return $this->path;
+ }
+
+ /**
+ * Set the path currently being compiled.
+ *
+ * @param string $path
+ * @return void
+ */
+ public function setPath($path)
+ {
+ $this->path = $path;
+ }
+
+ /**
+ * Compile the given Blade template contents.
+ *
+ * @param string $value
+ * @return string
+ */
+ public function compileString($value)
+ {
+ $result = '';
+
+ $this->footer = [];
+
+ // Here we will loop through all of the tokens returned by the Zend lexer and
+ // parse each one into the corresponding valid PHP. We will then have this
+ // template as the correctly rendered PHP that can be rendered natively.
+ foreach (token_get_all($value) as $token) {
+ $result .= is_array($token) ? $this->parseToken($token) : $token;
+ }
+
+ // If there are any footer lines that need to get added to a template we will
+ // add them here at the end of the template. This gets used mainly for the
+ // template inheritance via the extends keyword that should be appended.
+ if (count($this->footer) > 0) {
+ $result = ltrim($result, PHP_EOL)
+ .PHP_EOL.implode(PHP_EOL, array_reverse($this->footer));
+ }
+
+ return $result;
+ }
+
+ /**
+ * Parse the tokens from the template.
+ *
+ * @param array $token
+ * @return string
+ */
+ protected function parseToken($token)
+ {
+ list($id, $content) = $token;
+
+ if ($id == T_INLINE_HTML) {
+ foreach ($this->compilers as $type) {
+ $content = $this->{"compile{$type}"}($content);
+ }
+ }
+
+ return $content;
+ }
+
+ /**
+ * Execute the user defined extensions.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function compileExtensions($value)
+ {
+ foreach ($this->extensions as $compiler) {
+ $value = call_user_func($compiler, $value, $this);
+ }
+
+ return $value;
+ }
+
+ /**
+ * Compile Blade comments into valid PHP.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function compileComments($value)
+ {
+ $pattern = sprintf('/%s--(.*?)--%s/s', $this->contentTags[0], $this->contentTags[1]);
+
+ return preg_replace($pattern, '', $value);
+ }
+
+ /**
+ * Compile Blade echos into valid PHP.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function compileEchos($value)
+ {
+ foreach ($this->getEchoMethods() as $method => $length) {
+ $value = $this->$method($value);
+ }
+
+ return $value;
+ }
+
+ /**
+ * Get the echo methods in the proper order for compilation.
+ *
+ * @return array
+ */
+ protected function getEchoMethods()
+ {
+ $methods = [
+ 'compileRawEchos' => strlen(stripcslashes($this->rawTags[0])),
+ 'compileEscapedEchos' => strlen(stripcslashes($this->escapedTags[0])),
+ 'compileRegularEchos' => strlen(stripcslashes($this->contentTags[0])),
+ ];
+
+ uksort($methods, function ($method1, $method2) use ($methods) {
+ // Ensure the longest tags are processed first
+ if ($methods[$method1] > $methods[$method2]) {
+ return -1;
+ }
+ if ($methods[$method1] < $methods[$method2]) {
+ return 1;
+ }
+
+ // Otherwise give preference to raw tags (assuming they've overridden)
+ if ($method1 === 'compileRawEchos') {
+ return -1;
+ }
+ if ($method2 === 'compileRawEchos') {
+ return 1;
+ }
+
+ if ($method1 === 'compileEscapedEchos') {
+ return -1;
+ }
+ if ($method2 === 'compileEscapedEchos') {
+ return 1;
+ }
+ });
+
+ return $methods;
+ }
+
+ /**
+ * Compile Blade statements that start with "@".
+ *
+ * @param string $value
+ * @return mixed
+ */
+ protected function compileStatements($value)
+ {
+ $callback = function ($match) {
+ if (method_exists($this, $method = 'compile'.ucfirst($match[1]))) {
+ $match[0] = $this->$method(Arr::get($match, 3));
+ } elseif (isset($this->customDirectives[$match[1]])) {
+ $match[0] = call_user_func($this->customDirectives[$match[1]], Arr::get($match, 3));
+ }
+
+ return isset($match[3]) ? $match[0] : $match[0].$match[2];
+ };
+
+ return preg_replace_callback('/\B@(\w+)([ \t]*)(\( ( (?>[^()]+) | (?3) )* \))?/x', $callback, $value);
+ }
+
+ /**
+ * Compile the "raw" echo statements.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function compileRawEchos($value)
+ {
+ $pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->rawTags[0], $this->rawTags[1]);
+
+ $callback = function ($matches) {
+ $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
+
+ return $matches[1] ? substr($matches[0], 1) : 'compileEchoDefaults($matches[2]).'; ?>'.$whitespace;
+ };
+
+ return preg_replace_callback($pattern, $callback, $value);
+ }
+
+ /**
+ * Compile the "regular" echo statements.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function compileRegularEchos($value)
+ {
+ $pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->contentTags[0], $this->contentTags[1]);
+
+ $callback = function ($matches) {
+ $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
+
+ $wrapped = sprintf($this->echoFormat, $this->compileEchoDefaults($matches[2]));
+
+ return $matches[1] ? substr($matches[0], 1) : ''.$whitespace;
+ };
+
+ return preg_replace_callback($pattern, $callback, $value);
+ }
+
+ /**
+ * Compile the escaped echo statements.
+ *
+ * @param string $value
+ * @return string
+ */
+ protected function compileEscapedEchos($value)
+ {
+ $pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->escapedTags[0], $this->escapedTags[1]);
+
+ $callback = function ($matches) {
+ $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
+
+ return $matches[1] ? $matches[0] : 'compileEchoDefaults($matches[2]).'); ?>'.$whitespace;
+ };
+
+ return preg_replace_callback($pattern, $callback, $value);
+ }
+
+ /**
+ * Compile the default values for the echo statement.
+ *
+ * @param string $value
+ * @return string
+ */
+ public function compileEchoDefaults($value)
+ {
+ return preg_replace('/^(?=\$)(.+?)(?:\s+or\s+)(.+?)$/s', 'isset($1) ? $1 : $2', $value);
+ }
+
+ /**
+ * Compile the each statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEach($expression)
+ {
+ return "renderEach{$expression}; ?>";
+ }
+
+ /**
+ * Compile the inject statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileInject($expression)
+ {
+ $segments = explode(',', preg_replace("/[\(\)\\\"\']/", '', $expression));
+
+ return '";
+ }
+
+ /**
+ * Compile the yield statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileYield($expression)
+ {
+ return "yieldContent{$expression}; ?>";
+ }
+
+ /**
+ * Compile the show statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileShow($expression)
+ {
+ return 'yieldSection(); ?>';
+ }
+
+ /**
+ * Compile the section statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileSection($expression)
+ {
+ return "startSection{$expression}; ?>";
+ }
+
+ /**
+ * Compile the append statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileAppend($expression)
+ {
+ return 'appendSection(); ?>';
+ }
+
+ /**
+ * Compile the end-section statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndsection($expression)
+ {
+ return 'stopSection(); ?>';
+ }
+
+ /**
+ * Compile the stop statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileStop($expression)
+ {
+ return 'stopSection(); ?>';
+ }
+
+ /**
+ * Compile the overwrite statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileOverwrite($expression)
+ {
+ return 'stopSection(true); ?>';
+ }
+
+ /**
+ * Compile the unless statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileUnless($expression)
+ {
+ return "";
+ }
+
+ /**
+ * Compile the end unless statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndunless($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the lang statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileLang($expression)
+ {
+ return "get$expression; ?>";
+ }
+
+ /**
+ * Compile the choice statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileChoice($expression)
+ {
+ return "choice$expression; ?>";
+ }
+
+ /**
+ * Compile the else statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileElse($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the for statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileFor($expression)
+ {
+ return "";
+ }
+
+ /**
+ * Compile the foreach statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileForeach($expression)
+ {
+ return "";
+ }
+
+ /**
+ * Compile the forelse statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileForelse($expression)
+ {
+ $empty = '$__empty_'.++$this->forelseCounter;
+
+ return "";
+ }
+
+ /**
+ * Compile the can statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileCan($expression)
+ {
+ return "check{$expression}): ?>";
+ }
+
+ /**
+ * Compile the cannot statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileCannot($expression)
+ {
+ return "denies{$expression}): ?>";
+ }
+
+ /**
+ * Compile the if statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileIf($expression)
+ {
+ return "";
+ }
+
+ /**
+ * Compile the else-if statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileElseif($expression)
+ {
+ return "";
+ }
+
+ /**
+ * Compile the forelse statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEmpty($expression)
+ {
+ $empty = '$__empty_'.$this->forelseCounter--;
+
+ return "";
+ }
+
+ /**
+ * Compile the while statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileWhile($expression)
+ {
+ return "";
+ }
+
+ /**
+ * Compile the end-while statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndwhile($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the end-for statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndfor($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the end-for-each statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndforeach($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the end-can statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndcan($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the end-cannot statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndcannot($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the end-if statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndif($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the end-for-else statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndforelse($expression)
+ {
+ return '';
+ }
+
+ /**
+ * Compile the extends statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileExtends($expression)
+ {
+ if (Str::startsWith($expression, '(')) {
+ $expression = substr($expression, 1, -1);
+ }
+
+ $data = "make($expression, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+
+ $this->footer[] = $data;
+
+ return '';
+ }
+
+ /**
+ * Compile the include statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileInclude($expression)
+ {
+ if (Str::startsWith($expression, '(')) {
+ $expression = substr($expression, 1, -1);
+ }
+
+ return "make($expression, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+ }
+
+ /**
+ * Compile the stack statements into the content.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileStack($expression)
+ {
+ return "yieldContent{$expression}; ?>";
+ }
+
+ /**
+ * Compile the push statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compilePush($expression)
+ {
+ return "startSection{$expression}; ?>";
+ }
+
+ /**
+ * Compile the endpush statements into valid PHP.
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected function compileEndpush($expression)
+ {
+ return 'appendSection(); ?>';
+ }
+
+ /**
+ * Get the extensions used by the compiler.
+ *
+ * @return array
+ */
+ public function getExtensions()
+ {
+ return $this->extensions;
+ }
+
+ /**
+ * Register a custom Blade compiler.
+ *
+ * @param callable $compiler
+ * @return void
+ */
+ public function extend(callable $compiler)
+ {
+ $this->extensions[] = $compiler;
+ }
+
+ /**
+ * Register a handler for custom directives.
+ *
+ * @param string $name
+ * @param callable $handler
+ * @return void
+ */
+ public function directive($name, callable $handler)
+ {
+ $this->customDirectives[$name] = $handler;
+ }
+
+ /**
+ * Get the list of custom directives.
+ *
+ * @return array
+ */
+ public function getCustomDirectives()
+ {
+ return $this->customDirectives;
+ }
+
+ /**
+ * Gets the raw tags used by the compiler.
+ *
+ * @return array
+ */
+ public function getRawTags()
+ {
+ return $this->rawTags;
+ }
+
+ /**
+ * Sets the raw tags used for the compiler.
+ *
+ * @param string $openTag
+ * @param string $closeTag
+ * @return void
+ */
+ public function setRawTags($openTag, $closeTag)
+ {
+ $this->rawTags = [preg_quote($openTag), preg_quote($closeTag)];
+ }
+
+ /**
+ * Sets the content tags used for the compiler.
+ *
+ * @param string $openTag
+ * @param string $closeTag
+ * @param bool $escaped
+ * @return void
+ */
+ public function setContentTags($openTag, $closeTag, $escaped = false)
+ {
+ $property = ($escaped === true) ? 'escapedTags' : 'contentTags';
+
+ $this->{$property} = [preg_quote($openTag), preg_quote($closeTag)];
+ }
+
+ /**
+ * Sets the escaped content tags used for the compiler.
+ *
+ * @param string $openTag
+ * @param string $closeTag
+ * @return void
+ */
+ public function setEscapedContentTags($openTag, $closeTag)
+ {
+ $this->setContentTags($openTag, $closeTag, true);
+ }
+
+ /**
+ * Gets the content tags used for the compiler.
+ *
+ * @return string
+ */
+ public function getContentTags()
+ {
+ return $this->getTags();
+ }
+
+ /**
+ * Gets the escaped content tags used for the compiler.
+ *
+ * @return string
+ */
+ public function getEscapedContentTags()
+ {
+ return $this->getTags(true);
+ }
+
+ /**
+ * Gets the tags used for the compiler.
+ *
+ * @param bool $escaped
+ * @return array
+ */
+ protected function getTags($escaped = false)
+ {
+ $tags = $escaped ? $this->escapedTags : $this->contentTags;
+
+ return array_map('stripcslashes', $tags);
+ }
+
+ /**
+ * Set the echo format to be used by the compiler.
+ *
+ * @param string $format
+ * @return void
+ */
+ public function setEchoFormat($format)
+ {
+ $this->echoFormat = $format;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php b/application/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php
index 81034aa..73ded29 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php
@@ -1,68 +1,75 @@
-files = $files;
- $this->cachePath = $cachePath;
- }
+ /**
+ * Create a new compiler instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param string $cachePath
+ * @return void
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function __construct(Filesystem $files, $cachePath)
+ {
+ if (! $cachePath) {
+ throw new InvalidArgumentException('Please provide a valid cache path.');
+ }
- /**
- * Get the path to the compiled version of a view.
- *
- * @param string $path
- * @return string
- */
- public function getCompiledPath($path)
- {
- return $this->cachePath.'/'.md5($path);
- }
+ $this->files = $files;
+ $this->cachePath = $cachePath;
+ }
- /**
- * Determine if the view at the given path is expired.
- *
- * @param string $path
- * @return bool
- */
- public function isExpired($path)
- {
- $compiled = $this->getCompiledPath($path);
+ /**
+ * Get the path to the compiled version of a view.
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getCompiledPath($path)
+ {
+ return $this->cachePath.'/'.md5($path);
+ }
- // If the compiled file doesn't exist we will indicate that the view is expired
- // so that it can be re-compiled. Else, we will verify the last modification
- // of the views is less than the modification times of the compiled views.
- if ( ! $this->cachePath || ! $this->files->exists($compiled))
- {
- return true;
- }
+ /**
+ * Determine if the view at the given path is expired.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isExpired($path)
+ {
+ $compiled = $this->getCompiledPath($path);
- $lastModified = $this->files->lastModified($path);
+ // If the compiled file doesn't exist we will indicate that the view is expired
+ // so that it can be re-compiled. Else, we will verify the last modification
+ // of the views is less than the modification times of the compiled views.
+ if (! $this->files->exists($compiled)) {
+ return true;
+ }
- return $lastModified >= $this->files->lastModified($compiled);
- }
+ $lastModified = $this->files->lastModified($path);
+ return $lastModified >= $this->files->lastModified($compiled);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php b/application/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php
index 85034b0..dfcb023 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php
@@ -1,29 +1,30 @@
-compiler = $compiler;
- }
-
- /**
- * Get the evaluated contents of the view.
- *
- * @param string $path
- * @param array $data
- * @return string
- */
- public function get($path, array $data = array())
- {
- $this->lastCompiled[] = $path;
-
- // If this given view has expired, which means it has simply been edited since
- // it was last compiled, we will re-compile the views so we can evaluate a
- // fresh copy of the view. We'll pass the compiler the path of the view.
- if ($this->compiler->isExpired($path))
- {
- $this->compiler->compile($path);
- }
-
- $compiled = $this->compiler->getCompiledPath($path);
-
- // Once we have the path to the compiled file, we will evaluate the paths with
- // typical PHP just like any other templates. We also keep a stack of views
- // which have been rendered for right exception messages to be generated.
- $results = $this->evaluatePath($compiled, $data);
-
- array_pop($this->lastCompiled);
-
- return $results;
- }
-
- /**
- * Handle a view exception.
- *
- * @param \Exception $e
- * @param int $obLevel
- * @return void
- *
- * @throws $e
- */
- protected function handleViewException($e, $obLevel)
- {
- $e = new ErrorException($this->getMessage($e), 0, 1, $e->getFile(), $e->getLine(), $e);
-
- parent::handleViewException($e, $obLevel);
- }
-
- /**
- * Get the exception message for an exception.
- *
- * @param \Exception $e
- * @return string
- */
- protected function getMessage($e)
- {
- return $e->getMessage().' (View: '.realpath(last($this->lastCompiled)).')';
- }
-
- /**
- * Get the compiler implementation.
- *
- * @return \Illuminate\View\Compilers\CompilerInterface
- */
- public function getCompiler()
- {
- return $this->compiler;
- }
-
+class CompilerEngine extends PhpEngine
+{
+ /**
+ * The Blade compiler instance.
+ *
+ * @var \Illuminate\View\Compilers\CompilerInterface
+ */
+ protected $compiler;
+
+ /**
+ * A stack of the last compiled templates.
+ *
+ * @var array
+ */
+ protected $lastCompiled = [];
+
+ /**
+ * Create a new Blade view engine instance.
+ *
+ * @param \Illuminate\View\Compilers\CompilerInterface $compiler
+ * @return void
+ */
+ public function __construct(CompilerInterface $compiler)
+ {
+ $this->compiler = $compiler;
+ }
+
+ /**
+ * Get the evaluated contents of the view.
+ *
+ * @param string $path
+ * @param array $data
+ * @return string
+ */
+ public function get($path, array $data = [])
+ {
+ $this->lastCompiled[] = $path;
+
+ // If this given view has expired, which means it has simply been edited since
+ // it was last compiled, we will re-compile the views so we can evaluate a
+ // fresh copy of the view. We'll pass the compiler the path of the view.
+ if ($this->compiler->isExpired($path)) {
+ $this->compiler->compile($path);
+ }
+
+ $compiled = $this->compiler->getCompiledPath($path);
+
+ // Once we have the path to the compiled file, we will evaluate the paths with
+ // typical PHP just like any other templates. We also keep a stack of views
+ // which have been rendered for right exception messages to be generated.
+ $results = $this->evaluatePath($compiled, $data);
+
+ array_pop($this->lastCompiled);
+
+ return $results;
+ }
+
+ /**
+ * Handle a view exception.
+ *
+ * @param \Exception $e
+ * @param int $obLevel
+ * @return void
+ *
+ * @throws $e
+ */
+ protected function handleViewException($e, $obLevel)
+ {
+ $e = new ErrorException($this->getMessage($e), 0, 1, $e->getFile(), $e->getLine(), $e);
+
+ parent::handleViewException($e, $obLevel);
+ }
+
+ /**
+ * Get the exception message for an exception.
+ *
+ * @param \Exception $e
+ * @return string
+ */
+ protected function getMessage($e)
+ {
+ return $e->getMessage().' (View: '.realpath(last($this->lastCompiled)).')';
+ }
+
+ /**
+ * Get the compiler implementation.
+ *
+ * @return \Illuminate\View\Compilers\CompilerInterface
+ */
+ public function getCompiler()
+ {
+ return $this->compiler;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Engines/Engine.php b/application/vendor/laravel/framework/src/Illuminate/View/Engines/Engine.php
index 4ea9796..bf5c748 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Engines/Engine.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Engines/Engine.php
@@ -1,22 +1,23 @@
-lastRendered;
- }
+abstract class Engine
+{
+ /**
+ * The view that was last to be rendered.
+ *
+ * @var string
+ */
+ protected $lastRendered;
+ /**
+ * Get the last view that was rendered.
+ *
+ * @return string
+ */
+ public function getLastRendered()
+ {
+ return $this->lastRendered;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php b/application/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php
index 5368734..a6f71d2 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php
@@ -1,14 +1,15 @@
-resolved[$engine]);
-
- $this->resolvers[$engine] = $resolver;
- }
-
- /**
- * Resolver an engine instance by name.
- *
- * @param string $engine
- * @return \Illuminate\View\Engines\EngineInterface
- * @throws \InvalidArgumentException
- */
- public function resolve($engine)
- {
- if (isset($this->resolved[$engine]))
- {
- return $this->resolved[$engine];
- }
-
- if (isset($this->resolvers[$engine]))
- {
- return $this->resolved[$engine] = call_user_func($this->resolvers[$engine]);
- }
-
- throw new InvalidArgumentException("Engine $engine not found.");
- }
-
+class EngineResolver
+{
+ /**
+ * The array of engine resolvers.
+ *
+ * @var array
+ */
+ protected $resolvers = [];
+
+ /**
+ * The resolved engine instances.
+ *
+ * @var array
+ */
+ protected $resolved = [];
+
+ /**
+ * Register a new engine resolver.
+ *
+ * The engine string typically corresponds to a file extension.
+ *
+ * @param string $engine
+ * @param \Closure $resolver
+ * @return void
+ */
+ public function register($engine, Closure $resolver)
+ {
+ unset($this->resolved[$engine]);
+
+ $this->resolvers[$engine] = $resolver;
+ }
+
+ /**
+ * Resolver an engine instance by name.
+ *
+ * @param string $engine
+ * @return \Illuminate\View\Engines\EngineInterface
+ * @throws \InvalidArgumentException
+ */
+ public function resolve($engine)
+ {
+ if (isset($this->resolved[$engine])) {
+ return $this->resolved[$engine];
+ }
+
+ if (isset($this->resolvers[$engine])) {
+ return $this->resolved[$engine] = call_user_func($this->resolvers[$engine]);
+ }
+
+ throw new InvalidArgumentException("Engine $engine not found.");
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php b/application/vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php
index f43828e..7bbf3fc 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php
@@ -1,68 +1,69 @@
-evaluatePath($path, $data);
- }
+use Exception;
+use Throwable;
+use Symfony\Component\Debug\Exception\FatalThrowableError;
- /**
- * Get the evaluated contents of the view at the given path.
- *
- * @param string $__path
- * @param array $__data
- * @return string
- */
- protected function evaluatePath($__path, $__data)
- {
- $obLevel = ob_get_level();
+class PhpEngine implements EngineInterface
+{
+ /**
+ * Get the evaluated contents of the view.
+ *
+ * @param string $path
+ * @param array $data
+ * @return string
+ */
+ public function get($path, array $data = [])
+ {
+ return $this->evaluatePath($path, $data);
+ }
- ob_start();
+ /**
+ * Get the evaluated contents of the view at the given path.
+ *
+ * @param string $__path
+ * @param array $__data
+ * @return string
+ */
+ protected function evaluatePath($__path, $__data)
+ {
+ $obLevel = ob_get_level();
- extract($__data);
+ ob_start();
- // We'll evaluate the contents of the view inside a try/catch block so we can
- // flush out any stray output that might get out before an error occurs or
- // an exception is thrown. This prevents any partial views from leaking.
- try
- {
- include $__path;
- }
- catch (Exception $e)
- {
- $this->handleViewException($e, $obLevel);
- }
+ extract($__data, EXTR_SKIP);
- return ltrim(ob_get_clean());
- }
+ // We'll evaluate the contents of the view inside a try/catch block so we can
+ // flush out any stray output that might get out before an error occurs or
+ // an exception is thrown. This prevents any partial views from leaking.
+ try {
+ include $__path;
+ } catch (Exception $e) {
+ $this->handleViewException($e, $obLevel);
+ } catch (Throwable $e) {
+ $this->handleViewException(new FatalThrowableError($e), $obLevel);
+ }
- /**
- * Handle a view exception.
- *
- * @param \Exception $e
- * @param int $obLevel
- * @return void
- *
- * @throws $e
- */
- protected function handleViewException($e, $obLevel)
- {
- while (ob_get_level() > $obLevel)
- {
- ob_end_clean();
- }
+ return ltrim(ob_get_clean());
+ }
- throw $e;
- }
+ /**
+ * Handle a view exception.
+ *
+ * @param \Exception $e
+ * @param int $obLevel
+ * @return void
+ *
+ * @throws $e
+ */
+ protected function handleViewException($e, $obLevel)
+ {
+ while (ob_get_level() > $obLevel) {
+ ob_end_clean();
+ }
+ throw $e;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Expression.php b/application/vendor/laravel/framework/src/Illuminate/View/Expression.php
new file mode 100644
index 0000000..4749b23
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Expression.php
@@ -0,0 +1,46 @@
+html = $html;
+ }
+
+ /**
+ * Get the the HTML string.
+ *
+ * @return string
+ */
+ public function toHtml()
+ {
+ return $this->html;
+ }
+
+ /**
+ * Get the the HTML string.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->toHtml();
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Factory.php b/application/vendor/laravel/framework/src/Illuminate/View/Factory.php
index f5b341c..5c7e7b5 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Factory.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Factory.php
@@ -1,899 +1,886 @@
- 'blade', 'php' => 'php');
-
- /**
- * The view composer events.
- *
- * @var array
- */
- protected $composers = array();
-
- /**
- * All of the finished, captured sections.
- *
- * @var array
- */
- protected $sections = array();
-
- /**
- * The stack of in-progress sections.
- *
- * @var array
- */
- protected $sectionStack = array();
-
- /**
- * The number of active rendering operations.
- *
- * @var int
- */
- protected $renderCount = 0;
-
- /**
- * Create a new view factory instance.
- *
- * @param \Illuminate\View\Engines\EngineResolver $engines
- * @param \Illuminate\View\ViewFinderInterface $finder
- * @param \Illuminate\Contracts\Events\Dispatcher $events
- * @return void
- */
- public function __construct(EngineResolver $engines, ViewFinderInterface $finder, Dispatcher $events)
- {
- $this->finder = $finder;
- $this->events = $events;
- $this->engines = $engines;
-
- $this->share('__env', $this);
- }
-
- /**
- * Get the evaluated view contents for the given view.
- *
- * @param string $path
- * @param array $data
- * @param array $mergeData
- * @return \Illuminate\View\View
- */
- public function file($path, $data = array(), $mergeData = array())
- {
- $data = array_merge($mergeData, $this->parseData($data));
-
- $this->callCreator($view = new View($this, $this->getEngineFromPath($path), $path, $path, $data));
-
- return $view;
- }
-
- /**
- * Get the evaluated view contents for the given view.
- *
- * @param string $view
- * @param array $data
- * @param array $mergeData
- * @return \Illuminate\View\View
- */
- public function make($view, $data = array(), $mergeData = array())
- {
- if (isset($this->aliases[$view])) $view = $this->aliases[$view];
-
- $view = $this->normalizeName($view);
-
- $path = $this->finder->find($view);
-
- $data = array_merge($mergeData, $this->parseData($data));
-
- $this->callCreator($view = new View($this, $this->getEngineFromPath($path), $view, $path, $data));
-
- return $view;
- }
-
- /**
- * Normalize a view name.
- *
- * @param string $name
- *
- * @return string
- */
- protected function normalizeName($name)
- {
- $delimiter = ViewFinderInterface::HINT_PATH_DELIMITER;
-
- if (strpos($name, $delimiter) === false)
- {
- return str_replace('/', '.', $name);
- }
-
- list($namespace, $name) = explode($delimiter, $name);
-
- return $namespace . $delimiter . str_replace('/', '.', $name);
- }
-
- /**
- * Parse the given data into a raw array.
- *
- * @param mixed $data
- * @return array
- */
- protected function parseData($data)
- {
- return $data instanceof Arrayable ? $data->toArray() : $data;
- }
-
- /**
- * Get the evaluated view contents for a named view.
- *
- * @param string $view
- * @param mixed $data
- * @return \Illuminate\View\View
- */
- public function of($view, $data = array())
- {
- return $this->make($this->names[$view], $data);
- }
-
- /**
- * Register a named view.
- *
- * @param string $view
- * @param string $name
- * @return void
- */
- public function name($view, $name)
- {
- $this->names[$name] = $view;
- }
-
- /**
- * Add an alias for a view.
- *
- * @param string $view
- * @param string $alias
- * @return void
- */
- public function alias($view, $alias)
- {
- $this->aliases[$alias] = $view;
- }
-
- /**
- * Determine if a given view exists.
- *
- * @param string $view
- * @return bool
- */
- public function exists($view)
- {
- try
- {
- $this->finder->find($view);
- }
- catch (InvalidArgumentException $e)
- {
- return false;
- }
-
- return true;
- }
-
- /**
- * Get the rendered contents of a partial from a loop.
- *
- * @param string $view
- * @param array $data
- * @param string $iterator
- * @param string $empty
- * @return string
- */
- public function renderEach($view, $data, $iterator, $empty = 'raw|')
- {
- $result = '';
-
- // If is actually data in the array, we will loop through the data and append
- // an instance of the partial view to the final result HTML passing in the
- // iterated value of this data array, allowing the views to access them.
- if (count($data) > 0)
- {
- foreach ($data as $key => $value)
- {
- $data = array('key' => $key, $iterator => $value);
-
- $result .= $this->make($view, $data)->render();
- }
- }
-
- // If there is no data in the array, we will render the contents of the empty
- // view. Alternatively, the "empty view" could be a raw string that begins
- // with "raw|" for convenience and to let this know that it is a string.
- else
- {
- if (starts_with($empty, 'raw|'))
- {
- $result = substr($empty, 4);
- }
- else
- {
- $result = $this->make($empty)->render();
- }
- }
-
- return $result;
- }
-
- /**
- * Get the appropriate view engine for the given path.
- *
- * @param string $path
- * @return \Illuminate\View\Engines\EngineInterface
- *
- * @throws \InvalidArgumentException
- */
- public function getEngineFromPath($path)
- {
- if ( ! $extension = $this->getExtension($path))
- {
- throw new InvalidArgumentException("Unrecognized extension in file: $path");
- }
-
- $engine = $this->extensions[$extension];
-
- return $this->engines->resolve($engine);
- }
-
- /**
- * Get the extension used by the view file.
- *
- * @param string $path
- * @return string
- */
- protected function getExtension($path)
- {
- $extensions = array_keys($this->extensions);
-
- return array_first($extensions, function($key, $value) use ($path)
- {
- return ends_with($path, $value);
- });
- }
-
- /**
- * Add a piece of shared data to the environment.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function share($key, $value = null)
- {
- if ( ! is_array($key)) return $this->shared[$key] = $value;
-
- foreach ($key as $innerKey => $innerValue)
- {
- $this->share($innerKey, $innerValue);
- }
- }
-
- /**
- * Register a view creator event.
- *
- * @param array|string $views
- * @param \Closure|string $callback
- * @return array
- */
- public function creator($views, $callback)
- {
- $creators = array();
-
- foreach ((array) $views as $view)
- {
- $creators[] = $this->addViewEvent($view, $callback, 'creating: ');
- }
-
- return $creators;
- }
-
- /**
- * Register multiple view composers via an array.
- *
- * @param array $composers
- * @return array
- */
- public function composers(array $composers)
- {
- $registered = array();
-
- foreach ($composers as $callback => $views)
- {
- $registered = array_merge($registered, $this->composer($views, $callback));
- }
-
- return $registered;
- }
-
- /**
- * Register a view composer event.
- *
- * @param array|string $views
- * @param \Closure|string $callback
- * @param int|null $priority
- * @return array
- */
- public function composer($views, $callback, $priority = null)
- {
- $composers = array();
-
- foreach ((array) $views as $view)
- {
- $composers[] = $this->addViewEvent($view, $callback, 'composing: ', $priority);
- }
-
- return $composers;
- }
-
- /**
- * Add an event for a given view.
- *
- * @param string $view
- * @param \Closure|string $callback
- * @param string $prefix
- * @param int|null $priority
- * @return \Closure
- */
- protected function addViewEvent($view, $callback, $prefix = 'composing: ', $priority = null)
- {
- $view = $this->normalizeName($view);
-
- if ($callback instanceof Closure)
- {
- $this->addEventListener($prefix.$view, $callback, $priority);
-
- return $callback;
- }
- elseif (is_string($callback))
- {
- return $this->addClassEvent($view, $callback, $prefix, $priority);
- }
- }
-
- /**
- * Register a class based view composer.
- *
- * @param string $view
- * @param string $class
- * @param string $prefix
- * @param int|null $priority
- * @return \Closure
- */
- protected function addClassEvent($view, $class, $prefix, $priority = null)
- {
- $name = $prefix.$view;
-
- // When registering a class based view "composer", we will simply resolve the
- // classes from the application IoC container then call the compose method
- // on the instance. This allows for convenient, testable view composers.
- $callback = $this->buildClassEventCallback($class, $prefix);
-
- $this->addEventListener($name, $callback, $priority);
-
- return $callback;
- }
-
- /**
- * Add a listener to the event dispatcher.
- *
- * @param string $name
- * @param \Closure $callback
- * @param int $priority
- * @return void
- */
- protected function addEventListener($name, $callback, $priority = null)
- {
- if (is_null($priority))
- {
- $this->events->listen($name, $callback);
- }
- else
- {
- $this->events->listen($name, $callback, $priority);
- }
- }
-
- /**
- * Build a class based container callback Closure.
- *
- * @param string $class
- * @param string $prefix
- * @return \Closure
- */
- protected function buildClassEventCallback($class, $prefix)
- {
- list($class, $method) = $this->parseClassEvent($class, $prefix);
-
- // Once we have the class and method name, we can build the Closure to resolve
- // the instance out of the IoC container and call the method on it with the
- // given arguments that are passed to the Closure as the composer's data.
- return function() use ($class, $method)
- {
- $callable = array($this->container->make($class), $method);
-
- return call_user_func_array($callable, func_get_args());
- };
- }
-
- /**
- * Parse a class based composer name.
- *
- * @param string $class
- * @param string $prefix
- * @return array
- */
- protected function parseClassEvent($class, $prefix)
- {
- if (str_contains($class, '@'))
- {
- return explode('@', $class);
- }
-
- $method = str_contains($prefix, 'composing') ? 'compose' : 'create';
-
- return array($class, $method);
- }
-
- /**
- * Call the composer for a given view.
- *
- * @param \Illuminate\View\View $view
- * @return void
- */
- public function callComposer(View $view)
- {
- $this->events->fire('composing: '.$view->getName(), array($view));
- }
-
- /**
- * Call the creator for a given view.
- *
- * @param \Illuminate\View\View $view
- * @return void
- */
- public function callCreator(View $view)
- {
- $this->events->fire('creating: '.$view->getName(), array($view));
- }
-
- /**
- * Start injecting content into a section.
- *
- * @param string $section
- * @param string $content
- * @return void
- */
- public function startSection($section, $content = '')
- {
- if ($content === '')
- {
- if (ob_start())
- {
- $this->sectionStack[] = $section;
- }
- }
- else
- {
- $this->extendSection($section, $content);
- }
- }
-
- /**
- * Inject inline content into a section.
- *
- * @param string $section
- * @param string $content
- * @return void
- */
- public function inject($section, $content)
- {
- return $this->startSection($section, $content);
- }
-
- /**
- * Stop injecting content into a section and return its contents.
- *
- * @return string
- */
- public function yieldSection()
- {
- return $this->yieldContent($this->stopSection());
- }
-
- /**
- * Stop injecting content into a section.
- *
- * @param bool $overwrite
- * @return string
- */
- public function stopSection($overwrite = false)
- {
- $last = array_pop($this->sectionStack);
-
- if ($overwrite)
- {
- $this->sections[$last] = ob_get_clean();
- }
- else
- {
- $this->extendSection($last, ob_get_clean());
- }
-
- return $last;
- }
-
- /**
- * Stop injecting content into a section and append it.
- *
- * @return string
- */
- public function appendSection()
- {
- $last = array_pop($this->sectionStack);
-
- if (isset($this->sections[$last]))
- {
- $this->sections[$last] .= ob_get_clean();
- }
- else
- {
- $this->sections[$last] = ob_get_clean();
- }
-
- return $last;
- }
-
- /**
- * Append content to a given section.
- *
- * @param string $section
- * @param string $content
- * @return void
- */
- protected function extendSection($section, $content)
- {
- if (isset($this->sections[$section]))
- {
- $content = str_replace('@parent', $content, $this->sections[$section]);
- }
-
- $this->sections[$section] = $content;
- }
-
- /**
- * Get the string contents of a section.
- *
- * @param string $section
- * @param string $default
- * @return string
- */
- public function yieldContent($section, $default = '')
- {
- $sectionContent = $default;
-
- if (isset($this->sections[$section]))
- {
- $sectionContent = $this->sections[$section];
- }
-
- $sectionContent = str_replace('@@parent', '--parent--holder--', $sectionContent);
-
- return str_replace(
- '--parent--holder--', '@parent', str_replace('@parent', '', $sectionContent)
- );
- }
-
- /**
- * Flush all of the section contents.
- *
- * @return void
- */
- public function flushSections()
- {
- $this->sections = array();
-
- $this->sectionStack = array();
- }
-
- /**
- * Flush all of the section contents if done rendering.
- *
- * @return void
- */
- public function flushSectionsIfDoneRendering()
- {
- if ($this->doneRendering()) $this->flushSections();
- }
-
- /**
- * Increment the rendering counter.
- *
- * @return void
- */
- public function incrementRender()
- {
- $this->renderCount++;
- }
-
- /**
- * Decrement the rendering counter.
- *
- * @return void
- */
- public function decrementRender()
- {
- $this->renderCount--;
- }
-
- /**
- * Check if there are no active render operations.
- *
- * @return bool
- */
- public function doneRendering()
- {
- return $this->renderCount == 0;
- }
-
- /**
- * Add a location to the array of view locations.
- *
- * @param string $location
- * @return void
- */
- public function addLocation($location)
- {
- $this->finder->addLocation($location);
- }
-
- /**
- * Add a new namespace to the loader.
- *
- * @param string $namespace
- * @param string|array $hints
- * @return void
- */
- public function addNamespace($namespace, $hints)
- {
- $this->finder->addNamespace($namespace, $hints);
- }
-
- /**
- * Prepend a new namespace to the loader.
- *
- * @param string $namespace
- * @param string|array $hints
- * @return void
- */
- public function prependNamespace($namespace, $hints)
- {
- $this->finder->prependNamespace($namespace, $hints);
- }
-
- /**
- * Register a valid view extension and its engine.
- *
- * @param string $extension
- * @param string $engine
- * @param \Closure $resolver
- * @return void
- */
- public function addExtension($extension, $engine, $resolver = null)
- {
- $this->finder->addExtension($extension);
-
- if (isset($resolver))
- {
- $this->engines->register($engine, $resolver);
- }
-
- unset($this->extensions[$extension]);
-
- $this->extensions = array_merge(array($extension => $engine), $this->extensions);
- }
-
- /**
- * Get the extension to engine bindings.
- *
- * @return array
- */
- public function getExtensions()
- {
- return $this->extensions;
- }
-
- /**
- * Get the engine resolver instance.
- *
- * @return \Illuminate\View\Engines\EngineResolver
- */
- public function getEngineResolver()
- {
- return $this->engines;
- }
-
- /**
- * Get the view finder instance.
- *
- * @return \Illuminate\View\ViewFinderInterface
- */
- public function getFinder()
- {
- return $this->finder;
- }
-
- /**
- * Set the view finder instance.
- *
- * @param \Illuminate\View\ViewFinderInterface $finder
- * @return void
- */
- public function setFinder(ViewFinderInterface $finder)
- {
- $this->finder = $finder;
- }
-
- /**
- * Get the event dispatcher instance.
- *
- * @return \Illuminate\Contracts\Events\Dispatcher
- */
- public function getDispatcher()
- {
- return $this->events;
- }
-
- /**
- * Set the event dispatcher instance.
- *
- * @param \Illuminate\Contracts\Events\Dispatcher
- * @return void
- */
- public function setDispatcher(Dispatcher $events)
- {
- $this->events = $events;
- }
-
- /**
- * Get the IoC container instance.
- *
- * @return \Illuminate\Contracts\Container\Container
- */
- public function getContainer()
- {
- return $this->container;
- }
-
- /**
- * Set the IoC container instance.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @return void
- */
- public function setContainer(Container $container)
- {
- $this->container = $container;
- }
-
- /**
- * Get an item from the shared data.
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- */
- public function shared($key, $default = null)
- {
- return array_get($this->shared, $key, $default);
- }
-
- /**
- * Get all of the shared data for the environment.
- *
- * @return array
- */
- public function getShared()
- {
- return $this->shared;
- }
-
- /**
- * Check if section exists.
- *
- * @param string $name
- * @return bool
- */
- public function hasSection($name)
- {
- return array_key_exists($name, $this->sections);
- }
-
- /**
- * Get the entire array of sections.
- *
- * @return array
- */
- public function getSections()
- {
- return $this->sections;
- }
-
- /**
- * Get all of the registered named views in environment.
- *
- * @return array
- */
- public function getNames()
- {
- return $this->names;
- }
-
+class Factory implements FactoryContract
+{
+ /**
+ * The engine implementation.
+ *
+ * @var \Illuminate\View\Engines\EngineResolver
+ */
+ protected $engines;
+
+ /**
+ * The view finder implementation.
+ *
+ * @var \Illuminate\View\ViewFinderInterface
+ */
+ protected $finder;
+
+ /**
+ * The event dispatcher instance.
+ *
+ * @var \Illuminate\Contracts\Events\Dispatcher
+ */
+ protected $events;
+
+ /**
+ * The IoC container instance.
+ *
+ * @var \Illuminate\Contracts\Container\Container
+ */
+ protected $container;
+
+ /**
+ * Data that should be available to all templates.
+ *
+ * @var array
+ */
+ protected $shared = [];
+
+ /**
+ * Array of registered view name aliases.
+ *
+ * @var array
+ */
+ protected $aliases = [];
+
+ /**
+ * All of the registered view names.
+ *
+ * @var array
+ */
+ protected $names = [];
+
+ /**
+ * The extension to engine bindings.
+ *
+ * @var array
+ */
+ protected $extensions = ['blade.php' => 'blade', 'php' => 'php'];
+
+ /**
+ * The view composer events.
+ *
+ * @var array
+ */
+ protected $composers = [];
+
+ /**
+ * All of the finished, captured sections.
+ *
+ * @var array
+ */
+ protected $sections = [];
+
+ /**
+ * The stack of in-progress sections.
+ *
+ * @var array
+ */
+ protected $sectionStack = [];
+
+ /**
+ * The number of active rendering operations.
+ *
+ * @var int
+ */
+ protected $renderCount = 0;
+
+ /**
+ * Create a new view factory instance.
+ *
+ * @param \Illuminate\View\Engines\EngineResolver $engines
+ * @param \Illuminate\View\ViewFinderInterface $finder
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @return void
+ */
+ public function __construct(EngineResolver $engines, ViewFinderInterface $finder, Dispatcher $events)
+ {
+ $this->finder = $finder;
+ $this->events = $events;
+ $this->engines = $engines;
+
+ $this->share('__env', $this);
+ }
+
+ /**
+ * Get the evaluated view contents for the given view.
+ *
+ * @param string $path
+ * @param array $data
+ * @param array $mergeData
+ * @return \Illuminate\Contracts\View\View
+ */
+ public function file($path, $data = [], $mergeData = [])
+ {
+ $data = array_merge($mergeData, $this->parseData($data));
+
+ $this->callCreator($view = new View($this, $this->getEngineFromPath($path), $path, $path, $data));
+
+ return $view;
+ }
+
+ /**
+ * Get the evaluated view contents for the given view.
+ *
+ * @param string $view
+ * @param array $data
+ * @param array $mergeData
+ * @return \Illuminate\Contracts\View\View
+ */
+ public function make($view, $data = [], $mergeData = [])
+ {
+ if (isset($this->aliases[$view])) {
+ $view = $this->aliases[$view];
+ }
+
+ $view = $this->normalizeName($view);
+
+ $path = $this->finder->find($view);
+
+ $data = array_merge($mergeData, $this->parseData($data));
+
+ $this->callCreator($view = new View($this, $this->getEngineFromPath($path), $view, $path, $data));
+
+ return $view;
+ }
+
+ /**
+ * Normalize a view name.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function normalizeName($name)
+ {
+ $delimiter = ViewFinderInterface::HINT_PATH_DELIMITER;
+
+ if (strpos($name, $delimiter) === false) {
+ return str_replace('/', '.', $name);
+ }
+
+ list($namespace, $name) = explode($delimiter, $name);
+
+ return $namespace.$delimiter.str_replace('/', '.', $name);
+ }
+
+ /**
+ * Parse the given data into a raw array.
+ *
+ * @param mixed $data
+ * @return array
+ */
+ protected function parseData($data)
+ {
+ return $data instanceof Arrayable ? $data->toArray() : $data;
+ }
+
+ /**
+ * Get the evaluated view contents for a named view.
+ *
+ * @param string $view
+ * @param mixed $data
+ * @return \Illuminate\Contracts\View\View
+ */
+ public function of($view, $data = [])
+ {
+ return $this->make($this->names[$view], $data);
+ }
+
+ /**
+ * Register a named view.
+ *
+ * @param string $view
+ * @param string $name
+ * @return void
+ */
+ public function name($view, $name)
+ {
+ $this->names[$name] = $view;
+ }
+
+ /**
+ * Add an alias for a view.
+ *
+ * @param string $view
+ * @param string $alias
+ * @return void
+ */
+ public function alias($view, $alias)
+ {
+ $this->aliases[$alias] = $view;
+ }
+
+ /**
+ * Determine if a given view exists.
+ *
+ * @param string $view
+ * @return bool
+ */
+ public function exists($view)
+ {
+ try {
+ $this->finder->find($view);
+ } catch (InvalidArgumentException $e) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Get the rendered contents of a partial from a loop.
+ *
+ * @param string $view
+ * @param array $data
+ * @param string $iterator
+ * @param string $empty
+ * @return string
+ */
+ public function renderEach($view, $data, $iterator, $empty = 'raw|')
+ {
+ $result = '';
+
+ // If is actually data in the array, we will loop through the data and append
+ // an instance of the partial view to the final result HTML passing in the
+ // iterated value of this data array, allowing the views to access them.
+ if (count($data) > 0) {
+ foreach ($data as $key => $value) {
+ $data = ['key' => $key, $iterator => $value];
+
+ $result .= $this->make($view, $data)->render();
+ }
+ }
+
+ // If there is no data in the array, we will render the contents of the empty
+ // view. Alternatively, the "empty view" could be a raw string that begins
+ // with "raw|" for convenience and to let this know that it is a string.
+ else {
+ if (Str::startsWith($empty, 'raw|')) {
+ $result = substr($empty, 4);
+ } else {
+ $result = $this->make($empty)->render();
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Get the appropriate view engine for the given path.
+ *
+ * @param string $path
+ * @return \Illuminate\View\Engines\EngineInterface
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function getEngineFromPath($path)
+ {
+ if (! $extension = $this->getExtension($path)) {
+ throw new InvalidArgumentException("Unrecognized extension in file: $path");
+ }
+
+ $engine = $this->extensions[$extension];
+
+ return $this->engines->resolve($engine);
+ }
+
+ /**
+ * Get the extension used by the view file.
+ *
+ * @param string $path
+ * @return string
+ */
+ protected function getExtension($path)
+ {
+ $extensions = array_keys($this->extensions);
+
+ return Arr::first($extensions, function ($key, $value) use ($path) {
+ return Str::endsWith($path, '.'.$value);
+ });
+ }
+
+ /**
+ * Add a piece of shared data to the environment.
+ *
+ * @param array|string $key
+ * @param mixed $value
+ * @return mixed
+ */
+ public function share($key, $value = null)
+ {
+ if (! is_array($key)) {
+ return $this->shared[$key] = $value;
+ }
+
+ foreach ($key as $innerKey => $innerValue) {
+ $this->share($innerKey, $innerValue);
+ }
+ }
+
+ /**
+ * Register a view creator event.
+ *
+ * @param array|string $views
+ * @param \Closure|string $callback
+ * @return array
+ */
+ public function creator($views, $callback)
+ {
+ $creators = [];
+
+ foreach ((array) $views as $view) {
+ $creators[] = $this->addViewEvent($view, $callback, 'creating: ');
+ }
+
+ return $creators;
+ }
+
+ /**
+ * Register multiple view composers via an array.
+ *
+ * @param array $composers
+ * @return array
+ */
+ public function composers(array $composers)
+ {
+ $registered = [];
+
+ foreach ($composers as $callback => $views) {
+ $registered = array_merge($registered, $this->composer($views, $callback));
+ }
+
+ return $registered;
+ }
+
+ /**
+ * Register a view composer event.
+ *
+ * @param array|string $views
+ * @param \Closure|string $callback
+ * @param int|null $priority
+ * @return array
+ */
+ public function composer($views, $callback, $priority = null)
+ {
+ $composers = [];
+
+ foreach ((array) $views as $view) {
+ $composers[] = $this->addViewEvent($view, $callback, 'composing: ', $priority);
+ }
+
+ return $composers;
+ }
+
+ /**
+ * Add an event for a given view.
+ *
+ * @param string $view
+ * @param \Closure|string $callback
+ * @param string $prefix
+ * @param int|null $priority
+ * @return \Closure|null
+ */
+ protected function addViewEvent($view, $callback, $prefix = 'composing: ', $priority = null)
+ {
+ $view = $this->normalizeName($view);
+
+ if ($callback instanceof Closure) {
+ $this->addEventListener($prefix.$view, $callback, $priority);
+
+ return $callback;
+ } elseif (is_string($callback)) {
+ return $this->addClassEvent($view, $callback, $prefix, $priority);
+ }
+ }
+
+ /**
+ * Register a class based view composer.
+ *
+ * @param string $view
+ * @param string $class
+ * @param string $prefix
+ * @param int|null $priority
+ * @return \Closure
+ */
+ protected function addClassEvent($view, $class, $prefix, $priority = null)
+ {
+ $name = $prefix.$view;
+
+ // When registering a class based view "composer", we will simply resolve the
+ // classes from the application IoC container then call the compose method
+ // on the instance. This allows for convenient, testable view composers.
+ $callback = $this->buildClassEventCallback($class, $prefix);
+
+ $this->addEventListener($name, $callback, $priority);
+
+ return $callback;
+ }
+
+ /**
+ * Add a listener to the event dispatcher.
+ *
+ * @param string $name
+ * @param \Closure $callback
+ * @param int|null $priority
+ * @return void
+ */
+ protected function addEventListener($name, $callback, $priority = null)
+ {
+ if (is_null($priority)) {
+ $this->events->listen($name, $callback);
+ } else {
+ $this->events->listen($name, $callback, $priority);
+ }
+ }
+
+ /**
+ * Build a class based container callback Closure.
+ *
+ * @param string $class
+ * @param string $prefix
+ * @return \Closure
+ */
+ protected function buildClassEventCallback($class, $prefix)
+ {
+ list($class, $method) = $this->parseClassEvent($class, $prefix);
+
+ // Once we have the class and method name, we can build the Closure to resolve
+ // the instance out of the IoC container and call the method on it with the
+ // given arguments that are passed to the Closure as the composer's data.
+ return function () use ($class, $method) {
+ $callable = [$this->container->make($class), $method];
+
+ return call_user_func_array($callable, func_get_args());
+ };
+ }
+
+ /**
+ * Parse a class based composer name.
+ *
+ * @param string $class
+ * @param string $prefix
+ * @return array
+ */
+ protected function parseClassEvent($class, $prefix)
+ {
+ if (Str::contains($class, '@')) {
+ return explode('@', $class);
+ }
+
+ $method = Str::contains($prefix, 'composing') ? 'compose' : 'create';
+
+ return [$class, $method];
+ }
+
+ /**
+ * Call the composer for a given view.
+ *
+ * @param \Illuminate\Contracts\View\View $view
+ * @return void
+ */
+ public function callComposer(View $view)
+ {
+ $this->events->fire('composing: '.$view->getName(), [$view]);
+ }
+
+ /**
+ * Call the creator for a given view.
+ *
+ * @param \Illuminate\Contracts\View\View $view
+ * @return void
+ */
+ public function callCreator(View $view)
+ {
+ $this->events->fire('creating: '.$view->getName(), [$view]);
+ }
+
+ /**
+ * Start injecting content into a section.
+ *
+ * @param string $section
+ * @param string $content
+ * @return void
+ */
+ public function startSection($section, $content = '')
+ {
+ if ($content === '') {
+ if (ob_start()) {
+ $this->sectionStack[] = $section;
+ }
+ } else {
+ $this->extendSection($section, $content);
+ }
+ }
+
+ /**
+ * Inject inline content into a section.
+ *
+ * @param string $section
+ * @param string $content
+ * @return void
+ */
+ public function inject($section, $content)
+ {
+ return $this->startSection($section, $content);
+ }
+
+ /**
+ * Stop injecting content into a section and return its contents.
+ *
+ * @return string
+ */
+ public function yieldSection()
+ {
+ if (empty($this->sectionStack)) {
+ return '';
+ }
+
+ return $this->yieldContent($this->stopSection());
+ }
+
+ /**
+ * Stop injecting content into a section.
+ *
+ * @param bool $overwrite
+ * @return string
+ * @throws \InvalidArgumentException
+ */
+ public function stopSection($overwrite = false)
+ {
+ if (empty($this->sectionStack)) {
+ throw new InvalidArgumentException('Cannot end a section without first starting one.');
+ }
+
+ $last = array_pop($this->sectionStack);
+
+ if ($overwrite) {
+ $this->sections[$last] = ob_get_clean();
+ } else {
+ $this->extendSection($last, ob_get_clean());
+ }
+
+ return $last;
+ }
+
+ /**
+ * Stop injecting content into a section and append it.
+ *
+ * @return string
+ * @throws \InvalidArgumentException
+ */
+ public function appendSection()
+ {
+ if (empty($this->sectionStack)) {
+ throw new InvalidArgumentException('Cannot end a section without first starting one.');
+ }
+
+ $last = array_pop($this->sectionStack);
+
+ if (isset($this->sections[$last])) {
+ $this->sections[$last] .= ob_get_clean();
+ } else {
+ $this->sections[$last] = ob_get_clean();
+ }
+
+ return $last;
+ }
+
+ /**
+ * Append content to a given section.
+ *
+ * @param string $section
+ * @param string $content
+ * @return void
+ */
+ protected function extendSection($section, $content)
+ {
+ if (isset($this->sections[$section])) {
+ $content = str_replace('@parent', $content, $this->sections[$section]);
+ }
+
+ $this->sections[$section] = $content;
+ }
+
+ /**
+ * Get the string contents of a section.
+ *
+ * @param string $section
+ * @param string $default
+ * @return string
+ */
+ public function yieldContent($section, $default = '')
+ {
+ $sectionContent = $default;
+
+ if (isset($this->sections[$section])) {
+ $sectionContent = $this->sections[$section];
+ }
+
+ $sectionContent = str_replace('@@parent', '--parent--holder--', $sectionContent);
+
+ return str_replace(
+ '--parent--holder--', '@parent', str_replace('@parent', '', $sectionContent)
+ );
+ }
+
+ /**
+ * Flush all of the section contents.
+ *
+ * @return void
+ */
+ public function flushSections()
+ {
+ $this->renderCount = 0;
+
+ $this->sections = [];
+
+ $this->sectionStack = [];
+ }
+
+ /**
+ * Flush all of the section contents if done rendering.
+ *
+ * @return void
+ */
+ public function flushSectionsIfDoneRendering()
+ {
+ if ($this->doneRendering()) {
+ $this->flushSections();
+ }
+ }
+
+ /**
+ * Increment the rendering counter.
+ *
+ * @return void
+ */
+ public function incrementRender()
+ {
+ $this->renderCount++;
+ }
+
+ /**
+ * Decrement the rendering counter.
+ *
+ * @return void
+ */
+ public function decrementRender()
+ {
+ $this->renderCount--;
+ }
+
+ /**
+ * Check if there are no active render operations.
+ *
+ * @return bool
+ */
+ public function doneRendering()
+ {
+ return $this->renderCount == 0;
+ }
+
+ /**
+ * Add a location to the array of view locations.
+ *
+ * @param string $location
+ * @return void
+ */
+ public function addLocation($location)
+ {
+ $this->finder->addLocation($location);
+ }
+
+ /**
+ * Add a new namespace to the loader.
+ *
+ * @param string $namespace
+ * @param string|array $hints
+ * @return void
+ */
+ public function addNamespace($namespace, $hints)
+ {
+ $this->finder->addNamespace($namespace, $hints);
+ }
+
+ /**
+ * Prepend a new namespace to the loader.
+ *
+ * @param string $namespace
+ * @param string|array $hints
+ * @return void
+ */
+ public function prependNamespace($namespace, $hints)
+ {
+ $this->finder->prependNamespace($namespace, $hints);
+ }
+
+ /**
+ * Register a valid view extension and its engine.
+ *
+ * @param string $extension
+ * @param string $engine
+ * @param \Closure $resolver
+ * @return void
+ */
+ public function addExtension($extension, $engine, $resolver = null)
+ {
+ $this->finder->addExtension($extension);
+
+ if (isset($resolver)) {
+ $this->engines->register($engine, $resolver);
+ }
+
+ unset($this->extensions[$extension]);
+
+ $this->extensions = array_merge([$extension => $engine], $this->extensions);
+ }
+
+ /**
+ * Get the extension to engine bindings.
+ *
+ * @return array
+ */
+ public function getExtensions()
+ {
+ return $this->extensions;
+ }
+
+ /**
+ * Get the engine resolver instance.
+ *
+ * @return \Illuminate\View\Engines\EngineResolver
+ */
+ public function getEngineResolver()
+ {
+ return $this->engines;
+ }
+
+ /**
+ * Get the view finder instance.
+ *
+ * @return \Illuminate\View\ViewFinderInterface
+ */
+ public function getFinder()
+ {
+ return $this->finder;
+ }
+
+ /**
+ * Set the view finder instance.
+ *
+ * @param \Illuminate\View\ViewFinderInterface $finder
+ * @return void
+ */
+ public function setFinder(ViewFinderInterface $finder)
+ {
+ $this->finder = $finder;
+ }
+
+ /**
+ * Get the event dispatcher instance.
+ *
+ * @return \Illuminate\Contracts\Events\Dispatcher
+ */
+ public function getDispatcher()
+ {
+ return $this->events;
+ }
+
+ /**
+ * Set the event dispatcher instance.
+ *
+ * @param \Illuminate\Contracts\Events\Dispatcher $events
+ * @return void
+ */
+ public function setDispatcher(Dispatcher $events)
+ {
+ $this->events = $events;
+ }
+
+ /**
+ * Get the IoC container instance.
+ *
+ * @return \Illuminate\Contracts\Container\Container
+ */
+ public function getContainer()
+ {
+ return $this->container;
+ }
+
+ /**
+ * Set the IoC container instance.
+ *
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return void
+ */
+ public function setContainer(Container $container)
+ {
+ $this->container = $container;
+ }
+
+ /**
+ * Get an item from the shared data.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public function shared($key, $default = null)
+ {
+ return Arr::get($this->shared, $key, $default);
+ }
+
+ /**
+ * Get all of the shared data for the environment.
+ *
+ * @return array
+ */
+ public function getShared()
+ {
+ return $this->shared;
+ }
+
+ /**
+ * Check if section exists.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasSection($name)
+ {
+ return array_key_exists($name, $this->sections);
+ }
+
+ /**
+ * Get the entire array of sections.
+ *
+ * @return array
+ */
+ public function getSections()
+ {
+ return $this->sections;
+ }
+
+ /**
+ * Get all of the registered named views in environment.
+ *
+ * @return array
+ */
+ public function getNames()
+ {
+ return $this->names;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php b/application/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php
index 94efedb..1c976b3 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php
@@ -1,274 +1,265 @@
-files = $files;
- $this->paths = $paths;
-
- if (isset($extensions))
- {
- $this->extensions = $extensions;
- }
- }
-
- /**
- * Get the fully qualified location of the view.
- *
- * @param string $name
- * @return string
- */
- public function find($name)
- {
- if (isset($this->views[$name])) return $this->views[$name];
-
- if ($this->hasHintInformation($name = trim($name)))
- {
- return $this->views[$name] = $this->findNamedPathView($name);
- }
-
- return $this->views[$name] = $this->findInPaths($name, $this->paths);
- }
-
- /**
- * Get the path to a template with a named path.
- *
- * @param string $name
- * @return string
- */
- protected function findNamedPathView($name)
- {
- list($namespace, $view) = $this->getNamespaceSegments($name);
-
- return $this->findInPaths($view, $this->hints[$namespace]);
- }
-
- /**
- * Get the segments of a template with a named path.
- *
- * @param string $name
- * @return array
- *
- * @throws \InvalidArgumentException
- */
- protected function getNamespaceSegments($name)
- {
- $segments = explode(static::HINT_PATH_DELIMITER, $name);
-
- if (count($segments) != 2)
- {
- throw new InvalidArgumentException("View [$name] has an invalid name.");
- }
-
- if ( ! isset($this->hints[$segments[0]]))
- {
- throw new InvalidArgumentException("No hint path defined for [{$segments[0]}].");
- }
-
- return $segments;
- }
-
- /**
- * Find the given view in the list of paths.
- *
- * @param string $name
- * @param array $paths
- * @return string
- *
- * @throws \InvalidArgumentException
- */
- protected function findInPaths($name, $paths)
- {
- foreach ((array) $paths as $path)
- {
- foreach ($this->getPossibleViewFiles($name) as $file)
- {
- if ($this->files->exists($viewPath = $path.'/'.$file))
- {
- return $viewPath;
- }
- }
- }
-
- throw new InvalidArgumentException("View [$name] not found.");
- }
-
- /**
- * Get an array of possible view files.
- *
- * @param string $name
- * @return array
- */
- protected function getPossibleViewFiles($name)
- {
- return array_map(function($extension) use ($name)
- {
- return str_replace('.', '/', $name).'.'.$extension;
-
- }, $this->extensions);
- }
-
- /**
- * Add a location to the finder.
- *
- * @param string $location
- * @return void
- */
- public function addLocation($location)
- {
- $this->paths[] = $location;
- }
-
- /**
- * Add a namespace hint to the finder.
- *
- * @param string $namespace
- * @param string|array $hints
- * @return void
- */
- public function addNamespace($namespace, $hints)
- {
- $hints = (array) $hints;
-
- if (isset($this->hints[$namespace]))
- {
- $hints = array_merge($this->hints[$namespace], $hints);
- }
-
- $this->hints[$namespace] = $hints;
- }
-
- /**
- * Prepend a namespace hint to the finder.
- *
- * @param string $namespace
- * @param string|array $hints
- * @return void
- */
- public function prependNamespace($namespace, $hints)
- {
- $hints = (array) $hints;
-
- if (isset($this->hints[$namespace]))
- {
- $hints = array_merge($hints, $this->hints[$namespace]);
- }
-
- $this->hints[$namespace] = $hints;
- }
-
- /**
- * Register an extension with the view finder.
- *
- * @param string $extension
- * @return void
- */
- public function addExtension($extension)
- {
- if (($index = array_search($extension, $this->extensions)) !== false)
- {
- unset($this->extensions[$index]);
- }
-
- array_unshift($this->extensions, $extension);
- }
-
- /**
- * Returns whether or not the view specify a hint information.
- *
- * @param string $name
- * @return bool
- */
- public function hasHintInformation($name)
- {
- return strpos($name, static::HINT_PATH_DELIMITER) > 0;
- }
-
- /**
- * Get the filesystem instance.
- *
- * @return \Illuminate\Filesystem\Filesystem
- */
- public function getFilesystem()
- {
- return $this->files;
- }
-
- /**
- * Get the active view paths.
- *
- * @return array
- */
- public function getPaths()
- {
- return $this->paths;
- }
-
- /**
- * Get the namespace to file path hints.
- *
- * @return array
- */
- public function getHints()
- {
- return $this->hints;
- }
-
- /**
- * Get registered extensions.
- *
- * @return array
- */
- public function getExtensions()
- {
- return $this->extensions;
- }
-
+class FileViewFinder implements ViewFinderInterface
+{
+ /**
+ * The filesystem instance.
+ *
+ * @var \Illuminate\Filesystem\Filesystem
+ */
+ protected $files;
+
+ /**
+ * The array of active view paths.
+ *
+ * @var array
+ */
+ protected $paths;
+
+ /**
+ * The array of views that have been located.
+ *
+ * @var array
+ */
+ protected $views = [];
+
+ /**
+ * The namespace to file path hints.
+ *
+ * @var array
+ */
+ protected $hints = [];
+
+ /**
+ * Register a view extension with the finder.
+ *
+ * @var array
+ */
+ protected $extensions = ['blade.php', 'php'];
+
+ /**
+ * Create a new file view loader instance.
+ *
+ * @param \Illuminate\Filesystem\Filesystem $files
+ * @param array $paths
+ * @param array $extensions
+ * @return void
+ */
+ public function __construct(Filesystem $files, array $paths, array $extensions = null)
+ {
+ $this->files = $files;
+ $this->paths = $paths;
+
+ if (isset($extensions)) {
+ $this->extensions = $extensions;
+ }
+ }
+
+ /**
+ * Get the fully qualified location of the view.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function find($name)
+ {
+ if (isset($this->views[$name])) {
+ return $this->views[$name];
+ }
+
+ if ($this->hasHintInformation($name = trim($name))) {
+ return $this->views[$name] = $this->findNamedPathView($name);
+ }
+
+ return $this->views[$name] = $this->findInPaths($name, $this->paths);
+ }
+
+ /**
+ * Get the path to a template with a named path.
+ *
+ * @param string $name
+ * @return string
+ */
+ protected function findNamedPathView($name)
+ {
+ list($namespace, $view) = $this->getNamespaceSegments($name);
+
+ return $this->findInPaths($view, $this->hints[$namespace]);
+ }
+
+ /**
+ * Get the segments of a template with a named path.
+ *
+ * @param string $name
+ * @return array
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function getNamespaceSegments($name)
+ {
+ $segments = explode(static::HINT_PATH_DELIMITER, $name);
+
+ if (count($segments) != 2) {
+ throw new InvalidArgumentException("View [$name] has an invalid name.");
+ }
+
+ if (! isset($this->hints[$segments[0]])) {
+ throw new InvalidArgumentException("No hint path defined for [{$segments[0]}].");
+ }
+
+ return $segments;
+ }
+
+ /**
+ * Find the given view in the list of paths.
+ *
+ * @param string $name
+ * @param array $paths
+ * @return string
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function findInPaths($name, $paths)
+ {
+ foreach ((array) $paths as $path) {
+ foreach ($this->getPossibleViewFiles($name) as $file) {
+ if ($this->files->exists($viewPath = $path.'/'.$file)) {
+ return $viewPath;
+ }
+ }
+ }
+
+ throw new InvalidArgumentException("View [$name] not found.");
+ }
+
+ /**
+ * Get an array of possible view files.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function getPossibleViewFiles($name)
+ {
+ return array_map(function ($extension) use ($name) {
+ return str_replace('.', '/', $name).'.'.$extension;
+ }, $this->extensions);
+ }
+
+ /**
+ * Add a location to the finder.
+ *
+ * @param string $location
+ * @return void
+ */
+ public function addLocation($location)
+ {
+ $this->paths[] = $location;
+ }
+
+ /**
+ * Add a namespace hint to the finder.
+ *
+ * @param string $namespace
+ * @param string|array $hints
+ * @return void
+ */
+ public function addNamespace($namespace, $hints)
+ {
+ $hints = (array) $hints;
+
+ if (isset($this->hints[$namespace])) {
+ $hints = array_merge($this->hints[$namespace], $hints);
+ }
+
+ $this->hints[$namespace] = $hints;
+ }
+
+ /**
+ * Prepend a namespace hint to the finder.
+ *
+ * @param string $namespace
+ * @param string|array $hints
+ * @return void
+ */
+ public function prependNamespace($namespace, $hints)
+ {
+ $hints = (array) $hints;
+
+ if (isset($this->hints[$namespace])) {
+ $hints = array_merge($hints, $this->hints[$namespace]);
+ }
+
+ $this->hints[$namespace] = $hints;
+ }
+
+ /**
+ * Register an extension with the view finder.
+ *
+ * @param string $extension
+ * @return void
+ */
+ public function addExtension($extension)
+ {
+ if (($index = array_search($extension, $this->extensions)) !== false) {
+ unset($this->extensions[$index]);
+ }
+
+ array_unshift($this->extensions, $extension);
+ }
+
+ /**
+ * Returns whether or not the view specify a hint information.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasHintInformation($name)
+ {
+ return strpos($name, static::HINT_PATH_DELIMITER) > 0;
+ }
+
+ /**
+ * Get the filesystem instance.
+ *
+ * @return \Illuminate\Filesystem\Filesystem
+ */
+ public function getFilesystem()
+ {
+ return $this->files;
+ }
+
+ /**
+ * Get the active view paths.
+ *
+ * @return array
+ */
+ public function getPaths()
+ {
+ return $this->paths;
+ }
+
+ /**
+ * Get the namespace to file path hints.
+ *
+ * @return array
+ */
+ public function getHints()
+ {
+ return $this->hints;
+ }
+
+ /**
+ * Get registered extensions.
+ *
+ * @return array
+ */
+ public function getExtensions()
+ {
+ return $this->extensions;
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php b/application/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php
index 956360c..812cf61 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php
@@ -1,58 +1,51 @@
-view = $view;
- }
-
- /**
- * Handle an incoming request.
- *
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @return mixed
- */
- public function handle($request, Closure $next)
- {
- // If the current session has an "errors" variable bound to it, we will share
- // its value with all view instances so the views can easily access errors
- // without having to bind. An empty bag is set when there aren't errors.
- if ($request->session()->has('errors'))
- {
- $this->view->share(
- 'errors', $request->session()->get('errors')
- );
- }
-
- // Putting the errors in the view for every view allows the developer to just
- // assume that some errors are always available, which is convenient since
- // they don't have to continually run checks for the presence of errors.
- else
- {
- $this->view->share('errors', new ViewErrorBag);
- }
-
- return $next($request);
- }
-
+class ShareErrorsFromSession
+{
+ /**
+ * The view factory implementation.
+ *
+ * @var \Illuminate\Contracts\View\Factory
+ */
+ protected $view;
+
+ /**
+ * Create a new error binder instance.
+ *
+ * @param \Illuminate\Contracts\View\Factory $view
+ * @return void
+ */
+ public function __construct(ViewFactory $view)
+ {
+ $this->view = $view;
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ // If the current session has an "errors" variable bound to it, we will share
+ // its value with all view instances so the views can easily access errors
+ // without having to bind. An empty bag is set when there aren't errors.
+ $this->view->share(
+ 'errors', $request->session()->get('errors', new ViewErrorBag)
+ );
+
+ // Putting the errors in the view for every view allows the developer to just
+ // assume that some errors are always available, which is convenient since
+ // they don't have to continually run checks for the presence of errors.
+
+ return $next($request);
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/View.php b/application/vendor/laravel/framework/src/Illuminate/View/View.php
index c7aa1df..c748ce4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/View.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/View.php
@@ -1,403 +1,404 @@
-view = $view;
- $this->path = $path;
- $this->engine = $engine;
- $this->factory = $factory;
-
- $this->data = $data instanceof Arrayable ? $data->toArray() : (array) $data;
- }
-
- /**
- * Get the string contents of the view.
- *
- * @param \Closure|null $callback
- * @return string
- */
- public function render(Closure $callback = null)
- {
- $contents = $this->renderContents();
-
- $response = isset($callback) ? $callback($this, $contents) : null;
-
- // Once we have the contents of the view, we will flush the sections if we are
- // done rendering all views so that there is nothing left hanging over when
- // another view gets rendered in the future by the application developer.
- $this->factory->flushSectionsIfDoneRendering();
-
- return $response ?: $contents;
- }
-
- /**
- * Get the contents of the view instance.
- *
- * @return string
- */
- protected function renderContents()
- {
- // We will keep track of the amount of views being rendered so we can flush
- // the section after the complete rendering operation is done. This will
- // clear out the sections for any separate views that may be rendered.
- $this->factory->incrementRender();
-
- $this->factory->callComposer($this);
-
- $contents = $this->getContents();
-
- // Once we've finished rendering the view, we'll decrement the render count
- // so that each sections get flushed out next time a view is created and
- // no old sections are staying around in the memory of an environment.
- $this->factory->decrementRender();
-
- return $contents;
- }
-
- /**
- * Get the sections of the rendered view.
- *
- * @return array
- */
- public function renderSections()
- {
- $env = $this->factory;
-
- return $this->render(function($view) use ($env)
- {
- return $env->getSections();
- });
- }
-
- /**
- * Get the evaluated contents of the view.
- *
- * @return string
- */
- protected function getContents()
- {
- return $this->engine->get($this->path, $this->gatherData());
- }
-
- /**
- * Get the data bound to the view instance.
- *
- * @return array
- */
- protected function gatherData()
- {
- $data = array_merge($this->factory->getShared(), $this->data);
-
- foreach ($data as $key => $value)
- {
- if ($value instanceof Renderable)
- {
- $data[$key] = $value->render();
- }
- }
-
- return $data;
- }
-
- /**
- * Add a piece of data to the view.
- *
- * @param string|array $key
- * @param mixed $value
- * @return $this
- */
- public function with($key, $value = null)
- {
- if (is_array($key))
- {
- $this->data = array_merge($this->data, $key);
- }
- else
- {
- $this->data[$key] = $value;
- }
-
- return $this;
- }
-
- /**
- * Add a view instance to the view data.
- *
- * @param string $key
- * @param string $view
- * @param array $data
- * @return $this
- */
- public function nest($key, $view, array $data = array())
- {
- return $this->with($key, $this->factory->make($view, $data));
- }
-
- /**
- * Add validation errors to the view.
- *
- * @param \Illuminate\Contracts\Support\MessageProvider|array $provider
- * @return $this
- */
- public function withErrors($provider)
- {
- if ($provider instanceof MessageProvider)
- {
- $this->with('errors', $provider->getMessageBag());
- }
- else
- {
- $this->with('errors', new MessageBag((array) $provider));
- }
-
- return $this;
- }
-
- /**
- * Get the view factory instance.
- *
- * @return \Illuminate\View\Factory
- */
- public function getFactory()
- {
- return $this->factory;
- }
-
- /**
- * Get the view's rendering engine.
- *
- * @return \Illuminate\View\Engines\EngineInterface
- */
- public function getEngine()
- {
- return $this->engine;
- }
-
- /**
- * Get the name of the view.
- *
- * @return string
- */
- public function name()
- {
- return $this->getName();
- }
-
- /**
- * Get the name of the view.
- *
- * @return string
- */
- public function getName()
- {
- return $this->view;
- }
-
- /**
- * Get the array of view data.
- *
- * @return array
- */
- public function getData()
- {
- return $this->data;
- }
-
- /**
- * Get the path to the view file.
- *
- * @return string
- */
- public function getPath()
- {
- return $this->path;
- }
-
- /**
- * Set the path to the view.
- *
- * @param string $path
- * @return void
- */
- public function setPath($path)
- {
- $this->path = $path;
- }
-
- /**
- * Determine if a piece of data is bound.
- *
- * @param string $key
- * @return bool
- */
- public function offsetExists($key)
- {
- return array_key_exists($key, $this->data);
- }
-
- /**
- * Get a piece of bound data to the view.
- *
- * @param string $key
- * @return mixed
- */
- public function offsetGet($key)
- {
- return $this->data[$key];
- }
-
- /**
- * Set a piece of data on the view.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function offsetSet($key, $value)
- {
- $this->with($key, $value);
- }
-
- /**
- * Unset a piece of data from the view.
- *
- * @param string $key
- * @return void
- */
- public function offsetUnset($key)
- {
- unset($this->data[$key]);
- }
-
- /**
- * Get a piece of data from the view.
- *
- * @param string $key
- * @return mixed
- */
- public function &__get($key)
- {
- return $this->data[$key];
- }
-
- /**
- * Set a piece of data on the view.
- *
- * @param string $key
- * @param mixed $value
- * @return void
- */
- public function __set($key, $value)
- {
- $this->with($key, $value);
- }
-
- /**
- * Check if a piece of data is bound to the view.
- *
- * @param string $key
- * @return bool
- */
- public function __isset($key)
- {
- return isset($this->data[$key]);
- }
-
- /**
- * Remove a piece of bound data from the view.
- *
- * @param string $key
- * @return bool
- */
- public function __unset($key)
- {
- unset($this->data[$key]);
- }
-
- /**
- * Dynamically bind parameters to the view.
- *
- * @param string $method
- * @param array $parameters
- * @return \Illuminate\View\View
- *
- * @throws \BadMethodCallException
- */
- public function __call($method, $parameters)
- {
- if (starts_with($method, 'with'))
- {
- return $this->with(snake_case(substr($method, 4)), $parameters[0]);
- }
-
- throw new BadMethodCallException("Method [$method] does not exist on view.");
- }
-
- /**
- * Get the string contents of the view.
- *
- * @return string
- */
- public function __toString()
- {
- return $this->render();
- }
-
+class View implements ArrayAccess, ViewContract
+{
+ /**
+ * The view factory instance.
+ *
+ * @var \Illuminate\View\Factory
+ */
+ protected $factory;
+
+ /**
+ * The engine implementation.
+ *
+ * @var \Illuminate\View\Engines\EngineInterface
+ */
+ protected $engine;
+
+ /**
+ * The name of the view.
+ *
+ * @var string
+ */
+ protected $view;
+
+ /**
+ * The array of view data.
+ *
+ * @var array
+ */
+ protected $data;
+
+ /**
+ * The path to the view file.
+ *
+ * @var string
+ */
+ protected $path;
+
+ /**
+ * Create a new view instance.
+ *
+ * @param \Illuminate\View\Factory $factory
+ * @param \Illuminate\View\Engines\EngineInterface $engine
+ * @param string $view
+ * @param string $path
+ * @param array $data
+ * @return void
+ */
+ public function __construct(Factory $factory, EngineInterface $engine, $view, $path, $data = [])
+ {
+ $this->view = $view;
+ $this->path = $path;
+ $this->engine = $engine;
+ $this->factory = $factory;
+
+ $this->data = $data instanceof Arrayable ? $data->toArray() : (array) $data;
+ }
+
+ /**
+ * Get the string contents of the view.
+ *
+ * @param callable|null $callback
+ * @return string
+ */
+ public function render(callable $callback = null)
+ {
+ try {
+ $contents = $this->renderContents();
+
+ $response = isset($callback) ? call_user_func($callback, $this, $contents) : null;
+
+ // Once we have the contents of the view, we will flush the sections if we are
+ // done rendering all views so that there is nothing left hanging over when
+ // another view gets rendered in the future by the application developer.
+ $this->factory->flushSectionsIfDoneRendering();
+
+ return ! is_null($response) ? $response : $contents;
+ } catch (Exception $e) {
+ $this->factory->flushSections();
+
+ throw $e;
+ } catch (Throwable $e) {
+ $this->factory->flushSections();
+
+ throw $e;
+ }
+ }
+
+ /**
+ * Get the contents of the view instance.
+ *
+ * @return string
+ */
+ protected function renderContents()
+ {
+ // We will keep track of the amount of views being rendered so we can flush
+ // the section after the complete rendering operation is done. This will
+ // clear out the sections for any separate views that may be rendered.
+ $this->factory->incrementRender();
+
+ $this->factory->callComposer($this);
+
+ $contents = $this->getContents();
+
+ // Once we've finished rendering the view, we'll decrement the render count
+ // so that each sections get flushed out next time a view is created and
+ // no old sections are staying around in the memory of an environment.
+ $this->factory->decrementRender();
+
+ return $contents;
+ }
+
+ /**
+ * Get the sections of the rendered view.
+ *
+ * @return array
+ */
+ public function renderSections()
+ {
+ return $this->render(function () {
+ return $this->factory->getSections();
+ });
+ }
+
+ /**
+ * Get the evaluated contents of the view.
+ *
+ * @return string
+ */
+ protected function getContents()
+ {
+ return $this->engine->get($this->path, $this->gatherData());
+ }
+
+ /**
+ * Get the data bound to the view instance.
+ *
+ * @return array
+ */
+ protected function gatherData()
+ {
+ $data = array_merge($this->factory->getShared(), $this->data);
+
+ foreach ($data as $key => $value) {
+ if ($value instanceof Renderable) {
+ $data[$key] = $value->render();
+ }
+ }
+
+ return $data;
+ }
+
+ /**
+ * Add a piece of data to the view.
+ *
+ * @param string|array $key
+ * @param mixed $value
+ * @return $this
+ */
+ public function with($key, $value = null)
+ {
+ if (is_array($key)) {
+ $this->data = array_merge($this->data, $key);
+ } else {
+ $this->data[$key] = $value;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add a view instance to the view data.
+ *
+ * @param string $key
+ * @param string $view
+ * @param array $data
+ * @return $this
+ */
+ public function nest($key, $view, array $data = [])
+ {
+ return $this->with($key, $this->factory->make($view, $data));
+ }
+
+ /**
+ * Add validation errors to the view.
+ *
+ * @param \Illuminate\Contracts\Support\MessageProvider|array $provider
+ * @return $this
+ */
+ public function withErrors($provider)
+ {
+ if ($provider instanceof MessageProvider) {
+ $this->with('errors', $provider->getMessageBag());
+ } else {
+ $this->with('errors', new MessageBag((array) $provider));
+ }
+
+ return $this;
+ }
+
+ /**
+ * Get the view factory instance.
+ *
+ * @return \Illuminate\View\Factory
+ */
+ public function getFactory()
+ {
+ return $this->factory;
+ }
+
+ /**
+ * Get the view's rendering engine.
+ *
+ * @return \Illuminate\View\Engines\EngineInterface
+ */
+ public function getEngine()
+ {
+ return $this->engine;
+ }
+
+ /**
+ * Get the name of the view.
+ *
+ * @return string
+ */
+ public function name()
+ {
+ return $this->getName();
+ }
+
+ /**
+ * Get the name of the view.
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->view;
+ }
+
+ /**
+ * Get the array of view data.
+ *
+ * @return array
+ */
+ public function getData()
+ {
+ return $this->data;
+ }
+
+ /**
+ * Get the path to the view file.
+ *
+ * @return string
+ */
+ public function getPath()
+ {
+ return $this->path;
+ }
+
+ /**
+ * Set the path to the view.
+ *
+ * @param string $path
+ * @return void
+ */
+ public function setPath($path)
+ {
+ $this->path = $path;
+ }
+
+ /**
+ * Determine if a piece of data is bound.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ return array_key_exists($key, $this->data);
+ }
+
+ /**
+ * Get a piece of bound data to the view.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function offsetGet($key)
+ {
+ return $this->data[$key];
+ }
+
+ /**
+ * Set a piece of data on the view.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($key, $value)
+ {
+ $this->with($key, $value);
+ }
+
+ /**
+ * Unset a piece of data from the view.
+ *
+ * @param string $key
+ * @return void
+ */
+ public function offsetUnset($key)
+ {
+ unset($this->data[$key]);
+ }
+
+ /**
+ * Get a piece of data from the view.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function &__get($key)
+ {
+ return $this->data[$key];
+ }
+
+ /**
+ * Set a piece of data on the view.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ $this->with($key, $value);
+ }
+
+ /**
+ * Check if a piece of data is bound to the view.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function __isset($key)
+ {
+ return isset($this->data[$key]);
+ }
+
+ /**
+ * Remove a piece of bound data from the view.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function __unset($key)
+ {
+ unset($this->data[$key]);
+ }
+
+ /**
+ * Dynamically bind parameters to the view.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return \Illuminate\View\View
+ *
+ * @throws \BadMethodCallException
+ */
+ public function __call($method, $parameters)
+ {
+ if (Str::startsWith($method, 'with')) {
+ return $this->with(Str::snake(substr($method, 4)), $parameters[0]);
+ }
+
+ throw new BadMethodCallException("Method [$method] does not exist on view.");
+ }
+
+ /**
+ * Get the string contents of the view.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->render();
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php b/application/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php
index df287f2..4af1f9d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php
+++ b/application/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php
@@ -1,54 +1,55 @@
-registerEngineResolver();
-
- $this->registerViewFinder();
-
- $this->registerFactory();
- }
-
- /**
- * Register the engine resolver instance.
- *
- * @return void
- */
- public function registerEngineResolver()
- {
- $this->app->singleton('view.engine.resolver', function()
- {
- $resolver = new EngineResolver;
-
- // Next we will register the various engines with the resolver so that the
- // environment can resolve the engines it needs for various views based
- // on the extension of view files. We call a method for each engines.
- foreach (array('php', 'blade') as $engine)
- {
- $this->{'register'.ucfirst($engine).'Engine'}($resolver);
- }
-
- return $resolver;
- });
- }
-
- /**
- * Register the PHP engine implementation.
- *
- * @param \Illuminate\View\Engines\EngineResolver $resolver
- * @return void
- */
- public function registerPhpEngine($resolver)
- {
- $resolver->register('php', function() { return new PhpEngine; });
- }
-
- /**
- * Register the Blade engine implementation.
- *
- * @param \Illuminate\View\Engines\EngineResolver $resolver
- * @return void
- */
- public function registerBladeEngine($resolver)
- {
- $app = $this->app;
-
- // The Compiler engine requires an instance of the CompilerInterface, which in
- // this case will be the Blade compiler, so we'll first create the compiler
- // instance to pass into the engine so it can compile the views properly.
- $app->singleton('blade.compiler', function($app)
- {
- $cache = $app['config']['view.compiled'];
-
- return new BladeCompiler($app['files'], $cache);
- });
-
- $resolver->register('blade', function() use ($app)
- {
- return new CompilerEngine($app['blade.compiler'], $app['files']);
- });
- }
-
- /**
- * Register the view finder implementation.
- *
- * @return void
- */
- public function registerViewFinder()
- {
- $this->app->bind('view.finder', function($app)
- {
- $paths = $app['config']['view.paths'];
-
- return new FileViewFinder($app['files'], $paths);
- });
- }
-
- /**
- * Register the view environment.
- *
- * @return void
- */
- public function registerFactory()
- {
- $this->app->singleton('view', function($app)
- {
- // Next we need to grab the engine resolver instance that will be used by the
- // environment. The resolver will be used by an environment to get each of
- // the various engine implementations such as plain PHP or Blade engine.
- $resolver = $app['view.engine.resolver'];
-
- $finder = $app['view.finder'];
-
- $env = new Factory($resolver, $finder, $app['events']);
-
- // We will also set the container instance on this view environment since the
- // view composers may be classes registered in the container, which allows
- // for great testable, flexible composers for the application developer.
- $env->setContainer($app);
-
- $env->share('app', $app);
-
- return $env;
- });
- }
-
+class ViewServiceProvider extends ServiceProvider
+{
+ /**
+ * Register the service provider.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->registerEngineResolver();
+
+ $this->registerViewFinder();
+
+ $this->registerFactory();
+ }
+
+ /**
+ * Register the engine resolver instance.
+ *
+ * @return void
+ */
+ public function registerEngineResolver()
+ {
+ $this->app->singleton('view.engine.resolver', function () {
+ $resolver = new EngineResolver;
+
+ // Next we will register the various engines with the resolver so that the
+ // environment can resolve the engines it needs for various views based
+ // on the extension of view files. We call a method for each engines.
+ foreach (['php', 'blade'] as $engine) {
+ $this->{'register'.ucfirst($engine).'Engine'}($resolver);
+ }
+
+ return $resolver;
+ });
+ }
+
+ /**
+ * Register the PHP engine implementation.
+ *
+ * @param \Illuminate\View\Engines\EngineResolver $resolver
+ * @return void
+ */
+ public function registerPhpEngine($resolver)
+ {
+ $resolver->register('php', function () {
+ return new PhpEngine;
+ });
+ }
+
+ /**
+ * Register the Blade engine implementation.
+ *
+ * @param \Illuminate\View\Engines\EngineResolver $resolver
+ * @return void
+ */
+ public function registerBladeEngine($resolver)
+ {
+ $app = $this->app;
+
+ // The Compiler engine requires an instance of the CompilerInterface, which in
+ // this case will be the Blade compiler, so we'll first create the compiler
+ // instance to pass into the engine so it can compile the views properly.
+ $app->singleton('blade.compiler', function ($app) {
+ $cache = $app['config']['view.compiled'];
+
+ return new BladeCompiler($app['files'], $cache);
+ });
+
+ $resolver->register('blade', function () use ($app) {
+ return new CompilerEngine($app['blade.compiler']);
+ });
+ }
+
+ /**
+ * Register the view finder implementation.
+ *
+ * @return void
+ */
+ public function registerViewFinder()
+ {
+ $this->app->bind('view.finder', function ($app) {
+ $paths = $app['config']['view.paths'];
+
+ return new FileViewFinder($app['files'], $paths);
+ });
+ }
+
+ /**
+ * Register the view environment.
+ *
+ * @return void
+ */
+ public function registerFactory()
+ {
+ $this->app->singleton('view', function ($app) {
+ // Next we need to grab the engine resolver instance that will be used by the
+ // environment. The resolver will be used by an environment to get each of
+ // the various engine implementations such as plain PHP or Blade engine.
+ $resolver = $app['view.engine.resolver'];
+
+ $finder = $app['view.finder'];
+
+ $env = new Factory($resolver, $finder, $app['events']);
+
+ // We will also set the container instance on this view environment since the
+ // view composers may be classes registered in the container, which allows
+ // for great testable, flexible composers for the application developer.
+ $env->setContainer($app);
+
+ $env->share('app', $app);
+
+ return $env;
+ });
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/View/composer.json b/application/vendor/laravel/framework/src/Illuminate/View/composer.json
index cdcda58..4eb012b 100644
--- a/application/vendor/laravel/framework/src/Illuminate/View/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/View/composer.json
@@ -14,11 +14,13 @@
}
],
"require": {
- "php": ">=5.4.0",
- "illuminate/container": "5.0.*",
- "illuminate/contracts": "5.0.*",
- "illuminate/filesystem": "5.0.*",
- "illuminate/support": "5.0.*"
+ "php": ">=5.5.9",
+ "illuminate/container": "5.1.*",
+ "illuminate/contracts": "5.1.*",
+ "illuminate/events": "5.1.*",
+ "illuminate/filesystem": "5.1.*",
+ "illuminate/support": "5.1.*",
+ "symfony/debug": "2.7.*"
},
"autoload": {
"psr-4": {
@@ -27,7 +29,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.1-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/CONTRIBUTING.md b/application/vendor/laravelcollective/html/CONTRIBUTING.md
similarity index 100%
rename from application/vendor/laravel/framework/CONTRIBUTING.md
rename to application/vendor/laravelcollective/html/CONTRIBUTING.md
diff --git a/application/vendor/laravelcollective/html/LICENSE.txt b/application/vendor/laravelcollective/html/LICENSE.txt
new file mode 100644
index 0000000..40cd6a3
--- /dev/null
+++ b/application/vendor/laravelcollective/html/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/application/vendor/laravelcollective/html/composer.json b/application/vendor/laravelcollective/html/composer.json
new file mode 100644
index 0000000..8d70bd5
--- /dev/null
+++ b/application/vendor/laravelcollective/html/composer.json
@@ -0,0 +1,33 @@
+{
+ "name": "laravelcollective/html",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "Adam Engebretson",
+ "email": "adam@laravelcollective.com"
+ },
+ {
+ "name": "Taylor Otwell",
+ "email": "taylorotwell@gmail.com"
+ }
+ ],
+ "require": {
+ "php": ">=5.5.9",
+ "illuminate/http": "5.1.*",
+ "illuminate/routing": "5.1.*",
+ "illuminate/session": "5.1.*",
+ "illuminate/support": "5.1.*"
+ },
+ "require-dev": {
+ "mockery/mockery": "~0.9",
+ "phpunit/phpunit": "~4.0"
+ },
+ "autoload": {
+ "psr-4": {
+ "Collective\\Html\\": "src/"
+ },
+ "files": [
+ "src/helpers.php"
+ ]
+ }
+}
diff --git a/application/vendor/laravelcollective/html/readme.md b/application/vendor/laravelcollective/html/readme.md
new file mode 100644
index 0000000..4d3d9e1
--- /dev/null
+++ b/application/vendor/laravelcollective/html/readme.md
@@ -0,0 +1,9 @@
+# Forms & HTML
+
+[](https://travis-ci.org/LaravelCollective/html)
+[](https://packagist.org/packages/laravelcollective/html)
+[](https://packagist.org/packages/laravelcollective/html)
+[](https://packagist.org/packages/laravelcollective/html)
+[](https://packagist.org/packages/laravelcollective/html)
+
+Official documentation for Forms & Html for The Laravel Framework can be found at the [LaravelCollective](http://laravelcollective.com) website.
diff --git a/application/vendor/laravelcollective/html/src/FormBuilder.php b/application/vendor/laravelcollective/html/src/FormBuilder.php
new file mode 100644
index 0000000..74d77de
--- /dev/null
+++ b/application/vendor/laravelcollective/html/src/FormBuilder.php
@@ -0,0 +1,1155 @@
+url = $url;
+ $this->html = $html;
+ $this->csrfToken = $csrfToken;
+ }
+
+ /**
+ * Open up a new HTML form.
+ *
+ * @param array $options
+ *
+ * @return string
+ */
+ public function open(array $options = [])
+ {
+ $method = array_get($options, 'method', 'post');
+
+ // We need to extract the proper method from the attributes. If the method is
+ // something other than GET or POST we'll use POST since we will spoof the
+ // actual method since forms don't support the reserved methods in HTML.
+ $attributes['method'] = $this->getMethod($method);
+
+ $attributes['action'] = $this->getAction($options);
+
+ $attributes['accept-charset'] = 'UTF-8';
+
+ // If the method is PUT, PATCH or DELETE we will need to add a spoofer hidden
+ // field that will instruct the Symfony request to pretend the method is a
+ // different method than it actually is, for convenience from the forms.
+ $append = $this->getAppendage($method);
+
+ if (isset($options['files']) && $options['files']) {
+ $options['enctype'] = 'multipart/form-data';
+ }
+
+ // Finally we're ready to create the final form HTML field. We will attribute
+ // format the array of attributes. We will also add on the appendage which
+ // is used to spoof requests for this PUT, PATCH, etc. methods on forms.
+ $attributes = array_merge(
+
+ $attributes, array_except($options, $this->reserved)
+
+ );
+
+ // Finally, we will concatenate all of the attributes into a single string so
+ // we can build out the final form open statement. We'll also append on an
+ // extra value for the hidden _method field if it's needed for the form.
+ $attributes = $this->html->attributes($attributes);
+
+ return ''.$append;
+ }
+
+ /**
+ * Create a new model based form builder.
+ *
+ * @param mixed $model
+ * @param array $options
+ *
+ * @return string
+ */
+ public function model($model, array $options = [])
+ {
+ $this->model = $model;
+
+ return $this->open($options);
+ }
+
+ /**
+ * Set the model instance on the form builder.
+ *
+ * @param mixed $model
+ *
+ * @return void
+ */
+ public function setModel($model)
+ {
+ $this->model = $model;
+ }
+
+ /**
+ * Close the current form.
+ *
+ * @return string
+ */
+ public function close()
+ {
+ $this->labels = [];
+
+ $this->model = null;
+
+ return '';
+ }
+
+ /**
+ * Generate a hidden field with the current CSRF token.
+ *
+ * @return string
+ */
+ public function token()
+ {
+ $token = !empty($this->csrfToken) ? $this->csrfToken : $this->session->getToken();
+
+ return $this->hidden('_token', $token);
+ }
+
+ /**
+ * Create a form label element.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function label($name, $value = null, $options = [])
+ {
+ $this->labels[] = $name;
+
+ $options = $this->html->attributes($options);
+
+ $value = e($this->formatLabel($name, $value));
+
+ return '';
+ }
+
+ /**
+ * Format the label value.
+ *
+ * @param string $name
+ * @param string|null $value
+ *
+ * @return string
+ */
+ protected function formatLabel($name, $value)
+ {
+ return $value ?: ucwords(str_replace('_', ' ', $name));
+ }
+
+ /**
+ * Create a form input field.
+ *
+ * @param string $type
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function input($type, $name, $value = null, $options = [])
+ {
+ if (!isset($options['name'])) {
+ $options['name'] = $name;
+ }
+
+ // We will get the appropriate value for the given field. We will look for the
+ // value in the session for the value in the old input data then we'll look
+ // in the model instance if one is set. Otherwise we will just use empty.
+ $id = $this->getIdAttribute($name, $options);
+
+ if (!in_array($type, $this->skipValueTypes)) {
+ $value = $this->getValueAttribute($name, $value);
+ }
+
+ // Once we have the type, value, and ID we can merge them into the rest of the
+ // attributes array so we can convert them into their HTML attribute format
+ // when creating the HTML element. Then, we will return the entire input.
+ $merge = compact('type', 'value', 'id');
+
+ $options = array_merge($options, $merge);
+
+ return 'html->attributes($options).'>';
+ }
+
+ /**
+ * Create a text input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function text($name, $value = null, $options = [])
+ {
+ return $this->input('text', $name, $value, $options);
+ }
+
+ /**
+ * Create a password input field.
+ *
+ * @param string $name
+ * @param array $options
+ *
+ * @return string
+ */
+ public function password($name, $options = [])
+ {
+ return $this->input('password', $name, '', $options);
+ }
+
+ /**
+ * Create a hidden input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function hidden($name, $value = null, $options = [])
+ {
+ return $this->input('hidden', $name, $value, $options);
+ }
+
+ /**
+ * Create an e-mail input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function email($name, $value = null, $options = [])
+ {
+ return $this->input('email', $name, $value, $options);
+ }
+
+ /**
+ * Create a tel input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function tel($name, $value = null, $options = [])
+ {
+ return $this->input('tel', $name, $value, $options);
+ }
+
+ /**
+ * Create a number input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function number($name, $value = null, $options = [])
+ {
+ return $this->input('number', $name, $value, $options);
+ }
+
+ /**
+ * Create a date input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function date($name, $value = null, $options = [])
+ {
+ if ($value instanceof DateTime) {
+ $value = $value->format('Y-m-d');
+ }
+
+ return $this->input('date', $name, $value, $options);
+ }
+
+ /**
+ * Create a datetime input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function datetime($name, $value = null, $options = [])
+ {
+ if ($value instanceof DateTime) {
+ $value = $value->format(DateTime::RFC3339);
+ }
+
+ return $this->input('datetime', $name, $value, $options);
+ }
+
+ /**
+ * Create a datetime-local input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function datetimeLocal($name, $value = null, $options = [])
+ {
+ if ($value instanceof DateTime) {
+ $value = $value->format('Y-m-d\TH:i');
+ }
+
+ return $this->input('datetime-local', $name, $value, $options);
+ }
+
+ /**
+ * Create a time input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function time($name, $value = null, $options = [])
+ {
+ return $this->input('time', $name, $value, $options);
+ }
+
+ /**
+ * Create a url input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function url($name, $value = null, $options = [])
+ {
+ return $this->input('url', $name, $value, $options);
+ }
+
+ /**
+ * Create a file input field.
+ *
+ * @param string $name
+ * @param array $options
+ *
+ * @return string
+ */
+ public function file($name, $options = [])
+ {
+ return $this->input('file', $name, null, $options);
+ }
+
+ /**
+ * Create a textarea input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function textarea($name, $value = null, $options = [])
+ {
+ if (!isset($options['name'])) {
+ $options['name'] = $name;
+ }
+
+ // Next we will look for the rows and cols attributes, as each of these are put
+ // on the textarea element definition. If they are not present, we will just
+ // assume some sane default values for these attributes for the developer.
+ $options = $this->setTextAreaSize($options);
+
+ $options['id'] = $this->getIdAttribute($name, $options);
+
+ $value = (string) $this->getValueAttribute($name, $value);
+
+ unset($options['size']);
+
+ // Next we will convert the attributes into a string form. Also we have removed
+ // the size attribute, as it was merely a short-cut for the rows and cols on
+ // the element. Then we'll create the final textarea elements HTML for us.
+ $options = $this->html->attributes($options);
+
+ return ''.e($value).'';
+ }
+
+ /**
+ * Set the text area size on the attributes.
+ *
+ * @param array $options
+ *
+ * @return array
+ */
+ protected function setTextAreaSize($options)
+ {
+ if (isset($options['size'])) {
+ return $this->setQuickTextAreaSize($options);
+ }
+
+ // If the "size" attribute was not specified, we will just look for the regular
+ // columns and rows attributes, using sane defaults if these do not exist on
+ // the attributes array. We'll then return this entire options array back.
+ $cols = array_get($options, 'cols', 50);
+
+ $rows = array_get($options, 'rows', 10);
+
+ return array_merge($options, compact('cols', 'rows'));
+ }
+
+ /**
+ * Set the text area size using the quick "size" attribute.
+ *
+ * @param array $options
+ *
+ * @return array
+ */
+ protected function setQuickTextAreaSize($options)
+ {
+ $segments = explode('x', $options['size']);
+
+ return array_merge($options, ['cols' => $segments[0], 'rows' => $segments[1]]);
+ }
+
+ /**
+ * Create a select box field.
+ *
+ * @param string $name
+ * @param array $list
+ * @param string $selected
+ * @param array $options
+ *
+ * @return string
+ */
+ public function select($name, $list = [], $selected = null, $options = [])
+ {
+ // When building a select box the "value" attribute is really the selected one
+ // so we will use that when checking the model or session for a value which
+ // should provide a convenient method of re-populating the forms on post.
+ $selected = $this->getValueAttribute($name, $selected);
+
+ $options['id'] = $this->getIdAttribute($name, $options);
+
+ if (!isset($options['name'])) {
+ $options['name'] = $name;
+ }
+
+ // We will simply loop through the options and build an HTML value for each of
+ // them until we have an array of HTML declarations. Then we will join them
+ // all together into one single HTML element that can be put on the form.
+ $html = [];
+
+ if (isset($options['placeholder'])) {
+ $html[] = $this->placeholderOption($options['placeholder'], $selected);
+ unset($options['placeholder']);
+ }
+
+ foreach ($list as $value => $display) {
+ $html[] = $this->getSelectOption($display, $value, $selected);
+ }
+
+ // Once we have all of this HTML, we can join this into a single element after
+ // formatting the attributes into an HTML "attributes" string, then we will
+ // build out a final select statement, which will contain all the values.
+ $options = $this->html->attributes($options);
+
+ $list = implode('', $html);
+
+ return "{$list}";
+ }
+
+ /**
+ * Create a select range field.
+ *
+ * @param string $name
+ * @param string $begin
+ * @param string $end
+ * @param string $selected
+ * @param array $options
+ *
+ * @return string
+ */
+ public function selectRange($name, $begin, $end, $selected = null, $options = [])
+ {
+ $range = array_combine($range = range($begin, $end), $range);
+
+ return $this->select($name, $range, $selected, $options);
+ }
+
+ /**
+ * Create a select year field.
+ *
+ * @param string $name
+ * @param string $begin
+ * @param string $end
+ * @param string $selected
+ * @param array $options
+ *
+ * @return string
+ */
+ public function selectYear()
+ {
+ return call_user_func_array([$this, 'selectRange'], func_get_args());
+ }
+
+ /**
+ * Create a select month field.
+ *
+ * @param string $name
+ * @param string $selected
+ * @param array $options
+ * @param string $format
+ *
+ * @return string
+ */
+ public function selectMonth($name, $selected = null, $options = [], $format = '%B')
+ {
+ $months = [];
+
+ foreach (range(1, 12) as $month) {
+ $months[$month] = strftime($format, mktime(0, 0, 0, $month, 1));
+ }
+
+ return $this->select($name, $months, $selected, $options);
+ }
+
+ /**
+ * Get the select option for the given value.
+ *
+ * @param string $display
+ * @param string $value
+ * @param string $selected
+ *
+ * @return string
+ */
+ public function getSelectOption($display, $value, $selected)
+ {
+ if (is_array($display)) {
+ return $this->optionGroup($display, $value, $selected);
+ }
+
+ return $this->option($display, $value, $selected);
+ }
+
+ /**
+ * Create an option group form element.
+ *
+ * @param array $list
+ * @param string $label
+ * @param string $selected
+ *
+ * @return string
+ */
+ protected function optionGroup($list, $label, $selected)
+ {
+ $html = [];
+
+ foreach ($list as $value => $display) {
+ $html[] = $this->option($display, $value, $selected);
+ }
+
+ return '';
+ }
+
+ /**
+ * Create a select element option.
+ *
+ * @param string $display
+ * @param string $value
+ * @param string $selected
+ *
+ * @return string
+ */
+ protected function option($display, $value, $selected)
+ {
+ $selected = $this->getSelectedValue($value, $selected);
+
+ $options = ['value' => $value, 'selected' => $selected];
+
+ return 'html->attributes($options).'>'.e($display).'';
+ }
+
+ /**
+ * Create a placeholder select element option.
+ *
+ * @param $display
+ * @param $selected
+ *
+ * @return string
+ */
+ protected function placeholderOption($display, $selected)
+ {
+ $selected = $this->getSelectedValue(null, $selected);
+
+ $options = compact('selected');
+ $options['value'] = '';
+
+ return 'html->attributes($options).'>'.e($display).'';
+ }
+
+ /**
+ * Determine if the value is selected.
+ *
+ * @param string $value
+ * @param string $selected
+ *
+ * @return string|null
+ */
+ protected function getSelectedValue($value, $selected)
+ {
+ if (is_array($selected)) {
+ return in_array($value, $selected, true) || in_array((string) $value, $selected, true)
+ ? 'selected'
+ : null;
+ }
+
+ return ((string) $value == (string) $selected) ? 'selected' : null;
+ }
+
+ /**
+ * Create a checkbox input field.
+ *
+ * @param string $name
+ * @param mixed $value
+ * @param bool $checked
+ * @param array $options
+ *
+ * @return string
+ */
+ public function checkbox($name, $value = 1, $checked = null, $options = [])
+ {
+ return $this->checkable('checkbox', $name, $value, $checked, $options);
+ }
+
+ /**
+ * Create a radio button input field.
+ *
+ * @param string $name
+ * @param mixed $value
+ * @param bool $checked
+ * @param array $options
+ *
+ * @return string
+ */
+ public function radio($name, $value = null, $checked = null, $options = [])
+ {
+ if (is_null($value)) {
+ $value = $name;
+ }
+
+ return $this->checkable('radio', $name, $value, $checked, $options);
+ }
+
+ /**
+ * Create a checkable input field.
+ *
+ * @param string $type
+ * @param string $name
+ * @param mixed $value
+ * @param bool $checked
+ * @param array $options
+ *
+ * @return string
+ */
+ protected function checkable($type, $name, $value, $checked, $options)
+ {
+ $checked = $this->getCheckedState($type, $name, $value, $checked);
+
+ if ($checked) {
+ $options['checked'] = 'checked';
+ }
+
+ return $this->input($type, $name, $value, $options);
+ }
+
+ /**
+ * Get the check state for a checkable input.
+ *
+ * @param string $type
+ * @param string $name
+ * @param mixed $value
+ * @param bool $checked
+ *
+ * @return bool
+ */
+ protected function getCheckedState($type, $name, $value, $checked)
+ {
+ switch ($type) {
+ case 'checkbox':
+ return $this->getCheckboxCheckedState($name, $value, $checked);
+
+ case 'radio':
+ return $this->getRadioCheckedState($name, $value, $checked);
+
+ default:
+ return $this->getValueAttribute($name) == $value;
+ }
+ }
+
+ /**
+ * Get the check state for a checkbox input.
+ *
+ * @param string $name
+ * @param mixed $value
+ * @param bool $checked
+ *
+ * @return bool
+ */
+ protected function getCheckboxCheckedState($name, $value, $checked)
+ {
+ if (isset($this->session) && !$this->oldInputIsEmpty() && is_null($this->old($name))) {
+ return false;
+ }
+
+ if ($this->missingOldAndModel($name)) {
+ return $checked;
+ }
+
+ $posted = $this->getValueAttribute($name, $checked);
+
+ if (is_array($posted)) {
+ return in_array($value, $posted);
+ } elseif ($posted instanceof Collection) {
+ return $posted->contains('id', $value);
+ } else {
+ return (bool) $posted;
+ }
+ }
+
+ /**
+ * Get the check state for a radio input.
+ *
+ * @param string $name
+ * @param mixed $value
+ * @param bool $checked
+ *
+ * @return bool
+ */
+ protected function getRadioCheckedState($name, $value, $checked)
+ {
+ if ($this->missingOldAndModel($name)) {
+ return $checked;
+ }
+
+ return $this->getValueAttribute($name) == $value;
+ }
+
+ /**
+ * Determine if old input or model input exists for a key.
+ *
+ * @param string $name
+ *
+ * @return bool
+ */
+ protected function missingOldAndModel($name)
+ {
+ return (is_null($this->old($name)) && is_null($this->getModelValueAttribute($name)));
+ }
+
+ /**
+ * Create a HTML reset input element.
+ *
+ * @param string $value
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function reset($value, $attributes = [])
+ {
+ return $this->input('reset', null, $value, $attributes);
+ }
+
+ /**
+ * Create a HTML image input element.
+ *
+ * @param string $url
+ * @param string $name
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function image($url, $name = null, $attributes = [])
+ {
+ $attributes['src'] = $this->url->asset($url);
+
+ return $this->input('image', $name, null, $attributes);
+ }
+
+ /**
+ * Create a color input field.
+ *
+ * @param string $name
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function color($name, $value = null, $options = [])
+ {
+ return $this->input('color', $name, $value, $options);
+ }
+
+ /**
+ * Create a submit button element.
+ *
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function submit($value = null, $options = [])
+ {
+ return $this->input('submit', null, $value, $options);
+ }
+
+ /**
+ * Create a button element.
+ *
+ * @param string $value
+ * @param array $options
+ *
+ * @return string
+ */
+ public function button($value = null, $options = [])
+ {
+ if (!array_key_exists('type', $options)) {
+ $options['type'] = 'button';
+ }
+
+ return 'html->attributes($options).'>'.$value.'';
+ }
+
+ /**
+ * Parse the form action method.
+ *
+ * @param string $method
+ *
+ * @return string
+ */
+ protected function getMethod($method)
+ {
+ $method = strtoupper($method);
+
+ return $method != 'GET' ? 'POST' : $method;
+ }
+
+ /**
+ * Get the form action from the options.
+ *
+ * @param array $options
+ *
+ * @return string
+ */
+ protected function getAction(array $options)
+ {
+ // We will also check for a "route" or "action" parameter on the array so that
+ // developers can easily specify a route or controller action when creating
+ // a form providing a convenient interface for creating the form actions.
+ if (isset($options['url'])) {
+ return $this->getUrlAction($options['url']);
+ }
+
+ if (isset($options['route'])) {
+ return $this->getRouteAction($options['route']);
+ }
+
+ // If an action is available, we are attempting to open a form to a controller
+ // action route. So, we will use the URL generator to get the path to these
+ // actions and return them from the method. Otherwise, we'll use current.
+ elseif (isset($options['action'])) {
+ return $this->getControllerAction($options['action']);
+ }
+
+ return $this->url->current();
+ }
+
+ /**
+ * Get the action for a "url" option.
+ *
+ * @param array|string $options
+ *
+ * @return string
+ */
+ protected function getUrlAction($options)
+ {
+ if (is_array($options)) {
+ return $this->url->to($options[0], array_slice($options, 1));
+ }
+
+ return $this->url->to($options);
+ }
+
+ /**
+ * Get the action for a "route" option.
+ *
+ * @param array|string $options
+ *
+ * @return string
+ */
+ protected function getRouteAction($options)
+ {
+ if (is_array($options)) {
+ return $this->url->route($options[0], array_slice($options, 1));
+ }
+
+ return $this->url->route($options);
+ }
+
+ /**
+ * Get the action for an "action" option.
+ *
+ * @param array|string $options
+ *
+ * @return string
+ */
+ protected function getControllerAction($options)
+ {
+ if (is_array($options)) {
+ return $this->url->action($options[0], array_slice($options, 1));
+ }
+
+ return $this->url->action($options);
+ }
+
+ /**
+ * Get the form appendage for the given method.
+ *
+ * @param string $method
+ *
+ * @return string
+ */
+ protected function getAppendage($method)
+ {
+ list($method, $appendage) = [strtoupper($method), ''];
+
+ // If the HTTP method is in this list of spoofed methods, we will attach the
+ // method spoofer hidden input to the form. This allows us to use regular
+ // form to initiate PUT and DELETE requests in addition to the typical.
+ if (in_array($method, $this->spoofedMethods)) {
+ $appendage .= $this->hidden('_method', $method);
+ }
+
+ // If the method is something other than GET we will go ahead and attach the
+ // CSRF token to the form, as this can't hurt and is convenient to simply
+ // always have available on every form the developers creates for them.
+ if ($method != 'GET') {
+ $appendage .= $this->token();
+ }
+
+ return $appendage;
+ }
+
+ /**
+ * Get the ID attribute for a field name.
+ *
+ * @param string $name
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function getIdAttribute($name, $attributes)
+ {
+ if (array_key_exists('id', $attributes)) {
+ return $attributes['id'];
+ }
+
+ if (in_array($name, $this->labels)) {
+ return $name;
+ }
+ }
+
+ /**
+ * Get the value that should be assigned to the field.
+ *
+ * @param string $name
+ * @param string $value
+ *
+ * @return mixed
+ */
+ public function getValueAttribute($name, $value = null)
+ {
+ if (is_null($name)) {
+ return $value;
+ }
+
+ if (!is_null($this->old($name))) {
+ return $this->old($name);
+ }
+
+ if (!is_null($value)) {
+ return $value;
+ }
+
+ if (isset($this->model)) {
+ return $this->getModelValueAttribute($name);
+ }
+ }
+
+ /**
+ * Get the model value that should be assigned to the field.
+ *
+ * @param string $name
+ *
+ * @return mixed
+ */
+ protected function getModelValueAttribute($name)
+ {
+ return data_get($this->model, $this->transformKey($name));
+ }
+
+ /**
+ * Get a value from the session's old input.
+ *
+ * @param string $name
+ *
+ * @return mixed
+ */
+ public function old($name)
+ {
+ if (isset($this->session)) {
+ return $this->session->getOldInput($this->transformKey($name));
+ }
+ }
+
+ /**
+ * Determine if the old input is empty.
+ *
+ * @return bool
+ */
+ public function oldInputIsEmpty()
+ {
+ return (isset($this->session) && count($this->session->getOldInput()) == 0);
+ }
+
+ /**
+ * Transform key from array to dot syntax.
+ *
+ * @param string $key
+ *
+ * @return string
+ */
+ protected function transformKey($key)
+ {
+ return str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], $key);
+ }
+
+ /**
+ * Get the session store implementation.
+ *
+ * @return \Illuminate\Session\SessionInterface $session
+ */
+ public function getSessionStore()
+ {
+ return $this->session;
+ }
+
+ /**
+ * Set the session store implementation.
+ *
+ * @param \Illuminate\Session\SessionInterface $session
+ *
+ * @return $this
+ */
+ public function setSessionStore(SessionInterface $session)
+ {
+ $this->session = $session;
+
+ return $this;
+ }
+}
diff --git a/application/vendor/laravelcollective/html/src/FormFacade.php b/application/vendor/laravelcollective/html/src/FormFacade.php
new file mode 100644
index 0000000..66d459f
--- /dev/null
+++ b/application/vendor/laravelcollective/html/src/FormFacade.php
@@ -0,0 +1,21 @@
+url = $url;
+ }
+
+ /**
+ * Convert an HTML string to entities.
+ *
+ * @param string $value
+ *
+ * @return string
+ */
+ public function entities($value)
+ {
+ return htmlentities($value, ENT_QUOTES, 'UTF-8', false);
+ }
+
+ /**
+ * Convert entities to HTML characters.
+ *
+ * @param string $value
+ *
+ * @return string
+ */
+ public function decode($value)
+ {
+ return html_entity_decode($value, ENT_QUOTES, 'UTF-8');
+ }
+
+ /**
+ * Generate a link to a JavaScript file.
+ *
+ * @param string $url
+ * @param array $attributes
+ * @param bool $secure
+ *
+ * @return string
+ */
+ public function script($url, $attributes = [], $secure = null)
+ {
+ $attributes['src'] = $this->url->asset($url, $secure);
+
+ return 'attributes($attributes).'>'.PHP_EOL;
+ }
+
+ /**
+ * Generate a link to a CSS file.
+ *
+ * @param string $url
+ * @param array $attributes
+ * @param bool $secure
+ *
+ * @return string
+ */
+ public function style($url, $attributes = [], $secure = null)
+ {
+ $defaults = ['media' => 'all', 'type' => 'text/css', 'rel' => 'stylesheet'];
+
+ $attributes = $attributes + $defaults;
+
+ $attributes['href'] = $this->url->asset($url, $secure);
+
+ return 'attributes($attributes).'>'.PHP_EOL;
+ }
+
+ /**
+ * Generate an HTML image element.
+ *
+ * @param string $url
+ * @param string $alt
+ * @param array $attributes
+ * @param bool $secure
+ *
+ * @return string
+ */
+ public function image($url, $alt = null, $attributes = [], $secure = null)
+ {
+ $attributes['alt'] = $alt;
+
+ return 'attributes($attributes).'>';
+ }
+
+ /**
+ * Generate a link to a Favicon file.
+ *
+ * @param string $url
+ * @param array $attributes
+ * @param bool $secure
+ *
+ * @return string
+ */
+ public function favicon($url, $attributes = [], $secure = null)
+ {
+ $defaults = ['rel' => 'shortcut icon', 'type' => 'image/x-icon'];
+
+ $attributes = $attributes + $defaults;
+
+ $attributes['href'] = $this->url->asset($url, $secure);
+
+ return 'attributes($attributes).'>'.PHP_EOL;
+ }
+
+ /**
+ * Generate a HTML link.
+ *
+ * @param string $url
+ * @param string $title
+ * @param array $attributes
+ * @param bool $secure
+ *
+ * @return string
+ */
+ public function link($url, $title = null, $attributes = [], $secure = null)
+ {
+ $url = $this->url->to($url, [], $secure);
+
+ if (is_null($title) || $title === false) {
+ $title = $url;
+ }
+
+ return 'attributes($attributes).'>'.$this->entities($title).'';
+ }
+
+ /**
+ * Generate a HTTPS HTML link.
+ *
+ * @param string $url
+ * @param string $title
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function secureLink($url, $title = null, $attributes = [])
+ {
+ return $this->link($url, $title, $attributes, true);
+ }
+
+ /**
+ * Generate a HTML link to an asset.
+ *
+ * @param string $url
+ * @param string $title
+ * @param array $attributes
+ * @param bool $secure
+ *
+ * @return string
+ */
+ public function linkAsset($url, $title = null, $attributes = [], $secure = null)
+ {
+ $url = $this->url->asset($url, $secure);
+
+ return $this->link($url, $title ?: $url, $attributes, $secure);
+ }
+
+ /**
+ * Generate a HTTPS HTML link to an asset.
+ *
+ * @param string $url
+ * @param string $title
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function linkSecureAsset($url, $title = null, $attributes = [])
+ {
+ return $this->linkAsset($url, $title, $attributes, true);
+ }
+
+ /**
+ * Generate a HTML link to a named route.
+ *
+ * @param string $name
+ * @param string $title
+ * @param array $parameters
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function linkRoute($name, $title = null, $parameters = [], $attributes = [])
+ {
+ return $this->link($this->url->route($name, $parameters), $title, $attributes);
+ }
+
+ /**
+ * Generate a HTML link to a controller action.
+ *
+ * @param string $action
+ * @param string $title
+ * @param array $parameters
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function linkAction($action, $title = null, $parameters = [], $attributes = [])
+ {
+ return $this->link($this->url->action($action, $parameters), $title, $attributes);
+ }
+
+ /**
+ * Generate a HTML link to an email address.
+ *
+ * @param string $email
+ * @param string $title
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function mailto($email, $title = null, $attributes = [])
+ {
+ $email = $this->email($email);
+
+ $title = $title ?: $email;
+
+ $email = $this->obfuscate('mailto:').$email;
+
+ return 'attributes($attributes).'>'.$this->entities($title).'';
+ }
+
+ /**
+ * Obfuscate an e-mail address to prevent spam-bots from sniffing it.
+ *
+ * @param string $email
+ *
+ * @return string
+ */
+ public function email($email)
+ {
+ return str_replace('@', '@', $this->obfuscate($email));
+ }
+
+ /**
+ * Generate an ordered list of items.
+ *
+ * @param array $list
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function ol($list, $attributes = [])
+ {
+ return $this->listing('ol', $list, $attributes);
+ }
+
+ /**
+ * Generate an un-ordered list of items.
+ *
+ * @param array $list
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function ul($list, $attributes = [])
+ {
+ return $this->listing('ul', $list, $attributes);
+ }
+
+ /**
+ * Generate a description list of items.
+ *
+ * @param array $list
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function dl(array $list, array $attributes = [])
+ {
+ $attributes = $this->attributes($attributes);
+
+ $html = "";
+
+ foreach ($list as $key => $value) {
+ $value = (array) $value;
+
+ $html .= "$key";
+
+ foreach ($value as $v_key => $v_value) {
+ $html .= "$v_value";
+ }
+ }
+
+ $html .= '';
+
+ return $html;
+ }
+
+ /**
+ * Create a listing HTML element.
+ *
+ * @param string $type
+ * @param array $list
+ * @param array $attributes
+ *
+ * @return string
+ */
+ protected function listing($type, $list, $attributes = [])
+ {
+ $html = '';
+
+ if (count($list) == 0) {
+ return $html;
+ }
+
+ // Essentially we will just spin through the list and build the list of the HTML
+ // elements from the array. We will also handled nested lists in case that is
+ // present in the array. Then we will build out the final listing elements.
+ foreach ($list as $key => $value) {
+ $html .= $this->listingElement($key, $type, $value);
+ }
+
+ $attributes = $this->attributes($attributes);
+
+ return "<{$type}{$attributes}>{$html}";
+ }
+
+ /**
+ * Create the HTML for a listing element.
+ *
+ * @param mixed $key
+ * @param string $type
+ * @param mixed $value
+ *
+ * @return string
+ */
+ protected function listingElement($key, $type, $value)
+ {
+ if (is_array($value)) {
+ return $this->nestedListing($key, $type, $value);
+ } else {
+ return ''.e($value).'';
+ }
+ }
+
+ /**
+ * Create the HTML for a nested listing attribute.
+ *
+ * @param mixed $key
+ * @param string $type
+ * @param mixed $value
+ *
+ * @return string
+ */
+ protected function nestedListing($key, $type, $value)
+ {
+ if (is_int($key)) {
+ return $this->listing($type, $value);
+ } else {
+ return ''.$key.$this->listing($type, $value).'';
+ }
+ }
+
+ /**
+ * Build an HTML attribute string from an array.
+ *
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function attributes($attributes)
+ {
+ $html = [];
+
+ foreach ((array) $attributes as $key => $value) {
+ $element = $this->attributeElement($key, $value);
+
+ if (!is_null($element)) {
+ $html[] = $element;
+ }
+ }
+
+ return count($html) > 0 ? ' '.implode(' ', $html) : '';
+ }
+
+ /**
+ * Build a single attribute element.
+ *
+ * @param string $key
+ * @param string $value
+ *
+ * @return string
+ */
+ protected function attributeElement($key, $value)
+ {
+ // For numeric keys we will assume that the key and the value are the same
+ // as this will convert HTML attributes such as "required" to a correct
+ // form like required="required" instead of using incorrect numerics.
+ if (is_numeric($key)) {
+ $key = $value;
+ }
+
+ if (!is_null($value)) {
+ return $key.'="'.e($value).'"';
+ }
+ }
+
+ /**
+ * Obfuscate a string to prevent spam-bots from sniffing it.
+ *
+ * @param string $value
+ *
+ * @return string
+ */
+ public function obfuscate($value)
+ {
+ $safe = '';
+
+ foreach (str_split($value) as $letter) {
+ if (ord($letter) > 128) {
+ return $letter;
+ }
+
+ // To properly obfuscate the value, we will randomly convert each letter to
+ // its entity or hexadecimal representation, keeping a bot from sniffing
+ // the randomly obfuscated letters out of the string on the responses.
+ switch (rand(1, 3)) {
+ case 1:
+ $safe .= '&#'.ord($letter).';'; break;
+
+ case 2:
+ $safe .= '&#x'.dechex(ord($letter)).';'; break;
+
+ case 3:
+ $safe .= $letter;
+ }
+ }
+
+ return $safe;
+ }
+
+ /**
+ * Generate a meta tag.
+ *
+ * @param string $name
+ * @param string $content
+ * @param array $attributes
+ *
+ * @return string
+ */
+ public function meta($name, $content, array $attributes = [])
+ {
+ $defaults = compact('name', 'content');
+
+ $attributes = array_merge($defaults, $attributes);
+
+ return 'attributes($attributes).'>'.PHP_EOL;
+ }
+}
diff --git a/application/vendor/laravelcollective/html/src/HtmlFacade.php b/application/vendor/laravelcollective/html/src/HtmlFacade.php
new file mode 100644
index 0000000..1202359
--- /dev/null
+++ b/application/vendor/laravelcollective/html/src/HtmlFacade.php
@@ -0,0 +1,21 @@
+registerHtmlBuilder();
+
+ $this->registerFormBuilder();
+
+ $this->app->alias('html', 'Collective\Html\HtmlBuilder');
+ $this->app->alias('form', 'Collective\Html\FormBuilder');
+ }
+
+ /**
+ * Register the HTML builder instance.
+ *
+ * @return void
+ */
+ protected function registerHtmlBuilder()
+ {
+ $this->app->singleton('html', function ($app) {
+ return new HtmlBuilder($app['url']);
+ });
+ }
+
+ /**
+ * Register the form builder instance.
+ *
+ * @return void
+ */
+ protected function registerFormBuilder()
+ {
+ $this->app->singleton('form', function ($app) {
+ $form = new FormBuilder($app['html'], $app['url'], $app['session.store']->getToken());
+
+ return $form->setSessionStore($app['session.store']);
+ });
+ }
+
+ /**
+ * Get the services provided by the provider.
+ *
+ * @return array
+ */
+ public function provides()
+ {
+ return ['html', 'form', 'Collective\Html\HtmlBuilder', 'Collective\Html\FormBuilder'];
+ }
+}
diff --git a/application/vendor/laravelcollective/html/src/helpers.php b/application/vendor/laravelcollective/html/src/helpers.php
new file mode 100644
index 0000000..b84673b
--- /dev/null
+++ b/application/vendor/laravelcollective/html/src/helpers.php
@@ -0,0 +1,69 @@
+link($url, $title, $attributes, $secure);
+ }
+}
+
+if (!function_exists('link_to_asset')) {
+ /**
+ * Generate a HTML link to an asset.
+ *
+ * @param string $url
+ * @param string $title
+ * @param array $attributes
+ * @param bool $secure
+ *
+ * @return string
+ */
+ function link_to_asset($url, $title = null, $attributes = [], $secure = null)
+ {
+ return app('html')->linkAsset($url, $title, $attributes, $secure);
+ }
+}
+
+if (!function_exists('link_to_route')) {
+ /**
+ * Generate a HTML link to a named route.
+ *
+ * @param string $name
+ * @param string $title
+ * @param array $parameters
+ * @param array $attributes
+ *
+ * @return string
+ */
+ function link_to_route($name, $title = null, $parameters = [], $attributes = [])
+ {
+ return app('html')->linkRoute($name, $title, $parameters, $attributes);
+ }
+}
+
+if (!function_exists('link_to_action')) {
+ /**
+ * Generate a HTML link to a controller action.
+ *
+ * @param string $action
+ * @param string $title
+ * @param array $parameters
+ * @param array $attributes
+ *
+ * @return string
+ */
+ function link_to_action($action, $title = null, $parameters = [], $attributes = [])
+ {
+ return app('html')->linkAction($action, $title, $parameters, $attributes);
+ }
+}
diff --git a/application/vendor/league/flysystem/LICENSE b/application/vendor/league/flysystem/LICENSE
index 308972c..f2684c8 100644
--- a/application/vendor/league/flysystem/LICENSE
+++ b/application/vendor/league/flysystem/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015 Frank de Jonge
+Copyright (c) 2013-2019 Frank de Jonge
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/application/vendor/league/flysystem/README.md b/application/vendor/league/flysystem/README.md
deleted file mode 100644
index 45b7c49..0000000
--- a/application/vendor/league/flysystem/README.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# League\Flysystem
-
-[](https://twitter.com/frankdejonge)
-[](https://travis-ci.org/thephpleague/flysystem)
-[](https://scrutinizer-ci.com/g/thephpleague/flysystem/code-structure)
-[](https://scrutinizer-ci.com/g/thephpleague/flysystem)
-[](LICENSE)
-[](https://packagist.org/packages/league/flysystem)
-[](https://packagist.org/packages/league/flysystem)
-
-[](https://insight.sensiolabs.com/projects/9820f1af-2fd0-4ab6-b42a-03e0c821e0af)
-
-Flysystem is a filesystem abstraction which allows you to easily swap out a local filesystem for a remote one.
-
-# Goals
-
-* Have a generic API for handling common tasks across multiple file storage engines.
-* Have consistent output which you can rely on.
-* Integrate well with other packages/frameworks.
-* Be cacheable.
-* Emulate directories in systems that support none, like AwsS3.
-* Support third party plugins.
-* Make it easy to test your filesystem interactions.
-* Support streams for big file handling.
-
-# Installation
-
-Through Composer, obviously:
-
-```
-composer require league/flysystem
-```
-
-You can also use Flysystem without using Composer by registering an autoloader function:
-
-```php
-spl_autoload_register(function($class) {
- $prefix = 'League\\Flysystem\\';
-
- if ( ! substr($class, 0, 17) === $prefix) {
- return;
- }
-
- $class = substr($class, strlen($prefix));
- $location = __DIR__ . 'path/to/flysystem/src/' . str_replace('\\', '/', $class) . '.php';
-
- if (is_file($location)) {
- require_once($location);
- }
-});
-```
-
-## Integrations
-
-Want to get started quickly? Check out some of these integrations:
-
-* Laravel integration: https://github.com/GrahamCampbell/Laravel-Flysystem
-* Symfony integration: https://github.com/1up-lab/OneupFlysystemBundle
-* Zend Framework integration: https://github.com/bushbaby/BsbFlysystem
-* CakePHP integration: https://github.com/WyriHaximus/FlyPie
-* Silex integration: https://github.com/WyriHaximus/SliFly
-* Cilex integration: https://github.com/WyriHaximus/cli-fly
-* Yii 2 integration: https://github.com/creocoder/yii2-flysystem
-* Backup manager: https://github.com/heybigname/backup-manager
-
-## Adapters
-
-* Local
-* Amazon Web Services - S3 V2: https://github.com/thephpleague/flysystem-aws-s3-v2
-* Amazon Web Services - S3 V3: https://github.com/thephpleague/flysystem-aws-s3-v3
-* Rackspace Cloud Files: https://github.com/thephpleague/flysystem-rackspace
-* Dropbox: https://github.com/thephpleague/flysystem-dropbox
-* Copy: https://github.com/thephpleague/flysystem-copy
-* Ftp
-* Sftp (through phpseclib): https://github.com/thephpleague/flysystem-sftp
-* Zip (through ZipArchive): https://github.com/thephpleague/flysystem-ziparchive
-* WebDAV (through SabreDAV): https://github.com/thephpleague/flysystem-webdav
-* PHPCR: https://github.com/thephpleague/flysystem-phpcr
-* Azure Blob Storage
-* NullAdapter
-
-## Caching
-
-* Memory (array caching)
-* Redis (through Predis)
-* Memcached
-* Adapter
-* Stash
-
-## Documentation
-
-[Check out the documentation](http://flysystem.thephpleague.com/)
-
-## Security
-
-If you discover any security related issues, please email frenky@frenky.net instead of using the issue tracker.
-
-
-# Enjoy
-
-Oh and if you've come down this far, you might as well follow me on [twitter](http://twitter.com/frankdejonge).
diff --git a/application/vendor/league/flysystem/composer.json b/application/vendor/league/flysystem/composer.json
index dab5d14..84229e9 100644
--- a/application/vendor/league/flysystem/composer.json
+++ b/application/vendor/league/flysystem/composer.json
@@ -14,14 +14,12 @@
}
],
"require": {
- "php": ">=5.4.0"
+ "php": ">=5.5.9",
+ "ext-fileinfo": "*"
},
"require-dev": {
- "ext-fileinfo": "*",
- "phpunit/phpunit": "~4.1",
- "mockery/mockery": "~0.9",
- "phpspec/phpspec": "^2.2",
- "phpspec/prophecy-phpunit": "~1.0"
+ "phpspec/phpspec": "^3.4",
+ "phpunit/phpunit": "^5.7.10"
},
"autoload": {
"psr-4": {
@@ -31,31 +29,36 @@
"autoload-dev": {
"psr-4": {
"League\\Flysystem\\Stub\\": "stub/"
- }
+ },
+ "files": [
+ "tests/PHPUnitHacks.php"
+ ]
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
"league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
"league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
- "league/flysystem-copy": "Allows you to use Copy.com storage",
"league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
"league/flysystem-webdav": "Allows you to use WebDAV storage",
"league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
"league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
- "league/flysystem-dropbox": "Allows you to use Dropbox storage",
+ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
+ "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications",
"league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
+ "ext-ftp": "Allows you to use FTP server storage",
+ "ext-openssl": "Allows you to use FTPS server storage",
"league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
"league/flysystem-ziparchive": "Allows you to use ZipArchive adapter"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
},
- "config": {
- "bin-dir": "bin"
- },
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
+ },
+ "scripts": {
+ "phpstan": "php phpstan.php"
}
}
diff --git a/application/vendor/league/flysystem/deprecations.md b/application/vendor/league/flysystem/deprecations.md
new file mode 100644
index 0000000..c336a42
--- /dev/null
+++ b/application/vendor/league/flysystem/deprecations.md
@@ -0,0 +1,19 @@
+# Deprecations
+
+This document lists all the planned deprecations.
+
+## Handlers will be removed in 2.0
+
+The `Handler` type and associated calls will be removed in version 2.0.
+
+### Upgrade path
+
+You should create your own implementation for handling OOP usage,
+but it's recommended to move away from using an OOP-style wrapper entirely.
+
+The reason for this is that it's too easy for implementation details (for
+your application this is Flysystem) to leak into the application. The most
+important part for Flysystem is that it improves portability and creates a
+solid boundary between your application core and the infrastructure you use.
+The OOP-style handling breaks this principle, therefore I want to stop
+promoting it.
diff --git a/application/vendor/league/flysystem/src/Adapter/AbstractAdapter.php b/application/vendor/league/flysystem/src/Adapter/AbstractAdapter.php
index 4617c95..e577ac4 100644
--- a/application/vendor/league/flysystem/src/Adapter/AbstractAdapter.php
+++ b/application/vendor/league/flysystem/src/Adapter/AbstractAdapter.php
@@ -7,7 +7,7 @@
abstract class AbstractAdapter implements AdapterInterface
{
/**
- * @var string path prefix
+ * @var string|null path prefix
*/
protected $pathPrefix;
@@ -21,23 +21,25 @@ abstract class AbstractAdapter implements AdapterInterface
*
* @param string $prefix
*
- * @return self
+ * @return void
*/
public function setPathPrefix($prefix)
{
- $is_empty = empty($prefix);
+ $prefix = (string) $prefix;
- if (! $is_empty) {
- $prefix = rtrim($prefix, $this->pathSeparator).$this->pathSeparator;
+ if ($prefix === '') {
+ $this->pathPrefix = null;
+
+ return;
}
- $this->pathPrefix = $is_empty ? null : $prefix;
+ $this->pathPrefix = rtrim($prefix, '\\/') . $this->pathSeparator;
}
/**
* Get the path prefix.
*
- * @return string path prefix
+ * @return string|null path prefix or null if pathPrefix is empty
*/
public function getPathPrefix()
{
@@ -53,17 +55,7 @@ public function getPathPrefix()
*/
public function applyPathPrefix($path)
{
- $path = ltrim($path, '\\/');
-
- if (strlen($path) === 0) {
- return $this->getPathPrefix() ?: '';
- }
-
- if ($prefix = $this->getPathPrefix()) {
- $path = $prefix.$path;
- }
-
- return $path;
+ return $this->getPathPrefix() . ltrim($path, '\\/');
}
/**
@@ -75,12 +67,6 @@ public function applyPathPrefix($path)
*/
public function removePathPrefix($path)
{
- $pathPrefix = $this->getPathPrefix();
-
- if ($pathPrefix === null) {
- return $path;
- }
-
- return substr($path, strlen($pathPrefix));
+ return substr($path, strlen($this->getPathPrefix()));
}
}
diff --git a/application/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php b/application/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php
index 102eab4..578b491 100644
--- a/application/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php
+++ b/application/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php
@@ -6,6 +6,8 @@
use League\Flysystem\AdapterInterface;
use League\Flysystem\Config;
use League\Flysystem\NotSupportedException;
+use League\Flysystem\SafeStorage;
+use RuntimeException;
abstract class AbstractFtpAdapter extends AbstractAdapter
{
@@ -24,16 +26,6 @@ abstract class AbstractFtpAdapter extends AbstractAdapter
*/
protected $port = 21;
- /**
- * @var string|null
- */
- protected $username;
-
- /**
- * @var string|null
- */
- protected $password;
-
/**
* @var bool
*/
@@ -79,6 +71,18 @@ abstract class AbstractFtpAdapter extends AbstractAdapter
*/
protected $systemType;
+ /**
+ * @var SafeStorage
+ */
+ protected $safeStorage;
+
+ /**
+ * True to enable timestamps for FTP servers that return unix-style listings.
+ *
+ * @var bool
+ */
+ protected $enableTimestampsOnUnixListings = false;
+
/**
* Constructor.
*
@@ -86,6 +90,7 @@ abstract class AbstractFtpAdapter extends AbstractAdapter
*/
public function __construct(array $config)
{
+ $this->safeStorage = new SafeStorage();
$this->setConfig($config);
}
@@ -99,11 +104,11 @@ public function __construct(array $config)
public function setConfig(array $config)
{
foreach ($this->configurable as $setting) {
- if (! isset($config[$setting])) {
+ if ( ! isset($config[$setting])) {
continue;
}
- $method = 'set'.ucfirst($setting);
+ $method = 'set' . ucfirst($setting);
if (method_exists($this, $method)) {
$this->$method($config[$setting]);
@@ -208,7 +213,7 @@ public function setPort($port)
*/
public function setRoot($root)
{
- $this->root = rtrim($root, '\\/').$this->separator;
+ $this->root = rtrim($root, '\\/') . $this->separator;
return $this;
}
@@ -220,7 +225,9 @@ public function setRoot($root)
*/
public function getUsername()
{
- return empty($this->username) ? 'anonymous' : $this->username;
+ $username = $this->safeStorage->retrieveSafely('username');
+
+ return $username !== null ? $username : 'anonymous';
}
/**
@@ -232,7 +239,7 @@ public function getUsername()
*/
public function setUsername($username)
{
- $this->username = $username;
+ $this->safeStorage->storeSafely('username', $username);
return $this;
}
@@ -244,7 +251,7 @@ public function setUsername($username)
*/
public function getPassword()
{
- return $this->password;
+ return $this->safeStorage->retrieveSafely('password');
}
/**
@@ -256,7 +263,7 @@ public function getPassword()
*/
public function setPassword($password)
{
- $this->password = $password;
+ $this->safeStorage->storeSafely('password', $password);
return $this;
}
@@ -309,6 +316,20 @@ public function setSystemType($systemType)
return $this;
}
+ /**
+ * True to enable timestamps for FTP servers that return unix-style listings.
+ *
+ * @param bool $bool
+ *
+ * @return $this
+ */
+ public function setEnableTimestampsOnUnixListings($bool = false)
+ {
+ $this->enableTimestampsOnUnixListings = $bool;
+
+ return $this;
+ }
+
/**
* @inheritdoc
*/
@@ -317,6 +338,8 @@ public function listContents($directory = '', $recursive = false)
return $this->listDirectoryContents($directory, $recursive);
}
+ abstract protected function listDirectoryContents($directory, $recursive = false);
+
/**
* Normalize a directory listing.
*
@@ -333,7 +356,7 @@ protected function normalizeListing(array $listing, $prefix = '')
while ($item = array_shift($listing)) {
if (preg_match('#^.*:$#', $item)) {
- $base = trim($item, ':');
+ $base = preg_replace('~^\./*|:$~', '', $item);
continue;
}
@@ -387,6 +410,18 @@ protected function normalizeObject($item, $base)
/**
* Normalize a Unix file entry.
*
+ * Given $item contains:
+ * '-rw-r--r-- 1 ftp ftp 409 Aug 19 09:01 file1.txt'
+ *
+ * This function will return:
+ * [
+ * 'type' => 'file',
+ * 'path' => 'file1.txt',
+ * 'visibility' => 'public',
+ * 'size' => 409,
+ * 'timestamp' => 1566205260
+ * ]
+ *
* @param string $item
* @param string $base
*
@@ -395,9 +430,14 @@ protected function normalizeObject($item, $base)
protected function normalizeUnixObject($item, $base)
{
$item = preg_replace('#\s+#', ' ', trim($item), 7);
- list($permissions, /* $number */, /* $owner */, /* $group */, $size, /* $month */, /* $day */, /* $time*/, $name) = explode(' ', $item, 9);
+
+ if (count(explode(' ', $item, 9)) !== 9) {
+ throw new RuntimeException("Metadata can't be parsed from item '$item' , not enough parts.");
+ }
+
+ list($permissions, /* $number */, /* $owner */, /* $group */, $size, $month, $day, $timeOrYear, $name) = explode(' ', $item, 9);
$type = $this->detectType($permissions);
- $path = empty($base) ? $name : $base.$this->separator.$name;
+ $path = $base === '' ? $name : $base . $this->separator . $name;
if ($type === 'dir') {
return compact('type', 'path');
@@ -407,7 +447,44 @@ protected function normalizeUnixObject($item, $base)
$visibility = $permissions & 0044 ? AdapterInterface::VISIBILITY_PUBLIC : AdapterInterface::VISIBILITY_PRIVATE;
$size = (int) $size;
- return compact('type', 'path', 'visibility', 'size');
+ $result = compact('type', 'path', 'visibility', 'size');
+ if ($this->enableTimestampsOnUnixListings) {
+ $timestamp = $this->normalizeUnixTimestamp($month, $day, $timeOrYear);
+ $result += compact('timestamp');
+ }
+
+ return $result;
+ }
+
+ /**
+ * Only accurate to the minute (current year), or to the day.
+ *
+ * Inadequacies in timestamp accuracy are due to limitations of the FTP 'LIST' command
+ *
+ * Note: The 'MLSD' command is a machine-readable replacement for 'LIST'
+ * but many FTP servers do not support it :(
+ *
+ * @param string $month e.g. 'Aug'
+ * @param string $day e.g. '19'
+ * @param string $timeOrYear e.g. '09:01' OR '2015'
+ *
+ * @return int
+ */
+ protected function normalizeUnixTimestamp($month, $day, $timeOrYear)
+ {
+ if (is_numeric($timeOrYear)) {
+ $year = $timeOrYear;
+ $hour = '00';
+ $minute = '00';
+ $seconds = '00';
+ } else {
+ $year = date('Y');
+ list($hour, $minute) = explode(':', $timeOrYear);
+ $seconds = '00';
+ }
+ $dateTime = DateTime::createFromFormat('Y-M-j-G:i:s', "{$year}-{$month}-{$day}-{$hour}:{$minute}:{$seconds}");
+
+ return $dateTime->getTimestamp();
}
/**
@@ -421,12 +498,18 @@ protected function normalizeUnixObject($item, $base)
protected function normalizeWindowsObject($item, $base)
{
$item = preg_replace('#\s+#', ' ', trim($item), 3);
+
+ if (count(explode(' ', $item, 4)) !== 4) {
+ throw new RuntimeException("Metadata can't be parsed from item '$item' , not enough parts.");
+ }
+
list($date, $time, $size, $name) = explode(' ', $item, 4);
- $path = empty($base) ? $name : $base.$this->separator.$name;
+ $path = $base === '' ? $name : $base . $this->separator . $name;
// Check for the correct date/time format
$format = strlen($date) === 8 ? 'm-d-yH:iA' : 'Y-m-dH:i';
- $timestamp = DateTime::createFromFormat($format, $date.$time)->getTimestamp();
+ $dt = DateTime::createFromFormat($format, $date . $time);
+ $timestamp = $dt ? $dt->getTimestamp() : (int) strtotime("$date $time");
if ($size === '') {
$type = 'dir';
@@ -450,11 +533,7 @@ protected function normalizeWindowsObject($item, $base)
*/
protected function detectSystemType($item)
{
- if (preg_match('/^[0-9]{2,4}-[0-9]{2}-[0-9]{2}/', $item)) {
- return $this->systemType = 'windows';
- }
-
- return $this->systemType = 'unix';
+ return preg_match('/^[0-9]{2,4}-[0-9]{2}-[0-9]{2}/', $item) ? 'windows' : 'unix';
}
/**
@@ -493,8 +572,8 @@ protected function normalizePermissions($permissions)
return array_sum(str_split($part));
};
- // get the sum of the groups
- return array_sum(array_map($mapper, $parts));
+ // converts to decimal number
+ return octdec(implode('', array_map($mapper, $parts)));
}
/**
@@ -507,11 +586,7 @@ protected function normalizePermissions($permissions)
public function removeDotDirectories(array $list)
{
$filter = function ($line) {
- if (! empty($line) && !preg_match('#.* \.(\.)?$|^total#', $line)) {
- return true;
- }
-
- return false;
+ return $line !== '' && ! preg_match('#.* \.(\.)?$|^total#', $line);
};
return array_filter($list, $filter);
@@ -548,7 +623,9 @@ public function getVisibility($path)
*/
public function ensureDirectory($dirname)
{
- if (! empty($dirname) && !$this->has($dirname)) {
+ $dirname = (string) $dirname;
+
+ if ($dirname !== '' && ! $this->has($dirname)) {
$this->createDir($dirname, new Config());
}
}
@@ -558,7 +635,10 @@ public function ensureDirectory($dirname)
*/
public function getConnection()
{
- if (! $this->isConnected()) {
+ $tries = 0;
+
+ while ( ! $this->isConnected() && $tries < 3) {
+ $tries++;
$this->disconnect();
$this->connect();
}
diff --git a/application/vendor/league/flysystem/src/Adapter/CanOverwriteFiles.php b/application/vendor/league/flysystem/src/Adapter/CanOverwriteFiles.php
new file mode 100644
index 0000000..fd8d216
--- /dev/null
+++ b/application/vendor/league/flysystem/src/Adapter/CanOverwriteFiles.php
@@ -0,0 +1,12 @@
+passive = $passive;
}
+ /**
+ * @param bool $ignorePassiveAddress
+ */
+ public function setIgnorePassiveAddress($ignorePassiveAddress)
+ {
+ $this->ignorePassiveAddress = $ignorePassiveAddress;
+ }
+
+ /**
+ * @param bool $recurseManually
+ */
+ public function setRecurseManually($recurseManually)
+ {
+ $this->recurseManually = $recurseManually;
+ }
+
+ /**
+ * @param bool $utf8
+ */
+ public function setUtf8($utf8)
+ {
+ $this->utf8 = (bool) $utf8;
+ }
+
/**
* Connect to the FTP server.
*/
@@ -84,13 +134,30 @@ public function connect()
$this->connection = ftp_connect($this->getHost(), $this->getPort(), $this->getTimeout());
}
- if (! $this->connection) {
+ if ( ! $this->connection) {
throw new RuntimeException('Could not connect to host: ' . $this->getHost() . ', port:' . $this->getPort());
}
$this->login();
+ $this->setUtf8Mode();
$this->setConnectionPassiveMode();
$this->setConnectionRoot();
+ $this->isPureFtpd = $this->isPureFtpdServer();
+ }
+
+ /**
+ * Set the connection to UTF-8 mode.
+ */
+ protected function setUtf8Mode()
+ {
+ if ($this->utf8) {
+ $response = ftp_raw($this->connection, "OPTS UTF8 ON");
+ if (substr($response[0], 0, 3) !== '200') {
+ throw new RuntimeException(
+ 'Could not set UTF-8 mode for connection: ' . $this->getHost() . '::' . $this->getPort()
+ );
+ }
+ }
}
/**
@@ -100,7 +167,11 @@ public function connect()
*/
protected function setConnectionPassiveMode()
{
- if (! ftp_pasv($this->connection, $this->passive)) {
+ if (is_bool($this->ignorePassiveAddress) && defined('FTP_USEPASVADDRESS')) {
+ ftp_set_option($this->connection, FTP_USEPASVADDRESS, ! $this->ignorePassiveAddress);
+ }
+
+ if ( ! ftp_pasv($this->connection, $this->passive)) {
throw new RuntimeException(
'Could not set passive mode for connection: ' . $this->getHost() . '::' . $this->getPort()
);
@@ -115,7 +186,7 @@ protected function setConnectionRoot()
$root = $this->getRoot();
$connection = $this->connection;
- if (empty($root) === false && ! ftp_chdir($connection, $root)) {
+ if ($root && ! ftp_chdir($connection, $root)) {
throw new RuntimeException('Root is invalid or does not exist: ' . $this->getRoot());
}
@@ -133,14 +204,16 @@ protected function setConnectionRoot()
*/
protected function login()
{
- set_error_handler(
- function () {
- }
+ set_error_handler(function () {
+ });
+ $isLoggedIn = ftp_login(
+ $this->connection,
+ $this->getUsername(),
+ $this->getPassword()
);
- $isLoggedIn = ftp_login($this->connection, $this->getUsername(), $this->getPassword());
restore_error_handler();
- if (! $isLoggedIn) {
+ if ( ! $isLoggedIn) {
$this->disconnect();
throw new RuntimeException(
'Could not login with connection: ' . $this->getHost() . '::' . $this->getPort(
@@ -154,7 +227,7 @@ function () {
*/
public function disconnect()
{
- if ($this->isConnected()) {
+ if (is_resource($this->connection)) {
ftp_close($this->connection);
}
@@ -177,7 +250,7 @@ public function write($path, $contents, Config $config)
}
$result['contents'] = $contents;
- $result['mimetype'] = Util::guessMimeType($path, $contents);
+ $result['mimetype'] = $config->get('mimetype') ?: Util::guessMimeType($path, $contents);
return $result;
}
@@ -189,7 +262,7 @@ public function writeStream($path, $resource, Config $config)
{
$this->ensureDirectory(Util::dirname($path));
- if (! ftp_fput($this->getConnection(), $path, $resource, $this->transferMode)) {
+ if ( ! ftp_fput($this->getConnection(), $path, $resource, $this->transferMode)) {
return false;
}
@@ -197,7 +270,9 @@ public function writeStream($path, $resource, Config $config)
$this->setVisibility($path, $visibility);
}
- return compact('path', 'visibility');
+ $type = 'file';
+
+ return compact('type', 'path', 'visibility');
}
/**
@@ -238,14 +313,14 @@ public function delete($path)
public function deleteDir($dirname)
{
$connection = $this->getConnection();
- $contents = array_reverse($this->listDirectoryContents($dirname));
+ $contents = array_reverse($this->listDirectoryContents($dirname, false));
foreach ($contents as $object) {
if ($object['type'] === 'file') {
- if (! ftp_delete($connection, $object['path'])) {
+ if ( ! ftp_delete($connection, $object['path'])) {
return false;
}
- } elseif (! ftp_rmdir($connection, $object['path'])) {
+ } elseif ( ! $this->deleteDir($object['path'])) {
return false;
}
}
@@ -273,7 +348,7 @@ public function createDir($dirname, Config $config)
$this->setConnectionRoot();
- return ['path' => $dirname];
+ return ['type' => 'dir', 'path' => $dirname];
}
/**
@@ -287,7 +362,7 @@ public function createDir($dirname, Config $config)
protected function createActualDirectory($directory, $connection)
{
// List the current directory
- $listing = ftp_nlist($connection, '.');
+ $listing = ftp_nlist($connection, '.') ?: [];
foreach ($listing as $key => $item) {
if (preg_match('~^\./.*~', $item)) {
@@ -295,7 +370,7 @@ protected function createActualDirectory($directory, $connection)
}
}
- if (in_array($directory, $listing)) {
+ if (in_array($directory, $listing, true)) {
return true;
}
@@ -307,24 +382,30 @@ protected function createActualDirectory($directory, $connection)
*/
public function getMetadata($path)
{
- $connection = $this->getConnection();
-
if ($path === '') {
return ['type' => 'dir', 'path' => ''];
}
- if (@ftp_chdir($connection, $path) === true) {
+ if (@ftp_chdir($this->getConnection(), $path) === true) {
$this->setConnectionRoot();
return ['type' => 'dir', 'path' => $path];
}
- $listing = ftp_rawlist($connection, $path);
+ $listing = $this->ftpRawlist('-A', str_replace('*', '\\*', $path));
+
+ if (empty($listing) || in_array('total 0', $listing, true)) {
+ return false;
+ }
- if (empty($listing)) {
+ if (preg_match('/.* not found/', $listing[0])) {
return false;
}
+ if (preg_match('/^total [0-9]*$/', $listing[0])) {
+ array_shift($listing);
+ }
+
return $this->normalizeObject($listing[0], '');
}
@@ -333,11 +414,11 @@ public function getMetadata($path)
*/
public function getMimetype($path)
{
- if (! $metadata = $this->read($path)) {
+ if ( ! $metadata = $this->getMetadata($path)) {
return false;
}
- $metadata['mimetype'] = Util::guessMimeType($path, $metadata['contents']);
+ $metadata['mimetype'] = MimeType::detectByFilename($path);
return $metadata;
}
@@ -349,7 +430,7 @@ public function getTimestamp($path)
{
$timestamp = ftp_mdtm($this->getConnection(), $path);
- return ($timestamp !== -1) ? ['timestamp' => $timestamp] : false;
+ return ($timestamp !== -1) ? ['path' => $path, 'timestamp' => $timestamp] : false;
}
/**
@@ -357,7 +438,7 @@ public function getTimestamp($path)
*/
public function read($path)
{
- if (! $object = $this->readStream($path)) {
+ if ( ! $object = $this->readStream($path)) {
return false;
}
@@ -373,17 +454,17 @@ public function read($path)
*/
public function readStream($path)
{
- $stream = fopen('php://temp', 'w+');
+ $stream = fopen('php://temp', 'w+b');
$result = ftp_fget($this->getConnection(), $stream, $path, $this->transferMode);
rewind($stream);
- if (! $result) {
+ if ( ! $result) {
fclose($stream);
return false;
}
- return compact('stream');
+ return ['type' => 'file', 'path' => $path, 'stream' => $stream];
}
/**
@@ -393,11 +474,11 @@ public function setVisibility($path, $visibility)
{
$mode = $visibility === AdapterInterface::VISIBILITY_PUBLIC ? $this->getPermPublic() : $this->getPermPrivate();
- if (! ftp_chmod($this->getConnection(), $mode, $path)) {
+ if ( ! ftp_chmod($this->getConnection(), $mode, $path)) {
return false;
}
- return compact('visibility');
+ return compact('path', 'visibility');
}
/**
@@ -407,18 +488,85 @@ public function setVisibility($path, $visibility)
*/
protected function listDirectoryContents($directory, $recursive = true)
{
- $listing = ftp_rawlist($this->getConnection(), '-lna ' . $directory, $recursive);
+ $directory = str_replace('*', '\\*', $directory);
+
+ if ($recursive && $this->recurseManually) {
+ return $this->listDirectoryContentsRecursive($directory);
+ }
+
+ $options = $recursive ? '-alnR' : '-aln';
+ $listing = $this->ftpRawlist($options, $directory);
return $listing ? $this->normalizeListing($listing, $directory) : [];
}
+ /**
+ * @inheritdoc
+ *
+ * @param string $directory
+ */
+ protected function listDirectoryContentsRecursive($directory)
+ {
+ $listing = $this->normalizeListing($this->ftpRawlist('-aln', $directory) ?: [], $directory);
+ $output = [];
+
+ foreach ($listing as $item) {
+ $output[] = $item;
+ if ($item['type'] !== 'dir') {
+ continue;
+ }
+ $output = array_merge($output, $this->listDirectoryContentsRecursive($item['path']));
+ }
+
+ return $output;
+ }
+
/**
* Check if the connection is open.
*
* @return bool
+ *
+ * @throws ErrorException
*/
public function isConnected()
{
- return ! is_null($this->connection) && ftp_systype($this->connection) !== false;
+ try {
+ return is_resource($this->connection) && ftp_rawlist($this->connection, $this->getRoot()) !== false;
+ } catch (ErrorException $e) {
+ if (strpos($e->getMessage(), 'ftp_rawlist') === false) {
+ throw $e;
+ }
+
+ return false;
+ }
+ }
+
+ /**
+ * @return bool
+ */
+ protected function isPureFtpdServer()
+ {
+ $response = ftp_raw($this->connection, 'HELP');
+
+ return stripos(implode(' ', $response), 'Pure-FTPd') !== false;
+ }
+
+ /**
+ * The ftp_rawlist function with optional escaping.
+ *
+ * @param string $options
+ * @param string $path
+ *
+ * @return array
+ */
+ protected function ftpRawlist($options, $path)
+ {
+ $connection = $this->getConnection();
+
+ if ($this->isPureFtpd) {
+ $path = str_replace(' ', '\ ', $path);
+ }
+
+ return ftp_rawlist($connection, $options . ' ' . $path);
}
}
diff --git a/application/vendor/league/flysystem/src/Adapter/Ftpd.php b/application/vendor/league/flysystem/src/Adapter/Ftpd.php
index b7ac88d..d5349e4 100644
--- a/application/vendor/league/flysystem/src/Adapter/Ftpd.php
+++ b/application/vendor/league/flysystem/src/Adapter/Ftpd.php
@@ -9,7 +9,16 @@ class Ftpd extends Ftp
*/
public function getMetadata($path)
{
- if (empty($path) || !($object = ftp_raw($this->getConnection(), 'STAT '.$path)) || count($object) < 3) {
+ if ($path === '') {
+ return ['type' => 'dir', 'path' => ''];
+ }
+ if (@ftp_chdir($this->getConnection(), $path) === true) {
+ $this->setConnectionRoot();
+
+ return ['type' => 'dir', 'path' => $path];
+ }
+
+ if ( ! ($object = ftp_raw($this->getConnection(), 'STAT ' . $path)) || count($object) < 3) {
return false;
}
@@ -27,7 +36,7 @@ protected function listDirectoryContents($directory, $recursive = true)
{
$listing = ftp_rawlist($this->getConnection(), $directory, $recursive);
- if ($listing === false || (!empty($listing) && substr($listing[0], 0, 5) === "ftpd:")) {
+ if ($listing === false || ( ! empty($listing) && substr($listing[0], 0, 5) === "ftpd:")) {
return [];
}
diff --git a/application/vendor/league/flysystem/src/Adapter/Local.php b/application/vendor/league/flysystem/src/Adapter/Local.php
index f5ed5d4..c6e6fa8 100644
--- a/application/vendor/league/flysystem/src/Adapter/Local.php
+++ b/application/vendor/league/flysystem/src/Adapter/Local.php
@@ -4,11 +4,13 @@
use DirectoryIterator;
use FilesystemIterator;
-use Finfo;
-use League\Flysystem\AdapterInterface;
+use finfo as Finfo;
use League\Flysystem\Config;
+use League\Flysystem\Exception;
use League\Flysystem\NotSupportedException;
+use League\Flysystem\UnreadableFileException;
use League\Flysystem\Util;
+use LogicException;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use SplFileInfo;
@@ -30,13 +32,13 @@ class Local extends AbstractAdapter
*/
protected static $permissions = [
'file' => [
- 'public' => 0744,
- 'private' => 0700,
+ 'public' => 0644,
+ 'private' => 0600,
],
'dir' => [
'public' => 0755,
'private' => 0700,
- ]
+ ],
];
/**
@@ -53,6 +55,7 @@ class Local extends AbstractAdapter
* @var int
*/
protected $writeFlags;
+
/**
* @var int
*/
@@ -65,18 +68,20 @@ class Local extends AbstractAdapter
* @param int $writeFlags
* @param int $linkHandling
* @param array $permissions
+ *
+ * @throws LogicException
*/
public function __construct($root, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS, array $permissions = [])
{
- // permissionMap needs to be set before ensureDirectory() is called.
+ $root = is_link($root) ? realpath($root) : $root;
$this->permissionMap = array_replace_recursive(static::$permissions, $permissions);
- $realRoot = $this->ensureDirectory($root);
+ $this->ensureDirectory($root);
- if (! is_dir($realRoot) || !is_readable($realRoot)) {
- throw new \LogicException('The root path '.$root.' is not readable.');
+ if ( ! is_dir($root) || ! is_readable($root)) {
+ throw new LogicException('The root path ' . $root . ' is not readable.');
}
- $this->setPathPrefix($realRoot);
+ $this->setPathPrefix($root);
$this->writeFlags = $writeFlags;
$this->linkHandling = $linkHandling;
}
@@ -86,17 +91,27 @@ public function __construct($root, $writeFlags = LOCK_EX, $linkHandling = self::
*
* @param string $root root directory path
*
- * @return string real path to root
+ * @return void
+ *
+ * @throws Exception in case the root directory can not be created
*/
protected function ensureDirectory($root)
{
- if (! is_dir($root)) {
+ if ( ! is_dir($root)) {
$umask = umask(0);
- mkdir($root, $this->permissionMap['dir']['public'], true);
+
+ if ( ! @mkdir($root, $this->permissionMap['dir']['public'], true)) {
+ $mkdirError = error_get_last();
+ }
+
umask($umask);
- }
+ clearstatcache(false, $root);
- return realpath($root);
+ if ( ! is_dir($root)) {
+ $errorMessage = isset($mkdirError['message']) ? $mkdirError['message'] : '';
+ throw new Exception(sprintf('Impossible to create the root directory "%s". %s', $root, $errorMessage));
+ }
+ }
}
/**
@@ -139,23 +154,21 @@ public function writeStream($path, $resource, Config $config)
{
$location = $this->applyPathPrefix($path);
$this->ensureDirectory(dirname($location));
- $stream = fopen($location, 'w+');
+ $stream = fopen($location, 'w+b');
- if (! $stream) {
+ if ( ! $stream || stream_copy_to_stream($resource, $stream) === false || ! fclose($stream)) {
return false;
}
- stream_copy_to_stream($resource, $stream);
-
- if (! fclose($stream)) {
- return false;
- }
+ $type = 'file';
+ $result = compact('type', 'path');
if ($visibility = $config->get('visibility')) {
$this->setVisibility($path, $visibility);
+ $result['visibility'] = $visibility;
}
- return compact('path', 'visibility');
+ return $result;
}
/**
@@ -164,9 +177,9 @@ public function writeStream($path, $resource, Config $config)
public function readStream($path)
{
$location = $this->applyPathPrefix($path);
- $stream = fopen($location, 'r');
+ $stream = fopen($location, 'rb');
- return compact('stream', 'path');
+ return ['type' => 'file', 'path' => $path, 'stream' => $stream];
}
/**
@@ -183,14 +196,21 @@ public function updateStream($path, $resource, Config $config)
public function update($path, $contents, Config $config)
{
$location = $this->applyPathPrefix($path);
- $mimetype = Util::guessMimeType($path, $contents);
$size = file_put_contents($location, $contents, $this->writeFlags);
if ($size === false) {
return false;
}
- return compact('path', 'size', 'contents', 'mimetype');
+ $type = 'file';
+
+ $result = compact('type', 'path', 'size', 'contents');
+
+ if ($mimetype = $config->get('mimetype') ?: Util::guessMimeType($path, $contents)) {
+ $result['mimetype'] = $mimetype;
+ }
+
+ return $result;
}
/**
@@ -199,13 +219,13 @@ public function update($path, $contents, Config $config)
public function read($path)
{
$location = $this->applyPathPrefix($path);
- $contents = file_get_contents($location);
+ $contents = @file_get_contents($location);
if ($contents === false) {
return false;
}
- return compact('contents', 'path');
+ return ['type' => 'file', 'path' => $path, 'contents' => $contents];
}
/**
@@ -240,7 +260,7 @@ public function delete($path)
{
$location = $this->applyPathPrefix($path);
- return unlink($location);
+ return @unlink($location);
}
/**
@@ -249,9 +269,9 @@ public function delete($path)
public function listContents($directory = '', $recursive = false)
{
$result = [];
- $location = $this->applyPathPrefix($directory).$this->pathSeparator;
+ $location = $this->applyPathPrefix($directory);
- if (! is_dir($location)) {
+ if ( ! is_dir($location)) {
return [];
}
@@ -276,6 +296,7 @@ public function listContents($directory = '', $recursive = false)
public function getMetadata($path)
{
$location = $this->applyPathPrefix($path);
+ clearstatcache(false, $location);
$info = new SplFileInfo($location);
return $this->normalizeFileInfo($info);
@@ -296,8 +317,13 @@ public function getMimetype($path)
{
$location = $this->applyPathPrefix($path);
$finfo = new Finfo(FILEINFO_MIME_TYPE);
+ $mimetype = $finfo->file($location);
- return ['mimetype' => $finfo->file($location)];
+ if (in_array($mimetype, ['application/octet-stream', 'inode/x-empty', 'application/x-empty'])) {
+ $mimetype = Util\MimeType::detectByFilename($location);
+ }
+
+ return ['path' => $path, 'type' => 'file', 'mimetype' => $mimetype];
}
/**
@@ -316,9 +342,17 @@ public function getVisibility($path)
$location = $this->applyPathPrefix($path);
clearstatcache(false, $location);
$permissions = octdec(substr(sprintf('%o', fileperms($location)), -4));
- $visibility = $permissions & 0044 ? AdapterInterface::VISIBILITY_PUBLIC : AdapterInterface::VISIBILITY_PRIVATE;
+ $type = is_dir($location) ? 'dir' : 'file';
- return compact('visibility');
+ foreach ($this->permissionMap[$type] as $visibility => $visibilityPermissions) {
+ if ($visibilityPermissions == $permissions) {
+ return compact('path', 'visibility');
+ }
+ }
+
+ $visibility = substr(sprintf('%o', fileperms($location)), -4);
+
+ return compact('path', 'visibility');
}
/**
@@ -328,9 +362,13 @@ public function setVisibility($path, $visibility)
{
$location = $this->applyPathPrefix($path);
$type = is_dir($location) ? 'dir' : 'file';
- chmod($location, $this->permissionMap[$type][$visibility]);
+ $success = chmod($location, $this->permissionMap[$type][$visibility]);
+
+ if ($success === false) {
+ return false;
+ }
- return compact('visibility');
+ return compact('path', 'visibility');
}
/**
@@ -341,11 +379,13 @@ public function createDir($dirname, Config $config)
$location = $this->applyPathPrefix($dirname);
$umask = umask(0);
$visibility = $config->get('visibility', 'public');
+ $return = ['path' => $dirname, 'type' => 'dir'];
- if (! is_dir($location) && !mkdir($location, $this->permissionMap['dir'][$visibility], true)) {
- $return = false;
- } else {
- $return = ['path' => $dirname, 'type' => 'dir'];
+ if ( ! is_dir($location)) {
+ if (false === @mkdir($location, $this->permissionMap['dir'][$visibility], true)
+ || false === is_dir($location)) {
+ $return = false;
+ }
}
umask($umask);
@@ -360,42 +400,50 @@ public function deleteDir($dirname)
{
$location = $this->applyPathPrefix($dirname);
- if (! is_dir($location)) {
+ if ( ! is_dir($location)) {
return false;
}
- $contents = new RecursiveIteratorIterator(
- new RecursiveDirectoryIterator($location, FilesystemIterator::SKIP_DOTS),
- RecursiveIteratorIterator::CHILD_FIRST
- );
+ $contents = $this->getRecursiveDirectoryIterator($location, RecursiveIteratorIterator::CHILD_FIRST);
/** @var SplFileInfo $file */
foreach ($contents as $file) {
- switch ($file->getType()) {
- case 'dir':
- rmdir($file->getRealPath());
- break;
- case 'link':
- unlink($file->getPathname());
- break;
- default:
- unlink($file->getRealPath());
- }
+ $this->guardAgainstUnreadableFileInfo($file);
+ $this->deleteFileInfoObject($file);
}
return rmdir($location);
}
+ /**
+ * @param SplFileInfo $file
+ */
+ protected function deleteFileInfoObject(SplFileInfo $file)
+ {
+ switch ($file->getType()) {
+ case 'dir':
+ rmdir($file->getRealPath());
+ break;
+ case 'link':
+ unlink($file->getPathname());
+ break;
+ default:
+ unlink($file->getRealPath());
+ }
+ }
+
/**
* Normalize the file info.
*
* @param SplFileInfo $file
*
- * @return array
+ * @return array|void
+ *
+ * @throws NotSupportedException
*/
protected function normalizeFileInfo(SplFileInfo $file)
{
- if (! $file->isLink()) {
+ if ( ! $file->isLink()) {
return $this->mapFileInfo($file);
}
@@ -421,15 +469,16 @@ protected function getFilePath(SplFileInfo $file)
/**
* @param string $path
+ * @param int $mode
*
* @return RecursiveIteratorIterator
*/
- protected function getRecursiveDirectoryIterator($path)
+ protected function getRecursiveDirectoryIterator($path, $mode = RecursiveIteratorIterator::SELF_FIRST)
{
- $directory = new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS);
- $iterator = new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST);
-
- return $iterator;
+ return new RecursiveIteratorIterator(
+ new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
+ $mode
+ );
}
/**
@@ -466,12 +515,14 @@ protected function mapFileInfo(SplFileInfo $file)
}
/**
- * @inheritdoc
+ * @param SplFileInfo $file
+ *
+ * @throws UnreadableFileException
*/
- public function applyPathPrefix($path)
+ protected function guardAgainstUnreadableFileInfo(SplFileInfo $file)
{
- $prefixedPath = parent::applyPathPrefix($path);
-
- return str_replace('/', DIRECTORY_SEPARATOR, $prefixedPath);
+ if ( ! $file->isReadable()) {
+ throw UnreadableFileException::forFileInfo($file);
+ }
}
}
diff --git a/application/vendor/league/flysystem/src/Adapter/NullAdapter.php b/application/vendor/league/flysystem/src/Adapter/NullAdapter.php
index e3f4904..2527087 100644
--- a/application/vendor/league/flysystem/src/Adapter/NullAdapter.php
+++ b/application/vendor/league/flysystem/src/Adapter/NullAdapter.php
@@ -29,7 +29,7 @@ public function has($path)
public function write($path, $contents, Config $config)
{
$type = 'file';
- $result = compact('contents', 'type', 'size', 'path');
+ $result = compact('contents', 'type', 'path');
if ($visibility = $config->get('visibility')) {
$result['visibility'] = $visibility;
diff --git a/application/vendor/league/flysystem/src/Adapter/Polyfill/NotSupportingVisibilityTrait.php b/application/vendor/league/flysystem/src/Adapter/Polyfill/NotSupportingVisibilityTrait.php
index 64de443..fc0a747 100644
--- a/application/vendor/league/flysystem/src/Adapter/Polyfill/NotSupportingVisibilityTrait.php
+++ b/application/vendor/league/flysystem/src/Adapter/Polyfill/NotSupportingVisibilityTrait.php
@@ -15,7 +15,7 @@ trait NotSupportingVisibilityTrait
*/
public function getVisibility($path)
{
- throw new LogicException(get_class($this).' does not support visibility. Path: '.$path);
+ throw new LogicException(get_class($this) . ' does not support visibility. Path: ' . $path);
}
/**
@@ -28,6 +28,6 @@ public function getVisibility($path)
*/
public function setVisibility($path, $visibility)
{
- throw new LogicException(get_class($this).' does not support visibility. Path: '.$path.', visibility: '.$visibility);
+ throw new LogicException(get_class($this) . ' does not support visibility. Path: ' . $path . ', visibility: ' . $visibility);
}
}
diff --git a/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedCopyTrait.php b/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedCopyTrait.php
index 44ed2e0..1b491a4 100644
--- a/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedCopyTrait.php
+++ b/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedCopyTrait.php
@@ -18,7 +18,7 @@ public function copy($path, $newpath)
{
$response = $this->readStream($path);
- if ($response === false || !is_resource($response['stream'])) {
+ if ($response === false || ! is_resource($response['stream'])) {
return false;
}
@@ -35,11 +35,17 @@ public function copy($path, $newpath)
/**
* @param string $path
+ *
+ * @return resource
*/
abstract public function readStream($path);
/**
- * @param string $path
+ * @param string $path
+ * @param resource $resource
+ * @param Config $config
+ *
+ * @return resource
*/
abstract public function writeStream($path, $resource, Config $config);
}
diff --git a/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedReadingTrait.php b/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedReadingTrait.php
index 3cd6ab4..2b31c01 100644
--- a/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedReadingTrait.php
+++ b/application/vendor/league/flysystem/src/Adapter/Polyfill/StreamedReadingTrait.php
@@ -2,22 +2,27 @@
namespace League\Flysystem\Adapter\Polyfill;
+/**
+ * A helper for adapters that only handle strings to provide read streams.
+ */
trait StreamedReadingTrait
{
/**
- * Get the contents of a file in a stream.
+ * Reads a file as a stream.
*
* @param string $path
*
- * @return resource|false false when not found, or a resource
+ * @return array|false
+ *
+ * @see League\Flysystem\ReadInterface::readStream()
*/
public function readStream($path)
{
- if (! $data = $this->read($path)) {
+ if ( ! $data = $this->read($path)) {
return false;
}
- $stream = tmpfile();
+ $stream = fopen('php://temp', 'w+b');
fwrite($stream, $data['contents']);
rewind($stream);
$data['stream'] = $stream;
@@ -26,12 +31,14 @@ public function readStream($path)
return $data;
}
- // Required abstract method
-
/**
+ * Reads a file.
+ *
* @param string $path
*
- * @return resource
+ * @return array|false
+ *
+ * @see League\Flysystem\ReadInterface::read()
*/
abstract public function read($path);
}
diff --git a/application/vendor/league/flysystem/src/Config.php b/application/vendor/league/flysystem/src/Config.php
index 00cf752..639f43d 100644
--- a/application/vendor/league/flysystem/src/Config.php
+++ b/application/vendor/league/flysystem/src/Config.php
@@ -10,7 +10,7 @@ class Config
protected $settings = [];
/**
- * @var Config
+ * @var Config|null
*/
protected $fallback;
@@ -34,7 +34,7 @@ public function __construct(array $settings = [])
*/
public function get($key, $default = null)
{
- if (! array_key_exists($key, $this->settings)) {
+ if ( ! array_key_exists($key, $this->settings)) {
return $this->getDefault($key, $default);
}
@@ -50,7 +50,13 @@ public function get($key, $default = null)
*/
public function has($key)
{
- return array_key_exists($key, $this->settings);
+ if (array_key_exists($key, $this->settings)) {
+ return true;
+ }
+
+ return $this->fallback instanceof Config
+ ? $this->fallback->has($key)
+ : false;
}
/**
@@ -63,7 +69,7 @@ public function has($key)
*/
protected function getDefault($key, $default)
{
- if (! $this->fallback) {
+ if ( ! $this->fallback) {
return $default;
}
diff --git a/application/vendor/league/flysystem/src/ConfigAwareTrait.php b/application/vendor/league/flysystem/src/ConfigAwareTrait.php
index 2476c6a..202d605 100644
--- a/application/vendor/league/flysystem/src/ConfigAwareTrait.php
+++ b/application/vendor/league/flysystem/src/ConfigAwareTrait.php
@@ -19,7 +19,7 @@ trait ConfigAwareTrait
*/
protected function setConfig($config)
{
- $this->config = $config ? Util::ensureConfig($config) : null;
+ $this->config = $config ? Util::ensureConfig($config) : new Config;
}
/**
@@ -29,10 +29,6 @@ protected function setConfig($config)
*/
public function getConfig()
{
- if ($this->config === null) {
- return $this->config = new Config;
- }
-
return $this->config;
}
diff --git a/application/vendor/league/flysystem/src/Directory.php b/application/vendor/league/flysystem/src/Directory.php
index 6ba744b..d4f90a8 100644
--- a/application/vendor/league/flysystem/src/Directory.php
+++ b/application/vendor/league/flysystem/src/Directory.php
@@ -2,6 +2,9 @@
namespace League\Flysystem;
+/**
+ * @deprecated
+ */
class Directory extends Handler
{
/**
diff --git a/application/vendor/league/flysystem/src/File.php b/application/vendor/league/flysystem/src/File.php
index 3294af5..4a4b7a0 100644
--- a/application/vendor/league/flysystem/src/File.php
+++ b/application/vendor/league/flysystem/src/File.php
@@ -2,6 +2,9 @@
namespace League\Flysystem;
+/**
+ * @deprecated
+ */
class File extends Handler
{
/**
@@ -17,7 +20,7 @@ public function exists()
/**
* Read the file.
*
- * @return string file contents
+ * @return string|false file contents
*/
public function read()
{
@@ -27,7 +30,7 @@ public function read()
/**
* Read the file as a stream.
*
- * @return resource file stream
+ * @return resource|false file stream
*/
public function readStream()
{
@@ -143,7 +146,7 @@ public function copy($newpath)
/**
* Get the file's timestamp.
*
- * @return int unix timestamp
+ * @return string|false The timestamp or false on failure.
*/
public function getTimestamp()
{
@@ -153,7 +156,7 @@ public function getTimestamp()
/**
* Get the file's mimetype.
*
- * @return string mimetime
+ * @return string|false The file mime-type or false on failure.
*/
public function getMimetype()
{
@@ -163,7 +166,7 @@ public function getMimetype()
/**
* Get the file's visibility.
*
- * @return string visibility
+ * @return string|false The visibility (public|private) or false on failure.
*/
public function getVisibility()
{
@@ -173,7 +176,7 @@ public function getVisibility()
/**
* Get the file's metadata.
*
- * @return array
+ * @return array|false The file metadata or false on failure.
*/
public function getMetadata()
{
@@ -183,7 +186,7 @@ public function getMetadata()
/**
* Get the file size.
*
- * @return int file size
+ * @return int|false The file size or false on failure.
*/
public function getSize()
{
diff --git a/application/vendor/league/flysystem/src/FileExistsException.php b/application/vendor/league/flysystem/src/FileExistsException.php
index c0b63da..c82e20c 100644
--- a/application/vendor/league/flysystem/src/FileExistsException.php
+++ b/application/vendor/league/flysystem/src/FileExistsException.php
@@ -22,11 +22,11 @@ public function __construct($path, $code = 0, BaseException $previous = null)
{
$this->path = $path;
- parent::__construct('File already exists at path: '.$this->getPath(), $code, $previous);
+ parent::__construct('File already exists at path: ' . $this->getPath(), $code, $previous);
}
/**
- * Get the path which was not found.
+ * Get the path which was found.
*
* @return string
*/
diff --git a/application/vendor/league/flysystem/src/FileNotFoundException.php b/application/vendor/league/flysystem/src/FileNotFoundException.php
index b66a4cc..989df69 100644
--- a/application/vendor/league/flysystem/src/FileNotFoundException.php
+++ b/application/vendor/league/flysystem/src/FileNotFoundException.php
@@ -22,7 +22,7 @@ public function __construct($path, $code = 0, BaseException $previous = null)
{
$this->path = $path;
- parent::__construct('File not found at path: '.$this->getPath(), $code, $previous);
+ parent::__construct('File not found at path: ' . $this->getPath(), $code, $previous);
}
/**
diff --git a/application/vendor/league/flysystem/src/Filesystem.php b/application/vendor/league/flysystem/src/Filesystem.php
index 84e204b..18b590e 100644
--- a/application/vendor/league/flysystem/src/Filesystem.php
+++ b/application/vendor/league/flysystem/src/Filesystem.php
@@ -3,11 +3,14 @@
namespace League\Flysystem;
use InvalidArgumentException;
+use League\Flysystem\Adapter\CanOverwriteFiles;
use League\Flysystem\Plugin\PluggableTrait;
use League\Flysystem\Util\ContentListingFormatter;
/**
* @method array getWithMetadata(string $path, array $metadata)
+ * @method bool forceCopy(string $path, string $newpath)
+ * @method bool forceRename(string $path, string $newpath)
* @method array listFiles(string $path = '', boolean $recursive = false)
* @method array listPaths(string $path = '', boolean $recursive = false)
* @method array listWith(array $keys = [], $directory = '', $recursive = false)
@@ -51,7 +54,7 @@ public function has($path)
{
$path = Util::normalizePath($path);
- return (bool) $this->getAdapter()->has($path);
+ return strlen($path) === 0 ? false : (bool) $this->getAdapter()->has($path);
}
/**
@@ -71,7 +74,7 @@ public function write($path, $contents, array $config = [])
*/
public function writeStream($path, $resource, array $config = [])
{
- if (! is_resource($resource)) {
+ if ( ! is_resource($resource)) {
throw new InvalidArgumentException(__METHOD__ . ' expects argument #2 to be a valid resource.');
}
@@ -92,7 +95,7 @@ public function put($path, $contents, array $config = [])
$path = Util::normalizePath($path);
$config = $this->prepareConfig($config);
- if ($this->has($path)) {
+ if ( ! $this->getAdapter() instanceof CanOverwriteFiles && $this->has($path)) {
return (bool) $this->getAdapter()->update($path, $contents, $config);
}
@@ -104,7 +107,7 @@ public function put($path, $contents, array $config = [])
*/
public function putStream($path, $resource, array $config = [])
{
- if (! is_resource($resource)) {
+ if ( ! is_resource($resource)) {
throw new InvalidArgumentException(__METHOD__ . ' expects argument #2 to be a valid resource.');
}
@@ -112,7 +115,7 @@ public function putStream($path, $resource, array $config = [])
$config = $this->prepareConfig($config);
Util::rewindStream($resource);
- if ($this->has($path)) {
+ if ( ! $this->getAdapter() instanceof CanOverwriteFiles && $this->has($path)) {
return (bool) $this->getAdapter()->updateStream($path, $resource, $config);
}
@@ -155,7 +158,7 @@ public function update($path, $contents, array $config = [])
*/
public function updateStream($path, $resource, array $config = [])
{
- if (! is_resource($resource)) {
+ if ( ! is_resource($resource)) {
throw new InvalidArgumentException(__METHOD__ . ' expects argument #2 to be a valid resource.');
}
@@ -175,7 +178,7 @@ public function read($path)
$path = Util::normalizePath($path);
$this->assertPresent($path);
- if (! ($object = $this->getAdapter()->read($path))) {
+ if ( ! ($object = $this->getAdapter()->read($path))) {
return false;
}
@@ -190,7 +193,7 @@ public function readStream($path)
$path = Util::normalizePath($path);
$this->assertPresent($path);
- if (! $object = $this->getAdapter()->readStream($path)) {
+ if ( ! $object = $this->getAdapter()->readStream($path)) {
return false;
}
@@ -267,7 +270,8 @@ public function listContents($directory = '', $recursive = false)
$directory = Util::normalizePath($directory);
$contents = $this->getAdapter()->listContents($directory, $recursive);
- return (new ContentListingFormatter($directory, $recursive))->formatListing($contents);
+ return (new ContentListingFormatter($directory, $recursive, $this->config->get('case_sensitive', true)))
+ ->formatListing($contents);
}
/**
@@ -278,7 +282,7 @@ public function getMimetype($path)
$path = Util::normalizePath($path);
$this->assertPresent($path);
- if (! $object = $this->getAdapter()->getMimetype($path)) {
+ if (( ! $object = $this->getAdapter()->getMimetype($path)) || ! array_key_exists('mimetype', $object)) {
return false;
}
@@ -293,7 +297,7 @@ public function getTimestamp($path)
$path = Util::normalizePath($path);
$this->assertPresent($path);
- if (! $object = $this->getAdapter()->getTimestamp($path)) {
+ if (( ! $object = $this->getAdapter()->getTimestamp($path)) || ! array_key_exists('timestamp', $object)) {
return false;
}
@@ -308,7 +312,7 @@ public function getVisibility($path)
$path = Util::normalizePath($path);
$this->assertPresent($path);
- if (($object = $this->getAdapter()->getVisibility($path)) === false) {
+ if (( ! $object = $this->getAdapter()->getVisibility($path)) || ! array_key_exists('visibility', $object)) {
return false;
}
@@ -321,8 +325,9 @@ public function getVisibility($path)
public function getSize($path)
{
$path = Util::normalizePath($path);
+ $this->assertPresent($path);
- if (($object = $this->getAdapter()->getSize($path)) === false || !isset($object['size'])) {
+ if (( ! $object = $this->getAdapter()->getSize($path)) || ! array_key_exists('size', $object)) {
return false;
}
@@ -335,6 +340,7 @@ public function getSize($path)
public function setVisibility($path, $visibility)
{
$path = Util::normalizePath($path);
+ $this->assertPresent($path);
return (bool) $this->getAdapter()->setVisibility($path, $visibility);
}
@@ -357,7 +363,7 @@ public function get($path, Handler $handler = null)
{
$path = Util::normalizePath($path);
- if (! $handler) {
+ if ( ! $handler) {
$metadata = $this->getMetadata($path);
$handler = $metadata['type'] === 'file' ? new File($this, $path) : new Directory($this, $path);
}
@@ -374,10 +380,12 @@ public function get($path, Handler $handler = null)
* @param string $path path to file
*
* @throws FileNotFoundException
+ *
+ * @return void
*/
public function assertPresent($path)
{
- if (! $this->has($path)) {
+ if ($this->config->get('disable_asserts', false) === false && ! $this->has($path)) {
throw new FileNotFoundException($path);
}
}
@@ -388,10 +396,12 @@ public function assertPresent($path)
* @param string $path path to file
*
* @throws FileExistsException
+ *
+ * @return void
*/
public function assertAbsent($path)
{
- if ($this->has($path)) {
+ if ($this->config->get('disable_asserts', false) === false && $this->has($path)) {
throw new FileExistsException($path);
}
}
diff --git a/application/vendor/league/flysystem/src/FilesystemInterface.php b/application/vendor/league/flysystem/src/FilesystemInterface.php
index d631443..09b811b 100644
--- a/application/vendor/league/flysystem/src/FilesystemInterface.php
+++ b/application/vendor/league/flysystem/src/FilesystemInterface.php
@@ -2,6 +2,8 @@
namespace League\Flysystem;
+use InvalidArgumentException;
+
interface FilesystemInterface
{
/**
@@ -61,6 +63,8 @@ public function getMetadata($path);
*
* @param string $path The path to the file.
*
+ * @throws FileNotFoundException
+ *
* @return int|false The file size or false on failure.
*/
public function getSize($path);
@@ -216,6 +220,8 @@ public function createDir($dirname, array $config = []);
* @param string $path The path to the file.
* @param string $visibility One of 'public' or 'private'.
*
+ * @throws FileNotFoundException
+ *
* @return bool True on success, false on failure.
*/
public function setVisibility($path, $visibility);
@@ -258,6 +264,8 @@ public function readAndDelete($path);
/**
* Get a file/directory handler.
*
+ * @deprecated
+ *
* @param string $path The path to the file.
* @param Handler $handler An optional existing handler to populate.
*
diff --git a/application/vendor/league/flysystem/src/FilesystemNotFoundException.php b/application/vendor/league/flysystem/src/FilesystemNotFoundException.php
new file mode 100644
index 0000000..0c16aa0
--- /dev/null
+++ b/application/vendor/league/flysystem/src/FilesystemNotFoundException.php
@@ -0,0 +1,12 @@
+ Filesystem,]
+ *
+ * @throws InvalidArgumentException
*/
public function __construct(array $filesystems = [])
{
@@ -65,7 +45,9 @@ public function __construct(array $filesystems = [])
/**
* Mount filesystems.
*
- * @param array $filesystems [:prefix => Filesystem,]
+ * @param FilesystemInterface[] $filesystems [:prefix => Filesystem,]
+ *
+ * @throws InvalidArgumentException
*
* @return $this
*/
@@ -84,12 +66,14 @@ public function mountFilesystems(array $filesystems)
* @param string $prefix
* @param FilesystemInterface $filesystem
*
+ * @throws InvalidArgumentException
+ *
* @return $this
*/
public function mountFilesystem($prefix, FilesystemInterface $filesystem)
{
- if (! is_string($prefix)) {
- throw new InvalidArgumentException(__METHOD__.' expects argument #1 to be a string.');
+ if ( ! is_string($prefix)) {
+ throw new InvalidArgumentException(__METHOD__ . ' expects argument #1 to be a string.');
}
$this->filesystems[$prefix] = $filesystem;
@@ -102,14 +86,14 @@ public function mountFilesystem($prefix, FilesystemInterface $filesystem)
*
* @param string $prefix
*
- * @throws LogicException
+ * @throws FilesystemNotFoundException
*
* @return FilesystemInterface
*/
public function getFilesystem($prefix)
{
- if (! isset($this->filesystems[$prefix])) {
- throw new LogicException('No filesystem mounted with prefix '.$prefix);
+ if ( ! isset($this->filesystems[$prefix])) {
+ throw new FilesystemNotFoundException('No filesystem mounted with prefix ' . $prefix);
}
return $this->filesystems[$prefix];
@@ -120,25 +104,23 @@ public function getFilesystem($prefix)
*
* @param array $arguments
*
+ * @throws InvalidArgumentException
+ *
* @return array [:prefix, :arguments]
*/
public function filterPrefix(array $arguments)
{
if (empty($arguments)) {
- throw new LogicException('At least one argument needed');
+ throw new InvalidArgumentException('At least one argument needed');
}
$path = array_shift($arguments);
- if (! is_string($path)) {
+ if ( ! is_string($path)) {
throw new InvalidArgumentException('First argument should be a string');
}
- if (! preg_match('#^.+\:\/\/.*#', $path)) {
- throw new InvalidArgumentException('No prefix detected in path: '.$path);
- }
-
- list($prefix, $path) = explode('://', $path, 2);
+ list($prefix, $path) = $this->getPrefixAndPath($path);
array_unshift($arguments, $path);
return [$prefix, $arguments];
@@ -148,13 +130,15 @@ public function filterPrefix(array $arguments)
* @param string $directory
* @param bool $recursive
*
+ * @throws InvalidArgumentException
+ * @throws FilesystemNotFoundException
+ *
* @return array
*/
public function listContents($directory = '', $recursive = false)
{
- list($prefix, $arguments) = $this->filterPrefix([$directory]);
+ list($prefix, $directory) = $this->getPrefixAndPath($directory);
$filesystem = $this->getFilesystem($prefix);
- $directory = array_shift($arguments);
$result = $filesystem->listContents($directory, $recursive);
foreach ($result as &$file) {
@@ -170,6 +154,9 @@ public function listContents($directory = '', $recursive = false)
* @param string $method
* @param array $arguments
*
+ * @throws InvalidArgumentException
+ * @throws FilesystemNotFoundException
+ *
* @return mixed
*/
public function __call($method, $arguments)
@@ -180,26 +167,29 @@ public function __call($method, $arguments)
}
/**
- * @param $from
- * @param $to
+ * @param string $from
+ * @param string $to
+ * @param array $config
+ *
+ * @throws InvalidArgumentException
+ * @throws FilesystemNotFoundException
+ * @throws FileExistsException
*
* @return bool
*/
- public function copy($from, $to)
+ public function copy($from, $to, array $config = [])
{
- list($prefixFrom, $arguments) = $this->filterPrefix([$from]);
+ list($prefixFrom, $from) = $this->getPrefixAndPath($from);
- $fsFrom = $this->getFilesystem($prefixFrom);
- $buffer = call_user_func_array([$fsFrom, 'readStream'], $arguments);
+ $buffer = $this->getFilesystem($prefixFrom)->readStream($from);
if ($buffer === false) {
return false;
}
- list($prefixTo, $arguments) = $this->filterPrefix([$to]);
+ list($prefixTo, $to) = $this->getPrefixAndPath($to);
- $fsTo = $this->getFilesystem($prefixTo);
- $result = call_user_func_array([$fsTo, 'writeStream'], array_merge($arguments, [$buffer]));
+ $result = $this->getFilesystem($prefixTo)->writeStream($to, $buffer, $config);
if (is_resource($buffer)) {
fclose($buffer);
@@ -214,11 +204,15 @@ public function copy($from, $to)
* @param array $keys
* @param string $directory
* @param bool $recursive
+ *
+ * @throws InvalidArgumentException
+ * @throws FilesystemNotFoundException
+ *
+ * @return array
*/
public function listWith(array $keys = [], $directory = '', $recursive = false)
{
- list($prefix, $arguments) = $this->filterPrefix([$directory]);
- $directory = $arguments[0];
+ list($prefix, $directory) = $this->getPrefixAndPath($directory);
$arguments = [$keys, $directory, $recursive];
return $this->invokePluginOnFilesystem('listWith', $arguments, $prefix);
@@ -227,14 +221,32 @@ public function listWith(array $keys = [], $directory = '', $recursive = false)
/**
* Move a file.
*
- * @param $from
- * @param $to
+ * @param string $from
+ * @param string $to
+ * @param array $config
+ *
+ * @throws InvalidArgumentException
+ * @throws FilesystemNotFoundException
*
* @return bool
*/
- public function move($from, $to)
+ public function move($from, $to, array $config = [])
{
- $copied = $this->copy($from, $to);
+ list($prefixFrom, $pathFrom) = $this->getPrefixAndPath($from);
+ list($prefixTo, $pathTo) = $this->getPrefixAndPath($to);
+
+ if ($prefixFrom === $prefixTo) {
+ $filesystem = $this->getFilesystem($prefixFrom);
+ $renamed = $filesystem->rename($pathFrom, $pathTo);
+
+ if ($renamed && isset($config['visibility'])) {
+ return $filesystem->setVisibility($pathTo, $config['visibility']);
+ }
+
+ return $renamed;
+ }
+
+ $copied = $this->copy($from, $to, $config);
if ($copied) {
return $this->delete($from);
@@ -246,9 +258,11 @@ public function move($from, $to)
/**
* Invoke a plugin on a filesystem mounted on a given prefix.
*
- * @param $method
- * @param $arguments
- * @param $prefix
+ * @param string $method
+ * @param array $arguments
+ * @param string $prefix
+ *
+ * @throws FilesystemNotFoundException
*
* @return mixed
*/
@@ -266,4 +280,369 @@ public function invokePluginOnFilesystem($method, $arguments, $prefix)
return call_user_func_array($callback, $arguments);
}
+
+ /**
+ * @param string $path
+ *
+ * @throws InvalidArgumentException
+ *
+ * @return string[] [:prefix, :path]
+ */
+ protected function getPrefixAndPath($path)
+ {
+ if (strpos($path, '://') < 1) {
+ throw new InvalidArgumentException('No prefix detected in path: ' . $path);
+ }
+
+ return explode('://', $path, 2);
+ }
+
+ /**
+ * Check whether a file exists.
+ *
+ * @param string $path
+ *
+ * @return bool
+ */
+ public function has($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->has($path);
+ }
+
+ /**
+ * Read a file.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return string|false The file contents or false on failure.
+ */
+ public function read($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->read($path);
+ }
+
+ /**
+ * Retrieves a read-stream for a path.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return resource|false The path resource or false on failure.
+ */
+ public function readStream($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->readStream($path);
+ }
+
+ /**
+ * Get a file's metadata.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return array|false The file metadata or false on failure.
+ */
+ public function getMetadata($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->getMetadata($path);
+ }
+
+ /**
+ * Get a file's size.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return int|false The file size or false on failure.
+ */
+ public function getSize($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->getSize($path);
+ }
+
+ /**
+ * Get a file's mime-type.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return string|false The file mime-type or false on failure.
+ */
+ public function getMimetype($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->getMimetype($path);
+ }
+
+ /**
+ * Get a file's timestamp.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return string|false The timestamp or false on failure.
+ */
+ public function getTimestamp($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->getTimestamp($path);
+ }
+
+ /**
+ * Get a file's visibility.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return string|false The visibility (public|private) or false on failure.
+ */
+ public function getVisibility($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->getVisibility($path);
+ }
+
+ /**
+ * Write a new file.
+ *
+ * @param string $path The path of the new file.
+ * @param string $contents The file contents.
+ * @param array $config An optional configuration array.
+ *
+ * @throws FileExistsException
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function write($path, $contents, array $config = [])
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->write($path, $contents, $config);
+ }
+
+ /**
+ * Write a new file using a stream.
+ *
+ * @param string $path The path of the new file.
+ * @param resource $resource The file handle.
+ * @param array $config An optional configuration array.
+ *
+ * @throws InvalidArgumentException If $resource is not a file handle.
+ * @throws FileExistsException
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function writeStream($path, $resource, array $config = [])
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->writeStream($path, $resource, $config);
+ }
+
+ /**
+ * Update an existing file.
+ *
+ * @param string $path The path of the existing file.
+ * @param string $contents The file contents.
+ * @param array $config An optional configuration array.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function update($path, $contents, array $config = [])
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->update($path, $contents, $config);
+ }
+
+ /**
+ * Update an existing file using a stream.
+ *
+ * @param string $path The path of the existing file.
+ * @param resource $resource The file handle.
+ * @param array $config An optional configuration array.
+ *
+ * @throws InvalidArgumentException If $resource is not a file handle.
+ * @throws FileNotFoundException
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function updateStream($path, $resource, array $config = [])
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->updateStream($path, $resource, $config);
+ }
+
+ /**
+ * Rename a file.
+ *
+ * @param string $path Path to the existing file.
+ * @param string $newpath The new path of the file.
+ *
+ * @throws FileExistsException Thrown if $newpath exists.
+ * @throws FileNotFoundException Thrown if $path does not exist.
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function rename($path, $newpath)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->rename($path, $newpath);
+ }
+
+ /**
+ * Delete a file.
+ *
+ * @param string $path
+ *
+ * @throws FileNotFoundException
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function delete($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->delete($path);
+ }
+
+ /**
+ * Delete a directory.
+ *
+ * @param string $dirname
+ *
+ * @throws RootViolationException Thrown if $dirname is empty.
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function deleteDir($dirname)
+ {
+ list($prefix, $dirname) = $this->getPrefixAndPath($dirname);
+
+ return $this->getFilesystem($prefix)->deleteDir($dirname);
+ }
+
+ /**
+ * Create a directory.
+ *
+ * @param string $dirname The name of the new directory.
+ * @param array $config An optional configuration array.
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function createDir($dirname, array $config = [])
+ {
+ list($prefix, $dirname) = $this->getPrefixAndPath($dirname);
+
+ return $this->getFilesystem($prefix)->createDir($dirname);
+ }
+
+ /**
+ * Set the visibility for a file.
+ *
+ * @param string $path The path to the file.
+ * @param string $visibility One of 'public' or 'private'.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function setVisibility($path, $visibility)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->setVisibility($path, $visibility);
+ }
+
+ /**
+ * Create a file or update if exists.
+ *
+ * @param string $path The path to the file.
+ * @param string $contents The file contents.
+ * @param array $config An optional configuration array.
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function put($path, $contents, array $config = [])
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->put($path, $contents, $config);
+ }
+
+ /**
+ * Create a file or update if exists.
+ *
+ * @param string $path The path to the file.
+ * @param resource $resource The file handle.
+ * @param array $config An optional configuration array.
+ *
+ * @throws InvalidArgumentException Thrown if $resource is not a resource.
+ *
+ * @return bool True on success, false on failure.
+ */
+ public function putStream($path, $resource, array $config = [])
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->putStream($path, $resource, $config);
+ }
+
+ /**
+ * Read and delete a file.
+ *
+ * @param string $path The path to the file.
+ *
+ * @throws FileNotFoundException
+ *
+ * @return string|false The file contents, or false on failure.
+ */
+ public function readAndDelete($path)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->readAndDelete($path);
+ }
+
+ /**
+ * Get a file/directory handler.
+ *
+ * @deprecated
+ *
+ * @param string $path The path to the file.
+ * @param Handler $handler An optional existing handler to populate.
+ *
+ * @return Handler Either a file or directory handler.
+ */
+ public function get($path, Handler $handler = null)
+ {
+ list($prefix, $path) = $this->getPrefixAndPath($path);
+
+ return $this->getFilesystem($prefix)->get($path);
+ }
}
diff --git a/application/vendor/league/flysystem/src/NotSupportedException.php b/application/vendor/league/flysystem/src/NotSupportedException.php
index 5d20839..08f47f7 100644
--- a/application/vendor/league/flysystem/src/NotSupportedException.php
+++ b/application/vendor/league/flysystem/src/NotSupportedException.php
@@ -18,7 +18,7 @@ public static function forLink(SplFileInfo $file)
{
$message = 'Links are not supported, encountered link at ';
- return new static($message.$file->getPathname());
+ return new static($message . $file->getPathname());
}
/**
diff --git a/application/vendor/league/flysystem/src/Plugin/EmptyDir.php b/application/vendor/league/flysystem/src/Plugin/EmptyDir.php
index 9502333..b5ae7f5 100644
--- a/application/vendor/league/flysystem/src/Plugin/EmptyDir.php
+++ b/application/vendor/league/flysystem/src/Plugin/EmptyDir.php
@@ -17,7 +17,7 @@ public function getMethod()
/**
* Empty a directory's contents.
*
- * @param $dirname
+ * @param string $dirname
*/
public function handle($dirname)
{
diff --git a/application/vendor/league/flysystem/src/Plugin/ForcedCopy.php b/application/vendor/league/flysystem/src/Plugin/ForcedCopy.php
new file mode 100644
index 0000000..a41e9f3
--- /dev/null
+++ b/application/vendor/league/flysystem/src/Plugin/ForcedCopy.php
@@ -0,0 +1,44 @@
+filesystem->delete($newpath);
+ } catch (FileNotFoundException $e) {
+ // The destination path does not exist. That's ok.
+ $deleted = true;
+ }
+
+ if ($deleted) {
+ return $this->filesystem->copy($path, $newpath);
+ }
+
+ return false;
+ }
+}
diff --git a/application/vendor/league/flysystem/src/Plugin/ForcedRename.php b/application/vendor/league/flysystem/src/Plugin/ForcedRename.php
new file mode 100644
index 0000000..3f51cd6
--- /dev/null
+++ b/application/vendor/league/flysystem/src/Plugin/ForcedRename.php
@@ -0,0 +1,44 @@
+filesystem->delete($newpath);
+ } catch (FileNotFoundException $e) {
+ // The destination path does not exist. That's ok.
+ $deleted = true;
+ }
+
+ if ($deleted) {
+ return $this->filesystem->rename($path, $newpath);
+ }
+
+ return false;
+ }
+}
diff --git a/application/vendor/league/flysystem/src/Plugin/GetWithMetadata.php b/application/vendor/league/flysystem/src/Plugin/GetWithMetadata.php
index b88fd68..6fe4f05 100644
--- a/application/vendor/league/flysystem/src/Plugin/GetWithMetadata.php
+++ b/application/vendor/league/flysystem/src/Plugin/GetWithMetadata.php
@@ -3,6 +3,7 @@
namespace League\Flysystem\Plugin;
use InvalidArgumentException;
+use League\Flysystem\FileNotFoundException;
class GetWithMetadata extends AbstractPlugin
{
@@ -23,22 +24,23 @@ public function getMethod()
* @param array $metadata metadata keys
*
* @throws InvalidArgumentException
+ * @throws FileNotFoundException
*
- * @return array metadata
+ * @return array|false metadata
*/
public function handle($path, array $metadata)
{
$object = $this->filesystem->getMetadata($path);
- if (! $object) {
+ if ( ! $object) {
return false;
}
$keys = array_diff($metadata, array_keys($object));
foreach ($keys as $key) {
- if (! method_exists($this->filesystem, $method = 'get'.ucfirst($key))) {
- throw new InvalidArgumentException('Could not fetch metadata: '.$key);
+ if ( ! method_exists($this->filesystem, $method = 'get' . ucfirst($key))) {
+ throw new InvalidArgumentException('Could not fetch metadata: ' . $key);
}
$object[$key] = $this->filesystem->{$method}($path);
diff --git a/application/vendor/league/flysystem/src/Plugin/ListWith.php b/application/vendor/league/flysystem/src/Plugin/ListWith.php
index 341a219..d90464e 100644
--- a/application/vendor/league/flysystem/src/Plugin/ListWith.php
+++ b/application/vendor/league/flysystem/src/Plugin/ListWith.php
@@ -40,17 +40,17 @@ public function handle(array $keys = [], $directory = '', $recursive = false)
/**
* Get a meta-data value by key name.
*
- * @param array $object
- * @param $key
+ * @param array $object
+ * @param string $key
*
* @return array
*/
protected function getMetadataByName(array $object, $key)
{
- $method = 'get'.ucfirst($key);
+ $method = 'get' . ucfirst($key);
- if (! method_exists($this->filesystem, $method)) {
- throw new \InvalidArgumentException('Could not get meta-data for key: '.$key);
+ if ( ! method_exists($this->filesystem, $method)) {
+ throw new \InvalidArgumentException('Could not get meta-data for key: ' . $key);
}
$object[$key] = $this->filesystem->{$method}($object['path']);
diff --git a/application/vendor/league/flysystem/src/Plugin/PluggableTrait.php b/application/vendor/league/flysystem/src/Plugin/PluggableTrait.php
index 4f39a16..922edfe 100644
--- a/application/vendor/league/flysystem/src/Plugin/PluggableTrait.php
+++ b/application/vendor/league/flysystem/src/Plugin/PluggableTrait.php
@@ -19,10 +19,16 @@ trait PluggableTrait
*
* @param PluginInterface $plugin
*
+ * @throws LogicException
+ *
* @return $this
*/
public function addPlugin(PluginInterface $plugin)
{
+ if ( ! method_exists($plugin, 'handle')) {
+ throw new LogicException(get_class($plugin) . ' does not have a handle method.');
+ }
+
$this->plugins[$plugin->getMethod()] = $plugin;
return $this;
@@ -33,18 +39,14 @@ public function addPlugin(PluginInterface $plugin)
*
* @param string $method
*
- * @throws LogicException
+ * @throws PluginNotFoundException
*
- * @return PluginInterface $plugin
+ * @return PluginInterface
*/
protected function findPlugin($method)
{
- if (! isset($this->plugins[$method])) {
- throw new PluginNotFoundException('Plugin not found for method: '.$method);
- }
-
- if (! method_exists($this->plugins[$method], 'handle')) {
- throw new LogicException(get_class($this->plugins[$method]).' does not have a handle method.');
+ if ( ! isset($this->plugins[$method])) {
+ throw new PluginNotFoundException('Plugin not found for method: ' . $method);
}
return $this->plugins[$method];
@@ -53,8 +55,11 @@ protected function findPlugin($method)
/**
* Invoke a plugin by method name.
*
- * @param string $method
- * @param array $arguments
+ * @param string $method
+ * @param array $arguments
+ * @param FilesystemInterface $filesystem
+ *
+ * @throws PluginNotFoundException
*
* @return mixed
*/
@@ -84,8 +89,8 @@ public function __call($method, array $arguments)
} catch (PluginNotFoundException $e) {
throw new BadMethodCallException(
'Call to undefined method '
- .get_class($this)
- .'::'.$method
+ . get_class($this)
+ . '::' . $method
);
}
}
diff --git a/application/vendor/league/flysystem/src/ReadInterface.php b/application/vendor/league/flysystem/src/ReadInterface.php
index f37e0c9..898a8d5 100644
--- a/application/vendor/league/flysystem/src/ReadInterface.php
+++ b/application/vendor/league/flysystem/src/ReadInterface.php
@@ -51,7 +51,7 @@ public function listContents($directory = '', $recursive = false);
public function getMetadata($path);
/**
- * Get all the meta data of a file or directory.
+ * Get the size of a file.
*
* @param string $path
*
@@ -69,7 +69,7 @@ public function getSize($path);
public function getMimetype($path);
/**
- * Get the timestamp of a file.
+ * Get the last modified time of a file as a timestamp.
*
* @param string $path
*
diff --git a/application/vendor/league/flysystem/src/SafeStorage.php b/application/vendor/league/flysystem/src/SafeStorage.php
new file mode 100644
index 0000000..5397f58
--- /dev/null
+++ b/application/vendor/league/flysystem/src/SafeStorage.php
@@ -0,0 +1,39 @@
+hash = spl_object_hash($this);
+ static::$safeStorage[$this->hash] = [];
+ }
+
+ public function storeSafely($key, $value)
+ {
+ static::$safeStorage[$this->hash][$key] = $value;
+ }
+
+ public function retrieveSafely($key)
+ {
+ if (array_key_exists($key, static::$safeStorage[$this->hash])) {
+ return static::$safeStorage[$this->hash][$key];
+ }
+ }
+
+ public function __destruct()
+ {
+ unset(static::$safeStorage[$this->hash]);
+ }
+}
diff --git a/application/vendor/league/flysystem/src/UnreadableFileException.php b/application/vendor/league/flysystem/src/UnreadableFileException.php
new file mode 100644
index 0000000..e668033
--- /dev/null
+++ b/application/vendor/league/flysystem/src/UnreadableFileException.php
@@ -0,0 +1,18 @@
+getRealPath()
+ )
+ );
+ }
+}
diff --git a/application/vendor/league/flysystem/src/Util.php b/application/vendor/league/flysystem/src/Util.php
index 5734856..2c77540 100644
--- a/application/vendor/league/flysystem/src/Util.php
+++ b/application/vendor/league/flysystem/src/Util.php
@@ -16,12 +16,17 @@ class Util
*/
public static function pathinfo($path)
{
- $pathinfo = pathinfo($path) + compact('path');
- $pathinfo['dirname'] = array_key_exists('dirname', $pathinfo)
- ? static::normalizeDirname($pathinfo['dirname'])
- : '';
+ $pathinfo = compact('path');
- return $pathinfo;
+ if ('' !== $dirname = dirname($path)) {
+ $pathinfo['dirname'] = static::normalizeDirname($dirname);
+ }
+
+ $pathinfo['basename'] = static::basename($path);
+
+ $pathinfo += pathinfo($pathinfo['basename']);
+
+ return $pathinfo + ['dirname' => ''];
}
/**
@@ -33,11 +38,7 @@ public static function pathinfo($path)
*/
public static function normalizeDirname($dirname)
{
- if ($dirname === '.') {
- return '';
- }
-
- return $dirname;
+ return $dirname === '.' ? '' : $dirname;
}
/**
@@ -65,7 +66,7 @@ public static function map(array $object, array $map)
$result = [];
foreach ($map as $from => $to) {
- if (! isset($object[$from])) {
+ if ( ! isset($object[$from])) {
continue;
}
@@ -86,20 +87,7 @@ public static function map(array $object, array $map)
*/
public static function normalizePath($path)
{
- // Remove any kind of funky unicode whitespace
- $normalized = preg_replace('#\p{C}+|^\./#u', '', $path);
- $normalized = static::normalizeRelativePath($normalized);
-
- if (preg_match('#/\.{2}|^\.{2}/|^\.{2}$#', $normalized)) {
- throw new LogicException(
- 'Path is outside of the defined root, path: [' . $path . '], resolved: [' . $normalized . ']'
- );
- }
-
- $normalized = preg_replace('#\\\{2,}#', '\\', trim($normalized, '\\'));
- $normalized = preg_replace('#/{2,}#', '/', trim($normalized, '/'));
-
- return $normalized;
+ return static::normalizeRelativePath($path);
}
/**
@@ -107,18 +95,54 @@ public static function normalizePath($path)
*
* @param string $path
*
+ * @throws LogicException
+ *
* @return string
*/
public static function normalizeRelativePath($path)
{
- // Path remove self referring paths ("/./").
- $path = preg_replace('#/\.(?=/)|^\./|/\./?$#', '', $path);
+ $path = str_replace('\\', '/', $path);
+ $path = static::removeFunkyWhiteSpace($path);
+
+ $parts = [];
+
+ foreach (explode('/', $path) as $part) {
+ switch ($part) {
+ case '':
+ case '.':
+ break;
+
+ case '..':
+ if (empty($parts)) {
+ throw new LogicException(
+ 'Path is outside of the defined root, path: [' . $path . ']'
+ );
+ }
+ array_pop($parts);
+ break;
+
+ default:
+ $parts[] = $part;
+ break;
+ }
+ }
- // Regex for resolving relative paths
- $regex = '#/*[^/\.]+/\.\.#Uu';
+ return implode('/', $parts);
+ }
- while (preg_match($regex, $path)) {
- $path = preg_replace($regex, '', $path);
+ /**
+ * Removes unprintable characters and invalid unicode characters.
+ *
+ * @param string $path
+ *
+ * @return string $path
+ */
+ protected static function removeFunkyWhiteSpace($path)
+ {
+ // We do this check in a loop, since removing invalid unicode characters
+ // can lead to new characters being created.
+ while (preg_match('#\p{C}+|^\./#u', $path)) {
+ $path = preg_replace('#\p{C}+|^\./#u', '', $path);
}
return $path;
@@ -152,8 +176,8 @@ public static function contentSize($contents)
/**
* Guess MIME Type based on the path of the file and it's content.
*
- * @param string $path
- * @param string $content
+ * @param string $path
+ * @param string|resource $content
*
* @return string|null MIME Type or NULL if no extension detected
*/
@@ -161,15 +185,11 @@ public static function guessMimeType($path, $content)
{
$mimeType = MimeType::detectByContent($content);
- if (empty($mimeType) || $mimeType === 'text/plain') {
- $extension = pathinfo($path, PATHINFO_EXTENSION);
-
- if ($extension) {
- $mimeType = MimeType::detectByFileExtension($extension) ?: 'text/plain';
- }
+ if ( ! (empty($mimeType) || in_array($mimeType, ['application/x-empty', 'text/plain', 'text/x-asm']))) {
+ return $mimeType;
}
- return $mimeType;
+ return MimeType::detectByFilename($path);
}
/**
@@ -185,11 +205,7 @@ public static function emulateDirectories(array $listing)
$listedDirectories = [];
foreach ($listing as $object) {
- list($directories, $listedDirectories) = static::emulateObjectDirectories(
- $object,
- $directories,
- $listedDirectories
- );
+ list($directories, $listedDirectories) = static::emulateObjectDirectories($object, $directories, $listedDirectories);
}
$directories = array_diff(array_unique($directories), array_unique($listedDirectories));
@@ -281,7 +297,7 @@ protected static function emulateObjectDirectories(array $object, array $directo
$parent = $object['dirname'];
- while (! empty($parent) && ! in_array($parent, $directories)) {
+ while ( ! empty($parent) && ! in_array($parent, $directories)) {
$directories[] = $parent;
$parent = static::dirname($parent);
}
@@ -294,4 +310,40 @@ protected static function emulateObjectDirectories(array $object, array $directo
return [$directories, $listedDirectories];
}
+
+ /**
+ * Returns the trailing name component of the path.
+ *
+ * @param string $path
+ *
+ * @return string
+ */
+ private static function basename($path)
+ {
+ $separators = DIRECTORY_SEPARATOR === '/' ? '/' : '\/';
+
+ $path = rtrim($path, $separators);
+
+ $basename = preg_replace('#.*?([^' . preg_quote($separators, '#') . ']+$)#', '$1', $path);
+
+ if (DIRECTORY_SEPARATOR === '/') {
+ return $basename;
+ }
+ // @codeCoverageIgnoreStart
+ // Extra Windows path munging. This is tested via AppVeyor, but code
+ // coverage is not reported.
+
+ // Handle relative paths with drive letters. c:file.txt.
+ while (preg_match('#^[a-zA-Z]{1}:[^\\\/]#', $basename)) {
+ $basename = substr($basename, 2);
+ }
+
+ // Remove colon for standalone drive letter names.
+ if (preg_match('#^[a-zA-Z]{1}:$#', $basename)) {
+ $basename = rtrim($basename, ':');
+ }
+
+ return $basename;
+ // @codeCoverageIgnoreEnd
+ }
}
diff --git a/application/vendor/league/flysystem/src/Util/ContentListingFormatter.php b/application/vendor/league/flysystem/src/Util/ContentListingFormatter.php
index db453c4..ae0d3b9 100644
--- a/application/vendor/league/flysystem/src/Util/ContentListingFormatter.php
+++ b/application/vendor/league/flysystem/src/Util/ContentListingFormatter.php
@@ -13,19 +13,26 @@ class ContentListingFormatter
* @var string
*/
private $directory;
+
/**
* @var bool
*/
private $recursive;
+ /**
+ * @var bool
+ */
+ private $caseSensitive;
+
/**
* @param string $directory
* @param bool $recursive
*/
- public function __construct($directory, $recursive)
+ public function __construct($directory, $recursive, $caseSensitive = true)
{
- $this->directory = $directory;
+ $this->directory = rtrim($directory, '/');
$this->recursive = $recursive;
+ $this->caseSensitive = $caseSensitive;
}
/**
@@ -37,14 +44,9 @@ public function __construct($directory, $recursive)
*/
public function formatListing(array $listing)
{
- $listing = array_values(
- array_map(
- [$this, 'addPathInfo'],
- array_filter($listing, [$this, 'isEntryOutOfScope'])
- )
- );
-
- return $this->sortListing($listing);
+ $listing = array_filter(array_map([$this, 'addPathInfo'], $listing), [$this, 'isEntryOutOfScope']);
+
+ return $this->sortListing(array_values($listing));
}
private function addPathInfo(array $entry)
@@ -75,7 +77,7 @@ private function isEntryOutOfScope(array $entry)
/**
* Check if the entry resides within the parent directory.
*
- * @param $entry
+ * @param array $entry
*
* @return bool
*/
@@ -85,19 +87,23 @@ private function residesInDirectory(array $entry)
return true;
}
- return strpos($entry['path'], $this->directory . '/') === 0;
+ return $this->caseSensitive
+ ? strpos($entry['path'], $this->directory . '/') === 0
+ : stripos($entry['path'], $this->directory . '/') === 0;
}
/**
* Check if the entry is a direct child of the directory.
*
- * @param $entry
+ * @param array $entry
*
* @return bool
*/
private function isDirectChild(array $entry)
{
- return Util::dirname($entry['path']) === $this->directory;
+ return $this->caseSensitive
+ ? $entry['dirname'] === $this->directory
+ : strcasecmp($this->directory, $entry['dirname']) === 0;
}
/**
@@ -107,12 +113,9 @@ private function isDirectChild(array $entry)
*/
private function sortListing(array $listing)
{
- usort(
- $listing,
- function ($a, $b) {
- return strcasecmp($a['path'], $b['path']);
- }
- );
+ usort($listing, function ($a, $b) {
+ return strcasecmp($a['path'], $b['path']);
+ });
return $listing;
}
diff --git a/application/vendor/league/flysystem/src/Util/MimeType.php b/application/vendor/league/flysystem/src/Util/MimeType.php
index d44d013..a4bd5e2 100644
--- a/application/vendor/league/flysystem/src/Util/MimeType.php
+++ b/application/vendor/league/flysystem/src/Util/MimeType.php
@@ -2,31 +2,212 @@
namespace League\Flysystem\Util;
-use Finfo;
+use ErrorException;
+use finfo;
/**
* @internal
*/
class MimeType
{
+ protected static $extensionToMimeTypeMap = [
+ 'hqx' => 'application/mac-binhex40',
+ 'cpt' => 'application/mac-compactpro',
+ 'csv' => 'text/csv',
+ 'bin' => 'application/octet-stream',
+ 'dms' => 'application/octet-stream',
+ 'lha' => 'application/octet-stream',
+ 'lzh' => 'application/octet-stream',
+ 'exe' => 'application/octet-stream',
+ 'class' => 'application/octet-stream',
+ 'psd' => 'application/x-photoshop',
+ 'so' => 'application/octet-stream',
+ 'sea' => 'application/octet-stream',
+ 'dll' => 'application/octet-stream',
+ 'oda' => 'application/oda',
+ 'pdf' => 'application/pdf',
+ 'ai' => 'application/pdf',
+ 'eps' => 'application/postscript',
+ 'epub' => 'application/epub+zip',
+ 'ps' => 'application/postscript',
+ 'smi' => 'application/smil',
+ 'smil' => 'application/smil',
+ 'mif' => 'application/vnd.mif',
+ 'xls' => 'application/vnd.ms-excel',
+ 'xlt' => 'application/vnd.ms-excel',
+ 'xla' => 'application/vnd.ms-excel',
+ 'ppt' => 'application/powerpoint',
+ 'pot' => 'application/vnd.ms-powerpoint',
+ 'pps' => 'application/vnd.ms-powerpoint',
+ 'ppa' => 'application/vnd.ms-powerpoint',
+ 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+ 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+ 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+ 'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+ 'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+ 'potm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+ 'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+ 'wbxml' => 'application/wbxml',
+ 'wmlc' => 'application/wmlc',
+ 'dcr' => 'application/x-director',
+ 'dir' => 'application/x-director',
+ 'dxr' => 'application/x-director',
+ 'dvi' => 'application/x-dvi',
+ 'gtar' => 'application/x-gtar',
+ 'gz' => 'application/x-gzip',
+ 'gzip' => 'application/x-gzip',
+ 'php' => 'application/x-httpd-php',
+ 'php4' => 'application/x-httpd-php',
+ 'php3' => 'application/x-httpd-php',
+ 'phtml' => 'application/x-httpd-php',
+ 'phps' => 'application/x-httpd-php-source',
+ 'js' => 'application/javascript',
+ 'swf' => 'application/x-shockwave-flash',
+ 'sit' => 'application/x-stuffit',
+ 'tar' => 'application/x-tar',
+ 'tgz' => 'application/x-tar',
+ 'z' => 'application/x-compress',
+ 'xhtml' => 'application/xhtml+xml',
+ 'xht' => 'application/xhtml+xml',
+ 'rdf' => 'application/rdf+xml',
+ 'zip' => 'application/x-zip',
+ 'rar' => 'application/x-rar',
+ 'mid' => 'audio/midi',
+ 'midi' => 'audio/midi',
+ 'mpga' => 'audio/mpeg',
+ 'mp2' => 'audio/mpeg',
+ 'mp3' => 'audio/mpeg',
+ 'aif' => 'audio/x-aiff',
+ 'aiff' => 'audio/x-aiff',
+ 'aifc' => 'audio/x-aiff',
+ 'ram' => 'audio/x-pn-realaudio',
+ 'rm' => 'audio/x-pn-realaudio',
+ 'rpm' => 'audio/x-pn-realaudio-plugin',
+ 'ra' => 'audio/x-realaudio',
+ 'rv' => 'video/vnd.rn-realvideo',
+ 'wav' => 'audio/x-wav',
+ 'jpg' => 'image/jpeg',
+ 'jpeg' => 'image/jpeg',
+ 'jpe' => 'image/jpeg',
+ 'png' => 'image/png',
+ 'gif' => 'image/gif',
+ 'bmp' => 'image/bmp',
+ 'tiff' => 'image/tiff',
+ 'tif' => 'image/tiff',
+ 'svg' => 'image/svg+xml',
+ 'css' => 'text/css',
+ 'html' => 'text/html',
+ 'htm' => 'text/html',
+ 'shtml' => 'text/html',
+ 'txt' => 'text/plain',
+ 'text' => 'text/plain',
+ 'log' => 'text/plain',
+ 'rtx' => 'text/richtext',
+ 'rtf' => 'text/rtf',
+ 'xml' => 'application/xml',
+ 'xsl' => 'application/xml',
+ 'dmn' => 'application/octet-stream',
+ 'bpmn' => 'application/octet-stream',
+ 'mpeg' => 'video/mpeg',
+ 'mpg' => 'video/mpeg',
+ 'mpe' => 'video/mpeg',
+ 'qt' => 'video/quicktime',
+ 'mov' => 'video/quicktime',
+ 'avi' => 'video/x-msvideo',
+ 'movie' => 'video/x-sgi-movie',
+ 'doc' => 'application/msword',
+ 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'docm' => 'application/vnd.ms-word.template.macroEnabled.12',
+ 'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
+ 'dot' => 'application/msword',
+ 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+ 'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+ 'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
+ 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+ 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+ 'word' => 'application/msword',
+ 'xl' => 'application/excel',
+ 'eml' => 'message/rfc822',
+ 'json' => 'application/json',
+ 'pem' => 'application/x-x509-user-cert',
+ 'p10' => 'application/x-pkcs10',
+ 'p12' => 'application/x-pkcs12',
+ 'p7a' => 'application/x-pkcs7-signature',
+ 'p7c' => 'application/pkcs7-mime',
+ 'p7m' => 'application/pkcs7-mime',
+ 'p7r' => 'application/x-pkcs7-certreqresp',
+ 'p7s' => 'application/pkcs7-signature',
+ 'crt' => 'application/x-x509-ca-cert',
+ 'crl' => 'application/pkix-crl',
+ 'der' => 'application/x-x509-ca-cert',
+ 'kdb' => 'application/octet-stream',
+ 'pgp' => 'application/pgp',
+ 'gpg' => 'application/gpg-keys',
+ 'sst' => 'application/octet-stream',
+ 'csr' => 'application/octet-stream',
+ 'rsa' => 'application/x-pkcs7',
+ 'cer' => 'application/pkix-cert',
+ '3g2' => 'video/3gpp2',
+ '3gp' => 'video/3gp',
+ 'mp4' => 'video/mp4',
+ 'm4a' => 'audio/x-m4a',
+ 'f4v' => 'video/mp4',
+ 'webm' => 'video/webm',
+ 'aac' => 'audio/x-acc',
+ 'm4u' => 'application/vnd.mpegurl',
+ 'm3u' => 'text/plain',
+ 'xspf' => 'application/xspf+xml',
+ 'vlc' => 'application/videolan',
+ 'wmv' => 'video/x-ms-wmv',
+ 'au' => 'audio/x-au',
+ 'ac3' => 'audio/ac3',
+ 'flac' => 'audio/x-flac',
+ 'ogg' => 'audio/ogg',
+ 'kmz' => 'application/vnd.google-earth.kmz',
+ 'kml' => 'application/vnd.google-earth.kml+xml',
+ 'ics' => 'text/calendar',
+ 'zsh' => 'text/x-scriptzsh',
+ '7zip' => 'application/x-7z-compressed',
+ 'cdr' => 'application/cdr',
+ 'wma' => 'audio/x-ms-wma',
+ 'jar' => 'application/java-archive',
+ 'tex' => 'application/x-tex',
+ 'latex' => 'application/x-latex',
+ 'odt' => 'application/vnd.oasis.opendocument.text',
+ 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+ 'odp' => 'application/vnd.oasis.opendocument.presentation',
+ 'odg' => 'application/vnd.oasis.opendocument.graphics',
+ 'odc' => 'application/vnd.oasis.opendocument.chart',
+ 'odf' => 'application/vnd.oasis.opendocument.formula',
+ 'odi' => 'application/vnd.oasis.opendocument.image',
+ 'odm' => 'application/vnd.oasis.opendocument.text-master',
+ 'odb' => 'application/vnd.oasis.opendocument.database',
+ 'ott' => 'application/vnd.oasis.opendocument.text-template',
+ ];
+
/**
* Detects MIME Type based on given content.
*
- * @param string $content
+ * @param mixed $content
*
* @return string|null MIME Type or NULL if no mime type detected
*/
public static function detectByContent($content)
{
- if (! class_exists('Finfo')) {
- return;
+ if ( ! class_exists('finfo') || ! is_string($content)) {
+ return null;
}
+ try {
+ $finfo = new finfo(FILEINFO_MIME_TYPE);
- $finfo = new Finfo(FILEINFO_MIME_TYPE);
- $mimeType = $finfo->buffer($content);
-
- return $mimeType ?: null;
- }
+ return $finfo->buffer($content) ?: null;
+ // @codeCoverageIgnoreStart
+ } catch (ErrorException $e) {
+ // This is caused by an array to string conversion error.
+ }
+ } // @codeCoverageIgnoreEnd
/**
* Detects MIME Type based on file extension.
@@ -37,15 +218,21 @@ public static function detectByContent($content)
*/
public static function detectByFileExtension($extension)
{
- static $extensionToMimeTypeMap;
+ return isset(static::$extensionToMimeTypeMap[$extension])
+ ? static::$extensionToMimeTypeMap[$extension]
+ : 'text/plain';
+ }
- if (! $extensionToMimeTypeMap) {
- $extensionToMimeTypeMap = static::getExtensionToMimeTypeMap();
- }
+ /**
+ * @param string $filename
+ *
+ * @return string|null MIME Type or NULL if no extension detected
+ */
+ public static function detectByFilename($filename)
+ {
+ $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
- if (isset($extensionToMimeTypeMap[$extension])) {
- return $extensionToMimeTypeMap[$extension];
- }
+ return empty($extension) ? 'text/plain' : static::detectByFileExtension($extension);
}
/**
@@ -53,146 +240,6 @@ public static function detectByFileExtension($extension)
*/
public static function getExtensionToMimeTypeMap()
{
- return [
- 'hqx' => 'application/mac-binhex40',
- 'cpt' => 'application/mac-compactpro',
- 'csv' => 'text/x-comma-separated-values',
- 'bin' => 'application/octet-stream',
- 'dms' => 'application/octet-stream',
- 'lha' => 'application/octet-stream',
- 'lzh' => 'application/octet-stream',
- 'exe' => 'application/octet-stream',
- 'class' => 'application/octet-stream',
- 'psd' => 'application/x-photoshop',
- 'so' => 'application/octet-stream',
- 'sea' => 'application/octet-stream',
- 'dll' => 'application/octet-stream',
- 'oda' => 'application/oda',
- 'pdf' => 'application/pdf',
- 'ai' => 'application/pdf',
- 'eps' => 'application/postscript',
- 'ps' => 'application/postscript',
- 'smi' => 'application/smil',
- 'smil' => 'application/smil',
- 'mif' => 'application/vnd.mif',
- 'xls' => 'application/vnd.ms-excel',
- 'ppt' => 'application/powerpoint',
- 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
- 'wbxml' => 'application/wbxml',
- 'wmlc' => 'application/wmlc',
- 'dcr' => 'application/x-director',
- 'dir' => 'application/x-director',
- 'dxr' => 'application/x-director',
- 'dvi' => 'application/x-dvi',
- 'gtar' => 'application/x-gtar',
- 'gz' => 'application/x-gzip',
- 'gzip' => 'application/x-gzip',
- 'php' => 'application/x-httpd-php',
- 'php4' => 'application/x-httpd-php',
- 'php3' => 'application/x-httpd-php',
- 'phtml' => 'application/x-httpd-php',
- 'phps' => 'application/x-httpd-php-source',
- 'js' => 'application/javascript',
- 'swf' => 'application/x-shockwave-flash',
- 'sit' => 'application/x-stuffit',
- 'tar' => 'application/x-tar',
- 'tgz' => 'application/x-tar',
- 'z' => 'application/x-compress',
- 'xhtml' => 'application/xhtml+xml',
- 'xht' => 'application/xhtml+xml',
- 'zip' => 'application/x-zip',
- 'rar' => 'application/x-rar',
- 'mid' => 'audio/midi',
- 'midi' => 'audio/midi',
- 'mpga' => 'audio/mpeg',
- 'mp2' => 'audio/mpeg',
- 'mp3' => 'audio/mpeg',
- 'aif' => 'audio/x-aiff',
- 'aiff' => 'audio/x-aiff',
- 'aifc' => 'audio/x-aiff',
- 'ram' => 'audio/x-pn-realaudio',
- 'rm' => 'audio/x-pn-realaudio',
- 'rpm' => 'audio/x-pn-realaudio-plugin',
- 'ra' => 'audio/x-realaudio',
- 'rv' => 'video/vnd.rn-realvideo',
- 'wav' => 'audio/x-wav',
- 'jpg' => 'image/jpeg',
- 'jpeg' => 'image/jpeg',
- 'jpe' => 'image/jpeg',
- 'png' => 'image/png',
- 'gif' => 'image/gif',
- 'bmp' => 'image/bmp',
- 'tiff' => 'image/tiff',
- 'tif' => 'image/tiff',
- 'css' => 'text/css',
- 'html' => 'text/html',
- 'htm' => 'text/html',
- 'shtml' => 'text/html',
- 'txt' => 'text/plain',
- 'text' => 'text/plain',
- 'log' => 'text/plain',
- 'rtx' => 'text/richtext',
- 'rtf' => 'text/rtf',
- 'xml' => 'application/xml',
- 'xsl' => 'application/xml',
- 'mpeg' => 'video/mpeg',
- 'mpg' => 'video/mpeg',
- 'mpe' => 'video/mpeg',
- 'qt' => 'video/quicktime',
- 'mov' => 'video/quicktime',
- 'avi' => 'video/x-msvideo',
- 'movie' => 'video/x-sgi-movie',
- 'doc' => 'application/msword',
- 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'dot' => 'application/msword',
- 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- 'word' => 'application/msword',
- 'xl' => 'application/excel',
- 'eml' => 'message/rfc822',
- 'json' => 'application/json',
- 'pem' => 'application/x-x509-user-cert',
- 'p10' => 'application/x-pkcs10',
- 'p12' => 'application/x-pkcs12',
- 'p7a' => 'application/x-pkcs7-signature',
- 'p7c' => 'application/pkcs7-mime',
- 'p7m' => 'application/pkcs7-mime',
- 'p7r' => 'application/x-pkcs7-certreqresp',
- 'p7s' => 'application/pkcs7-signature',
- 'crt' => 'application/x-x509-ca-cert',
- 'crl' => 'application/pkix-crl',
- 'der' => 'application/x-x509-ca-cert',
- 'kdb' => 'application/octet-stream',
- 'pgp' => 'application/pgp',
- 'gpg' => 'application/gpg-keys',
- 'sst' => 'application/octet-stream',
- 'csr' => 'application/octet-stream',
- 'rsa' => 'application/x-pkcs7',
- 'cer' => 'application/pkix-cert',
- '3g2' => 'video/3gpp2',
- '3gp' => 'video/3gp',
- 'mp4' => 'video/mp4',
- 'm4a' => 'audio/x-m4a',
- 'f4v' => 'video/mp4',
- 'webm' => 'video/webm',
- 'aac' => 'audio/x-acc',
- 'm4u' => 'application/vnd.mpegurl',
- 'm3u' => 'text/plain',
- 'xspf' => 'application/xspf+xml',
- 'vlc' => 'application/videolan',
- 'wmv' => 'video/x-ms-wmv',
- 'au' => 'audio/x-au',
- 'ac3' => 'audio/ac3',
- 'flac' => 'audio/x-flac',
- 'ogg' => 'audio/ogg',
- 'kmz' => 'application/vnd.google-earth.kmz',
- 'kml' => 'application/vnd.google-earth.kml+xml',
- 'ics' => 'text/calendar',
- 'zsh' => 'text/x-scriptzsh',
- '7zip' => 'application/x-7z-compressed',
- 'cdr' => 'application/cdr',
- 'wma' => 'audio/x-ms-wma',
- 'jar' => 'application/java-archive',
- ];
+ return static::$extensionToMimeTypeMap;
}
}
diff --git a/application/vendor/league/flysystem/src/Util/StreamHasher.php b/application/vendor/league/flysystem/src/Util/StreamHasher.php
new file mode 100644
index 0000000..938ec5d
--- /dev/null
+++ b/application/vendor/league/flysystem/src/Util/StreamHasher.php
@@ -0,0 +1,36 @@
+algo = $algo;
+ }
+
+ /**
+ * @param resource $resource
+ *
+ * @return string
+ */
+ public function hash($resource)
+ {
+ rewind($resource);
+ $context = hash_init($this->algo);
+ hash_update_stream($context, $resource);
+ fclose($resource);
+
+ return hash_final($context);
+ }
+}
diff --git a/application/vendor/monolog/monolog/.php_cs b/application/vendor/monolog/monolog/.php_cs
deleted file mode 100644
index 2511e98..0000000
--- a/application/vendor/monolog/monolog/.php_cs
+++ /dev/null
@@ -1,15 +0,0 @@
-files()
- ->name('*.php')
- ->in(__DIR__.'/src')
- ->in(__DIR__.'/tests')
-;
-
-return Symfony\CS\Config\Config::create()
- ->fixers(array(
- 'psr0', 'encoding', 'short_tag', 'braces', 'elseif', 'eof_ending', 'function_declaration', 'indentation', 'line_after_namespace', 'linefeed', 'lowercase_constants', 'lowercase_keywords', 'multiple_use', 'php_closing_tag', 'trailing_spaces', 'visibility', 'duplicate_semicolon', 'extra_empty_lines', 'include', 'namespace_no_leading_whitespace', 'object_operator', 'operators_spaces', 'phpdoc_params', 'return', 'single_array_no_trailing_comma', 'spaces_cast', 'standardize_not_equal', 'ternary_spaces', 'unused_use', 'whitespacy_lines',
- ))
- ->finder($finder)
-;
diff --git a/application/vendor/monolog/monolog/CHANGELOG.md b/application/vendor/monolog/monolog/CHANGELOG.md
new file mode 100644
index 0000000..9b0f528
--- /dev/null
+++ b/application/vendor/monolog/monolog/CHANGELOG.md
@@ -0,0 +1,388 @@
+### 1.25.1 (2019-09-06)
+
+ * Fixed forward-compatible interfaces to be compatible with Monolog 1.x too.
+
+### 1.25.0 (2019-09-06)
+
+ * Deprecated SlackbotHandler, use SlackWebhookHandler or SlackHandler instead
+ * Deprecated RavenHandler, use sentry/sentry 2.x and their Sentry\Monolog\Handler instead
+ * Deprecated HipChatHandler, migrate to Slack and use SlackWebhookHandler or SlackHandler instead
+ * Added forward-compatible interfaces and traits FormattableHandlerInterface, FormattableHandlerTrait, ProcessableHandlerInterface, ProcessableHandlerTrait. If you use modern PHP and want to make code compatible with Monolog 1 and 2 this can help. You will have to require at least Monolog 1.25 though.
+ * Added support for RFC3164 (outdated BSD syslog protocol) to SyslogUdpHandler
+ * Fixed issue in GroupHandler and WhatFailureGroupHandler where setting multiple processors would duplicate records
+ * Fixed issue in SignalHandler restarting syscalls functionality
+ * Fixed normalizers handling of exception backtraces to avoid serializing arguments in some cases
+ * Fixed ZendMonitorHandler to work with the latest Zend Server versions
+ * Fixed ChromePHPHandler to avoid sending more data than latest Chrome versions allow in headers (4KB down from 256KB).
+
+### 1.24.0 (2018-11-05)
+
+ * BC Notice: If you are extending any of the Monolog's Formatters' `normalize` method, make sure you add the new `$depth = 0` argument to your function signature to avoid strict PHP warnings.
+ * Added a `ResettableInterface` in order to reset/reset/clear/flush handlers and processors
+ * Added a `ProcessorInterface` as an optional way to label a class as being a processor (mostly useful for autowiring dependency containers)
+ * Added a way to log signals being received using Monolog\SignalHandler
+ * Added ability to customize error handling at the Logger level using Logger::setExceptionHandler
+ * Added InsightOpsHandler to migrate users of the LogEntriesHandler
+ * Added protection to NormalizerHandler against circular and very deep structures, it now stops normalizing at a depth of 9
+ * Added capture of stack traces to ErrorHandler when logging PHP errors
+ * Added RavenHandler support for a `contexts` context or extra key to forward that to Sentry's contexts
+ * Added forwarding of context info to FluentdFormatter
+ * Added SocketHandler::setChunkSize to override the default chunk size in case you must send large log lines to rsyslog for example
+ * Added ability to extend/override BrowserConsoleHandler
+ * Added SlackWebhookHandler::getWebhookUrl and SlackHandler::getToken to enable class extensibility
+ * Added SwiftMailerHandler::getSubjectFormatter to enable class extensibility
+ * Dropped official support for HHVM in test builds
+ * Fixed normalization of exception traces when call_user_func is used to avoid serializing objects and the data they contain
+ * Fixed naming of fields in Slack handler, all field names are now capitalized in all cases
+ * Fixed HipChatHandler bug where slack dropped messages randomly
+ * Fixed normalization of objects in Slack handlers
+ * Fixed support for PHP7's Throwable in NewRelicHandler
+ * Fixed race bug when StreamHandler sometimes incorrectly reported it failed to create a directory
+ * Fixed table row styling issues in HtmlFormatter
+ * Fixed RavenHandler dropping the message when logging exception
+ * Fixed WhatFailureGroupHandler skipping processors when using handleBatch
+ and implement it where possible
+ * Fixed display of anonymous class names
+
+### 1.23.0 (2017-06-19)
+
+ * Improved SyslogUdpHandler's support for RFC5424 and added optional `$ident` argument
+ * Fixed GelfHandler truncation to be per field and not per message
+ * Fixed compatibility issue with PHP <5.3.6
+ * Fixed support for headless Chrome in ChromePHPHandler
+ * Fixed support for latest Aws SDK in DynamoDbHandler
+ * Fixed support for SwiftMailer 6.0+ in SwiftMailerHandler
+
+### 1.22.1 (2017-03-13)
+
+ * Fixed lots of minor issues in the new Slack integrations
+ * Fixed support for allowInlineLineBreaks in LineFormatter when formatting exception backtraces
+
+### 1.22.0 (2016-11-26)
+
+ * Added SlackbotHandler and SlackWebhookHandler to set up Slack integration more easily
+ * Added MercurialProcessor to add mercurial revision and branch names to log records
+ * Added support for AWS SDK v3 in DynamoDbHandler
+ * Fixed fatal errors occuring when normalizing generators that have been fully consumed
+ * Fixed RollbarHandler to include a level (rollbar level), monolog_level (original name), channel and datetime (unix)
+ * Fixed RollbarHandler not flushing records automatically, calling close() explicitly is not necessary anymore
+ * Fixed SyslogUdpHandler to avoid sending empty frames
+ * Fixed a few PHP 7.0 and 7.1 compatibility issues
+
+### 1.21.0 (2016-07-29)
+
+ * Break: Reverted the addition of $context when the ErrorHandler handles regular php errors from 1.20.0 as it was causing issues
+ * Added support for more formats in RotatingFileHandler::setFilenameFormat as long as they have Y, m and d in order
+ * Added ability to format the main line of text the SlackHandler sends by explictly setting a formatter on the handler
+ * Added information about SoapFault instances in NormalizerFormatter
+ * Added $handleOnlyReportedErrors option on ErrorHandler::registerErrorHandler (default true) to allow logging of all errors no matter the error_reporting level
+
+### 1.20.0 (2016-07-02)
+
+ * Added FingersCrossedHandler::activate() to manually trigger the handler regardless of the activation policy
+ * Added StreamHandler::getUrl to retrieve the stream's URL
+ * Added ability to override addRow/addTitle in HtmlFormatter
+ * Added the $context to context information when the ErrorHandler handles a regular php error
+ * Deprecated RotatingFileHandler::setFilenameFormat to only support 3 formats: Y, Y-m and Y-m-d
+ * Fixed WhatFailureGroupHandler to work with PHP7 throwables
+ * Fixed a few minor bugs
+
+### 1.19.0 (2016-04-12)
+
+ * Break: StreamHandler will not close streams automatically that it does not own. If you pass in a stream (not a path/url), then it will not close it for you. You can retrieve those using getStream() if needed
+ * Added DeduplicationHandler to remove duplicate records from notifications across multiple requests, useful for email or other notifications on errors
+ * Added ability to use `%message%` and other LineFormatter replacements in the subject line of emails sent with NativeMailHandler and SwiftMailerHandler
+ * Fixed HipChatHandler handling of long messages
+
+### 1.18.2 (2016-04-02)
+
+ * Fixed ElasticaFormatter to use more precise dates
+ * Fixed GelfMessageFormatter sending too long messages
+
+### 1.18.1 (2016-03-13)
+
+ * Fixed SlackHandler bug where slack dropped messages randomly
+ * Fixed RedisHandler issue when using with the PHPRedis extension
+ * Fixed AmqpHandler content-type being incorrectly set when using with the AMQP extension
+ * Fixed BrowserConsoleHandler regression
+
+### 1.18.0 (2016-03-01)
+
+ * Added optional reduction of timestamp precision via `Logger->useMicrosecondTimestamps(false)`, disabling it gets you a bit of performance boost but reduces the precision to the second instead of microsecond
+ * Added possibility to skip some extra stack frames in IntrospectionProcessor if you have some library wrapping Monolog that is always adding frames
+ * Added `Logger->withName` to clone a logger (keeping all handlers) with a new name
+ * Added FluentdFormatter for the Fluentd unix socket protocol
+ * Added HandlerWrapper base class to ease the creation of handler wrappers, just extend it and override as needed
+ * Added support for replacing context sub-keys using `%context.*%` in LineFormatter
+ * Added support for `payload` context value in RollbarHandler
+ * Added setRelease to RavenHandler to describe the application version, sent with every log
+ * Added support for `fingerprint` context value in RavenHandler
+ * Fixed JSON encoding errors that would gobble up the whole log record, we now handle those more gracefully by dropping chars as needed
+ * Fixed write timeouts in SocketHandler and derivatives, set to 10sec by default, lower it with `setWritingTimeout()`
+ * Fixed PHP7 compatibility with regard to Exception/Throwable handling in a few places
+
+### 1.17.2 (2015-10-14)
+
+ * Fixed ErrorHandler compatibility with non-Monolog PSR-3 loggers
+ * Fixed SlackHandler handling to use slack functionalities better
+ * Fixed SwiftMailerHandler bug when sending multiple emails they all had the same id
+ * Fixed 5.3 compatibility regression
+
+### 1.17.1 (2015-08-31)
+
+ * Fixed RollbarHandler triggering PHP notices
+
+### 1.17.0 (2015-08-30)
+
+ * Added support for `checksum` and `release` context/extra values in RavenHandler
+ * Added better support for exceptions in RollbarHandler
+ * Added UidProcessor::getUid
+ * Added support for showing the resource type in NormalizedFormatter
+ * Fixed IntrospectionProcessor triggering PHP notices
+
+### 1.16.0 (2015-08-09)
+
+ * Added IFTTTHandler to notify ifttt.com triggers
+ * Added Logger::setHandlers() to allow setting/replacing all handlers
+ * Added $capSize in RedisHandler to cap the log size
+ * Fixed StreamHandler creation of directory to only trigger when the first log write happens
+ * Fixed bug in the handling of curl failures
+ * Fixed duplicate logging of fatal errors when both error and fatal error handlers are registered in monolog's ErrorHandler
+ * Fixed missing fatal errors records with handlers that need to be closed to flush log records
+ * Fixed TagProcessor::addTags support for associative arrays
+
+### 1.15.0 (2015-07-12)
+
+ * Added addTags and setTags methods to change a TagProcessor
+ * Added automatic creation of directories if they are missing for a StreamHandler to open a log file
+ * Added retry functionality to Loggly, Cube and Mandrill handlers so they retry up to 5 times in case of network failure
+ * Fixed process exit code being incorrectly reset to 0 if ErrorHandler::registerExceptionHandler was used
+ * Fixed HTML/JS escaping in BrowserConsoleHandler
+ * Fixed JSON encoding errors being silently suppressed (PHP 5.5+ only)
+
+### 1.14.0 (2015-06-19)
+
+ * Added PHPConsoleHandler to send record to Chrome's PHP Console extension and library
+ * Added support for objects implementing __toString in the NormalizerFormatter
+ * Added support for HipChat's v2 API in HipChatHandler
+ * Added Logger::setTimezone() to initialize the timezone monolog should use in case date.timezone isn't correct for your app
+ * Added an option to send formatted message instead of the raw record on PushoverHandler via ->useFormattedMessage(true)
+ * Fixed curl errors being silently suppressed
+
+### 1.13.1 (2015-03-09)
+
+ * Fixed regression in HipChat requiring a new token to be created
+
+### 1.13.0 (2015-03-05)
+
+ * Added Registry::hasLogger to check for the presence of a logger instance
+ * Added context.user support to RavenHandler
+ * Added HipChat API v2 support in the HipChatHandler
+ * Added NativeMailerHandler::addParameter to pass params to the mail() process
+ * Added context data to SlackHandler when $includeContextAndExtra is true
+ * Added ability to customize the Swift_Message per-email in SwiftMailerHandler
+ * Fixed SwiftMailerHandler to lazily create message instances if a callback is provided
+ * Fixed serialization of INF and NaN values in Normalizer and LineFormatter
+
+### 1.12.0 (2014-12-29)
+
+ * Break: HandlerInterface::isHandling now receives a partial record containing only a level key. This was always the intent and does not break any Monolog handler but is strictly speaking a BC break and you should check if you relied on any other field in your own handlers.
+ * Added PsrHandler to forward records to another PSR-3 logger
+ * Added SamplingHandler to wrap around a handler and include only every Nth record
+ * Added MongoDBFormatter to support better storage with MongoDBHandler (it must be enabled manually for now)
+ * Added exception codes in the output of most formatters
+ * Added LineFormatter::includeStacktraces to enable exception stack traces in logs (uses more than one line)
+ * Added $useShortAttachment to SlackHandler to minify attachment size and $includeExtra to append extra data
+ * Added $host to HipChatHandler for users of private instances
+ * Added $transactionName to NewRelicHandler and support for a transaction_name context value
+ * Fixed MandrillHandler to avoid outputing API call responses
+ * Fixed some non-standard behaviors in SyslogUdpHandler
+
+### 1.11.0 (2014-09-30)
+
+ * Break: The NewRelicHandler extra and context data are now prefixed with extra_ and context_ to avoid clashes. Watch out if you have scripts reading those from the API and rely on names
+ * Added WhatFailureGroupHandler to suppress any exception coming from the wrapped handlers and avoid chain failures if a logging service fails
+ * Added MandrillHandler to send emails via the Mandrillapp.com API
+ * Added SlackHandler to log records to a Slack.com account
+ * Added FleepHookHandler to log records to a Fleep.io account
+ * Added LogglyHandler::addTag to allow adding tags to an existing handler
+ * Added $ignoreEmptyContextAndExtra to LineFormatter to avoid empty [] at the end
+ * Added $useLocking to StreamHandler and RotatingFileHandler to enable flock() while writing
+ * Added support for PhpAmqpLib in the AmqpHandler
+ * Added FingersCrossedHandler::clear and BufferHandler::clear to reset them between batches in long running jobs
+ * Added support for adding extra fields from $_SERVER in the WebProcessor
+ * Fixed support for non-string values in PrsLogMessageProcessor
+ * Fixed SwiftMailer messages being sent with the wrong date in long running scripts
+ * Fixed minor PHP 5.6 compatibility issues
+ * Fixed BufferHandler::close being called twice
+
+### 1.10.0 (2014-06-04)
+
+ * Added Logger::getHandlers() and Logger::getProcessors() methods
+ * Added $passthruLevel argument to FingersCrossedHandler to let it always pass some records through even if the trigger level is not reached
+ * Added support for extra data in NewRelicHandler
+ * Added $expandNewlines flag to the ErrorLogHandler to create multiple log entries when a message has multiple lines
+
+### 1.9.1 (2014-04-24)
+
+ * Fixed regression in RotatingFileHandler file permissions
+ * Fixed initialization of the BufferHandler to make sure it gets flushed after receiving records
+ * Fixed ChromePHPHandler and FirePHPHandler's activation strategies to be more conservative
+
+### 1.9.0 (2014-04-20)
+
+ * Added LogEntriesHandler to send logs to a LogEntries account
+ * Added $filePermissions to tweak file mode on StreamHandler and RotatingFileHandler
+ * Added $useFormatting flag to MemoryProcessor to make it send raw data in bytes
+ * Added support for table formatting in FirePHPHandler via the table context key
+ * Added a TagProcessor to add tags to records, and support for tags in RavenHandler
+ * Added $appendNewline flag to the JsonFormatter to enable using it when logging to files
+ * Added sound support to the PushoverHandler
+ * Fixed multi-threading support in StreamHandler
+ * Fixed empty headers issue when ChromePHPHandler received no records
+ * Fixed default format of the ErrorLogHandler
+
+### 1.8.0 (2014-03-23)
+
+ * Break: the LineFormatter now strips newlines by default because this was a bug, set $allowInlineLineBreaks to true if you need them
+ * Added BrowserConsoleHandler to send logs to any browser's console via console.log() injection in the output
+ * Added FilterHandler to filter records and only allow those of a given list of levels through to the wrapped handler
+ * Added FlowdockHandler to send logs to a Flowdock account
+ * Added RollbarHandler to send logs to a Rollbar account
+ * Added HtmlFormatter to send prettier log emails with colors for each log level
+ * Added GitProcessor to add the current branch/commit to extra record data
+ * Added a Monolog\Registry class to allow easier global access to pre-configured loggers
+ * Added support for the new official graylog2/gelf-php lib for GelfHandler, upgrade if you can by replacing the mlehner/gelf-php requirement
+ * Added support for HHVM
+ * Added support for Loggly batch uploads
+ * Added support for tweaking the content type and encoding in NativeMailerHandler
+ * Added $skipClassesPartials to tweak the ignored classes in the IntrospectionProcessor
+ * Fixed batch request support in GelfHandler
+
+### 1.7.0 (2013-11-14)
+
+ * Added ElasticSearchHandler to send logs to an Elastic Search server
+ * Added DynamoDbHandler and ScalarFormatter to send logs to Amazon's Dynamo DB
+ * Added SyslogUdpHandler to send logs to a remote syslogd server
+ * Added LogglyHandler to send logs to a Loggly account
+ * Added $level to IntrospectionProcessor so it only adds backtraces when needed
+ * Added $version to LogstashFormatter to allow using the new v1 Logstash format
+ * Added $appName to NewRelicHandler
+ * Added configuration of Pushover notification retries/expiry
+ * Added $maxColumnWidth to NativeMailerHandler to change the 70 chars default
+ * Added chainability to most setters for all handlers
+ * Fixed RavenHandler batch processing so it takes the message from the record with highest priority
+ * Fixed HipChatHandler batch processing so it sends all messages at once
+ * Fixed issues with eAccelerator
+ * Fixed and improved many small things
+
+### 1.6.0 (2013-07-29)
+
+ * Added HipChatHandler to send logs to a HipChat chat room
+ * Added ErrorLogHandler to send logs to PHP's error_log function
+ * Added NewRelicHandler to send logs to NewRelic's service
+ * Added Monolog\ErrorHandler helper class to register a Logger as exception/error/fatal handler
+ * Added ChannelLevelActivationStrategy for the FingersCrossedHandler to customize levels by channel
+ * Added stack traces output when normalizing exceptions (json output & co)
+ * Added Monolog\Logger::API constant (currently 1)
+ * Added support for ChromePHP's v4.0 extension
+ * Added support for message priorities in PushoverHandler, see $highPriorityLevel and $emergencyLevel
+ * Added support for sending messages to multiple users at once with the PushoverHandler
+ * Fixed RavenHandler's support for batch sending of messages (when behind a Buffer or FingersCrossedHandler)
+ * Fixed normalization of Traversables with very large data sets, only the first 1000 items are shown now
+ * Fixed issue in RotatingFileHandler when an open_basedir restriction is active
+ * Fixed minor issues in RavenHandler and bumped the API to Raven 0.5.0
+ * Fixed SyslogHandler issue when many were used concurrently with different facilities
+
+### 1.5.0 (2013-04-23)
+
+ * Added ProcessIdProcessor to inject the PID in log records
+ * Added UidProcessor to inject a unique identifier to all log records of one request/run
+ * Added support for previous exceptions in the LineFormatter exception serialization
+ * Added Monolog\Logger::getLevels() to get all available levels
+ * Fixed ChromePHPHandler so it avoids sending headers larger than Chrome can handle
+
+### 1.4.1 (2013-04-01)
+
+ * Fixed exception formatting in the LineFormatter to be more minimalistic
+ * Fixed RavenHandler's handling of context/extra data, requires Raven client >0.1.0
+ * Fixed log rotation in RotatingFileHandler to work with long running scripts spanning multiple days
+ * Fixed WebProcessor array access so it checks for data presence
+ * Fixed Buffer, Group and FingersCrossed handlers to make use of their processors
+
+### 1.4.0 (2013-02-13)
+
+ * Added RedisHandler to log to Redis via the Predis library or the phpredis extension
+ * Added ZendMonitorHandler to log to the Zend Server monitor
+ * Added the possibility to pass arrays of handlers and processors directly in the Logger constructor
+ * Added `$useSSL` option to the PushoverHandler which is enabled by default
+ * Fixed ChromePHPHandler and FirePHPHandler issue when multiple instances are used simultaneously
+ * Fixed header injection capability in the NativeMailHandler
+
+### 1.3.1 (2013-01-11)
+
+ * Fixed LogstashFormatter to be usable with stream handlers
+ * Fixed GelfMessageFormatter levels on Windows
+
+### 1.3.0 (2013-01-08)
+
+ * Added PSR-3 compliance, the `Monolog\Logger` class is now an instance of `Psr\Log\LoggerInterface`
+ * Added PsrLogMessageProcessor that you can selectively enable for full PSR-3 compliance
+ * Added LogstashFormatter (combine with SocketHandler or StreamHandler to send logs to Logstash)
+ * Added PushoverHandler to send mobile notifications
+ * Added CouchDBHandler and DoctrineCouchDBHandler
+ * Added RavenHandler to send data to Sentry servers
+ * Added support for the new MongoClient class in MongoDBHandler
+ * Added microsecond precision to log records' timestamps
+ * Added `$flushOnOverflow` param to BufferHandler to flush by batches instead of losing
+ the oldest entries
+ * Fixed normalization of objects with cyclic references
+
+### 1.2.1 (2012-08-29)
+
+ * Added new $logopts arg to SyslogHandler to provide custom openlog options
+ * Fixed fatal error in SyslogHandler
+
+### 1.2.0 (2012-08-18)
+
+ * Added AmqpHandler (for use with AMQP servers)
+ * Added CubeHandler
+ * Added NativeMailerHandler::addHeader() to send custom headers in mails
+ * Added the possibility to specify more than one recipient in NativeMailerHandler
+ * Added the possibility to specify float timeouts in SocketHandler
+ * Added NOTICE and EMERGENCY levels to conform with RFC 5424
+ * Fixed the log records to use the php default timezone instead of UTC
+ * Fixed BufferHandler not being flushed properly on PHP fatal errors
+ * Fixed normalization of exotic resource types
+ * Fixed the default format of the SyslogHandler to avoid duplicating datetimes in syslog
+
+### 1.1.0 (2012-04-23)
+
+ * Added Monolog\Logger::isHandling() to check if a handler will
+ handle the given log level
+ * Added ChromePHPHandler
+ * Added MongoDBHandler
+ * Added GelfHandler (for use with Graylog2 servers)
+ * Added SocketHandler (for use with syslog-ng for example)
+ * Added NormalizerFormatter
+ * Added the possibility to change the activation strategy of the FingersCrossedHandler
+ * Added possibility to show microseconds in logs
+ * Added `server` and `referer` to WebProcessor output
+
+### 1.0.2 (2011-10-24)
+
+ * Fixed bug in IE with large response headers and FirePHPHandler
+
+### 1.0.1 (2011-08-25)
+
+ * Added MemoryPeakUsageProcessor and MemoryUsageProcessor
+ * Added Monolog\Logger::getName() to get a logger's channel name
+
+### 1.0.0 (2011-07-06)
+
+ * Added IntrospectionProcessor to get info from where the logger was called
+ * Fixed WebProcessor in CLI
+
+### 1.0.0-RC1 (2011-07-01)
+
+ * Initial release
diff --git a/application/vendor/monolog/monolog/CHANGELOG.mdown b/application/vendor/monolog/monolog/CHANGELOG.mdown
deleted file mode 100644
index 2aaeec5..0000000
--- a/application/vendor/monolog/monolog/CHANGELOG.mdown
+++ /dev/null
@@ -1,265 +0,0 @@
-### 1.17.2 (2015-10-14)
-
- * Fixed ErrorHandler compatibility with non-Monolog PSR-3 loggers
- * Fixed SlackHandler handling to use slack functionalities better
- * Fixed SwiftMailerHandler bug when sending multiple emails they all had the same id
- * Fixed 5.3 compatibility regression
-
-### 1.17.1 (2015-08-31)
-
- * Fixed RollbarHandler triggering PHP notices
-
-### 1.17.0 (2015-08-30)
-
- * Added support for `checksum` and `release` context/extra values in RavenHandler
- * Added better support for exceptions in RollbarHandler
- * Added UidProcessor::getUid
- * Added support for showing the resource type in NormalizedFormatter
- * Fixed IntrospectionProcessor triggering PHP notices
-
-### 1.16.0 (2015-08-09)
-
- * Added IFTTTHandler to notify ifttt.com triggers
- * Added Logger::setHandlers() to allow setting/replacing all handlers
- * Added $capSize in RedisHandler to cap the log size
- * Fixed StreamHandler creation of directory to only trigger when the first log write happens
- * Fixed bug in the handling of curl failures
- * Fixed duplicate logging of fatal errors when both error and fatal error handlers are registered in monolog's ErrorHandler
- * Fixed missing fatal errors records with handlers that need to be closed to flush log records
- * Fixed TagProcessor::addTags support for associative arrays
-
-### 1.15.0 (2015-07-12)
-
- * Added addTags and setTags methods to change a TagProcessor
- * Added automatic creation of directories if they are missing for a StreamHandler to open a log file
- * Added retry functionality to Loggly, Cube and Mandrill handlers so they retry up to 5 times in case of network failure
- * Fixed process exit code being incorrectly reset to 0 if ErrorHandler::registerExceptionHandler was used
- * Fixed HTML/JS escaping in BrowserConsoleHandler
- * Fixed JSON encoding errors being silently suppressed (PHP 5.5+ only)
-
-### 1.14.0 (2015-06-19)
-
- * Added PHPConsoleHandler to send record to Chrome's PHP Console extension and library
- * Added support for objects implementing __toString in the NormalizerFormatter
- * Added support for HipChat's v2 API in HipChatHandler
- * Added Logger::setTimezone() to initialize the timezone monolog should use in case date.timezone isn't correct for your app
- * Added an option to send formatted message instead of the raw record on PushoverHandler via ->useFormattedMessage(true)
- * Fixed curl errors being silently suppressed
-
-### 1.13.1 (2015-03-09)
-
- * Fixed regression in HipChat requiring a new token to be created
-
-### 1.13.0 (2015-03-05)
-
- * Added Registry::hasLogger to check for the presence of a logger instance
- * Added context.user support to RavenHandler
- * Added HipChat API v2 support in the HipChatHandler
- * Added NativeMailerHandler::addParameter to pass params to the mail() process
- * Added context data to SlackHandler when $includeContextAndExtra is true
- * Added ability to customize the Swift_Message per-email in SwiftMailerHandler
- * Fixed SwiftMailerHandler to lazily create message instances if a callback is provided
- * Fixed serialization of INF and NaN values in Normalizer and LineFormatter
-
-### 1.12.0 (2014-12-29)
-
- * Break: HandlerInterface::isHandling now receives a partial record containing only a level key. This was always the intent and does not break any Monolog handler but is strictly speaking a BC break and you should check if you relied on any other field in your own handlers.
- * Added PsrHandler to forward records to another PSR-3 logger
- * Added SamplingHandler to wrap around a handler and include only every Nth record
- * Added MongoDBFormatter to support better storage with MongoDBHandler (it must be enabled manually for now)
- * Added exception codes in the output of most formatters
- * Added LineFormatter::includeStacktraces to enable exception stack traces in logs (uses more than one line)
- * Added $useShortAttachment to SlackHandler to minify attachment size and $includeExtra to append extra data
- * Added $host to HipChatHandler for users of private instances
- * Added $transactionName to NewRelicHandler and support for a transaction_name context value
- * Fixed MandrillHandler to avoid outputing API call responses
- * Fixed some non-standard behaviors in SyslogUdpHandler
-
-### 1.11.0 (2014-09-30)
-
- * Break: The NewRelicHandler extra and context data are now prefixed with extra_ and context_ to avoid clashes. Watch out if you have scripts reading those from the API and rely on names
- * Added WhatFailureGroupHandler to suppress any exception coming from the wrapped handlers and avoid chain failures if a logging service fails
- * Added MandrillHandler to send emails via the Mandrillapp.com API
- * Added SlackHandler to log records to a Slack.com account
- * Added FleepHookHandler to log records to a Fleep.io account
- * Added LogglyHandler::addTag to allow adding tags to an existing handler
- * Added $ignoreEmptyContextAndExtra to LineFormatter to avoid empty [] at the end
- * Added $useLocking to StreamHandler and RotatingFileHandler to enable flock() while writing
- * Added support for PhpAmqpLib in the AmqpHandler
- * Added FingersCrossedHandler::clear and BufferHandler::clear to reset them between batches in long running jobs
- * Added support for adding extra fields from $_SERVER in the WebProcessor
- * Fixed support for non-string values in PrsLogMessageProcessor
- * Fixed SwiftMailer messages being sent with the wrong date in long running scripts
- * Fixed minor PHP 5.6 compatibility issues
- * Fixed BufferHandler::close being called twice
-
-### 1.10.0 (2014-06-04)
-
- * Added Logger::getHandlers() and Logger::getProcessors() methods
- * Added $passthruLevel argument to FingersCrossedHandler to let it always pass some records through even if the trigger level is not reached
- * Added support for extra data in NewRelicHandler
- * Added $expandNewlines flag to the ErrorLogHandler to create multiple log entries when a message has multiple lines
-
-### 1.9.1 (2014-04-24)
-
- * Fixed regression in RotatingFileHandler file permissions
- * Fixed initialization of the BufferHandler to make sure it gets flushed after receiving records
- * Fixed ChromePHPHandler and FirePHPHandler's activation strategies to be more conservative
-
-### 1.9.0 (2014-04-20)
-
- * Added LogEntriesHandler to send logs to a LogEntries account
- * Added $filePermissions to tweak file mode on StreamHandler and RotatingFileHandler
- * Added $useFormatting flag to MemoryProcessor to make it send raw data in bytes
- * Added support for table formatting in FirePHPHandler via the table context key
- * Added a TagProcessor to add tags to records, and support for tags in RavenHandler
- * Added $appendNewline flag to the JsonFormatter to enable using it when logging to files
- * Added sound support to the PushoverHandler
- * Fixed multi-threading support in StreamHandler
- * Fixed empty headers issue when ChromePHPHandler received no records
- * Fixed default format of the ErrorLogHandler
-
-### 1.8.0 (2014-03-23)
-
- * Break: the LineFormatter now strips newlines by default because this was a bug, set $allowInlineLineBreaks to true if you need them
- * Added BrowserConsoleHandler to send logs to any browser's console via console.log() injection in the output
- * Added FilterHandler to filter records and only allow those of a given list of levels through to the wrapped handler
- * Added FlowdockHandler to send logs to a Flowdock account
- * Added RollbarHandler to send logs to a Rollbar account
- * Added HtmlFormatter to send prettier log emails with colors for each log level
- * Added GitProcessor to add the current branch/commit to extra record data
- * Added a Monolog\Registry class to allow easier global access to pre-configured loggers
- * Added support for the new official graylog2/gelf-php lib for GelfHandler, upgrade if you can by replacing the mlehner/gelf-php requirement
- * Added support for HHVM
- * Added support for Loggly batch uploads
- * Added support for tweaking the content type and encoding in NativeMailerHandler
- * Added $skipClassesPartials to tweak the ignored classes in the IntrospectionProcessor
- * Fixed batch request support in GelfHandler
-
-### 1.7.0 (2013-11-14)
-
- * Added ElasticSearchHandler to send logs to an Elastic Search server
- * Added DynamoDbHandler and ScalarFormatter to send logs to Amazon's Dynamo DB
- * Added SyslogUdpHandler to send logs to a remote syslogd server
- * Added LogglyHandler to send logs to a Loggly account
- * Added $level to IntrospectionProcessor so it only adds backtraces when needed
- * Added $version to LogstashFormatter to allow using the new v1 Logstash format
- * Added $appName to NewRelicHandler
- * Added configuration of Pushover notification retries/expiry
- * Added $maxColumnWidth to NativeMailerHandler to change the 70 chars default
- * Added chainability to most setters for all handlers
- * Fixed RavenHandler batch processing so it takes the message from the record with highest priority
- * Fixed HipChatHandler batch processing so it sends all messages at once
- * Fixed issues with eAccelerator
- * Fixed and improved many small things
-
-### 1.6.0 (2013-07-29)
-
- * Added HipChatHandler to send logs to a HipChat chat room
- * Added ErrorLogHandler to send logs to PHP's error_log function
- * Added NewRelicHandler to send logs to NewRelic's service
- * Added Monolog\ErrorHandler helper class to register a Logger as exception/error/fatal handler
- * Added ChannelLevelActivationStrategy for the FingersCrossedHandler to customize levels by channel
- * Added stack traces output when normalizing exceptions (json output & co)
- * Added Monolog\Logger::API constant (currently 1)
- * Added support for ChromePHP's v4.0 extension
- * Added support for message priorities in PushoverHandler, see $highPriorityLevel and $emergencyLevel
- * Added support for sending messages to multiple users at once with the PushoverHandler
- * Fixed RavenHandler's support for batch sending of messages (when behind a Buffer or FingersCrossedHandler)
- * Fixed normalization of Traversables with very large data sets, only the first 1000 items are shown now
- * Fixed issue in RotatingFileHandler when an open_basedir restriction is active
- * Fixed minor issues in RavenHandler and bumped the API to Raven 0.5.0
- * Fixed SyslogHandler issue when many were used concurrently with different facilities
-
-### 1.5.0 (2013-04-23)
-
- * Added ProcessIdProcessor to inject the PID in log records
- * Added UidProcessor to inject a unique identifier to all log records of one request/run
- * Added support for previous exceptions in the LineFormatter exception serialization
- * Added Monolog\Logger::getLevels() to get all available levels
- * Fixed ChromePHPHandler so it avoids sending headers larger than Chrome can handle
-
-### 1.4.1 (2013-04-01)
-
- * Fixed exception formatting in the LineFormatter to be more minimalistic
- * Fixed RavenHandler's handling of context/extra data, requires Raven client >0.1.0
- * Fixed log rotation in RotatingFileHandler to work with long running scripts spanning multiple days
- * Fixed WebProcessor array access so it checks for data presence
- * Fixed Buffer, Group and FingersCrossed handlers to make use of their processors
-
-### 1.4.0 (2013-02-13)
-
- * Added RedisHandler to log to Redis via the Predis library or the phpredis extension
- * Added ZendMonitorHandler to log to the Zend Server monitor
- * Added the possibility to pass arrays of handlers and processors directly in the Logger constructor
- * Added `$useSSL` option to the PushoverHandler which is enabled by default
- * Fixed ChromePHPHandler and FirePHPHandler issue when multiple instances are used simultaneously
- * Fixed header injection capability in the NativeMailHandler
-
-### 1.3.1 (2013-01-11)
-
- * Fixed LogstashFormatter to be usable with stream handlers
- * Fixed GelfMessageFormatter levels on Windows
-
-### 1.3.0 (2013-01-08)
-
- * Added PSR-3 compliance, the `Monolog\Logger` class is now an instance of `Psr\Log\LoggerInterface`
- * Added PsrLogMessageProcessor that you can selectively enable for full PSR-3 compliance
- * Added LogstashFormatter (combine with SocketHandler or StreamHandler to send logs to Logstash)
- * Added PushoverHandler to send mobile notifications
- * Added CouchDBHandler and DoctrineCouchDBHandler
- * Added RavenHandler to send data to Sentry servers
- * Added support for the new MongoClient class in MongoDBHandler
- * Added microsecond precision to log records' timestamps
- * Added `$flushOnOverflow` param to BufferHandler to flush by batches instead of losing
- the oldest entries
- * Fixed normalization of objects with cyclic references
-
-### 1.2.1 (2012-08-29)
-
- * Added new $logopts arg to SyslogHandler to provide custom openlog options
- * Fixed fatal error in SyslogHandler
-
-### 1.2.0 (2012-08-18)
-
- * Added AmqpHandler (for use with AMQP servers)
- * Added CubeHandler
- * Added NativeMailerHandler::addHeader() to send custom headers in mails
- * Added the possibility to specify more than one recipient in NativeMailerHandler
- * Added the possibility to specify float timeouts in SocketHandler
- * Added NOTICE and EMERGENCY levels to conform with RFC 5424
- * Fixed the log records to use the php default timezone instead of UTC
- * Fixed BufferHandler not being flushed properly on PHP fatal errors
- * Fixed normalization of exotic resource types
- * Fixed the default format of the SyslogHandler to avoid duplicating datetimes in syslog
-
-### 1.1.0 (2012-04-23)
-
- * Added Monolog\Logger::isHandling() to check if a handler will
- handle the given log level
- * Added ChromePHPHandler
- * Added MongoDBHandler
- * Added GelfHandler (for use with Graylog2 servers)
- * Added SocketHandler (for use with syslog-ng for example)
- * Added NormalizerFormatter
- * Added the possibility to change the activation strategy of the FingersCrossedHandler
- * Added possibility to show microseconds in logs
- * Added `server` and `referer` to WebProcessor output
-
-### 1.0.2 (2011-10-24)
-
- * Fixed bug in IE with large response headers and FirePHPHandler
-
-### 1.0.1 (2011-08-25)
-
- * Added MemoryPeakUsageProcessor and MemoryUsageProcessor
- * Added Monolog\Logger::getName() to get a logger's channel name
-
-### 1.0.0 (2011-07-06)
-
- * Added IntrospectionProcessor to get info from where the logger was called
- * Fixed WebProcessor in CLI
-
-### 1.0.0-RC1 (2011-07-01)
-
- * Initial release
diff --git a/application/vendor/monolog/monolog/LICENSE b/application/vendor/monolog/monolog/LICENSE
index 56e08d5..1647321 100644
--- a/application/vendor/monolog/monolog/LICENSE
+++ b/application/vendor/monolog/monolog/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 Jordi Boggiano
+Copyright (c) 2011-2016 Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/application/vendor/monolog/monolog/README.md b/application/vendor/monolog/monolog/README.md
new file mode 100644
index 0000000..a578eb2
--- /dev/null
+++ b/application/vendor/monolog/monolog/README.md
@@ -0,0 +1,94 @@
+# Monolog - Logging for PHP [](https://travis-ci.org/Seldaek/monolog)
+
+[](https://packagist.org/packages/monolog/monolog)
+[](https://packagist.org/packages/monolog/monolog)
+
+
+Monolog sends your logs to files, sockets, inboxes, databases and various
+web services. See the complete list of handlers below. Special handlers
+allow you to build advanced logging strategies.
+
+This library implements the [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
+interface that you can type-hint against in your own libraries to keep
+a maximum of interoperability. You can also use it in your applications to
+make sure you can always use another compatible logger at a later time.
+As of 1.11.0 Monolog public APIs will also accept PSR-3 log levels.
+Internally Monolog still uses its own level scheme since it predates PSR-3.
+
+## Installation
+
+Install the latest version with
+
+```bash
+$ composer require monolog/monolog
+```
+
+## Basic Usage
+
+```php
+pushHandler(new StreamHandler('path/to/your.log', Logger::WARNING));
+
+// add records to the log
+$log->addWarning('Foo');
+$log->addError('Bar');
+```
+
+## Documentation
+
+- [Usage Instructions](doc/01-usage.md)
+- [Handlers, Formatters and Processors](doc/02-handlers-formatters-processors.md)
+- [Utility classes](doc/03-utilities.md)
+- [Extending Monolog](doc/04-extending.md)
+
+## Third Party Packages
+
+Third party handlers, formatters and processors are
+[listed in the wiki](https://github.com/Seldaek/monolog/wiki/Third-Party-Packages). You
+can also add your own there if you publish one.
+
+## About
+
+### Requirements
+
+- Monolog works with PHP 5.3 or above, and is also tested to work with HHVM.
+
+### Submitting bugs and feature requests
+
+Bugs and feature request are tracked on [GitHub](https://github.com/Seldaek/monolog/issues)
+
+### Framework Integrations
+
+- Frameworks and libraries using [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
+ can be used very easily with Monolog since it implements the interface.
+- [Symfony2](http://symfony.com) comes out of the box with Monolog.
+- [Silex](http://silex.sensiolabs.org/) comes out of the box with Monolog.
+- [Laravel 4 & 5](http://laravel.com/) come out of the box with Monolog.
+- [Lumen](http://lumen.laravel.com/) comes out of the box with Monolog.
+- [PPI](http://www.ppi.io/) comes out of the box with Monolog.
+- [CakePHP](http://cakephp.org/) is usable with Monolog via the [cakephp-monolog](https://github.com/jadb/cakephp-monolog) plugin.
+- [Slim](http://www.slimframework.com/) is usable with Monolog via the [Slim-Monolog](https://github.com/Flynsarmy/Slim-Monolog) log writer.
+- [XOOPS 2.6](http://xoops.org/) comes out of the box with Monolog.
+- [Aura.Web_Project](https://github.com/auraphp/Aura.Web_Project) comes out of the box with Monolog.
+- [Nette Framework](http://nette.org/en/) can be used with Monolog via [Kdyby/Monolog](https://github.com/Kdyby/Monolog) extension.
+- [Proton Micro Framework](https://github.com/alexbilbie/Proton) comes out of the box with Monolog.
+
+### Author
+
+Jordi Boggiano - -
+See also the list of [contributors](https://github.com/Seldaek/monolog/contributors) which participated in this project.
+
+### License
+
+Monolog is licensed under the MIT License - see the `LICENSE` file for details
+
+### Acknowledgements
+
+This library is heavily inspired by Python's [Logbook](https://logbook.readthedocs.io/en/stable/)
+library, although most concepts have been adjusted to fit to the PHP world.
diff --git a/application/vendor/monolog/monolog/README.mdown b/application/vendor/monolog/monolog/README.mdown
deleted file mode 100644
index 7d8ade5..0000000
--- a/application/vendor/monolog/monolog/README.mdown
+++ /dev/null
@@ -1,95 +0,0 @@
-# Monolog - Logging for PHP [](https://travis-ci.org/Seldaek/monolog)
-
-[](https://packagist.org/packages/monolog/monolog)
-[](https://packagist.org/packages/monolog/monolog)
-[](https://www.versioneye.com/php/monolog:monolog/references)
-
-
-Monolog sends your logs to files, sockets, inboxes, databases and various
-web services. See the complete list of handlers below. Special handlers
-allow you to build advanced logging strategies.
-
-This library implements the [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-interface that you can type-hint against in your own libraries to keep
-a maximum of interoperability. You can also use it in your applications to
-make sure you can always use another compatible logger at a later time.
-As of 1.11.0 Monolog public APIs will also accept PSR-3 log levels.
-Internally Monolog still uses its own level scheme since it predates PSR-3.
-
-## Installation
-
-Install the latest version with
-
-```bash
-$ composer require monolog/monolog
-```
-
-## Basic Usage
-
-```php
-pushHandler(new StreamHandler('path/to/your.log', Logger::WARNING));
-
-// add records to the log
-$log->addWarning('Foo');
-$log->addError('Bar');
-```
-
-## Documentation
-
-- [Usage Instructions](doc/01-usage.md)
-- [Handlers, Formatters and Processors](doc/02-handlers-formatters-processors.md)
-- [Utility classes](doc/03-utilities.md)
-- [Extending Monolog](doc/04-extending.md)
-
-## Third Party Packages
-
-Third party handlers, formatters and processors are
-[listed in the wiki](https://github.com/Seldaek/monolog/wiki/Third-Party-Packages). You
-can also add your own there if you publish one.
-
-## About
-
-### Requirements
-
-- Monolog works with PHP 5.3 or above, and is also tested to work with HHVM.
-
-### Submitting bugs and feature requests
-
-Bugs and feature request are tracked on [GitHub](https://github.com/Seldaek/monolog/issues)
-
-### Framework Integrations
-
-- Frameworks and libraries using [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
- can be used very easily with Monolog since it implements the interface.
-- [Symfony2](http://symfony.com) comes out of the box with Monolog.
-- [Silex](http://silex.sensiolabs.org/) comes out of the box with Monolog.
-- [Laravel 4 & 5](http://laravel.com/) come out of the box with Monolog.
-- [Lumen](http://lumen.laravel.com/) comes out of the box with Monolog.
-- [PPI](http://www.ppi.io/) comes out of the box with Monolog.
-- [CakePHP](http://cakephp.org/) is usable with Monolog via the [cakephp-monolog](https://github.com/jadb/cakephp-monolog) plugin.
-- [Slim](http://www.slimframework.com/) is usable with Monolog via the [Slim-Monolog](https://github.com/Flynsarmy/Slim-Monolog) log writer.
-- [XOOPS 2.6](http://xoops.org/) comes out of the box with Monolog.
-- [Aura.Web_Project](https://github.com/auraphp/Aura.Web_Project) comes out of the box with Monolog.
-- [Nette Framework](http://nette.org/en/) can be used with Monolog via [Kdyby/Monolog](https://github.com/Kdyby/Monolog) extension.
-- [Proton Micro Framework](https://github.com/alexbilbie/Proton) comes out of the box with Monolog.
-
-### Author
-
-Jordi Boggiano - -
-See also the list of [contributors](https://github.com/Seldaek/monolog/contributors) which participated in this project.
-
-### License
-
-Monolog is licensed under the MIT License - see the `LICENSE` file for details
-
-### Acknowledgements
-
-This library is heavily inspired by Python's [Logbook](http://packages.python.org/Logbook/)
-library, although most concepts have been adjusted to fit to the PHP world.
diff --git a/application/vendor/monolog/monolog/composer.json b/application/vendor/monolog/monolog/composer.json
index 2bb9053..097df87 100644
--- a/application/vendor/monolog/monolog/composer.json
+++ b/application/vendor/monolog/monolog/composer.json
@@ -19,12 +19,12 @@
"require-dev": {
"phpunit/phpunit": "~4.5",
"graylog2/gelf-php": "~1.0",
- "raven/raven": "^0.13",
+ "sentry/sentry": "^0.13",
"ruflin/elastica": ">=0.90 <3.0",
"doctrine/couchdb": "~1.0@dev",
- "aws/aws-sdk-php": "^2.4.9",
- "videlalvaro/php-amqplib": "~2.4",
- "swiftmailer/swiftmailer": "~5.3",
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+ "php-amqplib/php-amqplib": "~2.4",
+ "swiftmailer/swiftmailer": "^5.3|^6.0",
"php-console/php-console": "^3.1.3",
"phpunit/phpunit-mock-objects": "2.3.0",
"jakub-onderka/php-parallel-lint": "0.9"
@@ -32,12 +32,13 @@
"_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis",
"suggest": {
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
- "raven/raven": "Allow sending log messages to a Sentry server",
+ "sentry/sentry": "Allow sending log messages to a Sentry server",
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
"ruflin/elastica": "Allow sending log messages to an Elastic Search server",
- "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+ "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
+ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
"php-console/php-console": "Allow sending log messages to Google Chrome"
@@ -53,12 +54,12 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.16.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor",
+ "parallel-lint . --exclude vendor --exclude src/Monolog/Handler/FormattableHandlerInterface.php --exclude src/Monolog/Handler/FormattableHandlerTrait.php --exclude src/Monolog/Handler/ProcessableHandlerInterface.php --exclude src/Monolog/Handler/ProcessableHandlerTrait.php",
"phpunit"
]
}
diff --git a/application/vendor/monolog/monolog/doc/01-usage.md b/application/vendor/monolog/monolog/doc/01-usage.md
deleted file mode 100644
index 75bc402..0000000
--- a/application/vendor/monolog/monolog/doc/01-usage.md
+++ /dev/null
@@ -1,228 +0,0 @@
-# Using Monolog
-
-- [Installation](#installation)
-- [Core Concepts](#core-concepts)
-- [Log Levels](#log-levels)
-- [Configuring a logger](#configuring-a-logger)
-- [Adding extra data in the records](#adding-extra-data-in-the-records)
-- [Leveraging channels](#leveraging-channels)
-- [Customizing the log format](#customizing-the-log-format)
-
-## Installation
-
-Monolog is available on Packagist ([monolog/monolog](http://packagist.org/packages/monolog/monolog))
-and as such installable via [Composer](http://getcomposer.org/).
-
-```bash
-composer require monolog/monolog
-```
-
-If you do not use Composer, you can grab the code from GitHub, and use any
-PSR-0 compatible autoloader (e.g. the [Symfony2 ClassLoader component](https://github.com/symfony/ClassLoader))
-to load Monolog classes.
-
-## Core Concepts
-
-Every `Logger` instance has a channel (name) and a stack of handlers. Whenever
-you add a record to the logger, it traverses the handler stack. Each handler
-decides whether it fully handled the record, and if so, the propagation of the
-record ends there.
-
-This allows for flexible logging setups, for example having a `StreamHandler` at
-the bottom of the stack that will log anything to disk, and on top of that add
-a `MailHandler` that will send emails only when an error message is logged.
-Handlers also have a `$bubble` property which defines whether they block the
-record or not if they handled it. In this example, setting the `MailHandler`'s
-`$bubble` argument to false means that records handled by the `MailHandler` will
-not propagate to the `StreamHandler` anymore.
-
-You can create many `Logger`s, each defining a channel (e.g.: db, request,
-router, ..) and each of them combining various handlers, which can be shared
-or not. The channel is reflected in the logs and allows you to easily see or
-filter records.
-
-Each Handler also has a Formatter, a default one with settings that make sense
-will be created if you don't set one. The formatters normalize and format
-incoming records so that they can be used by the handlers to output useful
-information.
-
-Custom severity levels are not available. Only the eight
-[RFC 5424](http://tools.ietf.org/html/rfc5424) levels (debug, info, notice,
-warning, error, critical, alert, emergency) are present for basic filtering
-purposes, but for sorting and other use cases that would require
-flexibility, you should add Processors to the Logger that can add extra
-information (tags, user ip, ..) to the records before they are handled.
-
-## Log Levels
-
-Monolog supports the logging levels described by [RFC 5424](http://tools.ietf.org/html/rfc5424).
-
-- **DEBUG** (100): Detailed debug information.
-
-- **INFO** (200): Interesting events. Examples: User logs in, SQL logs.
-
-- **NOTICE** (250): Normal but significant events.
-
-- **WARNING** (300): Exceptional occurrences that are not errors. Examples:
- Use of deprecated APIs, poor use of an API, undesirable things that are not
- necessarily wrong.
-
-- **ERROR** (400): Runtime errors that do not require immediate action but
- should typically be logged and monitored.
-
-- **CRITICAL** (500): Critical conditions. Example: Application component
- unavailable, unexpected exception.
-
-- **ALERT** (550): Action must be taken immediately. Example: Entire website
- down, database unavailable, etc. This should trigger the SMS alerts and wake
- you up.
-
-- **EMERGENCY** (600): Emergency: system is unusable.
-
-## Configuring a logger
-
-Here is a basic setup to log to a file and to firephp on the DEBUG level:
-
-```php
-pushHandler(new StreamHandler(__DIR__.'/my_app.log', Logger::DEBUG));
-$logger->pushHandler(new FirePHPHandler());
-
-// You can now use your logger
-$logger->addInfo('My logger is now ready');
-```
-
-Let's explain it. The first step is to create the logger instance which will
-be used in your code. The argument is a channel name, which is useful when
-you use several loggers (see below for more details about it).
-
-The logger itself does not know how to handle a record. It delegates it to
-some handlers. The code above registers two handlers in the stack to allow
-handling records in two different ways.
-
-Note that the FirePHPHandler is called first as it is added on top of the
-stack. This allows you to temporarily add a logger with bubbling disabled if
-you want to override other configured loggers.
-
-> If you use Monolog standalone and are looking for an easy way to
-> configure many handlers, the [theorchard/monolog-cascade](https://github.com/theorchard/monolog-cascade)
-> can help you build complex logging configs via PHP arrays, yaml or json configs.
-
-## Adding extra data in the records
-
-Monolog provides two different ways to add extra informations along the simple
-textual message.
-
-### Using the logging context
-
-The first way is the context, allowing to pass an array of data along the
-record:
-
-```php
-addInfo('Adding a new user', array('username' => 'Seldaek'));
-```
-
-Simple handlers (like the StreamHandler for instance) will simply format
-the array to a string but richer handlers can take advantage of the context
-(FirePHP is able to display arrays in pretty way for instance).
-
-### Using processors
-
-The second way is to add extra data for all records by using a processor.
-Processors can be any callable. They will get the record as parameter and
-must return it after having eventually changed the `extra` part of it. Let's
-write a processor adding some dummy data in the record:
-
-```php
-pushProcessor(function ($record) {
- $record['extra']['dummy'] = 'Hello world!';
-
- return $record;
-});
-```
-
-Monolog provides some built-in processors that can be used in your project.
-Look at the [dedicated chapter](https://github.com/Seldaek/monolog/blob/master/doc/02-handlers-formatters-processors.md#processors) for the list.
-
-> Tip: processors can also be registered on a specific handler instead of
- the logger to apply only for this handler.
-
-## Leveraging channels
-
-Channels are a great way to identify to which part of the application a record
-is related. This is useful in big applications (and is leveraged by
-MonologBundle in Symfony2).
-
-Picture two loggers sharing a handler that writes to a single log file.
-Channels would allow you to identify the logger that issued every record.
-You can easily grep through the log files filtering this or that channel.
-
-```php
-pushHandler($stream);
-$logger->pushHandler($firephp);
-
-// Create a logger for the security-related stuff with a different channel
-$securityLogger = new Logger('security');
-$securityLogger->pushHandler($stream);
-$securityLogger->pushHandler($firephp);
-```
-
-## Customizing the log format
-
-In Monolog it's easy to customize the format of the logs written into files,
-sockets, mails, databases and other handlers. Most of the handlers use the
-
-```php
-$record['formatted']
-```
-
-value to be automatically put into the log device. This value depends on the
-formatter settings. You can choose between predefined formatter classes or
-write your own (e.g. a multiline text file for human-readable output).
-
-To configure a predefined formatter class, just set it as the handler's field:
-
-```php
-// the default date format is "Y-m-d H:i:s"
-$dateFormat = "Y n j, g:i a";
-// the default output format is "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n"
-$output = "%datetime% > %level_name% > %message% %context% %extra%\n";
-// finally, create a formatter
-$formatter = new LineFormatter($output, $dateFormat);
-
-// Create a handler
-$stream = new StreamHandler(__DIR__.'/my_app.log', Logger::DEBUG);
-$stream->setFormatter($formatter);
-// bind it to a logger object
-$securityLogger = new Logger('security');
-$securityLogger->pushHandler($stream);
-```
-
-You may also reuse the same formatter between multiple handlers and share those
-handlers between multiple loggers.
-
-[Handlers, Formatters and Processors](02-handlers-formatters-processors.md) →
diff --git a/application/vendor/monolog/monolog/doc/02-handlers-formatters-processors.md b/application/vendor/monolog/monolog/doc/02-handlers-formatters-processors.md
deleted file mode 100644
index 90f8fce..0000000
--- a/application/vendor/monolog/monolog/doc/02-handlers-formatters-processors.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# Handlers, Formatters and Processors
-
-- [Handlers](#handlers)
- - [Log to files and syslog](#log-to-files-and-syslog)
- - [Send alerts and emails](#send-alerts-and-emails)
- - [Log specific servers and networked logging](#log-specific-servers-and-networked-logging)
- - [Logging in development](#logging-in-development)
- - [Log to databases](#log-to-databases)
- - [Wrappers / Special Handlers](#wrappers--special-handlers)
-- [Formatters](#formatters)
-- [Processors](#processors)
-- [Third Party Packages](#third-party-packages)
-
-## Handlers
-
-### Log to files and syslog
-
-- _StreamHandler_: Logs records into any PHP stream, use this for log files.
-- _RotatingFileHandler_: Logs records to a file and creates one logfile per day.
- It will also delete files older than `$maxFiles`. You should use
- [logrotate](http://linuxcommand.org/man_pages/logrotate8.html) for high profile
- setups though, this is just meant as a quick and dirty solution.
-- _SyslogHandler_: Logs records to the syslog.
-- _ErrorLogHandler_: Logs records to PHP's
- [`error_log()`](http://docs.php.net/manual/en/function.error-log.php) function.
-
-### Send alerts and emails
-
-- _NativeMailerHandler_: Sends emails using PHP's
- [`mail()`](http://php.net/manual/en/function.mail.php) function.
-- _SwiftMailerHandler_: Sends emails using a [`Swift_Mailer`](http://swiftmailer.org/) instance.
-- _PushoverHandler_: Sends mobile notifications via the [Pushover](https://www.pushover.net/) API.
-- _HipChatHandler_: Logs records to a [HipChat](http://hipchat.com) chat room using its API.
-- _FlowdockHandler_: Logs records to a [Flowdock](https://www.flowdock.com/) account.
-- _SlackHandler_: Logs records to a [Slack](https://www.slack.com/) account.
-- _MandrillHandler_: Sends emails via the Mandrill API using a [`Swift_Message`](http://swiftmailer.org/) instance.
-- _FleepHookHandler_: Logs records to a [Fleep](https://fleep.io/) conversation using Webhooks.
-- _IFTTTHandler_: Notifies an [IFTTT](https://ifttt.com/maker) trigger with the log channel, level name and message.
-
-### Log specific servers and networked logging
-
-- _SocketHandler_: Logs records to [sockets](http://php.net/fsockopen), use this
- for UNIX and TCP sockets. See an [example](sockets.md).
-- _AmqpHandler_: Logs records to an [amqp](http://www.amqp.org/) compatible
- server. Requires the [php-amqp](http://pecl.php.net/package/amqp) extension (1.0+).
-- _GelfHandler_: Logs records to a [Graylog2](http://www.graylog2.org) server.
-- _CubeHandler_: Logs records to a [Cube](http://square.github.com/cube/) server.
-- _RavenHandler_: Logs records to a [Sentry](http://getsentry.com/) server using
- [raven](https://packagist.org/packages/raven/raven).
-- _ZendMonitorHandler_: Logs records to the Zend Monitor present in Zend Server.
-- _NewRelicHandler_: Logs records to a [NewRelic](http://newrelic.com/) application.
-- _LogglyHandler_: Logs records to a [Loggly](http://www.loggly.com/) account.
-- _RollbarHandler_: Logs records to a [Rollbar](https://rollbar.com/) account.
-- _SyslogUdpHandler_: Logs records to a remote [Syslogd](http://www.rsyslog.com/) server.
-- _LogEntriesHandler_: Logs records to a [LogEntries](http://logentries.com/) account.
-
-### Logging in development
-
-- _FirePHPHandler_: Handler for [FirePHP](http://www.firephp.org/), providing
- inline `console` messages within [FireBug](http://getfirebug.com/).
-- _ChromePHPHandler_: Handler for [ChromePHP](http://www.chromephp.com/), providing
- inline `console` messages within Chrome.
-- _BrowserConsoleHandler_: Handler to send logs to browser's Javascript `console` with
- no browser extension required. Most browsers supporting `console` API are supported.
-- _PHPConsoleHandler_: Handler for [PHP Console](https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef), providing
- inline `console` and notification popup messages within Chrome.
-
-### Log to databases
-
-- _RedisHandler_: Logs records to a [redis](http://redis.io) server.
-- _MongoDBHandler_: Handler to write records in MongoDB via a
- [Mongo](http://pecl.php.net/package/mongo) extension connection.
-- _CouchDBHandler_: Logs records to a CouchDB server.
-- _DoctrineCouchDBHandler_: Logs records to a CouchDB server via the Doctrine CouchDB ODM.
-- _ElasticSearchHandler_: Logs records to an Elastic Search server.
-- _DynamoDbHandler_: Logs records to a DynamoDB table with the [AWS SDK](https://github.com/aws/aws-sdk-php).
-
-### Wrappers / Special Handlers
-
-- _FingersCrossedHandler_: A very interesting wrapper. It takes a logger as
- parameter and will accumulate log records of all levels until a record
- exceeds the defined severity level. At which point it delivers all records,
- including those of lower severity, to the handler it wraps. This means that
- until an error actually happens you will not see anything in your logs, but
- when it happens you will have the full information, including debug and info
- records. This provides you with all the information you need, but only when
- you need it.
-- _WhatFailureGroupHandler_: This handler extends the _GroupHandler_ ignoring
- exceptions raised by each child handler. This allows you to ignore issues
- where a remote tcp connection may have died but you do not want your entire
- application to crash and may wish to continue to log to other handlers.
-- _BufferHandler_: This handler will buffer all the log records it receives
- until `close()` is called at which point it will call `handleBatch()` on the
- handler it wraps with all the log messages at once. This is very useful to
- send an email with all records at once for example instead of having one mail
- for every log record.
-- _GroupHandler_: This handler groups other handlers. Every record received is
- sent to all the handlers it is configured with.
-- _FilterHandler_: This handler only lets records of the given levels through
- to the wrapped handler.
-- _SamplingHandler_: Wraps around another handler and lets you sample records
- if you only want to store some of them.
-- _NullHandler_: Any record it can handle will be thrown away. This can be used
- to put on top of an existing handler stack to disable it temporarily.
-- _PsrHandler_: Can be used to forward log records to an existing PSR-3 logger
-- _TestHandler_: Used for testing, it records everything that is sent to it and
- has accessors to read out the information.
-
-## Formatters
-
-- _LineFormatter_: Formats a log record into a one-line string.
-- _HtmlFormatter_: Used to format log records into a human readable html table, mainly suitable for emails.
-- _NormalizerFormatter_: Normalizes objects/resources down to strings so a record can easily be serialized/encoded.
-- _ScalarFormatter_: Used to format log records into an associative array of scalar values.
-- _JsonFormatter_: Encodes a log record into json.
-- _WildfireFormatter_: Used to format log records into the Wildfire/FirePHP protocol, only useful for the FirePHPHandler.
-- _ChromePHPFormatter_: Used to format log records into the ChromePHP format, only useful for the ChromePHPHandler.
-- _GelfMessageFormatter_: Used to format log records into Gelf message instances, only useful for the GelfHandler.
-- _LogstashFormatter_: Used to format log records into [logstash](http://logstash.net/) event json, useful for any handler listed under inputs [here](http://logstash.net/docs/latest).
-- _ElasticaFormatter_: Used to format log records into an Elastica\Document object, only useful for the ElasticSearchHandler.
-- _LogglyFormatter_: Used to format log records into Loggly messages, only useful for the LogglyHandler.
-- _FlowdockFormatter_: Used to format log records into Flowdock messages, only useful for the FlowdockHandler.
-- _MongoDBFormatter_: Converts \DateTime instances to \MongoDate and objects recursively to arrays, only useful with the MongoDBHandler.
-
-## Processors
-
-- _IntrospectionProcessor_: Adds the line/file/class/method from which the log call originated.
-- _WebProcessor_: Adds the current request URI, request method and client IP to a log record.
-- _MemoryUsageProcessor_: Adds the current memory usage to a log record.
-- _MemoryPeakUsageProcessor_: Adds the peak memory usage to a log record.
-- _ProcessIdProcessor_: Adds the process id to a log record.
-- _UidProcessor_: Adds a unique identifier to a log record.
-- _GitProcessor_: Adds the current git branch and commit to a log record.
-- _TagProcessor_: Adds an array of predefined tags to a log record.
-
-## Third Party Packages
-
-Third party handlers, formatters and processors are
-[listed in the wiki](https://github.com/Seldaek/monolog/wiki/Third-Party-Packages). You
-can also add your own there if you publish one.
-
-← [Usage](01-usage.md) | [Utility classes](03-utilities.md) →
diff --git a/application/vendor/monolog/monolog/doc/03-utilities.md b/application/vendor/monolog/monolog/doc/03-utilities.md
deleted file mode 100644
index c62aa41..0000000
--- a/application/vendor/monolog/monolog/doc/03-utilities.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Utilities
-
-- _Registry_: The `Monolog\Registry` class lets you configure global loggers that you
- can then statically access from anywhere. It is not really a best practice but can
- help in some older codebases or for ease of use.
-- _ErrorHandler_: The `Monolog\ErrorHandler` class allows you to easily register
- a Logger instance as an exception handler, error handler or fatal error handler.
-- _ErrorLevelActivationStrategy_: Activates a FingersCrossedHandler when a certain log
- level is reached.
-- _ChannelLevelActivationStrategy_: Activates a FingersCrossedHandler when a certain
- log level is reached, depending on which channel received the log record.
-
-← [Handlers, Formatters and Processors](02-handlers-formatters-processors.md) | [Extending Monolog](04-extending.md) →
diff --git a/application/vendor/monolog/monolog/doc/04-extending.md b/application/vendor/monolog/monolog/doc/04-extending.md
deleted file mode 100644
index ebd9104..0000000
--- a/application/vendor/monolog/monolog/doc/04-extending.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Extending Monolog
-
-Monolog is fully extensible, allowing you to adapt your logger to your needs.
-
-## Writing your own handler
-
-Monolog provides many built-in handlers. But if the one you need does not
-exist, you can write it and use it in your logger. The only requirement is
-to implement `Monolog\Handler\HandlerInterface`.
-
-Let's write a PDOHandler to log records to a database. We will extend the
-abstract class provided by Monolog to keep things DRY.
-
-```php
-pdo = $pdo;
- parent::__construct($level, $bubble);
- }
-
- protected function write(array $record)
- {
- if (!$this->initialized) {
- $this->initialize();
- }
-
- $this->statement->execute(array(
- 'channel' => $record['channel'],
- 'level' => $record['level'],
- 'message' => $record['formatted'],
- 'time' => $record['datetime']->format('U'),
- ));
- }
-
- private function initialize()
- {
- $this->pdo->exec(
- 'CREATE TABLE IF NOT EXISTS monolog '
- .'(channel VARCHAR(255), level INTEGER, message LONGTEXT, time INTEGER UNSIGNED)'
- );
- $this->statement = $this->pdo->prepare(
- 'INSERT INTO monolog (channel, level, message, time) VALUES (:channel, :level, :message, :time)'
- );
-
- $this->initialized = true;
- }
-}
-```
-
-You can now use this handler in your logger:
-
-```php
-pushHandler(new PDOHandler(new PDO('sqlite:logs.sqlite')));
-
-// You can now use your logger
-$logger->addInfo('My logger is now ready');
-```
-
-The `Monolog\Handler\AbstractProcessingHandler` class provides most of the
-logic needed for the handler, including the use of processors and the formatting
-of the record (which is why we use ``$record['formatted']`` instead of ``$record['message']``).
-
-← [Utility classes](03-utilities.md)
diff --git a/application/vendor/monolog/monolog/doc/sockets.md b/application/vendor/monolog/monolog/doc/sockets.md
deleted file mode 100644
index ea9cf0e..0000000
--- a/application/vendor/monolog/monolog/doc/sockets.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Sockets Handler
-===============
-
-This handler allows you to write your logs to sockets using [fsockopen](http://php.net/fsockopen)
-or [pfsockopen](http://php.net/pfsockopen).
-
-Persistent sockets are mainly useful in web environments where you gain some performance not closing/opening
-the connections between requests.
-
-You can use a `unix://` prefix to access unix sockets and `udp://` to open UDP sockets instead of the default TCP.
-
-Basic Example
--------------
-
-```php
-setPersistent(true);
-
-// Now add the handler
-$logger->pushHandler($handler, Logger::DEBUG);
-
-// You can now use your logger
-$logger->addInfo('My logger is now ready');
-
-```
-
-In this example, using syslog-ng, you should see the log on the log server:
-
- cweb1 [2012-02-26 00:12:03] my_logger.INFO: My logger is now ready [] []
-
diff --git a/application/vendor/monolog/monolog/phpunit.xml.dist b/application/vendor/monolog/monolog/phpunit.xml.dist
deleted file mode 100644
index 20d82b6..0000000
--- a/application/vendor/monolog/monolog/phpunit.xml.dist
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- tests/Monolog/
-
-
-
-
-
- src/Monolog/
-
-
-
-
-
-
-
diff --git a/application/vendor/monolog/monolog/src/Monolog/ErrorHandler.php b/application/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
index f21eb28..adc55bd 100644
--- a/application/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
@@ -14,6 +14,7 @@
use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
use Monolog\Handler\AbstractHandler;
+use Monolog\Registry;
/**
* Monolog error handler
@@ -33,10 +34,12 @@ class ErrorHandler
private $previousErrorHandler;
private $errorLevelMap;
+ private $handleOnlyReportedErrors;
private $hasFatalErrorHandler;
private $fatalLevel;
private $reservedMemory;
+ private $lastFatalTrace;
private static $fatalErrors = array(E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR);
public function __construct(LoggerInterface $logger)
@@ -57,6 +60,9 @@ public function __construct(LoggerInterface $logger)
*/
public static function register(LoggerInterface $logger, $errorLevelMap = array(), $exceptionLevel = null, $fatalLevel = null)
{
+ //Forces the autoloader to run for LogLevel. Fixes an autoload issue at compile-time on PHP5.3. See https://github.com/Seldaek/monolog/pull/929
+ class_exists('\\Psr\\Log\\LogLevel', true);
+
$handler = new static($logger);
if ($errorLevelMap !== false) {
$handler->registerErrorHandler($errorLevelMap);
@@ -80,13 +86,15 @@ public function registerExceptionHandler($level = null, $callPrevious = true)
}
}
- public function registerErrorHandler(array $levelMap = array(), $callPrevious = true, $errorTypes = -1)
+ public function registerErrorHandler(array $levelMap = array(), $callPrevious = true, $errorTypes = -1, $handleOnlyReportedErrors = true)
{
$prev = set_error_handler(array($this, 'handleError'), $errorTypes);
$this->errorLevelMap = array_replace($this->defaultErrorLevelMap(), $levelMap);
if ($callPrevious) {
$this->previousErrorHandler = $prev ?: true;
}
+
+ $this->handleOnlyReportedErrors = $handleOnlyReportedErrors;
}
public function registerFatalHandler($level = null, $reservedMemorySize = 20)
@@ -126,7 +134,7 @@ public function handleException($e)
{
$this->logger->log(
$this->uncaughtExceptionLevel === null ? LogLevel::ERROR : $this->uncaughtExceptionLevel,
- sprintf('Uncaught Exception %s: "%s" at %s line %s', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()),
+ sprintf('Uncaught Exception %s: "%s" at %s line %s', Utils::getClass($e), $e->getMessage(), $e->getFile(), $e->getLine()),
array('exception' => $e)
);
@@ -142,7 +150,7 @@ public function handleException($e)
*/
public function handleError($code, $message, $file = '', $line = 0, $context = array())
{
- if (!(error_reporting() & $code)) {
+ if ($this->handleOnlyReportedErrors && !(error_reporting() & $code)) {
return;
}
@@ -150,6 +158,13 @@ public function handleError($code, $message, $file = '', $line = 0, $context = a
if (!$this->hasFatalErrorHandler || !in_array($code, self::$fatalErrors, true)) {
$level = isset($this->errorLevelMap[$code]) ? $this->errorLevelMap[$code] : LogLevel::CRITICAL;
$this->logger->log($level, self::codeToString($code).': '.$message, array('code' => $code, 'message' => $message, 'file' => $file, 'line' => $line));
+ } else {
+ // http://php.net/manual/en/function.debug-backtrace.php
+ // As of 5.3.6, DEBUG_BACKTRACE_IGNORE_ARGS option was added.
+ // Any version less than 5.3.6 must use the DEBUG_BACKTRACE_IGNORE_ARGS constant value '2'.
+ $trace = debug_backtrace((PHP_VERSION_ID < 50306) ? 2 : DEBUG_BACKTRACE_IGNORE_ARGS);
+ array_shift($trace); // Exclude handleError from trace
+ $this->lastFatalTrace = $trace;
}
if ($this->previousErrorHandler === true) {
@@ -171,7 +186,7 @@ public function handleFatalError()
$this->logger->log(
$this->fatalLevel === null ? LogLevel::ALERT : $this->fatalLevel,
'Fatal Error ('.self::codeToString($lastError['type']).'): '.$lastError['message'],
- array('code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'])
+ array('code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'], 'trace' => $this->lastFatalTrace)
);
if ($this->logger instanceof Logger) {
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
index 56d3e27..9beda1e 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
@@ -41,10 +41,9 @@ public function format(array $record)
{
// Retrieve the line and file if set and remove them from the formatted extra
$backtrace = 'unknown';
- if (isset($record['extra']['file']) && isset($record['extra']['line'])) {
+ if (isset($record['extra']['file'], $record['extra']['line'])) {
$backtrace = $record['extra']['file'].' : '.$record['extra']['line'];
- unset($record['extra']['file']);
- unset($record['extra']['line']);
+ unset($record['extra']['file'], $record['extra']['line']);
}
$message = array('message' => $record['message']);
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
index b0b0cf0..4c556cf 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
@@ -36,7 +36,9 @@ class ElasticaFormatter extends NormalizerFormatter
*/
public function __construct($index, $type)
{
- parent::__construct(\DateTime::ISO8601);
+ // elasticsearch requires a ISO 8601 format date with optional millisecond precision.
+ parent::__construct('Y-m-d\TH:i:s.uP');
+
$this->index = $index;
$this->type = $type;
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
new file mode 100644
index 0000000..46a91ff
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
@@ -0,0 +1,86 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+/**
+ * Class FluentdFormatter
+ *
+ * Serializes a log message to Fluentd unix socket protocol
+ *
+ * Fluentd config:
+ *
+ *
+ * type unix
+ * path /var/run/td-agent/td-agent.sock
+ *
+ *
+ * Monolog setup:
+ *
+ * $logger = new Monolog\Logger('fluent.tag');
+ * $fluentHandler = new Monolog\Handler\SocketHandler('unix:///var/run/td-agent/td-agent.sock');
+ * $fluentHandler->setFormatter(new Monolog\Formatter\FluentdFormatter());
+ * $logger->pushHandler($fluentHandler);
+ *
+ * @author Andrius Putna
+ */
+class FluentdFormatter implements FormatterInterface
+{
+ /**
+ * @var bool $levelTag should message level be a part of the fluentd tag
+ */
+ protected $levelTag = false;
+
+ public function __construct($levelTag = false)
+ {
+ if (!function_exists('json_encode')) {
+ throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s FluentdUnixFormatter');
+ }
+
+ $this->levelTag = (bool) $levelTag;
+ }
+
+ public function isUsingLevelsInTag()
+ {
+ return $this->levelTag;
+ }
+
+ public function format(array $record)
+ {
+ $tag = $record['channel'];
+ if ($this->levelTag) {
+ $tag .= '.' . strtolower($record['level_name']);
+ }
+
+ $message = array(
+ 'message' => $record['message'],
+ 'context' => $record['context'],
+ 'extra' => $record['extra'],
+ );
+
+ if (!$this->levelTag) {
+ $message['level'] = $record['level'];
+ $message['level_name'] = $record['level_name'];
+ }
+
+ return json_encode(array($tag, $record['datetime']->getTimestamp(), $message));
+ }
+
+ public function formatBatch(array $records)
+ {
+ $message = '';
+ foreach ($records as $record) {
+ $message .= $this->format($record);
+ }
+
+ return $message;
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
index 1e43175..2c1b0e8 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
@@ -22,6 +22,8 @@
*/
class GelfMessageFormatter extends NormalizerFormatter
{
+ const DEFAULT_MAX_LENGTH = 32766;
+
/**
* @var string the name of the system for the Gelf log message
*/
@@ -37,6 +39,11 @@ class GelfMessageFormatter extends NormalizerFormatter
*/
protected $contextPrefix;
+ /**
+ * @var int max length per field
+ */
+ protected $maxLength;
+
/**
* Translates Monolog log levels to Graylog2 log priorities.
*/
@@ -51,7 +58,7 @@ class GelfMessageFormatter extends NormalizerFormatter
Logger::EMERGENCY => 0,
);
- public function __construct($systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_')
+ public function __construct($systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_', $maxLength = null)
{
parent::__construct('U.u');
@@ -59,6 +66,7 @@ public function __construct($systemName = null, $extraPrefix = null, $contextPre
$this->extraPrefix = $extraPrefix;
$this->contextPrefix = $contextPrefix;
+ $this->maxLength = is_null($maxLength) ? self::DEFAULT_MAX_LENGTH : $maxLength;
}
/**
@@ -79,6 +87,13 @@ public function format(array $record)
->setHost($this->systemName)
->setLevel($this->logLevels[$record['level']]);
+ // message length + system name length + 200 for padding / metadata
+ $len = 200 + strlen((string) $record['message']) + strlen($this->systemName);
+
+ if ($len > $this->maxLength) {
+ $message->setShortMessage(substr($record['message'], 0, $this->maxLength));
+ }
+
if (isset($record['channel'])) {
$message->setFacility($record['channel']);
}
@@ -92,11 +107,23 @@ public function format(array $record)
}
foreach ($record['extra'] as $key => $val) {
- $message->setAdditional($this->extraPrefix . $key, is_scalar($val) ? $val : $this->toJson($val));
+ $val = is_scalar($val) || null === $val ? $val : $this->toJson($val);
+ $len = strlen($this->extraPrefix . $key . $val);
+ if ($len > $this->maxLength) {
+ $message->setAdditional($this->extraPrefix . $key, substr($val, 0, $this->maxLength));
+ break;
+ }
+ $message->setAdditional($this->extraPrefix . $key, $val);
}
foreach ($record['context'] as $key => $val) {
- $message->setAdditional($this->contextPrefix . $key, is_scalar($val) ? $val : $this->toJson($val));
+ $val = is_scalar($val) || null === $val ? $val : $this->toJson($val);
+ $len = strlen($this->contextPrefix . $key . $val);
+ if ($len > $this->maxLength) {
+ $message->setAdditional($this->contextPrefix . $key, substr($val, 0, $this->maxLength));
+ break;
+ }
+ $message->setAdditional($this->contextPrefix . $key, $val);
}
if (null === $message->getFile() && isset($record['context']['exception']['file'])) {
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
index 255d288..dfc0b4a 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
@@ -24,7 +24,7 @@ class HtmlFormatter extends NormalizerFormatter
/**
* Translates Monolog log levels to html color priorities.
*/
- private $logLevels = array(
+ protected $logLevels = array(
Logger::DEBUG => '#cccccc',
Logger::INFO => '#468847',
Logger::NOTICE => '#3a87ad',
@@ -51,29 +51,30 @@ public function __construct($dateFormat = null)
* @param bool $escapeTd false if td content must not be html escaped
* @return string
*/
- private function addRow($th, $td = ' ', $escapeTd = true)
+ protected function addRow($th, $td = ' ', $escapeTd = true)
{
$th = htmlspecialchars($th, ENT_NOQUOTES, 'UTF-8');
if ($escapeTd) {
$td = ''.htmlspecialchars($td, ENT_NOQUOTES, 'UTF-8').'
';
}
- return "\n| $th: | \n".$td." | \n
";
+ return "\n| $th: | \n".$td." | \n
";
}
/**
* Create a HTML h1 tag
*
- * @param string $title Text to be in the h1
- * @param integer $level Error level
+ * @param string $title Text to be in the h1
+ * @param int $level Error level
* @return string
*/
- private function addTitle($title, $level)
+ protected function addTitle($title, $level)
{
$title = htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8');
return ''.$title.'
';
}
+
/**
* Formats a log record.
*
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
index e5a1d2c..2ff119e 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
@@ -11,6 +11,10 @@
namespace Monolog\Formatter;
+use Exception;
+use Monolog\Utils;
+use Throwable;
+
/**
* Encodes whatever record data is passed to it as json
*
@@ -18,7 +22,7 @@
*
* @author Jordi Boggiano
*/
-class JsonFormatter implements FormatterInterface
+class JsonFormatter extends NormalizerFormatter
{
const BATCH_MODE_JSON = 1;
const BATCH_MODE_NEWLINES = 2;
@@ -26,8 +30,14 @@ class JsonFormatter implements FormatterInterface
protected $batchMode;
protected $appendNewline;
+ /**
+ * @var bool
+ */
+ protected $includeStacktraces = false;
+
/**
* @param int $batchMode
+ * @param bool $appendNewline
*/
public function __construct($batchMode = self::BATCH_MODE_JSON, $appendNewline = true)
{
@@ -64,7 +74,7 @@ public function isAppendingNewlines()
*/
public function format(array $record)
{
- return json_encode($record) . ($this->appendNewline ? "\n" : '');
+ return $this->toJson($this->normalize($record), true) . ($this->appendNewline ? "\n" : '');
}
/**
@@ -82,6 +92,14 @@ public function formatBatch(array $records)
}
}
+ /**
+ * @param bool $include
+ */
+ public function includeStacktraces($include = true)
+ {
+ $this->includeStacktraces = $include;
+ }
+
/**
* Return a JSON-encoded array of records.
*
@@ -90,7 +108,7 @@ public function formatBatch(array $records)
*/
protected function formatBatchJson(array $records)
{
- return json_encode($records);
+ return $this->toJson($this->normalize($records), true);
}
/**
@@ -113,4 +131,78 @@ protected function formatBatchNewlines(array $records)
return implode("\n", $records);
}
+
+ /**
+ * Normalizes given $data.
+ *
+ * @param mixed $data
+ *
+ * @return mixed
+ */
+ protected function normalize($data, $depth = 0)
+ {
+ if ($depth > 9) {
+ return 'Over 9 levels deep, aborting normalization';
+ }
+
+ if (is_array($data) || $data instanceof \Traversable) {
+ $normalized = array();
+
+ $count = 1;
+ foreach ($data as $key => $value) {
+ if ($count++ > 1000) {
+ $normalized['...'] = 'Over 1000 items ('.count($data).' total), aborting normalization';
+ break;
+ }
+
+ $normalized[$key] = $this->normalize($value, $depth+1);
+ }
+
+ return $normalized;
+ }
+
+ if ($data instanceof Exception || $data instanceof Throwable) {
+ return $this->normalizeException($data);
+ }
+
+ return $data;
+ }
+
+ /**
+ * Normalizes given exception with or without its own stack trace based on
+ * `includeStacktraces` property.
+ *
+ * @param Exception|Throwable $e
+ *
+ * @return array
+ */
+ protected function normalizeException($e)
+ {
+ // TODO 2.0 only check for Throwable
+ if (!$e instanceof Exception && !$e instanceof Throwable) {
+ throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.Utils::getClass($e));
+ }
+
+ $data = array(
+ 'class' => Utils::getClass($e),
+ 'message' => $e->getMessage(),
+ 'code' => $e->getCode(),
+ 'file' => $e->getFile().':'.$e->getLine(),
+ );
+
+ if ($this->includeStacktraces) {
+ $trace = $e->getTrace();
+ foreach ($trace as $frame) {
+ if (isset($frame['file'])) {
+ $data['trace'][] = $frame['file'].':'.$frame['line'];
+ }
+ }
+ }
+
+ if ($previous = $e->getPrevious()) {
+ $data['previous'] = $this->normalizeException($previous);
+ }
+
+ return $data;
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
index 388e226..f98e1a6 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
-use Exception;
+use Monolog\Utils;
/**
* Formats incoming records into a one-line string
@@ -78,6 +78,14 @@ public function format(array $record)
}
}
+
+ foreach ($vars['context'] as $var => $val) {
+ if (false !== strpos($output, '%context.'.$var.'%')) {
+ $output = str_replace('%context.'.$var.'%', $this->stringify($val), $output);
+ unset($vars['context'][$var]);
+ }
+ }
+
if ($this->ignoreEmptyContextAndExtra) {
if (empty($vars['context'])) {
unset($vars['context']);
@@ -96,6 +104,11 @@ public function format(array $record)
}
}
+ // remove leftover %extra.xxx% and %context.xxx% if any
+ if (false !== strpos($output, '%')) {
+ $output = preg_replace('/%(?:extra|context)\..+?%/', '', $output);
+ }
+
return $output;
}
@@ -114,18 +127,23 @@ public function stringify($value)
return $this->replaceNewlines($this->convertToString($value));
}
- protected function normalizeException(Exception $e)
+ protected function normalizeException($e)
{
+ // TODO 2.0 only check for Throwable
+ if (!$e instanceof \Exception && !$e instanceof \Throwable) {
+ throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.Utils::getClass($e));
+ }
+
$previousText = '';
if ($previous = $e->getPrevious()) {
do {
- $previousText .= ', '.get_class($previous).'(code: '.$previous->getCode().'): '.$previous->getMessage().' at '.$previous->getFile().':'.$previous->getLine();
+ $previousText .= ', '.Utils::getClass($previous).'(code: '.$previous->getCode().'): '.$previous->getMessage().' at '.$previous->getFile().':'.$previous->getLine();
} while ($previous = $previous->getPrevious());
}
- $str = '[object] ('.get_class($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')';
+ $str = '[object] ('.Utils::getClass($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')';
if ($this->includeStacktraces) {
- $str .= "\n[stacktrace]\n".$e->getTraceAsString();
+ $str .= "\n[stacktrace]\n".$e->getTraceAsString()."\n";
}
return $str;
@@ -151,6 +169,10 @@ protected function convertToString($data)
protected function replaceNewlines($str)
{
if ($this->allowInlineLineBreaks) {
+ if (0 === strpos($str, '{')) {
+ return str_replace(array('\r', '\n'), array("\r", "\n"), $str);
+ }
+
return $str;
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
index f02bceb..401859b 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
@@ -22,7 +22,7 @@ class LogglyFormatter extends JsonFormatter
* Overrides the default batch mode to new lines for compatibility with the
* Loggly bulk API.
*
- * @param integer $batchMode
+ * @param int $batchMode
*/
public function __construct($batchMode = self::BATCH_MODE_NEWLINES, $appendNewline = false)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
index be21b2c..8f83bec 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
@@ -45,16 +45,16 @@ class LogstashFormatter extends NormalizerFormatter
protected $contextPrefix;
/**
- * @var integer logstash format version to use
+ * @var int logstash format version to use
*/
protected $version;
/**
- * @param string $applicationName the application that sends the data, used as the "type" field of logstash
- * @param string $systemName the system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine
- * @param string $extraPrefix prefix for extra keys inside logstash "fields"
- * @param string $contextPrefix prefix for context keys inside logstash "fields", defaults to ctxt_
- * @param integer $version the logstash format version to use, defaults to 0
+ * @param string $applicationName the application that sends the data, used as the "type" field of logstash
+ * @param string $systemName the system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine
+ * @param string $extraPrefix prefix for extra keys inside logstash "fields"
+ * @param string $contextPrefix prefix for context keys inside logstash "fields", defaults to ctxt_
+ * @param int $version the logstash format version to use, defaults to 0
*/
public function __construct($applicationName, $systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_', $version = self::V0)
{
@@ -92,7 +92,7 @@ protected function formatV0(array $record)
$message = array(
'@timestamp' => $record['datetime'],
'@source' => $this->systemName,
- '@fields' => array()
+ '@fields' => array(),
);
if (isset($record['message'])) {
$message['@message'] = $record['message'];
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
index eb067bb..eb7be84 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
@@ -11,6 +11,8 @@
namespace Monolog\Formatter;
+use Monolog\Utils;
+
/**
* Formats a record for use with the MongoDBHandler.
*
@@ -75,7 +77,7 @@ protected function formatArray(array $record, $nestingLevel = 0)
protected function formatObject($value, $nestingLevel)
{
$objectVars = get_object_vars($value);
- $objectVars['class'] = get_class($value);
+ $objectVars['class'] = Utils::getClass($value);
return $this->formatArray($objectVars, $nestingLevel);
}
@@ -83,7 +85,7 @@ protected function formatObject($value, $nestingLevel)
protected function formatException(\Exception $exception, $nestingLevel)
{
$formattedException = array(
- 'class' => get_class($exception),
+ 'class' => Utils::getClass($exception),
'message' => $exception->getMessage(),
'code' => $exception->getCode(),
'file' => $exception->getFile() . ':' . $exception->getLine(),
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
index 0361935..9865394 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
@@ -12,6 +12,7 @@
namespace Monolog\Formatter;
use Exception;
+use Monolog\Utils;
/**
* Normalizes incoming records to remove objects/resources so it's easier to dump to various targets
@@ -55,8 +56,12 @@ public function formatBatch(array $records)
return $records;
}
- protected function normalize($data)
+ protected function normalize($data, $depth = 0)
{
+ if ($depth > 9) {
+ return 'Over 9 levels deep, aborting normalization';
+ }
+
if (null === $data || is_scalar($data)) {
if (is_float($data)) {
if (is_infinite($data)) {
@@ -70,16 +75,17 @@ protected function normalize($data)
return $data;
}
- if (is_array($data) || $data instanceof \Traversable) {
+ if (is_array($data)) {
$normalized = array();
$count = 1;
foreach ($data as $key => $value) {
- if ($count++ >= 1000) {
- $normalized['...'] = 'Over 1000 items, aborting normalization';
+ if ($count++ > 1000) {
+ $normalized['...'] = 'Over 1000 items ('.count($data).' total), aborting normalization';
break;
}
- $normalized[$key] = $this->normalize($value);
+
+ $normalized[$key] = $this->normalize($value, $depth+1);
}
return $normalized;
@@ -90,19 +96,20 @@ protected function normalize($data)
}
if (is_object($data)) {
- if ($data instanceof Exception) {
+ // TODO 2.0 only check for Throwable
+ if ($data instanceof Exception || (PHP_VERSION_ID > 70000 && $data instanceof \Throwable)) {
return $this->normalizeException($data);
}
// non-serializable objects that implement __toString stringified
if (method_exists($data, '__toString') && !$data instanceof \JsonSerializable) {
- $value = (string) $data;
+ $value = $data->__toString();
} else {
// the rest is json-serialized in some way
$value = $this->toJson($data, true);
}
- return sprintf("[object] (%s: %s)", get_class($data), $value);
+ return sprintf("[object] (%s: %s)", Utils::getClass($data), $value);
}
if (is_resource($data)) {
@@ -112,22 +119,38 @@ protected function normalize($data)
return '[unknown('.gettype($data).')]';
}
- protected function normalizeException(Exception $e)
+ protected function normalizeException($e)
{
+ // TODO 2.0 only check for Throwable
+ if (!$e instanceof Exception && !$e instanceof \Throwable) {
+ throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.Utils::getClass($e));
+ }
+
$data = array(
- 'class' => get_class($e),
+ 'class' => Utils::getClass($e),
'message' => $e->getMessage(),
'code' => $e->getCode(),
'file' => $e->getFile().':'.$e->getLine(),
);
+ if ($e instanceof \SoapFault) {
+ if (isset($e->faultcode)) {
+ $data['faultcode'] = $e->faultcode;
+ }
+
+ if (isset($e->faultactor)) {
+ $data['faultactor'] = $e->faultactor;
+ }
+
+ if (isset($e->detail)) {
+ $data['detail'] = $e->detail;
+ }
+ }
+
$trace = $e->getTrace();
foreach ($trace as $frame) {
if (isset($frame['file'])) {
$data['trace'][] = $frame['file'].':'.$frame['line'];
- } else {
- // We should again normalize the frames, because it might contain invalid items
- $data['trace'][] = $this->toJson($this->normalize($frame), true);
}
}
@@ -138,23 +161,72 @@ protected function normalizeException(Exception $e)
return $data;
}
+ /**
+ * Return the JSON representation of a value
+ *
+ * @param mixed $data
+ * @param bool $ignoreErrors
+ * @throws \RuntimeException if encoding fails and errors are not ignored
+ * @return string
+ */
protected function toJson($data, $ignoreErrors = false)
{
// suppress json_encode errors since it's twitchy with some inputs
if ($ignoreErrors) {
- if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
- return @json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
- }
+ return @$this->jsonEncode($data);
+ }
- return @json_encode($data);
+ $json = $this->jsonEncode($data);
+
+ if ($json === false) {
+ $json = $this->handleJsonError(json_last_error(), $data);
}
+ return $json;
+ }
+
+ /**
+ * @param mixed $data
+ * @return string JSON encoded data or null on failure
+ */
+ private function jsonEncode($data)
+ {
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
- $json = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+ return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+ }
+
+ return json_encode($data);
+ }
+
+ /**
+ * Handle a json_encode failure.
+ *
+ * If the failure is due to invalid string encoding, try to clean the
+ * input and encode again. If the second encoding attempt fails, the
+ * inital error is not encoding related or the input can't be cleaned then
+ * raise a descriptive exception.
+ *
+ * @param int $code return code of json_last_error function
+ * @param mixed $data data that was meant to be encoded
+ * @throws \RuntimeException if failure can't be corrected
+ * @return string JSON encoded data after error correction
+ */
+ private function handleJsonError($code, $data)
+ {
+ if ($code !== JSON_ERROR_UTF8) {
+ $this->throwEncodeError($code, $data);
+ }
+
+ if (is_string($data)) {
+ $this->detectAndCleanUtf8($data);
+ } elseif (is_array($data)) {
+ array_walk_recursive($data, array($this, 'detectAndCleanUtf8'));
} else {
- $json = json_encode($data);
+ $this->throwEncodeError($code, $data);
}
+ $json = $this->jsonEncode($data);
+
if ($json === false) {
$this->throwEncodeError(json_last_error(), $data);
}
@@ -165,8 +237,8 @@ protected function toJson($data, $ignoreErrors = false)
/**
* Throws an exception according to a given code with a customized message
*
- * @param int $code return code of json_last_error function
- * @param mixed $data data that was meant to be encoded
+ * @param int $code return code of json_last_error function
+ * @param mixed $data data that was meant to be encoded
* @throws \RuntimeException
*/
private function throwEncodeError($code, $data)
@@ -190,4 +262,36 @@ private function throwEncodeError($code, $data)
throw new \RuntimeException('JSON encoding failed: '.$msg.'. Encoding: '.var_export($data, true));
}
+
+ /**
+ * Detect invalid UTF-8 string characters and convert to valid UTF-8.
+ *
+ * Valid UTF-8 input will be left unmodified, but strings containing
+ * invalid UTF-8 codepoints will be reencoded as UTF-8 with an assumed
+ * original encoding of ISO-8859-15. This conversion may result in
+ * incorrect output if the actual encoding was not ISO-8859-15, but it
+ * will be clean UTF-8 output and will not rely on expensive and fragile
+ * detection algorithms.
+ *
+ * Function converts the input in place in the passed variable so that it
+ * can be used as a callback for array_walk_recursive.
+ *
+ * @param mixed &$data Input to check and convert if needed
+ * @private
+ */
+ public function detectAndCleanUtf8(&$data)
+ {
+ if (is_string($data) && !preg_match('//u', $data)) {
+ $data = preg_replace_callback(
+ '/[\x80-\xFF]+/',
+ function ($m) { return utf8_encode($m[0]); },
+ $data
+ );
+ $data = str_replace(
+ array('¤', '¦', '¨', '´', '¸', '¼', '½', '¾'),
+ array('€', 'Š', 'š', 'Ž', 'ž', 'Œ', 'œ', 'Ÿ'),
+ $data
+ );
+ }
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php b/application/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
index 654710a..65dba99 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
@@ -102,12 +102,12 @@ public function formatBatch(array $records)
throw new \BadMethodCallException('Batch formatting does not make sense for the WildfireFormatter');
}
- protected function normalize($data)
+ protected function normalize($data, $depth = 0)
{
if (is_object($data) && !$data instanceof \DateTime) {
return $data;
}
- return parent::normalize($data);
+ return parent::normalize($data, $depth);
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
index 69ede49..92b9d45 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
@@ -11,16 +11,17 @@
namespace Monolog\Handler;
-use Monolog\Logger;
use Monolog\Formatter\FormatterInterface;
use Monolog\Formatter\LineFormatter;
+use Monolog\Logger;
+use Monolog\ResettableInterface;
/**
* Base Handler class providing the Handler structure
*
* @author Jordi Boggiano
*/
-abstract class AbstractHandler implements HandlerInterface
+abstract class AbstractHandler implements HandlerInterface, ResettableInterface
{
protected $level = Logger::DEBUG;
protected $bubble = true;
@@ -32,8 +33,8 @@ abstract class AbstractHandler implements HandlerInterface
protected $processors = array();
/**
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($level = Logger::DEBUG, $bubble = true)
{
@@ -118,7 +119,7 @@ public function getFormatter()
/**
* Sets minimum logging level at which this handler will be triggered.
*
- * @param integer $level
+ * @param int|string $level Level or level name
* @return self
*/
public function setLevel($level)
@@ -131,7 +132,7 @@ public function setLevel($level)
/**
* Gets minimum logging level at which this handler will be triggered.
*
- * @return integer
+ * @return int
*/
public function getLevel()
{
@@ -141,8 +142,8 @@ public function getLevel()
/**
* Sets the bubbling behavior.
*
- * @param Boolean $bubble true means that this handler allows bubbling.
- * false means that bubbling is not permitted.
+ * @param bool $bubble true means that this handler allows bubbling.
+ * false means that bubbling is not permitted.
* @return self
*/
public function setBubble($bubble)
@@ -155,8 +156,8 @@ public function setBubble($bubble)
/**
* Gets the bubbling behavior.
*
- * @return Boolean true means that this handler allows bubbling.
- * false means that bubbling is not permitted.
+ * @return bool true means that this handler allows bubbling.
+ * false means that bubbling is not permitted.
*/
public function getBubble()
{
@@ -169,6 +170,17 @@ public function __destruct()
$this->close();
} catch (\Exception $e) {
// do nothing
+ } catch (\Throwable $e) {
+ // do nothing
+ }
+ }
+
+ public function reset()
+ {
+ foreach ($this->processors as $processor) {
+ if ($processor instanceof ResettableInterface) {
+ $processor->reset();
+ }
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
index 6f18f72..e1e8953 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
@@ -11,6 +11,8 @@
namespace Monolog\Handler;
+use Monolog\ResettableInterface;
+
/**
* Base Handler class providing the Handler structure
*
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
index 3eb83bd..8c76aca 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
@@ -53,9 +53,9 @@ abstract class AbstractSyslogHandler extends AbstractProcessingHandler
);
/**
- * @param mixed $facility
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param mixed $facility
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($facility = LOG_USER, $level = Logger::DEBUG, $bubble = true)
{
@@ -70,6 +70,15 @@ public function __construct($facility = LOG_USER, $level = Logger::DEBUG, $bubbl
$this->facilities['local5'] = LOG_LOCAL5;
$this->facilities['local6'] = LOG_LOCAL6;
$this->facilities['local7'] = LOG_LOCAL7;
+ } else {
+ $this->facilities['local0'] = 128; // LOG_LOCAL0
+ $this->facilities['local1'] = 136; // LOG_LOCAL1
+ $this->facilities['local2'] = 144; // LOG_LOCAL2
+ $this->facilities['local3'] = 152; // LOG_LOCAL3
+ $this->facilities['local4'] = 160; // LOG_LOCAL4
+ $this->facilities['local5'] = 168; // LOG_LOCAL5
+ $this->facilities['local6'] = 176; // LOG_LOCAL6
+ $this->facilities['local7'] = 184; // LOG_LOCAL7
}
// convert textual description of facility to syslog constant
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
index a28ba02..e5a46bc 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
@@ -55,39 +55,89 @@ public function __construct($exchange, $exchangeName = 'log', $level = Logger::D
protected function write(array $record)
{
$data = $record["formatted"];
-
- $routingKey = sprintf(
- '%s.%s',
- // TODO 2.0 remove substr call
- substr($record['level_name'], 0, 4),
- $record['channel']
- );
+ $routingKey = $this->getRoutingKey($record);
if ($this->exchange instanceof AMQPExchange) {
$this->exchange->publish(
$data,
- strtolower($routingKey),
+ $routingKey,
0,
array(
'delivery_mode' => 2,
- 'Content-type' => 'application/json'
+ 'content_type' => 'application/json',
)
);
} else {
$this->exchange->basic_publish(
- new AMQPMessage(
- (string) $data,
- array(
- 'delivery_mode' => 2,
- 'content_type' => 'application/json'
- )
- ),
+ $this->createAmqpMessage($data),
$this->exchangeName,
- strtolower($routingKey)
+ $routingKey
);
}
}
+ /**
+ * {@inheritDoc}
+ */
+ public function handleBatch(array $records)
+ {
+ if ($this->exchange instanceof AMQPExchange) {
+ parent::handleBatch($records);
+
+ return;
+ }
+
+ foreach ($records as $record) {
+ if (!$this->isHandling($record)) {
+ continue;
+ }
+
+ $record = $this->processRecord($record);
+ $data = $this->getFormatter()->format($record);
+
+ $this->exchange->batch_basic_publish(
+ $this->createAmqpMessage($data),
+ $this->exchangeName,
+ $this->getRoutingKey($record)
+ );
+ }
+
+ $this->exchange->publish_batch();
+ }
+
+ /**
+ * Gets the routing key for the AMQP exchange
+ *
+ * @param array $record
+ * @return string
+ */
+ protected function getRoutingKey(array $record)
+ {
+ $routingKey = sprintf(
+ '%s.%s',
+ // TODO 2.0 remove substr call
+ substr($record['level_name'], 0, 4),
+ $record['channel']
+ );
+
+ return strtolower($routingKey);
+ }
+
+ /**
+ * @param string $data
+ * @return AMQPMessage
+ */
+ private function createAmqpMessage($data)
+ {
+ return new AMQPMessage(
+ (string) $data,
+ array(
+ 'delivery_mode' => 2,
+ 'content_type' => 'application/json',
+ )
+ );
+ }
+
/**
* {@inheritDoc}
*/
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
index a409952..23cf23b 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
@@ -31,7 +31,6 @@ class BrowserConsoleHandler extends AbstractProcessingHandler
* Example of formatted string:
*
* You can do [[blue text]]{color: blue} or [[green background]]{background-color: green; color: white}
- *
*/
protected function getDefaultFormatter()
{
@@ -44,12 +43,12 @@ protected function getDefaultFormatter()
protected function write(array $record)
{
// Accumulate records
- self::$records[] = $record;
+ static::$records[] = $record;
// Register shutdown handler if not already done
- if (PHP_SAPI !== 'cli' && !self::$initialized) {
- self::$initialized = true;
- register_shutdown_function(array('Monolog\Handler\BrowserConsoleHandler', 'send'));
+ if (!static::$initialized) {
+ static::$initialized = true;
+ $this->registerShutdownFunction();
}
}
@@ -59,54 +58,103 @@ protected function write(array $record)
*/
public static function send()
{
- $htmlTags = true;
+ $format = static::getResponseFormat();
+ if ($format === 'unknown') {
+ return;
+ }
+
+ if (count(static::$records)) {
+ if ($format === 'html') {
+ static::writeOutput('');
+ } elseif ($format === 'js') {
+ static::writeOutput(static::generateScript());
+ }
+ static::resetStatic();
+ }
+ }
+
+ public function close()
+ {
+ self::resetStatic();
+ }
+
+ public function reset()
+ {
+ self::resetStatic();
+ }
+
+ /**
+ * Forget all logged records
+ */
+ public static function resetStatic()
+ {
+ static::$records = array();
+ }
+
+ /**
+ * Wrapper for register_shutdown_function to allow overriding
+ */
+ protected function registerShutdownFunction()
+ {
+ if (PHP_SAPI !== 'cli') {
+ register_shutdown_function(array('Monolog\Handler\BrowserConsoleHandler', 'send'));
+ }
+ }
+
+ /**
+ * Wrapper for echo to allow overriding
+ *
+ * @param string $str
+ */
+ protected static function writeOutput($str)
+ {
+ echo $str;
+ }
+
+ /**
+ * Checks the format of the response
+ *
+ * If Content-Type is set to application/javascript or text/javascript -> js
+ * If Content-Type is set to text/html, or is unset -> html
+ * If Content-Type is anything else -> unknown
+ *
+ * @return string One of 'js', 'html' or 'unknown'
+ */
+ protected static function getResponseFormat()
+ {
// Check content type
foreach (headers_list() as $header) {
if (stripos($header, 'content-type:') === 0) {
// This handler only works with HTML and javascript outputs
// text/javascript is obsolete in favour of application/javascript, but still used
if (stripos($header, 'application/javascript') !== false || stripos($header, 'text/javascript') !== false) {
- $htmlTags = false;
- } elseif (stripos($header, 'text/html') === false) {
- return;
+ return 'js';
+ }
+ if (stripos($header, 'text/html') === false) {
+ return 'unknown';
}
break;
}
}
- if (count(self::$records)) {
- if ($htmlTags) {
- echo '';
- } else {
- echo self::generateScript();
- }
- self::reset();
- }
- }
-
- /**
- * Forget all logged records
- */
- public static function reset()
- {
- self::$records = array();
+ return 'html';
}
private static function generateScript()
{
$script = array();
- foreach (self::$records as $record) {
- $context = self::dump('Context', $record['context']);
- $extra = self::dump('Extra', $record['extra']);
+ foreach (static::$records as $record) {
+ $context = static::dump('Context', $record['context']);
+ $extra = static::dump('Extra', $record['extra']);
if (empty($context) && empty($extra)) {
- $script[] = self::call_array('log', self::handleStyles($record['formatted']));
+ $script[] = static::call_array('log', static::handleStyles($record['formatted']));
} else {
$script = array_merge($script,
- array(self::call_array('groupCollapsed', self::handleStyles($record['formatted']))),
+ array(static::call_array('groupCollapsed', static::handleStyles($record['formatted']))),
$context,
$extra,
- array(self::call('groupEnd'))
+ array(static::call('groupEnd'))
);
}
}
@@ -116,19 +164,19 @@ private static function generateScript()
private static function handleStyles($formatted)
{
- $args = array(self::quote('font-weight: normal'));
+ $args = array(static::quote('font-weight: normal'));
$format = '%c' . $formatted;
preg_match_all('/\[\[(.*?)\]\]\{([^}]*)\}/s', $format, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
foreach (array_reverse($matches) as $match) {
- $args[] = self::quote(self::handleCustomStyles($match[2][0], $match[1][0]));
+ $args[] = static::quote(static::handleCustomStyles($match[2][0], $match[1][0]));
$args[] = '"font-weight: normal"';
$pos = $match[0][1];
$format = substr($format, 0, $pos) . '%c' . $match[1][0] . '%c' . substr($format, $pos + strlen($match[0][0]));
}
- array_unshift($args, self::quote($format));
+ array_unshift($args, static::quote($format));
return $args;
}
@@ -160,13 +208,13 @@ private static function dump($title, array $dict)
if (empty($dict)) {
return $script;
}
- $script[] = self::call('log', self::quote('%c%s'), self::quote('font-weight: bold'), self::quote($title));
+ $script[] = static::call('log', static::quote('%c%s'), static::quote('font-weight: bold'), static::quote($title));
foreach ($dict as $key => $value) {
$value = json_encode($value);
if (empty($value)) {
- $value = self::quote('');
+ $value = static::quote('');
}
- $script[] = self::call('log', self::quote('%s: %o'), self::quote($key), $value);
+ $script[] = static::call('log', static::quote('%s: %o'), static::quote($key), $value);
}
return $script;
@@ -182,7 +230,7 @@ private static function call()
$args = func_get_args();
$method = array_shift($args);
- return self::call_array($method, $args);
+ return static::call_array($method, $args);
}
private static function call_array($method, array $args)
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
index 6d8136f..61d1b50 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
@@ -12,6 +12,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
+use Monolog\ResettableInterface;
/**
* Buffers all records until closing the handler and then pass them as batch.
@@ -32,10 +33,10 @@ class BufferHandler extends AbstractHandler
/**
* @param HandlerInterface $handler Handler.
- * @param integer $bufferLimit How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
- * @param Boolean $flushOnOverflow If true, the buffer is flushed when the max size has been reached, by default oldest entries are discarded
+ * @param int $bufferLimit How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $flushOnOverflow If true, the buffer is flushed when the max size has been reached, by default oldest entries are discarded
*/
public function __construct(HandlerInterface $handler, $bufferLimit = 0, $level = Logger::DEBUG, $bubble = true, $flushOnOverflow = false)
{
@@ -114,4 +115,15 @@ public function clear()
$this->bufferSize = 0;
$this->buffer = array();
}
+
+ public function reset()
+ {
+ $this->flush();
+
+ parent::reset();
+
+ if ($this->handler instanceof ResettableInterface) {
+ $this->handler->reset();
+ }
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
index b3f2963..ac98d5d 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
@@ -17,6 +17,8 @@
/**
* Handler sending logs to the ChromePHP extension (http://www.chromephp.com/)
*
+ * This also works out of the box with Firefox 43+
+ *
* @author Christophe Coevoet
*/
class ChromePHPHandler extends AbstractProcessingHandler
@@ -31,14 +33,19 @@ class ChromePHPHandler extends AbstractProcessingHandler
*/
const HEADER_NAME = 'X-ChromeLogger-Data';
+ /**
+ * Regular expression to detect supported browsers (matches any Chrome, or Firefox 43+)
+ */
+ const USER_AGENT_REGEX = '{\b(?:Chrome/\d+(?:\.\d+)*|HeadlessChrome|Firefox/(?:4[3-9]|[5-9]\d|\d{3,})(?:\.\d)*)\b}';
+
protected static $initialized = false;
/**
* Tracks whether we sent too much data
*
- * Chrome limits the headers to 256KB, so when we sent 240KB we stop sending
+ * Chrome limits the headers to 4KB, so when we sent 3KB we stop sending
*
- * @var Boolean
+ * @var bool
*/
protected static $overflowed = false;
@@ -51,8 +58,8 @@ class ChromePHPHandler extends AbstractProcessingHandler
protected static $sendHeaders = true;
/**
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($level = Logger::DEBUG, $bubble = true)
{
@@ -129,7 +136,7 @@ protected function send()
$json = @json_encode(self::$json);
$data = base64_encode(utf8_encode($json));
- if (strlen($data) > 240 * 1024) {
+ if (strlen($data) > 3 * 1024) {
self::$overflowed = true;
$record = array(
@@ -167,7 +174,7 @@ protected function sendHeader($header, $content)
/**
* Verifies if the headers are accepted by the current user agent
*
- * @return Boolean
+ * @return bool
*/
protected function headersAccepted()
{
@@ -175,7 +182,7 @@ protected function headersAccepted()
return false;
}
- return preg_match('{\bChrome/\d+[\.\d+]*\b}', $_SERVER['HTTP_USER_AGENT']);
+ return preg_match(self::USER_AGENT_REGEX, $_SERVER['HTTP_USER_AGENT']);
}
/**
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
index b3687c3..cc98697 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
@@ -54,7 +54,7 @@ protected function write(array $record)
'ignore_errors' => true,
'max_redirects' => 0,
'header' => 'Content-type: application/json',
- )
+ ),
));
if (false === @file_get_contents($url, null, $context)) {
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
index e7dd854..96b3ca0 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
@@ -21,37 +21,37 @@
*/
class CubeHandler extends AbstractProcessingHandler
{
- private $udpConnection = null;
- private $httpConnection = null;
- private $scheme = null;
- private $host = null;
- private $port = null;
+ private $udpConnection;
+ private $httpConnection;
+ private $scheme;
+ private $host;
+ private $port;
private $acceptedSchemes = array('http', 'udp');
/**
* Create a Cube handler
*
* @throws \UnexpectedValueException when given url is not a valid url.
- * A valid url must consists of three parts : protocol://host:port
- * Only valid protocol used by Cube are http and udp
+ * A valid url must consist of three parts : protocol://host:port
+ * Only valid protocols used by Cube are http and udp
*/
public function __construct($url, $level = Logger::DEBUG, $bubble = true)
{
- $urlInfos = parse_url($url);
+ $urlInfo = parse_url($url);
- if (!isset($urlInfos['scheme']) || !isset($urlInfos['host']) || !isset($urlInfos['port'])) {
+ if (!isset($urlInfo['scheme'], $urlInfo['host'], $urlInfo['port'])) {
throw new \UnexpectedValueException('URL "'.$url.'" is not valid');
}
- if (!in_array($urlInfos['scheme'], $this->acceptedSchemes)) {
+ if (!in_array($urlInfo['scheme'], $this->acceptedSchemes)) {
throw new \UnexpectedValueException(
- 'Invalid protocol (' . $urlInfos['scheme'] . ').'
+ 'Invalid protocol (' . $urlInfo['scheme'] . ').'
. ' Valid options are ' . implode(', ', $this->acceptedSchemes));
}
- $this->scheme = $urlInfos['scheme'];
- $this->host = $urlInfos['host'];
- $this->port = $urlInfos['port'];
+ $this->scheme = $urlInfo['scheme'];
+ $this->host = $urlInfo['host'];
+ $this->port = $urlInfo['port'];
parent::__construct($level, $bubble);
}
@@ -59,7 +59,8 @@ public function __construct($url, $level = Logger::DEBUG, $bubble = true)
/**
* Establish a connection to an UDP socket
*
- * @throws \LogicException when unable to connect to the socket
+ * @throws \LogicException when unable to connect to the socket
+ * @throws MissingExtensionException when there is no socket extension
*/
protected function connectUdp()
{
@@ -79,6 +80,7 @@ protected function connectUdp()
/**
* Establish a connection to a http server
+ * @throws \LogicException when no curl extension
*/
protected function connectHttp()
{
@@ -140,10 +142,10 @@ private function writeHttp($data)
curl_setopt($this->httpConnection, CURLOPT_POSTFIELDS, '['.$data.']');
curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, array(
- 'Content-Type: application/json',
- 'Content-Length: ' . strlen('['.$data.']'))
- );
+ 'Content-Type: application/json',
+ 'Content-Length: ' . strlen('['.$data.']'),
+ ));
- Curl\Util::execute($ch, 5, false);
+ Curl\Util::execute($this->httpConnection, 5, false);
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php b/application/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php
index adbe4f4..48d30b3 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php
@@ -26,7 +26,7 @@ class Util
/**
* Executes a CURL request with optional retries and exception on failure
*
- * @param resource $ch curl handler
+ * @param resource $ch curl handler
* @throws \RuntimeException
*/
public static function execute($ch, $retries = 5, $closeAfterDone = true)
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php
new file mode 100644
index 0000000..35b55cb
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php
@@ -0,0 +1,169 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Simple handler wrapper that deduplicates log records across multiple requests
+ *
+ * It also includes the BufferHandler functionality and will buffer
+ * all messages until the end of the request or flush() is called.
+ *
+ * This works by storing all log records' messages above $deduplicationLevel
+ * to the file specified by $deduplicationStore. When further logs come in at the end of the
+ * request (or when flush() is called), all those above $deduplicationLevel are checked
+ * against the existing stored logs. If they match and the timestamps in the stored log is
+ * not older than $time seconds, the new log record is discarded. If no log record is new, the
+ * whole data set is discarded.
+ *
+ * This is mainly useful in combination with Mail handlers or things like Slack or HipChat handlers
+ * that send messages to people, to avoid spamming with the same message over and over in case of
+ * a major component failure like a database server being down which makes all requests fail in the
+ * same way.
+ *
+ * @author Jordi Boggiano
+ */
+class DeduplicationHandler extends BufferHandler
+{
+ /**
+ * @var string
+ */
+ protected $deduplicationStore;
+
+ /**
+ * @var int
+ */
+ protected $deduplicationLevel;
+
+ /**
+ * @var int
+ */
+ protected $time;
+
+ /**
+ * @var bool
+ */
+ private $gc = false;
+
+ /**
+ * @param HandlerInterface $handler Handler.
+ * @param string $deduplicationStore The file/path where the deduplication log should be kept
+ * @param int $deduplicationLevel The minimum logging level for log records to be looked at for deduplication purposes
+ * @param int $time The period (in seconds) during which duplicate entries should be suppressed after a given log is sent through
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ */
+ public function __construct(HandlerInterface $handler, $deduplicationStore = null, $deduplicationLevel = Logger::ERROR, $time = 60, $bubble = true)
+ {
+ parent::__construct($handler, 0, Logger::DEBUG, $bubble, false);
+
+ $this->deduplicationStore = $deduplicationStore === null ? sys_get_temp_dir() . '/monolog-dedup-' . substr(md5(__FILE__), 0, 20) .'.log' : $deduplicationStore;
+ $this->deduplicationLevel = Logger::toMonologLevel($deduplicationLevel);
+ $this->time = $time;
+ }
+
+ public function flush()
+ {
+ if ($this->bufferSize === 0) {
+ return;
+ }
+
+ $passthru = null;
+
+ foreach ($this->buffer as $record) {
+ if ($record['level'] >= $this->deduplicationLevel) {
+
+ $passthru = $passthru || !$this->isDuplicate($record);
+ if ($passthru) {
+ $this->appendRecord($record);
+ }
+ }
+ }
+
+ // default of null is valid as well as if no record matches duplicationLevel we just pass through
+ if ($passthru === true || $passthru === null) {
+ $this->handler->handleBatch($this->buffer);
+ }
+
+ $this->clear();
+
+ if ($this->gc) {
+ $this->collectLogs();
+ }
+ }
+
+ private function isDuplicate(array $record)
+ {
+ if (!file_exists($this->deduplicationStore)) {
+ return false;
+ }
+
+ $store = file($this->deduplicationStore, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+ if (!is_array($store)) {
+ return false;
+ }
+
+ $yesterday = time() - 86400;
+ $timestampValidity = $record['datetime']->getTimestamp() - $this->time;
+ $expectedMessage = preg_replace('{[\r\n].*}', '', $record['message']);
+
+ for ($i = count($store) - 1; $i >= 0; $i--) {
+ list($timestamp, $level, $message) = explode(':', $store[$i], 3);
+
+ if ($level === $record['level_name'] && $message === $expectedMessage && $timestamp > $timestampValidity) {
+ return true;
+ }
+
+ if ($timestamp < $yesterday) {
+ $this->gc = true;
+ }
+ }
+
+ return false;
+ }
+
+ private function collectLogs()
+ {
+ if (!file_exists($this->deduplicationStore)) {
+ return false;
+ }
+
+ $handle = fopen($this->deduplicationStore, 'rw+');
+ flock($handle, LOCK_EX);
+ $validLogs = array();
+
+ $timestampValidity = time() - $this->time;
+
+ while (!feof($handle)) {
+ $log = fgets($handle);
+ if (substr($log, 0, 10) >= $timestampValidity) {
+ $validLogs[] = $log;
+ }
+ }
+
+ ftruncate($handle, 0);
+ rewind($handle);
+ foreach ($validLogs as $log) {
+ fwrite($handle, $log);
+ }
+
+ flock($handle, LOCK_UN);
+ fclose($handle);
+
+ $this->gc = false;
+ }
+
+ private function appendRecord(array $record)
+ {
+ file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . preg_replace('{[\r\n].*}', '', $record['message']) . "\n", FILE_APPEND);
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
index e7f843c..237b71f 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
@@ -11,8 +11,9 @@
namespace Monolog\Handler;
-use Aws\Common\Aws;
+use Aws\Sdk;
use Aws\DynamoDb\DynamoDbClient;
+use Aws\DynamoDb\Marshaler;
use Monolog\Formatter\ScalarFormatter;
use Monolog\Logger;
@@ -36,16 +37,29 @@ class DynamoDbHandler extends AbstractProcessingHandler
*/
protected $table;
+ /**
+ * @var int
+ */
+ protected $version;
+
+ /**
+ * @var Marshaler
+ */
+ protected $marshaler;
+
/**
* @param DynamoDbClient $client
* @param string $table
- * @param integer $level
- * @param boolean $bubble
+ * @param int $level
+ * @param bool $bubble
*/
public function __construct(DynamoDbClient $client, $table, $level = Logger::DEBUG, $bubble = true)
{
- if (!defined('Aws\Common\Aws::VERSION') || version_compare('3.0', Aws::VERSION, '<=')) {
- throw new \RuntimeException('The DynamoDbHandler is only known to work with the AWS SDK 2.x releases');
+ if (defined('Aws\Sdk::VERSION') && version_compare(Sdk::VERSION, '3.0', '>=')) {
+ $this->version = 3;
+ $this->marshaler = new Marshaler;
+ } else {
+ $this->version = 2;
}
$this->client = $client;
@@ -60,11 +74,15 @@ public function __construct(DynamoDbClient $client, $table, $level = Logger::DEB
protected function write(array $record)
{
$filtered = $this->filterEmptyFields($record['formatted']);
- $formatted = $this->client->formatAttributes($filtered);
+ if ($this->version === 3) {
+ $formatted = $this->marshaler->marshalItem($filtered);
+ } else {
+ $formatted = $this->client->formatAttributes($filtered);
+ }
$this->client->putItem(array(
'TableName' => $this->table,
- 'Item' => $formatted
+ 'Item' => $formatted,
));
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
index 96e5d57..bb0f83e 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
@@ -46,10 +46,10 @@ class ElasticSearchHandler extends AbstractProcessingHandler
protected $options = array();
/**
- * @param Client $client Elastica Client object
- * @param array $options Handler configuration
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param Client $client Elastica Client object
+ * @param array $options Handler configuration
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct(Client $client, array $options = array(), $level = Logger::DEBUG, $bubble = true)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
index d1e1ee6..b2986b0 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
@@ -28,10 +28,10 @@ class ErrorLogHandler extends AbstractProcessingHandler
protected $expandNewlines;
/**
- * @param integer $messageType Says where the error should go.
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
- * @param Boolean $expandNewlines If set to true, newlines in the message will be expanded to be take multiple log entries
+ * @param int $messageType Says where the error should go.
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $expandNewlines If set to true, newlines in the message will be expanded to be take multiple log entries
*/
public function __construct($messageType = self::OPERATING_SYSTEM, $level = Logger::DEBUG, $bubble = true, $expandNewlines = false)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
index dad8227..938c1a7 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
@@ -31,7 +31,7 @@ class FilterHandler extends AbstractHandler
protected $handler;
/**
- * Minimum level for logs that are passes to handler
+ * Minimum level for logs that are passed to handler
*
* @var int[]
*/
@@ -40,7 +40,7 @@ class FilterHandler extends AbstractHandler
/**
* Whether the messages that are handled can bubble up the stack or not
*
- * @var Boolean
+ * @var bool
*/
protected $bubble;
@@ -48,7 +48,7 @@ class FilterHandler extends AbstractHandler
* @param callable|HandlerInterface $handler Handler or factory callable($record, $this).
* @param int|array $minLevelOrList A list of levels to accept or a minimum level if maxLevel is provided
* @param int $maxLevel Maximum level to accept, only used if $minLevelOrList is not an array
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($handler, $minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY, $bubble = true)
{
@@ -70,8 +70,8 @@ public function getAcceptedLevels()
}
/**
- * @param int|array $minLevelOrList A list of levels to accept or a minimum level if maxLevel is provided
- * @param int $maxLevel Maximum level to accept, only used if $minLevelOrList is not an array
+ * @param int|string|array $minLevelOrList A list of levels to accept or a minimum level or level name if maxLevel is provided
+ * @param int|string $maxLevel Maximum level or level name to accept, only used if $minLevelOrList is not an array
*/
public function setAcceptedLevels($minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
index c3e42ef..aaca12c 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
@@ -22,7 +22,7 @@ interface ActivationStrategyInterface
* Returns whether the given record activates the handler.
*
* @param array $record
- * @return Boolean
+ * @return bool
*/
public function isHandlerActivated(array $record);
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
index e3b403f..2a2a64d 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
@@ -2,12 +2,12 @@
/*
* This file is part of the Monolog package.
-*
-* (c) Jordi Boggiano
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
+ *
+ * (c) Jordi Boggiano
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
namespace Monolog\Handler\FingersCrossed;
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
index 30a85dd..275fd51 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
@@ -14,6 +14,7 @@
use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
use Monolog\Handler\FingersCrossed\ActivationStrategyInterface;
use Monolog\Logger;
+use Monolog\ResettableInterface;
/**
* Buffers all records until a certain level is reached
@@ -41,8 +42,8 @@ class FingersCrossedHandler extends AbstractHandler
* @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler).
* @param int|ActivationStrategyInterface $activationStrategy Strategy which determines when this handler takes action
* @param int $bufferSize How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
- * @param Boolean $stopBuffering Whether the handler should stop buffering after being triggered (default true)
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $stopBuffering Whether the handler should stop buffering after being triggered (default true)
* @param int $passthruLevel Minimum level to always flush to handler on close, even if strategy not triggered
*/
public function __construct($handler, $activationStrategy = null, $bufferSize = 0, $bubble = true, $stopBuffering = true, $passthruLevel = null)
@@ -79,6 +80,26 @@ public function isHandling(array $record)
return true;
}
+ /**
+ * Manually activate this logger regardless of the activation strategy
+ */
+ public function activate()
+ {
+ if ($this->stopBuffering) {
+ $this->buffering = false;
+ }
+ if (!$this->handler instanceof HandlerInterface) {
+ $record = end($this->buffer) ?: null;
+
+ $this->handler = call_user_func($this->handler, $record, $this);
+ if (!$this->handler instanceof HandlerInterface) {
+ throw new \RuntimeException("The factory callable should return a HandlerInterface");
+ }
+ }
+ $this->handler->handleBatch($this->buffer);
+ $this->buffer = array();
+ }
+
/**
* {@inheritdoc}
*/
@@ -96,17 +117,7 @@ public function handle(array $record)
array_shift($this->buffer);
}
if ($this->activationStrategy->isHandlerActivated($record)) {
- if ($this->stopBuffering) {
- $this->buffering = false;
- }
- if (!$this->handler instanceof HandlerInterface) {
- $this->handler = call_user_func($this->handler, $record, $this);
- if (!$this->handler instanceof HandlerInterface) {
- throw new \RuntimeException("The factory callable should return a HandlerInterface");
- }
- }
- $this->handler->handleBatch($this->buffer);
- $this->buffer = array();
+ $this->activate();
}
} else {
$this->handler->handle($record);
@@ -120,24 +131,18 @@ public function handle(array $record)
*/
public function close()
{
- if (null !== $this->passthruLevel) {
- $level = $this->passthruLevel;
- $this->buffer = array_filter($this->buffer, function ($record) use ($level) {
- return $record['level'] >= $level;
- });
- if (count($this->buffer) > 0) {
- $this->handler->handleBatch($this->buffer);
- $this->buffer = array();
- }
- }
+ $this->flushBuffer();
}
- /**
- * Resets the state of the handler. Stops forwarding records to the wrapped handler.
- */
public function reset()
{
- $this->buffering = true;
+ $this->flushBuffer();
+
+ parent::reset();
+
+ if ($this->handler instanceof ResettableInterface) {
+ $this->handler->reset();
+ }
}
/**
@@ -150,4 +155,23 @@ public function clear()
$this->buffer = array();
$this->reset();
}
+
+ /**
+ * Resets the state of the handler. Stops forwarding records to the wrapped handler.
+ */
+ private function flushBuffer()
+ {
+ if (null !== $this->passthruLevel) {
+ $level = $this->passthruLevel;
+ $this->buffer = array_filter($this->buffer, function ($record) use ($level) {
+ return $record['level'] >= $level;
+ });
+ if (count($this->buffer) > 0) {
+ $this->handler->handleBatch($this->buffer);
+ }
+ }
+
+ $this->buffer = array();
+ $this->buffering = true;
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
index fee4795..c30b184 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
@@ -158,7 +158,7 @@ protected function write(array $record)
/**
* Verifies if the headers are accepted by the current user agent
*
- * @return Boolean
+ * @return bool
*/
protected function headersAccepted()
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
index 388692c..c43c013 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
@@ -118,7 +118,7 @@ private function buildHeader($content)
private function buildContent($record)
{
$dataArray = array(
- 'message' => $record['formatted']
+ 'message' => $record['formatted'],
);
return http_build_query($dataArray);
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php
new file mode 100644
index 0000000..3e2f1b2
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php
@@ -0,0 +1,39 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\FormatterInterface;
+
+/**
+ * Interface to describe loggers that have a formatter
+ *
+ * This interface is present in monolog 1.x to ease forward compatibility.
+ *
+ * @author Jordi Boggiano
+ */
+interface FormattableHandlerInterface
+{
+ /**
+ * Sets the formatter.
+ *
+ * @param FormatterInterface $formatter
+ * @return HandlerInterface self
+ */
+ public function setFormatter(FormatterInterface $formatter): HandlerInterface;
+
+ /**
+ * Gets the formatter.
+ *
+ * @return FormatterInterface
+ */
+ public function getFormatter(): FormatterInterface;
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php b/application/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php
new file mode 100644
index 0000000..e9ec5e7
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php
@@ -0,0 +1,63 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\FormatterInterface;
+use Monolog\Formatter\LineFormatter;
+
+/**
+ * Helper trait for implementing FormattableInterface
+ *
+ * This trait is present in monolog 1.x to ease forward compatibility.
+ *
+ * @author Jordi Boggiano
+ */
+trait FormattableHandlerTrait
+{
+ /**
+ * @var FormatterInterface
+ */
+ protected $formatter;
+
+ /**
+ * {@inheritdoc}
+ * @suppress PhanTypeMismatchReturn
+ */
+ public function setFormatter(FormatterInterface $formatter): HandlerInterface
+ {
+ $this->formatter = $formatter;
+
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFormatter(): FormatterInterface
+ {
+ if (!$this->formatter) {
+ $this->formatter = $this->getDefaultFormatter();
+ }
+
+ return $this->formatter;
+ }
+
+ /**
+ * Gets the default formatter.
+ *
+ * Overwrite this if the LineFormatter is not a good default for your handler.
+ */
+ protected function getDefaultFormatter(): FormatterInterface
+ {
+ return new LineFormatter();
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
index 28c7b55..71e4669 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
@@ -33,28 +33,20 @@ class GelfHandler extends AbstractProcessingHandler
/**
* @param PublisherInterface|IMessagePublisher|Publisher $publisher a publisher object
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($publisher, $level = Logger::DEBUG, $bubble = true)
{
parent::__construct($level, $bubble);
if (!$publisher instanceof Publisher && !$publisher instanceof IMessagePublisher && !$publisher instanceof PublisherInterface) {
- throw new InvalidArgumentException("Invalid publisher, expected a Gelf\Publisher, Gelf\IMessagePublisher or Gelf\PublisherInterface instance");
+ throw new InvalidArgumentException('Invalid publisher, expected a Gelf\Publisher, Gelf\IMessagePublisher or Gelf\PublisherInterface instance');
}
$this->publisher = $publisher;
}
- /**
- * {@inheritdoc}
- */
- public function close()
- {
- $this->publisher = null;
- }
-
/**
* {@inheritdoc}
*/
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
index 99384d3..0d461f9 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
@@ -11,6 +11,9 @@
namespace Monolog\Handler;
+use Monolog\Formatter\FormatterInterface;
+use Monolog\ResettableInterface;
+
/**
* Forwards records to multiple handlers
*
@@ -21,8 +24,8 @@ class GroupHandler extends AbstractHandler
protected $handlers;
/**
- * @param array $handlers Array of Handlers.
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param array $handlers Array of Handlers.
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct(array $handlers, $bubble = true)
{
@@ -73,8 +76,42 @@ public function handle(array $record)
*/
public function handleBatch(array $records)
{
+ if ($this->processors) {
+ $processed = array();
+ foreach ($records as $record) {
+ foreach ($this->processors as $processor) {
+ $record = call_user_func($processor, $record);
+ }
+ $processed[] = $record;
+ }
+ $records = $processed;
+ }
+
foreach ($this->handlers as $handler) {
$handler->handleBatch($records);
}
}
+
+ public function reset()
+ {
+ parent::reset();
+
+ foreach ($this->handlers as $handler) {
+ if ($handler instanceof ResettableInterface) {
+ $handler->reset();
+ }
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setFormatter(FormatterInterface $formatter)
+ {
+ foreach ($this->handlers as $handler) {
+ $handler->setFormatter($formatter);
+ }
+
+ return $this;
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php b/application/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
index d920c4b..8d5a4a0 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
@@ -31,7 +31,7 @@ interface HandlerInterface
*
* @param array $record Partial log record containing only a level key
*
- * @return Boolean
+ * @return bool
*/
public function isHandling(array $record);
@@ -46,7 +46,7 @@ public function isHandling(array $record);
* calling further handlers in the stack with a given log record.
*
* @param array $record The record to handle
- * @return Boolean true means that this handler handled the record, and that bubbling is not permitted.
+ * @return bool true means that this handler handled the record, and that bubbling is not permitted.
* false means the record was either not processed or that this handler allows bubbling.
*/
public function handle(array $record);
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php b/application/vendor/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
new file mode 100644
index 0000000..55e6498
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
@@ -0,0 +1,116 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\ResettableInterface;
+use Monolog\Formatter\FormatterInterface;
+
+/**
+ * This simple wrapper class can be used to extend handlers functionality.
+ *
+ * Example: A custom filtering that can be applied to any handler.
+ *
+ * Inherit from this class and override handle() like this:
+ *
+ * public function handle(array $record)
+ * {
+ * if ($record meets certain conditions) {
+ * return false;
+ * }
+ * return $this->handler->handle($record);
+ * }
+ *
+ * @author Alexey Karapetov
+ */
+class HandlerWrapper implements HandlerInterface, ResettableInterface
+{
+ /**
+ * @var HandlerInterface
+ */
+ protected $handler;
+
+ /**
+ * HandlerWrapper constructor.
+ * @param HandlerInterface $handler
+ */
+ public function __construct(HandlerInterface $handler)
+ {
+ $this->handler = $handler;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isHandling(array $record)
+ {
+ return $this->handler->isHandling($record);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(array $record)
+ {
+ return $this->handler->handle($record);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handleBatch(array $records)
+ {
+ return $this->handler->handleBatch($records);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function pushProcessor($callback)
+ {
+ $this->handler->pushProcessor($callback);
+
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function popProcessor()
+ {
+ return $this->handler->popProcessor();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setFormatter(FormatterInterface $formatter)
+ {
+ $this->handler->setFormatter($formatter);
+
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFormatter()
+ {
+ return $this->handler->getFormatter();
+ }
+
+ public function reset()
+ {
+ if ($this->handler instanceof ResettableInterface) {
+ return $this->handler->reset();
+ }
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
index 34d3437..179d626 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
@@ -84,19 +84,21 @@ class HipChatHandler extends SocketHandler
private $version;
/**
- * @param string $token HipChat API Token
- * @param string $room The room that should be alerted of the message (Id or Name)
- * @param string $name Name used in the "from" field. Not used for v2
- * @param bool $notify Trigger a notification in clients or not
- * @param int $level The minimum logging level at which this handler will be triggered
- * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
- * @param bool $useSSL Whether to connect via SSL.
- * @param string $format The format of the messages (default to text, can be set to html if you have html in the messages)
- * @param string $host The HipChat server hostname.
- * @param string $version The HipChat API version (default HipChatHandler::API_V1)
+ * @param string $token HipChat API Token
+ * @param string $room The room that should be alerted of the message (Id or Name)
+ * @param string $name Name used in the "from" field.
+ * @param bool $notify Trigger a notification in clients or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $useSSL Whether to connect via SSL.
+ * @param string $format The format of the messages (default to text, can be set to html if you have html in the messages)
+ * @param string $host The HipChat server hostname.
+ * @param string $version The HipChat API version (default HipChatHandler::API_V1)
*/
public function __construct($token, $room, $name = 'Monolog', $notify = false, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $format = 'text', $host = 'api.hipchat.com', $version = self::API_V1)
{
+ @trigger_error('The Monolog\Handler\HipChatHandler class is deprecated. You should migrate to Slack and the SlackWebhookHandler / SlackbotHandler, see https://www.atlassian.com/partnerships/slack', E_USER_DEPRECATED);
+
if ($version == self::API_V1 && !$this->validateStringLength($name, static::MAXIMUM_NAME_LENGTH)) {
throw new \InvalidArgumentException('The supplied name is too long. HipChat\'s v1 API supports names up to 15 UTF-8 characters.');
}
@@ -143,10 +145,23 @@ private function buildContent($record)
'color' => $this->getAlertColor($record['level']),
);
+ if (!$this->validateStringLength($dataArray['message'], static::MAXIMUM_MESSAGE_LENGTH)) {
+ if (function_exists('mb_substr')) {
+ $dataArray['message'] = mb_substr($dataArray['message'], 0, static::MAXIMUM_MESSAGE_LENGTH).' [truncated]';
+ } else {
+ $dataArray['message'] = substr($dataArray['message'], 0, static::MAXIMUM_MESSAGE_LENGTH).' [truncated]';
+ }
+ }
+
// if we are using the legacy API then we need to send some additional information
if ($this->version == self::API_V1) {
$dataArray['room_id'] = $this->room;
- $dataArray['from'] = $this->name;
+ }
+
+ // append the sender name if it is set
+ // always append it if we use the v1 api (it is required in v1)
+ if ($this->version == self::API_V1 || $this->name !== null) {
+ $dataArray['from'] = (string) $this->name;
}
return http_build_query($dataArray);
@@ -179,7 +194,7 @@ private function buildHeader($content)
/**
* Assigns a color to each level of log records.
*
- * @param integer $level
+ * @param int $level
* @return string
*/
protected function getAlertColor($level)
@@ -206,6 +221,21 @@ protected function getAlertColor($level)
protected function write(array $record)
{
parent::write($record);
+ $this->finalizeWrite();
+ }
+
+ /**
+ * Finalizes the request by reading some bytes and then closing the socket
+ *
+ * If we do not read some but close the socket too early, hipchat sometimes
+ * drops the request entirely.
+ */
+ protected function finalizeWrite()
+ {
+ $res = $this->getResource();
+ if (is_resource($res)) {
+ @fread($res, 2048);
+ }
$this->closeSocket();
}
@@ -303,7 +333,7 @@ private function combineRecords($records)
array(
'level' => $level,
'level_name' => $levelName,
- 'datetime' => $datetime
+ 'datetime' => $datetime,
)
);
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
index bc11705..7f22622 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
@@ -30,10 +30,10 @@ class IFTTTHandler extends AbstractProcessingHandler
private $secretKey;
/**
- * @param string $eventName The name of the IFTTT Maker event that should be triggered
- * @param string $secretKey A valid IFTTT secret key
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param string $eventName The name of the IFTTT Maker event that should be triggered
+ * @param string $secretKey A valid IFTTT secret key
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($eventName, $secretKey, $level = Logger::ERROR, $bubble = true)
{
@@ -51,7 +51,7 @@ public function write(array $record)
$postData = array(
"value1" => $record["channel"],
"value2" => $record["level_name"],
- "value3" => $record["message"]
+ "value3" => $record["message"],
);
$postString = json_encode($postData);
@@ -61,7 +61,7 @@ public function write(array $record)
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $postString);
curl_setopt($ch, CURLOPT_HTTPHEADER, array(
- "Content-Type: application/json"
+ "Content-Type: application/json",
));
Curl\Util::execute($ch);
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php
new file mode 100644
index 0000000..8f683dc
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php
@@ -0,0 +1,62 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+ namespace Monolog\Handler;
+
+ use Monolog\Logger;
+
+/**
+ * Inspired on LogEntriesHandler.
+ *
+ * @author Robert Kaufmann III
+ * @author Gabriel Machado
+ */
+class InsightOpsHandler extends SocketHandler
+{
+ /**
+ * @var string
+ */
+ protected $logToken;
+
+ /**
+ * @param string $token Log token supplied by InsightOps
+ * @param string $region Region where InsightOps account is hosted. Could be 'us' or 'eu'.
+ * @param bool $useSSL Whether or not SSL encryption should be used
+ * @param int $level The minimum logging level to trigger this handler
+ * @param bool $bubble Whether or not messages that are handled should bubble up the stack.
+ *
+ * @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing
+ */
+ public function __construct($token, $region = 'us', $useSSL = true, $level = Logger::DEBUG, $bubble = true)
+ {
+ if ($useSSL && !extension_loaded('openssl')) {
+ throw new MissingExtensionException('The OpenSSL PHP plugin is required to use SSL encrypted connection for InsightOpsHandler');
+ }
+
+ $endpoint = $useSSL
+ ? 'ssl://' . $region . '.data.logs.insight.rapid7.com:443'
+ : $region . '.data.logs.insight.rapid7.com:80';
+
+ parent::__construct($endpoint, $level, $bubble);
+ $this->logToken = $token;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * @param array $record
+ * @return string
+ */
+ protected function generateDataStream($record)
+ {
+ return $this->logToken . ' ' . $record['formatted'];
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
index bd56230..ea89fb3 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
@@ -24,20 +24,20 @@ class LogEntriesHandler extends SocketHandler
protected $logToken;
/**
- * @param string $token Log token supplied by LogEntries
- * @param boolean $useSSL Whether or not SSL encryption should be used.
- * @param int $level The minimum logging level to trigger this handler
- * @param boolean $bubble Whether or not messages that are handled should bubble up the stack.
+ * @param string $token Log token supplied by LogEntries
+ * @param bool $useSSL Whether or not SSL encryption should be used.
+ * @param int $level The minimum logging level to trigger this handler
+ * @param bool $bubble Whether or not messages that are handled should bubble up the stack.
*
* @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing
*/
- public function __construct($token, $useSSL = true, $level = Logger::DEBUG, $bubble = true)
+ public function __construct($token, $useSSL = true, $level = Logger::DEBUG, $bubble = true, $host = 'data.logentries.com')
{
if ($useSSL && !extension_loaded('openssl')) {
throw new MissingExtensionException('The OpenSSL PHP plugin is required to use SSL encrypted connection for LogEntriesHandler');
}
- $endpoint = $useSSL ? 'ssl://data.logentries.com:443' : 'data.logentries.com:80';
+ $endpoint = $useSSL ? 'ssl://' . $host . ':443' : $host . ':80';
parent::__construct($endpoint, $level, $bubble);
$this->logToken = $token;
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
index 50ed638..9e23283 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
@@ -52,4 +52,16 @@ protected function write(array $record)
{
$this->send((string) $record['formatted'], array($record));
}
+
+ protected function getHighestRecord(array $records)
+ {
+ $highestRecord = null;
+ foreach ($records as $record) {
+ if ($highestRecord === null || $highestRecord['level'] < $record['level']) {
+ $highestRecord = $record;
+ }
+ }
+
+ return $highestRecord;
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
index 0ed098a..3f0956a 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
@@ -26,8 +26,8 @@ class MandrillHandler extends MailHandler
/**
* @param string $apiKey A valid Mandrill API key
* @param callable|\Swift_Message $message An example message for real messages, only the body will be replaced
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($apiKey, $message, $level = Logger::ERROR, $bubble = true)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
index 6c431f2..56fe755 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
@@ -31,8 +31,8 @@ class MongoDBHandler extends AbstractProcessingHandler
public function __construct($mongo, $database, $collection, $level = Logger::DEBUG, $bubble = true)
{
- if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
- throw new \InvalidArgumentException('MongoClient or Mongo instance required');
+ if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo || $mongo instanceof \MongoDB\Client)) {
+ throw new \InvalidArgumentException('MongoClient, Mongo or MongoDB\Client instance required');
}
$this->mongoCollection = $mongo->selectCollection($database, $collection);
@@ -42,7 +42,11 @@ public function __construct($mongo, $database, $collection, $level = Logger::DEB
protected function write(array $record)
{
- $this->mongoCollection->save($record["formatted"]);
+ if ($this->mongoCollection instanceof \MongoDB\Collection) {
+ $this->mongoCollection->insertOne($record["formatted"]);
+ } else {
+ $this->mongoCollection->save($record["formatted"]);
+ }
}
/**
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
index 5118a0e..d7807fd 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
@@ -12,6 +12,7 @@
namespace Monolog\Handler;
use Monolog\Logger;
+use Monolog\Formatter\LineFormatter;
/**
* NativeMailerHandler uses the mail() function to send the emails
@@ -47,7 +48,7 @@ class NativeMailerHandler extends MailHandler
/**
* The wordwrap length for the message
- * @var integer
+ * @var int
*/
protected $maxColumnWidth;
@@ -67,8 +68,8 @@ class NativeMailerHandler extends MailHandler
* @param string|array $to The receiver of the mail
* @param string $subject The subject of the mail
* @param string $from The sender of the mail
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
* @param int $maxColumnWidth The maximum column width that the message lines will have
*/
public function __construct($to, $subject, $from, $level = Logger::ERROR, $bubble = true, $maxColumnWidth = 70)
@@ -101,7 +102,7 @@ public function addHeader($headers)
/**
* Add parameters to the message
*
- * @param string|array $parameters Custom added parameters
+ * @param string|array $parameters Custom added parameters
* @return self
*/
public function addParameter($parameters)
@@ -122,8 +123,16 @@ protected function send($content, array $records)
if ($this->getContentType() == 'text/html' && false === strpos($headers, 'MIME-Version:')) {
$headers .= 'MIME-Version: 1.0' . "\r\n";
}
+
+ $subject = $this->subject;
+ if ($records) {
+ $subjectFormatter = new LineFormatter($this->subject);
+ $subject = $subjectFormatter->format($this->getHighestRecord($records));
+ }
+
+ $parameters = implode(' ', $this->parameters);
foreach ($this->to as $to) {
- mail($to, $this->subject, $content, $headers, implode(' ', $this->parameters));
+ mail($to, $subject, $content, $headers, $parameters);
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
index 8cb4ab3..f911997 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
@@ -18,6 +18,8 @@
* Class to record a log on a NewRelic application.
* Enabling New Relic High Security mode may prevent capture of useful information.
*
+ * This handler requires a NormalizerFormatter to function and expects an array in $record['formatted']
+ *
* @see https://docs.newrelic.com/docs/agents/php-agent
* @see https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security
*/
@@ -41,16 +43,16 @@ class NewRelicHandler extends AbstractProcessingHandler
* Some context and extra data is passed into the handler as arrays of values. Do we send them as is
* (useful if we are using the API), or explode them for display on the NewRelic RPM website?
*
- * @var boolean
+ * @var bool
*/
protected $explodeArrays;
/**
* {@inheritDoc}
*
- * @param string $appName
- * @param boolean $explodeArrays
- * @param string $transactionName
+ * @param string $appName
+ * @param bool $explodeArrays
+ * @param string $transactionName
*/
public function __construct(
$level = Logger::ERROR,
@@ -84,30 +86,34 @@ protected function write(array $record)
unset($record['formatted']['context']['transaction_name']);
}
- if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Exception) {
+ if (isset($record['context']['exception']) && ($record['context']['exception'] instanceof \Exception || (PHP_VERSION_ID >= 70000 && $record['context']['exception'] instanceof \Throwable))) {
newrelic_notice_error($record['message'], $record['context']['exception']);
unset($record['formatted']['context']['exception']);
} else {
newrelic_notice_error($record['message']);
}
- foreach ($record['formatted']['context'] as $key => $parameter) {
- if (is_array($parameter) && $this->explodeArrays) {
- foreach ($parameter as $paramKey => $paramValue) {
- $this->setNewRelicParameter('context_' . $key . '_' . $paramKey, $paramValue);
+ if (isset($record['formatted']['context']) && is_array($record['formatted']['context'])) {
+ foreach ($record['formatted']['context'] as $key => $parameter) {
+ if (is_array($parameter) && $this->explodeArrays) {
+ foreach ($parameter as $paramKey => $paramValue) {
+ $this->setNewRelicParameter('context_' . $key . '_' . $paramKey, $paramValue);
+ }
+ } else {
+ $this->setNewRelicParameter('context_' . $key, $parameter);
}
- } else {
- $this->setNewRelicParameter('context_' . $key, $parameter);
}
}
- foreach ($record['formatted']['extra'] as $key => $parameter) {
- if (is_array($parameter) && $this->explodeArrays) {
- foreach ($parameter as $paramKey => $paramValue) {
- $this->setNewRelicParameter('extra_' . $key . '_' . $paramKey, $paramValue);
+ if (isset($record['formatted']['extra']) && is_array($record['formatted']['extra'])) {
+ foreach ($record['formatted']['extra'] as $key => $parameter) {
+ if (is_array($parameter) && $this->explodeArrays) {
+ foreach ($parameter as $paramKey => $paramValue) {
+ $this->setNewRelicParameter('extra_' . $key . '_' . $paramKey, $paramValue);
+ }
+ } else {
+ $this->setNewRelicParameter('extra_' . $key, $parameter);
}
- } else {
- $this->setNewRelicParameter('extra_' . $key, $parameter);
}
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
index 3754e45..4b84588 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
@@ -24,7 +24,7 @@
class NullHandler extends AbstractHandler
{
/**
- * @param integer $level The minimum logging level at which this handler will be triggered
+ * @param int $level The minimum logging level at which this handler will be triggered
*/
public function __construct($level = Logger::DEBUG)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
index 2b7e353..1f2076a 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
@@ -66,10 +66,10 @@ class PHPConsoleHandler extends AbstractProcessingHandler
private $connector;
/**
- * @param array $options See \Monolog\Handler\PHPConsoleHandler::$options for more details
- * @param Connector|null $connector Instance of \PhpConsole\Connector class (optional)
- * @param int $level
- * @param bool $bubble
+ * @param array $options See \Monolog\Handler\PHPConsoleHandler::$options for more details
+ * @param Connector|null $connector Instance of \PhpConsole\Connector class (optional)
+ * @param int $level
+ * @param bool $bubble
* @throws Exception
*/
public function __construct(array $options = array(), Connector $connector = null, $level = Logger::DEBUG, $bubble = true)
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php b/application/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php
new file mode 100644
index 0000000..66a3d83
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php
@@ -0,0 +1,40 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Processor\ProcessorInterface;
+
+/**
+ * Interface to describe loggers that have processors
+ *
+ * This interface is present in monolog 1.x to ease forward compatibility.
+ *
+ * @author Jordi Boggiano
+ */
+interface ProcessableHandlerInterface
+{
+ /**
+ * Adds a processor in the stack.
+ *
+ * @param ProcessorInterface|callable $callback
+ * @return HandlerInterface self
+ */
+ public function pushProcessor($callback): HandlerInterface;
+
+ /**
+ * Removes the processor on top of the stack and returns it.
+ *
+ * @throws \LogicException In case the processor stack is empty
+ * @return callable
+ */
+ public function popProcessor(): callable;
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php b/application/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php
new file mode 100644
index 0000000..09f32a1
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php
@@ -0,0 +1,73 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\ResettableInterface;
+
+/**
+ * Helper trait for implementing ProcessableInterface
+ *
+ * This trait is present in monolog 1.x to ease forward compatibility.
+ *
+ * @author Jordi Boggiano
+ */
+trait ProcessableHandlerTrait
+{
+ /**
+ * @var callable[]
+ */
+ protected $processors = [];
+
+ /**
+ * {@inheritdoc}
+ * @suppress PhanTypeMismatchReturn
+ */
+ public function pushProcessor($callback): HandlerInterface
+ {
+ array_unshift($this->processors, $callback);
+
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function popProcessor(): callable
+ {
+ if (!$this->processors) {
+ throw new \LogicException('You tried to pop from an empty processor stack.');
+ }
+
+ return array_shift($this->processors);
+ }
+
+ /**
+ * Processes a record.
+ */
+ protected function processRecord(array $record): array
+ {
+ foreach ($this->processors as $processor) {
+ $record = $processor($record);
+ }
+
+ return $record;
+ }
+
+ protected function resetProcessors(): void
+ {
+ foreach ($this->processors as $processor) {
+ if ($processor instanceof ResettableInterface) {
+ $processor->reset();
+ }
+ }
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
index 1ae8584..a99e6ab 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
@@ -31,7 +31,7 @@ class PsrHandler extends AbstractHandler
/**
* @param LoggerInterface $logger The underlying PSR-3 compliant logger to which messages will be proxied
* @param int $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct(LoggerInterface $logger, $level = Logger::DEBUG, $bubble = true)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
index 9917b64..f27bb3d 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
@@ -68,16 +68,16 @@ class PushoverHandler extends SocketHandler
* @param string $token Pushover api token
* @param string|array $users Pushover user id or array of ids the message will be sent to
* @param string $title Title sent to the Pushover API
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
- * @param Boolean $useSSL Whether to connect via SSL. Required when pushing messages to users that are not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $useSSL Whether to connect via SSL. Required when pushing messages to users that are not
* the pushover.net app owner. OpenSSL is required for this option.
- * @param integer $highPriorityLevel The minimum logging level at which this handler will start
+ * @param int $highPriorityLevel The minimum logging level at which this handler will start
* sending "high priority" requests to the Pushover API
- * @param integer $emergencyLevel The minimum logging level at which this handler will start
+ * @param int $emergencyLevel The minimum logging level at which this handler will start
* sending "emergency" requests to the Pushover API
- * @param integer $retry The retry parameter specifies how often (in seconds) the Pushover servers will send the same notification to the user.
- * @param integer $expire The expire parameter specifies how many seconds your notification will continue to be retried for (every retry seconds).
+ * @param int $retry The retry parameter specifies how often (in seconds) the Pushover servers will send the same notification to the user.
+ * @param int $expire The expire parameter specifies how many seconds your notification will continue to be retried for (every retry seconds).
*/
public function __construct($token, $users, $title = null, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $highPriorityLevel = Logger::CRITICAL, $emergencyLevel = Logger::EMERGENCY, $retry = 30, $expire = 25200)
{
@@ -115,7 +115,7 @@ private function buildContent($record)
'user' => $this->user,
'message' => $message,
'title' => $this->title,
- 'timestamp' => $timestamp
+ 'timestamp' => $timestamp,
);
if (isset($record['level']) && $record['level'] >= $this->emergencyLevel) {
@@ -176,10 +176,10 @@ public function setEmergencyLevel($value)
/**
* Use the formatted message?
- * @param boolean $value
+ * @param bool $value
*/
public function useFormattedMessage($value)
{
- $this->useFormattedMessage = (boolean) $value;
+ $this->useFormattedMessage = (bool) $value;
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php
index 1807705..1929f25 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/RavenHandler.php
@@ -18,7 +18,7 @@
/**
* Handler to send messages to a Sentry (https://github.com/getsentry/sentry) server
- * using raven-php (https://github.com/getsentry/raven-php)
+ * using sentry-php (https://github.com/getsentry/sentry-php)
*
* @author Marc Abramowitz
*/
@@ -27,7 +27,7 @@ class RavenHandler extends AbstractProcessingHandler
/**
* Translates Monolog log levels to Raven log levels.
*/
- private $logLevels = array(
+ protected $logLevels = array(
Logger::DEBUG => Raven_Client::DEBUG,
Logger::INFO => Raven_Client::INFO,
Logger::NOTICE => Raven_Client::INFO,
@@ -38,6 +38,12 @@ class RavenHandler extends AbstractProcessingHandler
Logger::EMERGENCY => Raven_Client::FATAL,
);
+ /**
+ * @var string should represent the current version of the calling
+ * software. Can be any string (git commit, version number)
+ */
+ protected $release;
+
/**
* @var Raven_Client the client object that sends the message to the server
*/
@@ -50,11 +56,13 @@ class RavenHandler extends AbstractProcessingHandler
/**
* @param Raven_Client $ravenClient
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct(Raven_Client $ravenClient, $level = Logger::DEBUG, $bubble = true)
{
+ @trigger_error('The Monolog\Handler\RavenHandler class is deprecated. You should rather upgrade to the sentry/sentry 2.x and use Sentry\Monolog\Handler, see https://github.com/getsentry/sentry-php/blob/master/src/Monolog/Handler.php', E_USER_DEPRECATED);
+
parent::__construct($level, $bubble);
$this->ravenClient = $ravenClient;
@@ -78,7 +86,7 @@ public function handleBatch(array $records)
// the record with the highest severity is the "main" one
$record = array_reduce($records, function ($highest, $record) {
- if ($record['level'] >= $highest['level']) {
+ if ($record['level'] > $highest['level']) {
return $record;
}
@@ -139,6 +147,10 @@ protected function write(array $record)
$options['tags'] = array_merge($options['tags'], $record['context']['tags']);
unset($record['context']['tags']);
}
+ if (!empty($record['context']['fingerprint'])) {
+ $options['fingerprint'] = $record['context']['fingerprint'];
+ unset($record['context']['fingerprint']);
+ }
if (!empty($record['context']['logger'])) {
$options['logger'] = $record['context']['logger'];
unset($record['context']['logger']);
@@ -165,8 +177,12 @@ protected function write(array $record)
$options['extra']['extra'] = $record['extra'];
}
- if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Exception) {
- $options['extra']['message'] = $record['formatted'];
+ if (!empty($this->release) && !isset($options['release'])) {
+ $options['release'] = $this->release;
+ }
+
+ if (isset($record['context']['exception']) && ($record['context']['exception'] instanceof \Exception || (PHP_VERSION_ID >= 70000 && $record['context']['exception'] instanceof \Throwable))) {
+ $options['message'] = $record['formatted'];
$this->ravenClient->captureException($record['context']['exception'], $options);
} else {
$this->ravenClient->captureMessage($record['formatted'], array(), $options);
@@ -202,6 +218,17 @@ protected function getDefaultBatchFormatter()
*/
protected function getExtraParameters()
{
- return array('checksum', 'release');
+ return array('contexts', 'checksum', 'release', 'event_id');
+ }
+
+ /**
+ * @param string $value
+ * @return self
+ */
+ public function setRelease($value)
+ {
+ $this->release = $value;
+
+ return $this;
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
index 157e2f9..590f996 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
@@ -34,9 +34,9 @@ class RedisHandler extends AbstractProcessingHandler
/**
* @param \Predis\Client|\Redis $redis The redis instance
* @param string $key The key name to push records to
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param boolean $bubble Whether the messages that are handled can bubble up the stack or not
- * @param integer $capSize Number of entries to limit list size to
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $capSize Number of entries to limit list size to
*/
public function __construct($redis, $key, $level = Logger::DEBUG, $bubble = true, $capSize = false)
{
@@ -67,7 +67,7 @@ protected function write(array $record)
* Write and cap the collection
* Writes the record to the redis list and caps its
*
- * @param array $record associative record array
+ * @param array $record associative record array
* @return void
*/
protected function writeCapped(array $record)
@@ -76,7 +76,7 @@ protected function writeCapped(array $record)
$this->redisClient->multi()
->rpush($this->redisKey, $record["formatted"])
->ltrim($this->redisKey, -$this->capSize, -1)
- ->execute();
+ ->exec();
} else {
$redisKey = $this->redisKey;
$capSize = $this->capSize;
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
index 0ad618d..65073ff 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
@@ -18,6 +18,17 @@
/**
* Sends errors to Rollbar
*
+ * If the context data contains a `payload` key, that is used as an array
+ * of payload options to RollbarNotifier's report_message/report_exception methods.
+ *
+ * Rollbar's context info will contain the context + extra keys from the log record
+ * merged, and then on top of that a few keys:
+ *
+ * - level (rollbar level name)
+ * - monolog_level (monolog level name, raw level, as rollbar only has 5 but monolog 8)
+ * - channel
+ * - datetime (unix timestamp)
+ *
* @author Paul Statezny
*/
class RollbarHandler extends AbstractProcessingHandler
@@ -29,6 +40,17 @@ class RollbarHandler extends AbstractProcessingHandler
*/
protected $rollbarNotifier;
+ protected $levelMap = array(
+ Logger::DEBUG => 'debug',
+ Logger::INFO => 'info',
+ Logger::NOTICE => 'info',
+ Logger::WARNING => 'warning',
+ Logger::ERROR => 'error',
+ Logger::CRITICAL => 'critical',
+ Logger::ALERT => 'critical',
+ Logger::EMERGENCY => 'critical',
+ );
+
/**
* Records whether any log records have been added since the last flush of the rollbar notifier
*
@@ -36,10 +58,12 @@ class RollbarHandler extends AbstractProcessingHandler
*/
private $hasRecords = false;
+ protected $initialized = false;
+
/**
* @param RollbarNotifier $rollbarNotifier RollbarNotifier object constructed with valid token
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct(RollbarNotifier $rollbarNotifier, $level = Logger::ERROR, $bubble = true)
{
@@ -53,43 +77,68 @@ public function __construct(RollbarNotifier $rollbarNotifier, $level = Logger::E
*/
protected function write(array $record)
{
- if (isset($record['context']['exception']) && $record['context']['exception'] instanceof Exception) {
- $context = $record['context'];
+ if (!$this->initialized) {
+ // __destructor() doesn't get called on Fatal errors
+ register_shutdown_function(array($this, 'close'));
+ $this->initialized = true;
+ }
+
+ $context = $record['context'];
+ $payload = array();
+ if (isset($context['payload'])) {
+ $payload = $context['payload'];
+ unset($context['payload']);
+ }
+ $context = array_merge($context, $record['extra'], array(
+ 'level' => $this->levelMap[$record['level']],
+ 'monolog_level' => $record['level_name'],
+ 'channel' => $record['channel'],
+ 'datetime' => $record['datetime']->format('U'),
+ ));
+
+ if (isset($context['exception']) && $context['exception'] instanceof Exception) {
+ $payload['level'] = $context['level'];
$exception = $context['exception'];
unset($context['exception']);
- $payload = array();
- if (isset($context['payload'])) {
- $payload = $context['payload'];
- unset($context['payload']);
- }
-
$this->rollbarNotifier->report_exception($exception, $context, $payload);
} else {
- $extraData = array(
- 'level' => $record['level'],
- 'channel' => $record['channel'],
- 'datetime' => $record['datetime']->format('U'),
- );
-
$this->rollbarNotifier->report_message(
$record['message'],
- $record['level_name'],
- array_merge($record['context'], $record['extra'], $extraData)
+ $context['level'],
+ $context,
+ $payload
);
}
$this->hasRecords = true;
}
- /**
- * {@inheritdoc}
- */
- public function close()
+ public function flush()
{
if ($this->hasRecords) {
$this->rollbarNotifier->flush();
$this->hasRecords = false;
}
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function close()
+ {
+ $this->flush();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function reset()
+ {
+ $this->flush();
+
+ parent::reset();
+ }
+
+
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
index 0a20377..ae2309f 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
@@ -24,6 +24,10 @@
*/
class RotatingFileHandler extends StreamHandler
{
+ const FILE_PER_DAY = 'Y-m-d';
+ const FILE_PER_MONTH = 'Y-m';
+ const FILE_PER_YEAR = 'Y';
+
protected $filename;
protected $maxFiles;
protected $mustRotate;
@@ -33,11 +37,11 @@ class RotatingFileHandler extends StreamHandler
/**
* @param string $filename
- * @param integer $maxFiles The maximal amount of files to keep (0 means unlimited)
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $maxFiles The maximal amount of files to keep (0 means unlimited)
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
* @param int|null $filePermission Optional file permissions (default (0644) are only for owner read/write)
- * @param Boolean $useLocking Try to lock log file before doing any writes
+ * @param bool $useLocking Try to lock log file before doing any writes
*/
public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = null, $useLocking = false)
{
@@ -62,8 +66,35 @@ public function close()
}
}
+ /**
+ * {@inheritdoc}
+ */
+ public function reset()
+ {
+ parent::reset();
+
+ if (true === $this->mustRotate) {
+ $this->rotate();
+ }
+ }
+
public function setFilenameFormat($filenameFormat, $dateFormat)
{
+ if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) {
+ trigger_error(
+ 'Invalid date format - format must be one of '.
+ 'RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), RotatingFileHandler::FILE_PER_MONTH ("Y-m") '.
+ 'or RotatingFileHandler::FILE_PER_YEAR ("Y"), or you can set one of the '.
+ 'date formats using slashes, underscores and/or dots instead of dashes.',
+ E_USER_DEPRECATED
+ );
+ }
+ if (substr_count($filenameFormat, '{date}') === 0) {
+ trigger_error(
+ 'Invalid filename format - format should contain at least `{date}`, because otherwise rotating is impossible.',
+ E_USER_DEPRECATED
+ );
+ }
$this->filenameFormat = $filenameFormat;
$this->dateFormat = $dateFormat;
$this->url = $this->getTimedFilename();
@@ -115,7 +146,11 @@ protected function rotate()
foreach (array_slice($logFiles, $this->maxFiles) as $file) {
if (is_writable($file)) {
+ // suppress errors here as unlink() might fail if two processes
+ // are cleaning up/rotating at the same time
+ set_error_handler(function ($errno, $errstr, $errfile, $errline) {});
unlink($file);
+ restore_error_handler();
}
}
@@ -143,7 +178,7 @@ protected function getGlobPattern()
$fileInfo = pathinfo($this->filename);
$glob = str_replace(
array('{filename}', '{date}'),
- array($fileInfo['filename'], '*'),
+ array($fileInfo['filename'], '[0-9][0-9][0-9][0-9]*'),
$fileInfo['dirname'] . '/' . $this->filenameFormat
);
if (!empty($fileInfo['extension'])) {
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php b/application/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
new file mode 100644
index 0000000..e55e0e2
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
@@ -0,0 +1,294 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler\Slack;
+
+use Monolog\Logger;
+use Monolog\Formatter\NormalizerFormatter;
+use Monolog\Formatter\FormatterInterface;
+
+/**
+ * Slack record utility helping to log to Slack webhooks or API.
+ *
+ * @author Greg Kedzierski
+ * @author Haralan Dobrev
+ * @see https://api.slack.com/incoming-webhooks
+ * @see https://api.slack.com/docs/message-attachments
+ */
+class SlackRecord
+{
+ const COLOR_DANGER = 'danger';
+
+ const COLOR_WARNING = 'warning';
+
+ const COLOR_GOOD = 'good';
+
+ const COLOR_DEFAULT = '#e3e4e6';
+
+ /**
+ * Slack channel (encoded ID or name)
+ * @var string|null
+ */
+ private $channel;
+
+ /**
+ * Name of a bot
+ * @var string|null
+ */
+ private $username;
+
+ /**
+ * User icon e.g. 'ghost', 'http://example.com/user.png'
+ * @var string
+ */
+ private $userIcon;
+
+ /**
+ * Whether the message should be added to Slack as attachment (plain text otherwise)
+ * @var bool
+ */
+ private $useAttachment;
+
+ /**
+ * Whether the the context/extra messages added to Slack as attachments are in a short style
+ * @var bool
+ */
+ private $useShortAttachment;
+
+ /**
+ * Whether the attachment should include context and extra data
+ * @var bool
+ */
+ private $includeContextAndExtra;
+
+ /**
+ * Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
+ * @var array
+ */
+ private $excludeFields;
+
+ /**
+ * @var FormatterInterface
+ */
+ private $formatter;
+
+ /**
+ * @var NormalizerFormatter
+ */
+ private $normalizerFormatter;
+
+ public function __construct($channel = null, $username = null, $useAttachment = true, $userIcon = null, $useShortAttachment = false, $includeContextAndExtra = false, array $excludeFields = array(), FormatterInterface $formatter = null)
+ {
+ $this->channel = $channel;
+ $this->username = $username;
+ $this->userIcon = trim($userIcon, ':');
+ $this->useAttachment = $useAttachment;
+ $this->useShortAttachment = $useShortAttachment;
+ $this->includeContextAndExtra = $includeContextAndExtra;
+ $this->excludeFields = $excludeFields;
+ $this->formatter = $formatter;
+
+ if ($this->includeContextAndExtra) {
+ $this->normalizerFormatter = new NormalizerFormatter();
+ }
+ }
+
+ public function getSlackData(array $record)
+ {
+ $dataArray = array();
+ $record = $this->excludeFields($record);
+
+ if ($this->username) {
+ $dataArray['username'] = $this->username;
+ }
+
+ if ($this->channel) {
+ $dataArray['channel'] = $this->channel;
+ }
+
+ if ($this->formatter && !$this->useAttachment) {
+ $message = $this->formatter->format($record);
+ } else {
+ $message = $record['message'];
+ }
+
+ if ($this->useAttachment) {
+ $attachment = array(
+ 'fallback' => $message,
+ 'text' => $message,
+ 'color' => $this->getAttachmentColor($record['level']),
+ 'fields' => array(),
+ 'mrkdwn_in' => array('fields'),
+ 'ts' => $record['datetime']->getTimestamp()
+ );
+
+ if ($this->useShortAttachment) {
+ $attachment['title'] = $record['level_name'];
+ } else {
+ $attachment['title'] = 'Message';
+ $attachment['fields'][] = $this->generateAttachmentField('Level', $record['level_name']);
+ }
+
+
+ if ($this->includeContextAndExtra) {
+ foreach (array('extra', 'context') as $key) {
+ if (empty($record[$key])) {
+ continue;
+ }
+
+ if ($this->useShortAttachment) {
+ $attachment['fields'][] = $this->generateAttachmentField(
+ $key,
+ $record[$key]
+ );
+ } else {
+ // Add all extra fields as individual fields in attachment
+ $attachment['fields'] = array_merge(
+ $attachment['fields'],
+ $this->generateAttachmentFields($record[$key])
+ );
+ }
+ }
+ }
+
+ $dataArray['attachments'] = array($attachment);
+ } else {
+ $dataArray['text'] = $message;
+ }
+
+ if ($this->userIcon) {
+ if (filter_var($this->userIcon, FILTER_VALIDATE_URL)) {
+ $dataArray['icon_url'] = $this->userIcon;
+ } else {
+ $dataArray['icon_emoji'] = ":{$this->userIcon}:";
+ }
+ }
+
+ return $dataArray;
+ }
+
+ /**
+ * Returned a Slack message attachment color associated with
+ * provided level.
+ *
+ * @param int $level
+ * @return string
+ */
+ public function getAttachmentColor($level)
+ {
+ switch (true) {
+ case $level >= Logger::ERROR:
+ return self::COLOR_DANGER;
+ case $level >= Logger::WARNING:
+ return self::COLOR_WARNING;
+ case $level >= Logger::INFO:
+ return self::COLOR_GOOD;
+ default:
+ return self::COLOR_DEFAULT;
+ }
+ }
+
+ /**
+ * Stringifies an array of key/value pairs to be used in attachment fields
+ *
+ * @param array $fields
+ *
+ * @return string
+ */
+ public function stringify($fields)
+ {
+ $normalized = $this->normalizerFormatter->format($fields);
+ $prettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
+
+ $hasSecondDimension = count(array_filter($normalized, 'is_array'));
+ $hasNonNumericKeys = !count(array_filter(array_keys($normalized), 'is_numeric'));
+
+ return $hasSecondDimension || $hasNonNumericKeys
+ ? json_encode($normalized, $prettyPrintFlag)
+ : json_encode($normalized);
+ }
+
+ /**
+ * Sets the formatter
+ *
+ * @param FormatterInterface $formatter
+ */
+ public function setFormatter(FormatterInterface $formatter)
+ {
+ $this->formatter = $formatter;
+ }
+
+ /**
+ * Generates attachment field
+ *
+ * @param string $title
+ * @param string|array $value
+ *
+ * @return array
+ */
+ private function generateAttachmentField($title, $value)
+ {
+ $value = is_array($value)
+ ? sprintf('```%s```', $this->stringify($value))
+ : $value;
+
+ return array(
+ 'title' => ucfirst($title),
+ 'value' => $value,
+ 'short' => false
+ );
+ }
+
+ /**
+ * Generates a collection of attachment fields from array
+ *
+ * @param array $data
+ *
+ * @return array
+ */
+ private function generateAttachmentFields(array $data)
+ {
+ $fields = array();
+ foreach ($this->normalizerFormatter->format($data) as $key => $value) {
+ $fields[] = $this->generateAttachmentField($key, $value);
+ }
+
+ return $fields;
+ }
+
+ /**
+ * Get a copy of record with fields excluded according to $this->excludeFields
+ *
+ * @param array $record
+ *
+ * @return array
+ */
+ private function excludeFields(array $record)
+ {
+ foreach ($this->excludeFields as $field) {
+ $keys = explode('.', $field);
+ $node = &$record;
+ $lastKey = end($keys);
+ foreach ($keys as $key) {
+ if (!isset($node[$key])) {
+ break;
+ }
+ if ($lastKey === $key) {
+ unset($node[$key]);
+ break;
+ }
+ $node = &$node[$key];
+ }
+ }
+
+ return $record;
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
index 61245ff..45d634f 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
@@ -11,8 +11,9 @@
namespace Monolog\Handler;
+use Monolog\Formatter\FormatterInterface;
use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\Slack\SlackRecord;
/**
* Sends notifications through Slack API
@@ -29,58 +30,25 @@ class SlackHandler extends SocketHandler
private $token;
/**
- * Slack channel (encoded ID or name)
- * @var string
- */
- private $channel;
-
- /**
- * Name of a bot
- * @var string
- */
- private $username;
-
- /**
- * Emoji icon name
- * @var string
- */
- private $iconEmoji;
-
- /**
- * Whether the message should be added to Slack as attachment (plain text otherwise)
- * @var bool
- */
- private $useAttachment;
-
- /**
- * Whether the the context/extra messages added to Slack as attachments are in a short style
- * @var bool
- */
- private $useShortAttachment;
-
- /**
- * Whether the attachment should include context and extra data
- * @var bool
- */
- private $includeContextAndExtra;
-
- /**
- * @var LineFormatter
+ * Instance of the SlackRecord util class preparing data for Slack API.
+ * @var SlackRecord
*/
- private $lineFormatter;
+ private $slackRecord;
/**
- * @param string $token Slack API token
- * @param string $channel Slack channel (encoded ID or name)
- * @param string $username Name of a bot
- * @param bool $useAttachment Whether the message should be added to Slack as attachment (plain text otherwise)
- * @param string|null $iconEmoji The emoji name to use (or null)
- * @param int $level The minimum logging level at which this handler will be triggered
- * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
- * @param bool $useShortAttachment Whether the the context/extra messages added to Slack as attachments are in a short style
- * @param bool $includeContextAndExtra Whether the attachment should include context and extra data
+ * @param string $token Slack API token
+ * @param string $channel Slack channel (encoded ID or name)
+ * @param string|null $username Name of a bot
+ * @param bool $useAttachment Whether the message should be added to Slack as attachment (plain text otherwise)
+ * @param string|null $iconEmoji The emoji name to use (or null)
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param bool $useShortAttachment Whether the the context/extra messages added to Slack as attachments are in a short style
+ * @param bool $includeContextAndExtra Whether the attachment should include context and extra data
+ * @param array $excludeFields Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
+ * @throws MissingExtensionException If no OpenSSL PHP extension configured
*/
- public function __construct($token, $channel, $username = 'Monolog', $useAttachment = true, $iconEmoji = null, $level = Logger::CRITICAL, $bubble = true, $useShortAttachment = false, $includeContextAndExtra = false)
+ public function __construct($token, $channel, $username = null, $useAttachment = true, $iconEmoji = null, $level = Logger::CRITICAL, $bubble = true, $useShortAttachment = false, $includeContextAndExtra = false, array $excludeFields = array())
{
if (!extension_loaded('openssl')) {
throw new MissingExtensionException('The OpenSSL PHP extension is required to use the SlackHandler');
@@ -88,16 +56,28 @@ public function __construct($token, $channel, $username = 'Monolog', $useAttachm
parent::__construct('ssl://slack.com:443', $level, $bubble);
+ $this->slackRecord = new SlackRecord(
+ $channel,
+ $username,
+ $useAttachment,
+ $iconEmoji,
+ $useShortAttachment,
+ $includeContextAndExtra,
+ $excludeFields,
+ $this->formatter
+ );
+
$this->token = $token;
- $this->channel = $channel;
- $this->username = $username;
- $this->iconEmoji = trim($iconEmoji, ':');
- $this->useAttachment = $useAttachment;
- $this->useShortAttachment = $useShortAttachment;
- $this->includeContextAndExtra = $includeContextAndExtra;
- if ($this->includeContextAndExtra) {
- $this->lineFormatter = new LineFormatter;
- }
+ }
+
+ public function getSlackRecord()
+ {
+ return $this->slackRecord;
+ }
+
+ public function getToken()
+ {
+ return $this->token;
}
/**
@@ -134,81 +114,11 @@ private function buildContent($record)
*/
protected function prepareContentData($record)
{
- $dataArray = array(
- 'token' => $this->token,
- 'channel' => $this->channel,
- 'username' => $this->username,
- 'text' => '',
- 'attachments' => array()
- );
-
- if ($this->useAttachment) {
- $attachment = array(
- 'fallback' => $record['message'],
- 'color' => $this->getAttachmentColor($record['level']),
- 'fields' => array()
- );
-
- if ($this->useShortAttachment) {
- $attachment['title'] = $record['level_name'];
- $attachment['text'] = $record['message'];
- } else {
- $attachment['title'] = 'Message';
- $attachment['text'] = $record['message'];
- $attachment['fields'][] = array(
- 'title' => 'Level',
- 'value' => $record['level_name'],
- 'short' => true
- );
- }
-
- if ($this->includeContextAndExtra) {
- if (!empty($record['extra'])) {
- if ($this->useShortAttachment) {
- $attachment['fields'][] = array(
- 'title' => "Extra",
- 'value' => $this->stringify($record['extra']),
- 'short' => $this->useShortAttachment
- );
- } else {
- // Add all extra fields as individual fields in attachment
- foreach ($record['extra'] as $var => $val) {
- $attachment['fields'][] = array(
- 'title' => $var,
- 'value' => $val,
- 'short' => $this->useShortAttachment
- );
- }
- }
- }
-
- if (!empty($record['context'])) {
- if ($this->useShortAttachment) {
- $attachment['fields'][] = array(
- 'title' => "Context",
- 'value' => $this->stringify($record['context']),
- 'short' => $this->useShortAttachment
- );
- } else {
- // Add all context fields as individual fields in attachment
- foreach ($record['context'] as $var => $val) {
- $attachment['fields'][] = array(
- 'title' => $var,
- 'value' => $val,
- 'short' => $this->useShortAttachment
- );
- }
- }
- }
- }
+ $dataArray = $this->slackRecord->getSlackData($record);
+ $dataArray['token'] = $this->token;
- $dataArray['attachments'] = json_encode(array($attachment));
- } else {
- $dataArray['text'] = $record['message'];
- }
-
- if ($this->iconEmoji) {
- $dataArray['icon_emoji'] = ":{$this->iconEmoji}:";
+ if (!empty($dataArray['attachments'])) {
+ $dataArray['attachments'] = json_encode($dataArray['attachments']);
}
return $dataArray;
@@ -239,6 +149,21 @@ private function buildHeader($content)
protected function write(array $record)
{
parent::write($record);
+ $this->finalizeWrite();
+ }
+
+ /**
+ * Finalizes the request by reading some bytes and then closing the socket
+ *
+ * If we do not read some but close the socket too early, slack sometimes
+ * drops the request entirely.
+ */
+ protected function finalizeWrite()
+ {
+ $res = $this->getResource();
+ if (is_resource($res)) {
+ @fread($res, 2048);
+ }
$this->closeSocket();
}
@@ -248,37 +173,48 @@ protected function write(array $record)
*
* @param int $level
* @return string
+ * @deprecated Use underlying SlackRecord instead
*/
protected function getAttachmentColor($level)
{
- switch (true) {
- case $level >= Logger::ERROR:
- return 'danger';
- case $level >= Logger::WARNING:
- return 'warning';
- case $level >= Logger::INFO:
- return 'good';
- default:
- return '#e3e4e6';
- }
+ trigger_error(
+ 'SlackHandler::getAttachmentColor() is deprecated. Use underlying SlackRecord instead.',
+ E_USER_DEPRECATED
+ );
+
+ return $this->slackRecord->getAttachmentColor($level);
}
/**
* Stringifies an array of key/value pairs to be used in attachment fields
*
- * @param array $fields
- * @access protected
+ * @param array $fields
* @return string
+ * @deprecated Use underlying SlackRecord instead
*/
protected function stringify($fields)
{
- $string = '';
- foreach ($fields as $var => $val) {
- $string .= $var.': '.$this->lineFormatter->stringify($val)." | ";
- }
+ trigger_error(
+ 'SlackHandler::stringify() is deprecated. Use underlying SlackRecord instead.',
+ E_USER_DEPRECATED
+ );
- $string = rtrim($string, " |");
+ return $this->slackRecord->stringify($fields);
+ }
+
+ public function setFormatter(FormatterInterface $formatter)
+ {
+ parent::setFormatter($formatter);
+ $this->slackRecord->setFormatter($formatter);
+
+ return $this;
+ }
+
+ public function getFormatter()
+ {
+ $formatter = parent::getFormatter();
+ $this->slackRecord->setFormatter($formatter);
- return $string;
+ return $formatter;
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
new file mode 100644
index 0000000..1ef85fa
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
@@ -0,0 +1,120 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\FormatterInterface;
+use Monolog\Logger;
+use Monolog\Handler\Slack\SlackRecord;
+
+/**
+ * Sends notifications through Slack Webhooks
+ *
+ * @author Haralan Dobrev
+ * @see https://api.slack.com/incoming-webhooks
+ */
+class SlackWebhookHandler extends AbstractProcessingHandler
+{
+ /**
+ * Slack Webhook token
+ * @var string
+ */
+ private $webhookUrl;
+
+ /**
+ * Instance of the SlackRecord util class preparing data for Slack API.
+ * @var SlackRecord
+ */
+ private $slackRecord;
+
+ /**
+ * @param string $webhookUrl Slack Webhook URL
+ * @param string|null $channel Slack channel (encoded ID or name)
+ * @param string|null $username Name of a bot
+ * @param bool $useAttachment Whether the message should be added to Slack as attachment (plain text otherwise)
+ * @param string|null $iconEmoji The emoji name to use (or null)
+ * @param bool $useShortAttachment Whether the the context/extra messages added to Slack as attachments are in a short style
+ * @param bool $includeContextAndExtra Whether the attachment should include context and extra data
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param array $excludeFields Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
+ */
+ public function __construct($webhookUrl, $channel = null, $username = null, $useAttachment = true, $iconEmoji = null, $useShortAttachment = false, $includeContextAndExtra = false, $level = Logger::CRITICAL, $bubble = true, array $excludeFields = array())
+ {
+ parent::__construct($level, $bubble);
+
+ $this->webhookUrl = $webhookUrl;
+
+ $this->slackRecord = new SlackRecord(
+ $channel,
+ $username,
+ $useAttachment,
+ $iconEmoji,
+ $useShortAttachment,
+ $includeContextAndExtra,
+ $excludeFields,
+ $this->formatter
+ );
+ }
+
+ public function getSlackRecord()
+ {
+ return $this->slackRecord;
+ }
+
+ public function getWebhookUrl()
+ {
+ return $this->webhookUrl;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * @param array $record
+ */
+ protected function write(array $record)
+ {
+ $postData = $this->slackRecord->getSlackData($record);
+ $postString = json_encode($postData);
+
+ $ch = curl_init();
+ $options = array(
+ CURLOPT_URL => $this->webhookUrl,
+ CURLOPT_POST => true,
+ CURLOPT_RETURNTRANSFER => true,
+ CURLOPT_HTTPHEADER => array('Content-type: application/json'),
+ CURLOPT_POSTFIELDS => $postString
+ );
+ if (defined('CURLOPT_SAFE_UPLOAD')) {
+ $options[CURLOPT_SAFE_UPLOAD] = true;
+ }
+
+ curl_setopt_array($ch, $options);
+
+ Curl\Util::execute($ch);
+ }
+
+ public function setFormatter(FormatterInterface $formatter)
+ {
+ parent::setFormatter($formatter);
+ $this->slackRecord->setFormatter($formatter);
+
+ return $this;
+ }
+
+ public function getFormatter()
+ {
+ $formatter = parent::getFormatter();
+ $this->slackRecord->setFormatter($formatter);
+
+ return $formatter;
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
new file mode 100644
index 0000000..d3352ea
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
@@ -0,0 +1,84 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Sends notifications through Slack's Slackbot
+ *
+ * @author Haralan Dobrev
+ * @see https://slack.com/apps/A0F81R8ET-slackbot
+ * @deprecated According to Slack the API used on this handler it is deprecated.
+ * Therefore this handler will be removed on 2.x
+ * Slack suggests to use webhooks instead. Please contact slack for more information.
+ */
+class SlackbotHandler extends AbstractProcessingHandler
+{
+ /**
+ * The slug of the Slack team
+ * @var string
+ */
+ private $slackTeam;
+
+ /**
+ * Slackbot token
+ * @var string
+ */
+ private $token;
+
+ /**
+ * Slack channel name
+ * @var string
+ */
+ private $channel;
+
+ /**
+ * @param string $slackTeam Slack team slug
+ * @param string $token Slackbot token
+ * @param string $channel Slack channel (encoded ID or name)
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ */
+ public function __construct($slackTeam, $token, $channel, $level = Logger::CRITICAL, $bubble = true)
+ {
+ @trigger_error('SlackbotHandler is deprecated and will be removed on 2.x', E_USER_DEPRECATED);
+ parent::__construct($level, $bubble);
+
+ $this->slackTeam = $slackTeam;
+ $this->token = $token;
+ $this->channel = $channel;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * @param array $record
+ */
+ protected function write(array $record)
+ {
+ $slackbotUrl = sprintf(
+ 'https://%s.slack.com/services/hooks/slackbot?token=%s&channel=%s',
+ $this->slackTeam,
+ $this->token,
+ $this->channel
+ );
+
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $slackbotUrl);
+ curl_setopt($ch, CURLOPT_POST, true);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $record['message']);
+
+ Curl\Util::execute($ch);
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
index a3e7252..db50d97 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
@@ -25,14 +25,18 @@ class SocketHandler extends AbstractProcessingHandler
private $connectionTimeout;
private $resource;
private $timeout = 0;
+ private $writingTimeout = 10;
+ private $lastSentBytes = null;
+ private $chunkSize = null;
private $persistent = false;
private $errno;
private $errstr;
+ private $lastWritingAt;
/**
- * @param string $connectionString Socket connection string
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param string $connectionString Socket connection string
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct($connectionString, $level = Logger::DEBUG, $bubble = true)
{
@@ -80,11 +84,11 @@ public function closeSocket()
/**
* Set socket connection to nbe persistent. It only has effect before the connection is initiated.
*
- * @param boolean $persistent
+ * @param bool $persistent
*/
public function setPersistent($persistent)
{
- $this->persistent = (boolean) $persistent;
+ $this->persistent = (bool) $persistent;
}
/**
@@ -113,6 +117,27 @@ public function setTimeout($seconds)
$this->timeout = (float) $seconds;
}
+ /**
+ * Set writing timeout. Only has effect during connection in the writing cycle.
+ *
+ * @param float $seconds 0 for no timeout
+ */
+ public function setWritingTimeout($seconds)
+ {
+ $this->validateTimeout($seconds);
+ $this->writingTimeout = (float) $seconds;
+ }
+
+ /**
+ * Set chunk size. Only has effect during connection in the writing cycle.
+ *
+ * @param float $bytes
+ */
+ public function setChunkSize($bytes)
+ {
+ $this->chunkSize = $bytes;
+ }
+
/**
* Get current connection string
*
@@ -126,7 +151,7 @@ public function getConnectionString()
/**
* Get persistent setting
*
- * @return boolean
+ * @return bool
*/
public function isPersistent()
{
@@ -153,12 +178,32 @@ public function getTimeout()
return $this->timeout;
}
+ /**
+ * Get current local writing timeout
+ *
+ * @return float
+ */
+ public function getWritingTimeout()
+ {
+ return $this->writingTimeout;
+ }
+
+ /**
+ * Get current chunk size
+ *
+ * @return float
+ */
+ public function getChunkSize()
+ {
+ return $this->chunkSize;
+ }
+
/**
* Check to see if the socket is currently available.
*
* UDP might appear to be connected but might fail when writing. See http://php.net/fsockopen for details.
*
- * @return boolean
+ * @return bool
*/
public function isConnected()
{
@@ -195,6 +240,16 @@ protected function streamSetTimeout()
return stream_set_timeout($this->resource, $seconds, $microseconds);
}
+ /**
+ * Wrapper to allow mocking
+ *
+ * @see http://php.net/manual/en/function.stream-set-chunk-size.php
+ */
+ protected function streamSetChunkSize()
+ {
+ return stream_set_chunk_size($this->resource, $this->chunkSize);
+ }
+
/**
* Wrapper to allow mocking
*/
@@ -232,10 +287,19 @@ protected function generateDataStream($record)
return (string) $record['formatted'];
}
+ /**
+ * @return resource|null
+ */
+ protected function getResource()
+ {
+ return $this->resource;
+ }
+
private function connect()
{
$this->createSocketResource();
$this->setSocketTimeout();
+ $this->setStreamChunkSize();
}
private function createSocketResource()
@@ -258,10 +322,18 @@ private function setSocketTimeout()
}
}
+ private function setStreamChunkSize()
+ {
+ if ($this->chunkSize && !$this->streamSetChunkSize()) {
+ throw new \UnexpectedValueException("Failed setting chunk size with stream_set_chunk_size()");
+ }
+ }
+
private function writeToSocket($data)
{
$length = strlen($data);
$sent = 0;
+ $this->lastSentBytes = $sent;
while ($this->isConnected() && $sent < $length) {
if (0 == $sent) {
$chunk = $this->fwrite($data);
@@ -276,9 +348,38 @@ private function writeToSocket($data)
if ($socketInfo['timed_out']) {
throw new \RuntimeException("Write timed-out");
}
+
+ if ($this->writingIsTimedOut($sent)) {
+ throw new \RuntimeException("Write timed-out, no data sent for `{$this->writingTimeout}` seconds, probably we got disconnected (sent $sent of $length)");
+ }
}
if (!$this->isConnected() && $sent < $length) {
throw new \RuntimeException("End-of-file reached, probably we got disconnected (sent $sent of $length)");
}
}
+
+ private function writingIsTimedOut($sent)
+ {
+ $writingTimeout = (int) floor($this->writingTimeout);
+ if (0 === $writingTimeout) {
+ return false;
+ }
+
+ if ($sent !== $this->lastSentBytes) {
+ $this->lastWritingAt = time();
+ $this->lastSentBytes = $sent;
+
+ return false;
+ } else {
+ usleep(100);
+ }
+
+ if ((time() - $this->lastWritingAt) >= $writingTimeout) {
+ $this->closeSocket();
+
+ return true;
+ }
+
+ return false;
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
index 28b9b11..27d90e0 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
@@ -31,10 +31,10 @@ class StreamHandler extends AbstractProcessingHandler
/**
* @param resource|string $stream
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
* @param int|null $filePermission Optional file permissions (default (0644) are only for owner read/write)
- * @param Boolean $useLocking Try to lock log file before doing any writes
+ * @param bool $useLocking Try to lock log file before doing any writes
*
* @throws \Exception If a missing directory is not buildable
* @throws \InvalidArgumentException If stream is not a resource or string
@@ -59,10 +59,31 @@ public function __construct($stream, $level = Logger::DEBUG, $bubble = true, $fi
*/
public function close()
{
- if (is_resource($this->stream)) {
+ if ($this->url && is_resource($this->stream)) {
fclose($this->stream);
}
$this->stream = null;
+ $this->dirCreated = null;
+ }
+
+ /**
+ * Return the currently active stream if it is open
+ *
+ * @return resource|null
+ */
+ public function getStream()
+ {
+ return $this->stream;
+ }
+
+ /**
+ * Return the stream URL if it was configured with a URL and not an active resource
+ *
+ * @return string|null
+ */
+ public function getUrl()
+ {
+ return $this->url;
}
/**
@@ -71,7 +92,7 @@ public function close()
protected function write(array $record)
{
if (!is_resource($this->stream)) {
- if (!$this->url) {
+ if (null === $this->url || '' === $this->url) {
throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().');
}
$this->createDir();
@@ -93,13 +114,23 @@ protected function write(array $record)
flock($this->stream, LOCK_EX);
}
- fwrite($this->stream, (string) $record['formatted']);
+ $this->streamWrite($this->stream, $record);
if ($this->useLocking) {
flock($this->stream, LOCK_UN);
}
}
+ /**
+ * Write to stream
+ * @param resource $stream
+ * @param array $record
+ */
+ protected function streamWrite($stream, array $record)
+ {
+ fwrite($stream, (string) $record['formatted']);
+ }
+
private function customErrorHandler($code, $msg)
{
$this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg);
@@ -137,7 +168,7 @@ private function createDir()
set_error_handler(array($this, 'customErrorHandler'));
$status = mkdir($dir, 0777, true);
restore_error_handler();
- if (false === $status) {
+ if (false === $status && !is_dir($dir)) {
throw new \UnexpectedValueException(sprintf('There is no existing directory at "%s" and its not buildable: '.$this->errorMessage, $dir));
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
index 5c2b156..ac7b16f 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
@@ -12,6 +12,9 @@
namespace Monolog\Handler;
use Monolog\Logger;
+use Monolog\Formatter\FormatterInterface;
+use Monolog\Formatter\LineFormatter;
+use Swift;
/**
* SwiftMailerHandler uses Swift_Mailer to send the emails
@@ -26,8 +29,8 @@ class SwiftMailerHandler extends MailHandler
/**
* @param \Swift_Mailer $mailer The mailer to use
* @param callable|\Swift_Message $message An example message for real messages, only the body will be replaced
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
*/
public function __construct(\Swift_Mailer $mailer, $message, $level = Logger::ERROR, $bubble = true)
{
@@ -45,11 +48,22 @@ protected function send($content, array $records)
$this->mailer->send($this->buildMessage($content, $records));
}
+ /**
+ * Gets the formatter for the Swift_Message subject.
+ *
+ * @param string $format The format of the subject
+ * @return FormatterInterface
+ */
+ protected function getSubjectFormatter($format)
+ {
+ return new LineFormatter($format);
+ }
+
/**
* Creates instance of Swift_Message to be sent
*
- * @param string $content formatted email body to be sent
- * @param array $records Log records that formed the content
+ * @param string $content formatted email body to be sent
+ * @param array $records Log records that formed the content
* @return \Swift_Message
*/
protected function buildMessage($content, array $records)
@@ -66,8 +80,17 @@ protected function buildMessage($content, array $records)
throw new \InvalidArgumentException('Could not resolve message as instance of Swift_Message or a callable returning it');
}
+ if ($records) {
+ $subjectFormatter = $this->getSubjectFormatter($message->getSubject());
+ $message->setSubject($subjectFormatter->format($this->getHighestRecord($records)));
+ }
+
$message->setBody($content);
- $message->setDate(time());
+ if (version_compare(Swift::VERSION, '6.0.0', '>=')) {
+ $message->setDate(new \DateTimeImmutable());
+ } else {
+ $message->setDate(time());
+ }
return $message;
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
index 47c73e1..f770c80 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
@@ -32,11 +32,11 @@ class SyslogHandler extends AbstractSyslogHandler
protected $logopts;
/**
- * @param string $ident
- * @param mixed $facility
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
- * @param int $logopts Option flags for the openlog() call, defaults to LOG_PID
+ * @param string $ident
+ * @param mixed $facility
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param int $logopts Option flags for the openlog() call, defaults to LOG_PID
*/
public function __construct($ident, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $logopts = LOG_PID)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
index 2e32fa7..4dfd5f5 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
@@ -18,22 +18,38 @@
* A Handler for logging to a remote syslogd server.
*
* @author Jesper Skovgaard Nielsen
+ * @author Dominik Kukacka
*/
class SyslogUdpHandler extends AbstractSyslogHandler
{
+ const RFC3164 = 0;
+ const RFC5424 = 1;
+
+ private $dateFormats = array(
+ self::RFC3164 => 'M d H:i:s',
+ self::RFC5424 => \DateTime::RFC3339,
+ );
+
protected $socket;
+ protected $ident;
+ protected $rfc;
/**
- * @param string $host
- * @param int $port
- * @param mixed $facility
- * @param integer $level The minimum logging level at which this handler will be triggered
- * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param string $host
+ * @param int $port
+ * @param mixed $facility
+ * @param int $level The minimum logging level at which this handler will be triggered
+ * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
+ * @param string $ident Program name or tag for each log message.
+ * @param int $rfc RFC to format the message for.
*/
- public function __construct($host, $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true)
+ public function __construct($host, $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $ident = 'php', $rfc = self::RFC5424)
{
parent::__construct($facility, $level, $bubble);
+ $this->ident = $ident;
+ $this->rfc = $rfc;
+
$this->socket = new UdpSocket($host, $port ?: 514);
}
@@ -59,17 +75,43 @@ private function splitMessageIntoLines($message)
$message = implode("\n", $message);
}
- return preg_split('/$\R?^/m', $message);
+ return preg_split('/$\R?^/m', $message, -1, PREG_SPLIT_NO_EMPTY);
}
/**
- * Make common syslog header (see rfc5424)
+ * Make common syslog header (see rfc5424 or rfc3164)
*/
protected function makeCommonSyslogHeader($severity)
{
$priority = $severity + $this->facility;
- return "<$priority>1 ";
+ if (!$pid = getmypid()) {
+ $pid = '-';
+ }
+
+ if (!$hostname = gethostname()) {
+ $hostname = '-';
+ }
+
+ $date = $this->getDateTime();
+
+ if ($this->rfc === self::RFC3164) {
+ return "<$priority>" .
+ $date . " " .
+ $hostname . " " .
+ $this->ident . "[" . $pid . "]: ";
+ } else {
+ return "<$priority>1 " .
+ $date . " " .
+ $hostname . " " .
+ $this->ident . " " .
+ $pid . " - - ";
+ }
+ }
+
+ protected function getDateTime()
+ {
+ return date($this->dateFormats[$this->rfc]);
}
/**
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
index e24fa9e..478db0a 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
@@ -18,74 +18,103 @@
*
* @author Jordi Boggiano
*
- * @method boolean hasEmergency($record)
- * @method boolean hasAlert($record)
- * @method boolean hasCritical($record)
- * @method boolean hasError($record)
- * @method boolean hasWarning($record)
- * @method boolean hasNotice($record)
- * @method boolean hasInfo($record)
- * @method boolean hasDebug($record)
+ * @method bool hasEmergency($record)
+ * @method bool hasAlert($record)
+ * @method bool hasCritical($record)
+ * @method bool hasError($record)
+ * @method bool hasWarning($record)
+ * @method bool hasNotice($record)
+ * @method bool hasInfo($record)
+ * @method bool hasDebug($record)
*
- * @method boolean hasEmergencyRecords()
- * @method boolean hasAlertRecords()
- * @method boolean hasCriticalRecords()
- * @method boolean hasErrorRecords()
- * @method boolean hasWarningRecords()
- * @method boolean hasNoticeRecords()
- * @method boolean hasInfoRecords()
- * @method boolean hasDebugRecords()
+ * @method bool hasEmergencyRecords()
+ * @method bool hasAlertRecords()
+ * @method bool hasCriticalRecords()
+ * @method bool hasErrorRecords()
+ * @method bool hasWarningRecords()
+ * @method bool hasNoticeRecords()
+ * @method bool hasInfoRecords()
+ * @method bool hasDebugRecords()
*
- * @method boolean hasEmergencyThatContains($message)
- * @method boolean hasAlertThatContains($message)
- * @method boolean hasCriticalThatContains($message)
- * @method boolean hasErrorThatContains($message)
- * @method boolean hasWarningThatContains($message)
- * @method boolean hasNoticeThatContains($message)
- * @method boolean hasInfoThatContains($message)
- * @method boolean hasDebugThatContains($message)
+ * @method bool hasEmergencyThatContains($message)
+ * @method bool hasAlertThatContains($message)
+ * @method bool hasCriticalThatContains($message)
+ * @method bool hasErrorThatContains($message)
+ * @method bool hasWarningThatContains($message)
+ * @method bool hasNoticeThatContains($message)
+ * @method bool hasInfoThatContains($message)
+ * @method bool hasDebugThatContains($message)
*
- * @method boolean hasEmergencyThatMatches($message)
- * @method boolean hasAlertThatMatches($message)
- * @method boolean hasCriticalThatMatches($message)
- * @method boolean hasErrorThatMatches($message)
- * @method boolean hasWarningThatMatches($message)
- * @method boolean hasNoticeThatMatches($message)
- * @method boolean hasInfoThatMatches($message)
- * @method boolean hasDebugThatMatches($message)
+ * @method bool hasEmergencyThatMatches($message)
+ * @method bool hasAlertThatMatches($message)
+ * @method bool hasCriticalThatMatches($message)
+ * @method bool hasErrorThatMatches($message)
+ * @method bool hasWarningThatMatches($message)
+ * @method bool hasNoticeThatMatches($message)
+ * @method bool hasInfoThatMatches($message)
+ * @method bool hasDebugThatMatches($message)
*
- * @method boolean hasEmergencyThatPasses($message)
- * @method boolean hasAlertThatPasses($message)
- * @method boolean hasCriticalThatPasses($message)
- * @method boolean hasErrorThatPasses($message)
- * @method boolean hasWarningThatPasses($message)
- * @method boolean hasNoticeThatPasses($message)
- * @method boolean hasInfoThatPasses($message)
- * @method boolean hasDebugThatPasses($message)
+ * @method bool hasEmergencyThatPasses($message)
+ * @method bool hasAlertThatPasses($message)
+ * @method bool hasCriticalThatPasses($message)
+ * @method bool hasErrorThatPasses($message)
+ * @method bool hasWarningThatPasses($message)
+ * @method bool hasNoticeThatPasses($message)
+ * @method bool hasInfoThatPasses($message)
+ * @method bool hasDebugThatPasses($message)
*/
class TestHandler extends AbstractProcessingHandler
{
protected $records = array();
protected $recordsByLevel = array();
+ private $skipReset = false;
public function getRecords()
{
return $this->records;
}
- protected function hasRecordRecords($level)
+ public function clear()
+ {
+ $this->records = array();
+ $this->recordsByLevel = array();
+ }
+
+ public function reset()
+ {
+ if (!$this->skipReset) {
+ $this->clear();
+ }
+ }
+
+ public function setSkipReset($skipReset)
+ {
+ $this->skipReset = $skipReset;
+ }
+
+ public function hasRecords($level)
{
return isset($this->recordsByLevel[$level]);
}
- protected function hasRecord($record, $level)
+ /**
+ * @param string|array $record Either a message string or an array containing message and optionally context keys that will be checked against all records
+ * @param int $level Logger::LEVEL constant value
+ */
+ public function hasRecord($record, $level)
{
- if (is_array($record)) {
- $record = $record['message'];
+ if (is_string($record)) {
+ $record = array('message' => $record);
}
return $this->hasRecordThatPasses(function ($rec) use ($record) {
- return $rec['message'] === $record;
+ if ($rec['message'] !== $record['message']) {
+ return false;
+ }
+ if (isset($record['context']) && $rec['context'] !== $record['context']) {
+ return false;
+ }
+ return true;
}, $level);
}
@@ -134,7 +163,7 @@ protected function write(array $record)
public function __call($method, $args)
{
if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
- $genericMethod = $matches[1] . 'Record' . $matches[3];
+ $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
$level = constant('Monolog\Logger::' . strtoupper($matches[2]));
if (method_exists($this, $genericMethod)) {
$args[] = $level;
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
index 05a8817..7d7622a 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
@@ -35,6 +35,8 @@ public function handle(array $record)
$handler->handle($record);
} catch (\Exception $e) {
// What failure?
+ } catch (\Throwable $e) {
+ // What failure?
}
}
@@ -46,11 +48,24 @@ public function handle(array $record)
*/
public function handleBatch(array $records)
{
+ if ($this->processors) {
+ $processed = array();
+ foreach ($records as $record) {
+ foreach ($this->processors as $processor) {
+ $record = call_user_func($processor, $record);
+ }
+ $processed[] = $record;
+ }
+ $records = $processed;
+ }
+
foreach ($this->handlers as $handler) {
try {
$handler->handleBatch($records);
} catch (\Exception $e) {
// What failure?
+ } catch (\Throwable $e) {
+ // What failure?
}
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php b/application/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
index f22cf21..a20aeae 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
@@ -17,6 +17,7 @@
* Handler sending logs to Zend Monitor
*
* @author Christian Bergau
+ * @author Jason Davis
*/
class ZendMonitorHandler extends AbstractProcessingHandler
{
@@ -25,16 +26,7 @@ class ZendMonitorHandler extends AbstractProcessingHandler
*
* @var array
*/
- protected $levelMap = array(
- Logger::DEBUG => 1,
- Logger::INFO => 2,
- Logger::NOTICE => 3,
- Logger::WARNING => 4,
- Logger::ERROR => 5,
- Logger::CRITICAL => 6,
- Logger::ALERT => 7,
- Logger::EMERGENCY => 0,
- );
+ protected $levelMap = array();
/**
* Construct
@@ -46,8 +38,21 @@ class ZendMonitorHandler extends AbstractProcessingHandler
public function __construct($level = Logger::DEBUG, $bubble = true)
{
if (!function_exists('zend_monitor_custom_event')) {
- throw new MissingExtensionException('You must have Zend Server installed in order to use this handler');
+ throw new MissingExtensionException(
+ 'You must have Zend Server installed with Zend Monitor enabled in order to use this handler'
+ );
}
+ //zend monitor constants are not defined if zend monitor is not enabled.
+ $this->levelMap = array(
+ Logger::DEBUG => \ZEND_MONITOR_EVENT_SEVERITY_INFO,
+ Logger::INFO => \ZEND_MONITOR_EVENT_SEVERITY_INFO,
+ Logger::NOTICE => \ZEND_MONITOR_EVENT_SEVERITY_INFO,
+ Logger::WARNING => \ZEND_MONITOR_EVENT_SEVERITY_WARNING,
+ Logger::ERROR => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
+ Logger::CRITICAL => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
+ Logger::ALERT => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
+ Logger::EMERGENCY => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
+ );
parent::__construct($level, $bubble);
}
@@ -57,22 +62,23 @@ public function __construct($level = Logger::DEBUG, $bubble = true)
protected function write(array $record)
{
$this->writeZendMonitorCustomEvent(
- $this->levelMap[$record['level']],
+ Logger::getLevelName($record['level']),
$record['message'],
- $record['formatted']
+ $record['formatted'],
+ $this->levelMap[$record['level']]
);
}
/**
- * Write a record to Zend Monitor
- *
- * @param int $level
- * @param string $message
- * @param array $formatted
+ * Write to Zend Monitor Events
+ * @param string $type Text displayed in "Class Name (custom)" field
+ * @param string $message Text displayed in "Error String"
+ * @param mixed $formatted Displayed in Custom Variables tab
+ * @param int $severity Set the event severity level (-1,0,1)
*/
- protected function writeZendMonitorCustomEvent($level, $message, $formatted)
+ protected function writeZendMonitorCustomEvent($type, $message, $formatted, $severity)
{
- zend_monitor_custom_event($level, $message, $formatted);
+ zend_monitor_custom_event($type, $message, $formatted, $severity);
}
/**
diff --git a/application/vendor/monolog/monolog/src/Monolog/Logger.php b/application/vendor/monolog/monolog/src/Monolog/Logger.php
index d31a098..05dfc81 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Logger.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Logger.php
@@ -15,6 +15,7 @@
use Monolog\Handler\StreamHandler;
use Psr\Log\LoggerInterface;
use Psr\Log\InvalidArgumentException;
+use Exception;
/**
* Monolog log channel
@@ -24,7 +25,7 @@
*
* @author Jordi Boggiano
*/
-class Logger implements LoggerInterface
+class Logger implements LoggerInterface, ResettableInterface
{
/**
* Detailed debug information
@@ -92,14 +93,14 @@ class Logger implements LoggerInterface
* @var array $levels Logging levels
*/
protected static $levels = array(
- 100 => 'DEBUG',
- 200 => 'INFO',
- 250 => 'NOTICE',
- 300 => 'WARNING',
- 400 => 'ERROR',
- 500 => 'CRITICAL',
- 550 => 'ALERT',
- 600 => 'EMERGENCY',
+ self::DEBUG => 'DEBUG',
+ self::INFO => 'INFO',
+ self::NOTICE => 'NOTICE',
+ self::WARNING => 'WARNING',
+ self::ERROR => 'ERROR',
+ self::CRITICAL => 'CRITICAL',
+ self::ALERT => 'ALERT',
+ self::EMERGENCY => 'EMERGENCY',
);
/**
@@ -128,6 +129,16 @@ class Logger implements LoggerInterface
*/
protected $processors;
+ /**
+ * @var bool
+ */
+ protected $microsecondTimestamps = true;
+
+ /**
+ * @var callable
+ */
+ protected $exceptionHandler;
+
/**
* @param string $name The logging channel
* @param HandlerInterface[] $handlers Optional stack of handlers, the first one in the array is called first, etc.
@@ -136,7 +147,7 @@ class Logger implements LoggerInterface
public function __construct($name, array $handlers = array(), array $processors = array())
{
$this->name = $name;
- $this->handlers = $handlers;
+ $this->setHandlers($handlers);
$this->processors = $processors;
}
@@ -148,10 +159,23 @@ public function getName()
return $this->name;
}
+ /**
+ * Return a new cloned instance with the name changed
+ *
+ * @return static
+ */
+ public function withName($name)
+ {
+ $new = clone $this;
+ $new->name = $name;
+
+ return $new;
+ }
+
/**
* Pushes a handler on to the stack.
*
- * @param HandlerInterface $handler
+ * @param HandlerInterface $handler
* @return $this
*/
public function pushHandler(HandlerInterface $handler)
@@ -180,7 +204,7 @@ public function popHandler()
*
* If a map is passed, keys will be ignored.
*
- * @param HandlerInterface[] $handlers
+ * @param HandlerInterface[] $handlers
* @return $this
*/
public function setHandlers(array $handlers)
@@ -204,7 +228,7 @@ public function getHandlers()
/**
* Adds a processor on to the stack.
*
- * @param callable $callback
+ * @param callable $callback
* @return $this
*/
public function pushProcessor($callback)
@@ -239,13 +263,31 @@ public function getProcessors()
return $this->processors;
}
+ /**
+ * Control the use of microsecond resolution timestamps in the 'datetime'
+ * member of new records.
+ *
+ * Generating microsecond resolution timestamps by calling
+ * microtime(true), formatting the result via sprintf() and then parsing
+ * the resulting string via \DateTime::createFromFormat() can incur
+ * a measurable runtime overhead vs simple usage of DateTime to capture
+ * a second resolution timestamp in systems which generate a large number
+ * of log events.
+ *
+ * @param bool $micro True to use microtime() to create timestamps
+ */
+ public function useMicrosecondTimestamps($micro)
+ {
+ $this->microsecondTimestamps = (bool) $micro;
+ }
+
/**
* Adds a log record.
*
- * @param integer $level The logging level
+ * @param int $level The logging level
* @param string $message The log message
* @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @return bool Whether the record has been processed
*/
public function addRecord($level, $message, array $context = array())
{
@@ -257,11 +299,14 @@ public function addRecord($level, $message, array $context = array())
// check if any handler will handle this message so we can return early and save cycles
$handlerKey = null;
- foreach ($this->handlers as $key => $handler) {
+ reset($this->handlers);
+ while ($handler = current($this->handlers)) {
if ($handler->isHandling(array('level' => $level))) {
- $handlerKey = $key;
+ $handlerKey = key($this->handlers);
break;
}
+
+ next($this->handlers);
}
if (null === $handlerKey) {
@@ -272,33 +317,93 @@ public function addRecord($level, $message, array $context = array())
static::$timezone = new \DateTimeZone(date_default_timezone_get() ?: 'UTC');
}
+ // php7.1+ always has microseconds enabled, so we do not need this hack
+ if ($this->microsecondTimestamps && PHP_VERSION_ID < 70100) {
+ $ts = \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)), static::$timezone);
+ } else {
+ $ts = new \DateTime(null, static::$timezone);
+ }
+ $ts->setTimezone(static::$timezone);
+
$record = array(
'message' => (string) $message,
'context' => $context,
'level' => $level,
'level_name' => $levelName,
'channel' => $this->name,
- 'datetime' => \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)), static::$timezone)->setTimezone(static::$timezone),
+ 'datetime' => $ts,
'extra' => array(),
);
- foreach ($this->processors as $processor) {
- $record = call_user_func($processor, $record);
- }
- while (isset($this->handlers[$handlerKey]) &&
- false === $this->handlers[$handlerKey]->handle($record)) {
- $handlerKey++;
+ try {
+ foreach ($this->processors as $processor) {
+ $record = call_user_func($processor, $record);
+ }
+
+ while ($handler = current($this->handlers)) {
+ if (true === $handler->handle($record)) {
+ break;
+ }
+
+ next($this->handlers);
+ }
+ } catch (Exception $e) {
+ $this->handleException($e, $record);
}
return true;
}
+ /**
+ * Ends a log cycle and frees all resources used by handlers.
+ *
+ * Closing a Handler means flushing all buffers and freeing any open resources/handles.
+ * Handlers that have been closed should be able to accept log records again and re-open
+ * themselves on demand, but this may not always be possible depending on implementation.
+ *
+ * This is useful at the end of a request and will be called automatically on every handler
+ * when they get destructed.
+ */
+ public function close()
+ {
+ foreach ($this->handlers as $handler) {
+ if (method_exists($handler, 'close')) {
+ $handler->close();
+ }
+ }
+ }
+
+ /**
+ * Ends a log cycle and resets all handlers and processors to their initial state.
+ *
+ * Resetting a Handler or a Processor means flushing/cleaning all buffers, resetting internal
+ * state, and getting it back to a state in which it can receive log records again.
+ *
+ * This is useful in case you want to avoid logs leaking between two requests or jobs when you
+ * have a long running process like a worker or an application server serving multiple requests
+ * in one process.
+ */
+ public function reset()
+ {
+ foreach ($this->handlers as $handler) {
+ if ($handler instanceof ResettableInterface) {
+ $handler->reset();
+ }
+ }
+
+ foreach ($this->processors as $processor) {
+ if ($processor instanceof ResettableInterface) {
+ $processor->reset();
+ }
+ }
+ }
+
/**
* Adds a log record at the DEBUG level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addDebug($message, array $context = array())
{
@@ -308,9 +413,9 @@ public function addDebug($message, array $context = array())
/**
* Adds a log record at the INFO level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addInfo($message, array $context = array())
{
@@ -320,9 +425,9 @@ public function addInfo($message, array $context = array())
/**
* Adds a log record at the NOTICE level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addNotice($message, array $context = array())
{
@@ -332,9 +437,9 @@ public function addNotice($message, array $context = array())
/**
* Adds a log record at the WARNING level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addWarning($message, array $context = array())
{
@@ -344,9 +449,9 @@ public function addWarning($message, array $context = array())
/**
* Adds a log record at the ERROR level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addError($message, array $context = array())
{
@@ -356,9 +461,9 @@ public function addError($message, array $context = array())
/**
* Adds a log record at the CRITICAL level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addCritical($message, array $context = array())
{
@@ -368,9 +473,9 @@ public function addCritical($message, array $context = array())
/**
* Adds a log record at the ALERT level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addAlert($message, array $context = array())
{
@@ -380,9 +485,9 @@ public function addAlert($message, array $context = array())
/**
* Adds a log record at the EMERGENCY level.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function addEmergency($message, array $context = array())
{
@@ -402,7 +507,7 @@ public static function getLevels()
/**
* Gets the name of the logging level.
*
- * @param integer $level
+ * @param int $level
* @return string
*/
public static function getLevelName($level)
@@ -432,8 +537,8 @@ public static function toMonologLevel($level)
/**
* Checks whether the Logger has a handler that listens on the given level
*
- * @param integer $level
- * @return Boolean
+ * @param int $level
+ * @return bool
*/
public function isHandling($level)
{
@@ -450,15 +555,52 @@ public function isHandling($level)
return false;
}
+ /**
+ * Set a custom exception handler
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function setExceptionHandler($callback)
+ {
+ if (!is_callable($callback)) {
+ throw new \InvalidArgumentException('Exception handler must be valid callable (callback or object with an __invoke method), '.var_export($callback, true).' given');
+ }
+ $this->exceptionHandler = $callback;
+
+ return $this;
+ }
+
+ /**
+ * @return callable
+ */
+ public function getExceptionHandler()
+ {
+ return $this->exceptionHandler;
+ }
+
+ /**
+ * Delegates exception management to the custom exception handler,
+ * or throws the exception if no custom handler is set.
+ */
+ protected function handleException(Exception $e, array $record)
+ {
+ if (!$this->exceptionHandler) {
+ throw $e;
+ }
+
+ call_user_func($this->exceptionHandler, $e, $record);
+ }
+
/**
* Adds a log record at an arbitrary level.
*
* This method allows for compatibility with common interfaces.
*
* @param mixed $level The log level
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function log($level, $message, array $context = array())
{
@@ -472,9 +614,9 @@ public function log($level, $message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function debug($message, array $context = array())
{
@@ -486,9 +628,9 @@ public function debug($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function info($message, array $context = array())
{
@@ -500,9 +642,9 @@ public function info($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function notice($message, array $context = array())
{
@@ -514,9 +656,9 @@ public function notice($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function warn($message, array $context = array())
{
@@ -528,9 +670,9 @@ public function warn($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function warning($message, array $context = array())
{
@@ -542,9 +684,9 @@ public function warning($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function err($message, array $context = array())
{
@@ -556,9 +698,9 @@ public function err($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function error($message, array $context = array())
{
@@ -570,9 +712,9 @@ public function error($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function crit($message, array $context = array())
{
@@ -584,9 +726,9 @@ public function crit($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function critical($message, array $context = array())
{
@@ -598,9 +740,9 @@ public function critical($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function alert($message, array $context = array())
{
@@ -612,9 +754,9 @@ public function alert($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function emerg($message, array $context = array())
{
@@ -626,9 +768,9 @@ public function emerg($message, array $context = array())
*
* This method allows for compatibility with common interfaces.
*
- * @param string $message The log message
- * @param array $context The log context
- * @return Boolean Whether the record has been processed
+ * @param string $message The log message
+ * @param array $context The log context
+ * @return bool Whether the record has been processed
*/
public function emergency($message, array $context = array())
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
index 1899400..9fc3f50 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
@@ -19,7 +19,7 @@
* @author Nick Otter
* @author Jordi Boggiano
*/
-class GitProcessor
+class GitProcessor implements ProcessorInterface
{
private $level;
private static $cache;
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
index 8f553fe..6ae192a 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
@@ -24,21 +24,24 @@
*
* @author Jordi Boggiano
*/
-class IntrospectionProcessor
+class IntrospectionProcessor implements ProcessorInterface
{
private $level;
private $skipClassesPartials;
+ private $skipStackFramesCount;
+
private $skipFunctions = array(
'call_user_func',
'call_user_func_array',
);
- public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array())
+ public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array(), $skipStackFramesCount = 0)
{
$this->level = Logger::toMonologLevel($level);
$this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials);
+ $this->skipStackFramesCount = $skipStackFramesCount;
}
/**
@@ -52,7 +55,12 @@ public function __invoke(array $record)
return $record;
}
- $trace = debug_backtrace();
+ /*
+ * http://php.net/manual/en/function.debug-backtrace.php
+ * As of 5.3.6, DEBUG_BACKTRACE_IGNORE_ARGS option was added.
+ * Any version less than 5.3.6 must use the DEBUG_BACKTRACE_IGNORE_ARGS constant value '2'.
+ */
+ $trace = debug_backtrace((PHP_VERSION_ID < 50306) ? 2 : DEBUG_BACKTRACE_IGNORE_ARGS);
// skip first since it's always the current method
array_shift($trace);
@@ -77,6 +85,8 @@ public function __invoke(array $record)
break;
}
+ $i += $this->skipStackFramesCount;
+
// we should have the call source now
$record['extra'] = array_merge(
$record['extra'],
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
index eb802c0..2a379a3 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
@@ -16,26 +16,26 @@
*
* @author Rob Jensen
*/
-abstract class MemoryProcessor
+abstract class MemoryProcessor implements ProcessorInterface
{
/**
- * @var boolean If true, get the real size of memory allocated from system. Else, only the memory used by emalloc() is reported.
+ * @var bool If true, get the real size of memory allocated from system. Else, only the memory used by emalloc() is reported.
*/
protected $realUsage;
/**
- * @var boolean If true, then format memory size to human readable string (MB, KB, B depending on size)
+ * @var bool If true, then format memory size to human readable string (MB, KB, B depending on size)
*/
protected $useFormatting;
/**
- * @param boolean $realUsage Set this to true to get the real size of memory allocated from system.
- * @param boolean $useFormatting If true, then format memory size to human readable string (MB, KB, B depending on size)
+ * @param bool $realUsage Set this to true to get the real size of memory allocated from system.
+ * @param bool $useFormatting If true, then format memory size to human readable string (MB, KB, B depending on size)
*/
public function __construct($realUsage = true, $useFormatting = true)
{
- $this->realUsage = (boolean) $realUsage;
- $this->useFormatting = (boolean) $useFormatting;
+ $this->realUsage = (bool) $realUsage;
+ $this->useFormatting = (bool) $useFormatting;
}
/**
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
new file mode 100644
index 0000000..2f5b326
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
@@ -0,0 +1,63 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+use Monolog\Logger;
+
+/**
+ * Injects Hg branch and Hg revision number in all records
+ *
+ * @author Jonathan A. Schweder
+ */
+class MercurialProcessor implements ProcessorInterface
+{
+ private $level;
+ private static $cache;
+
+ public function __construct($level = Logger::DEBUG)
+ {
+ $this->level = Logger::toMonologLevel($level);
+ }
+
+ /**
+ * @param array $record
+ * @return array
+ */
+ public function __invoke(array $record)
+ {
+ // return if the level is not high enough
+ if ($record['level'] < $this->level) {
+ return $record;
+ }
+
+ $record['extra']['hg'] = self::getMercurialInfo();
+
+ return $record;
+ }
+
+ private static function getMercurialInfo()
+ {
+ if (self::$cache) {
+ return self::$cache;
+ }
+
+ $result = explode(' ', trim(`hg id -nb`));
+ if (count($result) >= 3) {
+ return self::$cache = array(
+ 'branch' => $result[1],
+ 'revision' => $result[2],
+ );
+ }
+
+ return self::$cache = array();
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
index 9d3f559..66b80fb 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
@@ -16,7 +16,7 @@
*
* @author Andreas Hörnicke
*/
-class ProcessIdProcessor
+class ProcessIdProcessor implements ProcessorInterface
{
/**
* @param array $record
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php b/application/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php
new file mode 100644
index 0000000..7e64d4d
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php
@@ -0,0 +1,25 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * An optional interface to allow labelling Monolog processors.
+ *
+ * @author Nicolas Grekas
+ */
+interface ProcessorInterface
+{
+ /**
+ * @return array The processed records
+ */
+ public function __invoke(array $records);
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
index c2686ce..0088505 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
@@ -11,6 +11,8 @@
namespace Monolog\Processor;
+use Monolog\Utils;
+
/**
* Processes a record's message according to PSR-3 rules
*
@@ -18,7 +20,7 @@
*
* @author Jordi Boggiano
*/
-class PsrLogMessageProcessor
+class PsrLogMessageProcessor implements ProcessorInterface
{
/**
* @param array $record
@@ -35,7 +37,7 @@ public function __invoke(array $record)
if (is_null($val) || is_scalar($val) || (is_object($val) && method_exists($val, "__toString"))) {
$replacements['{'.$key.'}'] = $val;
} elseif (is_object($val)) {
- $replacements['{'.$key.'}'] = '[object '.get_class($val).']';
+ $replacements['{'.$key.'}'] = '[object '.Utils::getClass($val).']';
} else {
$replacements['{'.$key.'}'] = '['.gettype($val).']';
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
index 7e2df2a..615a4d9 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
@@ -16,7 +16,7 @@
*
* @author Martijn Riemers
*/
-class TagProcessor
+class TagProcessor implements ProcessorInterface
{
private $tags;
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
index 812707c..d1f708c 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
@@ -11,12 +11,14 @@
namespace Monolog\Processor;
+use Monolog\ResettableInterface;
+
/**
* Adds a unique identifier into records
*
* @author Simon Mönch
*/
-class UidProcessor
+class UidProcessor implements ProcessorInterface, ResettableInterface
{
private $uid;
@@ -26,7 +28,8 @@ public function __construct($length = 7)
throw new \InvalidArgumentException('The uid length must be an integer between 1 and 32');
}
- $this->uid = substr(hash('md5', uniqid('', true)), 0, $length);
+
+ $this->uid = $this->generateUid($length);
}
public function __invoke(array $record)
@@ -43,4 +46,14 @@ public function getUid()
{
return $this->uid;
}
+
+ public function reset()
+ {
+ $this->uid = $this->generateUid(strlen($this->uid));
+ }
+
+ private function generateUid($length)
+ {
+ return substr(hash('md5', uniqid('', true)), 0, $length);
+ }
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php b/application/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
index 21f22a6..684188f 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
@@ -16,7 +16,7 @@
*
* @author Jordi Boggiano
*/
-class WebProcessor
+class WebProcessor implements ProcessorInterface
{
/**
* @var array|\ArrayAccess
@@ -24,6 +24,10 @@ class WebProcessor
protected $serverData;
/**
+ * Default fields
+ *
+ * Array is structured as [key in record.extra => key in $serverData]
+ *
* @var array
*/
protected $extraFields = array(
@@ -36,7 +40,7 @@ class WebProcessor
/**
* @param array|\ArrayAccess $serverData Array or object w/ ArrayAccess that provides access to the $_SERVER data
- * @param array|null $extraFields Extra field names to be added (all available by default)
+ * @param array|null $extraFields Field names and the related key inside $serverData to be added. If not provided it defaults to: url, ip, http_method, server, referrer
*/
public function __construct($serverData = null, array $extraFields = null)
{
@@ -49,10 +53,14 @@ public function __construct($serverData = null, array $extraFields = null)
}
if (null !== $extraFields) {
- foreach (array_keys($this->extraFields) as $fieldName) {
- if (!in_array($fieldName, $extraFields)) {
- unset($this->extraFields[$fieldName]);
+ if (isset($extraFields[0])) {
+ foreach (array_keys($this->extraFields) as $fieldName) {
+ if (!in_array($fieldName, $extraFields)) {
+ unset($this->extraFields[$fieldName]);
+ }
}
+ } else {
+ $this->extraFields = $extraFields;
}
}
}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Registry.php b/application/vendor/monolog/monolog/src/Monolog/Registry.php
index a33cb7c..159b751 100644
--- a/application/vendor/monolog/monolog/src/Monolog/Registry.php
+++ b/application/vendor/monolog/monolog/src/Monolog/Registry.php
@@ -49,7 +49,7 @@ class Registry
*
* @param Logger $logger Instance of the logging channel
* @param string|null $name Name of the logging channel ($logger->getName() by default)
- * @param boolean $overwrite Overwrite instance in the registry if the given name already exists?
+ * @param bool $overwrite Overwrite instance in the registry if the given name already exists?
* @throws \InvalidArgumentException If $overwrite set to false and named Logger instance already exists
*/
public static function addLogger(Logger $logger, $name = null, $overwrite = false)
@@ -107,8 +107,8 @@ public static function clear()
* Gets Logger instance from the registry
*
* @param string $name Name of the requested Logger instance
- * @return Logger Requested instance of Logger
* @throws \InvalidArgumentException If named Logger instance is not in the registry
+ * @return Logger Requested instance of Logger
*/
public static function getInstance($name)
{
@@ -124,8 +124,8 @@ public static function getInstance($name)
*
* @param string $name Name of the requested Logger instance
* @param array $arguments Arguments passed to static method call
- * @return Logger Requested instance of Logger
* @throws \InvalidArgumentException If named Logger instance is not in the registry
+ * @return Logger Requested instance of Logger
*/
public static function __callStatic($name, $arguments)
{
diff --git a/application/vendor/monolog/monolog/src/Monolog/ResettableInterface.php b/application/vendor/monolog/monolog/src/Monolog/ResettableInterface.php
new file mode 100644
index 0000000..635bc77
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/ResettableInterface.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog;
+
+/**
+ * Handler or Processor implementing this interface will be reset when Logger::reset() is called.
+ *
+ * Resetting ends a log cycle gets them back to their initial state.
+ *
+ * Resetting a Handler or a Processor means flushing/cleaning all buffers, resetting internal
+ * state, and getting it back to a state in which it can receive log records again.
+ *
+ * This is useful in case you want to avoid logs leaking between two requests or jobs when you
+ * have a long running process like a worker or an application server serving multiple requests
+ * in one process.
+ *
+ * @author Grégoire Pineau
+ */
+interface ResettableInterface
+{
+ public function reset();
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/SignalHandler.php b/application/vendor/monolog/monolog/src/Monolog/SignalHandler.php
new file mode 100644
index 0000000..d87018f
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/SignalHandler.php
@@ -0,0 +1,115 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog;
+
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use ReflectionExtension;
+
+/**
+ * Monolog POSIX signal handler
+ *
+ * @author Robert Gust-Bardon
+ */
+class SignalHandler
+{
+ private $logger;
+
+ private $previousSignalHandler = array();
+ private $signalLevelMap = array();
+ private $signalRestartSyscalls = array();
+
+ public function __construct(LoggerInterface $logger)
+ {
+ $this->logger = $logger;
+ }
+
+ public function registerSignalHandler($signo, $level = LogLevel::CRITICAL, $callPrevious = true, $restartSyscalls = true, $async = true)
+ {
+ if (!extension_loaded('pcntl') || !function_exists('pcntl_signal')) {
+ return $this;
+ }
+
+ if ($callPrevious) {
+ if (function_exists('pcntl_signal_get_handler')) {
+ $handler = pcntl_signal_get_handler($signo);
+ if ($handler === false) {
+ return $this;
+ }
+ $this->previousSignalHandler[$signo] = $handler;
+ } else {
+ $this->previousSignalHandler[$signo] = true;
+ }
+ } else {
+ unset($this->previousSignalHandler[$signo]);
+ }
+ $this->signalLevelMap[$signo] = $level;
+ $this->signalRestartSyscalls[$signo] = $restartSyscalls;
+
+ if (function_exists('pcntl_async_signals') && $async !== null) {
+ pcntl_async_signals($async);
+ }
+
+ pcntl_signal($signo, array($this, 'handleSignal'), $restartSyscalls);
+
+ return $this;
+ }
+
+ public function handleSignal($signo, array $siginfo = null)
+ {
+ static $signals = array();
+
+ if (!$signals && extension_loaded('pcntl')) {
+ $pcntl = new ReflectionExtension('pcntl');
+ $constants = $pcntl->getConstants();
+ if (!$constants) {
+ // HHVM 3.24.2 returns an empty array.
+ $constants = get_defined_constants(true);
+ $constants = $constants['Core'];
+ }
+ foreach ($constants as $name => $value) {
+ if (substr($name, 0, 3) === 'SIG' && $name[3] !== '_' && is_int($value)) {
+ $signals[$value] = $name;
+ }
+ }
+ unset($constants);
+ }
+
+ $level = isset($this->signalLevelMap[$signo]) ? $this->signalLevelMap[$signo] : LogLevel::CRITICAL;
+ $signal = isset($signals[$signo]) ? $signals[$signo] : $signo;
+ $context = isset($siginfo) ? $siginfo : array();
+ $this->logger->log($level, sprintf('Program received signal %s', $signal), $context);
+
+ if (!isset($this->previousSignalHandler[$signo])) {
+ return;
+ }
+
+ if ($this->previousSignalHandler[$signo] === true || $this->previousSignalHandler[$signo] === SIG_DFL) {
+ if (extension_loaded('pcntl') && function_exists('pcntl_signal') && function_exists('pcntl_sigprocmask') && function_exists('pcntl_signal_dispatch')
+ && extension_loaded('posix') && function_exists('posix_getpid') && function_exists('posix_kill')) {
+ $restartSyscalls = isset($this->signalRestartSyscalls[$signo]) ? $this->signalRestartSyscalls[$signo] : true;
+ pcntl_signal($signo, SIG_DFL, $restartSyscalls);
+ pcntl_sigprocmask(SIG_UNBLOCK, array($signo), $oldset);
+ posix_kill(posix_getpid(), $signo);
+ pcntl_signal_dispatch();
+ pcntl_sigprocmask(SIG_SETMASK, $oldset);
+ pcntl_signal($signo, array($this, 'handleSignal'), $restartSyscalls);
+ }
+ } elseif (is_callable($this->previousSignalHandler[$signo])) {
+ if (PHP_VERSION_ID >= 70100) {
+ $this->previousSignalHandler[$signo]($signo, $siginfo);
+ } else {
+ $this->previousSignalHandler[$signo]($signo);
+ }
+ }
+ }
+}
diff --git a/application/vendor/monolog/monolog/src/Monolog/Utils.php b/application/vendor/monolog/monolog/src/Monolog/Utils.php
new file mode 100644
index 0000000..eb9be86
--- /dev/null
+++ b/application/vendor/monolog/monolog/src/Monolog/Utils.php
@@ -0,0 +1,25 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog;
+
+class Utils
+{
+ /**
+ * @internal
+ */
+ public static function getClass($object)
+ {
+ $class = \get_class($object);
+
+ return 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).'@anonymous' : $class;
+ }
+}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/ErrorHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/ErrorHandlerTest.php
deleted file mode 100644
index a9a3f30..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/ErrorHandlerTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Monolog\Handler\TestHandler;
-
-class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
-{
- public function testHandleError()
- {
- $logger = new Logger('test', array($handler = new TestHandler));
- $errHandler = new ErrorHandler($logger);
-
- $errHandler->registerErrorHandler(array(E_USER_NOTICE => Logger::EMERGENCY), false);
- trigger_error('Foo', E_USER_ERROR);
- $this->assertCount(1, $handler->getRecords());
- $this->assertTrue($handler->hasErrorRecords());
- trigger_error('Foo', E_USER_NOTICE);
- $this->assertCount(2, $handler->getRecords());
- $this->assertTrue($handler->hasEmergencyRecords());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
deleted file mode 100644
index e7f7334..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @covers Monolog\Formatter\ChromePHPFormatter::format
- */
- public function testDefaultFormat()
- {
- $formatter = new ChromePHPFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('ip' => '127.0.0.1'),
- 'message' => 'log',
- );
-
- $message = $formatter->format($record);
-
- $this->assertEquals(
- array(
- 'meh',
- array(
- 'message' => 'log',
- 'context' => array('from' => 'logger'),
- 'extra' => array('ip' => '127.0.0.1'),
- ),
- 'unknown',
- 'error'
- ),
- $message
- );
- }
-
- /**
- * @covers Monolog\Formatter\ChromePHPFormatter::format
- */
- public function testFormatWithFileAndLine()
- {
- $formatter = new ChromePHPFormatter();
- $record = array(
- 'level' => Logger::CRITICAL,
- 'level_name' => 'CRITICAL',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14),
- 'message' => 'log',
- );
-
- $message = $formatter->format($record);
-
- $this->assertEquals(
- array(
- 'meh',
- array(
- 'message' => 'log',
- 'context' => array('from' => 'logger'),
- 'extra' => array('ip' => '127.0.0.1'),
- ),
- 'test : 14',
- 'error'
- ),
- $message
- );
- }
-
- /**
- * @covers Monolog\Formatter\ChromePHPFormatter::format
- */
- public function testFormatWithoutContext()
- {
- $formatter = new ChromePHPFormatter();
- $record = array(
- 'level' => Logger::DEBUG,
- 'level_name' => 'DEBUG',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- $message = $formatter->format($record);
-
- $this->assertEquals(
- array(
- 'meh',
- 'log',
- 'unknown',
- 'log'
- ),
- $message
- );
- }
-
- /**
- * @covers Monolog\Formatter\ChromePHPFormatter::formatBatch
- */
- public function testBatchFormatThrowException()
- {
- $formatter = new ChromePHPFormatter();
- $records = array(
- array(
- 'level' => Logger::INFO,
- 'level_name' => 'INFO',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- ),
- array(
- 'level' => Logger::WARNING,
- 'level_name' => 'WARNING',
- 'channel' => 'foo',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log2',
- ),
- );
-
- $this->assertEquals(
- array(
- array(
- 'meh',
- 'log',
- 'unknown',
- 'info'
- ),
- array(
- 'foo',
- 'log2',
- 'unknown',
- 'warn'
- ),
- ),
- $formatter->formatBatch($records)
- );
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
deleted file mode 100644
index 546e5c2..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class ElasticaFormatterTest extends \PHPUnit_Framework_TestCase
-{
- public function setUp()
- {
- if (!class_exists("Elastica\Document")) {
- $this->markTestSkipped("ruflin/elastica not installed");
- }
- }
-
- /**
- * @covers Monolog\Formatter\ElasticaFormatter::__construct
- * @covers Monolog\Formatter\ElasticaFormatter::format
- * @covers Monolog\Formatter\ElasticaFormatter::getDocument
- */
- public function testFormat()
- {
- // test log message
- $msg = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- // expected values
- $expected = $msg;
- $expected['datetime'] = '1970-01-01T00:00:00+0000';
- $expected['context'] = array(
- 'class' => '[object] (stdClass: {})',
- 'foo' => 7,
- 0 => 'bar',
- );
-
- // format log message
- $formatter = new ElasticaFormatter('my_index', 'doc_type');
- $doc = $formatter->format($msg);
- $this->assertInstanceOf('Elastica\Document', $doc);
-
- // Document parameters
- $params = $doc->getParams();
- $this->assertEquals('my_index', $params['_index']);
- $this->assertEquals('doc_type', $params['_type']);
-
- // Document data values
- $data = $doc->getData();
- foreach (array_keys($expected) as $key) {
- $this->assertEquals($expected[$key], $data[$key]);
- }
- }
-
- /**
- * @covers Monolog\Formatter\ElasticaFormatter::getIndex
- * @covers Monolog\Formatter\ElasticaFormatter::getType
- */
- public function testGetters()
- {
- $formatter = new ElasticaFormatter('my_index', 'doc_type');
- $this->assertEquals('my_index', $formatter->getIndex());
- $this->assertEquals('doc_type', $formatter->getType());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php
deleted file mode 100644
index 1b2fd97..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class FlowdockFormatterTest extends TestCase
-{
- /**
- * @covers Monolog\Formatter\FlowdockFormatter::format
- */
- public function testFormat()
- {
- $formatter = new FlowdockFormatter('test_source', 'source@test.com');
- $record = $this->getRecord();
-
- $expected = array(
- 'source' => 'test_source',
- 'from_address' => 'source@test.com',
- 'subject' => 'in test_source: WARNING - test',
- 'content' => 'test',
- 'tags' => array('#logs', '#warning', '#test'),
- 'project' => 'test_source',
- );
- $formatted = $formatter->format($record);
-
- $this->assertEquals($expected, $formatted['flowdock']);
- }
-
- /**
- * @ covers Monolog\Formatter\FlowdockFormatter::formatBatch
- */
- public function testFormatBatch()
- {
- $formatter = new FlowdockFormatter('test_source', 'source@test.com');
- $records = array(
- $this->getRecord(Logger::WARNING),
- $this->getRecord(Logger::DEBUG),
- );
- $formatted = $formatter->formatBatch($records);
-
- $this->assertArrayHasKey('flowdock', $formatted[0]);
- $this->assertArrayHasKey('flowdock', $formatted[1]);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
deleted file mode 100644
index 6ac1485..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
+++ /dev/null
@@ -1,204 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
-{
- public function setUp()
- {
- if (!class_exists('\Gelf\Message')) {
- $this->markTestSkipped("graylog2/gelf-php or mlehner/gelf-php is not installed");
- }
- }
-
- /**
- * @covers Monolog\Formatter\GelfMessageFormatter::format
- */
- public function testDefaultFormatter()
- {
- $formatter = new GelfMessageFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
- $this->assertEquals(0, $message->getTimestamp());
- $this->assertEquals('log', $message->getShortMessage());
- $this->assertEquals('meh', $message->getFacility());
- $this->assertEquals(null, $message->getLine());
- $this->assertEquals(null, $message->getFile());
- $this->assertEquals($this->isLegacy() ? 3 : 'error', $message->getLevel());
- $this->assertNotEmpty($message->getHost());
-
- $formatter = new GelfMessageFormatter('mysystem');
-
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
- $this->assertEquals('mysystem', $message->getHost());
- }
-
- /**
- * @covers Monolog\Formatter\GelfMessageFormatter::format
- */
- public function testFormatWithFileAndLine()
- {
- $formatter = new GelfMessageFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('file' => 'test', 'line' => 14),
- 'message' => 'log',
- );
-
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
- $this->assertEquals('test', $message->getFile());
- $this->assertEquals(14, $message->getLine());
- }
-
- /**
- * @covers Monolog\Formatter\GelfMessageFormatter::format
- * @expectedException InvalidArgumentException
- */
- public function testFormatInvalidFails()
- {
- $formatter = new GelfMessageFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- );
-
- $formatter->format($record);
- }
-
- /**
- * @covers Monolog\Formatter\GelfMessageFormatter::format
- */
- public function testFormatWithContext()
- {
- $formatter = new GelfMessageFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
-
- $message_array = $message->toArray();
-
- $this->assertArrayHasKey('_ctxt_from', $message_array);
- $this->assertEquals('logger', $message_array['_ctxt_from']);
-
- // Test with extraPrefix
- $formatter = new GelfMessageFormatter(null, null, 'CTX');
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
-
- $message_array = $message->toArray();
-
- $this->assertArrayHasKey('_CTXfrom', $message_array);
- $this->assertEquals('logger', $message_array['_CTXfrom']);
- }
-
- /**
- * @covers Monolog\Formatter\GelfMessageFormatter::format
- */
- public function testFormatWithContextContainingException()
- {
- $formatter = new GelfMessageFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger', 'exception' => array(
- 'class' => '\Exception',
- 'file' => '/some/file/in/dir.php:56',
- 'trace' => array('/some/file/1.php:23', '/some/file/2.php:3')
- )),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log'
- );
-
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
-
- $this->assertEquals("/some/file/in/dir.php", $message->getFile());
- $this->assertEquals("56", $message->getLine());
- }
-
- /**
- * @covers Monolog\Formatter\GelfMessageFormatter::format
- */
- public function testFormatWithExtra()
- {
- $formatter = new GelfMessageFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
-
- $message_array = $message->toArray();
-
- $this->assertArrayHasKey('_key', $message_array);
- $this->assertEquals('pair', $message_array['_key']);
-
- // Test with extraPrefix
- $formatter = new GelfMessageFormatter(null, 'EXT');
- $message = $formatter->format($record);
-
- $this->assertInstanceOf('Gelf\Message', $message);
-
- $message_array = $message->toArray();
-
- $this->assertArrayHasKey('_EXTkey', $message_array);
- $this->assertEquals('pair', $message_array['_EXTkey']);
- }
-
- private function isLegacy()
- {
- return interface_exists('\Gelf\IMessagePublisher');
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
deleted file mode 100644
index 69e2007..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class JsonFormatterTest extends TestCase
-{
- /**
- * @covers Monolog\Formatter\JsonFormatter::__construct
- * @covers Monolog\Formatter\JsonFormatter::getBatchMode
- * @covers Monolog\Formatter\JsonFormatter::isAppendingNewlines
- */
- public function testConstruct()
- {
- $formatter = new JsonFormatter();
- $this->assertEquals(JsonFormatter::BATCH_MODE_JSON, $formatter->getBatchMode());
- $this->assertEquals(true, $formatter->isAppendingNewlines());
- $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES, false);
- $this->assertEquals(JsonFormatter::BATCH_MODE_NEWLINES, $formatter->getBatchMode());
- $this->assertEquals(false, $formatter->isAppendingNewlines());
- }
-
- /**
- * @covers Monolog\Formatter\JsonFormatter::format
- */
- public function testFormat()
- {
- $formatter = new JsonFormatter();
- $record = $this->getRecord();
- $this->assertEquals(json_encode($record)."\n", $formatter->format($record));
-
- $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false);
- $record = $this->getRecord();
- $this->assertEquals(json_encode($record), $formatter->format($record));
- }
-
- /**
- * @covers Monolog\Formatter\JsonFormatter::formatBatch
- * @covers Monolog\Formatter\JsonFormatter::formatBatchJson
- */
- public function testFormatBatch()
- {
- $formatter = new JsonFormatter();
- $records = array(
- $this->getRecord(Logger::WARNING),
- $this->getRecord(Logger::DEBUG),
- );
- $this->assertEquals(json_encode($records), $formatter->formatBatch($records));
- }
-
- /**
- * @covers Monolog\Formatter\JsonFormatter::formatBatch
- * @covers Monolog\Formatter\JsonFormatter::formatBatchNewlines
- */
- public function testFormatBatchNewlines()
- {
- $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES);
- $records = $expected = array(
- $this->getRecord(Logger::WARNING),
- $this->getRecord(Logger::DEBUG),
- );
- array_walk($expected, function (&$value, $key) {
- $value = json_encode($value);
- });
- $this->assertEquals(implode("\n", $expected), $formatter->formatBatch($records));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php
deleted file mode 100644
index 875bd57..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * @covers Monolog\Formatter\LineFormatter
- */
-class LineFormatterTest extends \PHPUnit_Framework_TestCase
-{
- public function testDefFormatWithString()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $message = $formatter->format(array(
- 'level_name' => 'WARNING',
- 'channel' => 'log',
- 'context' => array(),
- 'message' => 'foo',
- 'datetime' => new \DateTime,
- 'extra' => array(),
- ));
- $this->assertEquals('['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message);
- }
-
- public function testDefFormatWithArrayContext()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $message = $formatter->format(array(
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'message' => 'foo',
- 'datetime' => new \DateTime,
- 'extra' => array(),
- 'context' => array(
- 'foo' => 'bar',
- 'baz' => 'qux',
- 'bool' => false,
- 'null' => null,
- )
- ));
- $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foo {"foo":"bar","baz":"qux","bool":false,"null":null} []'."\n", $message);
- }
-
- public function testDefFormatExtras()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $message = $formatter->format(array(
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array('ip' => '127.0.0.1'),
- 'message' => 'log',
- ));
- $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] {"ip":"127.0.0.1"}'."\n", $message);
- }
-
- public function testFormatExtras()
- {
- $formatter = new LineFormatter("[%datetime%] %channel%.%level_name%: %message% %context% %extra.file% %extra%\n", 'Y-m-d');
- $message = $formatter->format(array(
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array('ip' => '127.0.0.1', 'file' => 'test'),
- 'message' => 'log',
- ));
- $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] test {"ip":"127.0.0.1"}'."\n", $message);
- }
-
- public function testContextAndExtraOptionallyNotShownIfEmpty()
- {
- $formatter = new LineFormatter(null, 'Y-m-d', false, true);
- $message = $formatter->format(array(
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array(),
- 'message' => 'log',
- ));
- $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log '."\n", $message);
- }
-
- public function testDefFormatWithObject()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $message = $formatter->format(array(
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array('foo' => new TestFoo, 'bar' => new TestBar, 'baz' => array(), 'res' => fopen('php://memory', 'rb')),
- 'message' => 'foobar',
- ));
-
- $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\\\Formatter\\\\TestFoo: {\\"foo\\":\\"foo\\"})","bar":"[object] (Monolog\\\\Formatter\\\\TestBar: bar)","baz":[],"res":"[resource] (stream)"}'."\n", $message);
- }
-
- public function testDefFormatWithException()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $message = $formatter->format(array(
- 'level_name' => 'CRITICAL',
- 'channel' => 'core',
- 'context' => array('exception' => new \RuntimeException('Foo')),
- 'datetime' => new \DateTime,
- 'extra' => array(),
- 'message' => 'foobar',
- ));
-
- $path = str_replace('\\/', '/', json_encode(__FILE__));
-
- $this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (RuntimeException(code: 0): Foo at '.substr($path, 1, -1).':'.(__LINE__ - 8).')"} []'."\n", $message);
- }
-
- public function testDefFormatWithPreviousException()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $previous = new \LogicException('Wut?');
- $message = $formatter->format(array(
- 'level_name' => 'CRITICAL',
- 'channel' => 'core',
- 'context' => array('exception' => new \RuntimeException('Foo', 0, $previous)),
- 'datetime' => new \DateTime,
- 'extra' => array(),
- 'message' => 'foobar',
- ));
-
- $path = str_replace('\\/', '/', json_encode(__FILE__));
-
- $this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (RuntimeException(code: 0): Foo at '.substr($path, 1, -1).':'.(__LINE__ - 8).', LogicException(code: 0): Wut? at '.substr($path, 1, -1).':'.(__LINE__ - 12).')"} []'."\n", $message);
- }
-
- public function testBatchFormat()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $message = $formatter->formatBatch(array(
- array(
- 'level_name' => 'CRITICAL',
- 'channel' => 'test',
- 'message' => 'bar',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array(),
- ),
- array(
- 'level_name' => 'WARNING',
- 'channel' => 'log',
- 'message' => 'foo',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array(),
- ),
- ));
- $this->assertEquals('['.date('Y-m-d').'] test.CRITICAL: bar [] []'."\n".'['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message);
- }
-
- public function testFormatShouldStripInlineLineBreaks()
- {
- $formatter = new LineFormatter(null, 'Y-m-d');
- $message = $formatter->format(
- array(
- 'message' => "foo\nbar",
- 'context' => array(),
- 'extra' => array(),
- )
- );
-
- $this->assertRegExp('/foo bar/', $message);
- }
-
- public function testFormatShouldNotStripInlineLineBreaksWhenFlagIsSet()
- {
- $formatter = new LineFormatter(null, 'Y-m-d', true);
- $message = $formatter->format(
- array(
- 'message' => "foo\nbar",
- 'context' => array(),
- 'extra' => array(),
- )
- );
-
- $this->assertRegExp('/foo\nbar/', $message);
- }
-}
-
-class TestFoo
-{
- public $foo = 'foo';
-}
-
-class TestBar
-{
- public function __toString()
- {
- return 'bar';
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php
deleted file mode 100644
index 6d59b3f..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\TestCase;
-
-class LogglyFormatterTest extends TestCase
-{
- /**
- * @covers Monolog\Formatter\LogglyFormatter::__construct
- */
- public function testConstruct()
- {
- $formatter = new LogglyFormatter();
- $this->assertEquals(LogglyFormatter::BATCH_MODE_NEWLINES, $formatter->getBatchMode());
- $formatter = new LogglyFormatter(LogglyFormatter::BATCH_MODE_JSON);
- $this->assertEquals(LogglyFormatter::BATCH_MODE_JSON, $formatter->getBatchMode());
- }
-
- /**
- * @covers Monolog\Formatter\LogglyFormatter::format
- */
- public function testFormat()
- {
- $formatter = new LogglyFormatter();
- $record = $this->getRecord();
- $formatted_decoded = json_decode($formatter->format($record), true);
- $this->assertArrayHasKey("timestamp", $formatted_decoded);
- $this->assertEquals(new \DateTime($formatted_decoded["timestamp"]), $record["datetime"]);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php
deleted file mode 100644
index de4a3c2..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php
+++ /dev/null
@@ -1,289 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testDefaultFormatter()
- {
- $formatter = new LogstashFormatter('test', 'hostname');
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']);
- $this->assertEquals('log', $message['@message']);
- $this->assertEquals('meh', $message['@fields']['channel']);
- $this->assertContains('meh', $message['@tags']);
- $this->assertEquals(Logger::ERROR, $message['@fields']['level']);
- $this->assertEquals('test', $message['@type']);
- $this->assertEquals('hostname', $message['@source']);
-
- $formatter = new LogstashFormatter('mysystem');
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertEquals('mysystem', $message['@type']);
- }
-
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testFormatWithFileAndLine()
- {
- $formatter = new LogstashFormatter('test');
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('file' => 'test', 'line' => 14),
- 'message' => 'log',
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertEquals('test', $message['@fields']['file']);
- $this->assertEquals(14, $message['@fields']['line']);
- }
-
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testFormatWithContext()
- {
- $formatter = new LogstashFormatter('test');
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $message_array = $message['@fields'];
-
- $this->assertArrayHasKey('ctxt_from', $message_array);
- $this->assertEquals('logger', $message_array['ctxt_from']);
-
- // Test with extraPrefix
- $formatter = new LogstashFormatter('test', null, null, 'CTX');
- $message = json_decode($formatter->format($record), true);
-
- $message_array = $message['@fields'];
-
- $this->assertArrayHasKey('CTXfrom', $message_array);
- $this->assertEquals('logger', $message_array['CTXfrom']);
- }
-
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testFormatWithExtra()
- {
- $formatter = new LogstashFormatter('test');
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $message_array = $message['@fields'];
-
- $this->assertArrayHasKey('key', $message_array);
- $this->assertEquals('pair', $message_array['key']);
-
- // Test with extraPrefix
- $formatter = new LogstashFormatter('test', null, 'EXT');
- $message = json_decode($formatter->format($record), true);
-
- $message_array = $message['@fields'];
-
- $this->assertArrayHasKey('EXTkey', $message_array);
- $this->assertEquals('pair', $message_array['EXTkey']);
- }
-
- public function testFormatWithApplicationName()
- {
- $formatter = new LogstashFormatter('app', 'test');
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertArrayHasKey('@type', $message);
- $this->assertEquals('app', $message['@type']);
- }
-
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testDefaultFormatterV1()
- {
- $formatter = new LogstashFormatter('test', 'hostname', null, 'ctxt_', LogstashFormatter::V1);
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']);
- $this->assertEquals("1", $message['@version']);
- $this->assertEquals('log', $message['message']);
- $this->assertEquals('meh', $message['channel']);
- $this->assertEquals('ERROR', $message['level']);
- $this->assertEquals('test', $message['type']);
- $this->assertEquals('hostname', $message['host']);
-
- $formatter = new LogstashFormatter('mysystem', null, null, 'ctxt_', LogstashFormatter::V1);
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertEquals('mysystem', $message['type']);
- }
-
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testFormatWithFileAndLineV1()
- {
- $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1);
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('file' => 'test', 'line' => 14),
- 'message' => 'log',
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertEquals('test', $message['file']);
- $this->assertEquals(14, $message['line']);
- }
-
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testFormatWithContextV1()
- {
- $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1);
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertArrayHasKey('ctxt_from', $message);
- $this->assertEquals('logger', $message['ctxt_from']);
-
- // Test with extraPrefix
- $formatter = new LogstashFormatter('test', null, null, 'CTX', LogstashFormatter::V1);
- $message = json_decode($formatter->format($record), true);
-
- $this->assertArrayHasKey('CTXfrom', $message);
- $this->assertEquals('logger', $message['CTXfrom']);
- }
-
- /**
- * @covers Monolog\Formatter\LogstashFormatter::format
- */
- public function testFormatWithExtraV1()
- {
- $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1);
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertArrayHasKey('key', $message);
- $this->assertEquals('pair', $message['key']);
-
- // Test with extraPrefix
- $formatter = new LogstashFormatter('test', null, 'EXT', 'ctxt_', LogstashFormatter::V1);
- $message = json_decode($formatter->format($record), true);
-
- $this->assertArrayHasKey('EXTkey', $message);
- $this->assertEquals('pair', $message['EXTkey']);
- }
-
- public function testFormatWithApplicationNameV1()
- {
- $formatter = new LogstashFormatter('app', 'test', null, 'ctxt_', LogstashFormatter::V1);
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('key' => 'pair'),
- 'message' => 'log'
- );
-
- $message = json_decode($formatter->format($record), true);
-
- $this->assertArrayHasKey('type', $message);
- $this->assertEquals('app', $message['type']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php
deleted file mode 100644
index 1554ef4..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php
+++ /dev/null
@@ -1,253 +0,0 @@
-
- */
-class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
-{
- public function setUp()
- {
- if (!class_exists('MongoDate')) {
- $this->markTestSkipped('mongo extension not installed');
- }
- }
-
- public function constructArgumentProvider()
- {
- return array(
- array(1, true, 1, true),
- array(0, false, 0, false),
- );
- }
-
- /**
- * @param $traceDepth
- * @param $traceAsString
- * @param $expectedTraceDepth
- * @param $expectedTraceAsString
- *
- * @dataProvider constructArgumentProvider
- */
- public function testConstruct($traceDepth, $traceAsString, $expectedTraceDepth, $expectedTraceAsString)
- {
- $formatter = new MongoDBFormatter($traceDepth, $traceAsString);
-
- $reflTrace = new \ReflectionProperty($formatter, 'exceptionTraceAsString');
- $reflTrace->setAccessible(true);
- $this->assertEquals($expectedTraceAsString, $reflTrace->getValue($formatter));
-
- $reflDepth = new\ReflectionProperty($formatter, 'maxNestingLevel');
- $reflDepth->setAccessible(true);
- $this->assertEquals($expectedTraceDepth, $reflDepth->getValue($formatter));
- }
-
- public function testSimpleFormat()
- {
- $record = array(
- 'message' => 'some log message',
- 'context' => array(),
- 'level' => Logger::WARNING,
- 'level_name' => Logger::getLevelName(Logger::WARNING),
- 'channel' => 'test',
- 'datetime' => new \DateTime('2014-02-01 00:00:00'),
- 'extra' => array(),
- );
-
- $formatter = new MongoDBFormatter();
- $formattedRecord = $formatter->format($record);
-
- $this->assertCount(7, $formattedRecord);
- $this->assertEquals('some log message', $formattedRecord['message']);
- $this->assertEquals(array(), $formattedRecord['context']);
- $this->assertEquals(Logger::WARNING, $formattedRecord['level']);
- $this->assertEquals(Logger::getLevelName(Logger::WARNING), $formattedRecord['level_name']);
- $this->assertEquals('test', $formattedRecord['channel']);
- $this->assertInstanceOf('\MongoDate', $formattedRecord['datetime']);
- $this->assertEquals('0.00000000 1391212800', $formattedRecord['datetime']->__toString());
- $this->assertEquals(array(), $formattedRecord['extra']);
- }
-
- public function testRecursiveFormat()
- {
- $someObject = new \stdClass();
- $someObject->foo = 'something';
- $someObject->bar = 'stuff';
-
- $record = array(
- 'message' => 'some log message',
- 'context' => array(
- 'stuff' => new \DateTime('2014-02-01 02:31:33'),
- 'some_object' => $someObject,
- 'context_string' => 'some string',
- 'context_int' => 123456,
- 'except' => new \Exception('exception message', 987),
- ),
- 'level' => Logger::WARNING,
- 'level_name' => Logger::getLevelName(Logger::WARNING),
- 'channel' => 'test',
- 'datetime' => new \DateTime('2014-02-01 00:00:00'),
- 'extra' => array(),
- );
-
- $formatter = new MongoDBFormatter();
- $formattedRecord = $formatter->format($record);
-
- $this->assertCount(5, $formattedRecord['context']);
- $this->assertInstanceOf('\MongoDate', $formattedRecord['context']['stuff']);
- $this->assertEquals('0.00000000 1391221893', $formattedRecord['context']['stuff']->__toString());
- $this->assertEquals(
- array(
- 'foo' => 'something',
- 'bar' => 'stuff',
- 'class' => 'stdClass',
- ),
- $formattedRecord['context']['some_object']
- );
- $this->assertEquals('some string', $formattedRecord['context']['context_string']);
- $this->assertEquals(123456, $formattedRecord['context']['context_int']);
-
- $this->assertCount(5, $formattedRecord['context']['except']);
- $this->assertEquals('exception message', $formattedRecord['context']['except']['message']);
- $this->assertEquals(987, $formattedRecord['context']['except']['code']);
- $this->assertInternalType('string', $formattedRecord['context']['except']['file']);
- $this->assertInternalType('integer', $formattedRecord['context']['except']['code']);
- $this->assertInternalType('string', $formattedRecord['context']['except']['trace']);
- $this->assertEquals('Exception', $formattedRecord['context']['except']['class']);
- }
-
- public function testFormatDepthArray()
- {
- $record = array(
- 'message' => 'some log message',
- 'context' => array(
- 'nest2' => array(
- 'property' => 'anything',
- 'nest3' => array(
- 'nest4' => 'value',
- 'property' => 'nothing'
- )
- )
- ),
- 'level' => Logger::WARNING,
- 'level_name' => Logger::getLevelName(Logger::WARNING),
- 'channel' => 'test',
- 'datetime' => new \DateTime('2014-02-01 00:00:00'),
- 'extra' => array(),
- );
-
- $formatter = new MongoDBFormatter(2);
- $formattedResult = $formatter->format($record);
-
- $this->assertEquals(
- array(
- 'nest2' => array(
- 'property' => 'anything',
- 'nest3' => '[...]',
- )
- ),
- $formattedResult['context']
- );
- }
-
- public function testFormatDepthArrayInfiniteNesting()
- {
- $record = array(
- 'message' => 'some log message',
- 'context' => array(
- 'nest2' => array(
- 'property' => 'something',
- 'nest3' => array(
- 'property' => 'anything',
- 'nest4' => array(
- 'property' => 'nothing',
- ),
- )
- )
- ),
- 'level' => Logger::WARNING,
- 'level_name' => Logger::getLevelName(Logger::WARNING),
- 'channel' => 'test',
- 'datetime' => new \DateTime('2014-02-01 00:00:00'),
- 'extra' => array(),
- );
-
- $formatter = new MongoDBFormatter(0);
- $formattedResult = $formatter->format($record);
-
- $this->assertEquals(
- array(
- 'nest2' => array(
- 'property' => 'something',
- 'nest3' => array(
- 'property' => 'anything',
- 'nest4' => array(
- 'property' => 'nothing',
- )
- ),
- )
- ),
- $formattedResult['context']
- );
- }
-
- public function testFormatDepthObjects()
- {
- $someObject = new \stdClass();
- $someObject->property = 'anything';
- $someObject->nest3 = new \stdClass();
- $someObject->nest3->property = 'nothing';
- $someObject->nest3->nest4 = 'invisible';
-
- $record = array(
- 'message' => 'some log message',
- 'context' => array(
- 'nest2' => $someObject
- ),
- 'level' => Logger::WARNING,
- 'level_name' => Logger::getLevelName(Logger::WARNING),
- 'channel' => 'test',
- 'datetime' => new \DateTime('2014-02-01 00:00:00'),
- 'extra' => array(),
- );
-
- $formatter = new MongoDBFormatter(2, true);
- $formattedResult = $formatter->format($record);
-
- $this->assertEquals(
- array(
- 'nest2' => array(
- 'property' => 'anything',
- 'nest3' => '[...]',
- 'class' => 'stdClass',
- ),
- ),
- $formattedResult['context']
- );
- }
-
- public function testFormatDepthException()
- {
- $record = array(
- 'message' => 'some log message',
- 'context' => array(
- 'nest2' => new \Exception('exception message', 987),
- ),
- 'level' => Logger::WARNING,
- 'level_name' => Logger::getLevelName(Logger::WARNING),
- 'channel' => 'test',
- 'datetime' => new \DateTime('2014-02-01 00:00:00'),
- 'extra' => array(),
- );
-
- $formatter = new MongoDBFormatter(2, false);
- $formattedRecord = $formatter->format($record);
-
- $this->assertEquals('exception message', $formattedRecord['context']['nest2']['message']);
- $this->assertEquals(987, $formattedRecord['context']['nest2']['code']);
- $this->assertEquals('[...]', $formattedRecord['context']['nest2']['trace']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
deleted file mode 100644
index c484dfe..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
+++ /dev/null
@@ -1,270 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * @covers Monolog\Formatter\NormalizerFormatter
- */
-class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
-{
- public function testFormat()
- {
- $formatter = new NormalizerFormatter('Y-m-d');
- $formatted = $formatter->format(array(
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'message' => 'foo',
- 'datetime' => new \DateTime,
- 'extra' => array('foo' => new TestFooNorm, 'bar' => new TestBarNorm, 'baz' => array(), 'res' => fopen('php://memory', 'rb')),
- 'context' => array(
- 'foo' => 'bar',
- 'baz' => 'qux',
- 'inf' => INF,
- '-inf' => -INF,
- 'nan' => acos(4),
- ),
- ));
-
- $this->assertEquals(array(
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'message' => 'foo',
- 'datetime' => date('Y-m-d'),
- 'extra' => array(
- 'foo' => '[object] (Monolog\\Formatter\\TestFooNorm: {"foo":"foo"})',
- 'bar' => '[object] (Monolog\\Formatter\\TestBarNorm: bar)',
- 'baz' => array(),
- 'res' => '[resource] (stream)',
- ),
- 'context' => array(
- 'foo' => 'bar',
- 'baz' => 'qux',
- 'inf' => 'INF',
- '-inf' => '-INF',
- 'nan' => 'NaN',
- )
- ), $formatted);
- }
-
- public function testFormatExceptions()
- {
- $formatter = new NormalizerFormatter('Y-m-d');
- $e = new \LogicException('bar');
- $e2 = new \RuntimeException('foo', 0, $e);
- $formatted = $formatter->format(array(
- 'exception' => $e2,
- ));
-
- $this->assertGreaterThan(5, count($formatted['exception']['trace']));
- $this->assertTrue(isset($formatted['exception']['previous']));
- unset($formatted['exception']['trace'], $formatted['exception']['previous']);
-
- $this->assertEquals(array(
- 'exception' => array(
- 'class' => get_class($e2),
- 'message' => $e2->getMessage(),
- 'code' => $e2->getCode(),
- 'file' => $e2->getFile().':'.$e2->getLine(),
- )
- ), $formatted);
- }
-
- public function testBatchFormat()
- {
- $formatter = new NormalizerFormatter('Y-m-d');
- $formatted = $formatter->formatBatch(array(
- array(
- 'level_name' => 'CRITICAL',
- 'channel' => 'test',
- 'message' => 'bar',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array(),
- ),
- array(
- 'level_name' => 'WARNING',
- 'channel' => 'log',
- 'message' => 'foo',
- 'context' => array(),
- 'datetime' => new \DateTime,
- 'extra' => array(),
- ),
- ));
- $this->assertEquals(array(
- array(
- 'level_name' => 'CRITICAL',
- 'channel' => 'test',
- 'message' => 'bar',
- 'context' => array(),
- 'datetime' => date('Y-m-d'),
- 'extra' => array(),
- ),
- array(
- 'level_name' => 'WARNING',
- 'channel' => 'log',
- 'message' => 'foo',
- 'context' => array(),
- 'datetime' => date('Y-m-d'),
- 'extra' => array(),
- ),
- ), $formatted);
- }
-
- /**
- * Test issue #137
- */
- public function testIgnoresRecursiveObjectReferences()
- {
- // set up the recursion
- $foo = new \stdClass();
- $bar = new \stdClass();
-
- $foo->bar = $bar;
- $bar->foo = $foo;
-
- // set an error handler to assert that the error is not raised anymore
- $that = $this;
- set_error_handler(function ($level, $message, $file, $line, $context) use ($that) {
- if (error_reporting() & $level) {
- restore_error_handler();
- $that->fail("$message should not be raised");
- }
- });
-
- $formatter = new NormalizerFormatter();
- $reflMethod = new \ReflectionMethod($formatter, 'toJson');
- $reflMethod->setAccessible(true);
- $res = $reflMethod->invoke($formatter, array($foo, $bar), true);
-
- restore_error_handler();
-
- $this->assertEquals(@json_encode(array($foo, $bar)), $res);
- }
-
- public function testIgnoresInvalidTypes()
- {
- // set up the recursion
- $resource = fopen(__FILE__, 'r');
-
- // set an error handler to assert that the error is not raised anymore
- $that = $this;
- set_error_handler(function ($level, $message, $file, $line, $context) use ($that) {
- if (error_reporting() & $level) {
- restore_error_handler();
- $that->fail("$message should not be raised");
- }
- });
-
- $formatter = new NormalizerFormatter();
- $reflMethod = new \ReflectionMethod($formatter, 'toJson');
- $reflMethod->setAccessible(true);
- $res = $reflMethod->invoke($formatter, array($resource), true);
-
- restore_error_handler();
-
- $this->assertEquals(@json_encode(array($resource)), $res);
- }
-
- /**
- * @expectedException RuntimeException
- */
- public function testThrowsOnInvalidEncoding()
- {
- $formatter = new NormalizerFormatter();
- $reflMethod = new \ReflectionMethod($formatter, 'toJson');
- $reflMethod->setAccessible(true);
-
- // send an invalid unicode sequence
- $res = $reflMethod->invoke($formatter, array('message' => "\xB1\x31"));
- if (PHP_VERSION_ID < 50500 && $res === '{"message":null}') {
- throw new \RuntimeException('PHP 5.3/5.4 throw a warning and null the value instead of returning false entirely');
- }
- }
-
- public function testExceptionTraceWithArgs()
- {
- if (defined('HHVM_VERSION')) {
- $this->markTestSkipped('Not supported in HHVM since it detects errors differently');
- }
-
- // This happens i.e. in React promises or Guzzle streams where stream wrappers are registered
- // and no file or line are included in the trace because it's treated as internal function
- set_error_handler(function ($errno, $errstr, $errfile, $errline) {
- throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
- });
-
- try {
- // This will contain $resource and $wrappedResource as arguments in the trace item
- $resource = fopen('php://memory', 'rw+');
- fwrite($resource, 'test_resource');
- $wrappedResource = new TestFooNorm;
- $wrappedResource->foo = $resource;
- // Just do something stupid with a resource/wrapped resource as argument
- array_keys($wrappedResource);
- } catch (\Exception $e) {
- restore_error_handler();
- }
-
- $formatter = new NormalizerFormatter();
- $record = array('context' => array('exception' => $e));
- $result = $formatter->format($record);
-
- $this->assertRegExp(
- '%"resource":"\[resource\] \(stream\)"%',
- $result['context']['exception']['trace'][0]
- );
-
- if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
- $pattern = '%"wrappedResource":"\[object\] \(Monolog\\\\\\\\Formatter\\\\\\\\TestFooNorm: \)"%';
- } else {
- $pattern = '%\\\\"foo\\\\":null%';
- }
-
- // Tests that the wrapped resource is ignored while encoding, only works for PHP <= 5.4
- $this->assertRegExp(
- $pattern,
- $result['context']['exception']['trace'][0]
- );
- }
-}
-
-class TestFooNorm
-{
- public $foo = 'foo';
-}
-
-class TestBarNorm
-{
- public function __toString()
- {
- return 'bar';
- }
-}
-
-class TestStreamFoo
-{
- public $foo;
- public $resource;
-
- public function __construct($resource)
- {
- $this->resource = $resource;
- $this->foo = 'BAR';
- }
-
- public function __toString()
- {
- fseek($this->resource, 0);
-
- return $this->foo . ' - ' . (string) stream_get_contents($this->resource);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php
deleted file mode 100644
index 2a35446..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-formatter = new ScalarFormatter();
- }
-
- public function buildTrace(\Exception $e)
- {
- $data = array();
- $trace = $e->getTrace();
- foreach ($trace as $frame) {
- if (isset($frame['file'])) {
- $data[] = $frame['file'].':'.$frame['line'];
- } else {
- $data[] = json_encode($frame);
- }
- }
-
- return $data;
- }
-
- public function encodeJson($data)
- {
- if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
- return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
- }
-
- return json_encode($data);
- }
-
- public function testFormat()
- {
- $exception = new \Exception('foo');
- $formatted = $this->formatter->format(array(
- 'foo' => 'string',
- 'bar' => 1,
- 'baz' => false,
- 'bam' => array(1, 2, 3),
- 'bat' => array('foo' => 'bar'),
- 'bap' => \DateTime::createFromFormat(\DateTime::ISO8601, '1970-01-01T00:00:00+0000'),
- 'ban' => $exception
- ));
-
- $this->assertSame(array(
- 'foo' => 'string',
- 'bar' => 1,
- 'baz' => false,
- 'bam' => $this->encodeJson(array(1, 2, 3)),
- 'bat' => $this->encodeJson(array('foo' => 'bar')),
- 'bap' => '1970-01-01 00:00:00',
- 'ban' => $this->encodeJson(array(
- 'class' => get_class($exception),
- 'message' => $exception->getMessage(),
- 'code' => $exception->getCode(),
- 'file' => $exception->getFile() . ':' . $exception->getLine(),
- 'trace' => $this->buildTrace($exception)
- ))
- ), $formatted);
- }
-
- public function testFormatWithErrorContext()
- {
- $context = array('file' => 'foo', 'line' => 1);
- $formatted = $this->formatter->format(array(
- 'context' => $context
- ));
-
- $this->assertSame(array(
- 'context' => $this->encodeJson($context)
- ), $formatted);
- }
-
- public function testFormatWithExceptionContext()
- {
- $exception = new \Exception('foo');
- $formatted = $this->formatter->format(array(
- 'context' => array(
- 'exception' => $exception
- )
- ));
-
- $this->assertSame(array(
- 'context' => $this->encodeJson(array(
- 'exception' => array(
- 'class' => get_class($exception),
- 'message' => $exception->getMessage(),
- 'code' => $exception->getCode(),
- 'file' => $exception->getFile() . ':' . $exception->getLine(),
- 'trace' => $this->buildTrace($exception)
- )
- ))
- ), $formatted);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php b/application/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php
deleted file mode 100644
index 52f15a3..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php
+++ /dev/null
@@ -1,142 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @covers Monolog\Formatter\WildfireFormatter::format
- */
- public function testDefaultFormat()
- {
- $wildfire = new WildfireFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('ip' => '127.0.0.1'),
- 'message' => 'log',
- );
-
- $message = $wildfire->format($record);
-
- $this->assertEquals(
- '125|[{"Type":"ERROR","File":"","Line":"","Label":"meh"},'
- .'{"message":"log","context":{"from":"logger"},"extra":{"ip":"127.0.0.1"}}]|',
- $message
- );
- }
-
- /**
- * @covers Monolog\Formatter\WildfireFormatter::format
- */
- public function testFormatWithFileAndLine()
- {
- $wildfire = new WildfireFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('from' => 'logger'),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14),
- 'message' => 'log',
- );
-
- $message = $wildfire->format($record);
-
- $this->assertEquals(
- '129|[{"Type":"ERROR","File":"test","Line":14,"Label":"meh"},'
- .'{"message":"log","context":{"from":"logger"},"extra":{"ip":"127.0.0.1"}}]|',
- $message
- );
- }
-
- /**
- * @covers Monolog\Formatter\WildfireFormatter::format
- */
- public function testFormatWithoutContext()
- {
- $wildfire = new WildfireFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- $message = $wildfire->format($record);
-
- $this->assertEquals(
- '58|[{"Type":"ERROR","File":"","Line":"","Label":"meh"},"log"]|',
- $message
- );
- }
-
- /**
- * @covers Monolog\Formatter\WildfireFormatter::formatBatch
- * @expectedException BadMethodCallException
- */
- public function testBatchFormatThrowException()
- {
- $wildfire = new WildfireFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array(),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- $wildfire->formatBatch(array($record));
- }
-
- /**
- * @covers Monolog\Formatter\WildfireFormatter::format
- */
- public function testTableFormat()
- {
- $wildfire = new WildfireFormatter();
- $record = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'table-channel',
- 'context' => array(
- WildfireFormatter::TABLE => array(
- array('col1', 'col2', 'col3'),
- array('val1', 'val2', 'val3'),
- array('foo1', 'foo2', 'foo3'),
- array('bar1', 'bar2', 'bar3'),
- ),
- ),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'table-message',
- );
-
- $message = $wildfire->format($record);
-
- $this->assertEquals(
- '171|[{"Type":"TABLE","File":"","Line":"","Label":"table-channel: table-message"},[["col1","col2","col3"],["val1","val2","val3"],["foo1","foo2","foo3"],["bar1","bar2","bar3"]]]|',
- $message
- );
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php
deleted file mode 100644
index 568eb9d..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Processor\WebProcessor;
-
-class AbstractHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\AbstractHandler::__construct
- * @covers Monolog\Handler\AbstractHandler::getLevel
- * @covers Monolog\Handler\AbstractHandler::setLevel
- * @covers Monolog\Handler\AbstractHandler::getBubble
- * @covers Monolog\Handler\AbstractHandler::setBubble
- * @covers Monolog\Handler\AbstractHandler::getFormatter
- * @covers Monolog\Handler\AbstractHandler::setFormatter
- */
- public function testConstructAndGetSet()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false));
- $this->assertEquals(Logger::WARNING, $handler->getLevel());
- $this->assertEquals(false, $handler->getBubble());
-
- $handler->setLevel(Logger::ERROR);
- $handler->setBubble(true);
- $handler->setFormatter($formatter = new LineFormatter);
- $this->assertEquals(Logger::ERROR, $handler->getLevel());
- $this->assertEquals(true, $handler->getBubble());
- $this->assertSame($formatter, $handler->getFormatter());
- }
-
- /**
- * @covers Monolog\Handler\AbstractHandler::handleBatch
- */
- public function testHandleBatch()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
- $handler->expects($this->exactly(2))
- ->method('handle');
- $handler->handleBatch(array($this->getRecord(), $this->getRecord()));
- }
-
- /**
- * @covers Monolog\Handler\AbstractHandler::isHandling
- */
- public function testIsHandling()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false));
- $this->assertTrue($handler->isHandling($this->getRecord()));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
- }
-
- /**
- * @covers Monolog\Handler\AbstractHandler::__construct
- */
- public function testHandlesPsrStyleLevels()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array('warning', false));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
- $handler->setLevel('debug');
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG)));
- }
-
- /**
- * @covers Monolog\Handler\AbstractHandler::getFormatter
- * @covers Monolog\Handler\AbstractHandler::getDefaultFormatter
- */
- public function testGetFormatterInitializesDefault()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
- $this->assertInstanceOf('Monolog\Formatter\LineFormatter', $handler->getFormatter());
- }
-
- /**
- * @covers Monolog\Handler\AbstractHandler::pushProcessor
- * @covers Monolog\Handler\AbstractHandler::popProcessor
- * @expectedException LogicException
- */
- public function testPushPopProcessor()
- {
- $logger = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
- $processor1 = new WebProcessor;
- $processor2 = new WebProcessor;
-
- $logger->pushProcessor($processor1);
- $logger->pushProcessor($processor2);
-
- $this->assertEquals($processor2, $logger->popProcessor());
- $this->assertEquals($processor1, $logger->popProcessor());
- $logger->popProcessor();
- }
-
- /**
- * @covers Monolog\Handler\AbstractHandler::pushProcessor
- * @expectedException InvalidArgumentException
- */
- public function testPushProcessorWithNonCallable()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
-
- $handler->pushProcessor(new \stdClass());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php
deleted file mode 100644
index 24d4f63..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Processor\WebProcessor;
-
-class AbstractProcessingHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\AbstractProcessingHandler::handle
- */
- public function testHandleLowerLevelMessage()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, true));
- $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
- }
-
- /**
- * @covers Monolog\Handler\AbstractProcessingHandler::handle
- */
- public function testHandleBubbling()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, true));
- $this->assertFalse($handler->handle($this->getRecord()));
- }
-
- /**
- * @covers Monolog\Handler\AbstractProcessingHandler::handle
- */
- public function testHandleNotBubbling()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, false));
- $this->assertTrue($handler->handle($this->getRecord()));
- }
-
- /**
- * @covers Monolog\Handler\AbstractProcessingHandler::handle
- */
- public function testHandleIsFalseWhenNotHandled()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, false));
- $this->assertTrue($handler->handle($this->getRecord()));
- $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
- }
-
- /**
- * @covers Monolog\Handler\AbstractProcessingHandler::processRecord
- */
- public function testProcessRecord()
- {
- $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler');
- $handler->pushProcessor(new WebProcessor(array(
- 'REQUEST_URI' => '',
- 'REQUEST_METHOD' => '',
- 'REMOTE_ADDR' => '',
- 'SERVER_NAME' => '',
- 'UNIQUE_ID' => '',
- )));
- $handledRecord = null;
- $handler->expects($this->once())
- ->method('write')
- ->will($this->returnCallback(function ($record) use (&$handledRecord) {
- $handledRecord = $record;
- }))
- ;
- $handler->handle($this->getRecord());
- $this->assertEquals(6, count($handledRecord['extra']));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php
deleted file mode 100644
index a71d625..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use PhpAmqpLib\Message\AMQPMessage;
-use PhpAmqpLib\Connection\AMQPConnection;
-
-/**
- * @covers Monolog\Handler\RotatingFileHandler
- */
-class AmqpHandlerTest extends TestCase
-{
- public function testHandleAmqpExt()
- {
- if (!class_exists('AMQPConnection') || !class_exists('AMQPExchange')) {
- $this->markTestSkipped("amqp-php not installed");
- }
-
- if (!class_exists('AMQPChannel')) {
- $this->markTestSkipped("Please update AMQP to version >= 1.0");
- }
-
- $messages = array();
-
- $exchange = $this->getMock('AMQPExchange', array('publish', 'setName'), array(), '', false);
- $exchange->expects($this->once())
- ->method('setName')
- ->with('log')
- ;
- $exchange->expects($this->any())
- ->method('publish')
- ->will($this->returnCallback(function ($message, $routing_key, $flags = 0, $attributes = array()) use (&$messages) {
- $messages[] = array($message, $routing_key, $flags, $attributes);
- }))
- ;
-
- $handler = new AmqpHandler($exchange, 'log');
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $expected = array(
- array(
- 'message' => 'test',
- 'context' => array(
- 'data' => array(),
- 'foo' => 34,
- ),
- 'level' => 300,
- 'level_name' => 'WARNING',
- 'channel' => 'test',
- 'extra' => array(),
- ),
- 'warn.test',
- 0,
- array(
- 'delivery_mode' => 2,
- 'Content-type' => 'application/json'
- )
- );
-
- $handler->handle($record);
-
- $this->assertCount(1, $messages);
- $messages[0][0] = json_decode($messages[0][0], true);
- unset($messages[0][0]['datetime']);
- $this->assertEquals($expected, $messages[0]);
- }
-
- public function testHandlePhpAmqpLib()
- {
- if (!class_exists('PhpAmqpLib\Connection\AMQPConnection')) {
- $this->markTestSkipped("php-amqplib not installed");
- }
-
- $messages = array();
-
- $exchange = $this->getMock('PhpAmqpLib\Channel\AMQPChannel', array('basic_publish', '__destruct'), array(), '', false);
-
- $exchange->expects($this->any())
- ->method('basic_publish')
- ->will($this->returnCallback(function (AMQPMessage $msg, $exchange = "", $routing_key = "", $mandatory = false, $immediate = false, $ticket = null) use (&$messages) {
- $messages[] = array($msg, $exchange, $routing_key, $mandatory, $immediate, $ticket);
- }))
- ;
-
- $handler = new AmqpHandler($exchange, 'log');
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $expected = array(
- array(
- 'message' => 'test',
- 'context' => array(
- 'data' => array(),
- 'foo' => 34,
- ),
- 'level' => 300,
- 'level_name' => 'WARNING',
- 'channel' => 'test',
- 'extra' => array(),
- ),
- 'log',
- 'warn.test',
- false,
- false,
- null,
- array(
- 'delivery_mode' => 2,
- 'content_type' => 'application/json'
- )
- );
-
- $handler->handle($record);
-
- $this->assertCount(1, $messages);
-
- /* @var $msg AMQPMessage */
- $msg = $messages[0][0];
- $messages[0][0] = json_decode($msg->body, true);
- $messages[0][] = $msg->get_properties();
- unset($messages[0][0]['datetime']);
-
- $this->assertEquals($expected, $messages[0]);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
deleted file mode 100644
index ffb1d74..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\BrowserConsoleHandlerTest
- */
-class BrowserConsoleHandlerTest extends TestCase
-{
- protected function setUp()
- {
- BrowserConsoleHandler::reset();
- }
-
- protected function generateScript()
- {
- $reflMethod = new \ReflectionMethod('Monolog\Handler\BrowserConsoleHandler', 'generateScript');
- $reflMethod->setAccessible(true);
-
- return $reflMethod->invoke(null);
- }
-
- public function testStyling()
- {
- $handler = new BrowserConsoleHandler();
- $handler->setFormatter($this->getIdentityFormatter());
-
- $handler->handle($this->getRecord(Logger::DEBUG, 'foo[[bar]]{color: red}'));
-
- $expected = <<assertEquals($expected, $this->generateScript());
- }
-
- public function testEscaping()
- {
- $handler = new BrowserConsoleHandler();
- $handler->setFormatter($this->getIdentityFormatter());
-
- $handler->handle($this->getRecord(Logger::DEBUG, "[foo] [[\"bar\n[baz]\"]]{color: red}"));
-
- $expected = <<assertEquals($expected, $this->generateScript());
- }
-
- public function testAutolabel()
- {
- $handler = new BrowserConsoleHandler();
- $handler->setFormatter($this->getIdentityFormatter());
-
- $handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}'));
- $handler->handle($this->getRecord(Logger::DEBUG, '[[bar]]{macro: autolabel}'));
- $handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}'));
-
- $expected = <<assertEquals($expected, $this->generateScript());
- }
-
- public function testContext()
- {
- $handler = new BrowserConsoleHandler();
- $handler->setFormatter($this->getIdentityFormatter());
-
- $handler->handle($this->getRecord(Logger::DEBUG, 'test', array('foo' => 'bar')));
-
- $expected = <<assertEquals($expected, $this->generateScript());
- }
-
- public function testConcurrentHandlers()
- {
- $handler1 = new BrowserConsoleHandler();
- $handler1->setFormatter($this->getIdentityFormatter());
-
- $handler2 = new BrowserConsoleHandler();
- $handler2->setFormatter($this->getIdentityFormatter());
-
- $handler1->handle($this->getRecord(Logger::DEBUG, 'test1'));
- $handler2->handle($this->getRecord(Logger::DEBUG, 'test2'));
- $handler1->handle($this->getRecord(Logger::DEBUG, 'test3'));
- $handler2->handle($this->getRecord(Logger::DEBUG, 'test4'));
-
- $expected = <<assertEquals($expected, $this->generateScript());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php
deleted file mode 100644
index da8b3c3..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class BufferHandlerTest extends TestCase
-{
- private $shutdownCheckHandler;
-
- /**
- * @covers Monolog\Handler\BufferHandler::__construct
- * @covers Monolog\Handler\BufferHandler::handle
- * @covers Monolog\Handler\BufferHandler::close
- */
- public function testHandleBuffers()
- {
- $test = new TestHandler();
- $handler = new BufferHandler($test);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $this->assertFalse($test->hasDebugRecords());
- $this->assertFalse($test->hasInfoRecords());
- $handler->close();
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue(count($test->getRecords()) === 2);
- }
-
- /**
- * @covers Monolog\Handler\BufferHandler::close
- * @covers Monolog\Handler\BufferHandler::flush
- */
- public function testPropagatesRecordsAtEndOfRequest()
- {
- $test = new TestHandler();
- $handler = new BufferHandler($test);
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $this->shutdownCheckHandler = $test;
- register_shutdown_function(array($this, 'checkPropagation'));
- }
-
- public function checkPropagation()
- {
- if (!$this->shutdownCheckHandler->hasWarningRecords() || !$this->shutdownCheckHandler->hasDebugRecords()) {
- echo '!!! BufferHandlerTest::testPropagatesRecordsAtEndOfRequest failed to verify that the messages have been propagated' . PHP_EOL;
- exit(1);
- }
- }
-
- /**
- * @covers Monolog\Handler\BufferHandler::handle
- */
- public function testHandleBufferLimit()
- {
- $test = new TestHandler();
- $handler = new BufferHandler($test, 2);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->close();
- $this->assertTrue($test->hasWarningRecords());
- $this->assertTrue($test->hasInfoRecords());
- $this->assertFalse($test->hasDebugRecords());
- }
-
- /**
- * @covers Monolog\Handler\BufferHandler::handle
- */
- public function testHandleBufferLimitWithFlushOnOverflow()
- {
- $test = new TestHandler();
- $handler = new BufferHandler($test, 3, Logger::DEBUG, true, true);
-
- // send two records
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $this->assertFalse($test->hasDebugRecords());
- $this->assertCount(0, $test->getRecords());
-
- // overflow
- $handler->handle($this->getRecord(Logger::INFO));
- $this->assertTrue($test->hasDebugRecords());
- $this->assertCount(3, $test->getRecords());
-
- // should buffer again
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertCount(3, $test->getRecords());
-
- $handler->close();
- $this->assertCount(5, $test->getRecords());
- $this->assertTrue($test->hasWarningRecords());
- $this->assertTrue($test->hasInfoRecords());
- }
-
- /**
- * @covers Monolog\Handler\BufferHandler::handle
- */
- public function testHandleLevel()
- {
- $test = new TestHandler();
- $handler = new BufferHandler($test, 0, Logger::INFO);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->close();
- $this->assertTrue($test->hasWarningRecords());
- $this->assertTrue($test->hasInfoRecords());
- $this->assertFalse($test->hasDebugRecords());
- }
-
- /**
- * @covers Monolog\Handler\BufferHandler::flush
- */
- public function testFlush()
- {
- $test = new TestHandler();
- $handler = new BufferHandler($test, 0);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->flush();
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue($test->hasDebugRecords());
- $this->assertFalse($test->hasWarningRecords());
- }
-
- /**
- * @covers Monolog\Handler\BufferHandler::handle
- */
- public function testHandleUsesProcessors()
- {
- $test = new TestHandler();
- $handler = new BufferHandler($test);
- $handler->pushProcessor(function ($record) {
- $record['extra']['foo'] = true;
-
- return $record;
- });
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->flush();
- $this->assertTrue($test->hasWarningRecords());
- $records = $test->getRecords();
- $this->assertTrue($records[0]['extra']['foo']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
deleted file mode 100644
index 4d64025..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\ChromePHPHandler
- */
-class ChromePHPHandlerTest extends TestCase
-{
- protected function setUp()
- {
- TestChromePHPHandler::reset();
- $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; Chrome/1.0';
- }
-
- public function testHeaders()
- {
- $handler = new TestChromePHPHandler();
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::WARNING));
-
- $expected = array(
- 'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array(
- 'version' => ChromePHPHandler::VERSION,
- 'columns' => array('label', 'log', 'backtrace', 'type'),
- 'rows' => array(
- 'test',
- 'test',
- ),
- 'request_uri' => '',
- ))))
- );
-
- $this->assertEquals($expected, $handler->getHeaders());
- }
-
- public function testHeadersOverflow()
- {
- $handler = new TestChromePHPHandler();
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 150 * 1024)));
-
- // overflow chrome headers limit
- $handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 100 * 1024)));
-
- $expected = array(
- 'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array(
- 'version' => ChromePHPHandler::VERSION,
- 'columns' => array('label', 'log', 'backtrace', 'type'),
- 'rows' => array(
- array(
- 'test',
- 'test',
- 'unknown',
- 'log',
- ),
- array(
- 'test',
- str_repeat('a', 150 * 1024),
- 'unknown',
- 'warn',
- ),
- array(
- 'monolog',
- 'Incomplete logs, chrome header size limit reached',
- 'unknown',
- 'warn',
- ),
- ),
- 'request_uri' => '',
- ))))
- );
-
- $this->assertEquals($expected, $handler->getHeaders());
- }
-
- public function testConcurrentHandlers()
- {
- $handler = new TestChromePHPHandler();
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::WARNING));
-
- $handler2 = new TestChromePHPHandler();
- $handler2->setFormatter($this->getIdentityFormatter());
- $handler2->handle($this->getRecord(Logger::DEBUG));
- $handler2->handle($this->getRecord(Logger::WARNING));
-
- $expected = array(
- 'X-ChromeLogger-Data' => base64_encode(utf8_encode(json_encode(array(
- 'version' => ChromePHPHandler::VERSION,
- 'columns' => array('label', 'log', 'backtrace', 'type'),
- 'rows' => array(
- 'test',
- 'test',
- 'test',
- 'test',
- ),
- 'request_uri' => '',
- ))))
- );
-
- $this->assertEquals($expected, $handler2->getHeaders());
- }
-}
-
-class TestChromePHPHandler extends ChromePHPHandler
-{
- protected $headers = array();
-
- public static function reset()
- {
- self::$initialized = false;
- self::$overflowed = false;
- self::$sendHeaders = true;
- self::$json['rows'] = array();
- }
-
- protected function sendHeader($header, $content)
- {
- $this->headers[$header] = $content;
- }
-
- public function getHeaders()
- {
- return $this->headers;
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php
deleted file mode 100644
index 9fc4b38..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class CouchDBHandlerTest extends TestCase
-{
- public function testHandle()
- {
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $handler = new CouchDBHandler();
-
- try {
- $handler->handle($record);
- } catch (\RuntimeException $e) {
- $this->markTestSkipped('Could not connect to couchdb server on http://localhost:5984');
- }
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
deleted file mode 100644
index d67da90..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class DoctrineCouchDBHandlerTest extends TestCase
-{
- protected function setup()
- {
- if (!class_exists('Doctrine\CouchDB\CouchDBClient')) {
- $this->markTestSkipped('The "doctrine/couchdb" package is not installed');
- }
- }
-
- public function testHandle()
- {
- $client = $this->getMockBuilder('Doctrine\\CouchDB\\CouchDBClient')
- ->setMethods(array('postDocument'))
- ->disableOriginalConstructor()
- ->getMock();
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $expected = array(
- 'message' => 'test',
- 'context' => array('data' => '[object] (stdClass: {})', 'foo' => 34),
- 'level' => Logger::WARNING,
- 'level_name' => 'WARNING',
- 'channel' => 'test',
- 'datetime' => $record['datetime']->format('Y-m-d H:i:s'),
- 'extra' => array(),
- );
-
- $client->expects($this->once())
- ->method('postDocument')
- ->with($expected);
-
- $handler = new DoctrineCouchDBHandler($client);
- $handler->handle($record);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php
deleted file mode 100644
index 42d4323..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-class DynamoDbHandlerTest extends TestCase
-{
- private $client;
-
- public function setUp()
- {
- if (!class_exists('Aws\DynamoDb\DynamoDbClient')) {
- $this->markTestSkipped('aws/aws-sdk-php not installed');
- }
-
- $this->client = $this->getMockBuilder('Aws\DynamoDb\DynamoDbClient')
- ->setMethods(array('formatAttributes', '__call'))
- ->disableOriginalConstructor()->getMock();
- }
-
- public function testConstruct()
- {
- $this->assertInstanceOf('Monolog\Handler\DynamoDbHandler', new DynamoDbHandler($this->client, 'foo'));
- }
-
- public function testInterface()
- {
- $this->assertInstanceOf('Monolog\Handler\HandlerInterface', new DynamoDbHandler($this->client, 'foo'));
- }
-
- public function testGetFormatter()
- {
- $handler = new DynamoDbHandler($this->client, 'foo');
- $this->assertInstanceOf('Monolog\Formatter\ScalarFormatter', $handler->getFormatter());
- }
-
- public function testHandle()
- {
- $record = $this->getRecord();
- $formatter = $this->getMock('Monolog\Formatter\FormatterInterface');
- $formatted = array('foo' => 1, 'bar' => 2);
- $handler = new DynamoDbHandler($this->client, 'foo');
- $handler->setFormatter($formatter);
-
- $formatter
- ->expects($this->once())
- ->method('format')
- ->with($record)
- ->will($this->returnValue($formatted));
- $this->client
- ->expects($this->once())
- ->method('formatAttributes')
- ->with($this->isType('array'))
- ->will($this->returnValue($formatted));
- $this->client
- ->expects($this->once())
- ->method('__call')
- ->with('putItem', array(array(
- 'TableName' => 'foo',
- 'Item' => $formatted
- )));
-
- $handler->handle($record);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php
deleted file mode 100644
index 1687074..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php
+++ /dev/null
@@ -1,239 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\ElasticaFormatter;
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\TestCase;
-use Monolog\Logger;
-use Elastica\Client;
-use Elastica\Request;
-use Elastica\Response;
-
-class ElasticSearchHandlerTest extends TestCase
-{
- /**
- * @var Client mock
- */
- protected $client;
-
- /**
- * @var array Default handler options
- */
- protected $options = array(
- 'index' => 'my_index',
- 'type' => 'doc_type',
- );
-
- public function setUp()
- {
- // Elastica lib required
- if (!class_exists("Elastica\Client")) {
- $this->markTestSkipped("ruflin/elastica not installed");
- }
-
- // base mock Elastica Client object
- $this->client = $this->getMockBuilder('Elastica\Client')
- ->setMethods(array('addDocuments'))
- ->disableOriginalConstructor()
- ->getMock();
- }
-
- /**
- * @covers Monolog\Handler\ElasticSearchHandler::write
- * @covers Monolog\Handler\ElasticSearchHandler::handleBatch
- * @covers Monolog\Handler\ElasticSearchHandler::bulkSend
- * @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter
- */
- public function testHandle()
- {
- // log message
- $msg = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- // format expected result
- $formatter = new ElasticaFormatter($this->options['index'], $this->options['type']);
- $expected = array($formatter->format($msg));
-
- // setup ES client mock
- $this->client->expects($this->any())
- ->method('addDocuments')
- ->with($expected);
-
- // perform tests
- $handler = new ElasticSearchHandler($this->client, $this->options);
- $handler->handle($msg);
- $handler->handleBatch(array($msg));
- }
-
- /**
- * @covers Monolog\Handler\ElasticSearchHandler::setFormatter
- */
- public function testSetFormatter()
- {
- $handler = new ElasticSearchHandler($this->client);
- $formatter = new ElasticaFormatter('index_new', 'type_new');
- $handler->setFormatter($formatter);
- $this->assertInstanceOf('Monolog\Formatter\ElasticaFormatter', $handler->getFormatter());
- $this->assertEquals('index_new', $handler->getFormatter()->getIndex());
- $this->assertEquals('type_new', $handler->getFormatter()->getType());
- }
-
- /**
- * @covers Monolog\Handler\ElasticSearchHandler::setFormatter
- * @expectedException InvalidArgumentException
- * @expectedExceptionMessage ElasticSearchHandler is only compatible with ElasticaFormatter
- */
- public function testSetFormatterInvalid()
- {
- $handler = new ElasticSearchHandler($this->client);
- $formatter = new NormalizerFormatter();
- $handler->setFormatter($formatter);
- }
-
- /**
- * @covers Monolog\Handler\ElasticSearchHandler::__construct
- * @covers Monolog\Handler\ElasticSearchHandler::getOptions
- */
- public function testOptions()
- {
- $expected = array(
- 'index' => $this->options['index'],
- 'type' => $this->options['type'],
- 'ignore_error' => false,
- );
- $handler = new ElasticSearchHandler($this->client, $this->options);
- $this->assertEquals($expected, $handler->getOptions());
- }
-
- /**
- * @covers Monolog\Handler\ElasticSearchHandler::bulkSend
- * @dataProvider providerTestConnectionErrors
- */
- public function testConnectionErrors($ignore, $expectedError)
- {
- $clientOpts = array('host' => '127.0.0.1', 'port' => 1);
- $client = new Client($clientOpts);
- $handlerOpts = array('ignore_error' => $ignore);
- $handler = new ElasticSearchHandler($client, $handlerOpts);
-
- if ($expectedError) {
- $this->setExpectedException($expectedError[0], $expectedError[1]);
- $handler->handle($this->getRecord());
- } else {
- $this->assertFalse($handler->handle($this->getRecord()));
- }
- }
-
- /**
- * @return array
- */
- public function providerTestConnectionErrors()
- {
- return array(
- array(false, array('RuntimeException', 'Error sending messages to Elasticsearch')),
- array(true, false),
- );
- }
-
- /**
- * Integration test using localhost Elastic Search server
- *
- * @covers Monolog\Handler\ElasticSearchHandler::__construct
- * @covers Monolog\Handler\ElasticSearchHandler::handleBatch
- * @covers Monolog\Handler\ElasticSearchHandler::bulkSend
- * @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter
- */
- public function testHandleIntegration()
- {
- $msg = array(
- 'level' => Logger::ERROR,
- 'level_name' => 'ERROR',
- 'channel' => 'meh',
- 'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
- 'datetime' => new \DateTime("@0"),
- 'extra' => array(),
- 'message' => 'log',
- );
-
- $expected = $msg;
- $expected['datetime'] = $msg['datetime']->format(\DateTime::ISO8601);
- $expected['context'] = array(
- 'class' => '[object] (stdClass: {})',
- 'foo' => 7,
- 0 => 'bar',
- );
-
- $client = new Client();
- $handler = new ElasticSearchHandler($client, $this->options);
- try {
- $handler->handleBatch(array($msg));
- } catch (\RuntimeException $e) {
- $this->markTestSkipped("Cannot connect to Elastic Search server on localhost");
- }
-
- // check document id from ES server response
- $documentId = $this->getCreatedDocId($client->getLastResponse());
- $this->assertNotEmpty($documentId, 'No elastic document id received');
-
- // retrieve document source from ES and validate
- $document = $this->getDocSourceFromElastic(
- $client,
- $this->options['index'],
- $this->options['type'],
- $documentId
- );
- $this->assertEquals($expected, $document);
-
- // remove test index from ES
- $client->request("/{$this->options['index']}", Request::DELETE);
- }
-
- /**
- * Return last created document id from ES response
- * @param Response $response Elastica Response object
- * @return string|null
- */
- protected function getCreatedDocId(Response $response)
- {
- $data = $response->getData();
- if (!empty($data['items'][0]['create']['_id'])) {
- return $data['items'][0]['create']['_id'];
- }
- }
-
- /**
- * Retrieve document by id from Elasticsearch
- * @param Client $client Elastica client
- * @param string $index
- * @param string $type
- * @param string $documentId
- * @return array
- */
- protected function getDocSourceFromElastic(Client $client, $index, $type, $documentId)
- {
- $resp = $client->request("/{$index}/{$type}/{$documentId}", Request::GET);
- $data = $resp->getData();
- if (!empty($data['_source'])) {
- return $data['_source'];
- }
-
- return array();
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php
deleted file mode 100644
index 99785cb..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-function error_log()
-{
- $GLOBALS['error_log'][] = func_get_args();
-}
-
-class ErrorLogHandlerTest extends TestCase
-{
- protected function setUp()
- {
- $GLOBALS['error_log'] = array();
- }
-
- /**
- * @covers Monolog\Handler\ErrorLogHandler::__construct
- * @expectedException InvalidArgumentException
- * @expectedExceptionMessage The given message type "42" is not supported
- */
- public function testShouldNotAcceptAnInvalidTypeOnContructor()
- {
- new ErrorLogHandler(42);
- }
-
- /**
- * @covers Monolog\Handler\ErrorLogHandler::write
- */
- public function testShouldLogMessagesUsingErrorLogFuncion()
- {
- $type = ErrorLogHandler::OPERATING_SYSTEM;
- $handler = new ErrorLogHandler($type);
- $handler->setFormatter(new LineFormatter('%channel%.%level_name%: %message% %context% %extra%', null, true));
- $handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
-
- $this->assertSame("test.ERROR: Foo\nBar\r\n\r\nBaz [] []", $GLOBALS['error_log'][0][0]);
- $this->assertSame($GLOBALS['error_log'][0][1], $type);
-
- $handler = new ErrorLogHandler($type, Logger::DEBUG, true, true);
- $handler->setFormatter(new LineFormatter(null, null, true));
- $handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
-
- $this->assertStringMatchesFormat('[%s] test.ERROR: Foo', $GLOBALS['error_log'][1][0]);
- $this->assertSame($GLOBALS['error_log'][1][1], $type);
-
- $this->assertStringMatchesFormat('Bar', $GLOBALS['error_log'][2][0]);
- $this->assertSame($GLOBALS['error_log'][2][1], $type);
-
- $this->assertStringMatchesFormat('Baz [] []', $GLOBALS['error_log'][3][0]);
- $this->assertSame($GLOBALS['error_log'][3][1], $type);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php
deleted file mode 100644
index 31b7686..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class FilterHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\FilterHandler::isHandling
- */
- public function testIsHandling()
- {
- $test = new TestHandler();
- $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE);
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::INFO)));
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::NOTICE)));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::WARNING)));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::ERROR)));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::CRITICAL)));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::ALERT)));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::EMERGENCY)));
- }
-
- /**
- * @covers Monolog\Handler\FilterHandler::handle
- * @covers Monolog\Handler\FilterHandler::setAcceptedLevels
- * @covers Monolog\Handler\FilterHandler::isHandling
- */
- public function testHandleProcessOnlyNeededLevels()
- {
- $test = new TestHandler();
- $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE);
-
- $handler->handle($this->getRecord(Logger::DEBUG));
- $this->assertFalse($test->hasDebugRecords());
-
- $handler->handle($this->getRecord(Logger::INFO));
- $this->assertTrue($test->hasInfoRecords());
- $handler->handle($this->getRecord(Logger::NOTICE));
- $this->assertTrue($test->hasNoticeRecords());
-
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertFalse($test->hasWarningRecords());
- $handler->handle($this->getRecord(Logger::ERROR));
- $this->assertFalse($test->hasErrorRecords());
- $handler->handle($this->getRecord(Logger::CRITICAL));
- $this->assertFalse($test->hasCriticalRecords());
- $handler->handle($this->getRecord(Logger::ALERT));
- $this->assertFalse($test->hasAlertRecords());
- $handler->handle($this->getRecord(Logger::EMERGENCY));
- $this->assertFalse($test->hasEmergencyRecords());
-
- $test = new TestHandler();
- $handler = new FilterHandler($test, array(Logger::INFO, Logger::ERROR));
-
- $handler->handle($this->getRecord(Logger::DEBUG));
- $this->assertFalse($test->hasDebugRecords());
- $handler->handle($this->getRecord(Logger::INFO));
- $this->assertTrue($test->hasInfoRecords());
- $handler->handle($this->getRecord(Logger::NOTICE));
- $this->assertFalse($test->hasNoticeRecords());
- $handler->handle($this->getRecord(Logger::ERROR));
- $this->assertTrue($test->hasErrorRecords());
- $handler->handle($this->getRecord(Logger::CRITICAL));
- $this->assertFalse($test->hasCriticalRecords());
- }
-
- /**
- * @covers Monolog\Handler\FilterHandler::setAcceptedLevels
- * @covers Monolog\Handler\FilterHandler::getAcceptedLevels
- */
- public function testAcceptedLevelApi()
- {
- $test = new TestHandler();
- $handler = new FilterHandler($test);
-
- $levels = array(Logger::INFO, Logger::ERROR);
- $handler->setAcceptedLevels($levels);
- $this->assertSame($levels, $handler->getAcceptedLevels());
-
- $handler->setAcceptedLevels(array('info', 'error'));
- $this->assertSame($levels, $handler->getAcceptedLevels());
-
- $levels = array(Logger::CRITICAL, Logger::ALERT, Logger::EMERGENCY);
- $handler->setAcceptedLevels(Logger::CRITICAL, Logger::EMERGENCY);
- $this->assertSame($levels, $handler->getAcceptedLevels());
-
- $handler->setAcceptedLevels('critical', 'emergency');
- $this->assertSame($levels, $handler->getAcceptedLevels());
- }
-
- /**
- * @covers Monolog\Handler\FilterHandler::handle
- */
- public function testHandleUsesProcessors()
- {
- $test = new TestHandler();
- $handler = new FilterHandler($test, Logger::DEBUG, Logger::EMERGENCY);
- $handler->pushProcessor(
- function ($record) {
- $record['extra']['foo'] = true;
-
- return $record;
- }
- );
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasWarningRecords());
- $records = $test->getRecords();
- $this->assertTrue($records[0]['extra']['foo']);
- }
-
- /**
- * @covers Monolog\Handler\FilterHandler::handle
- */
- public function testHandleRespectsBubble()
- {
- $test = new TestHandler();
-
- $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, false);
- $this->assertTrue($handler->handle($this->getRecord(Logger::INFO)));
- $this->assertFalse($handler->handle($this->getRecord(Logger::WARNING)));
-
- $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, true);
- $this->assertFalse($handler->handle($this->getRecord(Logger::INFO)));
- $this->assertFalse($handler->handle($this->getRecord(Logger::WARNING)));
- }
-
- /**
- * @covers Monolog\Handler\FilterHandler::handle
- */
- public function testHandleWithCallback()
- {
- $test = new TestHandler();
- $handler = new FilterHandler(
- function ($record, $handler) use ($test) {
- return $test;
- }, Logger::INFO, Logger::NOTICE, false
- );
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $this->assertFalse($test->hasDebugRecords());
- $this->assertTrue($test->hasInfoRecords());
- }
-
- /**
- * @covers Monolog\Handler\FilterHandler::handle
- * @expectedException \RuntimeException
- */
- public function testHandleWithBadCallbackThrowsException()
- {
- $handler = new FilterHandler(
- function ($record, $handler) {
- return 'foo';
- }
- );
- $handler->handle($this->getRecord(Logger::WARNING));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php
deleted file mode 100644
index 8e31e9b..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php
+++ /dev/null
@@ -1,255 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
-use Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy;
-use Psr\Log\LogLevel;
-
-class FingersCrossedHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::__construct
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- */
- public function testHandleBuffers()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $this->assertFalse($test->hasDebugRecords());
- $this->assertFalse($test->hasInfoRecords());
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->close();
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue(count($test->getRecords()) === 3);
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- */
- public function testHandleStopsBufferingAfterTrigger()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test);
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->close();
- $this->assertTrue($test->hasWarningRecords());
- $this->assertTrue($test->hasDebugRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- * @covers Monolog\Handler\FingersCrossedHandler::reset
- */
- public function testHandleRestartBufferingAfterReset()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test);
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->reset();
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->close();
- $this->assertTrue($test->hasWarningRecords());
- $this->assertTrue($test->hasDebugRecords());
- $this->assertFalse($test->hasInfoRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- */
- public function testHandleRestartBufferingAfterBeingTriggeredWhenStopBufferingIsDisabled()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, Logger::WARNING, 0, false, false);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::WARNING));
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->close();
- $this->assertTrue($test->hasWarningRecords());
- $this->assertTrue($test->hasDebugRecords());
- $this->assertFalse($test->hasInfoRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- */
- public function testHandleBufferLimit()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, Logger::WARNING, 2);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasWarningRecords());
- $this->assertTrue($test->hasInfoRecords());
- $this->assertFalse($test->hasDebugRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- */
- public function testHandleWithCallback()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler(function ($record, $handler) use ($test) {
- return $test;
- });
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $this->assertFalse($test->hasDebugRecords());
- $this->assertFalse($test->hasInfoRecords());
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue(count($test->getRecords()) === 3);
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- * @expectedException RuntimeException
- */
- public function testHandleWithBadCallbackThrowsException()
- {
- $handler = new FingersCrossedHandler(function ($record, $handler) {
- return 'foo';
- });
- $handler->handle($this->getRecord(Logger::WARNING));
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::isHandling
- */
- public function testIsHandlingAlways()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, Logger::ERROR);
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG)));
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::__construct
- * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::__construct
- * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::isHandlerActivated
- */
- public function testErrorLevelActivationStrategy()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $this->assertFalse($test->hasDebugRecords());
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasWarningRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::__construct
- * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::__construct
- * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::isHandlerActivated
- */
- public function testErrorLevelActivationStrategyWithPsrLevel()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy('warning'));
- $handler->handle($this->getRecord(Logger::DEBUG));
- $this->assertFalse($test->hasDebugRecords());
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasWarningRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::__construct
- * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::isHandlerActivated
- */
- public function testChannelLevelActivationStrategy()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy(Logger::ERROR, array('othertest' => Logger::DEBUG)));
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertFalse($test->hasWarningRecords());
- $record = $this->getRecord(Logger::DEBUG);
- $record['channel'] = 'othertest';
- $handler->handle($record);
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasWarningRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::__construct
- * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::isHandlerActivated
- */
- public function testChannelLevelActivationStrategyWithPsrLevels()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy('error', array('othertest' => 'debug')));
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertFalse($test->hasWarningRecords());
- $record = $this->getRecord(Logger::DEBUG);
- $record['channel'] = 'othertest';
- $handler->handle($record);
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasWarningRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::handle
- */
- public function testHandleUsesProcessors()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, Logger::INFO);
- $handler->pushProcessor(function ($record) {
- $record['extra']['foo'] = true;
-
- return $record;
- });
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasWarningRecords());
- $records = $test->getRecords();
- $this->assertTrue($records[0]['extra']['foo']);
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::close
- */
- public function testPassthruOnClose()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, Logger::INFO);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->close();
- $this->assertFalse($test->hasDebugRecords());
- $this->assertTrue($test->hasInfoRecords());
- }
-
- /**
- * @covers Monolog\Handler\FingersCrossedHandler::close
- */
- public function testPsrLevelPassthruOnClose()
- {
- $test = new TestHandler();
- $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, LogLevel::INFO);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- $handler->close();
- $this->assertFalse($test->hasDebugRecords());
- $this->assertTrue($test->hasInfoRecords());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
deleted file mode 100644
index 0eb10a6..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\FirePHPHandler
- */
-class FirePHPHandlerTest extends TestCase
-{
- public function setUp()
- {
- TestFirePHPHandler::reset();
- $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; FirePHP/1.0';
- }
-
- public function testHeaders()
- {
- $handler = new TestFirePHPHandler;
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::WARNING));
-
- $expected = array(
- 'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',
- 'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1',
- 'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3',
- 'X-Wf-1-1-1-1' => 'test',
- 'X-Wf-1-1-1-2' => 'test',
- );
-
- $this->assertEquals($expected, $handler->getHeaders());
- }
-
- public function testConcurrentHandlers()
- {
- $handler = new TestFirePHPHandler;
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::WARNING));
-
- $handler2 = new TestFirePHPHandler;
- $handler2->setFormatter($this->getIdentityFormatter());
- $handler2->handle($this->getRecord(Logger::DEBUG));
- $handler2->handle($this->getRecord(Logger::WARNING));
-
- $expected = array(
- 'X-Wf-Protocol-1' => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',
- 'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1',
- 'X-Wf-1-Plugin-1' => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3',
- 'X-Wf-1-1-1-1' => 'test',
- 'X-Wf-1-1-1-2' => 'test',
- );
-
- $expected2 = array(
- 'X-Wf-1-1-1-3' => 'test',
- 'X-Wf-1-1-1-4' => 'test',
- );
-
- $this->assertEquals($expected, $handler->getHeaders());
- $this->assertEquals($expected2, $handler2->getHeaders());
- }
-}
-
-class TestFirePHPHandler extends FirePHPHandler
-{
- protected $headers = array();
-
- public static function reset()
- {
- self::$initialized = false;
- self::$sendHeaders = true;
- self::$messageIndex = 1;
- }
-
- protected function sendHeader($header, $content)
- {
- $this->headers[$header] = $content;
- }
-
- public function getHeaders()
- {
- return $this->headers;
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php
deleted file mode 100644
index 91cdd31..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Logger;
-use Monolog\TestCase;
-
-/**
- * @coversDefaultClass \Monolog\Handler\FleepHookHandler
- */
-class FleepHookHandlerTest extends TestCase
-{
- /**
- * Default token to use in tests
- */
- const TOKEN = '123abc';
-
- /**
- * @var FleepHookHandler
- */
- private $handler;
-
- public function setUp()
- {
- parent::setUp();
-
- if (!extension_loaded('openssl')) {
- $this->markTestSkipped('This test requires openssl extension to run');
- }
-
- // Create instances of the handler and logger for convenience
- $this->handler = new FleepHookHandler(self::TOKEN);
- }
-
- /**
- * @covers ::__construct
- */
- public function testConstructorSetsExpectedDefaults()
- {
- $this->assertEquals(Logger::DEBUG, $this->handler->getLevel());
- $this->assertEquals(true, $this->handler->getBubble());
- }
-
- /**
- * @covers ::getDefaultFormatter
- */
- public function testHandlerUsesLineFormatterWhichIgnoresEmptyArrays()
- {
- $record = array(
- 'message' => 'msg',
- 'context' => array(),
- 'level' => Logger::DEBUG,
- 'level_name' => Logger::getLevelName(Logger::DEBUG),
- 'channel' => 'channel',
- 'datetime' => new \DateTime(),
- 'extra' => array(),
- );
-
- $expectedFormatter = new LineFormatter(null, null, true, true);
- $expected = $expectedFormatter->format($record);
-
- $handlerFormatter = $this->handler->getFormatter();
- $actual = $handlerFormatter->format($record);
-
- $this->assertEquals($expected, $actual, 'Empty context and extra arrays should not be rendered');
- }
-
- /**
- * @covers ::__construct
- */
- public function testConnectionStringisConstructedCorrectly()
- {
- $this->assertEquals('ssl://' . FleepHookHandler::FLEEP_HOST . ':443', $this->handler->getConnectionString());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php
deleted file mode 100644
index 4b120d5..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FlowdockFormatter;
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Dominik Liebler
- * @see https://www.hipchat.com/docs/api
- */
-class FlowdockHandlerTest extends TestCase
-{
- /**
- * @var resource
- */
- private $res;
-
- /**
- * @var FlowdockHandler
- */
- private $handler;
-
- public function setUp()
- {
- if (!extension_loaded('openssl')) {
- $this->markTestSkipped('This test requires openssl to run');
- }
- }
-
- public function testWriteHeader()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/v1\/messages\/team_inbox\/.* HTTP\/1.1\\r\\nHost: api.flowdock.com\\r\\nContent-Type: application\/json\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
- return $content;
- }
-
- /**
- * @depends testWriteHeader
- */
- public function testWriteContent($content)
- {
- $this->assertRegexp('/"source":"test_source"/', $content);
- $this->assertRegexp('/"from_address":"source@test\.com"/', $content);
- }
-
- private function createHandler($token = 'myToken')
- {
- $constructorArgs = array($token, Logger::DEBUG);
- $this->res = fopen('php://memory', 'a');
- $this->handler = $this->getMock(
- '\Monolog\Handler\FlowdockHandler',
- array('fsockopen', 'streamSetTimeout', 'closeSocket'),
- $constructorArgs
- );
-
- $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
- $reflectionProperty->setAccessible(true);
- $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
- $this->handler->expects($this->any())
- ->method('fsockopen')
- ->will($this->returnValue($this->res));
- $this->handler->expects($this->any())
- ->method('streamSetTimeout')
- ->will($this->returnValue(true));
- $this->handler->expects($this->any())
- ->method('closeSocket')
- ->will($this->returnValue(true));
-
- $this->handler->setFormatter(new FlowdockFormatter('test_source', 'source@test.com'));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php
deleted file mode 100644
index 9d007b1..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\Message;
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\GelfMessageFormatter;
-
-class GelfHandlerLegacyTest extends TestCase
-{
- public function setUp()
- {
- if (!class_exists('Gelf\MessagePublisher') || !class_exists('Gelf\Message')) {
- $this->markTestSkipped("mlehner/gelf-php not installed");
- }
-
- require_once __DIR__ . '/GelfMockMessagePublisher.php';
- }
-
- /**
- * @covers Monolog\Handler\GelfHandler::__construct
- */
- public function testConstruct()
- {
- $handler = new GelfHandler($this->getMessagePublisher());
- $this->assertInstanceOf('Monolog\Handler\GelfHandler', $handler);
- }
-
- protected function getHandler($messagePublisher)
- {
- $handler = new GelfHandler($messagePublisher);
-
- return $handler;
- }
-
- protected function getMessagePublisher()
- {
- return new GelfMockMessagePublisher('localhost');
- }
-
- public function testDebug()
- {
- $messagePublisher = $this->getMessagePublisher();
- $handler = $this->getHandler($messagePublisher);
-
- $record = $this->getRecord(Logger::DEBUG, "A test debug message");
- $handler->handle($record);
-
- $this->assertEquals(7, $messagePublisher->lastMessage->getLevel());
- $this->assertEquals('test', $messagePublisher->lastMessage->getFacility());
- $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage());
- $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage());
- }
-
- public function testWarning()
- {
- $messagePublisher = $this->getMessagePublisher();
- $handler = $this->getHandler($messagePublisher);
-
- $record = $this->getRecord(Logger::WARNING, "A test warning message");
- $handler->handle($record);
-
- $this->assertEquals(4, $messagePublisher->lastMessage->getLevel());
- $this->assertEquals('test', $messagePublisher->lastMessage->getFacility());
- $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage());
- $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage());
- }
-
- public function testInjectedGelfMessageFormatter()
- {
- $messagePublisher = $this->getMessagePublisher();
- $handler = $this->getHandler($messagePublisher);
-
- $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX'));
-
- $record = $this->getRecord(Logger::WARNING, "A test warning message");
- $record['extra']['blarg'] = 'yep';
- $record['context']['from'] = 'logger';
- $handler->handle($record);
-
- $this->assertEquals('mysystem', $messagePublisher->lastMessage->getHost());
- $this->assertArrayHasKey('_EXTblarg', $messagePublisher->lastMessage->toArray());
- $this->assertArrayHasKey('_CTXfrom', $messagePublisher->lastMessage->toArray());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php
deleted file mode 100644
index 8cdd64f..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\Message;
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\GelfMessageFormatter;
-
-class GelfHandlerTest extends TestCase
-{
- public function setUp()
- {
- if (!class_exists('Gelf\Publisher') || !class_exists('Gelf\Message')) {
- $this->markTestSkipped("graylog2/gelf-php not installed");
- }
- }
-
- /**
- * @covers Monolog\Handler\GelfHandler::__construct
- */
- public function testConstruct()
- {
- $handler = new GelfHandler($this->getMessagePublisher());
- $this->assertInstanceOf('Monolog\Handler\GelfHandler', $handler);
- }
-
- protected function getHandler($messagePublisher)
- {
- $handler = new GelfHandler($messagePublisher);
-
- return $handler;
- }
-
- protected function getMessagePublisher()
- {
- return $this->getMock('Gelf\Publisher', array('publish'), array(), '', false);
- }
-
- public function testDebug()
- {
- $record = $this->getRecord(Logger::DEBUG, "A test debug message");
- $expectedMessage = new Message();
- $expectedMessage
- ->setLevel(7)
- ->setFacility("test")
- ->setShortMessage($record['message'])
- ->setTimestamp($record['datetime'])
- ;
-
- $messagePublisher = $this->getMessagePublisher();
- $messagePublisher->expects($this->once())
- ->method('publish')
- ->with($expectedMessage);
-
- $handler = $this->getHandler($messagePublisher);
-
- $handler->handle($record);
- }
-
- public function testWarning()
- {
- $record = $this->getRecord(Logger::WARNING, "A test warning message");
- $expectedMessage = new Message();
- $expectedMessage
- ->setLevel(4)
- ->setFacility("test")
- ->setShortMessage($record['message'])
- ->setTimestamp($record['datetime'])
- ;
-
- $messagePublisher = $this->getMessagePublisher();
- $messagePublisher->expects($this->once())
- ->method('publish')
- ->with($expectedMessage);
-
- $handler = $this->getHandler($messagePublisher);
-
- $handler->handle($record);
- }
-
- public function testInjectedGelfMessageFormatter()
- {
- $record = $this->getRecord(Logger::WARNING, "A test warning message");
- $record['extra']['blarg'] = 'yep';
- $record['context']['from'] = 'logger';
-
- $expectedMessage = new Message();
- $expectedMessage
- ->setLevel(4)
- ->setFacility("test")
- ->setHost("mysystem")
- ->setShortMessage($record['message'])
- ->setTimestamp($record['datetime'])
- ->setAdditional("EXTblarg", 'yep')
- ->setAdditional("CTXfrom", 'logger')
- ;
-
- $messagePublisher = $this->getMessagePublisher();
- $messagePublisher->expects($this->once())
- ->method('publish')
- ->with($expectedMessage);
-
- $handler = $this->getHandler($messagePublisher);
- $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX'));
- $handler->handle($record);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php
deleted file mode 100644
index 873d92f..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\MessagePublisher;
-use Gelf\Message;
-
-class GelfMockMessagePublisher extends MessagePublisher
-{
- public function publish(Message $message)
- {
- $this->lastMessage = $message;
- }
-
- public $lastMessage = null;
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php
deleted file mode 100644
index c6298a6..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class GroupHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\GroupHandler::__construct
- * @expectedException InvalidArgumentException
- */
- public function testConstructorOnlyTakesHandler()
- {
- new GroupHandler(array(new TestHandler(), "foo"));
- }
-
- /**
- * @covers Monolog\Handler\GroupHandler::__construct
- * @covers Monolog\Handler\GroupHandler::handle
- */
- public function testHandle()
- {
- $testHandlers = array(new TestHandler(), new TestHandler());
- $handler = new GroupHandler($testHandlers);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- foreach ($testHandlers as $test) {
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue(count($test->getRecords()) === 2);
- }
- }
-
- /**
- * @covers Monolog\Handler\GroupHandler::handleBatch
- */
- public function testHandleBatch()
- {
- $testHandlers = array(new TestHandler(), new TestHandler());
- $handler = new GroupHandler($testHandlers);
- $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
- foreach ($testHandlers as $test) {
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue(count($test->getRecords()) === 2);
- }
- }
-
- /**
- * @covers Monolog\Handler\GroupHandler::isHandling
- */
- public function testIsHandling()
- {
- $testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING));
- $handler = new GroupHandler($testHandlers);
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
- }
-
- /**
- * @covers Monolog\Handler\GroupHandler::handle
- */
- public function testHandleUsesProcessors()
- {
- $test = new TestHandler();
- $handler = new GroupHandler(array($test));
- $handler->pushProcessor(function ($record) {
- $record['extra']['foo'] = true;
-
- return $record;
- });
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasWarningRecords());
- $records = $test->getRecords();
- $this->assertTrue($records[0]['extra']['foo']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php
deleted file mode 100644
index 462dac8..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php
+++ /dev/null
@@ -1,244 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Rafael Dohms
- * @see https://www.hipchat.com/docs/api
- */
-class HipChatHandlerTest extends TestCase
-{
- private $res;
- private $handler;
-
- public function testWriteHeader()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/v1\/rooms\/message\?format=json&auth_token=.* HTTP\/1.1\\r\\nHost: api.hipchat.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
- return $content;
- }
-
- public function testWriteCustomHostHeader()
- {
- $this->createHandler('myToken', 'room1', 'Monolog', true, 'hipchat.foo.bar');
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/v1\/rooms\/message\?format=json&auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
- return $content;
- }
-
- public function testWriteV2()
- {
- $this->createHandler('myToken', 'room1', 'Monolog', false, 'hipchat.foo.bar', 'v2');
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/v2\/room\/room1\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
- return $content;
- }
-
- public function testWriteV2Notify()
- {
- $this->createHandler('myToken', 'room1', 'Monolog', true, 'hipchat.foo.bar', 'v2');
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/v2\/room\/room1\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
- return $content;
- }
-
- public function testRoomSpaces()
- {
- $this->createHandler('myToken', 'room name', 'Monolog', false, 'hipchat.foo.bar', 'v2');
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/v2\/room\/room%20name\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
- return $content;
- }
-
- /**
- * @depends testWriteHeader
- */
- public function testWriteContent($content)
- {
- $this->assertRegexp('/notify=0&message=test1&message_format=text&color=red&room_id=room1&from=Monolog$/', $content);
- }
-
- /**
- * @depends testWriteCustomHostHeader
- */
- public function testWriteContentNotify($content)
- {
- $this->assertRegexp('/notify=1&message=test1&message_format=text&color=red&room_id=room1&from=Monolog$/', $content);
- }
-
- /**
- * @depends testWriteV2
- */
- public function testWriteContentV2($content)
- {
- $this->assertRegexp('/notify=false&message=test1&message_format=text&color=red$/', $content);
- }
-
- /**
- * @depends testWriteV2Notify
- */
- public function testWriteContentV2Notify($content)
- {
- $this->assertRegexp('/notify=true&message=test1&message_format=text&color=red$/', $content);
- }
-
- public function testWriteWithComplexMessage()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Backup of database "example" finished in 16 minutes.'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/message=Backup\+of\+database\+%22example%22\+finished\+in\+16\+minutes\./', $content);
- }
-
- /**
- * @dataProvider provideLevelColors
- */
- public function testWriteWithErrorLevelsAndColors($level, $expectedColor)
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord($level, 'Backup of database "example" finished in 16 minutes.'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/color='.$expectedColor.'/', $content);
- }
-
- public function provideLevelColors()
- {
- return array(
- array(Logger::DEBUG, 'gray'),
- array(Logger::INFO, 'green'),
- array(Logger::WARNING, 'yellow'),
- array(Logger::ERROR, 'red'),
- array(Logger::CRITICAL, 'red'),
- array(Logger::ALERT, 'red'),
- array(Logger::EMERGENCY,'red'),
- array(Logger::NOTICE, 'green'),
- );
- }
-
- /**
- * @dataProvider provideBatchRecords
- */
- public function testHandleBatch($records, $expectedColor)
- {
- $this->createHandler();
-
- $this->handler->handleBatch($records);
-
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/color='.$expectedColor.'/', $content);
- }
-
- public function provideBatchRecords()
- {
- return array(
- array(
- array(
- array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTime()),
- array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()),
- array('level' => Logger::CRITICAL, 'message' => 'Everything is broken!', 'level_name' => 'critical', 'datetime' => new \DateTime())
- ),
- 'red',
- ),
- array(
- array(
- array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTime()),
- array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()),
- ),
- 'yellow',
- ),
- array(
- array(
- array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTime()),
- array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()),
- ),
- 'green',
- ),
- array(
- array(
- array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTime()),
- ),
- 'gray',
- ),
- );
- }
-
- private function createHandler($token = 'myToken', $room = 'room1', $name = 'Monolog', $notify = false, $host = 'api.hipchat.com', $version = 'v1')
- {
- $constructorArgs = array($token, $room, $name, $notify, Logger::DEBUG, true, true, 'text', $host, $version);
- $this->res = fopen('php://memory', 'a');
- $this->handler = $this->getMock(
- '\Monolog\Handler\HipChatHandler',
- array('fsockopen', 'streamSetTimeout', 'closeSocket'),
- $constructorArgs
- );
-
- $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
- $reflectionProperty->setAccessible(true);
- $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
- $this->handler->expects($this->any())
- ->method('fsockopen')
- ->will($this->returnValue($this->res));
- $this->handler->expects($this->any())
- ->method('streamSetTimeout')
- ->will($this->returnValue(true));
- $this->handler->expects($this->any())
- ->method('closeSocket')
- ->will($this->returnValue(true));
-
- $this->handler->setFormatter($this->getIdentityFormatter());
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- public function testCreateWithTooLongName()
- {
- $hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere');
- }
-
- public function testCreateWithTooLongNameV2()
- {
- // creating a handler with too long of a name but using the v2 api doesn't matter.
- $hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere', false, Logger::CRITICAL, true, true, 'test', 'api.hipchat.com', 'v2');
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
deleted file mode 100644
index 7af60be..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Robert Kaufmann III
- */
-class LogEntriesHandlerTest extends TestCase
-{
- /**
- * @var resource
- */
- private $res;
-
- /**
- * @var LogEntriesHandler
- */
- private $handler;
-
- public function testWriteContent()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Critical write test'));
-
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] test.CRITICAL: Critical write test/', $content);
- }
-
- public function testWriteBatchContent()
- {
- $records = array(
- $this->getRecord(),
- $this->getRecord(),
- $this->getRecord()
- );
- $this->createHandler();
- $this->handler->handleBatch($records);
-
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/(testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] .* \[\] \[\]\n){3}/', $content);
- }
-
- private function createHandler()
- {
- $useSSL = extension_loaded('openssl');
- $args = array('testToken', $useSSL, Logger::DEBUG, true);
- $this->res = fopen('php://memory', 'a');
- $this->handler = $this->getMock(
- '\Monolog\Handler\LogEntriesHandler',
- array('fsockopen', 'streamSetTimeout', 'closeSocket'),
- $args
- );
-
- $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
- $reflectionProperty->setAccessible(true);
- $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
- $this->handler->expects($this->any())
- ->method('fsockopen')
- ->will($this->returnValue($this->res));
- $this->handler->expects($this->any())
- ->method('streamSetTimeout')
- ->will($this->returnValue(true));
- $this->handler->expects($this->any())
- ->method('closeSocket')
- ->will($this->returnValue(true));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php
deleted file mode 100644
index 6754f3d..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class MailHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\MailHandler::handleBatch
- */
- public function testHandleBatch()
- {
- $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
- $formatter->expects($this->once())
- ->method('formatBatch'); // Each record is formatted
-
- $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
- $handler->expects($this->once())
- ->method('send');
- $handler->expects($this->never())
- ->method('write'); // write is for individual records
-
- $handler->setFormatter($formatter);
-
- $handler->handleBatch($this->getMultipleRecords());
- }
-
- /**
- * @covers Monolog\Handler\MailHandler::handleBatch
- */
- public function testHandleBatchNotSendsMailIfMessagesAreBelowLevel()
- {
- $records = array(
- $this->getRecord(Logger::DEBUG, 'debug message 1'),
- $this->getRecord(Logger::DEBUG, 'debug message 2'),
- $this->getRecord(Logger::INFO, 'information'),
- );
-
- $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
- $handler->expects($this->never())
- ->method('send');
- $handler->setLevel(Logger::ERROR);
-
- $handler->handleBatch($records);
- }
-
- /**
- * @covers Monolog\Handler\MailHandler::write
- */
- public function testHandle()
- {
- $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
-
- $record = $this->getRecord();
- $records = array($record);
- $records[0]['formatted'] = '['.$record['datetime']->format('Y-m-d H:i:s').'] test.WARNING: test [] []'."\n";
-
- $handler->expects($this->once())
- ->method('send')
- ->with($records[0]['formatted'], $records);
-
- $handler->handle($record);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php
deleted file mode 100644
index a083322..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Raven_Client;
-
-class MockRavenClient extends Raven_Client
-{
- public function capture($data, $stack, $vars = null)
- {
- $data = array_merge($this->get_user_data(), $data);
- $this->lastData = $data;
- $this->lastStack = $stack;
- }
-
- public $lastData;
- public $lastStack;
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php
deleted file mode 100644
index 0fdef63..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class MongoDBHandlerTest extends TestCase
-{
- /**
- * @expectedException InvalidArgumentException
- */
- public function testConstructorShouldThrowExceptionForInvalidMongo()
- {
- new MongoDBHandler(new \stdClass(), 'DB', 'Collection');
- }
-
- public function testHandle()
- {
- $mongo = $this->getMock('Mongo', array('selectCollection'), array(), '', false);
- $collection = $this->getMock('stdClass', array('save'));
-
- $mongo->expects($this->once())
- ->method('selectCollection')
- ->with('DB', 'Collection')
- ->will($this->returnValue($collection));
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $expected = array(
- 'message' => 'test',
- 'context' => array('data' => '[object] (stdClass: {})', 'foo' => 34),
- 'level' => Logger::WARNING,
- 'level_name' => 'WARNING',
- 'channel' => 'test',
- 'datetime' => $record['datetime']->format('Y-m-d H:i:s'),
- 'extra' => array(),
- );
-
- $collection->expects($this->once())
- ->method('save')
- ->with($expected);
-
- $handler = new MongoDBHandler($mongo, 'DB', 'Collection');
- $handler->handle($record);
- }
-}
-
-if (!class_exists('Mongo')) {
- class Mongo
- {
- public function selectCollection()
- {
- }
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php
deleted file mode 100644
index c2553ee..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-class NativeMailerHandlerTest extends TestCase
-{
- /**
- * @expectedException InvalidArgumentException
- */
- public function testConstructorHeaderInjection()
- {
- $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', "receiver@example.org\r\nFrom: faked@attacker.org");
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- public function testSetterHeaderInjection()
- {
- $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
- $mailer->addHeader("Content-Type: text/html\r\nFrom: faked@attacker.org");
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- public function testSetterArrayHeaderInjection()
- {
- $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
- $mailer->addHeader(array("Content-Type: text/html\r\nFrom: faked@attacker.org"));
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- public function testSetterContentTypeInjection()
- {
- $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
- $mailer->setContentType("text/html\r\nFrom: faked@attacker.org");
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- public function testSetterEncodingInjection()
- {
- $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
- $mailer->setEncoding("utf-8\r\nFrom: faked@attacker.org");
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php
deleted file mode 100644
index 4eda615..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php
+++ /dev/null
@@ -1,192 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class NewRelicHandlerTest extends TestCase
-{
- public static $appname;
- public static $customParameters;
- public static $transactionName;
-
- public function setUp()
- {
- self::$appname = null;
- self::$customParameters = array();
- self::$transactionName = null;
- }
-
- /**
- * @expectedException Monolog\Handler\MissingExtensionException
- */
- public function testThehandlerThrowsAnExceptionIfTheNRExtensionIsNotLoaded()
- {
- $handler = new StubNewRelicHandlerWithoutExtension();
- $handler->handle($this->getRecord(Logger::ERROR));
- }
-
- public function testThehandlerCanHandleTheRecord()
- {
- $handler = new StubNewRelicHandler();
- $handler->handle($this->getRecord(Logger::ERROR));
- }
-
- public function testThehandlerCanAddContextParamsToTheNewRelicTrace()
- {
- $handler = new StubNewRelicHandler();
- $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('a' => 'b')));
- $this->assertEquals(array('context_a' => 'b'), self::$customParameters);
- }
-
- public function testThehandlerCanAddExplodedContextParamsToTheNewRelicTrace()
- {
- $handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true);
- $handler->handle($this->getRecord(
- Logger::ERROR,
- 'log message',
- array('a' => array('key1' => 'value1', 'key2' => 'value2'))
- ));
- $this->assertEquals(
- array('context_a_key1' => 'value1', 'context_a_key2' => 'value2'),
- self::$customParameters
- );
- }
-
- public function testThehandlerCanAddExtraParamsToTheNewRelicTrace()
- {
- $record = $this->getRecord(Logger::ERROR, 'log message');
- $record['extra'] = array('c' => 'd');
-
- $handler = new StubNewRelicHandler();
- $handler->handle($record);
-
- $this->assertEquals(array('extra_c' => 'd'), self::$customParameters);
- }
-
- public function testThehandlerCanAddExplodedExtraParamsToTheNewRelicTrace()
- {
- $record = $this->getRecord(Logger::ERROR, 'log message');
- $record['extra'] = array('c' => array('key1' => 'value1', 'key2' => 'value2'));
-
- $handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true);
- $handler->handle($record);
-
- $this->assertEquals(
- array('extra_c_key1' => 'value1', 'extra_c_key2' => 'value2'),
- self::$customParameters
- );
- }
-
- public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace()
- {
- $record = $this->getRecord(Logger::ERROR, 'log message', array('a' => 'b'));
- $record['extra'] = array('c' => 'd');
-
- $handler = new StubNewRelicHandler();
- $handler->handle($record);
-
- $expected = array(
- 'context_a' => 'b',
- 'extra_c' => 'd',
- );
-
- $this->assertEquals($expected, self::$customParameters);
- }
-
- public function testTheAppNameIsNullByDefault()
- {
- $handler = new StubNewRelicHandler();
- $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
- $this->assertEquals(null, self::$appname);
- }
-
- public function testTheAppNameCanBeInjectedFromtheConstructor()
- {
- $handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName');
- $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
- $this->assertEquals('myAppName', self::$appname);
- }
-
- public function testTheAppNameCanBeOverriddenFromEachLog()
- {
- $handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName');
- $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('appname' => 'logAppName')));
-
- $this->assertEquals('logAppName', self::$appname);
- }
-
- public function testTheTransactionNameIsNullByDefault()
- {
- $handler = new StubNewRelicHandler();
- $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
- $this->assertEquals(null, self::$transactionName);
- }
-
- public function testTheTransactionNameCanBeInjectedFromTheConstructor()
- {
- $handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction');
- $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
- $this->assertEquals('myTransaction', self::$transactionName);
- }
-
- public function testTheTransactionNameCanBeOverriddenFromEachLog()
- {
- $handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction');
- $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('transaction_name' => 'logTransactName')));
-
- $this->assertEquals('logTransactName', self::$transactionName);
- }
-}
-
-class StubNewRelicHandlerWithoutExtension extends NewRelicHandler
-{
- protected function isNewRelicEnabled()
- {
- return false;
- }
-}
-
-class StubNewRelicHandler extends NewRelicHandler
-{
- protected function isNewRelicEnabled()
- {
- return true;
- }
-}
-
-function newrelic_notice_error()
-{
- return true;
-}
-
-function newrelic_set_appname($appname)
-{
- return NewRelicHandlerTest::$appname = $appname;
-}
-
-function newrelic_name_transaction($transactionName)
-{
- return NewRelicHandlerTest::$transactionName = $transactionName;
-}
-
-function newrelic_add_custom_parameter($key, $value)
-{
- NewRelicHandlerTest::$customParameters[$key] = $value;
-
- return true;
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php
deleted file mode 100644
index 292df78..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\NullHandler::handle
- */
-class NullHandlerTest extends TestCase
-{
- public function testHandle()
- {
- $handler = new NullHandler();
- $this->assertTrue($handler->handle($this->getRecord()));
- }
-
- public function testHandleLowerLevelRecord()
- {
- $handler = new NullHandler(Logger::WARNING);
- $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php
deleted file mode 100644
index ee95172..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php
+++ /dev/null
@@ -1,274 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Exception;
-use Monolog\ErrorHandler;
-use Monolog\Logger;
-use Monolog\TestCase;
-use PhpConsole\Connector;
-use PhpConsole\Dispatcher\Debug as DebugDispatcher;
-use PhpConsole\Dispatcher\Errors as ErrorDispatcher;
-use PhpConsole\Handler;
-use PHPUnit_Framework_MockObject_MockObject;
-
-/**
- * @covers Monolog\Handler\PHPConsoleHandler
- * @author Sergey Barbushin https://www.linkedin.com/in/barbushin
- */
-class PHPConsoleHandlerTest extends TestCase
-{
-
- /** @var Connector|PHPUnit_Framework_MockObject_MockObject */
- protected $connector;
- /** @var DebugDispatcher|PHPUnit_Framework_MockObject_MockObject */
- protected $debugDispatcher;
- /** @var ErrorDispatcher|PHPUnit_Framework_MockObject_MockObject */
- protected $errorDispatcher;
-
- protected function setUp()
- {
- if (!class_exists('PhpConsole\Connector')) {
- $this->markTestSkipped('PHP Console library not found. See https://github.com/barbushin/php-console#installation');
- }
- $this->connector = $this->initConnectorMock();
-
- $this->debugDispatcher = $this->initDebugDispatcherMock($this->connector);
- $this->connector->setDebugDispatcher($this->debugDispatcher);
-
- $this->errorDispatcher = $this->initErrorDispatcherMock($this->connector);
- $this->connector->setErrorsDispatcher($this->errorDispatcher);
- }
-
- protected function initDebugDispatcherMock(Connector $connector)
- {
- return $this->getMockBuilder('PhpConsole\Dispatcher\Debug')
- ->disableOriginalConstructor()
- ->setMethods(array('dispatchDebug'))
- ->setConstructorArgs(array($connector, $connector->getDumper()))
- ->getMock();
- }
-
- protected function initErrorDispatcherMock(Connector $connector)
- {
- return $this->getMockBuilder('PhpConsole\Dispatcher\Errors')
- ->disableOriginalConstructor()
- ->setMethods(array('dispatchError', 'dispatchException'))
- ->setConstructorArgs(array($connector, $connector->getDumper()))
- ->getMock();
- }
-
- protected function initConnectorMock()
- {
- $connector = $this->getMockBuilder('PhpConsole\Connector')
- ->disableOriginalConstructor()
- ->setMethods(array(
- 'sendMessage',
- 'onShutDown',
- 'isActiveClient',
- 'setSourcesBasePath',
- 'setServerEncoding',
- 'setPassword',
- 'enableSslOnlyMode',
- 'setAllowedIpMasks',
- 'setHeadersLimit',
- 'startEvalRequestsListener',
- ))
- ->getMock();
-
- $connector->expects($this->any())
- ->method('isActiveClient')
- ->will($this->returnValue(true));
-
- return $connector;
- }
-
- protected function getHandlerDefaultOption($name)
- {
- $handler = new PHPConsoleHandler(array(), $this->connector);
- $options = $handler->getOptions();
-
- return $options[$name];
- }
-
- protected function initLogger($handlerOptions = array(), $level = Logger::DEBUG)
- {
- return new Logger('test', array(
- new PHPConsoleHandler($handlerOptions, $this->connector, $level)
- ));
- }
-
- public function testInitWithDefaultConnector()
- {
- $handler = new PHPConsoleHandler();
- $this->assertEquals(spl_object_hash(Connector::getInstance()), spl_object_hash($handler->getConnector()));
- }
-
- public function testInitWithCustomConnector()
- {
- $handler = new PHPConsoleHandler(array(), $this->connector);
- $this->assertEquals(spl_object_hash($this->connector), spl_object_hash($handler->getConnector()));
- }
-
- public function testDebug()
- {
- $this->debugDispatcher->expects($this->once())->method('dispatchDebug')->with($this->equalTo('test'));
- $this->initLogger()->addDebug('test');
- }
-
- public function testDebugContextInMessage()
- {
- $message = 'test';
- $tag = 'tag';
- $context = array($tag, 'custom' => mt_rand());
- $expectedMessage = $message . ' ' . json_encode(array_slice($context, 1));
- $this->debugDispatcher->expects($this->once())->method('dispatchDebug')->with(
- $this->equalTo($expectedMessage),
- $this->equalTo($tag)
- );
- $this->initLogger()->addDebug($message, $context);
- }
-
- public function testDebugTags($tagsContextKeys = null)
- {
- $expectedTags = mt_rand();
- $logger = $this->initLogger($tagsContextKeys ? array('debugTagsKeysInContext' => $tagsContextKeys) : array());
- if (!$tagsContextKeys) {
- $tagsContextKeys = $this->getHandlerDefaultOption('debugTagsKeysInContext');
- }
- foreach ($tagsContextKeys as $key) {
- $debugDispatcher = $this->initDebugDispatcherMock($this->connector);
- $debugDispatcher->expects($this->once())->method('dispatchDebug')->with(
- $this->anything(),
- $this->equalTo($expectedTags)
- );
- $this->connector->setDebugDispatcher($debugDispatcher);
- $logger->addDebug('test', array($key => $expectedTags));
- }
- }
-
- public function testError($classesPartialsTraceIgnore = null)
- {
- $code = E_USER_NOTICE;
- $message = 'message';
- $file = __FILE__;
- $line = __LINE__;
- $this->errorDispatcher->expects($this->once())->method('dispatchError')->with(
- $this->equalTo($code),
- $this->equalTo($message),
- $this->equalTo($file),
- $this->equalTo($line),
- $classesPartialsTraceIgnore ?: $this->equalTo($this->getHandlerDefaultOption('classesPartialsTraceIgnore'))
- );
- $errorHandler = ErrorHandler::register($this->initLogger($classesPartialsTraceIgnore ? array('classesPartialsTraceIgnore' => $classesPartialsTraceIgnore) : array()), false);
- $errorHandler->registerErrorHandler(array(), false, E_USER_WARNING);
- $errorHandler->handleError($code, $message, $file, $line);
- }
-
- public function testException()
- {
- $e = new Exception();
- $this->errorDispatcher->expects($this->once())->method('dispatchException')->with(
- $this->equalTo($e)
- );
- $handler = $this->initLogger();
- $handler->log(
- \Psr\Log\LogLevel::ERROR,
- sprintf('Uncaught Exception %s: "%s" at %s line %s', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()),
- array('exception' => $e)
- );
- }
-
- /**
- * @expectedException Exception
- */
- public function testWrongOptionsThrowsException()
- {
- new PHPConsoleHandler(array('xxx' => 1));
- }
-
- public function testOptionEnabled()
- {
- $this->debugDispatcher->expects($this->never())->method('dispatchDebug');
- $this->initLogger(array('enabled' => false))->addDebug('test');
- }
-
- public function testOptionClassesPartialsTraceIgnore()
- {
- $this->testError(array('Class', 'Namespace\\'));
- }
-
- public function testOptionDebugTagsKeysInContext()
- {
- $this->testDebugTags(array('key1', 'key2'));
- }
-
- public function testOptionUseOwnErrorsAndExceptionsHandler()
- {
- $this->initLogger(array('useOwnErrorsHandler' => true, 'useOwnExceptionsHandler' => true));
- $this->assertEquals(array(Handler::getInstance(), 'handleError'), set_error_handler(function () {
- }));
- $this->assertEquals(array(Handler::getInstance(), 'handleException'), set_exception_handler(function () {
- }));
- }
-
- public static function provideConnectorMethodsOptionsSets()
- {
- return array(
- array('sourcesBasePath', 'setSourcesBasePath', __DIR__),
- array('serverEncoding', 'setServerEncoding', 'cp1251'),
- array('password', 'setPassword', '******'),
- array('enableSslOnlyMode', 'enableSslOnlyMode', true, false),
- array('ipMasks', 'setAllowedIpMasks', array('127.0.0.*')),
- array('headersLimit', 'setHeadersLimit', 2500),
- array('enableEvalListener', 'startEvalRequestsListener', true, false),
- );
- }
-
- /**
- * @dataProvider provideConnectorMethodsOptionsSets
- */
- public function testOptionCallsConnectorMethod($option, $method, $value, $isArgument = true)
- {
- $expectCall = $this->connector->expects($this->once())->method($method);
- if ($isArgument) {
- $expectCall->with($value);
- }
- new PHPConsoleHandler(array($option => $value), $this->connector);
- }
-
- public function testOptionDetectDumpTraceAndSource()
- {
- new PHPConsoleHandler(array('detectDumpTraceAndSource' => true), $this->connector);
- $this->assertTrue($this->connector->getDebugDispatcher()->detectTraceAndSource);
- }
-
- public static function provideDumperOptionsValues()
- {
- return array(
- array('dumperLevelLimit', 'levelLimit', 1001),
- array('dumperItemsCountLimit', 'itemsCountLimit', 1002),
- array('dumperItemSizeLimit', 'itemSizeLimit', 1003),
- array('dumperDumpSizeLimit', 'dumpSizeLimit', 1004),
- array('dumperDetectCallbacks', 'detectCallbacks', true),
- );
- }
-
- /**
- * @dataProvider provideDumperOptionsValues
- */
- public function testDumperOptions($option, $dumperProperty, $value)
- {
- new PHPConsoleHandler(array($option => $value), $this->connector);
- $this->assertEquals($value, $this->connector->getDumper()->$dumperProperty);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php
deleted file mode 100644
index 64eaab1..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\PsrHandler::handle
- */
-class PsrHandlerTest extends TestCase
-{
- public function logLevelProvider()
- {
- $levels = array();
- $monologLogger = new Logger('');
-
- foreach ($monologLogger->getLevels() as $levelName => $level) {
- $levels[] = array($levelName, $level);
- }
-
- return $levels;
- }
-
- /**
- * @dataProvider logLevelProvider
- */
- public function testHandlesAllLevels($levelName, $level)
- {
- $message = 'Hello, world! ' . $level;
- $context = array('foo' => 'bar', 'level' => $level);
-
- $psrLogger = $this->getMock('Psr\Log\NullLogger');
- $psrLogger->expects($this->once())
- ->method('log')
- ->with(strtolower($levelName), $message, $context);
-
- $handler = new PsrHandler($psrLogger);
- $handler->handle(array('level' => $level, 'level_name' => $levelName, 'message' => $message, 'context' => $context));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php
deleted file mode 100644
index 8940823..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * Almost all examples (expected header, titles, messages) taken from
- * https://www.pushover.net/api
- * @author Sebastian Göttschkes
- * @see https://www.pushover.net/api
- */
-class PushoverHandlerTest extends TestCase
-{
- private $res;
- private $handler;
-
- public function testWriteHeader()
- {
- $this->createHandler();
- $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/1\/messages.json HTTP\/1.1\\r\\nHost: api.pushover.net\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
- return $content;
- }
-
- /**
- * @depends testWriteHeader
- */
- public function testWriteContent($content)
- {
- $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}$/', $content);
- }
-
- public function testWriteWithComplexTitle()
- {
- $this->createHandler('myToken', 'myUser', 'Backup finished - SQL1', Logger::EMERGENCY);
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/title=Backup\+finished\+-\+SQL1/', $content);
- }
-
- public function testWriteWithComplexMessage()
- {
- $this->createHandler();
- $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Backup of database "example" finished in 16 minutes.'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/message=Backup\+of\+database\+%22example%22\+finished\+in\+16\+minutes\./', $content);
- }
-
- public function testWriteWithTooLongMessage()
- {
- $message = str_pad('test', 520, 'a');
- $this->createHandler();
- $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
- $this->handler->handle($this->getRecord(Logger::CRITICAL, $message));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $expectedMessage = substr($message, 0, 505);
-
- $this->assertRegexp('/message=' . $expectedMessage . '&title/', $content);
- }
-
- public function testWriteWithHighPriority()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}&priority=1$/', $content);
- }
-
- public function testWriteWithEmergencyPriority()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200$/', $content);
- }
-
- public function testWriteToMultipleUsers()
- {
- $this->createHandler('myToken', array('userA', 'userB'));
- $this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/token=myToken&user=userA&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200POST/', $content);
- $this->assertRegexp('/token=myToken&user=userB&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200$/', $content);
- }
-
- private function createHandler($token = 'myToken', $user = 'myUser', $title = 'Monolog')
- {
- $constructorArgs = array($token, $user, $title);
- $this->res = fopen('php://memory', 'a');
- $this->handler = $this->getMock(
- '\Monolog\Handler\PushoverHandler',
- array('fsockopen', 'streamSetTimeout', 'closeSocket'),
- $constructorArgs
- );
-
- $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
- $reflectionProperty->setAccessible(true);
- $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
- $this->handler->expects($this->any())
- ->method('fsockopen')
- ->will($this->returnValue($this->res));
- $this->handler->expects($this->any())
- ->method('streamSetTimeout')
- ->will($this->returnValue(true));
- $this->handler->expects($this->any())
- ->method('closeSocket')
- ->will($this->returnValue(true));
-
- $this->handler->setFormatter($this->getIdentityFormatter());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
deleted file mode 100644
index 2ca5c02..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
+++ /dev/null
@@ -1,199 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-class RavenHandlerTest extends TestCase
-{
- public function setUp()
- {
- if (!class_exists('Raven_Client')) {
- $this->markTestSkipped('raven/raven not installed');
- }
-
- require_once __DIR__ . '/MockRavenClient.php';
- }
-
- /**
- * @covers Monolog\Handler\RavenHandler::__construct
- */
- public function testConstruct()
- {
- $handler = new RavenHandler($this->getRavenClient());
- $this->assertInstanceOf('Monolog\Handler\RavenHandler', $handler);
- }
-
- protected function getHandler($ravenClient)
- {
- $handler = new RavenHandler($ravenClient);
-
- return $handler;
- }
-
- protected function getRavenClient()
- {
- $dsn = 'http://43f6017361224d098402974103bfc53d:a6a0538fc2934ba2bed32e08741b2cd3@marca.python.live.cheggnet.com:9000/1';
-
- return new MockRavenClient($dsn);
- }
-
- public function testDebug()
- {
- $ravenClient = $this->getRavenClient();
- $handler = $this->getHandler($ravenClient);
-
- $record = $this->getRecord(Logger::DEBUG, 'A test debug message');
- $handler->handle($record);
-
- $this->assertEquals($ravenClient::DEBUG, $ravenClient->lastData['level']);
- $this->assertContains($record['message'], $ravenClient->lastData['message']);
- }
-
- public function testWarning()
- {
- $ravenClient = $this->getRavenClient();
- $handler = $this->getHandler($ravenClient);
-
- $record = $this->getRecord(Logger::WARNING, 'A test warning message');
- $handler->handle($record);
-
- $this->assertEquals($ravenClient::WARNING, $ravenClient->lastData['level']);
- $this->assertContains($record['message'], $ravenClient->lastData['message']);
- }
-
- public function testTag()
- {
- $ravenClient = $this->getRavenClient();
- $handler = $this->getHandler($ravenClient);
-
- $tags = array(1, 2, 'foo');
- $record = $this->getRecord(Logger::INFO, 'test', array('tags' => $tags));
- $handler->handle($record);
-
- $this->assertEquals($tags, $ravenClient->lastData['tags']);
- }
-
- public function testExtraParameters()
- {
- $ravenClient = $this->getRavenClient();
- $handler = $this->getHandler($ravenClient);
-
- $checksum = '098f6bcd4621d373cade4e832627b4f6';
- $release = '05a671c66aefea124cc08b76ea6d30bb';
- $record = $this->getRecord(Logger::INFO, 'test', array('checksum' => $checksum, 'release' => $release));
- $handler->handle($record);
-
- $this->assertEquals($checksum, $ravenClient->lastData['checksum']);
- $this->assertEquals($release, $ravenClient->lastData['release']);
- }
-
- public function testUserContext()
- {
- $ravenClient = $this->getRavenClient();
- $handler = $this->getHandler($ravenClient);
-
- $recordWithNoContext = $this->getRecord(Logger::INFO, 'test with default user context');
- // set user context 'externally'
-
- $user = array(
- 'id' => '123',
- 'email' => 'test@test.com'
- );
-
- $recordWithContext = $this->getRecord(Logger::INFO, 'test', array('user' => $user));
-
- $ravenClient->user_context(array('id' => 'test_user_id'));
- // handle context
- $handler->handle($recordWithContext);
- $this->assertEquals($user, $ravenClient->lastData['user']);
-
- // check to see if its reset
- $handler->handle($recordWithNoContext);
- $this->assertInternalType('array', $ravenClient->context->user);
- $this->assertSame('test_user_id', $ravenClient->context->user['id']);
-
- // handle with null context
- $ravenClient->user_context(null);
- $handler->handle($recordWithContext);
- $this->assertEquals($user, $ravenClient->lastData['user']);
-
- // check to see if its reset
- $handler->handle($recordWithNoContext);
- $this->assertNull($ravenClient->context->user);
- }
-
- public function testException()
- {
- $ravenClient = $this->getRavenClient();
- $handler = $this->getHandler($ravenClient);
-
- try {
- $this->methodThatThrowsAnException();
- } catch (\Exception $e) {
- $record = $this->getRecord(Logger::ERROR, $e->getMessage(), array('exception' => $e));
- $handler->handle($record);
- }
-
- $this->assertEquals($record['message'], $ravenClient->lastData['message']);
- }
-
- public function testHandleBatch()
- {
- $records = $this->getMultipleRecords();
- $records[] = $this->getRecord(Logger::WARNING, 'warning');
- $records[] = $this->getRecord(Logger::WARNING, 'warning');
-
- $logFormatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
- $logFormatter->expects($this->once())->method('formatBatch');
-
- $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
- $formatter->expects($this->once())->method('format')->with($this->callback(function ($record) {
- return $record['level'] == 400;
- }));
-
- $handler = $this->getHandler($this->getRavenClient());
- $handler->setBatchFormatter($logFormatter);
- $handler->setFormatter($formatter);
- $handler->handleBatch($records);
- }
-
- public function testHandleBatchDoNothingIfRecordsAreBelowLevel()
- {
- $records = array(
- $this->getRecord(Logger::DEBUG, 'debug message 1'),
- $this->getRecord(Logger::DEBUG, 'debug message 2'),
- $this->getRecord(Logger::INFO, 'information'),
- );
-
- $handler = $this->getMock('Monolog\Handler\RavenHandler', null, array($this->getRavenClient()));
- $handler->expects($this->never())->method('handle');
- $handler->setLevel(Logger::ERROR);
- $handler->handleBatch($records);
- }
-
- public function testGetSetBatchFormatter()
- {
- $ravenClient = $this->getRavenClient();
- $handler = $this->getHandler($ravenClient);
-
- $handler->setBatchFormatter($formatter = new LineFormatter());
- $this->assertSame($formatter, $handler->getBatchFormatter());
- }
-
- private function methodThatThrowsAnException()
- {
- throw new \Exception('This is an exception');
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php
deleted file mode 100644
index 97e0d94..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-class RedisHandlerTest extends TestCase
-{
- /**
- * @expectedException InvalidArgumentException
- */
- public function testConstructorShouldThrowExceptionForInvalidRedis()
- {
- new RedisHandler(new \stdClass(), 'key');
- }
-
- public function testConstructorShouldWorkWithPredis()
- {
- $redis = $this->getMock('Predis\Client');
- $this->assertInstanceof('Monolog\Handler\RedisHandler', new RedisHandler($redis, 'key'));
- }
-
- public function testConstructorShouldWorkWithRedis()
- {
- $redis = $this->getMock('Redis');
- $this->assertInstanceof('Monolog\Handler\RedisHandler', new RedisHandler($redis, 'key'));
- }
-
- public function testPredisHandle()
- {
- $redis = $this->getMock('Predis\Client', array('rpush'));
-
- // Predis\Client uses rpush
- $redis->expects($this->once())
- ->method('rpush')
- ->with('key', 'test');
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $handler = new RedisHandler($redis, 'key');
- $handler->setFormatter(new LineFormatter("%message%"));
- $handler->handle($record);
- }
-
- public function testRedisHandle()
- {
- $redis = $this->getMock('Redis', array('rpush'));
-
- // Redis uses rPush
- $redis->expects($this->once())
- ->method('rPush')
- ->with('key', 'test');
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $handler = new RedisHandler($redis, 'key');
- $handler->setFormatter(new LineFormatter("%message%"));
- $handler->handle($record);
- }
-
- public function testRedisHandleCapped()
- {
- $redis = $this->getMock('Redis', array('multi', 'rpush', 'ltrim', 'execute'));
-
- // Redis uses multi
- $redis->expects($this->once())
- ->method('multi')
- ->will($this->returnSelf());
-
- $redis->expects($this->once())
- ->method('rpush')
- ->will($this->returnSelf());
-
- $redis->expects($this->once())
- ->method('ltrim')
- ->will($this->returnSelf());
-
- $redis->expects($this->once())
- ->method('execute')
- ->will($this->returnSelf());
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
- $handler->setFormatter(new LineFormatter("%message%"));
- $handler->handle($record);
- }
-
- public function testPredisHandleCapped()
- {
- $redis = $this->getMock('Predis\Client', array('transaction'));
-
- $redisTransaction = $this->getMock('Predis\Client', array('rpush', 'ltrim'));
-
- $redisTransaction->expects($this->once())
- ->method('rpush')
- ->will($this->returnSelf());
-
- $redisTransaction->expects($this->once())
- ->method('ltrim')
- ->will($this->returnSelf());
-
- // Redis uses multi
- $redis->expects($this->once())
- ->method('transaction')
- ->will($this->returnCallback(function ($cb) use ($redisTransaction) {
- $cb($redisTransaction);
- }));
-
- $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
- $handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
- $handler->setFormatter(new LineFormatter("%message%"));
- $handler->handle($record);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php
deleted file mode 100644
index f4cefda..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-/**
- * @covers Monolog\Handler\RotatingFileHandler
- */
-class RotatingFileHandlerTest extends TestCase
-{
- public function setUp()
- {
- $dir = __DIR__.'/Fixtures';
- chmod($dir, 0777);
- if (!is_writable($dir)) {
- $this->markTestSkipped($dir.' must be writeable to test the RotatingFileHandler.');
- }
- }
-
- public function testRotationCreatesNewFile()
- {
- touch(__DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400).'.rot');
-
- $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot');
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord());
-
- $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
- $this->assertTrue(file_exists($log));
- $this->assertEquals('test', file_get_contents($log));
- }
-
- /**
- * @dataProvider rotationTests
- */
- public function testRotation($createFile)
- {
- touch($old1 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400).'.rot');
- touch($old2 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 2).'.rot');
- touch($old3 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 3).'.rot');
- touch($old4 = __DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400 * 4).'.rot');
-
- $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
-
- if ($createFile) {
- touch($log);
- }
-
- $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2);
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord());
-
- $handler->close();
-
- $this->assertTrue(file_exists($log));
- $this->assertTrue(file_exists($old1));
- $this->assertEquals($createFile, file_exists($old2));
- $this->assertEquals($createFile, file_exists($old3));
- $this->assertEquals($createFile, file_exists($old4));
- $this->assertEquals('test', file_get_contents($log));
- }
-
- public function rotationTests()
- {
- return array(
- 'Rotation is triggered when the file of the current day is not present'
- => array(true),
- 'Rotation is not triggered when the file is already present'
- => array(false),
- );
- }
-
- public function testReuseCurrentFile()
- {
- $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
- file_put_contents($log, "foo");
- $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot');
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord());
- $this->assertEquals('footest', file_get_contents($log));
- }
-
- public function tearDown()
- {
- foreach (glob(__DIR__.'/Fixtures/*.rot') as $file) {
- unlink($file);
- }
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php
deleted file mode 100644
index b354cee..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-/**
- * @covers Monolog\Handler\SamplingHandler::handle
- */
-class SamplingHandlerTest extends TestCase
-{
- public function testHandle()
- {
- $testHandler = new TestHandler();
- $handler = new SamplingHandler($testHandler, 2);
- for ($i = 0; $i < 10000; $i++) {
- $handler->handle($this->getRecord());
- }
- $count = count($testHandler->getRecords());
- // $count should be half of 10k, so between 4k and 6k
- $this->assertLessThan(6000, $count);
- $this->assertGreaterThan(4000, $count);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
deleted file mode 100644
index d657fae..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Greg Kedzierski
- * @see https://api.slack.com/
- */
-class SlackHandlerTest extends TestCase
-{
- /**
- * @var resource
- */
- private $res;
-
- /**
- * @var SlackHandler
- */
- private $handler;
-
- public function setUp()
- {
- if (!extension_loaded('openssl')) {
- $this->markTestSkipped('This test requires openssl to run');
- }
- }
-
- public function testWriteHeader()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/POST \/api\/chat.postMessage HTTP\/1.1\\r\\nHost: slack.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
- }
-
- public function testWriteContent()
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/token=myToken&channel=channel1&username=Monolog&text=&attachments=.*$/', $content);
- }
-
- public function testWriteContentWithEmoji()
- {
- $this->createHandler('myToken', 'channel1', 'Monolog', true, 'alien');
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/icon_emoji=%3Aalien%3A$/', $content);
- }
-
- /**
- * @dataProvider provideLevelColors
- */
- public function testWriteContentWithColors($level, $expectedColor)
- {
- $this->createHandler();
- $this->handler->handle($this->getRecord($level, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/color%22%3A%22'.$expectedColor.'/', $content);
- }
-
- public function testWriteContentWithPlainTextMessage()
- {
- $this->createHandler('myToken', 'channel1', 'Monolog', false);
- $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
- fseek($this->res, 0);
- $content = fread($this->res, 1024);
-
- $this->assertRegexp('/text=test1/', $content);
- }
-
- public function provideLevelColors()
- {
- return array(
- array(Logger::DEBUG, '%23e3e4e6'), // escaped #e3e4e6
- array(Logger::INFO, 'good'),
- array(Logger::NOTICE, 'good'),
- array(Logger::WARNING, 'warning'),
- array(Logger::ERROR, 'danger'),
- array(Logger::CRITICAL, 'danger'),
- array(Logger::ALERT, 'danger'),
- array(Logger::EMERGENCY,'danger'),
- );
- }
-
- private function createHandler($token = 'myToken', $channel = 'channel1', $username = 'Monolog', $useAttachment = true, $iconEmoji = null, $useShortAttachment = false, $includeExtra = false)
- {
- $constructorArgs = array($token, $channel, $username, $useAttachment, $iconEmoji, Logger::DEBUG, true, $useShortAttachment, $includeExtra);
- $this->res = fopen('php://memory', 'a');
- $this->handler = $this->getMock(
- '\Monolog\Handler\SlackHandler',
- array('fsockopen', 'streamSetTimeout', 'closeSocket'),
- $constructorArgs
- );
-
- $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
- $reflectionProperty->setAccessible(true);
- $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
- $this->handler->expects($this->any())
- ->method('fsockopen')
- ->will($this->returnValue($this->res));
- $this->handler->expects($this->any())
- ->method('streamSetTimeout')
- ->will($this->returnValue(true));
- $this->handler->expects($this->any())
- ->method('closeSocket')
- ->will($this->returnValue(true));
-
- $this->handler->setFormatter($this->getIdentityFormatter());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php
deleted file mode 100644
index 2e3d504..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Pablo de Leon Belloc
- */
-class SocketHandlerTest extends TestCase
-{
- /**
- * @var Monolog\Handler\SocketHandler
- */
- private $handler;
-
- /**
- * @var resource
- */
- private $res;
-
- /**
- * @expectedException UnexpectedValueException
- */
- public function testInvalidHostname()
- {
- $this->createHandler('garbage://here');
- $this->writeRecord('data');
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- public function testBadConnectionTimeout()
- {
- $this->createHandler('localhost:1234');
- $this->handler->setConnectionTimeout(-1);
- }
-
- public function testSetConnectionTimeout()
- {
- $this->createHandler('localhost:1234');
- $this->handler->setConnectionTimeout(10.1);
- $this->assertEquals(10.1, $this->handler->getConnectionTimeout());
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- public function testBadTimeout()
- {
- $this->createHandler('localhost:1234');
- $this->handler->setTimeout(-1);
- }
-
- public function testSetTimeout()
- {
- $this->createHandler('localhost:1234');
- $this->handler->setTimeout(10.25);
- $this->assertEquals(10.25, $this->handler->getTimeout());
- }
-
- public function testSetConnectionString()
- {
- $this->createHandler('tcp://localhost:9090');
- $this->assertEquals('tcp://localhost:9090', $this->handler->getConnectionString());
- }
-
- /**
- * @expectedException UnexpectedValueException
- */
- public function testExceptionIsThrownOnFsockopenError()
- {
- $this->setMockHandler(array('fsockopen'));
- $this->handler->expects($this->once())
- ->method('fsockopen')
- ->will($this->returnValue(false));
- $this->writeRecord('Hello world');
- }
-
- /**
- * @expectedException UnexpectedValueException
- */
- public function testExceptionIsThrownOnPfsockopenError()
- {
- $this->setMockHandler(array('pfsockopen'));
- $this->handler->expects($this->once())
- ->method('pfsockopen')
- ->will($this->returnValue(false));
- $this->handler->setPersistent(true);
- $this->writeRecord('Hello world');
- }
-
- /**
- * @expectedException UnexpectedValueException
- */
- public function testExceptionIsThrownIfCannotSetTimeout()
- {
- $this->setMockHandler(array('streamSetTimeout'));
- $this->handler->expects($this->once())
- ->method('streamSetTimeout')
- ->will($this->returnValue(false));
- $this->writeRecord('Hello world');
- }
-
- /**
- * @expectedException RuntimeException
- */
- public function testWriteFailsOnIfFwriteReturnsFalse()
- {
- $this->setMockHandler(array('fwrite'));
-
- $callback = function ($arg) {
- $map = array(
- 'Hello world' => 6,
- 'world' => false,
- );
-
- return $map[$arg];
- };
-
- $this->handler->expects($this->exactly(2))
- ->method('fwrite')
- ->will($this->returnCallback($callback));
-
- $this->writeRecord('Hello world');
- }
-
- /**
- * @expectedException RuntimeException
- */
- public function testWriteFailsIfStreamTimesOut()
- {
- $this->setMockHandler(array('fwrite', 'streamGetMetadata'));
-
- $callback = function ($arg) {
- $map = array(
- 'Hello world' => 6,
- 'world' => 5,
- );
-
- return $map[$arg];
- };
-
- $this->handler->expects($this->exactly(1))
- ->method('fwrite')
- ->will($this->returnCallback($callback));
- $this->handler->expects($this->exactly(1))
- ->method('streamGetMetadata')
- ->will($this->returnValue(array('timed_out' => true)));
-
- $this->writeRecord('Hello world');
- }
-
- /**
- * @expectedException RuntimeException
- */
- public function testWriteFailsOnIncompleteWrite()
- {
- $this->setMockHandler(array('fwrite', 'streamGetMetadata'));
-
- $res = $this->res;
- $callback = function ($string) use ($res) {
- fclose($res);
-
- return strlen('Hello');
- };
-
- $this->handler->expects($this->exactly(1))
- ->method('fwrite')
- ->will($this->returnCallback($callback));
- $this->handler->expects($this->exactly(1))
- ->method('streamGetMetadata')
- ->will($this->returnValue(array('timed_out' => false)));
-
- $this->writeRecord('Hello world');
- }
-
- public function testWriteWithMemoryFile()
- {
- $this->setMockHandler();
- $this->writeRecord('test1');
- $this->writeRecord('test2');
- $this->writeRecord('test3');
- fseek($this->res, 0);
- $this->assertEquals('test1test2test3', fread($this->res, 1024));
- }
-
- public function testWriteWithMock()
- {
- $this->setMockHandler(array('fwrite'));
-
- $callback = function ($arg) {
- $map = array(
- 'Hello world' => 6,
- 'world' => 5,
- );
-
- return $map[$arg];
- };
-
- $this->handler->expects($this->exactly(2))
- ->method('fwrite')
- ->will($this->returnCallback($callback));
-
- $this->writeRecord('Hello world');
- }
-
- public function testClose()
- {
- $this->setMockHandler();
- $this->writeRecord('Hello world');
- $this->assertInternalType('resource', $this->res);
- $this->handler->close();
- $this->assertFalse(is_resource($this->res), "Expected resource to be closed after closing handler");
- }
-
- public function testCloseDoesNotClosePersistentSocket()
- {
- $this->setMockHandler();
- $this->handler->setPersistent(true);
- $this->writeRecord('Hello world');
- $this->assertTrue(is_resource($this->res));
- $this->handler->close();
- $this->assertTrue(is_resource($this->res));
- }
-
- private function createHandler($connectionString)
- {
- $this->handler = new SocketHandler($connectionString);
- $this->handler->setFormatter($this->getIdentityFormatter());
- }
-
- private function writeRecord($string)
- {
- $this->handler->handle($this->getRecord(Logger::WARNING, $string));
- }
-
- private function setMockHandler(array $methods = array())
- {
- $this->res = fopen('php://memory', 'a');
-
- $defaultMethods = array('fsockopen', 'pfsockopen', 'streamSetTimeout');
- $newMethods = array_diff($methods, $defaultMethods);
-
- $finalMethods = array_merge($defaultMethods, $newMethods);
-
- $this->handler = $this->getMock(
- '\Monolog\Handler\SocketHandler', $finalMethods, array('localhost:1234')
- );
-
- if (!in_array('fsockopen', $methods)) {
- $this->handler->expects($this->any())
- ->method('fsockopen')
- ->will($this->returnValue($this->res));
- }
-
- if (!in_array('pfsockopen', $methods)) {
- $this->handler->expects($this->any())
- ->method('pfsockopen')
- ->will($this->returnValue($this->res));
- }
-
- if (!in_array('streamSetTimeout', $methods)) {
- $this->handler->expects($this->any())
- ->method('streamSetTimeout')
- ->will($this->returnValue(true));
- }
-
- $this->handler->setFormatter($this->getIdentityFormatter());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php
deleted file mode 100644
index b1e22fb..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class StreamHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWrite()
- {
- $handle = fopen('php://memory', 'a+');
- $handler = new StreamHandler($handle);
- $handler->setFormatter($this->getIdentityFormatter());
- $handler->handle($this->getRecord(Logger::WARNING, 'test'));
- $handler->handle($this->getRecord(Logger::WARNING, 'test2'));
- $handler->handle($this->getRecord(Logger::WARNING, 'test3'));
- fseek($handle, 0);
- $this->assertEquals('testtest2test3', fread($handle, 100));
- }
-
- /**
- * @covers Monolog\Handler\StreamHandler::close
- */
- public function testClose()
- {
- $handle = fopen('php://memory', 'a+');
- $handler = new StreamHandler($handle);
- $this->assertTrue(is_resource($handle));
- $handler->close();
- $this->assertFalse(is_resource($handle));
- }
-
- /**
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteCreatesTheStreamResource()
- {
- $handler = new StreamHandler('php://memory');
- $handler->handle($this->getRecord());
- }
-
- /**
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteLocking()
- {
- $temp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'monolog_locked_log';
- $handler = new StreamHandler($temp, Logger::DEBUG, true, null, true);
- $handler->handle($this->getRecord());
- }
-
- /**
- * @expectedException LogicException
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteMissingResource()
- {
- $handler = new StreamHandler(null);
- $handler->handle($this->getRecord());
- }
-
- public function invalidArgumentProvider()
- {
- return array(
- array(1),
- array(array()),
- array(array('bogus://url')),
- );
- }
-
- /**
- * @dataProvider invalidArgumentProvider
- * @expectedException InvalidArgumentException
- * @covers Monolog\Handler\StreamHandler::__construct
- */
- public function testWriteInvalidArgument($invalidArgument)
- {
- $handler = new StreamHandler($invalidArgument);
- }
-
- /**
- * @expectedException UnexpectedValueException
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteInvalidResource()
- {
- $handler = new StreamHandler('bogus://url');
- $handler->handle($this->getRecord());
- }
-
- /**
- * @expectedException UnexpectedValueException
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteNonExistingResource()
- {
- $handler = new StreamHandler('ftp://foo/bar/baz/'.rand(0, 10000));
- $handler->handle($this->getRecord());
- }
-
- /**
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteNonExistingPath()
- {
- $handler = new StreamHandler(sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
- $handler->handle($this->getRecord());
- }
-
- /**
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteNonExistingFileResource()
- {
- $handler = new StreamHandler('file://'.sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
- $handler->handle($this->getRecord());
- }
-
- /**
- * @expectedException Exception
- * @expectedExceptionMessageRegExp /There is no existing directory at/
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteNonExistingAndNotCreatablePath()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Permissions checks can not run on windows');
- }
- $handler = new StreamHandler('/foo/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
- $handler->handle($this->getRecord());
- }
-
- /**
- * @expectedException Exception
- * @expectedExceptionMessageRegExp /There is no existing directory at/
- * @covers Monolog\Handler\StreamHandler::__construct
- * @covers Monolog\Handler\StreamHandler::write
- */
- public function testWriteNonExistingAndNotCreatableFileResource()
- {
- if (defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Permissions checks can not run on windows');
- }
- $handler = new StreamHandler('file:///foo/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
- $handler->handle($this->getRecord());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php
deleted file mode 100644
index 55e69c2..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-mailer = $this
- ->getMockBuilder('Swift_Mailer')
- ->disableOriginalConstructor()
- ->getMock();
- }
-
- public function testMessageCreationIsLazyWhenUsingCallback()
- {
- $this->mailer->expects($this->never())
- ->method('send');
-
- $callback = function () {
- throw new \RuntimeException('Swift_Message creation callback should not have been called in this test');
- };
- $handler = new SwiftMailerHandler($this->mailer, $callback);
-
- $records = array(
- $this->getRecord(Logger::DEBUG),
- $this->getRecord(Logger::INFO),
- );
- $handler->handleBatch($records);
- }
-
- public function testMessageCanBeCustomizedGivenLoggedData()
- {
- // Wire Mailer to expect a specific Swift_Message with a customized Subject
- $expectedMessage = new \Swift_Message();
- $this->mailer->expects($this->once())
- ->method('send')
- ->with($this->callback(function ($value) use ($expectedMessage) {
- return $value instanceof \Swift_Message
- && $value->getSubject() === 'Emergency'
- && $value === $expectedMessage;
- }));
-
- // Callback dynamically changes subject based on number of logged records
- $callback = function ($content, array $records) use ($expectedMessage) {
- $subject = count($records) > 0 ? 'Emergency' : 'Normal';
- $expectedMessage->setSubject($subject);
-
- return $expectedMessage;
- };
- $handler = new SwiftMailerHandler($this->mailer, $callback);
-
- // Logging 1 record makes this an Emergency
- $records = array(
- $this->getRecord(Logger::EMERGENCY),
- );
- $handler->handleBatch($records);
- }
-
- public function testMessageHaveUniqueId() {
- $messageTemplate = \Swift_Message::newInstance();
- $handler = new SwiftMailerHandler($this->mailer, $messageTemplate);
-
- $method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage');
- $method->setAccessible(true);
- $method->invokeArgs($handler, array($messageTemplate, array()));
-
- $builtMessage1 = $method->invoke($handler, $messageTemplate, array());
- $builtMessage2 = $method->invoke($handler, $messageTemplate, array());
-
- $this->assertFalse($builtMessage1->getId() === $builtMessage2->getId(), 'Two different messages have the same id');
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php
deleted file mode 100644
index 8f9e46b..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-class SyslogHandlerTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @covers Monolog\Handler\SyslogHandler::__construct
- */
- public function testConstruct()
- {
- $handler = new SyslogHandler('test');
- $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-
- $handler = new SyslogHandler('test', LOG_USER);
- $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-
- $handler = new SyslogHandler('test', 'user');
- $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-
- $handler = new SyslogHandler('test', LOG_USER, Logger::DEBUG, true, LOG_PERROR);
- $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
- }
-
- /**
- * @covers Monolog\Handler\SyslogHandler::__construct
- */
- public function testConstructInvalidFacility()
- {
- $this->setExpectedException('UnexpectedValueException');
- $handler = new SyslogHandler('test', 'unknown');
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
deleted file mode 100644
index 497812b..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * @requires extension sockets
- */
-class SyslogUdpHandlerTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @expectedException UnexpectedValueException
- */
- public function testWeValidateFacilities()
- {
- $handler = new SyslogUdpHandler("ip", null, "invalidFacility");
- }
-
- public function testWeSplitIntoLines()
- {
- $handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv");
- $handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
-
- $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol'));
- $socket->expects($this->at(0))
- ->method('write')
- ->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 ");
- $socket->expects($this->at(1))
- ->method('write')
- ->with("hej", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 ");
-
- $handler->setSocket($socket);
-
- $handler->handle($this->getRecordWithMessage("hej\nlol"));
- }
-
- protected function getRecordWithMessage($msg)
- {
- return array('message' => $msg, 'level' => \Monolog\Logger::WARNING, 'context' => null, 'extra' => array(), 'channel' => 'lol');
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
deleted file mode 100644
index 75cc4a8..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\TestHandler
- */
-class TestHandlerTest extends TestCase
-{
- /**
- * @dataProvider methodProvider
- */
- public function testHandler($method, $level)
- {
- $handler = new TestHandler;
- $record = $this->getRecord($level, 'test'.$method);
- $this->assertFalse($handler->{'has'.$method}($record), 'has'.$method);
- $this->assertFalse($handler->{'has'.$method.'ThatContains'}('test'), 'has'.$method.'ThatContains');
- $this->assertFalse($handler->{'has'.$method.'ThatPasses'}(function ($rec) {
- return true;
- }), 'has'.$method.'ThatPasses');
- $this->assertFalse($handler->{'has'.$method.'ThatMatches'}('/test\w+/'));
- $this->assertFalse($handler->{'has'.$method.'Records'}(), 'has'.$method.'Records');
- $handler->handle($record);
-
- $this->assertFalse($handler->{'has'.$method}('bar'), 'has'.$method);
- $this->assertTrue($handler->{'has'.$method}($record), 'has'.$method);
- $this->assertTrue($handler->{'has'.$method}('test'.$method), 'has'.$method);
- $this->assertTrue($handler->{'has'.$method.'ThatContains'}('test'), 'has'.$method.'ThatContains');
- $this->assertTrue($handler->{'has'.$method.'ThatPasses'}(function ($rec) {
- return true;
- }), 'has'.$method.'ThatPasses');
- $this->assertTrue($handler->{'has'.$method.'ThatMatches'}('/test\w+/'));
- $this->assertTrue($handler->{'has'.$method.'Records'}(), 'has'.$method.'Records');
-
- $records = $handler->getRecords();
- unset($records[0]['formatted']);
- $this->assertEquals(array($record), $records);
- }
-
- public function methodProvider()
- {
- return array(
- array('Emergency', Logger::EMERGENCY),
- array('Alert' , Logger::ALERT),
- array('Critical' , Logger::CRITICAL),
- array('Error' , Logger::ERROR),
- array('Warning' , Logger::WARNING),
- array('Info' , Logger::INFO),
- array('Notice' , Logger::NOTICE),
- array('Debug' , Logger::DEBUG),
- );
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php
deleted file mode 100644
index fa524d0..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Handler\SyslogUdp\UdpSocket;
-
-/**
- * @requires extension sockets
- */
-class UdpSocketTest extends TestCase
-{
- public function testWeDoNotTruncateShortMessages()
- {
- $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol'));
-
- $socket->expects($this->at(0))
- ->method('send')
- ->with("HEADER: The quick brown fox jumps over the lazy dog");
-
- $socket->write("The quick brown fox jumps over the lazy dog", "HEADER: ");
- }
-
- public function testLongMessagesAreTruncated()
- {
- $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol'));
-
- $truncatedString = str_repeat("derp", 16254).'d';
-
- $socket->expects($this->exactly(1))
- ->method('send')
- ->with("HEADER" . $truncatedString);
-
- $longString = str_repeat("derp", 20000);
-
- $socket->write($longString, "HEADER");
- }
-
- public function testDoubleCloseDoesNotError()
- {
- $socket = new UdpSocket('127.0.0.1', 514);
- $socket->close();
- $socket->close();
- }
-
- /**
- * @expectedException LogicException
- */
- public function testWriteAfterCloseErrors()
- {
- $socket = new UdpSocket('127.0.0.1', 514);
- $socket->close();
- $socket->write('foo', "HEADER");
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
deleted file mode 100644
index 8d37a1f..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class WhatFailureGroupHandlerTest extends TestCase
-{
- /**
- * @covers Monolog\Handler\WhatFailureGroupHandler::__construct
- * @expectedException InvalidArgumentException
- */
- public function testConstructorOnlyTakesHandler()
- {
- new WhatFailureGroupHandler(array(new TestHandler(), "foo"));
- }
-
- /**
- * @covers Monolog\Handler\WhatFailureGroupHandler::__construct
- * @covers Monolog\Handler\WhatFailureGroupHandler::handle
- */
- public function testHandle()
- {
- $testHandlers = array(new TestHandler(), new TestHandler());
- $handler = new WhatFailureGroupHandler($testHandlers);
- $handler->handle($this->getRecord(Logger::DEBUG));
- $handler->handle($this->getRecord(Logger::INFO));
- foreach ($testHandlers as $test) {
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue(count($test->getRecords()) === 2);
- }
- }
-
- /**
- * @covers Monolog\Handler\WhatFailureGroupHandler::handleBatch
- */
- public function testHandleBatch()
- {
- $testHandlers = array(new TestHandler(), new TestHandler());
- $handler = new WhatFailureGroupHandler($testHandlers);
- $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
- foreach ($testHandlers as $test) {
- $this->assertTrue($test->hasDebugRecords());
- $this->assertTrue($test->hasInfoRecords());
- $this->assertTrue(count($test->getRecords()) === 2);
- }
- }
-
- /**
- * @covers Monolog\Handler\WhatFailureGroupHandler::isHandling
- */
- public function testIsHandling()
- {
- $testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING));
- $handler = new WhatFailureGroupHandler($testHandlers);
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
- $this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
- $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
- }
-
- /**
- * @covers Monolog\Handler\WhatFailureGroupHandler::handle
- */
- public function testHandleUsesProcessors()
- {
- $test = new TestHandler();
- $handler = new WhatFailureGroupHandler(array($test));
- $handler->pushProcessor(function ($record) {
- $record['extra']['foo'] = true;
-
- return $record;
- });
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasWarningRecords());
- $records = $test->getRecords();
- $this->assertTrue($records[0]['extra']['foo']);
- }
-
- /**
- * @covers Monolog\Handler\WhatFailureGroupHandler::handle
- */
- public function testHandleException()
- {
- $test = new TestHandler();
- $exception = new ExceptionTestHandler();
- $handler = new WhatFailureGroupHandler(array($exception, $test, $exception));
- $handler->pushProcessor(function ($record) {
- $record['extra']['foo'] = true;
-
- return $record;
- });
- $handler->handle($this->getRecord(Logger::WARNING));
- $this->assertTrue($test->hasWarningRecords());
- $records = $test->getRecords();
- $this->assertTrue($records[0]['extra']['foo']);
- }
-}
-
-class ExceptionTestHandler extends TestHandler
-{
- /**
- * {@inheritdoc}
- */
- public function handle(array $record)
- {
- parent::handle($record);
-
- throw new \Exception("ExceptionTestHandler::handle");
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php b/application/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php
deleted file mode 100644
index 416039e..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-class ZendMonitorHandlerTest extends TestCase
-{
- protected $zendMonitorHandler;
-
- public function setUp()
- {
- if (!function_exists('zend_monitor_custom_event')) {
- $this->markTestSkipped('ZendServer is not installed');
- }
- }
-
- /**
- * @covers Monolog\Handler\ZendMonitorHandler::write
- */
- public function testWrite()
- {
- $record = $this->getRecord();
- $formatterResult = array(
- 'message' => $record['message']
- );
-
- $zendMonitor = $this->getMockBuilder('Monolog\Handler\ZendMonitorHandler')
- ->setMethods(array('writeZendMonitorCustomEvent', 'getDefaultFormatter'))
- ->getMock();
-
- $formatterMock = $this->getMockBuilder('Monolog\Formatter\NormalizerFormatter')
- ->disableOriginalConstructor()
- ->getMock();
-
- $formatterMock->expects($this->once())
- ->method('format')
- ->will($this->returnValue($formatterResult));
-
- $zendMonitor->expects($this->once())
- ->method('getDefaultFormatter')
- ->will($this->returnValue($formatterMock));
-
- $levelMap = $zendMonitor->getLevelMap();
-
- $zendMonitor->expects($this->once())
- ->method('writeZendMonitorCustomEvent')
- ->with($levelMap[$record['level']], $record['message'], $formatterResult);
-
- $zendMonitor->handle($record);
- }
-
- /**
- * @covers Monolog\Handler\ZendMonitorHandler::getDefaultFormatter
- */
- public function testGetDefaultFormatterReturnsNormalizerFormatter()
- {
- $zendMonitor = new ZendMonitorHandler();
- $this->assertInstanceOf('Monolog\Formatter\NormalizerFormatter', $zendMonitor->getDefaultFormatter());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/LoggerTest.php b/application/vendor/monolog/monolog/tests/Monolog/LoggerTest.php
deleted file mode 100644
index b9ba6e9..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/LoggerTest.php
+++ /dev/null
@@ -1,471 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Monolog\Processor\WebProcessor;
-use Monolog\Handler\TestHandler;
-
-class LoggerTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @covers Monolog\Logger::getName
- */
- public function testGetName()
- {
- $logger = new Logger('foo');
- $this->assertEquals('foo', $logger->getName());
- }
-
- /**
- * @covers Monolog\Logger::getLevelName
- */
- public function testGetLevelName()
- {
- $this->assertEquals('ERROR', Logger::getLevelName(Logger::ERROR));
- }
-
- /**
- * @covers Monolog\Logger::toMonologLevel
- */
- public function testConvertPSR3ToMonologLevel()
- {
- $this->assertEquals(Logger::toMonologLevel('debug'), 100);
- $this->assertEquals(Logger::toMonologLevel('info'), 200);
- $this->assertEquals(Logger::toMonologLevel('notice'), 250);
- $this->assertEquals(Logger::toMonologLevel('warning'), 300);
- $this->assertEquals(Logger::toMonologLevel('error'), 400);
- $this->assertEquals(Logger::toMonologLevel('critical'), 500);
- $this->assertEquals(Logger::toMonologLevel('alert'), 550);
- $this->assertEquals(Logger::toMonologLevel('emergency'), 600);
- }
-
- /**
- * @covers Monolog\Logger::getLevelName
- * @expectedException InvalidArgumentException
- */
- public function testGetLevelNameThrows()
- {
- Logger::getLevelName(5);
- }
-
- /**
- * @covers Monolog\Logger::__construct
- */
- public function testChannel()
- {
- $logger = new Logger('foo');
- $handler = new TestHandler;
- $logger->pushHandler($handler);
- $logger->addWarning('test');
- list($record) = $handler->getRecords();
- $this->assertEquals('foo', $record['channel']);
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testLog()
- {
- $logger = new Logger(__METHOD__);
-
- $handler = $this->getMock('Monolog\Handler\NullHandler', array('handle'));
- $handler->expects($this->once())
- ->method('handle');
- $logger->pushHandler($handler);
-
- $this->assertTrue($logger->addWarning('test'));
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testLogNotHandled()
- {
- $logger = new Logger(__METHOD__);
-
- $handler = $this->getMock('Monolog\Handler\NullHandler', array('handle'), array(Logger::ERROR));
- $handler->expects($this->never())
- ->method('handle');
- $logger->pushHandler($handler);
-
- $this->assertFalse($logger->addWarning('test'));
- }
-
- public function testHandlersInCtor()
- {
- $handler1 = new TestHandler;
- $handler2 = new TestHandler;
- $logger = new Logger(__METHOD__, array($handler1, $handler2));
-
- $this->assertEquals($handler1, $logger->popHandler());
- $this->assertEquals($handler2, $logger->popHandler());
- }
-
- public function testProcessorsInCtor()
- {
- $processor1 = new WebProcessor;
- $processor2 = new WebProcessor;
- $logger = new Logger(__METHOD__, array(), array($processor1, $processor2));
-
- $this->assertEquals($processor1, $logger->popProcessor());
- $this->assertEquals($processor2, $logger->popProcessor());
- }
-
- /**
- * @covers Monolog\Logger::pushHandler
- * @covers Monolog\Logger::popHandler
- * @expectedException LogicException
- */
- public function testPushPopHandler()
- {
- $logger = new Logger(__METHOD__);
- $handler1 = new TestHandler;
- $handler2 = new TestHandler;
-
- $logger->pushHandler($handler1);
- $logger->pushHandler($handler2);
-
- $this->assertEquals($handler2, $logger->popHandler());
- $this->assertEquals($handler1, $logger->popHandler());
- $logger->popHandler();
- }
-
- /**
- * @covers Monolog\Logger::setHandlers
- */
- public function testSetHandlers()
- {
- $logger = new Logger(__METHOD__);
- $handler1 = new TestHandler;
- $handler2 = new TestHandler;
-
- $logger->pushHandler($handler1);
- $logger->setHandlers(array($handler2));
-
- // handler1 has been removed
- $this->assertEquals(array($handler2), $logger->getHandlers());
-
- $logger->setHandlers(array(
- "AMapKey" => $handler1,
- "Woop" => $handler2,
- ));
-
- // Keys have been scrubbed
- $this->assertEquals(array($handler1, $handler2), $logger->getHandlers());
- }
-
- /**
- * @covers Monolog\Logger::pushProcessor
- * @covers Monolog\Logger::popProcessor
- * @expectedException LogicException
- */
- public function testPushPopProcessor()
- {
- $logger = new Logger(__METHOD__);
- $processor1 = new WebProcessor;
- $processor2 = new WebProcessor;
-
- $logger->pushProcessor($processor1);
- $logger->pushProcessor($processor2);
-
- $this->assertEquals($processor2, $logger->popProcessor());
- $this->assertEquals($processor1, $logger->popProcessor());
- $logger->popProcessor();
- }
-
- /**
- * @covers Monolog\Logger::pushProcessor
- * @expectedException InvalidArgumentException
- */
- public function testPushProcessorWithNonCallable()
- {
- $logger = new Logger(__METHOD__);
-
- $logger->pushProcessor(new \stdClass());
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testProcessorsAreExecuted()
- {
- $logger = new Logger(__METHOD__);
- $handler = new TestHandler;
- $logger->pushHandler($handler);
- $logger->pushProcessor(function ($record) {
- $record['extra']['win'] = true;
-
- return $record;
- });
- $logger->addError('test');
- list($record) = $handler->getRecords();
- $this->assertTrue($record['extra']['win']);
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testProcessorsAreCalledOnlyOnce()
- {
- $logger = new Logger(__METHOD__);
- $handler = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler->expects($this->any())
- ->method('isHandling')
- ->will($this->returnValue(true))
- ;
- $handler->expects($this->any())
- ->method('handle')
- ->will($this->returnValue(true))
- ;
- $logger->pushHandler($handler);
-
- $processor = $this->getMockBuilder('Monolog\Processor\WebProcessor')
- ->disableOriginalConstructor()
- ->setMethods(array('__invoke'))
- ->getMock()
- ;
- $processor->expects($this->once())
- ->method('__invoke')
- ->will($this->returnArgument(0))
- ;
- $logger->pushProcessor($processor);
-
- $logger->addError('test');
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testProcessorsNotCalledWhenNotHandled()
- {
- $logger = new Logger(__METHOD__);
- $handler = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler->expects($this->once())
- ->method('isHandling')
- ->will($this->returnValue(false))
- ;
- $logger->pushHandler($handler);
- $that = $this;
- $logger->pushProcessor(function ($record) use ($that) {
- $that->fail('The processor should not be called');
- });
- $logger->addAlert('test');
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testHandlersNotCalledBeforeFirstHandling()
- {
- $logger = new Logger(__METHOD__);
-
- $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler1->expects($this->never())
- ->method('isHandling')
- ->will($this->returnValue(false))
- ;
- $handler1->expects($this->once())
- ->method('handle')
- ->will($this->returnValue(false))
- ;
- $logger->pushHandler($handler1);
-
- $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler2->expects($this->once())
- ->method('isHandling')
- ->will($this->returnValue(true))
- ;
- $handler2->expects($this->once())
- ->method('handle')
- ->will($this->returnValue(false))
- ;
- $logger->pushHandler($handler2);
-
- $handler3 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler3->expects($this->once())
- ->method('isHandling')
- ->will($this->returnValue(false))
- ;
- $handler3->expects($this->never())
- ->method('handle')
- ;
- $logger->pushHandler($handler3);
-
- $logger->debug('test');
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testBubblingWhenTheHandlerReturnsFalse()
- {
- $logger = new Logger(__METHOD__);
-
- $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler1->expects($this->any())
- ->method('isHandling')
- ->will($this->returnValue(true))
- ;
- $handler1->expects($this->once())
- ->method('handle')
- ->will($this->returnValue(false))
- ;
- $logger->pushHandler($handler1);
-
- $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler2->expects($this->any())
- ->method('isHandling')
- ->will($this->returnValue(true))
- ;
- $handler2->expects($this->once())
- ->method('handle')
- ->will($this->returnValue(false))
- ;
- $logger->pushHandler($handler2);
-
- $logger->debug('test');
- }
-
- /**
- * @covers Monolog\Logger::addRecord
- */
- public function testNotBubblingWhenTheHandlerReturnsTrue()
- {
- $logger = new Logger(__METHOD__);
-
- $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler1->expects($this->any())
- ->method('isHandling')
- ->will($this->returnValue(true))
- ;
- $handler1->expects($this->never())
- ->method('handle')
- ;
- $logger->pushHandler($handler1);
-
- $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler2->expects($this->any())
- ->method('isHandling')
- ->will($this->returnValue(true))
- ;
- $handler2->expects($this->once())
- ->method('handle')
- ->will($this->returnValue(true))
- ;
- $logger->pushHandler($handler2);
-
- $logger->debug('test');
- }
-
- /**
- * @covers Monolog\Logger::isHandling
- */
- public function testIsHandling()
- {
- $logger = new Logger(__METHOD__);
-
- $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler1->expects($this->any())
- ->method('isHandling')
- ->will($this->returnValue(false))
- ;
-
- $logger->pushHandler($handler1);
- $this->assertFalse($logger->isHandling(Logger::DEBUG));
-
- $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
- $handler2->expects($this->any())
- ->method('isHandling')
- ->will($this->returnValue(true))
- ;
-
- $logger->pushHandler($handler2);
- $this->assertTrue($logger->isHandling(Logger::DEBUG));
- }
-
- /**
- * @dataProvider logMethodProvider
- * @covers Monolog\Logger::addDebug
- * @covers Monolog\Logger::addInfo
- * @covers Monolog\Logger::addNotice
- * @covers Monolog\Logger::addWarning
- * @covers Monolog\Logger::addError
- * @covers Monolog\Logger::addCritical
- * @covers Monolog\Logger::addAlert
- * @covers Monolog\Logger::addEmergency
- * @covers Monolog\Logger::debug
- * @covers Monolog\Logger::info
- * @covers Monolog\Logger::notice
- * @covers Monolog\Logger::warn
- * @covers Monolog\Logger::err
- * @covers Monolog\Logger::crit
- * @covers Monolog\Logger::alert
- * @covers Monolog\Logger::emerg
- */
- public function testLogMethods($method, $expectedLevel)
- {
- $logger = new Logger('foo');
- $handler = new TestHandler;
- $logger->pushHandler($handler);
- $logger->{$method}('test');
- list($record) = $handler->getRecords();
- $this->assertEquals($expectedLevel, $record['level']);
- }
-
- public function logMethodProvider()
- {
- return array(
- // monolog methods
- array('addDebug', Logger::DEBUG),
- array('addInfo', Logger::INFO),
- array('addNotice', Logger::NOTICE),
- array('addWarning', Logger::WARNING),
- array('addError', Logger::ERROR),
- array('addCritical', Logger::CRITICAL),
- array('addAlert', Logger::ALERT),
- array('addEmergency', Logger::EMERGENCY),
-
- // ZF/Sf2 compat methods
- array('debug', Logger::DEBUG),
- array('info', Logger::INFO),
- array('notice', Logger::NOTICE),
- array('warn', Logger::WARNING),
- array('err', Logger::ERROR),
- array('crit', Logger::CRITICAL),
- array('alert', Logger::ALERT),
- array('emerg', Logger::EMERGENCY),
- );
- }
-
- /**
- * @dataProvider setTimezoneProvider
- * @covers Monolog\Logger::setTimezone
- */
- public function testSetTimezone($tz)
- {
- Logger::setTimezone($tz);
- $logger = new Logger('foo');
- $handler = new TestHandler;
- $logger->pushHandler($handler);
- $logger->info('test');
- list($record) = $handler->getRecords();
- $this->assertEquals($tz, $record['datetime']->getTimezone());
- }
-
- public function setTimezoneProvider()
- {
- return array_map(
- function ($tz) { return array(new \DateTimeZone($tz)); },
- \DateTimeZone::listIdentifiers()
- );
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php
deleted file mode 100644
index 5adb505..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class GitProcessorTest extends TestCase
-{
- /**
- * @covers Monolog\Processor\GitProcessor::__invoke
- */
- public function testProcessor()
- {
- $processor = new GitProcessor();
- $record = $processor($this->getRecord());
-
- $this->assertArrayHasKey('git', $record['extra']);
- $this->assertTrue(!is_array($record['extra']['git']['branch']));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php
deleted file mode 100644
index 0dd411d..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Acme;
-
-class Tester
-{
- public function test($handler, $record)
- {
- $handler->handle($record);
- }
-}
-
-function tester($handler, $record)
-{
- $handler->handle($record);
-}
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-use Monolog\Handler\TestHandler;
-
-class IntrospectionProcessorTest extends TestCase
-{
- public function getHandler()
- {
- $processor = new IntrospectionProcessor();
- $handler = new TestHandler();
- $handler->pushProcessor($processor);
-
- return $handler;
- }
-
- public function testProcessorFromClass()
- {
- $handler = $this->getHandler();
- $tester = new \Acme\Tester;
- $tester->test($handler, $this->getRecord());
- list($record) = $handler->getRecords();
- $this->assertEquals(__FILE__, $record['extra']['file']);
- $this->assertEquals(18, $record['extra']['line']);
- $this->assertEquals('Acme\Tester', $record['extra']['class']);
- $this->assertEquals('test', $record['extra']['function']);
- }
-
- public function testProcessorFromFunc()
- {
- $handler = $this->getHandler();
- \Acme\tester($handler, $this->getRecord());
- list($record) = $handler->getRecords();
- $this->assertEquals(__FILE__, $record['extra']['file']);
- $this->assertEquals(24, $record['extra']['line']);
- $this->assertEquals(null, $record['extra']['class']);
- $this->assertEquals('Acme\tester', $record['extra']['function']);
- }
-
- public function testLevelTooLow()
- {
- $input = array(
- 'level' => Logger::DEBUG,
- 'extra' => array(),
- );
-
- $expected = $input;
-
- $processor = new IntrospectionProcessor(Logger::CRITICAL);
- $actual = $processor($input);
-
- $this->assertEquals($expected, $actual);
- }
-
- public function testLevelEqual()
- {
- $input = array(
- 'level' => Logger::CRITICAL,
- 'extra' => array(),
- );
-
- $expected = $input;
- $expected['extra'] = array(
- 'file' => null,
- 'line' => null,
- 'class' => 'ReflectionMethod',
- 'function' => 'invokeArgs',
- );
-
- $processor = new IntrospectionProcessor(Logger::CRITICAL);
- $actual = $processor($input);
-
- $this->assertEquals($expected, $actual);
- }
-
- public function testLevelHigher()
- {
- $input = array(
- 'level' => Logger::EMERGENCY,
- 'extra' => array(),
- );
-
- $expected = $input;
- $expected['extra'] = array(
- 'file' => null,
- 'line' => null,
- 'class' => 'ReflectionMethod',
- 'function' => 'invokeArgs',
- );
-
- $processor = new IntrospectionProcessor(Logger::CRITICAL);
- $actual = $processor($input);
-
- $this->assertEquals($expected, $actual);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php
deleted file mode 100644
index eb66614..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class MemoryPeakUsageProcessorTest extends TestCase
-{
- /**
- * @covers Monolog\Processor\MemoryPeakUsageProcessor::__invoke
- * @covers Monolog\Processor\MemoryProcessor::formatBytes
- */
- public function testProcessor()
- {
- $processor = new MemoryPeakUsageProcessor();
- $record = $processor($this->getRecord());
- $this->assertArrayHasKey('memory_peak_usage', $record['extra']);
- $this->assertRegExp('#[0-9.]+ (M|K)?B$#', $record['extra']['memory_peak_usage']);
- }
-
- /**
- * @covers Monolog\Processor\MemoryPeakUsageProcessor::__invoke
- * @covers Monolog\Processor\MemoryProcessor::formatBytes
- */
- public function testProcessorWithoutFormatting()
- {
- $processor = new MemoryPeakUsageProcessor(true, false);
- $record = $processor($this->getRecord());
- $this->assertArrayHasKey('memory_peak_usage', $record['extra']);
- $this->assertInternalType('int', $record['extra']['memory_peak_usage']);
- $this->assertGreaterThan(0, $record['extra']['memory_peak_usage']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php
deleted file mode 100644
index 4692dbf..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class MemoryUsageProcessorTest extends TestCase
-{
- /**
- * @covers Monolog\Processor\MemoryUsageProcessor::__invoke
- * @covers Monolog\Processor\MemoryProcessor::formatBytes
- */
- public function testProcessor()
- {
- $processor = new MemoryUsageProcessor();
- $record = $processor($this->getRecord());
- $this->assertArrayHasKey('memory_usage', $record['extra']);
- $this->assertRegExp('#[0-9.]+ (M|K)?B$#', $record['extra']['memory_usage']);
- }
-
- /**
- * @covers Monolog\Processor\MemoryUsageProcessor::__invoke
- * @covers Monolog\Processor\MemoryProcessor::formatBytes
- */
- public function testProcessorWithoutFormatting()
- {
- $processor = new MemoryUsageProcessor(true, false);
- $record = $processor($this->getRecord());
- $this->assertArrayHasKey('memory_usage', $record['extra']);
- $this->assertInternalType('int', $record['extra']['memory_usage']);
- $this->assertGreaterThan(0, $record['extra']['memory_usage']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php
deleted file mode 100644
index 458d2a3..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class ProcessIdProcessorTest extends TestCase
-{
- /**
- * @covers Monolog\Processor\ProcessIdProcessor::__invoke
- */
- public function testProcessor()
- {
- $processor = new ProcessIdProcessor();
- $record = $processor($this->getRecord());
- $this->assertArrayHasKey('process_id', $record['extra']);
- $this->assertInternalType('int', $record['extra']['process_id']);
- $this->assertGreaterThan(0, $record['extra']['process_id']);
- $this->assertEquals(getmypid(), $record['extra']['process_id']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
deleted file mode 100644
index 81bfbdc..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @dataProvider getPairs
- */
- public function testReplacement($val, $expected)
- {
- $proc = new PsrLogMessageProcessor;
-
- $message = $proc(array(
- 'message' => '{foo}',
- 'context' => array('foo' => $val)
- ));
- $this->assertEquals($expected, $message['message']);
- }
-
- public function getPairs()
- {
- return array(
- array('foo', 'foo'),
- array('3', '3'),
- array(3, '3'),
- array(null, ''),
- array(true, '1'),
- array(false, ''),
- array(new \stdClass, '[object stdClass]'),
- array(array(), '[array]'),
- );
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
deleted file mode 100644
index 0d860c6..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class TagProcessorTest extends TestCase
-{
- /**
- * @covers Monolog\Processor\TagProcessor::__invoke
- */
- public function testProcessor()
- {
- $tags = array(1, 2, 3);
- $processor = new TagProcessor($tags);
- $record = $processor($this->getRecord());
-
- $this->assertEquals($tags, $record['extra']['tags']);
- }
-
- /**
- * @covers Monolog\Processor\TagProcessor::__invoke
- */
- public function testProcessorTagModification()
- {
- $tags = array(1, 2, 3);
- $processor = new TagProcessor($tags);
-
- $record = $processor($this->getRecord());
- $this->assertEquals($tags, $record['extra']['tags']);
-
- $processor->setTags(array('a', 'b'));
- $record = $processor($this->getRecord());
- $this->assertEquals(array('a', 'b'), $record['extra']['tags']);
-
- $processor->addTags(array('a', 'c', 'foo' => 'bar'));
- $record = $processor($this->getRecord());
- $this->assertEquals(array('a', 'b', 'a', 'c', 'foo' => 'bar'), $record['extra']['tags']);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php
deleted file mode 100644
index befad95..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class UidProcessorTest extends TestCase
-{
- /**
- * @covers Monolog\Processor\UidProcessor::__invoke
- */
- public function testProcessor()
- {
- $processor = new UidProcessor();
- $record = $processor($this->getRecord());
- $this->assertArrayHasKey('uid', $record['extra']);
- }
- public function testGetUid()
- {
- $processor = new UidProcessor(10);
- $this->assertEquals(10, strlen($processor->getUid()));
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php b/application/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php
deleted file mode 100644
index dba8941..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class WebProcessorTest extends TestCase
-{
- public function testProcessor()
- {
- $server = array(
- 'REQUEST_URI' => 'A',
- 'REMOTE_ADDR' => 'B',
- 'REQUEST_METHOD' => 'C',
- 'HTTP_REFERER' => 'D',
- 'SERVER_NAME' => 'F',
- 'UNIQUE_ID' => 'G',
- );
-
- $processor = new WebProcessor($server);
- $record = $processor($this->getRecord());
- $this->assertEquals($server['REQUEST_URI'], $record['extra']['url']);
- $this->assertEquals($server['REMOTE_ADDR'], $record['extra']['ip']);
- $this->assertEquals($server['REQUEST_METHOD'], $record['extra']['http_method']);
- $this->assertEquals($server['HTTP_REFERER'], $record['extra']['referrer']);
- $this->assertEquals($server['SERVER_NAME'], $record['extra']['server']);
- $this->assertEquals($server['UNIQUE_ID'], $record['extra']['unique_id']);
- }
-
- public function testProcessorDoNothingIfNoRequestUri()
- {
- $server = array(
- 'REMOTE_ADDR' => 'B',
- 'REQUEST_METHOD' => 'C',
- );
- $processor = new WebProcessor($server);
- $record = $processor($this->getRecord());
- $this->assertEmpty($record['extra']);
- }
-
- public function testProcessorReturnNullIfNoHttpReferer()
- {
- $server = array(
- 'REQUEST_URI' => 'A',
- 'REMOTE_ADDR' => 'B',
- 'REQUEST_METHOD' => 'C',
- 'SERVER_NAME' => 'F',
- );
- $processor = new WebProcessor($server);
- $record = $processor($this->getRecord());
- $this->assertNull($record['extra']['referrer']);
- }
-
- public function testProcessorDoesNotAddUniqueIdIfNotPresent()
- {
- $server = array(
- 'REQUEST_URI' => 'A',
- 'REMOTE_ADDR' => 'B',
- 'REQUEST_METHOD' => 'C',
- 'SERVER_NAME' => 'F',
- );
- $processor = new WebProcessor($server);
- $record = $processor($this->getRecord());
- $this->assertFalse(isset($record['extra']['unique_id']));
- }
-
- public function testProcessorAddsOnlyRequestedExtraFields()
- {
- $server = array(
- 'REQUEST_URI' => 'A',
- 'REMOTE_ADDR' => 'B',
- 'REQUEST_METHOD' => 'C',
- 'SERVER_NAME' => 'F',
- );
-
- $processor = new WebProcessor($server, array('url', 'http_method'));
- $record = $processor($this->getRecord());
-
- $this->assertSame(array('url' => 'A', 'http_method' => 'C'), $record['extra']);
- }
-
- /**
- * @expectedException UnexpectedValueException
- */
- public function testInvalidData()
- {
- new WebProcessor(new \stdClass);
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php b/application/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php
deleted file mode 100644
index ab89944..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/PsrLogCompatTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Monolog\Handler\TestHandler;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Processor\PsrLogMessageProcessor;
-use Psr\Log\Test\LoggerInterfaceTest;
-
-class PsrLogCompatTest extends LoggerInterfaceTest
-{
- private $handler;
-
- public function getLogger()
- {
- $logger = new Logger('foo');
- $logger->pushHandler($handler = new TestHandler);
- $logger->pushProcessor(new PsrLogMessageProcessor);
- $handler->setFormatter(new LineFormatter('%level_name% %message%'));
-
- $this->handler = $handler;
-
- return $logger;
- }
-
- public function getLogs()
- {
- $convert = function ($record) {
- $lower = function ($match) {
- return strtolower($match[0]);
- };
-
- return preg_replace_callback('{^[A-Z]+}', $lower, $record['formatted']);
- };
-
- return array_map($convert, $this->handler->getRecords());
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/RegistryTest.php b/application/vendor/monolog/monolog/tests/Monolog/RegistryTest.php
deleted file mode 100644
index 15fdfbd..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/RegistryTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-class RegistryTest extends \PHPUnit_Framework_TestCase
-{
- protected function setUp()
- {
- Registry::clear();
- }
-
- /**
- * @dataProvider hasLoggerProvider
- * @covers Monolog\Registry::hasLogger
- */
- public function testHasLogger(array $loggersToAdd, array $loggersToCheck, array $expectedResult)
- {
- foreach ($loggersToAdd as $loggerToAdd) {
- Registry::addLogger($loggerToAdd);
- }
- foreach ($loggersToCheck as $index => $loggerToCheck) {
- $this->assertSame($expectedResult[$index], Registry::hasLogger($loggerToCheck));
- }
- }
-
- public function hasLoggerProvider()
- {
- $logger1 = new Logger('test1');
- $logger2 = new Logger('test2');
- $logger3 = new Logger('test3');
-
- return array(
- // only instances
- array(
- array($logger1),
- array($logger1, $logger2),
- array(true, false),
- ),
- // only names
- array(
- array($logger1),
- array('test1', 'test2'),
- array(true, false),
- ),
- // mixed case
- array(
- array($logger1, $logger2),
- array('test1', $logger2, 'test3', $logger3),
- array(true, true, false, false),
- ),
- );
- }
-
- /**
- * @covers Monolog\Registry::clear
- */
- public function testClearClears()
- {
- Registry::addLogger(new Logger('test1'), 'log');
- Registry::clear();
-
- $this->setExpectedException('\InvalidArgumentException');
- Registry::getInstance('log');
- }
-
- /**
- * @dataProvider removedLoggerProvider
- * @covers Monolog\Registry::addLogger
- * @covers Monolog\Registry::removeLogger
- */
- public function testRemovesLogger($loggerToAdd, $remove)
- {
- Registry::addLogger($loggerToAdd);
- Registry::removeLogger($remove);
-
- $this->setExpectedException('\InvalidArgumentException');
- Registry::getInstance($loggerToAdd->getName());
- }
-
- public function removedLoggerProvider()
- {
- $logger1 = new Logger('test1');
-
- return array(
- array($logger1, $logger1),
- array($logger1, 'test1'),
- );
- }
-
- /**
- * @covers Monolog\Registry::addLogger
- * @covers Monolog\Registry::getInstance
- * @covers Monolog\Registry::__callStatic
- */
- public function testGetsSameLogger()
- {
- $logger1 = new Logger('test1');
- $logger2 = new Logger('test2');
-
- Registry::addLogger($logger1, 'test1');
- Registry::addLogger($logger2);
-
- $this->assertSame($logger1, Registry::getInstance('test1'));
- $this->assertSame($logger2, Registry::test2());
- }
-
- /**
- * @expectedException \InvalidArgumentException
- * @covers Monolog\Registry::getInstance
- */
- public function testFailsOnNonExistantLogger()
- {
- Registry::getInstance('test1');
- }
-
- /**
- * @covers Monolog\Registry::addLogger
- */
- public function testReplacesLogger()
- {
- $log1 = new Logger('test1');
- $log2 = new Logger('test2');
-
- Registry::addLogger($log1, 'log');
-
- Registry::addLogger($log2, 'log', true);
-
- $this->assertSame($log2, Registry::getInstance('log'));
- }
-
- /**
- * @expectedException \InvalidArgumentException
- * @covers Monolog\Registry::addLogger
- */
- public function testFailsOnUnspecifiedReplacement()
- {
- $log1 = new Logger('test1');
- $log2 = new Logger('test2');
-
- Registry::addLogger($log1, 'log');
-
- Registry::addLogger($log2, 'log');
- }
-}
diff --git a/application/vendor/monolog/monolog/tests/Monolog/TestCase.php b/application/vendor/monolog/monolog/tests/Monolog/TestCase.php
deleted file mode 100644
index cae7934..0000000
--- a/application/vendor/monolog/monolog/tests/Monolog/TestCase.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-class TestCase extends \PHPUnit_Framework_TestCase
-{
- /**
- * @return array Record
- */
- protected function getRecord($level = Logger::WARNING, $message = 'test', $context = array())
- {
- return array(
- 'message' => $message,
- 'context' => $context,
- 'level' => $level,
- 'level_name' => Logger::getLevelName($level),
- 'channel' => 'test',
- 'datetime' => \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true))),
- 'extra' => array(),
- );
- }
-
- /**
- * @return array
- */
- protected function getMultipleRecords()
- {
- return array(
- $this->getRecord(Logger::DEBUG, 'debug message 1'),
- $this->getRecord(Logger::DEBUG, 'debug message 2'),
- $this->getRecord(Logger::INFO, 'information'),
- $this->getRecord(Logger::WARNING, 'warning'),
- $this->getRecord(Logger::ERROR, 'error')
- );
- }
-
- /**
- * @return Monolog\Formatter\FormatterInterface
- */
- protected function getIdentityFormatter()
- {
- $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
- $formatter->expects($this->any())
- ->method('format')
- ->will($this->returnCallback(function ($record) { return $record['message']; }));
-
- return $formatter;
- }
-}
diff --git a/application/vendor/mtdowling/cron-expression/CHANGELOG.md b/application/vendor/mtdowling/cron-expression/CHANGELOG.md
new file mode 100644
index 0000000..8ddab90
--- /dev/null
+++ b/application/vendor/mtdowling/cron-expression/CHANGELOG.md
@@ -0,0 +1,36 @@
+# Change Log
+
+## [1.2.0] - 2017-01-22
+### Added
+- Added IDE, CodeSniffer, and StyleCI.IO support
+
+### Changed
+- Switched to PSR-4 Autoloading
+
+### Fixed
+- 0 step expressions are handled better
+- Fixed `DayOfMonth` validation to be more strict
+- Typos
+
+## [1.1.0] - 2016-01-26
+### Added
+- Support for non-hourly offset timezones
+- Checks for valid expressions
+
+### Changed
+- Max Iterations no longer hardcoded for `getRunDate()`
+- Supports DateTimeImmutable for newer PHP verions
+
+### Fixed
+- Fixed looping bug for PHP 7 when determining the last specified weekday of a month
+
+## [1.0.3] - 2013-11-23
+### Added
+- Now supports expressions with any number of extra spaces, tabs, or newlines
+
+### Changed
+- Using static instead of self in `CronExpression::factory`
+
+### Fixed
+- Fixes issue [#28](https://github.com/mtdowling/cron-expression/issues/28) where PHP increments of ranges were failing due to PHP casting hyphens to 0
+- Only set default timezone if the given $currentTime is not a DateTime instance ([#34](https://github.com/mtdowling/cron-expression/issues/34))
diff --git a/application/vendor/mtdowling/cron-expression/README.md b/application/vendor/mtdowling/cron-expression/README.md
index 1571e5d..c9e3bf3 100644
--- a/application/vendor/mtdowling/cron-expression/README.md
+++ b/application/vendor/mtdowling/cron-expression/README.md
@@ -68,15 +68,4 @@ Requirements
- PHP 5.3+
- PHPUnit is required to run the unit tests
-- Composer is required to run the unit tests
-
-CHANGELOG
-=========
-
-1.0.3 (2013-11-23)
-------------------
-
-* Only set default timezone if the given $currentTime is not a DateTime instance ([#34](https://github.com/mtdowling/cron-expression/issues/34))
-* Fixes issue [#28](https://github.com/mtdowling/cron-expression/issues/28) where PHP increments of ranges were failing due to PHP casting hyphens to 0
-* Now supports expressions with any number of extra spaces, tabs, or newlines
-* Using static instead of self in `CronExpression::factory`
+- Composer is required to run the unit tests
\ No newline at end of file
diff --git a/application/vendor/mtdowling/cron-expression/composer.json b/application/vendor/mtdowling/cron-expression/composer.json
index 62c0d89..ce42d40 100644
--- a/application/vendor/mtdowling/cron-expression/composer.json
+++ b/application/vendor/mtdowling/cron-expression/composer.json
@@ -13,11 +13,16 @@
"php": ">=5.3.2"
},
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "~4.0|~5.0"
},
"autoload": {
- "psr-0": {
- "Cron": "src/"
+ "psr-4": {
+ "Cron\\": "src/Cron/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "Tests\\": "tests/Cron/"
}
}
}
\ No newline at end of file
diff --git a/application/vendor/mtdowling/cron-expression/phpunit.xml.dist b/application/vendor/mtdowling/cron-expression/phpunit.xml.dist
deleted file mode 100644
index fb8a552..0000000
--- a/application/vendor/mtdowling/cron-expression/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
- ./tests
-
-
-
-
-
- ./src/Cron
-
-
-
-
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/AbstractField.php b/application/vendor/mtdowling/cron-expression/src/Cron/AbstractField.php
index c0616a2..cd2410a 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/AbstractField.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/AbstractField.php
@@ -76,8 +76,13 @@ public function isInRange($dateValue, $value)
public function isInIncrementsOfRanges($dateValue, $value)
{
$parts = array_map('trim', explode('/', $value, 2));
- $stepSize = isset($parts[1]) ? $parts[1] : 0;
- if (($parts[0] == '*' || $parts[0] === '0') && 0 !== $stepSize) {
+ $stepSize = isset($parts[1]) ? (int) $parts[1] : 0;
+
+ if ($stepSize === 0) {
+ return false;
+ }
+
+ if (($parts[0] == '*' || $parts[0] === '0')) {
return (int) $dateValue % $stepSize == 0;
}
@@ -101,4 +106,43 @@ public function isInIncrementsOfRanges($dateValue, $value)
return false;
}
+
+ /**
+ * Returns a range of values for the given cron expression
+ *
+ * @param string $expression The expression to evaluate
+ * @param int $max Maximum offset for range
+ *
+ * @return array
+ */
+ public function getRangeForExpression($expression, $max)
+ {
+ $values = array();
+
+ if ($this->isRange($expression) || $this->isIncrementsOfRanges($expression)) {
+ if (!$this->isIncrementsOfRanges($expression)) {
+ list ($offset, $to) = explode('-', $expression);
+ $stepSize = 1;
+ }
+ else {
+ $range = array_map('trim', explode('/', $expression, 2));
+ $stepSize = isset($range[1]) ? $range[1] : 0;
+ $range = $range[0];
+ $range = explode('-', $range, 2);
+ $offset = $range[0];
+ $to = isset($range[1]) ? $range[1] : $max;
+ }
+ $offset = $offset == '*' ? 0 : $offset;
+ for ($i = $offset; $i <= $to; $i += $stepSize) {
+ $values[] = $i;
+ }
+ sort($values);
+ }
+ else {
+ $values = array($expression);
+ }
+
+ return $values;
+ }
+
}
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/CronExpression.php b/application/vendor/mtdowling/cron-expression/src/Cron/CronExpression.php
index ce90f29..d69b415 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/CronExpression.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/CronExpression.php
@@ -2,6 +2,13 @@
namespace Cron;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeZone;
+use Exception;
+use InvalidArgumentException;
+use RuntimeException;
+
/**
* CRON expression parser that can determine whether or not a CRON expression is
* due to run, the next run date and previous run date of a CRON expression.
@@ -33,6 +40,11 @@ class CronExpression
*/
private $fieldFactory;
+ /**
+ * @var int Max iteration count when searching for next run date
+ */
+ private $maxIterationCount = 1000;
+
/**
* @var array Order in which to test of cron parts
*/
@@ -72,6 +84,25 @@ public static function factory($expression, FieldFactory $fieldFactory = null)
return new static($expression, $fieldFactory ?: new FieldFactory());
}
+ /**
+ * Validate a CronExpression.
+ *
+ * @param string $expression The CRON expression to validate.
+ *
+ * @return bool True if a valid CRON expression was passed. False if not.
+ * @see \Cron\CronExpression::factory
+ */
+ public static function isValidExpression($expression)
+ {
+ try {
+ self::factory($expression);
+ } catch (InvalidArgumentException $e) {
+ return false;
+ }
+
+ return true;
+ }
+
/**
* Parse a CRON expression
*
@@ -96,7 +127,7 @@ public function setExpression($value)
{
$this->cronParts = preg_split('/\s/', $value, -1, PREG_SPLIT_NO_EMPTY);
if (count($this->cronParts) < 5) {
- throw new \InvalidArgumentException(
+ throw new InvalidArgumentException(
$value . ' is not a valid CRON expression'
);
}
@@ -120,8 +151,8 @@ public function setExpression($value)
public function setPart($position, $value)
{
if (!$this->fieldFactory->getField($position)->validate($value)) {
- throw new \InvalidArgumentException(
- 'Invalid CRON field value ' . $value . ' as position ' . $position
+ throw new InvalidArgumentException(
+ 'Invalid CRON field value ' . $value . ' at position ' . $position
);
}
@@ -130,6 +161,20 @@ public function setPart($position, $value)
return $this;
}
+ /**
+ * Set max iteration count for searching next run dates
+ *
+ * @param int $maxIterationCount Max iteration count when searching for next run date
+ *
+ * @return CronExpression
+ */
+ public function setMaxIterationCount($maxIterationCount)
+ {
+ $this->maxIterationCount = $maxIterationCount;
+
+ return $this;
+ }
+
/**
* Get a next run date relative to the current date or a specific date
*
@@ -161,7 +206,7 @@ public function getNextRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate
*
* @return \DateTime
* @throws \RuntimeException on too many iterations
- * @see Cron\CronExpression::getNextRunDate
+ * @see \Cron\CronExpression::getNextRunDate
*/
public function getPreviousRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate = false)
{
@@ -183,7 +228,11 @@ public function getMultipleRunDates($total, $currentTime = 'now', $invert = fals
{
$matches = array();
for ($i = 0; $i < max(0, $total); $i++) {
- $matches[] = $this->getRunDate($currentTime, $i, $invert, $allowCurrentDate);
+ try {
+ $matches[] = $this->getRunDate($currentTime, $i, $invert, $allowCurrentDate);
+ } catch (RuntimeException $e) {
+ break;
+ }
}
return $matches;
@@ -233,14 +282,19 @@ public function isDue($currentTime = 'now')
if ('now' === $currentTime) {
$currentDate = date('Y-m-d H:i');
$currentTime = strtotime($currentDate);
- } elseif ($currentTime instanceof \DateTime) {
+ } elseif ($currentTime instanceof DateTime) {
$currentDate = clone $currentTime;
// Ensure time in 'current' timezone is used
- $currentDate->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+ $currentDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
+ $currentDate = $currentDate->format('Y-m-d H:i');
+ $currentTime = strtotime($currentDate);
+ } elseif ($currentTime instanceof DateTimeImmutable) {
+ $currentDate = DateTime::createFromFormat('U', $currentTime->format('U'));
+ $currentDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
$currentDate = $currentDate->format('Y-m-d H:i');
$currentTime = strtotime($currentDate);
} else {
- $currentTime = new \DateTime($currentTime);
+ $currentTime = new DateTime($currentTime);
$currentTime->setTime($currentTime->format('H'), $currentTime->format('i'), 0);
$currentDate = $currentTime->format('Y-m-d H:i');
$currentTime = $currentTime->getTimeStamp();
@@ -248,7 +302,7 @@ public function isDue($currentTime = 'now')
try {
return $this->getNextRunDate($currentDate, 0, true)->getTimestamp() == $currentTime;
- } catch (\Exception $e) {
+ } catch (Exception $e) {
return false;
}
}
@@ -267,11 +321,14 @@ public function isDue($currentTime = 'now')
*/
protected function getRunDate($currentTime = null, $nth = 0, $invert = false, $allowCurrentDate = false)
{
- if ($currentTime instanceof \DateTime) {
+ if ($currentTime instanceof DateTime) {
$currentDate = clone $currentTime;
+ } elseif ($currentTime instanceof DateTimeImmutable) {
+ $currentDate = DateTime::createFromFormat('U', $currentTime->format('U'));
+ $currentDate->setTimezone($currentTime->getTimezone());
} else {
- $currentDate = new \DateTime($currentTime ?: 'now');
- $currentDate->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+ $currentDate = new DateTime($currentTime ?: 'now');
+ $currentDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
}
$currentDate->setTime($currentDate->format('H'), $currentDate->format('i'), 0);
@@ -291,7 +348,7 @@ protected function getRunDate($currentTime = null, $nth = 0, $invert = false, $a
}
// Set a hard limit to bail on an impossible date
- for ($i = 0; $i < 1000; $i++) {
+ for ($i = 0; $i < $this->maxIterationCount; $i++) {
foreach ($parts as $position => $part) {
$satisfied = false;
@@ -311,14 +368,14 @@ protected function getRunDate($currentTime = null, $nth = 0, $invert = false, $a
// If the field is not satisfied, then start over
if (!$satisfied) {
- $field->increment($nextRun, $invert);
+ $field->increment($nextRun, $invert, $part);
continue 2;
}
}
// Skip this match if needed
if ((!$allowCurrentDate && $nextRun == $currentDate) || --$nth > -1) {
- $this->fieldFactory->getField(0)->increment($nextRun, $invert);
+ $this->fieldFactory->getField(0)->increment($nextRun, $invert, isset($parts[0]) ? $parts[0] : null);
continue;
}
@@ -326,7 +383,7 @@ protected function getRunDate($currentTime = null, $nth = 0, $invert = false, $a
}
// @codeCoverageIgnoreStart
- throw new \RuntimeException('Impossible CRON expression');
+ throw new RuntimeException('Impossible CRON expression');
// @codeCoverageIgnoreEnd
}
}
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/DayOfMonthField.php b/application/vendor/mtdowling/cron-expression/src/Cron/DayOfMonthField.php
index 86129c9..53e15bc 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/DayOfMonthField.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/DayOfMonthField.php
@@ -2,6 +2,8 @@
namespace Cron;
+use DateTime;
+
/**
* Day of month field. Allows: * , / - ? L W
*
@@ -34,7 +36,7 @@ class DayOfMonthField extends AbstractField
private static function getNearestWeekday($currentYear, $currentMonth, $targetDay)
{
$tday = str_pad($targetDay, 2, '0', STR_PAD_LEFT);
- $target = \DateTime::createFromFormat('Y-m-d', "$currentYear-$currentMonth-$tday");
+ $target = DateTime::createFromFormat('Y-m-d', "$currentYear-$currentMonth-$tday");
$currentWeekday = (int) $target->format('N');
if ($currentWeekday < 6) {
@@ -54,7 +56,7 @@ private static function getNearestWeekday($currentYear, $currentMonth, $targetDa
}
}
- public function isSatisfiedBy(\DateTime $date, $value)
+ public function isSatisfiedBy(DateTime $date, $value)
{
// ? states that the field value is to be skipped
if ($value == '?') {
@@ -83,7 +85,7 @@ public function isSatisfiedBy(\DateTime $date, $value)
return $this->isSatisfied($date->format('d'), $value);
}
- public function increment(\DateTime $date, $invert = false)
+ public function increment(DateTime $date, $invert = false)
{
if ($invert) {
$date->modify('previous day');
@@ -96,8 +98,76 @@ public function increment(\DateTime $date, $invert = false)
return $this;
}
+ /**
+ * Validates that the value is valid for the Day of the Month field
+ * Days of the month can contain values of 1-31, *, L, or ? by default. This can be augmented with lists via a ',',
+ * ranges via a '-', or with a '[0-9]W' to specify the closest weekday.
+ *
+ * @param string $value
+ * @return bool
+ */
public function validate($value)
{
- return (bool) preg_match('/^[\*,\/\-\?LW0-9A-Za-z]+$/', $value);
+ // Allow wildcards and a single L
+ if ($value === '?' || $value === '*' || $value === 'L') {
+ return true;
+ }
+
+ // If you only contain numbers and are within 1-31
+ if ((bool) preg_match('/^\d{1,2}$/', $value) && ($value >= 1 && $value <= 31)) {
+ return true;
+ }
+
+ // If you have a -, we will deal with each of your chunks
+ if ((bool) preg_match('/-/', $value)) {
+ // We cannot have a range within a list or vice versa
+ if ((bool) preg_match('/,/', $value)) {
+ return false;
+ }
+
+ $chunks = explode('-', $value);
+ foreach ($chunks as $chunk) {
+ if (!$this->validate($chunk)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ // If you have a comma, we will deal with each value
+ if ((bool) preg_match('/,/', $value)) {
+ // We cannot have a range within a list or vice versa
+ if ((bool) preg_match('/-/', $value)) {
+ return false;
+ }
+
+ $chunks = explode(',', $value);
+ foreach ($chunks as $chunk) {
+ if (!$this->validate($chunk)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ // If you contain a /, we'll deal with it
+ if ((bool) preg_match('/\//', $value)) {
+ $chunks = explode('/', $value);
+ foreach ($chunks as $chunk) {
+ if (!$this->validate($chunk)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ // If you end in W, make sure that it has a numeric in front of it
+ if ((bool) preg_match('/^\d{1,2}W$/', $value)) {
+ return true;
+ }
+
+ return false;
}
}
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/DayOfWeekField.php b/application/vendor/mtdowling/cron-expression/src/Cron/DayOfWeekField.php
index 8e33b19..83e2f4c 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/DayOfWeekField.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/DayOfWeekField.php
@@ -2,6 +2,10 @@
namespace Cron;
+use DateTime;
+use InvalidArgumentException;
+
+
/**
* Day of week field. Allows: * / , - ? L #
*
@@ -17,7 +21,7 @@
*/
class DayOfWeekField extends AbstractField
{
- public function isSatisfiedBy(\DateTime $date, $value)
+ public function isSatisfiedBy(DateTime $date, $value)
{
if ($value == '?') {
return true;
@@ -36,7 +40,10 @@ public function isSatisfiedBy(\DateTime $date, $value)
$tdate = clone $date;
$tdate->setDate($currentYear, $currentMonth, $lastDayOfMonth);
while ($tdate->format('w') != $weekday) {
- $tdate->setDate($currentYear, $currentMonth, --$lastDayOfMonth);
+ $tdateClone = new DateTime();
+ $tdate = $tdateClone
+ ->setTimezone($tdate->getTimezone())
+ ->setDate($currentYear, $currentMonth, --$lastDayOfMonth);
}
return $date->format('j') == $lastDayOfMonth;
@@ -53,10 +60,10 @@ public function isSatisfiedBy(\DateTime $date, $value)
// Validate the hash fields
if ($weekday < 0 || $weekday > 7) {
- throw new \InvalidArgumentException("Weekday must be a value between 0 and 7. {$weekday} given");
+ throw new InvalidArgumentException("Weekday must be a value between 0 and 7. {$weekday} given");
}
if ($nth > 5) {
- throw new \InvalidArgumentException('There are never more than 5 of a given weekday in a month');
+ throw new InvalidArgumentException('There are never more than 5 of a given weekday in a month');
}
// The current weekday must match the targeted weekday to proceed
if ($date->format('N') != $weekday) {
@@ -97,7 +104,7 @@ public function isSatisfiedBy(\DateTime $date, $value)
return $this->isSatisfied($fieldValue, $value);
}
- public function increment(\DateTime $date, $invert = false)
+ public function increment(DateTime $date, $invert = false)
{
if ($invert) {
$date->modify('-1 day');
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/FieldFactory.php b/application/vendor/mtdowling/cron-expression/src/Cron/FieldFactory.php
index 5aa86f6..fa0e6fe 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/FieldFactory.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/FieldFactory.php
@@ -2,6 +2,8 @@
namespace Cron;
+use InvalidArgumentException;
+
/**
* CRON field factory implementing a flyweight factory
* @link http://en.wikipedia.org/wiki/Cron
@@ -44,7 +46,7 @@ public function getField($position)
$this->fields[$position] = new YearField();
break;
default:
- throw new \InvalidArgumentException(
+ throw new InvalidArgumentException(
$position . ' is not a valid position'
);
}
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/FieldInterface.php b/application/vendor/mtdowling/cron-expression/src/Cron/FieldInterface.php
index 3823fbf..be37b93 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/FieldInterface.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/FieldInterface.php
@@ -1,6 +1,7 @@
isSatisfied($date->format('H'), $value);
}
- public function increment(\DateTime $date, $invert = false)
+ public function increment(DateTime $date, $invert = false, $parts = null)
{
// Change timezone to UTC temporarily. This will
// allow us to go back or forwards and hour even
// if DST will be changed between the hours.
- $timezone = $date->getTimezone();
- $date->setTimezone(new \DateTimeZone('UTC'));
- if ($invert) {
- $date->modify('-1 hour');
- $date->setTime($date->format('H'), 59);
- } else {
- $date->modify('+1 hour');
- $date->setTime($date->format('H'), 0);
+ if (is_null($parts) || $parts == '*') {
+ $timezone = $date->getTimezone();
+ $date->setTimezone(new DateTimeZone('UTC'));
+ if ($invert) {
+ $date->modify('-1 hour');
+ } else {
+ $date->modify('+1 hour');
+ }
+ $date->setTimezone($timezone);
+
+ $date->setTime($date->format('H'), $invert ? 59 : 0);
+ return $this;
+ }
+
+ $parts = strpos($parts, ',') !== false ? explode(',', $parts) : array($parts);
+ $hours = array();
+ foreach ($parts as $part) {
+ $hours = array_merge($hours, $this->getRangeForExpression($part, 23));
+ }
+
+ $current_hour = $date->format('H');
+ $position = $invert ? count($hours) - 1 : 0;
+ if (count($hours) > 1) {
+ for ($i = 0; $i < count($hours) - 1; $i++) {
+ if ((!$invert && $current_hour >= $hours[$i] && $current_hour < $hours[$i + 1]) ||
+ ($invert && $current_hour > $hours[$i] && $current_hour <= $hours[$i + 1])) {
+ $position = $invert ? $i : $i + 1;
+ break;
+ }
+ }
+ }
+
+ $hour = $hours[$position];
+ if ((!$invert && $date->format('H') >= $hour) || ($invert && $date->format('H') <= $hour)) {
+ $date->modify(($invert ? '-' : '+') . '1 day');
+ $date->setTime($invert ? 23 : 0, $invert ? 59 : 0);
+ }
+ else {
+ $date->setTime($hour, $invert ? 59 : 0);
}
- $date->setTimezone($timezone);
return $this;
}
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/MinutesField.php b/application/vendor/mtdowling/cron-expression/src/Cron/MinutesField.php
index cfa2b09..d8432b5 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/MinutesField.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/MinutesField.php
@@ -2,22 +2,54 @@
namespace Cron;
+use DateTime;
+
+
/**
* Minutes field. Allows: * , / -
*/
class MinutesField extends AbstractField
{
- public function isSatisfiedBy(\DateTime $date, $value)
+ public function isSatisfiedBy(DateTime $date, $value)
{
return $this->isSatisfied($date->format('i'), $value);
}
- public function increment(\DateTime $date, $invert = false)
+ public function increment(DateTime $date, $invert = false, $parts = null)
{
- if ($invert) {
- $date->modify('-1 minute');
- } else {
- $date->modify('+1 minute');
+ if (is_null($parts)) {
+ if ($invert) {
+ $date->modify('-1 minute');
+ } else {
+ $date->modify('+1 minute');
+ }
+ return $this;
+ }
+
+ $parts = strpos($parts, ',') !== false ? explode(',', $parts) : array($parts);
+ $minutes = array();
+ foreach ($parts as $part) {
+ $minutes = array_merge($minutes, $this->getRangeForExpression($part, 59));
+ }
+
+ $current_minute = $date->format('i');
+ $position = $invert ? count($minutes) - 1 : 0;
+ if (count($minutes) > 1) {
+ for ($i = 0; $i < count($minutes) - 1; $i++) {
+ if ((!$invert && $current_minute >= $minutes[$i] && $current_minute < $minutes[$i + 1]) ||
+ ($invert && $current_minute > $minutes[$i] && $current_minute <= $minutes[$i + 1])) {
+ $position = $invert ? $i : $i + 1;
+ break;
+ }
+ }
+ }
+
+ if ((!$invert && $current_minute >= $minutes[$position]) || ($invert && $current_minute <= $minutes[$position])) {
+ $date->modify(($invert ? '-' : '+') . '1 hour');
+ $date->setTime($date->format('H'), $invert ? 59 : 0);
+ }
+ else {
+ $date->setTime($date->format('H'), $minutes[$position]);
}
return $this;
diff --git a/application/vendor/mtdowling/cron-expression/src/Cron/YearField.php b/application/vendor/mtdowling/cron-expression/src/Cron/YearField.php
index b526dde..db244fb 100644
--- a/application/vendor/mtdowling/cron-expression/src/Cron/YearField.php
+++ b/application/vendor/mtdowling/cron-expression/src/Cron/YearField.php
@@ -2,17 +2,20 @@
namespace Cron;
+use DateTime;
+
+
/**
* Year field. Allows: * , / -
*/
class YearField extends AbstractField
{
- public function isSatisfiedBy(\DateTime $date, $value)
+ public function isSatisfiedBy(DateTime $date, $value)
{
return $this->isSatisfied($date->format('Y'), $value);
}
- public function increment(\DateTime $date, $invert = false)
+ public function increment(DateTime $date, $invert = false)
{
if ($invert) {
$date->modify('-1 year');
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/AbstractFieldTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/AbstractFieldTest.php
index 5272106..a1d653b 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/AbstractFieldTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/AbstractFieldTest.php
@@ -3,11 +3,12 @@
namespace Cron\Tests;
use Cron\DayOfWeekField;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class AbstractFieldTest extends \PHPUnit_Framework_TestCase
+class AbstractFieldTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\AbstractField::isRange
@@ -26,7 +27,6 @@ public function testTestsIfIncrementsOfRanges()
{
$f = new DayOfWeekField();
$this->assertFalse($f->isIncrementsOfRanges('1-2'));
- $this->assertFalse($f->isIncrementsOfRanges('1-2'));
$this->assertTrue($f->isIncrementsOfRanges('1/2'));
$this->assertTrue($f->isIncrementsOfRanges('*/2'));
$this->assertTrue($f->isIncrementsOfRanges('3-12/2'));
@@ -38,11 +38,11 @@ public function testTestsIfIncrementsOfRanges()
public function testTestsIfInRange()
{
$f = new DayOfWeekField();
- $this->assertTrue($f->isInRange(1, '1-2'));
- $this->assertTrue($f->isInRange(2, '1-2'));
- $this->assertTrue($f->isInRange(5, '4-12'));
- $this->assertFalse($f->isInRange(3, '4-12'));
- $this->assertFalse($f->isInRange(13, '4-12'));
+ $this->assertTrue($f->isInRange('1', '1-2'));
+ $this->assertTrue($f->isInRange('2', '1-2'));
+ $this->assertTrue($f->isInRange('5', '4-12'));
+ $this->assertFalse($f->isInRange('3', '4-12'));
+ $this->assertFalse($f->isInRange('13', '4-12'));
}
/**
@@ -51,20 +51,22 @@ public function testTestsIfInRange()
public function testTestsIfInIncrementsOfRanges()
{
$f = new DayOfWeekField();
- $this->assertTrue($f->isInIncrementsOfRanges(3, '3-59/2'));
- $this->assertTrue($f->isInIncrementsOfRanges(13, '3-59/2'));
- $this->assertTrue($f->isInIncrementsOfRanges(15, '3-59/2'));
- $this->assertTrue($f->isInIncrementsOfRanges(14, '*/2'));
- $this->assertFalse($f->isInIncrementsOfRanges(2, '3-59/13'));
- $this->assertFalse($f->isInIncrementsOfRanges(14, '*/13'));
- $this->assertFalse($f->isInIncrementsOfRanges(14, '3-59/2'));
- $this->assertFalse($f->isInIncrementsOfRanges(3, '2-59'));
- $this->assertFalse($f->isInIncrementsOfRanges(3, '2'));
- $this->assertFalse($f->isInIncrementsOfRanges(3, '*'));
+ $this->assertTrue($f->isInIncrementsOfRanges('3', '3-59/2'));
+ $this->assertTrue($f->isInIncrementsOfRanges('13', '3-59/2'));
+ $this->assertTrue($f->isInIncrementsOfRanges('15', '3-59/2'));
+ $this->assertTrue($f->isInIncrementsOfRanges('14', '*/2'));
+ $this->assertFalse($f->isInIncrementsOfRanges('2', '3-59/13'));
+ $this->assertFalse($f->isInIncrementsOfRanges('14', '*/13'));
+ $this->assertFalse($f->isInIncrementsOfRanges('14', '3-59/2'));
+ $this->assertFalse($f->isInIncrementsOfRanges('3', '2-59'));
+ $this->assertFalse($f->isInIncrementsOfRanges('3', '2'));
+ $this->assertFalse($f->isInIncrementsOfRanges('3', '*'));
+ $this->assertFalse($f->isInIncrementsOfRanges('0', '*/0'));
+ $this->assertFalse($f->isInIncrementsOfRanges('1', '*/0'));
- $this->assertTrue($f->isInIncrementsOfRanges(4, '4/10'));
- $this->assertTrue($f->isInIncrementsOfRanges(14, '4/10'));
- $this->assertTrue($f->isInIncrementsOfRanges(34, '4/10'));
+ $this->assertTrue($f->isInIncrementsOfRanges('4', '4/10'));
+ $this->assertTrue($f->isInIncrementsOfRanges('14', '4/10'));
+ $this->assertTrue($f->isInIncrementsOfRanges('34', '4/10'));
}
/**
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/CronExpressionTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/CronExpressionTest.php
index 013b701..f6fedb9 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/CronExpressionTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/CronExpressionTest.php
@@ -4,12 +4,14 @@
use Cron\CronExpression;
use DateTime;
+use DateTimeZone;
use InvalidArgumentException;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class CronExpressionTest extends \PHPUnit_Framework_TestCase
+class CronExpressionTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\CronExpression::factory
@@ -222,9 +224,9 @@ public function testIsDueHandlesDifferentTimezones()
{
$cron = CronExpression::factory('0 15 * * 3'); //Wednesday at 15:00
$date = '2014-01-01 15:00'; //Wednesday
- $utc = new \DateTimeZone('UTC');
- $amsterdam = new \DateTimeZone('Europe/Amsterdam');
- $tokyo = new \DateTimeZone('Asia/Tokyo');
+ $utc = new DateTimeZone('UTC');
+ $amsterdam = new DateTimeZone('Europe/Amsterdam');
+ $tokyo = new DateTimeZone('Asia/Tokyo');
date_default_timezone_set('UTC');
$this->assertTrue($cron->isDue(new DateTime($date, $utc)));
@@ -277,6 +279,27 @@ public function testProvidesMultipleRunDates()
), $cron->getMultipleRunDates(4, '2008-11-09 00:00:00', false, true));
}
+ /**
+ * @covers Cron\CronExpression::getMultipleRunDates
+ * @covers Cron\CronExpression::setMaxIterationCount
+ */
+ public function testProvidesMultipleRunDatesForTheFarFuture() {
+ // Fails with the default 1000 iteration limit
+ $cron = CronExpression::factory('0 0 12 1 * */2');
+ $cron->setMaxIterationCount(2000);
+ $this->assertEquals(array(
+ new DateTime('2016-01-12 00:00:00'),
+ new DateTime('2018-01-12 00:00:00'),
+ new DateTime('2020-01-12 00:00:00'),
+ new DateTime('2022-01-12 00:00:00'),
+ new DateTime('2024-01-12 00:00:00'),
+ new DateTime('2026-01-12 00:00:00'),
+ new DateTime('2028-01-12 00:00:00'),
+ new DateTime('2030-01-12 00:00:00'),
+ new DateTime('2032-01-12 00:00:00'),
+ ), $cron->getMultipleRunDates(9, '2015-04-28 00:00:00', false, true));
+ }
+
/**
* @covers Cron\CronExpression
*/
@@ -368,9 +391,24 @@ public function testIssue20() {
public function testKeepOriginalTime()
{
$now = new \DateTime;
- $strNow = $now->format(\DateTime::ISO8601);
+ $strNow = $now->format(DateTime::ISO8601);
$cron = CronExpression::factory('0 0 * * *');
$cron->getPreviousRunDate($now);
- $this->assertEquals($strNow, $now->format(\DateTime::ISO8601));
+ $this->assertEquals($strNow, $now->format(DateTime::ISO8601));
+ }
+
+ /**
+ * @covers Cron\CronExpression::__construct
+ * @covers Cron\CronExpression::factory
+ * @covers Cron\CronExpression::isValidExpression
+ * @covers Cron\CronExpression::setExpression
+ * @covers Cron\CronExpression::setPart
+ */
+ public function testValidationWorks()
+ {
+ // Invalid. Only four values
+ $this->assertFalse(CronExpression::isValidExpression('* * * 1'));
+ // Valid
+ $this->assertTrue(CronExpression::isValidExpression('* * * * 1'));
}
}
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfMonthFieldTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfMonthFieldTest.php
index 94afbb0..eff0455 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfMonthFieldTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfMonthFieldTest.php
@@ -3,23 +3,22 @@
namespace Cron\Tests;
use Cron\DayOfMonthField;
-
use DateTime;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class DayOfMonthFieldTest extends \PHPUnit_Framework_TestCase
+class DayOfMonthFieldTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\DayOfMonthField::validate
*/
- public function testValdatesField()
+ public function testValidatesField()
{
$f = new DayOfMonthField();
$this->assertTrue($f->validate('1'));
$this->assertTrue($f->validate('*'));
- $this->assertTrue($f->validate('*/3,1,1-12'));
$this->assertTrue($f->validate('5W,L'));
$this->assertFalse($f->validate('1.'));
}
@@ -47,4 +46,16 @@ public function testIncrementsDate()
$f->increment($d, true);
$this->assertEquals('2011-03-14 23:59:00', $d->format('Y-m-d H:i:s'));
}
+
+ /**
+ * Day of the month cannot accept a 0 value, it must be between 1 and 31
+ * See Github issue #120
+ *
+ * @since 2017-01-22
+ */
+ public function testDoesNotAccept0Date()
+ {
+ $f = new DayOfMonthField();
+ $this->assertFalse($f->validate(0));
+ }
}
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfWeekFieldTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfWeekFieldTest.php
index 703a517..182d5e9 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfWeekFieldTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/DayOfWeekFieldTest.php
@@ -4,11 +4,12 @@
use Cron\DayOfWeekField;
use DateTime;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class DayOfWeekFieldTest extends \PHPUnit_Framework_TestCase
+class DayOfWeekFieldTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\DayOfWeekField::validate
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/FieldFactoryTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/FieldFactoryTest.php
index ec087b1..f34cc9b 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/FieldFactoryTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/FieldFactoryTest.php
@@ -3,11 +3,12 @@
namespace Cron\Tests;
use Cron\FieldFactory;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class FieldFactoryTest extends \PHPUnit_Framework_TestCase
+class FieldFactoryTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\FieldFactory::getField
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/HoursFieldTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/HoursFieldTest.php
index 48bd135..d2d8a22 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/HoursFieldTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/HoursFieldTest.php
@@ -4,16 +4,17 @@
use Cron\HoursField;
use DateTime;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class HoursFieldTest extends \PHPUnit_Framework_TestCase
+class HoursFieldTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\HoursField::validate
*/
- public function testValdatesField()
+ public function testValidatesField()
{
$f = new HoursField();
$this->assertTrue($f->validate('1'));
@@ -35,4 +36,40 @@ public function testIncrementsDate()
$f->increment($d, true);
$this->assertEquals('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
}
+
+ /**
+ * @covers Cron\HoursField::increment
+ */
+ public function testIncrementsDateWithThirtyMinuteOffsetTimezone()
+ {
+ $tz = date_default_timezone_get();
+ date_default_timezone_set('America/St_Johns');
+ $d = new DateTime('2011-03-15 11:15:00');
+ $f = new HoursField();
+ $f->increment($d);
+ $this->assertEquals('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
+
+ $d->setTime(11, 15, 0);
+ $f->increment($d, true);
+ $this->assertEquals('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
+ date_default_timezone_set($tz);
+ }
+
+ /**
+ * @covers Cron\HoursField::increment
+ */
+ public function testIncrementDateWithFifteenMinuteOffsetTimezone()
+ {
+ $tz = date_default_timezone_get();
+ date_default_timezone_set('Asia/Kathmandu');
+ $d = new DateTime('2011-03-15 11:15:00');
+ $f = new HoursField();
+ $f->increment($d);
+ $this->assertEquals('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
+
+ $d->setTime(11, 15, 0);
+ $f->increment($d, true);
+ $this->assertEquals('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
+ date_default_timezone_set($tz);
+ }
}
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/MinutesFieldTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/MinutesFieldTest.php
index 82ce966..af3fef7 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/MinutesFieldTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/MinutesFieldTest.php
@@ -4,16 +4,17 @@
use Cron\MinutesField;
use DateTime;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class MinutesFieldTest extends \PHPUnit_Framework_TestCase
+class MinutesFieldTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\MinutesField::validate
*/
- public function testValdatesField()
+ public function testValidatesField()
{
$f = new MinutesField();
$this->assertTrue($f->validate('1'));
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/MonthFieldTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/MonthFieldTest.php
index 82878f8..2d9b0ad 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/MonthFieldTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/MonthFieldTest.php
@@ -4,16 +4,17 @@
use Cron\MonthField;
use DateTime;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class MonthFieldTest extends \PHPUnit_Framework_TestCase
+class MonthFieldTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\MonthField::validate
*/
- public function testValdatesField()
+ public function testValidatesField()
{
$f = new MonthField();
$this->assertTrue($f->validate('12'));
@@ -37,6 +38,25 @@ public function testIncrementsDate()
$this->assertEquals('2011-02-28 23:59:00', $d->format('Y-m-d H:i:s'));
}
+ /**
+ * @covers Cron\MonthField::increment
+ */
+ public function testIncrementsDateWithThirtyMinuteTimezone()
+ {
+ $tz = date_default_timezone_get();
+ date_default_timezone_set('America/St_Johns');
+ $d = new DateTime('2011-03-31 11:59:59');
+ $f = new MonthField();
+ $f->increment($d);
+ $this->assertEquals('2011-04-01 00:00:00', $d->format('Y-m-d H:i:s'));
+
+ $d = new DateTime('2011-03-15 11:15:00');
+ $f->increment($d, true);
+ $this->assertEquals('2011-02-28 23:59:00', $d->format('Y-m-d H:i:s'));
+ date_default_timezone_set($tz);
+ }
+
+
/**
* @covers Cron\MonthField::increment
*/
diff --git a/application/vendor/mtdowling/cron-expression/tests/Cron/YearFieldTest.php b/application/vendor/mtdowling/cron-expression/tests/Cron/YearFieldTest.php
index e7bcacb..b5059ec 100644
--- a/application/vendor/mtdowling/cron-expression/tests/Cron/YearFieldTest.php
+++ b/application/vendor/mtdowling/cron-expression/tests/Cron/YearFieldTest.php
@@ -4,16 +4,17 @@
use Cron\YearField;
use DateTime;
+use PHPUnit_Framework_TestCase;
/**
* @author Michael Dowling
*/
-class YearFieldTest extends \PHPUnit_Framework_TestCase
+class YearFieldTest extends PHPUnit_Framework_TestCase
{
/**
* @covers Cron\YearField::validate
*/
- public function testValdatesField()
+ public function testValidatesField()
{
$f = new YearField();
$this->assertTrue($f->validate('2011'));
diff --git a/application/vendor/nesbot/carbon/bin/upgrade-carbon b/application/vendor/nesbot/carbon/bin/upgrade-carbon
new file mode 100644
index 0000000..49c4c9a
--- /dev/null
+++ b/application/vendor/nesbot/carbon/bin/upgrade-carbon
@@ -0,0 +1,34 @@
+#!/usr/bin/env php
+=5.3.9",
+ "kylekatarnls/update-helper": "^1.1",
+ "symfony/translation": "~2.6 || ~3.0 || ~4.0"
+ },
+ "require-dev": {
+ "composer/composer": "^1.2",
+ "friendsofphp/php-cs-fixer": "~2",
+ "phpunit/phpunit": "^4.8.35 || ^5.7"
+ },
+ "autoload": {
+ "psr-4": {
+ "": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "Tests\\": "tests/"
+ }
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "scripts": {
+ "test": [
+ "@phpunit",
+ "@phpcs"
+ ],
+ "phpunit": "phpunit --verbose --coverage-clover=coverage.xml",
+ "phpcs": "php-cs-fixer fix -v --diff --dry-run",
+ "phpstan": "phpstan analyse --configuration phpstan.neon --level 3 src tests",
+ "post-autoload-dump": [
+ "UpdateHelper\\UpdateHelper::check"
+ ],
+ "upgrade-carbon": [
+ "Carbon\\Upgrade::upgrade"
+ ]
+ },
+ "extra": {
+ "update-helper": "Carbon\\Upgrade",
+ "laravel": {
+ "providers": [
+ "Carbon\\Laravel\\ServiceProvider"
+ ]
+ }
}
- ],
- "require": {
- "php": ">=5.3.0",
- "symfony/translation": "~2.6|~3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
- },
- "autoload": {
- "psr-4": {
- "Carbon\\": "src/Carbon/"
- }
- },
- "autoload-dev": {
- "psr-4": {
- "Tests\\": "tests/"
- }
- }
}
diff --git a/application/vendor/nesbot/carbon/readme.md b/application/vendor/nesbot/carbon/readme.md
index 545bed3..5e9d1cc 100644
--- a/application/vendor/nesbot/carbon/readme.md
+++ b/application/vendor/nesbot/carbon/readme.md
@@ -4,15 +4,20 @@
[](https://packagist.org/packages/nesbot/carbon)
[](https://travis-ci.org/briannesbitt/Carbon)
[](https://styleci.io/repos/5724990)
+[](https://codecov.io/github/briannesbitt/Carbon?branch=master)
+[](https://php-eye.com/package/nesbot/carbon)
+[](https://github.com/phpstan/phpstan)
A simple PHP API extension for DateTime. [http://carbon.nesbot.com](http://carbon.nesbot.com)
```php
+use Carbon\Carbon;
+
printf("Right now is %s", Carbon::now()->toDateTimeString());
printf("Right now in Vancouver is %s", Carbon::now('America/Vancouver')); //implicit __toString()
$tomorrow = Carbon::now()->addDay();
$lastWeek = Carbon::now()->subWeek();
-$nextSummerOlympics = Carbon::createFromDate(2012)->addYears(4);
+$nextSummerOlympics = Carbon::createFromDate(2016)->addYears(4);
$officialDate = Carbon::now()->toRfc2822String();
@@ -20,13 +25,13 @@ $howOldAmI = Carbon::createFromDate(1975, 5, 21)->age;
$noonTodayLondonTime = Carbon::createFromTime(12, 0, 0, 'Europe/London');
-$worldWillEnd = Carbon::createFromDate(2012, 12, 21, 'GMT');
+$internetWillBlowUpOn = Carbon::create(2038, 01, 19, 3, 14, 7, 'GMT');
-// Don't really want to die so mock now
+// Don't really want this to happen so mock now
Carbon::setTestNow(Carbon::createFromDate(2000, 1, 1));
// comparisons are always done in UTC
-if (Carbon::now()->gte($worldWillEnd)) {
+if (Carbon::now()->gte($internetWillBlowUpOn)) {
die();
}
@@ -55,7 +60,7 @@ $ composer require nesbot/carbon
```json
{
"require": {
- "nesbot/carbon": "~1.14"
+ "nesbot/carbon": "~1.21"
}
}
```
@@ -70,6 +75,7 @@ printf("Now: %s", Carbon::now());
```
+
### Without Composer
Why are you not using [composer](http://getcomposer.org/)? Download [Carbon.php](https://github.com/briannesbitt/Carbon/blob/master/src/Carbon/Carbon.php) from the repo and save the file into your project path somewhere.
@@ -82,3 +88,7 @@ use Carbon\Carbon;
printf("Now: %s", Carbon::now());
```
+
+## Docs
+
+[http://carbon.nesbot.com/docs](http://carbon.nesbot.com/docs)
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Carbon.php b/application/vendor/nesbot/carbon/src/Carbon/Carbon.php
index 2d27616..7b8a5d9 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Carbon.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Carbon.php
@@ -11,14 +11,16 @@
namespace Carbon;
+use Carbon\Exceptions\InvalidDateException;
use Closure;
+use DateInterval;
+use DatePeriod;
use DateTime;
+use DateTimeInterface;
use DateTimeZone;
-use DatePeriod;
use InvalidArgumentException;
-use Symfony\Component\Translation\Translator;
+use JsonSerializable;
use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Translation\Loader\ArrayLoader;
/**
* A simple API extension for DateTime
@@ -31,28 +33,47 @@
* @property int $minute
* @property int $second
* @property int $timestamp seconds since the Unix Epoch
- * @property DateTimeZone $timezone the current timezone
- * @property DateTimeZone $tz alias of timezone
- * @property-read integer $micro
- * @property-read integer $dayOfWeek 0 (for Sunday) through 6 (for Saturday)
- * @property-read integer $dayOfYear 0 through 365
- * @property-read integer $weekOfMonth 1 through 5
- * @property-read integer $weekOfYear ISO-8601 week number of year, weeks starting on Monday
- * @property-read integer $daysInMonth number of days in the given month
- * @property-read integer $age does a diffInYears() with default parameters
- * @property-read integer $quarter the quarter of this instance, 1 - 4
- * @property-read integer $offset the timezone offset in seconds from UTC
- * @property-read integer $offsetHours the timezone offset in hours from UTC
- * @property-read boolean $dst daylight savings time indicator, true if DST, false otherwise
- * @property-read boolean $local checks if the timezone is local, true if local, false otherwise
- * @property-read boolean $utc checks if the timezone is UTC, true if UTC, false otherwise
- * @property-read string $timezoneName
- * @property-read string $tzName
+ * @property \DateTimeZone $timezone the current timezone
+ * @property \DateTimeZone $tz alias of timezone
+ * @property-read int $micro
+ * @property-read int $dayOfWeek 0 (for Sunday) through 6 (for Saturday)
+ * @property-read int $dayOfWeekIso 1 (for Monday) through 7 (for Sunday)
+ * @property-read int $dayOfYear 0 through 365
+ * @property-read int $weekOfMonth 1 through 5
+ * @property-read int $weekNumberInMonth 1 through 5
+ * @property-read int $weekOfYear ISO-8601 week number of year, weeks starting on Monday
+ * @property-read int $daysInMonth number of days in the given month
+ * @property-read int $age does a diffInYears() with default parameters
+ * @property-read int $quarter the quarter of this instance, 1 - 4
+ * @property-read int $offset the timezone offset in seconds from UTC
+ * @property-read int $offsetHours the timezone offset in hours from UTC
+ * @property-read bool $dst daylight savings time indicator, true if DST, false otherwise
+ * @property-read bool $local checks if the timezone is local, true if local, false otherwise
+ * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise
+ * @property-read string $timezoneName
+ * @property-read string $tzName
+ * @property-read string $englishDayOfWeek the day of week in English
+ * @property-read string $shortEnglishDayOfWeek the abbreviated day of week in English
+ * @property-read string $englishMonth the day of week in English
+ * @property-read string $shortEnglishMonth the abbreviated day of week in English
+ * @property-read string $localeDayOfWeek the day of week in current locale LC_TIME
+ * @property-read string $shortLocaleDayOfWeek the abbreviated day of week in current locale LC_TIME
+ * @property-read string $localeMonth the month in current locale LC_TIME
+ * @property-read string $shortLocaleMonth the abbreviated month in current locale LC_TIME
*/
-class Carbon extends DateTime
+class Carbon extends DateTime implements JsonSerializable
{
+ const NO_ZERO_DIFF = 01;
+ const JUST_NOW = 02;
+ const ONE_DAY_WORDS = 04;
+ const TWO_DAY_WORDS = 010;
+
+ // Substitutes for Carbon 2 modes
+ const DIFF_RELATIVE_TO_NOW = 'relative-to-now';
+ const DIFF_RELATIVE_TO_OTHER = 'relative-to-other';
+
/**
- * The day constants
+ * The day constants.
*/
const SUNDAY = 0;
const MONDAY = 1;
@@ -78,34 +99,28 @@ class Carbon extends DateTime
);
/**
- * Terms used to detect if a time passed is a relative date for testing purposes
- *
- * @var array
- */
- protected static $relativeKeywords = array(
- 'this',
- 'next',
- 'last',
- 'tomorrow',
- 'yesterday',
- '+',
- '-',
- 'first',
- 'last',
- 'ago',
- );
-
- /**
- * Number of X in Y
+ * Number of X in Y.
*/
+ const YEARS_PER_MILLENNIUM = 1000;
const YEARS_PER_CENTURY = 100;
const YEARS_PER_DECADE = 10;
const MONTHS_PER_YEAR = 12;
+ const MONTHS_PER_QUARTER = 3;
const WEEKS_PER_YEAR = 52;
+ const WEEKS_PER_MONTH = 4;
const DAYS_PER_WEEK = 7;
const HOURS_PER_DAY = 24;
const MINUTES_PER_HOUR = 60;
const SECONDS_PER_MINUTE = 60;
+ const MICROSECONDS_PER_MILLISECOND = 1000;
+ const MICROSECONDS_PER_SECOND = 1000000;
+
+ /**
+ * RFC7231 DateTime format.
+ *
+ * @var string
+ */
+ const RFC7231_FORMAT = 'D, d M Y H:i:s \G\M\T';
/**
* Default format to use for __toString method when type juggling occurs.
@@ -114,6 +129,20 @@ class Carbon extends DateTime
*/
const DEFAULT_TO_STRING_FORMAT = 'Y-m-d H:i:s';
+ /**
+ * Format for converting mocked time, includes microseconds.
+ *
+ * @var string
+ */
+ const MOCK_DATETIME_FORMAT = 'Y-m-d H:i:s.u';
+
+ /**
+ * Customizable PHP_INT_SIZE override.
+ *
+ * @var int
+ */
+ public static $PHPIntSize = PHP_INT_SIZE;
+
/**
* Format to use for __toString method when type juggling occurs.
*
@@ -122,48 +151,308 @@ class Carbon extends DateTime
protected static $toStringFormat = self::DEFAULT_TO_STRING_FORMAT;
/**
- * First day of week
+ * First day of week.
*
* @var int
*/
protected static $weekStartsAt = self::MONDAY;
/**
- * Last day of week
+ * Last day of week.
*
* @var int
*/
protected static $weekEndsAt = self::SUNDAY;
/**
- * Days of weekend
+ * Days of weekend.
+ *
+ * @var array
+ */
+ protected static $weekendDays = array(
+ self::SATURDAY,
+ self::SUNDAY,
+ );
+
+ /**
+ * Midday/noon hour.
+ *
+ * @var int
+ */
+ protected static $midDayAt = 12;
+
+ /**
+ * Format regex patterns.
*
* @var array
*/
- protected static $weekendDays = array(self::SATURDAY, self::SUNDAY);
+ protected static $regexFormats = array(
+ 'd' => '(3[01]|[12][0-9]|0[1-9])',
+ 'D' => '([a-zA-Z]{3})',
+ 'j' => '([123][0-9]|[1-9])',
+ 'l' => '([a-zA-Z]{2,})',
+ 'N' => '([1-7])',
+ 'S' => '([a-zA-Z]{2})',
+ 'w' => '([0-6])',
+ 'z' => '(36[0-5]|3[0-5][0-9]|[12][0-9]{2}|[1-9]?[0-9])',
+ 'W' => '(5[012]|[1-4][0-9]|[1-9])',
+ 'F' => '([a-zA-Z]{2,})',
+ 'm' => '(1[012]|0[1-9])',
+ 'M' => '([a-zA-Z]{3})',
+ 'n' => '(1[012]|[1-9])',
+ 't' => '(2[89]|3[01])',
+ 'L' => '(0|1)',
+ 'o' => '([1-9][0-9]{0,4})',
+ 'Y' => '([1-9]?[0-9]{4})',
+ 'y' => '([0-9]{2})',
+ 'a' => '(am|pm)',
+ 'A' => '(AM|PM)',
+ 'B' => '([0-9]{3})',
+ 'g' => '(1[012]|[1-9])',
+ 'G' => '(2[0-3]|1?[0-9])',
+ 'h' => '(1[012]|0[1-9])',
+ 'H' => '(2[0-3]|[01][0-9])',
+ 'i' => '([0-5][0-9])',
+ 's' => '([0-5][0-9])',
+ 'u' => '([0-9]{1,6})',
+ 'v' => '([0-9]{1,3})',
+ 'e' => '([a-zA-Z]{1,5})|([a-zA-Z]*\/[a-zA-Z]*)',
+ 'I' => '(0|1)',
+ 'O' => '([\+\-](1[012]|0[0-9])[0134][05])',
+ 'P' => '([\+\-](1[012]|0[0-9]):[0134][05])',
+ 'T' => '([a-zA-Z]{1,5})',
+ 'Z' => '(-?[1-5]?[0-9]{1,4})',
+ 'U' => '([0-9]*)',
+
+ // The formats below are combinations of the above formats.
+ 'c' => '(([1-9]?[0-9]{4})\-(1[012]|0[1-9])\-(3[01]|[12][0-9]|0[1-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])[\+\-](1[012]|0[0-9]):([0134][05]))', // Y-m-dTH:i:sP
+ 'r' => '(([a-zA-Z]{3}), ([123][0-9]|[1-9]) ([a-zA-Z]{3}) ([1-9]?[0-9]{4}) (2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9]) [\+\-](1[012]|0[0-9])([0134][05]))', // D, j M Y H:i:s O
+ );
/**
- * A test Carbon instance to be returned when now instances are created
+ * A test Carbon instance to be returned when now instances are created.
*
- * @var Carbon
+ * @var \Carbon\Carbon
*/
protected static $testNow;
/**
- * A translator to ... er ... translate stuff
+ * A translator to ... er ... translate stuff.
*
- * @var TranslatorInterface
+ * @var \Symfony\Component\Translation\TranslatorInterface
*/
protected static $translator;
/**
- * Creates a DateTimeZone from a string or a DateTimeZone
+ * The errors that can occur.
+ *
+ * @var array
+ */
+ protected static $lastErrors;
+
+ /**
+ * The custom Carbon JSON serializer.
*
- * @param DateTimeZone|string|null $object
+ * @var callable|null
+ */
+ protected static $serializer;
+
+ /**
+ * The registered string macros.
*
- * @throws InvalidArgumentException
+ * @var array
+ */
+ protected static $localMacros = array();
+
+ /**
+ * Will UTF8 encoding be used to print localized date/time ?
+ *
+ * @var bool
+ */
+ protected static $utf8 = false;
+
+ /**
+ * Add microseconds to now on PHP < 7.1 and 7.1.3. true by default.
+ *
+ * @var bool
+ */
+ protected static $microsecondsFallback = true;
+
+ /**
+ * Indicates if months should be calculated with overflow.
+ *
+ * @var bool
+ */
+ protected static $monthsOverflow = true;
+
+ /**
+ * Indicates if years should be calculated with overflow.
+ *
+ * @var bool
+ */
+ protected static $yearsOverflow = true;
+
+ /**
+ * Indicates if years are compared with month by default so isSameMonth and isSameQuarter have $ofSameYear set
+ * to true by default.
+ *
+ * @var bool
+ */
+ protected static $compareYearWithMonth = false;
+
+ /**
+ * Options for diffForHumans().
+ *
+ * @var int
+ */
+ protected static $humanDiffOptions = self::NO_ZERO_DIFF;
+
+ /**
+ * @param int $humanDiffOptions
+ */
+ public static function setHumanDiffOptions($humanDiffOptions)
+ {
+ static::$humanDiffOptions = $humanDiffOptions;
+ }
+
+ /**
+ * @param int $humanDiffOption
+ */
+ public static function enableHumanDiffOption($humanDiffOption)
+ {
+ static::$humanDiffOptions = static::getHumanDiffOptions() | $humanDiffOption;
+ }
+
+ /**
+ * @param int $humanDiffOption
+ */
+ public static function disableHumanDiffOption($humanDiffOption)
+ {
+ static::$humanDiffOptions = static::getHumanDiffOptions() & ~$humanDiffOption;
+ }
+
+ /**
+ * @return int
+ */
+ public static function getHumanDiffOptions()
+ {
+ return static::$humanDiffOptions;
+ }
+
+ /**
+ * Add microseconds to now on PHP < 7.1 and 7.1.3 if set to true,
+ * let microseconds to 0 on those PHP versions if false.
+ *
+ * @param bool $microsecondsFallback
+ */
+ public static function useMicrosecondsFallback($microsecondsFallback = true)
+ {
+ static::$microsecondsFallback = $microsecondsFallback;
+ }
+
+ /**
+ * Return true if microseconds fallback on PHP < 7.1 and 7.1.3 is
+ * enabled. false if disabled.
+ *
+ * @return bool
+ */
+ public static function isMicrosecondsFallbackEnabled()
+ {
+ return static::$microsecondsFallback;
+ }
+
+ /**
+ * Indicates if months should be calculated with overflow.
+ *
+ * @param bool $monthsOverflow
+ *
+ * @return void
+ */
+ public static function useMonthsOverflow($monthsOverflow = true)
+ {
+ static::$monthsOverflow = $monthsOverflow;
+ }
+
+ /**
+ * Reset the month overflow behavior.
+ *
+ * @return void
+ */
+ public static function resetMonthsOverflow()
+ {
+ static::$monthsOverflow = true;
+ }
+
+ /**
+ * Get the month overflow behavior.
+ *
+ * @return bool
+ */
+ public static function shouldOverflowMonths()
+ {
+ return static::$monthsOverflow;
+ }
+
+ /**
+ * Indicates if years should be calculated with overflow.
+ *
+ * @param bool $yearsOverflow
+ *
+ * @return void
+ */
+ public static function useYearsOverflow($yearsOverflow = true)
+ {
+ static::$yearsOverflow = $yearsOverflow;
+ }
+
+ /**
+ * Reset the month overflow behavior.
+ *
+ * @return void
+ */
+ public static function resetYearsOverflow()
+ {
+ static::$yearsOverflow = true;
+ }
+
+ /**
+ * Get the month overflow behavior.
+ *
+ * @return bool
+ */
+ public static function shouldOverflowYears()
+ {
+ return static::$yearsOverflow;
+ }
+
+ /**
+ * Get the month comparison default behavior.
+ *
+ * @return bool
+ */
+ public static function compareYearWithMonth($compareYearWithMonth = true)
+ {
+ static::$compareYearWithMonth = $compareYearWithMonth;
+ }
+
+ /**
+ * Get the month comparison default behavior.
+ *
+ * @return bool
+ */
+ public static function shouldCompareYearWithMonth()
+ {
+ return static::$compareYearWithMonth;
+ }
+
+ /**
+ * Creates a DateTimeZone from a string, DateTimeZone or integer offset.
+ *
+ * @param \DateTimeZone|string|int|null $object
*
- * @return DateTimeZone
+ * @throws \InvalidArgumentException
+ *
+ * @return \DateTimeZone
*/
protected static function safeCreateDateTimeZone($object)
{
@@ -176,13 +465,35 @@ protected static function safeCreateDateTimeZone($object)
return $object;
}
- $tz = @timezone_open((string) $object);
+ if (is_numeric($object)) {
+ $tzName = timezone_name_from_abbr(null, $object * 3600, true);
+
+ if ($tzName === false) {
+ throw new InvalidArgumentException('Unknown or bad timezone ('.$object.')');
+ }
+
+ $object = $tzName;
+ }
+
+ $tz = @timezone_open($object = (string) $object);
+
+ if ($tz !== false) {
+ return $tz;
+ }
- if ($tz === false) {
- throw new InvalidArgumentException('Unknown or bad timezone ('.$object.')');
+ // Work-around for a bug fixed in PHP 5.5.10 https://bugs.php.net/bug.php?id=45528
+ // See: https://stackoverflow.com/q/14068594/2646927
+ // @codeCoverageIgnoreStart
+ if (strpos($object, ':') !== false) {
+ try {
+ return static::createFromFormat('O', $object)->getTimezone();
+ } catch (InvalidArgumentException $e) {
+ //
+ }
}
+ // @codeCoverageIgnoreEnd
- return $tz;
+ throw new InvalidArgumentException('Unknown or bad timezone ('.$object.')');
}
///////////////////////////////////////////////////////////////////
@@ -195,52 +506,86 @@ protected static function safeCreateDateTimeZone($object)
* Please see the testing aids section (specifically static::setTestNow())
* for more on the possibility of this constructor returning a test instance.
*
- * @param string|null $time
- * @param DateTimeZone|string|null $tz
+ * @param string|null $time
+ * @param \DateTimeZone|string|null $tz
*/
public function __construct($time = null, $tz = null)
{
// If the class has a test now set and we are trying to create a now()
// instance then override as required
- if (static::hasTestNow() && (empty($time) || $time === 'now' || static::hasRelativeKeywords($time))) {
+ $isNow = empty($time) || $time === 'now';
+ if (static::hasTestNow() && ($isNow || static::hasRelativeKeywords($time))) {
$testInstance = clone static::getTestNow();
- if (static::hasRelativeKeywords($time)) {
- $testInstance->modify($time);
- }
//shift the time according to the given time zone
- if ($tz !== null && $tz !== static::getTestNow()->tz) {
+ if ($tz !== null && $tz !== static::getTestNow()->getTimezone()) {
$testInstance->setTimezone($tz);
} else {
- $tz = $testInstance->tz;
+ $tz = $testInstance->getTimezone();
}
- $time = $testInstance->toDateTimeString();
+ if (static::hasRelativeKeywords($time)) {
+ $testInstance->modify($time);
+ }
+
+ $time = $testInstance->format(static::MOCK_DATETIME_FORMAT);
}
- parent::__construct($time, static::safeCreateDateTimeZone($tz));
+ $timezone = static::safeCreateDateTimeZone($tz);
+ // @codeCoverageIgnoreStart
+ if ($isNow && !isset($testInstance) && static::isMicrosecondsFallbackEnabled() && (
+ version_compare(PHP_VERSION, '7.1.0-dev', '<')
+ ||
+ version_compare(PHP_VERSION, '7.1.3-dev', '>=') && version_compare(PHP_VERSION, '7.1.4-dev', '<')
+ )
+ ) {
+ // Get microseconds from microtime() if "now" asked and PHP < 7.1 and PHP 7.1.3 if fallback enabled.
+ list($microTime, $timeStamp) = explode(' ', microtime());
+ $dateTime = new DateTime('now', $timezone);
+ $dateTime->setTimestamp($timeStamp); // Use the timestamp returned by microtime as now can happen in the next second
+ $time = $dateTime->format(static::DEFAULT_TO_STRING_FORMAT).substr($microTime, 1, 7);
+ }
+ // @codeCoverageIgnoreEnd
+
+ // Work-around for PHP bug https://bugs.php.net/bug.php?id=67127
+ if (strpos((string) .1, '.') === false) {
+ $locale = setlocale(LC_NUMERIC, '0');
+ setlocale(LC_NUMERIC, 'C');
+ }
+ parent::__construct($time, $timezone);
+ if (isset($locale)) {
+ setlocale(LC_NUMERIC, $locale);
+ }
+ static::setLastErrors(parent::getLastErrors());
}
/**
- * Create a Carbon instance from a DateTime one
+ * Create a Carbon instance from a DateTime one.
*
- * @param DateTime $dt
+ * @param \DateTime|\DateTimeInterface $date
*
* @return static
*/
- public static function instance(DateTime $dt)
+ public static function instance($date)
{
- return new static($dt->format('Y-m-d H:i:s.u'), $dt->getTimeZone());
+ if ($date instanceof static) {
+ return clone $date;
+ }
+
+ static::expectDateTime($date);
+
+ return new static($date->format('Y-m-d H:i:s.u'), $date->getTimezone());
}
/**
- * Create a carbon instance from a string. This is an alias for the
- * constructor that allows better fluent syntax as it allows you to do
- * Carbon::parse('Monday next week')->fn() rather than
- * (new Carbon('Monday next week'))->fn()
+ * Create a carbon instance from a string.
+ *
+ * This is an alias for the constructor that allows better fluent syntax
+ * as it allows you to do Carbon::parse('Monday next week')->fn() rather
+ * than (new Carbon('Monday next week'))->fn().
*
- * @param string|null $time
- * @param DateTimeZone|string|null $tz
+ * @param string|null $time
+ * @param \DateTimeZone|string|null $tz
*
* @return static
*/
@@ -250,9 +595,9 @@ public static function parse($time = null, $tz = null)
}
/**
- * Get a Carbon instance for the current date and time
+ * Get a Carbon instance for the current date and time.
*
- * @param DateTimeZone|string|null $tz
+ * @param \DateTimeZone|string|null $tz
*
* @return static
*/
@@ -262,51 +607,51 @@ public static function now($tz = null)
}
/**
- * Create a Carbon instance for today
+ * Create a Carbon instance for today.
*
- * @param DateTimeZone|string|null $tz
+ * @param \DateTimeZone|string|null $tz
*
* @return static
*/
public static function today($tz = null)
{
- return static::now($tz)->startOfDay();
+ return static::parse('today', $tz);
}
/**
- * Create a Carbon instance for tomorrow
+ * Create a Carbon instance for tomorrow.
*
- * @param DateTimeZone|string|null $tz
+ * @param \DateTimeZone|string|null $tz
*
* @return static
*/
public static function tomorrow($tz = null)
{
- return static::today($tz)->addDay();
+ return static::parse('tomorrow', $tz);
}
/**
- * Create a Carbon instance for yesterday
+ * Create a Carbon instance for yesterday.
*
- * @param DateTimeZone|string|null $tz
+ * @param \DateTimeZone|string|null $tz
*
* @return static
*/
public static function yesterday($tz = null)
{
- return static::today($tz)->subDay();
+ return static::parse('yesterday', $tz);
}
/**
* Create a Carbon instance for the greatest supported date.
*
- * @return Carbon
+ * @return static
*/
public static function maxValue()
{
- if (PHP_INT_SIZE === 4) {
- // 32 bit (and additionally Windows 64 bit)
- return static::createFromTimestamp(PHP_INT_MAX);
+ if (self::$PHPIntSize === 4) {
+ // 32 bit
+ return static::createFromTimestamp(PHP_INT_MAX); // @codeCoverageIgnore
}
// 64 bit
@@ -316,13 +661,13 @@ public static function maxValue()
/**
* Create a Carbon instance for the lowest supported date.
*
- * @return Carbon
+ * @return static
*/
public static function minValue()
{
- if (PHP_INT_SIZE === 4) {
- // 32 bit (and additionally Windows 64 bit)
- return static::createFromTimestamp(~PHP_INT_MAX);
+ if (self::$PHPIntSize === 4) {
+ // 32 bit
+ return static::createFromTimestamp(~PHP_INT_MAX); // @codeCoverageIgnore
}
// 64 bit
@@ -332,175 +677,457 @@ public static function minValue()
/**
* Create a new Carbon instance from a specific date and time.
*
- * If any of $year, $month or $day are set to null their now() values
- * will be used.
+ * If any of $year, $month or $day are set to null their now() values will
+ * be used.
+ *
+ * If $hour is null it will be set to its now() value and the default
+ * values for $minute and $second will be their now() values.
*
- * If $hour is null it will be set to its now() value and the default values
- * for $minute and $second will be their now() values.
* If $hour is not null then the default values for $minute and $second
* will be 0.
*
- * @param int|null $year
- * @param int|null $month
- * @param int|null $day
- * @param int|null $hour
- * @param int|null $minute
- * @param int|null $second
- * @param DateTimeZone|string|null $tz
+ * @param int|null $year
+ * @param int|null $month
+ * @param int|null $day
+ * @param int|null $hour
+ * @param int|null $minute
+ * @param int|null $second
+ * @param \DateTimeZone|string|null $tz
+ *
+ * @throws \InvalidArgumentException
*
* @return static
*/
public static function create($year = null, $month = null, $day = null, $hour = null, $minute = null, $second = null, $tz = null)
{
- $year = $year === null ? date('Y') : $year;
- $month = $month === null ? date('n') : $month;
- $day = $day === null ? date('j') : $day;
+ $now = static::hasTestNow() ? static::getTestNow() : static::now($tz);
+
+ $defaults = array_combine(array(
+ 'year',
+ 'month',
+ 'day',
+ 'hour',
+ 'minute',
+ 'second',
+ ), explode('-', $now->format('Y-n-j-G-i-s')));
+
+ $year = $year === null ? $defaults['year'] : $year;
+ $month = $month === null ? $defaults['month'] : $month;
+ $day = $day === null ? $defaults['day'] : $day;
if ($hour === null) {
- $hour = date('G');
- $minute = $minute === null ? date('i') : $minute;
- $second = $second === null ? date('s') : $second;
+ $hour = $defaults['hour'];
+ $minute = $minute === null ? $defaults['minute'] : $minute;
+ $second = $second === null ? $defaults['second'] : $second;
} else {
$minute = $minute === null ? 0 : $minute;
$second = $second === null ? 0 : $second;
}
- return static::createFromFormat('Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
+ $fixYear = null;
+
+ if ($year < 0) {
+ $fixYear = $year;
+ $year = 0;
+ } elseif ($year > 9999) {
+ $fixYear = $year - 9999;
+ $year = 9999;
+ }
+
+ $instance = static::createFromFormat('!Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
+
+ if ($fixYear !== null) {
+ $instance->addYears($fixYear);
+ }
+
+ return $instance;
}
/**
- * Create a Carbon instance from just a date. The time portion is set to now.
+ * Create a new safe Carbon instance from a specific date and time.
*
- * @param int|null $year
- * @param int|null $month
- * @param int|null $day
- * @param DateTimeZone|string|null $tz
+ * If any of $year, $month or $day are set to null their now() values will
+ * be used.
*
- * @return static
- */
- public static function createFromDate($year = null, $month = null, $day = null, $tz = null)
- {
- return static::create($year, $month, $day, null, null, null, $tz);
- }
-
- /**
- * Create a Carbon instance from just a time. The date portion is set to today.
+ * If $hour is null it will be set to its now() value and the default
+ * values for $minute and $second will be their now() values.
+ *
+ * If $hour is not null then the default values for $minute and $second
+ * will be 0.
+ *
+ * If one of the set values is not valid, an \InvalidArgumentException
+ * will be thrown.
*
- * @param int|null $hour
- * @param int|null $minute
- * @param int|null $second
- * @param DateTimeZone|string|null $tz
+ * @param int|null $year
+ * @param int|null $month
+ * @param int|null $day
+ * @param int|null $hour
+ * @param int|null $minute
+ * @param int|null $second
+ * @param \DateTimeZone|string|null $tz
+ *
+ * @throws \Carbon\Exceptions\InvalidDateException|\InvalidArgumentException
*
* @return static
*/
- public static function createFromTime($hour = null, $minute = null, $second = null, $tz = null)
+ public static function createSafe($year = null, $month = null, $day = null, $hour = null, $minute = null, $second = null, $tz = null)
{
- return static::create(null, null, null, $hour, $minute, $second, $tz);
+ $fields = array(
+ 'year' => array(0, 9999),
+ 'month' => array(0, 12),
+ 'day' => array(0, 31),
+ 'hour' => array(0, 24),
+ 'minute' => array(0, 59),
+ 'second' => array(0, 59),
+ );
+
+ foreach ($fields as $field => $range) {
+ if ($$field !== null && (!is_int($$field) || $$field < $range[0] || $$field > $range[1])) {
+ throw new InvalidDateException($field, $$field);
+ }
+ }
+
+ $instance = static::create($year, $month, $day, $hour, $minute, $second, $tz);
+
+ foreach (array_reverse($fields) as $field => $range) {
+ if ($$field !== null && (!is_int($$field) || $$field !== $instance->$field)) {
+ throw new InvalidDateException($field, $$field);
+ }
+ }
+
+ return $instance;
}
/**
- * Create a Carbon instance from a specific format
+ * Create a Carbon instance from just a date. The time portion is set to now.
*
- * @param string $format
- * @param string $time
- * @param DateTimeZone|string|null $tz
+ * @param int|null $year
+ * @param int|null $month
+ * @param int|null $day
+ * @param \DateTimeZone|string|null $tz
*
- * @throws InvalidArgumentException
+ * @throws \InvalidArgumentException
*
* @return static
*/
- public static function createFromFormat($format, $time, $tz = null)
+ public static function createFromDate($year = null, $month = null, $day = null, $tz = null)
{
- if ($tz !== null) {
- $dt = parent::createFromFormat($format, $time, static::safeCreateDateTimeZone($tz));
- } else {
- $dt = parent::createFromFormat($format, $time);
- }
-
- if ($dt instanceof DateTime) {
- return static::instance($dt);
- }
-
- $errors = static::getLastErrors();
- throw new InvalidArgumentException(implode(PHP_EOL, $errors['errors']));
+ return static::create($year, $month, $day, null, null, null, $tz);
}
/**
- * Create a Carbon instance from a timestamp
+ * Create a Carbon instance from just a date. The time portion is set to midnight.
*
- * @param int $timestamp
- * @param DateTimeZone|string|null $tz
+ * @param int|null $year
+ * @param int|null $month
+ * @param int|null $day
+ * @param \DateTimeZone|string|null $tz
*
* @return static
*/
- public static function createFromTimestamp($timestamp, $tz = null)
+ public static function createMidnightDate($year = null, $month = null, $day = null, $tz = null)
{
- return static::now($tz)->setTimestamp($timestamp);
+ return static::create($year, $month, $day, 0, 0, 0, $tz);
}
/**
- * Create a Carbon instance from an UTC timestamp
+ * Create a Carbon instance from just a time. The date portion is set to today.
*
- * @param int $timestamp
+ * @param int|null $hour
+ * @param int|null $minute
+ * @param int|null $second
+ * @param \DateTimeZone|string|null $tz
+ *
+ * @throws \InvalidArgumentException
*
* @return static
*/
- public static function createFromTimestampUTC($timestamp)
+ public static function createFromTime($hour = null, $minute = null, $second = null, $tz = null)
{
- return new static('@'.$timestamp);
+ return static::create(null, null, null, $hour, $minute, $second, $tz);
}
/**
- * Get a copy of the instance
+ * Create a Carbon instance from a time string. The date portion is set to today.
+ *
+ * @param string $time
+ * @param \DateTimeZone|string|null $tz
+ *
+ * @throws \InvalidArgumentException
*
* @return static
*/
- public function copy()
+ public static function createFromTimeString($time, $tz = null)
{
- return static::instance($this);
+ return static::today($tz)->setTimeFromTimeString($time);
}
- ///////////////////////////////////////////////////////////////////
- ///////////////////////// GETTERS AND SETTERS /////////////////////
- ///////////////////////////////////////////////////////////////////
+ private static function createFromFormatAndTimezone($format, $time, $tz)
+ {
+ return $tz !== null
+ ? parent::createFromFormat($format, $time, static::safeCreateDateTimeZone($tz))
+ : parent::createFromFormat($format, $time);
+ }
/**
- * Get a part of the Carbon object
+ * Create a Carbon instance from a specific format.
*
- * @param string $name
+ * @param string $format Datetime format
+ * @param string $time
+ * @param \DateTimeZone|string|null $tz
*
* @throws InvalidArgumentException
*
- * @return string|int|DateTimeZone
+ * @return static
*/
- public function __get($name)
+ public static function createFromFormat($format, $time, $tz = null)
{
+ // First attempt to create an instance, so that error messages are based on the unmodified format.
+ $date = self::createFromFormatAndTimezone($format, $time, $tz);
+ $lastErrors = parent::getLastErrors();
+
+ if (($mock = static::getTestNow()) && ($date instanceof DateTime || $date instanceof DateTimeInterface)) {
+ // Set timezone from mock if custom timezone was neither given directly nor as a part of format.
+ // First let's skip the part that will be ignored by the parser.
+ $nonEscaped = '(?getTimezone();
+ }
+
+ // Prepend mock datetime only if the format does not contain non escaped unix epoch reset flag.
+ if (!preg_match("/{$nonEscaped}[!|]/", $format)) {
+ $format = static::MOCK_DATETIME_FORMAT.' '.$format;
+ $time = $mock->format(static::MOCK_DATETIME_FORMAT).' '.$time;
+ }
+
+ // Regenerate date from the modified format to base result on the mocked instance instead of now.
+ $date = self::createFromFormatAndTimezone($format, $time, $tz);
+ }
+
+ if ($date instanceof DateTime || $date instanceof DateTimeInterface) {
+ $instance = static::instance($date);
+ $instance::setLastErrors($lastErrors);
+
+ return $instance;
+ }
+
+ throw new InvalidArgumentException(implode(PHP_EOL, $lastErrors['errors']));
+ }
+
+ /**
+ * Set last errors.
+ *
+ * @param array $lastErrors
+ *
+ * @return void
+ */
+ private static function setLastErrors(array $lastErrors)
+ {
+ static::$lastErrors = $lastErrors;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getLastErrors()
+ {
+ return static::$lastErrors;
+ }
+
+ /**
+ * Create a Carbon instance from a timestamp.
+ *
+ * @param int $timestamp
+ * @param \DateTimeZone|string|null $tz
+ *
+ * @return static
+ */
+ public static function createFromTimestamp($timestamp, $tz = null)
+ {
+ return static::today($tz)->setTimestamp($timestamp);
+ }
+
+ /**
+ * Create a Carbon instance from a timestamp in milliseconds.
+ *
+ * @param int $timestamp
+ * @param \DateTimeZone|string|null $tz
+ *
+ * @return static
+ */
+ public static function createFromTimestampMs($timestamp, $tz = null)
+ {
+ return static::createFromFormat('U.u', sprintf('%F', $timestamp / 1000))
+ ->setTimezone($tz);
+ }
+
+ /**
+ * Create a Carbon instance from an UTC timestamp.
+ *
+ * @param int $timestamp
+ *
+ * @return static
+ */
+ public static function createFromTimestampUTC($timestamp)
+ {
+ return new static('@'.$timestamp);
+ }
+
+ /**
+ * Make a Carbon instance from given variable if possible.
+ *
+ * Always return a new instance. Parse only strings and only these likely to be dates (skip intervals
+ * and recurrences). Throw an exception for invalid format, but otherwise return null.
+ *
+ * @param mixed $var
+ *
+ * @return static|null
+ */
+ public static function make($var)
+ {
+ if ($var instanceof DateTime || $var instanceof DateTimeInterface) {
+ return static::instance($var);
+ }
+
+ if (is_string($var)) {
+ $var = trim($var);
+ $first = substr($var, 0, 1);
+
+ if (is_string($var) && $first !== 'P' && $first !== 'R' && preg_match('/[a-z0-9]/i', $var)) {
+ return static::parse($var);
+ }
+ }
+ }
+
+ /**
+ * Get a copy of the instance.
+ *
+ * @return static
+ */
+ public function copy()
+ {
+ return clone $this;
+ }
+
+ /**
+ * Returns a present instance in the same timezone.
+ *
+ * @return static
+ */
+ public function nowWithSameTz()
+ {
+ return static::now($this->getTimezone());
+ }
+
+ /**
+ * Throws an exception if the given object is not a DateTime and does not implement DateTimeInterface
+ * and not in $other.
+ *
+ * @param mixed $date
+ * @param string|array $other
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected static function expectDateTime($date, $other = array())
+ {
+ $message = 'Expected ';
+ foreach ((array) $other as $expect) {
+ $message .= "{$expect}, ";
+ }
+
+ if (!$date instanceof DateTime && !$date instanceof DateTimeInterface) {
+ throw new InvalidArgumentException(
+ $message.'DateTime or DateTimeInterface, '.
+ (is_object($date) ? get_class($date) : gettype($date)).' given'
+ );
+ }
+ }
+
+ /**
+ * Return the Carbon instance passed through, a now instance in the same timezone
+ * if null given or parse the input if string given.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ *
+ * @return static
+ */
+ protected function resolveCarbon($date = null)
+ {
+ if (!$date) {
+ return $this->nowWithSameTz();
+ }
+
+ if (is_string($date)) {
+ return static::parse($date, $this->getTimezone());
+ }
+
+ static::expectDateTime($date, array('null', 'string'));
+
+ return $date instanceof self ? $date : static::instance($date);
+ }
+
+ ///////////////////////////////////////////////////////////////////
+ ///////////////////////// GETTERS AND SETTERS /////////////////////
+ ///////////////////////////////////////////////////////////////////
+
+ /**
+ * Get a part of the Carbon object
+ *
+ * @param string $name
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return string|int|bool|\DateTimeZone
+ */
+ public function __get($name)
+ {
+ static $formats = array(
+ 'year' => 'Y',
+ 'yearIso' => 'o',
+ 'month' => 'n',
+ 'day' => 'j',
+ 'hour' => 'G',
+ 'minute' => 'i',
+ 'second' => 's',
+ 'micro' => 'u',
+ 'dayOfWeek' => 'w',
+ 'dayOfWeekIso' => 'N',
+ 'dayOfYear' => 'z',
+ 'weekOfYear' => 'W',
+ 'daysInMonth' => 't',
+ 'timestamp' => 'U',
+ 'englishDayOfWeek' => 'l',
+ 'shortEnglishDayOfWeek' => 'D',
+ 'englishMonth' => 'F',
+ 'shortEnglishMonth' => 'M',
+ 'localeDayOfWeek' => '%A',
+ 'shortLocaleDayOfWeek' => '%a',
+ 'localeMonth' => '%B',
+ 'shortLocaleMonth' => '%b',
+ );
+
switch (true) {
- case array_key_exists($name, $formats = array(
- 'year' => 'Y',
- 'yearIso' => 'o',
- 'month' => 'n',
- 'day' => 'j',
- 'hour' => 'G',
- 'minute' => 'i',
- 'second' => 's',
- 'micro' => 'u',
- 'dayOfWeek' => 'w',
- 'dayOfYear' => 'z',
- 'weekOfYear' => 'W',
- 'daysInMonth' => 't',
- 'timestamp' => 'U',
- )):
- return (int) $this->format($formats[$name]);
+ case isset($formats[$name]):
+ $format = $formats[$name];
+ $method = substr($format, 0, 1) === '%' ? 'formatLocalized' : 'format';
+ $value = $this->$method($format);
+
+ return is_numeric($value) ? (int) $value : $value;
case $name === 'weekOfMonth':
return (int) ceil($this->day / static::DAYS_PER_WEEK);
+ case $name === 'weekNumberInMonth':
+ return (int) ceil(($this->day + $this->copy()->startOfMonth()->dayOfWeek - 1) / static::DAYS_PER_WEEK);
+
case $name === 'age':
- return (int) $this->diffInYears();
+ return $this->diffInYears();
case $name === 'quarter':
- return (int) ceil($this->month / 3);
+ return (int) ceil($this->month / static::MONTHS_PER_QUARTER);
case $name === 'offset':
return $this->getOffset();
@@ -512,10 +1139,10 @@ public function __get($name)
return $this->format('I') === '1';
case $name === 'local':
- return $this->offset === $this->copy()->setTimezone(date_default_timezone_get())->offset;
+ return $this->getOffset() === $this->copy()->setTimezone(date_default_timezone_get())->getOffset();
case $name === 'utc':
- return $this->offset === 0;
+ return $this->getOffset() === 0;
case $name === 'timezone' || $name === 'tz':
return $this->getTimezone();
@@ -549,36 +1176,25 @@ public function __isset($name)
/**
* Set a part of the Carbon object
*
- * @param string $name
- * @param string|int|DateTimeZone $value
+ * @param string $name
+ * @param string|int|\DateTimeZone $value
*
- * @throws InvalidArgumentException
+ * @throws \InvalidArgumentException
+ *
+ * @return void
*/
public function __set($name, $value)
{
switch ($name) {
case 'year':
- $this->setDate($value, $this->month, $this->day);
- break;
-
case 'month':
- $this->setDate($this->year, $value, $this->day);
- break;
-
case 'day':
- $this->setDate($this->year, $this->month, $value);
- break;
-
case 'hour':
- $this->setTime($value, $this->minute, $this->second);
- break;
-
case 'minute':
- $this->setTime($this->hour, $value, $this->second);
- break;
-
case 'second':
- $this->setTime($this->hour, $this->minute, $value);
+ list($year, $month, $day, $hour, $minute, $second) = explode('-', $this->format('Y-n-j-G-i-s'));
+ $$name = $value;
+ $this->setDateTime($year, $month, $day, $hour, $minute, $second);
break;
case 'timestamp':
@@ -679,6 +1295,26 @@ public function second($value)
return $this;
}
+ /**
+ * Sets the current date of the DateTime object to a different date.
+ * Calls modify as a workaround for a php bug
+ *
+ * @param int $year
+ * @param int $month
+ * @param int $day
+ *
+ * @return static
+ *
+ * @see https://github.com/briannesbitt/Carbon/issues/539
+ * @see https://bugs.php.net/bug.php?id=63863
+ */
+ public function setDate($year, $month, $day)
+ {
+ $this->modify('+0 day');
+
+ return parent::setDate($year, $month, $day);
+ }
+
/**
* Set the date and time all together
*
@@ -705,13 +1341,11 @@ public function setDateTime($year, $month, $day, $hour, $minute, $second = 0)
*/
public function setTimeFromTimeString($time)
{
- $time = explode(":", $time);
-
- $hour = $time[0];
- $minute = isset($time[1]) ? $time[1] : 0;
- $second = isset($time[2]) ? $time[2] : 0;
+ if (strpos($time, ':') === false) {
+ $time .= ':0';
+ }
- return $this->setTime($hour, $minute, $second);
+ return $this->modify($time);
}
/**
@@ -723,15 +1357,13 @@ public function setTimeFromTimeString($time)
*/
public function timestamp($value)
{
- $this->timestamp = $value;
-
- return $this;
+ return $this->setTimestamp($value);
}
/**
* Alias for setTimezone()
*
- * @param DateTimeZone|string $value
+ * @param \DateTimeZone|string $value
*
* @return static
*/
@@ -743,7 +1375,7 @@ public function timezone($value)
/**
* Alias for setTimezone()
*
- * @param DateTimeZone|string $value
+ * @param \DateTimeZone|string $value
*
* @return static
*/
@@ -755,17 +1387,62 @@ public function tz($value)
/**
* Set the instance's timezone from a string or object
*
- * @param DateTimeZone|string $value
+ * @param \DateTimeZone|string $value
*
* @return static
*/
public function setTimezone($value)
{
parent::setTimezone(static::safeCreateDateTimeZone($value));
+ // https://bugs.php.net/bug.php?id=72338
+ // just workaround on this bug
+ $this->getTimestamp();
+
+ return $this;
+ }
+
+ /**
+ * Set the year, month, and date for this instance to that of the passed instance.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface $date
+ *
+ * @return static
+ */
+ public function setDateFrom($date)
+ {
+ $date = static::instance($date);
+
+ $this->setDate($date->year, $date->month, $date->day);
+
+ return $this;
+ }
+
+ /**
+ * Set the hour, day, and time for this instance to that of the passed instance.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface $date
+ *
+ * @return static
+ */
+ public function setTimeFrom($date)
+ {
+ $date = static::instance($date);
+
+ $this->setTime($date->hour, $date->minute, $date->second);
return $this;
}
+ /**
+ * Get the days of the week
+ *
+ * @return array
+ */
+ public static function getDays()
+ {
+ return static::$days;
+ }
+
///////////////////////////////////////////////////////////////////
/////////////////////// WEEK SPECIAL DAYS /////////////////////////
///////////////////////////////////////////////////////////////////
@@ -783,10 +1460,18 @@ public static function getWeekStartsAt()
/**
* Set the first day of week
*
- * @param int
+ * @param int $day week start day
+ *
+ * @throws InvalidArgumentException
+ *
+ * @return void
*/
public static function setWeekStartsAt($day)
{
+ if ($day > static::SATURDAY || $day < static::SUNDAY) {
+ throw new InvalidArgumentException('Day of a week should be greater than or equal to 0 and less than or equal to 6.');
+ }
+
static::$weekStartsAt = $day;
}
@@ -801,12 +1486,20 @@ public static function getWeekEndsAt()
}
/**
- * Set the first day of week
+ * Set the last day of week
+ *
+ * @param int $day
+ *
+ * @throws InvalidArgumentException
*
- * @param int
+ * @return void
*/
public static function setWeekEndsAt($day)
{
+ if ($day > static::SATURDAY || $day < static::SUNDAY) {
+ throw new InvalidArgumentException('Day of a week should be greater than or equal to 0 and less than or equal to 6.');
+ }
+
static::$weekEndsAt = $day;
}
@@ -823,13 +1516,37 @@ public static function getWeekendDays()
/**
* Set weekend days
*
- * @param array
+ * @param array $days
+ *
+ * @return void
*/
public static function setWeekendDays($days)
{
static::$weekendDays = $days;
}
+ /**
+ * get midday/noon hour
+ *
+ * @return int
+ */
+ public static function getMidDayAt()
+ {
+ return static::$midDayAt;
+ }
+
+ /**
+ * Set midday/noon hour
+ *
+ * @param int $hour midday hour
+ *
+ * @return void
+ */
+ public static function setMidDayAt($hour)
+ {
+ static::$midDayAt = $hour;
+ }
+
///////////////////////////////////////////////////////////////////
///////////////////////// TESTING AIDS ////////////////////////////
///////////////////////////////////////////////////////////////////
@@ -841,6 +1558,7 @@ public static function setWeekendDays($days)
* - A call to the static now() method, ex. Carbon::now()
* - When a null (or blank string) is passed to the constructor or parse(), ex. new Carbon(null)
* - When the string "now" is passed to the constructor or parse(), ex. new Carbon('now')
+ * - When a string containing the desired time is passed to Carbon::parse().
*
* Note the timezone parameter was left out of the examples above and
* has no affect as the mock value will be returned regardless of its value.
@@ -848,11 +1566,12 @@ public static function setWeekendDays($days)
* To clear the test instance call this method using the default
* parameter of null.
*
- * @param Carbon|null $testNow
+ * @param \Carbon\Carbon|null $testNow real or mock Carbon instance
+ * @param \Carbon\Carbon|string|null $testNow
*/
- public static function setTestNow(Carbon $testNow = null)
+ public static function setTestNow($testNow = null)
{
- static::$testNow = $testNow;
+ static::$testNow = is_string($testNow) ? static::parse($testNow) : $testNow;
}
/**
@@ -878,25 +1597,24 @@ public static function hasTestNow()
}
/**
- * Determine if there is a relative keyword in the time string, this is to
- * create dates relative to now for test instances. e.g.: next tuesday
+ * Determine if a time string will produce a relative date.
*
* @param string $time
*
- * @return bool true if there is a keyword, otherwise false
+ * @return bool true if time match a relative date, false if absolute or invalid time string
*/
public static function hasRelativeKeywords($time)
{
- // skip common format with a '-' in it
- if (preg_match('/[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}/', $time) !== 1) {
- foreach (static::$relativeKeywords as $keyword) {
- if (stripos($time, $keyword) !== false) {
- return true;
- }
- }
+ if (strtotime($time) === false) {
+ return false;
}
- return false;
+ $date1 = new DateTime('2000-01-01T00:00:00Z');
+ $date1->modify($time);
+ $date2 = new DateTime('2001-12-25T00:00:00Z');
+ $date2->modify($time);
+
+ return $date1 != $date2;
}
///////////////////////////////////////////////////////////////////
@@ -904,16 +1622,14 @@ public static function hasRelativeKeywords($time)
///////////////////////////////////////////////////////////////////
/**
- * Intialize the translator instance if necessary.
+ * Initialize the translator instance if necessary.
*
- * @return TranslatorInterface
+ * @return \Symfony\Component\Translation\TranslatorInterface
*/
protected static function translator()
{
if (static::$translator === null) {
- static::$translator = new Translator('en');
- static::$translator->addLoader('array', new ArrayLoader());
- static::setLocale('en');
+ static::$translator = Translator::get();
}
return static::$translator;
@@ -922,7 +1638,7 @@ protected static function translator()
/**
* Get the translator instance in use
*
- * @return TranslatorInterface
+ * @return \Symfony\Component\Translation\TranslatorInterface
*/
public static function getTranslator()
{
@@ -932,7 +1648,9 @@ public static function getTranslator()
/**
* Set the translator instance to use
*
- * @param TranslatorInterface $translator
+ * @param \Symfony\Component\Translation\TranslatorInterface $translator
+ *
+ * @return void
*/
public static function setTranslator(TranslatorInterface $translator)
{
@@ -950,81 +1668,233 @@ public static function getLocale()
}
/**
- * Set the current translator locale
+ * Set the current translator locale and indicate if the source locale file exists
*
- * @param string $locale
+ * @param string $locale locale ex. en
+ *
+ * @return bool
*/
public static function setLocale($locale)
{
- static::translator()->setLocale($locale);
-
- // Ensure the locale has been loaded.
- static::translator()->addResource('array', require __DIR__.'/Lang/'.$locale.'.php', $locale);
+ return static::translator()->setLocale($locale) !== false;
}
- ///////////////////////////////////////////////////////////////////
- /////////////////////// STRING FORMATTING /////////////////////////
- ///////////////////////////////////////////////////////////////////
-
/**
- * Format the instance with the current locale. You can set the current
- * locale using setlocale() http://php.net/setlocale.
+ * Set the current locale to the given, execute the passed function, reset the locale to previous one,
+ * then return the result of the closure (or null if the closure was void).
*
- * @param string $format
+ * @param string $locale locale ex. en
*
- * @return string
+ * @return mixed
*/
- public function formatLocalized($format)
+ public static function executeWithLocale($locale, $func)
{
- // Check for Windows to find and replace the %e
- // modifier correctly
- if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
- $format = preg_replace('#(?trans('y')) !== 'y' &&
+ $y !== $translator->trans('year')
+ ) || (
+ ($y = $translator->trans('d')) !== 'd' &&
+ $y !== $translator->trans('day')
+ ) || (
+ ($y = $translator->trans('h')) !== 'h' &&
+ $y !== $translator->trans('hour')
+ );
+ });
}
/**
- * Set the default format used when type juggling a Carbon instance to a string
+ * Returns true if the given locale is internally supported and has diff syntax support (ago, from now, before, after).
+ * Support is considered enabled if the 4 sentences are translated in the given locale.
*
- * @param string $format
+ * @param string $locale locale ex. en
+ *
+ * @return bool
*/
- public static function setToStringFormat($format)
+ public static function localeHasDiffSyntax($locale)
{
- static::$toStringFormat = $format;
+ return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+ return $newLocale &&
+ $translator->trans('ago') !== 'ago' &&
+ $translator->trans('from_now') !== 'from_now' &&
+ $translator->trans('before') !== 'before' &&
+ $translator->trans('after') !== 'after';
+ });
}
/**
- * Format the instance as a string using the set format
+ * Returns true if the given locale is internally supported and has words for 1-day diff (just now, yesterday, tomorrow).
+ * Support is considered enabled if the 3 words are translated in the given locale.
*
- * @return string
+ * @param string $locale locale ex. en
+ *
+ * @return bool
*/
- public function __toString()
+ public static function localeHasDiffOneDayWords($locale)
{
- return $this->format(static::$toStringFormat);
+ return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+ return $newLocale &&
+ $translator->trans('diff_now') !== 'diff_now' &&
+ $translator->trans('diff_yesterday') !== 'diff_yesterday' &&
+ $translator->trans('diff_tomorrow') !== 'diff_tomorrow';
+ });
}
/**
- * Format the instance as date
+ * Returns true if the given locale is internally supported and has words for 2-days diff (before yesterday, after tomorrow).
+ * Support is considered enabled if the 2 words are translated in the given locale.
*
- * @return string
+ * @param string $locale locale ex. en
+ *
+ * @return bool
*/
- public function toDateString()
+ public static function localeHasDiffTwoDayWords($locale)
{
- return $this->format('Y-m-d');
+ return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+ return $newLocale &&
+ $translator->trans('diff_before_yesterday') !== 'diff_before_yesterday' &&
+ $translator->trans('diff_after_tomorrow') !== 'diff_after_tomorrow';
+ });
}
/**
- * Format the instance as a readable date
+ * Returns true if the given locale is internally supported and has period syntax support (X times, every X, from X, to X).
+ * Support is considered enabled if the 4 sentences are translated in the given locale.
+ *
+ * @param string $locale locale ex. en
+ *
+ * @return bool
+ */
+ public static function localeHasPeriodSyntax($locale)
+ {
+ return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+ return $newLocale &&
+ $translator->trans('period_recurrences') !== 'period_recurrences' &&
+ $translator->trans('period_interval') !== 'period_interval' &&
+ $translator->trans('period_start_date') !== 'period_start_date' &&
+ $translator->trans('period_end_date') !== 'period_end_date';
+ });
+ }
+
+ /**
+ * Returns the list of internally available locales and already loaded custom locales.
+ * (It will ignore custom translator dynamic loading.)
+ *
+ * @return array
+ */
+ public static function getAvailableLocales()
+ {
+ $translator = static::translator();
+ $locales = array();
+ if ($translator instanceof Translator) {
+ foreach (glob(__DIR__.'/Lang/*.php') as $file) {
+ $locales[] = substr($file, strrpos($file, '/') + 1, -4);
+ }
+
+ $locales = array_unique(array_merge($locales, array_keys($translator->getMessages())));
+ }
+
+ return $locales;
+ }
+
+ ///////////////////////////////////////////////////////////////////
+ /////////////////////// STRING FORMATTING /////////////////////////
+ ///////////////////////////////////////////////////////////////////
+
+ /**
+ * Set if UTF8 will be used for localized date/time
+ *
+ * @param bool $utf8
+ */
+ public static function setUtf8($utf8)
+ {
+ static::$utf8 = $utf8;
+ }
+
+ /**
+ * Format the instance with the current locale. You can set the current
+ * locale using setlocale() http://php.net/setlocale.
+ *
+ * @param string $format
+ *
+ * @return string
+ */
+ public function formatLocalized($format)
+ {
+ // Check for Windows to find and replace the %e modifier correctly.
+ if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+ $format = preg_replace('#(?toDateTimeString()));
+
+ return static::$utf8 ? utf8_encode($formatted) : $formatted;
+ }
+
+ /**
+ * Reset the format used to the default when type juggling a Carbon instance to a string
+ *
+ * @return void
+ */
+ public static function resetToStringFormat()
+ {
+ static::setToStringFormat(static::DEFAULT_TO_STRING_FORMAT);
+ }
+
+ /**
+ * Set the default format used when type juggling a Carbon instance to a string
+ *
+ * @param string|Closure $format
+ *
+ * @return void
+ */
+ public static function setToStringFormat($format)
+ {
+ static::$toStringFormat = $format;
+ }
+
+ /**
+ * Format the instance as a string using the set format
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ $format = static::$toStringFormat;
+
+ return $this->format($format instanceof Closure ? $format($this) : $format);
+ }
+
+ /**
+ * Format the instance as date
+ *
+ * @return string
+ */
+ public function toDateString()
+ {
+ return $this->format('Y-m-d');
+ }
+
+ /**
+ * Format the instance as a readable date
*
* @return string
*/
@@ -1053,6 +1923,21 @@ public function toDateTimeString()
return $this->format('Y-m-d H:i:s');
}
+ /**
+ * Format the instance as date and time T-separated with no timezone
+ *
+ * @example
+ * ```
+ * echo Carbon::now()->toDateTimeLocalString();
+ * ```
+ *
+ * @return string
+ */
+ public function toDateTimeLocalString()
+ {
+ return $this->format('Y-m-d\TH:i:s');
+ }
+
/**
* Format the instance with day, date and time
*
@@ -1090,7 +1975,7 @@ public function toCookieString()
*/
public function toIso8601String()
{
- return $this->format(static::ISO8601);
+ return $this->toAtomString();
}
/**
@@ -1103,6 +1988,16 @@ public function toRfc822String()
return $this->format(static::RFC822);
}
+ /**
+ * Convert the instance to UTC and return as Zulu ISO8601
+ *
+ * @return string
+ */
+ public function toIso8601ZuluString()
+ {
+ return $this->copy()->setTimezone('UTC')->format('Y-m-d\TH:i:s\Z');
+ }
+
/**
* Format the instance as RFC850
*
@@ -1173,373 +2068,1259 @@ public function toW3cString()
return $this->format(static::W3C);
}
- ///////////////////////////////////////////////////////////////////
- ////////////////////////// COMPARISONS ////////////////////////////
- ///////////////////////////////////////////////////////////////////
-
/**
- * Determines if the instance is equal to another
+ * Format the instance as RFC7231
*
- * @param Carbon $dt
- *
- * @return bool
+ * @return string
*/
- public function eq(Carbon $dt)
+ public function toRfc7231String()
{
- return $this == $dt;
+ return $this->copy()
+ ->setTimezone('GMT')
+ ->format(static::RFC7231_FORMAT);
}
/**
- * Determines if the instance is not equal to another
+ * Get default array representation
*
- * @param Carbon $dt
- *
- * @return bool
+ * @return array
*/
- public function ne(Carbon $dt)
+ public function toArray()
{
- return !$this->eq($dt);
+ return array(
+ 'year' => $this->year,
+ 'month' => $this->month,
+ 'day' => $this->day,
+ 'dayOfWeek' => $this->dayOfWeek,
+ 'dayOfYear' => $this->dayOfYear,
+ 'hour' => $this->hour,
+ 'minute' => $this->minute,
+ 'second' => $this->second,
+ 'micro' => $this->micro,
+ 'timestamp' => $this->timestamp,
+ 'formatted' => $this->format(self::DEFAULT_TO_STRING_FORMAT),
+ 'timezone' => $this->timezone,
+ );
}
/**
- * Determines if the instance is greater (after) than another
+ * Get default object representation.
*
- * @param Carbon $dt
+ * @example
+ * ```
+ * var_dump(Carbon::now()->toObject());
+ * ```
*
- * @return bool
+ * @return object
*/
- public function gt(Carbon $dt)
+ public function toObject()
{
- return $this > $dt;
+ return (object) $this->toArray();
}
/**
- * Determines if the instance is greater (after) than or equal to another
+ * Returns english human readable complete date string.
*
- * @param Carbon $dt
+ * @example
+ * ```
+ * echo Carbon::now()->toString();
+ * ```
*
- * @return bool
+ * @return string
*/
- public function gte(Carbon $dt)
+ public function toString()
{
- return $this >= $dt;
+ return $this->format('D M j Y H:i:s \G\M\TO');
}
/**
- * Determines if the instance is less (before) than another
+ * Return the ISO-8601 string (ex: 1977-04-22T06:00:00Z, if $keepOffset truthy, offset will be kept:
+ * 1977-04-22T01:00:00-05:00).
*
- * @param Carbon $dt
+ * @example
+ * ```
+ * echo Carbon::now('America/Toronto')->toISOString() . "\n";
+ * echo Carbon::now('America/Toronto')->toISOString(true) . "\n";
+ * ```
*
- * @return bool
+ * @param bool $keepOffset Pass true to keep the date offset. Else forced to UTC.
+ *
+ * @return null|string
*/
- public function lt(Carbon $dt)
+ public function toISOString($keepOffset = false)
{
- return $this < $dt;
+ if ($this->year === 0) {
+ return null;
+ }
+
+ $year = $this->year < 0 || $this->year > 9999
+ ? ($this->year < 0 ? '-' : '+').str_pad(abs($this->year), 6, '0', STR_PAD_LEFT)
+ : str_pad($this->year, 4, '0', STR_PAD_LEFT);
+ $tz = $keepOffset ? $this->format('P') : 'Z';
+ $date = $keepOffset ? $this : $this->copy()->setTimezone('UTC');
+
+ return $year.$date->format('-m-d\TH:i:s.u').$tz;
}
/**
- * Determines if the instance is less (before) or equal to another
+ * Return the ISO-8601 string (ex: 1977-04-22T06:00:00Z) with UTC timezone.
*
- * @param Carbon $dt
+ * @example
+ * ```
+ * echo Carbon::now('America/Toronto')->toJSON();
+ * ```
*
- * @return bool
+ * @return null|string
*/
- public function lte(Carbon $dt)
+ public function toJSON()
{
- return $this <= $dt;
+ return $this->toISOString();
}
/**
- * Determines if the instance is between two others
+ * Return native DateTime PHP object matching the current instance.
*
- * @param Carbon $dt1
- * @param Carbon $dt2
- * @param bool $equal Indicates if a > and < comparison should be used or <= or >=
+ * @example
+ * ```
+ * var_dump(Carbon::now()->toDateTime());
+ * ```
*
- * @return bool
+ * @return DateTime
*/
- public function between(Carbon $dt1, Carbon $dt2, $equal = true)
+ public function toDateTime()
{
- if ($dt1->gt($dt2)) {
- $temp = $dt1;
- $dt1 = $dt2;
- $dt2 = $temp;
- }
-
- if ($equal) {
- return $this->gte($dt1) && $this->lte($dt2);
- }
-
- return $this->gt($dt1) && $this->lt($dt2);
+ return new DateTime($this->format('Y-m-d H:i:s.u'), $this->getTimezone());
}
/**
- * Get the closest date from the instance.
+ * @alias toDateTime
*
- * @param Carbon $dt1
- * @param Carbon $dt2
+ * Return native DateTime PHP object matching the current instance.
*
- * @return static
+ * @example
+ * ```
+ * var_dump(Carbon::now()->toDate());
+ * ```
+ *
+ * @return DateTime
*/
- public function closest(Carbon $dt1, Carbon $dt2)
+ public function toDate()
{
- return $this->diffInSeconds($dt1) < $this->diffInSeconds($dt2) ? $dt1 : $dt2;
+ return $this->toDateTime();
}
+ ///////////////////////////////////////////////////////////////////
+ ////////////////////////// COMPARISONS ////////////////////////////
+ ///////////////////////////////////////////////////////////////////
+
/**
- * Get the farthest date from the instance.
+ * Determines if the instance is equal to another
*
- * @param Carbon $dt1
- * @param Carbon $dt2
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
- * @return static
+ * @return bool
*/
- public function farthest(Carbon $dt1, Carbon $dt2)
+ public function eq($date)
{
- return $this->diffInSeconds($dt1) > $this->diffInSeconds($dt2) ? $dt1 : $dt2;
+ return $this == $date;
}
/**
- * Get the minimum instance between a given instance (default now) and the current instance.
+ * Determines if the instance is equal to another
*
- * @param Carbon|null $dt
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
- * @return static
+ * @see eq()
+ *
+ * @return bool
*/
- public function min(Carbon $dt = null)
+ public function equalTo($date)
{
- $dt = $dt ?: static::now($this->tz);
-
- return $this->lt($dt) ? $this : $dt;
+ return $this->eq($date);
}
/**
- * Get the maximum instance between a given instance (default now) and the current instance.
+ * Determines if the instance is not equal to another
*
- * @param Carbon|null $dt
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
- * @return static
+ * @return bool
*/
- public function max(Carbon $dt = null)
+ public function ne($date)
{
- $dt = $dt ?: static::now($this->tz);
-
- return $this->gt($dt) ? $this : $dt;
+ return !$this->eq($date);
}
/**
- * Determines if the instance is a weekday
+ * Determines if the instance is not equal to another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see ne()
*
* @return bool
*/
- public function isWeekday()
+ public function notEqualTo($date)
{
- return !$this->isWeekend();
+ return $this->ne($date);
}
/**
- * Determines if the instance is a weekend day
+ * Determines if the instance is greater (after) than another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
* @return bool
*/
- public function isWeekend()
+ public function gt($date)
{
- return in_array($this->dayOfWeek, self::$weekendDays);
+ return $this > $date;
}
/**
- * Determines if the instance is yesterday
+ * Determines if the instance is greater (after) than another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see gt()
*
* @return bool
*/
- public function isYesterday()
+ public function greaterThan($date)
{
- return $this->toDateString() === static::yesterday($this->tz)->toDateString();
+ return $this->gt($date);
}
/**
- * Determines if the instance is today
+ * Determines if the instance is greater (after) than another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see gt()
*
* @return bool
*/
- public function isToday()
+ public function isAfter($date)
{
- return $this->toDateString() === static::now($this->tz)->toDateString();
+ return $this->gt($date);
}
/**
- * Determines if the instance is tomorrow
+ * Determines if the instance is greater (after) than or equal to another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
* @return bool
*/
- public function isTomorrow()
+ public function gte($date)
{
- return $this->toDateString() === static::tomorrow($this->tz)->toDateString();
+ return $this >= $date;
}
/**
- * Determines if the instance is in the future, ie. greater (after) than now
+ * Determines if the instance is greater (after) than or equal to another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see gte()
*
* @return bool
*/
- public function isFuture()
+ public function greaterThanOrEqualTo($date)
{
- return $this->gt(static::now($this->tz));
+ return $this->gte($date);
}
/**
- * Determines if the instance is in the past, ie. less (before) than now
+ * Determines if the instance is less (before) than another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
* @return bool
*/
- public function isPast()
+ public function lt($date)
{
- return $this->lt(static::now($this->tz));
+ return $this < $date;
}
/**
- * Determines if the instance is a leap year
+ * Determines if the instance is less (before) than another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see lt()
*
* @return bool
*/
- public function isLeapYear()
+ public function lessThan($date)
{
- return $this->format('L') === '1';
+ return $this->lt($date);
}
/**
- * Checks if the passed in date is the same day as the instance current day.
+ * Determines if the instance is less (before) than another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
- * @param Carbon $dt
+ * @see lt()
*
* @return bool
*/
- public function isSameDay(Carbon $dt)
+ public function isBefore($date)
{
- return $this->toDateString() === $dt->toDateString();
+ return $this->lt($date);
}
/**
- * Checks if this day is a Sunday.
+ * Determines if the instance is less (before) or equal to another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
*
* @return bool
*/
- public function isSunday()
+ public function lte($date)
{
- return $this->dayOfWeek === static::SUNDAY;
+ return $this <= $date;
}
/**
- * Checks if this day is a Monday.
+ * Determines if the instance is less (before) or equal to another
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see lte()
*
* @return bool
*/
- public function isMonday()
+ public function lessThanOrEqualTo($date)
{
- return $this->dayOfWeek === static::MONDAY;
+ return $this->lte($date);
}
/**
- * Checks if this day is a Tuesday.
+ * Determines if the instance is between two others
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date1
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date2
+ * @param bool $equal Indicates if an equal to comparison should be done
*
* @return bool
*/
- public function isTuesday()
+ public function between($date1, $date2, $equal = true)
{
- return $this->dayOfWeek === static::TUESDAY;
+ if ($date1->gt($date2)) {
+ $temp = $date1;
+ $date1 = $date2;
+ $date2 = $temp;
+ }
+
+ if ($equal) {
+ return $this->gte($date1) && $this->lte($date2);
+ }
+
+ return $this->gt($date1) && $this->lt($date2);
}
- /**
- * Checks if this day is a Wednesday.
- *
- * @return bool
- */
- public function isWednesday()
+ protected function floatDiffInSeconds($date)
{
- return $this->dayOfWeek === static::WEDNESDAY;
+ $date = $this->resolveCarbon($date);
+
+ return abs($this->diffInRealSeconds($date, false) + ($date->micro - $this->micro) / 1000000);
}
/**
- * Checks if this day is a Thursday.
+ * Determines if the instance is between two others
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date1
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date2
+ * @param bool $equal Indicates if a > and < comparison should be used or <= or >=
*
* @return bool
*/
- public function isThursday()
+ public function isBetween($date1, $date2, $equal = true)
{
- return $this->dayOfWeek === static::THURSDAY;
+ return $this->between($date1, $date2, $equal);
}
/**
- * Checks if this day is a Friday.
+ * Get the closest date from the instance.
*
- * @return bool
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date1
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date2
+ *
+ * @return static
*/
- public function isFriday()
+ public function closest($date1, $date2)
{
- return $this->dayOfWeek === static::FRIDAY;
+ return $this->floatDiffInSeconds($date1) < $this->floatDiffInSeconds($date2) ? $date1 : $date2;
}
/**
- * Checks if this day is a Saturday.
+ * Get the farthest date from the instance.
*
- * @return bool
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date1
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date2
+ *
+ * @return static
*/
- public function isSaturday()
+ public function farthest($date1, $date2)
{
- return $this->dayOfWeek === static::SATURDAY;
+ return $this->floatDiffInSeconds($date1) > $this->floatDiffInSeconds($date2) ? $date1 : $date2;
}
- ///////////////////////////////////////////////////////////////////
- /////////////////// ADDITIONS AND SUBTRACTIONS ////////////////////
- ///////////////////////////////////////////////////////////////////
-
/**
- * Add years to the instance. Positive $value travel forward while
- * negative $value travel into the past.
+ * Get the minimum instance between a given instance (default now) and the current instance.
*
- * @param int $value
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
*
* @return static
*/
- public function addYears($value)
+ public function min($date = null)
{
- return $this->modify((int) $value.' year');
+ $date = $this->resolveCarbon($date);
+
+ return $this->lt($date) ? $this : $date;
}
/**
- * Add a year to the instance
+ * Get the minimum instance between a given instance (default now) and the current instance.
*
- * @param int $value
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see min()
*
* @return static
*/
- public function addYear($value = 1)
+ public function minimum($date = null)
{
- return $this->addYears($value);
+ return $this->min($date);
}
/**
- * Remove a year from the instance
+ * Get the maximum instance between a given instance (default now) and the current instance.
*
- * @param int $value
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ *
+ * @return static
+ */
+ public function max($date = null)
+ {
+ $date = $this->resolveCarbon($date);
+
+ return $this->gt($date) ? $this : $date;
+ }
+
+ /**
+ * Get the maximum instance between a given instance (default now) and the current instance.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+ *
+ * @see max()
+ *
+ * @return static
+ */
+ public function maximum($date = null)
+ {
+ return $this->max($date);
+ }
+
+ /**
+ * Determines if the instance is a weekday.
+ *
+ * @return bool
+ */
+ public function isWeekday()
+ {
+ return !$this->isWeekend();
+ }
+
+ /**
+ * Determines if the instance is a weekend day.
+ *
+ * @return bool
+ */
+ public function isWeekend()
+ {
+ return in_array($this->dayOfWeek, static::$weekendDays);
+ }
+
+ /**
+ * Determines if the instance is yesterday.
+ *
+ * @return bool
+ */
+ public function isYesterday()
+ {
+ return $this->toDateString() === static::yesterday($this->getTimezone())->toDateString();
+ }
+
+ /**
+ * Determines if the instance is today.
+ *
+ * @return bool
+ */
+ public function isToday()
+ {
+ return $this->toDateString() === $this->nowWithSameTz()->toDateString();
+ }
+
+ /**
+ * Determines if the instance is tomorrow.
+ *
+ * @return bool
+ */
+ public function isTomorrow()
+ {
+ return $this->toDateString() === static::tomorrow($this->getTimezone())->toDateString();
+ }
+
+ /**
+ * Determines if the instance is within the next week.
+ *
+ * @return bool
+ */
+ public function isNextWeek()
+ {
+ return $this->weekOfYear === $this->nowWithSameTz()->addWeek()->weekOfYear;
+ }
+
+ /**
+ * Determines if the instance is within the last week.
+ *
+ * @return bool
+ */
+ public function isLastWeek()
+ {
+ return $this->weekOfYear === $this->nowWithSameTz()->subWeek()->weekOfYear;
+ }
+
+ /**
+ * Determines if the instance is within the next quarter.
+ *
+ * @return bool
+ */
+ public function isNextQuarter()
+ {
+ return $this->quarter === $this->nowWithSameTz()->addQuarter()->quarter;
+ }
+
+ /**
+ * Determines if the instance is within the last quarter.
+ *
+ * @return bool
+ */
+ public function isLastQuarter()
+ {
+ return $this->quarter === $this->nowWithSameTz()->subQuarter()->quarter;
+ }
+
+ /**
+ * Determines if the instance is within the next month.
+ *
+ * @return bool
+ */
+ public function isNextMonth()
+ {
+ return $this->month === $this->nowWithSameTz()->addMonthNoOverflow()->month;
+ }
+
+ /**
+ * Determines if the instance is within the last month.
+ *
+ * @return bool
+ */
+ public function isLastMonth()
+ {
+ return $this->month === $this->nowWithSameTz()->subMonthNoOverflow()->month;
+ }
+
+ /**
+ * Determines if the instance is within next year.
+ *
+ * @return bool
+ */
+ public function isNextYear()
+ {
+ return $this->year === $this->nowWithSameTz()->addYear()->year;
+ }
+
+ /**
+ * Determines if the instance is within the previous year.
+ *
+ * @return bool
+ */
+ public function isLastYear()
+ {
+ return $this->year === $this->nowWithSameTz()->subYear()->year;
+ }
+
+ /**
+ * Determines if the instance is in the future, ie. greater (after) than now.
+ *
+ * @return bool
+ */
+ public function isFuture()
+ {
+ return $this->gt($this->nowWithSameTz());
+ }
+
+ /**
+ * Determines if the instance is in the past, ie. less (before) than now.
+ *
+ * @return bool
+ */
+ public function isPast()
+ {
+ return $this->lt($this->nowWithSameTz());
+ }
+
+ /**
+ * Determines if the instance is a leap year.
+ *
+ * @return bool
+ */
+ public function isLeapYear()
+ {
+ return $this->format('L') === '1';
+ }
+
+ /**
+ * Determines if the instance is a long year
+ *
+ * @see https://en.wikipedia.org/wiki/ISO_8601#Week_dates
+ *
+ * @return bool
+ */
+ public function isLongYear()
+ {
+ return static::create($this->year, 12, 28, 0, 0, 0, $this->tz)->weekOfYear === 53;
+ }
+
+ /**
+ * Compares the formatted values of the two dates.
+ *
+ * @param string $format The date formats to compare.
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day.
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return bool
+ */
+ public function isSameAs($format, $date = null)
+ {
+ $date = $date ?: static::now($this->tz);
+
+ static::expectDateTime($date, 'null');
+
+ return $this->format($format) === $date->format($format);
+ }
+
+ /**
+ * Determines if the instance is in the current year.
+ *
+ * @return bool
+ */
+ public function isCurrentYear()
+ {
+ return $this->isSameYear();
+ }
+
+ /**
+ * Checks if the passed in date is in the same year as the instance year.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day.
+ *
+ * @return bool
+ */
+ public function isSameYear($date = null)
+ {
+ return $this->isSameAs('Y', $date);
+ }
+
+ /**
+ * Determines if the instance is in the current month.
+ *
+ * @return bool
+ */
+ public function isCurrentQuarter()
+ {
+ return $this->isSameQuarter();
+ }
+
+ /**
+ * Checks if the passed in date is in the same quarter as the instance quarter (and year if needed).
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day.
+ * @param bool $ofSameYear Check if it is the same month in the same year.
+ *
+ * @return bool
+ */
+ public function isSameQuarter($date = null, $ofSameYear = null)
+ {
+ $date = $date ? static::instance($date) : static::now($this->tz);
+
+ static::expectDateTime($date, 'null');
+
+ $ofSameYear = is_null($ofSameYear) ? static::shouldCompareYearWithMonth() : $ofSameYear;
+
+ return $this->quarter === $date->quarter && (!$ofSameYear || $this->isSameYear($date));
+ }
+
+ /**
+ * Determines if the instance is in the current month.
+ *
+ * @param bool $ofSameYear Check if it is the same month in the same year.
+ *
+ * @return bool
+ */
+ public function isCurrentMonth($ofSameYear = null)
+ {
+ return $this->isSameMonth(null, $ofSameYear);
+ }
+
+ /**
+ * Checks if the passed in date is in the same month as the instance´s month.
+ *
+ * Note that this defaults to only comparing the month while ignoring the year.
+ * To test if it is the same exact month of the same year, pass in true as the second parameter.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date.
+ * @param bool $ofSameYear Check if it is the same month in the same year.
+ *
+ * @return bool
+ */
+ public function isSameMonth($date = null, $ofSameYear = null)
+ {
+ $ofSameYear = is_null($ofSameYear) ? static::shouldCompareYearWithMonth() : $ofSameYear;
+
+ return $this->isSameAs($ofSameYear ? 'Y-m' : 'm', $date);
+ }
+
+ /**
+ * Determines if the instance is in the current day.
+ *
+ * @return bool
+ */
+ public function isCurrentDay()
+ {
+ return $this->isSameDay();
+ }
+
+ /**
+ * Checks if the passed in date is the same exact day as the instance´s day.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date.
+ *
+ * @return bool
+ */
+ public function isSameDay($date = null)
+ {
+ return $this->isSameAs('Y-m-d', $date);
+ }
+
+ /**
+ * Determines if the instance is in the current hour.
+ *
+ * @return bool
+ */
+ public function isCurrentHour()
+ {
+ return $this->isSameHour();
+ }
+
+ /**
+ * Checks if the passed in date is the same exact hour as the instance´s hour.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date.
+ *
+ * @return bool
+ */
+ public function isSameHour($date = null)
+ {
+ return $this->isSameAs('Y-m-d H', $date);
+ }
+
+ /**
+ * Determines if the instance is in the current minute.
+ *
+ * @return bool
+ */
+ public function isCurrentMinute()
+ {
+ return $this->isSameMinute();
+ }
+
+ /**
+ * Checks if the passed in date is the same exact minute as the instance´s minute.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date.
+ *
+ * @return bool
+ */
+ public function isSameMinute($date = null)
+ {
+ return $this->isSameAs('Y-m-d H:i', $date);
+ }
+
+ /**
+ * Determines if the instance is in the current second.
+ *
+ * @return bool
+ */
+ public function isCurrentSecond()
+ {
+ return $this->isSameSecond();
+ }
+
+ /**
+ * Checks if the passed in date is the same exact second as the instance´s second.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use the current date.
+ *
+ * @return bool
+ */
+ public function isSameSecond($date = null)
+ {
+ return $this->isSameAs('Y-m-d H:i:s', $date);
+ }
+
+ /**
+ * Checks if this day is a specific day of the week.
+ *
+ * @param int $dayOfWeek
+ *
+ * @return bool
+ */
+ public function isDayOfWeek($dayOfWeek)
+ {
+ return $this->dayOfWeek === $dayOfWeek;
+ }
+
+ /**
+ * Checks if this day is a Sunday.
+ *
+ * @return bool
+ */
+ public function isSunday()
+ {
+ return $this->dayOfWeek === static::SUNDAY;
+ }
+
+ /**
+ * Checks if this day is a Monday.
+ *
+ * @return bool
+ */
+ public function isMonday()
+ {
+ return $this->dayOfWeek === static::MONDAY;
+ }
+
+ /**
+ * Checks if this day is a Tuesday.
+ *
+ * @return bool
+ */
+ public function isTuesday()
+ {
+ return $this->dayOfWeek === static::TUESDAY;
+ }
+
+ /**
+ * Checks if this day is a Wednesday.
+ *
+ * @return bool
+ */
+ public function isWednesday()
+ {
+ return $this->dayOfWeek === static::WEDNESDAY;
+ }
+
+ /**
+ * Checks if this day is a Thursday.
+ *
+ * @return bool
+ */
+ public function isThursday()
+ {
+ return $this->dayOfWeek === static::THURSDAY;
+ }
+
+ /**
+ * Checks if this day is a Friday.
+ *
+ * @return bool
+ */
+ public function isFriday()
+ {
+ return $this->dayOfWeek === static::FRIDAY;
+ }
+
+ /**
+ * Checks if this day is a Saturday.
+ *
+ * @return bool
+ */
+ public function isSaturday()
+ {
+ return $this->dayOfWeek === static::SATURDAY;
+ }
+
+ /**
+ * Check if its the birthday. Compares the date/month values of the two dates.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|null $date The instance to compare with or null to use current day.
+ *
+ * @return bool
+ */
+ public function isBirthday($date = null)
+ {
+ return $this->isSameAs('md', $date);
+ }
+
+ /**
+ * Check if today is the last day of the Month
+ *
+ * @return bool
+ */
+ public function isLastOfMonth()
+ {
+ return $this->day === $this->daysInMonth;
+ }
+
+ /**
+ * Check if the instance is start of day / midnight.
+ *
+ * @param bool $checkMicroseconds check time at microseconds precision
+ * /!\ Warning, this is not reliable with PHP < 7.1.4
+ *
+ * @return bool
+ */
+ public function isStartOfDay($checkMicroseconds = false)
+ {
+ return $checkMicroseconds
+ ? $this->format('H:i:s.u') === '00:00:00.000000'
+ : $this->format('H:i:s') === '00:00:00';
+ }
+
+ /**
+ * Check if the instance is end of day.
+ *
+ * @param bool $checkMicroseconds check time at microseconds precision
+ * /!\ Warning, this is not reliable with PHP < 7.1.4
+ *
+ * @return bool
+ */
+ public function isEndOfDay($checkMicroseconds = false)
+ {
+ return $checkMicroseconds
+ ? $this->format('H:i:s.u') === '23:59:59.999999'
+ : $this->format('H:i:s') === '23:59:59';
+ }
+
+ /**
+ * Check if the instance is start of day / midnight.
+ *
+ * @return bool
+ */
+ public function isMidnight()
+ {
+ return $this->isStartOfDay();
+ }
+
+ /**
+ * Check if the instance is midday.
+ *
+ * @return bool
+ */
+ public function isMidday()
+ {
+ return $this->format('G:i:s') === static::$midDayAt.':00:00';
+ }
+
+ /**
+ * Checks if the (date)time string is in a given format.
+ *
+ * @param string $date
+ * @param string $format
+ *
+ * @return bool
+ */
+ public static function hasFormat($date, $format)
+ {
+ try {
+ // Try to create a DateTime object. Throws an InvalidArgumentException if the provided time string
+ // doesn't match the format in any way.
+ static::createFromFormat($format, $date);
+
+ // createFromFormat() is known to handle edge cases silently.
+ // E.g. "1975-5-1" (Y-n-j) will still be parsed correctly when "Y-m-d" is supplied as the format.
+ // To ensure we're really testing against our desired format, perform an additional regex validation.
+ $regex = strtr(
+ preg_quote($format, '/'),
+ static::$regexFormats
+ );
+
+ return (bool) preg_match('/^'.$regex.'$/', $date);
+ } catch (InvalidArgumentException $e) {
+ }
+
+ return false;
+ }
+
+ ///////////////////////////////////////////////////////////////////
+ /////////////////// ADDITIONS AND SUBTRACTIONS ////////////////////
+ ///////////////////////////////////////////////////////////////////
+
+ /**
+ * Add centuries to the instance. Positive $value travels forward while
+ * negative $value travels into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addCenturies($value)
+ {
+ return $this->addYears(static::YEARS_PER_CENTURY * $value);
+ }
+
+ /**
+ * Add a century to the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addCentury($value = 1)
+ {
+ return $this->addCenturies($value);
+ }
+
+ /**
+ * Remove centuries from the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subCenturies($value)
+ {
+ return $this->addCenturies(-1 * $value);
+ }
+
+ /**
+ * Remove a century from the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subCentury($value = 1)
+ {
+ return $this->subCenturies($value);
+ }
+
+ /**
+ * Add years to the instance. Positive $value travel forward while
+ * negative $value travel into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addYears($value)
+ {
+ if ($this->shouldOverflowYears()) {
+ return $this->addYearsWithOverflow($value);
+ }
+
+ return $this->addYearsNoOverflow($value);
+ }
+
+ /**
+ * Add a year to the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addYear($value = 1)
+ {
+ return $this->addYears($value);
+ }
+
+ /**
+ * Add years to the instance with no overflow of months
+ * Positive $value travel forward while
+ * negative $value travel into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addYearsNoOverflow($value)
+ {
+ return $this->addMonthsNoOverflow($value * static::MONTHS_PER_YEAR);
+ }
+
+ /**
+ * Add year with overflow months set to false
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addYearNoOverflow($value = 1)
+ {
+ return $this->addYearsNoOverflow($value);
+ }
+
+ /**
+ * Add years to the instance.
+ * Positive $value travel forward while
+ * negative $value travel into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addYearsWithOverflow($value)
+ {
+ return $this->modify((int) $value.' year');
+ }
+
+ /**
+ * Add year with overflow.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addYearWithOverflow($value = 1)
+ {
+ return $this->addYearsWithOverflow($value);
+ }
+
+ /**
+ * Remove years from the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subYears($value)
+ {
+ return $this->addYears(-1 * $value);
+ }
+
+ /**
+ * Remove a year from the instance
+ *
+ * @param int $value
*
* @return static
*/
public function subYear($value = 1)
{
- return $this->subYears($value);
+ return $this->subYears($value);
+ }
+
+ /**
+ * Remove years from the instance with no month overflow.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subYearsNoOverflow($value)
+ {
+ return $this->subMonthsNoOverflow($value * static::MONTHS_PER_YEAR);
+ }
+
+ /**
+ * Remove year from the instance with no month overflow
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subYearNoOverflow($value = 1)
+ {
+ return $this->subYearsNoOverflow($value);
+ }
+
+ /**
+ * Remove years from the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subYearsWithOverflow($value)
+ {
+ return $this->subMonthsWithOverflow($value * static::MONTHS_PER_YEAR);
+ }
+
+ /**
+ * Remove year from the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subYearWithOverflow($value = 1)
+ {
+ return $this->subYearsWithOverflow($value);
}
/**
- * Remove years from the instance.
+ * Add quarters to the instance. Positive $value travels forward while
+ * negative $value travels into the past.
*
* @param int $value
*
* @return static
*/
- public function subYears($value)
+ public function addQuarters($value)
{
- return $this->addYears(-1 * $value);
+ return $this->addMonths(static::MONTHS_PER_QUARTER * $value);
+ }
+
+ /**
+ * Add a quarter to the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addQuarter($value = 1)
+ {
+ return $this->addQuarters($value);
+ }
+
+ /**
+ * Remove quarters from the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subQuarters($value)
+ {
+ return $this->addQuarters(-1 * $value);
+ }
+
+ /**
+ * Remove a quarter from the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subQuarter($value = 1)
+ {
+ return $this->subQuarters($value);
}
/**
@@ -1552,7 +3333,11 @@ public function subYears($value)
*/
public function addMonths($value)
{
- return $this->modify((int) $value.' month');
+ if (static::shouldOverflowMonths()) {
+ return $this->addMonthsWithOverflow($value);
+ }
+
+ return $this->addMonthsNoOverflow($value);
}
/**
@@ -1567,6 +3352,18 @@ public function addMonth($value = 1)
return $this->addMonths($value);
}
+ /**
+ * Remove months from the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subMonths($value)
+ {
+ return $this->addMonths(-1 * $value);
+ }
+
/**
* Remove a month from the instance
*
@@ -1579,6 +3376,31 @@ public function subMonth($value = 1)
return $this->subMonths($value);
}
+ /**
+ * Add months to the instance. Positive $value travels forward while
+ * negative $value travels into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addMonthsWithOverflow($value)
+ {
+ return $this->modify((int) $value.' month');
+ }
+
+ /**
+ * Add a month to the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addMonthWithOverflow($value = 1)
+ {
+ return $this->addMonthsWithOverflow($value);
+ }
+
/**
* Remove months from the instance
*
@@ -1586,9 +3408,21 @@ public function subMonth($value = 1)
*
* @return static
*/
- public function subMonths($value)
+ public function subMonthsWithOverflow($value)
{
- return $this->addMonths(-1 * $value);
+ return $this->addMonthsWithOverflow(-1 * $value);
+ }
+
+ /**
+ * Remove a month from the instance
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subMonthWithOverflow($value = 1)
+ {
+ return $this->subMonthsWithOverflow($value);
}
/**
@@ -1601,13 +3435,15 @@ public function subMonths($value)
*/
public function addMonthsNoOverflow($value)
{
- $date = $this->copy()->addMonths($value);
+ $day = $this->day;
+
+ $this->modify((int) $value.' month');
- if ($date->day !== $this->day) {
- $date->day(1)->subMonth()->day($date->daysInMonth);
+ if ($day !== $this->day) {
+ $this->modify('last day of previous month');
}
- return $date;
+ return $this;
}
/**
@@ -1623,27 +3459,27 @@ public function addMonthNoOverflow($value = 1)
}
/**
- * Remove a month with no overflow from the instance
+ * Remove months with no overflow from the instance
*
* @param int $value
*
* @return static
*/
- public function subMonthNoOverflow($value = 1)
+ public function subMonthsNoOverflow($value)
{
- return $this->subMonthsNoOverflow($value);
+ return $this->addMonthsNoOverflow(-1 * $value);
}
/**
- * Remove months with no overflow from the instance
+ * Remove a month with no overflow from the instance
*
* @param int $value
*
* @return static
*/
- public function subMonthsNoOverflow($value)
+ public function subMonthNoOverflow($value = 1)
{
- return $this->addMonthsNoOverflow(-1 * $value);
+ return $this->subMonthsNoOverflow($value);
}
/**
@@ -1672,27 +3508,27 @@ public function addDay($value = 1)
}
/**
- * Remove a day from the instance
+ * Remove days from the instance
*
* @param int $value
*
* @return static
*/
- public function subDay($value = 1)
+ public function subDays($value)
{
- return $this->subDays($value);
+ return $this->addDays(-1 * $value);
}
/**
- * Remove days from the instance
+ * Remove a day from the instance
*
* @param int $value
*
* @return static
*/
- public function subDays($value)
+ public function subDay($value = 1)
{
- return $this->addDays(-1 * $value);
+ return $this->subDays($value);
}
/**
@@ -1705,7 +3541,11 @@ public function subDays($value)
*/
public function addWeekdays($value)
{
- return $this->modify((int) $value.' weekday');
+ // Fix for weekday bug https://bugs.php.net/bug.php?id=54909
+ $t = $this->toTimeString();
+ $this->modify((int) $value.' weekday');
+
+ return $this->setTimeFromTimeString($t);
}
/**
@@ -1721,27 +3561,27 @@ public function addWeekday($value = 1)
}
/**
- * Remove a weekday from the instance
+ * Remove weekdays from the instance
*
* @param int $value
*
* @return static
*/
- public function subWeekday($value = 1)
+ public function subWeekdays($value)
{
- return $this->subWeekdays($value);
+ return $this->addWeekdays(-1 * $value);
}
/**
- * Remove weekdays from the instance
+ * Remove a weekday from the instance
*
* @param int $value
*
* @return static
*/
- public function subWeekdays($value)
+ public function subWeekday($value = 1)
{
- return $this->addWeekdays(-1 * $value);
+ return $this->subWeekdays($value);
}
/**
@@ -1770,27 +3610,27 @@ public function addWeek($value = 1)
}
/**
- * Remove a week from the instance
+ * Remove weeks to the instance
*
* @param int $value
*
* @return static
*/
- public function subWeek($value = 1)
+ public function subWeeks($value)
{
- return $this->subWeeks($value);
+ return $this->addWeeks(-1 * $value);
}
/**
- * Remove weeks to the instance
+ * Remove a week from the instance
*
* @param int $value
*
* @return static
*/
- public function subWeeks($value)
+ public function subWeek($value = 1)
{
- return $this->addWeeks(-1 * $value);
+ return $this->subWeeks($value);
}
/**
@@ -1807,7 +3647,20 @@ public function addHours($value)
}
/**
- * Add an hour to the instance
+ * Add hours to the instance using timestamp. Positive $value travels
+ * forward while negative $value travels into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addRealHours($value)
+ {
+ return $this->addRealMinutes($value * static::MINUTES_PER_HOUR);
+ }
+
+ /**
+ * Add an hour to the instance.
*
* @param int $value
*
@@ -1819,7 +3672,43 @@ public function addHour($value = 1)
}
/**
- * Remove an hour from the instance
+ * Add an hour to the instance using timestamp.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addRealHour($value = 1)
+ {
+ return $this->addRealHours($value);
+ }
+
+ /**
+ * Remove hours from the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subHours($value)
+ {
+ return $this->addHours(-1 * $value);
+ }
+
+ /**
+ * Remove hours from the instance using timestamp.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subRealHours($value)
+ {
+ return $this->addRealHours(-1 * $value);
+ }
+
+ /**
+ * Remove an hour from the instance.
*
* @param int $value
*
@@ -1831,89 +3720,187 @@ public function subHour($value = 1)
}
/**
- * Remove hours from the instance
+ * Remove an hour from the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subRealHour($value = 1)
+ {
+ return $this->subRealHours($value);
+ }
+
+ /**
+ * Add minutes to the instance using timestamp. Positive $value
+ * travels forward while negative $value travels into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addMinutes($value)
+ {
+ return $this->modify((int) $value.' minute');
+ }
+
+ /**
+ * Add minutes to the instance using timestamp. Positive $value travels
+ * forward while negative $value travels into the past.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addRealMinutes($value)
+ {
+ return $this->addRealSeconds($value * static::SECONDS_PER_MINUTE);
+ }
+
+ /**
+ * Add a minute to the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addMinute($value = 1)
+ {
+ return $this->addMinutes($value);
+ }
+
+ /**
+ * Add a minute to the instance using timestamp.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function addRealMinute($value = 1)
+ {
+ return $this->addRealMinutes($value);
+ }
+
+ /**
+ * Remove a minute from the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subMinute($value = 1)
+ {
+ return $this->subMinutes($value);
+ }
+
+ /**
+ * Remove a minute from the instance using timestamp.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subRealMinute($value = 1)
+ {
+ return $this->addRealMinutes(-1 * $value);
+ }
+
+ /**
+ * Remove minutes from the instance.
+ *
+ * @param int $value
+ *
+ * @return static
+ */
+ public function subMinutes($value)
+ {
+ return $this->addMinutes(-1 * $value);
+ }
+
+ /**
+ * Remove a minute from the instance using timestamp.
*
* @param int $value
*
* @return static
*/
- public function subHours($value)
+ public function subRealMinutes($value = 1)
{
- return $this->addHours(-1 * $value);
+ return $this->subRealMinute($value);
}
/**
- * Add minutes to the instance. Positive $value travels forward while
+ * Add seconds to the instance. Positive $value travels forward while
* negative $value travels into the past.
*
* @param int $value
*
* @return static
*/
- public function addMinutes($value)
+ public function addSeconds($value)
{
- return $this->modify((int) $value.' minute');
+ return $this->modify((int) $value.' second');
}
/**
- * Add a minute to the instance
+ * Add seconds to the instance using timestamp. Positive $value travels
+ * forward while negative $value travels into the past.
*
* @param int $value
*
* @return static
*/
- public function addMinute($value = 1)
+ public function addRealSeconds($value)
{
- return $this->addMinutes($value);
+ return $this->setTimestamp($this->getTimestamp() + $value);
}
/**
- * Remove a minute from the instance
+ * Add a second to the instance.
*
* @param int $value
*
* @return static
*/
- public function subMinute($value = 1)
+ public function addSecond($value = 1)
{
- return $this->subMinutes($value);
+ return $this->addSeconds($value);
}
/**
- * Remove minutes from the instance
+ * Add a second to the instance using timestamp.
*
* @param int $value
*
* @return static
*/
- public function subMinutes($value)
+ public function addRealSecond($value = 1)
{
- return $this->addMinutes(-1 * $value);
+ return $this->addRealSeconds($value);
}
/**
- * Add seconds to the instance. Positive $value travels forward while
- * negative $value travels into the past.
+ * Remove seconds from the instance.
*
* @param int $value
*
* @return static
*/
- public function addSeconds($value)
+ public function subSeconds($value)
{
- return $this->modify((int) $value.' second');
+ return $this->addSeconds(-1 * $value);
}
/**
- * Add a second to the instance
+ * Remove seconds from the instance using timestamp.
*
* @param int $value
*
* @return static
*/
- public function addSecond($value = 1)
+ public function subRealSeconds($value)
{
- return $this->addSeconds($value);
+ return $this->addRealSeconds(-1 * $value);
}
/**
@@ -1929,121 +3916,205 @@ public function subSecond($value = 1)
}
/**
- * Remove seconds from the instance
+ * Remove a second from the instance using timestamp.
*
* @param int $value
*
* @return static
*/
- public function subSeconds($value)
+ public function subRealSecond($value = 1)
{
- return $this->addSeconds(-1 * $value);
+ return $this->subRealSeconds($value);
}
///////////////////////////////////////////////////////////////////
/////////////////////////// DIFFERENCES ///////////////////////////
///////////////////////////////////////////////////////////////////
+ /**
+ * @param DateInterval $diff
+ * @param bool $absolute
+ * @param bool $trimMicroseconds
+ *
+ * @return CarbonInterval
+ */
+ protected static function fixDiffInterval(DateInterval $diff, $absolute, $trimMicroseconds)
+ {
+ $diff = CarbonInterval::instance($diff, $trimMicroseconds);
+
+ // @codeCoverageIgnoreStart
+ if (version_compare(PHP_VERSION, '7.1.0-dev', '<')) {
+ return $diff;
+ }
+
+ // Work-around for https://bugs.php.net/bug.php?id=77145
+ if ($diff->f > 0 && $diff->y === -1 && $diff->m === 11 && $diff->d >= 27 && $diff->h === 23 && $diff->i === 59 && $diff->s === 59) {
+ $diff->y = 0;
+ $diff->m = 0;
+ $diff->d = 0;
+ $diff->h = 0;
+ $diff->i = 0;
+ $diff->s = 0;
+ $diff->f = (1000000 - round($diff->f * 1000000)) / 1000000;
+ $diff->invert();
+ } elseif ($diff->f < 0) {
+ if ($diff->s !== 0 || $diff->i !== 0 || $diff->h !== 0 || $diff->d !== 0 || $diff->m !== 0 || $diff->y !== 0) {
+ $diff->f = (round($diff->f * 1000000) + 1000000) / 1000000;
+ $diff->s--;
+ if ($diff->s < 0) {
+ $diff->s += 60;
+ $diff->i--;
+ if ($diff->i < 0) {
+ $diff->i += 60;
+ $diff->h--;
+ if ($diff->h < 0) {
+ $diff->h += 24;
+ $diff->d--;
+ if ($diff->d < 0) {
+ $diff->d += 30;
+ $diff->m--;
+ if ($diff->m < 0) {
+ $diff->m += 12;
+ $diff->y--;
+ }
+ }
+ }
+ }
+ }
+ } else {
+ $diff->f *= -1;
+ $diff->invert();
+ }
+ }
+ // @codeCoverageIgnoreEnd
+ if ($absolute && $diff->invert) {
+ $diff->invert();
+ }
+
+ return $diff;
+ }
+
+ /**
+ * Get the difference as a CarbonInterval instance.
+ *
+ * Pass false as second argument to get a microseconds-precise interval. Else
+ * microseconds in the original interval will not be kept.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ * @param bool $trimMicroseconds (true by default)
+ *
+ * @return CarbonInterval
+ */
+ public function diffAsCarbonInterval($date = null, $absolute = true, $trimMicroseconds = true)
+ {
+ $from = $this;
+ $to = $this->resolveCarbon($date);
+
+ if ($trimMicroseconds) {
+ $from = $from->copy()->startOfSecond();
+ $to = $to->copy()->startOfSecond();
+ }
+
+ return static::fixDiffInterval($from->diff($to, $absolute), $absolute, $trimMicroseconds);
+ }
+
/**
* Get the difference in years
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInYears(Carbon $dt = null, $abs = true)
+ public function diffInYears($date = null, $absolute = true)
{
- $dt = $dt ?: static::now($this->tz);
-
- return (int) $this->diff($dt, $abs)->format('%r%y');
+ return (int) $this->diff($this->resolveCarbon($date), $absolute)->format('%r%y');
}
/**
* Get the difference in months
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInMonths(Carbon $dt = null, $abs = true)
+ public function diffInMonths($date = null, $absolute = true)
{
- $dt = $dt ?: static::now($this->tz);
+ $date = $this->resolveCarbon($date);
- return $this->diffInYears($dt, $abs) * static::MONTHS_PER_YEAR + (int) $this->diff($dt, $abs)->format('%r%m');
+ return $this->diffInYears($date, $absolute) * static::MONTHS_PER_YEAR + (int) $this->diff($date, $absolute)->format('%r%m');
}
/**
* Get the difference in weeks
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInWeeks(Carbon $dt = null, $abs = true)
+ public function diffInWeeks($date = null, $absolute = true)
{
- return (int) ($this->diffInDays($dt, $abs) / static::DAYS_PER_WEEK);
+ return (int) ($this->diffInDays($date, $absolute) / static::DAYS_PER_WEEK);
}
/**
* Get the difference in days
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInDays(Carbon $dt = null, $abs = true)
+ public function diffInDays($date = null, $absolute = true)
{
- $dt = $dt ?: static::now($this->tz);
-
- return (int) $this->diff($dt, $abs)->format('%r%a');
+ return (int) $this->diff($this->resolveCarbon($date), $absolute)->format('%r%a');
}
/**
* Get the difference in days using a filter closure
*
- * @param Closure $callback
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param Closure $callback
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInDaysFiltered(Closure $callback, Carbon $dt = null, $abs = true)
+ public function diffInDaysFiltered(Closure $callback, $date = null, $absolute = true)
{
- return $this->diffFiltered(CarbonInterval::day(), $callback, $dt, $abs);
+ return $this->diffFiltered(CarbonInterval::day(), $callback, $date, $absolute);
}
/**
* Get the difference in hours using a filter closure
*
- * @param Closure $callback
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param Closure $callback
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInHoursFiltered(Closure $callback, Carbon $dt = null, $abs = true)
+ public function diffInHoursFiltered(Closure $callback, $date = null, $absolute = true)
{
- return $this->diffFiltered(CarbonInterval::hour(), $callback, $dt, $abs);
+ return $this->diffFiltered(CarbonInterval::hour(), $callback, $date, $absolute);
}
/**
* Get the difference by the given interval using a filter closure
*
- * @param CarbonInterval $ci An interval to traverse by
- * @param Closure $callback
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param CarbonInterval $ci An interval to traverse by
+ * @param Closure $callback
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffFiltered(CarbonInterval $ci, Closure $callback, Carbon $dt = null, $abs = true)
+ public function diffFiltered(CarbonInterval $ci, Closure $callback, $date = null, $absolute = true)
{
$start = $this;
- $end = $dt ?: static::now($this->tz);
+ $end = $this->resolveCarbon($date);
$inverse = false;
if ($end < $start) {
@@ -2053,85 +4124,197 @@ public function diffFiltered(CarbonInterval $ci, Closure $callback, Carbon $dt =
}
$period = new DatePeriod($start, $ci, $end);
- $vals = array_filter(iterator_to_array($period), function (DateTime $date) use ($callback) {
+ $values = array_filter(iterator_to_array($period), function ($date) use ($callback) {
return call_user_func($callback, Carbon::instance($date));
});
- $diff = count($vals);
+ $diff = count($values);
- return $inverse && !$abs ? -$diff : $diff;
+ return $inverse && !$absolute ? -$diff : $diff;
}
/**
* Get the difference in weekdays
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInWeekdays(Carbon $dt = null, $abs = true)
+ public function diffInWeekdays($date = null, $absolute = true)
{
return $this->diffInDaysFiltered(function (Carbon $date) {
return $date->isWeekday();
- }, $dt, $abs);
+ }, $date, $absolute);
}
/**
* Get the difference in weekend days using a filter
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInWeekendDays(Carbon $dt = null, $abs = true)
+ public function diffInWeekendDays($date = null, $absolute = true)
{
return $this->diffInDaysFiltered(function (Carbon $date) {
return $date->isWeekend();
- }, $dt, $abs);
+ }, $date, $absolute);
+ }
+
+ /**
+ * Get the difference in hours.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ *
+ * @return int
+ */
+ public function diffInHours($date = null, $absolute = true)
+ {
+ return (int) ($this->diffInSeconds($date, $absolute) / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR);
+ }
+
+ /**
+ * Get the difference in hours using timestamps.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ *
+ * @return int
+ */
+ public function diffInRealHours($date = null, $absolute = true)
+ {
+ return (int) ($this->diffInRealSeconds($date, $absolute) / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR);
+ }
+
+ /**
+ * Get the difference in minutes.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ *
+ * @return int
+ */
+ public function diffInMinutes($date = null, $absolute = true)
+ {
+ return (int) ($this->diffInSeconds($date, $absolute) / static::SECONDS_PER_MINUTE);
+ }
+
+ /**
+ * Get the difference in minutes using timestamps.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ *
+ * @return int
+ */
+ public function diffInRealMinutes($date = null, $absolute = true)
+ {
+ return (int) ($this->diffInRealSeconds($date, $absolute) / static::SECONDS_PER_MINUTE);
+ }
+
+ /**
+ * Get the difference in seconds.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ *
+ * @return int
+ */
+ public function diffInSeconds($date = null, $absolute = true)
+ {
+ $diff = $this->diff($this->resolveCarbon($date));
+ if (!$diff->days && version_compare(PHP_VERSION, '5.4.0-dev', '>=')) {
+ $diff = static::fixDiffInterval($diff, $absolute, false);
+ }
+ $value = $diff->days * static::HOURS_PER_DAY * static::MINUTES_PER_HOUR * static::SECONDS_PER_MINUTE +
+ $diff->h * static::MINUTES_PER_HOUR * static::SECONDS_PER_MINUTE +
+ $diff->i * static::SECONDS_PER_MINUTE +
+ $diff->s;
+
+ return $absolute || !$diff->invert ? $value : -$value;
}
/**
- * Get the difference in hours
+ * Get the difference in seconds using timestamps.
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInHours(Carbon $dt = null, $abs = true)
+ public function diffInRealSeconds($date = null, $absolute = true)
{
- return (int) ($this->diffInSeconds($dt, $abs) / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR);
+ $date = $this->resolveCarbon($date);
+ $value = $date->getTimestamp() - $this->getTimestamp();
+
+ return $absolute ? abs($value) : $value;
+ }
+
+ /**
+ * Get the difference in milliseconds.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ *
+ * @return int
+ */
+ public function diffInMilliseconds($date = null, $absolute = true)
+ {
+ return (int) ($this->diffInMicroseconds($date, $absolute) / static::MICROSECONDS_PER_MILLISECOND);
+ }
+
+ /**
+ * Get the difference in milliseconds using timestamps.
+ *
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
+ *
+ * @return int
+ */
+ public function diffInRealMilliseconds($date = null, $absolute = true)
+ {
+ return (int) ($this->diffInRealMicroseconds($date, $absolute) / static::MICROSECONDS_PER_MILLISECOND);
}
/**
- * Get the difference in minutes
+ * Get the difference in microseconds.
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInMinutes(Carbon $dt = null, $abs = true)
+ public function diffInMicroseconds($date = null, $absolute = true)
{
- return (int) ($this->diffInSeconds($dt, $abs) / static::SECONDS_PER_MINUTE);
+ $diff = $this->diff($this->resolveCarbon($date));
+ $micro = isset($diff->f) ? $diff->f : 0;
+ $value = (int) round((((($diff->days * static::HOURS_PER_DAY) +
+ $diff->h) * static::MINUTES_PER_HOUR +
+ $diff->i) * static::SECONDS_PER_MINUTE +
+ ($micro + $diff->s)) * static::MICROSECONDS_PER_SECOND);
+
+ return $absolute || !$diff->invert ? $value : -$value;
}
/**
- * Get the difference in seconds
+ * Get the difference in microseconds using timestamps.
*
- * @param Carbon|null $dt
- * @param bool $abs Get the absolute of the difference
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
+ * @param bool $absolute Get the absolute of the difference
*
* @return int
*/
- public function diffInSeconds(Carbon $dt = null, $abs = true)
+ public function diffInRealMicroseconds($date = null, $absolute = true)
{
- $dt = $dt ?: static::now($this->tz);
- $value = $dt->getTimestamp() - $this->getTimestamp();
+ /** @var Carbon $date */
+ $date = $this->resolveCarbon($date);
+ $value = ($date->timestamp - $this->timestamp) * static::MICROSECONDS_PER_SECOND +
+ $date->micro - $this->micro;
- return $abs ? abs($value) : $value;
+ return $absolute ? abs($value) : $value;
}
/**
@@ -2145,7 +4328,7 @@ public function secondsSinceMidnight()
}
/**
- * The number of seconds until 23:23:59.
+ * The number of seconds until 23:59:59.
*
* @return int
*/
@@ -2175,76 +4358,309 @@ public function secondsUntilEndOfDay()
*
* @param Carbon|null $other
* @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
*
* @return string
*/
- public function diffForHumans(Carbon $other = null, $absolute = false)
+ public function diffForHumans($other = null, $absolute = false, $short = false, $parts = 1)
{
$isNow = $other === null;
+ $relativeToNow = $isNow;
+
+ if ($absolute === static::DIFF_RELATIVE_TO_NOW) {
+ $absolute = false;
+ $relativeToNow = true;
+ } elseif ($absolute === static::DIFF_RELATIVE_TO_OTHER) {
+ $absolute = false;
+ $relativeToNow = false;
+ }
+
+ $interval = array();
+
+ $parts = min(6, max(1, (int) $parts));
+ $count = 1;
+ $unit = $short ? 's' : 'second';
if ($isNow) {
- $other = static::now($this->tz);
+ $other = $this->nowWithSameTz();
+ } elseif (!$other instanceof DateTime && !$other instanceof DateTimeInterface) {
+ $other = static::parse($other);
}
$diffInterval = $this->diff($other);
- switch (true) {
- case ($diffInterval->y > 0):
- $unit = 'year';
- $count = $diffInterval->y;
- break;
+ $diffIntervalArray = array(
+ array('value' => $diffInterval->y, 'unit' => 'year', 'unitShort' => 'y'),
+ array('value' => $diffInterval->m, 'unit' => 'month', 'unitShort' => 'm'),
+ array('value' => $diffInterval->d, 'unit' => 'day', 'unitShort' => 'd'),
+ array('value' => $diffInterval->h, 'unit' => 'hour', 'unitShort' => 'h'),
+ array('value' => $diffInterval->i, 'unit' => 'minute', 'unitShort' => 'min'),
+ array('value' => $diffInterval->s, 'unit' => 'second', 'unitShort' => 's'),
+ );
+
+ foreach ($diffIntervalArray as $diffIntervalData) {
+ if ($diffIntervalData['value'] > 0) {
+ $unit = $short ? $diffIntervalData['unitShort'] : $diffIntervalData['unit'];
+ $count = $diffIntervalData['value'];
+
+ if ($diffIntervalData['unit'] === 'day' && $count >= static::DAYS_PER_WEEK) {
+ $unit = $short ? 'w' : 'week';
+ $count = (int) ($count / static::DAYS_PER_WEEK);
+
+ $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count));
+
+ // get the count days excluding weeks (might be zero)
+ $numOfDaysCount = (int) ($diffIntervalData['value'] - ($count * static::DAYS_PER_WEEK));
+
+ if ($numOfDaysCount > 0 && count($interval) < $parts) {
+ $unit = $short ? 'd' : 'day';
+ $count = $numOfDaysCount;
+ $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count));
+ }
+ } else {
+ $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count));
+ }
+ }
- case ($diffInterval->m > 0):
- $unit = 'month';
- $count = $diffInterval->m;
+ // break the loop after we get the required number of parts in array
+ if (count($interval) >= $parts) {
break;
+ }
+ }
- case ($diffInterval->d > 0):
- $unit = 'day';
- $count = $diffInterval->d;
- if ($count >= self::DAYS_PER_WEEK) {
- $unit = 'week';
- $count = (int) ($count / self::DAYS_PER_WEEK);
+ if (count($interval) === 0) {
+ if ($isNow && static::getHumanDiffOptions() & self::JUST_NOW) {
+ $key = 'diff_now';
+ $translation = static::translator()->trans($key);
+ if ($translation !== $key) {
+ return $translation;
}
- break;
+ }
+ $count = static::getHumanDiffOptions() & self::NO_ZERO_DIFF ? 1 : 0;
+ $unit = $short ? 's' : 'second';
+ $interval[] = static::translator()->transChoice($unit, $count, array(':count' => $count));
+ }
- case ($diffInterval->h > 0):
- $unit = 'hour';
- $count = $diffInterval->h;
- break;
+ // join the interval parts by a space
+ $time = implode(' ', $interval);
- case ($diffInterval->i > 0):
- $unit = 'minute';
- $count = $diffInterval->i;
- break;
+ unset($diffIntervalArray, $interval);
- default:
- $count = $diffInterval->s;
- $unit = 'second';
- break;
+ if ($absolute) {
+ return $time;
}
- if ($count === 0) {
- $count = 1;
+ $isFuture = $diffInterval->invert === 1;
+
+ $transId = $relativeToNow ? ($isFuture ? 'from_now' : 'ago') : ($isFuture ? 'after' : 'before');
+
+ if ($parts === 1) {
+ if ($isNow && $unit === 'day') {
+ if ($count === 1 && static::getHumanDiffOptions() & self::ONE_DAY_WORDS) {
+ $key = $isFuture ? 'diff_tomorrow' : 'diff_yesterday';
+ $translation = static::translator()->trans($key);
+ if ($translation !== $key) {
+ return $translation;
+ }
+ }
+ if ($count === 2 && static::getHumanDiffOptions() & self::TWO_DAY_WORDS) {
+ $key = $isFuture ? 'diff_after_tomorrow' : 'diff_before_yesterday';
+ $translation = static::translator()->trans($key);
+ if ($translation !== $key) {
+ return $translation;
+ }
+ }
+ }
+ // Some languages have special pluralization for past and future tense.
+ $key = $unit.'_'.$transId;
+ if ($key !== static::translator()->transChoice($key, $count)) {
+ $time = static::translator()->transChoice($key, $count, array(':count' => $count));
+ }
}
- $time = static::translator()->transChoice($unit, $count, array(':count' => $count));
+ return static::translator()->trans($transId, array(':time' => $time));
+ }
- if ($absolute) {
- return $time;
+ /**
+ * @alias diffForHumans
+ *
+ * Get the difference in a human readable format in the current locale.
+ *
+ * When comparing a value in the past to default now:
+ * 1 hour ago
+ * 5 months ago
+ *
+ * When comparing a value in the future to default now:
+ * 1 hour from now
+ * 5 months from now
+ *
+ * When comparing a value in the past to another value:
+ * 1 hour before
+ * 5 months before
+ *
+ * When comparing a value in the future to another value:
+ * 1 hour after
+ * 5 months after
+ *
+ * @param Carbon|null $other
+ * @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
+ *
+ * @return string
+ */
+ public function from($other = null, $absolute = false, $short = false, $parts = 1)
+ {
+ if (!$other && !$absolute) {
+ $absolute = static::DIFF_RELATIVE_TO_NOW;
}
- $isFuture = $diffInterval->invert === 1;
+ return $this->diffForHumans($other, $absolute, $short, $parts);
+ }
+
+ /**
+ * @alias diffForHumans
+ *
+ * Get the difference in a human readable format in the current locale.
+ *
+ * When comparing a value in the past to default now:
+ * 1 hour ago
+ * 5 months ago
+ *
+ * When comparing a value in the future to default now:
+ * 1 hour from now
+ * 5 months from now
+ *
+ * When comparing a value in the past to another value:
+ * 1 hour before
+ * 5 months before
+ *
+ * When comparing a value in the future to another value:
+ * 1 hour after
+ * 5 months after
+ *
+ * @param Carbon|null $other
+ * @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
+ *
+ * @return string
+ */
+ public function since($other = null, $absolute = false, $short = false, $parts = 1)
+ {
+ return $this->diffForHumans($other, $absolute, $short, $parts);
+ }
+
+ /**
+ * Get the difference in a human readable format in the current locale from an other
+ * instance given (or now if null given) to current instance.
+ *
+ * When comparing a value in the past to default now:
+ * 1 hour from now
+ * 5 months from now
+ *
+ * When comparing a value in the future to default now:
+ * 1 hour ago
+ * 5 months ago
+ *
+ * When comparing a value in the past to another value:
+ * 1 hour after
+ * 5 months after
+ *
+ * When comparing a value in the future to another value:
+ * 1 hour before
+ * 5 months before
+ *
+ * @param Carbon|null $other
+ * @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
+ *
+ * @return string
+ */
+ public function to($other = null, $absolute = false, $short = false, $parts = 1)
+ {
+ if (!$other && !$absolute) {
+ $absolute = static::DIFF_RELATIVE_TO_NOW;
+ }
+
+ return $this->resolveCarbon($other)->diffForHumans($this, $absolute, $short, $parts);
+ }
+
+ /**
+ * @alias to
+ *
+ * Get the difference in a human readable format in the current locale from an other
+ * instance given (or now if null given) to current instance.
+ *
+ * @param Carbon|null $other
+ * @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
+ *
+ * @return string
+ */
+ public function until($other = null, $absolute = false, $short = false, $parts = 1)
+ {
+ return $this->to($other, $absolute, $short, $parts);
+ }
+
+ /**
+ * Get the difference in a human readable format in the current locale from current
+ * instance to now.
+ *
+ * @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
+ *
+ * @return string
+ */
+ public function fromNow($absolute = null, $short = false, $parts = 1)
+ {
+ $other = null;
+
+ if ($absolute instanceof DateTimeInterface) {
+ list($other, $absolute, $short, $parts) = array_pad(func_get_args(), 5, null);
+ }
+
+ return $this->from($other, $absolute, $short, $parts);
+ }
+
+ /**
+ * Get the difference in a human readable format in the current locale from an other
+ * instance given to now
+ *
+ * @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
+ *
+ * @return string
+ */
+ public function toNow($absolute = null, $short = false, $parts = 1)
+ {
+ return $this->to(null, $absolute, $short, $parts);
+ }
- $transId = $isNow ? ($isFuture ? 'from_now' : 'ago') : ($isFuture ? 'after' : 'before');
+ /**
+ * Get the difference in a human readable format in the current locale from an other
+ * instance given to now
+ *
+ * @param bool $absolute removes time difference modifiers ago, after, etc
+ * @param bool $short displays short format of time units
+ * @param int $parts displays number of parts in the interval
+ *
+ * @return string
+ */
+ public function ago($absolute = null, $short = false, $parts = 1)
+ {
+ $other = null;
- // Some langs have special pluralization for past and future tense.
- $tryKeyExists = $unit.'_'.$transId;
- if ($tryKeyExists !== static::translator()->transChoice($tryKeyExists, $count)) {
- $time = static::translator()->transChoice($tryKeyExists, $count, array(':count' => $count));
+ if ($absolute instanceof DateTimeInterface) {
+ list($other, $absolute, $short, $parts) = array_pad(func_get_args(), 5, null);
}
- return static::translator()->trans($transId, array(':time' => $time));
+ return $this->from($other, $absolute, $short, $parts);
}
///////////////////////////////////////////////////////////////////
@@ -2252,23 +4668,23 @@ public function diffForHumans(Carbon $other = null, $absolute = false)
///////////////////////////////////////////////////////////////////
/**
- * Resets the time to 00:00:00
+ * Resets the time to 00:00:00 start of day
*
* @return static
*/
public function startOfDay()
{
- return $this->hour(0)->minute(0)->second(0);
+ return $this->modify('00:00:00.000000');
}
/**
- * Resets the time to 23:59:59
+ * Resets the time to 23:59:59 end of day
*
* @return static
*/
public function endOfDay()
{
- return $this->hour(23)->minute(59)->second(59);
+ return $this->modify('23:59:59.999999');
}
/**
@@ -2278,7 +4694,7 @@ public function endOfDay()
*/
public function startOfMonth()
{
- return $this->startOfDay()->day(1);
+ return $this->setDate($this->year, $this->month, 1)->startOfDay();
}
/**
@@ -2288,7 +4704,29 @@ public function startOfMonth()
*/
public function endOfMonth()
{
- return $this->day($this->daysInMonth)->endOfDay();
+ return $this->setDate($this->year, $this->month, $this->daysInMonth)->endOfDay();
+ }
+
+ /**
+ * Resets the date to the first day of the quarter and the time to 00:00:00
+ *
+ * @return static
+ */
+ public function startOfQuarter()
+ {
+ $month = ($this->quarter - 1) * static::MONTHS_PER_QUARTER + 1;
+
+ return $this->setDate($this->year, $month, 1)->startOfDay();
+ }
+
+ /**
+ * Resets the date to end of the quarter and time to 23:59:59
+ *
+ * @return static
+ */
+ public function endOfQuarter()
+ {
+ return $this->startOfQuarter()->addMonths(static::MONTHS_PER_QUARTER - 1)->endOfMonth();
}
/**
@@ -2298,7 +4736,7 @@ public function endOfMonth()
*/
public function startOfYear()
{
- return $this->month(1)->startOfMonth();
+ return $this->setDate($this->year, 1, 1)->startOfDay();
}
/**
@@ -2308,7 +4746,7 @@ public function startOfYear()
*/
public function endOfYear()
{
- return $this->month(static::MONTHS_PER_YEAR)->endOfMonth();
+ return $this->setDate($this->year, 12, 31)->endOfDay();
}
/**
@@ -2318,7 +4756,9 @@ public function endOfYear()
*/
public function startOfDecade()
{
- return $this->startOfYear()->year($this->year - $this->year % static::YEARS_PER_DECADE);
+ $year = $this->year - $this->year % static::YEARS_PER_DECADE;
+
+ return $this->setDate($year, 1, 1)->startOfDay();
}
/**
@@ -2328,7 +4768,9 @@ public function startOfDecade()
*/
public function endOfDecade()
{
- return $this->endOfYear()->year($this->year - $this->year % static::YEARS_PER_DECADE + static::YEARS_PER_DECADE - 1);
+ $year = $this->year - $this->year % static::YEARS_PER_DECADE + static::YEARS_PER_DECADE - 1;
+
+ return $this->setDate($year, 12, 31)->endOfDay();
}
/**
@@ -2338,7 +4780,9 @@ public function endOfDecade()
*/
public function startOfCentury()
{
- return $this->startOfYear()->year($this->year - $this->year % static::YEARS_PER_CENTURY);
+ $year = $this->year - ($this->year - 1) % static::YEARS_PER_CENTURY;
+
+ return $this->setDate($year, 1, 1)->startOfDay();
}
/**
@@ -2348,7 +4792,33 @@ public function startOfCentury()
*/
public function endOfCentury()
{
- return $this->endOfYear()->year($this->year - $this->year % static::YEARS_PER_CENTURY + static::YEARS_PER_CENTURY - 1);
+ $year = $this->year - 1 - ($this->year - 1) % static::YEARS_PER_CENTURY + static::YEARS_PER_CENTURY;
+
+ return $this->setDate($year, 12, 31)->endOfDay();
+ }
+
+ /**
+ * Resets the date to the first day of the century and the time to 00:00:00
+ *
+ * @return static
+ */
+ public function startOfMillennium()
+ {
+ $year = $this->year - ($this->year - 1) % static::YEARS_PER_MILLENNIUM;
+
+ return $this->setDate($year, 1, 1)->startOfDay();
+ }
+
+ /**
+ * Resets the date to end of the century and time to 23:59:59
+ *
+ * @return static
+ */
+ public function endOfMillennium()
+ {
+ $year = $this->year - 1 - ($this->year - 1) % static::YEARS_PER_MILLENNIUM + static::YEARS_PER_MILLENNIUM;
+
+ return $this->setDate($year, 12, 31)->endOfDay();
}
/**
@@ -2358,8 +4828,8 @@ public function endOfCentury()
*/
public function startOfWeek()
{
- if ($this->dayOfWeek !== static::$weekStartsAt) {
- $this->previous(static::$weekStartsAt);
+ while ($this->dayOfWeek !== static::$weekStartsAt) {
+ $this->subDay();
}
return $this->startOfDay();
@@ -2372,17 +4842,87 @@ public function startOfWeek()
*/
public function endOfWeek()
{
- if ($this->dayOfWeek !== static::$weekEndsAt) {
- $this->next(static::$weekEndsAt);
+ while ($this->dayOfWeek !== static::$weekEndsAt) {
+ $this->addDay();
}
return $this->endOfDay();
}
+ /**
+ * Modify to start of current hour, minutes and seconds become 0
+ *
+ * @return static
+ */
+ public function startOfHour()
+ {
+ return $this->setTime($this->hour, 0, 0);
+ }
+
+ /**
+ * Modify to end of current hour, minutes and seconds become 59
+ *
+ * @return static
+ */
+ public function endOfHour()
+ {
+ return $this->modify("$this->hour:59:59.999999");
+ }
+
+ /**
+ * Modify to start of current minute, seconds become 0
+ *
+ * @return static
+ */
+ public function startOfMinute()
+ {
+ return $this->setTime($this->hour, $this->minute, 0);
+ }
+
+ /**
+ * Modify to end of current minute, seconds become 59
+ *
+ * @return static
+ */
+ public function endOfMinute()
+ {
+ return $this->modify("$this->hour:$this->minute:59.999999");
+ }
+
+ /**
+ * Modify to start of current minute, seconds become 0
+ *
+ * @return static
+ */
+ public function startOfSecond()
+ {
+ return $this->modify("$this->hour:$this->minute:$this->second.0");
+ }
+
+ /**
+ * Modify to end of current minute, seconds become 59
+ *
+ * @return static
+ */
+ public function endOfSecond()
+ {
+ return $this->modify("$this->hour:$this->minute:$this->second.999999");
+ }
+
+ /**
+ * Modify to midday, default to self::$midDayAt
+ *
+ * @return static
+ */
+ public function midDay()
+ {
+ return $this->setTime(self::$midDayAt, 0, 0);
+ }
+
/**
* Modify to the next occurrence of a given day of the week.
* If no dayOfWeek is provided, modify to the next occurrence
- * of the current day of the week. Use the supplied consts
+ * of the current day of the week. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
* @param int|null $dayOfWeek
@@ -2398,10 +4938,69 @@ public function next($dayOfWeek = null)
return $this->startOfDay()->modify('next '.static::$days[$dayOfWeek]);
}
+ /**
+ * Go forward or backward to the next week- or weekend-day.
+ *
+ * @param bool $weekday
+ * @param bool $forward
+ *
+ * @return $this
+ */
+ private function nextOrPreviousDay($weekday = true, $forward = true)
+ {
+ $step = $forward ? 1 : -1;
+
+ do {
+ $this->addDay($step);
+ } while ($weekday ? $this->isWeekend() : $this->isWeekday());
+
+ return $this;
+ }
+
+ /**
+ * Go forward to the next weekday.
+ *
+ * @return $this
+ */
+ public function nextWeekday()
+ {
+ return $this->nextOrPreviousDay();
+ }
+
+ /**
+ * Go backward to the previous weekday.
+ *
+ * @return $this
+ */
+ public function previousWeekday()
+ {
+ return $this->nextOrPreviousDay(true, false);
+ }
+
+ /**
+ * Go forward to the next weekend day.
+ *
+ * @return $this
+ */
+ public function nextWeekendDay()
+ {
+ return $this->nextOrPreviousDay(false);
+ }
+
+ /**
+ * Go backward to the previous weekend day.
+ *
+ * @return $this
+ */
+ public function previousWeekendDay()
+ {
+ return $this->nextOrPreviousDay(false, false);
+ }
+
/**
* Modify to the previous occurrence of a given day of the week.
* If no dayOfWeek is provided, modify to the previous occurrence
- * of the current day of the week. Use the supplied consts
+ * of the current day of the week. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
* @param int|null $dayOfWeek
@@ -2420,7 +5019,7 @@ public function previous($dayOfWeek = null)
/**
* Modify to the first occurrence of a given day of the week
* in the current month. If no dayOfWeek is provided, modify to the
- * first day of the current month. Use the supplied consts
+ * first day of the current month. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
* @param int|null $dayOfWeek
@@ -2441,7 +5040,7 @@ public function firstOfMonth($dayOfWeek = null)
/**
* Modify to the last occurrence of a given day of the week
* in the current month. If no dayOfWeek is provided, modify to the
- * last day of the current month. Use the supplied consts
+ * last day of the current month. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
* @param int|null $dayOfWeek
@@ -2463,7 +5062,7 @@ public function lastOfMonth($dayOfWeek = null)
* Modify to the given occurrence of a given day of the week
* in the current month. If the calculated occurrence is outside the scope
* of the current month, then return false and no modifications are made.
- * Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
+ * Use the supplied constants to indicate the desired dayOfWeek, ex. static::MONDAY.
*
* @param int $nth
* @param int $dayOfWeek
@@ -2472,48 +5071,48 @@ public function lastOfMonth($dayOfWeek = null)
*/
public function nthOfMonth($nth, $dayOfWeek)
{
- $dt = $this->copy()->firstOfMonth();
- $check = $dt->format('Y-m');
- $dt->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
+ $date = $this->copy()->firstOfMonth();
+ $check = $date->format('Y-m');
+ $date->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
- return $dt->format('Y-m') === $check ? $this->modify($dt) : false;
+ return $date->format('Y-m') === $check ? $this->modify($date) : false;
}
/**
* Modify to the first occurrence of a given day of the week
* in the current quarter. If no dayOfWeek is provided, modify to the
- * first day of the current quarter. Use the supplied consts
+ * first day of the current quarter. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
- * @param int|null $dayOfWeek
+ * @param int|null $dayOfWeek day of the week default null
*
* @return static
*/
public function firstOfQuarter($dayOfWeek = null)
{
- return $this->day(1)->month($this->quarter * 3 - 2)->firstOfMonth($dayOfWeek);
+ return $this->setDate($this->year, $this->quarter * static::MONTHS_PER_QUARTER - 2, 1)->firstOfMonth($dayOfWeek);
}
/**
* Modify to the last occurrence of a given day of the week
* in the current quarter. If no dayOfWeek is provided, modify to the
- * last day of the current quarter. Use the supplied consts
+ * last day of the current quarter. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
- * @param int|null $dayOfWeek
+ * @param int|null $dayOfWeek day of the week default null
*
* @return static
*/
public function lastOfQuarter($dayOfWeek = null)
{
- return $this->day(1)->month($this->quarter * 3)->lastOfMonth($dayOfWeek);
+ return $this->setDate($this->year, $this->quarter * static::MONTHS_PER_QUARTER, 1)->lastOfMonth($dayOfWeek);
}
/**
* Modify to the given occurrence of a given day of the week
* in the current quarter. If the calculated occurrence is outside the scope
* of the current quarter, then return false and no modifications are made.
- * Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
+ * Use the supplied constants to indicate the desired dayOfWeek, ex. static::MONDAY.
*
* @param int $nth
* @param int $dayOfWeek
@@ -2522,21 +5121,21 @@ public function lastOfQuarter($dayOfWeek = null)
*/
public function nthOfQuarter($nth, $dayOfWeek)
{
- $dt = $this->copy()->day(1)->month($this->quarter * 3);
- $lastMonth = $dt->month;
- $year = $dt->year;
- $dt->firstOfQuarter()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
+ $date = $this->copy()->day(1)->month($this->quarter * static::MONTHS_PER_QUARTER);
+ $lastMonth = $date->month;
+ $year = $date->year;
+ $date->firstOfQuarter()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
- return ($lastMonth < $dt->month || $year !== $dt->year) ? false : $this->modify($dt);
+ return ($lastMonth < $date->month || $year !== $date->year) ? false : $this->modify($date);
}
/**
* Modify to the first occurrence of a given day of the week
* in the current year. If no dayOfWeek is provided, modify to the
- * first day of the current year. Use the supplied consts
+ * first day of the current year. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
- * @param int|null $dayOfWeek
+ * @param int|null $dayOfWeek day of the week default null
*
* @return static
*/
@@ -2548,10 +5147,10 @@ public function firstOfYear($dayOfWeek = null)
/**
* Modify to the last occurrence of a given day of the week
* in the current year. If no dayOfWeek is provided, modify to the
- * last day of the current year. Use the supplied consts
+ * last day of the current year. Use the supplied constants
* to indicate the desired dayOfWeek, ex. static::MONDAY.
*
- * @param int|null $dayOfWeek
+ * @param int|null $dayOfWeek day of the week default null
*
* @return static
*/
@@ -2564,7 +5163,7 @@ public function lastOfYear($dayOfWeek = null)
* Modify to the given occurrence of a given day of the week
* in the current year. If the calculated occurrence is outside the scope
* of the current year, then return false and no modifications are made.
- * Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
+ * Use the supplied constants to indicate the desired dayOfWeek, ex. static::MONDAY.
*
* @param int $nth
* @param int $dayOfWeek
@@ -2573,36 +5172,256 @@ public function lastOfYear($dayOfWeek = null)
*/
public function nthOfYear($nth, $dayOfWeek)
{
- $dt = $this->copy()->firstOfYear()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
+ $date = $this->copy()->firstOfYear()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
- return $this->year === $dt->year ? $this->modify($dt) : false;
+ return $this->year === $date->year ? $this->modify($date) : false;
}
/**
* Modify the current instance to the average of a given instance (default now) and the current instance.
*
- * @param Carbon|null $dt
+ * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
*
* @return static
*/
- public function average(Carbon $dt = null)
+ public function average($date = null)
{
- $dt = $dt ?: static::now($this->tz);
+ $date = $this->resolveCarbon($date);
+ $increment = $this->diffInRealSeconds($date, false) / 2;
+ $intIncrement = floor($increment);
+ $microIncrement = (int) (($date->micro - $this->micro) / 2 + 1000000 * ($increment - $intIncrement));
+ $micro = (int) ($this->micro + $microIncrement);
+ while ($micro >= 1000000) {
+ $micro -= 1000000;
+ $intIncrement++;
+ }
+ $this->addSeconds($intIncrement);
+
+ if (version_compare(PHP_VERSION, '7.1.8-dev', '>=')) {
+ $this->setTime($this->hour, $this->minute, $this->second, $micro);
+ }
- return $this->addSeconds((int) ($this->diffInSeconds($dt, false) / 2));
+ return $this;
}
+ ///////////////////////////////////////////////////////////////////
+ /////////////////////////// SERIALIZATION /////////////////////////
+ ///////////////////////////////////////////////////////////////////
+
/**
- * Check if its the birthday. Compares the date/month values of the two dates.
+ * Return a serialized string of the instance.
+ *
+ * @return string
+ */
+ public function serialize()
+ {
+ return serialize($this);
+ }
+
+ /**
+ * Create an instance from a serialized string.
+ *
+ * @param string $value
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return static
+ */
+ public static function fromSerialized($value)
+ {
+ $instance = @unserialize($value);
+
+ if (!$instance instanceof static) {
+ throw new InvalidArgumentException('Invalid serialized value.');
+ }
+
+ return $instance;
+ }
+
+ /**
+ * The __set_state handler.
+ *
+ * @param array $array
+ *
+ * @return static
+ */
+ public static function __set_state($array)
+ {
+ return static::instance(parent::__set_state($array));
+ }
+
+ /**
+ * Prepare the object for JSON serialization.
+ *
+ * @return array|string
+ */
+ public function jsonSerialize()
+ {
+ if (static::$serializer) {
+ return call_user_func(static::$serializer, $this);
+ }
+
+ $carbon = $this;
+
+ return call_user_func(function () use ($carbon) {
+ return get_object_vars($carbon);
+ });
+ }
+
+ /**
+ * JSON serialize all Carbon instances using the given callback.
+ *
+ * @param callable $callback
+ *
+ * @return void
+ */
+ public static function serializeUsing($callback)
+ {
+ static::$serializer = $callback;
+ }
+
+ ///////////////////////////////////////////////////////////////////
+ /////////////////////////////// MACRO /////////////////////////////
+ ///////////////////////////////////////////////////////////////////
+
+ /**
+ * Register a custom macro.
+ *
+ * @param string $name
+ * @param object|callable $macro
+ *
+ * @return void
+ */
+ public static function macro($name, $macro)
+ {
+ static::$localMacros[$name] = $macro;
+ }
+
+ /**
+ * Remove all macros.
+ */
+ public static function resetMacros()
+ {
+ static::$localMacros = array();
+ }
+
+ /**
+ * Mix another object into the class.
+ *
+ * @param object $mixin
+ *
+ * @return void
+ */
+ public static function mixin($mixin)
+ {
+ $reflection = new \ReflectionClass($mixin);
+ $methods = $reflection->getMethods(
+ \ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED
+ );
+
+ foreach ($methods as $method) {
+ $method->setAccessible(true);
+
+ static::macro($method->name, $method->invoke($mixin));
+ }
+ }
+
+ /**
+ * Checks if macro is registered.
*
- * @param Carbon|null $dt The instance to compare with or null to use current day.
+ * @param string $name
*
* @return bool
*/
- public function isBirthday(Carbon $dt = null)
+ public static function hasMacro($name)
+ {
+ return isset(static::$localMacros[$name]);
+ }
+
+ /**
+ * Dynamically handle calls to the class.
+ *
+ * @param string $method
+ * @param array $parameters
+ *
+ * @throws \BadMethodCallException
+ *
+ * @return mixed
+ */
+ public static function __callStatic($method, $parameters)
+ {
+ if (!static::hasMacro($method)) {
+ throw new \BadMethodCallException("Method $method does not exist.");
+ }
+
+ if (static::$localMacros[$method] instanceof Closure && method_exists('Closure', 'bind')) {
+ return call_user_func_array(Closure::bind(static::$localMacros[$method], null, get_called_class()), $parameters);
+ }
+
+ return call_user_func_array(static::$localMacros[$method], $parameters);
+ }
+
+ /**
+ * Dynamically handle calls to the class.
+ *
+ * @param string $method
+ * @param array $parameters
+ *
+ * @throws \BadMethodCallException|\ReflectionException
+ *
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ if (!static::hasMacro($method)) {
+ throw new \BadMethodCallException("Method $method does not exist.");
+ }
+
+ $macro = static::$localMacros[$method];
+
+ $reflexion = new \ReflectionFunction($macro);
+ $reflectionParameters = $reflexion->getParameters();
+ $expectedCount = count($reflectionParameters);
+ $actualCount = count($parameters);
+ if ($expectedCount > $actualCount && $reflectionParameters[$expectedCount - 1]->name === 'self') {
+ for ($i = $actualCount; $i < $expectedCount - 1; $i++) {
+ $parameters[] = $reflectionParameters[$i]->getDefaultValue();
+ }
+ $parameters[] = $this;
+ }
+
+ if ($macro instanceof Closure && method_exists($macro, 'bindTo')) {
+ return call_user_func_array($macro->bindTo($this, get_class($this)), $parameters);
+ }
+
+ return call_user_func_array($macro, $parameters);
+ }
+
+ /**
+ * Show truthy properties on var_dump().
+ *
+ * @return array
+ */
+ public function __debugInfo()
+ {
+ return array_filter(get_object_vars($this), function ($var) {
+ return $var;
+ });
+ }
+
+ /**
+ * Cast the current instance into the given class.
+ *
+ * @param string $className The $className::instance() method will be called to cast the current object.
+ *
+ * @return object
+ */
+ public function cast($className)
{
- $dt = $dt ?: static::now($this->tz);
+ if (!method_exists($className, 'instance')) {
+ throw new \InvalidArgumentException("$className has not the instance() method needed to cast the date.");
+ }
- return $this->format('md') === $dt->format('md');
+ return $className::instance($this);
}
}
diff --git a/application/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php b/application/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
index 05f00a4..e8c6032 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
@@ -11,15 +11,17 @@
namespace Carbon;
+use Closure;
use DateInterval;
use InvalidArgumentException;
-use Symfony\Component\Translation\Translator;
+use ReflectionClass;
+use ReflectionFunction;
+use ReflectionMethod;
use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Translation\Loader\ArrayLoader;
/**
* A simple API extension for DateInterval.
- * The implemenation provides helpers to handle weeks but only days are saved.
+ * The implementation provides helpers to handle weeks but only days are saved.
* Weeks are calculated based on the total days of the current instance.
*
* @property int $years Total years of the current interval.
@@ -29,9 +31,16 @@
* @property int $hours Total hours of the current interval.
* @property int $minutes Total minutes of the current interval.
* @property int $seconds Total seconds of the current interval.
- *
- * @property-read integer $dayzExcludeWeeks Total days remaining in the final week of the current instance (days % 7).
- * @property-read integer $daysExcludeWeeks alias of dayzExcludeWeeks
+ * @property-read int $dayzExcludeWeeks Total days remaining in the final week of the current instance (days % 7).
+ * @property-read int $daysExcludeWeeks alias of dayzExcludeWeeks
+ * @property-read float $totalYears Number of years equivalent to the interval.
+ * @property-read float $totalMonths Number of months equivalent to the interval.
+ * @property-read float $totalWeeks Number of weeks equivalent to the interval.
+ * @property-read float $totalDays Number of days equivalent to the interval.
+ * @property-read float $totalDayz Alias for totalDays.
+ * @property-read float $totalHours Number of hours equivalent to the interval.
+ * @property-read float $totalMinutes Number of minutes equivalent to the interval.
+ * @property-read float $totalSeconds Number of seconds equivalent to the interval.
*
* @method static CarbonInterval years($years = 1) Create instance specifying a number of years.
* @method static CarbonInterval year($years = 1) Alias for years()
@@ -48,21 +57,21 @@
* @method static CarbonInterval minute($minutes = 1) Alias for minutes()
* @method static CarbonInterval seconds($seconds = 1) Create instance specifying a number of seconds.
* @method static CarbonInterval second($seconds = 1) Alias for seconds()
- * @method CarbonInterval years() years($years = 1) Set the years portion of the current interval.
- * @method CarbonInterval year() year($years = 1) Alias for years().
- * @method CarbonInterval months() months($months = 1) Set the months portion of the current interval.
- * @method CarbonInterval month() month($months = 1) Alias for months().
- * @method CarbonInterval weeks() weeks($weeks = 1) Set the weeks portion of the current interval. Will overwrite dayz value.
- * @method CarbonInterval week() week($weeks = 1) Alias for weeks().
- * @method CarbonInterval days() days($days = 1) Set the days portion of the current interval.
- * @method CarbonInterval dayz() dayz($days = 1) Alias for days().
- * @method CarbonInterval day() day($days = 1) Alias for days().
- * @method CarbonInterval hours() hours($hours = 1) Set the hours portion of the current interval.
- * @method CarbonInterval hour() hour($hours = 1) Alias for hours().
- * @method CarbonInterval minutes() minutes($minutes = 1) Set the minutes portion of the current interval.
- * @method CarbonInterval minute() minute($minutes = 1) Alias for minutes().
- * @method CarbonInterval seconds() seconds($seconds = 1) Set the seconds portion of the current interval.
- * @method CarbonInterval second() second($seconds = 1) Alias for seconds().
+ * @method CarbonInterval years($years = 1) Set the years portion of the current interval.
+ * @method CarbonInterval year($years = 1) Alias for years().
+ * @method CarbonInterval months($months = 1) Set the months portion of the current interval.
+ * @method CarbonInterval month($months = 1) Alias for months().
+ * @method CarbonInterval weeks($weeks = 1) Set the weeks portion of the current interval. Will overwrite dayz value.
+ * @method CarbonInterval week($weeks = 1) Alias for weeks().
+ * @method CarbonInterval days($days = 1) Set the days portion of the current interval.
+ * @method CarbonInterval dayz($days = 1) Alias for days().
+ * @method CarbonInterval day($days = 1) Alias for days().
+ * @method CarbonInterval hours($hours = 1) Set the hours portion of the current interval.
+ * @method CarbonInterval hour($hours = 1) Alias for hours().
+ * @method CarbonInterval minutes($minutes = 1) Set the minutes portion of the current interval.
+ * @method CarbonInterval minute($minutes = 1) Alias for minutes().
+ * @method CarbonInterval seconds($seconds = 1) Set the seconds portion of the current interval.
+ * @method CarbonInterval second($seconds = 1) Alias for seconds().
*/
class CarbonInterval extends DateInterval
{
@@ -81,16 +90,81 @@ class CarbonInterval extends DateInterval
/**
* A translator to ... er ... translate stuff
*
- * @var TranslatorInterface
+ * @var \Symfony\Component\Translation\TranslatorInterface
*/
protected static $translator;
+ /**
+ * @var array|null
+ */
+ protected static $cascadeFactors;
+
+ /**
+ * @var array|null
+ */
+ private static $flipCascadeFactors;
+
+ /**
+ * The registered macros.
+ *
+ * @var array
+ */
+ protected static $macros = array();
+
/**
* Before PHP 5.4.20/5.5.4 instead of FALSE days will be set to -99999 when the interval instance
- * was created by DateTime:diff().
+ * was created by DateTime::diff().
*/
const PHP_DAYS_FALSE = -99999;
+ /**
+ * Mapping of units and factors for cascading.
+ *
+ * Should only be modified by changing the factors or referenced constants.
+ *
+ * @return array
+ */
+ public static function getCascadeFactors()
+ {
+ return static::$cascadeFactors ?: array(
+ 'minutes' => array(Carbon::SECONDS_PER_MINUTE, 'seconds'),
+ 'hours' => array(Carbon::MINUTES_PER_HOUR, 'minutes'),
+ 'dayz' => array(Carbon::HOURS_PER_DAY, 'hours'),
+ 'months' => array(Carbon::DAYS_PER_WEEK * Carbon::WEEKS_PER_MONTH, 'dayz'),
+ 'years' => array(Carbon::MONTHS_PER_YEAR, 'months'),
+ );
+ }
+
+ private static function standardizeUnit($unit)
+ {
+ $unit = rtrim($unit, 'sz').'s';
+
+ return $unit === 'days' ? 'dayz' : $unit;
+ }
+
+ private static function getFlipCascadeFactors()
+ {
+ if (!self::$flipCascadeFactors) {
+ self::$flipCascadeFactors = array();
+ foreach (static::getCascadeFactors() as $to => $tuple) {
+ list($factor, $from) = $tuple;
+
+ self::$flipCascadeFactors[self::standardizeUnit($from)] = array(self::standardizeUnit($to), $factor);
+ }
+ }
+
+ return self::$flipCascadeFactors;
+ }
+
+ /**
+ * @param array $cascadeFactors
+ */
+ public static function setCascadeFactors(array $cascadeFactors)
+ {
+ self::$flipCascadeFactors = null;
+ static::$cascadeFactors = $cascadeFactors;
+ }
+
/**
* Determine if the interval was created via DateTime:diff() or not.
*
@@ -120,32 +194,99 @@ private static function wasCreatedFromDiff(DateInterval $interval)
*/
public function __construct($years = 1, $months = null, $weeks = null, $days = null, $hours = null, $minutes = null, $seconds = null)
{
- $spec = static::PERIOD_PREFIX;
+ $spec = $years;
- $spec .= $years > 0 ? $years.static::PERIOD_YEARS : '';
- $spec .= $months > 0 ? $months.static::PERIOD_MONTHS : '';
+ if (!is_string($spec) || floatval($years) || preg_match('/^[0-9.]/', $years)) {
+ $spec = static::PERIOD_PREFIX;
- $specDays = 0;
- $specDays += $weeks > 0 ? $weeks * Carbon::DAYS_PER_WEEK : 0;
- $specDays += $days > 0 ? $days : 0;
+ $spec .= $years > 0 ? $years.static::PERIOD_YEARS : '';
+ $spec .= $months > 0 ? $months.static::PERIOD_MONTHS : '';
- $spec .= $specDays > 0 ? $specDays.static::PERIOD_DAYS : '';
+ $specDays = 0;
+ $specDays += $weeks > 0 ? $weeks * static::getDaysPerWeek() : 0;
+ $specDays += $days > 0 ? $days : 0;
- if ($hours > 0 || $minutes > 0 || $seconds > 0) {
- $spec .= static::PERIOD_TIME_PREFIX;
- $spec .= $hours > 0 ? $hours.static::PERIOD_HOURS : '';
- $spec .= $minutes > 0 ? $minutes.static::PERIOD_MINUTES : '';
- $spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : '';
- }
+ $spec .= $specDays > 0 ? $specDays.static::PERIOD_DAYS : '';
+
+ if ($hours > 0 || $minutes > 0 || $seconds > 0) {
+ $spec .= static::PERIOD_TIME_PREFIX;
+ $spec .= $hours > 0 ? $hours.static::PERIOD_HOURS : '';
+ $spec .= $minutes > 0 ? $minutes.static::PERIOD_MINUTES : '';
+ $spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : '';
+ }
- if ($spec === static::PERIOD_PREFIX) {
- // Allow the zero interval.
- $spec .= '0'.static::PERIOD_YEARS;
+ if ($spec === static::PERIOD_PREFIX) {
+ // Allow the zero interval.
+ $spec .= '0'.static::PERIOD_YEARS;
+ }
}
parent::__construct($spec);
}
+ /**
+ * Returns the factor for a given source-to-target couple.
+ *
+ * @param string $source
+ * @param string $target
+ *
+ * @return int|null
+ */
+ public static function getFactor($source, $target)
+ {
+ $source = self::standardizeUnit($source);
+ $target = self::standardizeUnit($target);
+ $factors = static::getFlipCascadeFactors();
+ if (isset($factors[$source])) {
+ list($to, $factor) = $factors[$source];
+ if ($to === $target) {
+ return $factor;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Returns current config for days per week.
+ *
+ * @return int
+ */
+ public static function getDaysPerWeek()
+ {
+ return static::getFactor('dayz', 'weeks') ?: Carbon::DAYS_PER_WEEK;
+ }
+
+ /**
+ * Returns current config for hours per day.
+ *
+ * @return int
+ */
+ public static function getHoursPerDay()
+ {
+ return static::getFactor('hours', 'dayz') ?: Carbon::HOURS_PER_DAY;
+ }
+
+ /**
+ * Returns current config for minutes per hour.
+ *
+ * @return int
+ */
+ public static function getMinutesPerHours()
+ {
+ return static::getFactor('minutes', 'hours') ?: Carbon::MINUTES_PER_HOUR;
+ }
+
+ /**
+ * Returns current config for seconds per minute.
+ *
+ * @return int
+ */
+ public static function getSecondsPerMinutes()
+ {
+ return static::getFactor('seconds', 'minutes') ?: Carbon::SECONDS_PER_MINUTE;
+ }
+
/**
* Create a new CarbonInterval instance from specific values.
* This is an alias for the constructor that allows better fluent
@@ -167,6 +308,19 @@ public static function create($years = 1, $months = null, $weeks = null, $days =
return new static($years, $months, $weeks, $days, $hours, $minutes, $seconds);
}
+ /**
+ * Get a copy of the instance.
+ *
+ * @return static
+ */
+ public function copy()
+ {
+ $date = new static($this->spec());
+ $date->invert = $this->invert;
+
+ return $date;
+ }
+
/**
* Provide static helpers to create instances. Allows CarbonInterval::years(3).
*
@@ -212,6 +366,123 @@ public static function __callStatic($name, $args)
case 'second':
return new static(null, null, null, null, null, null, $arg);
}
+
+ if (static::hasMacro($name)) {
+ return call_user_func_array(
+ array(new static(0), $name), $args
+ );
+ }
+ }
+
+ /**
+ * Creates a CarbonInterval from string.
+ *
+ * Format:
+ *
+ * Suffix | Unit | Example | DateInterval expression
+ * -------|---------|---------|------------------------
+ * y | years | 1y | P1Y
+ * mo | months | 3mo | P3M
+ * w | weeks | 2w | P2W
+ * d | days | 28d | P28D
+ * h | hours | 4h | PT4H
+ * m | minutes | 12m | PT12M
+ * s | seconds | 59s | PT59S
+ *
+ * e. g. `1w 3d 4h 32m 23s` is converted to 10 days 4 hours 32 minutes and 23 seconds.
+ *
+ * Special cases:
+ * - An empty string will return a zero interval
+ * - Fractions are allowed for weeks, days, hours and minutes and will be converted
+ * and rounded to the next smaller value (caution: 0.5w = 4d)
+ *
+ * @param string $intervalDefinition
+ *
+ * @return static
+ */
+ public static function fromString($intervalDefinition)
+ {
+ if (empty($intervalDefinition)) {
+ return new static(0);
+ }
+
+ $years = 0;
+ $months = 0;
+ $weeks = 0;
+ $days = 0;
+ $hours = 0;
+ $minutes = 0;
+ $seconds = 0;
+
+ $pattern = '/(\d+(?:\.\d+)?)\h*([^\d\h]*)/i';
+ preg_match_all($pattern, $intervalDefinition, $parts, PREG_SET_ORDER);
+ while ($match = array_shift($parts)) {
+ list($part, $value, $unit) = $match;
+ $intValue = intval($value);
+ $fraction = floatval($value) - $intValue;
+ switch (strtolower($unit)) {
+ case 'year':
+ case 'years':
+ case 'y':
+ $years += $intValue;
+ break;
+
+ case 'month':
+ case 'months':
+ case 'mo':
+ $months += $intValue;
+ break;
+
+ case 'week':
+ case 'weeks':
+ case 'w':
+ $weeks += $intValue;
+ if ($fraction) {
+ $parts[] = array(null, $fraction * static::getDaysPerWeek(), 'd');
+ }
+ break;
+
+ case 'day':
+ case 'days':
+ case 'd':
+ $days += $intValue;
+ if ($fraction) {
+ $parts[] = array(null, $fraction * static::getHoursPerDay(), 'h');
+ }
+ break;
+
+ case 'hour':
+ case 'hours':
+ case 'h':
+ $hours += $intValue;
+ if ($fraction) {
+ $parts[] = array(null, $fraction * static::getMinutesPerHours(), 'm');
+ }
+ break;
+
+ case 'minute':
+ case 'minutes':
+ case 'm':
+ $minutes += $intValue;
+ if ($fraction) {
+ $seconds += round($fraction * static::getSecondsPerMinutes());
+ }
+ break;
+
+ case 'second':
+ case 'seconds':
+ case 's':
+ $seconds += $intValue;
+ break;
+
+ default:
+ throw new InvalidArgumentException(
+ sprintf('Invalid part %s in definition %s', $part, $intervalDefinition)
+ );
+ }
+ }
+
+ return new static($years, $months, $weeks, $days, $hours, $minutes, $seconds);
}
/**
@@ -219,49 +490,82 @@ public static function __callStatic($name, $args)
* DateInterval objects created from DateTime::diff() as you can't externally
* set the $days field.
*
- * @param DateInterval $di
+ * Pass false as second argument to get a microseconds-precise interval. Else
+ * microseconds in the original interval will not be kept.
*
- * @throws InvalidArgumentException
+ * @param DateInterval $di
+ * @param bool $trimMicroseconds (true by default)
*
* @return static
*/
- public static function instance(DateInterval $di)
+ public static function instance(DateInterval $di, $trimMicroseconds = true)
{
- if (static::wasCreatedFromDiff($di)) {
- throw new InvalidArgumentException("Can not instance a DateInterval object created from DateTime::diff().");
+ $microseconds = $trimMicroseconds || version_compare(PHP_VERSION, '7.1.0-dev', '<') ? 0 : $di->f;
+ $instance = new static(static::getDateIntervalSpec($di));
+ if ($microseconds) {
+ $instance->f = $microseconds;
}
-
- $instance = new static($di->y, $di->m, 0, $di->d, $di->h, $di->i, $di->s);
$instance->invert = $di->invert;
- $instance->days = $di->days;
+ foreach (array('y', 'm', 'd', 'h', 'i', 's') as $unit) {
+ if ($di->$unit < 0) {
+ $instance->$unit *= -1;
+ }
+ }
return $instance;
}
+ /**
+ * Make a CarbonInterval instance from given variable if possible.
+ *
+ * Always return a new instance. Parse only strings and only these likely to be intervals (skip dates
+ * and recurrences). Throw an exception for invalid format, but otherwise return null.
+ *
+ * @param mixed $var
+ *
+ * @return static|null
+ */
+ public static function make($var)
+ {
+ if ($var instanceof DateInterval) {
+ return static::instance($var);
+ }
+
+ if (is_string($var)) {
+ $var = trim($var);
+
+ if (substr($var, 0, 1) === 'P') {
+ return new static($var);
+ }
+
+ if (preg_match('/^(?:\h*\d+(?:\.\d+)?\h*[a-z]+)+$/i', $var)) {
+ return static::fromString($var);
+ }
+ }
+ }
+
///////////////////////////////////////////////////////////////////
/////////////////////// LOCALIZATION //////////////////////////////
///////////////////////////////////////////////////////////////////
/**
- * Intialize the translator instance if necessary.
+ * Initialize the translator instance if necessary.
*
- * @return TranslatorInterface
+ * @return \Symfony\Component\Translation\TranslatorInterface
*/
protected static function translator()
{
if (static::$translator === null) {
- static::$translator = new Translator('en');
- static::$translator->addLoader('array', new ArrayLoader());
- static::setLocale('en');
+ static::$translator = Translator::get();
}
return static::$translator;
}
/**
- * Get the translator instance in use
+ * Get the translator instance in use.
*
- * @return TranslatorInterface
+ * @return \Symfony\Component\Translation\TranslatorInterface
*/
public static function getTranslator()
{
@@ -269,7 +573,7 @@ public static function getTranslator()
}
/**
- * Set the translator instance to use
+ * Set the translator instance to use.
*
* @param TranslatorInterface $translator
*/
@@ -279,7 +583,7 @@ public static function setTranslator(TranslatorInterface $translator)
}
/**
- * Get the current translator locale
+ * Get the current translator locale.
*
* @return string
*/
@@ -289,16 +593,13 @@ public static function getLocale()
}
/**
- * Set the current translator locale
+ * Set the current translator locale.
*
* @param string $locale
*/
public static function setLocale($locale)
{
- static::translator()->setLocale($locale);
-
- // Ensure the locale has been loaded.
- static::translator()->addResource('array', require __DIR__.'/Lang/'.$locale.'.php', $locale);
+ return static::translator()->setLocale($locale) !== false;
}
///////////////////////////////////////////////////////////////////
@@ -306,16 +607,20 @@ public static function setLocale($locale)
///////////////////////////////////////////////////////////////////
/**
- * Get a part of the CarbonInterval object
+ * Get a part of the CarbonInterval object.
*
* @param string $name
*
- * @throws InvalidArgumentException
+ * @throws \InvalidArgumentException
*
- * @return int
+ * @return int|float
*/
public function __get($name)
{
+ if (substr($name, 0, 5) === 'total') {
+ return $this->total(substr($name, 5));
+ }
+
switch ($name) {
case 'years':
return $this->y;
@@ -336,11 +641,11 @@ public function __get($name)
return $this->s;
case 'weeks':
- return (int)floor($this->d / Carbon::DAYS_PER_WEEK);
+ return (int) floor($this->d / static::getDaysPerWeek());
case 'daysExcludeWeeks':
case 'dayzExcludeWeeks':
- return $this->d % Carbon::DAYS_PER_WEEK;
+ return $this->d % static::getDaysPerWeek();
default:
throw new InvalidArgumentException(sprintf("Unknown getter '%s'", $name));
@@ -348,12 +653,12 @@ public function __get($name)
}
/**
- * Set a part of the CarbonInterval object
+ * Set a part of the CarbonInterval object.
*
* @param string $name
* @param int $val
*
- * @throws InvalidArgumentException
+ * @throws \InvalidArgumentException
*/
public function __set($name, $val)
{
@@ -367,7 +672,7 @@ public function __set($name, $val)
break;
case 'weeks':
- $this->d = $val * Carbon::DAYS_PER_WEEK;
+ $this->d = $val * static::getDaysPerWeek();
break;
case 'dayz':
@@ -398,11 +703,102 @@ public function __set($name, $val)
*/
public function weeksAndDays($weeks, $days)
{
- $this->dayz = ($weeks * Carbon::DAYS_PER_WEEK) + $days;
+ $this->dayz = ($weeks * static::getDaysPerWeek()) + $days;
return $this;
}
+ /**
+ * Register a custom macro.
+ *
+ * @param string $name
+ * @param object|callable $macro
+ *
+ * @return void
+ */
+ public static function macro($name, $macro)
+ {
+ static::$macros[$name] = $macro;
+ }
+
+ /**
+ * Remove all macros.
+ */
+ public static function resetMacros()
+ {
+ static::$macros = array();
+ }
+
+ /**
+ * Register macros from a mixin object.
+ *
+ * @param object $mixin
+ *
+ * @throws \ReflectionException
+ *
+ * @return void
+ */
+ public static function mixin($mixin)
+ {
+ $reflection = new ReflectionClass($mixin);
+
+ $methods = $reflection->getMethods(
+ ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
+ );
+
+ foreach ($methods as $method) {
+ $method->setAccessible(true);
+
+ static::macro($method->name, $method->invoke($mixin));
+ }
+ }
+
+ /**
+ * Check if macro is registered.
+ *
+ * @param string $name
+ *
+ * @return bool
+ */
+ public static function hasMacro($name)
+ {
+ return isset(static::$macros[$name]);
+ }
+
+ /**
+ * Call given macro.
+ *
+ * @param string $name
+ * @param array $parameters
+ *
+ * @return mixed
+ */
+ protected function callMacro($name, $parameters)
+ {
+ $macro = static::$macros[$name];
+
+ $reflection = new ReflectionFunction($macro);
+
+ $reflectionParameters = $reflection->getParameters();
+
+ $expectedCount = count($reflectionParameters);
+ $actualCount = count($parameters);
+
+ if ($expectedCount > $actualCount && $reflectionParameters[$expectedCount - 1]->name === 'self') {
+ for ($i = $actualCount; $i < $expectedCount - 1; $i++) {
+ $parameters[] = $reflectionParameters[$i]->getDefaultValue();
+ }
+
+ $parameters[] = $this;
+ }
+
+ if ($macro instanceof Closure && method_exists($macro, 'bindTo')) {
+ $macro = $macro->bindTo($this, get_class($this));
+ }
+
+ return call_user_func_array($macro, $parameters);
+ }
+
/**
* Allow fluent calls on the setters... CarbonInterval::years(3)->months(5)->day().
*
@@ -416,6 +812,10 @@ public function weeksAndDays($weeks, $days)
*/
public function __call($name, $args)
{
+ if (static::hasMacro($name)) {
+ return $this->callMacro($name, $args);
+ }
+
$arg = count($args) === 0 ? 1 : $args[0];
switch ($name) {
@@ -431,7 +831,7 @@ public function __call($name, $args)
case 'weeks':
case 'week':
- $this->dayz = $arg * Carbon::DAYS_PER_WEEK;
+ $this->dayz = $arg * static::getDaysPerWeek();
break;
case 'days':
@@ -462,24 +862,27 @@ public function __call($name, $args)
/**
* Get the current interval in a human readable format in the current locale.
*
+ * @param bool $short (false by default), returns short units if true
+ *
* @return string
*/
- public function forHumans()
+ public function forHumans($short = false)
{
$periods = array(
- 'year' => $this->years,
- 'month' => $this->months,
- 'week' => $this->weeks,
- 'day' => $this->daysExcludeWeeks,
- 'hour' => $this->hours,
- 'minute' => $this->minutes,
- 'second' => $this->seconds,
+ 'year' => array('y', $this->years),
+ 'month' => array('m', $this->months),
+ 'week' => array('w', $this->weeks),
+ 'day' => array('d', $this->daysExcludeWeeks),
+ 'hour' => array('h', $this->hours),
+ 'minute' => array('min', $this->minutes),
+ 'second' => array('s', $this->seconds),
);
$parts = array();
- foreach ($periods as $unit => $count) {
+ foreach ($periods as $unit => $options) {
+ list($shortUnit, $count) = $options;
if ($count > 0) {
- array_push($parts, static::translator()->transChoice($unit, $count, array(':count' => $count)));
+ $parts[] = static::translator()->transChoice($short ? $shortUnit : $unit, $count, array(':count' => $count));
}
}
@@ -497,7 +900,31 @@ public function __toString()
}
/**
- * Add the passed interval to the current instance
+ * Convert the interval to a CarbonPeriod.
+ *
+ * @return CarbonPeriod
+ */
+ public function toPeriod()
+ {
+ return CarbonPeriod::createFromArray(
+ array_merge(array($this), func_get_args())
+ );
+ }
+
+ /**
+ * Invert the interval.
+ *
+ * @return $this
+ */
+ public function invert()
+ {
+ $this->invert = $this->invert ? 0 : 1;
+
+ return $this;
+ }
+
+ /**
+ * Add the passed interval to the current instance.
*
* @param DateInterval $interval
*
@@ -505,19 +932,232 @@ public function __toString()
*/
public function add(DateInterval $interval)
{
- $sign = $interval->invert === 1 ? -1 : 1;
+ $sign = ($this->invert === 1) !== ($interval->invert === 1) ? -1 : 1;
if (static::wasCreatedFromDiff($interval)) {
- $this->dayz = $this->dayz + $interval->days * $sign;
+ $this->dayz += $interval->days * $sign;
} else {
- $this->years = $this->years + $interval->y * $sign;
- $this->months = $this->months + $interval->m * $sign;
- $this->dayz = $this->dayz + $interval->d * $sign;
- $this->hours = $this->hours + $interval->h * $sign;
- $this->minutes = $this->minutes + $interval->i * $sign;
- $this->seconds = $this->seconds + $interval->s * $sign;
+ $this->years += $interval->y * $sign;
+ $this->months += $interval->m * $sign;
+ $this->dayz += $interval->d * $sign;
+ $this->hours += $interval->h * $sign;
+ $this->minutes += $interval->i * $sign;
+ $this->seconds += $interval->s * $sign;
+ }
+
+ if (($this->years || $this->months || $this->dayz || $this->hours || $this->minutes || $this->seconds) &&
+ $this->years <= 0 && $this->months <= 0 && $this->dayz <= 0 && $this->hours <= 0 && $this->minutes <= 0 && $this->seconds <= 0
+ ) {
+ $this->years *= -1;
+ $this->months *= -1;
+ $this->dayz *= -1;
+ $this->hours *= -1;
+ $this->minutes *= -1;
+ $this->seconds *= -1;
+ $this->invert();
}
return $this;
}
+
+ /**
+ * Multiply current instance given number of times
+ *
+ * @param float $factor
+ *
+ * @return $this
+ */
+ public function times($factor)
+ {
+ if ($factor < 0) {
+ $this->invert = $this->invert ? 0 : 1;
+ $factor = -$factor;
+ }
+
+ $this->years = (int) round($this->years * $factor);
+ $this->months = (int) round($this->months * $factor);
+ $this->dayz = (int) round($this->dayz * $factor);
+ $this->hours = (int) round($this->hours * $factor);
+ $this->minutes = (int) round($this->minutes * $factor);
+ $this->seconds = (int) round($this->seconds * $factor);
+
+ return $this;
+ }
+
+ /**
+ * Get the interval_spec string of a date interval.
+ *
+ * @param DateInterval $interval
+ *
+ * @return string
+ */
+ public static function getDateIntervalSpec(DateInterval $interval)
+ {
+ $date = array_filter(array(
+ static::PERIOD_YEARS => abs($interval->y),
+ static::PERIOD_MONTHS => abs($interval->m),
+ static::PERIOD_DAYS => abs($interval->d),
+ ));
+
+ $time = array_filter(array(
+ static::PERIOD_HOURS => abs($interval->h),
+ static::PERIOD_MINUTES => abs($interval->i),
+ static::PERIOD_SECONDS => abs($interval->s),
+ ));
+
+ $specString = static::PERIOD_PREFIX;
+
+ foreach ($date as $key => $value) {
+ $specString .= $value.$key;
+ }
+
+ if (count($time) > 0) {
+ $specString .= static::PERIOD_TIME_PREFIX;
+ foreach ($time as $key => $value) {
+ $specString .= $value.$key;
+ }
+ }
+
+ return $specString === static::PERIOD_PREFIX ? 'PT0S' : $specString;
+ }
+
+ /**
+ * Get the interval_spec string.
+ *
+ * @return string
+ */
+ public function spec()
+ {
+ return static::getDateIntervalSpec($this);
+ }
+
+ /**
+ * Comparing 2 date intervals.
+ *
+ * @param DateInterval $a
+ * @param DateInterval $b
+ *
+ * @return int
+ */
+ public static function compareDateIntervals(DateInterval $a, DateInterval $b)
+ {
+ $current = Carbon::now();
+ $passed = $current->copy()->add($b);
+ $current->add($a);
+
+ if ($current < $passed) {
+ return -1;
+ }
+ if ($current > $passed) {
+ return 1;
+ }
+
+ return 0;
+ }
+
+ /**
+ * Comparing with passed interval.
+ *
+ * @param DateInterval $interval
+ *
+ * @return int
+ */
+ public function compare(DateInterval $interval)
+ {
+ return static::compareDateIntervals($this, $interval);
+ }
+
+ /**
+ * Convert overflowed values into bigger units.
+ *
+ * @return $this
+ */
+ public function cascade()
+ {
+ foreach (static::getFlipCascadeFactors() as $source => $cascade) {
+ list($target, $factor) = $cascade;
+
+ if ($source === 'dayz' && $target === 'weeks') {
+ continue;
+ }
+
+ $value = $this->$source;
+ $this->$source = $modulo = $value % $factor;
+ $this->$target += ($value - $modulo) / $factor;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Get amount of given unit equivalent to the interval.
+ *
+ * @param string $unit
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return float
+ */
+ public function total($unit)
+ {
+ $realUnit = $unit = strtolower($unit);
+
+ if (in_array($unit, array('days', 'weeks'))) {
+ $realUnit = 'dayz';
+ } elseif (!in_array($unit, array('seconds', 'minutes', 'hours', 'dayz', 'months', 'years'))) {
+ throw new InvalidArgumentException("Unknown unit '$unit'.");
+ }
+
+ $result = 0;
+ $cumulativeFactor = 0;
+ $unitFound = false;
+
+ foreach (static::getFlipCascadeFactors() as $source => $cascade) {
+ list($target, $factor) = $cascade;
+
+ if ($source === $realUnit) {
+ $unitFound = true;
+ $result += $this->$source;
+ $cumulativeFactor = 1;
+ }
+
+ if ($factor === false) {
+ if ($unitFound) {
+ break;
+ }
+
+ $result = 0;
+ $cumulativeFactor = 0;
+
+ continue;
+ }
+
+ if ($target === $realUnit) {
+ $unitFound = true;
+ }
+
+ if ($cumulativeFactor) {
+ $cumulativeFactor *= $factor;
+ $result += $this->$target * $cumulativeFactor;
+
+ continue;
+ }
+
+ $result = ($result + $this->$source) / $factor;
+ }
+
+ if (isset($target) && !$cumulativeFactor) {
+ $result += $this->$target;
+ }
+
+ if (!$unitFound) {
+ throw new \InvalidArgumentException("Unit $unit have no configuration to get total from other units.");
+ }
+
+ if ($unit === 'weeks') {
+ return $result / static::getDaysPerWeek();
+ }
+
+ return $result;
+ }
}
diff --git a/application/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php b/application/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php
new file mode 100644
index 0000000..808e9d6
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php
@@ -0,0 +1,1453 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Carbon;
+
+use BadMethodCallException;
+use Closure;
+use Countable;
+use DateInterval;
+use DateTime;
+use DateTimeInterface;
+use InvalidArgumentException;
+use Iterator;
+use ReflectionClass;
+use ReflectionFunction;
+use ReflectionMethod;
+use RuntimeException;
+
+/**
+ * Substitution of DatePeriod with some modifications and many more features.
+ * Fully compatible with PHP 5.3+!
+ *
+ * @method static CarbonPeriod start($date, $inclusive = null) Create instance specifying start date.
+ * @method static CarbonPeriod since($date, $inclusive = null) Alias for start().
+ * @method static CarbonPeriod sinceNow($inclusive = null) Create instance with start date set to now.
+ * @method static CarbonPeriod end($date = null, $inclusive = null) Create instance specifying end date.
+ * @method static CarbonPeriod until($date = null, $inclusive = null) Alias for end().
+ * @method static CarbonPeriod untilNow($inclusive = null) Create instance with end date set to now.
+ * @method static CarbonPeriod dates($start, $end = null) Create instance with start and end date.
+ * @method static CarbonPeriod between($start, $end = null) Create instance with start and end date.
+ * @method static CarbonPeriod recurrences($recurrences = null) Create instance with maximum number of recurrences.
+ * @method static CarbonPeriod times($recurrences = null) Alias for recurrences().
+ * @method static CarbonPeriod options($options = null) Create instance with options.
+ * @method static CarbonPeriod toggle($options, $state = null) Create instance with options toggled on or off.
+ * @method static CarbonPeriod filter($callback, $name = null) Create instance with filter added to the stack.
+ * @method static CarbonPeriod push($callback, $name = null) Alias for filter().
+ * @method static CarbonPeriod prepend($callback, $name = null) Create instance with filter prepened to the stack.
+ * @method static CarbonPeriod filters(array $filters) Create instance with filters stack.
+ * @method static CarbonPeriod interval($interval) Create instance with given date interval.
+ * @method static CarbonPeriod each($interval) Create instance with given date interval.
+ * @method static CarbonPeriod every($interval) Create instance with given date interval.
+ * @method static CarbonPeriod step($interval) Create instance with given date interval.
+ * @method static CarbonPeriod stepBy($interval) Create instance with given date interval.
+ * @method static CarbonPeriod invert() Create instance with inverted date interval.
+ * @method static CarbonPeriod years($years = 1) Create instance specifying a number of years for date interval.
+ * @method static CarbonPeriod year($years = 1) Alias for years().
+ * @method static CarbonPeriod months($months = 1) Create instance specifying a number of months for date interval.
+ * @method static CarbonPeriod month($months = 1) Alias for months().
+ * @method static CarbonPeriod weeks($weeks = 1) Create instance specifying a number of weeks for date interval.
+ * @method static CarbonPeriod week($weeks = 1) Alias for weeks().
+ * @method static CarbonPeriod days($days = 1) Create instance specifying a number of days for date interval.
+ * @method static CarbonPeriod dayz($days = 1) Alias for days().
+ * @method static CarbonPeriod day($days = 1) Alias for days().
+ * @method static CarbonPeriod hours($hours = 1) Create instance specifying a number of hours for date interval.
+ * @method static CarbonPeriod hour($hours = 1) Alias for hours().
+ * @method static CarbonPeriod minutes($minutes = 1) Create instance specifying a number of minutes for date interval.
+ * @method static CarbonPeriod minute($minutes = 1) Alias for minutes().
+ * @method static CarbonPeriod seconds($seconds = 1) Create instance specifying a number of seconds for date interval.
+ * @method static CarbonPeriod second($seconds = 1) Alias for seconds().
+ * @method CarbonPeriod start($date, $inclusive = null) Change the period start date.
+ * @method CarbonPeriod since($date, $inclusive = null) Alias for start().
+ * @method CarbonPeriod sinceNow($inclusive = null) Change the period start date to now.
+ * @method CarbonPeriod end($date = null, $inclusive = null) Change the period end date.
+ * @method CarbonPeriod until($date = null, $inclusive = null) Alias for end().
+ * @method CarbonPeriod untilNow($inclusive = null) Change the period end date to now.
+ * @method CarbonPeriod dates($start, $end = null) Change the period start and end date.
+ * @method CarbonPeriod recurrences($recurrences = null) Change the maximum number of recurrences.
+ * @method CarbonPeriod times($recurrences = null) Alias for recurrences().
+ * @method CarbonPeriod options($options = null) Change the period options.
+ * @method CarbonPeriod toggle($options, $state = null) Toggle given options on or off.
+ * @method CarbonPeriod filter($callback, $name = null) Add a filter to the stack.
+ * @method CarbonPeriod push($callback, $name = null) Alias for filter().
+ * @method CarbonPeriod prepend($callback, $name = null) Prepend a filter to the stack.
+ * @method CarbonPeriod filters(array $filters = array()) Set filters stack.
+ * @method CarbonPeriod interval($interval) Change the period date interval.
+ * @method CarbonPeriod invert() Invert the period date interval.
+ * @method CarbonPeriod years($years = 1) Set the years portion of the date interval.
+ * @method CarbonPeriod year($years = 1) Alias for years().
+ * @method CarbonPeriod months($months = 1) Set the months portion of the date interval.
+ * @method CarbonPeriod month($months = 1) Alias for months().
+ * @method CarbonPeriod weeks($weeks = 1) Set the weeks portion of the date interval.
+ * @method CarbonPeriod week($weeks = 1) Alias for weeks().
+ * @method CarbonPeriod days($days = 1) Set the days portion of the date interval.
+ * @method CarbonPeriod dayz($days = 1) Alias for days().
+ * @method CarbonPeriod day($days = 1) Alias for days().
+ * @method CarbonPeriod hours($hours = 1) Set the hours portion of the date interval.
+ * @method CarbonPeriod hour($hours = 1) Alias for hours().
+ * @method CarbonPeriod minutes($minutes = 1) Set the minutes portion of the date interval.
+ * @method CarbonPeriod minute($minutes = 1) Alias for minutes().
+ * @method CarbonPeriod seconds($seconds = 1) Set the seconds portion of the date interval.
+ * @method CarbonPeriod second($seconds = 1) Alias for seconds().
+ */
+class CarbonPeriod implements Iterator, Countable
+{
+ /**
+ * Built-in filters.
+ *
+ * @var string
+ */
+ const RECURRENCES_FILTER = 'Carbon\CarbonPeriod::filterRecurrences';
+ const END_DATE_FILTER = 'Carbon\CarbonPeriod::filterEndDate';
+
+ /**
+ * Special value which can be returned by filters to end iteration. Also a filter.
+ *
+ * @var string
+ */
+ const END_ITERATION = 'Carbon\CarbonPeriod::endIteration';
+
+ /**
+ * Available options.
+ *
+ * @var int
+ */
+ const EXCLUDE_START_DATE = 1;
+ const EXCLUDE_END_DATE = 2;
+
+ /**
+ * Number of maximum attempts before giving up on finding next valid date.
+ *
+ * @var int
+ */
+ const NEXT_MAX_ATTEMPTS = 1000;
+
+ /**
+ * The registered macros.
+ *
+ * @var array
+ */
+ protected static $macros = array();
+
+ /**
+ * Underlying date interval instance. Always present, one day by default.
+ *
+ * @var CarbonInterval
+ */
+ protected $dateInterval;
+
+ /**
+ * Whether current date interval was set by default.
+ *
+ * @var bool
+ */
+ protected $isDefaultInterval;
+
+ /**
+ * The filters stack.
+ *
+ * @var array
+ */
+ protected $filters = array();
+
+ /**
+ * Period start date. Applied on rewind. Always present, now by default.
+ *
+ * @var Carbon
+ */
+ protected $startDate;
+
+ /**
+ * Period end date. For inverted interval should be before the start date. Applied via a filter.
+ *
+ * @var Carbon|null
+ */
+ protected $endDate;
+
+ /**
+ * Limit for number of recurrences. Applied via a filter.
+ *
+ * @var int|null
+ */
+ protected $recurrences;
+
+ /**
+ * Iteration options.
+ *
+ * @var int
+ */
+ protected $options;
+
+ /**
+ * Index of current date. Always sequential, even if some dates are skipped by filters.
+ * Equal to null only before the first iteration.
+ *
+ * @var int
+ */
+ protected $key;
+
+ /**
+ * Current date. May temporarily hold unaccepted value when looking for a next valid date.
+ * Equal to null only before the first iteration.
+ *
+ * @var Carbon
+ */
+ protected $current;
+
+ /**
+ * Timezone of current date. Taken from the start date.
+ *
+ * @var \DateTimeZone|null
+ */
+ protected $timezone;
+
+ /**
+ * The cached validation result for current date.
+ *
+ * @var bool|string|null
+ */
+ protected $validationResult;
+
+ /**
+ * Create a new instance.
+ *
+ * @return static
+ */
+ public static function create()
+ {
+ return static::createFromArray(func_get_args());
+ }
+
+ /**
+ * Create a new instance from an array of parameters.
+ *
+ * @param array $params
+ *
+ * @return static
+ */
+ public static function createFromArray(array $params)
+ {
+ // PHP 5.3 equivalent of new static(...$params).
+ $reflection = new ReflectionClass(get_class());
+ /** @var static $instance */
+ $instance = $reflection->newInstanceArgs($params);
+
+ return $instance;
+ }
+
+ /**
+ * Create CarbonPeriod from ISO 8601 string.
+ *
+ * @param string $iso
+ * @param int|null $options
+ *
+ * @return static
+ */
+ public static function createFromIso($iso, $options = null)
+ {
+ $params = static::parseIso8601($iso);
+
+ $instance = static::createFromArray($params);
+
+ if ($options !== null) {
+ $instance->setOptions($options);
+ }
+
+ return $instance;
+ }
+
+ /**
+ * Return whether given interval contains non zero value of any time unit.
+ *
+ * @param \DateInterval $interval
+ *
+ * @return bool
+ */
+ protected static function intervalHasTime(DateInterval $interval)
+ {
+ // The array_key_exists and get_object_vars are used as a workaround to check microsecond support.
+ // Both isset and property_exists will fail on PHP 7.0.14 - 7.0.21 due to the following bug:
+ // https://bugs.php.net/bug.php?id=74852
+ return $interval->h || $interval->i || $interval->s || array_key_exists('f', get_object_vars($interval)) && $interval->f;
+ }
+
+ /**
+ * Return whether given callable is a string pointing to one of Carbon's is* methods
+ * and should be automatically converted to a filter callback.
+ *
+ * @param callable $callable
+ *
+ * @return bool
+ */
+ protected static function isCarbonPredicateMethod($callable)
+ {
+ return is_string($callable) && substr($callable, 0, 2) === 'is' && (method_exists('Carbon\Carbon', $callable) || Carbon::hasMacro($callable));
+ }
+
+ /**
+ * Return whether given variable is an ISO 8601 specification.
+ *
+ * Note: Check is very basic, as actual validation will be done later when parsing.
+ * We just want to ensure that variable is not any other type of a valid parameter.
+ *
+ * @param mixed $var
+ *
+ * @return bool
+ */
+ protected static function isIso8601($var)
+ {
+ if (!is_string($var)) {
+ return false;
+ }
+
+ // Match slash but not within a timezone name.
+ $part = '[a-z]+(?:[_-][a-z]+)*';
+
+ preg_match("#\b$part/$part\b|(/)#i", $var, $match);
+
+ return isset($match[1]);
+ }
+
+ /**
+ * Parse given ISO 8601 string into an array of arguments.
+ *
+ * @param string $iso
+ *
+ * @return array
+ */
+ protected static function parseIso8601($iso)
+ {
+ $result = array();
+
+ $interval = null;
+ $start = null;
+ $end = null;
+
+ foreach (explode('/', $iso) as $key => $part) {
+ if ($key === 0 && preg_match('/^R([0-9]*)$/', $part, $match)) {
+ $parsed = strlen($match[1]) ? (int) $match[1] : null;
+ } elseif ($interval === null && $parsed = CarbonInterval::make($part)) {
+ $interval = $part;
+ } elseif ($start === null && $parsed = Carbon::make($part)) {
+ $start = $part;
+ } elseif ($end === null && $parsed = Carbon::make(static::addMissingParts($start, $part))) {
+ $end = $part;
+ } else {
+ throw new InvalidArgumentException("Invalid ISO 8601 specification: $iso.");
+ }
+
+ $result[] = $parsed;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Add missing parts of the target date from the soure date.
+ *
+ * @param string $source
+ * @param string $target
+ *
+ * @return string
+ */
+ protected static function addMissingParts($source, $target)
+ {
+ $pattern = '/'.preg_replace('/[0-9]+/', '[0-9]+', preg_quote($target, '/')).'$/';
+
+ $result = preg_replace($pattern, $target, $source, 1, $count);
+
+ return $count ? $result : $target;
+ }
+
+ /**
+ * Register a custom macro.
+ *
+ * @param string $name
+ * @param object|callable $macro
+ *
+ * @return void
+ */
+ public static function macro($name, $macro)
+ {
+ static::$macros[$name] = $macro;
+ }
+
+ /**
+ * Remove all macros.
+ */
+ public static function resetMacros()
+ {
+ static::$macros = array();
+ }
+
+ /**
+ * Register macros from a mixin object.
+ *
+ * @param object $mixin
+ *
+ * @throws \ReflectionException
+ *
+ * @return void
+ */
+ public static function mixin($mixin)
+ {
+ $reflection = new ReflectionClass($mixin);
+
+ $methods = $reflection->getMethods(
+ ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
+ );
+
+ foreach ($methods as $method) {
+ $method->setAccessible(true);
+
+ static::macro($method->name, $method->invoke($mixin));
+ }
+ }
+
+ /**
+ * Check if macro is registered.
+ *
+ * @param string $name
+ *
+ * @return bool
+ */
+ public static function hasMacro($name)
+ {
+ return isset(static::$macros[$name]);
+ }
+
+ /**
+ * Provide static proxy for instance aliases.
+ *
+ * @param string $method
+ * @param array $parameters
+ *
+ * @return mixed
+ */
+ public static function __callStatic($method, $parameters)
+ {
+ return call_user_func_array(
+ array(new static, $method), $parameters
+ );
+ }
+
+ /**
+ * CarbonPeriod constructor.
+ *
+ * @throws InvalidArgumentException
+ */
+ public function __construct()
+ {
+ // Parse and assign arguments one by one. First argument may be an ISO 8601 spec,
+ // which will be first parsed into parts and then processed the same way.
+ $arguments = func_get_args();
+
+ if (count($arguments) && static::isIso8601($iso = $arguments[0])) {
+ array_splice($arguments, 0, 1, static::parseIso8601($iso));
+ }
+
+ foreach ($arguments as $argument) {
+ if ($this->dateInterval === null && $parsed = CarbonInterval::make($argument)) {
+ $this->setDateInterval($parsed);
+ } elseif ($this->startDate === null && $parsed = Carbon::make($argument)) {
+ $this->setStartDate($parsed);
+ } elseif ($this->endDate === null && $parsed = Carbon::make($argument)) {
+ $this->setEndDate($parsed);
+ } elseif ($this->recurrences === null && $this->endDate === null && is_numeric($argument)) {
+ $this->setRecurrences($argument);
+ } elseif ($this->options === null && (is_int($argument) || $argument === null)) {
+ $this->setOptions($argument);
+ } else {
+ throw new InvalidArgumentException('Invalid constructor parameters.');
+ }
+ }
+
+ if ($this->startDate === null) {
+ $this->setStartDate(Carbon::now());
+ }
+
+ if ($this->dateInterval === null) {
+ $this->setDateInterval(CarbonInterval::day());
+
+ $this->isDefaultInterval = true;
+ }
+
+ if ($this->options === null) {
+ $this->setOptions(0);
+ }
+ }
+
+ /**
+ * Change the period date interval.
+ *
+ * @param DateInterval|string $interval
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return $this
+ */
+ public function setDateInterval($interval)
+ {
+ if (!$interval = CarbonInterval::make($interval)) {
+ throw new InvalidArgumentException('Invalid interval.');
+ }
+
+ if ($interval->spec() === 'PT0S') {
+ throw new InvalidArgumentException('Empty interval is not accepted.');
+ }
+
+ $this->dateInterval = $interval;
+
+ $this->isDefaultInterval = false;
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Invert the period date interval.
+ *
+ * @return $this
+ */
+ public function invertDateInterval()
+ {
+ $interval = $this->dateInterval->invert();
+
+ return $this->setDateInterval($interval);
+ }
+
+ /**
+ * Set start and end date.
+ *
+ * @param DateTime|DateTimeInterface|string $start
+ * @param DateTime|DateTimeInterface|string|null $end
+ *
+ * @return $this
+ */
+ public function setDates($start, $end)
+ {
+ $this->setStartDate($start);
+ $this->setEndDate($end);
+
+ return $this;
+ }
+
+ /**
+ * Change the period options.
+ *
+ * @param int|null $options
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return $this
+ */
+ public function setOptions($options)
+ {
+ if (!is_int($options) && !is_null($options)) {
+ throw new InvalidArgumentException('Invalid options.');
+ }
+
+ $this->options = $options ?: 0;
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Get the period options.
+ *
+ * @return int
+ */
+ public function getOptions()
+ {
+ return $this->options;
+ }
+
+ /**
+ * Toggle given options on or off.
+ *
+ * @param int $options
+ * @param bool|null $state
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return $this
+ */
+ public function toggleOptions($options, $state = null)
+ {
+ if ($state === null) {
+ $state = ($this->options & $options) !== $options;
+ }
+
+ return $this->setOptions($state ?
+ $this->options | $options :
+ $this->options & ~$options
+ );
+ }
+
+ /**
+ * Toggle EXCLUDE_START_DATE option.
+ *
+ * @param bool $state
+ *
+ * @return $this
+ */
+ public function excludeStartDate($state = true)
+ {
+ return $this->toggleOptions(static::EXCLUDE_START_DATE, $state);
+ }
+
+ /**
+ * Toggle EXCLUDE_END_DATE option.
+ *
+ * @param bool $state
+ *
+ * @return $this
+ */
+ public function excludeEndDate($state = true)
+ {
+ return $this->toggleOptions(static::EXCLUDE_END_DATE, $state);
+ }
+
+ /**
+ * Get the underlying date interval.
+ *
+ * @return CarbonInterval
+ */
+ public function getDateInterval()
+ {
+ return $this->dateInterval->copy();
+ }
+
+ /**
+ * Get start date of the period.
+ *
+ * @return Carbon
+ */
+ public function getStartDate()
+ {
+ return $this->startDate->copy();
+ }
+
+ /**
+ * Get end date of the period.
+ *
+ * @return Carbon|null
+ */
+ public function getEndDate()
+ {
+ if ($this->endDate) {
+ return $this->endDate->copy();
+ }
+ }
+
+ /**
+ * Get number of recurrences.
+ *
+ * @return int|null
+ */
+ public function getRecurrences()
+ {
+ return $this->recurrences;
+ }
+
+ /**
+ * Returns true if the start date should be excluded.
+ *
+ * @return bool
+ */
+ public function isStartExcluded()
+ {
+ return ($this->options & static::EXCLUDE_START_DATE) !== 0;
+ }
+
+ /**
+ * Returns true if the end date should be excluded.
+ *
+ * @return bool
+ */
+ public function isEndExcluded()
+ {
+ return ($this->options & static::EXCLUDE_END_DATE) !== 0;
+ }
+
+ /**
+ * Add a filter to the stack.
+ *
+ * @param callable $callback
+ * @param string $name
+ *
+ * @return $this
+ */
+ public function addFilter($callback, $name = null)
+ {
+ $tuple = $this->createFilterTuple(func_get_args());
+
+ $this->filters[] = $tuple;
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Prepend a filter to the stack.
+ *
+ * @param callable $callback
+ * @param string $name
+ *
+ * @return $this
+ */
+ public function prependFilter($callback, $name = null)
+ {
+ $tuple = $this->createFilterTuple(func_get_args());
+
+ array_unshift($this->filters, $tuple);
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Create a filter tuple from raw parameters.
+ *
+ * Will create an automatic filter callback for one of Carbon's is* methods.
+ *
+ * @param array $parameters
+ *
+ * @return array
+ */
+ protected function createFilterTuple(array $parameters)
+ {
+ $method = array_shift($parameters);
+
+ if (!$this->isCarbonPredicateMethod($method)) {
+ return array($method, array_shift($parameters));
+ }
+
+ return array(function ($date) use ($method, $parameters) {
+ return call_user_func_array(array($date, $method), $parameters);
+ }, $method);
+ }
+
+ /**
+ * Remove a filter by instance or name.
+ *
+ * @param callable|string $filter
+ *
+ * @return $this
+ */
+ public function removeFilter($filter)
+ {
+ $key = is_callable($filter) ? 0 : 1;
+
+ $this->filters = array_values(array_filter(
+ $this->filters,
+ function ($tuple) use ($key, $filter) {
+ return $tuple[$key] !== $filter;
+ }
+ ));
+
+ $this->updateInternalState();
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Return whether given instance or name is in the filter stack.
+ *
+ * @param callable|string $filter
+ *
+ * @return bool
+ */
+ public function hasFilter($filter)
+ {
+ $key = is_callable($filter) ? 0 : 1;
+
+ foreach ($this->filters as $tuple) {
+ if ($tuple[$key] === $filter) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Get filters stack.
+ *
+ * @return array
+ */
+ public function getFilters()
+ {
+ return $this->filters;
+ }
+
+ /**
+ * Set filters stack.
+ *
+ * @param array $filters
+ *
+ * @return $this
+ */
+ public function setFilters(array $filters)
+ {
+ $this->filters = $filters;
+
+ $this->updateInternalState();
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Reset filters stack.
+ *
+ * @return $this
+ */
+ public function resetFilters()
+ {
+ $this->filters = array();
+
+ if ($this->endDate !== null) {
+ $this->filters[] = array(static::END_DATE_FILTER, null);
+ }
+
+ if ($this->recurrences !== null) {
+ $this->filters[] = array(static::RECURRENCES_FILTER, null);
+ }
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Update properties after removing built-in filters.
+ *
+ * @return void
+ */
+ protected function updateInternalState()
+ {
+ if (!$this->hasFilter(static::END_DATE_FILTER)) {
+ $this->endDate = null;
+ }
+
+ if (!$this->hasFilter(static::RECURRENCES_FILTER)) {
+ $this->recurrences = null;
+ }
+ }
+
+ /**
+ * Add a recurrences filter (set maximum number of recurrences).
+ *
+ * @param int|null $recurrences
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return $this
+ */
+ public function setRecurrences($recurrences)
+ {
+ if (!is_numeric($recurrences) && !is_null($recurrences) || $recurrences < 0) {
+ throw new InvalidArgumentException('Invalid number of recurrences.');
+ }
+
+ if ($recurrences === null) {
+ return $this->removeFilter(static::RECURRENCES_FILTER);
+ }
+
+ $this->recurrences = (int) $recurrences;
+
+ if (!$this->hasFilter(static::RECURRENCES_FILTER)) {
+ return $this->addFilter(static::RECURRENCES_FILTER);
+ }
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * Recurrences filter callback (limits number of recurrences).
+ *
+ * @param \Carbon\Carbon $current
+ * @param int $key
+ *
+ * @return bool|string
+ */
+ protected function filterRecurrences($current, $key)
+ {
+ if ($key < $this->recurrences) {
+ return true;
+ }
+
+ return static::END_ITERATION;
+ }
+
+ /**
+ * Change the period start date.
+ *
+ * @param DateTime|DateTimeInterface|string $date
+ * @param bool|null $inclusive
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return $this
+ */
+ public function setStartDate($date, $inclusive = null)
+ {
+ if (!$date = Carbon::make($date)) {
+ throw new InvalidArgumentException('Invalid start date.');
+ }
+
+ $this->startDate = $date;
+
+ if ($inclusive !== null) {
+ $this->toggleOptions(static::EXCLUDE_START_DATE, !$inclusive);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Change the period end date.
+ *
+ * @param DateTime|DateTimeInterface|string|null $date
+ * @param bool|null $inclusive
+ *
+ * @throws \InvalidArgumentException
+ *
+ * @return $this
+ */
+ public function setEndDate($date, $inclusive = null)
+ {
+ if (!is_null($date) && !$date = Carbon::make($date)) {
+ throw new InvalidArgumentException('Invalid end date.');
+ }
+
+ if (!$date) {
+ return $this->removeFilter(static::END_DATE_FILTER);
+ }
+
+ $this->endDate = $date;
+
+ if ($inclusive !== null) {
+ $this->toggleOptions(static::EXCLUDE_END_DATE, !$inclusive);
+ }
+
+ if (!$this->hasFilter(static::END_DATE_FILTER)) {
+ return $this->addFilter(static::END_DATE_FILTER);
+ }
+
+ $this->handleChangedParameters();
+
+ return $this;
+ }
+
+ /**
+ * End date filter callback.
+ *
+ * @param \Carbon\Carbon $current
+ *
+ * @return bool|string
+ */
+ protected function filterEndDate($current)
+ {
+ if (!$this->isEndExcluded() && $current == $this->endDate) {
+ return true;
+ }
+
+ if ($this->dateInterval->invert ? $current > $this->endDate : $current < $this->endDate) {
+ return true;
+ }
+
+ return static::END_ITERATION;
+ }
+
+ /**
+ * End iteration filter callback.
+ *
+ * @return string
+ */
+ protected function endIteration()
+ {
+ return static::END_ITERATION;
+ }
+
+ /**
+ * Handle change of the parameters.
+ */
+ protected function handleChangedParameters()
+ {
+ $this->validationResult = null;
+ }
+
+ /**
+ * Validate current date and stop iteration when necessary.
+ *
+ * Returns true when current date is valid, false if it is not, or static::END_ITERATION
+ * when iteration should be stopped.
+ *
+ * @return bool|string
+ */
+ protected function validateCurrentDate()
+ {
+ if ($this->current === null) {
+ $this->rewind();
+ }
+
+ // Check after the first rewind to avoid repeating the initial validation.
+ if ($this->validationResult !== null) {
+ return $this->validationResult;
+ }
+
+ return $this->validationResult = $this->checkFilters();
+ }
+
+ /**
+ * Check whether current value and key pass all the filters.
+ *
+ * @return bool|string
+ */
+ protected function checkFilters()
+ {
+ $current = $this->prepareForReturn($this->current);
+
+ foreach ($this->filters as $tuple) {
+ $result = call_user_func(
+ $tuple[0], $current->copy(), $this->key, $this
+ );
+
+ if ($result === static::END_ITERATION) {
+ return static::END_ITERATION;
+ }
+
+ if (!$result) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Prepare given date to be returned to the external logic.
+ *
+ * @param Carbon $date
+ *
+ * @return Carbon
+ */
+ protected function prepareForReturn(Carbon $date)
+ {
+ $date = $date->copy();
+
+ if ($this->timezone) {
+ $date->setTimezone($this->timezone);
+ }
+
+ return $date;
+ }
+
+ /**
+ * Check if the current position is valid.
+ *
+ * @return bool
+ */
+ public function valid()
+ {
+ return $this->validateCurrentDate() === true;
+ }
+
+ /**
+ * Return the current key.
+ *
+ * @return int|null
+ */
+ public function key()
+ {
+ if ($this->valid()) {
+ return $this->key;
+ }
+ }
+
+ /**
+ * Return the current date.
+ *
+ * @return Carbon|null
+ */
+ public function current()
+ {
+ if ($this->valid()) {
+ return $this->prepareForReturn($this->current);
+ }
+ }
+
+ /**
+ * Move forward to the next date.
+ *
+ * @throws \RuntimeException
+ *
+ * @return void
+ */
+ public function next()
+ {
+ if ($this->current === null) {
+ $this->rewind();
+ }
+
+ if ($this->validationResult !== static::END_ITERATION) {
+ $this->key++;
+
+ $this->incrementCurrentDateUntilValid();
+ }
+ }
+
+ /**
+ * Rewind to the start date.
+ *
+ * Iterating over a date in the UTC timezone avoids bug during backward DST change.
+ *
+ * @see https://bugs.php.net/bug.php?id=72255
+ * @see https://bugs.php.net/bug.php?id=74274
+ * @see https://wiki.php.net/rfc/datetime_and_daylight_saving_time
+ *
+ * @throws \RuntimeException
+ *
+ * @return void
+ */
+ public function rewind()
+ {
+ $this->key = 0;
+ $this->current = $this->startDate->copy();
+ $this->timezone = static::intervalHasTime($this->dateInterval) ? $this->current->getTimezone() : null;
+
+ if ($this->timezone) {
+ $this->current->setTimezone('UTC');
+ }
+
+ $this->validationResult = null;
+
+ if ($this->isStartExcluded() || $this->validateCurrentDate() === false) {
+ $this->incrementCurrentDateUntilValid();
+ }
+ }
+
+ /**
+ * Skip iterations and returns iteration state (false if ended, true if still valid).
+ *
+ * @param int $count steps number to skip (1 by default)
+ *
+ * @return bool
+ */
+ public function skip($count = 1)
+ {
+ for ($i = $count; $this->valid() && $i > 0; $i--) {
+ $this->next();
+ }
+
+ return $this->valid();
+ }
+
+ /**
+ * Keep incrementing the current date until a valid date is found or the iteration is ended.
+ *
+ * @throws \RuntimeException
+ *
+ * @return void
+ */
+ protected function incrementCurrentDateUntilValid()
+ {
+ $attempts = 0;
+
+ do {
+ $this->current->add($this->dateInterval);
+
+ $this->validationResult = null;
+
+ if (++$attempts > static::NEXT_MAX_ATTEMPTS) {
+ throw new RuntimeException('Could not find next valid date.');
+ }
+ } while ($this->validateCurrentDate() === false);
+ }
+
+ /**
+ * Format the date period as ISO 8601.
+ *
+ * @return string
+ */
+ public function toIso8601String()
+ {
+ $parts = array();
+
+ if ($this->recurrences !== null) {
+ $parts[] = 'R'.$this->recurrences;
+ }
+
+ $parts[] = $this->startDate->toIso8601String();
+
+ $parts[] = $this->dateInterval->spec();
+
+ if ($this->endDate !== null) {
+ $parts[] = $this->endDate->toIso8601String();
+ }
+
+ return implode('/', $parts);
+ }
+
+ /**
+ * Convert the date period into a string.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ $translator = Carbon::getTranslator();
+
+ $parts = array();
+
+ $format = !$this->startDate->isStartOfDay() || $this->endDate && !$this->endDate->isStartOfDay()
+ ? 'Y-m-d H:i:s'
+ : 'Y-m-d';
+
+ if ($this->recurrences !== null) {
+ $parts[] = $translator->transChoice('period_recurrences', $this->recurrences, array(':count' => $this->recurrences));
+ }
+
+ $parts[] = $translator->trans('period_interval', array(':interval' => $this->dateInterval->forHumans()));
+
+ $parts[] = $translator->trans('period_start_date', array(':date' => $this->startDate->format($format)));
+
+ if ($this->endDate !== null) {
+ $parts[] = $translator->trans('period_end_date', array(':date' => $this->endDate->format($format)));
+ }
+
+ $result = implode(' ', $parts);
+
+ return mb_strtoupper(mb_substr($result, 0, 1)).mb_substr($result, 1);
+ }
+
+ /**
+ * Format the date period as ISO 8601.
+ *
+ * @return string
+ */
+ public function spec()
+ {
+ return $this->toIso8601String();
+ }
+
+ /**
+ * Convert the date period into an array without changing current iteration state.
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ $state = array(
+ $this->key,
+ $this->current ? $this->current->copy() : null,
+ $this->validationResult,
+ );
+
+ $result = iterator_to_array($this);
+
+ list(
+ $this->key,
+ $this->current,
+ $this->validationResult
+ ) = $state;
+
+ return $result;
+ }
+
+ /**
+ * Count dates in the date period.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return count($this->toArray());
+ }
+
+ /**
+ * Return the first date in the date period.
+ *
+ * @return Carbon|null
+ */
+ public function first()
+ {
+ if ($array = $this->toArray()) {
+ return $array[0];
+ }
+ }
+
+ /**
+ * Return the last date in the date period.
+ *
+ * @return Carbon|null
+ */
+ public function last()
+ {
+ if ($array = $this->toArray()) {
+ return $array[count($array) - 1];
+ }
+ }
+
+ /**
+ * Call given macro.
+ *
+ * @param string $name
+ * @param array $parameters
+ *
+ * @return mixed
+ */
+ protected function callMacro($name, $parameters)
+ {
+ $macro = static::$macros[$name];
+
+ $reflection = new ReflectionFunction($macro);
+
+ $reflectionParameters = $reflection->getParameters();
+
+ $expectedCount = count($reflectionParameters);
+ $actualCount = count($parameters);
+
+ if ($expectedCount > $actualCount && $reflectionParameters[$expectedCount - 1]->name === 'self') {
+ for ($i = $actualCount; $i < $expectedCount - 1; $i++) {
+ $parameters[] = $reflectionParameters[$i]->getDefaultValue();
+ }
+
+ $parameters[] = $this;
+ }
+
+ if ($macro instanceof Closure && method_exists($macro, 'bindTo')) {
+ $macro = $macro->bindTo($this, get_class($this));
+ }
+
+ return call_user_func_array($macro, $parameters);
+ }
+
+ /**
+ * Convert the date period into a string.
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return $this->toString();
+ }
+
+ /**
+ * Add aliases for setters.
+ *
+ * CarbonPeriod::days(3)->hours(5)->invert()
+ * ->sinceNow()->until('2010-01-10')
+ * ->filter(...)
+ * ->count()
+ *
+ * Note: We use magic method to let static and instance aliases with the same names.
+ *
+ * @param string $method
+ * @param array $parameters
+ *
+ * @return mixed
+ */
+ public function __call($method, $parameters)
+ {
+ if (static::hasMacro($method)) {
+ return $this->callMacro($method, $parameters);
+ }
+
+ $first = count($parameters) >= 1 ? $parameters[0] : null;
+ $second = count($parameters) >= 2 ? $parameters[1] : null;
+
+ switch ($method) {
+ case 'start':
+ case 'since':
+ return $this->setStartDate($first, $second);
+
+ case 'sinceNow':
+ return $this->setStartDate(new Carbon, $first);
+
+ case 'end':
+ case 'until':
+ return $this->setEndDate($first, $second);
+
+ case 'untilNow':
+ return $this->setEndDate(new Carbon, $first);
+
+ case 'dates':
+ case 'between':
+ return $this->setDates($first, $second);
+
+ case 'recurrences':
+ case 'times':
+ return $this->setRecurrences($first);
+
+ case 'options':
+ return $this->setOptions($first);
+
+ case 'toggle':
+ return $this->toggleOptions($first, $second);
+
+ case 'filter':
+ case 'push':
+ return $this->addFilter($first, $second);
+
+ case 'prepend':
+ return $this->prependFilter($first, $second);
+
+ case 'filters':
+ return $this->setFilters($first ?: array());
+
+ case 'interval':
+ case 'each':
+ case 'every':
+ case 'step':
+ case 'stepBy':
+ return $this->setDateInterval($first);
+
+ case 'invert':
+ return $this->invertDateInterval();
+
+ case 'years':
+ case 'year':
+ case 'months':
+ case 'month':
+ case 'weeks':
+ case 'week':
+ case 'days':
+ case 'dayz':
+ case 'day':
+ case 'hours':
+ case 'hour':
+ case 'minutes':
+ case 'minute':
+ case 'seconds':
+ case 'second':
+ return $this->setDateInterval(call_user_func(
+ // Override default P1D when instantiating via fluent setters.
+ array($this->isDefaultInterval ? new CarbonInterval('PT0S') : $this->dateInterval, $method),
+ count($parameters) === 0 ? 1 : $first
+ ));
+ }
+
+ throw new BadMethodCallException("Method $method does not exist.");
+ }
+}
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php b/application/vendor/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php
new file mode 100644
index 0000000..1b0d473
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php
@@ -0,0 +1,67 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Carbon\Exceptions;
+
+use Exception;
+use InvalidArgumentException;
+
+class InvalidDateException extends InvalidArgumentException
+{
+ /**
+ * The invalid field.
+ *
+ * @var string
+ */
+ private $field;
+
+ /**
+ * The invalid value.
+ *
+ * @var mixed
+ */
+ private $value;
+
+ /**
+ * Constructor.
+ *
+ * @param string $field
+ * @param mixed $value
+ * @param int $code
+ * @param \Exception|null $previous
+ */
+ public function __construct($field, $value, $code = 0, Exception $previous = null)
+ {
+ $this->field = $field;
+ $this->value = $value;
+ parent::__construct($field.' : '.$value.' is not a valid value.', $code, $previous);
+ }
+
+ /**
+ * Get the invalid field.
+ *
+ * @return string
+ */
+ public function getField()
+ {
+ return $this->field;
+ }
+
+ /**
+ * Get the invalid value.
+ *
+ * @return mixed
+ */
+ public function getValue()
+ {
+ return $this->value;
+ }
+}
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/af.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/af.php
index 86ab541..5cf6a8d 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/af.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/af.php
@@ -9,20 +9,23 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 jaar|:count jare',
- 'month' => '1 maand|:count maande',
- 'week' => '1 week|:count weke',
- 'day' => '1 dag|:count dae',
- 'hour' => '1 uur|:count ure',
- 'minute' => '1 minuut|:count minute',
- 'second' => '1 sekond|:count sekondes',
- 'ago' => ':time terug',
- 'from_now' => ':time van nou af',
- 'after' => ':time na',
- 'before' => ':time voor',
+ 'year' => ':count jaar|:count jare',
+ 'y' => ':count jaar|:count jare',
+ 'month' => ':count maand|:count maande',
+ 'm' => ':count maand|:count maande',
+ 'week' => ':count week|:count weke',
+ 'w' => ':count week|:count weke',
+ 'day' => ':count dag|:count dae',
+ 'd' => ':count dag|:count dae',
+ 'hour' => ':count uur|:count ure',
+ 'h' => ':count uur|:count ure',
+ 'minute' => ':count minuut|:count minute',
+ 'min' => ':count minuut|:count minute',
+ 'second' => ':count sekond|:count sekondes',
+ 's' => ':count sekond|:count sekondes',
+ 'ago' => ':time terug',
+ 'from_now' => ':time van nou af',
+ 'after' => ':time na',
+ 'before' => ':time voor',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ar.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ar.php
index 76b2772..de8f6b8 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/ar.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ar.php
@@ -8,24 +8,24 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
-/**
- * Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ar/date.php
- */
return array(
- 'year' => '{0}سنة|{1}سنة|{2}سنتين|[3,10]:count سنوات|[11,Inf]:count سنة',
- 'month' => '{0}شهر|{1} شهر|{2}شهرين|[3,10]:count أشهر|[11,Inf]:count شهر',
- 'week' => '{0}إسبوع|{1}إسبوع|{2}إسبوعين|[3,10]:count أسابيع|[11,Inf]:count إسبوع',
- 'day' => '{0}يوم|{1}يوم|{2}يومين|[3,10]:count أيام|[11,Inf] يوم',
- 'hour' => '{0}ساعة|{1}ساعة|{2}ساعتين|[3,10]:count ساعات|[11,Inf]:count ساعة',
- 'minute' => '{0}دقيقة|{1}دقيقة|{2}دقيقتين|[3,10]:count دقائق|[11,Inf]:count دقيقة',
- 'second' => '{0}ثانية|{1}ثانية|{2}ثانيتين|[3,10]:count ثوان|[11,Inf]:count ثانية',
- 'ago' => 'منذ :time',
- 'from_now' => 'من الآن :time',
- 'after' => 'بعد :time',
- 'before' => 'قبل :time',
+ 'year' => '{0}سنة|{1}سنة|{2}سنتين|[3,10]:count سنوات|[11,Inf]:count سنة',
+ 'y' => '{0}سنة|{1}سنة|{2}سنتين|[3,10]:count سنوات|[11,Inf]:count سنة',
+ 'month' => '{0}شهر|{1} شهر|{2}شهرين|[3,10]:count أشهر|[11,Inf]:count شهر',
+ 'm' => '{0}شهر|{1} شهر|{2}شهرين|[3,10]:count أشهر|[11,Inf]:count شهر',
+ 'week' => '{0}أسبوع|{1}أسبوع|{2}أسبوعين|[3,10]:count أسابيع|[11,Inf]:count أسبوع',
+ 'w' => '{0}أسبوع|{1}أسبوع|{2}أسبوعين|[3,10]:count أسابيع|[11,Inf]:count أسبوع',
+ 'day' => '{0}يوم|{1}يوم|{2}يومين|[3,10]:count أيام|[11,Inf] يوم',
+ 'd' => '{0}يوم|{1}يوم|{2}يومين|[3,10]:count أيام|[11,Inf] يوم',
+ 'hour' => '{0}ساعة|{1}ساعة|{2}ساعتين|[3,10]:count ساعات|[11,Inf]:count ساعة',
+ 'h' => '{0}ساعة|{1}ساعة|{2}ساعتين|[3,10]:count ساعات|[11,Inf]:count ساعة',
+ 'minute' => '{0}دقيقة|{1}دقيقة|{2}دقيقتين|[3,10]:count دقائق|[11,Inf]:count دقيقة',
+ 'min' => '{0}دقيقة|{1}دقيقة|{2}دقيقتين|[3,10]:count دقائق|[11,Inf]:count دقيقة',
+ 'second' => '{0}ثانية|{1}ثانية|{2}ثانيتين|[3,10]:count ثوان|[11,Inf]:count ثانية',
+ 's' => '{0}ثانية|{1}ثانية|{2}ثانيتين|[3,10]:count ثوان|[11,Inf]:count ثانية',
+ 'ago' => 'منذ :time',
+ 'from_now' => ':time من الآن',
+ 'after' => 'بعد :time',
+ 'before' => 'قبل :time',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php
new file mode 100644
index 0000000..846ae02
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => '[0,1] سَنَة|{2} سَنَتَيْن|[3,10]:count سَنَوَات|[11,Inf]:count سَنَة',
+ 'y' => '[0,1] سَنَة|{2} سَنَتَيْن|[3,10]:count سَنَوَات|[11,Inf]:count سَنَة',
+ 'month' => '[0,1] شَهْرَ|{2} شَهْرَيْن|[3,10]:count أَشْهُر|[11,Inf]:count شَهْرَ',
+ 'm' => '[0,1] شَهْرَ|{2} شَهْرَيْن|[3,10]:count أَشْهُر|[11,Inf]:count شَهْرَ',
+ 'week' => '[0,1] أُسْبُوع|{2} أُسْبُوعَيْن|[3,10]:count أَسَابِيع|[11,Inf]:count أُسْبُوع',
+ 'w' => '[0,1] أُسْبُوع|{2} أُسْبُوعَيْن|[3,10]:count أَسَابِيع|[11,Inf]:count أُسْبُوع',
+ 'day' => '[0,1] يَوْم|{2} يَوْمَيْن|[3,10]:count أَيَّام|[11,Inf] يَوْم',
+ 'd' => '[0,1] يَوْم|{2} يَوْمَيْن|[3,10]:count أَيَّام|[11,Inf] يَوْم',
+ 'hour' => '[0,1] سَاعَة|{2} سَاعَتَيْن|[3,10]:count سَاعَات|[11,Inf]:count سَاعَة',
+ 'h' => '[0,1] سَاعَة|{2} سَاعَتَيْن|[3,10]:count سَاعَات|[11,Inf]:count سَاعَة',
+ 'minute' => '[0,1] دَقِيقَة|{2} دَقِيقَتَيْن|[3,10]:count دَقَائِق|[11,Inf]:count دَقِيقَة',
+ 'min' => '[0,1] دَقِيقَة|{2} دَقِيقَتَيْن|[3,10]:count دَقَائِق|[11,Inf]:count دَقِيقَة',
+ 'second' => '[0,1] ثَانِيَة|{2} ثَانِيَتَيْن|[3,10]:count ثَوَان|[11,Inf]:count ثَانِيَة',
+ 's' => '[0,1] ثَانِيَة|{2} ثَانِيَتَيْن|[3,10]:count ثَوَان|[11,Inf]:count ثَانِيَة',
+ 'ago' => 'مُنْذُ :time',
+ 'from_now' => 'مِنَ الْآن :time',
+ 'after' => 'بَعْدَ :time',
+ 'before' => 'قَبْلَ :time',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/az.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/az.php
index 455d262..25f5c4a 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/az.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/az.php
@@ -1,4 +1,5 @@
':count il',
- 'month' => ':count ay',
- 'week' => ':count həftə',
- 'day' => ':count gün',
- 'hour' => ':count saat',
- 'minute' => ':count dəqiqə',
- 'second' => ':count saniyə',
- 'ago' => ':time öncə',
- 'from_now' => ':time sonra',
- 'after' => ':time sonra',
- 'before' => ':time öncə'
+ 'year' => ':count il',
+ 'y' => ':count il',
+ 'month' => ':count ay',
+ 'm' => ':count ay',
+ 'week' => ':count həftə',
+ 'w' => ':count həftə',
+ 'day' => ':count gün',
+ 'd' => ':count gün',
+ 'hour' => ':count saat',
+ 'h' => ':count saat',
+ 'minute' => ':count dəqiqə',
+ 'min' => ':count dəqiqə',
+ 'second' => ':count saniyə',
+ 's' => ':count saniyə',
+ 'ago' => ':time əvvəl',
+ 'from_now' => ':time sonra',
+ 'after' => ':time sonra',
+ 'before' => ':time əvvəl',
+ 'diff_now' => 'indi',
+ 'diff_yesterday' => 'dünən',
+ 'diff_tomorrow' => 'sabah',
+ 'diff_before_yesterday' => 'srağagün',
+ 'diff_after_tomorrow' => 'birisi gün',
+ 'period_recurrences' => ':count dəfədən bir',
+ 'period_interval' => 'hər :interval',
+ 'period_start_date' => ':date tarixindən başlayaraq',
+ 'period_end_date' => ':date tarixinədək',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/bg.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/bg.php
index d70d780..d9e510b 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/bg.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/bg.php
@@ -8,24 +8,24 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
-/**
- * Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/bg/date.php
- */
return array(
- 'year' => '1 година|:count години',
- 'month' => '1 месец|:count месеца',
- 'week' => '1 седмица|:count седмици',
- 'day' => '1 ден|:count дни',
- 'hour' => '1 час|:count часа',
- 'minute' => '1 минута|:count минути',
- 'second' => '1 секунда|:count секунди',
- 'ago' => 'преди :time',
- 'from_now' => ':time от сега',
- 'after' => 'след :time',
- 'before' => 'преди :time',
+ 'year' => ':count година|:count години',
+ 'y' => ':count година|:count години',
+ 'month' => ':count месец|:count месеца',
+ 'm' => ':count месец|:count месеца',
+ 'week' => ':count седмица|:count седмици',
+ 'w' => ':count седмица|:count седмици',
+ 'day' => ':count ден|:count дни',
+ 'd' => ':count ден|:count дни',
+ 'hour' => ':count час|:count часа',
+ 'h' => ':count час|:count часа',
+ 'minute' => ':count минута|:count минути',
+ 'min' => ':count минута|:count минути',
+ 'second' => ':count секунда|:count секунди',
+ 's' => ':count секунда|:count секунди',
+ 'ago' => 'преди :time',
+ 'from_now' => ':time от сега',
+ 'after' => 'след :time',
+ 'before' => 'преди :time',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/bn.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
index 41357cd..5817599 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
@@ -1,4 +1,5 @@
'১ বছর|:count বছর',
- 'month' => '১ মাস|:count মাস',
- 'week' => '১ সপ্তাহ|:count সপ্তাহ',
- 'day' => '১ দিন|:count দিন',
- 'hour' => '১ ঘন্টা|:count ঘন্টা',
- 'minute' => '১ মিনিট|:count মিনিট',
- 'second' => '১ সেকেন্ড|:count সেকেন্ড',
- 'ago' => ':time পূর্বে',
- 'from_now' => 'এখন থেকে :time',
- 'after' => ':time পরে',
- 'before' => ':time আগে',
+ 'year' => '১ বছর|:count বছর',
+ 'y' => '১ বছর|:count বছর',
+ 'month' => '১ মাস|:count মাস',
+ 'm' => '১ মাস|:count মাস',
+ 'week' => '১ সপ্তাহ|:count সপ্তাহ',
+ 'w' => '১ সপ্তাহ|:count সপ্তাহ',
+ 'day' => '১ দিন|:count দিন',
+ 'd' => '১ দিন|:count দিন',
+ 'hour' => '১ ঘন্টা|:count ঘন্টা',
+ 'h' => '১ ঘন্টা|:count ঘন্টা',
+ 'minute' => '১ মিনিট|:count মিনিট',
+ 'min' => '১ মিনিট|:count মিনিট',
+ 'second' => '১ সেকেন্ড|:count সেকেন্ড',
+ 's' => '১ সেকেন্ড|:count সেকেন্ড',
+ 'ago' => ':time পূর্বে',
+ 'from_now' => 'এখন থেকে :time',
+ 'after' => ':time পরে',
+ 'before' => ':time আগে',
+ 'diff_now' => 'এখন',
+ 'diff_yesterday' => 'গতকাল',
+ 'diff_tomorrow' => 'আগামীকাল',
+ 'period_recurrences' => ':count বার|:count বার',
+ 'period_interval' => 'প্রতি :interval',
+ 'period_start_date' => ':date থেকে',
+ 'period_end_date' => ':date পর্যন্ত',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php
new file mode 100644
index 0000000..7a9b05a
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/bs_BA.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count godina|:count godine|:count godina',
+ 'y' => ':count godina|:count godine|:count godina',
+ 'month' => ':count mjesec|:count mjeseca|:count mjeseci',
+ 'm' => ':count mjesec|:count mjeseca|:count mjeseci',
+ 'week' => ':count nedjelja|:count nedjelje|:count nedjelja',
+ 'w' => ':count nedjelja|:count nedjelje|:count nedjelja',
+ 'day' => ':count dan|:count dana|:count dana',
+ 'd' => ':count dan|:count dana|:count dana',
+ 'hour' => ':count sat|:count sata|:count sati',
+ 'h' => ':count sat|:count sata|:count sati',
+ 'minute' => ':count minut|:count minuta|:count minuta',
+ 'min' => ':count minut|:count minuta|:count minuta',
+ 'second' => ':count sekund|:count sekunda|:count sekundi',
+ 's' => ':count sekund|:count sekunda|:count sekundi',
+ 'ago' => 'prije :time',
+ 'from_now' => 'za :time',
+ 'after' => 'nakon :time',
+ 'before' => ':time ranije',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ca.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
index 8145161..c854b5a 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
@@ -1,4 +1,5 @@
'1 any|:count anys',
- 'month' => '1 mes|:count mesos',
- 'week' => '1 setmana|:count setmanes',
- 'day' => '1 dia|:count díes',
- 'hour' => '1 hora|:count hores',
- 'minute' => '1 minut|:count minuts',
- 'second' => '1 segon|:count segons',
- 'ago' => 'Fa :time',
- 'from_now' => 'Dins de :time',
- 'after' => ':time després',
- 'before' => ':time abans',
+ 'year' => ':count any|:count anys',
+ 'y' => ':count any|:count anys',
+ 'month' => ':count mes|:count mesos',
+ 'm' => ':count mes|:count mesos',
+ 'week' => ':count setmana|:count setmanes',
+ 'w' => ':count setmana|:count setmanes',
+ 'day' => ':count dia|:count dies',
+ 'd' => ':count dia|:count dies',
+ 'hour' => ':count hora|:count hores',
+ 'h' => ':count hora|:count hores',
+ 'minute' => ':count minut|:count minuts',
+ 'min' => ':count minut|:count minuts',
+ 'second' => ':count segon|:count segons',
+ 's' => ':count segon|:count segons',
+ 'ago' => 'fa :time',
+ 'from_now' => 'd\'aquí :time',
+ 'after' => ':time després',
+ 'before' => ':time abans',
+ 'diff_now' => 'ara mateix',
+ 'diff_yesterday' => 'ahir',
+ 'diff_tomorrow' => 'demà',
+ 'diff_before_yesterday' => "abans d'ahir",
+ 'diff_after_tomorrow' => 'demà passat',
+ 'period_recurrences' => ':count cop|:count cops',
+ 'period_interval' => 'cada :interval',
+ 'period_start_date' => 'de :date',
+ 'period_end_date' => 'fins a :date',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/cs.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/cs.php
index 26a78b3..a447ce2 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/cs.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/cs.php
@@ -1,4 +1,5 @@
'1 rok|:count roky|:count let',
- 'month' => '1 měsíc|:count měsíce|:count měsíců',
- 'week' => '1 týden|:count týdny|:count týdnů',
- 'day' => '1 den|:count dny|:count dní',
- 'hour' => '1 hodinu|:count hodiny|:count hodin',
- 'minute' => '1 minutu|:count minuty|:count minut',
- 'second' => '1 sekundu|:count sekundy|:count sekund',
- 'ago' => 'před :time',
- 'from_now' => 'za :time',
- 'after' => ':time později',
- 'before' => ':time předtím',
+ 'year' => ':count rok|:count roky|:count let',
+ 'y' => ':count rok|:count roky|:count let',
+ 'month' => ':count měsíc|:count měsíce|:count měsíců',
+ 'm' => ':count měsíc|:count měsíce|:count měsíců',
+ 'week' => ':count týden|:count týdny|:count týdnů',
+ 'w' => ':count týden|:count týdny|:count týdnů',
+ 'day' => ':count den|:count dny|:count dní',
+ 'd' => ':count den|:count dny|:count dní',
+ 'hour' => ':count hodinu|:count hodiny|:count hodin',
+ 'h' => ':count hodinu|:count hodiny|:count hodin',
+ 'minute' => ':count minutu|:count minuty|:count minut',
+ 'min' => ':count minutu|:count minuty|:count minut',
+ 'second' => ':count sekundu|:count sekundy|:count sekund',
+ 's' => ':count sekundu|:count sekundy|:count sekund',
+ 'ago' => ':time nazpět',
+ 'from_now' => 'za :time',
+ 'after' => ':time později',
+ 'before' => ':time předtím',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/cy.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/cy.php
new file mode 100644
index 0000000..c93750e
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/cy.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+return array(
+ 'year' => '1 flwyddyn|:count blynedd',
+ 'y' => ':countbl',
+ 'month' => '1 mis|:count fis',
+ 'm' => ':countmi',
+ 'week' => ':count wythnos',
+ 'w' => ':countw',
+ 'day' => ':count diwrnod',
+ 'd' => ':countd',
+ 'hour' => ':count awr',
+ 'h' => ':counth',
+ 'minute' => ':count munud',
+ 'min' => ':countm',
+ 'second' => ':count eiliad',
+ 's' => ':counts',
+ 'ago' => ':time yn ôl',
+ 'from_now' => ':time o hyn ymlaen',
+ 'after' => ':time ar ôl',
+ 'before' => ':time o\'r blaen',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/da.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/da.php
index d5c6a0a..86507b0 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/da.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/da.php
@@ -9,20 +9,23 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 år|:count år',
- 'month' => '1 måned|:count måneder',
- 'week' => '1 uge|:count uger',
- 'day' => '1 dag|:count dage',
- 'hour' => '1 time|:count timer',
- 'minute' => '1 minut|:count minutter',
- 'second' => '1 sekund|:count sekunder',
- 'ago' => ':time siden',
- 'from_now' => 'om :time',
- 'after' => ':time efter',
- 'before' => ':time før',
+ 'year' => ':count år|:count år',
+ 'y' => ':count år|:count år',
+ 'month' => ':count måned|:count måneder',
+ 'm' => ':count måned|:count måneder',
+ 'week' => ':count uge|:count uger',
+ 'w' => ':count uge|:count uger',
+ 'day' => ':count dag|:count dage',
+ 'd' => ':count dag|:count dage',
+ 'hour' => ':count time|:count timer',
+ 'h' => ':count time|:count timer',
+ 'minute' => ':count minut|:count minutter',
+ 'min' => ':count minut|:count minutter',
+ 'second' => ':count sekund|:count sekunder',
+ 's' => ':count sekund|:count sekunder',
+ 'ago' => ':time siden',
+ 'from_now' => 'om :time',
+ 'after' => ':time efter',
+ 'before' => ':time før',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/de.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/de.php
index bf0af71..5ea2a03 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/de.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/de.php
@@ -3,36 +3,44 @@
/*
* This file is part of the Carbon package.
*
- * (c) Michael Hohl
+ * (c) Brian Nesbitt
*
- * This file is released under the terms of CC0.
- * CC0 is even more permissive than the MIT license, allowing you to use the code in
- * any manner you want, without any copyright headers, notices, or other attribution.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 Jahr|:count Jahre',
- 'month' => '1 Monat|:count Monate',
- 'week' => '1 Woche|:count Wochen',
- 'day' => '1 Tag|:count Tage',
- 'hour' => '1 Stunde|:count Stunden',
- 'minute' => '1 Minute|:count Minuten',
- 'second' => '1 Sekunde|:count Sekunden',
- 'ago' => 'vor :time',
- 'from_now' => 'in :time',
- 'after' => ':time später',
- 'before' => ':time zuvor',
+ 'year' => ':count Jahr|:count Jahre',
+ 'y' => ':countJ|:countJ',
+ 'month' => ':count Monat|:count Monate',
+ 'm' => ':countMon|:countMon',
+ 'week' => ':count Woche|:count Wochen',
+ 'w' => ':countWo|:countWo',
+ 'day' => ':count Tag|:count Tage',
+ 'd' => ':countTg|:countTg',
+ 'hour' => ':count Stunde|:count Stunden',
+ 'h' => ':countStd|:countStd',
+ 'minute' => ':count Minute|:count Minuten',
+ 'min' => ':countMin|:countMin',
+ 'second' => ':count Sekunde|:count Sekunden',
+ 's' => ':countSek|:countSek',
+ 'ago' => 'vor :time',
+ 'from_now' => 'in :time',
+ 'after' => ':time später',
+ 'before' => ':time zuvor',
+
+ 'year_from_now' => ':count Jahr|:count Jahren',
+ 'month_from_now' => ':count Monat|:count Monaten',
+ 'week_from_now' => ':count Woche|:count Wochen',
+ 'day_from_now' => ':count Tag|:count Tagen',
+ 'year_ago' => ':count Jahr|:count Jahren',
+ 'month_ago' => ':count Monat|:count Monaten',
+ 'week_ago' => ':count Woche|:count Wochen',
+ 'day_ago' => ':count Tag|:count Tagen',
- 'year_from_now' => '1 Jahr|:count Jahren',
- 'month_from_now' => '1 Monat|:count Monaten',
- 'week_from_now' => '1 Woche|:count Wochen',
- 'day_from_now' => '1 Tag|:count Tagen',
- 'year_ago' => '1 Jahr|:count Jahren',
- 'month_ago' => '1 Monat|:count Monaten',
- 'week_ago' => '1 Woche|:count Wochen',
- 'day_ago' => '1 Tag|:count Tagen',
+ 'diff_now' => 'Gerade eben',
+ 'diff_yesterday' => 'Gestern',
+ 'diff_tomorrow' => 'Heute',
+ 'diff_before_yesterday' => 'Vorgestern',
+ 'diff_after_tomorrow' => 'Übermorgen',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php
new file mode 100644
index 0000000..e3c50b3
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/dv_MV.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => '{0}އަހަރެއް|[1,Inf]:count އަހަރު',
+ 'y' => '{0}އަހަރެއް|[1,Inf]:count އަހަރު',
+ 'month' => '{0}މައްސަރެއް|[1,Inf]:count މަސް',
+ 'm' => '{0}މައްސަރެއް|[1,Inf]:count މަސް',
+ 'week' => '{0}ހަފްތާއެއް|[1,Inf]:count ހަފްތާ',
+ 'w' => '{0}ހަފްތާއެއް|[1,Inf]:count ހަފްތާ',
+ 'day' => '{0}ދުވަސް|[1,Inf]:count ދުވަސް',
+ 'd' => '{0}ދުވަސް|[1,Inf]:count ދުވަސް',
+ 'hour' => '{0}ގަޑިއިރެއް|[1,Inf]:count ގަޑި',
+ 'h' => '{0}ގަޑިއިރެއް|[1,Inf]:count ގަޑި',
+ 'minute' => '{0}މިނެޓެއް|[1,Inf]:count މިނެޓް',
+ 'min' => '{0}މިނެޓެއް|[1,Inf]:count މިނެޓް',
+ 'second' => '{0}ސިކުންތެއް|[1,Inf]:count ސިކުންތު',
+ 's' => '{0}ސިކުންތެއް|[1,Inf]:count ސިކުންތު',
+ 'ago' => ':time ކުރިން',
+ 'from_now' => ':time ފަހުން',
+ 'after' => ':time ފަހުން',
+ 'before' => ':time ކުރި',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/el.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/el.php
index 1ecb271..16b3f44 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/el.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/el.php
@@ -1,4 +1,5 @@
'1 χρόνος|:count χρόνια',
- 'month' => '1 μήνας|:count μήνες',
- 'week' => '1 εβδομάδα|:count εβδομάδες',
- 'day' => '1 μέρα|:count μέρες',
- 'hour' => '1 ώρα|:count ώρες',
- 'minute' => '1 λεπτό|:count λεπτά',
- 'second' => '1 δευτερόλεπτο|:count δευτερόλεπτα',
- 'ago' => 'πρίν απο :time',
- 'from_now' => 'σε :time απο τώρα',
- 'after' => ':time μετά',
- 'before' => ':time πρίν'
+ 'year' => ':count χρόνος|:count χρόνια',
+ 'y' => ':count χρόνος|:count χρόνια',
+ 'month' => ':count μήνας|:count μήνες',
+ 'm' => ':count μήνας|:count μήνες',
+ 'week' => ':count εβδομάδα|:count εβδομάδες',
+ 'w' => ':count εβδομάδα|:count εβδομάδες',
+ 'day' => ':count μέρα|:count μέρες',
+ 'd' => ':count μέρα|:count μέρες',
+ 'hour' => ':count ώρα|:count ώρες',
+ 'h' => ':count ώρα|:count ώρες',
+ 'minute' => ':count λεπτό|:count λεπτά',
+ 'min' => ':count λεπτό|:count λεπτά',
+ 'second' => ':count δευτερόλεπτο|:count δευτερόλεπτα',
+ 's' => ':count δευτερόλεπτο|:count δευτερόλεπτα',
+ 'ago' => 'πριν από :time',
+ 'from_now' => 'σε :time από τώρα',
+ 'after' => ':time μετά',
+ 'before' => ':time πριν',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/en.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/en.php
index e0ad273..a15c131 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/en.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/en.php
@@ -9,20 +9,32 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 year|:count years',
- 'month' => '1 month|:count months',
- 'week' => '1 week|:count weeks',
- 'day' => '1 day|:count days',
- 'hour' => '1 hour|:count hours',
- 'minute' => '1 minute|:count minutes',
- 'second' => '1 second|:count seconds',
- 'ago' => ':time ago',
- 'from_now' => ':time from now',
- 'after' => ':time after',
- 'before' => ':time before',
+ 'year' => ':count year|:count years',
+ 'y' => ':countyr|:countyrs',
+ 'month' => ':count month|:count months',
+ 'm' => ':countmo|:countmos',
+ 'week' => ':count week|:count weeks',
+ 'w' => ':countw|:countw',
+ 'day' => ':count day|:count days',
+ 'd' => ':countd|:countd',
+ 'hour' => ':count hour|:count hours',
+ 'h' => ':counth|:counth',
+ 'minute' => ':count minute|:count minutes',
+ 'min' => ':countm|:countm',
+ 'second' => ':count second|:count seconds',
+ 's' => ':counts|:counts',
+ 'ago' => ':time ago',
+ 'from_now' => ':time from now',
+ 'after' => ':time after',
+ 'before' => ':time before',
+ 'diff_now' => 'just now',
+ 'diff_yesterday' => 'yesterday',
+ 'diff_tomorrow' => 'tomorrow',
+ 'diff_before_yesterday' => 'before yesterday',
+ 'diff_after_tomorrow' => 'after tomorrow',
+ 'period_recurrences' => 'once|:count times',
+ 'period_interval' => 'every :interval',
+ 'period_start_date' => 'from :date',
+ 'period_end_date' => 'to :date',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/eo.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/eo.php
index 3175a27..c5b90b3 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/eo.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/eo.php
@@ -1,4 +1,5 @@
'1 jaro|:count jaroj',
- 'month' => '1 monato|:count monatoj',
- 'week' => '1 semajno|:count semajnoj',
- 'day' => '1 tago|:count tagoj',
- 'hour' => '1 horo|:count horoj',
- 'minute' => '1 minuto|:count minutoj',
- 'second' => '1 sekundo|:count sekundoj',
- 'ago' => 'antaŭ :time',
- 'from_now' => 'je :time',
- 'after' => ':time poste',
- 'before' => ':time antaŭe'
+ 'year' => ':count jaro|:count jaroj',
+ 'y' => ':count jaro|:count jaroj',
+ 'month' => ':count monato|:count monatoj',
+ 'm' => ':count monato|:count monatoj',
+ 'week' => ':count semajno|:count semajnoj',
+ 'w' => ':count semajno|:count semajnoj',
+ 'day' => ':count tago|:count tagoj',
+ 'd' => ':count tago|:count tagoj',
+ 'hour' => ':count horo|:count horoj',
+ 'h' => ':count horo|:count horoj',
+ 'minute' => ':count minuto|:count minutoj',
+ 'min' => ':count minuto|:count minutoj',
+ 'second' => ':count sekundo|:count sekundoj',
+ 's' => ':count sekundo|:count sekundoj',
+ 'ago' => 'antaŭ :time',
+ 'from_now' => 'je :time',
+ 'after' => ':time poste',
+ 'before' => ':time antaŭe',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/es.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/es.php
index 2da39a0..567a280 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/es.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/es.php
@@ -9,20 +9,28 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 año|:count años',
- 'month' => '1 mes|:count meses',
- 'week' => '1 semana|:count semanas',
- 'day' => '1 día|:count días',
- 'hour' => '1 hora|:count horas',
- 'minute' => '1 minuto|:count minutos',
- 'second' => '1 segundo|:count segundos',
- 'ago' => 'hace :time',
- 'from_now' => 'dentro de :time',
- 'after' => ':time después',
- 'before' => ':time antes',
+ 'year' => ':count año|:count años',
+ 'y' => ':count año|:count años',
+ 'month' => ':count mes|:count meses',
+ 'm' => ':count mes|:count meses',
+ 'week' => ':count semana|:count semanas',
+ 'w' => ':count semana|:count semanas',
+ 'day' => ':count día|:count días',
+ 'd' => ':count día|:count días',
+ 'hour' => ':count hora|:count horas',
+ 'h' => ':count hora|:count horas',
+ 'minute' => ':count minuto|:count minutos',
+ 'min' => ':count minuto|:count minutos',
+ 'second' => ':count segundo|:count segundos',
+ 's' => ':count segundo|:count segundos',
+ 'ago' => 'hace :time',
+ 'from_now' => 'dentro de :time',
+ 'after' => ':time después',
+ 'before' => ':time antes',
+ 'diff_now' => 'ahora mismo',
+ 'diff_yesterday' => 'ayer',
+ 'diff_tomorrow' => 'mañana',
+ 'diff_before_yesterday' => 'antier',
+ 'diff_after_tomorrow' => 'pasado mañana',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/et.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/et.php
index 68dfae6..2d9291e 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/et.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/et.php
@@ -1,4 +1,5 @@
'1 aasta|:count aastat',
- 'month' => '1 kuu|:count kuud',
- 'week' => '1 nädal|:count nädalat',
- 'day' => '1 päev|:count päeva',
- 'hour' => '1 tund|:count tundi',
- 'minute' => '1 minut|:count minutit',
- 'second' => '1 sekund|:count sekundit',
- 'ago' => ':time tagasi',
- 'from_now' => ':time pärast',
- 'after' => ':time pärast',
- 'before' => ':time enne',
+ 'year' => ':count aasta|:count aastat',
+ 'y' => ':count aasta|:count aastat',
+ 'month' => ':count kuu|:count kuud',
+ 'm' => ':count kuu|:count kuud',
+ 'week' => ':count nädal|:count nädalat',
+ 'w' => ':count nädal|:count nädalat',
+ 'day' => ':count päev|:count päeva',
+ 'd' => ':count päev|:count päeva',
+ 'hour' => ':count tund|:count tundi',
+ 'h' => ':count tund|:count tundi',
+ 'minute' => ':count minut|:count minutit',
+ 'min' => ':count minut|:count minutit',
+ 'second' => ':count sekund|:count sekundit',
+ 's' => ':count sekund|:count sekundit',
+ 'ago' => ':time tagasi',
+ 'from_now' => ':time pärast',
+ 'after' => ':time pärast',
+ 'before' => ':time enne',
'year_from_now' => ':count aasta',
'month_from_now' => ':count kuu',
'week_from_now' => ':count nädala',
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/eu.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/eu.php
index 79c4d12..1cb6b7c 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/eu.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/eu.php
@@ -1,4 +1,5 @@
'Urte 1|:count urte',
- 'month' => 'Hile 1|:count hile',
- 'week' => 'Aste 1|:count aste',
- 'day' => 'Egun 1|:count egun',
- 'hour' => 'Ordu 1|:count ordu',
- 'minute' => 'Minutu 1|:count minutu',
- 'second' => 'Segundu 1|:count segundu',
- 'ago' => 'Orain dela :time',
- 'from_now' => ':time barru',
- 'after' => ':time geroago',
- 'before' => ':time lehenago'
+ 'year' => 'Urte 1|:count urte',
+ 'y' => 'Urte 1|:count urte',
+ 'month' => 'Hile 1|:count hile',
+ 'm' => 'Hile 1|:count hile',
+ 'week' => 'Aste 1|:count aste',
+ 'w' => 'Aste 1|:count aste',
+ 'day' => 'Egun 1|:count egun',
+ 'd' => 'Egun 1|:count egun',
+ 'hour' => 'Ordu 1|:count ordu',
+ 'h' => 'Ordu 1|:count ordu',
+ 'minute' => 'Minutu 1|:count minutu',
+ 'min' => 'Minutu 1|:count minutu',
+ 'second' => 'Segundu 1|:count segundu',
+ 's' => 'Segundu 1|:count segundu',
+ 'ago' => 'Orain dela :time',
+ 'from_now' => ':time barru',
+ 'after' => ':time geroago',
+ 'before' => ':time lehenago',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/fa.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/fa.php
index 8b671da..31bec88 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/fa.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/fa.php
@@ -9,21 +9,23 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
-
return array(
- 'year' => ':count سال',
- 'month' => ':count ماه',
- 'week' => ':count هفته',
- 'day' => ':count روز',
- 'hour' => ':count ساعت',
- 'minute' => ':count دقیقه',
- 'second' => ':count ثانیه',
- 'ago' => ':time پیش',
- 'from_now' => ':time بعد',
- 'after' => ':time پیش از',
- 'before' => ':time پس از',
+ 'year' => ':count سال',
+ 'y' => ':count سال',
+ 'month' => ':count ماه',
+ 'm' => ':count ماه',
+ 'week' => ':count هفته',
+ 'w' => ':count هفته',
+ 'day' => ':count روز',
+ 'd' => ':count روز',
+ 'hour' => ':count ساعت',
+ 'h' => ':count ساعت',
+ 'minute' => ':count دقیقه',
+ 'min' => ':count دقیقه',
+ 'second' => ':count ثانیه',
+ 's' => ':count ثانیه',
+ 'ago' => ':time پیش',
+ 'from_now' => ':time بعد',
+ 'after' => ':time پس از',
+ 'before' => ':time پیش از',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/fi.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
index 6198f99..4818804 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
@@ -1,4 +1,5 @@
'1 vuosi|:count vuotta',
- 'month' => '1 kuukausi|:count kuukautta',
- 'week' => '1 viikko|:count viikkoa',
- 'day' => '1 päivä|:count päivää',
- 'hour' => '1 tunti|:count tuntia',
- 'minute' => '1 minuutti|:count minuuttia',
- 'second' => '1 sekunti|:count sekuntia',
- 'ago' => ':time sitten',
- 'from_now' => ':time tästä hetkestä',
- 'after' => ':time sen jälkeen',
- 'before' => ':time ennen'
+ 'year' => ':count vuosi|:count vuotta',
+ 'y' => ':count vuosi|:count vuotta',
+ 'month' => ':count kuukausi|:count kuukautta',
+ 'm' => ':count kuukausi|:count kuukautta',
+ 'week' => ':count viikko|:count viikkoa',
+ 'w' => ':count viikko|:count viikkoa',
+ 'day' => ':count päivä|:count päivää',
+ 'd' => ':count päivä|:count päivää',
+ 'hour' => ':count tunti|:count tuntia',
+ 'h' => ':count tunti|:count tuntia',
+ 'minute' => ':count minuutti|:count minuuttia',
+ 'min' => ':count minuutti|:count minuuttia',
+ 'second' => ':count sekunti|:count sekuntia',
+ 's' => ':count sekunti|:count sekuntia',
+ 'ago' => ':time sitten',
+ 'from_now' => ':time tästä hetkestä',
+ 'after' => ':time sen jälkeen',
+ 'before' => ':time ennen',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/fo.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/fo.php
index 740f03b..d91104b 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/fo.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/fo.php
@@ -9,20 +9,23 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 ár|:count ár',
- 'month' => '1 mánaður|:count mánaðir',
- 'week' => '1 vika|:count vikur',
- 'day' => '1 dag|:count dagar',
- 'hour' => '1 tími|:count tímar',
- 'minute' => '1 minutt|:count minuttir',
- 'second' => '1 sekund|:count sekundir',
- 'ago' => ':time síðan',
- 'from_now' => 'um :time',
- 'after' => ':time aftaná',
- 'before' => ':time áðrenn',
+ 'year' => ':count ár|:count ár',
+ 'y' => ':count ár|:count ár',
+ 'month' => ':count mánaður|:count mánaðir',
+ 'm' => ':count mánaður|:count mánaðir',
+ 'week' => ':count vika|:count vikur',
+ 'w' => ':count vika|:count vikur',
+ 'day' => ':count dag|:count dagar',
+ 'd' => ':count dag|:count dagar',
+ 'hour' => ':count tími|:count tímar',
+ 'h' => ':count tími|:count tímar',
+ 'minute' => ':count minutt|:count minuttir',
+ 'min' => ':count minutt|:count minuttir',
+ 'second' => ':count sekund|:count sekundir',
+ 's' => ':count sekund|:count sekundir',
+ 'ago' => ':time síðan',
+ 'from_now' => 'um :time',
+ 'after' => ':time aftaná',
+ 'before' => ':time áðrenn',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/fr.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
index 298131a..0b20cdd 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
@@ -9,20 +9,32 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 an|:count ans',
- 'month' => ':count mois',
- 'week' => '1 semaine|:count semaines',
- 'day' => '1 jour|:count jours',
- 'hour' => '1 heure|:count heures',
- 'minute' => '1 minute|:count minutes',
- 'second' => '1 seconde|:count secondes',
- 'ago' => 'il y a :time',
- 'from_now' => 'dans :time',
- 'after' => ':time après',
- 'before' => ':time avant',
+ 'year' => ':count an|:count ans',
+ 'y' => ':count an|:count ans',
+ 'month' => ':count mois',
+ 'm' => ':count mois',
+ 'week' => ':count semaine|:count semaines',
+ 'w' => ':count sem.',
+ 'day' => ':count jour|:count jours',
+ 'd' => ':count j.',
+ 'hour' => ':count heure|:count heures',
+ 'h' => ':count h.',
+ 'minute' => ':count minute|:count minutes',
+ 'min' => ':count min.',
+ 'second' => ':count seconde|:count secondes',
+ 's' => ':count sec.',
+ 'ago' => 'il y a :time',
+ 'from_now' => 'dans :time',
+ 'after' => ':time après',
+ 'before' => ':time avant',
+ 'diff_now' => "à l'instant",
+ 'diff_yesterday' => 'hier',
+ 'diff_tomorrow' => 'demain',
+ 'diff_before_yesterday' => 'avant-hier',
+ 'diff_after_tomorrow' => 'après-demain',
+ 'period_recurrences' => ':count fois',
+ 'period_interval' => 'tous les :interval',
+ 'period_start_date' => 'de :date',
+ 'period_end_date' => 'à :date',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/gl.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/gl.php
new file mode 100644
index 0000000..cd22a31
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/gl.php
@@ -0,0 +1,24 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count ano|:count anos',
+ 'month' => ':count mes|:count meses',
+ 'week' => ':count semana|:count semanas',
+ 'day' => ':count día|:count días',
+ 'hour' => ':count hora|:count horas',
+ 'minute' => ':count minuto|:count minutos',
+ 'second' => ':count segundo|:count segundos',
+ 'ago' => 'fai :time',
+ 'from_now' => 'dentro de :time',
+ 'after' => ':time despois',
+ 'before' => ':time antes',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/gu.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/gu.php
new file mode 100644
index 0000000..7759dfc
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/gu.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count વર્ષ|:count વર્ષો',
+ 'y' => ':countવર્ષ|:countવર્ષો',
+ 'month' => ':count મહિનો|:count મહિના',
+ 'm' => ':countમહિનો|:countમહિના',
+ 'week' => ':count અઠવાડિયું|:count અઠવાડિયા',
+ 'w' => ':countઅઠ.|:countઅઠ.',
+ 'day' => ':count દિવસ|:count દિવસો',
+ 'd' => ':countદિ.|:countદિ.',
+ 'hour' => ':count કલાક|:count કલાકો',
+ 'h' => ':countક.|:countક.',
+ 'minute' => ':count મિનિટ|:count મિનિટ',
+ 'min' => ':countમિ.|:countમિ.',
+ 'second' => ':count સેકેન્ડ|:count સેકેન્ડ',
+ 's' => ':countસે.|:countસે.',
+ 'ago' => ':time પહેલા',
+ 'from_now' => ':time અત્યારથી',
+ 'after' => ':time પછી',
+ 'before' => ':time પહેલા',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/he.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/he.php
index 681915b..2d4f4f8 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/he.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/he.php
@@ -9,20 +9,23 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => 'שנה|{2}שנתיים|:count שנים',
- 'month' => 'חודש|{2}חודשיים|:count חודשים',
- 'week' => 'שבוע|{2}שבועיים|:count שבועות',
- 'day' => 'יום|{2}יומיים|:count ימים',
- 'hour' => 'שעה|{2}שעתיים|:count שעות',
- 'minute' => 'דקה|{2}דקותיים|:count דקות',
- 'second' => 'שניה|:count שניות',
- 'ago' => 'לפני :time',
- 'from_now' => 'בעוד :time',
- 'after' => 'אחרי :time',
- 'before' => 'לפני :time',
+ 'year' => 'שנה|{2}שנתיים|:count שנים',
+ 'y' => 'שנה|{2}שנתיים|:count שנים',
+ 'month' => 'חודש|{2}חודשיים|:count חודשים',
+ 'm' => 'חודש|{2}חודשיים|:count חודשים',
+ 'week' => 'שבוע|{2}שבועיים|:count שבועות',
+ 'w' => 'שבוע|{2}שבועיים|:count שבועות',
+ 'day' => 'יום|{2}יומיים|:count ימים',
+ 'd' => 'יום|{2}יומיים|:count ימים',
+ 'hour' => 'שעה|{2}שעתיים|:count שעות',
+ 'h' => 'שעה|{2}שעתיים|:count שעות',
+ 'minute' => 'דקה|{2}דקותיים|:count דקות',
+ 'min' => 'דקה|{2}דקותיים|:count דקות',
+ 'second' => 'שניה|:count שניות',
+ 's' => 'שניה|:count שניות',
+ 'ago' => 'לפני :time',
+ 'from_now' => 'בעוד :time',
+ 'after' => 'אחרי :time',
+ 'before' => 'לפני :time',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/hi.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/hi.php
new file mode 100644
index 0000000..6c670ee
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/hi.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => '1 वर्ष|:count वर्षों',
+ 'y' => '1 वर्ष|:count वर्षों',
+ 'month' => '1 माह|:count महीने',
+ 'm' => '1 माह|:count महीने',
+ 'week' => '1 सप्ताह|:count सप्ताह',
+ 'w' => '1 सप्ताह|:count सप्ताह',
+ 'day' => '1 दिन|:count दिनों',
+ 'd' => '1 दिन|:count दिनों',
+ 'hour' => '1 घंटा|:count घंटे',
+ 'h' => '1 घंटा|:count घंटे',
+ 'minute' => '1 मिनट|:count मिनटों',
+ 'min' => '1 मिनट|:count मिनटों',
+ 'second' => '1 सेकंड|:count सेकंड',
+ 's' => '1 सेकंड|:count सेकंड',
+ 'ago' => ':time पूर्व',
+ 'from_now' => ':time से',
+ 'after' => ':time के बाद',
+ 'before' => ':time के पहले',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/hr.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/hr.php
index ea21ced..1a339de 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/hr.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/hr.php
@@ -1,4 +1,5 @@
':count godinu|:count godine|:count godina',
- 'month' => ':count mjesec|:count mjeseca|:count mjeseci',
- 'week' => ':count tjedan|:count tjedna|:count tjedana',
- 'day' => ':count dan|:count dana|:count dana',
- 'hour' => ':count sat|:count sata|:count sati',
- 'minute' => ':count minutu|:count minute |:count minuta',
- 'second' => ':count sekundu|:count sekunde|:count sekundi',
- 'ago' => 'prije :time',
- 'from_now' => 'za :time',
- 'after' => 'za :time',
- 'before' => 'prije :time'
+ 'year' => ':count godinu|:count godine|:count godina',
+ 'y' => ':count godinu|:count godine|:count godina',
+ 'month' => ':count mjesec|:count mjeseca|:count mjeseci',
+ 'm' => ':count mjesec|:count mjeseca|:count mjeseci',
+ 'week' => ':count tjedan|:count tjedna|:count tjedana',
+ 'w' => ':count tjedan|:count tjedna|:count tjedana',
+ 'day' => ':count dan|:count dana|:count dana',
+ 'd' => ':count dan|:count dana|:count dana',
+ 'hour' => ':count sat|:count sata|:count sati',
+ 'h' => ':count sat|:count sata|:count sati',
+ 'minute' => ':count minutu|:count minute |:count minuta',
+ 'min' => ':count minutu|:count minute |:count minuta',
+ 'second' => ':count sekundu|:count sekunde|:count sekundi',
+ 's' => ':count sekundu|:count sekunde|:count sekundi',
+ 'ago' => 'prije :time',
+ 'from_now' => 'za :time',
+ 'after' => 'za :time',
+ 'before' => 'prije :time',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/hu.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
index f30c0c8..45daf41 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
@@ -1,4 +1,5 @@
'1 évvel|:count évvel',
- 'month' => '1 hónappal|:count hónappal',
- 'week' => '1 héttel|:count héttel',
- 'day' => '1 nappal|:count nappal',
- 'hour' => '1 órával|:count órával',
- 'minute' => '1 perccel|:count perccel',
- 'second' => '1 másodperccel|:count másodperccel',
- 'ago' => ':time korábban',
- 'from_now' => ':time később',
- 'after' => ':time később',
- 'before' => ':time korábban'
+ 'year' => ':count év',
+ 'y' => ':count év',
+ 'month' => ':count hónap',
+ 'm' => ':count hónap',
+ 'week' => ':count hét',
+ 'w' => ':count hét',
+ 'day' => ':count nap',
+ 'd' => ':count nap',
+ 'hour' => ':count óra',
+ 'h' => ':count óra',
+ 'minute' => ':count perc',
+ 'min' => ':count perc',
+ 'second' => ':count másodperc',
+ 's' => ':count másodperc',
+ 'ago' => ':time',
+ 'from_now' => ':time múlva',
+ 'after' => ':time később',
+ 'before' => ':time korábban',
+ 'year_ago' => ':count éve',
+ 'month_ago' => ':count hónapja',
+ 'week_ago' => ':count hete',
+ 'day_ago' => ':count napja',
+ 'hour_ago' => ':count órája',
+ 'minute_ago' => ':count perce',
+ 'second_ago' => ':count másodperce',
+ 'year_after' => ':count évvel',
+ 'month_after' => ':count hónappal',
+ 'week_after' => ':count héttel',
+ 'day_after' => ':count nappal',
+ 'hour_after' => ':count órával',
+ 'minute_after' => ':count perccel',
+ 'second_after' => ':count másodperccel',
+ 'year_before' => ':count évvel',
+ 'month_before' => ':count hónappal',
+ 'week_before' => ':count héttel',
+ 'day_before' => ':count nappal',
+ 'hour_before' => ':count órával',
+ 'minute_before' => ':count perccel',
+ 'second_before' => ':count másodperccel',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/hy.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/hy.php
new file mode 100644
index 0000000..d2665f2
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/hy.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count տարի',
+ 'y' => ':countտ',
+ 'month' => ':count ամիս',
+ 'm' => ':countամ',
+ 'week' => ':count շաբաթ',
+ 'w' => ':countշ',
+ 'day' => ':count օր',
+ 'd' => ':countօր',
+ 'hour' => ':count ժամ',
+ 'h' => ':countժ',
+ 'minute' => ':count րոպե',
+ 'min' => ':countր',
+ 'second' => ':count վարկյան',
+ 's' => ':countվրկ',
+ 'ago' => ':time առաջ',
+ 'from_now' => ':time ներկա պահից',
+ 'after' => ':time հետո',
+ 'before' => ':time առաջ',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/id.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/id.php
index 56757a5..7f7114f 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/id.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/id.php
@@ -1,4 +1,5 @@
':count tahun',
- 'month' => ':count bulan',
- 'week' => ':count minggu',
- 'day' => ':count hari',
- 'hour' => ':count jam',
- 'minute' => ':count menit',
- 'second' => ':count detik',
- 'ago' => ':time yang lalu',
- 'from_now' => ':time dari sekarang',
- 'after' => ':time setelah',
- 'before' => ':time sebelum'
+ 'year' => ':count tahun',
+ 'y' => ':count tahun',
+ 'month' => ':count bulan',
+ 'm' => ':count bulan',
+ 'week' => ':count minggu',
+ 'w' => ':count minggu',
+ 'day' => ':count hari',
+ 'd' => ':count hari',
+ 'hour' => ':count jam',
+ 'h' => ':count jam',
+ 'minute' => ':count menit',
+ 'min' => ':count menit',
+ 'second' => ':count detik',
+ 's' => ':count detik',
+ 'ago' => ':time yang lalu',
+ 'from_now' => ':time dari sekarang',
+ 'after' => ':time setelah',
+ 'before' => ':time sebelum',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/is.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/is.php
new file mode 100644
index 0000000..94c76a7
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/is.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => '1 ár|:count ár',
+ 'y' => '1 ár|:count ár',
+ 'month' => '1 mánuður|:count mánuðir',
+ 'm' => '1 mánuður|:count mánuðir',
+ 'week' => '1 vika|:count vikur',
+ 'w' => '1 vika|:count vikur',
+ 'day' => '1 dagur|:count dagar',
+ 'd' => '1 dagur|:count dagar',
+ 'hour' => '1 klukkutími|:count klukkutímar',
+ 'h' => '1 klukkutími|:count klukkutímar',
+ 'minute' => '1 mínúta|:count mínútur',
+ 'min' => '1 mínúta|:count mínútur',
+ 'second' => '1 sekúnda|:count sekúndur',
+ 's' => '1 sekúnda|:count sekúndur',
+ 'ago' => ':time síðan',
+ 'from_now' => ':time síðan',
+ 'after' => ':time eftir',
+ 'before' => ':time fyrir',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/it.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/it.php
index 680e0f5..70bc6d7 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/it.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/it.php
@@ -9,20 +9,28 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 anno|:count anni',
- 'month' => '1 mese|:count mesi',
- 'week' => '1 settimana|:count settimane',
- 'day' => '1 giorno|:count giorni',
- 'hour' => '1 ora|:count ore',
- 'minute' => '1 minuto|:count minuti',
- 'second' => '1 secondo|:count secondi',
- 'ago' => ':time fa',
- 'from_now' => ':time da adesso',
- 'after' => ':time dopo',
- 'before' => ':time prima',
+ 'year' => ':count anno|:count anni',
+ 'y' => ':count anno|:count anni',
+ 'month' => ':count mese|:count mesi',
+ 'm' => ':count mese|:count mesi',
+ 'week' => ':count settimana|:count settimane',
+ 'w' => ':count settimana|:count settimane',
+ 'day' => ':count giorno|:count giorni',
+ 'd' => ':count giorno|:count giorni',
+ 'hour' => ':count ora|:count ore',
+ 'h' => ':count ora|:count ore',
+ 'minute' => ':count minuto|:count minuti',
+ 'min' => ':count minuto|:count minuti',
+ 'second' => ':count secondo|:count secondi',
+ 's' => ':count secondo|:count secondi',
+ 'ago' => ':time fa',
+ 'from_now' => 'tra :time',
+ 'after' => ':time dopo',
+ 'before' => ':time prima',
+ 'diff_now' => 'proprio ora',
+ 'diff_yesterday' => 'ieri',
+ 'diff_tomorrow' => 'domani',
+ 'diff_before_yesterday' => "l'altro ieri",
+ 'diff_after_tomorrow' => 'dopodomani',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ja.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ja.php
index 66cbf90..7119547 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/ja.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ja.php
@@ -1,4 +1,5 @@
':count 年',
- 'month' => ':count ヶ月',
- 'week' => ':count 週間',
- 'day' => ':count 日',
- 'hour' => ':count 時間',
- 'minute' => ':count 分',
- 'second' => ':count 秒',
- 'ago' => ':time 前',
- 'from_now' => '今から :time',
- 'after' => ':time 後',
- 'before' => ':time 前'
+ 'year' => ':count年',
+ 'y' => ':count年',
+ 'month' => ':countヶ月',
+ 'm' => ':countヶ月',
+ 'week' => ':count週間',
+ 'w' => ':count週間',
+ 'day' => ':count日',
+ 'd' => ':count日',
+ 'hour' => ':count時間',
+ 'h' => ':count時間',
+ 'minute' => ':count分',
+ 'min' => ':count分',
+ 'second' => ':count秒',
+ 's' => ':count秒',
+ 'ago' => ':time前',
+ 'from_now' => '今から:time',
+ 'after' => ':time後',
+ 'before' => ':time前',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ka.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ka.php
new file mode 100644
index 0000000..a8dde7e
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ka.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count წლის',
+ 'y' => ':count წლის',
+ 'month' => ':count თვის',
+ 'm' => ':count თვის',
+ 'week' => ':count კვირის',
+ 'w' => ':count კვირის',
+ 'day' => ':count დღის',
+ 'd' => ':count დღის',
+ 'hour' => ':count საათის',
+ 'h' => ':count საათის',
+ 'minute' => ':count წუთის',
+ 'min' => ':count წუთის',
+ 'second' => ':count წამის',
+ 's' => ':count წამის',
+ 'ago' => ':time უკან',
+ 'from_now' => ':time შემდეგ',
+ 'after' => ':time შემდეგ',
+ 'before' => ':time უკან',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/kk.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/kk.php
new file mode 100644
index 0000000..8d113af
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/kk.php
@@ -0,0 +1,29 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+return array(
+ 'year' => ':count жыл',
+ 'y' => ':count жыл',
+ 'month' => ':count ай',
+ 'm' => ':count ай',
+ 'week' => ':count апта',
+ 'w' => ':count апта',
+ 'day' => ':count күн',
+ 'd' => ':count күн',
+ 'hour' => ':count сағат',
+ 'h' => ':count сағат',
+ 'minute' => ':count минут',
+ 'min' => ':count минут',
+ 'second' => ':count секунд',
+ 's' => ':count секунд',
+ 'ago' => ':time бұрын',
+ 'from_now' => ':time кейін',
+ 'after' => ':time кейін',
+ 'before' => ':time бұрын',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/km.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/km.php
new file mode 100644
index 0000000..a104e06
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/km.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count ឆ្នាំ',
+ 'y' => ':count ឆ្នាំ',
+ 'month' => ':count ខែ',
+ 'm' => ':count ខែ',
+ 'week' => ':count សប្ដាហ៍',
+ 'w' => ':count សប្ដាហ៍',
+ 'day' => ':count ថ្ងៃ',
+ 'd' => ':count ថ្ងៃ',
+ 'hour' => ':count ម៉ោង',
+ 'h' => ':count ម៉ោង',
+ 'minute' => ':count នាទី',
+ 'min' => ':count នាទី',
+ 'second' => ':count វិនាទី',
+ 's' => ':count វិនាទី',
+ 'ago' => ':timeមុន',
+ 'from_now' => ':timeពីឥឡូវ',
+ 'after' => 'នៅក្រោយ :time',
+ 'before' => 'នៅមុន :time',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ko.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ko.php
index fa863d9..0209164 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/ko.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ko.php
@@ -1,4 +1,5 @@
':count 년',
- 'month' => ':count 개월',
- 'week' => ':count 주일',
- 'day' => ':count 일',
- 'hour' => ':count 시간',
- 'minute' => ':count 분',
- 'second' => ':count 초',
- 'ago' => ':time 전',
- 'from_now' => ':time 후',
- 'after' => ':time 뒤',
- 'before' => ':time 앞',
+ 'year' => ':count 년',
+ 'y' => ':count 년',
+ 'month' => ':count 개월',
+ 'm' => ':count 개월',
+ 'week' => ':count 주일',
+ 'w' => ':count 주일',
+ 'day' => ':count 일',
+ 'd' => ':count 일',
+ 'hour' => ':count 시간',
+ 'h' => ':count 시간',
+ 'minute' => ':count 분',
+ 'min' => ':count 분',
+ 'second' => ':count 초',
+ 's' => ':count 초',
+ 'ago' => ':time 전',
+ 'from_now' => ':time 후',
+ 'after' => ':time 이후',
+ 'before' => ':time 이전',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/lt.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/lt.php
index af8ddcb..3f2fd1e 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/lt.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/lt.php
@@ -9,21 +9,30 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
-
return array(
- 'year' => '1 metus|:count metus|:count metų',
- 'month' => '1 menesį|:count menesius|:count menesių',
- 'week' => '1 savaitę|:count savaites|:count savaičių',
- 'day' => '1 dieną|:count dienas|:count dienų',
- 'hour' => '1 valandą|:count valandas|:count valandų',
- 'minute' => '1 minutę|:count minutes|:count minučių',
- 'second' => '1 sekundę|:count sekundes|:count sekundžių',
- 'ago' => 'prieš :time',
- 'from_now' => 'už :time',
- 'after' => 'po :time',
- 'before' => ':time nuo dabar',
+ 'year' => ':count metus|:count metus|:count metų',
+ 'y' => ':count metus|:count metus|:count metų',
+ 'month' => ':count mėnesį|:count mėnesius|:count mėnesių',
+ 'm' => ':count mėnesį|:count mėnesius|:count mėnesių',
+ 'week' => ':count savaitę|:count savaites|:count savaičių',
+ 'w' => ':count savaitę|:count savaites|:count savaičių',
+ 'day' => ':count dieną|:count dienas|:count dienų',
+ 'd' => ':count dieną|:count dienas|:count dienų',
+ 'hour' => ':count valandą|:count valandas|:count valandų',
+ 'h' => ':count valandą|:count valandas|:count valandų',
+ 'minute' => ':count minutę|:count minutes|:count minučių',
+ 'min' => ':count minutę|:count minutes|:count minučių',
+ 'second' => ':count sekundę|:count sekundes|:count sekundžių',
+ 's' => ':count sekundę|:count sekundes|:count sekundžių',
+ 'second_from_now' => ':count sekundės|:count sekundžių|:count sekundžių',
+ 'minute_from_now' => ':count minutės|:count minučių|:count minučių',
+ 'hour_from_now' => ':count valandos|:count valandų|:count valandų',
+ 'day_from_now' => ':count dienos|:count dienų|:count dienų',
+ 'week_from_now' => ':count savaitės|:count savaičių|:count savaičių',
+ 'month_from_now' => ':count mėnesio|:count mėnesių|:count mėnesių',
+ 'year_from_now' => ':count metų',
+ 'ago' => 'prieš :time',
+ 'from_now' => 'už :time',
+ 'after' => 'po :time',
+ 'before' => ':time nuo dabar',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/lv.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/lv.php
index fb66c22..363193d 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/lv.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/lv.php
@@ -1,43 +1,47 @@
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '0 gadiem|:count gada|:count gadiem',
- 'month' => '0 mēnešiem|:count mēneša|:count mēnešiem',
- 'week' => '0 nedēļām|:count nedēļas|:count nedēļām',
- 'day' => '0 dienām|:count dienas|:count dienām',
- 'hour' => '0 stundām|:count stundas|:count stundām',
- 'minute' => '0 minūtēm|:count minūtes|:count minūtēm',
- 'second' => '0 sekundēm|:count sekundes|:count sekundēm',
- 'ago' => 'pirms :time',
- 'from_now' => 'pēc :time',
- 'after' => ':time vēlāk',
- 'before' => ':time pirms',
+ 'year' => '0 gadiem|:count gada|:count gadiem',
+ 'y' => '0 gadiem|:count gada|:count gadiem',
+ 'month' => '0 mēnešiem|:count mēneša|:count mēnešiem',
+ 'm' => '0 mēnešiem|:count mēneša|:count mēnešiem',
+ 'week' => '0 nedēļām|:count nedēļas|:count nedēļām',
+ 'w' => '0 nedēļām|:count nedēļas|:count nedēļām',
+ 'day' => '0 dienām|:count dienas|:count dienām',
+ 'd' => '0 dienām|:count dienas|:count dienām',
+ 'hour' => '0 stundām|:count stundas|:count stundām',
+ 'h' => '0 stundām|:count stundas|:count stundām',
+ 'minute' => '0 minūtēm|:count minūtes|:count minūtēm',
+ 'min' => '0 minūtēm|:count minūtes|:count minūtēm',
+ 'second' => '0 sekundēm|:count sekundes|:count sekundēm',
+ 's' => '0 sekundēm|:count sekundes|:count sekundēm',
+ 'ago' => 'pirms :time',
+ 'from_now' => 'pēc :time',
+ 'after' => ':time vēlāk',
+ 'before' => ':time pirms',
- 'year_after' => '0 gadus|:count gadu|:count gadus',
- 'month_after' => '0 mēnešus|:count mēnesi|:count mēnešus',
- 'week_after' => '0 nedēļas|:count nedēļu|:count nedēļas',
- 'day_after' => '0 dienas|:count dienu|:count dienas',
- 'hour_after' => '0 stundas|:count stundu|:count stundas',
- 'minute_after' => '0 minūtes|:count minūti|:count minūtes',
- 'second_after' => '0 sekundes|:count sekundi|:count sekundes',
+ 'year_after' => '0 gadus|:count gadu|:count gadus',
+ 'month_after' => '0 mēnešus|:count mēnesi|:count mēnešus',
+ 'week_after' => '0 nedēļas|:count nedēļu|:count nedēļas',
+ 'day_after' => '0 dienas|:count dienu|:count dienas',
+ 'hour_after' => '0 stundas|:count stundu|:count stundas',
+ 'minute_after' => '0 minūtes|:count minūti|:count minūtes',
+ 'second_after' => '0 sekundes|:count sekundi|:count sekundes',
- 'year_before' => '0 gadus|:count gadu|:count gadus',
- 'month_before' => '0 mēnešus|:count mēnesi|:count mēnešus',
- 'week_before' => '0 nedēļas|:count nedēļu|:count nedēļas',
- 'day_before' => '0 dienas|:count dienu|:count dienas',
- 'hour_before' => '0 stundas|:count stundu|:count stundas',
+ 'year_before' => '0 gadus|:count gadu|:count gadus',
+ 'month_before' => '0 mēnešus|:count mēnesi|:count mēnešus',
+ 'week_before' => '0 nedēļas|:count nedēļu|:count nedēļas',
+ 'day_before' => '0 dienas|:count dienu|:count dienas',
+ 'hour_before' => '0 stundas|:count stundu|:count stundas',
'minute_before' => '0 minūtes|:count minūti|:count minūtes',
'second_before' => '0 sekundes|:count sekundi|:count sekundes',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/mk.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/mk.php
new file mode 100644
index 0000000..c5ec12d
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/mk.php
@@ -0,0 +1,24 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count година|:count години',
+ 'month' => ':count месец|:count месеци',
+ 'week' => ':count седмица|:count седмици',
+ 'day' => ':count ден|:count дена',
+ 'hour' => ':count час|:count часа',
+ 'minute' => ':count минута|:count минути',
+ 'second' => ':count секунда|:count секунди',
+ 'ago' => 'пред :time',
+ 'from_now' => ':time од сега',
+ 'after' => 'по :time',
+ 'before' => 'пред :time',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/mn.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/mn.php
new file mode 100644
index 0000000..b26dce5
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/mn.php
@@ -0,0 +1,62 @@
+
+ *
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @translator Batmandakh Erdenebileg
+ */
+
+return array(
+ 'year' => ':count жил',
+ 'y' => ':count жил',
+ 'month' => ':count сар',
+ 'm' => ':count сар',
+ 'week' => ':count долоо хоног',
+ 'w' => ':count долоо хоног',
+ 'day' => ':count өдөр',
+ 'd' => ':count өдөр',
+ 'hour' => ':count цаг',
+ 'h' => ':countц',
+ 'minute' => ':count минут',
+ 'min' => ':countм',
+ 'second' => ':count секунд',
+ 's' => ':countс',
+
+ 'ago' => ':timeн өмнө',
+ 'year_ago' => ':count жилий',
+ 'month_ago' => ':count сары',
+ 'day_ago' => ':count хоногий',
+ 'hour_ago' => ':count цагий',
+ 'minute_ago' => ':count минуты',
+ 'second_ago' => ':count секунды',
+
+ 'from_now' => 'одоогоос :time',
+ 'year_from_now' => ':count жилийн дараа',
+ 'month_from_now' => ':count сарын дараа',
+ 'day_from_now' => ':count хоногийн дараа',
+ 'hour_from_now' => ':count цагийн дараа',
+ 'minute_from_now' => ':count минутын дараа',
+ 'second_from_now' => ':count секундын дараа',
+
+ // Does it required to make translation for before, after as follows? hmm, I think we've made it with ago and from now keywords already. Anyway, I've included it just in case of undesired action...
+ 'after' => ':timeн дараа',
+ 'year_after' => ':count жилий',
+ 'month_after' => ':count сары',
+ 'day_after' => ':count хоногий',
+ 'hour_after' => ':count цагий',
+ 'minute_after' => ':count минуты',
+ 'second_after' => ':count секунды',
+ 'before' => ':timeн өмнө',
+ 'year_before' => ':count жилий',
+ 'month_before' => ':count сары',
+ 'day_before' => ':count хоногий',
+ 'hour_before' => ':count цагий',
+ 'minute_before' => ':count минуты',
+ 'second_before' => ':count секунды',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ms.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ms.php
index 90304f5..ef57422 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/ms.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ms.php
@@ -1,4 +1,5 @@
':count tahun',
- 'month' => ':count bulan',
- 'week' => ':count minggu',
- 'day' => ':count hari',
- 'hour' => ':count jam',
- 'minute' => ':count minit',
- 'second' => ':count saat',
- 'ago' => ':time yang lalu',
- 'from_now' => ':time dari sekarang',
- 'after' => ':time selepas',
- 'before' => ':time sebelum',
+ 'year' => ':count tahun',
+ 'y' => ':count tahun',
+ 'month' => ':count bulan',
+ 'm' => ':count bulan',
+ 'week' => ':count minggu',
+ 'w' => ':count minggu',
+ 'day' => ':count hari',
+ 'd' => ':count hari',
+ 'hour' => ':count jam',
+ 'h' => ':count jam',
+ 'minute' => ':count minit',
+ 'min' => ':count minit',
+ 'second' => ':count saat',
+ 's' => ':count saat',
+ 'ago' => ':time yang lalu',
+ 'from_now' => ':time dari sekarang',
+ 'after' => ':time selepas',
+ 'before' => ':time sebelum',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/my.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/my.php
new file mode 100644
index 0000000..e8e491e
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/my.php
@@ -0,0 +1,37 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count နှစ်|:count နှစ်',
+ 'y' => ':count နှစ်|:count နှစ်',
+ 'month' => ':count လ|:count လ',
+ 'm' => ':count လ|:count လ',
+ 'week' => ':count ပတ်|:count ပတ်',
+ 'w' => ':count ပတ်|:count ပတ်',
+ 'day' => ':count ရက်|:count ရက်',
+ 'd' => ':count ရက်|:count ရက်',
+ 'hour' => ':count နာရီ|:count နာရီ',
+ 'h' => ':count နာရီ|:count နာရီ',
+ 'minute' => ':count မိနစ်|:count မိနစ်',
+ 'min' => ':count မိနစ်|:count မိနစ်',
+ 'second' => ':count စက္ကန့်|:count စက္ကန့်',
+ 's' => ':count စက္ကန့်|:count စက္ကန့်',
+ 'ago' => 'လွန်ခဲ့သော :time က',
+ 'from_now' => 'ယခုမှစ၍နောက် :time အကြာ',
+ 'after' => ':time ကြာပြီးနောက်',
+ 'before' => ':time မတိုင်ခင်',
+ 'diff_now' => 'အခုလေးတင်',
+ 'diff_yesterday' => 'မနေ့က',
+ 'diff_tomorrow' => 'မနက်ဖြန်',
+ 'diff_before_yesterday' => 'တမြန်နေ့က',
+ 'diff_after_tomorrow' => 'တဘက်ခါ',
+ 'period_recurrences' => ':count ကြိမ်',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ne.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ne.php
new file mode 100644
index 0000000..0b528df
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ne.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count वर्ष',
+ 'y' => ':count वर्ष',
+ 'month' => ':count महिना',
+ 'm' => ':count महिना',
+ 'week' => ':count हप्ता',
+ 'w' => ':count हप्ता',
+ 'day' => ':count दिन',
+ 'd' => ':count दिन',
+ 'hour' => ':count घण्टा',
+ 'h' => ':count घण्टा',
+ 'minute' => ':count मिनेट',
+ 'min' => ':count मिनेट',
+ 'second' => ':count सेकेण्ड',
+ 's' => ':count सेकेण्ड',
+ 'ago' => ':time पहिले',
+ 'from_now' => ':time देखि',
+ 'after' => ':time पछि',
+ 'before' => ':time अघि',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/nl.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/nl.php
index 00cd194..ec5a88e 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/nl.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/nl.php
@@ -1,4 +1,5 @@
'1 jaar|:count jaren',
- 'month' => '1 maand|:count maanden',
- 'week' => '1 week|:count weken',
- 'day' => '1 dag|:count dagen',
- 'hour' => ':count uur',
- 'minute' => '1 minuut|:count minuten',
- 'second' => '1 seconde|:count seconden',
- 'ago' => ':time geleden',
- 'from_now' => 'over :time',
- 'after' => ':time later',
- 'before' => ':time eerder',
+ 'year' => ':count jaar',
+ 'y' => ':count jaar',
+ 'month' => ':count maand|:count maanden',
+ 'm' => ':count maand|:count maanden',
+ 'week' => ':count week|:count weken',
+ 'w' => ':count week|:count weken',
+ 'day' => ':count dag|:count dagen',
+ 'd' => ':count dag|:count dagen',
+ 'hour' => ':count uur',
+ 'h' => ':count uur',
+ 'minute' => ':count minuut|:count minuten',
+ 'min' => ':count minuut|:count minuten',
+ 'second' => ':count seconde|:count seconden',
+ 's' => ':count seconde|:count seconden',
+ 'ago' => ':time geleden',
+ 'from_now' => 'over :time',
+ 'after' => ':time later',
+ 'before' => ':time eerder',
+ 'diff_now' => 'nu',
+ 'diff_yesterday' => 'gisteren',
+ 'diff_tomorrow' => 'morgen',
+ 'diff_after_tomorrow' => 'overmorgen',
+ 'diff_before_yesterday' => 'eergisteren',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/no.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/no.php
index 32a08c8..a6ece06 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/no.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/no.php
@@ -1,4 +1,5 @@
'1 år|:count år',
- 'month' => '1 måned|:count måneder',
- 'week' => '1 uke|:count uker',
- 'day' => '1 dag|:count dager',
- 'hour' => '1 time|:count timer',
- 'minute' => '1 minutt|:count minutter',
- 'second' => '1 sekund|:count sekunder',
- 'ago' => ':time siden',
- 'from_now' => 'om :time',
- 'after' => ':time etter',
- 'before' => ':time før'
+ 'year' => ':count år|:count år',
+ 'y' => ':count år|:count år',
+ 'month' => ':count måned|:count måneder',
+ 'm' => ':count måned|:count måneder',
+ 'week' => ':count uke|:count uker',
+ 'w' => ':count uke|:count uker',
+ 'day' => ':count dag|:count dager',
+ 'd' => ':count dag|:count dager',
+ 'hour' => ':count time|:count timer',
+ 'h' => ':count time|:count timer',
+ 'minute' => ':count minutt|:count minutter',
+ 'min' => ':count minutt|:count minutter',
+ 'second' => ':count sekund|:count sekunder',
+ 's' => ':count sekund|:count sekunder',
+ 'ago' => ':time siden',
+ 'from_now' => 'om :time',
+ 'after' => ':time etter',
+ 'before' => ':time før',
+ 'diff_now' => 'akkurat nå',
+ 'diff_yesterday' => 'i går',
+ 'diff_tomorrow' => 'i morgen',
+ 'diff_before_yesterday' => 'i forgårs',
+ 'diff_after_tomorrow' => 'i overmorgen',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/oc.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/oc.php
new file mode 100644
index 0000000..e89e94c
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/oc.php
@@ -0,0 +1,44 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+\Symfony\Component\Translation\PluralizationRules::set(function ($number) {
+ return $number == 1 ? 0 : 1;
+}, 'oc');
+
+return array(
+ 'year' => ':count an|:count ans',
+ 'y' => ':count an|:count ans',
+ 'month' => ':count mes|:count meses',
+ 'm' => ':count mes|:count meses',
+ 'week' => ':count setmana|:count setmanas',
+ 'w' => ':count setmana|:count setmanas',
+ 'day' => ':count jorn|:count jorns',
+ 'd' => ':count jorn|:count jorns',
+ 'hour' => ':count ora|:count oras',
+ 'h' => ':count ora|:count oras',
+ 'minute' => ':count minuta|:count minutas',
+ 'min' => ':count minuta|:count minutas',
+ 'second' => ':count segonda|:count segondas',
+ 's' => ':count segonda|:count segondas',
+ 'ago' => 'fa :time',
+ 'from_now' => 'dins :time',
+ 'after' => ':time aprèp',
+ 'before' => ':time abans',
+ 'diff_now' => 'ara meteis',
+ 'diff_yesterday' => 'ièr',
+ 'diff_tomorrow' => 'deman',
+ 'diff_before_yesterday' => 'ièr delà',
+ 'diff_after_tomorrow' => 'deman passat',
+ 'period_recurrences' => ':count còp|:count còps',
+ 'period_interval' => 'cada :interval',
+ 'period_start_date' => 'de :date',
+ 'period_end_date' => 'fins a :date',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/pl.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/pl.php
index 1381d90..2308af2 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/pl.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/pl.php
@@ -1,4 +1,5 @@
'1 rok|:count lata|:count lat',
- 'month' => '1 miesiąc|:count miesiące|:count miesięcy',
- 'week' => '1 tydzień|:count tygodnie|:count tygodni',
- 'day' => '1 dzień|:count dni|:count dni',
- 'hour' => '1 godzina|:count godziny|:count godzin',
- 'minute' => '1 minuta|:count minuty|:count minut',
- 'second' => '1 sekunda|:count sekundy|:count sekund',
- 'ago' => ':time temu',
- 'from_now' => ':time od teraz',
- 'after' => ':time przed',
- 'before' => ':time po'
+ 'year' => ':count rok|:count lata|:count lat',
+ 'y' => ':countr|:countl',
+ 'month' => ':count miesiąc|:count miesiące|:count miesięcy',
+ 'm' => ':countmies',
+ 'week' => ':count tydzień|:count tygodnie|:count tygodni',
+ 'w' => ':counttyg',
+ 'day' => ':count dzień|:count dni|:count dni',
+ 'd' => ':countd',
+ 'hour' => ':count godzina|:count godziny|:count godzin',
+ 'h' => ':countg',
+ 'minute' => ':count minuta|:count minuty|:count minut',
+ 'min' => ':countm',
+ 'second' => ':count sekunda|:count sekundy|:count sekund',
+ 's' => ':counts',
+ 'ago' => ':time temu',
+ 'from_now' => ':time od teraz',
+ 'after' => ':time po',
+ 'before' => ':time przed',
+ 'diff_now' => 'przed chwilą',
+ 'diff_yesterday' => 'wczoraj',
+ 'diff_tomorrow' => 'jutro',
+ 'diff_before_yesterday' => 'przedwczoraj',
+ 'diff_after_tomorrow' => 'pojutrze',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ps.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ps.php
new file mode 100644
index 0000000..15c3296
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ps.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count کال|:count کاله',
+ 'y' => ':countکال|:countکاله',
+ 'month' => ':count مياشت|:count مياشتي',
+ 'm' => ':countمياشت|:countمياشتي',
+ 'week' => ':count اونۍ|:count اونۍ',
+ 'w' => ':countاونۍ|:countاونۍ',
+ 'day' => ':count ورځ|:count ورځي',
+ 'd' => ':countورځ|:countورځي',
+ 'hour' => ':count ساعت|:count ساعته',
+ 'h' => ':countساعت|:countساعته',
+ 'minute' => ':count دقيقه|:count دقيقې',
+ 'min' => ':countدقيقه|:countدقيقې',
+ 'second' => ':count ثانيه|:count ثانيې',
+ 's' => ':countثانيه|:countثانيې',
+ 'ago' => ':time دمخه',
+ 'from_now' => ':time له اوس څخه',
+ 'after' => ':time وروسته',
+ 'before' => ':time دمخه',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/pt.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/pt.php
index 4ee091f..392b121 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/pt.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/pt.php
@@ -1,4 +1,5 @@
'1 ano|:count anos',
- 'month' => '1 mês|:count meses',
- 'week' => '1 semana|:count semanas',
- 'day' => '1 dia|:count dias',
- 'hour' => '1 hora|:count horas',
- 'minute' => '1 minuto|:count minutos',
- 'second' => '1 segundo|:count segundos',
- 'ago' => ':time atrás',
- 'from_now' => 'em :time',
- 'after' => ':time depois',
- 'before' => ':time antes'
+ 'year' => ':count ano|:count anos',
+ 'y' => ':count ano|:count anos',
+ 'month' => ':count mês|:count meses',
+ 'm' => ':count mês|:count meses',
+ 'week' => ':count semana|:count semanas',
+ 'w' => ':count semana|:count semanas',
+ 'day' => ':count dia|:count dias',
+ 'd' => ':count dia|:count dias',
+ 'hour' => ':count hora|:count horas',
+ 'h' => ':count hora|:count horas',
+ 'minute' => ':count minuto|:count minutos',
+ 'min' => ':count minuto|:count minutos',
+ 'second' => ':count segundo|:count segundos',
+ 's' => ':count segundo|:count segundos',
+ 'ago' => ':time atrás',
+ 'from_now' => 'em :time',
+ 'after' => ':time depois',
+ 'before' => ':time antes',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
index cd9a90e..1f84eac 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
@@ -1,4 +1,5 @@
'1 ano|:count anos',
- 'month' => '1 mês|:count meses',
- 'week' => '1 semana|:count semanas',
- 'day' => '1 dia|:count dias',
- 'hour' => '1 hora|:count horas',
- 'minute' => '1 minuto|:count minutos',
- 'second' => '1 segundo|:count segundos',
- 'ago' => 'há :time',
- 'from_now' => 'dentro de :time',
- 'after' => 'após :time',
- 'before' => ':time atrás',
+ 'year' => ':count ano|:count anos',
+ 'y' => ':counta|:counta',
+ 'month' => ':count mês|:count meses',
+ 'm' => ':countm|:countm',
+ 'week' => ':count semana|:count semanas',
+ 'w' => ':countsem|:countsem',
+ 'day' => ':count dia|:count dias',
+ 'd' => ':countd|:countd',
+ 'hour' => ':count hora|:count horas',
+ 'h' => ':counth|:counth',
+ 'minute' => ':count minuto|:count minutos',
+ 'min' => ':countmin|:countmin',
+ 'second' => ':count segundo|:count segundos',
+ 's' => ':counts|:counts',
+ 'ago' => 'há :time',
+ 'from_now' => 'em :time',
+ 'after' => 'após :time',
+ 'before' => ':time atrás',
+ 'diff_now' => 'agora',
+ 'diff_yesterday' => 'ontem',
+ 'diff_tomorrow' => 'amanhã',
+ 'diff_before_yesterday' => 'anteontem',
+ 'diff_after_tomorrow' => 'depois de amanhã',
+ 'period_recurrences' => 'uma|:count vez',
+ 'period_interval' => 'toda :interval',
+ 'period_start_date' => 'de :date',
+ 'period_end_date' => 'até :date',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ro.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ro.php
index bd812f0..cc16724 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/ro.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ro.php
@@ -1,4 +1,5 @@
'un an|:count ani|:count ani',
- 'month' => 'o lună|:count luni|:count luni',
- 'week' => 'o săptămână|:count săptămâni|:count săptămâni',
- 'day' => 'o zi|:count zile|:count zile',
- 'hour' => 'o oră|:count ore|:count ore',
- 'minute' => 'un minut|:count minute|:count minute',
- 'second' => 'o secundă|:count secunde|:count secunde',
- 'ago' => 'acum :time',
- 'from_now' => ':time de acum',
- 'after' => 'peste :time',
- 'before' => 'acum :time'
+ 'year' => 'un an|:count ani|:count ani',
+ 'y' => 'un an|:count ani|:count ani',
+ 'month' => 'o lună|:count luni|:count luni',
+ 'm' => 'o lună|:count luni|:count luni',
+ 'week' => 'o săptămână|:count săptămâni|:count săptămâni',
+ 'w' => 'o săptămână|:count săptămâni|:count săptămâni',
+ 'day' => 'o zi|:count zile|:count zile',
+ 'd' => 'o zi|:count zile|:count zile',
+ 'hour' => 'o oră|:count ore|:count ore',
+ 'h' => 'o oră|:count ore|:count ore',
+ 'minute' => 'un minut|:count minute|:count minute',
+ 'min' => 'un minut|:count minute|:count minute',
+ 'second' => 'o secundă|:count secunde|:count secunde',
+ 's' => 'o secundă|:count secunde|:count secunde',
+ 'ago' => 'acum :time',
+ 'from_now' => ':time de acum',
+ 'after' => 'peste :time',
+ 'before' => 'acum :time',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ru.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
index c843c35..6a83fb1 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
@@ -1,4 +1,5 @@
':count год|:count года|:count лет',
- 'month' => ':count месяц|:count месяца|:count месяцев',
- 'week' => ':count неделю|:count недели|:count недель',
- 'day' => ':count день|:count дня|:count дней',
- 'hour' => ':count час|:count часа|:count часов',
- 'minute' => ':count минуту|:count минуты|:count минут',
- 'second' => ':count секунду|:count секунды|:count секунд',
- 'ago' => ':time назад',
- 'from_now' => 'через :time',
- 'after' => ':time после',
- 'before' => ':time до'
+ 'year' => ':count год|:count года|:count лет',
+ 'y' => ':count г|:count г|:count л',
+ 'month' => ':count месяц|:count месяца|:count месяцев',
+ 'm' => ':count м|:count м|:count м',
+ 'week' => ':count неделю|:count недели|:count недель',
+ 'w' => ':count н|:count н|:count н',
+ 'day' => ':count день|:count дня|:count дней',
+ 'd' => ':count д|:count д|:count д',
+ 'hour' => ':count час|:count часа|:count часов',
+ 'h' => ':count ч|:count ч|:count ч',
+ 'minute' => ':count минуту|:count минуты|:count минут',
+ 'min' => ':count мин|:count мин|:count мин',
+ 'second' => ':count секунду|:count секунды|:count секунд',
+ 's' => ':count с|:count с|:count с',
+ 'ago' => ':time назад',
+ 'from_now' => 'через :time',
+ 'after' => ':time после',
+ 'before' => ':time до',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sh.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sh.php
new file mode 100644
index 0000000..57f287a
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sh.php
@@ -0,0 +1,35 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+\Symfony\Component\Translation\PluralizationRules::set(function ($number) {
+ return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+}, 'sh');
+
+return array(
+ 'year' => ':count godina|:count godine|:count godina',
+ 'y' => ':count godina|:count godine|:count godina',
+ 'month' => ':count mesec|:count meseca|:count meseci',
+ 'm' => ':count mesec|:count meseca|:count meseci',
+ 'week' => ':count nedelja|:count nedelje|:count nedelja',
+ 'w' => ':count nedelja|:count nedelje|:count nedelja',
+ 'day' => ':count dan|:count dana|:count dana',
+ 'd' => ':count dan|:count dana|:count dana',
+ 'hour' => ':count čas|:count časa|:count časova',
+ 'h' => ':count čas|:count časa|:count časova',
+ 'minute' => ':count minut|:count minuta|:count minuta',
+ 'min' => ':count minut|:count minuta|:count minuta',
+ 'second' => ':count sekund|:count sekunda|:count sekundi',
+ 's' => ':count sekund|:count sekunda|:count sekundi',
+ 'ago' => 'pre :time',
+ 'from_now' => 'za :time',
+ 'after' => 'nakon :time',
+ 'before' => ':time raniјe',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sk.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
index 8729e45..6101344 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
@@ -1,4 +1,5 @@
'rok|:count roky|:count rokov',
- 'month' => 'mesiac|:count mesiace|:count mesiacov',
- 'week' => 'týždeň|:count týždne|:count týždňov',
- 'day' => 'deň|:count dni|:count dní',
- 'hour' => 'hodinu|:count hodiny|:count hodín',
- 'minute' => 'minútu|:count minúty|:count minút',
- 'second' => 'sekundu|:count sekundy|:count sekúnd',
- 'ago' => 'pred :time',
- 'from_now' => 'za :time',
- 'after' => ':time neskôr',
- 'before' => ':time predtým'
+ 'year' => 'rok|:count roky|:count rokov',
+ 'y' => 'rok|:count roky|:count rokov',
+ 'month' => 'mesiac|:count mesiace|:count mesiacov',
+ 'm' => 'mesiac|:count mesiace|:count mesiacov',
+ 'week' => 'týždeň|:count týždne|:count týždňov',
+ 'w' => 'týždeň|:count týždne|:count týždňov',
+ 'day' => 'deň|:count dni|:count dní',
+ 'd' => 'deň|:count dni|:count dní',
+ 'hour' => 'hodinu|:count hodiny|:count hodín',
+ 'h' => 'hodinu|:count hodiny|:count hodín',
+ 'minute' => 'minútu|:count minúty|:count minút',
+ 'min' => 'minútu|:count minúty|:count minút',
+ 'second' => 'sekundu|:count sekundy|:count sekúnd',
+ 's' => 'sekundu|:count sekundy|:count sekúnd',
+ 'ago' => 'pred :time',
+ 'from_now' => 'za :time',
+ 'after' => 'o :time neskôr',
+ 'before' => ':time predtým',
+ 'year_ago' => 'rokom|:count rokmi|:count rokmi',
+ 'month_ago' => 'mesiacom|:count mesiacmi|:count mesiacmi',
+ 'week_ago' => 'týždňom|:count týždňami|:count týždňami',
+ 'day_ago' => 'dňom|:count dňami|:count dňami',
+ 'hour_ago' => 'hodinou|:count hodinami|:count hodinami',
+ 'minute_ago' => 'minútou|:count minútami|:count minútami',
+ 'second_ago' => 'sekundou|:count sekundami|:count sekundami',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sl.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sl.php
index 8149a5d..06686d1 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/sl.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sl.php
@@ -1,4 +1,5 @@
':count leto|:count leti|:count leta|:count let',
- 'month' => ':count mesec|:count meseca|:count mesece|:count mesecev',
- 'week' => ':count teden|:count tedna|:count tedne|:count tednov',
- 'day' => ':count dan|:count dni|:count dni|:count dni',
- 'hour' => ':count uro|:count uri|:count ure|:count ur',
- 'minute' => ':count minuto|:count minuti|:count minute|:count minut',
- 'second' => ':count sekundo|:count sekundi|:count sekunde|:count sekund',
- 'year_ago' => ':count letom|:count leti|:count leti|:count leti',
+ 'year' => ':count leto|:count leti|:count leta|:count let',
+ 'y' => ':count leto|:count leti|:count leta|:count let',
+ 'month' => ':count mesec|:count meseca|:count mesece|:count mesecev',
+ 'm' => ':count mesec|:count meseca|:count mesece|:count mesecev',
+ 'week' => ':count teden|:count tedna|:count tedne|:count tednov',
+ 'w' => ':count teden|:count tedna|:count tedne|:count tednov',
+ 'day' => ':count dan|:count dni|:count dni|:count dni',
+ 'd' => ':count dan|:count dni|:count dni|:count dni',
+ 'hour' => ':count uro|:count uri|:count ure|:count ur',
+ 'h' => ':count uro|:count uri|:count ure|:count ur',
+ 'minute' => ':count minuto|:count minuti|:count minute|:count minut',
+ 'min' => ':count minuto|:count minuti|:count minute|:count minut',
+ 'second' => ':count sekundo|:count sekundi|:count sekunde|:count sekund',
+ 's' => ':count sekundo|:count sekundi|:count sekunde|:count sekund',
+ 'year_ago' => ':count letom|:count leti|:count leti|:count leti',
'month_ago' => ':count mesecem|:count meseci|:count meseci|:count meseci',
- 'week_ago' => ':count tednom|:count tednoma|:count tedni|:count tedni',
- 'day_ago' => ':count dnem|:count dnevoma|:count dnevi|:count dnevi',
- 'hour_ago' => ':count uro|:count urama|:count urami|:count urami',
- 'minute_ago'=> ':count minuto|:count minutama|:count minutami|:count minutami',
- 'second_ago'=> ':count sekundo|:count sekundama|:count sekundami|:count sekundami',
- 'ago' => 'pred :time',
- 'from_now' => 'čez :time',
- 'after' => 'čez :time',
- 'before' => 'pred :time'
+ 'week_ago' => ':count tednom|:count tednoma|:count tedni|:count tedni',
+ 'day_ago' => ':count dnem|:count dnevoma|:count dnevi|:count dnevi',
+ 'hour_ago' => ':count uro|:count urama|:count urami|:count urami',
+ 'minute_ago' => ':count minuto|:count minutama|:count minutami|:count minutami',
+ 'second_ago' => ':count sekundo|:count sekundama|:count sekundami|:count sekundami',
+ 'ago' => 'pred :time',
+ 'from_now' => 'čez :time',
+ 'after' => 'čez :time',
+ 'before' => 'pred :time',
+ 'diff_now' => 'ravnokar',
+ 'diff_yesterday' => 'včeraj',
+ 'diff_tomorrow' => 'jutri',
+ 'diff_before_yesterday' => 'predvčerajšnjim',
+ 'diff_after_tomorrow' => 'pojutrišnjem',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sq.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sq.php
index 4778260..6e138a0 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/sq.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sq.php
@@ -9,20 +9,23 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => '1 vit|:count vjet',
- 'month' => '1 muaj|:count muaj',
- 'week' => '1 javë|:count javë',
- 'day' => '1 ditë|:count ditë',
- 'hour' => '1 orë|:count orë',
- 'minute' => '1 minutë|:count minuta',
- 'second' => '1 sekondë|:count sekonda',
- 'ago' => ':time më parë',
- 'from_now' => ':time nga tani',
- 'after' => ':time pas',
- 'before' => ':time para',
+ 'year' => ':count vit|:count vjet',
+ 'y' => ':count vit|:count vjet',
+ 'month' => ':count muaj|:count muaj',
+ 'm' => ':count muaj|:count muaj',
+ 'week' => ':count javë|:count javë',
+ 'w' => ':count javë|:count javë',
+ 'day' => ':count ditë|:count ditë',
+ 'd' => ':count ditë|:count ditë',
+ 'hour' => ':count orë|:count orë',
+ 'h' => ':count orë|:count orë',
+ 'minute' => ':count minutë|:count minuta',
+ 'min' => ':count minutë|:count minuta',
+ 'second' => ':count sekondë|:count sekonda',
+ 's' => ':count sekondë|:count sekonda',
+ 'ago' => ':time më parë',
+ 'from_now' => ':time nga tani',
+ 'after' => ':time pas',
+ 'before' => ':time para',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sr.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr.php
index af060fa..5a10642 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/sr.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr.php
@@ -1,4 +1,5 @@
':count godina|:count godine|:count godina',
- 'month' => ':count mesec|:count meseca|:count meseci',
- 'week' => ':count nedelja|:count nedelje|:count nedelja',
- 'day' => ':count dan|:count dana|:count dana',
- 'hour' => ':count sat|:count sata|:count sati',
- 'minute' => ':count minut|:count minuta |:count minuta',
- 'second' => ':count sekund|:count sekunde|:count sekunde',
- 'ago' => 'pre :time',
- 'from_now' => ':time od sada',
- 'after' => 'nakon :time',
- 'before' => 'pre :time'
+ 'year' => ':count godina|:count godine|:count godina',
+ 'y' => ':count godina|:count godine|:count godina',
+ 'month' => ':count mesec|:count meseca|:count meseci',
+ 'm' => ':count mesec|:count meseca|:count meseci',
+ 'week' => ':count nedelja|:count nedelje|:count nedelja',
+ 'w' => ':count nedelja|:count nedelje|:count nedelja',
+ 'day' => ':count dan|:count dana|:count dana',
+ 'd' => ':count dan|:count dana|:count dana',
+ 'hour' => ':count sat|:count sata|:count sati',
+ 'h' => ':count sat|:count sata|:count sati',
+ 'minute' => ':count minut|:count minuta |:count minuta',
+ 'min' => ':count minut|:count minuta |:count minuta',
+ 'second' => ':count sekund|:count sekunde|:count sekunde',
+ 's' => ':count sekund|:count sekunde|:count sekunde',
+ 'ago' => 'pre :time',
+ 'from_now' => ':time od sada',
+ 'after' => 'nakon :time',
+ 'before' => 'pre :time',
+
+ 'year_from_now' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
+ 'year_ago' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
+
+ 'week_from_now' => '{1} :count nedelju|{2,3,4} :count nedelje|[5,Inf[ :count nedelja',
+ 'week_ago' => '{1} :count nedelju|{2,3,4} :count nedelje|[5,Inf[ :count nedelja',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php
new file mode 100644
index 0000000..2db83ed
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl.php
@@ -0,0 +1,43 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => '{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count године|[0,Inf[ :count година',
+ 'y' => ':count г.',
+ 'month' => '{1} :count месец|{2,3,4}:count месеца|[5,Inf[ :count месеци',
+ 'm' => ':count м.',
+ 'week' => '{1} :count недеља|{2,3,4}:count недеље|[5,Inf[ :count недеља',
+ 'w' => ':count нед.',
+ 'day' => '{1,21,31} :count дан|[2,Inf[ :count дана',
+ 'd' => ':count д.',
+ 'hour' => '{1,21} :count сат|{2,3,4,22,23,24}:count сата|[5,Inf[ :count сати',
+ 'h' => ':count ч.',
+ 'minute' => '{1,21,31,41,51} :count минут|[2,Inf[ :count минута',
+ 'min' => ':count мин.',
+ 'second' => '{1,21,31,41,51} :count секунд|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count секунде|[5,Inf[:count секунди',
+ 's' => ':count сек.',
+ 'ago' => 'пре :time',
+ 'from_now' => 'за :time',
+ 'after' => ':time након',
+ 'before' => ':time пре',
+
+ 'year_from_now' => '{1,21,31,41,51} :count годину|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count године|[5,Inf[ :count година',
+ 'year_ago' => '{1,21,31,41,51} :count годину|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count године|[5,Inf[ :count година',
+
+ 'week_from_now' => '{1} :count недељу|{2,3,4} :count недеље|[5,Inf[ :count недеља',
+ 'week_ago' => '{1} :count недељу|{2,3,4} :count недеље|[5,Inf[ :count недеља',
+
+ 'diff_now' => 'управо сада',
+ 'diff_yesterday' => 'јуче',
+ 'diff_tomorrow' => 'сутра',
+ 'diff_before_yesterday' => 'прекјуче',
+ 'diff_after_tomorrow' => 'прекосутра',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php
new file mode 100644
index 0000000..18214c4
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php
@@ -0,0 +1,43 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => '{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count године|[0,Inf[ :count година',
+ 'y' => ':count г.',
+ 'month' => '{1} :count мјесец|{2,3,4}:count мјесеца|[5,Inf[ :count мјесеци',
+ 'm' => ':count мј.',
+ 'week' => '{1} :count недјеља|{2,3,4}:count недјеље|[5,Inf[ :count недјеља',
+ 'w' => ':count нед.',
+ 'day' => '{1,21,31} :count дан|[2,Inf[ :count дана',
+ 'd' => ':count д.',
+ 'hour' => '{1,21} :count сат|{2,3,4,22,23,24}:count сата|[5,Inf[ :count сати',
+ 'h' => ':count ч.',
+ 'minute' => '{1,21,31,41,51} :count минут|[2,Inf[ :count минута',
+ 'min' => ':count мин.',
+ 'second' => '{1,21,31,41,51} :count секунд|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count секунде|[5,Inf[:count секунди',
+ 's' => ':count сек.',
+ 'ago' => 'прије :time',
+ 'from_now' => 'за :time',
+ 'after' => ':time након',
+ 'before' => ':time прије',
+
+ 'year_from_now' => '{1,21,31,41,51} :count годину|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count године|[5,Inf[ :count година',
+ 'year_ago' => '{1,21,31,41,51} :count годину|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count године|[5,Inf[ :count година',
+
+ 'week_from_now' => '{1} :count недјељу|{2,3,4} :count недјеље|[5,Inf[ :count недјеља',
+ 'week_ago' => '{1} :count недјељу|{2,3,4} :count недјеље|[5,Inf[ :count недјеља',
+
+ 'diff_now' => 'управо сада',
+ 'diff_yesterday' => 'јуче',
+ 'diff_tomorrow' => 'сутра',
+ 'diff_before_yesterday' => 'прекјуче',
+ 'diff_after_tomorrow' => 'прекосјутра',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php
new file mode 100644
index 0000000..2d2e288
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php
@@ -0,0 +1,43 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => '{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count godine|[0,Inf[ :count godina',
+ 'y' => ':count g.',
+ 'month' => '{1} :count mjesec|{2,3,4}:count mjeseca|[5,Inf[ :count mjeseci',
+ 'm' => ':count mj.',
+ 'week' => '{1} :count nedjelja|{2,3,4}:count nedjelje|[5,Inf[ :count nedjelja',
+ 'w' => ':count ned.',
+ 'day' => '{1,21,31} :count dan|[2,Inf[ :count dana',
+ 'd' => ':count d.',
+ 'hour' => '{1,21} :count sat|{2,3,4,22,23,24}:count sata|[5,Inf[ :count sati',
+ 'h' => ':count č.',
+ 'minute' => '{1,21,31,41,51} :count minut|[2,Inf[ :count minuta',
+ 'min' => ':count min.',
+ 'second' => '{1,21,31,41,51} :count sekund|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count sekunde|[5,Inf[:count sekundi',
+ 's' => ':count sek.',
+ 'ago' => 'prije :time',
+ 'from_now' => 'za :time',
+ 'after' => ':time nakon',
+ 'before' => ':time prije',
+
+ 'year_from_now' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
+ 'year_ago' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
+
+ 'week_from_now' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja',
+ 'week_ago' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja',
+
+ 'diff_now' => 'upravo sada',
+ 'diff_yesterday' => 'juče',
+ 'diff_tomorrow' => 'sutra',
+ 'diff_before_yesterday' => 'prekjuče',
+ 'diff_after_tomorrow' => 'preksutra',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php
new file mode 100644
index 0000000..7ebf6f0
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php
@@ -0,0 +1,12 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return require __DIR__.'/sr_Latn_ME.php';
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sv.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sv.php
index 54f61fc..89a03b4 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/sv.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sv.php
@@ -1,4 +1,5 @@
'1 år|:count år',
- 'month' => '1 månad|:count månader',
- 'week' => '1 vecka|:count veckor',
- 'day' => '1 dag|:count dagar',
- 'hour' => '1 timme|:count timmar',
- 'minute' => '1 minut|:count minuter',
- 'second' => '1 sekund|:count sekunder',
- 'ago' => ':time sedan',
- 'from_now' => 'om :time',
- 'after' => ':time efter',
- 'before' => ':time före'
+ 'year' => ':count år|:count år',
+ 'y' => ':count år|:count år',
+ 'month' => ':count månad|:count månader',
+ 'm' => ':count månad|:count månader',
+ 'week' => ':count vecka|:count veckor',
+ 'w' => ':count vecka|:count veckor',
+ 'day' => ':count dag|:count dagar',
+ 'd' => ':count dag|:count dagar',
+ 'hour' => ':count timme|:count timmar',
+ 'h' => ':count timme|:count timmar',
+ 'minute' => ':count minut|:count minuter',
+ 'min' => ':count minut|:count minuter',
+ 'second' => ':count sekund|:count sekunder',
+ 's' => ':count sekund|:count sekunder',
+ 'ago' => ':time sedan',
+ 'from_now' => 'om :time',
+ 'after' => ':time efter',
+ 'before' => ':time före',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/sw.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/sw.php
new file mode 100644
index 0000000..52f0342
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/sw.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => 'mwaka 1|miaka :count',
+ 'y' => 'mwaka 1|miaka :count',
+ 'month' => 'mwezi 1|miezi :count',
+ 'm' => 'mwezi 1|miezi :count',
+ 'week' => 'wiki 1|wiki :count',
+ 'w' => 'wiki 1|wiki :count',
+ 'day' => 'siku 1|siku :count',
+ 'd' => 'siku 1|siku :count',
+ 'hour' => 'saa 1|masaa :count',
+ 'h' => 'saa 1|masaa :count',
+ 'minute' => 'dakika 1|dakika :count',
+ 'min' => 'dakika 1|dakika :count',
+ 'second' => 'sekunde 1|sekunde :count',
+ 's' => 'sekunde 1|sekunde :count',
+ 'ago' => ':time ziliyopita',
+ 'from_now' => ':time kwanzia sasa',
+ 'after' => ':time baada',
+ 'before' => ':time kabla',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/th.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/th.php
index 13459bc..88bb4ac 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/th.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/th.php
@@ -1,4 +1,5 @@
'1 ปี|:count ปี',
- 'month' => '1 เดือน|:count เดือน',
- 'week' => '1 สัปดาห์|:count สัปดาห์',
- 'day' => '1 วัน|:count วัน',
- 'hour' => '1 ชั่วโมง|:count ชั่วโมง',
- 'minute' => '1 นาที|:count นาที',
- 'second' => '1 วินาที|:count วินาที',
- 'ago' => ':time ที่แล้ว',
- 'from_now' => ':time จากนี้',
- 'after' => 'หลัง:time',
- 'before' => 'ก่อน:time'
+ 'year' => ':count ปี',
+ 'y' => ':count ปี',
+ 'month' => ':count เดือน',
+ 'm' => ':count เดือน',
+ 'week' => ':count สัปดาห์',
+ 'w' => ':count สัปดาห์',
+ 'day' => ':count วัน',
+ 'd' => ':count วัน',
+ 'hour' => ':count ชั่วโมง',
+ 'h' => ':count ชั่วโมง',
+ 'minute' => ':count นาที',
+ 'min' => ':count นาที',
+ 'second' => ':count วินาที',
+ 's' => ':count วินาที',
+ 'ago' => ':timeที่แล้ว',
+ 'from_now' => ':timeต่อจากนี้',
+ 'after' => ':timeหลังจากนี้',
+ 'before' => ':timeก่อน',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/tr.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/tr.php
index d7f5134..6a9dfed 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/tr.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/tr.php
@@ -9,20 +9,23 @@
* file that was distributed with this source code.
*/
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
return array(
- 'year' => ':count yıl',
- 'month' => ':count ay',
- 'week' => ':count hafta',
- 'day' => ':count gün',
- 'hour' => ':count saat',
- 'minute' => ':count dakika',
- 'second' => ':count saniye',
- 'ago' => ':time önce',
- 'from_now' => ':time andan itibaren',
- 'after' => ':time sonra',
- 'before' => ':time önce',
+ 'year' => ':count yıl',
+ 'y' => ':count yıl',
+ 'month' => ':count ay',
+ 'm' => ':count ay',
+ 'week' => ':count hafta',
+ 'w' => ':count hafta',
+ 'day' => ':count gün',
+ 'd' => ':count gün',
+ 'hour' => ':count saat',
+ 'h' => ':count saat',
+ 'minute' => ':count dakika',
+ 'min' => ':count dakika',
+ 'second' => ':count saniye',
+ 's' => ':count saniye',
+ 'ago' => ':time önce',
+ 'from_now' => ':time sonra',
+ 'after' => ':time sonra',
+ 'before' => ':time önce',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/uk.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
index 6a23d27..8d08eaa 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
@@ -1,4 +1,5 @@
':count рік|:count роки|:count років',
- 'month' => ':count місяць|:count місяці|:count місяців',
- 'week' => ':count тиждень|:count тижні|:count тижнів',
- 'day' => ':count день|:count дні|:count днів',
- 'hour' => ':count година|:count години|:count годин',
- 'minute' => ':count хвилину|:count хвилини|:count хвилин',
- 'second' => ':count секунду|:count секунди|:count секунд',
- 'ago' => ':time назад',
- 'from_now' => 'через :time',
- 'after' => ':time після',
- 'before' => ':time до'
+ 'year' => ':count рік|:count роки|:count років',
+ 'y' => ':count рік|:count роки|:count років',
+ 'month' => ':count місяць|:count місяці|:count місяців',
+ 'm' => ':count місяць|:count місяці|:count місяців',
+ 'week' => ':count тиждень|:count тижні|:count тижнів',
+ 'w' => ':count тиждень|:count тижні|:count тижнів',
+ 'day' => ':count день|:count дні|:count днів',
+ 'd' => ':count день|:count дні|:count днів',
+ 'hour' => ':count година|:count години|:count годин',
+ 'h' => ':count година|:count години|:count годин',
+ 'minute' => ':count хвилину|:count хвилини|:count хвилин',
+ 'min' => ':count хвилину|:count хвилини|:count хвилин',
+ 'second' => ':count секунду|:count секунди|:count секунд',
+ 's' => ':count секунду|:count секунди|:count секунд',
+ 'ago' => ':time тому',
+ 'from_now' => 'через :time',
+ 'after' => ':time після',
+ 'before' => ':time до',
+ 'diff_now' => 'щойно',
+ 'diff_yesterday' => 'вчора',
+ 'diff_tomorrow' => 'завтра',
+ 'diff_before_yesterday' => 'позавчора',
+ 'diff_after_tomorrow' => 'післязавтра',
+ 'period_recurrences' => 'один раз|:count рази|:count разів',
+ 'period_interval' => 'кожні :interval',
+ 'period_start_date' => 'з :date',
+ 'period_end_date' => 'до :date',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/ur.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/ur.php
new file mode 100644
index 0000000..3c5f7ed
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/ur.php
@@ -0,0 +1,24 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count سال',
+ 'month' => ':count ماه',
+ 'week' => ':count ہفتے',
+ 'day' => ':count روز',
+ 'hour' => ':count گھنٹے',
+ 'minute' => ':count منٹ',
+ 'second' => ':count سیکنڈ',
+ 'ago' => ':time پہلے',
+ 'from_now' => ':time بعد',
+ 'after' => ':time بعد',
+ 'before' => ':time پہلے',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/uz.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/uz.php
index d9a5efa..1cb6f71 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/uz.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/uz.php
@@ -1,4 +1,5 @@
':count yil|:count yil|:count yil',
- 'month' => ':count oy|:count oy|:count oylar',
- 'week' => ':count hafta|:count hafta|:count hafta',
- 'day' => ':count kun|:count kun|:count kun',
- 'hour' => ':count soat|:count soat|:count soat',
- 'minute' => ':count minut|:count minut|:count minut',
- 'second' => ':count sekund|:count sekund|:count sekund',
- 'ago' => ':time avval',
- 'from_now' => 'keyin :time',
- 'after' => ':time keyin',
- 'before' => ':time gacha'
+ 'year' => ':count yil',
+ 'y' => ':count yil',
+ 'month' => ':count oy',
+ 'm' => ':count oy',
+ 'week' => ':count hafta',
+ 'w' => ':count hafta',
+ 'day' => ':count kun',
+ 'd' => ':count kun',
+ 'hour' => ':count soat',
+ 'h' => ':count soat',
+ 'minute' => ':count daqiqa',
+ 'min' => ':count daq',
+ 'second' => ':count soniya',
+ 's' => ':count s',
+ 'ago' => ':time avval',
+ 'from_now' => ':time dan keyin',
+ 'after' => ':time keyin',
+ 'before' => ':time oldin',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/vi.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/vi.php
index e0e8dfc..3f9838d 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/vi.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/vi.php
@@ -1,4 +1,5 @@
':count năm',
- 'month' => ':count tháng',
- 'week' => ':count tuần',
- 'day' => ':count ngày',
- 'hour' => ':count giờ',
- 'minute' => ':count phút',
- 'second' => ':count giây',
- 'ago' => ':time trước',
- 'from_now' => ':time từ bây giờ',
- 'after' => ':time sau',
- 'before' => ':time trước'
+ 'year' => ':count năm',
+ 'y' => ':count năm',
+ 'month' => ':count tháng',
+ 'm' => ':count tháng',
+ 'week' => ':count tuần',
+ 'w' => ':count tuần',
+ 'day' => ':count ngày',
+ 'd' => ':count ngày',
+ 'hour' => ':count giờ',
+ 'h' => ':count giờ',
+ 'minute' => ':count phút',
+ 'min' => ':count phút',
+ 'second' => ':count giây',
+ 's' => ':count giây',
+ 'ago' => ':time trước',
+ 'from_now' => ':time từ bây giờ',
+ 'after' => ':time sau',
+ 'before' => ':time trước',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/zh-TW.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/zh-TW.php
deleted file mode 100644
index 30f0825..0000000
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/zh-TW.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/**
- * Translation messages. See http://symfony.com/doc/current/book/translation.html
- * for possible formats.
- */
-/**
- * Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/zh-TW/date.php
- */
-return array(
- 'year' => ':count 年',
- 'month' => ':count 月',
- 'week' => ':count 周',
- 'day' => ':count 天',
- 'hour' => ':count 小時',
- 'minute' => ':count 分鐘',
- 'second' => ':count 秒',
- 'ago' => ':time前',
- 'from_now' => '距現在 :time',
- 'after' => ':time後',
- 'before' => ':time前'
-);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/zh.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/zh.php
index 58ea74f..9e1f6ca 100644
--- a/application/vendor/nesbot/carbon/src/Carbon/Lang/zh.php
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/zh.php
@@ -1,4 +1,5 @@
':count年',
- 'month' => ':count月',
- 'week' => ':count周',
- 'day' => ':count天',
- 'hour' => ':count小时',
- 'minute' => ':count分钟',
- 'second' => ':count秒',
- 'ago' => ':time前',
- 'from_now' => ':time距现在',
- 'after' => ':time后',
- 'before' => ':time前'
+ 'year' => ':count年',
+ 'y' => ':count年',
+ 'month' => ':count个月',
+ 'm' => ':count个月',
+ 'week' => ':count周',
+ 'w' => ':count周',
+ 'day' => ':count天',
+ 'd' => ':count天',
+ 'hour' => ':count小时',
+ 'h' => ':count小时',
+ 'minute' => ':count分钟',
+ 'min' => ':count分钟',
+ 'second' => ':count秒',
+ 's' => ':count秒',
+ 'ago' => ':time前',
+ 'from_now' => '距现在:time',
+ 'after' => ':time后',
+ 'before' => ':time前',
);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php b/application/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php
new file mode 100644
index 0000000..c848723
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php
@@ -0,0 +1,31 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+ 'year' => ':count年',
+ 'y' => ':count年',
+ 'month' => ':count月',
+ 'm' => ':count月',
+ 'week' => ':count週',
+ 'w' => ':count週',
+ 'day' => ':count天',
+ 'd' => ':count天',
+ 'hour' => ':count小時',
+ 'h' => ':count小時',
+ 'minute' => ':count分鐘',
+ 'min' => ':count分鐘',
+ 'second' => ':count秒',
+ 's' => ':count秒',
+ 'ago' => ':time前',
+ 'from_now' => '距現在:time',
+ 'after' => ':time後',
+ 'before' => ':time前',
+);
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php b/application/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php
new file mode 100644
index 0000000..4d83b0c
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php
@@ -0,0 +1,37 @@
+app['events'];
+ if ($events instanceof EventDispatcher || $events instanceof Dispatcher) {
+ $events->listen(class_exists('Illuminate\Foundation\Events\LocaleUpdated') ? 'Illuminate\Foundation\Events\LocaleUpdated' : 'locale.changed', function () use ($service) {
+ $service->updateLocale();
+ });
+ $service->updateLocale();
+ }
+ }
+
+ public function updateLocale()
+ {
+ $translator = $this->app['translator'];
+ if ($translator instanceof Translator || $translator instanceof IlluminateTranslator) {
+ Carbon::setLocale($translator->getLocale());
+ }
+ }
+
+ public function register()
+ {
+ // Needed for Laravel < 5.3 compatibility
+ }
+}
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Translator.php b/application/vendor/nesbot/carbon/src/Carbon/Translator.php
new file mode 100644
index 0000000..12115b0
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Translator.php
@@ -0,0 +1,143 @@
+addLoader('array', new Translation\Loader\ArrayLoader());
+ parent::__construct($locale, $formatter, $cacheDir, $debug);
+ }
+
+ /**
+ * Reset messages of a locale (all locale if no locale passed).
+ * Remove custom messages and reload initial messages from matching
+ * file in Lang directory.
+ *
+ * @param string|null $locale
+ *
+ * @return bool
+ */
+ public function resetMessages($locale = null)
+ {
+ if ($locale === null) {
+ static::$messages = array();
+
+ return true;
+ }
+
+ if (file_exists($filename = __DIR__.'/Lang/'.$locale.'.php')) {
+ static::$messages[$locale] = require $filename;
+ $this->addResource('array', static::$messages[$locale], $locale);
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Init messages language from matching file in Lang directory.
+ *
+ * @param string $locale
+ *
+ * @return bool
+ */
+ protected function loadMessagesFromFile($locale)
+ {
+ if (isset(static::$messages[$locale])) {
+ return true;
+ }
+
+ return $this->resetMessages($locale);
+ }
+
+ /**
+ * Set messages of a locale and take file first if present.
+ *
+ * @param string $locale
+ * @param array $messages
+ *
+ * @return $this
+ */
+ public function setMessages($locale, $messages)
+ {
+ $this->loadMessagesFromFile($locale);
+ $this->addResource('array', $messages, $locale);
+ static::$messages[$locale] = array_merge(
+ isset(static::$messages[$locale]) ? static::$messages[$locale] : array(),
+ $messages
+ );
+
+ return $this;
+ }
+
+ /**
+ * Get messages of a locale, if none given, return all the
+ * languages.
+ *
+ * @param string|null $locale
+ *
+ * @return array
+ */
+ public function getMessages($locale = null)
+ {
+ return $locale === null ? static::$messages : static::$messages[$locale];
+ }
+
+ /**
+ * Set the current translator locale and indicate if the source locale file exists
+ *
+ * @param string $locale locale ex. en
+ *
+ * @return bool
+ */
+ public function setLocale($locale)
+ {
+ $locale = preg_replace_callback('/[-_]([a-z]{2,})/', function ($matches) {
+ // _2-letters is a region, _3+-letters is a variant
+ return '_'.call_user_func(strlen($matches[1]) > 2 ? 'ucfirst' : 'strtoupper', $matches[1]);
+ }, strtolower($locale));
+
+ if ($this->loadMessagesFromFile($locale)) {
+ parent::setLocale($locale);
+
+ return true;
+ }
+
+ return false;
+ }
+}
diff --git a/application/vendor/nesbot/carbon/src/Carbon/Upgrade.php b/application/vendor/nesbot/carbon/src/Carbon/Upgrade.php
new file mode 100644
index 0000000..26449ff
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/Carbon/Upgrade.php
@@ -0,0 +1,150 @@
+ '5.8.0',
+ 'laravel/cashier' => '9.0.1',
+ 'illuminate/support' => '5.8.0',
+ 'laravel/dusk' => '5.0.0',
+ );
+
+ protected static $otherLibraries = array(
+ 'spatie/laravel-analytics' => '3.6.4',
+ 'jenssegers/date' => '3.5.0',
+ );
+
+ /**
+ * @param \UpdateHelper\UpdateHelper $helper
+ */
+ public function check(UpdateHelper $helper)
+ {
+ $helper->write(array(
+ 'Carbon 1 is deprecated, see how to migrate to Carbon 2.',
+ 'https://carbon.nesbot.com/docs/#api-carbon-2',
+ ));
+
+ if (static::SUGGEST_ON_UPDATE || static::ASK_ON_UPDATE || $helper->getIo()->isVerbose()) {
+ $laravelUpdate = array();
+
+ foreach (static::$laravelLibraries as $name => $version) {
+ if ($helper->hasAsDependency($name) && $helper->isDependencyLesserThan($name, $version)) {
+ $laravelUpdate[$name] = $version;
+ }
+ }
+
+ if (count($laravelUpdate)) {
+ $output = array(
+ ' Please consider upgrading your Laravel dependencies to be compatible with Carbon 2:',
+ );
+
+ foreach ($laravelUpdate as $name => $version) {
+ $output[] = " - $name at least to version $version";
+ }
+
+ $output[] = '';
+ $output[] = " If you can't update Laravel, check https://carbon.nesbot.com/ to see how to";
+ $output[] = ' install Carbon 2 using alias version and our adapter kylekatarnls/laravel-carbon-2';
+ $output[] = '';
+
+ $helper->write($output);
+ }
+
+ foreach (static::$otherLibraries as $name => $version) {
+ if ($helper->hasAsDependency($name) && $helper->isDependencyLesserThan($name, $version)) {
+ $helper->write(" Please consider upgrading $name at least to $version to be compatible with Carbon 2.\n");
+ }
+ }
+
+ if (static::ASK_ON_UPDATE) {
+ static::askForUpgrade($helper);
+
+ return;
+ }
+ }
+
+ $path = implode(DIRECTORY_SEPARATOR, array('.', 'vendor', 'bin', 'upgrade-carbon'));
+
+ if (!file_exists($path)) {
+ $path = realpath(__DIR__.'/../../bin/upgrade-carbon');
+ }
+
+ $helper->write(
+ ' You can run '.escapeshellarg($path).
+ ' to get help in updating carbon and other frameworks and libraries that depend on it.'
+ );
+ }
+
+ private static function getUpgradeQuestion($upgrades)
+ {
+ $message = "Do you want us to try the following upgrade:\n";
+
+ foreach ($upgrades as $name => $version) {
+ $message .= " - $name: $version\n";
+ }
+
+ return $message.'[Y/N] ';
+ }
+
+ public static function askForUpgrade(UpdateHelper $helper, $upgradeIfNotInteractive = false)
+ {
+ $upgrades = array(
+ 'nesbot/carbon' => '^2.0.0',
+ );
+
+ foreach (array(static::$laravelLibraries, static::$otherLibraries) as $libraries) {
+ foreach ($libraries as $name => $version) {
+ if ($helper->hasAsDependency($name) && $helper->isDependencyLesserThan($name, $version)) {
+ $upgrades[$name] = "^$version";
+ }
+ }
+ }
+
+ $shouldUpgrade = $helper->isInteractive()
+ ? $helper->getIo()->askConfirmation(static::getUpgradeQuestion($upgrades))
+ : $upgradeIfNotInteractive;
+
+ if ($shouldUpgrade) {
+ $helper->setDependencyVersions($upgrades)->update();
+ }
+ }
+
+ public static function upgrade(ScriptEvent $event = null)
+ {
+ if (!$event) {
+ $composer = new Composer();
+ $baseDir = __DIR__.'/../..';
+
+ if (file_exists("$baseDir/autoload.php")) {
+ $baseDir .= '/..';
+ }
+
+ $composer->setConfig(new Config(true, $baseDir));
+ $event = new ScriptEvent(
+ 'upgrade-carbon',
+ $composer,
+ new ConsoleIO(new StringInput(''), new ConsoleOutput(), new HelperSet(array(
+ new QuestionHelper(),
+ )))
+ );
+ }
+
+ static::askForUpgrade(new UpdateHelper($event), true);
+ }
+}
diff --git a/application/vendor/nesbot/carbon/src/JsonSerializable.php b/application/vendor/nesbot/carbon/src/JsonSerializable.php
new file mode 100644
index 0000000..d34060b
--- /dev/null
+++ b/application/vendor/nesbot/carbon/src/JsonSerializable.php
@@ -0,0 +1,18 @@
+json_encode,
+ * which is a value of any type other than a resource.
+ *
+ * @since 5.4.0
+ */
+ public function jsonSerialize();
+ }
+}
diff --git a/application/vendor/nikic/php-parser/.gitignore b/application/vendor/nikic/php-parser/.gitignore
new file mode 100644
index 0000000..8c7db2a
--- /dev/null
+++ b/application/vendor/nikic/php-parser/.gitignore
@@ -0,0 +1,4 @@
+vendor/
+composer.lock
+grammar/kmyacc.exe
+grammar/y.output
diff --git a/application/vendor/nikic/php-parser/.travis.yml b/application/vendor/nikic/php-parser/.travis.yml
index 445913f..4716915 100644
--- a/application/vendor/nikic/php-parser/.travis.yml
+++ b/application/vendor/nikic/php-parser/.travis.yml
@@ -1,14 +1,32 @@
language: php
+sudo: false
+
+cache:
+ directories:
+ - $HOME/.composer/cache
+
php:
- - 5.3
- 5.4
- 5.5
- 5.6
- 7.0
+ - nightly
- hhvm
+install:
+ - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then composer require satooshi/php-coveralls '~1.0'; fi
+ - composer install --prefer-dist
+
matrix:
allow_failures:
- - php: 7.0
+ - php: nightly
fast_finish: true
+
+script:
+ - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi
+ - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then test_old/run-php-src.sh; fi
+
+after_success:
+ if [ $TRAVIS_PHP_VERSION = '5.6' ]; then php vendor/bin/coveralls; fi
+
diff --git a/application/vendor/nikic/php-parser/CHANGELOG.md b/application/vendor/nikic/php-parser/CHANGELOG.md
index 75605cc..0ae6b7e 100644
--- a/application/vendor/nikic/php-parser/CHANGELOG.md
+++ b/application/vendor/nikic/php-parser/CHANGELOG.md
@@ -1,253 +1,151 @@
-Version 1.4.2-dev
+Version 2.1.2-dev
-----------------
Nothing yet.
-Version 1.4.1 (2015-09-19)
+Version 2.1.1 (2016-09-16)
--------------------------
-### Fixed
+### Changed
-* Fixed issue with too many newlines being stripped at the end of heredoc/nowdoc strings in some
- cases. (#227)
+* The pretty printer will now escape all control characters in the range `\x00-\x1F` inside double
+ quoted strings. If no special escape sequence is available, an octal escape will be used.
+* The quality of the error recovery has been improved. In particular unterminated expressions should
+ be handled more gracefully.
+* The PHP 7 parser will now generate a parse error for `$var =& new Obj` assignments.
+* Comments on free-standing code blocks will no be retained as comments on the first statement in
+ the code block.
-Version 1.4.0 (2015-07-14)
+Version 2.1.0 (2016-04-19)
--------------------------
-### Added
-
-* Added interface `PhpParser\Node\FunctionLike`, which is implemented by `Stmt\ClassMethod`,
- `Stmt\Function_` and `Expr\Closure` nodes. This interface provides getters for their common
- subnodes.
-* Added `Node\Stmt\ClassLike::getMethod()` to look up a specific method on a class/interface/trait.
-
### Fixed
-* Fixed `isPublic()` return value for implicitly public properties and methods that define and
- additional modifier like `static` or `abstract`.
-* Properties are now accepted by the trait builder.
-* Fixed `__HALT_COMPILER_OFFSET__` support on HHVM.
-
-Version 1.3.0 (2015-05-02)
---------------------------
+* Properly support `B""` strings (with uppercase `B`) in a number of places.
+* Fixed reformatting of indented parts in a certain non-standard comment style.
### Added
-* Errors can now store the attributes of the node/token where the error occurred. Previously only the start line was
- stored.
-* If file positions are enabled in the lexer, errors can now provide column information if it is available. See
- [documentation](https://github.com/nikic/PHP-Parser/blob/master/doc/component/Error.markdown#column-information).
-* The parser now provides an experimental error recovery mode, which can be enabled by disabling the `throwOnError`
- parser option. In this mode the parser will try to construct a partial AST even if the code is not valid PHP. See
- [documentation](https://github.com/nikic/PHP-Parser/blob/master/doc/component/Error.markdown#error-recovery).
-* Added support for PHP 7 `yield from` expression. It is represented by `Expr\YieldFrom`.
-* Added support for PHP 7 anonymous classes. These are represented by ordinary `Stmt\Class_` nodes with the name set to
- `null`. Furthermore this implies that `Expr\New_` can now contain a `Stmt\Class_` in its `class` subnode.
-
-### Fixed
-
-* Fixed registration of PHP 7 aliases, for the case where the old name was used before the new name.
-* Fixed handling of precedence when pretty-printing `print` expressions.
-* Floating point numbers are now pretty-printed with a higher precision.
-* Checks for special class names like `self` are now case-insensitive.
-
-Version 1.2.2 (2015-04-03)
---------------------------
-
-* The `NameResolver` now resolves parameter type hints when entering the function/method/closure node. As such other
- visitors running after it will be able to make use of the resolved names at that point already.
-* The autoloader no longer sets the `unserialize_callback_func` ini option on registration - this is not necessary and
- may cause issues when running PhpUnit tests with process isolation.
-
-Version 1.2.1 (2015-03-24)
---------------------------
-
-* Fixed registration of the aliases introduced in 1.2.0. Previously the old class names could not be used in
- `instanceof` checks under some circumstances.
-
-Version 1.2.0 (2015-03-22)
---------------------------
+* Added `dumpComments` option to node dumper, to enable dumping of comments associated with nodes.
+* Added `Stmt\Nop` node, that is used to collect comments located at the end of a block or at the
+ end of a file (without a following node with which they could otherwise be associated).
+* Added `kind` attribute to `Expr\Exit` to distinguish between `exit` and `die`.
+* Added `kind` attribute to `Scalar\LNumber` to distinguish between decimal, binary, octal and
+ hexadecimal numbers.
+* Added `kind` attribtue to `Expr\Array` to distinguish between `array()` and `[]`.
+* Added `kind` attribute to `Scalar\String` and `Scalar\Encapsed` to distinguish between
+ single-quoted, double-quoted, heredoc and nowdoc string.
+* Added `docLabel` attribute to `Scalar\String` and `Scalar\Encapsed`, if it is a heredoc or
+ nowdoc string.
+* Added start file offset information to `Comment` nodes.
+* Added `setReturnType()` method to function and method builders.
+* Added `-h` and `--help` options to `php-parse` script.
### Changed
-* To ensure compatibility with PHP 7, the following node classes have been renamed:
-
- OLD => NEW
- PhpParser\Node\Expr\Cast\Bool => PhpParser\Node\Expr\Cast\Bool_
- PhpParser\Node\Expr\Cast\Int => PhpParser\Node\Expr\Cast\Int_
- PhpParser\Node\Expr\Cast\Object => PhpParser\Node\Expr\Cast\Object_
- PhpParser\Node\Expr\Cast\String => PhpParser\Node\Expr\Cast\String_
- PhpParser\Node\Scalar\String => PhpParser\Node\Scalar\String_
-
- **The previous class names are still supported as aliases.** However it is strongly encouraged to use the new names
- in order to make your code compatible with PHP 7.
-
-* Subnodes are now stored using real properties instead of an array. This improves performance and memory usage of the
- initial parse and subsequent node tree operations. The `NodeAbstract` class still supports the old way of specifying
- subnodes, however this is *deprecated*. In any case properties that are assigned to a node after creation will no
- longer be considered as subnodes.
-
-* Methods and property declarations will no longer set the `Stmt\Class_::MODIFIER_PUBLIC` flag if no visibility is
- explicitly given. However the `isPublic()` method will continue to return true. This allows you to distinguish whether
- a method/property is explicitly or implicitly public and control the pretty printer output more precisely.
-
-* The `Stmt\Class_`, `Stmt\Interface_` and `Stmt\Trait_` nodes now inherit from `Stmt\ClassLike`, which provides a
- `getMethods()` method. Previously this method was only available on `Stmt\Class_`.
-
-* Support including the `bootstrap.php` file multiple times.
-
-* Make documentation and tests part of the release tarball again.
-
-* Improve support for HHVM and PHP 7.
-
-### Added
-
-* Added support for PHP 7 return type declarations. This adds an additional `returnType` subnode to `Stmt\Function_`,
- `Stmt\ClassMethod` and `Expr\Closure`.
-
-* Added support for the PHP 7 null coalesce operator `??`. The operator is represented by `Expr\BinaryOp\Coalesce`.
-
-* Added support for the PHP 7 spaceship operator `<=>`. The operator is represented by `Expr\BinaryOp\Spaceship`.
-
-* Added use builder.
-
-* Added global namespace support to the namespace builder.
-
-* Added a constructor flag to `NodeTraverser`, which disables cloning of nodes.
+* Invalid octal literals now throw a parse error in PHP 7 mode.
+* The pretty printer takes all the new attributes mentioned in the previous section into account.
+* The protected `AbstractPrettyPrinter::pComments()` method no longer returns a trailing newline.
+* The bundled autoloader supports library files being stored in a different directory than
+ `PhpParser` for easier downstream distribution.
-Version 1.1.0 (2015-01-18)
---------------------------
-
-* Methods that do not specify an explicit visibility (e.g. `function method()`) will now have the `MODIFIER_PUBLIC`
- flag set. This also means that their `isPublic()` method will return true.
-
-* Declaring a property as abstract or final is now an error.
-
-* The `Lexer` and `Lexer\Emulative` classes now accept an `$options` array in their constructors. Currently only the
- `usedAttributes` option is supported, which determines which attributes will be added to AST nodes. In particular
- it is now possible to add information on the token and file positions corresponding to a node. For more details see
- the [Lexer component](https://github.com/nikic/PHP-Parser/blob/master/doc/component/Lexer.markdown) documentation.
-
-* Node visitors can now return `NodeTraverser::DONT_TRAVERSE_CHILDREN` from `enterNode()` in order to skip all children
- of the current node, for all visitors.
-
-* Added builders for traits and namespaces.
-
-* The class, interface, trait, function, method and property builders now support adding doc comments using the
- `setDocComment()` method.
-
-* Added support for fully-qualified and namespace-relative names in builders. No longer allow use of name component
- arrays.
-
-* Do not add documentation and tests to distribution archive files.
+### Deprecated
-Version 1.0.2 (2014-11-04)
---------------------------
+* The `Comment::setLine()` and `Comment::setText()` methods have been deprecated. Construct new
+ objects instead.
-* The `NameResolver` visitor now also resolves names in trait adaptations (aliases and precedence declarations).
+### Removed
-* Remove stray whitespace when pretty-printing trait adaptations that only change visibility.
+* The internal (but public) method `Scalar\LNumber::parse()` has been removed. A non-internal
+ `LNumber::fromString()` method has been added instead.
-Version 1.0.1 (2014-10-14)
+Version 2.0.1 (2016-02-28)
--------------------------
-* Disallow `new` expressions without a class name. Previously `new;` was accidentally considered to be valid code.
-
-* Support T_ONUMBER token used by HHVM.
-
-* Add ability to directly pass code to the `php-parse.php` script.
-
-* Prevent truncation of `var_dump()` output in the `php-parse.php` script if XDebug is used.
+### Fixed
-Version 1.0.0 (2014-09-12)
+* `declare() {}` and `declare();` are not semantically equivalent and will now result in different
+ ASTs. The format case will have an empty `stmts` array, while the latter will set `stmts` to
+ `null`.
+* Magic constants are now supported as semi-reserved keywords.
+* A shebang line like `#!/usr/bin/env php` is now allowed at the start of a namespaced file.
+ Previously this generated an exception.
+* The `prettyPrintFile()` method will not strip a trailing `?>` from the raw data that follows a
+ `__halt_compiler()` statement.
+* The `prettyPrintFile()` method will not strip an opening `cond`
- will now appear before `Stmt\If->stmts` etc.
+A more detailed description of backwards incompatible changes can be found in the
+[upgrading guide](UPGRADE-2.0.md).
-* Added `Scalar\MagicConstant->getName()`, which returns the name of the magic constant (e.g. `__CLASS__`).
+### Removed
-**The following changes are also included in 0.9.5**:
+* Removed support for running on PHP 5.4. It is however still possible to parse PHP 5.2 and PHP 5.3
+ code while running on a newer version.
+* Removed legacy class name aliases. This includes the old non-namespaced class names and the old
+ names for classes that were renamed for PHP 7 compatibility.
+* Removed support for legacy node format. All nodes must have a `getSubNodeNames()` method now.
-* [BC] Deprecated `PHPParser_Template` and `PHPParser_TemplateLoader`. This functionality does not belong in the main project
- and - as far as I know - nobody is using it.
+### Added
-* Add `NodeTraverser::removeVisitor()` method, which removes a visitor from the node traverser. This also modifies the
- corresponding `NodeTraverserInterface`.
+* Added support for remaining PHP 7 features that were not present in 1.x:
+ * Group use declarations. These are represented using `Stmt\GroupUse` nodes. Furthermore a `type`
+ attribute was added to `Stmt\UseUse` to handle mixed group use declarations.
+ * Uniform variable syntax.
+ * Generalized yield operator.
+ * Scalar type declarations. These are presented using `'bool'`, `'int'`, `'float'` and `'string'`
+ as the type. The PHP 5 parser also accepts these, however they'll be `Name` instances there.
+ * Unicode escape sequences.
+* Added `PhpParser\ParserFactory` class, which should be used to create parser instances.
+* Added `Name::concat()` which concatenates two names.
+* Added `Name->slice()` which takes a subslice of a name.
-* Fix alias resolution in `NameResolver`: Class names are now correctly handled as case-insensitive.
+### Changed
-* The undefined variable error, which is used to the lexer to reset the error state, will no longer interfere with
- custom error handlers.
+* `PhpParser\Parser` is now an interface, implemented by `Parser\Php5`, `Parser\Php7` and
+ `Parser\Multiple`. The `Multiple` parser will try multiple parsers, until one succeeds.
+* Token constants are now defined on `PhpParser\Parser\Tokens` rather than `PhpParser\Parser`.
+* The `Name->set()`, `Name->append()`, `Name->prepend()` and `Name->setFirst()` methods are
+ deprecated in favor of `Name::concat()` and `Name->slice()`.
+* The `NodeTraverser` no longer clones nodes by default. The old behavior can be restored by
+ passing `true` to the constructor.
+* The constructor for `Scalar` nodes no longer has a default value. E.g. `new LNumber()` should now
+ be written as `new LNumber(0)`.
---
-**This changelog only includes changes from the 1.0 series. For older changes see the [0.9 series changelog][1].**
-
- [1]: https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md
+**This changelog only includes changes from the 2.0 series. For older changes see the
+[1.x series changelog](https://github.com/nikic/PHP-Parser/blob/1.x/CHANGELOG.md) and the
+[0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).**
\ No newline at end of file
diff --git a/application/vendor/nikic/php-parser/README.md b/application/vendor/nikic/php-parser/README.md
index 729e19b..28c565c 100644
--- a/application/vendor/nikic/php-parser/README.md
+++ b/application/vendor/nikic/php-parser/README.md
@@ -1,12 +1,14 @@
PHP Parser
==========
-This is a PHP 5.2 to PHP 5.6 parser written in PHP. Its purpose is to simplify static code analysis and
+[](https://travis-ci.org/nikic/PHP-Parser) [](https://coveralls.io/github/nikic/PHP-Parser?branch=master)
+
+This is a PHP 5.2 to PHP 7.0 parser written in PHP. Its purpose is to simplify static code analysis and
manipulation.
-[**Documentation for version 1.x**][doc_1_x] (stable; for running on PHP >= 5.3).
+[**Documentation for version 2.x**][doc_master] (stable; for running on PHP >= 5.4; for parsing PHP 5.2 to PHP 7.0).
-[Documentation for version 0.9.x][doc_0_9] (unsupported; for running on PHP 5.2).
+[Documentation for version 1.x][doc_1_x] (unsupported; for running on PHP >= 5.3; for parsing PHP 5.2 to PHP 5.6).
In a Nutshell
-------------
@@ -70,18 +72,25 @@ programming errors or security issues).
Additionally, you can convert a syntax tree back to PHP code. This allows you to do code preprocessing
(like automatedly porting code to older PHP versions).
+Installation
+------------
+
+The preferred installation method is [composer](https://getcomposer.org):
+
+ php composer.phar require nikic/php-parser
+
Documentation
-------------
1. [Introduction](doc/0_Introduction.markdown)
- 2. [Installation](doc/1_Installation.markdown)
- 3. [Usage of basic components](doc/2_Usage_of_basic_components.markdown)
- 4. [Other node tree representations](doc/3_Other_node_tree_representations.markdown)
- 5. [Code generation](doc/4_Code_generation.markdown)
+ 2. [Usage of basic components](doc/2_Usage_of_basic_components.markdown)
+ 3. [Other node tree representations](doc/3_Other_node_tree_representations.markdown)
+ 4. [Code generation](doc/4_Code_generation.markdown)
Component documentation:
- 1. [Lexer](doc/component/Lexer.markdown)
+ 1. [Error](doc/component/Error.markdown)
+ 2. [Lexer](doc/component/Lexer.markdown)
- [doc_0_9]: https://github.com/nikic/PHP-Parser/tree/0.9/doc
[doc_1_x]: https://github.com/nikic/PHP-Parser/tree/1.x/doc
+ [doc_master]: https://github.com/nikic/PHP-Parser/tree/master/doc
diff --git a/application/vendor/nikic/php-parser/UPGRADE-2.0.md b/application/vendor/nikic/php-parser/UPGRADE-2.0.md
new file mode 100644
index 0000000..1c61de5
--- /dev/null
+++ b/application/vendor/nikic/php-parser/UPGRADE-2.0.md
@@ -0,0 +1,74 @@
+Upgrading from PHP-Parser 1.x to 2.0
+====================================
+
+### PHP version requirements
+
+PHP-Parser now requires PHP 5.4 or newer to run. It is however still possible to *parse* PHP 5.2 and
+PHP 5.3 source code, while running on a newer version.
+
+### Creating a parser instance
+
+Parser instances should now be created through the `ParserFactory`. Old direct instantiation code
+will not work, because the parser class was renamed.
+
+Old:
+
+```php
+use PhpParser\Parser, PhpParser\Lexer;
+$parser = new Parser(new Lexer\Emulative);
+```
+
+New:
+
+```php
+use PhpParser\ParserFactory;
+$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
+```
+
+The first argument to `ParserFactory` determines how different PHP versions are handled. The
+possible values are:
+
+ * `ParserFactory::PREFER_PHP7`: Try to parse code as PHP 7. If this fails, try to parse it as PHP 5.
+ * `ParserFactory::PREFER_PHP5`: Try to parse code as PHP 5. If this fails, try to parse it as PHP 7.
+ * `ParserFactory::ONLY_PHP7`: Parse code as PHP 7.
+ * `ParserFactory::ONLY_PHP5`: Parse code as PHP 5.
+
+For most practical purposes the difference between `PREFER_PHP7` and `PREFER_PHP5` is mainly whether
+a scalar type hint like `string` will be stored as `'string'` (PHP 7) or as `new Name('string')`
+(PHP 5).
+
+To use a custom lexer, pass it as the second argument to the `create()` method:
+
+```php
+use PhpParser\ParserFactory;
+$lexer = new MyLexer;
+$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7, $lexer);
+```
+
+### Rename of the `PhpParser\Parser` class
+
+`PhpParser\Parser` is now an interface, which is implemented by `Parser\Php5`, `Parser\Php7` and
+`Parser\Multiple`. Parser tokens are now defined in `Parser\Tokens`. If you use the `ParserFactory`
+described above to create your parser instance, these changes should have no further impact on you.
+
+### Removal of legacy aliases
+
+All legacy aliases for classes have been removed. This includes the old non-namespaced `PHPParser_`
+classes, as well as the classes that had to be renamed for PHP 7 support.
+
+### Deprecations
+
+The `set()`, `setFirst()`, `append()` and `prepend()` methods of the `Node\Name` class have been
+deprecated. Instead `Name::concat()` and `Name->slice()` should be used.
+
+### Miscellaneous
+
+* The `NodeTraverser` no longer clones nodes by default. If you want to restore the old behavior,
+ pass `true` to the constructor.
+* The legacy node format has been removed. If you use custom nodes, they are now expected to
+ implement a `getSubNodeNames()` method.
+* The default value for `Scalar` node constructors was removed. This means that something like
+ `new LNumber()` should be replaced by `new LNumber(0)`.
+* String parts of encapsed strings are now represented using `Scalar\EncapsStringPart` nodes, while
+ previously raw strings were used. This affects the `parts` child of `Scalar\Encaps` and
+ `Expr\ShellExec`.
\ No newline at end of file
diff --git a/application/vendor/nikic/php-parser/bin/php-parse b/application/vendor/nikic/php-parser/bin/php-parse
new file mode 100644
index 0000000..974eb1a
--- /dev/null
+++ b/application/vendor/nikic/php-parser/bin/php-parse
@@ -0,0 +1,173 @@
+#!/usr/bin/env php
+ array(
+ 'startLine', 'endLine', 'startFilePos', 'endFilePos', 'comments'
+)));
+$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7, $lexer);
+$dumper = new PhpParser\NodeDumper(['dumpComments' => true]);
+$prettyPrinter = new PhpParser\PrettyPrinter\Standard;
+$serializer = new PhpParser\Serializer\XML;
+
+$traverser = new PhpParser\NodeTraverser();
+$traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver);
+
+foreach ($files as $file) {
+ if (strpos($file, ' Code $code\n";
+ } else {
+ if (!file_exists($file)) {
+ die("File $file does not exist.\n");
+ }
+
+ $code = file_get_contents($file);
+ echo "====> File $file:\n";
+ }
+
+ try {
+ $stmts = $parser->parse($code);
+ } catch (PhpParser\Error $e) {
+ if ($attributes['with-column-info'] && $e->hasColumnInfo()) {
+ $startLine = $e->getStartLine();
+ $endLine = $e->getEndLine();
+ $startColumn = $e->getStartColumn($code);
+ $endColumn = $e->getEndColumn($code);
+ $message .= $e->getRawMessage() . " from $startLine:$startColumn to $endLine:$endColumn";
+ } else {
+ $message = $e->getMessage();
+ }
+
+ die($message . "\n");
+ }
+
+ foreach ($operations as $operation) {
+ if ('dump' === $operation) {
+ echo "==> Node dump:\n";
+ echo $dumper->dump($stmts), "\n";
+ } elseif ('pretty-print' === $operation) {
+ echo "==> Pretty print:\n";
+ echo $prettyPrinter->prettyPrintFile($stmts), "\n";
+ } elseif ('serialize-xml' === $operation) {
+ echo "==> Serialized XML:\n";
+ echo $serializer->serialize($stmts), "\n";
+ } elseif ('var-dump' === $operation) {
+ echo "==> var_dump():\n";
+ var_dump($stmts);
+ } elseif ('resolve-names' === $operation) {
+ echo "==> Resolved names.\n";
+ $stmts = $traverser->traverse($stmts);
+ }
+ }
+}
+
+function showHelp($error = '') {
+ if ($error) {
+ echo $error . "\n\n";
+ }
+ die(<<