Skip to content
This repository was archived by the owner on Jan 8, 2024. It is now read-only.

Init Cake5 upgrade #14

Merged
merged 4 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['7.4', '8.2']
php-version: ['8.1', '8.2']
db-type: [sqlite, mysql, pgsql]
prefer-lowest: ['']
include:
- php-version: '7.4'
- php-version: '8.1'
db-type: 'sqlite'
prefer-lowest: 'prefer-lowest'

Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:

- name: Run PHPUnit
run: |
if [[ ${{ matrix.php-version }} == '7.4' && ${{ matrix.db-type }} == 'sqlite' ]]; then
if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.db-type }} == 'sqlite' ]]; then
vendor/bin/phpunit --coverage-clover=coverage.xml
else
vendor/bin/phpunit
Expand All @@ -65,7 +65,7 @@ jobs:
run: if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then vendor/bin/validate-prefer-lowest -m; fi

- name: Code Coverage Report
if: success() && matrix.php-version == '7.4' && matrix.db-type == 'sqlite'
if: success() && matrix.php-version == '8.1' && matrix.db-type == 'sqlite'
uses: codecov/codecov-action@v3

validation:
Expand All @@ -78,7 +78,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'
extensions: mbstring
coverage: none

Expand Down
13 changes: 0 additions & 13 deletions .php_cs

This file was deleted.

14 changes: 0 additions & 14 deletions .styleci.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
[![Build Status](https://img.shields.io/travis/php-http/cakephp-adapter.svg?style=flat-square)](https://travis-ci.org/php-http/cakephp-adapter)
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-http/cakephp-adapter.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cakephp-adapter)
[![Quality Score](https://img.shields.io/scrutinizer/g/php-http/cakephp-adapter.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cakephp-adapter)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg)](https://php.net/)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF.svg)](https://php.net/)
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/cakephp-adapter.svg?style=flat-square)](https://packagist.org/packages/php-http/cakephp-adapter)

[HTTPlug](http://httplug.io) adapter for the [CakePHP](https://cakephp.org/) HTTP library.

This branch is for use with CakePHP 4.2+.
This branch is for use with CakePHP 5.0+.

## Install

Expand Down
22 changes: 12 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"name": "php-http/cakephp-adapter",
"description": "Cake adapter for PHP-HTTP",
"description": "CakePHP adapter for PHP-HTTP",
"license": "MIT",
"keywords": ["cakephp", "httplug", "http", "cake"],
"keywords": [
"cakephp",
"httplug",
"http",
"cake"
],
"homepage": "https://httplug.io",
"authors": [
{
Expand All @@ -11,10 +16,10 @@
}
],
"require": {
"php": ">=7.4",
"php": ">=8.1",
"php-http/httplug": "^2.0",
"php-http/discovery": "^1.0",
"cakephp/cakephp": "^4.2"
"cakephp/cakephp": "5.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
Expand All @@ -35,11 +40,6 @@
"psr/http-client-implementation": "1.0",
"php-http/client-implementation": "1.0"
},
"scripts": {
"test": "vendor/bin/phpunit",
"test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
},
"prefer-stable": true,
"scripts": {
"test": "phpunit",
"test-coverage": "phpunit --log-junit webroot/coverage/unitreport.xml --coverage-html webroot/coverage --coverage-clover webroot/coverage/coverage.xml",
Expand All @@ -50,6 +50,7 @@
"cs-check": "phpcs --extensions=php",
"cs-fix": "phpcbf --extensions=php"
},
"prefer-stable": true,
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -59,5 +60,6 @@
"branch-alias": {
"dev-master": "0.3-dev"
}
}
},
"minimum-stability": "dev"
}