Rename App namespace to Surfnet/Tiqr

bin/console

@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-use App\Kernel;
+use Surfnet\Tiqr\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;

composer.json

@@ -7,13 +7,8 @@
   "prefer-stable": true,
   "autoload": {
     "psr-4": {
-      "App\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Dev\\": "dev",
-      "Tests\\": "tests/"
+      "Surfnet\\Tiqr\\": "src",
+      "Surfnet\\Tiqr\\Dev\\": "dev"
     }
   },
   "require": {

config/packages/twig.yaml

@@ -5,4 +5,4 @@ twig:
     debug: '%kernel.debug%'
     strict_variables: '%kernel.debug%'
     globals:
-        global_view_parameters: '@App\Service\GlobalViewParameters'
+        global_view_parameters: '@Surfnet\Tiqr\Service\GlobalViewParameters'

config/services.yaml

@@ -22,7 +22,7 @@ services:
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
-    App\:
+    Surfnet\Tiqr\:
         resource: '../src/*'
         exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
 
@@ -32,25 +32,25 @@ services:
     Symfony\Component\DependencyInjection\Container:
       alias: 'service_container'
 
-    App\Tiqr\Legacy\TiqrService:
-      factory: ['App\Tiqr\TiqrFactory', 'createService']
+    Surfnet\Tiqr\Tiqr\Legacy\TiqrService:
+      factory: ['Surfnet\Tiqr\Tiqr\TiqrFactory', 'createService']
 
-    App\Tiqr\Legacy\TiqrUserRepository:
-      factory: ['App\Tiqr\TiqrFactory', 'createUserRepository']
+    Surfnet\Tiqr\Tiqr\Legacy\TiqrUserRepository:
+      factory: ['Surfnet\Tiqr\Tiqr\TiqrFactory', 'createUserRepository']
 
-    App\Tiqr\TiqrUserRepositoryInterface:
-      alias: App\Tiqr\Legacy\TiqrUserRepository
+    Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface:
+      alias: Surfnet\Tiqr\Tiqr\Legacy\TiqrUserRepository
 
     surfnet_saml.saml2.bridge_container:
       class: Surfnet\SamlBundle\SAML2\BridgeContainer
       arguments:
           - '@logger'
 
-    App\Service\UserAgentMatcher:
+    Surfnet\Tiqr\Service\UserAgentMatcher:
       bind:
         $pattern: '%mobile_app_user_agent_pattern%'
 
-    App\Controller\ExceptionController:
+    Surfnet\Tiqr\Controller\ExceptionController:
       tags: ['controller.service_arguments']
       arguments:
-        $errorPageHelper: '@App\Service\ErrorPageHelper'
+        $errorPageHelper: '@Surfnet\Tiqr\Service\ErrorPageHelper'

config/services_dev.yaml

@@ -6,15 +6,15 @@ services:
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
-    Dev\:
+    Surfnet\Tiqr\Dev\:
         resource: '../dev/*'
         exclude: '../dev/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
 
-    Dev\Controller\:
+    Surfnet\Tiqr\Dev\Controller\:
         resource: '../dev/Controller'
         tags: ['controller.service_arguments']
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
     GuzzleHttp\Client:
         class: GuzzleHttp\Client
-        factory: ['Dev\HttpClientFactory', 'create']
+        factory: ['Surfnet\Tiqr\Dev\HttpClientFactory', 'create']

config/services_test.yaml

@@ -3,16 +3,16 @@ imports:
     - { resource: 'services_dev.yaml' }
 
 services:
-    Dev\FileLogger:
+    Surfnet\Tiqr\Dev\FileLogger:
         public: true
         decorates: 'logger'
         arguments:
             - '@kernel'
 
     overide_matcher:
-        class: App\Service\UserAgentMatcher
+        class: Surfnet\Tiqr\Service\UserAgentMatcher
         public: true
-        decorates: App\Service\UserAgentMatcher
+        decorates: Surfnet\Tiqr\Service\UserAgentMatcher
         arguments:
             - '/^Behat UA$/'
 

dev/Command/AuthenticationCommand.php

@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Command;
+namespace Surfnet\Tiqr\Dev\Command;
 
 use GuzzleHttp\Client;
 use OCRA;

dev/Command/RegistrationCommand.php

@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Command;
+namespace Surfnet\Tiqr\Dev\Command;
 
 use GuzzleHttp\Client;
 use RuntimeException;

dev/Controller/QrLinkController.php

@@ -17,9 +17,9 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Controller;
+namespace Surfnet\Tiqr\Dev\Controller;
 
-use App\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
 use InvalidArgumentException;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\Routing\Annotation\Route;

dev/Controller/SPController.php

@@ -18,20 +18,18 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Controller;
+namespace Surfnet\Tiqr\Dev\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\Routing\Annotation\Route;
 use DOMDocument;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
-use SAML2\Assertion;
 use SAML2\Certificate\PrivateKeyLoader;
 use SAML2\Configuration\PrivateKey;
 use SAML2\DOMDocumentFactory;
 use SAML2\Message;
 use SAML2\Response;
-use Surfnet\GsspBundle\Service\RegistrationService;
 use Surfnet\SamlBundle\Entity\IdentityProvider;
 use Surfnet\SamlBundle\Entity\ServiceProvider;
 use Surfnet\SamlBundle\Http\Exception\AuthnFailedSamlResponseException;

dev/FileLogger.php

@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev;
+namespace Surfnet\Tiqr\Dev;
 
 use League\Csv\Reader;
 use League\Csv\Writer;

dev/HttpClientFactory.php

@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev;
+namespace Surfnet\Tiqr\Dev;
 
 use GuzzleHttp\Client;
 

dev/Twig/GsspExtension.php

@@ -17,7 +17,7 @@
 
 declare(strict_types = 1);
 
-namespace Dev\Twig;
+namespace Surfnet\Tiqr\Dev\Twig;
 
 use Surfnet\SamlBundle\Entity\HostedEntities;
 use Twig\Extension\AbstractExtension;

public/index.php

@@ -1,5 +1,5 @@
 <?php
-use App\Kernel;
+use Surfnet\Tiqr\Kernel;
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 require_once dirname(__DIR__).'/config/bootstrap.php';

src/Controller/AuthenticationController.php

@@ -18,20 +18,20 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
-
-use App\Exception\NoActiveAuthenrequestException;
-use App\Exception\UserNotFoundException;
-use App\Exception\UserPermanentlyBlockedException;
-use App\Exception\UserTemporarilyBlockedException;
-use App\Tiqr\AuthenticationRateLimitServiceInterface;
-use App\Tiqr\Exception\UserNotExistsException;
-use App\Tiqr\Response\AuthenticationResponse;
-use App\Tiqr\Response\RateLimitedAuthenticationResponse;
-use App\Tiqr\TiqrServiceInterface;
-use App\Tiqr\TiqrUserInterface;
-use App\Tiqr\TiqrUserRepositoryInterface;
-use App\WithContextLogger;
+namespace Surfnet\Tiqr\Controller;
+
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Exception\UserNotFoundException;
+use Surfnet\Tiqr\Exception\UserPermanentlyBlockedException;
+use Surfnet\Tiqr\Exception\UserTemporarilyBlockedException;
+use Surfnet\Tiqr\Tiqr\AuthenticationRateLimitServiceInterface;
+use Surfnet\Tiqr\Tiqr\Exception\UserNotExistsException;
+use Surfnet\Tiqr\Tiqr\Response\AuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\Response\RateLimitedAuthenticationResponse;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface;
+use Surfnet\Tiqr\WithContextLogger;
 use Exception;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;

src/Controller/CancelController.php

@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
-use App\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
 use Psr\Log\LoggerInterface;
 use Surfnet\GsspBundle\Service\AuthenticationService;
 use Surfnet\GsspBundle\Service\RegistrationService;

src/Controller/ExceptionController.php

@@ -18,13 +18,13 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
-use App\Exception\NoActiveAuthenrequestException;
-use App\Exception\UserNotFoundException;
-use App\Exception\UserPermanentlyBlockedException;
-use App\Exception\UserTemporarilyBlockedException;
-use App\Service\ErrorPageHelper;
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Exception\UserNotFoundException;
+use Surfnet\Tiqr\Exception\UserPermanentlyBlockedException;
+use Surfnet\Tiqr\Exception\UserTemporarilyBlockedException;
+use Surfnet\Tiqr\Service\ErrorPageHelper;
 use Error;
 use Exception;
 use Surfnet\GsspBundle\Exception\UnrecoverableErrorException;

src/Controller/InfoController.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

src/Controller/RegistrationController.php

@@ -18,10 +18,10 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
+namespace Surfnet\Tiqr\Controller;
 
-use App\Exception\NoActiveAuthenrequestException;
-use App\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Exception\NoActiveAuthenrequestException;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
 use Psr\Log\LoggerInterface;
 use Surfnet\GsspBundle\Service\RegistrationService;
 use Surfnet\GsspBundle\Service\StateHandlerInterface;

src/Controller/TiqrAppApiController.php

@@ -18,14 +18,14 @@
  * limitations under the License.
  */
 
-namespace App\Controller;
-
-use App\Service\UserAgentMatcherInterface;
-use App\Tiqr\AuthenticationRateLimitServiceInterface;
-use App\Tiqr\Exception\UserNotExistsException;
-use App\Tiqr\TiqrServiceInterface;
-use App\Tiqr\TiqrUserRepositoryInterface;
-use App\WithContextLogger;
+namespace Surfnet\Tiqr\Controller;
+
+use Surfnet\Tiqr\Service\UserAgentMatcherInterface;
+use Surfnet\Tiqr\Tiqr\AuthenticationRateLimitServiceInterface;
+use Surfnet\Tiqr\Tiqr\Exception\UserNotExistsException;
+use Surfnet\Tiqr\Tiqr\TiqrServiceInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface;
+use Surfnet\Tiqr\WithContextLogger;
 use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

src/DependencyInjection/Configuration.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\DependencyInjection;
+namespace Surfnet\Tiqr\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;

src/EventSubscriber/LocaleResponseListener.php

@@ -18,7 +18,7 @@
 
 declare(strict_types = 1);
 
-namespace App\EventSubscriber;
+namespace Surfnet\Tiqr\EventSubscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;

src/Exception/NoActiveAuthenrequestException.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 

src/Exception/TiqrServerRuntimeException.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use Exception;
 use RuntimeException;

src/Exception/UserNotFoundException.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 

src/Exception/UserPermanentlyBlockedException.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 

src/Exception/UserTemporarilyBlockedException.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Exception;
+namespace Surfnet\Tiqr\Exception;
 
 use RuntimeException as CoreRuntimeException;
 

src/Features/Context/ErrorReportContext.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace App\Features\Context;
+namespace Surfnet\Tiqr\Features\Context;
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\AfterStepScope;

src/Features/Context/TiqrContext.php

@@ -18,11 +18,11 @@
  * limitations under the License.
  */
 
-namespace App\Features\Context;
+namespace Surfnet\Tiqr\Features\Context;
 
-use App\Tiqr\TiqrConfiguration;
-use App\Tiqr\TiqrConfigurationInterface;
-use App\Tiqr\TiqrUserRepositoryInterface;
+use Surfnet\Tiqr\Tiqr\TiqrConfiguration;
+use Surfnet\Tiqr\Tiqr\TiqrConfigurationInterface;
+use Surfnet\Tiqr\Tiqr\TiqrUserRepositoryInterface;
 use Assert\Assertion;
 use Assert\AssertionFailedException;
 use Behat\Behat\Context\Context;