Merge pull request #820 from OpenConext/hotfix/namespace-cherrypick-fix

Fix namespace after cherry picked bugfix
OpenConext · Nov 27, 2019 · dcebc06 · dcebc06
2 parents 3d4aa7e + bff209c
commit dcebc06
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -87,6 +87,7 @@ branches:
     - /^feature\/(.*)$/
     - /^hotfix\/(.*)$/
     - /^bugfix\/(.*)$/
+    - /^release\/(.*)$/
 
 after_failure:
   - sudo tail -500 /var/log/apache2/error.log

diff --git a/composer.lock b/composer.lock
diff --git a/library/EngineBlock/Corto/Module/Service/StepupAssertionConsumer.php b/library/EngineBlock/Corto/Module/Service/StepupAssertionConsumer.php
@@ -19,9 +19,9 @@
 use OpenConext\EngineBlock\Metadata\Loa;
 use OpenConext\EngineBlock\Metadata\LoaRepository;
 use OpenConext\EngineBlock\Service\ProcessingStateHelperInterface;
-use OpenConext\EngineBlock\Stepup\StepupDecision;
-use OpenConext\EngineBlock\Stepup\StepupGatewayCallOutHelper;
 use OpenConext\EngineBlockBundle\Authentication\AuthenticationState;
+use OpenConext\EngineBlockBundle\Stepup\StepupDecision;
+use OpenConext\EngineBlockBundle\Stepup\StepupGatewayCallOutHelper;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;

diff --git a/theme/package-lock.json b/theme/package-lock.json