tests(phpunit): fix phpunit tests related to base_path changes here : 4…

…8abd8c
charcoalphp · Sep 14, 2022 · 64b146f · 64b146f
1 parent b928fcd
commit 64b146f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/packages/app/tests/Charcoal/App/AppTest.php b/packages/app/tests/Charcoal/App/AppTest.php
@@ -35,7 +35,9 @@ class AppTest extends AbstractTestCase
      */
     public function setUp(): void
     {
-        $config    = new AppConfig();
+        $config = new AppConfig([
+            'base_path' => sys_get_temp_dir(),
+        ]);
         $container = new AppContainer([
             'config' => $config
         ]);

diff --git a/packages/app/tests/Charcoal/App/ServiceProvider/FilesystemServiceProviderTest.php b/packages/app/tests/Charcoal/App/ServiceProvider/FilesystemServiceProviderTest.php
@@ -207,7 +207,7 @@ public function testConfigWithoutTypeThrowsException()
 
     private function createAppConfig($defaults = null)
     {
-        return new AppConfig($defaults);
+        return new AppConfig(array_replace(['base_path' => sys_get_temp_dir()], $defaults));
     }
 
     private function getContainer($defaults = null)

diff --git a/packages/core/tests/Charcoal/Model/ServiceProvider/ModelServiceProviderTest.php b/packages/core/tests/Charcoal/Model/ServiceProvider/ModelServiceProviderTest.php
@@ -81,6 +81,7 @@ private function container()
         $container['database'] = new PDO('sqlite::memory:');
 
         $container['config'] = new AppConfig([
+            'base_path' => sys_get_temp_dir(),
             'metadata'  => [
                 'paths' => [],
             ],

diff --git a/packages/view/src/Charcoal/View/AbstractLoader.php b/packages/view/src/Charcoal/View/AbstractLoader.php
@@ -11,35 +11,22 @@
  */
 abstract class AbstractLoader implements LoaderInterface
 {
-    /**
-     * @var string
-     */
-    private $basePath = '';
-
-    /**
-     * @var string[]
-     */
-    private $paths = [];
-
-    /**
-     * @var array
-     */
-    private $dynamicTemplates = [];
+    private string $basePath = '';
+    private array $paths = [];
+    private array $dynamicTemplates = [];
 
     /**
      * The cache of searched template files.
-     *
-     * @var array
      */
-    private $fileCache = [];
+    private array $fileCache = [];
 
     /**
      * Default constructor, if none is provided by the concrete class implementations.
      *
      *
-     * @param array $data The class dependencies map.
+     * @param ?array $data The class dependencies map.
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->setBasePath($data['base_path']);
         $this->setPaths($data['paths']);