+ * capitalize($string);
+ * // Top-O-The-Morning To All_of_you!
+ *
+ * echo $inflector->capitalize($string, '-_ ');
+ * // Top-O-The-Morning To All_Of_You!
+ * ?>
+ *
+ *
+ * @param string $string The string to operate on.
+ * @param string $delimiters A list of word separators.
+ *
+ * @return string The string with all delimiter-separated words capitalized.
+ */
+ public function capitalize(string $string, string $delimiters = " \n\t\r\0\x0B-") : string
+ {
+ return ucwords($string, $delimiters);
+ }
+
+ /**
+ * Checks if the given string seems like it has utf8 characters in it.
+ *
+ * @param string $string The string to check for utf8 characters in.
+ */
+ public function seemsUtf8(string $string) : bool
+ {
+ for ($i = 0; $i < strlen($string); $i++) {
+ if (ord($string[$i]) < 0x80) {
+ continue; // 0bbbbbbb
+ }
+
+ if ((ord($string[$i]) & 0xE0) === 0xC0) {
+ $n = 1; // 110bbbbb
+ } elseif ((ord($string[$i]) & 0xF0) === 0xE0) {
+ $n = 2; // 1110bbbb
+ } elseif ((ord($string[$i]) & 0xF8) === 0xF0) {
+ $n = 3; // 11110bbb
+ } elseif ((ord($string[$i]) & 0xFC) === 0xF8) {
+ $n = 4; // 111110bb
+ } elseif ((ord($string[$i]) & 0xFE) === 0xFC) {
+ $n = 5; // 1111110b
+ } else {
+ return false; // Does not match any model
+ }
+
+ for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
+ if (++$i === strlen($string) || ((ord($string[$i]) & 0xC0) !== 0x80)) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Remove any illegal characters, accents, etc.
+ *
+ * @param string $string String to unaccent
+ *
+ * @return string Unaccented string
+ */
+ public function unaccent(string $string) : string
+ {
+ if (preg_match('/[\x80-\xff]/', $string) === false) {
+ return $string;
+ }
+
+ if ($this->seemsUtf8($string)) {
+ $string = strtr($string, self::ACCENTED_CHARACTERS);
+ } else {
+ $characters = [];
+
+ // Assume ISO-8859-1 if not UTF-8
+ $characters['in'] =
+ chr(128)
+ . chr(131)
+ . chr(138)
+ . chr(142)
+ . chr(154)
+ . chr(158)
+ . chr(159)
+ . chr(162)
+ . chr(165)
+ . chr(181)
+ . chr(192)
+ . chr(193)
+ . chr(194)
+ . chr(195)
+ . chr(196)
+ . chr(197)
+ . chr(199)
+ . chr(200)
+ . chr(201)
+ . chr(202)
+ . chr(203)
+ . chr(204)
+ . chr(205)
+ . chr(206)
+ . chr(207)
+ . chr(209)
+ . chr(210)
+ . chr(211)
+ . chr(212)
+ . chr(213)
+ . chr(214)
+ . chr(216)
+ . chr(217)
+ . chr(218)
+ . chr(219)
+ . chr(220)
+ . chr(221)
+ . chr(224)
+ . chr(225)
+ . chr(226)
+ . chr(227)
+ . chr(228)
+ . chr(229)
+ . chr(231)
+ . chr(232)
+ . chr(233)
+ . chr(234)
+ . chr(235)
+ . chr(236)
+ . chr(237)
+ . chr(238)
+ . chr(239)
+ . chr(241)
+ . chr(242)
+ . chr(243)
+ . chr(244)
+ . chr(245)
+ . chr(246)
+ . chr(248)
+ . chr(249)
+ . chr(250)
+ . chr(251)
+ . chr(252)
+ . chr(253)
+ . chr(255);
+
+ $characters['out'] = 'EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy';
+
+ $string = strtr($string, $characters['in'], $characters['out']);
+
+ $doubleChars = [];
+
+ $doubleChars['in'] = [
+ chr(140),
+ chr(156),
+ chr(198),
+ chr(208),
+ chr(222),
+ chr(223),
+ chr(230),
+ chr(240),
+ chr(254),
+ ];
+
+ $doubleChars['out'] = ['OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th'];
+
+ $string = str_replace($doubleChars['in'], $doubleChars['out'], $string);
+ }
+
+ return $string;
+ }
+
+ /**
+ * Convert any passed string to a url friendly string.
+ * Converts 'My first blog post' to 'my-first-blog-post'
+ *
+ * @param string $string String to urlize.
+ *
+ * @return string Urlized string.
+ */
+ public function urlize(string $string) : string
+ {
+ // Remove all non url friendly characters with the unaccent function
+ $unaccented = $this->unaccent($string);
+
+ if (function_exists('mb_strtolower')) {
+ $lowered = mb_strtolower($unaccented);
+ } else {
+ $lowered = strtolower($unaccented);
+ }
+
+ $replacements = [
+ '/\W/' => ' ',
+ '/([A-Z]+)([A-Z][a-z])/' => '\1_\2',
+ '/([a-z\d])([A-Z])/' => '\1_\2',
+ '/[^A-Z^a-z^0-9^\/]+/' => '-',
+ ];
+
+ $urlized = $lowered;
+
+ foreach ($replacements as $pattern => $replacement) {
+ $replaced = preg_replace($pattern, $replacement, $urlized);
+
+ if ($replaced === null) {
+ throw new RuntimeException(sprintf(
+ 'preg_replace returned null for value "%s"',
+ $urlized
+ ));
+ }
+
+ $urlized = $replaced;
+ }
+
+ return trim($urlized, '-');
+ }
+
+ /**
+ * Returns a word in singular form.
+ *
+ * @param string $word The word in plural form.
+ *
+ * @return string The word in singular form.
+ */
+ public function singularize(string $word) : string
+ {
+ return $this->singularizer->inflect($word);
+ }
+
+ /**
+ * Returns a word in plural form.
+ *
+ * @param string $word The word in singular form.
+ *
+ * @return string The word in plural form.
+ */
+ public function pluralize(string $word) : string
+ {
+ return $this->pluralizer->inflect($word);
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/InflectorFactory.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/InflectorFactory.php
new file mode 100644
index 0000000..44bba5d
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/InflectorFactory.php
@@ -0,0 +1,45 @@
+getFlippedSubstitutions()
+ );
+ }
+
+ public static function getPluralRuleset() : Ruleset
+ {
+ return new Ruleset(
+ new Transformations(...Inflectible::getPlural()),
+ new Patterns(...Uninflected::getPlural()),
+ new Substitutions(...Inflectible::getIrregular())
+ );
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Uninflected.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Uninflected.php
new file mode 100644
index 0000000..be37a97
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Uninflected.php
@@ -0,0 +1,193 @@
+getFlippedSubstitutions()
+ );
+ }
+
+ public static function getPluralRuleset() : Ruleset
+ {
+ return new Ruleset(
+ new Transformations(...Inflectible::getPlural()),
+ new Patterns(...Uninflected::getPlural()),
+ new Substitutions(...Inflectible::getIrregular())
+ );
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Uninflected.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Uninflected.php
new file mode 100644
index 0000000..2fdc020
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Uninflected.php
@@ -0,0 +1,34 @@
+getFlippedSubstitutions()
+ );
+ }
+
+ public static function getPluralRuleset() : Ruleset
+ {
+ return new Ruleset(
+ new Transformations(...Inflectible::getPlural()),
+ new Patterns(...Uninflected::getPlural()),
+ new Substitutions(...Inflectible::getIrregular())
+ );
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Uninflected.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Uninflected.php
new file mode 100644
index 0000000..c6b9fc7
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Uninflected.php
@@ -0,0 +1,36 @@
+pattern = $pattern;
+
+ if (isset($this->pattern[0]) && $this->pattern[0] === '/') {
+ $this->regex = $this->pattern;
+ } else {
+ $this->regex = '/' . $this->pattern . '/i';
+ }
+ }
+
+ public function getPattern() : string
+ {
+ return $this->pattern;
+ }
+
+ public function getRegex() : string
+ {
+ return $this->regex;
+ }
+
+ public function matches(string $word) : bool
+ {
+ return preg_match($this->getRegex(), $word) === 1;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Patterns.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Patterns.php
new file mode 100644
index 0000000..a71f1ed
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Patterns.php
@@ -0,0 +1,34 @@
+patterns = $patterns;
+
+ $patterns = array_map(static function (Pattern $pattern) : string {
+ return $pattern->getPattern();
+ }, $this->patterns);
+
+ $this->regex = '/^(?:' . implode('|', $patterns) . ')$/i';
+ }
+
+ public function matches(string $word) : bool
+ {
+ return preg_match($this->regex, $word, $regs) === 1;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Inflectible.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Inflectible.php
new file mode 100644
index 0000000..155055f
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Inflectible.php
@@ -0,0 +1,104 @@
+getFlippedSubstitutions()
+ );
+ }
+
+ public static function getPluralRuleset() : Ruleset
+ {
+ return new Ruleset(
+ new Transformations(...Inflectible::getPlural()),
+ new Patterns(...Uninflected::getPlural()),
+ new Substitutions(...Inflectible::getIrregular())
+ );
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Uninflected.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Uninflected.php
new file mode 100644
index 0000000..52360c4
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Uninflected.php
@@ -0,0 +1,38 @@
+regular = $regular;
+ $this->uninflected = $uninflected;
+ $this->irregular = $irregular;
+ }
+
+ public function getRegular() : Transformations
+ {
+ return $this->regular;
+ }
+
+ public function getUninflected() : Patterns
+ {
+ return $this->uninflected;
+ }
+
+ public function getIrregular() : Substitutions
+ {
+ return $this->irregular;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Inflectible.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Inflectible.php
new file mode 100644
index 0000000..6cace86
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Inflectible.php
@@ -0,0 +1,53 @@
+getFlippedSubstitutions()
+ );
+ }
+
+ public static function getPluralRuleset() : Ruleset
+ {
+ return new Ruleset(
+ new Transformations(...Inflectible::getPlural()),
+ new Patterns(...Uninflected::getPlural()),
+ new Substitutions(...Inflectible::getIrregular())
+ );
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Uninflected.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Uninflected.php
new file mode 100644
index 0000000..b13281e
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Uninflected.php
@@ -0,0 +1,36 @@
+from = $from;
+ $this->to = $to;
+ }
+
+ public function getFrom() : Word
+ {
+ return $this->from;
+ }
+
+ public function getTo() : Word
+ {
+ return $this->to;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Substitutions.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Substitutions.php
new file mode 100644
index 0000000..24cc34a
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Substitutions.php
@@ -0,0 +1,56 @@
+substitutions[$substitution->getFrom()->getWord()] = $substitution;
+ }
+ }
+
+ public function getFlippedSubstitutions() : Substitutions
+ {
+ $substitutions = [];
+
+ foreach ($this->substitutions as $substitution) {
+ $substitutions[] = new Substitution(
+ $substitution->getTo(),
+ $substitution->getFrom()
+ );
+ }
+
+ return new Substitutions(...$substitutions);
+ }
+
+ public function inflect(string $word) : string
+ {
+ $lowerWord = strtolower($word);
+
+ if (isset($this->substitutions[$lowerWord])) {
+ $firstLetterUppercase = $lowerWord[0] !== $word[0];
+
+ $toWord = $this->substitutions[$lowerWord]->getTo()->getWord();
+
+ if ($firstLetterUppercase) {
+ return strtoupper($toWord[0]) . substr($toWord, 1);
+ }
+
+ return $toWord;
+ }
+
+ return $word;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformation.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformation.php
new file mode 100644
index 0000000..84ef08b
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformation.php
@@ -0,0 +1,38 @@
+pattern = $pattern;
+ $this->replacement = $replacement;
+ }
+
+ public function getPattern() : Pattern
+ {
+ return $this->pattern;
+ }
+
+ public function getReplacement() : string
+ {
+ return $this->replacement;
+ }
+
+ public function inflect(string $word) : string
+ {
+ return (string) preg_replace($this->pattern->getRegex(), $this->replacement, $word);
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformations.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformations.php
new file mode 100644
index 0000000..9f4724e
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformations.php
@@ -0,0 +1,29 @@
+transformations = $transformations;
+ }
+
+ public function inflect(string $word) : string
+ {
+ foreach ($this->transformations as $transformation) {
+ if ($transformation->getPattern()->matches($word)) {
+ return $transformation->inflect($word);
+ }
+ }
+
+ return $word;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Inflectible.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Inflectible.php
new file mode 100644
index 0000000..74900cb
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Inflectible.php
@@ -0,0 +1,40 @@
+getFlippedSubstitutions()
+ );
+ }
+
+ public static function getPluralRuleset() : Ruleset
+ {
+ return new Ruleset(
+ new Transformations(...Inflectible::getPlural()),
+ new Patterns(...Uninflected::getPlural()),
+ new Substitutions(...Inflectible::getIrregular())
+ );
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Uninflected.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Uninflected.php
new file mode 100644
index 0000000..c95ccbf
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Uninflected.php
@@ -0,0 +1,36 @@
+word = $word;
+ }
+
+ public function getWord() : string
+ {
+ return $this->word;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/RulesetInflector.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/RulesetInflector.php
new file mode 100644
index 0000000..0e3a5eb
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/RulesetInflector.php
@@ -0,0 +1,55 @@
+rulesets = array_merge([$ruleset], $rulesets);
+ }
+
+ public function inflect(string $word) : string
+ {
+ if ($word === '') {
+ return '';
+ }
+
+ foreach ($this->rulesets as $ruleset) {
+ if ($ruleset->getUninflected()->matches($word)) {
+ return $word;
+ }
+
+ $inflected = $ruleset->getIrregular()->inflect($word);
+
+ if ($inflected !== $word) {
+ return $inflected;
+ }
+
+ $inflected = $ruleset->getRegular()->inflect($word);
+
+ if ($inflected !== $word) {
+ return $inflected;
+ }
+ }
+
+ return $word;
+ }
+}
diff --git a/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/WordInflector.php b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/WordInflector.php
new file mode 100644
index 0000000..f257055
--- /dev/null
+++ b/application/vendor/doctrine/inflector/lib/Doctrine/Inflector/WordInflector.php
@@ -0,0 +1,10 @@
+io = $io;
}
+ public function deactivate(Composer $composer, IOInterface $io)
+ {
+ // Not needed
+ }
+
+ public function uninstall(Composer $composer, IOInterface $io)
+ {
+ // Not needed
+ }
+
public static function getSubscribedEvents()
{
return array(
diff --git a/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php
index 3d3f0c0..02fbfe8 100644
--- a/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php
+++ b/application/vendor/kylekatarnls/update-helper/src/UpdateHelper/UpdateHelper.php
@@ -110,19 +110,25 @@ protected static function checkFileHelpers($file, $event, IOInterface $io, $comp
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()
- );
+ } catch (InvalidArgumentException $exception) {
+ $io->writeError(static::getErrorMessage($exception, $file, $class));
continue;
}
}
}
+ protected static function getErrorMessage(InvalidArgumentException $exception, $file, $class)
+ {
+ if ($exception instanceof NotUpdateInterfaceInstanceException) {
+ return 'UpdateHelper error in '.$file.":\n".JsonFile::encode($class).' is not an instance of UpdateHelperInterface.';
+ }
+
+ return 'UpdateHelper error: '.$exception->getPrevious()->getMessage().
+ "\nFile: ".$exception->getPrevious()->getFile().
+ "\nLine:".$exception->getPrevious()->getLine().
+ "\n\n".$exception->getPrevious()->getTraceAsString();
+ }
+
public static function check(Event $event)
{
if (!($event instanceof ScriptEvent) && !($event instanceof PackageEvent)) {
diff --git a/application/vendor/laravel/framework/composer.json b/application/vendor/laravel/framework/composer.json
index 9fac93e..af7f2b3 100644
--- a/application/vendor/laravel/framework/composer.json
+++ b/application/vendor/laravel/framework/composer.json
@@ -18,34 +18,32 @@
"php": ">=5.5.9",
"ext-mbstring": "*",
"ext-openssl": "*",
- "classpreloader/classpreloader": "~2.0|~3.0",
- "danielstjules/stringy": "~1.8",
+ "classpreloader/classpreloader": "~3.0",
"doctrine/inflector": "~1.0",
- "jeremeamia/superclosure": "~2.0",
+ "jeremeamia/superclosure": "~2.2",
"league/flysystem": "~1.0",
"monolog/monolog": "~1.11",
"mtdowling/cron-expression": "~1.0",
- "nesbot/carbon": "~1.19",
+ "nesbot/carbon": "~1.20",
"paragonie/random_compat": "~1.4",
"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"
+ "symfony/console": "2.8.*|3.0.*",
+ "symfony/debug": "2.8.*|3.0.*",
+ "symfony/finder": "2.8.*|3.0.*",
+ "symfony/http-foundation": "2.8.*|3.0.*",
+ "symfony/http-kernel": "2.8.*|3.0.*",
+ "symfony/polyfill-php56": "~1.0",
+ "symfony/process": "2.8.*|3.0.*",
+ "symfony/routing": "2.8.*|3.0.*",
+ "symfony/translation": "2.8.*|3.0.*",
+ "symfony/var-dumper": "2.8.*|3.0.*",
+ "vlucas/phpdotenv": "~2.2"
},
"replace": {
"illuminate/auth": "self.version",
- "illuminate/bus": "self.version",
"illuminate/broadcasting": "self.version",
+ "illuminate/bus": "self.version",
"illuminate/cache": "self.version",
"illuminate/config": "self.version",
"illuminate/console": "self.version",
@@ -70,15 +68,17 @@
"illuminate/support": "self.version",
"illuminate/translation": "self.version",
"illuminate/validation": "self.version",
- "illuminate/view": "self.version"
+ "illuminate/view": "self.version",
+ "tightenco/collect": "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"
+ "phpunit/phpunit": "~4.1",
+ "predis/predis": "~1.0",
+ "symfony/css-selector": "2.8.*|3.0.*",
+ "symfony/dom-crawler": "2.8.*|3.0.*"
},
"autoload": {
"classmap": [
@@ -94,7 +94,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.1-dev"
+ "dev-master": "5.2-dev"
}
},
"suggest": {
@@ -102,13 +102,14 @@
"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.*)."
+ "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).",
+ "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).",
+ "symfony/psr-http-message-bridge": "Required to use 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 4500a7b..76d266f 100644
--- a/application/vendor/laravel/framework/readme.md
+++ b/application/vendor/laravel/framework/readme.md
@@ -1,4 +1,4 @@
-## Laravel Framework (Kernel)
+# Laravel Framework (Kernel)
[](https://styleci.io/repos/7548986)
[](https://travis-ci.org/laravel/framework)
@@ -27,6 +27,6 @@ Thank you for considering contributing to the Laravel framework! The contributio
If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell at taylor@laravel.com. All security vulnerabilities will be promptly addressed.
-### License
+## License
The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/AuthorizationException.php
similarity index 59%
rename from application/vendor/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php
rename to application/vendor/laravel/framework/src/Illuminate/Auth/Access/AuthorizationException.php
index 7488c5b..dc0753e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/UnauthorizedException.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/AuthorizationException.php
@@ -4,7 +4,7 @@
use Exception;
-class UnauthorizedException extends Exception
+class AuthorizationException extends Exception
{
//
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
index de057d6..7b07f75 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
@@ -98,7 +98,7 @@ public function define($ability, $callback)
{
if (is_callable($callback)) {
$this->abilities[$ability] = $callback;
- } elseif (is_string($callback) && str_contains($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.");
@@ -197,7 +197,7 @@ public function check($ability, $arguments = [])
{
try {
$result = $this->raw($ability, $arguments);
- } catch (UnauthorizedException $e) {
+ } catch (AuthorizationException $e) {
return false;
}
@@ -211,7 +211,7 @@ public function check($ability, $arguments = [])
* @param array|mixed $arguments
* @return \Illuminate\Auth\Access\Response
*
- * @throws \Illuminate\Auth\Access\UnauthorizedException
+ * @throws \Illuminate\Auth\Access\AuthorizationException
*/
public function authorize($ability, $arguments = [])
{
@@ -279,7 +279,7 @@ protected function callAuthCallback($user, $ability, array $arguments)
*/
protected function callBeforeCallbacks($user, $ability, array $arguments)
{
- $arguments = array_merge([$user, $ability], $arguments);
+ $arguments = array_merge([$user, $ability], [$arguments]);
foreach ($this->beforeCallbacks as $before) {
if (! is_null($result = call_user_func_array($before, $arguments))) {
@@ -299,7 +299,7 @@ protected function callBeforeCallbacks($user, $ability, array $arguments)
*/
protected function callAfterCallbacks($user, $ability, array $arguments, $result)
{
- $arguments = array_merge([$user, $ability, $result], $arguments);
+ $arguments = array_merge([$user, $ability, $result], [$arguments]);
foreach ($this->afterCallbacks as $after) {
call_user_func_array($after, $arguments);
@@ -369,7 +369,7 @@ protected function resolvePolicyCallback($user, $ability, array $arguments)
[$instance, 'before'], $beforeArguments
);
- // If we recieved a non-null result from the before method, we will return it
+ // If we received 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)) {
@@ -424,7 +424,7 @@ public function resolvePolicy($class)
}
/**
- * Get a guard instance for the given user.
+ * Get a gate instance for the given user.
*
* @param \Illuminate\Contracts\Auth\Authenticatable|mixed $user
* @return static
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php
index 148b584..1a597bb 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php
@@ -21,10 +21,10 @@ protected function allow($message = null)
* @param string $message
* @return void
*
- * @throws \Illuminate\Auth\Access\UnauthorizedException
+ * @throws \Illuminate\Auth\Access\AuthorizationException
*/
protected function deny($message = 'This action is unauthorized.')
{
- throw new UnauthorizedException($message);
+ throw new AuthorizationException($message);
}
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php
old mode 100644
new mode 100755
index 96129f8..10a2610
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php
@@ -2,20 +2,127 @@
namespace Illuminate\Auth;
-use Illuminate\Support\Manager;
-use Illuminate\Contracts\Auth\Guard as GuardContract;
+use Closure;
+use InvalidArgumentException;
+use Illuminate\Contracts\Auth\Factory as FactoryContract;
-class AuthManager extends Manager
+class AuthManager implements FactoryContract
{
+ use CreatesUserProviders;
+
/**
- * Create a new driver instance.
+ * The application instance.
*
- * @param string $driver
+ * @var \Illuminate\Foundation\Application
+ */
+ protected $app;
+
+ /**
+ * The registered custom driver creators.
+ *
+ * @var array
+ */
+ protected $customCreators = [];
+
+ /**
+ * The array of created "drivers".
+ *
+ * @var array
+ */
+ protected $guards = [];
+
+ /**
+ * The user resolver shared by various services.
+ *
+ * Determines the default user for Gate, Request, and the Authenticatable contract.
+ *
+ * @var \Closure
+ */
+ protected $userResolver;
+
+ /**
+ * Create a new Auth manager instance.
+ *
+ * @param \Illuminate\Foundation\Application $app
+ * @return void
+ */
+ public function __construct($app)
+ {
+ $this->app = $app;
+
+ $this->userResolver = function ($guard = null) {
+ return $this->guard($guard)->user();
+ };
+ }
+
+ /**
+ * Attempt to get the guard from the local cache.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Auth\Guard|\Illuminate\Contracts\Auth\StatefulGuard
+ */
+ public function guard($name = null)
+ {
+ $name = $name ?: $this->getDefaultDriver();
+
+ return isset($this->guards[$name])
+ ? $this->guards[$name]
+ : $this->guards[$name] = $this->resolve($name);
+ }
+
+ /**
+ * Resolve the given guard.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Auth\Guard|\Illuminate\Contracts\Auth\StatefulGuard
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function resolve($name)
+ {
+ $config = $this->getConfig($name);
+
+ if (is_null($config)) {
+ throw new InvalidArgumentException("Auth guard [{$name}] is not defined.");
+ }
+
+ if (isset($this->customCreators[$config['driver']])) {
+ return $this->callCustomCreator($name, $config);
+ } else {
+ $driverMethod = 'create'.ucfirst($config['driver']).'Driver';
+
+ if (method_exists($this, $driverMethod)) {
+ return $this->{$driverMethod}($name, $config);
+ } else {
+ throw new InvalidArgumentException("Auth guard driver [{$name}] is not defined.");
+ }
+ }
+ }
+
+ /**
+ * Call a custom driver creator.
+ *
+ * @param string $name
+ * @param array $config
* @return mixed
*/
- protected function createDriver($driver)
+ protected function callCustomCreator($name, array $config)
{
- $guard = parent::createDriver($driver);
+ return $this->customCreators[$config['driver']]($this->app, $name, $config);
+ }
+
+ /**
+ * Create a session based authentication guard.
+ *
+ * @param string $name
+ * @param array $config
+ * @return \Illuminate\Auth\SessionGuard
+ */
+ public function createSessionDriver($name, $config)
+ {
+ $provider = $this->createUserProvider($config['provider']);
+
+ $guard = new SessionGuard($name, $provider, $this->app['session.store']);
// When using the remember me functionality of the authentication services we
// will need to be set the encryption instance of the guard, which allows
@@ -36,93 +143,152 @@ protected function createDriver($driver)
}
/**
- * Call a custom driver creator.
+ * Create a token based authentication guard.
*
- * @param string $driver
- * @return \Illuminate\Contracts\Auth\Guard
+ * @param string $name
+ * @param array $config
+ * @return \Illuminate\Auth\TokenGuard
*/
- protected function callCustomCreator($driver)
+ public function createTokenDriver($name, $config)
{
- $custom = parent::callCustomCreator($driver);
+ // The token guard implements a basic API token based guard implementation
+ // that takes an API token field from the request and matches it to the
+ // user in the database or another persistence layer where users are.
+ $guard = new TokenGuard(
+ $this->createUserProvider($config['provider']),
+ $this->app['request']
+ );
- if ($custom instanceof GuardContract) {
- return $custom;
- }
+ $this->app->refresh('request', $guard, 'setRequest');
- return new Guard($custom, $this->app['session.store']);
+ return $guard;
}
/**
- * Create an instance of the database driver.
+ * Get the guard configuration.
*
- * @return \Illuminate\Auth\Guard
+ * @param string $name
+ * @return array
*/
- public function createDatabaseDriver()
+ protected function getConfig($name)
{
- $provider = $this->createDatabaseProvider();
+ return $this->app['config']["auth.guards.{$name}"];
+ }
- return new Guard($provider, $this->app['session.store']);
+ /**
+ * Get the default authentication driver name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['auth.defaults.guard'];
}
/**
- * Create an instance of the database user provider.
+ * Set the default guard driver the factory should serve.
*
- * @return \Illuminate\Auth\DatabaseUserProvider
+ * @param string $name
+ * @return void
*/
- protected function createDatabaseProvider()
+ public function shouldUse($name)
{
- $connection = $this->app['db']->connection();
+ $this->setDefaultDriver($name);
- // 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'];
+ $this->userResolver = function ($name = null) {
+ return $this->guard($name)->user();
+ };
+ }
- return new DatabaseUserProvider($connection, $this->app['hash'], $table);
+ /**
+ * Set the default authentication driver name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['auth.defaults.guard'] = $name;
}
/**
- * Create an instance of the Eloquent driver.
+ * Register a new callback based request guard.
*
- * @return \Illuminate\Auth\Guard
+ * @param string $driver
+ * @param callable $callback
+ * @return $this
*/
- public function createEloquentDriver()
+ public function viaRequest($driver, callable $callback)
{
- $provider = $this->createEloquentProvider();
+ return $this->extend($driver, function () use ($callback) {
+ $guard = new RequestGuard($callback, $this->app['request']);
+
+ $this->app->refresh('request', $guard, 'setRequest');
- return new Guard($provider, $this->app['session.store']);
+ return $guard;
+ });
}
/**
- * Create an instance of the Eloquent user provider.
+ * Get the user resolver callback.
*
- * @return \Illuminate\Auth\EloquentUserProvider
+ * @return \Closure
*/
- protected function createEloquentProvider()
+ public function userResolver()
{
- $model = $this->app['config']['auth.model'];
+ return $this->userResolver;
+ }
- return new EloquentUserProvider($this->app['hash'], $model);
+ /**
+ * Set the callback to be used to resolve users.
+ *
+ * @param \Closure $userResolver
+ * @return $this
+ */
+ public function resolveUsersUsing(Closure $userResolver)
+ {
+ $this->userResolver = $userResolver;
+
+ return $this;
}
/**
- * Get the default authentication driver name.
+ * Register a custom driver creator Closure.
*
- * @return string
+ * @param string $driver
+ * @param \Closure $callback
+ * @return $this
*/
- public function getDefaultDriver()
+ public function extend($driver, Closure $callback)
{
- return $this->app['config']['auth.driver'];
+ $this->customCreators[$driver] = $callback;
+
+ return $this;
}
/**
- * Set the default authentication driver name.
+ * Register a custom provider creator Closure.
*
* @param string $name
- * @return void
+ * @param \Closure $callback
+ * @return $this
*/
- public function setDefaultDriver($name)
+ public function provider($name, Closure $callback)
+ {
+ $this->customProviderCreators[$name] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Dynamically call the default driver instance.
+ *
+ * @param string $method
+ * @param array $parameters
+ * @return mixed
+ */
+ public function __call($method, $parameters)
{
- $this->app['config']['auth.driver'] = $name;
+ return call_user_func_array([$this->guard(), $method], $parameters);
}
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php
old mode 100644
new mode 100755
index 9ef8041..2820beb
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php
@@ -42,7 +42,7 @@ protected function registerAuthenticator()
});
$this->app->singleton('auth.driver', function ($app) {
- return $app['auth']->driver();
+ return $app['auth']->guard();
});
}
@@ -53,9 +53,11 @@ protected function registerAuthenticator()
*/
protected function registerUserResolver()
{
- $this->app->bind(AuthenticatableContract::class, function ($app) {
- return $app['auth']->user();
- });
+ $this->app->bind(
+ AuthenticatableContract::class, function ($app) {
+ return call_user_func($app['auth']->userResolver());
+ }
+ );
}
/**
@@ -67,7 +69,7 @@ protected function registerAccessGate()
{
$this->app->singleton(GateContract::class, function ($app) {
return new Gate($app, function () use ($app) {
- return $app['auth']->user();
+ return call_user_func($app['auth']->userResolver());
});
});
}
@@ -80,8 +82,8 @@ protected function registerAccessGate()
protected function registerRequestRebindHandler()
{
$this->app->rebinding('request', function ($app, $request) {
- $request->setUserResolver(function () use ($app) {
- return $app['auth']->user();
+ $request->setUserResolver(function ($guard = null) use ($app) {
+ return call_user_func($app['auth']->userResolver(), $guard);
});
});
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php
index 46101d2..ae55d8f 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php
@@ -4,6 +4,16 @@
trait Authenticatable
{
+ /**
+ * Get the name of the unique identifier for the user.
+ *
+ * @return string
+ */
+ public function getAuthIdentifierName()
+ {
+ return $this->getKeyName();
+ }
+
/**
* Get the unique identifier for the user.
*
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/AuthenticationException.php b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthenticationException.php
new file mode 100644
index 0000000..142afd1
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/AuthenticationException.php
@@ -0,0 +1,37 @@
+guard = $guard;
+
+ parent::__construct('Unauthenticated.');
+ }
+
+ /**
+ * Get the guard instance.
+ *
+ * @return \Illuminate\Contracts\Auth\Guard|null
+ */
+ public function guard()
+ {
+ return $this->guard;
+ }
+}
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 88dcb8c..320e934 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php
@@ -7,11 +7,11 @@
class ClearResetsCommand extends Command
{
/**
- * The console command name.
+ * The name and signature of the console command.
*
* @var string
*/
- protected $name = 'auth:clear-resets';
+ protected $signature = 'auth:clear-resets {name? : The name of the password broker}';
/**
* The console command description.
@@ -27,7 +27,7 @@ class ClearResetsCommand extends Command
*/
public function fire()
{
- $this->laravel['auth.password.tokens']->deleteExpired();
+ $this->laravel['auth.password']->broker($this->argument('name'))->getRepository()->deleteExpired();
$this->info('Expired reset tokens cleared!');
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/MakeAuthCommand.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/MakeAuthCommand.php
new file mode 100644
index 0000000..d7de893
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/MakeAuthCommand.php
@@ -0,0 +1,122 @@
+ 'auth/login.blade.php',
+ 'auth/register.stub' => 'auth/register.blade.php',
+ 'auth/passwords/email.stub' => 'auth/passwords/email.blade.php',
+ 'auth/passwords/reset.stub' => 'auth/passwords/reset.blade.php',
+ 'auth/emails/password.stub' => 'auth/emails/password.blade.php',
+ 'layouts/app.stub' => 'layouts/app.blade.php',
+ 'home.stub' => 'home.blade.php',
+ 'welcome.stub' => 'welcome.blade.php',
+ ];
+
+ /**
+ * Execute the console command.
+ *
+ * @return void
+ */
+ public function fire()
+ {
+ $this->createDirectories();
+
+ $this->exportViews();
+
+ if (! $this->option('views')) {
+ $this->info('Installed HomeController.');
+
+ file_put_contents(
+ app_path('Http/Controllers/HomeController.php'),
+ $this->compileControllerStub()
+ );
+
+ $this->info('Updated Routes File.');
+
+ file_put_contents(
+ app_path('Http/routes.php'),
+ file_get_contents(__DIR__.'/stubs/make/routes.stub'),
+ FILE_APPEND
+ );
+ }
+
+ $this->comment('Authentication scaffolding generated successfully!');
+ }
+
+ /**
+ * Create the directories for the files.
+ *
+ * @return void
+ */
+ protected function createDirectories()
+ {
+ if (! is_dir(base_path('resources/views/layouts'))) {
+ mkdir(base_path('resources/views/layouts'), 0755, true);
+ }
+
+ if (! is_dir(base_path('resources/views/auth/passwords'))) {
+ mkdir(base_path('resources/views/auth/passwords'), 0755, true);
+ }
+
+ if (! is_dir(base_path('resources/views/auth/emails'))) {
+ mkdir(base_path('resources/views/auth/emails'), 0755, true);
+ }
+ }
+
+ /**
+ * Export the authentication views.
+ *
+ * @return void
+ */
+ protected function exportViews()
+ {
+ foreach ($this->views as $key => $value) {
+ $path = base_path('resources/views/'.$value);
+
+ $this->line('
+
+@endsection
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub
new file mode 100644
index 0000000..33df8e3
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub
@@ -0,0 +1,47 @@
+@extends('layouts.app')
+
+
+@section('content')
+
+
+
+
+
+
+ Login
+
+
+
+
+
+@endsection
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
new file mode 100644
index 0000000..64e8297
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
@@ -0,0 +1,70 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+
+
+ Reset Password
+
+ @if (session('status'))
+
+
+ {{ session('status') }}
+
+ @endif
+
+
+
+
+@endsection
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub
new file mode 100644
index 0000000..4705d6e
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub
@@ -0,0 +1,82 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+
+
+ Reset Password
+
+
+
+
+
+
+@endsection
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub
new file mode 100644
index 0000000..7adf5c2
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub
@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+
+
+ Register
+
+
+
+
+
+@endsection
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
new file mode 100644
index 0000000..d909843
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Dashboard
+
+
+ You are logged in!
+
+
+
+@endsection
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/CreatesUserProviders.php b/application/vendor/laravel/framework/src/Illuminate/Auth/CreatesUserProviders.php
new file mode 100644
index 0000000..715dee0
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/CreatesUserProviders.php
@@ -0,0 +1,67 @@
+app['config']['auth.providers.'.$provider];
+
+ if (isset($this->customProviderCreators[$config['driver']])) {
+ return call_user_func(
+ $this->customProviderCreators[$config['driver']], $this->app, $config
+ );
+ }
+
+ switch ($config['driver']) {
+ case 'database':
+ return $this->createDatabaseProvider($config);
+ case 'eloquent':
+ return $this->createEloquentProvider($config);
+ default:
+ throw new InvalidArgumentException("Authentication user provider [{$config['driver']}] is not defined.");
+ }
+ }
+
+ /**
+ * Create an instance of the database user provider.
+ *
+ * @param array $config
+ * @return \Illuminate\Auth\DatabaseUserProvider
+ */
+ protected function createDatabaseProvider($config)
+ {
+ $connection = $this->app['db']->connection();
+
+ return new DatabaseUserProvider($connection, $this->app['hash'], $config['table']);
+ }
+
+ /**
+ * Create an instance of the Eloquent user provider.
+ *
+ * @param array $config
+ * @return \Illuminate\Auth\EloquentUserProvider
+ */
+ protected function createEloquentProvider($config)
+ {
+ return new EloquentUserProvider($this->app['hash'], $config['model']);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
old mode 100644
new mode 100755
index e23a63f..54cf035
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
@@ -86,8 +86,8 @@ public function retrieveByToken($identifier, $token)
public function updateRememberToken(UserContract $user, $token)
{
$this->conn->table($this->table)
- ->where('id', $user->getAuthIdentifier())
- ->update(['remember_token' => $token]);
+ ->where('id', $user->getAuthIdentifier())
+ ->update(['remember_token' => $token]);
}
/**
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
old mode 100644
new mode 100755
index e2b6dc7..780c997
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
@@ -59,7 +59,7 @@ public function retrieveByToken($identifier, $token)
$model = $this->createModel();
return $model->newQuery()
- ->where($model->getKeyName(), $identifier)
+ ->where($model->getAuthIdentifierName(), $identifier)
->where($model->getRememberTokenName(), $token)
->first();
}
@@ -86,6 +86,10 @@ public function updateRememberToken(UserContract $user, $token)
*/
public function retrieveByCredentials(array $credentials)
{
+ if (empty($credentials)) {
+ return;
+ }
+
// 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.
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Attempting.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Attempting.php
new file mode 100644
index 0000000..805db22
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Attempting.php
@@ -0,0 +1,41 @@
+login = $login;
+ $this->remember = $remember;
+ $this->credentials = $credentials;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Failed.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Failed.php
new file mode 100644
index 0000000..5807e8e
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Failed.php
@@ -0,0 +1,32 @@
+user = $user;
+ $this->credentials = $credentials;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Lockout.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Lockout.php
new file mode 100644
index 0000000..347943f
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Lockout.php
@@ -0,0 +1,26 @@
+request = $request;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php
new file mode 100644
index 0000000..8816745
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php
@@ -0,0 +1,37 @@
+user = $user;
+ $this->remember = $remember;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Logout.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Logout.php
new file mode 100644
index 0000000..ea788e7
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Events/Logout.php
@@ -0,0 +1,28 @@
+user = $user;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php
deleted file mode 100644
index 1b9ce10..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/GeneratorServiceProvider.php
+++ /dev/null
@@ -1,65 +0,0 @@
-commands as $command) {
- $this->{"register{$command}Command"}();
- }
-
- $this->commands(
- '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
old mode 100644
new mode 100755
index d349d49..b6880c0
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/GenericUser.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/GenericUser.php
@@ -24,6 +24,16 @@ public function __construct(array $attributes)
$this->attributes = $attributes;
}
+ /**
+ * Get the name of the unique identifier for the user.
+ *
+ * @return string
+ */
+ public function getAuthIdentifierName()
+ {
+ return 'id';
+ }
+
/**
* Get the unique identifier for the user.
*
@@ -31,7 +41,9 @@ public function __construct(array $attributes)
*/
public function getAuthIdentifier()
{
- return $this->attributes['id'];
+ $name = $this->getAuthIdentifierName();
+
+ return $this->attributes[$name];
}
/**
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php b/application/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php
new file mode 100644
index 0000000..95fee3a
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php
@@ -0,0 +1,86 @@
+user())) {
+ return $user;
+ }
+
+ throw new AuthenticationException($this);
+ }
+
+ /**
+ * 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 ID for the currently authenticated user.
+ *
+ * @return int|null
+ */
+ public function id()
+ {
+ if ($this->user()) {
+ return $this->user()->getAuthIdentifier();
+ }
+ }
+
+ /**
+ * Set the current user.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @return $this
+ */
+ public function setUser(AuthenticatableContract $user)
+ {
+ $this->user = $user;
+
+ return $this;
+ }
+}
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 a2418b3..71f8be8 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
@@ -3,24 +3,24 @@
namespace Illuminate\Auth\Middleware;
use Closure;
-use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Contracts\Auth\Factory as AuthFactory;
class AuthenticateWithBasicAuth
{
/**
- * The guard instance.
+ * The guard factory instance.
*
- * @var \Illuminate\Contracts\Auth\Guard
+ * @var \Illuminate\Contracts\Auth\Factory
*/
protected $auth;
/**
* Create a new middleware instance.
*
- * @param \Illuminate\Contracts\Auth\Guard $auth
+ * @param \Illuminate\Contracts\Auth\Factory $auth
* @return void
*/
- public function __construct(Guard $auth)
+ public function __construct(AuthFactory $auth)
{
$this->auth = $auth;
}
@@ -30,10 +30,11 @@ public function __construct(Guard $auth)
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
+ * @param string|null $guard
* @return mixed
*/
- public function handle($request, Closure $next)
+ public function handle($request, Closure $next, $guard = null)
{
- return $this->auth->basic() ?: $next($request);
+ return $this->auth->guard($guard)->basic() ?: $next($request);
}
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
old mode 100644
new mode 100755
index db93cf9..2bffaa9
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
@@ -123,19 +123,9 @@ public function exists(CanResetPasswordContract $user, $token)
*/
protected function tokenExpired($token)
{
- $expirationTime = strtotime($token['created_at']) + $this->expires;
+ $expiresAt = Carbon::parse($token['created_at'])->addSeconds($this->expires);
- return $expirationTime < $this->getCurrentTime();
- }
-
- /**
- * Get the current UNIX timestamp.
- *
- * @return int
- */
- protected function getCurrentTime()
- {
- return time();
+ return $expiresAt->isPast();
}
/**
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
old mode 100644
new mode 100755
index 2fecd5b..4621b42
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
@@ -82,7 +82,7 @@ public function sendResetLink(array $credentials, Closure $callback = null)
$user = $this->getUser($credentials);
if (is_null($user)) {
- return PasswordBrokerContract::INVALID_USER;
+ return static::INVALID_USER;
}
// Once we have the reset token, we are ready to send the message out to this
@@ -92,7 +92,7 @@ public function sendResetLink(array $credentials, Closure $callback = null)
$this->emailResetLink($user, $token, $callback);
- return PasswordBrokerContract::RESET_LINK_SENT;
+ return static::RESET_LINK_SENT;
}
/**
@@ -146,7 +146,7 @@ public function reset(array $credentials, Closure $callback)
$this->tokens->delete($credentials['token']);
- return PasswordBrokerContract::PASSWORD_RESET;
+ return static::PASSWORD_RESET;
}
/**
@@ -158,15 +158,15 @@ public function reset(array $credentials, Closure $callback)
protected function validateReset(array $credentials)
{
if (is_null($user = $this->getUser($credentials))) {
- return PasswordBrokerContract::INVALID_USER;
+ return static::INVALID_USER;
}
if (! $this->validateNewPassword($credentials)) {
- return PasswordBrokerContract::INVALID_PASSWORD;
+ return static::INVALID_PASSWORD;
}
if (! $this->tokens->exists($user, $credentials['token'])) {
- return PasswordBrokerContract::INVALID_TOKEN;
+ return static::INVALID_TOKEN;
}
return $user;
@@ -241,12 +241,46 @@ public function getUser(array $credentials)
return $user;
}
+ /**
+ * Create a new password reset token for the given user.
+ *
+ * @param CanResetPasswordContract $user
+ * @return string
+ */
+ public function createToken(CanResetPasswordContract $user)
+ {
+ return $this->tokens->create($user);
+ }
+
+ /**
+ * Delete the given password reset token.
+ *
+ * @param string $token
+ * @return void
+ */
+ public function deleteToken($token)
+ {
+ $this->tokens->delete($token);
+ }
+
+ /**
+ * Validate the given password reset token.
+ *
+ * @param CanResetPasswordContract $user
+ * @param string $token
+ * @return bool
+ */
+ public function tokenExists(CanResetPasswordContract $user, $token)
+ {
+ return $this->tokens->exists($user, $token);
+ }
+
/**
* Get the password reset token repository implementation.
*
* @return \Illuminate\Auth\Passwords\TokenRepositoryInterface
*/
- protected function getRepository()
+ public function getRepository()
{
return $this->tokens;
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
new file mode 100644
index 0000000..8edcf92
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
@@ -0,0 +1,145 @@
+app = $app;
+ }
+
+ /**
+ * Attempt to get the broker from the local cache.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Auth\PasswordBroker
+ */
+ public function broker($name = null)
+ {
+ $name = $name ?: $this->getDefaultDriver();
+
+ return isset($this->brokers[$name])
+ ? $this->brokers[$name]
+ : $this->brokers[$name] = $this->resolve($name);
+ }
+
+ /**
+ * Resolve the given broker.
+ *
+ * @param string $name
+ * @return \Illuminate\Contracts\Auth\PasswordBroker
+ *
+ * @throws \InvalidArgumentException
+ */
+ protected function resolve($name)
+ {
+ $config = $this->getConfig($name);
+
+ if (is_null($config)) {
+ throw new InvalidArgumentException("Password resetter [{$name}] is not defined.");
+ }
+
+ // 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(
+ $this->createTokenRepository($config),
+ $this->app['auth']->createUserProvider($config['provider']),
+ $this->app['mailer'],
+ $config['email']
+ );
+ }
+
+ /**
+ * Create a token repository instance based on the given configuration.
+ *
+ * @param array $config
+ * @return \Illuminate\Auth\Passwords\TokenRepositoryInterface
+ */
+ protected function createTokenRepository(array $config)
+ {
+ $key = $this->app['config']['app.key'];
+
+ if (Str::startsWith($key, 'base64:')) {
+ $key = base64_decode(substr($key, 7));
+ }
+
+ $connection = isset($config['connection']) ? $config['connection'] : null;
+
+ return new DatabaseTokenRepository(
+ $this->app['db']->connection($connection),
+ $config['table'],
+ $key,
+ $config['expire']
+ );
+ }
+
+ /**
+ * Get the password broker configuration.
+ *
+ * @param string $name
+ * @return array
+ */
+ protected function getConfig($name)
+ {
+ return $this->app['config']["auth.passwords.{$name}"];
+ }
+
+ /**
+ * Get the default password broker name.
+ *
+ * @return string
+ */
+ public function getDefaultDriver()
+ {
+ return $this->app['config']['auth.defaults.passwords'];
+ }
+
+ /**
+ * Set the default password broker name.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function setDefaultDriver($name)
+ {
+ $this->app['config']['auth.defaults.passwords'] = $name;
+ }
+
+ /**
+ * 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->broker(), $method], $parameters);
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php
old mode 100644
new mode 100755
index 2da8f7d..165ecaf
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php
@@ -3,7 +3,6 @@
namespace Illuminate\Auth\Passwords;
use Illuminate\Support\ServiceProvider;
-use Illuminate\Auth\Passwords\DatabaseTokenRepository as DbRepository;
class PasswordResetServiceProvider extends ServiceProvider
{
@@ -22,8 +21,6 @@ class PasswordResetServiceProvider extends ServiceProvider
public function register()
{
$this->registerPasswordBroker();
-
- $this->registerTokenRepository();
}
/**
@@ -34,44 +31,11 @@ public function register()
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
- );
+ return new PasswordBrokerManager($app);
});
- }
-
- /**
- * 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);
+ $this->app->bind('auth.password.broker', function ($app) {
+ return $app->make('auth.password')->broker();
});
}
@@ -82,6 +46,6 @@ protected function registerTokenRepository()
*/
public function provides()
{
- return ['auth.password', 'auth.password.tokens'];
+ return ['auth.password', 'auth.password.broker'];
}
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php b/application/vendor/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php
old mode 100644
new mode 100755
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/RequestGuard.php b/application/vendor/laravel/framework/src/Illuminate/Auth/RequestGuard.php
new file mode 100644
index 0000000..e6b9a7e
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/RequestGuard.php
@@ -0,0 +1,81 @@
+request = $request;
+ $this->callback = $callback;
+ }
+
+ /**
+ * Get the currently authenticated user.
+ *
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function user()
+ {
+ // 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;
+ }
+
+ return $this->user = call_user_func($this->callback, $this->request);
+ }
+
+ /**
+ * Validate a user's credentials.
+ *
+ * @param array $credentials
+ * @return bool
+ */
+ public function validate(array $credentials = [])
+ {
+ return ! is_null((new static(
+ $this->callback, $credentials['request']
+ ))->user());
+ }
+
+ /**
+ * Set the current request instance.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return $this
+ */
+ public function setRequest(Request $request)
+ {
+ $this->request = $request;
+
+ return $this;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/Guard.php b/application/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php
similarity index 84%
rename from application/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
rename to application/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php
index 482c3ea..2e85639 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/Guard.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php
@@ -4,23 +4,28 @@
use RuntimeException;
use Illuminate\Support\Str;
-use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Http\Response;
use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Contracts\Auth\StatefulGuard;
use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Illuminate\Contracts\Auth\Guard as GuardContract;
+use Illuminate\Contracts\Auth\SupportsBasicAuth;
use Illuminate\Contracts\Cookie\QueueingFactory as CookieJar;
-use Illuminate\Contracts\Auth\Authenticatable as UserContract;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
-class Guard implements GuardContract
+class SessionGuard implements StatefulGuard, SupportsBasicAuth
{
+ use GuardHelpers;
+
/**
- * The currently authenticated user.
+ * The name of the Guard. Typically "session".
*
- * @var \Illuminate\Contracts\Auth\Authenticatable
+ * Corresponds to driver name in authentication configuration.
+ *
+ * @var string
*/
- protected $user;
+ protected $name;
/**
* The user we last attempted to retrieve.
@@ -36,13 +41,6 @@ class Guard implements GuardContract
*/
protected $viaRemember = false;
- /**
- * The user provider implementation.
- *
- * @var \Illuminate\Contracts\Auth\UserProvider
- */
- protected $provider;
-
/**
* The session used by the guard.
*
@@ -88,40 +86,23 @@ class Guard implements GuardContract
/**
* Create a new authentication guard.
*
+ * @param string $name
* @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,
+ public function __construct($name,
+ UserProvider $provider,
SessionInterface $session,
Request $request = null)
{
+ $this->name = $name;
$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.
*
@@ -233,7 +214,7 @@ protected function getRecallerId()
/**
* Determine if the recaller cookie is in a valid format.
*
- * @param string $recaller
+ * @param mixed $recaller
* @return bool
*/
protected function validRecaller($recaller)
@@ -279,9 +260,10 @@ public function validate(array $credentials = [])
* Attempt to authenticate using HTTP Basic Auth.
*
* @param string $field
+ * @param array $extraConditions
* @return \Symfony\Component\HttpFoundation\Response|null
*/
- public function basic($field = 'email')
+ public function basic($field = 'email', $extraConditions = [])
{
if ($this->check()) {
return;
@@ -290,7 +272,7 @@ public function basic($field = 'email')
// 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)) {
+ if ($this->attemptBasic($this->getRequest(), $field, $extraConditions)) {
return;
}
@@ -301,11 +283,14 @@ public function basic($field = 'email')
* Perform a stateless HTTP Basic login attempt.
*
* @param string $field
+ * @param array $extraConditions
* @return \Symfony\Component\HttpFoundation\Response|null
*/
- public function onceBasic($field = 'email')
+ public function onceBasic($field = 'email', $extraConditions = [])
{
- if (! $this->once($this->getBasicCredentials($this->getRequest(), $field))) {
+ $credentials = $this->getBasicCredentials($this->getRequest(), $field);
+
+ if (! $this->once(array_merge($credentials, $extraConditions))) {
return $this->getBasicResponse();
}
}
@@ -315,15 +300,18 @@ public function onceBasic($field = 'email')
*
* @param \Symfony\Component\HttpFoundation\Request $request
* @param string $field
+ * @param array $extraConditions
* @return bool
*/
- protected function attemptBasic(Request $request, $field)
+ protected function attemptBasic(Request $request, $field, $extraConditions = [])
{
if (! $request->getUser()) {
return false;
}
- return $this->attempt($this->getBasicCredentials($request, $field));
+ $credentials = $this->getBasicCredentials($request, $field);
+
+ return $this->attempt(array_merge($credentials, $extraConditions));
}
/**
@@ -375,6 +363,13 @@ public function attempt(array $credentials = [], $remember = false, $login = tru
return true;
}
+ // If the authentication attempt fails we will fire an event so that the user
+ // may be notified of any suspicious attempts to access their account from
+ // an unrecognized user. A developer may listen to this event as needed.
+ if ($login) {
+ $this->fireFailedEvent($user, $credentials);
+ }
+
return false;
}
@@ -400,10 +395,24 @@ protected function hasValidCredentials($user, $credentials)
*/
protected function fireAttemptEvent(array $credentials, $remember, $login)
{
- if ($this->events) {
- $payload = [$credentials, $remember, $login];
+ if (isset($this->events)) {
+ $this->events->fire(new Events\Attempting(
+ $credentials, $remember, $login
+ ));
+ }
+ }
- $this->events->fire('auth.attempt', $payload);
+ /**
+ * Fire the failed authentication attempt event with the given arguments.
+ *
+ * @param \Illuminate\Contracts\Auth\Authenticatable|null $user
+ * @param array $credentials
+ * @return void
+ */
+ protected function fireFailedEvent($user, array $credentials)
+ {
+ if (isset($this->events)) {
+ $this->events->fire(new Events\Failed($user, $credentials));
}
}
@@ -415,8 +424,8 @@ protected function fireAttemptEvent(array $credentials, $remember, $login)
*/
public function attempting($callback)
{
- if ($this->events) {
- $this->events->listen('auth.attempt', $callback);
+ if (isset($this->events)) {
+ $this->events->listen(Events\Attempting::class, $callback);
}
}
@@ -427,7 +436,7 @@ public function attempting($callback)
* @param bool $remember
* @return void
*/
- public function login(UserContract $user, $remember = false)
+ public function login(AuthenticatableContract $user, $remember = false)
{
$this->updateSession($user->getAuthIdentifier());
@@ -458,7 +467,7 @@ public function login(UserContract $user, $remember = false)
protected function fireLoginEvent($user, $remember = false)
{
if (isset($this->events)) {
- $this->events->fire('auth.login', [$user, $remember]);
+ $this->events->fire(new Events\Login($user, $remember));
}
}
@@ -484,11 +493,15 @@ protected function updateSession($id)
*/
public function loginUsingId($id, $remember = false)
{
- $this->session->set($this->getName(), $id);
+ $user = $this->provider->retrieveById($id);
- $this->login($user = $this->provider->retrieveById($id), $remember);
+ if (! is_null($user)) {
+ $this->login($user, $remember);
+
+ return $user;
+ }
- return $user;
+ return false;
}
/**
@@ -499,7 +512,9 @@ public function loginUsingId($id, $remember = false)
*/
public function onceUsingId($id)
{
- if (! is_null($user = $this->provider->retrieveById($id))) {
+ $user = $this->provider->retrieveById($id);
+
+ if (! is_null($user)) {
$this->setUser($user);
return true;
@@ -514,7 +529,7 @@ public function onceUsingId($id)
* @param \Illuminate\Contracts\Auth\Authenticatable $user
* @return void
*/
- protected function queueRecallerCookie(UserContract $user)
+ protected function queueRecallerCookie(AuthenticatableContract $user)
{
$value = $user->getAuthIdentifier().'|'.$user->getRememberToken();
@@ -551,7 +566,7 @@ public function logout()
}
if (isset($this->events)) {
- $this->events->fire('auth.logout', [$user]);
+ $this->events->fire(new Events\Logout($user));
}
// Once we have fired the logout event we will clear the users out of memory
@@ -584,7 +599,7 @@ protected function clearUserDataFromStorage()
* @param \Illuminate\Contracts\Auth\Authenticatable $user
* @return void
*/
- protected function refreshRememberToken(UserContract $user)
+ protected function refreshRememberToken(AuthenticatableContract $user)
{
$user->setRememberToken($token = Str::random(60));
@@ -597,7 +612,7 @@ protected function refreshRememberToken(UserContract $user)
* @param \Illuminate\Contracts\Auth\Authenticatable $user
* @return void
*/
- protected function createRememberTokenIfDoesntExist(UserContract $user)
+ protected function createRememberTokenIfDoesntExist(AuthenticatableContract $user)
{
if (empty($user->getRememberToken())) {
$this->refreshRememberToken($user);
@@ -697,13 +712,15 @@ public function getUser()
* Set the current user.
*
* @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @return void
+ * @return $this
*/
- public function setUser(UserContract $user)
+ public function setUser(AuthenticatableContract $user)
{
$this->user = $user;
$this->loggedOut = false;
+
+ return $this;
}
/**
@@ -746,7 +763,7 @@ public function getLastAttempted()
*/
public function getName()
{
- return 'login_'.md5(get_class($this));
+ return 'login_'.$this->name.'_'.sha1(static::class);
}
/**
@@ -756,7 +773,7 @@ public function getName()
*/
public function getRecallerName()
{
- return 'remember_'.md5(get_class($this));
+ return 'remember_'.$this->name.'_'.sha1(static::class);
}
/**
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/TokenGuard.php b/application/vendor/laravel/framework/src/Illuminate/Auth/TokenGuard.php
new file mode 100644
index 0000000..2a33ab0
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/TokenGuard.php
@@ -0,0 +1,129 @@
+request = $request;
+ $this->provider = $provider;
+ $this->inputKey = 'api_token';
+ $this->storageKey = 'api_token';
+ }
+
+ /**
+ * Get the currently authenticated user.
+ *
+ * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ */
+ public function user()
+ {
+ // 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;
+ }
+
+ $user = null;
+
+ $token = $this->getTokenForRequest();
+
+ if (! empty($token)) {
+ $user = $this->provider->retrieveByCredentials(
+ [$this->storageKey => $token]
+ );
+ }
+
+ return $this->user = $user;
+ }
+
+ /**
+ * Get the token for the current request.
+ *
+ * @return string
+ */
+ protected function getTokenForRequest()
+ {
+ $token = $this->request->input($this->inputKey);
+
+ if (empty($token)) {
+ $token = $this->request->bearerToken();
+ }
+
+ if (empty($token)) {
+ $token = $this->request->getPassword();
+ }
+
+ return $token;
+ }
+
+ /**
+ * Validate a user's credentials.
+ *
+ * @param array $credentials
+ * @return bool
+ */
+ public function validate(array $credentials = [])
+ {
+ if (empty($credentials[$this->inputKey])) {
+ return false;
+ }
+
+ $credentials = [$this->storageKey => $credentials[$this->inputKey]];
+
+ if ($this->provider->retrieveByCredentials($credentials)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Set the current request instance.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return $this
+ */
+ public function setRequest(Request $request)
+ {
+ $this->request = $request;
+
+ return $this;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Auth/composer.json b/application/vendor/laravel/framework/src/Illuminate/Auth/composer.json
old mode 100644
new mode 100755
index 8bb3c66..669c217
--- a/application/vendor/laravel/framework/src/Illuminate/Auth/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Auth/composer.json
@@ -10,16 +10,15 @@
"authors": [
{
"name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "email": "taylor@laravel.com"
}
],
"require": {
"php": ">=5.5.9",
- "illuminate/contracts": "5.1.*",
- "illuminate/http": "5.1.*",
- "illuminate/session": "5.1.*",
- "illuminate/support": "5.1.*",
- "nesbot/carbon": "~1.19"
+ "illuminate/contracts": "5.2.*",
+ "illuminate/http": "5.2.*",
+ "illuminate/support": "5.2.*",
+ "nesbot/carbon": "~1.20"
},
"autoload": {
"psr-4": {
@@ -28,11 +27,13 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.1-dev"
+ "dev-master": "5.2-dev"
}
},
"suggest": {
- "illuminate/console": "Required to use the auth:clear-resets command (5.1.*)."
+ "illuminate/console": "Required to use the auth:clear-resets command (5.2.*).",
+ "illuminate/queue": "Required to fire login / logout events (5.2.*).",
+ "illuminate/session": "Required to use the session based guard (5.2.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
index 97a0fe5..05a83d4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
@@ -104,7 +104,7 @@ protected function resolve($name)
if (method_exists($this, $driverMethod)) {
return $this->{$driverMethod}($config);
} else {
- throw new InvalidArgumentException("Driver [{$config['driver']}] not supported.");
+ throw new InvalidArgumentException("Driver [{$config['driver']}] is not supported.");
}
}
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
index c3e89d1..53feb54 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
@@ -10,13 +10,13 @@
"authors": [
{
"name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "email": "taylor@laravel.com"
}
],
"require": {
"php": ">=5.5.9",
- "illuminate/contracts": "5.1.*",
- "illuminate/support": "5.1.*"
+ "illuminate/contracts": "5.2.*",
+ "illuminate/support": "5.2.*"
},
"autoload": {
"psr-4": {
@@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.1-dev"
+ "dev-master": "5.2-dev"
}
},
"suggest": {
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php
index 55eeb2a..affdb4d 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php
@@ -21,8 +21,8 @@ class BusServiceProvider extends ServiceProvider
public function register()
{
$this->app->singleton('Illuminate\Bus\Dispatcher', function ($app) {
- return new Dispatcher($app, function () use ($app) {
- return $app['Illuminate\Contracts\Queue\Queue'];
+ return new Dispatcher($app, function ($connection = null) use ($app) {
+ return $app['Illuminate\Contracts\Queue\Factory']->connection($connection);
});
});
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php b/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php
index cecf9f1..70e9b67 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php
@@ -3,22 +3,14 @@
namespace Illuminate\Bus;
use Closure;
-use ArrayAccess;
-use ReflectionClass;
use RuntimeException;
-use ReflectionParameter;
-use InvalidArgumentException;
use Illuminate\Pipeline\Pipeline;
-use Illuminate\Support\Collection;
use Illuminate\Contracts\Queue\Queue;
-use Illuminate\Contracts\Bus\SelfHandling;
use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Contracts\Bus\HandlerResolver;
use Illuminate\Contracts\Container\Container;
use Illuminate\Contracts\Bus\QueueingDispatcher;
-use Illuminate\Contracts\Bus\Dispatcher as DispatcherContract;
-class Dispatcher implements DispatcherContract, QueueingDispatcher, HandlerResolver
+class Dispatcher implements QueueingDispatcher
{
/**
* The container implementation.
@@ -48,20 +40,6 @@ class Dispatcher implements DispatcherContract, QueueingDispatcher, HandlerResol
*/
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.
*
@@ -76,105 +54,18 @@ public function __construct(Container $container, Closure $queueResolver = null)
$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)
+ public function dispatch($command)
{
if ($this->queueResolver && $this->commandShouldBeQueued($command)) {
return $this->dispatchToQueue($command);
} else {
- return $this->dispatchNow($command, $afterResolving);
+ return $this->dispatchNow($command);
}
}
@@ -182,25 +73,12 @@ public function dispatch($command, Closure $afterResolving = null)
* 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)
+ public function dispatchNow($command)
{
- 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
- );
+ return $this->pipeline->send($command)->through($this->pipes)->then(function ($command) {
+ return $this->container->call([$command, 'handle']);
});
}
@@ -212,13 +90,7 @@ public function dispatchNow($command, Closure $afterResolving = null)
*/
protected function commandShouldBeQueued($command)
{
- if ($command instanceof ShouldQueue) {
- return true;
- }
-
- return (new ReflectionClass($this->getHandlerClass($command)))->implementsInterface(
- 'Illuminate\Contracts\Queue\ShouldQueue'
- );
+ return $command instanceof ShouldQueue;
}
/**
@@ -231,7 +103,9 @@ protected function commandShouldBeQueued($command)
*/
public function dispatchToQueue($command)
{
- $queue = call_user_func($this->queueResolver);
+ $connection = isset($command->connection) ? $command->connection : null;
+
+ $queue = call_user_func($this->queueResolver, $connection);
if (! $queue instanceof Queue) {
throw new RuntimeException('Queue resolver did not return a Queue implementation.');
@@ -268,132 +142,6 @@ protected function pushCommandToQueue($queue, $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.
*
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/MarshalException.php b/application/vendor/laravel/framework/src/Illuminate/Bus/MarshalException.php
deleted file mode 100644
index 49c7674..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/MarshalException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-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
index 42d1ca5..a7d306a 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/Queueable.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/Queueable.php
@@ -4,24 +4,44 @@
trait Queueable
{
+ /**
+ * The name of the connection the job should be sent to.
+ *
+ * @var string|null
+ */
+ public $connection;
+
/**
* The name of the queue the job should be sent to.
*
- * @var string
+ * @var string|null
*/
public $queue;
/**
- * The seconds before the job should be made available.
+ * The number of seconds before the job should be made available.
*
- * @var int
+ * @var \DateTime|int|null
*/
public $delay;
+ /**
+ * Set the desired connection for the job.
+ *
+ * @param string|null $connection
+ * @return $this
+ */
+ public function onConnection($connection)
+ {
+ $this->connection = $connection;
+
+ return $this;
+ }
+
/**
* Set the desired queue for the job.
*
- * @param string $queue
+ * @param string|null $queue
* @return $this
*/
public function onQueue($queue)
@@ -34,7 +54,7 @@ public function onQueue($queue)
/**
* Set the desired delay for the job.
*
- * @param int $delay
+ * @param int|null $delay
* @return $this
*/
public function delay($delay)
diff --git a/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json b/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json
index 16982e6..12dd516 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Bus/composer.json
@@ -10,14 +10,14 @@
"authors": [
{
"name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "email": "taylor@laravel.com"
}
],
"require": {
"php": ">=5.5.9",
- "illuminate/contracts": "5.1.*",
- "illuminate/pipeline": "5.1.*",
- "illuminate/support": "5.1.*"
+ "illuminate/contracts": "5.2.*",
+ "illuminate/pipeline": "5.2.*",
+ "illuminate/support": "5.2.*"
},
"autoload": {
"psr-4": {
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.1-dev"
+ "dev-master": "5.2-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
old mode 100644
new mode 100755
index 9125dec..5fc88d5
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php
@@ -6,6 +6,8 @@
class ApcStore extends TaggableStore implements Store
{
+ use RetrievesMultipleKeys;
+
/**
* The APC wrapper instance.
*
@@ -36,7 +38,7 @@ public function __construct(ApcWrapper $apc, $prefix = '')
/**
* Retrieve an item from the cache by key.
*
- * @param string $key
+ * @param string|array $key
* @return mixed
*/
public function get($key)
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php b/application/vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php
old mode 100644
new mode 100755
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
old mode 100644
new mode 100755
index 3dd8c04..cc99318
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
@@ -6,6 +6,8 @@
class ArrayStore extends TaggableStore implements Store
{
+ use RetrievesMultipleKeys;
+
/**
* The array of stored values.
*
@@ -16,7 +18,7 @@ class ArrayStore extends TaggableStore implements Store
/**
* Retrieve an item from the cache by key.
*
- * @param string $key
+ * @param string|array $key
* @return mixed
*/
public function get($key)
@@ -54,7 +56,7 @@ public function increment($key, $value = 1)
}
/**
- * Increment the value of an item in the cache.
+ * Decrement the value of an item in the cache.
*
* @param string $key
* @param mixed $value
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
old mode 100644
new mode 100755
index 1eb7935..1b7cdc9
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
@@ -101,7 +101,7 @@ protected function resolve($name)
if (method_exists($this, $driverMethod)) {
return $this->{$driverMethod}($config);
} else {
- throw new InvalidArgumentException("Driver [{$config['driver']}] not supported.");
+ throw new InvalidArgumentException("Driver [{$config['driver']}] is not supported.");
}
}
}
@@ -176,28 +176,6 @@ 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.
*
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php
old mode 100644
new mode 100755
index fe4801e..8b0b468
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php
@@ -4,7 +4,6 @@
use Illuminate\Support\ServiceProvider;
use Illuminate\Cache\Console\ClearCommand;
-use Illuminate\Cache\Console\CacheTableCommand;
class CacheServiceProvider extends ServiceProvider
{
@@ -48,11 +47,7 @@ public function registerCommands()
return new ClearCommand($app['cache']);
});
- $this->app->singleton('command.cache.table', function ($app) {
- return new CacheTableCommand($app['files'], $app['composer']);
- });
-
- $this->commands('command.cache.clear', 'command.cache.table');
+ $this->commands('command.cache.clear');
}
/**
@@ -63,7 +58,7 @@ public function registerCommands()
public function provides()
{
return [
- 'cache', 'cache.store', 'memcached.connector', 'command.cache.clear', 'command.cache.table',
+ 'cache', 'cache.store', 'memcached.connector', 'command.cache.clear',
];
}
}
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 2e436d6..7c3f4b6 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php
@@ -3,7 +3,7 @@
namespace Illuminate\Cache\Console;
use Illuminate\Console\Command;
-use Illuminate\Foundation\Composer;
+use Illuminate\Support\Composer;
use Illuminate\Filesystem\Filesystem;
class CacheTableCommand extends Command
@@ -30,7 +30,7 @@ class CacheTableCommand extends Command
protected $files;
/**
- * @var \Illuminate\Foundation\Composer
+ * @var \Illuminate\Support\Composer
*/
protected $composer;
@@ -38,7 +38,7 @@ class CacheTableCommand extends Command
* Create a new cache table command instance.
*
* @param \Illuminate\Filesystem\Filesystem $files
- * @param \Illuminate\Foundation\Composer $composer
+ * @param \Illuminate\Support\Composer $composer
* @return void
*/
public function __construct(Filesystem $files, Composer $composer)
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
old mode 100644
new mode 100755
index 02ea032..899269a
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
@@ -4,6 +4,7 @@
use Illuminate\Console\Command;
use Illuminate\Cache\CacheManager;
+use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputArgument;
class ClearCommand extends Command
@@ -47,17 +48,23 @@ public function __construct(CacheManager $cache)
*
* @return void
*/
- public function fire()
+ public function handle()
{
- $storeName = $this->argument('store');
+ $tags = array_filter(explode(',', $this->option('tags')));
- $this->laravel['events']->fire('cache:clearing', [$storeName]);
+ $cache = $this->cache->store($store = $this->argument('store'));
- $this->cache->store($storeName)->flush();
+ $this->laravel['events']->fire('cache:clearing', [$store, $tags]);
- $this->laravel['events']->fire('cache:cleared', [$storeName]);
+ if (! empty($tags)) {
+ $cache->tags($tags)->flush();
+ } else {
+ $cache->flush();
+ }
- $this->info('Application cache cleared!');
+ $this->info('Cache cleared successfully.');
+
+ $this->laravel['events']->fire('cache:cleared', [$store, $tags]);
}
/**
@@ -71,4 +78,16 @@ protected function getArguments()
['store', InputArgument::OPTIONAL, 'The name of the store you would like to clear.'],
];
}
+
+ /**
+ * Get the console command options.
+ *
+ * @return array
+ */
+ protected function getOptions()
+ {
+ return [
+ ['tags', null, InputOption::VALUE_OPTIONAL, 'The cache tags you would like to clear.', null],
+ ];
+ }
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
old mode 100644
new mode 100755
index 20f20c7..b2382cb
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
@@ -10,6 +10,8 @@
class DatabaseStore implements Store
{
+ use RetrievesMultipleKeys;
+
/**
* The database connection instance.
*
@@ -58,7 +60,7 @@ public function __construct(ConnectionInterface $connection, EncrypterContract $
/**
* Retrieve an item from the cache by key.
*
- * @param string $key
+ * @param string|array $key
* @return mixed
*/
public function get($key)
@@ -126,7 +128,7 @@ public function increment($key, $value = 1)
}
/**
- * Increment the value of an item in the cache.
+ * Decrement the value of an item in the cache.
*
* @param string $key
* @param mixed $value
@@ -158,6 +160,10 @@ protected function incrementOrDecrement($key, $value, Closure $callback)
return false;
}
+ if (is_array($cache)) {
+ $cache = (object) $cache;
+ }
+
$current = $this->encrypter->decrypt($cache->value);
$new = $callback((int) $current, $value);
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheHit.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheHit.php
new file mode 100644
index 0000000..2e846a4
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheHit.php
@@ -0,0 +1,42 @@
+key = $key;
+ $this->tags = $tags;
+ $this->value = $value;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheMissed.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheMissed.php
new file mode 100644
index 0000000..2e2b2ff
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheMissed.php
@@ -0,0 +1,33 @@
+key = $key;
+ $this->tags = $tags;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyForgotten.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyForgotten.php
new file mode 100644
index 0000000..495bed5
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyForgotten.php
@@ -0,0 +1,33 @@
+key = $key;
+ $this->tags = $tags;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyWritten.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyWritten.php
new file mode 100644
index 0000000..7f5fc73
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyWritten.php
@@ -0,0 +1,51 @@
+key = $key;
+ $this->tags = $tags;
+ $this->value = $value;
+ $this->minutes = $minutes;
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
old mode 100644
new mode 100755
index 05f3eda..b21ba6c
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
@@ -4,11 +4,13 @@
use Exception;
use Illuminate\Support\Arr;
-use Illuminate\Contracts\Cache\Store;
use Illuminate\Filesystem\Filesystem;
+use Illuminate\Contracts\Cache\Store;
class FileStore implements Store
{
+ use RetrievesMultipleKeys;
+
/**
* The Illuminate Filesystem instance.
*
@@ -39,7 +41,7 @@ public function __construct(Filesystem $files, $directory)
/**
* Retrieve an item from the cache by key.
*
- * @param string $key
+ * @param string|array $key
* @return mixed
*/
public function get($key)
@@ -61,7 +63,9 @@ protected function getPayload($key)
// 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);
+ $expire = substr(
+ $contents = $this->files->get($path, true), 0, 10
+ );
} catch (Exception $e) {
return ['data' => null, 'time' => null];
}
@@ -99,7 +103,7 @@ public function put($key, $value, $minutes)
$this->createCacheDirectory($path = $this->path($key));
- $this->files->put($path, $value);
+ $this->files->put($path, $value, true);
}
/**
@@ -196,7 +200,7 @@ public function flush()
*/
protected function path($key)
{
- $parts = array_slice(str_split($hash = md5($key), 2), 0, 2);
+ $parts = array_slice(str_split($hash = sha1($key), 2), 0, 2);
return $this->directory.'/'.implode('/', $parts).'/'.$hash;
}
@@ -215,7 +219,7 @@ protected function expiration($minutes)
return 9999999999;
}
- return $time;
+ return (int) $time;
}
/**
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php b/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php
old mode 100644
new mode 100755
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
old mode 100644
new mode 100755
index 2c2aee0..156bcdc
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
@@ -2,6 +2,7 @@
namespace Illuminate\Cache;
+use Memcached;
use Illuminate\Contracts\Cache\Store;
class MemcachedStore extends TaggableStore implements Store
@@ -36,7 +37,7 @@ public function __construct($memcached, $prefix = '')
/**
* Retrieve an item from the cache by key.
*
- * @param string $key
+ * @param string|array $key
* @return mixed
*/
public function get($key)
@@ -48,6 +49,29 @@ public function get($key)
}
}
+ /**
+ * Retrieve multiple items from the cache by key.
+ *
+ * Items not found in the cache will have a null value.
+ *
+ * @param array $keys
+ * @return array
+ */
+ public function many(array $keys)
+ {
+ $prefixedKeys = array_map(function ($key) {
+ return $this->prefix.$key;
+ }, $keys);
+
+ $values = $this->memcached->getMulti($prefixedKeys, null, Memcached::GET_PRESERVE_ORDER);
+
+ if ($this->memcached->getResultCode() != 0) {
+ return array_fill_keys($keys, null);
+ }
+
+ return array_combine($keys, $values);
+ }
+
/**
* Store an item in the cache for a given number of minutes.
*
@@ -61,6 +85,24 @@ public function put($key, $value, $minutes)
$this->memcached->set($this->prefix.$key, $value, $minutes * 60);
}
+ /**
+ * Store multiple items in the cache for a given number of minutes.
+ *
+ * @param array $values
+ * @param int $minutes
+ * @return void
+ */
+ public function putMany(array $values, $minutes)
+ {
+ $prefixedValues = [];
+
+ foreach ($values as $key => $value) {
+ $prefixedValues[$this->prefix.$key] = $value;
+ }
+
+ $this->memcached->setMulti($prefixedValues, $minutes * 60);
+ }
+
/**
* Store an item in the cache if the key doesn't exist.
*
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php
old mode 100644
new mode 100755
index 46aed16..090ae4c
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/NullStore.php
@@ -6,6 +6,8 @@
class NullStore extends TaggableStore implements Store
{
+ use RetrievesMultipleKeys;
+
/**
* The array of stored values.
*
@@ -50,7 +52,7 @@ public function increment($key, $value = 1)
}
/**
- * Increment the value of an item in the cache.
+ * Decrement the value of an item in the cache.
*
* @param string $key
* @param mixed $value
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php b/application/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php
index 4a9978c..497ceb1 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php
@@ -34,12 +34,14 @@ public function __construct(Cache $cache)
*/
public function tooManyAttempts($key, $maxAttempts, $decayMinutes = 1)
{
- $lockedOut = $this->cache->has($key.':lockout');
+ if ($this->cache->has($key.':lockout')) {
+ return true;
+ }
+
+ if ($this->attempts($key) > $maxAttempts) {
+ $this->cache->add($key.':lockout', time() + ($decayMinutes * 60), $decayMinutes);
- if ($this->attempts($key) > $maxAttempts || $lockedOut) {
- if (! $lockedOut) {
- $this->cache->add($key.':lockout', time() + ($decayMinutes * 60), $decayMinutes);
- }
+ $this->resetAttempts($key);
return true;
}
@@ -72,6 +74,31 @@ public function attempts($key)
return $this->cache->get($key, 0);
}
+ /**
+ * Reset the number of attempts for the given key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function resetAttempts($key)
+ {
+ return $this->cache->forget($key);
+ }
+
+ /**
+ * Get the number of retries left for the given key.
+ *
+ * @param string $key
+ * @param int $maxAttempts
+ * @return int
+ */
+ public function retriesLeft($key, $maxAttempts)
+ {
+ $attempts = $this->attempts($key);
+
+ return $attempts === 0 ? $maxAttempts : $maxAttempts - $attempts + 1;
+ }
+
/**
* Clear the hits and lockout for the given key.
*
@@ -80,7 +107,7 @@ public function attempts($key)
*/
public function clear($key)
{
- $this->cache->forget($key);
+ $this->resetAttempts($key);
$this->cache->forget($key.':lockout');
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php
old mode 100644
new mode 100755
index aeea3f4..d3f2c97
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php
@@ -46,7 +46,7 @@ public function __construct(Redis $redis, $prefix = '', $connection = 'default')
/**
* Retrieve an item from the cache by key.
*
- * @param string $key
+ * @param string|array $key
* @return mixed
*/
public function get($key)
@@ -56,6 +56,31 @@ public function get($key)
}
}
+ /**
+ * Retrieve multiple items from the cache by key.
+ *
+ * Items not found in the cache will have a null value.
+ *
+ * @param array $keys
+ * @return array
+ */
+ public function many(array $keys)
+ {
+ $return = [];
+
+ $prefixedKeys = array_map(function ($key) {
+ return $this->prefix.$key;
+ }, $keys);
+
+ $values = $this->connection()->mget($prefixedKeys);
+
+ foreach ($values as $index => $value) {
+ $return[$keys[$index]] = is_numeric($value) ? $value : unserialize($value);
+ }
+
+ return $return;
+ }
+
/**
* Store an item in the cache for a given number of minutes.
*
@@ -68,9 +93,25 @@ public function put($key, $value, $minutes)
{
$value = is_numeric($value) ? $value : serialize($value);
- $minutes = max(1, $minutes);
+ $this->connection()->setex($this->prefix.$key, (int) max(1, $minutes * 60), $value);
+ }
+
+ /**
+ * Store multiple items in the cache for a given number of minutes.
+ *
+ * @param array $values
+ * @param int $minutes
+ * @return void
+ */
+ public function putMany(array $values, $minutes)
+ {
+ $this->connection()->multi();
+
+ foreach ($values as $key => $value) {
+ $this->put($key, $value, $minutes);
+ }
- $this->connection()->setex($this->prefix.$key, $minutes * 60, $value);
+ $this->connection()->exec();
}
/**
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php b/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
old mode 100644
new mode 100755
index fb76105..b50ddd0
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
@@ -70,8 +70,35 @@ public function setEventDispatcher(Dispatcher $events)
*/
protected function fireCacheEvent($event, $payload)
{
- if (isset($this->events)) {
- $this->events->fire('cache.'.$event, $payload);
+ if (! isset($this->events)) {
+ return;
+ }
+
+ switch ($event) {
+ case 'hit':
+ if (count($payload) == 2) {
+ $payload[] = [];
+ }
+
+ return $this->events->fire(new Events\CacheHit($payload[0], $payload[1], $payload[2]));
+ case 'missed':
+ if (count($payload) == 1) {
+ $payload[] = [];
+ }
+
+ return $this->events->fire(new Events\CacheMissed($payload[0], $payload[1]));
+ case 'delete':
+ if (count($payload) == 1) {
+ $payload[] = [];
+ }
+
+ return $this->events->fire(new Events\KeyForgotten($payload[0], $payload[1]));
+ case 'write':
+ if (count($payload) == 3) {
+ $payload[] = [];
+ }
+
+ return $this->events->fire(new Events\KeyWritten($payload[0], $payload[1], $payload[2], $payload[3]));
}
}
@@ -95,6 +122,10 @@ public function has($key)
*/
public function get($key, $default = null)
{
+ if (is_array($key)) {
+ return $this->many($key);
+ }
+
$value = $this->store->get($this->itemKey($key));
if (is_null($value)) {
@@ -108,6 +139,37 @@ public function get($key, $default = null)
return $value;
}
+ /**
+ * Retrieve multiple items from the cache by key.
+ *
+ * Items not found in the cache will have a null value.
+ *
+ * @param array $keys
+ * @return array
+ */
+ public function many(array $keys)
+ {
+ $normalizedKeys = [];
+
+ foreach ($keys as $key => $value) {
+ $normalizedKeys[] = is_string($key) ? $key : $value;
+ }
+
+ $values = $this->store->many($normalizedKeys);
+
+ foreach ($values as $key => &$value) {
+ if (is_null($value)) {
+ $this->fireCacheEvent('missed', [$key]);
+
+ $value = isset($keys[$key]) ? value($keys[$key]) : null;
+ } else {
+ $this->fireCacheEvent('hit', [$key, $value]);
+ }
+ }
+
+ return $values;
+ }
+
/**
* Retrieve an item from the cache and delete it.
*
@@ -132,8 +194,12 @@ public function pull($key, $default = null)
* @param \DateTime|int $minutes
* @return void
*/
- public function put($key, $value, $minutes)
+ public function put($key, $value, $minutes = null)
{
+ if (is_array($key) && filter_var($value, FILTER_VALIDATE_INT) !== false) {
+ return $this->putMany($key, $value);
+ }
+
$minutes = $this->getMinutes($minutes);
if (! is_null($minutes)) {
@@ -143,6 +209,26 @@ public function put($key, $value, $minutes)
}
}
+ /**
+ * Store multiple items in the cache for a given number of minutes.
+ *
+ * @param array $values
+ * @param int $minutes
+ * @return void
+ */
+ public function putMany(array $values, $minutes)
+ {
+ $minutes = $this->getMinutes($minutes);
+
+ if (! is_null($minutes)) {
+ $this->store->putMany($values, $minutes);
+
+ foreach ($values as $key => $value) {
+ $this->fireCacheEvent('write', [$key, $value, $minutes]);
+ }
+ }
+ }
+
/**
* Store an item in the cache if the key does not exist.
*
@@ -256,19 +342,6 @@ public function forget($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.
*
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/RetrievesMultipleKeys.php b/application/vendor/laravel/framework/src/Illuminate/Cache/RetrievesMultipleKeys.php
new file mode 100644
index 0000000..485d185
--- /dev/null
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/RetrievesMultipleKeys.php
@@ -0,0 +1,39 @@
+get($key);
+ }
+
+ return $return;
+ }
+
+ /**
+ * Store multiple items in the cache for a given number of minutes.
+ *
+ * @param array $values
+ * @param int $minutes
+ * @return void
+ */
+ public function putMany(array $values, $minutes)
+ {
+ foreach ($values as $key => $value) {
+ $this->put($key, $value, $minutes);
+ }
+ }
+}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php
index 4479fcc..ba00fa4 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggableStore.php
@@ -4,19 +4,6 @@
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.
*
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
index c1cfec8..0cbba7e 100644
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
@@ -6,6 +6,8 @@
class TaggedCache extends Repository
{
+ use RetrievesMultipleKeys;
+
/**
* The tag set instance.
*
diff --git a/application/vendor/laravel/framework/src/Illuminate/Cache/WinCacheStore.php b/application/vendor/laravel/framework/src/Illuminate/Cache/WinCacheStore.php
deleted file mode 100644
index 6dc3fc7..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/WinCacheStore.php
+++ /dev/null
@@ -1,121 +0,0 @@
-prefix = $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);
-
- if ($value !== false) {
- 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)
- {
- 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 increment($key, $value = 1)
- {
- return wincache_ucache_inc($this->prefix.$key, $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 wincache_ucache_dec($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 wincache_ucache_delete($this->prefix.$key);
- }
-
- /**
- * 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
deleted file mode 100644
index 7ef64cf..0000000
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/XCacheStore.php
+++ /dev/null
@@ -1,121 +0,0 @@
-prefix = $prefix;
- }
-
- /**
- * Retrieve an item from the cache by key.
- *
- * @param string $key
- * @return mixed
- */
- public function get($key)
- {
- $value = xcache_get($this->prefix.$key);
-
- if (isset($value)) {
- 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)
- {
- 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 increment($key, $value = 1)
- {
- return xcache_inc($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 xcache_dec($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);
- }
-
- /**
- * Remove an item from the cache.
- *
- * @param string $key
- * @return bool
- */
- public function forget($key)
- {
- return xcache_unset($this->prefix.$key);
- }
-
- /**
- * 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
old mode 100644
new mode 100755
index 51ee8ac..8ae4873
--- a/application/vendor/laravel/framework/src/Illuminate/Cache/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Cache/composer.json
@@ -10,14 +10,14 @@
"authors": [
{
"name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "email": "taylor@laravel.com"
}
],
"require": {
"php": ">=5.5.9",
- "illuminate/contracts": "5.1.*",
- "illuminate/support": "5.1.*",
- "nesbot/carbon": "~1.19"
+ "illuminate/contracts": "5.2.*",
+ "illuminate/support": "5.2.*",
+ "nesbot/carbon": "~1.20"
},
"autoload": {
"psr-4": {
@@ -26,13 +26,13 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.1-dev"
+ "dev-master": "5.2-dev"
}
},
"suggest": {
- "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.*)."
+ "illuminate/database": "Required to use the database cache driver (5.2.*).",
+ "illuminate/filesystem": "Required to use the file cache driver (5.2.*).",
+ "illuminate/redis": "Required to use the redis cache driver (5.2.*)."
},
"minimum-stability": "dev"
}
diff --git a/application/vendor/laravel/framework/src/Illuminate/Config/composer.json b/application/vendor/laravel/framework/src/Illuminate/Config/composer.json
old mode 100644
new mode 100755
index b4c4f23..05fd2e9
--- a/application/vendor/laravel/framework/src/Illuminate/Config/composer.json
+++ b/application/vendor/laravel/framework/src/Illuminate/Config/composer.json
@@ -10,14 +10,14 @@
"authors": [
{
"name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "email": "taylor@laravel.com"
}
],
"require": {
"php": ">=5.5.9",
- "illuminate/contracts": "5.1.*",
- "illuminate/filesystem": "5.1.*",
- "illuminate/support": "5.1.*"
+ "illuminate/contracts": "5.2.*",
+ "illuminate/filesystem": "5.2.*",
+ "illuminate/support": "5.2.*"
},
"autoload": {
"psr-4": {
@@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.1-dev"
+ "dev-master": "5.2-dev"
}
},
"minimum-stability": "dev"
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Application.php b/application/vendor/laravel/framework/src/Illuminate/Console/Application.php
old mode 100644
new mode 100755
index ee45c0a..a6deeb6
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Application.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Application.php
@@ -43,7 +43,7 @@ public function __construct(Container $laravel, Dispatcher $events, $version)
$this->setAutoExit(false);
$this->setCatchExceptions(false);
- $events->fire('artisan.start', [$this]);
+ $events->fire(new Events\ArtisanStarting($this));
}
/**
diff --git a/application/vendor/laravel/framework/src/Illuminate/Console/Command.php b/application/vendor/laravel/framework/src/Illuminate/Console/Command.php
old mode 100644
new mode 100755
index 47b79d0..44d429e
--- a/application/vendor/laravel/framework/src/Illuminate/Console/Command.php
+++ b/application/vendor/laravel/framework/src/Illuminate/Console/Command.php
@@ -12,7 +12,6 @@
use Symfony\Component\Console\Question\ChoiceQuestion;
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
use Symfony\Component\Console\Command\Command as SymfonyCommand;
-use Illuminate\Contracts\Foundation\Application as LaravelApplication;
class Command extends SymfonyCommand
{
@@ -58,6 +57,26 @@ class Command extends SymfonyCommand
*/
protected $description;
+ /**
+ * The default verbosity of output commands.
+ *
+ * @var int
+ */
+ protected $verbosity = OutputInterface::VERBOSITY_NORMAL;
+
+ /**
+ * The mapping between human readable verbosity levels and Symfony's OutputInterface.
+ *
+ * @var array
+ */
+ protected $verbosityMap = [
+ 'v' => OutputInterface::VERBOSITY_VERBOSE,
+ 'vv' => OutputInterface::VERBOSITY_VERY_VERBOSE,
+ 'vvv' => OutputInterface::VERBOSITY_DEBUG,
+ 'quiet' => OutputInterface::VERBOSITY_QUIET,
+ 'normal' => OutputInterface::VERBOSITY_NORMAL,
+ ];
+
/**
* Create a new console command instance.
*
@@ -182,6 +201,17 @@ public function callSilent($command, array $arguments = [])
return $instance->run(new ArrayInput($arguments), new NullOutput);
}
+ /**
+ * Determine if the given argument is present.
+ *
+ * @param string|int $name
+ * @return bool
+ */
+ public function hasArgument($name)
+ {
+ return $this->input->hasArgument($name);
+ }
+
/**
* Get the value of a command argument.
*
@@ -197,6 +227,17 @@ public function argument($key = null)
return $this->input->getArgument($key);
}
+ /**
+ * Determine if the given option is present.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasOption($name)
+ {
+ return $this->input->hasOption($name);
+ }
+
/**
* Get the value of a command option.
*
@@ -324,64 +365,73 @@ public function table(array $headers, $rows, $style = 'default')
* Write a string as information output.
*
* @param string $string
+ * @param null|int|string $verbosity
* @return void
*/
- public function info($string)
+ public function info($string, $verbosity = null)
{
- $this->output->writeln("
+
+
+
+
+
+ Welcome
+
+
+ Your Application's Landing Page.
+
+ - %s %s %s
- %s %s %s
- %s %s
- %s %s
* +---------------+-----------------------+------------------+
* | ISBN | Title | Author |
* +---------------+-----------------------+------------------+
@@ -190,29 +237,30 @@ public function setRow($column, array $row)
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
* +---------------+-----------------------+------------------+
- *
*/
public function render()
{
$this->calculateNumberOfColumns();
- $this->rows = $this->buildTableRows($this->rows);
- $this->headers = $this->buildTableRows($this->headers);
+ $rows = $this->buildTableRows($this->rows);
+ $headers = $this->buildTableRows($this->headers);
+
+ $this->calculateColumnsWidth(array_merge($headers, $rows));
$this->renderRowSeparator();
- if (!empty($this->headers)) {
- foreach ($this->headers as $header) {
+ if (!empty($headers)) {
+ foreach ($headers as $header) {
$this->renderRow($header, $this->style->getCellHeaderFormat());
$this->renderRowSeparator();
}
}
- foreach ($this->rows as $row) {
+ foreach ($rows as $row) {
if ($row instanceof TableSeparator) {
$this->renderRowSeparator();
} else {
$this->renderRow($row, $this->style->getCellRowFormat());
}
}
- if (!empty($this->rows)) {
+ if (!empty($rows)) {
$this->renderRowSeparator();
}
@@ -222,7 +270,7 @@ public function render()
/**
* Renders horizontal header separator.
*
- * Example: +-----+-----------+-------+
+ * Example: +-----+-----------+-------+
*/
private function renderRowSeparator()
{
@@ -236,7 +284,7 @@ private function renderRowSeparator()
$markup = $this->style->getCrossingChar();
for ($column = 0; $column < $count; ++$column) {
- $markup .= str_repeat($this->style->getHorizontalBorderChar(), $this->getColumnWidth($column)).$this->style->getCrossingChar();
+ $markup .= str_repeat($this->style->getHorizontalBorderChar(), $this->columnWidths[$column]).$this->style->getCrossingChar();
}
$this->output->writeln(sprintf($this->style->getBorderFormat(), $markup));
@@ -253,7 +301,7 @@ private function renderColumnSeparator()
/**
* Renders table row.
*
- * Example: | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
+ * Example: | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
*
* @param array $row
* @param string $cellFormat
@@ -282,27 +330,29 @@ private function renderRow(array $row, $cellFormat)
private function renderCell(array $row, $column, $cellFormat)
{
$cell = isset($row[$column]) ? $row[$column] : '';
- $width = $this->getColumnWidth($column);
+ $width = $this->columnWidths[$column];
if ($cell instanceof TableCell && $cell->getColspan() > 1) {
// add the width of the following columns(numbers of colspan).
foreach (range($column + 1, $column + $cell->getColspan() - 1) as $nextColumn) {
- $width += $this->getColumnSeparatorWidth() + $this->getColumnWidth($nextColumn);
+ $width += $this->getColumnSeparatorWidth() + $this->columnWidths[$nextColumn];
}
}
// str_pad won't work properly with multi-byte strings, we need to fix the padding
- if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell)) {
+ if (false !== $encoding = mb_detect_encoding($cell, null, true)) {
$width += strlen($cell) - mb_strwidth($cell, $encoding);
}
+ $style = $this->getColumnStyle($column);
+
if ($cell instanceof TableSeparator) {
- return sprintf($this->style->getBorderFormat(), str_repeat($this->style->getHorizontalBorderChar(), $width));
+ return sprintf($style->getBorderFormat(), str_repeat($style->getHorizontalBorderChar(), $width));
}
$width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
- $content = sprintf($this->style->getCellRowContentFormat(), $cell);
+ $content = sprintf($style->getCellRowContentFormat(), $cell);
- return sprintf($cellFormat, str_pad($content, $width, $this->style->getPaddingChar(), $this->style->getPadType()));
+ return sprintf($cellFormat, str_pad($content, $width, $style->getPaddingChar(), $style->getPadType()));
}
/**
@@ -337,7 +387,7 @@ private function buildTableRows($rows)
if (!strstr($cell, "\n")) {
continue;
}
- $lines = explode("\n", str_replace("\n", "this is html
[39;49m +[37;41m First exception [39;49m[37;41m[39;49m[37;41mthis is html[39;49m[37;41m
[39;49m[37;41m [39;49m [37;41m [39;49m [32mfoo3:bar[39m diff --git a/application/vendor/symfony/console/Tests/Fixtures/application_renderexception4.txt b/application/vendor/symfony/console/Tests/Fixtures/application_renderexception4.txt index 9d881e7..cb080e9 100644 --- a/application/vendor/symfony/console/Tests/Fixtures/application_renderexception4.txt +++ b/application/vendor/symfony/console/Tests/Fixtures/application_renderexception4.txt @@ -1,7 +1,7 @@ - - [InvalidArgumentException] - Command "foo" is not define - d. - + + [Symfony\Component\Console\Exception\CommandNotFoundException] + Command "foo" is not define + d. + diff --git a/application/vendor/symfony/console/Tests/Fixtures/application_renderexception_escapeslines.txt b/application/vendor/symfony/console/Tests/Fixtures/application_renderexception_escapeslines.txt deleted file mode 100644 index cf79b37..0000000 --- a/application/vendor/symfony/console/Tests/Fixtures/application_renderexception_escapeslines.txt +++ /dev/null @@ -1,9 +0,0 @@ - - - [Exception] - dont break here < - info>!