Consolidated all the services into better namespaces, see #90 (#97)

public/index.php

@@ -46,11 +46,11 @@
     'swiftmailer.use_spool' => false
 ]);
 
-$app->register(new Mentoring\ServiceProvider\MailerServiceProvider());
+$app->register(new \Mentoring\Mailer\ServiceProvider\MailerServiceProvider());
 
 $app->register(new Provider\FormServiceProvider());
 $app['form.type.extensions'] = $app->extend('form.type.extensions', function ($extensions) use ($app) {
-    $extensions[] = new \Mentoring\Form\Extension\MentoringFormTypeExtension();
+    $extensions[] = new \Mentoring\Account\Form\Extension\MentoringFormTypeExtension();
 
     return $extensions;
 });
@@ -73,26 +73,26 @@
     'db.options' => $dbOptions
 ]);
 
-$taxonomyServiceProvider = new \Mentoring\ServiceProvider\TaxonomyServiceProvider();
+$taxonomyServiceProvider = new \Mentoring\Taxonomy\ServiceProvider\TaxonomyServiceProvider();
 $app->register($taxonomyServiceProvider);
 
-$authServiceProvider = new \Mentoring\ServiceProvider\AuthServiceProvider();
+$authServiceProvider = new \Mentoring\Auth\ServiceProvider\AuthServiceProvider();
 $app->register($authServiceProvider);
 $app->mount('/auth', $authServiceProvider);
 
-$accountServiceProvider = new \Mentoring\ServiceProvider\AccountServiceProvider();
+$accountServiceProvider = new \Mentoring\Account\ServiceProvider\AccountServiceProvider();
 $app->register($accountServiceProvider);
 $app->mount('/account', $accountServiceProvider);
 
-$apiServiceProvider = new \Mentoring\ServiceProvider\ApiServiceProvider();
+$apiServiceProvider = new \Mentoring\PublicSite\ServiceProvider\ApiServiceProvider();
 $app->register($apiServiceProvider);
 $app->mount('/api/v0', $apiServiceProvider);
 
-$indexServiceProvider = new \Mentoring\ServiceProvider\IndexServiceProvider();
+$indexServiceProvider = new \Mentoring\PublicSite\ServiceProvider\IndexServiceProvider();
 $app->register($indexServiceProvider);
 $app->mount('/', $indexServiceProvider);
 
-$conversationServiceProvider = new \Mentoring\ServiceProvider\ConversationServiceProvider();
+$conversationServiceProvider = new \Mentoring\Conversation\ServiceProvider\ConversationServiceProvider();
 $app->register($conversationServiceProvider);
 $app->mount('/conversations', $conversationServiceProvider);
 

src/Mentoring/Controller/AccountController.php → src/Mentoring/Account/Controller/AccountController.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace Mentoring\Controller;
+namespace Mentoring\Account\Controller;
 
-use Mentoring\Form\ProfileForm;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Request;
 

src/Mentoring/Form/DataTransformer/TextToTagsTransformer.php → src/Mentoring/Account/Form/DataTransformer/TextToTagsTransformer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Form\DataTransformer;
+namespace Mentoring\Account\Form\DataTransformer;
 
 use Mentoring\Taxonomy\TermNotFoundException;
 use Symfony\Component\Form\DataTransformerInterface;

src/Mentoring/Form/Extension/MentoringFormTypeExtension.php → src/Mentoring/Account/Form/Extension/MentoringFormTypeExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Form\Extension;
+namespace Mentoring\Account\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;

src/Mentoring/Form/ProfileForm.php → src/Mentoring/Account/Form/ProfileForm.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Mentoring\Form;
+namespace Mentoring\Account\Form;
 
-use Mentoring\Form\DataTransformer\TextToTagsTransformer;
-use Mentoring\Validator\Constraints\TimezoneConstraint;
+use Mentoring\Account\Form\DataTransformer\TextToTagsTransformer;
+use Mentoring\Account\Validator\Constraints\TimezoneConstraint;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
@@ -16,7 +16,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Mentoring\Validator\Constraints\TagConstraint;
+use Mentoring\Account\Validator\Constraints\TagConstraint;
 
 class ProfileForm extends AbstractType
 {

src/Mentoring/ServiceProvider/AccountServiceProvider.php → src/Mentoring/Account/ServiceProvider/AccountServiceProvider.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Mentoring\ServiceProvider;
+namespace Mentoring\Account\ServiceProvider;
 
-use Mentoring\Controller\AccountController;
-use Mentoring\Form\ProfileForm;
+use Mentoring\Account\Controller\AccountController;
+use Mentoring\Account\Form\ProfileForm;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Silex\Api\ControllerProviderInterface;

src/Mentoring/Validator/Constraints/TagConstraint.php → src/Mentoring/Account/Validator/Constraints/TagConstraint.php

@@ -1,5 +1,5 @@
 <?php
-namespace Mentoring\Validator\Constraints;
+namespace Mentoring\Account\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 

src/Mentoring/Validator/Constraints/TagConstraintValidator.php → src/Mentoring/Account/Validator/Constraints/TagConstraintValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Validator\Constraints;
+namespace Mentoring\Account\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;

src/Mentoring/Validator/Constraints/TimezoneConstraint.php → src/Mentoring/Account/Validator/Constraints/TimezoneConstraint.php

@@ -6,7 +6,7 @@
  * Time: 08:24
  */
 
-namespace Mentoring\Validator\Constraints;
+namespace Mentoring\Account\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 

src/Mentoring/Validator/Constraints/TimezoneConstraintValidator.php → src/Mentoring/Account/Validator/Constraints/TimezoneConstraintValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Validator\Constraints;
+namespace Mentoring\Account\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;

src/Mentoring/Controller/AuthController.php → src/Mentoring/Auth/Controller/AuthController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Controller;
+namespace Mentoring\Auth\Controller;
 
 use League\OAuth2\Client\Provider\Github;
 use League\OAuth2\Client\Token\AccessToken;

src/Mentoring/ServiceProvider/AuthServiceProvider.php → src/Mentoring/Auth/ServiceProvider/AuthServiceProvider.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Mentoring\ServiceProvider;
+namespace Mentoring\Auth\ServiceProvider;
 
-use Mentoring\Controller\AuthController;
+use Mentoring\Auth\Controller\AuthController;
 use Mentoring\Taxonomy\TermHydrator;
 use Mentoring\User\UserHydrator;
 use Mentoring\User\UserService;

src/Mentoring/Controller/ConversationController.php → src/Mentoring/Conversation/Controller/ConversationController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Controller;
+namespace Mentoring\Conversation\Controller;
 
 use Mentoring\Conversation\Conversation;
 use Mentoring\Conversation\Message;

src/Mentoring/Form/ConversationReplyForm.php → src/Mentoring/Conversation/Form/ConversationReplyForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Form;
+namespace Mentoring\Conversation\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;

src/Mentoring/Form/ConversationStartForm.php → src/Mentoring/Conversation/Form/ConversationStartForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Form;
+namespace Mentoring\Conversation\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;

src/Mentoring/ServiceProvider/ConversationServiceProvider.php → src/Mentoring/Conversation/ServiceProvider/ConversationServiceProvider.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Mentoring\ServiceProvider;
+namespace Mentoring\Conversation\ServiceProvider;
 
-use Mentoring\Controller\ConversationController;
+use Mentoring\Conversation\Controller\ConversationController;
 use Mentoring\Conversation\ConversationRepository;
 use Mentoring\Conversation\ConversationTwigExtension;
 use Mentoring\Conversation\MarkdownConverter;
-use Mentoring\Form\ConversationReplyForm;
-use Mentoring\Form\ConversationStartForm;
+use Mentoring\Conversation\Form\ConversationReplyForm;
+use Mentoring\Conversation\Form\ConversationStartForm;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Silex\Api\ControllerProviderInterface;

src/Mentoring/ServiceProvider/MailerServiceProvider.php → src/Mentoring/Mailer/ServiceProvider/MailerServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\ServiceProvider;
+namespace Mentoring\Mailer\ServiceProvider;
 
 use Mentoring\Mailer\Mailer;
 use Pimple\Container;

src/Mentoring/Controller/ApiController.php → src/Mentoring/PublicSite/Controller/ApiController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Controller;
+namespace Mentoring\PublicSite\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

src/Mentoring/Controller/IndexController.php → src/Mentoring/PublicSite/Controller/IndexController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\Controller;
+namespace Mentoring\PublicSite\Controller;
 
 use Mentoring\Conversation\Message;
 use Mentoring\Form\ConversationStartForm;
@@ -51,7 +51,8 @@ public function viewProfileAction(Application $app, Request $request, $user_id)
         return $app['twig']->render('index/profile.twig', [
             'viewing_user' => $viewing_user,
             'message_form' => $form === null ? null : $form->createView(),
-            'viewing_yourself' => ($user && $viewing_user->getId() == $user->getId())
+//            'viewing_yourself' => ($user && $viewing_user->getId() == $user->getId())
+            'viewing_yourself' => false
         ]);
     }
 }

src/Mentoring/ServiceProvider/ApiServiceProvider.php → src/Mentoring/PublicSite/ServiceProvider/ApiServiceProvider.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Mentoring\ServiceProvider;
+namespace Mentoring\PublicSite\ServiceProvider;
 
-use Mentoring\Controller\ApiController;
+use Mentoring\PublicSite\Controller\ApiController;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Silex\Api\ControllerProviderInterface;

src/Mentoring/ServiceProvider/IndexServiceProvider.php → src/Mentoring/PublicSite/ServiceProvider/IndexServiceProvider.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Mentoring\ServiceProvider;
+namespace Mentoring\PublicSite\ServiceProvider;
 
-use Mentoring\Controller\IndexController;
+use Mentoring\PublicSite\Controller\IndexController;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Silex\Api\ControllerProviderInterface;

src/Mentoring/ServiceProvider/TaxonomyServiceProvider.php → src/Mentoring/Taxonomy/ServiceProvider/TaxonomyServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mentoring\ServiceProvider;
+namespace Mentoring\Taxonomy\ServiceProvider;
 
 use Mentoring\Taxonomy\TaxonomyService;
 use Mentoring\Taxonomy\TermHydrator;

tests/MentoringTest/Validator/TagConstraintTest.php → tests/MentoringTest/Account/Validator/TagConstraintTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace MentoringTest\Validator;
+namespace MentoringTest\Account\Validator;
 
-use Mentoring\Validator\Constraints\TagConstraintValidator;
-use Mentoring\Validator\Constraints\TagConstraint;
+use Mentoring\Account\Validator\Constraints\TagConstraintValidator;
+use Mentoring\Account\Validator\Constraints\TagConstraint;
 use Mentoring\Taxonomy\Term;
 
 class TagConstraintTest extends \PHPUnit_Framework_TestCase

tests/MentoringTest/Validator/TimezoneConstraintTest.php → tests/MentoringTest/Account/Validator/TimezoneConstraintTest.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace MentoringTest\Validator;
+namespace MentoringTest\Account\Validator;
 
-use Mentoring\Validator\Constraints\TimezoneConstraintValidator;
-use Mentoring\Validator\Constraints\TimezoneConstraint;
-use Mentoring\Taxonomy\Term;
+use Mentoring\Account\Validator\Constraints\TimezoneConstraintValidator;
+use Mentoring\Account\Validator\Constraints\TimezoneConstraint;
 
 class TimezoneConstraintTest extends \PHPUnit_Framework_TestCase
 {