Updated namespace in PHPUnit_BaseClass and added .editorconfig

Author: duzun

.editorconfig

@@ -0,0 +1,33 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# we recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.sublime-project]
+indent_style = tab
+indent_size = 4

tests/_PHPUnit_BaseClass.php

@@ -26,7 +26,7 @@ function _hQuery_Test_autoloader($class) {
  * @backupGlobals disabled
  */
 // -----------------------------------------------------
-abstract class PHPUnit_BaseClass extends PHPUnit_Framework_TestCase {
+abstract class PHPUnit_BaseClass extends PHPUnit\Framework\TestCase {
     public static $log = true;
     public static $testName;
     public static $className;

tests/hQuery.Test.php

@@ -69,12 +69,12 @@ public function testClass() {
         $this->assertMehodExists('fromHTML', self::$className);
         $this->assertMehodExists('fromFile', self::$className);
         $this->assertMehodExists('fromURL' , self::$className);
-        
+
         // $f = glob(PHPUNIT_DIR . 'data/*');
         // foreach($f as $k => $v) if(is_file($v) && substr($v, -3) != '.gz') {
             // $g = gzencode(file_get_contents($v), 9);
             // file_put_contents($v.'.gz', $g);
-        // }        
+        // }
     }
 
     // -----------------------------------------------------
@@ -115,7 +115,7 @@ public function test_find() {
         $this->assertEquals('test-div', $a->parent->attr('id'));
 
         // 2)
-        
+
         $ff = TestHQueryTests::fromFile(self::file_exists('data/attr.html'));
         $aa = $ff->find('a.aa');
         $this->assertEquals(3, count($aa));
@@ -213,4 +213,4 @@ public function test_jsonize($vars) {
     // -----------------------------------------------------
 
 }
-?>
+?>

tools/test_watcher.js

@@ -107,19 +107,30 @@ function run_test_async() {
 
 function check_phpunit_phar(cb) {
     if ( !fs.existsSync(_phpunit_path) ) {
-        var file = fs.createWriteStream(_phpunit_path);
-        http.get(_phpunit_url, function(response) {
-            response.pipe(file);
-            response.on('end', function (err) {
-                cb(err);
-            });
-        });
+        download(_phpunit_url, _phpunit_path, 7, cb);
     }
     else {
         cb();
     }
 }
 
+function download(srcUrl, filePath, maxRedirects, cb) {
+    return http.get(srcUrl, function onGet(response) {
+        var statusCode = response.statusCode;
+        var newUrl = response.headers.location;
+        console.log('↓', srcUrl, '→', statusCode);
+        if ( statusCode >= 300 && statusCode < 400 && newUrl ) {
+            if ( !maxRedirects-- ) {
+                return cb(new Error('Redirects detected (to "'+newUrl+'"")'));
+            }
+            return download(newUrl, filePath, maxRedirects, cb);
+        }
+        var file = fs.createWriteStream(filePath);
+        response.pipe(file);
+        response.on('end', cb);
+    });
+}
+
 check_phpunit_phar(function () {
     var testcase = process.argv[2];
     _test_file = get_test_file_path(testcase);