amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

chore(deps): upgrade dependencies (#4275)

Browse Source
This commit is contained in:
Alexis Saettler
2020-08-06 00:21:27 +02:00
committed by GitHub
parent a8b2151f3e
commit 6fcc60cae7
14 changed files with 801 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.azure/azure.sig
+13 -13
View File
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEuNgCced4O/05ANeg4OezJU6ORAcFAl7mE5wACgkQ4OezJU6O
RAf1OA//a4tBOjn1oJYwNp3QuakpQR8WjhI0y7YbHtAsAqjlizQf9EHgphhon10g
Cllejxr7sa5Kre2qVqWb3FpnpeW6XdTGEJxXnjffNj/11b08pCD0745h7LJXW9Ny
PldsQELZS1Oz+vOmxvaVowq6ynM4BuLm2uT1matbR+/Nk92RTv0EtK+8ptRnzVUb
M/Qzzv4J8pN2z06LyUjuNzD622NU/peoIhHP6iekUhagcRu5HxEdcLMiGx8nKHJ2
du8zGDw8IXIwfi+U2SVq8JkhIN5kBkki0SxgFNNPVunh4dopsYYChqBgoP40om//
aq1nldvUp9teLC1S8mVXbuzmsEedZ7jFanBSVy+HQQXA6ok81JK9Q+FWNOAf/hlF
Brs0LG9KUpC4IW7ndBcv3Or1j4kLCrn9iG9ux+g84Jn69rn78VTmzdPSUY5BNMQM
cvPXuCA/tVLiBESGlZG1eisSvrhGsZu1cTwEiR/xQO9YrDXCEAUnQRcfn76qd4p0
x8fn2wzZU3XiTbcInAcQs9pwJXJ3ICR7JWbL4JBQg9N8HvLFgidsI+paZMxCC/KW
GYHql21Sd9Sxw+ONTTfFIp0qC85p2XwGewHPgfc4cR5GHPlNb8DwLtelND17Gf9t
vOm6jhzoLya1XSOeeaw2WaQWVhbQM49+ChxZZHYReHHEMHjq65U=
=gZB5
iQIzBAABCgAdFiEEuNgCced4O/05ANeg4OezJU6ORAcFAl8pMekACgkQ4OezJU6O
RAc+FBAAga0p+bP3fynxWOAAD4JUK2FkvuiEDkot3pRT3Ox5aaBAh2zcLVj2V4ah
TCN6XnA6Wa+aot76jL526GzV9FsOoEM5Jlb9CnhVs4mYBLL3vPS6fZAVswn87GkV
8KK1zO5qX/0w6kFarfbN/AvRsRsACXyFfqTb8QdQEIt1FLLiSH4yyxpEM+eM3ayT
HNrdJfKXpGg+vTycBOD9BKEeUEZUtnuOTbPyV0aZ3rqA0dHEVxdcPr0UvedxTSs3
jHRC2mxsj7qL4eY4po4h6FMRkJpGwXeHZDv1YSXENhoCMLFwiCwcPNxQnkehUJYE
whlPBbrk1nrDYgesUG3L+VWQKD+ktsp8hGSpvYn8I8exTCmOt0rnv7FHjpYctx+K
qpc4DoFK9q0wX4kwUuU81gAuRvaKmaQJzDnkZpTx4Jk0e+dZE1VGiiBHEYJawx4/
0lWpi4Os4BqlLGa+tfja3M5LNNqsiNWwiXAo9bLXrucbAJSzLc04CTR7q27SgaTt
7jZUbZlir6l9ScbEOavRdWh0SPZXJN6o+vP7UkA3J1rszI9CcK7irX3g4a4EIj8z
SlLM63i1gzCC+gBlOyIBKNghR+unIrEGqkym9bRBm3PwHwafQ07/0h6FK2Vtti14
boGNQO6gzBEtaVJ/hXgwUEoQ2pPdEGVvj4nFgV5mMciRPX6rDC0=
=stjf
-----END PGP SIGNATURE-----
.azure/step-prepare-environment.yml
+1
View File
@@ -9,6 +9,7 @@ steps:
sudo update-alternatives --set php-cgi /usr/bin/php-cgi$(phpVersion)
sudo update-alternatives --set phar.phar /usr/bin/phar.phar$(phpVersion)
sudo apt-get install php$(phpVersion)-intl
sudo apt-get install php-imagick
php -version
displayName: Set php version $(phpVersion)
.github/workflows/cypress.yml
+2 -1
View File
@@ -31,9 +31,10 @@ jobs:
uses: actions/checkout@v2
- name: Setup PHP ${{ matrix.php-version }}
uses: shivammathur/setup-php@master
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
extensions: imagick
coverage: none
- name: Check PHP Version
run: php -v
CHANGELOG.md
+2 -1
View File
@@ -6,7 +6,8 @@
### Enhancements:
*
* Add dependency to php imagick module
* Renamed MOBILE_CLIENT_ID and MOBILE_CLIENT_SECRET variables to PASSPORT_PERSONAL_ACCESS_CLIENT_ID and PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET
### Fixes:
app/Helpers/DateHelper.php
+1 -1
View File
@@ -71,7 +71,7 @@ class DateHelper
$date->setTimezone($appTimezone);
}
return $date;
return $date === false ? null : $date;
}
/**
composer.json
+5 -4
View File
@@ -9,10 +9,11 @@
"ext-bcmath": "*",
"ext-gd": "*",
"ext-gmp": "*",
"ext-imagick": "*",
"ext-intl": "*",
"ext-redis": "*",
"asbiin/laravel-webauthn": "^0.8",
"bacon/bacon-qr-code": "^1.0",
"bacon/bacon-qr-code": "^2.0",
"creativeorange/gravatar": "~1.0",
"doctrine/dbal": "2.9.3",
"erusev/parsedown": "^1.7",
@@ -23,7 +24,7 @@
"intervention/image": "^2.3",
"laravel/cashier": "~10.0",
"laravel/framework": "^7.0",
"laravel/passport": "^8.0",
"laravel/passport": "^9.0",
"laravel/socialite": "^4.0",
"laravel/tinker": "^2.0",
"laravel/ui": "^2.0",
@@ -66,10 +67,10 @@
"nunomaduro/larastan": "^0.6",
"phpunit/phpcov": "^7.0",
"phpunit/phpunit": "^9.0",
"psalm/plugin-laravel": "^1.0",
"psalm/plugin-laravel": "1.1.1",
"roave/security-advisories": "dev-master",
"thecodingmachine/phpstan-safe-rule": "^1.0",
"vimeo/psalm": "^3.10"
"vimeo/psalm": "3.11.2"
},
"suggest": {
"ext-apcu": "*"
composer.lock
Generated
+751 -469
View File
File diff suppressed because it is too large Load Diff
public/css/app-ltr.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/css/app-rtl.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/mix-manifest.json
+2 -2
View File
@@ -2,8 +2,8 @@
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/vendor.js": "/js/vendor.js?id=be318c9f0f0e9c9469f3",
"/js/app.js": "/js/app.js?id=aa05d771942b4306b096",
"/css/app-ltr.css": "/css/app-ltr.css?id=50a29d9a682008ec4075",
"/css/app-rtl.css": "/css/app-rtl.css?id=54b5c63f9b15fa4d13c0",
"/css/app-ltr.css": "/css/app-ltr.css?id=93b0504c8a31e4fa6541",
"/css/app-rtl.css": "/css/app-rtl.css?id=5f893e2b310405ce8e45",
"/css/stripe.css": "/css/stripe.css?id=76c70a7b11ae5f38a725",
"/js/stripe.js": "/js/stripe.js?id=31bf2d83f6ef3685ff0b"
}
resources/views/vendor/passport/authorize.blade.php
Vendored
+8 -4
View File
@@ -15,9 +15,11 @@
<h2>Authorization Request</h2>
<p><strong>{{ $client->name }}</strong> is requesting permission to access your account.</p>
<!-- Scope List -->
@if (count($scopes) > 0)
<div class="scopes">
<p><strong>This application will be able to:</strong></p>
<ul>
@foreach ($scopes as $scope)
<li>{{ $scope->description }}</li>
@@ -27,22 +29,24 @@
@endif
<!-- Authorize Button -->
<form method="post" action="oauth/authorize">
<form method="post" action="{{ route('passport.authorizations.approve') }}">
@csrf
<input type="hidden" name="state" value="{{ $request->state }}">
<input type="hidden" name="client_id" value="{{ $client->id }}">
<button type="submit" class="btn btn-primary btn-approve">Authorize</button>
<input type="hidden" name="auth_token" value="{{ $authToken }}">
<button type="submit" class="btn btn-success btn-approve">Authorize</button>
</form>
<!-- Cancel Button -->
<form method="post" action="oauth/authorize">
<form method="post" action="{{ route('passport.authorizations.deny') }}">
@csrf
@method('DELETE')
<input type="hidden" name="state" value="{{ $request->state }}">
<input type="hidden" name="client_id" value="{{ $client->id }}">
<button class="btn">Cancel</button>
<input type="hidden" name="auth_token" value="{{ $authToken }}">
<button class="btn btn-danger">Cancel</button>
</form>
</div>
scripts/docker/apache/Dockerfile
+3 -1
View File
@@ -54,7 +54,9 @@ RUN set -ex; \
#- cbor-php (webauthn)
php7-gmp \
#- web-token/jwt-signature-algorithm-eddsa
php7-sodium
php7-sodium \
#- bacon/bacon-qr-code
php7-imagick
# Create a user to own all the code and assets and give them a working
# directory
scripts/docker/fpm/Dockerfile
+3 -1
View File
@@ -54,7 +54,9 @@ RUN set -ex; \
#- cbor-php (webauthn)
php7-gmp \
#- web-token/jwt-signature-algorithm-eddsa
php7-sodium
php7-sodium \
#- bacon/bacon-qr-code
php7-imagick
# Create a user to own all the code and assets and give them a working
# directory
scripts/docker/php-apache/Dockerfile
+8 -1
View File
@@ -41,6 +41,7 @@ RUN set -ex; \
libjpeg62-turbo-dev \
libgmp-dev \
libsodium-dev \
libmagickwand-dev \
; \
docker-php-ext-configure intl; \
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; \
@@ -59,6 +60,10 @@ RUN set -ex; \
mbstring \
opcache \
; \
\
printf "\n" | pecl install imagick ; \
docker-php-ext-enable imagick ; \
\
apt-get -y remove \
icu-devtools \
libicu-dev \
@@ -69,7 +74,9 @@ RUN set -ex; \
libfreetype6-dev \
libjpeg62-turbo-dev \
libgmp-dev \
libsodium-dev; \
libsodium-dev \
libmagickwand-dev \
; \
apt-get -y clean; \
rm -rf /var/lib/apt/lists/*