Merge 34df718 into 377f04d

lightSAML · Sep 1, 2020 · 99f7cd9 · 99f7cd9
2 parents 377f04d + 34df718
commit 99f7cd9
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
     - 7.0
     - 7.1
     - 7.2
+    - 7.3
 
 matrix:
     include:

diff --git a/composer.json b/composer.json
@@ -26,15 +26,15 @@
     },
     "require": {
         "php": ">=5.6",
-        "robrichards/xmlseclibs": "~2.0|~3.0|~4.0",
-        "symfony/http-foundation": "~2.3|~3.0|~4.0",
-        "symfony/event-dispatcher": "~2.3|~3.0|~4.0"
+        "robrichards/xmlseclibs": "~2.0|~3.0",
+        "symfony/http-foundation": "~2.3|~3.0|~4.0|~5.0",
+        "symfony/event-dispatcher": "~2.3|~3.0|~4.0|~5.0"
     },
     "require-dev": {
-        "symfony/dom-crawler": "~2.3|~3.0|~4.0",
-        "symfony/css-selector": "~2.3|~3.0|~4.0",
+        "symfony/dom-crawler": "~2.3|~3.0|~4.0|~5.0",
+        "symfony/css-selector": "~2.3|~3.0|~4.0|~5.0",
         "pimple/pimple": "~3.0",
-        "phpunit/phpunit": ">=5.7",
+        "phpunit/phpunit": ">=5.7 <8.0",
         "monolog/monolog": "~1.3"
     },
     "suggest": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,12 +10,11 @@
         convertWarningsToExceptions = "true"
         processIsolation            = "false"
         stopOnFailure               = "false"
-        syntaxCheck                 = "false"
         bootstrap                   = "autoload.php"
         >
 
     <logging>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+        <log type="junit" target="build/logs/junit.xml"/>
     </logging>
 
     <testsuites>

diff --git a/src/LightSaml/Action/DispatchEventAction.php b/src/LightSaml/Action/DispatchEventAction.php
@@ -40,6 +40,6 @@ public function __construct(EventDispatcherInterface $eventDispatcher, $event)
      */
     public function execute(ContextInterface $context)
     {
-        $this->eventDispatcher->dispatch($this->event, new GenericEvent($context));
+        $this->eventDispatcher->dispatch(new GenericEvent($context), $this->event);
     }
 }
diff --git a/src/LightSaml/Binding/AbstractBinding.php b/src/LightSaml/Binding/AbstractBinding.php
@@ -48,7 +48,7 @@ public function getEventDispatcher()
     protected function dispatchReceive($messageString)
     {
         if ($this->eventDispatcher) {
-            $this->eventDispatcher->dispatch(Events::BINDING_MESSAGE_RECEIVED, new GenericEvent($messageString));
+            $this->eventDispatcher->dispatch(new GenericEvent($messageString), Events::BINDING_MESSAGE_RECEIVED);
         }
     }
 
@@ -58,7 +58,7 @@ protected function dispatchReceive($messageString)
     protected function dispatchSend($messageString)
     {
         if ($this->eventDispatcher) {
-            $this->eventDispatcher->dispatch(Events::BINDING_MESSAGE_SENT, new GenericEvent($messageString));
+            $this->eventDispatcher->dispatch(new GenericEvent($messageString), Events::BINDING_MESSAGE_SENT);
         }
     }
 

diff --git a/tests/LightSaml/Tests/Action/DispatchEventActionTest.php b/tests/LightSaml/Tests/Action/DispatchEventActionTest.php
@@ -33,8 +33,8 @@ public function test_dispatches_generic_event_on_execute()
         $eventDispatcherMock->expects($this->once())
             ->method('dispatch')
             ->with(
-                $this->equalTo($expectedEventName),
-                $this->isInstanceOf(GenericEvent::class)
+                $this->isInstanceOf(GenericEvent::class),
+                $this->equalTo($expectedEventName)
             );
 
         $action->execute($context);

diff --git a/tests/LightSaml/Tests/Functional/Binding/HttpPostBindingFunctionalTest.php b/tests/LightSaml/Tests/Functional/Binding/HttpPostBindingFunctionalTest.php
@@ -29,12 +29,13 @@ public function test_send_authn_request()
         $eventDispatcherMock = $this->getEventDispatcherMock();
         $eventDispatcherMock->expects($this->once())
             ->method('dispatch')
-            ->willReturnCallback(function ($name, GenericEvent $event) {
+            ->willReturnCallback(function (GenericEvent $event, $name) {
                 $this->assertEquals(Events::BINDING_MESSAGE_SENT, $name);
                 $this->assertNotEmpty($event->getSubject());
                 $doc = new \DOMDocument();
                 $doc->loadXML($event->getSubject());
                 $this->assertEquals('AuthnRequest', $doc->firstChild->localName);
+                return $event;
             });
 
         $biding->setEventDispatcher($eventDispatcherMock);
@@ -99,12 +100,13 @@ public function test_receive_authn_request()
         $eventDispatcherMock = $this->getEventDispatcherMock();
         $eventDispatcherMock->expects($this->once())
             ->method('dispatch')
-            ->willReturnCallback(function ($name, GenericEvent $event) {
+            ->willReturnCallback(function (GenericEvent $event, $name) {
                 $this->assertEquals(Events::BINDING_MESSAGE_RECEIVED, $name);
                 $this->assertNotEmpty($event->getSubject());
                 $doc = new \DOMDocument();
                 $doc->loadXML($event->getSubject());
                 $this->assertEquals('AuthnRequest', $doc->firstChild->localName);
+                return $event;
             });
 
         $binding->setEventDispatcher($eventDispatcherMock);

diff --git a/tests/LightSaml/Tests/Functional/Binding/HttpRedirectBindingFunctionalTest.php b/tests/LightSaml/Tests/Functional/Binding/HttpRedirectBindingFunctionalTest.php
@@ -32,12 +32,13 @@ public function test__send_authn_request()
         $eventDispatcherMock = $this->getEventDispatcherMock();
         $eventDispatcherMock->expects($this->once())
             ->method('dispatch')
-            ->willReturnCallback(function ($name, GenericEvent $event) {
+            ->willReturnCallback(function (GenericEvent $event, $name) {
                 $this->assertEquals(Events::BINDING_MESSAGE_SENT, $name);
                 $this->assertNotEmpty($event->getSubject());
                 $doc = new \DOMDocument();
                 $doc->loadXML($event->getSubject());
                 $this->assertEquals('AuthnRequest', $doc->firstChild->localName);
+                return $event;
             });
 
         $biding->setEventDispatcher($eventDispatcherMock);
@@ -122,12 +123,13 @@ public function test__receive_authn_request()
         $eventDispatcherMock = $this->getEventDispatcherMock();
         $eventDispatcherMock->expects($this->once())
             ->method('dispatch')
-            ->willReturnCallback(function ($name, GenericEvent $event) {
+            ->willReturnCallback(function (GenericEvent $event, $name) {
                 $this->assertEquals(Events::BINDING_MESSAGE_RECEIVED, $name);
                 $this->assertNotEmpty($event->getSubject());
                 $doc = new \DOMDocument();
                 $doc->loadXML($event->getSubject());
                 $this->assertEquals('AuthnRequest', $doc->firstChild->localName);
+                return $event;
             });
 
         $binding->setEventDispatcher($eventDispatcherMock);