Skip to content

Commit

Permalink
Merge pull request #19 from FosterCommerce/chore/reapply-changes-fix-ecs
Browse files Browse the repository at this point in the history
chore: Reapply changes to remove code stubs; Fix composer.json formatting; Add editorconfig and fix ECS
  • Loading branch information
johnnynotsolucky authored Aug 21, 2024
2 parents e73aef6 + 8068b9c commit 402682b
Show file tree
Hide file tree
Showing 35 changed files with 1,352 additions and 2,383 deletions.
13 changes: 8 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 2
indent_style = tab
indent_size = 4

# PHP files
[*.php]
# Markdown files
[*.md]
trim_trailing_whitespace = false

[*.{yaml,yml}]
indent_size = 2
indent_style = space
indent_size = 4
101 changes: 48 additions & 53 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,51 @@
{
"name": "fostercommerce/craft-foster-checkout",
"description": "A drop-in best practice checkout process for Craft Commerce",
"type": "craft-plugin",
"license": "mit",
"version": "1.1.0",
"support": {
"email": "[email protected]"
},
"require": {
"php": "^8.2",
"craftcms/cms": "^5.0.0",
"craftcms/commerce": "^5.0.15"
},
"autoload": {
"psr-4": {
"fostercommerce\\craftfostercheckout\\": "src/"
}
},
"extra": {
"handle": "foster-checkout",
"name": "Foster Checkout",
"developer": "Foster Commerce",
"documentationUrl": "",
"class": "fostercommerce\\craftfostercheckout\\FosterCheckout"
},
"config": {
"sort-packages": true,
"platform": {
"php": "8.2"
},
"allow-plugins": {
"yiisoft/yii2-composer": true,
"craftcms/plugin-installer": true
}
},
"require-dev": {
"craftcms/generator": "^2.1",
"fostercommerce/rector": "dev-main",
"fostercommerce/ecs": "dev-main",
"craftcms/phpstan": "dev-main",
"phpstan/phpstan": "^1.11",
"craftcms/rector": "dev-main"
},
"scripts": {
"phpstan": [
"@php \"scripts/craft_stubs.php\"",
"phpstan --memory-limit=1G"
],
"ecs-check": "ecs check --ansi --memory-limit=1G",
"ecs-fix": "ecs check --ansi --fix --memory-limit=1G",
"rector": "rector process --config rector.php",
"rector-dry-run": "rector process --dry-run --config rector.php"
}
"name": "fostercommerce/craft-foster-checkout",
"description": "A drop-in best practice checkout process for Craft Commerce",
"type": "craft-plugin",
"license": "mit",
"version": "1.1.0",
"support": {
"email": "[email protected]"
},
"require": {
"php": "^8.2",
"craftcms/cms": "^5.0.0",
"craftcms/commerce": "^5.0.15"
},
"autoload": {
"psr-4": {
"fostercommerce\\craftfostercheckout\\": "src/"
}
},
"extra": {
"handle": "foster-checkout",
"name": "Foster Checkout",
"developer": "Foster Commerce",
"documentationUrl": "",
"class": "fostercommerce\\craftfostercheckout\\FosterCheckout"
},
"config": {
"sort-packages": true,
"allow-plugins": {
"yiisoft/yii2-composer": true,
"craftcms/plugin-installer": true
}
},
"require-dev": {
"roave/security-advisories": "dev-latest",
"craftcms/generator": "^2.1",
"fostercommerce/rector": "dev-main",
"fostercommerce/ecs": "dev-main",
"craftcms/phpstan": "dev-main",
"phpstan/phpstan": "^1.11",
"craftcms/rector": "dev-main"
},
"scripts": {
"phpstan": "phpstan --memory-limit=1G",
"ecs-check": "ecs check --ansi --memory-limit=1G",
"ecs-fix": "ecs check --ansi --fix --memory-limit=1G",
"rector": "rector process --config rector.php",
"rector-dry-run": "rector process --dry-run --config rector.php"
}
}

8 changes: 4 additions & 4 deletions ecs.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use fostercommerce\ecs\ECSConfig;

return ECSConfig::configure()
->withPaths([
__DIR__ . '/src',
__FILE__,
]);
->withPaths([
__DIR__ . '/src',
__FILE__,
]);
2 changes: 0 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ includes:
- vendor/craftcms/phpstan/phpstan.neon

parameters:
scanFiles:
- phpstan_stubs.php
paths:
- src
level: 5
Loading

0 comments on commit 402682b

Please sign in to comment.