Improve the code style and add a Makefile to run tests

Author: johnkrovitch

Makefile

@@ -0,0 +1,9 @@
+.PHONY: install tests
+
+all: install
+
+install:
+	composer install
+
+tests:
+	bin/phpunit

composer.json

@@ -25,14 +25,13 @@
         "symfony/framework-bundle": "^4.4|^5.1",
         "doctrine/doctrine-bundle": "*",
         "doctrine/orm": "*",
-        "symfony/stopwatch": "^4.4|^5.1",
         "symfony/security":"^4.4|^5.1"
     },
     "require-dev": {
+        "symfony/stopwatch": "^4.4|^5.1",
         "phpunit/phpunit": "^9.4"
     },
     "suggest": {
-        "doctrine/doctrine-bundle": "Use Doctrine to encrypt and decrypt entities automatically",
         "ext-sodium": "The Sodium library is native in PHP 7.2",
         "ext-mcrypt": "Don't use this except for backward compatibility purpose",
         "paragonie/sodium_compat": "Use this for a Sodium polyfill",

src/Doctrine/Connection/Factory/ConnectionFactory.php

@@ -5,7 +5,6 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\AbstractMySQLDriver;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Exception\DriverException;
@@ -48,7 +47,7 @@ public function createConnection(array $params, Configuration $config = null, Ev
             $wrapperClass = null;
             if (isset($params['wrapperClass'])) {
                 if (! is_subclass_of($params['wrapperClass'], Connection::class)) {
-                    throw DBALException::invalidWrapperClass($params['wrapperClass']);
+                    throw \Doctrine\DBAL\Exception::invalidWrapperClass($params['wrapperClass']);
                 }
 
                 $wrapperClass           = $params['wrapperClass'];
@@ -97,14 +96,14 @@ public function createConnection(array $params, Configuration $config = null, Ev
      * and the platform version is unknown.
      * For details have a look at DoctrineBundle issue #673.
      *
-     * @throws DBALException
+     * @throws \Doctrine\DBAL\Exception
      */
     private function getDatabasePlatform(Connection $connection) : AbstractPlatform
     {
         try {
             return $connection->getDatabasePlatform();
         } catch (DriverException $driverException) {
-            throw new DBALException(
+            throw new \Doctrine\DBAL\Exception(
                 'An exception occurred while establishing a connection to figure out your platform version.' . PHP_EOL .
                 "You can circumvent this by setting a 'server_version' configuration value" . PHP_EOL . PHP_EOL .
                 'For further information have a look at:' . PHP_EOL .

src/Encryption/AbstractEncryptionAdapter.php

@@ -22,17 +22,10 @@ abstract class AbstractEncryptionAdapter implements EncryptionAdapterInterface
 {
     protected const ENCODING = '8bit';
 
-    /** @var int */
-    protected $nonceSize;
-
-    /** @var int */
-    protected $keySize;
-
-    /** @var int */
-    protected $clearTextBlockSize;
-
-    /** @var int */
-    protected $encryptedBlockSize;
+    protected int $nonceSize;
+    protected int $keySize;
+    protected int $clearTextBlockSize;
+    protected int $encryptedBlockSize;
 
     /**
      * {@inheritdoc}

src/Entity/CryptableInterface.php

@@ -39,13 +39,13 @@ public function getEncryptedProperties(): array;
      * @return bool
      */
     public function getIsEncrypted(): bool;
-
+    
     /**
      * Set the encryption state of the entity
      *
      * @param bool $bool
      */
-    public function setIsEncrypted($bool): void;
+    public function setIsEncrypted(bool $bool): void;
 
     /**
      * Identifies a cipher key to encrypt/decrypt only related entities

src/HttpFoundation/DecryptFileResponse.php

@@ -24,15 +24,10 @@
  */
 class DecryptFileResponse extends BinaryFileResponse
 {
-    /** @var int */
-    protected $fileSize;
-
-    /** @var EncryptionManagerInterface */
-    protected $encryptionManager;
-
-    /** @var UserEncryptionProviderInterface */
-    protected $user;
-
+    protected int $fileSize;
+    protected EncryptionManagerInterface $encryptionManager;
+    protected UserEncryptionProviderInterface $user;
+    
     /**
      * Initialize the response with the file path and the original's file size
      * The original file's size is very important to prevent the null character padding of the encryption function at
@@ -51,12 +46,12 @@ class DecryptFileResponse extends BinaryFileResponse
     public function __construct(
         EncryptionManagerInterface $encryptionManager,
         $file,
-        $fileSize,
-        $status = 200,
-        $headers = [],
-        $contentDisposition = null,
-        $autoEtag = false,
-        $autoLastModified = true
+        int $fileSize,
+        int $status = 200,
+        array $headers = [],
+        ?string $contentDisposition = null,
+        bool $autoEtag = false,
+        bool $autoLastModified = true
     ) {
         parent::__construct($file, $status, $headers, false, $contentDisposition, $autoEtag, $autoLastModified);
         $this->setPrivate();

src/Resources/config/services/registry.yml

@@ -2,5 +2,7 @@ services:
     Sidus\EncryptionBundle\Registry\EncryptionManagerRegistry:
         public: false
         arguments:
-            $defaultManager: ~
+            # The default encryption manager code will be replaced in
+            # \Sidus\EncryptionBundle\DependencyInjection\SidusEncryptionExtension
+            $defaultCode: ~
             $managers: !tagged {tag: sidus.encryption.manager, default_index_method: getCode}