OxCom · Oct 18, 2017 · Oct 18, 2017 · Oct 18, 2017 · Apr 11, 2018 · Apr 11, 2018
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,34 @@
+## Description of the change
+
+> Please include a summary of the change and which issues are fixed.
+> Please also include relevant motivation and context.
+
+## Type of change
+
+- [ ] Bug fix (non-breaking change that fixes an issue)
+- [ ] New feature (non-breaking change that adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Maintenance
+- [ ] New release
+
+## Related issues
+
+> Shortcut stories and GitHub issues (delete irrelevant)
+
+- Fix [SC-]
+- Fix #1
+
+## Checklists
+
+### Development
+
+- [ ] Lint rules pass locally
+- [ ] The code changed/added as part of this pull request has been covered with tests
+- [ ] All tests related to the changed code pass in development
+
+### Code review
+
+- [ ] This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
+- [ ] "Ready for review" label attached to the PR and reviewers assigned
+- [ ] Issue from task tracker has a link to this pull request
+- [ ] Changes have been reviewed by at least one other engineer
diff --git a/.github/workflows/code_checks.yaml b/.github/workflows/code_checks.yaml
@@ -0,0 +1,44 @@
+# .github/workflows/code_checks.yaml
+name: Code_Checks
+
+on: ["push", "pull_request"]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: '8.0'
+            stability: 'prefer-lowest'
+          - php: '8.0'
+            stability: 'prefer-stable'
+          - php: '8.1'
+            stability: 'prefer-stable'
+          - php: '8.2'
+            stability: 'prefer-stable'
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.stability }} tests
+    steps:
+      # basically git clone
+      - uses: actions/checkout@v3
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      # use PHP of specific version
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: pcov, dom, curl, libxml, mbstring
+          coverage: pcov
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Execute tests
+        run: vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 /vendor/
 /var/
 !/var/.gitkeep
+.phpunit.result.cache
+.phpunit.cache
 
 composer.lock
 clover.xml
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,66 @@
+# Changelog
+
+## [v5.1.0] - 2023-05-05
+* Added tests for PHP 8.2 and updated CI workflow by symfony 6.2.10 @Chris53897 in #84
+* Added support for `rollbar/rollbar` v4 by @Chris53897 in #86
+* Added Symfony framework and version to configs by @danielmorell in #88
+
+## [v5.0.0] - 2022-09-16
+* Added Symfony 6 support, and update tests by @art-cg in #73
+* Added GitHub actions by @art-cg in #74
+* Feature/remove unused language version by @Chris53897 in #77
+* Fixed failing CI by @danielmorell in #78
+* Fixed #51 To make catch statement broader by @danielmorell in #80
+* Added CHANGELOG.md by @danielmorell in #81
+
+## [v4.0.0] - 2020-02-15
+* Update to symfony5 #61
+
+## [v3.1.2] - 2019-01-02
+* #39 Person data not loaded TokenStorage as documented
+
+## [v3.1.1] - 2018-12-16
+* #38: phpunit exits with a non-zero status
+* Update README.md
+
+## [v3.1.0] - 2018-10-16
+* #34 Change the name of the report to rollbar-php-symfony-bundle
+* #24 Point docs from README to Rollbar's site
+* #37 Remove exception listeners, rely on Symfony...::logKernelException() to log uncaught exceptions
+* readme updates
+
+## [v3.0.0] - 2018-10-10
+* Update README.md by @jessewgibbs in #30
+* Add Symfony 4 support and ability to configure all Rollbar parameters by @javer in #27
+
+## [v2.0.0] - 2018-04-17
+* Major refactoring of the directory structure following Symfony's [best practices](http://symfony.com/doc/3.4/bundles/best_practices.html).
+* Updated the `rollbar/rollbar` dependency to use the latest release.
+* Added support for manual logging through the `LoggerInterface` injected logger.
+* Utilized Symfony's Monolog Bundle to tap into Symfony's common logging mechanism.
+* Updated `README.md` and `Resources/doc/index.rst`.
+* Added Symfony's logged in user tracking by default.
+* Added support for `person_fn` for modifying the user tracking data.
+* Refactored the configuration options structure for `app/config/config.yml`.
+* Added passing Rollbar's default config values as they are defined in `rollbar/rollbar` dependency instead of redefining them in the bundle.
+
+## [v1.0.2] - 2018-02-16
+* update: allow to work with php7
+
+## [v1.0.1] - 2017-08-09
+* Update ExceptionListener.php fix function access level
+
+## [v1.0.0] - 2017-05-08
+* coverage
+
+
+[v5.0.0]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v4.0.0...v5.0.0
+[v4.0.0]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v3.1.2...v4.0.0
+[v3.1.2]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v3.1.1...v3.1.2
+[v3.1.1]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v3.1.0...v3.1.1
+[v3.1.0]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v3.0.0...v3.1.0
+[v3.0.0]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v2.0.0...v3.0.0
+[v2.0.0]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v1.0.2...v2.0.0
+[v1.0.2]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v1.0.1...v1.0.2
+[v1.0.1]: https://github.com/rollbar/rollbar-php-symfony-bundle/compare/v1.0.0...v1.0.1
+[v1.0.0]: https://github.com/rollbar/rollbar-php-symfony-bundle/releases/tag/v1.0.0
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Rollbar\Symfony\RollbarBundle\DependencyInjection;
+
+use Rollbar\Config;
+use Rollbar\Defaults;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+/**
+ * Class Configuration
+ *
+ * @link https://rollbar.com/docs/notifier/rollbar-php/#configuration-reference
+ */
+class Configuration implements ConfigurationInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfigTreeBuilder(): TreeBuilder
+    {
+        $treeBuilder = new TreeBuilder(RollbarExtension::ALIAS);
+        $rollbarConfigNode = $treeBuilder->getRootNode();
+
+        $rollbarConfigNodeChildren = $rollbarConfigNode->children();
+
+        $configOptions = Config::listOptions();
+        $rollbarDefaults = Defaults::get();
+
+        foreach ($configOptions as $option) {
+            $method = match ($option) {
+                'branch' => 'gitBranch',
+                default => $option,
+            };
+
+            try {
+                $default = $rollbarDefaults->fromSnakeCase($method);
+            } catch (\Exception $e) {
+                $default = null;
+            }
+
+            if (is_array($default)) {
+                $rollbarConfigNodeChildren
+                    ->arrayNode($option)
+                        ->scalarPrototype()->end()
+                        ->defaultValue($default)
+                    ->end();
+            } else {
+                $rollbarConfigNodeChildren
+                    ->scalarNode($option)
+                        ->defaultValue($default)
+                    ->end();
+            }
+        }
+
+        return $treeBuilder;
+    }
+}
diff --git a/...encyInjection/SymfonyRollbarExtension.php → DependencyInjection/RollbarExtension.php b/...encyInjection/SymfonyRollbarExtension.php → DependencyInjection/RollbarExtension.php
@@ -1,37 +1,25 @@
 <?php
 
-namespace SymfonyRollbarBundle\DependencyInjection;
+namespace Rollbar\Symfony\RollbarBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-/**
- * Class Extension
- * @package SymfonyRollbarBundle\DependencyInjection
- */
-class SymfonyRollbarExtension extends Extension
+class RollbarExtension extends Extension
 {
-    const ALIAS = 'symfony_rollbar';
+    public const ALIAS = 'rollbar';
 
     /**
-     * Loads a specific configuration.
-     *
-     * @param array            $configs   An array of configuration values
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     *
-     * @throws \InvalidArgumentException When provided tag is not defined in this extension
+     * {@inheritdoc}
+     * @throws \Exception
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config        = $this->processConfiguration($configuration, $configs);
 
-        if (!$config['enable']) {
-            return;
-        }
-
         // load services and register listeners
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
@@ -41,9 +29,9 @@ public function load(array $configs, ContainerBuilder $container)
     }
 
     /**
-     * @return string
+     * {@inheritdoc}
      */
-    public function getAlias()
+    public function getAlias(): string
     {
         return static::ALIAS;
     }

diff --git a/Factories/RollbarHandlerFactory.php b/Factories/RollbarHandlerFactory.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Rollbar\Symfony\RollbarBundle\Factories;
+
+use Psr\Log\LogLevel;
+use Monolog\Handler\RollbarHandler;
+use Rollbar\Rollbar;
+use Rollbar\Symfony\RollbarBundle\DependencyInjection\RollbarExtension;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+class RollbarHandlerFactory
+{
+    public function __construct(ContainerInterface $container)
+    {
+        $config = $container->getParameter(RollbarExtension::ALIAS . '.config');
+
+        if (isset($_ENV['ROLLBAR_TEST_TOKEN']) && $_ENV['ROLLBAR_TEST_TOKEN']) {
+            $config['access_token'] = $_ENV['ROLLBAR_TEST_TOKEN'];
+        }
+
+        if (!empty($config['person_fn']) && is_callable($config['person_fn'])) {
+            $config['person'] = null;
+        } elseif (empty($config['person'])) {
+            $config['person_fn'] = static function () use ($container) {
+                try {
+                    $token = $container->get('security.token_storage')->getToken();
+
+                    if ($token) {
+                        $user = $token->getUser();
+                        $serializer = $container->get('serializer');
+                        return \json_decode($serializer->serialize($user, 'json'), true, 512, JSON_THROW_ON_ERROR);
+                    }
+                } catch (\Throwable $exception) {
+                    // Ignore
+                }
+            };
+        }
+
+        $config['framework'] = 'symfony ' . Kernel::VERSION;
+
+        Rollbar::init($config, false, false, false);
+    }
+
+    public function createRollbarHandler(): RollbarHandler
+    {
+        return new RollbarHandler(Rollbar::logger(), LogLevel::ERROR);
+    }
+}