Skip to content

Commit

Permalink
Merge branch 'refactor-authentication-api' into add-visible-users-api
Browse files Browse the repository at this point in the history
  • Loading branch information
JVT038 committed Dec 1, 2024
2 parents eab07c1 + 2bd71c5 commit 60152f5
Show file tree
Hide file tree
Showing 165 changed files with 3,560 additions and 1,562 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ logs:
build:
docker compose build --no-cache
make up
make db_mysql_create_database
make composer_install
make db_mysql_create_database
make app_database_migrate
make exec_app_cmd CMD="php bin/console.php storage:link"

Expand Down Expand Up @@ -64,12 +64,12 @@ db_mysql_create_database:
make app_database_migrate

db_mysql_import:
docker cp storage/dump.sql movary_mysql_1:/tmp/dump.sql
docker compose exec mysql bash -c 'mysql -uroot -p${DATABASE_MYSQL_ROOT_PASSWORD} < /tmp/dump.sql'
docker cp storage/dump.sql movary-mysql-1:/tmp/dump.sql
docker compose exec mysql bash -c 'mysql -uroot -p${DATABASE_MYSQL_ROOT_PASSWORD} movary < /tmp/dump.sql'

db_mysql_export:
docker compose exec mysql bash -c 'mysqldump --databases --add-drop-database -uroot -p$(DATABASE_MYSQL_ROOT_PASSWORD) $(DATABASE_MYSQL_NAME) > /tmp/dump.sql'
docker cp movary_mysql_1:/tmp/dump.sql storage/dump.sql
docker cp movary-mysql-1:/tmp/dump.sql storage/dump.sql
chown $(USER_ID):$(USER_ID) storage/dump.sql

db_migration_create:
Expand Down
27 changes: 13 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,29 @@
"ext-mbstring": "*",
"ext-pdo": "*",
"doctrine/dbal": "^3.8.2",
"guzzlehttp/guzzle": "^7.8.1",
"guzzlehttp/guzzle": "^7.9.2",
"league/csv": "^9.15",
"maennchen/zipstream-php": "^3.1",
"monolog/monolog": "^3.5",
"monolog/monolog": "^3.7",
"nikic/fast-route": "^1.3",
"php-di/php-di": "^7.0.6",
"php-di/php-di": "^7.0.7",
"phpmailer/phpmailer": "^6.9.1",
"psr/http-client": "^1.0.3",
"ramsey/uuid": "^4.7.5",
"robmorgan/phinx": "^0.15.5",
"spomky-labs/otphp": "^11.2",
"symfony/console": "^6.4.4",
"twig/twig": "^3.8",
"ramsey/uuid": "^4.7.6",
"robmorgan/phinx": "^0.16.1",
"spomky-labs/otphp": "^11.3",
"symfony/console": "^7.1",
"twig/twig": "^3.14",
"vlucas/phpdotenv": "^5.6"
},
"require-dev": {
"phpunit/phpunit": "^9.6.17",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.9",
"phpstan/phpstan": "^1.10.59",
"phpstan/phpstan-phpunit": "^1.3.16",
"vimeo/psalm": "^4.30",
"psalm/plugin-phpunit": "^0.18.4",
"webmozarts/strict-phpunit": "^7.11.4"
"phpstan/phpstan": "^1.12.3",
"phpstan/phpstan-phpunit": "^1.4",
"vimeo/psalm": "^5.26",
"psalm/plugin-phpunit": "^0.19"
},
"scripts": {
"test": [
Expand Down
Loading

0 comments on commit 60152f5

Please sign in to comment.