update2

pfosten/vendor/laravel/framework/composer.json

@@ -18,7 +18,7 @@
         "php": ">=5.6.4",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "doctrine/inflector": "~1.0",
+        "doctrine/inflector": "~1.1",
         "erusev/parsedown": "~1.6",
         "league/flysystem": "~1.0",
         "monolog/monolog": "~1.11",

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Console/MakeAuthCommand.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace Illuminate\Auth\Console;
-
-use Illuminate\Console\Command;
-use Illuminate\Console\DetectsApplicationNamespace;
-
-class MakeAuthCommand extends Command
-{
-    use DetectsApplicationNamespace;
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'make:auth
-                    {--views : Only scaffold the authentication views}
-                    {--force : Overwrite existing views by default}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Scaffold basic login and registration views and routes';
-
-    /**
-     * The views that need to be exported.
-     *
-     * @var array
-     */
-    protected $views = [
-        'auth/login.stub' => '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',
-        'layouts/app.stub' => 'layouts/app.blade.php',
-        'home.stub' => 'home.blade.php',
-    ];
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        $this->createDirectories();
-
-        $this->exportViews();
-
-        if (! $this->option('views')) {
-            file_put_contents(
-                app_path('Http/Controllers/HomeController.php'),
-                $this->compileControllerStub()
-            );
-
-            file_put_contents(
-                base_path('routes/web.php'),
-                file_get_contents(__DIR__.'/stubs/make/routes.stub'),
-                FILE_APPEND
-            );
-        }
-
-        $this->info('Authentication scaffolding generated successfully.');
-    }
-
-    /**
-     * Create the directories for the files.
-     *
-     * @return void
-     */
-    protected function createDirectories()
-    {
-        if (! is_dir(resource_path('views/layouts'))) {
-            mkdir(resource_path('views/layouts'), 0755, true);
-        }
-
-        if (! is_dir(resource_path('views/auth/passwords'))) {
-            mkdir(resource_path('views/auth/passwords'), 0755, true);
-        }
-    }
-
-    /**
-     * Export the authentication views.
-     *
-     * @return void
-     */
-    protected function exportViews()
-    {
-        foreach ($this->views as $key => $value) {
-            if (file_exists(resource_path('views/'.$value)) && ! $this->option('force')) {
-                if (! $this->confirm("The [{$value}] view already exists. Do you want to replace it?")) {
-                    continue;
-                }
-            }
-
-            copy(
-                __DIR__.'/stubs/make/views/'.$key,
-                resource_path('views/'.$value)
-            );
-        }
-    }
-
-    /**
-     * Compiles the HomeController stub.
-     *
-     * @return string
-     */
-    protected function compileControllerStub()
-    {
-        return str_replace(
-            '{{namespace}}',
-            $this->getAppNamespace(),
-            file_get_contents(__DIR__.'/stubs/make/controllers/HomeController.stub')
-        );
-    }
-}

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/login.stub

@@ -6,6 +6,7 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="panel panel-default">
                 <div class="panel-heading">Login</div>
+
                 <div class="panel-body">
                     <form class="form-horizontal" method="POST" action="{{ route('login') }}">
                         {{ csrf_field() }}

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub

@@ -6,6 +6,7 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="panel panel-default">
                 <div class="panel-heading">Reset Password</div>
+
                 <div class="panel-body">
                     @if (session('status'))
                         <div class="alert alert-success">
@@ -33,7 +34,7 @@
                         <div class="form-group">
                             <div class="col-md-6 col-md-offset-4">
                                 <button type="submit" class="btn btn-primary">
-                                    Passwort-Rücksetzungslink zusenden
+                                    Send Password Reset Link
                                 </button>
                             </div>
                         </div>

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub

@@ -8,12 +8,6 @@
                 <div class="panel-heading">Reset Password</div>
 
                 <div class="panel-body">
-                    @if (session('status'))
-                        <div class="alert alert-success">
-                            {{ session('status') }}
-                        </div>
-                    @endif
-
                     <form class="form-horizontal" method="POST" action="{{ route('password.request') }}">
                         {{ csrf_field() }}
 
@@ -63,7 +57,7 @@
                         <div class="form-group">
                             <div class="col-md-6 col-md-offset-4">
                                 <button type="submit" class="btn btn-primary">
-                                    Passwort zurücksetzen
+                                    Reset Password
                                 </button>
                             </div>
                         </div>

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub

@@ -6,6 +6,7 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="panel panel-default">
                 <div class="panel-heading">Register</div>
+
                 <div class="panel-body">
                     <form class="form-horizontal" method="POST" action="{{ route('register') }}">
                         {{ csrf_field() }}

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub

@@ -8,6 +8,12 @@
                 <div class="panel-heading">Dashboard</div>
 
                 <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
                     You are logged in!
                 </div>
             </div>

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Notifications/ResetPassword.php

@@ -45,8 +45,8 @@ class ResetPassword extends Notification
     public function toMail($notifiable)
     {
         return (new MailMessage)
-            ->line('Du erhältst diese Mail, weil wir eine Anforderung zur Passwort-Rücksetzung erhalten haben.')
-            ->action('Passwort zurücksetzen', url(config('app.url').route('password.reset', $this->token, false)))
-            ->line('Wenn Du keine Rücksetzung angefordert hast, ignoriere diese Mail.');
+            ->line('You are receiving this email because we received a password reset request for your account.')
+            ->action('Reset Password', url(config('app.url').route('password.reset', $this->token, false)))
+            ->line('If you did not request a password reset, no further action is required.');
     }
 }

pfosten/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php

@@ -6,6 +6,9 @@ use Illuminate\Support\Str;
 use InvalidArgumentException;
 use Illuminate\Contracts\Auth\PasswordBrokerFactory as FactoryContract;
 
+/**
+ * @mixin \Illuminate\Contracts\Auth\PasswordBroker
+ */
 class PasswordBrokerManager implements FactoryContract
 {
     /**

pfosten/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php

@@ -14,6 +14,9 @@ use Illuminate\Broadcasting\Broadcasters\RedisBroadcaster;
 use Illuminate\Broadcasting\Broadcasters\PusherBroadcaster;
 use Illuminate\Contracts\Broadcasting\Factory as FactoryContract;
 
+/**
+ * @mixin \Illuminate\Contracts\Broadcasting\Broadcaster
+ */
 class BroadcastManager implements FactoryContract
 {
     /**

pfosten/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php

@@ -50,7 +50,8 @@ class ArrayStore extends TaggableStore implements Store
      */
     public function increment($key, $value = 1)
     {
-        $this->storage[$key] = ((int) $this->storage[$key]) + $value;
+        $this->storage[$key] = ! isset($this->storage[$key])
+                ? $value : ((int) $this->storage[$key]) + $value;
 
         return $this->storage[$key];
     }

pfosten/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php

@@ -9,6 +9,9 @@ use Illuminate\Contracts\Cache\Store;
 use Illuminate\Contracts\Cache\Factory as FactoryContract;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 
+/**
+ * @mixin \Illuminate\Contracts\Cache\Repository
+ */
 class CacheManager implements FactoryContract
 {
     /**

pfosten/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php

@@ -73,9 +73,15 @@ class RateLimiter
      */
     public function hit($key, $decayMinutes = 1)
     {
-        $this->cache->add($key, 0, $decayMinutes);
+        $added = $this->cache->add($key, 0, $decayMinutes);
 
-        return (int) $this->cache->increment($key);
+        $hits = (int) $this->cache->increment($key);
+
+        if (! $added && $hits == 1) {
+            $this->cache->put($key, 1, $decayMinutes);
+        }
+
+        return $hits;
     }
 
     /**

pfosten/vendor/laravel/framework/src/Illuminate/Cache/Repository.php

@@ -16,6 +16,9 @@ use Illuminate\Cache\Events\KeyForgotten;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Cache\Repository as CacheContract;
 
+/**
+ * @mixin \Illuminate\Contracts\Cache\Store
+ */
 class Repository implements CacheContract, ArrayAccess
 {
     use Macroable {

pfosten/vendor/laravel/framework/src/Illuminate/Console/Application.php

@@ -112,7 +112,7 @@ class Application extends SymfonyApplication implements ApplicationContract
         }
     }
 
-    /*
+    /**
      * Clear the console application bootstrappers.
      *
      * @return void

pfosten/vendor/laravel/framework/src/Illuminate/Console/Command.php

@@ -228,7 +228,7 @@ class Command extends SymfonyCommand
     /**
      * Get the value of a command argument.
      *
-     * @param  string  $key
+     * @param  string|null  $key
      * @return string|array
      */
     public function argument($key = null)

pfosten/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheMutex.php

@@ -32,7 +32,9 @@ class CacheMutex implements Mutex
      */
     public function create(Event $event)
     {
-        return $this->cache->add($event->mutexName(), true, 1440);
+        return $this->cache->add(
+            $event->mutexName(), true, $event->expiresAt
+        );
     }
 
     /**

pfosten/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php

@@ -76,7 +76,7 @@ class CallbackEvent extends Event
     }
 
     /**
-     * Remove the mutex file from disk.
+     * Clear the mutex for the event.
      *
      * @return void
      */
@@ -90,11 +90,10 @@ class CallbackEvent extends Event
     /**
      * Do not allow the event to overlap each other.
      *
+     * @param  int  $expiresAt
      * @return $this
-     *
-     * @throws \LogicException
      */
-    public function withoutOverlapping()
+    public function withoutOverlapping($expiresAt = 1440)
     {
         if (! isset($this->description)) {
             throw new LogicException(
@@ -104,6 +103,8 @@ class CallbackEvent extends Event
 
         $this->withoutOverlapping = true;
 
+        $this->expiresAt = $expiresAt;
+
         return $this->skip(function () {
             return $this->mutex->exists($this);
         });

pfosten/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php

@@ -64,6 +64,13 @@ class Event
      */
     public $withoutOverlapping = false;
 
+    /**
+     * The amount of time the mutex should be valid.
+     *
+     * @var int
+     */
+    public $expiresAt = 1440;
+
     /**
      * Indicates if the command should run in background.
      *
@@ -509,12 +516,15 @@ class Event
     /**
      * Do not allow the event to overlap each other.
      *
+     * @param  int  $expiresAt
      * @return $this
      */
-    public function withoutOverlapping()
+    public function withoutOverlapping($expiresAt = 1440)
     {
         $this->withoutOverlapping = true;
 
+        $this->expiresAt = $expiresAt;
+
         return $this->then(function () {
             $this->mutex->forget($this);
         })->skip(function () {

pfosten/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ManagesFrequencies.php

@@ -53,9 +53,11 @@ trait ManagesFrequencies
     private function inTimeInterval($startTime, $endTime)
     {
         return function () use ($startTime, $endTime) {
-            $now = Carbon::now()->getTimestamp();
-
-            return $now >= strtotime($startTime) && $now <= strtotime($endTime);
+            return Carbon::now($this->timezone)->between(
+                Carbon::parse($startTime, $this->timezone),
+                Carbon::parse($endTime, $this->timezone),
+                true
+            );
         };
     }
 
@@ -273,6 +275,22 @@ trait ManagesFrequencies
         return $this->spliceIntoPosition(3, $day);
     }
 
+    /**
+     * Schedule the event to run twice monthly.
+     *
+     * @param  int  $first
+     * @param  int  $second
+     * @return $this
+     */
+    public function twiceMonthly($first = 1, $second = 16)
+    {
+        $days = $first.','.$second;
+
+        return $this->spliceIntoPosition(1, 0)
+            ->spliceIntoPosition(2, 0)
+            ->spliceIntoPosition(3, $days);
+    }
+
     /**
      * Schedule the event to run quarterly.
      *

pfosten/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php

@@ -23,7 +23,7 @@ class Schedule
     protected $mutex;
 
     /**
-     * Create a new event instance.
+     * Create a new schedule instance.
      *
      * @return void
      */
@@ -41,7 +41,7 @@ class Schedule
      *
      * @param  string|callable  $callback
      * @param  array   $parameters
-     * @return \Illuminate\Console\Scheduling\Event
+     * @return \Illuminate\Console\Scheduling\CallbackEvent
      */
     public function call($callback, array $parameters = [])
     {
@@ -74,7 +74,7 @@ class Schedule
      * Add a new job callback event to the schedule.
      *
      * @param  object|string  $job
-     * @return \Illuminate\Console\Scheduling\Event
+     * @return \Illuminate\Console\Scheduling\CallbackEvent
      */
     public function job($job)
     {