Changeset 8796

Timestamp:

08/11/2014 10:26:55 PM (12 years ago)

Author:

djpaul

Message:

Revert r8795; instead, fix the tests by skipping them if running in a PHP environment < 5.3.

The ​https://core.trac.wordpress.org/changeset/29251 change in WordPress trunk/4.0's unit test suite surfaces a bug in PHP 5.2 environments which causes segfaults with _destruct() for static class variables. See ​https://bugs.php.net/bug.php?id=51822.

As the new tests are only failing in PHP 5.2.17 with WP trunk (at revision 29466 at time of writing), we've decided to fix by requiring the date_query unit tests run only in PHP 5.3+ environments.

Location:

trunk

Files:

• src/bp-core/bp-core-classes.php (modified) (1 diff)
• tests/phpunit/testcases/activity/class.BP_Activity_Activity.php (modified) (3 diffs)
• tests/phpunit/testcases/activity/template.php (modified) (1 diff)

trunk/src/bp-core/bp-core-classes.php

@@ -1544 +1544 @@
 
         /**
+         * Destructor.
+         */
+        public function __destruct() {
+                remove_filter( 'date_query_valid_columns', array( $this, 'register_date_column' ) );    
+        }
+
+        /**
          * Registers our date column with WP Date Query to pass validation.
          *

trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php

@@ -147 +147 @@
          * @group get
          * @group date_query
+         * @requires PHP 5.3
          */
         public function test_get_with_date_query_before() {
@@ -177 +178 @@
          * @group get
          * @group date_query
+         * @requires PHP 5.3
          */
         public function test_get_with_date_query_range() {
@@ -209 +211 @@
          * @group get
          * @group date_query
+         * @requires PHP 5.3
          */
         public function test_get_with_date_query_after() {

trunk/tests/phpunit/testcases/activity/template.php

@@ -518 +518 @@
          *
          * @group date_query
+         * @requires PHP 5.3
          */
         function test_bp_has_activities_with_date_query() {