Skip to content

Commit f186541

Browse files
fballianofballiano
committed
Merged 1.9.4.x and fixed conflict
2 parents 7070b3d + 6810c78 commit f186541

File tree

11,651 files changed

+56857
-1189990
lines changed

Some content is hidden

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

11,651 files changed

+56857
-1189990
lines changed

‎.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "composer"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"

‎.github/labeler.yml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
'Environment':
22
- .github/*
33
- .github/**/*
4-
- .phpstorm.meta.php/*
5-
- .travis.yml
6-
7-
'phpstan':
8-
- .github/phpstan.neon
9-
- .github/phpstan-baseline.neon
10-
- .github/phpstan_experimental_level.neon
114

125
'htaccess':
136
- .htaccess
147

158
'composer':
169
- composer.json
10+
- composer.lock
1711

1812
'downloader':
1913
- downloader/*
@@ -32,6 +26,10 @@
3226
- lib/Mage/*
3327
- lib/Mage/**/*
3428

29+
'Component: lib/Magento':
30+
- lib/Magento/*
31+
- lib/Magento/**/*
32+
3533
'Component: lib/Varien':
3634
- lib/Varien/*
3735
- lib/Varien/**/*
@@ -603,3 +601,25 @@
603601
# Add Documentation Label
604602
'Documentation':
605603
- '*.md'
604+
605+
'PHPStorm':
606+
- .phpstorm.meta.php/*
607+
608+
'phpcs':
609+
- .phpcs*
610+
- .github/workflows/phpcs.yml
611+
612+
'php-cs-fixer':
613+
- .php-cs-fixer*
614+
- .github/workflows/php-cs-fixer.yml
615+
616+
'phpstan':
617+
- phpstan*
618+
- .github/workflows/phpstan.yml
619+
620+
'phpunit':
621+
- dev/test/*
622+
- dev/phpunit*
623+
- dev/sonar*
624+
- .github/workflows/phpunit.yml
625+
- .github/workflows/sonar.yml

‎.github/phpstan-baseline.neon

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

‎.github/phpstan.neon

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

‎.github/phpstan_experimental_level.neon

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

‎.github/workflows/check-files.yml

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
name: File checker
2+
3+
on:
4+
workflow_call:
5+
outputs:
6+
composer:
7+
description: "Count changed Composer files"
8+
value: ${{ jobs.check.outputs.composer }}
9+
php:
10+
description: "Count changed PHP files"
11+
value: ${{ jobs.check.outputs.php }}
12+
xml:
13+
description: "Count changed XML files"
14+
value: ${{ jobs.check.outputs.xml }}
15+
workflow:
16+
description: "Count changed Workflow files"
17+
value: ${{ jobs.check.outputs.workflow }}
18+
phpcs:
19+
description: "Count changed PHPCS files"
20+
value: ${{ jobs.check.outputs.phpcs }}
21+
php-cs-fixer:
22+
description: "Count changed PHP-CS-Fixer files"
23+
value: ${{ jobs.check.outputs.php-cs-fixer }}
24+
phpstan:
25+
description: "Count changed PHPStan files"
26+
value: ${{ jobs.check.outputs.phpstan }}
27+
phpunit-test:
28+
description: "Count changed PhpUnit test files"
29+
value: ${{ jobs.check.outputs.phpunit-test }}
30+
phpunit:
31+
description: "Count changed PhpUnit files"
32+
value: ${{ jobs.check.outputs.phpunit }}
33+
sonar:
34+
description: "Count changed Sonar files"
35+
value: ${{ jobs.check.outputs.sonar }}
36+
# Allow manually triggering the workflow.
37+
workflow_dispatch:
38+
39+
jobs:
40+
check:
41+
name: Changed
42+
runs-on: [ubuntu-latest]
43+
outputs:
44+
composer: ${{ steps.all.outputs.composer }}
45+
php: ${{ steps.all.outputs.php }}
46+
xml: ${{ steps.all.outputs.xml }}
47+
workflow: ${{ steps.all.outputs.workflow }}
48+
phpcs: ${{ steps.all.outputs.phpcs }}
49+
php-cs-fixer: ${{ steps.all.outputs.php-cs-fixer }}
50+
phpstan: ${{ steps.all.outputs.phpstan }}
51+
phpunit-test: ${{ steps.all.outputs.phpunit-test }}
52+
phpunit: ${{ steps.all.outputs.phpunit }}
53+
sonar: ${{ steps.all.outputs.sonar }}
54+
55+
steps:
56+
- name: Checkout code
57+
uses: actions/checkout@v3
58+
with:
59+
fetch-depth: 2
60+
61+
- name: Get composer cache directory
62+
id: composer-cache
63+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
64+
65+
- name: Cache dependencies
66+
uses: actions/cache@v3
67+
with:
68+
path: ${{ steps.composer-cache.outputs.dir }}
69+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
70+
restore-keys: ${{ runner.os }}-composer-
71+
72+
- name: Get changed files
73+
id: changed-files-specific
74+
uses: tj-actions/changed-files@v35
75+
with:
76+
files: |
77+
composer.*
78+
*.php
79+
**/*.php
80+
**/*.xml
81+
.github/workflows/**
82+
**phpcs**
83+
**php-cs-fixer**
84+
**phpstan**
85+
dev/tests/
86+
dev/phpunit*
87+
dev/sonar*
88+
89+
- name: Run step if any file(s) changed
90+
id: all
91+
if: steps.changed-files-specific.outputs.any_changed == 'true'
92+
run: |
93+
echo "One or more files have changed."
94+
95+
count="$(grep -oE "composer.*" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
96+
echo "$count Composer file(s) changed"
97+
echo "composer=$count" >> $GITHUB_OUTPUT
98+
99+
count="$(grep -oE "*.php" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
100+
echo "$count PHP file(s) changed"
101+
echo "php=$count" >> $GITHUB_OUTPUT
102+
103+
count="$(grep -oE "*.xml" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
104+
echo "$count XML file(s) changed"
105+
echo "xml=$count" >> $GITHUB_OUTPUT
106+
107+
count="$(grep -oE ".github/workflows/**" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
108+
echo "$count Workflow file(s) changed"
109+
echo "workflow=$count" >> $GITHUB_OUTPUT
110+
111+
count="$(grep -oE "**phpcs**" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
112+
echo "$count PHPCS file(s) changed"
113+
echo "phpcs=$count" >> $GITHUB_OUTPUT
114+
115+
count="$(grep -oE "**php-cs-fixer**" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
116+
echo "$count PHP-CS-Fixer file(s) changed"
117+
echo "php-cs-fixer=$count" >> $GITHUB_OUTPUT
118+
119+
count="$(grep -oE "**phpstan**" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
120+
echo "$count PHPStan file(s) changed"
121+
echo "phpstan=$count" >> $GITHUB_OUTPUT
122+
123+
count="$(grep -oE "dev/tests/" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
124+
echo "$count UnitTest test file(s) changed"
125+
echo "phpunit-test=$count" >> $GITHUB_OUTPUT
126+
127+
count="$(grep -oE "dev/phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
128+
echo "$count UnitTest file(s) changed"
129+
echo "phpunit=$count" >> $GITHUB_OUTPUT
130+
131+
count="$(grep -oE "dev/sonar*" <<< "${{ steps.changed-files-specific.outputs.all_changed_files }}" | wc -l)"
132+
echo "$count Sonar file(s) changed"
133+
echo "sonar=$count" >> $GITHUB_OUTPUT

‎.github/workflows/composer.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Composer
2+
3+
on:
4+
workflow_call:
5+
# Allow manually triggering the workflow.
6+
workflow_dispatch:
7+
8+
jobs:
9+
composer:
10+
name: Validation
11+
runs-on: [ubuntu-latest]
12+
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v3
16+
17+
- name: Get composer cache directory
18+
id: composer-cache
19+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
20+
21+
- name: Cache dependencies
22+
uses: actions/cache@v3
23+
with:
24+
path: ${{ steps.composer-cache.outputs.dir }}
25+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
26+
restore-keys: ${{ runner.os }}-composer-
27+
28+
- name: Validate composer
29+
run: composer validate --strict

‎.github/workflows/labeler.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77

88
name: Labeler
99
on:
10-
- pull_request_target
10+
pull_request_target:
1111

1212
jobs:
1313
triage:
14+
name: Add labels
1415
runs-on: [ubuntu-latest]
1516
steps:
1617
- uses: actions/labeler@main
1718
with:
1819
repo-token: "${{ secrets.GITHUB_TOKEN }}"
20+
sync-labels: true
21+
continue-on-error: true

‎.github/workflows/php-cs-fixer.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: PHP-CS-Fixer
2+
3+
on:
4+
workflow_call:
5+
# Allow manually triggering the workflow.
6+
workflow_dispatch:
7+
8+
jobs:
9+
php-cs-fixer:
10+
name: Validation
11+
runs-on: [ubuntu-latest]
12+
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v3
16+
17+
- name: Get composer cache directory
18+
id: composer-cache
19+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
20+
21+
- name: Cache dependencies
22+
uses: actions/cache@v3
23+
with:
24+
path: ${{ steps.composer-cache.outputs.dir }}
25+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
26+
restore-keys: ${{ runner.os }}-composer-
27+
28+
- name: Install dependencies
29+
run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
30+
31+
- name: PHP-CS-Fixer
32+
run: php vendor/bin/php-cs-fixer fix --diff --dry-run

‎.github/workflows/phpcs.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: PHPCS
2+
3+
on:
4+
workflow_call:
5+
# Allow manually triggering the workflow.
6+
workflow_dispatch:
7+
8+
jobs:
9+
phpcs:
10+
name: ${{ matrix.rules.label }}
11+
runs-on: [ubuntu-latest]
12+
13+
strategy:
14+
matrix:
15+
rules:
16+
- label: Default
17+
path: .phpcs.xml.dist
18+
- label: Ecg
19+
path: .phpcs.ecg.xml.dist
20+
- label: PhpCompatibility
21+
path: .phpcs.php.xml.dist
22+
23+
steps:
24+
- name: Checkout code
25+
uses: actions/checkout@v3
26+
27+
- name: Get composer cache directory
28+
id: composer-cache
29+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
30+
31+
- name: Cache dependencies
32+
uses: actions/cache@v3
33+
with:
34+
path: ${{ steps.composer-cache.outputs.dir }}
35+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
36+
restore-keys: ${{ runner.os }}-composer-
37+
38+
- name: Install dependencies
39+
run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
40+
41+
- name: PHPCodeSniffer
42+
run: php vendor/bin/phpcs -s --report=full --standard=${{ matrix.rules.path }}
43+
continue-on-error: ${{ matrix.rules.path != '.github/phpcs-ruleset.xml' }}

0 commit comments

Comments
 (0)