Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
iamdharmesh committed Jun 27, 2022
2 parents c3a2d2c + 4b579bd commit a012252
Show file tree
Hide file tree
Showing 36 changed files with 6,860 additions and 3,784 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
/package.json export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/run-wpacceptance.sh export-ignore
/wpacceptance.json export-ignore
/README.md export-ignore
/.wp-env.json export-ignore
41 changes: 41 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: E2E test

on:
push:
branches:
- develop
- trunk
pull_request:
branches:
- develop
jobs:
cypress:
name: ${{ matrix.core.name }}
runs-on: ubuntu-latest
strategy:
matrix:
core:
- {name: 'WP latest', version: 'latest'}
- {name: 'WP minimum', version: 'WordPress/WordPress#4.6'}
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install dependencies
run: npm install
- name: Set the core version
run: ./tests/bin/set-core-version.js ${{ matrix.core.version }}
- name: Set up WP environment
run: npm run env:start
- name: Test
run: npm run cypress:run
- name: Upload artifacts
uses: actions/upload-artifact@v2
if: failure()
with:
name: cypress-artifact-safe-redirect-manager
retention-days: 7
path: |
${{ github.workspace }}/tests/cypress/screenshots/
${{ github.workspace }}/tests/cypress/videos/
${{ github.workspace }}/tests/cypress/logs/
20 changes: 20 additions & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Dependency Review Action
#
# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
on: [pull_request]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
- name: 'Dependency Review'
uses: actions/dependency-review-action@v1
32 changes: 32 additions & 0 deletions .github/workflows/php-compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: PHP Compatibility

on:
push:
branches:
- develop
- trunk
pull_request:
branches:
- develop

jobs:
php_compatibility:
name: PHP minimum 5.6
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
tools: composer:v2
coverage: none

- name: Install dependencies
run: composer install

- name: Run PHP Compatibility
run: vendor/bin/phpcs safe-redirect-manager.php inc/ -p --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 5.6-
15 changes: 8 additions & 7 deletions .github/workflows/lint.yml → .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Linting
name: PHPCS

on:
push:
Expand All @@ -16,15 +16,16 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
php-version: '7.4'
coverage: none
tools: composer:v1
tools: composer:v2

- name: composer install
run: composer install
- name: PHPCS check
uses: chekalsky/phpcs-action@v1
with:
phpcs_bin_path: './vendor/bin/phpcs .'

- name: Run PHPCS
run: composer run lint
40 changes: 40 additions & 0 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: PHPUnit

on:
push:
branches:
- develop
- trunk
pull_request:
branches:
- develop

jobs:
phpunit:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']

steps:
- name: Checkout
uses: actions/checkout@v2

- uses: getong/mariadb-action@v1.1

- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none
tools: composer:v2

- name: Install dependencies
run: composer update -W

- name: Setup WP Tests
run: bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1

- name: Run PHPUnit
run: './vendor/bin/phpunit'
61 changes: 0 additions & 61 deletions .github/workflows/test.yml

This file was deleted.

8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
vendor
node_modules
node_modules
artifacts
tests/cypress/downloads
tests/cypress/screenshots
tests/cypress/videos
.wp-env.override.json
.phpunit.result.cache
10 changes: 10 additions & 0 deletions .wp-env.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"plugins": ["."],
"env": {
"tests": {
"mappings": {
"wp-cli.yml": "./tests/bin/wp-cli.yml"
}
}
}
}
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,24 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [1.10.1] - 2021-09-28
## [1.11.0] - 2022-06-27
### Added
- Detect duplicate rules for the same 'redirect from' value (props [@adamsilverstein](https://github.com/adamsilverstein), [@dhanendran](https://github.com/dhanendran), [@hrkhal](https://github.com/hrkhal), [@jeffpaul](https://github.com/jeffpaul), [@lukaspawlik](https://github.com/lukaspawlik), [@sanketio](https://github.com/sanketio), [@Sidsector9](https://github.com/Sidsector9) via [#171](https://github.com/10up/safe-redirect-manager/pull/171)).
- PHP 8 compatibility (props [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter) via [#264](https://github.com/10up/safe-redirect-manager/pull/264)).
- E2E Tests with Cypress (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9), [@dkotter](https://github.com/dkotter) via [#262](https://github.com/10up/safe-redirect-manager/pull/262), [#273](https://github.com/10up/safe-redirect-manager/pull/273)).
- Dependency security scanning (props [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#268](https://github.com/10up/safe-redirect-manager/pull/268)).

### Changed
- Default number of redirects in readme files (props [@grappler](https://github.com/grappler) via [#259](https://github.com/10up/safe-redirect-manager/pull/259)).
- Bump WordPress "tested up to" version 6.0 (props [@jeffpaul](https://github.com/jeffpaul), [@sudip-10up](https://github.com/sudip-10up), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#260](https://github.com/10up/safe-redirect-manager/pull/260), [#270](https://github.com/10up/safe-redirect-manager/pull/270)).

### Fixed
- Unit tests by adding `PHPUnit-Polyfills` library (props [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#257](https://github.com/10up/safe-redirect-manager/pull/257)).

### Security
- Bump `minimist` from 1.2.5 to 1.2.6 (props [@dependabot](https://github.com/apps/dependabot) via [#265](https://github.com/10up/safe-redirect-manager/pull/265)).

## [1.10.1] - 2021-12-16
### Added
- Formatting options to `wp safe-redirect-manager list` command (props [@dinhtungdu](https://github.com/dinhtungdu), [@TheLastCicada](https://github.com/TheLastCicada) via [#238](https://github.com/10up/safe-redirect-manager/pull/238)).

Expand Down Expand Up @@ -218,6 +235,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Plugin released

[Unreleased]: https://github.com/10up/safe-redirect-manager/compare/trunk...develop
[1.11.0]: https://github.com/10up/safe-redirect-manager/compare/1.10.1...1.11.0
[1.10.1]: https://github.com/10up/safe-redirect-manager/compare/1.10.0...1.10.1
[1.10.0]: https://github.com/10up/safe-redirect-manager/compare/1.9.3...1.10.0
[1.9.3]: https://github.com/10up/safe-redirect-manager/compare/1.9.2...1.9.3
Expand Down
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo

Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.

[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zack Tollman (@tollmanz)](https://github.com/tollmanz), [Taylor Dewey (@tddewey)](https://github.com/tddewey), [10up (@10up)](https://github.com/10up), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Daniel Bachhuber (@danielbachhuber)](https://github.com/danielbachhuber), [VentureBeat (@VentureBeat)](https://github.com/VentureBeat), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Simon Wheatley (@simonwheatley)](https://github.com/simonwheatley), [Davis Shaver (@davisshaver)](https://github.com/davisshaver), [Tauno Hogue (@tauno)](https://github.com/tauno), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Benoît Chantre (@benoitchantre)](https://github.com/benoitchantre), [Viktor Szépe (@szepeviktor)](https://github.com/szepeviktor), [Molnár Éva (@milli05)](https://github.com/milli05), [Henrique Mouta (@vaurdan)](https://github.com/vaurdan), [Raymond Ware (@raymondware)](https://github.com/raymondware), [Kevin Langley Jr (@kevinlangleyjr)](https://github.com/kevinlangleyjr), [Justin Sternberg (@jtsternberg)](https://github.com/jtsternberg), [Francesco Laffi (@francescolaffi)](https://github.com/francescolaffi), [Scott Walkinshaw (@swalkinshaw)](https://github.com/swalkinshaw), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Tyrel Kelsey (@ninnypants)](https://github.com/ninnypants), [Lucy Tomás (@lucymtc)](https://github.com/lucymtc), [Luca Speranza (@lucspe)](https://github.com/lucspe), [Luke Gedeon (@lgedeon)](https://github.com/lgedeon), [Josh Betz (@joshbetz)](https://github.com/joshbetz), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [James Burke (@jameswburke)](https://github.com/jameswburke), [@inathani](https://github.com/inathani), [Ulrich Pogson (@grappler)](https://github.com/grappler), [Chancey Mathews (@chanceymathews)](https://github.com/chanceymathews), [Ramon van Belzen (@Ramoonus)](https://github.com/Ramoonus), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Linnea Huxford (@mslinnea)](https://github.com/mslinnea), [Jon Sherrard (@jonsherrard)](https://github.com/jonsherrard), Jean-Christophe Brebion, [Michael Pretty (@prettyboymp)](https://github.com/prettyboymp), [Armando Lüscher (@noplanman)](https://github.com/noplanman), [Nícholas André (@nicholasio)](https://github.com/nicholasio), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Noeste IJver (@noesteijver)](https://github.com/noesteijver), [David Greenwald (@davidegreenwald)](https://github.com/davidegreenwald), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Amy Evans (@amyevans)](https://github.com/amyevans), [Jeffrey Betts (@jeffreybetts)](https://github.com/jeffreybetts), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [Bradley Taylor (@braders)](https://github.com/braders), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Pop VeKind (@PopVeKind)](https://github.com/PopVeKind), [Vincent Klaiber (@vinkla)](https://github.com/vinkla), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Jeffrey Carandang (@phpbits)](https://github.com/phpbits), [Zachary Brown (@TheLastCicada)](https://github.com/TheLastCicada), [MD Sultan Nasir Uddin (@sultann)](https://github.com/sultann), [@jilltilt](https://github.com/jilltilt), [@yeevy](https://github.com/yeevy), [David Mondok (@davidmondok)](https://github.com/davidmondok).
[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zack Tollman (@tollmanz)](https://github.com/tollmanz), [Taylor Dewey (@tddewey)](https://github.com/tddewey), [10up (@10up)](https://github.com/10up), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Daniel Bachhuber (@danielbachhuber)](https://github.com/danielbachhuber), [VentureBeat (@VentureBeat)](https://github.com/VentureBeat), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Simon Wheatley (@simonwheatley)](https://github.com/simonwheatley), [Davis Shaver (@davisshaver)](https://github.com/davisshaver), [Tauno Hogue (@tauno)](https://github.com/tauno), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Benoît Chantre (@benoitchantre)](https://github.com/benoitchantre), [Viktor Szépe (@szepeviktor)](https://github.com/szepeviktor), [Molnár Éva (@milli05)](https://github.com/milli05), [Henrique Mouta (@vaurdan)](https://github.com/vaurdan), [Raymond Ware (@raymondware)](https://github.com/raymondware), [Kevin Langley Jr (@kevinlangleyjr)](https://github.com/kevinlangleyjr), [Justin Sternberg (@jtsternberg)](https://github.com/jtsternberg), [Francesco Laffi (@francescolaffi)](https://github.com/francescolaffi), [Scott Walkinshaw (@swalkinshaw)](https://github.com/swalkinshaw), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Peter Sorensen (@psorensen)](https://github.com/psorensen), [Tyrel Kelsey (@ninnypants)](https://github.com/ninnypants), [Lucy Tomás (@lucymtc)](https://github.com/lucymtc), [Luca Speranza (@lucspe)](https://github.com/lucspe), [Luke Gedeon (@lgedeon)](https://github.com/lgedeon), [Josh Betz (@joshbetz)](https://github.com/joshbetz), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [James Burke (@jameswburke)](https://github.com/jameswburke), [@inathani](https://github.com/inathani), [Ulrich Pogson (@grappler)](https://github.com/grappler), [Chancey Mathews (@chanceymathews)](https://github.com/chanceymathews), [Ramon van Belzen (@Ramoonus)](https://github.com/Ramoonus), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Linnea Huxford (@mslinnea)](https://github.com/mslinnea), [Jon Sherrard (@jonsherrard)](https://github.com/jonsherrard), Jean-Christophe Brebion, [Michael Pretty (@prettyboymp)](https://github.com/prettyboymp), [Armando Lüscher (@noplanman)](https://github.com/noplanman), [Nícholas André (@nicholasio)](https://github.com/nicholasio), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Noeste IJver (@noesteijver)](https://github.com/noesteijver), [David Greenwald (@davidegreenwald)](https://github.com/davidegreenwald), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Amy Evans (@amyevans)](https://github.com/amyevans), [Jeffrey Betts (@jeffreybetts)](https://github.com/jeffreybetts), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [Bradley Taylor (@braders)](https://github.com/braders), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Pop VeKind (@PopVeKind)](https://github.com/PopVeKind), [Vincent Klaiber (@vinkla)](https://github.com/vinkla), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Jeffrey Carandang (@phpbits)](https://github.com/phpbits), [Zachary Brown (@TheLastCicada)](https://github.com/TheLastCicada), [MD Sultan Nasir Uddin (@sultann)](https://github.com/sultann), [@jilltilt](https://github.com/jilltilt), [@yeevy](https://github.com/yeevy), [David Mondok (@davidmondok)](https://github.com/davidmondok), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Dhanendran (@dhanendran)](https://github.com/dhanendran), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Michael Ilett (@hrkhal)](https://github.com/hrkhal), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Sanket Parmar (@sanketio)](https://github.com/sanketio), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up).

## Libraries

Expand Down
Loading

0 comments on commit a012252

Please sign in to comment.