From 0a7595137aeec27dca4bc6bb87efefcf5474be4b Mon Sep 17 00:00:00 2001 From: Jesus Guerrero Date: Sun, 17 Dec 2023 17:51:08 -0400 Subject: [PATCH] chore: update dependencies --- Dockerfile | 5 ++++ composer.json | 12 +++++++-- composer.lock | 62 ++++++++++++++++++++++------------------------ docker-compose.yml | 3 --- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4071ba0..876bcf02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,10 @@ FROM php:8.1.2-fpm ARG user ARG uid ARG TZ + +ENV user $user +ENV uid $uid +ENV TZ $TZ # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -36,3 +40,4 @@ RUN mkdir -p /home/$user/.composer && \ WORKDIR /var/www USER $user +CMD ["php artisan serve"] diff --git a/composer.json b/composer.json index 815867e7..f722653e 100644 --- a/composer.json +++ b/composer.json @@ -4,10 +4,18 @@ "description": "The Laravel Framework.", "keywords": ["framework", "laravel"], "license": "MIT", + "repositories": [ + { + "url": "../packages/journal", + "type": "path", + "options": { + "symlink": true + } + } + ], "require": { "php": "^8.1", "ext-mailparse": "*", - "ext-redis": "*", "brick/money": "^0.6.0", "doctrine/dbal": "^3.3", "dompdf/dompdf": "^2.0.3", @@ -29,7 +37,7 @@ "laravel/tinker": "^2.8", "maatwebsite/excel": "^3.1", "nwidart/laravel-modules": "^9.0", - "php-mime-mail-parser/php-mime-mail-parser": "^7.1", + "php-mime-mail-parser/php-mime-mail-parser": "^8.0", "phpoffice/phpspreadsheet": "^1.27", "rlanvin/php-rrule": "^2.4", "simshaun/recurr": "^5.0", diff --git a/composer.lock b/composer.lock index f7b338d7..ad0437ce 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c0075c94e330fc7f49b53c5e14cdbcc9", + "content-hash": "9ea65b2532aada17a850815c50136ee4", "packages": [ { "name": "bacon/bacon-qr-code", @@ -2636,16 +2636,10 @@ { "name": "insane/journal", "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/insane-code/journal.git", - "reference": "424233e9ffa538efc51700b0bdd6700069717124" - }, "dist": { - "type": "zip", - "url": "https://api.github.com/repos/insane-code/journal/zipball/424233e9ffa538efc51700b0bdd6700069717124", - "reference": "424233e9ffa538efc51700b0bdd6700069717124", - "shasum": "" + "type": "path", + "url": "../packages/journal", + "reference": "424233e9ffa538efc51700b0bdd6700069717124" }, "require": { "staudenmeir/belongs-to-through": "^2.5" @@ -2659,7 +2653,6 @@ "phpunit/phpunit": "^7.4@dev", "symfony/thanks": "^1.0" }, - "default-branch": true, "type": "library", "extra": { "laravel": { @@ -2676,7 +2669,19 @@ "Insane\\Journal\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "Insane\\Journal\\Tests\\": "tests/" + } + }, + "scripts": { + "test": [ + "vendor/bin/phpunit" + ], + "test-coverage": [ + "vendor/bin/phpunit --coverage-html coverage" + ] + }, "license": [ "MIT" ], @@ -2688,14 +2693,13 @@ ], "description": "Accounting module for atmosphere and laravel", "keywords": [ - "Accounting", + "accounting", "invoicing" ], - "support": { - "issues": "https://github.com/insane-code/journal/issues", - "source": "https://github.com/insane-code/journal/tree/v1.0.5" - }, - "time": "2023-12-09T15:00:26+00:00" + "transport-options": { + "symlink": true, + "relative": true + } }, { "name": "insane/plan-module", @@ -5902,21 +5906,21 @@ }, { "name": "php-mime-mail-parser/php-mime-mail-parser", - "version": "7.1.2", + "version": "8.0.2", "source": { "type": "git", "url": "https://github.com/php-mime-mail-parser/php-mime-mail-parser.git", - "reference": "81d84bbc6a73b913110e155e98059526825c7ee3" + "reference": "f922907123625d940adbba7be403a2e620d0a8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-mime-mail-parser/php-mime-mail-parser/zipball/81d84bbc6a73b913110e155e98059526825c7ee3", - "reference": "81d84bbc6a73b913110e155e98059526825c7ee3", + "url": "https://api.github.com/repos/php-mime-mail-parser/php-mime-mail-parser/zipball/f922907123625d940adbba7be403a2e620d0a8e5", + "reference": "f922907123625d940adbba7be403a2e620d0a8e5", "shasum": "" }, "require": { "ext-mailparse": "*", - "php": "^7.2|^8.0" + "php": "^8.0" }, "replace": { "exorus/php-mime-mail-parser": "*", @@ -5969,7 +5973,7 @@ "role": "Developer" } ], - "description": "A fully tested email parser for PHP 7.2+ (mailparse extension wrapper).", + "description": "A fully tested email parser for PHP 8.0+ (mailparse extension wrapper).", "homepage": "https://github.com/php-mime-mail-parser/php-mime-mail-parser", "keywords": [ "MimeMailParser", @@ -5981,15 +5985,9 @@ ], "support": { "issues": "https://github.com/php-mime-mail-parser/php-mime-mail-parser/issues", - "source": "https://github.com/php-mime-mail-parser/php-mime-mail-parser/tree/7.1.2" + "source": "https://github.com/php-mime-mail-parser/php-mime-mail-parser/tree/8.0.2" }, - "funding": [ - { - "url": "https://github.com/eXorus", - "type": "github" - } - ], - "time": "2022-04-16T07:56:53+00:00" + "time": "2023-08-23T13:29:02+00:00" }, { "name": "phpdocumentor/reflection-common", diff --git a/docker-compose.yml b/docker-compose.yml index 85913e92..9ec49433 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -123,8 +123,6 @@ services: phpmyadmin: depends_on: - db - #links: - #- db:mysql image: phpmyadmin/phpmyadmin container_name: phpmyadmin restart: always @@ -134,7 +132,6 @@ services: environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - VIRTUAL_HOST=phpmyadmin.${HOST_DOMAIN} - #- VIRTUAL_PORT=8002 - LETSENCRYPT_HOST=phpmyadmin.${HOST_DOMAIN} - LETSENCRYPT_EMAIL=jesusant.guerrero@gmail.com networks: