update structure and tests

Author: OxCom

.gitignore

@@ -1,8 +1,6 @@
 .idea
 /coverage/
 /vendor/
-/var/
-!/var/.gitkeep
 
 composer.lock
 clover.xml

src/DependencyInjection/Configuration.php DependencyInjection/Configuration.php

@@ -17,5 +17,6 @@ services:
       - { name: kernel.event_listener, event: kernel.exception }
 
   symfony_rollbar.provider.rollbar_handler:
+    public: true
     class: SymfonyRollbarBundle\Provider\RollbarHandler
     arguments: ["@service_container"]

src/DependencyInjection/SymfonyRollbarExtension.php DependencyInjection/SymfonyRollbarExtension.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace SymfonyRollbarBundle\Tests\Fixtures\app;
+
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
@@ -25,6 +27,8 @@ public function getRootDir()
 
     /**
      * @param \Symfony\Component\Config\Loader\LoaderInterface $loader
+     *
+     * @throws \Exception
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {

src/EventListener/AbstractListener.php EventListener/AbstractListener.php

@@ -1,6 +1,7 @@
 <?php
-namespace Tests\SymfonyRollbarBundle;
+namespace SymfonyRollbarBundle\Tests;
 
+use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
@@ -9,7 +10,7 @@
 
 /**
  * Class BundleTest
- * @package Tests\SymfonyRollbarBundle
+ * @package SymfonyRollbarBundle\Tests
  */
 class BundleTest extends KernelTestCase
 {
@@ -39,5 +40,7 @@ public function testListeners()
             $ok = $listener[0] instanceof $expected[0] || $listener[0] instanceof $expected[1];
             $this->assertTrue($ok, 'Listeners were not registered');
         }
+
+        restore_error_handler();
     }
 }

src/EventListener/ErrorListener.php EventListener/ErrorListener.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Tests\SymfonyRollbarBundle\DependencyInjection;
+namespace SymfonyRollbarBundle\Tests\DependencyInjection;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use SymfonyRollbarBundle\DependencyInjection\Configuration;
 use SymfonyRollbarBundle\DependencyInjection\SymfonyRollbarExtension;
 
 /**
  * Class ConfigurationTest
- * @package Tests\SymfonyRollbarBundle\DependencyInjection
+ * @package SymfonyRollbarBundle\Tests\DependencyInjection
  */
 class ConfigurationTest extends KernelTestCase
 {

src/EventListener/ExceptionListener.php EventListener/ExceptionListener.php

@@ -1,5 +1,5 @@
 <?php
-namespace Tests\SymfonyRollbarBundle\DependencyInjection;
+namespace SymfonyRollbarBundle\Tests\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use SymfonyRollbarBundle\DependencyInjection\SymfonyRollbarExtension;
@@ -10,7 +10,7 @@
 
 /**
  * Class SymfonyRollbarExtensionTest
- * @package Tests\SymfonyRollbarBundle\DependencyInjection
+ * @package SymfonyRollbarBundle\Tests\DependencyInjection
  */
 class SymfonyRollbarExtensionTest extends AbstractExtensionTestCase
 {

src/Provider/RollbarHandler.php Provider/RollbarHandler.php

@@ -1,5 +1,5 @@
 <?php
-namespace Tests\SymfonyRollbarBundle\EventListener;
+namespace SymfonyRollbarBundle\Tests\EventListener;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
@@ -10,7 +10,7 @@
 
 /**
  * Class AbstractListenerTest
- * @package Tests\SymfonyRollbarBundle\EventListener
+ * @package SymfonyRollbarBundle\Tests\EventListener
  */
 class AbstractListenerTest extends KernelTestCase
 {
@@ -40,6 +40,8 @@ public function testListeners()
             $ok = $listener[0] instanceof $expected[0] || $listener[0] instanceof $expected[1];
             $this->assertTrue($ok, 'Listeners were not registered');
         }
+
+        restore_error_handler();
     }
 
     /**
@@ -60,6 +62,9 @@ public function generatorGetSubscribedEvents()
      */
     public function testGetSubscribedEvents($class)
     {
+        $handler = set_error_handler('var_dump');
+        restore_error_handler();
+
         /**
          * @var AbstractListener $listener
          */
@@ -72,6 +77,7 @@ public function testGetSubscribedEvents($class)
         $list = $listener::getSubscribedEvents();
 
         $this->assertEquals($expect, $list);
+        set_error_handler($handler);
     }
 
     /**
@@ -81,6 +87,9 @@ public function testGetSubscribedEvents($class)
      */
     public function testGetLogger($class)
     {
+        $handler = set_error_handler('var_dump');
+        restore_error_handler();
+
         /**
          * @var AbstractListener $listener
          */
@@ -89,5 +98,6 @@ public function testGetLogger($class)
 
         $logger = $listener->getLogger();
         $this->assertTrue($logger instanceof \Monolog\Logger);
+        set_error_handler($handler);
     }
 }

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

@@ -1,5 +1,5 @@
 <?php
-namespace Tests\SymfonyRollbarBundle\EventListener;
+namespace SymfonyRollbarBundle\Tests\EventListener;
 
 use Monolog\Logger;
 use Rollbar\ErrorWrapper;
@@ -10,7 +10,7 @@
 
 /**
  * Class ErrorListenerTest
- * @package Tests\SymfonyRollbarBundle\EventListener
+ * @package SymfonyRollbarBundle\Tests\EventListener
  */
 class ErrorListenerTest extends KernelTestCase
 {
@@ -56,6 +56,7 @@ public function testUserError()
         }
 
         trigger_error($message, E_USER_ERROR);
+        restore_error_handler();
     }
 
     /**
@@ -83,6 +84,7 @@ public function testFatalError()
 
                 $exception = $record['context']['exception'];
                 $this->assertInstanceOf(ErrorWrapper::class, $exception);
+                restore_error_handler();
             } catch (\Exception $e) {
                 echo implode("\n", [
                     $e->getMessage(),
@@ -102,7 +104,6 @@ public function testFatalError()
             $listener[0]->getLogger()->setHandlers([$handler]);
         }
 
-        // @ will allow to skip fatal error inside application, but we can get error with error_get_last()
         if (version_compare(PHP_VERSION, '7.0.0')  >= 0) {
             $this->expectException('Error');
             $this->expectExceptionMessage('Call to undefined function this_is_fatal_error()');

docs/config.md Resources/docs/config.md

@@ -1,5 +1,5 @@
 <?php
-namespace Tests\SymfonyRollbarBundle\EventListener;
+namespace SymfonyRollbarBundle\Tests\EventListener;
 
 use Monolog\Logger;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -11,7 +11,7 @@
 
 /**
  * Class ExceptionListenerTest
- * @package Tests\SymfonyRollbarBundle\EventListener
+ * @package SymfonyRollbarBundle\Tests\EventListener
  */
 class ExceptionListenerTest extends KernelTestCase
 {
@@ -42,6 +42,7 @@ public function testException($exception)
         );
 
         $eventDispatcher->dispatch('kernel.exception', $event);
+        restore_error_handler();
     }
 
     public function generateEventExceptions()

docs/install.md Resources/docs/install.md

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\SymfonyRollbarBundle\Provider;
+namespace SymfonyRollbarBundle\Tests\Provider;
 
 use Rollbar\Payload\Level;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -9,7 +9,7 @@
 /**
  * Class RollbarHandlerTest
  *
- * @package Tests\SymfonyRollbarBundle\Provider
+ * @package SymfonyRollbarBundle\Tests\Provider
  */
 class RollbarHandlerTest extends KernelTestCase
 {

src/SymfonyRollbarBundle.php SymfonyRollbarBundle.php

@@ -5,12 +5,17 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         convertErrorsToExceptions="false"
-         bootstrap="Fixtures/app/autoload.php"
+         convertErrorsToExceptions="true"
+         bootstrap="./Fixtures/app/autoload.php"
 >
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+    </listeners>
+
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="KERNEL_DIR" value="Fixtures/app" />
+        <server name="KERNEL_CLASS" value="SymfonyRollbarBundle\Tests\Fixtures\app\AppKernel" />
     </php>
 
     <testsuites>
@@ -21,7 +26,12 @@
 
     <filter>
         <whitelist>
-            <directory>./../src</directory>
+            <directory>.</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
         </whitelist>
     </filter>
     <logging>

tests/Fixtures/ErrorHandler.php Tests/Fixtures/ErrorHandler.php

@@ -10,30 +10,37 @@
         }
     ],
     "autoload": {
-        "psr-4": { "SymfonyRollbarBundle\\": "src/" }
+        "psr-4": { "SymfonyRollbarBundle\\": "./" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     },
     "autoload-dev": {
-        "psr-4": { "Tests\\": "tests/"}
+        "psr-4": { "Tests\\": "Tests/"},
+        "files": [
+            "Tests/Fixtures/app/AppKernel.php"
+        ]
     },
     "require": {
         "php": ">=5.6",
-        "monolog/monolog": "^1.22",
+        "monolog/monolog": "^1.23",
         "rollbar/rollbar": "^1.3",
-        "symfony/dependency-injection": "^3.2",
-        "symfony/config": "^3.2",
-        "symfony/http-kernel": "^3.2"
+        "symfony/dependency-injection": "~3.0|~4.0",
+        "symfony/config": "~3.0|~4.0",
+        "symfony/http-kernel": "~3.0|~4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^5.7 || ^6.5",
         "doctrine/doctrine-fixtures-bundle": "^2.3",
-        "squizlabs/php_codesniffer": "^2.7",
-        "matthiasnoback/symfony-dependency-injection-test": "^1.1"
+        "squizlabs/php_codesniffer": "^3.2",
+        "matthiasnoback/symfony-dependency-injection-test": "^1.2",
+        "symfony/phpunit-bridge": "^4.0"
     },
     "scripts": {
         "test": [
             "composer install",
-            "./vendor/bin/phpcs --standard=psr2 src/ tests/SymfonyRollbarBundle",
-            "./vendor/bin/phpunit -c tests/"
+            "./vendor/bin/phpcs --standard=psr2 DependencyInjection/ EventListener/ Provider/ Tests/SymfonyRollbarBundle",
+            "./vendor/bin/phpunit -c Tests/phpunit.xml.dist"
         ]
     }
 }