From 1001920e8c09d1c3130a69be10764b7b5696858b Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 18 Mar 2025 17:31:38 +0100 Subject: [PATCH] wip #7401 @4 --- .docker/production/docker-compose.yml | 2 + .env.production | 18 +- .idea/lettre-pharma.iml | 6 +- .idea/php.xml | 6 +- app/Console/Commands/Migration.php | 66 ++++ composer.json | 10 +- composer.lock | 498 +++++++++++++++++++------- config/database.php | 20 ++ config/filesystems.php | 11 + 9 files changed, 495 insertions(+), 142 deletions(-) create mode 100644 app/Console/Commands/Migration.php diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml index 764421b..1d2eb73 100644 --- a/.docker/production/docker-compose.yml +++ b/.docker/production/docker-compose.yml @@ -77,6 +77,7 @@ services: command: 'minio server /data/minio --console-address ":8900"' networks: - presquot + - nginxproxy restart: unless-stopped adminer: @@ -93,6 +94,7 @@ services: LETSENCRYPT_HOST: adminer.dev.prescription-quotidien.com networks: - presquot + - nginxproxy mariadb: container_name: presquot-mariadb diff --git a/.env.production b/.env.production index 1267d3e..89d93c8 100644 --- a/.env.production +++ b/.env.production @@ -15,6 +15,13 @@ DB_DATABASE=presquot DB_USERNAME=root DB_PASSWORD=35z8556x1KVZ8p3q +OLD_DB_CONNECTION=mysql +OLD_DB_HOST=ec2-35-181-42-50.eu-west-3.compute.amazonaws.com +OLD_DB_PORT=3306 +OLD_DB_DATABASE=psq +OLD_DB_USERNAME=root +OLD_DB_PASSWORD=yZBjT0o4S5R9MeAo6F + BROADCAST_DRIVER=pusher CACHE_DRIVER=redis QUEUE_DRIVER=redis @@ -46,6 +53,11 @@ AWS_DEFAULT_REGION=eu-west-3 AWS_BUCKET=presquot AWS_USE_PATH_STYLE_ENDPOINT=true +OLD_AWS_ACCESS_KEY_ID=AKIAZYI53ESTDP6BLEWY +OLD_AWS_SECRET_ACCESS_KEY=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 +OLD_AWS_DEFAULT_REGION=eu-west-3 +OLD_AWS_BUCKET=prescription-sante + PUSHER_HOST=presquot-soketi PUSHER_APP_ID=977841 PUSHER_APP_KEY=459380cb6d0a29d6861f @@ -59,9 +71,9 @@ SCOUT_PREFIX=prod_ SCOUT_QUEUE=true SCOUT_DRIVER=typesense -ALGOLIA_APP_ID=2DN9N2PQBK -ALGOLIA_SECRET=8a1916ad1188b1b570cb85a43e5be2fa -ALGOLIA_SEARCH_KEY=52af96ecc29fff550d9d8d2125ec1e57 +#ALGOLIA_APP_ID=2DN9N2PQBK +#ALGOLIA_SECRET=8a1916ad1188b1b570cb85a43e5be2fa +#ALGOLIA_SEARCH_KEY=52af96ecc29fff550d9d8d2125ec1e57 TYPESENSE_HOST=prequot-typesense TYPESENSE_API_KEY=K4fae5KYZTVj6Wucp5q9 diff --git a/.idea/lettre-pharma.iml b/.idea/lettre-pharma.iml index 0725d12..99624ce 100644 --- a/.idea/lettre-pharma.iml +++ b/.idea/lettre-pharma.iml @@ -11,7 +11,6 @@ - @@ -106,6 +105,11 @@ + + + + + diff --git a/.idea/php.xml b/.idea/php.xml index 9d97bcf..29dab40 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -232,10 +232,14 @@ - + + + + + diff --git a/app/Console/Commands/Migration.php b/app/Console/Commands/Migration.php new file mode 100644 index 0000000..a10887a --- /dev/null +++ b/app/Console/Commands/Migration.php @@ -0,0 +1,66 @@ +setArg('h', env('OLD_DB_HOST')); + $mysqldump->setManualArg('-u' . env('OLD_DB_USERNAME') . ' -p' . env('OLD_DB_PASSWORD')); + foreach ($ignore as $i) { + $mysqldump->setArg('ignore-table', $i); + } + $mysqldump->setArg(null, env('OLD_DB_DATABASE')); + $mysqldump->execute(); + + // Make backup of new server + $backup = Files::mkdir(storage_path('database/migrationbackup/')) . time() . '.sql'; + $mysqldump = new CommandLine('mysqldump', $backup, false); + $mysqldump->setArg('h', env('DB_HOST')); + $mysqldump->setManualArg('-u' . env('DB_USERNAME') . ' -p' . env('DB_PASSWORD')); + $mysqldump->setArg(null, env('DB_DATABASE')); + $mysqldump->execute(); + `gzip $backup`; + + //Import dump from old server + $mysql = 'mysql -h ' . env('DB_HOST') . ' -u' . env('DB_USERNAME') . ' -p' . env('DB_PASSWORD') . ' ' . env('DB_DATABASE') . ' < ' . $tmp; + `$mysql`; + unlink($tmp); + } +} diff --git a/composer.json b/composer.json index f158485..91b78ac 100644 --- a/composer.json +++ b/composer.json @@ -11,23 +11,23 @@ "php": "^8.3", "ext-dom": "*", "ext-json": "*", - "algolia/algoliasearch-client-php": "^2.8", "anaseqal/nova-import": "^0.0.3", "area17/twill": "^2.13", "biscolab/laravel-recaptcha": "^5.4", "coderello/laravel-nova-lang": "^1.8", + "cubist/util": "dev-master", "fideloper/proxy": "^4.4", "fluidbook/toolboxapiclient": "*", "fruitcake/laravel-cors": "^1.0", "gabrieliuga/laravel-nova-field-iframe": "^1.0", - "guzzlehttp/guzzle": "^7.8", + "guzzlehttp/guzzle": "^7.9", "html2text/html2text": "^4.3", "idf/nova-unlayer-field": "^0.2.1", "itsgoingd/clockwork": "^5.2", "judev/php-htmltruncator": "^1.2", "kriswallsmith/buzz": "^1.2", "kub-at/php-simple-html-dom-parser": "^1.9", - "laravel-lang/lang": "~6.0", + "laravel-lang/lang": "~6.1", "laravel/cashier": "^12.17", "laravel/framework": "^8.83", "laravel/horizon": "^5.22", @@ -49,10 +49,10 @@ "sentry/sentry-laravel": "^3.8.2", "spatie/laravel-analytics": "^3.11", "spatie/pdf-to-image": "^2.3", - "spatie/pdf-to-text": "^1.53", + "spatie/pdf-to-text": "^1.54", "stripe/stripe-php": "^7.128", "typesense/laravel-scout-typesense-driver": "^5.2", - "vaites/php-apache-tika": "^v1.3" + "vaites/php-apache-tika": "^v1.4" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.7", diff --git a/composer.lock b/composer.lock index 85f047a..f604757 100644 --- a/composer.lock +++ b/composer.lock @@ -4,82 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "74f5ff2baf2220129295faabc3c4dbc7", + "content-hash": "d45c969a16e08ea6fc9802e0b87f2e5d", "packages": [ - { - "name": "algolia/algoliasearch-client-php", - "version": "2.8.0", - "source": { - "type": "git", - "url": "https://github.com/algolia/algoliasearch-client-php.git", - "reference": "d9781147ae433f5bdbfd902497d748d60e70d693" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/d9781147ae433f5bdbfd902497d748d60e70d693", - "reference": "d9781147ae433f5bdbfd902497d748d60e70d693", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "php": "^5.3 || ^7.0 || ^8.0", - "psr/http-message": "^1.0", - "psr/log": "^1.0", - "psr/simple-cache": "^1.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "fzaninotto/faker": "^1.8", - "julienbourdeau/phpunit": "4.8.37", - "symfony/yaml": "^2.0 || ^4.0" - }, - "suggest": { - "guzzlehttp/guzzle": "If you prefer to use Guzzle HTTP client instead of the Http Client implementation provided by the package" - }, - "bin": [ - "bin/algolia-doctor" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-2.0": "2.0.x-dev" - } - }, - "autoload": { - "files": [ - "src/Http/Psr7/functions.php", - "src/functions.php" - ], - "psr-4": { - "Algolia\\AlgoliaSearch\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Algolia Team", - "email": "contact@algolia.com" - } - ], - "description": "Algolia Search API Client for PHP", - "keywords": [ - "algolia", - "api", - "client", - "php", - "search" - ], - "support": { - "issues": "https://github.com/algolia/algoliasearch-client-php/issues", - "source": "https://github.com/algolia/algoliasearch-client-php/tree/2.8.0" - }, - "time": "2021-04-07T16:50:58+00:00" - }, { "name": "anaseqal/nova-import", "version": "0.0.3", @@ -418,16 +344,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.337.3", + "version": "3.342.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6" + "reference": "4d42e384dac1e71107226ed72ed5e8e4d4ee3358" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/06dfc8f76423b49aaa181debd25bbdc724c346d6", - "reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4d42e384dac1e71107226ed72ed5e8e4d4ee3358", + "reference": "4d42e384dac1e71107226ed72ed5e8e4d4ee3358", "shasum": "" }, "require": { @@ -435,31 +361,30 @@ "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", - "mtdowling/jmespath.php": "^2.6", - "php": ">=7.2.5", - "psr/http-message": "^1.0 || ^2.0" + "guzzlehttp/guzzle": "^7.4.5", + "guzzlehttp/promises": "^2.0", + "guzzlehttp/psr7": "^2.4.5", + "mtdowling/jmespath.php": "^2.8.0", + "php": ">=8.1", + "psr/http-message": "^2.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", "aws/aws-php-sns-message-validator": "~1.0", "behat/behat": "~3.0", - "composer/composer": "^1.10.22", + "composer/composer": "^2.7.8", "dms/phpunit-arraysubset-asserts": "^0.4.0", "doctrine/cache": "~1.4", "ext-dom": "*", "ext-openssl": "*", "ext-pcntl": "*", "ext-sockets": "*", - "nette/neon": "^2.3", - "paragonie/random_compat": ">= 2", "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5", - "psr/cache": "^1.0 || ^2.0 || ^3.0", - "psr/simple-cache": "^1.0 || ^2.0 || ^3.0", - "sebastian/comparator": "^1.2.3 || ^4.0", - "yoast/phpunit-polyfills": "^1.0" + "psr/cache": "^2.0 || ^3.0", + "psr/simple-cache": "^2.0 || ^3.0", + "sebastian/comparator": "^1.2.3 || ^4.0 || ^5.0", + "symfony/filesystem": "^v6.4.0 || ^v7.1.0", + "yoast/phpunit-polyfills": "^2.0" }, "suggest": { "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", @@ -508,11 +433,11 @@ "sdk" ], "support": { - "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", + "forum": "https://github.com/aws/aws-sdk-php/discussions", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.337.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.342.7" }, - "time": "2025-01-21T19:10:05+00:00" + "time": "2025-03-17T18:18:04+00:00" }, { "name": "biscolab/laravel-recaptcha", @@ -1181,6 +1106,144 @@ ], "time": "2024-09-19T14:15:21+00:00" }, + { + "name": "cubist/net", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://git.cubedesigners.com/cubist_net.git", + "reference": "219a0559058cba8664271692b474cd412a2d498d" + }, + "dist": { + "type": "tar", + "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-e49955.tar", + "reference": "219a0559058cba8664271692b474cd412a2d498d", + "shasum": "2f159b1294e722fc61acd689fc39463e91feac9b" + }, + "require": { + "aws/aws-sdk-php": "^3.325", + "cubist/util": "dev-master", + "ext-ftp": "*", + "ext-ssh2": "*", + "php": ">=7.0.0" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-4": { + "Cubist\\Net\\": "src" + } + }, + "license": [ + "proprietary" + ], + "authors": [ + { + "name": "Vincent Vanwaelscappel", + "email": "vincent@cubedesigners.com" + } + ], + "description": "net cubist composer package", + "time": "2025-02-12T11:08:35+00:00" + }, + { + "name": "cubist/pdf", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://git.cubedesigners.com/cubist_pdf.git", + "reference": "198c57f933d64ad42d3bbeed6792fb72e52a474e" + }, + "dist": { + "type": "tar", + "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-36f8b5.tar", + "reference": "198c57f933d64ad42d3bbeed6792fb72e52a474e", + "shasum": "e7f9d4226ab0ec1459d461602b84240eea451e97" + }, + "require": { + "cubist/util": "dev-master", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "laravel/framework": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0", + "php": ">=7.4" + }, + "default-branch": true, + "type": "library", + "extra": { + "laravel": { + "providers": [] + } + }, + "autoload": { + "psr-4": { + "Cubist\\PDF\\": "src" + } + }, + "license": [ + "proprietary" + ], + "authors": [ + { + "name": "Vincent Vanwaelscappel", + "email": "vincent@cubedesigners.com" + } + ], + "description": "PDF", + "keywords": [ + "cubist", + "pdf" + ], + "time": "2025-02-19T09:05:27+00:00" + }, + { + "name": "cubist/util", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://git.cubedesigners.com/cubist_util.git", + "reference": "58cc7cb26196ccf3b4b4463db4f51d31ba5257ee" + }, + "dist": { + "type": "tar", + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-9d1d24.tar", + "reference": "58cc7cb26196ccf3b4b4463db4f51d31ba5257ee", + "shasum": "da558afabb012eaf9c1ec24d3c8908ed5c32d4e1" + }, + "require": { + "cubist/net": "dev-master", + "cubist/pdf": "dev-master", + "dpb587/microdata-dom": "dev-master", + "ext-dom": "*", + "ext-iconv": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-sodium": "*", + "laravel/framework": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0", + "norkunas/youtube-dl-php": "^2.2", + "php": ">=7.2" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-4": { + "Cubist\\Util\\": "src" + } + }, + "license": [ + "proprietary" + ], + "authors": [ + { + "name": "Vincent Vanwaelscappel", + "email": "vincent@cubedesigners.com" + } + ], + "description": "Utilities class", + "time": "2025-03-13T16:12:48+00:00" + }, { "name": "dflydev/dot-access-data", "version": "v3.0.3", @@ -1825,6 +1888,43 @@ }, "time": "2024-04-29T13:06:17+00:00" }, + { + "name": "dpb587/microdata-dom", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/dpb587/microdata-dom.php.git", + "reference": "8eaef2b88f7675784e6457e9a73b1d6f6b67b362" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dpb587/microdata-dom.php/zipball/8eaef2b88f7675784e6457e9a73b1d6f6b67b362", + "reference": "8eaef2b88f7675784e6457e9a73b1d6f6b67b362", + "shasum": "" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-0": { + "MicrodataDOM": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A library extending the PHP DOMDocument to support the Microdata DOM API.", + "keywords": [ + "microdata", + "structured-data" + ], + "support": { + "issues": "https://github.com/dpb587/microdata-dom.php/issues", + "source": "https://github.com/dpb587/microdata-dom.php/tree/master" + }, + "abandoned": true, + "time": "2016-04-04T05:09:29+00:00" + }, { "name": "dragonmantank/cron-expression", "version": "v3.4.0", @@ -4702,23 +4802,23 @@ }, { "name": "league/glide", - "version": "1.7.2", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/thephpleague/glide.git", - "reference": "8dba756ada0b8e525bf6f1f7d1bd83c1e99e124e" + "reference": "1f4a11801a10c284953860069ff20415fe2605c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/glide/zipball/8dba756ada0b8e525bf6f1f7d1bd83c1e99e124e", - "reference": "8dba756ada0b8e525bf6f1f7d1bd83c1e99e124e", + "url": "https://api.github.com/repos/thephpleague/glide/zipball/1f4a11801a10c284953860069ff20415fe2605c7", + "reference": "1f4a11801a10c284953860069ff20415fe2605c7", "shasum": "" }, "require": { "intervention/image": "^2.4", "league/flysystem": "^1.0", "php": "^7.2|^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0|^2.0" }, "require-dev": { "mockery/mockery": "^1.3.3", @@ -4766,9 +4866,9 @@ ], "support": { "issues": "https://github.com/thephpleague/glide/issues", - "source": "https://github.com/thephpleague/glide/tree/1.7.2" + "source": "https://github.com/thephpleague/glide/tree/1.x" }, - "time": "2023-02-14T06:26:04+00:00" + "time": "2023-08-24T08:37:04+00:00" }, { "name": "league/glide-laravel", @@ -6322,6 +6422,68 @@ }, "time": "2024-12-30T11:07:19+00:00" }, + { + "name": "norkunas/youtube-dl-php", + "version": "v2.10.0", + "source": { + "type": "git", + "url": "https://github.com/norkunas/youtube-dl-php.git", + "reference": "4c954b3b8c6b30d0c0135ec758b61a91f0ac3b6a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/norkunas/youtube-dl-php/zipball/4c954b3b8c6b30d0c0135ec758b61a91f0ac3b6a", + "reference": "4c954b3b8c6b30d0c0135ec758b61a91f0ac3b6a", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.4.0", + "symfony/filesystem": "^5.1|^6.0|^7.0", + "symfony/polyfill-php80": "^1.28", + "symfony/process": "^5.1|^6.0|^7.0" + }, + "require-dev": { + "mikey179/vfsstream": "^1.6.11", + "php-cs-fixer/shim": "^3.60", + "phpstan/phpstan": "^1.11.8", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.0", + "symfony/phpunit-bridge": "^6.4.10" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "YoutubeDl\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tomas Norkūnas", + "email": "norkunas.tom@gmail.com" + } + ], + "description": "youtube-dl / yt-dlp wrapper for php", + "keywords": [ + "youtube", + "youtube-dl", + "yt-dlp" + ], + "support": { + "issues": "https://github.com/norkunas/youtube-dl-php/issues", + "source": "https://github.com/norkunas/youtube-dl-php/tree/v2.10.0" + }, + "time": "2025-02-20T17:32:37+00:00" + }, { "name": "numaxlab/nova-ckeditor5-classic", "version": "1.1.2", @@ -8052,16 +8214,16 @@ }, { "name": "psr/http-message", - "version": "1.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { @@ -8070,7 +8232,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -8085,7 +8247,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -8099,9 +8261,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2023-04-04T09:50:52+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/log", @@ -8206,16 +8368,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.7", + "version": "v0.12.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c" + "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", - "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625", + "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625", "shasum": "" }, "require": { @@ -8279,9 +8441,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.7" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.8" }, - "time": "2024-12-10T01:58:33+00:00" + "time": "2025-03-16T03:05:19+00:00" }, { "name": "pusher/pusher-php-server", @@ -10044,6 +10206,72 @@ ], "time": "2024-09-25T14:20:29+00:00" }, + { + "name": "symfony/filesystem", + "version": "v7.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb", + "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v7.2.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-10-25T15:15:23+00:00" + }, { "name": "symfony/finder", "version": "v5.4.45", @@ -12381,21 +12609,22 @@ }, { "name": "vaites/php-apache-tika", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/vaites/php-apache-tika.git", - "reference": "9d7d13aad7df5789b765977f57f2c1d000c4cfa4" + "reference": "a115fa0790c17e97a94fdd3e7ff55e2fc2b810e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vaites/php-apache-tika/zipball/9d7d13aad7df5789b765977f57f2c1d000c4cfa4", - "reference": "9d7d13aad7df5789b765977f57f2c1d000c4cfa4", + "url": "https://api.github.com/repos/vaites/php-apache-tika/zipball/a115fa0790c17e97a94fdd3e7ff55e2fc2b810e5", + "reference": "a115fa0790c17e97a94fdd3e7ff55e2fc2b810e5", "shasum": "" }, "require": { "ext-curl": "*", - "php": ">=7.3.0" + "ext-json": "*", + "php": ">=7.4.0" }, "require-dev": { "filp/whoops": "^2.7", @@ -12442,7 +12671,10 @@ "2.8.0", "2.9.0", "2.9.1", - "2.9.2" + "2.9.2", + "2.9.3", + "3.0.0", + "3.1.0" ] }, "autoload": { @@ -12476,9 +12708,9 @@ ], "support": { "issues": "https://github.com/vaites/php-apache-tika/issues", - "source": "https://github.com/vaites/php-apache-tika/tree/v1.3.2" + "source": "https://github.com/vaites/php-apache-tika/tree/v1.4.0" }, - "time": "2024-05-28T22:00:22+00:00" + "time": "2025-03-16T10:35:49+00:00" }, { "name": "vlucas/phpdotenv", @@ -13269,16 +13501,16 @@ }, { "name": "filp/whoops", - "version": "2.17.0", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "075bc0c26631110584175de6523ab3f1652eb28e" + "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e", - "reference": "075bc0c26631110584175de6523ab3f1652eb28e", + "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e", + "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e", "shasum": "" }, "require": { @@ -13328,7 +13560,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.17.0" + "source": "https://github.com/filp/whoops/tree/2.18.0" }, "funding": [ { @@ -13336,7 +13568,7 @@ "type": "github" } ], - "time": "2025-01-25T12:00:00+00:00" + "time": "2025-03-15T12:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -15457,7 +15689,9 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": {}, + "stability-flags": { + "cubist/util": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { @@ -15465,6 +15699,6 @@ "ext-dom": "*", "ext-json": "*" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/config/database.php b/config/database.php index b42d9b3..4aea79c 100644 --- a/config/database.php +++ b/config/database.php @@ -63,6 +63,26 @@ return [ ]) : [], ], + 'mysql_old' => [ + 'driver' => 'mysql', + 'url' => env('OLD_DATABASE_URL'), + 'host' => env('OLD_DB_HOST', '127.0.0.1'), + 'port' => env('OLD_DB_PORT', '3306'), + 'database' => env('OLD_DB_DATABASE', 'forge'), + 'username' => env('OLD_DB_USERNAME', 'forge'), + 'password' => env('OLD_DB_PASSWORD', ''), + 'unix_socket' => env('OLD_DB_SOCKET', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + 'pgsql' => [ 'driver' => 'pgsql', 'url' => env('DATABASE_URL'), diff --git a/config/filesystems.php b/config/filesystems.php index fbcbeca..68b2f73 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -65,6 +65,17 @@ return [ 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT'), ], + 's3_old' => [ + 'driver' => 's3', + 'key' => env('OLD_AWS_ACCESS_KEY_ID'), + 'secret' => env('OLD_AWS_SECRET_ACCESS_KEY'), + 'region' => env('OLD_AWS_DEFAULT_REGION'), + 'bucket' => env('OLD_AWS_BUCKET'), + 'endpoint' => env('OLD_AWS_URL'), + 'use_path_style_endpoint' => env('OLD_AWS_USE_PATH_STYLE_ENDPOINT'), + ], + + ], /* -- 2.39.5