Skip to content

Commit

Permalink
use cweagans/composer-patches
Browse files Browse the repository at this point in the history
because with vaimo/composer-patches patching randomly fails with weird errors:
There is also vaimo/composer-patches#115

Processing patches configuration
  - Applying patches for codeigniter/framework (2)
    ~ kalkun-sms/kalkun: patches/Codeigniter_Framework/v3.1.13/10-php82_support.patch [NEW]
      Add support for PHP 8.2 (part1)
    ~ kalkun-sms/kalkun: patches/Codeigniter_Framework/v3.1.13/10-php82_support-part2.patch [NEW]
      Add support for PHP 8.2 (part2)

Error: Could not delete /home/runner/work/Kalkun/Kalkun/vendor/kenjis/ci-phpunit-test/CONTRIBUTING.md:

In Filesystem.php line 288:

  Could not delete /home/runner/work/Kalkun/Kalkun/vendor/kenjis/ci-phpunit-t
  est/CONTRIBUTING.md:

or

Processing patches configuration
  - Applying patches for codeigniter/framework (2)
    ~ kalkun-sms/kalkun: patches/Codeigniter_Framework/v3.1.13/10-php82_support.patch [NEW]
      Add support for PHP 8.2 (part1)
    ~ kalkun-sms/kalkun: patches/Codeigniter_Framework/v3.1.13/10-php82_support-part2.patch [NEW]
      Add support for PHP 8.2 (part2)

Error: Could not delete /home/runner/work/Kalkun/Kalkun/vendor/kenjis/ci-phpunit-test/.gitignore:

In Filesystem.php line 288:

  Could not delete /home/runner/work/Kalkun/Kalkun/vendor/kenjis/ci-phpunit-t
  est/.gitignore:
  • Loading branch information
tenzap committed Feb 13, 2024
1 parent 6bbc757 commit 86caf1c
Showing 1 changed file with 6 additions and 22 deletions.
28 changes: 6 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"ext-json": "*",
"ext-mbstring": "*",
"ext-session": "*",
"codeigniter/framework": ">=3.1.13 <3.2",
"codeigniter/framework": "=3.1.13",
"paragonie/random_compat": ">=2",
"giggsey/libphonenumber-for-php": "^8.12",
"league/csv": "^8.2 || ^9.5",
"datto/json-rpc-http": "^4.0 || ^5.0",
"kissifrot/php-ixr": "1.8.*",
"vaimo/composer-patches": "4.22.4 || ^5",
"cweagans/composer-patches": "~1.0",
"econea/nusoap": "^0.9.5.1"
},
"require-dev": {
Expand All @@ -32,35 +32,19 @@
"ext-sqlite3": "To connect to a SQLite3 database"
},
"extra": {
"patches-base": "patches/{{VendorName}}_{{ModuleName}}/{{version}}/{{file}}",
"patches": {
"codeigniter/framework": {
"Add support for PHP 8.2 (part1)": {
"source": "10-php82_support.patch",
"version": [
"=v3.1.13"
]
},
"Add support for PHP 8.2 (part2)": {
"source": "10-php82_support-part2.patch",
"version": [
"=v3.1.13"
]
}
"Add support for PHP 8.2 (part1)": "patches/Codeigniter_Framework/v3.1.13/10-php82_support.patch",
"Add support for PHP 8.2 (part2)": "patches/Codeigniter_Framework/v3.1.13/10-php82_support-part2.patch"
},
"kenjis/ci-phpunit-test": {
"Add support for PHP 8.2": {
"source": "support_php-8.2.patch",
"version": [
"=v3.0.4"
]
}
"Add support for PHP 8.2": "patches/Kenjis_CiPhpunitTest/v3.0.4/support_php-8.2.patch"
}
}
},
"config": {
"allow-plugins": {
"vaimo/composer-patches": true
"cweagans/composer-patches": true
}
}
}

0 comments on commit 86caf1c

Please sign in to comment.