Suppression abstract class action

0bcfc41f · François Agneray · 271f7146 · 0bcfc41f · 0bcfc41f · 0bcfc41f
Commit 0bcfc41f authored Apr 16, 2019 by François Agneray
--- a/src/Action/Login/ActivateAccountAction.php
+++ b/src/Action/Login/ActivateAccountAction.php
@@ -17,7 +17,7 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Swift_Mailer;
 use Swift_Message;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\User;

 /**
@@ -27,8 +27,15 @@ use App\Entity\User;
 * @author François Agneray <francois.agneray@lam.fr>
 * @package App\Action\Login
 */
-final class ActivateAccountAction extends AbstractAction
+final class ActivateAccountAction
 {
+    use ActionTrait;
+
+    /**
+     * The logger interface is the central access point to log anis information
+     */
+    private $logger;
+
    /**
     * The EntityManager is the central access point to Doctrine ORM functionality (metadata database)
     *
@@ -52,7 +59,7 @@ final class ActivateAccountAction extends AbstractAction
     */
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em, Swift_Mailer $mailer)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
        $this->mailer = $mailer;
    }

--- a/src/Action/Login/ChangePasswordAction.php
+++ b/src/Action/Login/ChangePasswordAction.php
@@ -17,7 +17,7 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Swift_Mailer;
 use Swift_Message;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

 /**
 * With this action the anis user can change his password (POST)
@@ -25,8 +25,15 @@ use App\Action\AbstractAction;
 * @author François Agneray <francois.agneray@lam.fr>
 * @package App\Action\Login
 */
-final class ChangePasswordAction extends AbstractAction
+final class ChangePasswordAction
 {
+    use ActionTrait;
+
+    /**
+     * The logger interface is the central access point to log anis information
+     */
+    private $logger;
+
    /**
     * The EntityManager is the central access point to Doctrine ORM functionality (metadata database)
     *
@@ -50,7 +57,7 @@ final class ChangePasswordAction extends AbstractAction
     */
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em, Swift_Mailer $mailer)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
        $this->mailer = $mailer;
    }

--- a/src/Action/Login/NewPasswordAction.php
+++ b/src/Action/Login/NewPasswordAction.php
@@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use Swift_Mailer;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

 /**
 * This action asks for a new password
@@ -24,8 +24,15 @@ use App\Action\AbstractAction;
 * @author François Agneray <francois.agneray@lam.fr>
 * @package App\Action\Login
 */
-final class NewPasswordAction extends AbstractAction
+final class NewPasswordAction
 {
+    use ActionTrait;
+
+    /**
+     * The logger interface is the central access point to log anis information
+     */
+    private $logger;
+
    /**
     * The EntityManager is the central access point to Doctrine ORM functionality (metadata database)
     *
@@ -49,7 +56,7 @@ final class NewPasswordAction extends AbstractAction
     */
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em, Swift_Mailer $mailer)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
        $this->mailer = $mailer;
    }

--- a/src/Action/Login/RegisterAction.php
+++ b/src/Action/Login/RegisterAction.php
@@ -17,7 +17,7 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Swift_Mailer;
 use Swift_Message;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\User;

 /**
@@ -26,8 +26,15 @@ use App\Entity\User;
 * @author François Agneray <francois.agneray@lam.fr>
 * @package App\Action\Login
 */
-final class RegisterAction extends AbstractAction
+final class RegisterAction
 {
+    use ActionTrait;
+
+    /**
+     * The logger interface is the central access point to log anis information
+     */
+    private $logger;
+
    /**
     * The EntityManager is the central access point to Doctrine ORM functionality (metadata database)
     *
@@ -51,7 +58,7 @@ final class RegisterAction extends AbstractAction
     */
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em, Swift_Mailer $mailer)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
        $this->mailer = $mailer;
    }

--- a/src/Action/Login/TokenAction.php
+++ b/src/Action/Login/TokenAction.php
@@ -18,7 +18,7 @@ use Lcobucci\JWT\Builder as JwtBuilder;
 use Lcobucci\JWT\Signer as JwtSigner;
 use Lcobucci\JWT\Token;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

 /**
 * Get a valid token (jwt) for a anis user (POST)
@@ -26,8 +26,15 @@ use App\Action\AbstractAction;
 * @author François Agneray <francois.agneray@lam.fr>
 * @package App\Action\Login
 */
-final class TokenAction extends AbstractAction
+final class TokenAction
 {
+    use ActionTrait;
+
+    /**
+     * The logger interface is the central access point to log anis information
+     */
+    private $logger;
+
    /**
     * The EntityManager is the central access point to Doctrine ORM functionality (metadata database)
     *
@@ -59,7 +66,7 @@ final class TokenAction extends AbstractAction
     */
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em, JwtBuilder $jwtBuilder, JwtSigner $jwtSigner)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
        $this->jwtBuilder = $jwtBuilder;
        $this->jwtSigner = $jwtSigner;

--- a/src/Action/Meta/AttributeListAction.php
+++ b/src/Action/Meta/AttributeListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,10 +15,13 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

-final class AttributeListAction extends AbstractAction
+final class AttributeListAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    private $datasetCriteriaFamilyMaxDisplay;
    private $datasetCriteriaFamilyList;
@@ -29,7 +32,7 @@ final class AttributeListAction extends AbstractAction

    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
        $this->datasetCriteriaFamilyMaxDisplay = 0;
        $this->datasetCriteriaFamilyList = array();

--- a/src/Action/Meta/CategoryAction.php
+++ b/src/Action/Meta/CategoryAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,16 +15,19 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\Category;

-final class CategoryAction extends AbstractAction
+final class CategoryAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/CategoryListAction.php
+++ b/src/Action/Meta/CategoryListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,16 +15,19 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\Category;

-final class CategoryListAction extends AbstractAction
+final class CategoryListAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/DatabaseAction.php
+++ b/src/Action/Meta/DatabaseAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,16 +15,19 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\Database;

-final class DatabaseAction extends AbstractAction
+final class DatabaseAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/DatabaseListAction.php
+++ b/src/Action/Meta/DatabaseListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,16 +15,19 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\Database;

-final class DatabaseListAction extends AbstractAction
+final class DatabaseListAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/DatasetAction.php
+++ b/src/Action/Meta/DatasetAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,17 +15,20 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\Dataset;
 use App\Entity\DatasetFamily;

-final class DatasetAction extends AbstractAction
+final class DatasetAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }


--- a/src/Action/Meta/DatasetCriteriaFamilyListAction.php
+++ b/src/Action/Meta/DatasetCriteriaFamilyListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,15 +15,18 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

-final class DatasetCriteriaFamilyListAction extends AbstractAction
+final class DatasetCriteriaFamilyListAction
 {
+    use ActionTrait;
+    
+    private $logger;
    private $em;

    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/DatasetListAction.php
+++ b/src/Action/Meta/DatasetListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,20 +15,23 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Utils\DBALConnectionFactory;
 use App\Entity\Dataset;
 use App\Entity\Project;
 use App\Entity\DatasetFamily;

-final class DatasetListAction extends AbstractAction
+final class DatasetListAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    private $dcf;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em, DBALConnectionFactory $dcf)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
        $this->dcf = $dcf;
    }

--- a/src/Action/Meta/DatasetOutputFamilyListAction.php
+++ b/src/Action/Meta/DatasetOutputFamilyListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,15 +15,18 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

-final class DatasetOutputFamilyListAction extends AbstractAction
+final class DatasetOutputFamilyListAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;

    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/FamilyAction.php
+++ b/src/Action/Meta/FamilyAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,15 +15,18 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

-final class FamilyAction extends AbstractAction
+final class FamilyAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/FamilyListAction.php
+++ b/src/Action/Meta/FamilyListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,15 +15,18 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

-final class FamilyListAction extends AbstractAction
+final class FamilyListAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/FileAction.php
+++ b/src/Action/Meta/FileAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,16 +15,19 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\File;

-final class FileAction extends AbstractAction
+final class FileAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }
    

--- a/src/Action/Meta/FileListAction.php
+++ b/src/Action/Meta/FileListAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,17 +15,20 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\File;
 use App\Entity\Dataset;

-final class FileListAction extends AbstractAction
+final class FileListAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }


--- a/src/Action/Meta/FileProxyAction.php
+++ b/src/Action/Meta/FileProxyAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,15 +15,18 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;

-final class FileProxyAction extends AbstractAction
+final class FileProxyAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;

    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }


--- a/src/Action/Meta/GroupAction.php
+++ b/src/Action/Meta/GroupAction.php
-<?php
+<?php declare(strict_types=1);
 /*
 * This file is part of ANIS SERVER API.
 *
@@ -15,16 +15,19 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;

-use App\Action\AbstractAction;
+use App\Utils\ActionTrait;
 use App\Entity\Group;

-final class GroupAction extends AbstractAction
+final class GroupAction
 {
+    use ActionTrait;
+
+    private $logger;
    private $em;
    
    public function __construct(LoggerInterface $logger, EntityManagerInterface $em)
    {
-        parent::__construct($logger);
+        $this->logger = $logger;
        $this->em = $em;
    }