Modernize test autoloading for a more PHP-native configuration (#3)

Author: Greg0

composer.json

@@ -29,7 +29,7 @@
       "Featurevisor\\": "src/"
     },
     "files": [
-      "src/index.php"
+      "src/functions.php"
     ]
   },
   "autoload-dev": {
@@ -46,7 +46,7 @@
     "featurevisor"
   ],
   "scripts": {
-    "test": "phpunit --bootstrap tests/bootstrap.php tests"
+    "test": "phpunit tests"
   },
   "license": [
     "MIT"

featurevisor

@@ -2,7 +2,6 @@
 <?php
 
 require __DIR__ . '/vendor/autoload.php';
-require __DIR__ . '/src/index.php';
 
 use function Featurevisor\createInstance;
 
@@ -471,6 +470,7 @@ function assessDistribution(array $cliOptions) {
     $populateUuid = $cliOptions['populateUuid'];
 
     $datafilesByEnvironment = buildDatafiles($featurevisorProjectPath, [$cliOptions['environment']]);
+    $level = getLoggerLevel($cliOptions);
 
     $f = createInstance([
         'datafile' => $datafilesByEnvironment[$cliOptions['environment']],

phpunit.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
          colors="true"
          processIsolation="false"
          stopOnFailure="false"

src/Instance.php

@@ -380,8 +380,3 @@ public function getAllEvaluations(array $context = [], array $featureKeys = [],
         return $evaluations;
     }
 }
-
-function createInstance(array $options = []): Instance
-{
-    return new Instance($options);
-}

src/Logger.php

@@ -74,8 +74,3 @@ public static function defaultLogHandler(string $level, string $message, $detail
         echo PHP_EOL;
     }
 }
-
-function createLogger(array $options = []): Logger
-{
-    return new Logger($options);
-}

src/functions.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Featurevisor;
+
+function createInstance(array $options = []): Instance
+{
+    return new Instance($options);
+}
+
+function createLogger(array $options = []): Logger
+{
+    return new Logger($options);
+}

src/index.php

@@ -1,18 +1,13 @@
 <?php
 
+namespace Featurevisor\Tests;
+
 use PHPUnit\Framework\TestCase;
-require_once __DIR__ . '/../src/Bucketer.php';
-require_once __DIR__ . '/../src/Logger.php';
 
 use Featurevisor\Bucketer;
-use Featurevisor\Logger;
 use function Featurevisor\createLogger;
 
 class BucketerTest extends TestCase {
-    public function testGetBucketedNumberIsFunction() {
-        // In PHP, it's a static method
-        $this->assertTrue(is_callable([Bucketer::class, 'getBucketedNumber']));
-    }
 
     public function testGetBucketedNumberRange() {
         $keys = ['foo', 'bar', 'baz', '123adshlk348-93asdlk'];

tests/BucketerTest.php

@@ -1,9 +1,8 @@
 <?php
 
+namespace Featurevisor\Tests;
+
 use PHPUnit\Framework\TestCase;
-require_once __DIR__ . '/../src/Child.php';
-require_once __DIR__ . '/../src/Instance.php';
-require_once __DIR__ . '/../src/index.php';
 
 use function Featurevisor\createInstance;
 

tests/ChildTest.php

@@ -1,9 +1,9 @@
 <?php
 
+namespace Featurevisor\Tests;
+
+use DateTime;
 use PHPUnit\Framework\TestCase;
-require_once __DIR__ . '/../src/Conditions.php';
-require_once __DIR__ . '/../src/DatafileReader.php';
-require_once __DIR__ . '/../src/Logger.php';
 
 use Featurevisor\DatafileReader;
 use function Featurevisor\createLogger;
@@ -24,10 +24,6 @@ protected function setUp(): void {
         ]);
     }
 
-    public function testAllConditionsAreMatchedIsFunction() {
-        $this->assertTrue(is_callable([$this->datafileReader, 'allConditionsAreMatched']));
-    }
-
     public function testMatchAllViaStar() {
         $this->assertTrue($this->datafileReader->allConditionsAreMatched('*', ['browser_type' => 'chrome']));
         $this->assertFalse($this->datafileReader->allConditionsAreMatched('blah', ['browser_type' => 'chrome']));