Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
faisal-alvi committed Jul 30, 2024
2 parents f2814d2 + 99d32d9 commit a6719b3
Show file tree
Hide file tree
Showing 11 changed files with 549 additions and 274 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
core:
- {name: 'WP latest', version: 'latest'}
- {name: 'WP minimum', version: 'WordPress/WordPress#6.3'}
- {name: 'WP minimum', version: 'WordPress/WordPress#6.4'}
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}

steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ node_modules
bower_components
release
vendor
10up-lib
.idea
*.log

Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [1.3.5] - 2024-07-31
**Note that this release bumps the minimum required version of WordPress from 6.2 to 6.4.**

### Changed
- Bump WordPress "tested up to" version 6.6 (props [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@sudip-md](https://github.com/sudip-md) via [#195](https://github.com/10up/publisher-media-kit/pull/195)).
- Bump WordPress minimum to version 6.4 (props [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@sudip-md](https://github.com/sudip-md) via [#195](https://github.com/10up/publisher-media-kit/pull/195)).

### Fixed
- Fatal error caused by redeclared functions (props [@claudiulodro](https://github.com/claudiulodro), [@Sidsector9](https://github.com/Sidsector9), [@shelb-elliott](https://github.com/shelb-elliott), [@iamdharmesh](https://github.com/iamdharmesh) via [#197](https://github.com/10up/publisher-media-kit/pull/197)).

## [1.3.4] - 2024-07-08
**Note that this release bumps the minimum required version of WordPress from 5.7 to 6.2.**

Expand Down Expand Up @@ -135,6 +145,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial private plugin release 🎉

[Unreleased]: https://github.com/10up/publisher-media-kit/compare/trunk...develop
[1.3.5]: https://github.com/10up/publisher-media-kit/compare/1.3.4...1.3.5
[1.3.4]: https://github.com/10up/publisher-media-kit/compare/1.3.3...1.3.4
[1.3.3]: https://github.com/10up/publisher-media-kit/compare/1.3.2...1.3.3
[1.3.2]: https://github.com/10up/publisher-media-kit/compare/1.3.1...1.3.2
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.

[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [David Godleman (@cldhmmr)](https://github.com/cldhmmr), [Trey Kane (@treykane)](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Karine Do (@kdo)](https://github.com/kdo), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Kelvin Balloo (@kelvinballoo)](https://github.com/kelvinballoo), [Ben Marshall (@bmarshall511)](https://github.com/bmarshall511), [Clayton Collie (@claytoncollie)](https://github.com/claytoncollie), [Sumit Bagthariya (@qasumitbagthariya)](https://github.com/qasumitbagthariya), [Sudip Dadhaniya (@sudip-md)](https://github.com/sudip-md), [Davis Shaver (@davisshaver)](https://github.com/davisshaver), [Konstantinos Galanakis (@kmgalanakis)](https://github.com/kmgalanakis).
[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [David Godleman (@cldhmmr)](https://github.com/cldhmmr), [Trey Kane (@treykane)](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Karine Do (@kdo)](https://github.com/kdo), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Kelvin Balloo (@kelvinballoo)](https://github.com/kelvinballoo), [Ben Marshall (@bmarshall511)](https://github.com/bmarshall511), [Clayton Collie (@claytoncollie)](https://github.com/claytoncollie), [Sumit Bagthariya (@qasumitbagthariya)](https://github.com/qasumitbagthariya), [Sudip Dadhaniya (@sudip-md)](https://github.com/sudip-md), [Davis Shaver (@davisshaver)](https://github.com/davisshaver), [Konstantinos Galanakis (@kmgalanakis)](https://github.com/kmgalanakis), [Claudiu Lodromanean (@claudiulodro)](https://github.com/claudiulodro), [Shelby Elliott (@shelb-elliott)](https://github.com/shelb-elliott).

## Libraries

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Twenty Twenty One default theme | Newspack base theme
## Requirements

* PHP Requires: 7.4+
* WordPress Requires at least: 6.2+
* WordPress Requires at least: 6.4+

## Theme Compatibility

Expand Down
79 changes: 49 additions & 30 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,51 @@
{
"name": "10up/publisher-media-kit",
"type": "wordpress-plugin",
"authors": [
{
"name": "10up",
"email": "info@10up.com"
}
],
"require": {
"php": ">=7.4"
},
"autoload": {
"psr-4": {
"PublisherMediaKit\\": "includes/classes/"
}
},
"require-dev": {
"phpunit/phpunit": "^8.2",
"10up/wp_mock": "^0.4.2",
"10up/phpcs-composer": "dev-master"
},
"scripts": {
"lint": "phpcs . --runtime-set testVersion 7.4-",
"lint-fix": "phpcbf ."
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
"name": "10up/publisher-media-kit",
"type": "wordpress-plugin",
"authors": [
{
"name": "10up",
"email": "info@10up.com"
}
],
"require": {
"php": ">=7.4",
"10up/wp-compat-validation-tool": "dev-trunk"
},
"autoload": {
"psr-4": {
"PublisherMediaKit\\": "includes/classes/"
}
},
"require-dev": {
"phpunit/phpunit": "^8.2",
"10up/wp_mock": "^0.4.2",
"10up/phpcs-composer": "dev-master"
},
"scripts": {
"lint": "phpcs . --runtime-set testVersion 7.4-",
"lint-fix": "phpcbf .",
"post-install-cmd": [
"./10up-lib/wp-compat-validation-tool/replace-namespace.sh PublisherMediaKitValidator"
],
"post-update-cmd": [
"./10up-lib/wp-compat-validation-tool/replace-namespace.sh PublisherMediaKitValidator"
]
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/installers": true
}
},
"repositories": [
{
"type": "git",
"url": "https://github.com/10up/wp-compat-validation-tool.git"
}
],
"extra": {
"installer-paths": {
"./{$name}/": ["10up/wp-compat-validation-tool"]
}
}
}
Loading

0 comments on commit a6719b3

Please sign in to comment.