Try: Make code coverage work

.github/workflows/pr-coverage.yml

@@ -0,0 +1,48 @@
+name: Run Codecov on PR
+on:
+    pull_request
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    services:
+      database:
+        image: mysql:5.6
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up PHP 8.1
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          tools: composer
+          extensions: mysql
+          coverage: xdebug
+
+      - name: Get cached composer directories
+        uses: actions/cache@v2
+        with:
+          path: ./vendor
+          key: ${{ runner.os }}-${{ hashFiles('./composer.lock') }}
+
+      - name: Install dependencies
+        run: composer self-update && composer require --dev --no-update phpunit/phpunit:^9.5 && composer update && composer install && composer dump-autoload
+
+      - name: Init database and WordPress
+        run: ./tests/bin/install.sh woo_test root root 127.0.0.1 latest
+
+      - name: Run tests and collect coverage
+        run: XDEBUG_MODE=coverage ./vendor/bin/phpunit -c ./tests/phpunit.xml.dist --coverage-clover coverage.xml
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4-beta
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}

.github/workflows/pr-unit-tests.yml

@@ -29,7 +29,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -85,7 +85,3 @@ jobs:
         run: |
           ./vendor/bin/phpunit --version
           WP_MULTISITE=${{ matrix.multisite }} ./vendor/bin/phpunit -c ./tests/phpunit.xml.dist
-
-      - name: Code Coverage
-        run: |
-          bash <(curl -s https://codecov.io/bash)

codecov.yml

@@ -1,5 +1,5 @@
 codecov:
-  branch: master
+  branch: trunk
 
 coverage:
   ignore:

composer.json

@@ -18,9 +18,6 @@
   "config": {
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
-    },
-    "platform": {
-      "php": "5.6"
     }
   },
   "archive": {

tests/ActionScheduler_UnitTestCase.php

@@ -9,14 +9,16 @@ class ActionScheduler_UnitTestCase extends WP_UnitTestCase {
 
 	/**
 	 * Perform test set-up work.
+	 * @before
 	 */
 	public function set_up() {
-		ActionScheduler_Callbacks::add_callbacks();
 		parent::set_up();
+		ActionScheduler_Callbacks::add_callbacks();
 	}
 
 	/**
 	 * Perform test tear-down work.
+	 * @after
 	 */
 	public function tear_down() {
 		ActionScheduler_Callbacks::remove_callbacks();

tests/phpunit/deprecated/ActionScheduler_UnitTestCase.php

@@ -9,14 +9,16 @@ class ActionScheduler_UnitTestCase extends WP_UnitTestCase {
 
 	/**
 	 * Perform test set-up work.
+	 * @before
 	 */
 	public function set_up() {
-		ActionScheduler_Callbacks::add_callbacks();
 		parent::set_up();
+		ActionScheduler_Callbacks::add_callbacks();
 	}
 
 	/**
 	 * Perform test tear-down work.
+	 * @after
 	 */
 	public function tear_down() {
 		ActionScheduler_Callbacks::remove_callbacks();

tests/phpunit/jobstore/ActionScheduler_DBStore_Test.php

@@ -7,14 +7,15 @@
  * @group tables
  */
 class ActionScheduler_DBStore_Test extends AbstractStoreTest {
+	/**
+	 * @before
+	 */
+	public function set_up() {
+		parent::set_up();
 
-	public function setUp() {
 		global $wpdb;
-
 		// Delete all actions before each test.
 		$wpdb->query( "DELETE FROM {$wpdb->actionscheduler_actions}" );
-
-		parent::setUp();
 	}
 
 	/**

tests/phpunit/jobstore/ActionScheduler_HybridStore_Test.php

@@ -14,8 +14,11 @@
 class ActionScheduler_HybridStore_Test extends ActionScheduler_UnitTestCase {
 	private $demarkation_id = 1000;
 
-	public function setUp() {
-		parent::setUp();
+	/**
+	 * @before
+	 */
+	public function set_up() {
+		parent::set_up();
 		if ( ! taxonomy_exists( PostStore::GROUP_TAXONOMY ) ) {
 			// register the post type and taxonomy necessary for the store to work
 			$store = new PostStore();
@@ -26,15 +29,18 @@ public function setUp() {
 		$hybrid->set_autoincrement( '', ActionScheduler_StoreSchema::ACTIONS_TABLE );
 	}
 
-	public function tearDown() {
-		parent::tearDown();
-
+	/*
+	 * @after
+	 */
+	public function tear_down() {
 		// reset the autoincrement index
 		/** @var \wpdb $wpdb */
 		global $wpdb;
 		$wpdb->query( "TRUNCATE TABLE {$wpdb->actionscheduler_actions}" );
 		$wpdb->query( "TRUNCATE TABLE {$wpdb->actionscheduler_logs}" );
 		delete_option( ActionScheduler_HybridStore::DEMARKATION_OPTION );
+
+		parent::tear_down();
 	}
 
 	public function test_actions_are_migrated_on_find() {

tests/phpunit/migration/ActionMigrator_Test.php

@@ -8,8 +8,11 @@
  * @group migration
  */
 class ActionMigrator_Test extends ActionScheduler_UnitTestCase {
-	public function setUp() {
-		parent::setUp();
+	/**
+	 * @before
+	 */
+	public function set_up() {
+		parent::set_up();
 		if ( ! taxonomy_exists( ActionScheduler_wpPostStore::GROUP_TAXONOMY )  ) {
 			// register the post type and taxonomy necessary for the store to work
 			$store = new ActionScheduler_wpPostStore();

tests/phpunit/migration/BatchFetcher_Test.php

@@ -8,8 +8,11 @@
  * @group migration
  */
 class BatchFetcher_Test extends ActionScheduler_UnitTestCase {
-	public function setUp() {
-		parent::setUp();
+	/**
+	 * @before
+	 */
+	public function set_up() {
+		parent::set_up();
 		if ( ! taxonomy_exists( PostStore::GROUP_TAXONOMY ) ) {
 			// register the post type and taxonomy necessary for the store to work
 			$store = new PostStore();

tests/phpunit/migration/LogMigrator_Test.php

@@ -7,8 +7,11 @@
  * @group migration
  */
 class LogMigrator_Test extends ActionScheduler_UnitTestCase {
-	function setUp() {
-		parent::setUp();
+	/**
+	 * @before
+	 */
+	function set_up() {
+		parent::set_up();
 		if ( ! taxonomy_exists( ActionScheduler_wpPostStore::GROUP_TAXONOMY )  ) {
 			// register the post type and taxonomy necessary for the store to work
 			$store = new ActionScheduler_wpPostStore();

tests/phpunit/migration/Runner_Test.php

@@ -11,8 +11,11 @@
  * @group migration
  */
 class Runner_Test extends ActionScheduler_UnitTestCase {
-	public function setUp() {
-		parent::setUp();
+	/**
+	 * @before
+	 */
+	public function set_up() {
+		parent::set_up();
 		if ( ! taxonomy_exists( PostStore::GROUP_TAXONOMY ) ) {
 			// register the post type and taxonomy necessary for the store to work
 			$store = new PostStore();

tests/phpunit/migration/Scheduler_Test.php

@@ -8,8 +8,11 @@
  * @group migration
  */
 class Scheduler_Test extends ActionScheduler_UnitTestCase {
-	public function setUp() {
-		parent::setUp();
+	/**
+	 * @before
+	 */
+	public function set_up() {
+		parent::set_up();
 		if ( ! taxonomy_exists( PostStore::GROUP_TAXONOMY ) ) {
 			// register the post type and taxonomy necessary for the store to work
 			$store = new PostStore();

tests/phpunit/procedural_api/procedural_api_Test.php

@@ -431,11 +431,19 @@ public function test_as_recover_from_incorrect_schema() {
 
 		// ensure that all four errors were logged to error_log.
 		$logged_errors = stream_get_contents( $error_capture );
-		$this->assertContains( 'Caught exception while enqueuing action "hook_17": Error saving action', $logged_errors );
-		$this->assertContains( 'Caught exception while enqueuing action "hook_18": Error saving action', $logged_errors );
-		$this->assertContains( 'Caught exception while enqueuing action "hook_19": Error saving action', $logged_errors );
-		$this->assertContains( 'Caught exception while enqueuing action "hook_20": Error saving action', $logged_errors );
-		$this->assertContains( "Unknown column 'priority' in 'field list'", $logged_errors );
+		if ( method_exists( $this, 'assertStringContainsString' ) ) {
+			$this->assertStringContainsString( 'Caught exception while enqueuing action "hook_17": Error saving action', $logged_errors );
+			$this->assertStringContainsString( 'Caught exception while enqueuing action "hook_18": Error saving action', $logged_errors );
+			$this->assertStringContainsString( 'Caught exception while enqueuing action "hook_19": Error saving action', $logged_errors );
+			$this->assertStringContainsString( 'Caught exception while enqueuing action "hook_20": Error saving action', $logged_errors );
+			$this->assertStringContainsString( "Unknown column 'priority' in 'field list'", $logged_errors );
+		} else {
+			$this->assertContains( 'Caught exception while enqueuing action "hook_17": Error saving action', $logged_errors );
+			$this->assertContains( 'Caught exception while enqueuing action "hook_18": Error saving action', $logged_errors );
+			$this->assertContains( 'Caught exception while enqueuing action "hook_19": Error saving action', $logged_errors );
+			$this->assertContains( 'Caught exception while enqueuing action "hook_20": Error saving action', $logged_errors );
+			$this->assertContains( "Unknown column 'priority' in 'field list'", $logged_errors );
+		}
 
 		// recreate the priority column.
 		$wpdb->query( "ALTER TABLE {$wpdb->actionscheduler_actions} ADD COLUMN priority tinyint(10) UNSIGNED NOT NULL DEFAULT 10" );

tests/phpunit/procedural_api/wc_get_scheduled_actions_Test.php

@@ -8,8 +8,11 @@ class as_get_scheduled_actions_Test extends ActionScheduler_UnitTestCase {
 	private $args = array();
 	private $groups = array();
 
-	public function setUp() {
-		parent::setUp();
+	/**
+	 * @before
+	 */
+	public function set_up() {
+		parent::set_up();
 
 		$store = ActionScheduler::store();