Skip to content

Commit b39222d

Browse files
authored
Merge pull request #6 from magento-trigger/php81
Add PHP 8.1 compatibility
2 parents abd3eb5 + 93e7d85 commit b39222d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+763
-1342
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
**/.DS_Store
12
/.idea
3+
/.phpunit.result.cache
24
/composer.phar
35
/composer.lock
46
/vendor
7+
/tests/FullStackTest/logs

.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

CodeSniffer.conf

Lines changed: 0 additions & 10 deletions
This file was deleted.

composer.json

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
{
2-
"name":"magento/magento-composer-installer",
3-
"description":"Composer installer for Magento modules",
4-
"keywords":[ "composer-installer", "magento"],
5-
"minimum-stability":"stable",
6-
"type":"composer-plugin",
7-
"license":"OSL-3.0",
8-
"homepage":"https://github.com/magento/magento-composer-installer",
9-
"repositories": [
10-
{
11-
"type": "vcs",
12-
"url": "[email protected]:firegento/phpcs.git"
13-
}
2+
"name": "magento/magento-composer-installer",
3+
"description": "Composer installer for Magento modules",
4+
"keywords": [
5+
"composer-installer",
6+
"magento"
147
],
15-
"authors":[
8+
"minimum-stability": "stable",
9+
"type": "composer-plugin",
10+
"license": "OSL-3.0",
11+
"homepage": "https://github.com/magento/magento-composer-installer",
12+
"authors": [
1613
{
17-
"name":"Daniel Fahlke aka Flyingmana",
18-
14+
"name": "Daniel Fahlke aka Flyingmana",
15+
"email": "[email protected]"
1916
},
2017
{
21-
"name":"Jörg Weller",
22-
18+
"name": "Jörg Weller",
19+
"email": "[email protected]"
2320
},
2421
{
25-
"name":"Karl Spies",
26-
22+
"name": "Karl Spies",
23+
"email": "[email protected]"
2724
},
2825
{
29-
"name":"Tobias Vogt",
30-
26+
"name": "Tobias Vogt",
27+
"email": "[email protected]"
3128
},
3229
{
33-
"name":"David Fuhr",
34-
30+
"name": "David Fuhr",
31+
"email": "[email protected]"
3532
},
3633
{
37-
"name":"Vinai Kopp",
38-
34+
"name": "Vinai Kopp",
35+
"email": "[email protected]"
3936
}
4037
],
41-
"require":{
38+
"require": {
4239
"composer-plugin-api": "^1.1 || ^2.0",
4340
"composer/composer": "^1.9 || ^2.0"
4441
},
45-
"require-dev":{
46-
"phpunit/phpunit":"*",
47-
"phpunit/phpunit-mock-objects": "dev-master",
48-
"squizlabs/php_codesniffer": "1.4.7",
49-
"firegento/phpcs": "~1.1.0",
50-
"symfony/process": "*",
42+
"require-dev": {
43+
"phpunit/phpunit": "^9.5",
44+
"squizlabs/php_codesniffer": "3.6.1",
45+
"symfony/process": "~5.4.0",
5146
"mikey179/vfsstream": "*"
5247
},
5348
"replace": {
5449
"magento-hackathon/magento-composer-installer": "*"
5550
},
56-
"autoload":{
57-
"psr-0":{
58-
"MagentoHackathon\\Composer\\Magento":"src/"
51+
"autoload": {
52+
"psr-0": {
53+
"MagentoHackathon\\Composer\\Magento": "src/"
54+
}
55+
},
56+
"autoload-dev": {
57+
"psr-4": {
58+
"MagentoHackathon\\": "tests/MagentoHackathon/"
5959
}
6060
},
6161
"archive": {
@@ -64,8 +64,10 @@
6464
"/tests/FullStackTest/"
6565
]
6666
},
67-
"extra":{
68-
"composer-command-registry": [ "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand" ],
69-
"class":"MagentoHackathon\\Composer\\Magento\\Plugin"
67+
"extra": {
68+
"composer-command-registry": [
69+
"MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
70+
],
71+
"class": "MagentoHackathon\\Composer\\Magento\\Plugin"
7072
}
7173
}

phpunit.xml.dist

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit backupGlobals="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
4+
backupGlobals="false"
45
backupStaticAttributes="false"
56
colors="true"
67
convertErrorsToExceptions="true"
78
convertNoticesToExceptions="true"
89
convertWarningsToExceptions="true"
910
processIsolation="false"
1011
stopOnFailure="false"
11-
syntaxCheck="false"
12-
bootstrap="tests/bootstrap.php"
13-
>
12+
bootstrap="tests/bootstrap.php">
13+
<coverage>
14+
<include>
15+
<directory>./src/</directory>
16+
</include>
17+
<exclude/>
18+
</coverage>
1419
<testsuites>
1520
<testsuite name="Magentohackathon Magento Installer Test Suite">
1621
<directory>./tests/MagentoHackathon</directory>
1722
</testsuite>
1823
</testsuites>
19-
2024
<groups>
2125
<exclude>
2226
<group>slow</group>
2327
</exclude>
2428
</groups>
25-
26-
<filter>
27-
<whitelist>
28-
<directory>./src/</directory>
29-
<exclude>
30-
</exclude>
31-
</whitelist>
32-
</filter>
33-
</phpunit>
29+
</phpunit>

0 commit comments

Comments
 (0)