Ticket #37523: 37523.diff

new file tests/phpunit/includes/class-basic-object.php

@@ +1 @@
+<?php
+/**
+ * Unit Tests: Basic_Object class
+ *
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 4.6.0
+ */
+
+/**
+ * Class used to test accessing methods and properties.
+ *
+ * @since 4.0.0
+ */
+class Basic_Object {
+        private $foo = 'bar';
+
+        public function __get( $name ) {
+                return $this->$name;
+        }
+
+        public function __set( $name, $value ) {
+                return $this->$name = $value;
+        }
+
+        public function __isset( $name ) {
+                return isset( $this->$name );
+        }
+
+        public function __unset( $name ) {
+                unset( $this->$name );
+        }
+
+        public function __call( $name, $arguments ) {
+                return call_user_func_array( array( $this, $name ), $arguments );
+        }
+
+        private function callMe() {
+                return 'maybe';
+        }
+}

new file tests/phpunit/includes/class-basic-subclass.php

@@ +1 @@
+<?php
+/**
+ * Unit Tests: Basic_Subclass class
+ *
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 4.6.0
+ */
+
+/**
+ * Class used to test accessing methods and properties.
+ *
+ * @since 4.0.0
+ */
+class Basic_Subclass extends Basic_Object {}

tests/phpunit/includes/functions.php

@@ -58 +58 @@
         }
 }
 
-class Basic_Object {
-        private $foo = 'bar';
-
-        public function __get( $name ) {
-                return $this->$name;
-        }
-
-        public function __set( $name, $value ) {
-                return $this->$name = $value;
-        }
-
-        public function __isset( $name ) {
-                return isset( $this->$name );
-        }
-
-        public function __unset( $name ) {
-                unset( $this->$name );
-        }
-
-        public function __call( $name, $arguments ) {
-                return call_user_func_array( array( $this, $name ), $arguments );
-        }
-
-        private function callMe() {
-                return 'maybe';
-        }
-}
-
-class Basic_Subclass extends Basic_Object {}
-
 function _wp_die_handler( $message, $title = '', $args = array() ) {
         if ( !$GLOBALS['_wp_die_disabled'] ) {
                 _wp_die_handler_txt( $message, $title, $args);
@@ -147 +117 @@
 
 /**
  * Helper used with the `upload_dir` filter to set https upload URL.
- */ 
+ */
 function _upload_dir_https( $uploads ) {
         $uploads['url'] = str_replace( 'http://', 'https://', $uploads['url'] );
         $uploads['baseurl'] = str_replace( 'http://', 'https://', $uploads['baseurl'] );

tests/phpunit/tests/basic.php

@@ -1 +1 @@
 <?php
+
+require_once dirname( dirname( __FILE__ ) ) . '/includes/class-basic-object.php';
+require_once dirname( dirname( __FILE__ ) ) . '/includes/class-basic-subclass.php';
+
 /**
  * just make sure the test framework is working
  *