Skip to content

Commit 95ec205

Browse files
e-spine-spin
committed
Fixes for PHPCQ2
1 parent b7eb3c9 commit 95ec205

12 files changed

+269
-75
lines changed

Diff for: ‎.composer-require-checker.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"symbol-whitelist": [
3+
"array", "bool", "false", "int", "null", "self", "static", "parent", "string", "true", "void", "mixed",
4+
"Contao\\ManagerBundle\\ContaoManagerBundle",
5+
"Contao\\ManagerPlugin\\Bundle\\BundlePluginInterface",
6+
"Contao\\ManagerPlugin\\Bundle\\Config\\BundleConfig",
7+
"Contao\\ManagerPlugin\\Bundle\\Parser\\ParserInterface",
8+
"Contao\\ManagerPlugin\\Routing\\RoutingPluginInterface",
9+
"Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle",
10+
"Doctrine\\DBAL\\ArrayParameterType",
11+
"Doctrine\\DBAL\\Connection",
12+
"Doctrine\\DBAL\\Schema\\Table",
13+
"Doctrine\\DBAL\\Types\\Types",
14+
"Symfony\\Component\\Config\\FileLocator",
15+
"tl_user_group"
16+
]
17+
}

Diff for: ‎.phpcq.lock

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"plugins":{"phpunit":{"api-version":"1.0.0","version":"1.0.0.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/phpunit/phpunit-1.0.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0"},"tool":{"phpunit":"^6.0 || ^7.0 || ^8.0 || ^9.0"}},"checksum":{"type":"sha-512","value":"c73f15658e3ba62665f09492ec91c3a6a715760bfaa88473a987538439fff442540148e086e46a6aa18ce55a3ea2fbf76caaa581384cb84a38859fcc609ae7e4"},"tools":{"phpunit":{"version":"9.6.16","url":"https://phar.phpunit.de/phpunit-9.6.16.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*","ext-json":"*","ext-libxml":"*","ext-mbstring":"*","ext-xml":"*","ext-xmlwriter":"*"}},"checksum":{"type":"sha-256","value":"891d46f06284db3695498aff5dfd6a944f835e07db2981295db2c2bcf6cfd338"},"signature":"https://phar.phpunit.de/phpunit-9.6.16.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.20.0","url":"https://github.com/vimeo/psalm/releases/download/5.20.0/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.20.0/psalm.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.7.1","url":"https://github.com/maglnet/ComposerRequireChecker/releases/download/4.7.1/composer-require-checker.phar","requirements":{"php":{"php":"~8.1.0 || ~8.2.0 || ~8.3.0","ext-phar":"*"}},"checksum":null,"signature":"https://github.com/maglnet/ComposerRequireChecker/releases/download/4.7.1/composer-require-checker.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},"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},"phpcs":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/phpcs/phpcs-1.1.1.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":"2737022369da1318cc4e0ea194e8a81019f7b079080d869aab878b7486052fdbe68fee3f28131f35573226def1aabd4bd005e038ee7b767c137b1107c1492a83"},"tools":{"phpcs":{"version":"3.8.1","url":"https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/download/3.8.1/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.8.1/phpcs.phar.asc"},"phpcbf":{"version":"3.8.1","url":"https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/download/3.8.1/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.8.1/phpcbf.phar.asc"}},"composerLock":null},"composer-normalize":{"api-version":"1.0.0","version":"1.1.0.0","type":"php-file","url":"https://phpcq.github.io/repository/plugin/composer-normalize/composer-normalize-1.1.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-json":"*"},"tool":{"composer-normalize":"^2.1"}},"checksum":{"type":"sha-512","value":"d59d3557cb20630734878a9115df5dd32d5aff815e5b15be36f6fb5d6e9d83dd36efd84215ab6529edcc924f600946f739a0d9e67723deff95c88346ab502498"},"tools":{"composer-normalize":{"version":"2.41.1","url":"https://github.com/ergebnis/composer-normalize/releases/download/2.41.1/composer-normalize.phar","requirements":{"php":{"php":"~8.1.0 || ~8.2.0 || ~8.3.0","ext-json":"*"}},"checksum":null,"signature":"https://github.com/ergebnis/composer-normalize/releases/download/2.41.1/composer-normalize.phar.asc"}},"composerLock":null}},"tools":[]}

Diff for: ‎.phpcq.yaml.dist

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
phpcq:
2+
repositories:
3+
- https://phpcq.github.io/repository/repository.json
4+
directories:
5+
- src
6+
- tests
7+
artifact: .phpcq/build
8+
composer:
9+
autodiscover: false
10+
11+
plugins:
12+
phpunit:
13+
version: ^1.0
14+
signed: false
15+
psalm:
16+
version: ^1.0
17+
signed: false
18+
composer-require-checker:
19+
version: ^1.0
20+
signed: false
21+
phpmd:
22+
version: ^1.0
23+
signed: false
24+
phpcpd:
25+
version: ^1.1
26+
signed: false
27+
phploc:
28+
version: ^1.0
29+
signed: false
30+
phpcs:
31+
version: ^1.0
32+
signed: false
33+
composer-normalize:
34+
version: ^1.0
35+
signed: false
36+
trusted-keys:
37+
# composer-require-checker
38+
- 033E5F8D801A2F8D
39+
# [email protected]
40+
- 4AA394086372C20A
41+
# psalm
42+
- 8A03EA3B385DBAA1
43+
- 12CE0F1D262429A5
44+
# [email protected]
45+
- D2CCAC42F6295E7D
46+
# PHP_CodeSniffer
47+
- 31C7E470E2138192
48+
# Composer normalize
49+
- C00543248C87FB13
50+
# phpmd
51+
- A4E55EA12C7C085C
52+
- 9093F8B32E4815AA
53+
54+
tasks:
55+
fix:
56+
- composer-normalize-fix
57+
- phpcbf
58+
59+
verify:
60+
- composer-require-checker
61+
- composer-normalize
62+
63+
analyze:
64+
- phploc
65+
- phpcpd
66+
- phpmd
67+
- phpcs
68+
- psalm
69+
- phpunit
70+
71+
default:
72+
- verify
73+
- analyze
74+
75+
phpcpd:
76+
plugin: phpcpd
77+
config:
78+
exclude:
79+
- tests
80+
- src/CoreBundle/EventListener/DcGeneral/DefinitionBuilder
81+
- src/CoreBundle/Resources/contao/dca
82+
83+
phpmd:
84+
plugin: phpmd
85+
config:
86+
ruleset:
87+
- ./.phpmd.xml
88+
89+
composer-require-checker:
90+
plugin: composer-require-checker
91+
config:
92+
config_file: '.composer-require-checker.json'
93+
94+
phpcs:
95+
plugin: phpcs
96+
config: &phpcs-config
97+
standard: PSR12
98+
excluded:
99+
- '*/Resources/contao/dca/*'
100+
- '*/Resources/contao/languages/*'
101+
- '*/Resources/public/*'
102+
103+
phpcbf:
104+
plugin: phpcs
105+
config:
106+
<<: *phpcs-config
107+
fix: true
108+
109+
composer-normalize-fix:
110+
plugin: composer-normalize
111+
config:
112+
dry_run: false

Diff for: ‎.phpmd.xml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<ruleset name="PHPMD rule set"
3+
xmlns="http://pmd.sf.net/ruleset/1.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
6+
xsi:noNamespaceSchemaLocation=" http://pmd.sf.net/ruleset_xml_schema.xsd">
7+
<description>
8+
PHPMD rule set
9+
</description>
10+
11+
<rule ref="rulesets/codesize.xml"/>
12+
<rule ref="rulesets/controversial.xml">
13+
<exclude name="CamelCaseVariableName"/>
14+
</rule>
15+
<rule ref="rulesets/controversial.xml/CamelCaseVariableName">
16+
<properties>
17+
<property name="allow-underscore" value="true"/>
18+
</properties>
19+
</rule>
20+
<rule ref="rulesets/design.xml"/>
21+
<rule ref="rulesets/naming.xml">
22+
<exclude name="ShortVariable" />
23+
</rule>
24+
<rule ref="rulesets/naming.xml/ShortVariable">
25+
<properties>
26+
<property name="exceptions" value="id" />
27+
</properties>
28+
</rule>
29+
<rule ref="rulesets/unusedcode.xml">
30+
<exclude name="UnusedLocalVariable"/>
31+
</rule>
32+
<rule ref="rulesets/unusedcode.xml/UnusedLocalVariable">
33+
<properties>
34+
<property name="allow-unused-foreach-variables" value="true"/>
35+
</properties>
36+
</rule>
37+
</ruleset>

Diff for: ‎build.default.properties

-10
This file was deleted.

Diff for: ‎build.xml

-12
This file was deleted.

Diff for: ‎composer.json

+22-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
22
"name": "metamodels/attribute_translatedselect",
33
"description": "MetaModels attribute for translated selects",
4+
"license": "LGPL-3.0-or-later",
5+
"type": "contao-bundle",
46
"keywords": [
57
"contao",
68
"metamodels",
79
"attribute",
810
"select",
911
"translatable"
1012
],
11-
"type": "contao-bundle",
12-
"homepage": "https://now.metamodel.me/",
13-
"license": "LGPL-3.0-or-later",
1413
"authors": [
1514
{
1615
"name": "Christian Schiffler",
@@ -24,6 +23,7 @@
2423
"role": "Developer"
2524
}
2625
],
26+
"homepage": "https://now.metamodel.me/",
2727
"support": {
2828
"email": "[email protected]",
2929
"issues": "https://github.com/MetaModels/attribute_translatedselect/issues",
@@ -32,19 +32,25 @@
3232
"source": "https://github.com/MetaModels/attribute_translatedselect"
3333
},
3434
"require": {
35-
"php": "^7.4 || ^8.0",
36-
"contao-community-alliance/dc-general": "^2.3@dev",
37-
"contao/core-bundle": "^4.13.0, <5.0",
35+
"php": "^8.1",
36+
"contao-community-alliance/dc-general": "^2.3",
37+
"contao/core-bundle": "^4.13.0 <5.0",
3838
"metamodels/attribute_select": "^2.3@dev",
39-
"metamodels/core": "^2.3@dev",
39+
"metamodels/core": "dev-feature/phpcq-2 as 2.3.0",
4040
"symfony/dependency-injection": "^5.4",
4141
"symfony/http-kernel": "^5.4"
4242
},
4343
"require-dev": {
4444
"contao/manager-plugin": "^2.1",
4545
"menatwork/contao-multicolumnwizard-bundle": "^3.4",
46-
"phpcq/all-tasks": "^1.2"
46+
"phpcq/runner-bootstrap": "^1.0@dev"
4747
},
48+
"repositories": [
49+
{
50+
"type": "composer",
51+
"url": "https://packages.cyberspectrum.de/r"
52+
}
53+
],
4854
"autoload": {
4955
"psr-4": {
5056
"MetaModels\\AttributeTranslatedSelectBundle\\": "src"
@@ -58,17 +64,18 @@
5864
"MetaModels\\AttributeTranslatedSelectBundle\\Test\\": "tests"
5965
}
6066
},
61-
"extra": {
62-
"contao-manager-plugin": "MetaModels\\AttributeTranslatedSelectBundle\\ContaoManager\\Plugin",
63-
"branch-alias": {
64-
"dev-feature/2.3.0": "2.3.x-dev"
65-
}
66-
},
6767
"config": {
6868
"allow-plugins": {
6969
"contao-components/installer": false,
70-
"contao/manager-plugin": false
70+
"contao/manager-plugin": false,
71+
"php-http/discovery": true
7172
},
7273
"sort-packages": true
74+
},
75+
"extra": {
76+
"branch-alias": {
77+
"dev-feature/2.3.0": "2.3.x-dev"
78+
},
79+
"contao-manager-plugin": "MetaModels\\AttributeTranslatedSelectBundle\\ContaoManager\\Plugin"
7380
}
7481
}

Diff for: ‎psalm.xml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
errorLevel="3"
4+
resolveFromConfigFile="true"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xmlns="https://getpsalm.org/schema/config"
7+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
8+
>
9+
<projectFiles>
10+
<directory name="src" />
11+
<ignoreFiles>
12+
<directory name="src/Resources/contao/dca"/>
13+
<directory name="src/Resources/contao/languages"/>
14+
</ignoreFiles>
15+
</projectFiles>
16+
</psalm>

0 commit comments

Comments
 (0)