Skip to content

Commit

Permalink
Merge pull request #1 from paragonie/ga
Browse files Browse the repository at this point in the history
Migrate to Github Actions
  • Loading branch information
paragonie-security authored Apr 19, 2021
2 parents 0af1cb8 + 26dcef5 commit 343d6ed
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 7 deletions.
56 changes: 56 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: CI

on: [push]

jobs:
old:
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['7.1', '7.2', '7.3']
phpunit-versions: ['latest']
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, intl, sodium
ini-values: post_max_size=256M, max_execution_time=180
tools: psalm

- name: Install dependencies
run: composer install

- name: Static Analysis
run: vendor/bin/psalm

modern:
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['7.4', '8.0']
phpunit-versions: ['latest']
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, intl, sodium
ini-values: post_max_size=256M, max_execution_time=180
tools: psalm

- name: Install dependencies
run: composer install

- name: Static Analysis
run: vendor/bin/psalm
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Monolog-Quill

[![Build Status](https://travis-ci.org/paragonie/monolog-quill.svg?branch=master)](https://travis-ci.org/paragonie/monolog-quill)
[![Build Status](https://github.com/paragonie/monolog-quill/actions/workflows/ci.yml/badge.svg)](https://github.com/monolog-quill/actions)
[![Latest Stable Version](https://poser.pugx.org/paragonie/monolog-quill/v/stable)](https://packagist.org/packages/paragonie/monolog-quill)
[![Latest Unstable Version](https://poser.pugx.org/paragonie/monolog-quill/v/unstable)](https://packagist.org/packages/paragonie/monolog-quill)
[![License](https://poser.pugx.org/paragonie/monolog-quill/license)](https://packagist.org/packages/paragonie/monolog-quill)
[![Downloads](https://img.shields.io/packagist/dt/paragonie/monolog-quill.svg)](https://packagist.org/packages/paragonie/monolog-quill)

**Requires PHP 7.**
**Requires PHP 7.1 or newer.**

Want to use [Monolog](https://github.com/Seldaek/monolog) to write security events to
a [Chronicle](https://github.com/paragonie/chronicle)?
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
}
],
"require": {
"php": "^7",
"php": "^7.1|^8",
"monolog/monolog": "^1",
"paragonie/quill": "^0|^1"
"paragonie/quill": "^0.6|^1"
},
"autoload": {
"psr-4": {
"ParagonIE\\MonologQuill\\": "src/"
}
},
"require-dev": {
"vimeo/psalm": "^0|^1"
"vimeo/psalm": "^3|^4"
},
"scripts": {
"static-analysis": "psalm"
Expand Down
5 changes: 3 additions & 2 deletions psalm.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0"?>
<psalm
name="Psalm tests for Monolog-Quill"
stopOnFirstError="false"
useDocblockTypes="true"
totallyTyped="true"
>
<projectFiles>
<directory name="src" />
<ignoreFiles>
<directory name="vendor" />
</ignoreFiles>
</projectFiles>
</psalm>
2 changes: 2 additions & 0 deletions src/QuillHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class QuillHandler extends AbstractProcessingHandler
* @param int $level
* @param bool $bubble
* @return self
*
* @psalm-suppress UnsafeInstantiation We want this to be subclassable
*/
public static function factory(
string $url = '',
Expand Down

0 comments on commit 343d6ed

Please sign in to comment.