Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PES-2422: Update dependencies #696

Merged
merged 9 commits into from
Jan 6, 2025
Merged

PES-2422: Update dependencies #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b1bf42
PES-2422: Add WordPress stubs to development dependencies
Karpec Jan 3, 2025
88826bc
PES-2422: Upgrade PHPStan to version 2.1
Karpec Jan 3, 2025
98f1de5
PES-2422: Upgrade PHPUnit to version 10.5.40
Karpec Jan 3, 2025
afc1fe3
PES-2422: Update phpstan/phpstan-strict-rules to version 2.0.1
Karpec Jan 3, 2025
df26893
PES-2422: Update WooCommerce stubs to version 9.5.0
Karpec Jan 3, 2025
3c2aade
PES-2422: Update PHPUnit configuration schema to 10.5 and display PHP…
Karpec Jan 3, 2025
ab498b2
PES-2422: Rename cartWeight to cartWeightKg for consistency between d…
Karpec Jan 3, 2025
82610be
PES-2422: Move PHPUnit cache to temp directory
Karpec Jan 3, 2025
2dc0932
PES-2422: Update PHPStan to version 2.1.1
Karpec Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ecrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"LICENSE$",
"^temp\/",
"^\\.idea\/",
"^.phpunit.result.cache$",
"\\.DS_Store$",
"\\.phar$"
],
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/log/
**/.DS_Store
/tests-coverage/
/.phpunit.result.cache
/config/config.local.neon
/node_modules/
phpunit.xml
9 changes: 5 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@
"require-dev": {
"composer/composer": "^2.6",
"wpify/scoper": "3.2.13",
"phpunit/phpunit": "10.4.2",
"php-stubs/woocommerce-stubs": "^9.3",
"phpunit/phpunit": "^10.5",
"php-stubs/woocommerce-stubs": "^9.5",
"editorconfig-checker/editorconfig-checker": "^10.6",
"slevomat/coding-standard": "^8.15",
"wp-cli/wp-cli-bundle": "^2.11",
"phpstan/extension-installer": "^1.4",
"szepeviktor/phpstan-wordpress": "^2.0",
"phpstan/phpstan-strict-rules": "^2.0",
"phpstan/phpstan": "^2.0",
"phpstan/phpstan": "^2.1",
"squizlabs/php_codesniffer": "^3.11",
"woocommerce/woocommerce-sniffs": "^1.0",
"phpstan/phpstan-nette": "^2.0"
"phpstan/phpstan-nette": "^2.0",
"php-stubs/wordpress-stubs": "^6.7"
},
"scripts": {
"build:deps": "bash build-deps.sh",
Expand Down
90 changes: 45 additions & 45 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
<!-- https://docs.phpunit.de/en/10.5/configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
backupGlobals="false"
colors="true"
displayDetailsOnTestsThatTriggerWarnings="true"
bootstrap="tests/bootstrap.php"
displayDetailsOnPhpunitDeprecations="true"
bootstrap="tests/bootstrap.php"
cacheResultFile="temp/.phpunit.result.cache"
>
<php>
<ini name="error_reporting" value="-1"/>
Expand Down
4 changes: 2 additions & 2 deletions tests/Module/Checkout/RateCalculatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ public static function calculationDataProvider(): array {
/**
* @dataProvider calculationDataProvider
*/
public function testGetShippingRateCost( ?float $expectedCost, Options $carrierOptions, float $totalProductValue, float $cartWeight, bool $isCouponApplied ): void {
public function testGetShippingRateCost( ?float $expectedCost, Options $carrierOptions, float $totalProductValue, float $cartWeightKg, bool $isCouponApplied ): void {
$this->createRateCalculatorMock();

$cost = $this->rateCalculator->getShippingRateCost(
$carrierOptions,
$totalProductValue,
$totalProductValue,
$cartWeight,
$cartWeightKg,
$isCouponApplied
);

Expand Down
20 changes: 10 additions & 10 deletions tests/Module/Checkout/ShippingRateFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public static function rateCreationDataProvider(): array {
],
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 5.0,
'cartWeightKg' => 5.0,
],
'car delivery carrier must not be present in rates' =>
[
Expand Down Expand Up @@ -162,7 +162,7 @@ public static function rateCreationDataProvider(): array {
'allowedCarrierNames' => null,
'isCarDeliveryEnabled' => false,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
'only one carrier is active' =>
[
Expand Down Expand Up @@ -208,7 +208,7 @@ public static function rateCreationDataProvider(): array {
'allowedCarrierNames' => null,
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
'carrier not supporting over-weight cart must be omitted' =>
[
Expand Down Expand Up @@ -242,7 +242,7 @@ public static function rateCreationDataProvider(): array {
],
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 21.0,
'cartWeightKg' => 21.0,
],
'inactive carrier must be omitted' =>
[
Expand Down Expand Up @@ -273,7 +273,7 @@ public static function rateCreationDataProvider(): array {
'allowedCarrierNames' => [],
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
'carrier disallowed by product must be omitted' =>
[
Expand Down Expand Up @@ -302,7 +302,7 @@ public static function rateCreationDataProvider(): array {
],
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
'carrier disallowed by product category must be omitted' =>
[
Expand Down Expand Up @@ -331,7 +331,7 @@ public static function rateCreationDataProvider(): array {
],
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
'car delivery carriers must be supported' =>
[
Expand Down Expand Up @@ -365,7 +365,7 @@ public static function rateCreationDataProvider(): array {
],
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
'carrier not supporting age verification must be omitted' =>
[
Expand Down Expand Up @@ -399,7 +399,7 @@ public static function rateCreationDataProvider(): array {
],
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => true,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
'allowed carrier names argument must support null' =>
[
Expand Down Expand Up @@ -430,7 +430,7 @@ public static function rateCreationDataProvider(): array {
'allowedCarrierNames' => null,
'isCarDeliveryEnabled' => true,
'isAgeVerificationRequiredByProduct' => false,
'cartWeight' => 1.0,
'cartWeightKg' => 1.0,
],
];
}
Expand Down