2.1.0 sentry sdk 3

1drop · Sep 1, 2021 · 840cec1 · 840cec1
1 parent a1db3f2
commit 840cec1
Show file tree

Hide file tree

Showing 5 changed files with 383 additions and 315 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
+.is_patched
 /vendor
diff --git a/Subscriber/ErrorHandler.php b/Subscriber/ErrorHandler.php
@@ -45,7 +45,7 @@ public function __construct(ContainerInterface $container)
     {
         $this->pluginDirectory = $container->getParameter('od_sentry.plugin_dir');
         // Hot fix the ClientBuilder of the sentry sdk if the SDK is not installed via composer but bundled in the plugin
-        if (class_exists('\PackageVersions\Versions') && !isset(Versions::VERSIONS['sentry/sdk']) && is_dir($this->pluginDirectory . '/vendor')) {
+        if (class_exists('\PackageVersions\Versions') && !isset(Versions::VERSIONS['sentry/sdk']) && is_dir($this->pluginDirectory . '/vendor') && !file_exists($this->pluginDirectory . '/.is_patched')) {
             $composerLock = json_decode(file_get_contents($this->pluginDirectory . '/composer.lock'), true);
             $sentryPackage = current(array_filter($composerLock['packages'], function(array $package) {
                 return $package['name'] === 'sentry/sentry';
@@ -56,11 +56,17 @@ public function __construct(ContainerInterface $container)
                 'PrettyVersions::getVersion(\'sentry/sentry\')->getPrettyVersion()',
                 "'" . $sentryVersion . "'"
             );
+            $this->replaceFileContent(
+                $this->pluginDirectory . '/vendor/sentry/sentry/src/Client.php',
+                'PrettyVersions::getVersion(\'sentry/sentry\')->getPrettyVersion()',
+                "'" . $sentryVersion . "'"
+            );
             $this->replaceFileContent(
                 $this->pluginDirectory . '/vendor/sentry/sentry/src/Event.php',
                 'PrettyVersions::getVersion(\'sentry/sentry\')->getPrettyVersion()',
                 "'" . $sentryVersion . "'"
             );
+            touch($this->pluginDirectory . '/.is_patched');
         }
         // Use composer autoloader if dependencies are bundles within the plugin (non-composer mode)
         if (file_exists($this->pluginDirectory . '/vendor/autoload.php')) {

diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
     }
   ],
   "require": {
-    "composer/installers": "~1.6",
-    "sentry/sdk": "^2.0"
+    "composer/installers": "^2.0",
+    "sentry/sdk": "^3.0"
   },
   "config": {
     "platform": {
-      "php": "7.2.0"
+      "php": "7.4.0"
     }
   },
   "extra": {