Merge pull request #21 from MacPaw/feat/updateDeps

Feat Update deps
MacPaw · Dec 6, 2021 · e64d3cd · e64d3cd
2 parents 5272afe + af549b5
commit e64d3cd
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,13 +14,20 @@ jobs:
                 php:
                     - '7.4'
                     - '8.0'
+                    - '8.1'
                 coverage: ['none']
                 symfony-versions:
                     - '4.4.*'
                     - '5.1.*'
                     - '5.2.*'
                     - '5.3.*'
                 include:
+                    - php: '8.0'
+                      symfony-versions: '^6.0'
+                      coverage: 'none'
+                    - php: '8.1'
+                      symfony-versions: '^6.0'
+                      coverage: 'none'
                     - description: 'Log Code Coverage'
                       php: '8.0'
                       coverage: 'xdebug'
@@ -56,8 +63,11 @@ jobs:
                   key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.symfony-versions }}-composer-${{ hashFiles('composer.json') }}
                   restore-keys: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.symfony-versions }}-composer
 
-            - name: Install dependencies
-              run: composer require "symfony/symfony:${{ matrix.symfony-versions }}" --no-update
+            - name: Update Symfony version
+              if: matrix.symfony-versions != ''
+              run: |
+                  composer require symfony/messenger:${{ matrix.symfony-versions }} --no-update --no-scripts
+                  composer require symfony/serializer:${{ matrix.symfony-versions }} --no-update --no-scripts
 
             - name: Install dependencies
               run: composer install

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -16,11 +16,11 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v1
               with:
-                  node-version: 12
+                  node-version: 14.17
             - name: Install dependencies
               run: npm install && npm install --save-dev semantic-release @semantic-release/changelog @semantic-release/git -D
             - name: Release
               env:
-                  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  GH_TOKEN: ${{ secrets.PACKAGIST_PUBLIC_RELEASE_GH }}
+                  GITHUB_TOKEN: ${{ secrets.PACKAGIST_PUBLIC_RELEASE_GH }}
               run: npx semantic-release
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -37,3 +37,19 @@ jobs:
 
             - name: Run script
               run: vendor/bin/phpstan analyse
+
+    composer-validate:
+        name: Composer validate
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+
+            - name: Install dependencies
+              run: composer install --no-progress --no-interaction --prefer-dist
+
+            - name: Run script
+              run: composer composer-validate
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@
 /composer.lock
 /build/
 /.phpunit.result.cache
-/package-lock.json
+
 /node_modules/
+/package-lock.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -40,6 +40,12 @@ You can run the unit-tests by calling `composer run phpunit`.
 
 New features without tests can't be merged.
 
+## Conventional Commits specification
+
+We are using husky pre-commit hook to check commit naming compliance with Conventional Commits convention.
+You have to run `npm install` after cloning project and then all commit naming errors (if any) will be shown in console.
+It helps us to create explicit commit history and automate release flow. 
+
 ## Issues and Bugs
 
 To create a new issue, you can use the GitHub issue tracking system.

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.x.x   | :white_check_mark: |
+
+## Reporting a Bug
+
+Report security bugs by emailing the lead maintainer at [email protected] or create [Issues](https://github.com/MacPaw/symfony-health-check-bundle/issues)
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities to
+**[[email protected]](mailto:[email protected])**. You will receive a response from
+us within 48 hours. If the issue is confirmed, we will release a patch as soon
+as possible depending on complexity but historically within a few days.
diff --git a/composer.json b/composer.json
@@ -28,8 +28,8 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "behat/behat": "^3.0",
-        "symfony/messenger": "^4.4 || ^5.0",
-        "symfony/serializer": "^4.4 || ^5.0"
+        "symfony/messenger": "^4.4 || ^5.0 || ^6.0",
+        "symfony/serializer": "^4.4 || ^5.0 || ^6.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12",
@@ -48,6 +48,7 @@
         }
     },
     "scripts": {
+        "composer-validate": "composer validate",
         "phpstan": "./vendor/bin/phpstan analyse -l max",
         "code-style": "./vendor/bin/phpcs",
         "code-style-fix": "./vendor/bin/phpcbf",