Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/php-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
matrix:
include:
# Check lowest supported WP version, with the lowest supported PHP.
- php: '7.4'
wp: '5.9'
- php: '8.0'
wp: '6.0'
allowed_failure: false
# Check latest WP with the highest supported PHP.
- php: 'latest'
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"require": {
"composer/installers": "~1.0",
"php": ">=7.4"
"php": ">=8.0"
},
"require-dev": {
"automattic/vipwpcs": "^3.0",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 15 additions & 29 deletions edit_flow.php
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
<?php
/*
Plugin Name: Edit Flow
Plugin URI: http://editflow.org/
Description: Remixing the WordPress admin for better editorial workflow options.
Author: Daniel Bachhuber, Scott Bressler, Mohammad Jangda, Automattic, and others
Version: 0.9.8
Author URI: http://editflow.org/

Copyright 2009-2019 Mohammad Jangda, Daniel Bachhuber, Automattic, et al.

GNU General Public License, Free Software Foundation <http://creativecommons.org/licenses/GPL/2.0/>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

*/
/**
* Plugin Name: Edit Flow
* Plugin URI: http://editflow.org/
* Description: Remixing the WordPress admin for better editorial workflow options.
* Author: Daniel Bachhuber, Scott Bressler, Mohammad Jangda, Automattic, and others
* Version: 0.9.8
* Requires at least: 6.0
* Requires PHP: 8.0
* License: GPL-3
* License URI: https://www.gnu.org/licenses/gpl-3.0.html
Comment on lines +10 to +11
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was the license change intentional?

composer.json still says GPL v2 or later. What is it?

I'd recommend adding a proper LICENSE file to the repo.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching that. We meant to make it GPL 3 as some of our other plugins have that already, so we were trying to make it consistent. I'll fix that inconsistency, and add a proper LICENSE file to the repo.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was an incorrect decision. A site that uses a GPLv2-only plugin can't legally be allowed to work with a version of Edit-Flow that is GPLv3 only. I've opened #804 to rectify this.

*
* Copyright 2009-2019 Mohammad Jangda, Daniel Bachhuber, Automattic, et al.
*/

/**
* Print admin notice regarding having an old version of PHP.
Expand All @@ -35,12 +21,12 @@
function _ef_print_php_version_admin_notice() {
?>
<div class="notice notice-error">
<p><?php esc_html_e( 'Edit Flow requires PHP 7.4+. Please contact your host to update your PHP version.', 'edit-flow' ); ?></p>
<p><?php esc_html_e( 'Edit Flow requires PHP 8.0+. Please contact your host to update your PHP version.', 'edit-flow' ); ?></p>
</div>
<?php
}

if ( version_compare( phpversion(), '7.4', '<' ) ) {
if ( version_compare( phpversion(), '8.0', '<' ) ) {
add_action( 'admin_notices', '_ef_print_php_version_admin_notice' );
return;
}
Expand Down