Add support back to PHP 7.4+ (#71)

Reviewed-on: #71
Co-authored-by: André Menrath <andre.menrath@posteo.de>
Co-committed-by: André Menrath <andre.menrath@posteo.de>

.distignore

@@ -1,34 +1,24 @@
 .distignore
 .git
 .gitignore
-.php_cs
-.svnignore
 .wordpress-org
 .wp-env.json
-_config.yml
-_site
 bin
 CHANGELOG.md
 CODE_OF_CONDUCT.md
 composer.json
 composer.lock
+docker-compose.yml
 Dockerfile
 docs
-docker-compose-test.yml
-docker-compose.yml
 FEDERATION.md
 Gruntfile.js
-Makefile
 node_modules
-npm-debug.log
-package-lock.json
 package.json
+package-lock.json
 phpcs.xml
 phpunit.xml
-phpunit.xml.dist
 README.md
-readme.md
-SECURITY.md
 src
 tests
 vendor

.forgejo/workflows/phpunit.yml

@@ -21,7 +21,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: root
     strategy:
       matrix:
-        php-version: ['8.1', '8.2', '8.3']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
     name: PHPUnit – PHP ${{ matrix.php-version }}
     env:
       extensions: mysql
@@ -45,7 +45,7 @@ jobs:
         with:
           path: |
             ./vendor/
-          key: cache-composer-phpunit-1
+          key: cache-composer-phpunit-2
 
       - name: Setup PHP
         uses: https://github.com/shivammathur/setup-php@v2

.forgejo/workflows/release.yml

@@ -0,0 +1,16 @@
+on:
+  push:
+    tags: 'v*'
+
+jobs:
+  upload-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: https://code.forgejo.org/actions/checkout@v4
+
+      - uses: https://code.forgejo.org/actions/forgejo-release@v2
+        with:
+          direction: upload
+          url: https://code.event-federation.eu
+          release-notes: ${{ TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitattributes

@@ -0,0 +1,23 @@
+.distignore  export-ignore
+.forgejo  export-ignore
+.gitattributes  export-ignore
+.gitignore export-ignore
+.wp-env.json  export-ignore
+bin  export-ignore
+CODE_OF_CONDUCT.md  export-ignore
+composer.json  export-ignore
+composer.lock  export-ignore
+docker-compose.yml  export-ignore
+Dockerfile  export-ignore
+docs  export-ignore
+FEDERATION.md  export-ignore
+Gruntfile.js  export-ignore
+node_modules  export-ignore
+package.json  export-ignore
+package-lock.json  export-ignore
+phpcs.xml  export-ignore
+phpunit.xml  export-ignore
+README.md  export-ignore
+src  export-ignore
+tests  export-ignore
+vendor  export-ignore

.gitignore

@@ -2,3 +2,4 @@ vendor/
 composer.lock
 .phpunit.result.cache
 node_modules/
+package-lock.json

Gruntfile.js

@@ -0,0 +1,59 @@
+module.exports = function (grunt) {
+	// Project configuration.
+	grunt.initConfig(
+		{
+			checktextdomain: {
+				options:{
+					text_domain: 'activitypub-event-bridge',
+					keywords: [
+					'__:1,2d',
+					'_e:1,2d',
+					'_x:1,2c,3d',
+					'esc_html__:1,2d',
+					'esc_html_e:1,2d',
+					'esc_html_x:1,2c,3d',
+					'esc_attr__:1,2d',
+					'esc_attr_e:1,2d',
+					'esc_attr_x:1,2c,3d',
+					'_ex:1,2c,3d',
+					'_n:1,2,4d',
+					'_nx:1,2,4c,5d',
+					'_n_noop:1,2,3d',
+					'_nx_noop:1,2,3c,4d'
+					]
+				},
+				files: {
+					src:  [
+					'**/*.php',         // Include all files
+					'!sass/**',         // Exclude sass/
+					'!node_modules/**', // Exclude node_modules/
+					'!tests/**',        // Exclude tests/
+					'!vendor/**',       // Exclude vendor/
+					'!build/**',        // Exclude build/
+					'!static/**',       // Exclude static resources
+					],
+					expand: true
+				}
+			},
+
+			wp_readme_to_markdown: {
+				target: {
+					files: {
+						'README.md': 'readme.txt'
+					},
+				},
+				options: {
+					pre_convert: function ( readme ) {
+						return readme.replace( /\*\*Note\*\*:/g, "> [!NOTE]\n>" );
+					}
+				}
+			}
+		}
+	);
+
+	grunt.loadNpmTasks( 'grunt-wp-readme-to-markdown' );
+	grunt.loadNpmTasks( 'grunt-checktextdomain' );
+
+	// Default task(s).
+	grunt.registerTask( 'default', ['wp_readme_to_markdown', 'checktextdomain'] );
+};

README.md

@@ -1,35 +1,33 @@
-# ActivityPub Event Bridge
+# ActivityPub Event Bridge #
-
+**Contributors:** [andremenrath](https://profiles.wordpress.org/andremenrath/)  
-Contributors: andremenrath  
+**Tags:** events, fediverse, activitypub, calendar  
-Tags: events, fediverse, activitypub, calendar  
+**Requires at least:** 6.5  
-Requires at least: 6.5  
+**Tested up to:** 6.6  
-Tested up to: 6.6  
+**Stable tag:** 0.2.0  
-Stable tag: 0.1.0  
+**Requires PHP:** 7.4  
-Requires PHP: 8.1  
+**License:** AGPL-3.0-or-later  
-License: AGPL-3.0-or-later  
+**License URI:** https://www.gnu.org/licenses/agpl-3.0.html  
-License URI: https://www.gnu.org/licenses/agpl-3.0.html  
-
 Integrating popular event plugins with the ActivityPub plugin.
 
-![](.wordpress-org/banner-1544x500.jpg)
+![Federate your Events, Expand your Reach!](.wordpress-org/banner-1544x500.jpg)
 
-## Description
+## Description ##
 
 Make your events more discoverable, expand your reach effortlessly while being independent of other (commercial) platforms, and be a part of the growing decentralized web (the Fediverse).
-With the ActivityPub Event Bridge plugin for WordPress, your events can be automatically followed, aggregated and displayed across decentralized platforms like [Mastodon](https://joinmastodon.org) or [Gancio](https://gancio.org), without any extra work.
+With the ActivityPub Event Bridge Plugin for WordPress, your events can be automatically followed, aggregated and displayed across decentralized platforms like [Mastodon](https://joinmastodon.org) or [Gancio](https://gancio.org), without any extra work.
 Forget the hassle of managing multiple social media accounts just to keep your audience informed.
 
 This plugin is not an event managing plugin but an add-on to popular event plugins. It extends their functionality to fully support the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/).
 With the ActivityPub plugin people can follow your website directly and engage with your events just as they would on social media: liking, boosting and even commenting if you enable it.
 You retain full ownership of your content. By integrating into your existing setup, it ensures no extra work is needed while enhancing your events' visibility across the web.
 
-### How It Works
+### How It Works ###
 
 With the ActivityPub Event Bridge WordPress plugin, sharing your events is effortless and automatic!
 Once you create an event on your WordPress site, it is seamlessly shared across the decentralized web using the ActivityPub protocol.
 
 <p align="center">
-    <img src="./.wordpress-org/event-activitypub-publishing.gif" alt="Logo" width="250" />
+    <img src="./.wordpress-org/event-activitypub-publishing.gif" alt="Logo" width="300"/>
 </p>
 
 Your events can be automatically delivered to platforms that fully support events, such as [Mobilizon](https://joinmobilizon.org/), [Gancio](https://gancio.org), [Friendica](https://friendi.ca), [Hubzilla](https://hubzilla.org), and [Pleroma](https://pleroma.social/).
@@ -42,9 +40,9 @@ These platforms create public event calendars by pulling in events from various
 Even platforms that don't yet fully support events, like [Mastodon](https://joinmastodon.org), will still receive a detailed, well-composed summary of your event.
 The Event Federation plugin ensures that users from those platforms are provided with all important information about an event.
 
-### Features for Your WordPress Events and the Fediverse
+### Features for Your WordPress Events and the Fediverse ###
 
-**ActivityPub-Enabled Event Sharing:** Your WordPress events are not part of the Fediverse and
+**ActivityPub-Enabled Event Sharing:** Your WordPress events are now compatible with the Fediverse, using the ActivityStreams format. This means your events can be easily discovered and followed by users on platforms like Mastodon and other ActivityPub-compatible services.
 
 **Automatic Event Summaries:** When your event is shared on the Fediverse, platforms like Mastodon that don't fully support events will display a brief HTML summary of key details — such as the event's title, start time, and location. This ensures that even if someone can't view the full event on their platform, they still get the important info at a glance, with a link to your WordPress event page.
 
@@ -52,11 +50,11 @@ The Event Federation plugin ensures that users from those platforms are provided
 
 **Event Reminders for Your Followers:** Often, events are planned well in advance. To keep your followers informed right in time, you can set up reminders that are supposed to trigger the events showing up in their timelines right before the event starts. At the moment this reminder is implemented as a self-boost of your original event post. While this feature may behave differently across various platforms, we are working on a more robust solution that will let you schedule dedicated reminder notes that appear in all followers' timelines.
 
-## Installation
+## Installation ##
 
-This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/). Additionally, you need to use one of the supported event plugins. See below.
+This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/). Additionally, you need to use one of the supported event Plugins.
 
-### Supported Event plugins
+### Supported Event Plugins ###
 
 * [The Events Calendar](https://de.wordpress.org/plugins/the-events-calendar/)
 * [VS Event List](https://de.wordpress.org/plugins/very-simple-event-list/)
@@ -66,41 +64,41 @@ This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/ac
 * [Modern Events Calendar Lite](https://webnus.net/modern-events-calendar/)
 * [GatherPress](https://gatherpress.org/)
 
-## Configuration
+## Configuration ##
 
-If you’re new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it’s recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality.
+If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it’s recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality.
 
-##  Frequently Asked Questions
+## Frequently Asked Questions ##
 
-### Do I need to install another event plugin to use the Event Federation plugin?
+### Do I need to install another event plugin to use the Event Federation Plugin? ###
 
 Yes, this plugin works as an add-on and requires both the ActivityPub plugin and a supported event plugin such as The Events Calendar, VS Event List, or Events Manager to manage your events. It just fills the missing gap between event plugins and the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/).
+### What platforms can follow my events? ###
 
-### What platforms can follow my events?
+Your events can be followed on platforms that support ActivityPub like [Mobilizon](https://joinmobilizon.org/), [Gancio](https://gancio.org), [Friendica](https://friendi.ca), [Hubzilla](https://hubzilla.org), and [Pleroma](https://pleroma.social/). Even other applications like [Mastodon](https://joinmastodon.org), which don't fully support events yet, will display all important information about the events.
-Your events can be followed on platforms that support ActivityPub like [Mobilizon](https://joinmobilizon.org/), [Gancio](https://gancio.org), [Friendica](https://friendi.ca), [Hubzilla](https://hubzilla.org), and [Pleroma](https://pleroma.social/). Even other applications like [Mastodon](https://joinmastodon.org), which don’t fully support events yet, will display all important information about the events.
 
-### How much extra work is required to maintain my events across the decentralized Web?
+### How much extra work is required to maintain my events across the decentralized Web? ###
 
 None! Once the plugin is set up, your events are automatically sent to all connected platforms or account that follow you (your Website). Any updates you make to your events are synced without additional effort.
 
-### Can I still use social media to promote my events?
+### Can I still use social media to promote my events? ###
 
 Yes, you can still use traditional social media if you wish. However, this plugin helps reduce reliance on commercial platforms by connecting your events to the decentralized Fediverse.
 
-### Will this plugin work if I don't use the ActivityPub plugin?
+### Will this plugin work if I don't use the ActivityPub plugin? ###
 
-No, the Event Federation plugin depends on the ActivityPub plugin to deliver your events across decentralized platforms, so it's essential to have it installed and configured.
+No, the Event Federation Plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/) to deliver your events across decentralized platforms, so it's essential to have it installed and configured.
 
-### My event plugin is not supported, what can I do?
+### My event plugin is not supported, what can I do? ###
 
 If you know about coding have a look at the documentation of how to add your plugin or open an [issue](https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/issues), if we can spare some free hours we might add it.
 
-### What if I experience problems?
+### What if I experience problems? ###
 
 We're always interested in your feedback. Feel free to reach out to us via [E-Mail](https://event-federation.eu/contact/) or create an [issue](https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/issues).
 
-## Changelog
+## Changelog ##
 
-### [0.1.0] 2024-10-01
+### [0.2.0] 2024-10-29 ###
 
-* Initial alpha release on WordPress.org
+* Initial release on https://wordpress.org/

activitypub-event-bridge.php

@@ -3,15 +3,15 @@
  * Plugin Name:  ActivityPub Event Bridge
  * Description:  Integrating popular event plugins with the ActivityPub plugin.
  * Plugin URI:   https://event-federation.eu/
- * Version:      0.1.1
+ * Version:      0.2.0
  * Author:       André Menrath
  * Author URI:   https://graz.social/@linos
  * Text Domain:  activitypub-event-bridge
  * License:      AGPL-3.0-or-later
- * License URI:  https://www.gnu.org/licenses/agpl-3.0.de.html
+ * License URI:  https://www.gnu.org/licenses/agpl-3.0.html
- * Requires PHP: 8.1
+ * Requires PHP: 7.4
  *
- * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 3.3.3.
+ * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 4.0.1.
  *
  * @package ActivityPub_Event_Bridge
  * @license AGPL-3.0-or-later

composer.json

@@ -4,7 +4,7 @@
     "description": "The ActivityPub Event Bridge help for event custom post types to federate properly.",
     "type": "wordpress-plugin",
     "require": {
-        "php": ">=8.1.0",
+        "php": ">=7.4.0",
         "composer/installers": "^2.0"
     },
     "require-dev": {

includes/activitypub/transformer/class-the-events-calendar.php

@@ -121,9 +121,9 @@ final class The_Events_Calendar extends Event {
 	/**
 	 * Get the event location.
 	 *
-	 * @return Place|array The place/venue if one is set.
+	 * @return ?Place The place/venue if one is set.
 	 */
-	public function get_location(): Place|null {
+	public function get_location(): ?Place {
 		// Get short handle for the venues.
 		$venues = $this->tribe_event->venues;
 

includes/admin/class-health-check.php

@@ -47,7 +47,7 @@ class Health_Check {
 	 */
 	public static function test_event_transformation() {
 		$result = array(
-			'label'       => \__( 'Transformation of Events to a valid ActivityStreams representation.', 'activitypub' ),
+			'label'       => \__( 'Transformation of Events to a valid ActivityStreams representation.', 'activitypub-event-bridge' ),
 			'status'      => 'good',
 			'badge'       => array(
 				'label' => \__( 'ActivityPub Event Bridge', 'activitypub-event-bridge' ),
@@ -172,7 +172,7 @@ class Health_Check {
 			'label'  => __( 'ActivityPub Event Bridge', 'activitypub-event-bridge' ),
 			'fields' => array(
 				'plugin_version'       => array(
-					'label'   => __( 'Plugin Version', 'activitypub' ),
+					'label'   => __( 'Plugin Version', 'activitypub-event-bridge' ),
 					'value'   => ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_VERSION,
 					'private' => true,
 				),

includes/class-settings.php

@@ -44,7 +44,7 @@ class Settings {
 			'activitypub_event_bridge_default_event_category',
 			array(
 				'type'              => 'string',
-				'description'       => \__( 'Define your own custom post template', 'activitypub' ),
+				'description'       => \__( 'Define your own custom post template', 'activitypub-event-bridge' ),
 				'show_in_rest'      => true,
 				'default'           => self::DEFAULT_EVENT_CATEGORY,
 				'sanitize_callback' => array( self::class, 'sanitize_mapped_event_category' ),
@@ -56,7 +56,7 @@ class Settings {
 			'activitypub_event_bridge_event_category_mappings',
 			array(
 				'type'              => 'array',
-				'description'       => \__( 'Define your own custom post template', 'activitypub' ),
+				'description'       => \__( 'Define your own custom post template', 'activitypub-event-bridge' ),
 				'default'           => array(),
 				'sanitize_callback' => array( self::class, 'sanitize_event_category_mappings' ),
 			)
@@ -67,7 +67,7 @@ class Settings {
 			'activitypub_event_bridge_initially_activated',
 			array(
 				'type'        => 'boolean',
-				'description' => \__( 'Whether the plugin just got activated for the first time.', 'activitypub' ),
+				'description' => \__( 'Whether the plugin just got activated for the first time.', 'activitypub-event-bridge' ),
 				'default'     => 1,
 			)
 		);

includes/class-setup.php

@@ -252,7 +252,7 @@ class Setup {
 	 *
 	 * @return \Activitypub\Transformer\Base|null
 	 */
-	public function register_activitypub_event_transformer( $transformer, $wp_object, $object_class ): \Activitypub\Transformer\Base|null {
+	public function register_activitypub_event_transformer( $transformer, $wp_object, $object_class ): \Activitypub\Transformer\Base {
 		// If the current WordPress object is not a post (e.g., a WP_Comment), don't change the transformer.
 		if ( 'WP_Post' !== $object_class ) {
 			return $transformer;

package.json

@@ -21,6 +21,9 @@
       "@wordpress/env": "^10.10.0",
       "@wordpress/scripts": "^30.0.2",
       "classnames": "^2.3.2",
+      "grunt": "^1.1.0",
+      "grunt-checktextdomain": "^1.0.1",
+      "grunt-wp-i18n": "^1.0.3",
       "grunt-wp-readme-to-markdown": "^2.0.1"
   }
 }

phpcs.xml

@@ -29,6 +29,9 @@
 	<!-- Exclude minified Javascript files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 
+	<!-- Exclude the Grundfile.js. -->
+	<exclude-pattern>Gruntfile.js</exclude-pattern>
+
 	<!-- Strip the filepaths down to the relevant bit. -->
 	<arg name="basepath" value="."/>
 

readme.txt

@@ -3,8 +3,8 @@ Contributors: andremenrath
 Tags: events, fediverse, activitypub, calendar
 Requires at least: 6.5
 Tested up to: 6.6
-Stable tag: 0.1.0
+Stable tag: 0.2.0
-Requires PHP: 8.1
+Requires PHP: 7.4
 License: AGPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/agpl-3.0.html
 Integrating popular event plugins with the ActivityPub plugin.
@@ -31,6 +31,8 @@ These platforms create public event calendars by pulling in events from various
 
 ![](./.wordpress-org/decentralized-event-calenders.gif)
 
+Even platforms that don't yet fully support events, like [Mastodon](https://joinmastodon.org), will still receive a detailed, well-composed summary of your event.
+The Event Federation plugin ensures that users from those platforms are provided with all important information about an event.
 
 = Features for Your WordPress Events and the Fediverse =
 
@@ -58,17 +60,16 @@ This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/ac
 
 == Configuration ==
 
-If you’re new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it’s recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality.
+If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it’s recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality.
 
 == Frequently Asked Questions ==
 
 = Do I need to install another event plugin to use the Event Federation Plugin? =
 
-Yes, this plugin works as an add-on and requires both the ActivityPub plugin and a supported event plugin such as The Events Calendar, VS Event List, or Events Manager to manage your events.
+Yes, this plugin works as an add-on and requires both the ActivityPub plugin and a supported event plugin such as The Events Calendar, VS Event List, or Events Manager to manage your events. It just fills the missing gap between event plugins and the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/).
-
 = What platforms can follow my events? =
 
-Your events can be followed on platforms that support ActivityPub like [Mobilizon](https://joinmobilizon.org/), [Gancio](https://gancio.org), [Friendica](https://friendi.ca), [Hubzilla](https://hubzilla.org), and [Pleroma](https://pleroma.social/). Even other applications like [Mastodon](https://joinmastodon.org), which don’t fully support events yet, will display all important information about the events.
+Your events can be followed on platforms that support ActivityPub like [Mobilizon](https://joinmobilizon.org/), [Gancio](https://gancio.org), [Friendica](https://friendi.ca), [Hubzilla](https://hubzilla.org), and [Pleroma](https://pleroma.social/). Even other applications like [Mastodon](https://joinmastodon.org), which don't fully support events yet, will display all important information about the events.
 
 = How much extra work is required to maintain my events across the decentralized Web? =
 
@@ -92,6 +93,6 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma
 
 == Changelog ==
 
-= [0.1.0] 2024-09-01 =
+= [0.2.0] 2024-10-29 =
 
-* Initial alpha release on WordPress.org
+* Initial release on https://wordpress.org/