Merge pull request #81 from Troopers/paulandrieux-patch-1

Inject alert only on requests that has a session

Author: paulandrieux

.travis.yml

@@ -9,5 +9,5 @@ cache:
 php:
     - 7.0
 
-install: composer update
+install: COMPOSER_MEMORY_LIMIT=-1 composer update
 script: vendor/bin/phpunit -v

EventListener/AlertifyListener.php

@@ -71,8 +71,9 @@ protected function injectAlertify(Response $response, Request $request)
         $hasMetaRefresh = false !== strripos($content, 'http-equiv="refresh"');
         $forceInject = $response->headers->get('X-Inject-Alertify', false);
         $isRedirectResponse = $response instanceof RedirectResponse;
+        $hasPreviousSession = $request->hasPreviousSession();
 
-        if ($hasBody && !$hasMetaRefresh && !$isRedirectResponse || $forceInject) {
+        if ($hasBody && $hasPreviousSession && !$hasMetaRefresh && !$isRedirectResponse || $forceInject) {
             if ($response->getStatusCode() === 204) {
                 throw new IncompatibleStatusCodeException();
             }

Tests/DependencyInjection/AlertifyExtensionTest.php

@@ -38,21 +38,21 @@ public function testContexts()
         $container = new ContainerBuilder();
         $loader = new TroopersAlertifyExtension();
         $loader->load([[
-                'contexts' => [
-                    'front' => [
-                        'engine'  => 'notie',
-                        'options' => [
-                            'animationDelay' => 300,
-                        ],
-                    ],
-                    'back' => [
-                        'engine'            => 'pushjs',
-                        'translationDomain' => 'admin',
+            'contexts' => [
+                'front' => [
+                    'engine'  => 'notie',
+                    'options' => [
+                        'animationDelay' => 300,
                     ],
                 ],
-                'default' => [
-                    'engine' => 'notie',
-                ], ]], $container);
+                'back' => [
+                    'engine'            => 'pushjs',
+                    'translationDomain' => 'admin',
+                ],
+            ],
+            'default' => [
+                'engine' => 'notie',
+            ], ]], $container);
         $this->assertSame([
             'contexts' => [
                 'front' => [