Release rtcamp merge

.github/workflows/create.yml

@@ -15,5 +15,5 @@ jobs:
           EXCLUDE_LIST: .gitattributes .gitignore .travis.yml README.md deploy.sh readme.sh
             tests map.conf nginx.log wercker.yml vendor
           SLUG: nginx-helper
-          WORDPRESS_PASSWORD: ${{ secrets.WORDPRESS_PASSWORD }}
-          WORDPRESS_USERNAME: ${{ secrets.WORDPRESS_USERNAME }}
+          WORDPRESS_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+          WORDPRESS_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/e2e-test.yml

@@ -5,15 +5,15 @@ name: End-to-End Tests
 # Controls when the workflow will run
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    branches:
-      - develop
-      - master
+#   push:
+#     branches:
+#       - develop
+#       - master
 
-  pull_request:
-    branches:
-      - develop
-      - master
+#   pull_request:
+#     branches:
+#       - develop
+#       - master
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -52,7 +52,7 @@ jobs:
 
       - name: Archive HTML Report on failure
         if: failure()
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: report
           path: ./tests/e2e-playwright/config

admin/class-fastcgi-purger.php

@@ -2,8 +2,8 @@
 /**
  * The admin-specific functionality of the plugin.
  *
- * @link       https://rtcamp.com/nginx-helper/
- * @since      2.0.0
+ * @link       https://github.com/gridpane/nginx-helper/
+ * @since      9.9.10
  *
  * @package    nginx-helper
  * @subpackage nginx-helper/admin
@@ -14,7 +14,7 @@
  *
  * @package    nginx-helper
  * @subpackage nginx-helper/admin
- * @author     rtCamp
+ * @author     GridPane
  */
 class FastCGI_Purger extends Purger {
 
@@ -31,7 +31,7 @@ public function purge_url( $url, $feed = true ) {
 		/**
 		 * Filters the URL to be purged.
 		 *
-		 * @since 2.1.0
+		 * @since 9.9.10
 		 *
 		 * @param string $url URL to be purged.
 		 */
@@ -94,8 +94,29 @@ public function purge_url( $url, $feed = true ) {
 				break;
 
 		}
+
+		if( ( is_page() || is_single() ) && $nginx_helper_admin->options['purge_amp_urls'] ) {
+			$this->purge_amp_version( $url );
+		}
 
 	}
+
+	/**
+	 * Purge AMP version of a URL.
+	 *
+	 * @param string $url_base The base URL to purge.
+	 */
+	private function purge_amp_version( $url_base ) {
+		$amp_url = sprintf( '%s/amp/', rtrim( $url_base, '/' ) );
+
+		$this->log( '- Purging AMP URL | ' . $amp_url );
+
+		if ( 'unlink_files' === $this->nginx_helper_admin->options['purge_method'] ) {
+			$this->delete_cache_file_for( $amp_url );
+		} else {
+			$this->do_remote_get( $amp_url );
+		}
+	}
 
 	/**
 	 * Function to custom purge urls.
@@ -228,7 +249,7 @@ public function purge_all() {
 		/**
 		 * Fire an action after the FastCGI cache has been purged.
 		 *
-		 * @since 2.1.0
+		 * @since 9.9.10
 		 */
 		do_action( 'rt_nginx_helper_after_fastcgi_purge_all' );
 	}