Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: develop into master #383

Merged
merged 8 commits into from
May 29, 2024
Merged

chore: develop into master #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
084f295
chore(deps): update redis docker tag to v7.2.5
renovate[bot] May 27, 2024
342a519
feat!: update laravel base to 11.x
lotyp May 27, 2024
774173c
Merge pull request #378 from wayofdev/feat/laravel-11
lotyp May 27, 2024
7e9a599
feat: update laravel configs to 11.x
lotyp May 28, 2024
c5e9ab8
Merge branch 'develop' into feat/laravel-11
lotyp May 28, 2024
128be93
chore(master): release 1.7.0
lotyp May 27, 2024
72225c6
feat: laravel-11.x updates
lotyp May 29, 2024
70de737
Merge pull request #381 from wayofdev/feat/laravel-11
lotyp May 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
4 changes: 2 additions & 2 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=pgsql
DB_HOST=127.0.0.1
DB_HOST=database
DB_PORT=5432
DB_DATABASE=wod
DB_USERNAME=wod
DB_PASSWORD=password
DB_FORWARD_PORT=5444

CACHE_DRIVER=file
CACHE_STORE=file
FILESYSTEM_DISK=local
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
Expand Down
2 changes: 1 addition & 1 deletion .github/.release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.6.0"
".": "1.7.0"
}
4 changes: 3 additions & 1 deletion .github/workflows/deploy-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ on: # yamllint disable-line rule:truthy

name: 🚀 Deploy to production

concurrency: production

jobs:
deployment:
runs-on: "ubuntu-22.04"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on: # yamllint disable-line rule:truthy

name: 🚀 Deploy to staging

concurrency: staging

jobs:
deployment:
runs-on: ${{ matrix.os }}
Expand Down
164 changes: 164 additions & 0 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,23 @@ lint-yaml: ## Lints yaml files inside project
.PHONY: lint-yaml

lint-php: ## Lints php files inside project using php-cs-fixer
$(APP_COMPOSER) run-script cs:fix
$(APP_COMPOSER) cs:fix
.PHONY: lint-php

lint-diff: ## Shows diff of php-cs-fixer
$(APP_COMPOSER) run-script cs:diff
$(APP_COMPOSER) cs:diff
.PHONY: lint-diff

lint-stan:
$(APP_COMPOSER) run-script stan
$(APP_COMPOSER) stan
.PHONY: lint-stan

lint-stan-baseline: ## Runs phpstan to update its baseline
$(APP_COMPOSER) stan:baseline
.PHONY: lint-stan-baseline

lint-deps:
$(APP_COMPOSER) run-script deptrac
$(APP_COMPOSER) deptrac
.PHONY: lint-deps

test: ## Run project php-unit and pest tests
Expand Down
8 changes: 4 additions & 4 deletions app/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,24 @@
"ext-pdo": "*",
"deployer/deployer": "^7.4",
"guzzlehttp/guzzle": "^7.8",
"laravel/framework": "^10.48",
"laravel/framework": "^v11.8",
"laravel/tinker": "^2.9",
"sentry/sentry-laravel": "^4.5",
"spatie/laravel-fractal": "^6.2",
"spatie/laravel-query-builder": "^5.8",
"spatie/laravel-route-attributes": "^1.22",
"wayofdev/laravel-open-docs": "^2.0"
"wayofdev/laravel-open-docs": "^2.1"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.42",
"fakerphp/faker": "^1.23",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^7.10",
"nunomaduro/collision": "^v8.1",
"larastan/larastan": "^2.9",
"pestphp/pest-plugin-laravel": "^2.4",
"phpstan/extension-installer": "^1.3",
"phpstan/phpstan-deprecation-rules": "^1.2",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-latest",
"spatie/laravel-ignition": "^2.7",
"wayofdev/cs-fixer-config": "^1.4"
},
Expand Down Expand Up @@ -64,6 +63,7 @@
"test": "php vendor/bin/pest",
"test:cc": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage-clover coverage.xml",
"stan": "php vendor/bin/phpstan analyse --memory-limit=2G",
"stan:baseline": "php vendor/bin/phpstan analyse --generate-baseline --memory-limit=2G --allow-empty-baseline",
"deptrac": "php vendor/bin/deptrac analyse --config-file=deptrac.yaml -v --cache-file=.build/.deptrac.cache",
"deptrac:ci": "php vendor/bin/deptrac analyse --config-file=deptrac.yaml -v --cache-file=.build/.deptrac.cache --formatter github-actions",
"deptrac:gv": "php vendor/bin/deptrac analyse --config-file=deptrac.yaml -v --cache-file=.build/.deptrac.cache --formatter graphviz-image --output ../assets/deptrac.svg"
Expand Down
Loading