FFI instantiation tweaks

Author: cdosoftei

Diff for: Makefile

@@ -19,13 +19,16 @@ stan: image
 psalm: image
 	${RUN_PHP_CMD} ./vendor/bin/psalm --show-info=true
 
+test-ffi-scope: image
+	${RUN_PHP_CMD} -d ffi.preload=./src/pcap.h -d memory_limit=-1 ./vendor/bin/phpunit --debug
+
 buster:
 	docker build -t ${REPOSITORY}:buster -f Dockerfile.buster .
 
 buster-test: buster
 	${RUN_CMD}:buster php -d memory_limit=-1 -d memory_limit=-1 ./vendor/bin/phpunit --debug
 
-ci: stan psalm test buster-test
+ci: stan psalm test-ffi-scope test buster-test
 
 clean:
 	rm -rf `cat .gitignore`

Diff for: src/PcapFFI.php

@@ -6,7 +6,7 @@
 
 use FFI;
 use FFI\CData;
-use FFI\Exception;
+use FFI\Exception as FFIException;
 
 /**
  * FFI/libpcap class
@@ -15,13 +15,13 @@ class PcapFFI
 {
     public const LIBPCAP_NAME = 'libpcap.so.1';
 
-    static private $ffi = NULL;
+    static private FFI $ffi;
 
     private ?string $error = null;
 
     public function __construct()
     {
-        if (self::$ffi) {
+        if (isset(self::$ffi)) {
             return;
         }
 
@@ -31,21 +31,18 @@ public function __construct()
             $code = file_get_contents(__DIR__ . '/pcap.h');
 
             if ($code === false) {
-                throw new Exception('Cannot load pcap C definitions');
+                throw new FFIException('Cannot load pcap C definitions');
             }
             self::$ffi = FFI::cdef($code, $lib);
         } else {
             try {
                 // Try preload
-                self::$ffi = \FFI::scope("_RTCKIT_PCAP_FFI_");
-            } catch (\FFI\Exception $e) {
+                self::$ffi = FFI::scope("_RTCKIT_PCAP_FFI_");
+            } catch (FFIException $e) {
                 // Try direct load
-                self::$ffi = \FFI::load(__DIR__ . '/pcap.h');
+                self::$ffi = FFI::load(__DIR__ . '/pcap.h');
             }
         }
-        if (!self::$ffi) {
-            throw new \RuntimeException("FFI parse fails");
-        }
     }
 
     public function lib_version(): string