#3004 impliment transient clear

CalderaWP · Feb 20, 2019 · 8631ba8 · 8631ba8
1 parent d538bfe
commit 8631ba8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/classes/transient.php b/classes/transient.php
@@ -142,7 +142,12 @@ public static function submission_complete(){
 	 * Clear all schedule cron jobs
 	 */
 	public static function clear_wpcron(){
-
+		$transients = self::get_all();
+		if( ! empty($transients)){
+			foreach ($transients as $transient_id ){
+				wp_clear_scheduled_hook(self::CRON_ACTION, [$transient_id]);
+			}
+		}
 
 	}
 
@@ -154,9 +159,16 @@ public static function clear_wpcron(){
 	 * @return array
 	 */
 	public static function get_all(){
-
+		global $wpdb;
+		$like = '%' . $wpdb->esc_like( 'cftransdata' ) . '%';
+		$query = $wpdb->prepare( "SELECT option_name FROM wp_options WHERE option_name LIKE %s ", $like );
 		$return = [];
-
+		$results = $wpdb->get_results($query,ARRAY_A);
+		if( ! empty( $results) ){
+			foreach ($results as $result ){
+				$return[] = $result[ 'option_name' ];
+			}
+		}
 		return $return;
 	}
 

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,5 +10,8 @@
 		<testsuite>
 			<directory prefix="test-" suffix=".php">./tests/</directory>
 		</testsuite>
+		<testsuite name="integration-cf2" suffix=".php">
+			<directory>./tests/Integration</directory>
+		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/tests/Integration/Caldera_Forms_TransientTest.php b/tests/Integration/Caldera_Forms_TransientTest.php
@@ -97,13 +97,11 @@ public function testDelete_at_submission_complete()
 	 */
 	public function testGetAllWhenThereAreNone()
 	{
-		$id = 'r2345';
-		$value = [9,0, new \stdClass() ];
-		$this->assertSame( 0, count( Caldera_Forms_Transient::get_all() ) );
-		\Caldera_Forms_Transient::set_transient($id,$value,1500 );
+
 		$this->assertSame( 0, count( Caldera_Forms_Transient::get_all() ) );
 
 
+
 	}
 
 	/**
@@ -115,10 +113,8 @@ public function testGetAllWhenThereAreSomeToGet()
 	{
 		$id = 'r2345';
 		$value = [9,0, new \stdClass() ];
-		$this->assertSame( 0, count( Caldera_Forms_Transient::get_all() ) );
 		\Caldera_Forms_Transient::set_transient($id,$value,1500 );
 		$transients = Caldera_Forms_Transient::get_all();
-
 		$this->assertSame( 1, count( $transients ) );
 		$this->assertSame( $transients[0], 'cftransdata_' . $id );
 		\Caldera_Forms_Transient::set_transient('cf222',[87],1500 );

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -2768,16 +2768,16 @@
     },
     {
         "name": "wpackagist-plugin/gutenberg",
-        "version": "5.0.0",
-        "version_normalized": "5.0.0.0",
+        "version": "5.1.0",
+        "version_normalized": "5.1.0.0",
         "source": {
             "type": "svn",
             "url": "https://plugins.svn.wordpress.org/gutenberg/",
-            "reference": "tags/5.0.0"
+            "reference": "tags/5.1.0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://downloads.wordpress.org/plugin/gutenberg.5.0.0.zip",
+            "url": "https://downloads.wordpress.org/plugin/gutenberg.5.1.0.zip",
             "reference": null,
             "shasum": null
         },