Skip to content

Commit f6f0738

Browse files
authored
Merge pull request #357 from Zasilkovna/PES-2805-dev-config-update
PES-2805: moved composer.json to root folder for better development
2 parents bf8e405 + 2bd1870 commit f6f0738

File tree

9 files changed

+65
-51
lines changed

9 files changed

+65
-51
lines changed

.editorconfig-checker.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"SpacesAfterTabs": false,
66
"NoColor": false,
77
"Exclude": [
8+
".idea/*",
9+
".DS_Store",
810
"vendor/*",
9-
"translations/*"
11+
"packetery/translations/*"
1012
],
1113
"AllowedContentTypes": [],
1214
"PassedFiles": [],

.gitattributes

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,3 @@
33
.github export-ignore
44
doc/ export-ignore
55
releases/ export-ignore
6-
packetery/bin export-ignore
7-
packetery/vendor/ export-ignore
8-
packetery/phpcs.xml export-ignore
9-
packetery/phpcs.xsd export-ignore
10-
packetery/composer.json export-ignore
11-
packetery/composer.lock export-ignore

.github/run-sniffer.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ php --version | head -1
99
echo "ℹ︎ Composer version:"
1010
composer --version
1111

12-
cd packetery
13-
1412
echo "➤ Installing dependencies..."
1513
composer --no-interaction --quiet install
1614

1715
echo "➤ Running sniffer:"
18-
./vendor/bin/phpcs -s ./ 2>&1 | tee /tmp/sniffer.log
16+
./vendor/bin/phpcs -s 2>&1 | tee /tmp/sniffer.log
1917

2018
if grep -q 'ERROR' /tmp/sniffer.log; then
2119
echo "🛑 Sniffer found errors, fix them."

.github/workflows/run-ec-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
run: php -v
2929

3030
- name: Install Composer dependencies
31-
run: composer install --working-dir=packetery
31+
run: composer install
3232

3333
- name: Run editorconfig check
3434
run: |
35-
packetery/vendor/bin/ec .
35+
vendor/bin/ec .

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.idea/
22
.DS_Store
33
.phpcs-cache
4-
packetery/vendor
5-
packetery/views/js/write-test.js
4+
/vendor/
5+
/packetery/views/js/write-test.js
6+
/packetery/packetery_error.log
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"name": "packetery/module-prestashop",
32
"require": {
43
"php": "^8.1"
54
},
@@ -9,9 +8,9 @@
98
"editorconfig-checker/editorconfig-checker": "^10.7"
109
},
1110
"scripts": {
12-
"check:ec": "vendor/bin/ec ..",
13-
"check:phpcs": "vendor/bin/phpcs --standard=./phpcs.xml .",
14-
"fix:phpcbf": "vendor/bin/phpcbf --standard=./phpcs.xml .",
11+
"check:ec": "vendor/bin/ec .",
12+
"check:phpcs": "vendor/bin/phpcs --standard=./phpcs.xml",
13+
"fix:phpcbf": "vendor/bin/phpcbf --standard=./phpcs.xml",
1514
"check:all": [
1615
"@check:ec",
1716
"@check:phpcs"
Lines changed: 49 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
<arg name="parallel" value="20"/>
99
<arg name="tab-width" value="4"/>
1010
<arg name="encoding" value="utf-8"/>
11+
<arg value="p"/>
12+
<arg value="s"/>
1113

1214
<ini name="error_reporting" value="E_ALL &#38; ~E_DEPRECATED"/>
1315

14-
<exclude-pattern>vendor/*</exclude-pattern>
15-
<exclude-pattern>translations/*.php</exclude-pattern>
16+
<file>packetery</file>
17+
<exclude-pattern>packetery/translations/*.php</exclude-pattern>
1618
<exclude-pattern>index.php</exclude-pattern>
1719

1820
<rule ref="PSR12">
File renamed without changes.

0 commit comments

Comments
 (0)