Skip to content

Commit

Permalink
Merge pull request #16 from visto9259/1.1.x
Browse files Browse the repository at this point in the history
Updated CI to Laminas CI. Updated coding standards and fixed coding errors. Fixed static-analysis errors and other QA
  • Loading branch information
visto9259 authored Oct 30, 2024
2 parents bb227da + be39a55 commit e61afd8
Show file tree
Hide file tree
Showing 18 changed files with 444 additions and 330 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
/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
*.phtml text eol=lf
62 changes: 0 additions & 62 deletions .github/workflows/build_test.yml

This file was deleted.

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

on:
pull_request:
push:
branches:
tags:

jobs:
ci:
uses: laminas/workflow-continuous-integration/.github/workflows/[email protected]
17 changes: 17 additions & 0 deletions .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions

name: "Automatic Releases"

on:
milestone:
types:
- "closed"

jobs:
release:
uses: laminas/workflow-automatic-releases/.github/workflows/[email protected]
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# LmcRbacMvc Developer Tools

[![Build](https://github.com/lm-commons/LmcRbacMvcDeveloperTools/actions/workflows/build_test.yml/badge.svg)](https://github.com/lm-commons/LmcRbacMvcDeveloperTools/actions/workflows/build_test.yml)
[![Version](http://poser.pugx.org/lm-commons/lmc-rbac-mvc-devtools/version)](https://packagist.org/packages/lm-commons/lmc-rbac-mvc-devtools)[![Total Downloads](http://poser.pugx.org/lm-commons/lmc-rbac-mvc-devtools/downloads)](https://packagist.org/packages/lm-commons/lmc-rbac-mvc-devtools)
[![License](https://poser.pugx.org/lm-commons/lmc-rbac/license)](https://packagist.org/packages/lm-commons/lmc-rbac)
Expand All @@ -8,7 +9,6 @@

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


Laminas MVC Developer Tools extension for [LmcRbacMvc](https://github.com/LM-Commons/LmcRbacMvc).

## Requirements
Expand All @@ -31,4 +31,3 @@ go in `development.config.php`.

- File issues at https://github.com/LM-Commons/LmcRbacMvcDeveloperTools/issues
- Ask questions in the [LM-Commons Slack](https://join.slack.com/t/lm-commons/shared_invite/zt-2gankt2wj-FTS45hp1W~JEj1tWvDsUHQ) chat.

12 changes: 9 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "~8.1.0 | ~8.2.0 | ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"laminas/laminas-mvc": "~3.0",
"laminas/laminas-developer-tools": "~2.0",
"lm-commons/lmc-rbac-mvc": "^4.0"
},
"require-dev": {
"phpunit/phpunit": "^10.5.30 | ^11.3.1",
"phpunit/phpunit": "^10.5.30 || ^11.3.1",
"laminas/laminas-permissions-rbac": "~3.0",
"laminas/laminas-coding-standard": "^2.5",
"laminas/laminas-coding-standard": "^3.0",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.25"
},
Expand All @@ -46,7 +46,13 @@
"extra": {
"laminas": {
"module": "Lmc\\Rbac\\Mvc\\DevTools"
},
"config":{
"platform": {
"php": "8.1.99"
}
}

},
"scripts": {
"check": [
Expand Down
Loading

0 comments on commit e61afd8

Please sign in to comment.