rm SingletonTrait

Author: kmaestro

src/Gtk.php

@@ -17,12 +17,16 @@
 class Gtk
 {
     use ProxyTrait;
-    use SingletonTrait;
 
     public LibraryInformation $info;
 
     public Loader $loader;
 
+    /**
+     * @var self|null
+     */
+    private static ?self $instance = null;
+
     /**
      * Gtk constructor.
      */
@@ -35,6 +39,23 @@ public function __construct()
         self::setInstance($this);
     }
 
+    /**
+     * @return self $this
+     */
+    public static function getInstance(): self
+    {
+        return self::$instance ??= new static();
+    }
+
+    /**
+     * @param  self|null $instance
+     * @return void
+     */
+    public static function setInstance(?self $instance): void
+    {
+        self::$instance = $instance;
+    }
+
     /**
      * @return Loader
      */
@@ -50,6 +71,7 @@ private function loader(): Loader
         return $loader;
     }
 
+
     /**
      * @param  LibraryInterface $library
      * @return LibraryInformation