Merge pull request #61 from XetaIO/laravel9

Update project to Laravel9

app/Exceptions/Handler.php

@@ -2,11 +2,8 @@
 namespace Xetaravel\Exceptions;
 
 use Illuminate\Auth\AuthenticationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Support\Facades\Auth;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -25,6 +22,17 @@ class Handler extends ExceptionHandler
         \Illuminate\Validation\ValidationException::class
     ];
 
+    /**
+     * A list of the inputs that are never flashed for validation exceptions.
+     *
+     * @var array<int, string>
+     */
+    protected $dontFlash = [
+        'current_password',
+        'password',
+        'password_confirmation',
+    ];
+
     /**
      * Report or log an exception.
      *

app/Http/Controllers/Discuss/PostController.php

@@ -41,7 +41,9 @@ public function create(Request $request): RedirectResponse
         $post = DiscussPostRepository::create($request->all());
         $user = DiscussUserRepository::create($request->all());
 
-        $parser = new MentionParser($post);
+        $parser = new MentionParser($post, [
+            'regex' => config('mentions.regex')
+        ]);
         $content = $parser->parse($post->content);
 
         //dd($content);

app/Http/Controllers/SecurityController.php

@@ -4,6 +4,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\View\View;
+use Phattarachai\LaravelMobileDetect\Agent;
 use Xetaravel\Models\Session;
 
 class SecurityController extends Controller
@@ -27,10 +28,27 @@ public function index(Request $request): View
     {
         $records = Session::expires()->where('user_id', Auth::id())->get();
 
+        $agent = new Agent();
+
         $sessions = [];
 
         foreach ($records as $record) {
-            $infos = get_browser($record->user_agent);
+            $agent->setUserAgent($record->user_agent);
+
+            $device_type = ($agent->isDesktop() ? 'desktop' :
+                                            $agent->isPhone()) ? 'phone' :
+                                            ($agent->isTablet() ? 'tablet' : 'unknown');
+
+            $infos = [
+                'platform' => $agent->platform(),
+                'platform_version' => $agent->version((string) $agent->platform()),
+                'browser' => $agent->browser(),
+                'browser_version' => $agent->version((string) $agent->browser()),
+                'desktop' => $agent->isDesktop(),
+                'phone' => $agent->isPhone(),
+                'tablet' => $agent->isTablet(),
+                'device_type' => $device_type
+            ];
 
             $record->infos = $infos;
 

app/Http/Kernel.php

@@ -13,11 +13,13 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Xetaravel\Http\Middleware\CheckForMaintenanceMode::class,
+        // \Xetaravel\Http\Middleware\TrustHosts::class,
+        \Xetaravel\Http\Middleware\TrustProxies::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
+        \Xetaravel\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \Xetaravel\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \Xetaravel\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -38,8 +40,9 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
-            'bindings',
+            // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
+            'throttle:api',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -53,11 +56,12 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \Xetaravel\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
+        //'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \Xetaravel\Http\Middleware\RedirectIfAuthenticated::class,
-        //'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

app/Http/Middleware/CheckForMaintenanceMode.php → app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -1,14 +1,14 @@
 <?php
 namespace Xetaravel\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
 
-class CheckForMaintenanceMode extends Middleware
+class PreventRequestsDuringMaintenance extends Middleware
 {
     /**
      * The URIs that should be reachable while maintenance mode is enabled.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //

app/Http/Middleware/SessionLogs.php

@@ -23,6 +23,10 @@ public function handle($request, Closure $next)
 
         $session = Session::where('id', $request->session()->getId())->first();
 
+        if (is_null($session)) {
+            return $next($request);
+        }
+
         $data = [
             'url' => $request->path(),
             'method' => $request->method()

app/Http/Middleware/TrustHosts.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Xetaravel\Http\Middleware;
+
+use Illuminate\Http\Middleware\TrustHosts as Middleware;
+
+class TrustHosts extends Middleware
+{
+    /**
+     * Get the host patterns that should be trusted.
+     *
+     * @return array<int, string|null>
+     */
+    public function hosts()
+    {
+        return [
+            $this->allSubdomainsOfApplicationUrl(),
+        ];
+    }
+}

app/Http/Middleware/TrustProxies.php

@@ -1,25 +1,28 @@
 <?php
+
 namespace Xetaravel\Http\Middleware;
 
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
     /**
      * The headers that should be used to detect proxies.
      *
-     * @var string
+     * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_FOR |
-                                                Request::HEADER_X_FORWARDED_HOST |
-                                                Request::HEADER_X_FORWARDED_PORT |
-                                                Request::HEADER_X_FORWARDED_PROTO;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Markdown/Emoji/EmojiExtension.php

@@ -1,13 +1,13 @@
 <?php
 namespace Xetaravel\Markdown\Emoji;
 
-use League\CommonMark\ConfigurableEnvironmentInterface;
+use League\CommonMark\Environment\EnvironmentBuilderInterface;
 use League\CommonMark\Extension\ExtensionInterface;
 
 final class EmojiExtension implements ExtensionInterface
 {
 
-    public function register(ConfigurableEnvironmentInterface $environment)
+    public function register(EnvironmentBuilderInterface $environment): void
     {
         $environment->addInlineParser(new EmojiParser);
     }

app/Markdown/Emoji/EmojiParser.php

@@ -1,9 +1,10 @@
 <?php
 namespace Xetaravel\Markdown\Emoji;
 
-use League\CommonMark\Inline\Element\Image;
-use League\CommonMark\Inline\Parser\InlineParserInterface;
-use League\CommonMark\InlineParserContext;
+use League\CommonMark\Extension\CommonMark\Node\Inline\Image;
+use League\CommonMark\Parser\Inline\InlineParserInterface;
+use League\CommonMark\Parser\InlineParserContext;
+use League\CommonMark\Parser\Inline\InlineParserMatch;
 
 class EmojiParser implements InlineParserInterface
 {
@@ -44,9 +45,9 @@ public function __construct()
      *
      * @return array
      */
-    public function getCharacters(): array
+    public function getMatchDefinition(): InlineParserMatch
     {
-        return [':'];
+        return InlineParserMatch::string(':');
     }
 
     /**

app/Markdown/Reply/Reply.php

@@ -1,92 +1,8 @@
 <?php
 namespace Xetaravel\Markdown\Reply;
 
-use League\CommonMark\Block\Element\AbstractBlock;
-use League\CommonMark\ContextInterface;
-use League\CommonMark\Cursor;
+use League\CommonMark\Node\Inline\AbstractStringContainer;
 
-class Reply extends AbstractBlock
+class Reply extends AbstractStringContainer
 {
-    /**
-     * The route used to display the post.
-     *
-     * @var string
-     */
-    protected $route;
-
-    /**
-     * The user of the reply.
-     *
-     * @var string
-     */
-    protected $user;
-
-    /**
-     * Constructor.
-     *
-     * @param string $route The route used to display the post.
-     * @param string $user The user of the reply.
-     */
-    public function __construct(string $route, string $user)
-    {
-        $this->route = $route;
-        $this->user = $user;
-    }
-
-    /**
-     * Get the route.
-     *
-     * @return string
-     */
-    public function getRoute()
-    {
-        return $this->route;
-    }
-
-    /**
-     * Get the user.
-     *
-     * @return string
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * Returns true if this block can contain the given block as a child node
-     *
-     * @param AbstractBlock $block
-     *
-     * @return bool
-     */
-    public function canContain(AbstractBlock $block): bool
-    {
-        return false;
-    }
-
-    /**
-     * Returns true if block type can accept lines of text
-     *
-     * @return bool
-     */
-    public function acceptsLines(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Whether this is a code block
-     *
-     * @return bool
-     */
-    public function isCode(): bool
-    {
-        return false;
-    }
-
-    public function matchesNextLine(Cursor $cursor): bool
-    {
-        return false;
-    }
 }

app/Markdown/Reply/ReplyExtension.php

@@ -1,15 +1,15 @@
 <?php
 namespace Xetaravel\Markdown\Reply;
 
-use League\CommonMark\ConfigurableEnvironmentInterface;
+use League\CommonMark\Environment\EnvironmentBuilderInterface;
 use League\CommonMark\Extension\ExtensionInterface;
 
 final class ReplyExtension implements ExtensionInterface
 {
-    public function register(ConfigurableEnvironmentInterface $environment)
+    public function register(EnvironmentBuilderInterface $environment): void
     {
         $environment
-            ->addBlockParser(new ReplyParser)
-            ->addBlockRenderer(Reply::class, new ReplyRenderer);
+            ->addInlineParser(new ReplyParser())
+            ->addRenderer(Reply::class, new ReplyRenderer());
     }
 }