Merge branch 'develop' into soup-bowl/log-expiry

.distignore

@@ -13,6 +13,7 @@
 composer.json
 composer.lock
 DOCKER_ENV
+Dockerfile-php-build
 docker_tag
 docker-compose.yml
 output.log

.github/workflows/deploy.yml

@@ -4,14 +4,32 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: write
+
 jobs:
+  generate-changelog:
+    uses: soup-bowl/wordpress-workflows/.github/workflows/generate-changelog.yml@main
+    with:
+      repository: soup-bowl/wp-simple-smtp
+    secrets: inherit
+
   tag:
     name: New tag
     runs-on: ubuntu-latest
+    needs: generate-changelog
 
     steps:
     - uses: actions/checkout@v3
 
+    - name: Update Readme
+      run: |
+        # Generate changelog.
+        echo "${{ needs.generate-changelog.outputs.changelog }}" | base64 --decode >> readme.txt
+        # Update version number.
+        sed -i 's/{{VERSION_NUMBER}}/${{ github.event.release.tag_name }}/g' readme.txt
+        sed -i 's/development-build/${{ github.event.release.tag_name }}/g' wp-simple-smtp.php
+
     - name: Composer Dependencies
       uses: php-actions/composer@v6
       with:
@@ -29,11 +47,7 @@ jobs:
         SLUG: simple-smtp
 
     - name: Upload release asset
-      uses: actions/upload-release-asset@v1
+      run: |
+        gh release upload ${{ github.event.release.tag_name }} ${{ steps.deploy.outputs.zip-path }} --clobber
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ${{ steps.deploy.outputs.zip-path }}
-        asset_name: ${{ github.event.repository.name }}.zip
-        asset_content_type: application/zip

.gitignore

@@ -1,3 +1,4 @@
 vendor/
+.DS_Store
 .env
-.phpunit.result.cache
+.phpunit.result.cache

assets/smtp-config.js

@@ -14,7 +14,7 @@ const { __ } = wp.i18n;
 function wpss_loadin() {
 	if ( null !== document.getElementById( 'wpss-conf' ) ) {
 		wpss_load_quicksettings( wpss_qc_settings );
-		document.getElementById( 'wpss-quickset' ).onchange = function( stuff ) {
+		document.getElementById( 'wpss-quickset' ).onchange = function ( stuff ) {
 			wpss_input_selection( wpss_qc_settings, stuff.target.value );
 		};
 	}

composer.json

@@ -7,10 +7,10 @@
 		]
     },
 	"require-dev": {
-		"phpunit/phpunit": "^8",
+		"phpunit/phpunit": "^9",
 		"phpmailer/phpmailer": "^6",
 		"vlucas/phpdotenv": "^5.2",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
+		"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
 		"wp-coding-standards/wpcs": "*"
 	},
 	"config": {