Merge pull request #545 from Neriderc/both-versions

Support 2.1 and 2.2

app/ApiHandler.php

@@ -44,8 +44,8 @@ public function __construct(ServerRequestInterface $request, GVExport $module, T
      * @return mixed
      */
     public function getResponse() {
-        $stream = Registry::container()->get(StreamFactoryInterface::class)->createStream(json_encode($this->response_data));
-        $response_factory = Registry::container()->get(ResponseFactoryInterface::class);
+        $stream = GVExport::getClass(StreamFactoryInterface::class)->createStream(json_encode($this->response_data));
+        $response_factory = GVExport::getClass(ResponseFactoryInterface::class);
         return $response_factory->createResponse()
             ->withBody($stream)
             ->withHeader('Content-Type', "application/json");

app/Favourite.php

@@ -59,9 +59,9 @@ private function addUserFavourite(Tree $tree, string $url, string $title): bool
         $note = "";
         $user = Auth::user();
         $favorite = function ($tree, $user, $url, $title, $note) {
-            return Registry::container()->get(UserFavoritesModule::class)->addUrlFavorite($tree, $user, $url, $title, $note);
+            return GVExport::getClass(UserFavoritesModule::class)->addUrlFavorite($tree, $user, $url, $title, $note);
         };
-        $favorite->call(Registry::container()->get(UserFavoritesModule::class), $tree, $user, $url, $title, $note);
+        $favorite->call(GVExport::getClass(UserFavoritesModule::class), $tree, $user, $url, $title, $note);
         return true;
     }
 
@@ -77,9 +77,9 @@ private function addTreeFavourite(Tree $tree, string $url, string $title): bool
     {
         $note = "";
         $favorite = function ($tree, $url, $title, $note) {
-            return Registry::container()->get(FamilyTreeFavoritesModule::class)->addUrlFavorite($tree, $url, $title, $note);
+            return GVExport::getClass(FamilyTreeFavoritesModule::class)->addUrlFavorite($tree, $url, $title, $note);
         };
-        $favorite->call(Registry::container()->get(FamilyTreeFavoritesModule::class), $tree, $url, $title, $note);
+        $favorite->call(GVExport::getClass(FamilyTreeFavoritesModule::class), $tree, $url, $title, $note);
         return true;
     }
 }

app/OutputFile.php

@@ -36,7 +36,7 @@ function __construct($temp_dir, $file_type, $module) {
     function downloadFile()
     {
         $stream = $this->getFileStream();
-        $response_factory = Registry::container()->get(ResponseFactoryInterface::class);
+        $response_factory = GVExport::getClass(ResponseFactoryInterface::class);
         return $response_factory->createResponse()
             ->withBody($stream)
             ->withHeader('Content-Type', $this->settings['graphviz_config']['output'][$this->fileType]['cont_type'])
@@ -59,7 +59,7 @@ private function getFileStream() {
             }
         }
 
-        return Registry::container()->get(StreamFactoryInterface::class)->createStreamFromFile($filename);
+        return GVExport::getClass(StreamFactoryInterface::class)->createStreamFromFile($filename);
     }
 
 }

module.php

@@ -431,7 +431,22 @@ private function strip_param_from_url($url, $param): string
         }
         return $url;
     }
+
+    /**
+     * A breaking change in webtrees 2.2.0 changes how the classes are retrieved.
+     * This function allows support for both 2.1.X and 2.2.X versions
+     * @param $class
+     * @return mixed
+     */
+    static function getClass($class)
+    {
+        if (version_compare(Webtrees::VERSION, '2.2.0', '>=')) {
+            return Registry::container()->get($class);
+        } else {
+            return app($class);
+        }
+    }
 }
 
-$moduleService = Registry::container()->get(ModuleService::class);
+$moduleService = GVExport::getClass(ModuleService::class);
 return new GVExport($moduleService);