fix return type mixed for php7.4

Use own transformers for `Place`

.forgejo/workflows/phpunit.yml

@@ -22,7 +22,6 @@ jobs:
     strategy:
       matrix:
         php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
-        wordpress-version: ['6.7']
     name: PHPUnit – PHP ${{ matrix.php-version }}
     env:
       extensions: mysql
@@ -38,7 +37,7 @@ jobs:
           path: |
             ${{ env.WP_CORE_DIR }}
             ${{ env.WP_TESTS_DIR }}
-          key: cache-wordpress-67-2
+          key: cache-wordpress-9
 
       - name: Cache Composer
         id: cache-composer-phpunit
@@ -69,11 +68,11 @@ jobs:
 
       - name: Setup Test Environment
         if: steps.cache-wordpress.outputs.cache-hit != 'true'
-        run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wordpress-version }} false false false false
+        run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 6.6 false false false false
 
       - name: Initialize WordPress test database
         if: steps.cache-wordpress.outputs.cache-hit != 'false'
-        run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wordpress-version }} false true true true
+        run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 6.6 false true true true
 
       - name: Run Integration tests for The Events Calendar
         run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=the_events_calendar

CHANGELOG.md

@@ -5,24 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [0.1.0] - 2024-10-20
-
-### Fixed
-
-* Fixed that transformer hook function might also return `null`.
-
-## [0.2.1] - 2024-11-16
 
 ### Added
 
-* Initial release on WordPress.org
+* Initial version tag.
-
-### Fixed
-
-* Applied some WordPress best practices
-
-## [0.2.0] - 2024-10-20
-
-### Added
-
-* Initial submission to WordPress.org

README.md

@@ -2,8 +2,8 @@
 **Contributors:** [andremenrath](https://profiles.wordpress.org/andremenrath/)  
 **Tags:** events, fediverse, activitypub, calendar  
 **Requires at least:** 6.5  
-**Tested up to:** 6.7  
+**Tested up to:** 6.6  
-**Stable tag:** 0.2.1  
+**Stable tag:** 0.2.0  
 **Requires PHP:** 7.4  
 **License:** AGPL-3.0-or-later  
 **License URI:** https://www.gnu.org/licenses/agpl-3.0.html  
@@ -73,7 +73,6 @@ If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activity
 ### 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? ###
 
 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.
@@ -100,16 +99,6 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma
 
 ## Changelog ##
 
-## Unreleased
-
-### Fixed
-
-* Fixed that transformer hook function might also return `null`.
-
-### [0.2.1] 2024-11-16 ###
-
-* Initial release on https://wordpress.org/
-
 ### [0.2.0] 2024-10-29 ###
 
-* Initial submission to https://wordpress.org/
+* Initial release on https://wordpress.org/

activitypub-event-bridge.php

@@ -3,7 +3,7 @@
  * Plugin Name:  ActivityPub Event Bridge
  * Description:  Integrating popular event plugins with the ActivityPub plugin.
  * Plugin URI:   https://event-federation.eu/
- * Version:      0.2.1
+ * Version:      0.2.0
  * Author:       André Menrath
  * Author URI:   https://graz.social/@linos
  * Text Domain:  activitypub-event-bridge
@@ -11,7 +11,7 @@
  * License URI:  https://www.gnu.org/licenses/agpl-3.0.html
  * Requires PHP: 7.4
  *
- * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 4.2.0.
+ * 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

bin/install-wp-tests.sh

@@ -208,15 +208,9 @@ install_wp_plugin() {
 	fi
 
 	# Get the latest tag.
-	if [ -z "$2" ]; then
+    LATEST_TAG=$(svn log https://plugins.svn.wordpress.org/$PLUGIN_NAME/tags --limit 1 | awk 'NR == 4 { print $4 }')
-		LATEST_TAG=$(svn log https://plugins.svn.wordpress.org/$PLUGIN_NAME/tags --limit 1 | awk 'NR == 4 { print $4 }')
+	if [ -n "$LATEST_TAG" ]; then
-		PLUGIN_VERSION=$LATEST_TAG
+		PLUGIN_FILE="$PLUGIN_NAME.$LATEST_TAG.zip"
-	else
-		PLUGIN_VERSION=$2
-	fi
-	
-	if [ -n "$PLUGIN_VERSION" ]; then
-		PLUGIN_FILE="$PLUGIN_NAME.$PLUGIN_VERSION.zip"
 	else
 		PLUGIN_FILE="$PLUGIN_NAME.zip"
 	fi
@@ -254,12 +248,12 @@ install_wp_plugins() {
 	# Install the one and only ActivityPub plugin (greetings @pfefferle).
 	install_wp_plugin activitypub
 	# Install (not-activate) all supported event plugins.
-	install_wp_plugin the-events-calendar "6.8.1"
+	install_wp_plugin the-events-calendar
 	install_wp_plugin very-simple-event-list
 	install_wp_plugin gatherpress
-	install_wp_plugin events-manager "6.6.3"
+	install_wp_plugin events-manager
-	install_wp_plugin wp-event-manager "3.1.45.1"
+	install_wp_plugin wp-event-manager
-	install_wp_plugin wp-event-solution "4.0.14"
+	install_wp_plugin wp-event-solution
 	# Mec is not installable via wordpress.org, we use our own mirror.
 	install_wp_plugin_mec
 }

composer.json

@@ -58,7 +58,7 @@
         ],
         "test-debug": [
             "@prepare-test",
-            "@test-gatherpress"
+            "@test-the-events-calendar"
         ],
         "test-vs-event-list": "phpunit --filter=vs_event_list",
         "test-the-events-calendar": "phpunit --filter=the_events_calendar",

docs/add_your_event_plugin.md

@@ -180,7 +180,7 @@ In the pipeline we want to run each event plugins integration tests in a single
 To activate/load your plugin add it to the switch statement within the function `_manually_load_plugin()` within `tests/bootstrap.php`.
 
 ```php
-	switch ( $activitypub_event_bridge_integration_filter ) {
+	switch ( $activitypub_event_extension_integration_filter ) {
     ...
     case 'my_event_plugin':
 			$plugin_file = 'my-event-plugin/my-event-plugin.php';

includes/activitypub/transformer/event/class-event.php

@@ -6,7 +6,7 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
@@ -64,17 +64,6 @@ abstract class Event extends Post {
 		return '[ap_content]';
 	}
 
-	/**
-	 * Returns the title of the event.
-	 *
-	 * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-name
-	 *
-	 * @return string The name.
-	 */
-	protected function get_name(): string {
-		return $this->wp_object->post_title;
-	}
-
 	/**
 	 * Extend the construction of the Post Transformer to also set the according taxonomy of the event post type.
 	 *
@@ -213,7 +202,7 @@ abstract class Event extends Post {
 			return '';
 		}
 		$address = $location->get_address();
-		if ( ! $address ) {
+		if ( ! $address && is_string( $location->get_name() ) ) {
 			return $location->get_name();
 		}
 		if ( is_string( $address ) ) {
@@ -370,7 +359,7 @@ abstract class Event extends Post {
 		$activitypub_object->set_to(
 			array(
 				'https://www.w3.org/ns/activitystreams#Public',
-				$this->get_actor_object()->get_followers(), // this fails on my machine.
+				$this->get_actor_object()->get_followers(),
 			)
 		);
 

includes/activitypub/transformer/event/class-eventin.php

@@ -8,15 +8,13 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Place;
-use ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Event;
-use DateTime;
-use DateTimeZone;
 use Etn\Core\Event\Event_Model;
 
 use function Activitypub\esc_hashtag;

includes/activitypub/transformer/event/class-events-manager.php

@@ -6,13 +6,13 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Place;
-use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Event as Event_Transformer;
 use DateTime;
 use DateTimeZone;
 use EM_Event;

includes/activitypub/transformer/event/class-gatherpress.php

@@ -6,14 +6,14 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Event as Event_Object;
 use Activitypub\Activity\Extended_Object\Place;
-use ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Event;
 use GatherPress\Core\Event as GatherPress_Event;
 
 /**

includes/activitypub/transformer/event/class-modern-events-calendar-lite.php

@@ -6,14 +6,13 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Place;
-use ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Event;
-
 use MEC;
 use MEC\Events\Event as MEC_Event;
 use MEC_main;

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

@@ -6,13 +6,14 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Place;
-use ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Event;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Location\The_Events_Calendar as The_Events_Calendar_Location;
 use WP_Post;
 
 use function Activitypub\esc_hashtag;
@@ -140,42 +141,9 @@ final class The_Events_Calendar extends Event {
 			return null;
 		}
 
-		// Set the address.
+		$location_transformer = new The_Events_Calendar_Location( $venue );
-		$address = array();
+		$full_location_object = false;
-
+		$location             = $location_transformer->to_object( $full_location_object );
-		if ( ! empty( $venue->country ) ) {
-			$address['addressCountry'] = $venue->country;
-		}
-
-		if ( ! empty( $venue->city ) ) {
-			$address['addressLocality'] = $venue->city;
-		}
-
-		if ( ! empty( $venue->province ) ) {
-			$address['addressRegion'] = $venue->province;
-		}
-
-		if ( ! empty( $venue->zip ) ) {
-			$address['postalCode'] = $venue->zip;
-		}
-
-		if ( ! empty( $venue->address ) ) {
-			$address['streetAddress'] = $venue->address;
-		}
-		if ( ! empty( $venue->post_title ) ) {
-			$address['name'] = $venue->post_title;
-		}
-		$address['type'] = 'PostalAddress';
-
-		$location = new Place();
-		if ( count( $address ) > 1 ) {
-			$location->set_address( $address );
-		} else {
-			$location->set_address( $venue->post_title );
-		}
-		$location->set_id( $venue->ID );
-		$location->set_name( $venue->post_title );
-
 		return $location;
 	}
 

includes/activitypub/transformer/event/class-vs-event-list.php

@@ -6,13 +6,13 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Place;
-use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Event as Event_Transformer;
 
 /**
  * ActivityPub Transformer for VS Event.

includes/activitypub/transformer/event/class-wp-event-manager.php

@@ -6,13 +6,13 @@
  * @license AGPL-3.0-or-later
  */
 
-namespace ActivityPub_Event_Bridge\Activitypub\Transformer;
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Event;
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 
 use Activitypub\Activity\Extended_Object\Place;
-use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer;
+use ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Event as Event_Transformer;
 use DateTime;
 
 /**

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

@@ -0,0 +1,125 @@
+<?php
+/**
+ * ActivityPub Tribe Transformer
+ *
+ * @package ActivityPub_Event_Bridge
+ * @license AGPL-3.0-or-later
+ */
+
+namespace ActivityPub_Event_Bridge\Activitypub\Transformer\Location;
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
+
+use Activitypub\Activity\Extended_Object\Place;
+use Activitypub\Transformer\Post;
+use WP_Post;
+
+/**
+ * ActivityPub Tribe Transformer
+ *
+ * @since 1.0.0
+ */
+final class The_Events_Calendar extends Post {
+	/**
+	 * Set the type of the object.
+	 */
+	public function get_type(): string {
+		return 'Place';
+	}
+
+	/**
+	 * Set the type of the object.
+	 */
+	public function get_replies() {
+		return null;
+	}
+
+	/**
+	 * Set the type of the object.
+	 */
+	public function get_sensitive() {
+		return null;
+	}
+
+	/**
+	 * Get the event location.
+	 *
+	 * @return array|string|null The place/venue if one is set.
+	 */
+	public function get_address() {
+		$address = array();
+
+		if ( ! empty( $this->wp_object->country ) ) {
+			$address['addressCountry'] = $this->wp_object->country;
+		}
+
+		if ( ! empty( $this->wp_object->city ) ) {
+			$address['addressLocality'] = $this->wp_object->city;
+		}
+
+		if ( ! empty( $this->wp_object->province ) ) {
+			$address['addressRegion'] = $this->wp_object->province;
+		}
+
+		if ( ! empty( $this->wp_object->zip ) ) {
+			$address['postalCode'] = $this->wp_object->zip;
+		}
+
+		if ( ! empty( $this->wp_object->address ) ) {
+			$address['streetAddress'] = $this->wp_object->address;
+		}
+		if ( ! empty( $this->wp_object->post_title ) ) {
+			$address['name'] = $this->wp_object->post_title;
+		}
+		$address['type'] = 'PostalAddress';
+
+		if ( count( $address ) > 1 ) {
+			return $address;
+		} else {
+			return $this->get_name();
+		}
+	}
+
+	/**
+	 * Generic function that converts an WP-Event object to an ActivityPub-Event object.
+	 *
+	 * @param bool $full_object bool Return an object with all properties set, or a minimal one as used within an `as:Event`s location.
+	 * @return Event_Object
+	 */
+	public function to_object( $full_object = true ): Place {
+		$activitypub_object = new Place();
+		$activitypub_object = $this->transform_object_properties( $activitypub_object );
+
+		if ( ! empty( $activitypub_object->content ) ) {
+			$activitypub_object->set_content_map(
+				array(
+					$this->get_locale() => $this->get_content(),
+				)
+			);
+		}
+
+		if ( $full_object ) {
+			$published = \strtotime( $this->wp_object->post_date_gmt );
+
+			$activitypub_object->set_published( \gmdate( 'Y-m-d\TH:i:s\Z', $published ) );
+
+			$updated = \strtotime( $this->wp_object->post_modified_gmt );
+
+			if ( $updated > $published ) {
+				$activitypub_object->set_updated( \gmdate( 'Y-m-d\TH:i:s\Z', $updated ) );
+			}
+
+			$activitypub_object->set_to(
+				array(
+					'https://www.w3.org/ns/activitystreams#Public',
+					$this->get_actor_object()->get_followers(),
+				)
+			);
+		}
+
+		$activitypub_object->set_address( $this->get_address() );
+
+		return $activitypub_object;
+	}
+}

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 {
+	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;

includes/plugins/class-event-plugin.php

@@ -83,6 +83,6 @@ abstract class Event_Plugin {
 	 * Returns the Activitypub transformer for the event plugins event post type.
 	 */
 	public static function get_activitypub_event_transformer_class(): string {
-		return str_replace( 'Plugins', 'Activitypub\Transformer', static::class );
+		return str_replace( 'Plugins', 'Activitypub\Transformer\Event', static::class );
 	}
 }

includes/plugins/class-modern-events-calendar-lite.php

@@ -38,7 +38,7 @@ final class Modern_Events_Calendar_Lite extends Event_plugin {
 	 */
 	public static function get_post_type(): string {
 		// See MEC_feature_events->get_main_post_type().
-		return 'mec-events';
+		return apply_filters( 'mec_post_type_name', 'mec-events' ); // phpcs:ignore
 	}
 
 	/**

readme.txt

@@ -2,8 +2,8 @@
 Contributors: andremenrath
 Tags: events, fediverse, activitypub, calendar
 Requires at least: 6.5
-Tested up to: 6.7
+Tested up to: 6.6
-Stable tag: 0.2.1
+Stable tag: 0.2.0
 Requires PHP: 7.4
 License: AGPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/agpl-3.0.html
@@ -67,7 +67,6 @@ If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activity
 = 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? =
 
 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.
@@ -94,10 +93,6 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma
 
 == Changelog ==
 
-= [0.2.1] 2024-11-16 =
-
-* Initial release on https://wordpress.org/
-
 = [0.2.0] 2024-10-29 =
 
-* Initial submission to https://wordpress.org/
+* Initial release on https://wordpress.org/

templates/admin-header.php

@@ -5,9 +5,6 @@
  * @package ActivityPub_Event_Bridge
  */
 
-// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
-
 /* @var array $args Template arguments. */
 $args = wp_parse_args(
 	$args,

tests/bootstrap.php

@@ -35,10 +35,10 @@ function _manually_load_plugin() {
 	require_once $plugin_dir . 'activitypub/activitypub.php';
 
 	// Capture the --filter argument.
-	$activitypub_event_bridge_integration_filter = null;
+	$activitypub_event_extension_integration_filter = null;
 	foreach ( $_SERVER['argv'] as $arg ) {
 		if ( strpos( $arg, '--filter=' ) === 0 ) {
-			$activitypub_event_bridge_integration_filter = substr( $arg, strlen( '--filter=' ) );
+			$activitypub_event_extension_integration_filter = substr( $arg, strlen( '--filter=' ) );
 			break;
 		}
 	}
@@ -49,7 +49,7 @@ function _manually_load_plugin() {
 
 	$plugin_file = null;
 	// See if we want to run integration tests for a specific event-plugin.
-	switch ( $activitypub_event_bridge_integration_filter ) {
+	switch ( $activitypub_event_extension_integration_filter ) {
 		case 'the_events_calendar':
 			$plugin_file = 'the-events-calendar/the-events-calendar.php';
 			break;
@@ -84,14 +84,14 @@ function _manually_load_plugin() {
 	}
 
 	// Hot fix that allows using Events Manager within unit tests, because the em_init() is later not run as admin.
-	if ( 'events_manager' === $activitypub_event_bridge_integration_filter ) {
+	if ( 'events_manager' === $activitypub_event_extension_integration_filter ) {
 		require_once $plugin_dir . 'events-manager/em-install.php';
 		em_create_events_table();
 		em_create_events_meta_table();
 		em_create_locations_table();
 	}
 
-	if ( 'modern_events_calendar_lite' === $activitypub_event_bridge_integration_filter ) {
+	if ( 'modern_events_calendar_lite' === $activitypub_event_extension_integration_filter ) {
 		require_once $plugin_dir . 'modern-events-calendar-lite/app/libraries/factory.php';
 		$mec_factory = new MEC_factory();
 		$mec_factory->install();

tests/test-class-plugin-eventin.php

@@ -64,7 +64,7 @@ class Test_Eventin extends WP_UnitTestCase {
 		$transformer = \Activitypub\Transformer\Factory::get_transformer( get_post( $event->id ) );
 
 		// Check that we got the right transformer.
-		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Eventin::class, $transformer );
+		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Eventin::class, $transformer );
 	}
 
 	/**

tests/test-class-plugin-events-manger.php

@@ -61,7 +61,7 @@ class Test_Events_Manager extends WP_UnitTestCase {
 		$transformer = \Activitypub\Transformer\Factory::get_transformer( $wp_object );
 
 		// Check that we got the right transformer.
-		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Events_Manager::class, $transformer );
+		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Events_Manager::class, $transformer );
 	}
 
 	/**

tests/test-class-plugin-gatherpress.php

@@ -65,7 +65,7 @@ class Test_GatherPress extends WP_UnitTestCase {
 		$transformer = \Activitypub\Transformer\Factory::get_transformer( $event->event );
 
 		// Check that we got the right transformer.
-		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\GatherPress::class, $transformer );
+		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event\GatherPress::class, $transformer );
 	}
 
 	/**

tests/test-class-plugin-modern-events-calendar-lite.php

@@ -74,7 +74,7 @@ class Test_Modern_Events_Calendar_Lite extends WP_UnitTestCase {
 		$transformer = \Activitypub\Transformer\Factory::get_transformer( $wp_object );
 
 		// Check that we got the right transformer.
-		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Modern_Events_Calendar_Lite::class, $transformer );
+		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event\Modern_Events_Calendar_Lite::class, $transformer );
 	}
 
 	/**

tests/test-class-plugin-the-events-calendar.php

@@ -91,7 +91,7 @@ class Test_The_Events_Calendar extends WP_UnitTestCase {
 		$transformer = \Activitypub\Transformer\Factory::get_transformer( $wp_object );
 
 		// Check that we got the right transformer.
-		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\The_Events_Calendar::class, $transformer );
+		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event\The_Events_Calendar::class, $transformer );
 	}
 
 	/**
@@ -192,6 +192,7 @@ class Test_The_Events_Calendar extends WP_UnitTestCase {
 			->create();
 
 		// Call the transformer.
+
 		$event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array();
 
 		// Check that the event ActivityStreams representation contains everything as expected.

tests/test-class-plugin-vs-event-list.php

@@ -58,7 +58,7 @@ class Test_VS_Event_List extends WP_UnitTestCase {
 		$transformer = \Activitypub\Transformer\Factory::get_transformer( $wp_object );
 
 		// Check that we got the right transformer.
-		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\VS_Event_List::class, $transformer );
+		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event\VS_Event_List::class, $transformer );
 	}
 
 	/**

tests/test-class-plugin-wp-event-manager.php

@@ -58,7 +58,7 @@ class Test_WP_Event_Manager extends WP_UnitTestCase {
 		$transformer = \Activitypub\Transformer\Factory::get_transformer( $wp_object );
 
 		// Check that we got the right transformer.
-		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\WP_Event_Manager::class, $transformer );
+		$this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event\WP_Event_Manager::class, $transformer );
 	}
 
 	/**