check if temp is writable. code cleanup.

Author: stefanak-michal

src/Bolt.php

@@ -26,11 +26,7 @@ final class Bolt
 
     public function __construct(private IConnection $connection)
     {
-        $_ENV['TEMP_DIR'] = getenv('TEMP') ?: getenv('TMPDIR') ?: (dirname(__DIR__) . DIRECTORY_SEPARATOR . 'temp');
-        if (!file_exists($_ENV['TEMP_DIR'])) {
-            mkdir($_ENV['TEMP_DIR'], recursive: true);
-        }
-
+        $this->tempDirectoryInit();
         if (!getenv('BOLT_ANALYTICS_OPTOUT') && is_writable($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR)) {
             if (!file_exists($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR)) {
                 mkdir($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics');
@@ -41,6 +37,20 @@ public function __construct(private IConnection $connection)
         $this->setProtocolVersions(5.4, 5, 4.4);
     }
 
+    private function tempDirectoryInit(): void
+    {
+        $_ENV['TEMP_DIR'] = getenv('TEMP');
+        if ($_ENV['TEMP_DIR'] === false || !is_writable($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR)) {
+            $_ENV['TEMP_DIR'] = getenv('TMPDIR');
+        }
+        if ($_ENV['TEMP_DIR'] === false || !is_writable($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR)) {
+            $_ENV['TEMP_DIR'] = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'temp';
+        }
+        if (!file_exists($_ENV['TEMP_DIR'])) {
+            mkdir($_ENV['TEMP_DIR'], recursive: true);
+        }
+    }
+
     private function track(): void
     {
         foreach (glob($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR . 'php-bolt-analytics' . DIRECTORY_SEPARATOR . 'queries.*.cnt') as $file) {

src/protocol/AProtocol.php

@@ -63,17 +63,15 @@ public function __construct(
      */
     protected function write(iterable $generator): void
     {
-        if (!getenv('BOLT_ANALYTICS_OPTOUT')) {
-            $this->track();
-        }
+        $this->track();
         foreach ($generator as $buffer) {
             $this->connection->write($buffer);
         }
     }
 
     private function track(): void
     {
-        if (is_writable($_ENV['TEMP_DIR']. DIRECTORY_SEPARATOR)) {
+        if (!getenv('BOLT_ANALYTICS_OPTOUT') && is_writable($_ENV['TEMP_DIR']. DIRECTORY_SEPARATOR)) {
             $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,7 +100,13 @@ public function readCallback(int $length = 2048): string
      */
     protected function setUp(): void
     {
-        $_ENV['TEMP_DIR'] = getenv('TEMP') ?: getenv('TMPDIR') ?: (dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'temp');
+        $_ENV['TEMP_DIR'] = getenv('TEMP');
+        if ($_ENV['TEMP_DIR'] === false || !is_writable($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR)) {
+            $_ENV['TEMP_DIR'] = getenv('TMPDIR');
+        }
+        if ($_ENV['TEMP_DIR'] === false || !is_writable($_ENV['TEMP_DIR'] . DIRECTORY_SEPARATOR)) {
+            $_ENV['TEMP_DIR'] = dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'temp';
+        }
         if (!file_exists($_ENV['TEMP_DIR'])) {
             mkdir($_ENV['TEMP_DIR'], recursive: true);
         }