Skip to content

Commit

Permalink
Merge pull request #77 from dereuromark/php-82
Browse files Browse the repository at this point in the history
Use 8.2 as min v
  • Loading branch information
dereuromark committed Apr 5, 2024
2 parents 0ca57ec + 4767065 commit f57d54d
Show file tree
Hide file tree
Showing 4 changed files with 169 additions and 108 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1', '8.3']
php-version: ['8.2', '8.3']
db-type: [sqlite, mysql, pgsql]
include:
- php-version: '8.1'
- php-version: '8.2'
db-type: 'sqlite'

services:
Expand Down Expand Up @@ -66,14 +66,14 @@ jobs:
if [[ ${{ matrix.db-type }} == 'sqlite' ]]; then export DB_URL='sqlite:///:memory:'; fi
if [[ ${{ matrix.db-type }} == 'mysql' ]]; then export DB_URL='mysql://root:root@127.0.0.1/cakephp'; fi
if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then export DB_URL='postgres://postgres:postgres@127.0.0.1/postgres'; fi
if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.db-type }} == 'mysql' ]]; then
if [[ ${{ matrix.php-version }} == '8.2' && ${{ matrix.db-type }} == 'mysql' ]]; then
vendor/bin/phpunit --coverage-clover=coverage.xml --coverage-text
else
vendor/bin/phpunit
fi
- name: Code Coverage Report
if: success() && matrix.php-version == '8.1' && matrix.db-type == 'mysql'
if: success() && matrix.php-version == '8.2' && matrix.db-type == 'mysql'
uses: codecov/codecov-action@v1

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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[![CI](https://github.com/dereuromark/cakephp-sandbox/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/dereuromark/cakephp-sandbox/actions/workflows/ci.yml?query=branch%3Amaster)
[![Coverage Status](https://img.shields.io/codecov/c/github/dereuromark/cakephp-sandbox/master.svg)](https://codecov.io/github/dereuromark/cakephp-sandbox)
[![License](https://poser.pugx.org/dereuromark/cakephp-sandbox/license.svg)](https://packagist.org/packages/dereuromark/cakephp-sandbox)
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg)](https://php.net/)
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%208.2-8892BF.svg)](https://php.net/)
[![Coding Standards](https://img.shields.io/badge/cs-PSR--2--R-yellow.svg)](https://github.com/php-fig-rectified/fig-rectified-standards)
[![PHPStan](https://img.shields.io/badge/phpstan-level%208-brightgreen.svg?style=flat)](https://phpstan.org/)

Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
],
"license": "MIT",
"require": {
"php": ">=8.1",
"php": ">=8.2",
"spryker/cakephp-statemachine": "dev-master",
"cakephp/plugin-installer": "^2.0.1",
"cakephp/cakephp": "^5.0.3",
"cakephp/bake": "3.x-dev as 3.0.2",
"mobiledetect/mobiledetectlib": "4.*",
"dereuromark/cakephp-comments": "dev-master",
"dereuromark/cakephp-favorites": "dev-master",
"dereuromark/cakephp-translate": "dev-master",
"dereuromark/cakephp-tinyauth": "dev-master",
Expand Down Expand Up @@ -71,7 +72,7 @@
"jdorn/sql-formatter": "@stable",
"dereuromark/cakephp-templating": "dev-master",
"friendsofcake/cakepdf": "^5.0",
"symfony/http-client": "^6.4"
"symfony/http-client": "^6.4 || ^7.0"
},
"require-dev": {
"robmorgan/phinx": "0.x-dev as 0.15.3",
Expand Down Expand Up @@ -146,7 +147,7 @@
"preferred-install": "dist",
"process-timeout": 900,
"platform": {
"php": "8.1.11"
"php": "8.2.11"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
Expand Down

0 comments on commit f57d54d

Please sign in to comment.