Release: v2.4.1

.github/workflows/node-tests.yml

@@ -4,25 +4,10 @@ on:
   pull_request:
 
 jobs:
-  npm-ci:
-    name: (npm) Install, build, and test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        with:
-          all_but_latest: true
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: Install node dependencies (npm ci)
-        run: npm ci
-      - name: Run npm lint
-        run: npm run lint
-      - name: Run npm test
-        run: npm run test
-      - name: Run npm build
-        run: npm run build
+  node-tests:
+    uses: alleyinteractive/.github/.github/workflows/node-tests.yml@main
+    with:
+      ci: true
+      node: 16
+      run-audit: false
+      working-directory: ./

.github/workflows/phpcs.yml

@@ -1,25 +1,13 @@
 name: PHP Coding Standards
+
 on:
   pull_request:
-  workflow_dispatch:
+
 jobs:
   phpcs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        with:
-          all_but_latest: true
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.0'
-          coverage: none
-      - name: Validate Composer package
-        run: composer validate --strict
-      - name: Install dependencies
-        uses: ramsey/composer-install@v2
-      - name: Run PHPCS
-        run: composer phpcs
+    strategy:
+      matrix:
+        php: [ 8.0 ]
+    uses: alleyinteractive/.github/.github/workflows/php-coding-standards.yml@main
+    with:
+      php: ${{ matrix.php }}

.github/workflows/phpunit.yml

@@ -1,51 +1,16 @@
-name: Unit Tests
+name: Testing Suite
+
 on:
   pull_request:
-  workflow_dispatch:
+
 jobs:
-  tests:
-    name: "PHP: ${{ matrix.php }} (MU: ${{ matrix.multisite }})"
-    runs-on: ubuntu-latest
+  php-tests:
     strategy:
-      fail-fast: true
       matrix:
-        multisite: [0, 1]
-        php: ['8.0', '7.4', '7.3', '7.2', '7.1']
-    env:
-      WP_CORE_DIR: /tmp/wordpress/
-      WP_MULTISITE: ${{ matrix.multisite }}
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        with:
-          all_but_latest: true
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd
-          coverage: none
-      - name: Install dependencies
-        uses: ramsey/composer-install@v2
-      - name: Set up WordPress
-        run: |
-          bash <(curl -s "https://raw.githubusercontent.com/wp-cli/sample-plugin/master/bin/install-wp-tests.sh") wordpress_unit_tests root '' 127.0.0.1
-          rm -rf "${WP_CORE_DIR}wp-content/plugins"
-          mkdir -p "${WP_CORE_DIR}wp-content/plugins/publish-to-apple-news"
-          rsync -a --exclude=.git . "${WP_CORE_DIR}wp-content/plugins/publish-to-apple-news"
-          cd ${WP_CORE_DIR}wp-content/plugins/publish-to-apple-news && composer install
-      - name: Run tests
-        shell: bash
-        run: |
-          cd ${WP_CORE_DIR}/wp-content/plugins/publish-to-apple-news
-          composer run phpunit
+        php: ['8.2', '8.1', '8.0', '7.4']
+        wordpress: ["latest"]
+    uses: alleyinteractive/.github/.github/workflows/php-tests.yml@main
+    with:
+      command: "test"
+      php: ${{ matrix.php }}
+      wordpress: ${{ matrix.wordpress }}

composer.json

@@ -5,18 +5,22 @@
   "type"       : "wordpress-plugin",
   "license"    : "GPL-3.0-or-later",
   "require"    : {
-    "composer/installers": "~1.0",
-    "php": ">=7.1"
+    "composer/installers": "^1.12.0",
+    "php": "^8.0"
   },
   "require-dev": {
-    "phpspec/prophecy": "~1.0",
-    "alleyinteractive/alley-coding-standards": "^0.3.0",
-    "yoast/phpunit-polyfills": "^1.0"
+    "phpspec/prophecy": "^1.17.0",
+    "alleyinteractive/alley-coding-standards": "^2.0.1",
+    "yoast/phpunit-polyfills": "^2.0"
   },
   "scripts": {
     "phpcbf" : "phpcbf .",
     "phpcs" : "phpcs .",
-    "phpunit" : "phpunit"
+    "phpunit" : "phpunit",
+    "test": [
+      "@phpcs",
+      "@phpunit"
+    ]
   },
   "config": {
     "allow-plugins": {

includes/apple-exporter/builders/class-components.php

@@ -526,6 +526,10 @@ private function get_components_from_node( $node ) {
 	 */
 	private function get_image_full_size_url( $url ) {
 
+		if(null === $url) {
+			return '';
+		}
+
 		// Strip URL formatting for easier matching.
 		$url = urldecode( $url );
 

tests/admin/test-class-admin-apple-themes.php

@@ -16,6 +16,7 @@
  * A class which is used to test the Admin_Apple_Themes class.
  */
 class Admin_Apple_Themes_Test extends Apple_News_Testcase {
+	private Admin_Apple_Themes $themes;
 
 	/**
 	 * A helper function to create the default theme.

tests/apple-exporter/components/test-class-table.php

@@ -18,6 +18,8 @@
  * @subpackage Tests
  */
 class Apple_News_Table_Test extends Apple_News_Component_TestCase {
+	private string $html;
+	private string $html_caption;
 
 	/**
 	 * A fixture containing operations to be run before each test.

tests/mocks/function-coauthors.php

@@ -29,6 +29,10 @@ function coauthors( $between = ', ', $between_last = ' and ', $before = '', $aft
 	// Get last index.
 	$last_index = count( $apple_news_coauthors ) - 1;
 
+	if(null === $between) {
+		$between = ', ';
+	}
+
 	// Compute output.
 	$output = $before
 		. implode( $between, array_slice( $apple_news_coauthors, 0, $last_index ) )