Merge pull request #14 from okvpn/feat/symfony-7

Symfony 7.0 support

.gitattributes

@@ -2,3 +2,4 @@
 .github export-ignore
 .travis.yml export-ignore
 phpunit.xml.dist export-ignore
+symfony.lock export-ignore

.github/workflows/tests.yml

@@ -0,0 +1,49 @@
+name: "Tests"
+
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - 'composer.json'
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: '7.4'
+            symfony: 4.4.*
+          - php: '8.1'
+            symfony: 6.4.*
+          - php: '8.3'
+            symfony: 7.0.*
+    name: PHP ${{ matrix.php }} SYMFONY ${{ matrix.symfony }}
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          extensions: curl, mbstring, pdo, pdo_sqlite, sqlite
+          php-version: ${{ matrix.php }}
+          tools: composer
+
+      - name: "Install dependencies"
+        run: composer update --ansi --no-interaction
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.symfony }}
+      - name: "Run tests"
+        run: "php vendor/bin/phpunit"

.gitignore

@@ -3,3 +3,4 @@
 /composer.lock
 /vendor/*
 /var/*
+.phpunit.result.cache

README.md

@@ -35,31 +35,6 @@ return [
 ]
 ```
 
-For Symfony 3.4
-
-```php
-<?php
-
-use Symfony\Component\HttpKernel\Kernel;
-use Symfony\Component\Config\Loader\LoaderInterface;
-
-class AppKernel extends Kernel
-{
-    public function registerBundles()
-    {
-        $bundles = array(
-            // ....
-            new Okvpn\Bundle\DatadogBundle\OkvpnDatadogBundle(), //Should loaded after framework bundle
-        );
-    }
-
-    public function registerContainerConfiguration(LoaderInterface $loader)
-    {
-        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
-    }
-}
-```
-
 3. Base configuration to enable the datadog client in your `config.yml`
 
 ```

composer.json

@@ -20,21 +20,37 @@
         "psr-4": { "Okvpn\\Bundle\\DatadogBundle\\Tests\\": "tests/" }
     },
     "require": {
-        "php":">=7.2",
-        "symfony/framework-bundle": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
+        "php":">=7.4",
+        "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0 || ^7.0",
         "graze/dog-statsd": "^0.4 || ^1.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
-        "doctrine/doctrine-bundle": "^1.6.10 || ^2.0.6",
-        "doctrine/orm": "2.5.11 || 2.6.x-dev as 2.6.3 || ^2.7.0",
-        "phpunit/phpunit": "^6.2 || ^8.5",
-        "symfony/browser-kit": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/console": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/security-bundle": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/phpunit-bridge": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/monolog-bundle": "^3.2.0"
-    }
+        "doctrine/doctrine-bundle": "^2.6",
+        "doctrine/orm": "^2.7",
+        "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0",
+        "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/console": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/security-bundle": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/var-dumper": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/yaml": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/flex": "^1.10 || ^2.0",
+        "symfony/monolog-bundle": "^3.2"
+    },
+    "config": {
+        "allow-plugins": {
+            "symfony/flex": true
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        },
+        "symfony": {
+            "allow-contrib": false
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/Client/ClientWrapper.php

@@ -81,7 +81,7 @@ public function event($title, $text, array $metadata = [], array $tags = [])
      */
     public function getOption(string $option, $default = null)
     {
-        return isset($this->options[$option]) ? $this->options[$option] : $default;
+        return $this->options[$option] ?? $default;
     }
 
     /**

src/Client/DatadogDns.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Okvpn\Bundle\DatadogBundle\Client;
+
+class DatadogDns
+{
+    public static function parser(string $dsn): array
+    {
+
+    }
+}

src/Client/DatadogFactory.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Okvpn\Bundle\DatadogBundle\Client;
+
+class DatadogFactory implements DatadogFactoryInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createClient(array $options): DogStatsInterface
+    {
+    }
+}

src/Client/DatadogFactoryInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Okvpn\Bundle\DatadogBundle\Client;
+
+interface DatadogFactoryInterface
+{
+    public function createClient(array $options): DogStatsInterface;
+}

src/DependencyInjection/CompilerPass/PushDatadogHandlerPass.php

@@ -13,7 +13,7 @@ class PushDatadogHandlerPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if ('all' !== $container->getParameter('okvpn_datadog.logging') || false === $container->getParameter('okvpn_datadog.profiling')) {
             return;

src/DependencyInjection/CompilerPass/SqlLoggerPass.php

@@ -22,7 +22,7 @@ public function __construct(array $connections)
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (false === $container->hasDefinition('okvpn_datadog.logger.sql')) {
             return;

src/DependencyInjection/Configuration.php

@@ -17,12 +17,10 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('okvpn_datadog');
-        $rootNode = \method_exists($treeBuilder, 'getRootNode') ?
-            $treeBuilder->getRootNode() :
-            $treeBuilder->root('okvpn_datadog');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode->children()
             ->arrayNode('handle_exceptions')

src/DependencyInjection/OkvpnDatadogExtension.php

@@ -14,7 +14,7 @@ class OkvpnDatadogExtension extends Extension
     /**
      * {@inheritdoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);

src/Logging/ErrorBag.php

@@ -35,7 +35,7 @@ public function flush(): void
 
     public function rootError(): ?array
     {
-        return isset($this->errors[0]) ? $this->errors[0] : null;
+        return $this->errors[0] ?? null;
     }
 
     public function getErrors(): array

src/Logging/Watcher/DefaultWatcher.php

@@ -49,7 +49,7 @@ public function watch(): array
         $context = [];
         if ($this->tokenStorage instanceof TokenStorageInterface) {
             $token = $this->tokenStorage->getToken();
-            if (null  !== $token) {
+            if (null !== $token) {
                 $context['token'] = method_exists($token, '__toString') ? $token->__toString() : $token->serialize();
             }
         }

src/Services/ExceptionHashService.php

@@ -36,7 +36,6 @@ public function hash(\Throwable $exception): string
             }
         }
 
-        $hash = sha1($hash);
-        return $hash;
+        return sha1($hash);
     }
 }