Merging Laravel into main

.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[docker-compose.yml]
+indent_size = 4

.env.example

@@ -0,0 +1,71 @@
+APP_NAME=AspireCloud
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_TIMEZONE=UTC
+APP_URL=http://api.aspirecloud.local
+
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+
+APP_MAINTENANCE_DRIVER=file
+# APP_MAINTENANCE_STORE=database
+
+PHP_CLI_SERVER_WORKERS=4
+
+BCRYPT_ROUNDS=12
+
+LOG_CHANNEL=stack
+LOG_STACK=single
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=pgsql
+DB_HOST=postgres
+DB_PORT=5432
+DB_DATABASE=aspirecloud
+DB_USERNAME=postgres
+DB_PASSWORD=password
+
+# root credentials used for initial db creation, not used at runtime.
+# production should never contain these values.
+DB_ROOT_USERNAME=postgres
+DB_ROOT_PASSWORD=password
+
+SESSION_DRIVER=redis
+SESSION_LIFETIME=120
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+BROADCAST_CONNECTION=log
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=database
+
+CACHE_STORE=redis
+CACHE_PREFIX=
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_CLIENT=phpredis
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=log
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="do-not-reply@aspirepress.org"
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+VITE_APP_NAME="${APP_NAME}"

.gitattributes

@@ -1,3 +1,11 @@
-# Force LF only on files where CRLF is deadly; git defaults are fine for the rest.
-*.bash text=auto eol=lf
-*.sh text=auto eol=lf
+* text=auto eol=lf
+
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
+CHANGELOG.md export-ignore
+.styleci.yml export-ignore

.github/workflows/run-checks.yaml

@@ -10,16 +10,22 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build container
-        run: docker build --target dev -t aspirepress/aspirecloud-php -f ./docker/webapp/Dockerfile .
+        run: docker build --target dev -t aspirepress/aspirecloud-cli -f ./docker/webapp/Dockerfile .
 
       - name: Install Composer dependencies
-        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-php sh -c "composer install"
+        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-cli sh -c "composer install"
+
+      - name: Create .env file
+        run: cp .env.example .env
+
+      - name: Create App Key
+        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-cli sh -c "./artisan key:generate"
 
       - name: Run style checks
-        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-php sh -c "./vendor/bin/phpcs"
+        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-cli sh -c "./vendor/bin/pint --test"
 
       - name: Run quality check
-        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-php sh -c "./vendor/bin/phpstan --memory-limit=1G analyse"
+        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-cli sh -c "./vendor/bin/phpstan --memory-limit=1G analyse"
 
       - name: Run unit tests
-        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-php sh -c "./vendor/bin/phpunit --testsuite=unit"
+        run: docker run --rm -v $(pwd):/var/www/html aspirepress/aspirecloud-cli sh -c "./vendor/bin/pest"

.gitignore

@@ -1,13 +1,22 @@
-/.phpcs-cache
-/.phpunit.result.cache
-/clover.xml
-/coveralls-upload.json
-/phpunit.xml
-/vendor/
-docker-compose.override.yml
-/assets/output/*
-/node_modules/
-/logs/error.log
-mix-manifest.json
-*.sql
+/.phpunit.cache
+/node_modules
+/public/build
+/public/hot
+/public/storage
+/storage/*.key
+/storage/pail
+/vendor
 .env
+.env.backup
+.env.production
+.phpactor.json
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+auth.json
+npm-debug.log
+yarn-error.log
+/.fleet
+/.idea
+/.vscode
+/.zed

Makefile

@@ -18,9 +18,12 @@ ifneq (,$(wildcard ./.env))
 endif
 
 list:
-	@grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | perl -ne '/^(?:.*?:)?(.*?):.*##(.*$$)/ and printf "\033[36m%-30s\033[0m %s\n", $$1, $$2'
 
-init: down clean build network up install-composer reset-database devmode-enable ## Initial configuration tasks
+init: check-env down clean build network up install-composer reset-database generate-key ## Initial configuration tasks
+
+check-env:
+	@[ -f .env ] || { cp .env.example .env && bin/dcrun ./artisan key:generate; }
 
 build: ## Builds the Docker containers
 	docker compose build
@@ -37,18 +40,18 @@ down: ## Stops the Docker containers
 	docker compose down
 
 unit: ## Run unit tests
-	bin/dcrun vendor/bin/phpunit --testsuite=unit ${OPTS}
+	bin/dcrun vendor/bin/pest --testsuite=unit ${OPTS}
 
 functional: ## Run functional tests
-	bin/dcrun vendor/bin/phpunit --testsuite=functional ${OPTS}
+	bin/dcrun vendor/bin/pest --testsuite=functional ${OPTS}
 
-test: unit functional acceptance ## Run all tests
+test: unit functional ## Run all tests
 
 acceptance: ## Run acceptance tests
 	bin/dcrun vendor/bin/behat -vvv ${OPTS}
 
 quality: ## Run all quality checks
-	bin/dcrun vendor/bin/phpstan ${OPTS}
+	bin/dcrun vendor/bin/phpstan --memory-limit=1G analyse ${OPTS}
 
 quality-baseline: ## Run all static analysis checks with baseline
 	bin/dcrun vendor/bin/phpstan analyse -b baseline.neon $(PHPSTAN_XDEBUG) src tests
@@ -66,55 +69,49 @@ sh-%: ## Execute shell for the container where % is a service name (webapp, post
 	docker compose exec $* sh || docker compose run --rm $* sh
 
 clear-cache: ## Clear cache
-	rm -f data/cache/config-cache.php public/build
+	bin/dcrun php artisan optimize:clear
 
-check: cs-fix quality test ## Check all quality and test elements
+check: cs quality test ## Check all quality and test elements
 
 cs: ## Run code style checks
-	bin/dcrun vendor/bin/phpcs ${OPTS}
-
-cs-fix: ## Fix code style issues
-	bin/dcrun vendor/bin/phpcbf ${OPTS} && vendor/bin/phpcs ${OPTS}
+	bin/dcrun vendor/bin/pint ${OPTS}
 
 create-migration: ## Create a new database migration
-	bin/dcrun vendor/bin/phinx create ${OPTS} -c vendor/aspirepress/aspirecloud-migrations/phinx.php
+	bin/dcrun php artisan make:migration
 
 create-seed: ##	Create a new database seed
-	bin/dcrun vendor/bin/phinx seed:create ${OPTS} -c vendor/aspirepress/aspirecloud-migrations/phinx.php
+	bin/dcrun php artisan make:seed
 
 migrate: ## Run database migrations
-	bin/dcrun vendor/bin/phinx migrate -c vendor/aspirepress/aspirecloud-migrations/phinx.php
+	bin/dcrun php artisan migrate --force --no-interaction
 
 migration-rollback: ## Rollback database migrations
-	bin/dcrun vendor/bin/phinx rollback -e development -c vendor/aspirepress/aspirecloud-migrations/phinx.php
+	bin/dcrun php artisan migrate --force --no-interaction
 
 seed: ## Run database seeds
-	bin/dcrun vendor/bin/phinx seed:run -c vendor/aspirepress/aspirecloud-migrations/phinx.php
-
-devmode-enable: ## Enable the PHP development mode
-	bin/dcrun composer development-enable
-
-devmode-disable: ## Disable the PHP development mode
-	bin/dcrun composer development-disable
-
-_empty-database: # internal target to empty database
-	bin/dcrun vendor/bin/phinx migrate -c vendor/aspirepress/aspirecloud-migrations/phinx.php -t 0
+	bin/dcrun php artisan db:seed
 
 migrate-testing: ## Run database migrations
-	bin/dcrun vendor/bin/phinx migrate -e testing -c vendor/aspirepress/aspirecloud-migrations/phinx.php
+	bin/dcrun php artisan migrate --database=test --force --no-interaction
 
 seed-testing: ## Run database seeds
-	bin/dcrun vendor/bin/phinx seed:run -e testing -c vendor/aspirepress/aspirecloud-migrations/phinx.php
+	bin/dcrun php artisan db:seed --database=test
+
+generate-key: ## Generate APP_KEY environment var
+	bin/dcrun php artisan key:generate
+
+drop-database:
+	bin/dcrun sh -c "export PGPASSWORD=${DB_ROOT_PASSWORD} && psql -U ${DB_ROOT_USERNAME} -h ${DB_HOST} -c 'drop database if exists ${DB_DATABASE}'"
 
-_empty-testing-database: # internal target to empty database
-	bin/dcrun vendor/bin/phinx migrate -e testing -c vendor/aspirepress/aspirecloud-migrations/phinx.php -t 0
+create-database:
+	bin/dcrun sh -c "export PGPASSWORD=${DB_ROOT_PASSWORD} && psql -U ${DB_ROOT_USERNAME} -h ${DB_HOST} -c 'create database ${DB_DATABASE} owner ${DB_USERNAME}'"
 
-reset-database: _empty-database migrate seed ## Clean database, run migrations and seeds
+reset-database: drop-database create-database migrate seed ## run migrations and seeds
 
-reset-testing-database: _empty-testing-database migrate-testing seed-testing
+reset-testing-database: migrate-testing seed-testing
 
-run-pgsql: ## Runs Postgres on the command line using the .env file variables
-	bin/dcrun sh -c "export PGPASSWORD=${DB_PASS} && psql -U ${DB_USER} -h ${DB_HOST} -d ${DB_NAME}"
+run-psql: ## Runs Postgres on the command line using the .env file variables
+	bin/dcrun sh -c "PGPASSWORD=${DB_PASSWORD} psql -U ${DB_USERNAME} -h ${DB_HOST} -p ${DB_PORT} -d ${DB_USERNAME}"
 
 network: ## Create docker networks for app and traefik proxy (if they don't exist already)
 	bin/create-external-network.sh wp-services

app/Http/Controllers/CatchAllController.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Http\Client\Response as ClientResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
+
+class CatchAllController extends Controller
+{
+    public function handle(Request $request): Response
+    {
+        $requestData = $request->all();
+        $ua = $request->header('User-Agent');
+        $path = $request->path();
+        $queryParams = $request->query();
+
+        // If path is root, return a 200 OK empty response
+        if ($path === '/') {
+            return response()->noContent(200);
+        }
+
+        try {
+            $response = Http::withHeaders([
+                'User-Agent' => $ua,
+                'Accept' => '*/*',
+            ])->asForm()->send($request->getMethod(), 'https://api.wordpress.org/'.$path, [
+                'query' => $queryParams,
+                'form_params' => $requestData,
+            ]);
+
+        } catch (RequestException $e) {
+            $statusCode = $e->response->status();
+
+            return response()->noContent($statusCode);
+        }
+
+        // Get content type and status code
+        $contentType = $response->header('Content-Type');
+        $statusCode = $response->status();
+        $content = $response->body();
+
+        // Log request and response in DB
+        $this->saveData($request, $response, $content);
+
+        // Forward response through
+        return response($content, $statusCode)->header('Content-Type', $contentType);
+    }
+
+    private function saveData(Request $request, ClientResponse $response, string $content): void
+    {
+        DB::table('request_data')->insert([
+            'id' => Str::uuid()->toString(),
+            'request_path' => $request->path(),
+            'request_query_params' => json_encode($request->query()),
+            'request_body' => json_encode($request->all()),
+            'request_headers' => json_encode($request->headers->all()),
+            'response_code' => $response->status(),
+            'response_body' => $content,
+            'response_headers' => json_encode($response->headers()),
+            'created_at' => Carbon::now(),
+        ]);
+    }
+}

app/Http/Controllers/Controller.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Http\Controllers;
+
+abstract class Controller
+{
+    //
+}