Merge branch 'sf4' of framagit.org:Chill-project/Chill-Activity into sf4

Controller/ActivityController.php

@@ -24,6 +24,7 @@ namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -51,16 +52,25 @@ class ActivityController extends AbstractController
      */
     protected $authorizationHelper;
     
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
+    
     /**
      * ActivityController constructor.
      *
      * @param EventDispatcherInterface $eventDispatcher
      * @param AuthorizationHelper $authorizationHelper
      */
-    public function __construct(EventDispatcherInterface $eventDispatcher, AuthorizationHelper $authorizationHelper)
-    {
+    public function __construct(
+        EventDispatcherInterface $eventDispatcher,
+        AuthorizationHelper $authorizationHelper,
+        LoggerInterface $logger
+    ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
+        $this->logger = $logger;
     }
     
     /**
@@ -390,9 +400,8 @@ class ActivityController extends AbstractController
             $form->handleRequest($request);
 
             if ($form->isValid()) {
-                $logger = $this->get('chill.main.logger');
-
-                $logger->notice("An activity has been removed", array(
+                
+                $this->logger->notice("An activity has been removed", array(
                    'by_user' => $this->getUser()->getUsername(),
                    'activity_id' => $activity->getId(),
                    'person_id' => $activity->getPerson()->getId(),

config/services/controller.yaml

@@ -3,4 +3,5 @@ services:
         arguments:
             $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+            $logger: '@chill.main.logger'
         tags: ['controller.service_arguments']

migrations/Version20150701091248.php

@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Activity;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;

migrations/Version20150702093317.php

@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Activity;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;

migrations/Version20150704091347.php

@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Activity;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;

migrations/Version20160222103457.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Activity;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;

migrations/Version20161114085659.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Activity;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;