Skip to content

Commit

Permalink
Merge pull request #116 from visto9259/Update_8_4
Browse files Browse the repository at this point in the history
Added support for PHP 8 4 and moved to laminas CI workflow
  • Loading branch information
visto9259 authored Jan 2, 2025
2 parents 814aa06 + 9f0625b commit 226cd1e
Show file tree
Hide file tree
Showing 35 changed files with 565 additions and 214 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
/psalm.baseline.xml export-ignore
/test/ export-ignore
/autoload-dev/ export-ignore
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
*.php text eol=lf
66 changes: 0 additions & 66 deletions .github/workflows/build_test.yml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "Continuous Integration"

on:
pull_request:
paths-ignore:
- 'docs/**'
push:
paths-ignore:
- 'docs/**'
branches:
tags:

jobs:
ci:
uses: laminas/workflow-continuous-integration/.github/workflows/[email protected]
8 changes: 8 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extensions": [
"sqlite3"
],
"ignore_php_platform_requirements": {
"8.4": true
}
}
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.github.com%2Frepos%2Flm-commons%2Flmcrbac%2Fproperties%2Fvalues&query=%24%5B%3A1%5D.value&label=Maintenance%20Status)


Role-based access control module to provide additional features on top of Laminas\Permissions\Rbac

## Requirements
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@
}
],
"require": {
"php": "^8.1 || ^8.2 || ^8.3",
"laminas/laminas-permissions-rbac": "^3.0",
"laminas/laminas-servicemanager": "^3.3",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"laminas/laminas-permissions-rbac": "^3.1",
"laminas/laminas-servicemanager": "^3.15",
"laminas/laminas-stdlib": "^3.1",
"doctrine/persistence": "^2.0 || ^3.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "^2.5.0",
"laminas/laminas-coding-standard": "^3.0",
"phpunit/phpunit": "^10.0 || ^11.0",
"phpspec/prophecy": "^1.10",
"phpspec/prophecy-phpunit": "^2.0",
"doctrine/orm": "^2.13 || ^3.0",
"symfony/cache": "^4.0 || ^5.0 || ^6.0",
"doctrine/orm": "^3.0",
"symfony/cache": "^6.3",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.25"
"vimeo/psalm": "^5.26"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 226cd1e

Please sign in to comment.