Merge tag '3.0.0'

.composer-require-checker.json

@@ -0,0 +1,10 @@
+{
+  "symbol-whitelist": [
+    "null", "true", "false",
+    "static", "self", "parent",
+    "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
+    "Contao\\ManagerPlugin\\Bundle\\BundlePluginInterface",
+    "Contao\\ManagerPlugin\\Bundle\\Parser\\ParserInterface",
+    "Contao\\ManagerPlugin\\Bundle\\Config\\BundleConfig"
+  ]
+}

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[{*.(xlf,xml,html5,twig,json,js,vue}]
+indent_style = space
+indent_size = 2
+
+[*.php]
+indent_style = space
+indent_size = 4
+max_line_length = 120

.gitattributes

@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text-auto
+
+# Configuration
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.phpcq.lock export-ignore
+.phpcq.yaml.dist export-ignore
+companion.json export-ignore
+composer.lock -diff
+phpcs.xml.dist export-ignore
+psalm.xml export-ignore
+rector.php export-ignore
+
+# PHP files
+*.php text eol=lf diff=php

.github/workflows/diagnostics.yml

@@ -0,0 +1,76 @@
+name: Code Quality Diagnostics
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    name: PHP ${{ matrix.php }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: 8.2
+            phpcq_install: 'update'
+          - php: 8.3
+            phpcq_install: 'update'
+
+    steps:
+      - name: Pull source
+        uses: actions/checkout@v4
+
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Cache composer cache directory
+        uses: actions/cache@v1
+        env:
+          cache-name: composer-cache-dir-${{ matrix.php }}
+        with:
+          path: ~/.cache/composer
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+
+      - name: Cache vendor directory
+        uses: actions/cache@v3
+        env:
+          cache-name: vendor-${{ matrix.php }}
+        with:
+          path: vendor
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+
+      - name: Cache phpcq directory
+        uses: actions/cache@v3
+        env:
+          cache-name: phpcq-${{ matrix.php }}
+        with:
+          path: .phpcq
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/.phpcq.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+
+      - name: Install composer dependencies
+        run: composer install
+
+      - name: Install phpcq toolchain
+        run: ./vendor/bin/phpcq ${{ matrix.phpcq_install }} -v
+
+      - name: Run tests
+        run: ./vendor/bin/phpcq run -v -o github-action -o default --threshold=info
+
+      - name: Upload build directory to artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ success() }} || ${{ failure() }}
+        with:
+          name: phpcq-builds-php-${{ matrix.php }}
+          path: .phpcq/build/

.gitignore

@@ -1,9 +1,11 @@
-/*
-!/.gitignore
-!/.gitattributes
-!/contao-module/
-!/dev/
-!/src/
-!/CHANGELOG.md
-!/README.md
-!/composer.json
+# Companion
+/.env.companion
+
+# Composer
+/composer.lock
+/vendor
+
+# PHPCQ
+/.phpcq
+/.phpcq.yaml
+/.phpcs-cache

.phpcq.lock

@@ -0,0 +1 @@
+{"plugins":{"composer-normalize":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/composer-normalize/composer-normalize-1.1.1.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-json":"*"},"tool":{"composer-normalize":"^2.1"}},"checksum":{"type":"sha-512","value":"d9abda440b85d501c58abf9c81bf76f417594b397129215ffa8b777e9bb5e5eda37d7661d661db3c8d11c24f20345bc6fbe56f013b3b9435d459d2b94f086e0f"},"tools":{"composer-normalize":{"version":"2.43.0","url":"https://github.com/ergebnis/composer-normalize/releases/download/2.43.0/composer-normalize.phar","requirements":{"php":{"php":"~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0","ext-json":"*"}},"checksum":null,"signature":"https://github.com/ergebnis/composer-normalize/releases/download/2.43.0/composer-normalize.phar.asc"}},"composerLock":null},"composer-require-checker":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/composer-require-checker/composer-require-checker-1.1.1.0.php","signature":null,"requirements":{"php":{"php":"^7.4 || ^8.0"},"tool":{"composer-require-checker":"^3.8 || ^4.0"}},"checksum":{"type":"sha-512","value":"d5415bddfe024c5749d894034583882aee4e5c3e1087815d9fdd81cb5e71630f631a0e35de0ff84b97fbbf738c16ece5f83bd8c00695913eb846aa6f04577dc2"},"tools":{"composer-require-checker":{"version":"4.12.0","url":"https://github.com/maglnet/ComposerRequireChecker/releases/download/4.12.0/composer-require-checker.phar","requirements":{"php":{"php":"~8.2.0 || ~8.3.0 || ~8.4.0","ext-phar":"*"}},"checksum":null,"signature":"https://github.com/maglnet/ComposerRequireChecker/releases/download/4.12.0/composer-require-checker.phar.asc"}},"composerLock":null},"phpcpd":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/phpcpd/phpcpd-1.1.1.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcpd":"^6.0"}},"checksum":{"type":"sha-512","value":"1189ce0bf3fade4cb4241f1d96f915ef8fc7651f4450dc79fdf464ee3d6be3009316f0d423ce2d4af9d76ad50807b7fdf4d77bfa6d9ee2c91d6eda32ea214433"},"tools":{"phpcpd":{"version":"6.0.3","url":"https://phar.phpunit.de/phpcpd-6.0.3.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*"}},"checksum":{"type":"sha-256","value":"2cbaea7cfda1bb4299d863eb075e977c3f49055dd16d88529fae5150d48a84cb"},"signature":"https://phar.phpunit.de/phpcpd-6.0.3.phar.asc"}},"composerLock":null},"phploc":{"api-version":"1.0.0","version":"1.0.0.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/phploc/phploc-1.0.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*","ext-json":"*"},"tool":{"phploc":"^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"}},"checksum":{"type":"sha-512","value":"f67b02d494796adf553cb3dd13ec06c1cb8e53c799954061749424251379541637538199afb3afa3c7a01cabd1cb6f1c53eb621f015dff9644c6c7cbf10c56d1"},"tools":{"phploc":{"version":"7.0.2","url":"https://phar.phpunit.de/phploc-7.0.2.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*","ext-json":"*"}},"checksum":{"type":"sha-256","value":"3d59778ec86faf25fd00e3a329b2f9ad4a3c751ca91601ea7dab70f887b0bf46"},"signature":"https://phar.phpunit.de/phploc-7.0.2.phar.asc"}},"composerLock":null},"phpmd":{"api-version":"1.0.0","version":"1.0.2.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/phpmd/phpmd-1.0.2.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpmd":"^2.6.1"}},"checksum":{"type":"sha-512","value":"f22280a6dec8dbdd2ec1d83b294f23237fe32c34f4a298e52038e0a7a0074d541635b2b488b1a6098a42d8418a6cd8eb804406ea82b91e362be2b5d11a0915b0"},"tools":{"phpmd":{"version":"2.15.0","url":"https://github.com/phpmd/phpmd/releases/download/2.15.0/phpmd.phar","requirements":{"php":{"php":">=5.3.9","ext-xml":"*"}},"checksum":null,"signature":"https://github.com/phpmd/phpmd/releases/download/2.15.0/phpmd.phar.asc"}},"composerLock":null},"psalm":{"api-version":"1.0.0","version":"1.2.0.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/psalm/psalm-1.2.0.0.php","signature":null,"requirements":{"php":{"php":"^7.4 || ^8.0","ext-dom":"*"},"tool":{"psalm":"^3.0 || ^4.0 || ^5.0"}},"checksum":{"type":"sha-512","value":"4a550c9226d7bca582d7c10bd87cce01190c96398936b1613421640c83df62ed1c6e0d44c1b39635414ea8cf4a892a6458d27590793238add24e7cb5547e6ffd"},"tools":{"psalm":{"version":"5.26.1","url":"https://github.com/vimeo/psalm/releases/download/5.26.1/psalm.phar","requirements":{"php":{"php":"^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0","ext-SimpleXML":"*","ext-ctype":"*","ext-dom":"*","ext-json":"*","ext-libxml":"*","ext-mbstring":"*","ext-tokenizer":"*"}},"checksum":null,"signature":"https://github.com/vimeo/psalm/releases/download/5.26.1/psalm.phar.asc"}},"composerLock":null},"phpcs":{"api-version":"1.0.0","version":"1.2.0.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/phpcs/phpcs-1.2.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcs":"^3.0 || ^2.0","phpcbf":"^3.0 || ^2.0"}},"checksum":{"type":"sha-512","value":"b6ed00306e76068a6af5e3b1dec837724f9e1900ef1049ce88e7ce195b0583524ca33a73613fba13244307a7ca853b6ddaa14ded69f651c3f184ac130bd1aaad"},"tools":{"phpcs":{"version":"3.10.3","url":"https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/download/3.10.3/phpcs.phar","requirements":{"php":{"php":">=5.4.0","ext-simplexml":"*","ext-tokenizer":"*","ext-xmlwriter":"*"}},"checksum":null,"signature":"https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/download/3.10.3/phpcs.phar.asc"},"phpcbf":{"version":"3.10.3","url":"https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/download/3.10.3/phpcbf.phar","requirements":{"php":{"php":">=5.4.0","ext-simplexml":"*","ext-tokenizer":"*","ext-xmlwriter":"*"}},"checksum":null,"signature":"https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/download/3.10.3/phpcbf.phar.asc"}},"composerLock":null}},"tools":[]}

.phpcq.yaml.dist

@@ -0,0 +1,84 @@
+phpcq:
+  repositories:
+    - 'https://phpcq.github.io/repository/repository.json'
+  directories:
+    - src
+  artifact: .phpcq/build
+  plugins:
+    composer-normalize:
+      version: ^1.0
+      signed: false
+    composer-require-checker:
+      version: ^1.0
+      signed: false
+    phpcpd:
+      version: ^1.1
+      signed: false
+    phploc:
+      version: ^1.0
+      signed: false
+    phpmd:
+      version: ^1.0
+      signed: false
+    psalm:
+      version: ^1.0
+      signed: false
+    phpcs:
+      version: ^1.0
+      signed: false
+  trusted-keys:
+    - C00543248C87FB13
+    - 033E5F8D801A2F8D
+    - D2CCAC42F6295E7D
+    - 4AA394086372C20A
+    - 9093F8B32E4815AA
+    - 8A03EA3B385DBAA1
+    - 12CE0F1D262429A5
+    - 31C7E470E2138192
+    - 5E6DDE998AB73B8E
+    - A978220305CD5C32
+tasks:
+  fix:
+    - composer-normalize-fix
+    - phpcbf
+  verify:
+    - composer-normalize
+    - composer-require-checker
+  analyze:
+    - phpcpd
+    - phploc
+    - phpmd
+    - psalm
+    - phpcs
+  default:
+    - verify
+    - analyze
+  composer-normalize-fix:
+    config:
+      dry_run: false
+      ignore_output:
+        - '#> pre-command-run: Contao\\ManagerPlugin\\Composer\\ArtifactsPlugin->preCommandRun#'
+        - '#Root package is not of type "project" or "contao-theme", we will not be installing Contao extensions.#'
+    plugin: composer-normalize
+  composer-normalize:
+    config:
+      ignore_output:
+        - '#> pre-command-run: Contao\\ManagerPlugin\\Composer\\ArtifactsPlugin->preCommandRun#'
+        - '#Root package is not of type "project" or "contao-theme", we will not be installing Contao extensions.#'
+  composer-require-checker:
+    config:
+      config_file: .composer-require-checker.json
+  phpcs:
+    config:
+      standard: ~
+      standard_paths:
+        - ./vendor/slevomat/coding-standard
+        - ./vendor/doctrine/coding-standard/lib
+  phpcbf:
+    plugin: phpcs
+    config:
+      standard: ~
+      standard_paths:
+        - ./vendor/slevomat/coding-standard
+        - ./vendor/doctrine/coding-standard/lib
+      fix: true

README.md

@@ -267,8 +267,8 @@ If you prefer to install it manually, download the latest release here: https://
 
 ## Compatibility
 
-- min. Contao version: >= 3.5.0
-- max. Contao version: 4.*
+- min. Contao version: ^4.9
+- PHP min. 7.4 || 8.0
 
 ## Dependency
 

companion.json

@@ -0,0 +1,35 @@
+{
+  "receipts": [
+    "projects/contao-bundle/4.13-5.3"
+  ],
+  "config": {
+    "phpConstraint": "^8.2"
+  },
+  "tools": {
+    "composer": {
+      "namespace": "Hofff\\Contao\\IconFont"
+    },
+    "phpcq": {
+      "plugins": {
+        "phpunit": false,
+        "rector": false
+      },
+      "presets": {
+        "composer-require-checker": {
+          "tasks": {
+            "composer-require-checker": {
+              "config":{
+                "config_file": ".composer-require-checker.json"
+              }
+            }
+          }
+        }
+      }
+    },
+    "psalm": {
+      "configuration": {
+        "errorLevel": "3"
+      }
+    }
+  }
+}

composer.json

@@ -1,44 +1,64 @@
 {
-	"name": "hofff/contao-iconfont",
-	"description": "Insert tag for Contao Open Source CMS to insert FontAwesome icons and individual icons",
-	"keywords": [
-		"contao",
-		"icon",
-		"iconfont",
-		"FontAwesome"
-	],
-	"type": "contao-module",
-	"license": "LGPL-3.0-or-later",
-	"homepage": "https://www.hofff.com",
-	"authors": [
-		{
-			"name": "Nicky Hoff",
-			"homepage": "https://www.hofff.com",
-			"email": "[email protected]",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"php": "^5.6 || ^7.0",
-		"contao/core-bundle" : "^3.5 || ^4.4",
-		"contao-community-alliance/composer-plugin" : "^2.4 || ^3.0"
-	},
-	"autoload": {
-		"psr-4": {
-			"Hofff\\Contao\\IconFont\\": "src/"
-		}
-	},
-	"extra": {
-		"contao": {
-			"sources": {
-				"contao-module": "system/modules/hofff_iconfont"
-			}
-		},
-		"branch-alias": {
-			"dev-develop": "2.2.x-dev",
-			"dev-master": "2.1.x-dev"
-		}
-	},
-	"prefer-stable": true,
-	"minimum-stability": "dev"
+  "name": "hofff/contao-iconfont",
+  "description": "Insert tag for Contao Open Source CMS to insert FontAwesome icons and individual icons",
+  "license": "LGPL-3.0-or-later",
+  "type": "contao-bundle",
+  "keywords": [
+    "contao",
+    "icon",
+    "iconfont",
+    "FontAwesome"
+  ],
+  "authors": [
+    {
+      "name": "Nicky Hoff",
+      "email": "[email protected]",
+      "homepage": "https://www.hofff.com",
+      "role": "Developer"
+    },
+    {
+      "name": "David Molineus",
+      "email": "[email protected]",
+      "homepage": "https://www.hofff.com",
+      "role": "Developer"
+    }
+  ],
+  "homepage": "https://www.hofff.com",
+  "require": {
+    "php": "^8.2",
+    "contao/core-bundle": "^4.13 || ^5.3",
+    "symfony/config": "^5.4 || ^6.4",
+    "symfony/dependency-injection": "^5.4 || ^6.4",
+    "symfony/http-kernel": "^5.4 || ^6.4"
+  },
+  "require-dev": {
+    "contao/manager-plugin": "^2.1",
+    "doctrine/coding-standard": "^12.0",
+    "phpcq/runner-bootstrap": "@dev"
+  },
+  "conflict": {
+    "contao/manager-plugin": "<2.1 || >= 3.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "Hofff\\Contao\\IconFont\\": "src/"
+    }
+  },
+  "config": {
+    "allow-plugins": {
+      "contao-community-alliance/composer-plugin": true,
+      "contao-components/installer": true,
+      "contao/manager-plugin": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "php-http/discovery": true
+    },
+    "sort-packages": true
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-develop": "3.0.x-dev",
+      "dev-master": "2.1.x-dev"
+    },
+    "contao-manager-plugin": "Hofff\\Contao\\IconFont\\ContaoManager\\Plugin"
+  }
 }