Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
1744b3b
Remove default `app` files
laravel-shift Apr 18, 2024
b46e907
Shift core files
laravel-shift Apr 18, 2024
4a6d347
Streamline config files
laravel-shift Apr 18, 2024
5f53911
Set new `ENV` variables
laravel-shift Apr 18, 2024
5830fa4
Default new `bootstrap/app.php`
laravel-shift Apr 18, 2024
524540b
Re-register HTTP middleware
laravel-shift Apr 18, 2024
4146f7d
Consolidate service providers
laravel-shift Apr 18, 2024
02e8049
Re-register service providers
laravel-shift Apr 18, 2024
5d7d87a
Re-register routes
laravel-shift Apr 18, 2024
fd1e174
Re-register scheduled commands
laravel-shift Apr 18, 2024
56aca01
Bump Composer dependencies
laravel-shift Apr 18, 2024
37ec65a
Convert `$casts` property to method
laravel-shift Apr 18, 2024
c9bd4f0
Adopt Laravel type hints
laravel-shift Apr 18, 2024
ba0bbd5
Mark base controller as `abstract`
laravel-shift Apr 18, 2024
02a868c
Remove `CreatesApplication` testing trait
laravel-shift Apr 18, 2024
96d1d6c
Shift cleanup
laravel-shift Apr 18, 2024
5d99e2d
void returns from commands
alexjustesen Apr 18, 2024
01759f6
updated composer dependencies
alexjustesen Apr 18, 2024
15fb093
use new integrated healthcheck endpoint
alexjustesen Apr 18, 2024
b1165ee
use /up
alexjustesen Apr 18, 2024
2d2016c
updated install cache commands
alexjustesen Apr 18, 2024
19da55d
Revert "use new integrated healthcheck endpoint"
alexjustesen Apr 18, 2024
f0c2e8c
fixed auto loading of dev dependencies
alexjustesen Apr 18, 2024
59d6e3f
consolidate app service provider
alexjustesen Apr 18, 2024
061504b
fixed user resource badge color
alexjustesen Apr 18, 2024
a3ec331
db migration for spatie settings v3
alexjustesen Apr 18, 2024
6a31c1a
published telescope migration
alexjustesen Apr 18, 2024
76b8447
removed explicitly requiring doctrine/dbal
alexjustesen Apr 18, 2024
b39b8b7
moved trust proxies middleware
alexjustesen Apr 18, 2024
749c5c3
set controller to new default
alexjustesen Apr 18, 2024
81ec9f3
removed filament config, no longer needed
alexjustesen Apr 18, 2024
43b15d2
added back app name
alexjustesen Apr 18, 2024
9c20934
consolidated telegram config
alexjustesen Apr 18, 2024
fc7dab9
added back default app env
alexjustesen Apr 18, 2024
5271394
removed inspire from console
alexjustesen Apr 18, 2024
9d8c0e5
removed debug route
alexjustesen Apr 18, 2024
06deb20
actually I need supervisor to monitor cron, oops
alexjustesen Apr 20, 2024
3cd6fb8
simplied when to run speedtests schedule
alexjustesen Apr 20, 2024
3439a24
code quality
alexjustesen Apr 20, 2024
1dd3ef3
Merge branch 'main' into shift-116575
alexjustesen Apr 20, 2024
929a15a
updated php unit defaults
alexjustesen Apr 20, 2024
4eb382e
bumped checkout to v4
alexjustesen Apr 20, 2024
571f4bb
updated env during app install
alexjustesen Apr 20, 2024
2232158
updated testing env
alexjustesen Apr 28, 2024
bbdcbb6
removed local cache from install command
alexjustesen Apr 28, 2024
17dd6b3
moved scheduled tasks to app instead of console route file to fix set…
alexjustesen Apr 28, 2024
a50331b
removed unused code
alexjustesen Apr 28, 2024
ac063db
use sqlite for testingl
alexjustesen Apr 29, 2024
d30625a
simplified tests
alexjustesen Apr 29, 2024
665b49b
make sqlite db
alexjustesen Apr 29, 2024
b7c46cd
dont run scripts
alexjustesen Apr 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,20 @@ APP_NAME="Speedtest Tracker"
APP_ENV=local
APP_KEY=
APP_DEBUG=false
APP_TIMEZONE=UTC
APP_URL=http://localhost

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US

APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database

BCRYPT_ROUNDS=12

LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

Expand All @@ -15,12 +26,15 @@ DB_DATABASE=speedtest_tracker
DB_USERNAME=
DB_PASSWORD=

BROADCAST_DRIVER=log
CACHE_DRIVER=database
BROADCAST_CONNECTION=log
CACHE_STORE=database
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database
SESSION_DRIVER=database
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

MAIL_MAILER=smtp
MAIL_HOST=mailhog
Expand Down
36 changes: 25 additions & 11 deletions .env.testing
Original file line number Diff line number Diff line change
@@ -1,27 +1,41 @@
APP_NAME="Speedtest Tracker"
APP_ENV=local
APP_KEY=base64:Tx3xYzxoL/5LmKHYr9QXlbnhTDVE1GK5T7tzxpovHaY=
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US

APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database

BCRYPT_ROUNDS=12

LOG_CHANNEL=stack
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=testing
DB_USERNAME=root
DB_PASSWORD=
DB_CONNECTION=sqlite
# DB_HOST=127.0.0.1
# DB_PORT=3306
# DB_DATABASE=testing
# DB_USERNAME=root
# DB_PASSWORD=

BROADCAST_DRIVER=log
CACHE_DRIVER=database
BROADCAST_CONNECTION=log
CACHE_STORE=file
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database
SESSION_DRIVER=database
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=1440

MEMCACHED_HOST=127.0.0.1

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null

MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_PORT=1025
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down
59 changes: 15 additions & 44 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,77 +12,48 @@ on:
jobs:
lint:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v4

- name: "duster"
uses: tighten/duster-action@v2
with:
args: lint --using=pint -v

test:
needs: [lint] # needs lint job to pass first

runs-on: ubuntu-22.04

services:
mysql:
image: mysql:8.0
env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: testing
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
coverage: none

- name: Prepare the environment
run: cp .env.testing .env

- name: Get composer cache directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Setup composer cache
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install composer dependencies
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress

- name: Install npm dependencies and build assets
run: npm ci && npm run build

- name: Directory permissions
- name: Generate an application key
run: php artisan key:generate

- name: Directory Permissions
run: chmod -R 777 storage bootstrap/cache

- name: Test application install
run: php artisan app:install --force
env:
DB_CONNECTION: mysql
DB_HOST: 127.0.0.1
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
DB_DATABASE: testing
DB_USERNAME: root
DB_PASSWORD: null
- name: Create SQLite database
run: |
mkdir -p database
touch database/database.sqlite

- name: Run tests
run: php artisan test
env:
DB_CONNECTION: mysql
DB_HOST: 127.0.0.1
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
DB_DATABASE: testing
DB_USERNAME: root
DB_PASSWORD: null
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/.phpunit.cache
/node_modules
/public/hot
/public/storage
/storage/*.key
/vendor
.env
.env.backup
.phpunit.result.cache
Homestead.json
Homestead.yaml
auth.json
Expand Down
Loading