Update minimum requirements and namespace

Author: aschempp

README.md

@@ -1,15 +1,15 @@
 Contao Sentry Bundle
 ====================
 
-This Contao bundle provides an easy integration of [sentry.io](https://sentry.io/) for Contao 4.4.x and newer.
+This Contao bundle provides an easy integration of [sentry.io](https://sentry.io/) for Contao 4.13 and 5.x.
 
 [![Author](http://img.shields.io/badge/[email protected]?style=flat-square)](https://twitter.com/1upgmbh)
 [![Software License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
 [![Total Downloads](http://img.shields.io/packagist/dt/oneup/contao-sentry-bundle.svg?style=flat-square)](https://packagist.org/packages/oneup/contao-sentry-bundle)
 
 --
 
-In the first place, this is an "wrapper extension" for the [`sentry/sentry-symfony` bundle][1]. Therefore, you need to
+In the first place, this is a "wrapper extension" for the [`sentry/sentry-symfony` bundle][1]. Therefore, you need to
 configure this bundle as you would configure the `sentry/sentry-symfony` bundle: [Documentation][2]
 
 ### Recommended configuration
@@ -44,7 +44,7 @@ some comments.
 
 In order to integrate this feature, you have to alter the error page template. Place a copy of 
 `vendor/contao/core-bundle/src/Resources/views/Error/layout.html.twig` in the directory 
-`app/Resources/ContaoCoreBundle/views/Error/`.
+`templates/ContaoCoreBundle/views/Error/`.
 
 Modify the copied template and place the following snippet just before the closing `</body>` tag:
 ```twig

composer.json

@@ -20,9 +20,9 @@
     }
   ],
   "require": {
-    "php": "^7.1 || ^8.0",
-    "contao/core-bundle": "^4.4 || ^5.0",
-    "sentry/sentry-symfony": "^4.0 || ^5.0",
+    "php": "^8.1",
+    "contao/core-bundle": "^4.13 || ^5.0",
+    "sentry/sentry-symfony": "^5.0",
     "twig/twig": "^2.7 || ^3.0"
   },
   "require-dev": {
@@ -43,11 +43,11 @@
     }
   },
   "extra": {
-    "contao-manager-plugin": "Oneup\\Contao\\SentryBundle\\ContaoManager\\Plugin"
+    "contao-manager-plugin": "Oneup\\ContaoSentryBundle\\ContaoManager\\Plugin"
   },
   "autoload": {
     "psr-4": {
-      "Oneup\\Contao\\SentryBundle\\": "src"
+      "Oneup\\ContaoSentryBundle\\": "src"
     }
   },
   "support": {

src/Resources/config/services.yml config/services.yaml

@@ -1,9 +1,9 @@
 services:
-    Oneup\Contao\SentryBundle\Twig\ContaoSentryTwigExtension:
+    Oneup\ContaoSentryBundle\Twig\ContaoSentryTwigExtension:
         tags:
             - { name: twig.extension }
 
-    Oneup\Contao\SentryBundle\Twig\ContaoSentryTwigRuntime:
+    Oneup\ContaoSentryBundle\Twig\ContaoSentryTwigRuntime:
         public: false
         tags:
             - { name: twig.runtime }

src/ContaoManager/Plugin.php

@@ -2,36 +2,25 @@
 
 declare(strict_types=1);
 
-namespace Oneup\Contao\SentryBundle\ContaoManager;
+namespace Oneup\ContaoSentryBundle\ContaoManager;
 
 use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
-use Contao\ManagerPlugin\Dependency\DependentPluginInterface;
-use Oneup\Contao\SentryBundle\OneupContaoSentryBundle;
+use Oneup\ContaoSentryBundle\OneupContaoSentryBundle;
 use Sentry\SentryBundle\SentryBundle;
 
-class Plugin implements BundlePluginInterface, DependentPluginInterface
+class Plugin implements BundlePluginInterface
 {
     public function getBundles(ParserInterface $parser): array
     {
         return [
-            // load SentryBundle (dependency)
-            BundleConfig::create(SentryBundle::class)->setLoadAfter([ContaoCoreBundle::class]),
-
-            // load OneupContaoSentryBundle
+            BundleConfig::create(SentryBundle::class),
             BundleConfig::create(OneupContaoSentryBundle::class)->setLoadAfter([
                 ContaoCoreBundle::class,
                 SentryBundle::class,
             ]),
         ];
     }
-
-    public function getPackageDependencies(): array
-    {
-        return [
-            'sentry/sentry-symfony',
-        ];
-    }
 }

src/DependencyInjection/OneupContaoSentryExtension.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Oneup\Contao\SentryBundle\DependencyInjection;
+namespace Oneup\ContaoSentryBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -18,7 +18,7 @@ class OneupContaoSentryExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
+        $loader->load('services.yaml');
     }
 }

src/OneupContaoSentryBundle.php

@@ -2,10 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Oneup\Contao\SentryBundle;
+namespace Oneup\ContaoSentryBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class OneupContaoSentryBundle extends Bundle
 {
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
 }

src/Twig/ContaoSentryTwigExtension.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Oneup\Contao\SentryBundle\Twig;
+namespace Oneup\ContaoSentryBundle\Twig;
 
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;

src/Twig/ContaoSentryTwigRuntime.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Oneup\Contao\SentryBundle\Twig;
+namespace Oneup\ContaoSentryBundle\Twig;
 
 use Sentry\SentrySdk;
 
@@ -22,15 +22,9 @@ public function sentryLastEventIdFilter(): ?string
     public function sentryDsn(): ?string
     {
         if ((null !== $client = SentrySdk::getCurrentHub()->getClient())
-            && (null !== $dsn = $client->getOptions()->getDsn())) {
-
-            return sprintf(
-                '%s://%s@%s/%s',
-                $dsn->getScheme(),
-                $dsn->getPublicKey(),
-                $dsn->getHost(),
-                $dsn->getProjectId()
-            );
+            && (null !== $dsn = $client->getOptions()->getDsn())
+        ) {
+            return (string) $dsn;
         }
 
         return null;