chore: flarum-cli audit infra --fix

extensions/statistics/.editorconfig

@@ -15,5 +15,5 @@ indent_size = 2
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
-[*.php]
+[*.{php,xml,json}]
 indent_size = 4

extensions/statistics/.gitattributes

@@ -1,5 +1,18 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+.gitmodules export-ignore
+.github export-ignore
+.travis export-ignore
 .travis.yml export-ignore
+.editorconfig export-ignore
+.styleci.yml export-ignore
+
+phpunit.xml export-ignore
+tests export-ignore
 
 js/dist/* -diff
+js/dist/* linguist-generated
+js/dist-typings/* linguist-generated
+js/yarn.lock -diff
+
+* text=auto eol=lf

extensions/statistics/.github/workflows/backend.yml

@@ -0,0 +1,15 @@
+name: Statistics PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
+jobs:
+  run:
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
+    with:
+      enable_backend_testing: true
+
+      backend_directory: .

extensions/statistics/.github/workflows/build.yml

@@ -1,17 +0,0 @@
-name: Build JavaScript assets
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@master
-      - uses: flarum/action-build@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

extensions/statistics/.github/workflows/frontend.yml

@@ -0,0 +1,21 @@
+name: Statistics JS
+
+on: [workflow_dispatch, push, pull_request]
+
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
+jobs:
+  run:
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./js
+      main_git_branch: master
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

extensions/statistics/.gitignore

@@ -1,6 +1,12 @@
 /vendor
+composer.lock
 composer.phar
+
 .DS_Store
 Thumbs.db
-node_modules
+tests/.phpunit.result.cache
-js/dist/*
+/tests/integration/tmp
+.vagrant
+.idea/*
+.vscode
+js/coverage-ts

extensions/statistics/composer.json

@@ -2,7 +2,9 @@
     "name": "flarum/statistics",
     "description": "Add a basic statistics widget on the Dashboard.",
     "type": "flarum-extension",
-    "keywords": ["administration"],
+    "keywords": [
+        "administration"
+    ],
     "license": "MIT",
     "support": {
         "issues": "https://github.com/flarum/core/issues",
@@ -36,6 +38,41 @@
                 "backgroundColor": "#6932d1",
                 "color": "#fff"
             }
+        },
+        "flarum-cli": {
+            "modules": {
+                "admin": true,
+                "forum": false,
+                "js": true,
+                "jsCommon": false,
+                "css": true,
+                "gitConf": true,
+                "githubActions": true,
+                "prettier": true,
+                "typescript": false,
+                "bundlewatch": false,
+                "backendTesting": true,
+                "editorConfig": true,
+                "styleci": true
+            }
         }
+    },
+    "scripts": {
+        "test": [
+            "@test:unit",
+            "@test:integration"
+        ],
+        "test:unit": "phpunit -c tests/phpunit.unit.xml",
+        "test:integration": "phpunit -c tests/phpunit.integration.xml",
+        "test:setup": "@php tests/integration/setup.php"
+    },
+    "scripts-descriptions": {
+        "test": "Runs all tests.",
+        "test:unit": "Runs all unit tests.",
+        "test:integration": "Runs all integration tests.",
+        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
+    },
+    "require-dev": {
+        "flarum/testing": "^1.0.0"
     }
 }

extensions/statistics/js/.gitignore

@@ -0,0 +1,9 @@
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+node_modules

extensions/statistics/js/admin.js

@@ -1,10 +1 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 export * from './src/admin';

extensions/statistics/js/package.json

@@ -1,22 +1,22 @@
 {
-  "private": true,
+    "private": true,
-  "name": "@flarum/statistics",
+    "name": "@flarum/statistics",
-  "prettier": "@flarum/prettier-config",
+    "prettier": "@flarum/prettier-config",
-  "dependencies": {
+    "dependencies": {
-    "@flarum/prettier-config": "^1.0.0",
+        "frappe-charts": "^1.6.2"
-    "frappe-charts": "^1.6.2",
+    },
-    "flarum-tsconfig": "^1.0.2",
+    "devDependencies": {
-    "flarum-webpack-config": "^1.0.0",
+        "prettier": "^2.5.1",
-    "webpack": "^4.46.0",
+        "flarum-webpack-config": "^2.0.0",
-    "webpack-cli": "^4.9.1"
+        "webpack": "^5.65.0",
-  },
+        "webpack-cli": "^4.9.1",
-  "devDependencies": {
+        "@flarum/prettier-config": "^1.0.0"
-    "prettier": "^2.5.1"
+    },
-  },
+    "scripts": {
-  "scripts": {
+        "dev": "webpack --mode development --watch",
-    "dev": "webpack --mode development --watch",
+        "build": "webpack --mode production",
-    "build": "webpack --mode production",
+        "format": "prettier --write src",
-    "format": "prettier --write src",
+        "format-check": "prettier --check src",
-    "format-check": "prettier --check src"
+        "analyze": "cross-env ANALYZER=true yarn build"
-  }
+    }
 }

extensions/statistics/js/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  // Use Flarum's tsconfig as a starting point
-  "extends": "flarum-tsconfig",
-  // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
-  // and also tells your Typescript server to read core's global typings for
-  // access to `dayjs` and `$` in the global namespace.
-  "include": ["src/**/*", "../vendor/flarum/core/js/dist-typings/@types/**/*"],
-  "compilerOptions": {
-    // This will output typings to `dist-typings`
-    "declarationDir": "./dist-typings",
-    "baseUrl": ".",
-    "paths": {
-      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
-    }
-  }
-}

extensions/statistics/js/webpack.config.js

@@ -1,3 +1 @@
-const config = require('flarum-webpack-config');
+module.exports = require('flarum-webpack-config')();
-
-module.exports = config();

extensions/statistics/tests/integration/setup.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+use Flarum\Testing\integration\Setup\SetupScript;
+
+require __DIR__.'/../../vendor/autoload.php';
+
+$setup = new SetupScript();
+
+$setup->run();

extensions/statistics/tests/phpunit.integration.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="true"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Integration Tests">
+            <directory suffix="Test.php">./integration</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

extensions/statistics/tests/phpunit.unit.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Unit Tests">
+            <directory suffix="Test.php">./unit</directory>
+        </testsuite>
+    </testsuites>
+    <listeners>
+        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
+    </listeners>
+</phpunit>