Finish psr-4 refactoring

PostHog · Mar 31, 2021 · f709966 · f709966
1 parent 168c5b9
commit f709966
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -6,6 +6,9 @@ vendor: composer.phar
 composer.phar:
 	@curl -sS https://getcomposer.org/installer | php
 
+docker:
+	@docker run -it --rm -v ${PWD}:/app -w /app chialab/php:7.4 bash
+
 test: lint
 	@vendor/bin/phpunit --colors test/
 	@php ./composer.phar validate
@@ -23,7 +26,7 @@ lint: dependencies
 
 release:
 	@printf "releasing ${VERSION}..."
-	@printf '<?php\nglobal $$POSTHOG_VERSION;\n$$POSTHOG_VERSION = "%b";\n' ${VERSION} > ./lib/PostHog/Version.php
+	@sed -Ei "s/(public const VERSION =).+/\1 '${VERSION}';/" ./lib/PostHog.php
 	@node -e "var fs = require('fs'), pkg = require('./composer'); pkg.version = '${VERSION}'; fs.writeFileSync('./composer.json', JSON.stringify(pkg, null, '\t'));"
 	@git changelog -t ${VERSION}
 	@git release ${VERSION}

diff --git a/bin/posthog b/bin/posthog
@@ -1,7 +1,9 @@
 #!/usr/bin/env php
 <?php
 
-require_once(__DIR__ . '/../lib/PostHog.php');
+require_once __DIR__ . '/../vendor/autoload.php';
+
+use PostHog\PostHog;
 
 if (in_array('--help', $argv)) {
   print(usage());

diff --git a/composer.json b/composer.json
@@ -18,12 +18,12 @@
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~8.0",
-		"overtrue/phplint": "^1.2",
+		"overtrue/phplint": "^2.3",
 		"squizlabs/php_codesniffer": "^3.5"
 	},
 	"autoload": {
 		"psr-4": {
-			"Posthog": "lib"
+			"PostHog\\": "lib/"
 		}
 	},
 	"bin": [

diff --git a/lib/PostHog/Client.php → lib/Client.php b/lib/PostHog/Client.php → lib/Client.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Posthog;
+namespace PostHog;
 
-use Posthog\Consumer\File;
-use Posthog\Consumer\ForkCurl;
-use Posthog\Consumer\LibCurl;
-use Posthog\Consumer\Socket;
+use PostHog\Consumer\File;
+use PostHog\Consumer\ForkCurl;
+use PostHog\Consumer\LibCurl;
+use PostHog\Consumer\Socket;
 
 class Client {
 
@@ -26,10 +26,10 @@ class Client {
    */
   public function __construct($apiKey, $options = array()) {
     $consumers = array(
-      "socket"     => "Socket",
-      "file"       => "PostHog_Consumer_File",
-      "fork_curl"  => "PostHog_Consumer_ForkCurl",
-      "lib_curl"   => "PostHog_Consumer_LibCurl"
+      "socket"     => Socket::class,
+      "file"       => File::class,
+      "fork_curl"  => ForkCurl::class,
+      "lib_curl"   => LibCurl::class,
     );
 
     // Use our socket libcurl by default
@@ -172,18 +172,16 @@ private function formatTime($ts) {
    */
 
   private function message($msg){
-    global $POSTHOG_VERSION;
-
     if (!isset($msg["properties"])) {
       $msg["properties"] = array();
     }
 
     $msg["library"] = 'posthog-php';
-    $msg["library_version"] = $POSTHOG_VERSION;
+    $msg["library_version"] = PostHog::VERSION;
     $msg["library_consumer"] = $this->consumer->getConsumer();
 
     $msg["properties"]['$lib'] = 'posthog-php';
-    $msg["properties"]['$lib_version'] = $POSTHOG_VERSION;
+    $msg["properties"]['$lib_version'] = PostHog::VERSION;
     $msg["properties"]['$lib_consumer'] = $this->consumer->getConsumer();
 
     if (isset($msg["distinctId"])) {

diff --git a/lib/PostHog/Consumer.php → lib/Consumer.php b/lib/PostHog/Consumer.php → lib/Consumer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Posthog;
+namespace PostHog;
 
 abstract class Consumer {
   protected $type = "Consumer";

diff --git a/lib/PostHog/Consumer/File.php → lib/Consumer/File.php b/lib/PostHog/Consumer/File.php → lib/Consumer/File.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Posthog\Consumer;
+namespace PostHog\Consumer;
 
-use Posthog\Consumer;
+use PostHog\Consumer;
 
-class PostHog_Consumer_File extends Consumer {
+class File extends Consumer {
   protected $type = "File";
 
   private $file_handle;
@@ -24,7 +24,7 @@ public function __construct($apiKey, $options = array()) {
     try {
       $this->file_handle = fopen($options["filename"], "a");
       chmod($options["filename"], 0777);
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
       $this->handleError($e->getCode(), $e->getMessage());
     }
   }

diff --git a/lib/PostHog/Consumer/ForkCurl.php → lib/Consumer/ForkCurl.php b/lib/PostHog/Consumer/ForkCurl.php → lib/Consumer/ForkCurl.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Posthog\Consumer;
+namespace PostHog\Consumer;
 
-use Posthog\QueueConsumer;
+use PostHog\QueueConsumer;
 
-class PostHog_Consumer_ForkCurl extends QueueConsumer {
+class ForkCurl extends QueueConsumer {
   protected $type = "ForkCurl";
 
   /**

diff --git a/lib/PostHog/Consumer/LibCurl.php → lib/Consumer/LibCurl.php b/lib/PostHog/Consumer/LibCurl.php → lib/Consumer/LibCurl.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Posthog\Consumer;
+namespace PostHog\Consumer;
 
-use Posthog\QueueConsumer;
+use PostHog\QueueConsumer;
 
-class PostHog_Consumer_LibCurl extends QueueConsumer {
+class LibCurl extends QueueConsumer {
   protected $type = "LibCurl";
 
   /**

diff --git a/lib/PostHog/Consumer/Socket.php → lib/Consumer/Socket.php b/lib/PostHog/Consumer/Socket.php → lib/Consumer/Socket.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Posthog\Consumer;
+namespace PostHog\Consumer;
 
-use Posthog\QueueConsumer;
+use PostHog\QueueConsumer;
 
 class Socket extends QueueConsumer {
   protected $type = "Socket";
@@ -81,7 +81,7 @@ private function createSocket() {
       }
 
       return $socket;
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
       $this->handleError($e->getCode(), $e->getMessage());
       $this->socket_failed = true;
 
@@ -111,7 +111,7 @@ private function makeRequest($socket, $req, $retry = true) {
         try {
           // Since we're try catch'ing prevent PHP logs.
           $written = @fwrite($socket, substr($req, $bytes_written));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
           $this->handleError($e->getCode(), $e->getMessage());
           $closed = true;
         }

diff --git a/lib/PostHog.php b/lib/PostHog.php
@@ -1,8 +1,12 @@
 <?php
 
-use Posthog\Client;
+namespace PostHog;
+
+use PostHog\Client;
 
 class PostHog {
+  public const VERSION = '1.0.0';
+
   private static $client;
 
   /**

diff --git a/lib/PostHog/Version.php b/lib/PostHog/Version.php
diff --git a/lib/PostHog/QueueConsumer.php → lib/QueueConsumer.php b/lib/PostHog/QueueConsumer.php → lib/QueueConsumer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Posthog;
+namespace PostHog;
 
 abstract class QueueConsumer extends Consumer {
   protected $type = "QueueConsumer";

diff --git a/send.php b/send.php
@@ -1,10 +1,12 @@
 <?php
 
+require_once __DIR__ . '/vendor/autoload.php';
+
 /**
  * require client
  */
 
-require_once(__DIR__ . "/lib/PostHog.php");
+use PostHog\PostHog;
 
 /**
  * Args
@@ -70,7 +72,7 @@
   if (!trim($line)) continue;
   $payload = json_decode($line, true);
   $type = $payload["type"];
-  $ret = call_user_func_array(array("PostHog", "raw"), array($payload));
+  $ret = call_user_func_array(array("PostHog\\PostHog", "raw"), array($payload));
   if ($ret) $successful++;
   $total++;
   if ($total % 100 === 0) PostHog::flush();

diff --git a/test/ConsumerFileTest.php b/test/ConsumerFileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Posthog\Client;
+use PostHog\Client;
 
 class ConsumerFileTest extends PHPUnit\Framework\TestCase
 {
@@ -82,7 +82,7 @@ public function testProductionProblems()
       "BrpS4SctoaCCsyjlnlun3OzyNJAafdlv__jUWaaJWXg",
       array(
         "consumer" => "file",
-        "filename" => "/dev/xxxxxxx",
+        "filename" => "/dev/x/xxxxxxx",
       )
     );
 

diff --git a/test/ConsumerForkCurlTest.php b/test/ConsumerForkCurlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . "/../lib/PostHog/Client.php";
+use PostHog\Client;
 
 class ConsumerForkCurlTest extends PHPUnit\Framework\TestCase
 {

diff --git a/test/ConsumerLibCurlTest.php b/test/ConsumerLibCurlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . "/../lib/PostHog/Client.php";
+use PostHog\Client;
 
 class ConsumerLibCurlTest extends PHPUnit\Framework\TestCase
 {

diff --git a/test/ConsumerSocketTest.php b/test/ConsumerSocketTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . "/../lib/PostHog/Client.php";
+use PostHog\Client;
 
 class ConsumerSocketTest extends PHPUnit\Framework\TestCase
 {

diff --git a/test/PostHogTest.php b/test/PostHogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Posthog;
+use PostHog\PostHog;
 
 class PostHogTest extends PHPUnit\Framework\TestCase
 {