Merge pull request #174 from iMattPro/updates

Small updates

Author: iMattPro

.github/workflows/tests.yml

@@ -93,24 +93,22 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.1"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.2"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.3"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.4"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mariadb:10.5"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mysql:5.6"
                       db_alias: "MyISAM Tests"
                       MYISAM: 1
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "mysql:5.6"
-                    - php: '7.1'
-                      db: "mysql:5.7"
                     - php: '7.2'
                       db: "mysql:5.7"
                       COVERAGE: 1
@@ -127,6 +125,8 @@ jobs:
                       db: "mysql:5.7"
                     - php: '8.2'
                       db: "mysql:5.7"
+                    - php: '8.3'
+                      db: "mysql:5.7"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
@@ -244,18 +244,16 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:9.5"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:9.6"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:10"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:11"
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "postgres:12"
-                    - php: '7.1'
-                      db: "postgres:13"
                     - php: '7.2'
                       db: "postgres:13"
                     - php: '7.3'
@@ -270,6 +268,8 @@ jobs:
                       db: "postgres:14"
                     - php: '8.2'
                       db: "postgres:14"
+                    - php: '8.3'
+                      db: "postgres:14"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
@@ -358,7 +358,7 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: '7.1'
+                    - php: '7.2'
                       db: "sqlite3"
                     - php: '7.2'
                       db: "mcr.microsoft.com/mssql/server:2017-latest"

acp/autogroups_module.php

@@ -50,7 +50,7 @@ public function main($id, $mode)
 		$this->tpl_name = 'manage_autogroups';
 
 		// Set the page title for our ACP auto groups
-		$this->page_title = $language->lang('ACP_AUTOGROUPS_MANAGE');
+		$this->page_title = 'ACP_AUTOGROUPS_MANAGE';
 
 		// Quick-submit settings from the general options form
 		if ($request->is_set_post('generalsubmit'))
@@ -64,7 +64,7 @@ public function main($id, $mode)
 			case 'add':
 			case 'edit':
 				// Set the page title for our ACP auto groups
-				$this->page_title = $language->lang(strtoupper("ACP_AUTOGROUPS_$action"));
+				$this->page_title = strtoupper("ACP_AUTOGROUPS_$action");
 
 				// Load the save auto group handle in the admin controller
 				$admin_controller->save_autogroup_rule($autogroups_id);

composer.json

@@ -65,7 +65,8 @@
 		"version-check": {
 			"host": "www.phpbb.com",
 			"directory": "/customise/db/extension/auto_groups",
-			"filename": "version_check"
+			"filename": "version_check",
+			"ssl": true
 		}
 	}
 }

tests/functional/lastvisit_test.php

@@ -25,10 +25,12 @@ public function test_autogroups_memberships()
 		$test_data = array(
 			'type' => 'lastvisit',
 			'group_name' => 'test-lastvisit',
-			'min' => 0,
-			'max' => 10,
+			'min' => 10,
+			'max' => 1000,
 		);
 
+		$test_user_id = $this->create_user('Bertie');
+
 		// Create a new test group
 		$group_id = $this->create_group($test_data['group_name']);
 		self::assertNotNull($group_id, 'Failed to create a test group.');
@@ -37,17 +39,17 @@ public function test_autogroups_memberships()
 		$autogroup_id = $this->create_autogroup_rule($test_data['type'], $group_id, $test_data['min'], $test_data['max']);
 		self::assertNotNull($autogroup_id, 'Failed to create an auto group rule set.');
 
-		// Run the cron job for a user with 2 days of membership, should add the user to the group
-		$this->update_user_lastvisit(2, 2)->reset_cron();
+		// Run the cron job for a user with 20 days since last visit, should add the user to the group
+		$this->update_user_lastvisit($test_user_id, 20)->reset_cron();
 		self::request('GET', "cron.php?cron_type=cron.task.autogroups_check&sid={$this->sid}", array(), false);
 		$this->purge_cache();
-		$this->assertInGroup(2, $test_data['group_name']);
+		$this->assertInGroup($test_user_id, $test_data['group_name']);
 
-		// Run the cron job for a user with 20 days of membership, should remove the user from the group
-		$this->update_user_lastvisit(2, 20)->reset_cron();
+		// Run the cron job for a user with 2 days since last visit, should remove the user from the group
+		$this->update_user_lastvisit($test_user_id, 2)->reset_cron();
 		self::request('GET', "cron.php?cron_type=cron.task.autogroups_check&sid={$this->sid}", array(), false);
 		$this->purge_cache();
-		$this->assertNotInGroup(2, $test_data['group_name']);
+		$this->assertNotInGroup($test_user_id, $test_data['group_name']);
 	}
 
 	/**