Merge pull request #142 from neo4j-php/analytics-submit-update

update sending analytics

Author: stefanak-michal

src/Bolt.php

@@ -26,13 +26,8 @@ final class Bolt
 
     public function __construct(private IConnection $connection)
     {
-        $_ENV['TEMP_DIR'] = getenv('TEMP') ?: getenv('TMPDIR') ?: (dirname(__DIR__) . DIRECTORY_SEPARATOR . 'temp');
-        var_dump($_ENV['TEMP_DIR']);
-        if (!file_exists($_ENV['TEMP_DIR'])) {
-            mkdir($_ENV['TEMP_DIR'], recursive: true);
-        }
-
-        if (!getenv('BOLT_ANALYTICS_OPTOUT')) {
+        $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');
             }
@@ -42,18 +37,31 @@ 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) {
             $time = intval(explode('.', basename($file))[1]);
             if ($time < strtotime('today')) {
                 $count = file_get_contents($file);
-                unlink($file);
 
                 $curl = curl_init();
                 curl_setopt_array($curl, [
                     CURLOPT_URL => 'https://api-eu.mixpanel.com/import?strict=0&project_id=3355308',
-                    CURLOPT_RETURNTRANSFER => true,
+                    CURLOPT_RETURNTRANSFER => false,
                     CURLOPT_ENCODING => '',
                     CURLOPT_MAXREDIRS => 10,
                     CURLOPT_TIMEOUT => $this->connection->getTimeout(),
@@ -77,7 +85,10 @@ private function track(): void
                         'authorization: Basic MDJhYjRiOWE2YTM4MThmNWFlZDEzYjNiMmE5M2MxNzQ6',
                     ],
                 ]);
-                curl_exec($curl);
+
+                if (curl_exec($curl)) {
+                    unlink($file);
+                }
                 curl_close($curl);
             }
         }

src/protocol/AProtocol.php

@@ -63,19 +63,19 @@ 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
     {
-        $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);
+        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,12 +100,18 @@ 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);
         }
 
-        if (!getenv('BOLT_ANALYTICS_OPTOUT')) {
+        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');
             }