From b2e4cf476863f77839a37ca891d87538cad75440 Mon Sep 17 00:00:00 2001 From: Mathieu Ducrot Date: Thu, 4 Jan 2024 10:29:35 +0100 Subject: [PATCH 1/2] =?UTF-8?q?D=C3=A9coupage=20Makefile=20pour=20=C3=AAtr?= =?UTF-8?q?e=20iso=20avec=20le=20d=C3=A9coupage=20du=20standard-bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3e16693..92b1ced 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Bundle grouping all vendor, generic utils and services that we use on each proje - Query functions to extends Doctrine DQL capacity - SentryCallback with special CleverCloud dedicated behavior - Utils for Array, Date, Math, Regex and String +- Validator constraints for EmailChain, Modulo, Password and more ## Installation From fcb24d5b4a361a982ea88154cfd40cba58bf157c Mon Sep 17 00:00:00 2001 From: Mathieu Ducrot Date: Thu, 4 Jan 2024 11:14:21 +0100 Subject: [PATCH 2/2] Use smartbooster/standard-bundle v1 and release tag v1 --- .github/workflows/ci.yml | 10 +++------- .gitignore | 1 + composer.json | 4 ++-- make/install.mk | 8 ++++++++ phpunit.xml.dist | 6 ++---- 5 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 make/install.mk diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52ca15b..0cad5f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,13 +13,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Validate composer.json - run: composer validate - - name: Composer install - run: composer install + - name: "Install: vendor & clear cache" + run: make install - name: Run coverage run: make coverage - - name: Clear cache - run: php bin/console c:c - name: Run qualimetry - run: make qa + run: make qualimetry diff --git a/.gitignore b/.gitignore index 956f46a..298f1e8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /symfony.lock /config/packages/test/dama_doctrine_test_bundle.yaml /config/packages/test/liip_test_fixtures.yaml +/make/dev.mk /make/qualimetry.mk /make/test.mk diff --git a/composer.json b/composer.json index 384a68b..1a6d85f 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "theofidry/alice-data-fixtures": "^1.5" }, "require-dev": { - "smartbooster/standard-bundle": "^0.4", + "smartbooster/standard-bundle": "^1.0", "symfony/flex": "^2", "symfony/phpunit-bridge": "^5.4|^6.2", "symfony/runtime": "^5.4|^6.2", @@ -52,7 +52,7 @@ }, "extra": { "branch-alias": { - "dev-master": "0.1.x-dev" + "dev-master": "1.0.x-dev" }, "symfony": { "allow-contrib": false, diff --git a/make/install.mk b/make/install.mk new file mode 100644 index 0000000..bc4b8b3 --- /dev/null +++ b/make/install.mk @@ -0,0 +1,8 @@ +## +## Installation and update +## ------- +.PHONY: install +install: ## Install the project + composer install + make cc + echo "Install complete !" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f0f9550..53b1747 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -11,15 +11,14 @@ - - - + + @@ -39,7 +38,6 @@ src/DataFixtures src/Kernel.php - ./src/SmartCoreBundle.php