improved

Author: stefanak-michal

src/Bolt.php

@@ -26,16 +26,14 @@ final class Bolt
 
     public function __construct(private IConnection $connection)
     {
-        if (!getenv('TEMP')) {
-            putenv('TEMP=' . dirname(__DIR__) . DIRECTORY_SEPARATOR . 'temp');
-            if (!file_exists(getenv('TEMP'))) {
-                mkdir(getenv('TEMP'), recursive: true);
-            }
+        $_ENV['TEMP_DIR'] = getenv('TEMP') ?? getenv('TMPDIR') ?? (dirname(__DIR__) . DIRECTORY_SEPARATOR . 'temp');
+        if (!file_exists($_ENV['TEMP_DIR'])) {
+            mkdir($_ENV['TEMP_DIR'], recursive: true);
         }
 
         if (!getenv('BOLT_ANALYTICS_OPTOUT')) {
-            if (!file_exists(getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR)) {
-                mkdir(getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-analytics');
+            if (!file_exists($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR)) {
+                mkdir($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics');
             }
             $this->track();
         }
@@ -45,7 +43,7 @@ public function __construct(private IConnection $connection)
 
     private function track(): void
     {
-        foreach (glob(getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR . 'queries.*.cnt') as $file) {
+        foreach (glob($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR . 'queries.*.cnt') as $file) {
             $time = intval(explode('.', basename($file))[1]);
             if ($time < strtotime('today')) {
                 $count = file_get_contents($file);

src/helpers/FileCache.php

@@ -17,9 +17,9 @@ class FileCache implements CacheInterface
 
     public function __construct()
     {
-        $this->tempDir = getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-filecache' . DIRECTORY_SEPARATOR;
+        $this->tempDir = $_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-filecache' . DIRECTORY_SEPARATOR;
         if (!file_exists($this->tempDir)) {
-            mkdir(getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-filecache');
+            mkdir($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-filecache');
         }
 
         // clean old

src/protocol/AProtocol.php

@@ -73,7 +73,7 @@ protected function write(iterable $generator): void
 
     private function track(): void
     {
-        $file = getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR . 'queries.' . strtotime('today') . '.cnt';
+        $file = $_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR . 'queries.' . strtotime('today') . '.cnt';
         $count = file_exists($file) ? intval(file_get_contents($file)) : 0;
         file_put_contents($file, $count + 1);
     }

tests/protocol/ProtocolLayer.php

@@ -100,17 +100,14 @@ public function readCallback(int $length = 2048): string
      */
     protected function setUp(): void
     {
-        if (!getenv('TEMP')) {
-            putenv('TEMP=' . dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'temp');
-            if (!file_exists(getenv('TEMP'))) {
-                mkdir(getenv('TEMP'), recursive: true);
-            }
-            var_dump(getenv('TEMP'));
+        $_ENV['TEMP_DIR'] = getenv('TEMP') ?? getenv('TMPDIR') ?? (dirname(__DIR__) . DIRECTORY_SEPARATOR . 'temp');
+        if (!file_exists($_ENV['TEMP_DIR'])) {
+            mkdir($_ENV['TEMP_DIR'], recursive: true);
         }
 
         if (!getenv('BOLT_ANALYTICS_OPTOUT')) {
-            if (!file_exists(getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR)) {
-                mkdir(getenv('TEMP') . DIRECTORY_SEPARATOR . 'php-bolt-analytics');
+            if (!file_exists($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR)) {
+                mkdir($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics');
             }
         }