Merge pull request #202 from pluginkollektiv/develop

Release 1.8.2

.gitattributes

@@ -17,9 +17,11 @@
 /.stylelintrc.json export-ignore
 /.travis.yml export-ignore
 /composer.json export-ignore
+/composer-php5.json export-ignore
 /package.json export-ignore
 /package-lock.json export-ignore
 /composer.lock export-ignore
+/composer-php5.lock export-ignore
 /phpcs.xml export-ignore
 /phpunit.xml export-ignore
 /README.md export-ignore

.github/workflows/wordpress-plugin-asset-update.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: php-actions/composer@v1
+    - uses: php-actions/composer@v5
     - name: WordPress.org plugin asset/readme update
       uses: 10up/action-wordpress-plugin-asset-update@stable
       env:

.github/workflows/wordpress-plugin-deploy.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: php-actions/composer@v1
+    - uses: php-actions/composer@v5
     - name: WordPress Plugin Deploy
       uses: 10up/action-wordpress-plugin-deploy@stable
       env:

.stylelintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": "stylelint-config-wordpress",
+  "extends": "@wordpress/stylelint-config",
   "rules": {
     "selector-id-pattern": null
   }

.travis.yml

@@ -6,23 +6,20 @@ services:
 matrix:
   include:
     - php: 5.6
-      env: WP_VERSION=4.7
-    - php: 7.0
-    - php: 7.1
-    - php: 7.2
-    - php: 7.3
+      env:
+        - WP_VERSION=4.7
+        - COMPOSER=composer-php5.json
     - php: 7.4
+      env: WP_VERSION=5.5
+    - php: 8.0
       env: WP_VERSION=5.6
-    - php: nightly
-  allow_failures:
-    - php: nightly
 
 before_install:
-  - nvm install 10
+  - nvm install 14
 
 before_script:
-  - composer install
-  - npm install
+  - composer install --ignore-platform-reqs
+  - npm ci
   - |
     if [[ ! -z "$WP_VERSION" ]] ; then
       bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.8.2
+* Minor adjustments for the dashboard widget (#197) (#199)
+* Tested up to WordPress 5.7
+
 ## 1.8.1
 * Fix AMP compatibility for Standard and Transitional mode (#181) (#182)
 * JavaScript is no longer embedded if request is served by AMP (#181) (#182)

composer-php5.json

@@ -0,0 +1,93 @@
+{
+  "name": "pluginkollektiv/statify",
+  "description": "Compact, easy-to-use and privacy-compliant stats plugin for WordPress.",
+  "license": "GPL-3.0-or-later",
+  "type": "wordpress-plugin",
+  "keywords": [
+    "wordpress",
+    "plugin",
+    "statistics"
+  ],
+  "config": {
+    "platform": {
+      "php": "5.6"
+    }
+  },
+  "require": {
+    "php": "^5.2|^7|^8",
+    "npm-asset/chartist": "^0.11.4",
+    "npm-asset/chartist-plugin-tooltips-updated": "^0.1.3"
+  },
+  "require-dev": {
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+    "matthiasmullie/minify": "^1.3",
+    "slowprog/composer-copy-file": "^0.3",
+    "squizlabs/php_codesniffer": "^3.5",
+    "phpcompatibility/phpcompatibility-wp": "^2.1",
+    "wp-coding-standards/wpcs": "^2.3",
+    "phpunit/phpunit": "^5"
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://asset-packagist.org"
+    }
+  ],
+  "scripts": {
+    "post-install-cmd": [
+      "@build"
+    ],
+    "post-update-cmd": [
+      "@build"
+    ],
+    "build": [
+      "@copy-assets",
+      "@minify"
+    ],
+    "copy-assets": [
+      "SlowProg\\CopyFile\\ScriptHandler::copy"
+    ],
+    "cs": [
+      "@lint-php"
+    ],
+    "csfix": [
+      "phpcbf --standard=phpcs.xml"
+    ],
+    "lint-all": [
+      "@lint-php",
+      "@lint-js",
+      "@lint-css"
+    ],
+    "lint-css": [
+      "npx stylelint css/dashboard.css"
+    ],
+    "lint-js": [
+      "npx eslint js/dashboard.js",
+      "npx eslint js/snippet.js"
+    ],
+    "lint-php": [
+      "phpcs --standard=phpcs.xml -s"
+    ],
+    "lint-tests": [
+      "phpcs --standard=tests/phpcs.xml tests"
+    ],
+    "minify": [
+      "minifycss css/dashboard.css > css/dashboard.min.css",
+      "minifyjs js/dashboard.js > js/dashboard.min.js",
+      "minifyjs js/snippet.js > js/snippet.min.js",
+      "minifycss vendor/npm-asset/chartist-plugin-tooltips-updated/dist/chartist-plugin-tooltip.css > css/chartist-plugin-tooltip.min.css"
+    ],
+    "test": [
+      "phpunit"
+    ]
+  },
+  "extra": {
+    "copy-file": {
+      "vendor/npm-asset/chartist/dist/chartist.min.css": "css/",
+      "vendor/npm-asset/chartist/dist/chartist.min.js": "js/",
+      "vendor/npm-asset/chartist/dist/chartist.min.js.map": "js/",
+      "vendor/npm-asset/chartist-plugin-tooltips-updated/dist/chartist-plugin-tooltip.min.js": "js/",
+      "vendor/npm-asset/chartist-plugin-tooltips-updated/dist/chartist-plugin-tooltip.min.js.map": "js/"
+    }
+  }
+}

composer.json

@@ -9,7 +9,7 @@
     "statistics"
   ],
   "require": {
-    "php": "^5.2|^7",
+    "php": "^5.2|^7|^8",
     "npm-asset/chartist": "^0.11.4",
     "npm-asset/chartist-plugin-tooltips-updated": "^0.1.3"
   },
@@ -18,9 +18,9 @@
     "matthiasmullie/minify": "^1.3",
     "slowprog/composer-copy-file": "^0.3",
     "squizlabs/php_codesniffer": "^3.5",
-    "phpcompatibility/php-compatibility": "^9.3",
+    "phpcompatibility/phpcompatibility-wp": "^2.1",
     "wp-coding-standards/wpcs": "^2.3",
-    "phpunit/phpunit": "^5"
+    "phpunit/phpunit": "^5|^7"
   },
   "repositories": [
     {