From 066c493d00991b97c16cffdb0d0ad9413f7a38da Mon Sep 17 00:00:00 2001 From: EwelinaLasowy Date: Wed, 4 May 2022 15:09:10 +0200 Subject: [PATCH] #5 - May 2022 composer update --- composer.json | 2 +- composer.lock | 187 ++++++++++++--------------------- docker-compose.yml | 8 +- environment/dev/php/Dockerfile | 2 +- 4 files changed, 73 insertions(+), 126 deletions(-) diff --git a/composer.json b/composer.json index 155b43e..72dce70 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "ext-redis": "*", "azuyalabs/yasumi": "^2.4", "barryvdh/laravel-dompdf": "^1.0", - "fruitcake/laravel-cors": "^2.0", + "fruitcake/laravel-cors": "^3.0", "guzzlehttp/guzzle": "^7.0.1", "inertiajs/inertia-laravel": "^0.5.1", "laravel/framework": "^9.7", diff --git a/composer.lock b/composer.lock index 37702df..69e26db 100644 --- a/composer.lock +++ b/composer.lock @@ -4,64 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "572998c0dff042cc8ddf65cb1b7348c9", + "content-hash": "c23bb050dbab6338570f0f73adb83cf8", "packages": [ - { - "name": "asm89/stack-cors", - "version": "v2.1.1", - "source": { - "type": "git", - "url": "https://github.com/asm89/stack-cors.git", - "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a", - "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a", - "shasum": "" - }, - "require": { - "php": "^7.2|^8.0", - "symfony/http-foundation": "^4|^5|^6", - "symfony/http-kernel": "^4|^5|^6" - }, - "require-dev": { - "phpunit/phpunit": "^7|^9", - "squizlabs/php_codesniffer": "^3.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "autoload": { - "psr-4": { - "Asm89\\Stack\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Alexander", - "email": "iam.asm89@gmail.com" - } - ], - "description": "Cross-origin resource sharing library and stack middleware", - "homepage": "https://github.com/asm89/stack-cors", - "keywords": [ - "cors", - "stack" - ], - "support": { - "issues": "https://github.com/asm89/stack-cors/issues", - "source": "https://github.com/asm89/stack-cors/tree/v2.1.1" - }, - "time": "2022-01-18T09:12:03+00:00" - }, { "name": "azuyalabs/yasumi", "version": "2.5.0", @@ -515,16 +459,16 @@ }, { "name": "dompdf/dompdf", - "version": "v1.2.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575" + "reference": "5031045d9640b38cfc14aac9667470df09c9e090" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c6dfd9bb8b0040609f04754f729d4cb3016e0575", - "reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090", + "reference": "5031045d9640b38cfc14aac9667470df09c9e090", "shasum": "" }, "require": { @@ -535,6 +479,8 @@ "php": "^7.1 || ^8.0" }, "require-dev": { + "ext-json": "*", + "ext-zip": "*", "mockery/mockery": "^1.3", "phpunit/phpunit": "^7.5 || ^8 || ^9", "squizlabs/php_codesniffer": "^3.5" @@ -576,9 +522,9 @@ "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/v1.2.1" + "source": "https://github.com/dompdf/dompdf/tree/v1.2.2" }, - "time": "2022-03-24T12:57:42+00:00" + "time": "2022-04-27T13:50:54+00:00" }, { "name": "dragonmantank/cron-expression", @@ -872,34 +818,34 @@ }, { "name": "fruitcake/laravel-cors", - "version": "v2.2.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/fruitcake/laravel-cors.git", - "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534" + "reference": "7c036ec08972d8d5d9db637e772af6887828faf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534", - "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534", + "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/7c036ec08972d8d5d9db637e772af6887828faf5", + "reference": "7c036ec08972d8d5d9db637e772af6887828faf5", "shasum": "" }, "require": { - "asm89/stack-cors": "^2.0.1", + "fruitcake/php-cors": "^1.2", "illuminate/contracts": "^6|^7|^8|^9", "illuminate/support": "^6|^7|^8|^9", - "php": ">=7.2" + "php": "^7.4|^8.0" }, "require-dev": { "laravel/framework": "^6|^7.24|^8", "orchestra/testbench-dusk": "^4|^5|^6|^7", - "phpunit/phpunit": "^6|^7|^8|^9", + "phpunit/phpunit": "^9", "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "3.0-dev" }, "laravel": { "providers": [ @@ -935,7 +881,7 @@ ], "support": { "issues": "https://github.com/fruitcake/laravel-cors/issues", - "source": "https://github.com/fruitcake/laravel-cors/tree/v2.2.0" + "source": "https://github.com/fruitcake/laravel-cors/tree/v3.0.0" }, "funding": [ { @@ -947,7 +893,7 @@ "type": "github" } ], - "time": "2022-02-23T14:25:13+00:00" + "time": "2022-02-23T14:53:22+00:00" }, { "name": "fruitcake/php-cors", @@ -1093,16 +1039,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.246.0", + "version": "v0.247.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "33aef1ccce34799a1124c39951fed8ad0b16aced" + "reference": "1fc6eab7512b4e2dd4b6c96b2697f9b6bfbaddc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/33aef1ccce34799a1124c39951fed8ad0b16aced", - "reference": "33aef1ccce34799a1124c39951fed8ad0b16aced", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/1fc6eab7512b4e2dd4b6c96b2697f9b6bfbaddc2", + "reference": "1fc6eab7512b4e2dd4b6c96b2697f9b6bfbaddc2", "shasum": "" }, "require": { @@ -1131,9 +1077,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.246.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.247.0" }, - "time": "2022-04-24T00:58:37+00:00" + "time": "2022-05-02T01:12:12+00:00" }, { "name": "google/auth", @@ -1733,16 +1679,16 @@ }, { "name": "laravel/framework", - "version": "v9.10.1", + "version": "v9.11.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "93414b1c7c0a56081d96c060bb850ac192d3d323" + "reference": "598a8c84d452a66b90a3213b1d67189cc726c728" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/93414b1c7c0a56081d96c060bb850ac192d3d323", - "reference": "93414b1c7c0a56081d96c060bb850ac192d3d323", + "url": "https://api.github.com/repos/laravel/framework/zipball/598a8c84d452a66b90a3213b1d67189cc726c728", + "reference": "598a8c84d452a66b90a3213b1d67189cc726c728", "shasum": "" }, "require": { @@ -1908,7 +1854,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-04-28T13:18:25+00:00" + "time": "2022-05-03T14:47:20+00:00" }, { "name": "laravel/helpers", @@ -2161,16 +2107,16 @@ }, { "name": "laravel/telescope", - "version": "v4.8.3", + "version": "v4.9.0", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "bb23d58161032c8745d38348452afcbcd8adfc78" + "reference": "d0cf8d6a54a1831dbe189a1f194e8271a4a5435a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/bb23d58161032c8745d38348452afcbcd8adfc78", - "reference": "bb23d58161032c8745d38348452afcbcd8adfc78", + "url": "https://api.github.com/repos/laravel/telescope/zipball/d0cf8d6a54a1831dbe189a1f194e8271a4a5435a", + "reference": "d0cf8d6a54a1831dbe189a1f194e8271a4a5435a", "shasum": "" }, "require": { @@ -2223,9 +2169,9 @@ ], "support": { "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/v4.8.3" + "source": "https://github.com/laravel/telescope/tree/v4.9.0" }, - "time": "2022-04-11T14:29:02+00:00" + "time": "2022-04-19T15:48:51+00:00" }, { "name": "laravel/tinker", @@ -2648,16 +2594,16 @@ }, { "name": "league/flysystem", - "version": "3.0.18", + "version": "3.0.19", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "c8e137e594948240b03372e012344b07c61b9193" + "reference": "670df21225d68d165a8df38587ac3f41caf608f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c8e137e594948240b03372e012344b07c61b9193", - "reference": "c8e137e594948240b03372e012344b07c61b9193", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/670df21225d68d165a8df38587ac3f41caf608f8", + "reference": "670df21225d68d165a8df38587ac3f41caf608f8", "shasum": "" }, "require": { @@ -2718,7 +2664,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.0.18" + "source": "https://github.com/thephpleague/flysystem/tree/3.0.19" }, "funding": [ { @@ -2734,7 +2680,7 @@ "type": "tidelift" } ], - "time": "2022-04-25T18:55:04+00:00" + "time": "2022-05-03T21:19:02+00:00" }, { "name": "league/mime-type-detection", @@ -2870,16 +2816,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.39", + "version": "3.1.40", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "5165334de44c6f7788a5818a1d019aa71a43e092" + "reference": "8a54972e3d616c74687c3cbff15765555761885c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/5165334de44c6f7788a5818a1d019aa71a43e092", - "reference": "5165334de44c6f7788a5818a1d019aa71a43e092", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/8a54972e3d616c74687c3cbff15765555761885c", + "reference": "8a54972e3d616c74687c3cbff15765555761885c", "shasum": "" }, "require": { @@ -2932,7 +2878,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.39" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.40" }, "funding": [ { @@ -2944,7 +2890,7 @@ "type": "github" } ], - "time": "2022-04-23T11:44:18+00:00" + "time": "2022-05-02T13:50:01+00:00" }, { "name": "maennchen/zipstream-php", @@ -3335,16 +3281,16 @@ }, { "name": "nesbot/carbon", - "version": "2.57.0", + "version": "2.58.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "4a54375c21eea4811dbd1149fe6b246517554e78" + "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4a54375c21eea4811dbd1149fe6b246517554e78", - "reference": "4a54375c21eea4811dbd1149fe6b246517554e78", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055", + "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055", "shasum": "" }, "require": { @@ -3362,7 +3308,8 @@ "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^0.12.54 || ^1.0", - "phpunit/phpunit": "^7.5.20 || ^8.5.14", + "phpunit/php-file-iterator": "^2.0.5", + "phpunit/phpunit": "^7.5.20 || ^8.5.23", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -3427,7 +3374,7 @@ "type": "tidelift" } ], - "time": "2022-02-13T18:13:33+00:00" + "time": "2022-04-25T19:31:17+00:00" }, { "name": "nette/schema", @@ -8388,16 +8335,16 @@ }, { "name": "laravel/dusk", - "version": "v6.23.0", + "version": "v6.23.1", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "98901d49176977c96330fd8c2ca5460eee50a246" + "reference": "41f6deb42ae42b9b7dae1c32c03cb35d365d3118" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/98901d49176977c96330fd8c2ca5460eee50a246", - "reference": "98901d49176977c96330fd8c2ca5460eee50a246", + "url": "https://api.github.com/repos/laravel/dusk/zipball/41f6deb42ae42b9b7dae1c32c03cb35d365d3118", + "reference": "41f6deb42ae42b9b7dae1c32c03cb35d365d3118", "shasum": "" }, "require": { @@ -8455,9 +8402,9 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v6.23.0" + "source": "https://github.com/laravel/dusk/tree/v6.23.1" }, - "time": "2022-04-11T18:55:12+00:00" + "time": "2022-05-02T14:01:47+00:00" }, { "name": "mockery/mockery", @@ -8842,16 +8789,16 @@ }, { "name": "php-webdriver/webdriver", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb" + "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/99d4856ed7dffcdf6a52eccd6551e83d8d557ceb", - "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/b27ddf458d273c7d4602106fcaf978aa0b7fe15a", + "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a", "shasum": "" }, "require": { @@ -8901,9 +8848,9 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.0" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.1" }, - "time": "2021-10-14T09:30:02+00:00" + "time": "2022-05-03T12:16:34+00:00" }, { "name": "phpdocumentor/reflection-common", diff --git a/docker-compose.yml b/docker-compose.yml index 6e14c5d..b4df020 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: restart: unless-stopped database: - image: postgres:13 + image: postgres:14 container_name: toby-db-dev environment: - PGPASSWORD=${DOCKER_DEV_DB_ROOT_PASSWORD} @@ -51,7 +51,7 @@ services: restart: unless-stopped database-test: - image: postgres:13 + image: postgres:14 container_name: toby-db-test environment: - PGPASSWORD=${DOCKER_TEST_DB_ROOT_PASSWORD} @@ -65,7 +65,7 @@ services: restart: unless-stopped redis: - image: redis:6 + image: redis:7 container_name: toby-redis ports: - ${FORWARD_REDIS_PORT:-6379}:6379 @@ -76,7 +76,7 @@ services: restart: unless-stopped node: - image: node:17.2.0-alpine3.14 + image: node:18.1.0-alpine3.14 container_name: toby-node working_dir: /application volumes: diff --git a/environment/dev/php/Dockerfile b/environment/dev/php/Dockerfile index d068a6c..39e707c 100644 --- a/environment/dev/php/Dockerfile +++ b/environment/dev/php/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/blumilksoftware/php:8.1 -ARG XDEBUG_VERSION=3.1.2 +ARG XDEBUG_VERSION=3.1.4 ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \