diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5a6ec3f..12e5e55b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,23 +2,14 @@ ## Code style -StyleCI will flag code style violations in your pull requests. +php-cs-fixer will fix code style violations in your pull requests. ## Running tests -Run `docker-compose up -d` to start the containers. Then run `./test` to run the tests. +Run `composer docker-up` to start the containers. Then run `composer test` to run the tests. -When you're done testing, run `docker-compose down` to shut down the containers. +When you're done testing, run `composer docker-down` to shut down the containers. ### Docker on M1 -You can add: -```yaml -services: - mysql: - platform: linux/amd64 - mysql2: - platform: linux/amd64 -``` - -to `docker-compose.override.yml` to make `docker-compose up-d` work on M1. +Run `composer docker-m1` to symlink `docker-compose-m1.override.yml` to `docker-compose.override.yml`. This will reconfigure a few services in the docker compose config to be compatible with M1. diff --git a/composer.json b/composer.json index 68f621bb..8aca9ded 100644 --- a/composer.json +++ b/composer.json @@ -11,21 +11,22 @@ "authors": [ { "name": "Samuel Ć tancl", - "email": "samuel.stancl@gmail.com" + "email": "samuel@archte.ch" } ], "require": { + "php": "^8.1", "ext-json": "*", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^9.0", "facade/ignition-contracts": "^1.0", - "ramsey/uuid": "^3.7|^4.0", - "stancl/jobpipeline": "dev-master", - "stancl/virtualcolumn": "dev-master" + "ramsey/uuid": "^4.0", + "stancl/jobpipeline": "^1.6", + "stancl/virtualcolumn": "^1.2" }, "require-dev": { - "laravel/framework": "^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0", - "league/flysystem-aws-s3-v3": "^1.0|^3.0", + "laravel/framework": "^9.0", + "orchestra/testbench": "^7.0", + "league/flysystem-aws-s3-v3": "^3.0", "doctrine/dbal": "^2.10", "spatie/valuestore": "^1.2.5", "pestphp/pest": "^1.21" @@ -55,10 +56,11 @@ } }, "scripts": { - "docker-up": "PHP_VERSION=8.0.11 docker-compose up -d", - "docker-down": "PHP_VERSION=8.0.11 docker-compose down", - "docker-rebuild": "PHP_VERSION=8.0.11 docker-compose up -d --no-deps --build", - "test": "PHP_VERSION=8.0.11 ./test" + "docker-up": "PHP_VERSION=8.1 docker-compose up -d", + "docker-down": "PHP_VERSION=8.1 docker-compose down", + "docker-rebuild": "PHP_VERSION=8.1 docker-compose up -d --no-deps --build", + "docker-m1": "ln -s docker-compose-m1.override.yml docker-compose.override.yml", + "test": "PHP_VERSION=8.1 ./test" }, "minimum-stability": "dev", "prefer-stable": true, diff --git a/docker-compose-m1.override.yml b/docker-compose-m1.override.yml new file mode 100644 index 00000000..32e163e6 --- /dev/null +++ b/docker-compose-m1.override.yml @@ -0,0 +1,7 @@ +services: + mysql: + platform: linux/amd64 + mysql2: + platform: linux/amd64 + mssql: + image: mcr.microsoft.com/azure-sql-edge