make pake phar-able, make tests use modern phpunit

bin/pake

@@ -4,41 +4,38 @@
 function _pake_bin_init()
 {
     $loaded = false;
-    $_path = dirname(__FILE__); // php 5.2 compatibility
 
-    if (file_exists($_path.'/../../../../composer.json')) {
+    if (file_exists('composer.json')) {
         // looks like we are installed as dependency via composer
-        $project_dir = realpath($_path . '/../../../..');
-
-        $data = json_decode(file_get_contents($project_dir . DIRECTORY_SEPARATOR . 'composer.json'), true);
+        $data = json_decode(file_get_contents('composer.json'), true);
 
         if (isset($data['config']['vendor-dir'])) {
             $vendor_dir = $data['config']['vendor-dir'];
         } else {
             $vendor_dir = 'vendor';
         }
 
-        $autoload_file = $project_dir . '/' . $vendor_dir . '/autoload.php';
+        $autoload_file = $vendor_dir . '/autoload.php';
 
         if (file_exists($autoload_file)) {
-            require_once $autoload_file;
+            require_once($autoload_file);
             $loaded = true;
         }
     }
 
-    if (!$loaded and is_dir($_path . '/../vendor') and file_exists($_path . '/../vendor/autoload.php')) {
+    if (!$loaded and is_dir($__DIR__. '/../vendor') and file_exists($__DIR__. '/../vendor/autoload.php')) {
         // looks like we are in composer dev-environment
-        require_once realpath($_path . '/..').'/vendor/autoload.php';
+        require_once(realpath($__DIR__. '/..').'/vendor/autoload.php');
         $loaded = true;
     }
 
     if (!$loaded) {
         // fallback to custom autoloader
-        require_once realpath($_path . '/..').'/lib/pake/autoload.php';
+        require_once('../lib/pake/autoload.php');
         $loaded = true;
     }
 
-    require_once realpath($_path . '/..').'/lib/pake/cli_init.php';
+    require_once('../lib/pake/cli_init.php');
 
     $retval = pakeApp::get_instance()->run();
 

composer.json

@@ -31,7 +31,8 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "simpletest/simpletest": "1.1.*"
+        "simpletest/simpletest": "1.1.*",
+        "phpunit/phpunit": "^7.5.18"
     },
     "suggest": {
         "ext-bz2": "*",
@@ -43,7 +44,12 @@
         "simpletest/simpletest": "1.1.*"
     },
     "autoload": {
-        "files": ["lib/pake/autoload.php"]
+        "classmap": ["lib/pake/"],
+        "files": ["lib/pake/pakeFunction.php"]
+    },
+    "autoload-dev": {
+        "classmap": ["tests/", "lib/pake/"],
+        "files": ["lib/pake/pakeFunction.php"]
     },
     "bin": ["bin/pake"]
 }

phpunit.xml

@@ -0,0 +1 @@
+<phpunit colors="true" convertDeprecationsToExceptions="false" bootstrap="tests/autoload.php"/>

test/pakeTaskTest.php → tests/PakeTaskTest.php

@@ -1,8 +1,10 @@
 <?php
+use PHPUnit\Framework\TestCase;
 
-class pakeTaskTest extends UnitTestCase
+
+class PakeTaskTest extends TestCase
 {
-  public function test_abbrev()
+  public function testAbbrev()
   {
     $words = array('start', 'stop', 'queue', 'quit');
     $result = pakeTask::abbrev($words);
@@ -17,6 +19,6 @@ public function test_abbrev()
       'que' => array('queue'), 'queu' => array('queue'), 'queue' => array('queue'),
       'qui' => array('quit'), 'quit' => array('quit')
     );
-    $this->assertEqual($expected, $result);
+    $this->assertEquals($expected, $result);
   }
 }

tests/autoload.php

@@ -0,0 +1,6 @@
+<?php
+include_once __DIR__.'/../vendor/autoload.php';
+
+$classLoader = new \Composer\Autoload\ClassLoader();
+$classLoader->addPsr4("Your\\Test\\Namespace\\Here\\", __DIR__, true);
+$classLoader->register();