Skip to content

Commit

Permalink
Merge pull request #33 from mirko-pagliai/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
mirko-pagliai authored Sep 29, 2021
2 parents 3ceae43 + c6033b1 commit 1ca2a97
Show file tree
Hide file tree
Showing 8 changed files with 147 additions and 86 deletions.
139 changes: 139 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
name: CI

on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0' # weekly

jobs:
testsuite:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-version: ['7.2', '7.3', '7.4', '8.0']
prefer-lowest: ['']
include:
- php-version: '7.2'
prefer-lowest: 'prefer-lowest'
- php-version: '7.3'
prefer-lowest: 'prefer-lowest'
- php-version: '7.4'
prefer-lowest: 'prefer-lowest'
- php-version: '8.0'
prefer-lowest: 'prefer-lowest'

steps:
- uses: actions/checkout@v2

- name: Validate composer.json and composer.lock
run: composer validate --strict

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Composer install
run: |
if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
composer update --prefer-lowest --prefer-stable
else
composer update
fi
- name: Composer show
run: composer show

- name: Run PHPUnit
run: |
if [[ ${{ matrix.php-version }} == '8.0' ]]; then
export CODECOVERAGE=1 && vendor/bin/phpunit --verbose --coverage-clover=coverage.xml
else
vendor/bin/phpunit
fi
- name: Submit code coverage
if: matrix.php-version == '8.0'
uses: codecov/codecov-action@v1

cs-stan:
name: Coding Standard & Static Analysis
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
coverage: none
tools: cs2pr

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Composer install
run: composer stan-setup

- name: Run PHP CodeSniffer
continue-on-error: true
run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml

- name: Show PHPCS results in PR
run: cs2pr ./phpcs-report.xml

- name: Run psalm
if: success() || failure()
run: vendor/bin/psalm.phar --output-format=github

- name: Run phpstan
if: success() || failure()
run: vendor/bin/phpstan.phar analyse --error-format=github


testsuite-windows:
runs-on: windows-2019
name: Windows - PHP 7.4

env:
EXTENSIONS: mbstring, intl, gd
PHP_VERSION: '7.4'

steps:
- uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ env.PHP_VERSION }}
extensions: ${{ env.EXTENSIONS }}
ini-values: apc.enable_cli = 1, extension = php_fileinfo.dll
coverage: none

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Composer install
run: composer update

- name: Run PHPUnit
run: vendor/bin/phpunit --verbose
42 changes: 0 additions & 42 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# 1.x branch
## 1.1 branch
### 1.1.8
* fixed little bug for `LinkScanner::import()`, in catching exception messages;
* migration to github actions.

### 1.1.7
* fixed bug for `ScanEntity` when calling non-existent magic methods;
* extensive improvement of function descriptions and tags.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# LinkScanner plugin

[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.txt)
[![Build Status](https://api.travis-ci.org/mirko-pagliai/cakephp-link-scanner.svg?branch=master)](https://travis-ci.org/mirko-pagliai/cakephp-link-scanner)
[![Build status](https://ci.appveyor.com/api/projects/status/hqk7fxtad6r75wk3?svg=true)](https://ci.appveyor.com/project/mirko-pagliai/cakephp-link-scanner)
[![CI](https://github.com/mirko-pagliai/cakephp-link-scanner/actions/workflows/ci.yml/badge.svg)](https://github.com/mirko-pagliai/cakephp-link-scanner/actions/workflows/ci.yml)
[![codecov](https://codecov.io/gh/mirko-pagliai/cakephp-link-scanner/branch/master/graph/badge.svg)](https://codecov.io/gh/mirko-pagliai/cakephp-link-scanner)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/519cd9567f2848b68ed3df0f58f6cfc5)](https://www.codacy.com/gh/mirko-pagliai/cakephp-link-scanner/dashboard?utm_source=github.com&utm_medium=referral&utm_content=mirko-pagliai/cakephp-link-scanner&utm_campaign=Badge_Grade)
[![CodeFactor](https://www.codefactor.io/repository/github/mirko-pagliai/cakephp-link-scanner/badge)](https://www.codefactor.io/repository/github/mirko-pagliai/cakephp-link-scanner)

*LinkScanner* is a CakePHP plugin for recursively scanning links: starting from
Expand Down
35 changes: 0 additions & 35 deletions appveyor.yml

This file was deleted.

5 changes: 0 additions & 5 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ parameters:
count: 1
path: src/Command/LinkScannerCommand.php

-
message: "#^Call to an undefined static method Tools\\\\Exceptionist\\:\\:isUrl\\(\\)\\.$#"
count: 1
path: src/Utility/LinkScanner.php

-
message: "#^Access to protected property LinkScanner\\\\Utility\\\\LinkScanner\\:\\:\\$hostname\\.$#"
count: 1
Expand Down
2 changes: 1 addition & 1 deletion src/Utility/LinkScanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public function import(string $filename)
try {
$instance = unserialize(file_get_contents($filename) ?: '');
} catch (Exception $e) {
$message = preg_replace('/^file_get_contents\([\/\w\d:\-\\\\]+\): /', '', $e->getMessage()) ?: '';
$message = preg_replace('/file_get_contents\([^)]+\):\s+/', '', $e->getMessage()) ?: '';
throw new RuntimeException(__d(
'link-scanner',
'Failed to import results from file `{0}` with message `{1}`',
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.7
1.1.8

0 comments on commit 1ca2a97

Please sign in to comment.