Skip to content

Commit

Permalink
chore(deps): upgrade dependencies (#1043)
Browse files Browse the repository at this point in the history
  • Loading branch information
asbiin authored Mar 1, 2024
1 parent 381d106 commit abf5064
Show file tree
Hide file tree
Showing 11 changed files with 4,594 additions and 3,898 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Run tests
uses: monicahq/workflows/.github/workflows/laravel.yml@v2
with:
php-versions: "['8.1', '8.2']"
php-versions: "['8.2']"
connections: "['sqlite', 'mysql']"
default-php-version: '8.2'
default-connection: sqlite
Expand Down
39 changes: 14 additions & 25 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:
workflow_dispatch:

env:
php-version: '8.1'
node-version: 18
php-version: '8.2'
node-version: 20

jobs:
#############
Expand All @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -53,9 +53,9 @@ jobs:

- name: Get Composer Cache Directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache composer files
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
Expand All @@ -69,21 +69,10 @@ jobs:

# Yarn
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.node-version }}
- name: Get yarn cache directory path
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache yarn files
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
${{ runner.os }}-yarn-
cache: yarn
- name: Install yarn dependencies
run: yarn install
- name: Lint files
Expand All @@ -105,15 +94,15 @@ jobs:
- name: Get version
id: version
run: |
echo "::set-output name=version::$(git describe --abbrev=0 --tags | sed 's/^v//')"
echo "::set-output name=release::$(git describe --abbrev=0 --tags --exact-match $GITHUB_SHA 2>/dev/null || git log --pretty="%h" -n1 $GITHUB_SHA)"
echo "version=$(git describe --abbrev=0 --tags | sed 's/^v//')" >> $GITHUB_OUTPUT
echo "release=$(git describe --abbrev=0 --tags --exact-match $GITHUB_SHA 2>/dev/null || git log --pretty="%h" -n1 $GITHUB_SHA)" >> $GITHUB_OUTPUT
- name: Build assets
run: yarn run production

- name: Store assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: assets
path: |
Expand All @@ -123,7 +112,7 @@ jobs:
public/fonts
- name: Store source maps
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sourcemaps
path: |
Expand All @@ -143,16 +132,16 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: webfactory/ssh-agent@v0.5.4
- uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Download assets
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: assets
path: public
Expand Down
4 changes: 2 additions & 2 deletions app/Actions/Fortify/PasswordValidationRules.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Actions\Fortify;

use Laravel\Fortify\Rules\Password;
use Illuminate\Validation\Rules\Password;

trait PasswordValidationRules
{
Expand All @@ -13,6 +13,6 @@ trait PasswordValidationRules
*/
protected function passwordRules()
{
return ['required', 'string', new Password, 'confirmed'];
return ['required', 'string', Password::default(), 'confirmed'];
}
}
2 changes: 1 addition & 1 deletion app/Models/Note.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Note extends Model
/**
* The attributes that are mass assignable.
*
* @var array<string>
* @var array<int,string>
*/
protected $fillable = [
'description',
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Post.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Post extends Model implements Feedable
/**
* The attributes that are mass assignable.
*
* @var array<string>
* @var array<int,string>
*/
protected $fillable = [
'title',
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Release.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Release extends Model
/**
* The attributes that are mass assignable.
*
* @var array<string>
* @var array<int,string>
*/
protected $fillable = [
'release_number',
Expand Down
8 changes: 4 additions & 4 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class User extends Authenticatable
/**
* The attributes that are mass assignable.
*
* @var array<string>
* @var array<int,string>
*/
protected $fillable = [
'name',
Expand All @@ -31,7 +31,7 @@ class User extends Authenticatable
/**
* The attributes that should be hidden for arrays.
*
* @var array<int, string>
* @var array<int,string>
*/
protected $hidden = [
'password',
Expand All @@ -43,7 +43,7 @@ class User extends Authenticatable
/**
* The attributes that should be cast to native types.
*
* @var array<string, string>
* @var array<string,string>
*/
protected $casts = [
'email_verified_at' => 'datetime',
Expand All @@ -52,7 +52,7 @@ class User extends Authenticatable
/**
* The accessors to append to the model's array form.
*
* @var array
* @var array<int,string>
*/
protected $appends = [
'profile_photo_url',
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"laravel/legacy-factories": "^1.1",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^6.1",
"nunomaduro/larastan": "^2.1",
"larastan/larastan": "^2.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpunit/phpunit": "^9.0",
"phpunit/phpunit": "^10.0",
"psalm/plugin-laravel": "^2.0",
"roave/security-advisories": "dev-master",
"spatie/laravel-ignition": "^2.0",
Expand All @@ -44,7 +44,8 @@
"preferred-install": "dist",
"sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true
"composer/package-versions-deprecated": true,
"php-http/discovery": true
}
},
"extra": {
Expand Down
Loading

0 comments on commit abf5064

Please sign in to comment.