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.

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

v1 Release #742

Merged
merged 7 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 49 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
target-branch: "dev"
schedule:
interval: "weekly"
groups:
npm-major:
update-types:
- "major"
npm-minor:
update-types:
- "minor"
- "patch"

- package-ecosystem: "composer"
directory: "/"
target-branch: "dev"
schedule:
interval: "weekly"
groups:
composer-major:
update-types:
- "major"
composer-minor:
update-types:
- "minor"
- "patch"

- package-ecosystem: "docker"
directory: "/"
target-branch: "dev"
schedule:
interval: "weekly"
groups:
docker:
patterns:
- '*'

- package-ecosystem: "github-actions"
directory: "/"
target-branch: "dev"
schedule:
interval: "weekly"
groups:
actions:
patterns:
- '*'
6 changes: 3 additions & 3 deletions .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 18.x
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: 18
node-version: 20

- name: Build all assets
run: |
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.1
coverage: pcov
extensions: mbstring

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/

- name: Use Node.js 18.x
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: 18
node-version: 20

- name: Try to build the assets
run: |
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.1
extensions: mbstring

- id: composer-cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 18 LTS
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Try to build the assets
run: |
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
operating-system: [ ubuntu-latest ]
php-versions: [ '8.0', '8.1', '8.2' ]
php-versions: [ '8.1', '8.2', '8.3' ]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion app/Helper/Sharing.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class Sharing
{
public static $linkClasses = 'share-link btn btn-xs btn-light';
public static $linkClasses = 'share-link btn btn-light';

public static $placeholders = [
'#URL#',
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Guest/TagController.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function show(Request $request, int $tagID): View
->publicOnly()
->orderBy(
$request->input('orderBy', 'title'),
$request->input('orderDir', 'asc')
$this->getOrderDirection($request, 'asc')
)->paginate(getPaginationLimit());

return view('guest.tags.show', [
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Models/ListController.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function show(Request $request, LinkList $list): View
->byUser()
->orderBy(
$request->input('orderBy', 'created_at'),
$request->input('orderDir', 'desc')
$this->getOrderDirection($request)
)->paginate(getPaginationLimit());

return view('models.lists.show', [
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Setup/RequirementsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function index(): View
protected function checkRequirements(): array
{
$results = [
'php_version' => PHP_VERSION_ID >= 70400,
'php_version' => PHP_VERSION_ID >= 80110,
'extension_bcmath' => extension_loaded('bcmath'),
'extension_ctype' => extension_loaded('ctype'),
'extension_json' => extension_loaded('json'),
Expand Down
30 changes: 18 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,47 @@
"license": "GPL-3.0-or-later",
"type": "project",
"require": {
"php": "^8.0.2 | ^8.1 | ^8.2",
"php": "^8.1 | ^8.2 | ^8.3",
"composer/semver": "^3.3.2",
"doctrine/dbal": "^3.6.1",
"guzzlehttp/guzzle": "^7.0.1",
"doctrine/dbal": "^3.6",
"guzzlehttp/guzzle": "^7.8.1",
"kovah/laravel-html-meta": "^2.0",
"laracasts/flash": "^3.1",
"laravel/fortify": "^1.7",
"laravel/framework": "^9.0",
"laravel/fortify": "^v1.20",
"laravel/framework": "^v10.43",
"league/csv": "^9.6",
"league/flysystem-aws-s3-v3": "^3.0",
"league/flysystem-ftp": "^3.0",
"league/flysystem-sftp-v3": "^3.0",
"masterminds/html5": "^2.8",
"predis/predis": "^v2.1",
"rap2hpoutre/laravel-log-viewer": "^v2.2.0",
"sentry/sentry-laravel": "^3.3.0",
"shaarli/netscape-bookmark-parser": "^v4.0",
"rap2hpoutre/laravel-log-viewer": "^v2.3",
"sentry/sentry-laravel": "^4.2",
"shaarli/netscape-bookmark-parser": "dev-master",
"spatie/laravel-backup": "^8.1.5",
"symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.0",
"symfony/postmark-mailer": "^6.0",
"venturecraft/revisionable": "^1.34"
"venturecraft/revisionable": "^1.40"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.2",
"barryvdh/laravel-ide-helper": "^2.6",
"spatie/laravel-ignition": "^1.6",
"spatie/laravel-ignition": "^2.4",
"fakerphp/faker": "^1.12",
"laravel/tinker": "^2.2",
"mockery/mockery": "^1.5",
"nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.0",
"nunomaduro/collision": "^v7.10.0",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.5"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/Kovah/netscape-bookmark-parser"
}
],
"autoload": {
"files": [
"app/Helper/functions.php"
Expand Down
Loading
Loading