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>
fix typo
2024-10-31 16:40:26 +01:00 · 2024-10-29 21:23:50 +01:00 · 2024-10-29 21:12:59 +01:00 · 2024-10-29 15:23:35 +01:00
12 changed files with 58 additions and 29 deletions
--- a/.distignore
+++ b/.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
+vendor
--- a/.forgejo/workflows/phpunit.yml
+++ b/.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
--- a/.forgejo/workflows/release.yml
+++ b/.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 }}
--- a/.gitattributes
+++ b/.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
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@
 **Requires at least:** 6.5  
 **Tested up to:** 6.6  
 **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.
--- a/activitypub-event-bridge.php
+++ b/activitypub-event-bridge.php
@ -8,10 +8,10 @@
 * 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
- * Requires PHP: 8.1
+ * 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: 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
--- a/composer.json
+++ b/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": {
--- a/includes/activitypub/transformer/class-the-events-calendar.php
+++ b/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;

--- a/includes/admin/class-health-check.php
+++ b/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,
 				),
--- a/includes/class-settings.php
+++ b/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,
 			)
 		);
--- a/includes/class-setup.php
+++ b/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;
--- a/readme.txt
+++ b/readme.txt
@ -4,7 +4,7 @@ Tags: events, fediverse, activitypub, calendar
 Requires at least: 6.5
 Tested up to: 6.6
 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.
Author	SHA1	Message	Date
André Menrath	7f23ed17c0	Add support back to PHP 7.4+ (#71 ) All checks were successful PHP Code Checker / PHP Code Checker (push) Successful in 49s Details PHPUnit / PHPUnit – PHP 7.4 (push) Successful in 1m3s Details PHPUnit / PHPUnit – PHP 8.0 (push) Successful in 1m3s Details PHPUnit / PHPUnit – PHP 8.1 (push) Successful in 1m5s Details PHPUnit / PHPUnit – PHP 8.2 (push) Successful in 1m4s Details PHPUnit / PHPUnit – PHP 8.3 (push) Successful in 57s Details Reviewed-on: #71 Co-authored-by: André Menrath <andre.menrath@posteo.de> Co-committed-by: André Menrath <andre.menrath@posteo.de>	2024-10-31 16:40:26 +01:00
André Menrath	ba922e6030	fix typo All checks were successful PHP Code Checker / PHP Code Checker (push) Successful in 46s Details PHPUnit / PHPUnit – PHP 8.1 (push) Successful in 57s Details PHPUnit / PHPUnit – PHP 8.2 (push) Successful in 58s Details PHPUnit / PHPUnit – PHP 8.3 (push) Successful in 58s Details / upload-release (push) Successful in 3s Details	2024-10-29 21:23:50 +01:00
André Menrath	37bd66ee9b	Streamline the release process with forgejo actions (#74 ) Some checks failed PHP Code Checker / PHP Code Checker (push) Successful in 44s Details PHPUnit / PHPUnit – PHP 8.1 (push) Failing after 54s Details PHPUnit / PHPUnit – PHP 8.2 (push) Failing after 51s Details PHPUnit / PHPUnit – PHP 8.3 (push) Failing after 53s Details Also the .zip release files will only contain the needed production code, no development artifacts or tests. Reviewed-on: #74 Co-authored-by: André Menrath <andre.menrath@posteo.de> Co-committed-by: André Menrath <andre.menrath@posteo.de>	2024-10-29 21:12:59 +01:00
André Menrath	03026aea03	Add new first version of banner and icons, solves #17 (#73 ) All checks were successful PHP Code Checker / PHP Code Checker (push) Successful in 48s Details PHPUnit / PHPUnit – PHP 8.1 (push) Successful in 1m1s Details PHPUnit / PHPUnit – PHP 8.2 (push) Successful in 1m13s Details PHPUnit / PHPUnit – PHP 8.3 (push) Successful in 1m3s Details Reviewed-on: #73 Co-authored-by: André Menrath <andre.menrath@posteo.de> Co-committed-by: André Menrath <andre.menrath@posteo.de>	2024-10-29 15:23:35 +01:00