Merge pull request #67 from Seros/allow-dependency-updates

Allow updates for Symfony and Doctrine bundles

Author: mogilvie

.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+
+jobs:
+  test:
+    name: PHP ${{ matrix.php }} - Symfony ${{ matrix.symfony }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - 8.2
+          - 8.3
+          - 8.4
+        symfony:
+          - 6.4.*
+          - 7.4.*
+          - 8.0.*
+        exclude:
+          # Symfony 8.0 requires PHP 8.4+
+          - php: '8.2'
+            symfony: '8.0.*'
+          - php: '8.3'
+            symfony: '8.0.*'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP and install Symfony Flex globally
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          extensions: mbstring, openssl, sodium
+          tools: flex
+
+      - name: Install dependencies
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.symfony }}
+        run: composer update --prefer-dist --no-progress --no-interaction
+
+      - name: Run tests
+        run: vendor/bin/phpunit

composer.json

@@ -15,17 +15,18 @@
     ],
     "require" : {
         "php": ">=8.2",
-        "symfony/framework-bundle": "^6.4||^7.0",
-        "symfony/console": "^6.4||^7.0",
-        "doctrine/orm": "^2.12||^3.2",
-        "doctrine/doctrine-bundle": "^2.12",
-        "symfony/monolog-bundle": "^3.7",
+        "symfony/framework-bundle": "^6.4||^7.4||^8.0",
+        "symfony/console": "^6.4||^7.4||^8.0",
+        "doctrine/orm": "^2.12||^3.2||^4.0",
+        "doctrine/doctrine-bundle": "^2.12||^3.0",
+        "symfony/monolog-bundle": "^3.7||^4.0",
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-sodium": "*"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^6.0"
+        "symfony/phpunit-bridge": "^6.0",
+        "phpunit/phpunit": "^11.2"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         cacheDirectory=".phpunit.cache"
+>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;quiet[]=indirect&amp;quiet[]=other"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Project Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source>
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
+</phpunit>

src/Command/GenKeyCommand.php

@@ -21,7 +21,15 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $encryption_key_256bit = base64_encode(openssl_random_pseudo_bytes(32));
+        do {
+            $encryption_key_256bit = openssl_random_pseudo_bytes(
+                32,
+                $innerStrong
+            );
+            // $bytes needs to be verified as well
+        } while (!$encryption_key_256bit || !$innerStrong);
+        $encryption_key_256bit = base64_encode($encryption_key_256bit);
+
         $io = new SymfonyStyle($input, $output);
         $io->title('Generated Key');
         $io->success('Key is: ' . $encryption_key_256bit);

src/Encryptors/AesCbcEncryptor.php

@@ -60,8 +60,15 @@ public function encrypt(?string $data, ?string $columnName = null): ?string
         $key = $this->getSecretKey();
 
         // Create a cipher of the appropriate length for this method.
-        $ivsize = openssl_cipher_iv_length(self::METHOD);
-        $iv = openssl_random_pseudo_bytes($ivsize);
+        do {
+            $iv = openssl_random_pseudo_bytes(
+                openssl_cipher_iv_length(
+                    self::METHOD
+                ),
+                $innerStrong
+            );
+            // $bytes needs to be verified as well
+        } while (!$iv || !$innerStrong);
 
         // Create the encryption.
         $ciphertext = openssl_encrypt(

src/Encryptors/AesGcmEncryptor.php

@@ -58,8 +58,15 @@ public function encrypt(?string $data, ?string $columnName = null): ?string
         }
 
         $key = $this->getSecretKey();
-        $ivsize = openssl_cipher_iv_length(self::METHOD);
-        $iv = openssl_random_pseudo_bytes($ivsize);
+        do {
+            $iv = openssl_random_pseudo_bytes(
+                openssl_cipher_iv_length(
+                    self::METHOD
+                ),
+                $innerStrong
+            );
+            // $bytes needs to be verified as well
+        } while (!$iv || !$innerStrong);
         $tag = '';
         $associatedData = $columnName ?? $this->defaultAssociatedData;
 
@@ -70,7 +77,7 @@ public function encrypt(?string $data, ?string $columnName = null): ?string
             OPENSSL_RAW_DATA,
             $iv,
             $tag,
-            $associatedData
+            $associatedData ?? ''
         );
 
         if ($ciphertext === false) {
@@ -112,7 +119,7 @@ public function decrypt(?string $data, ?string $columnName = null): ?string
             OPENSSL_RAW_DATA,
             $iv,
             $tag,
-            $columnName
+            $columnName ?? $this->defaultAssociatedData ?? ''
         );
 
         if ($plaintext === false) {
@@ -154,4 +161,4 @@ private function getSecretKey(): string
 
         return $key;
     }
-}
+}

tests/Unit/Command/GenKeyCommandTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Unit;
+namespace SpecShaper\EncryptBundle\Tests\Unit\Command;
 
 use PHPUnit\Framework\TestCase;
 use SpecShaper\EncryptBundle\Command\GenKeyCommand;
@@ -12,13 +12,15 @@ class GenKeyCommandTest extends TestCase
 {
     /**
      * Test that an encryption key of 43 characters (ending with =) is created.
-     *
-     * @test
      */
     public function testExecute()
     {
         $application = new Application();
-        $application->add(new GenKeyCommand());
+        if (method_exists($application, 'addCommand')) {
+            $application->addCommand(new GenKeyCommand());
+        } else {
+            $application->add(new GenKeyCommand());
+        }
 
         $command = $application->find('encrypt:genkey');
 

tests/Unit/Encryptors/AesCbcEncryptorTest.php

@@ -6,7 +6,7 @@
  * Time: 22:55.
  */
 
-namespace SpecShaper\EncryptBundle\tests\Unit\Encryptors;
+namespace SpecShaper\EncryptBundle\Tests\Unit\Encryptors;
 
 use SpecShaper\EncryptBundle\Encryptors\AesCbcEncryptor;
 use Symfony\Component\EventDispatcher\EventDispatcher;

tests/Unit/Encryptors/AesGcmEncryptorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SpecShaper\EncryptBundle\tests\Unit\Encryptors;
+namespace SpecShaper\EncryptBundle\Tests\Unit\Encryptors;
 
 use SpecShaper\EncryptBundle\Encryptors\AesGcmEncryptor;
 use Symfony\Component\EventDispatcher\EventDispatcher;