Version 2.9.0

See CHANGELOG.

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## Version 2.9.0
+
+### Updates
+
+- [#183][is_183]: Upgrade to Laravel 11 ([#190][pr_190])
+- [#39][is_39]: Look into support for new GitHub events ([#193][pr_193])
+
+### Development
+
+- Purge old VS Code configs
+
+[is_39]: https://github.com/JSn1nj4/ElliotDerhay.com/issues/39
+
+[is_183]: https://github.com/JSn1nj4/ElliotDerhay.com/issues/183
+
+[pr_190]: https://github.com/JSn1nj4/ElliotDerhay.com/pull/190
+
+[pr_193]: https://github.com/JSn1nj4/ElliotDerhay.com/pull/193
+
 ## Version 2.8.6
 
 ### Fix

app/Console/Commands/GithubEventPullCommand.php

@@ -29,16 +29,6 @@ class GithubEventPullCommand extends Command
 	 */
 	protected $description = 'Fetch events from GitHub\'s events API.';
 
-	/**
-	 * Create a new command instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
 	/**
 	 * Execute the console command.
 	 *
@@ -60,13 +50,13 @@ public function handle(GithubService $github): int
 
 		$events = $github->getEvents('JSn1nj4', $this->option('count'));
 
-		if($this->option('file')) {
+		if ($this->option('file')) {
 			Storage::disk('debug')->put($this->option('file'), $events->toJson());
 
 			return self::SUCCESS;
 		}
 
-		if($this->option('debug')) {
+		if ($this->option('debug')) {
 			dd($events);
 		}
 

app/DataTransferObjects/GithubEventDTO.php

@@ -4,36 +4,61 @@
 
 use Illuminate\Support\Carbon;
 
-class GithubEventDTO
+readonly class GithubEventDTO
 {
 	public function __construct(
-		public readonly string $id,
-		public readonly string $type,
-		public readonly ?string $action,
-		public readonly string $date,
-		public readonly GithubUserDTO $user,
-		public readonly ?string $source,
-		public readonly string $repo,
+		public string        $id,
+		public string        $type,
+		public string|null   $action,
+		public string        $date,
+		public GithubUserDTO $user,
+		public string|null   $source,
+		public string        $repo,
 	) {}
 
-	public static function getAction(array $data): ?string
+	public static function getAction(array $data): string|null
 	{
 		return match ($data['type']) {
-			'IssuesEvent' => \optional($data['payload'])['action'],
-			'PullRequestEvent' => (\optional($data['payload'])['merged']
-				? 'merged'
-				: \optional($data['payload'])['action']),
+			'CommitCommentEvent' => match (optional($data['payload'])['action']) {
+				'created' => 'commented on',
+				default => 'deleted a comment on',
+			},
+
+			'IssuesEvent' => optional($data['payload'])['action'],
+
+			'PullRequestEvent' => match (true) {
+				optional($data['payload'])['merged'] !== null => 'merged',
+				default => optional($data['payload'])['action'],
+			},
+
+			'PullRequestReviewCommentEvent' => match (optional($data['payload'])['action']) {
+				'created' => 'commented on a review of',
+				'deleted' => 'deleted a review comment on',
+				default => 'updated a review comment on',
+			},
+
+			'PullRequestReviewEvent' => 'started a review on',
+
+			'ReleaseEvent' => match (optional($data['payload'])['action']) {
+				null => 'updated',
+				default => optional($data['payload'])['action'],
+			},
+
 			default => null,
 		};
 	}
 
-	public static function getEventSource(array $data): ?string
+	public static function getEventSource(array $data): string|null
 	{
 		return match ($data['type']) {
-			'CreateEvent', 'DeleteEvent', 'PushEvent' 	=> $data['payload']['ref'],
-			'ForkEvent' 								=> $data['payload']['forkee']['full_name'],
-			'IssueCommentEvent', 'IssuesEvent' 			=> $data['payload']['issue']['number'],
-			'PullRequestEvent' 							=> $data['payload']['pull_request']['number'],
+			'CommitCommentEvent' => $data['payload']['comment']['commit_id'],
+			'CreateEvent', 'DeleteEvent', 'PushEvent' => $data['payload']['ref'],
+			'ForkEvent' => $data['payload']['forkee']['full_name'],
+			'IssueCommentEvent', 'IssuesEvent' => $data['payload']['issue']['number'],
+			'PullRequestEvent',
+			'PullRequestReviewCommentEvent',
+			'PullRequestReviewEvent' => $data['payload']['pull_request']['number'],
+			'ReleaseEvent' => $data['payload']['release']['html_url'],
 			default => null,
 		};
 	}

app/Http/Controllers/Controller.php

@@ -2,11 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
-class Controller extends BaseController
+abstract class Controller
 {
-	use AuthorizesRequests, ValidatesRequests;
+	//
 }

app/Http/Controllers/GithubEventController.php

@@ -3,40 +3,15 @@
 namespace App\Http\Controllers;
 
 use App\Models\GithubEvent;
+use Illuminate\Database\Eloquent\Collection;
 
 class GithubEventController extends Controller
 {
-	/**
-	 * GitHubEventController constructor method
-	 *
-	 * @method                  __construct
-	 * @access public
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		//
-	}
-
-	/**
-	 * Index recent GitHub events
-	 *
-	 * @method                  index
-	 * @access public
-	 *
-	 * @param integer           $count
-	 *
-	 * @return array
-	 *
-	 * This will return an asociative array that should automatically be
-	 * converted to JSON on the front-end.
-	 */
-	public function index(int $count = 7)
+	public function index(int $count = 7): Collection
 	{
 		return GithubEvent::with('user')
-				->latest('date')
-				->take($count)
-				->get();
+			->latest('date')
+			->take($count)
+			->get();
 	}
 }

app/Http/Controllers/ProjectsPortfolioController.php

@@ -3,15 +3,19 @@
 namespace App\Http\Controllers;
 
 use App\Models\Project;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 
 class ProjectsPortfolioController extends Controller
 {
-	public function index(Request $request, int $count = 10)
+	public function index(Request $request, int $count = 10): View|Factory|Collection|Application
 	{
 		$projects = Project::take($count)->get();
 
-		if($request->wantsJson()) {
+		if ($request->wantsJson()) {
 			return $projects;
 		}
 

app/Http/Controllers/TweetController.php

@@ -3,37 +3,15 @@
 namespace App\Http\Controllers;
 
 use App\Models\Tweet;
+use Illuminate\Database\Eloquent\Collection;
 
 class TweetController extends Controller
 {
-	/**
-	 * Store instance of App\Tseet on controller instantiation
-	 *
-	 * @method                  __construct
-	 * @access public
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		//
-	}
-
-	/**
-	 * Get a list of tweets for display in a timeline-like view
-	 *
-	 * @method                  index
-	 * @access public
-	 *
-	 * @param integer           $count
-	 *
-	 * @return object
-	 */
-	public function index(int $count = 5)
+	public function index(int $count = 5): Collection
 	{
 		return Tweet::with('user')
-				->latest('date')
-				->take($count)
-				->get();
+			->latest('date')
+			->take($count)
+			->get();
 	}
 }