Merge pull request #23 from bmaziere/drop-php-7-1-support

Drop support for PHP 7.1
ekino · Mar 2, 2020 · ad86f0b · ad86f0b
2 parents 90a5279 + 00f164a
commit ad86f0b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,9 @@ branches:
 language: php
 
 php:
-  - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 
 dist: trusty
 sudo: false
@@ -26,24 +26,18 @@ matrix:
     - php: '7.3'
       env: SYMFONY=3.4.*
     - php: '7.3'
-      env: SYMFONY=^4.2
+      env: SYMFONY=^4.4
     - php: '7.3'
       env: SYMFONY_DEPRECATIONS_HELPER=0
     - php: '7.2'
       env: SYMFONY=3.4.*
     - php: '7.2'
-      env: SYMFONY=^4.2
+      env: SYMFONY=^4.4
     - php: '7.2'
       env: SYMFONY_DEPRECATIONS_HELPER=0
-    - php: '7.1'
-      env: SYMFONY=3.4.*
-    - php: '7.1'
-      env: SYMFONY=^4.2
-    - php: '7.1'
-      env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
     - php: nightly
-    - php: '7.3'
+    - php: '7.4'
     - env: SYMFONY_DEPRECATIONS_HELPER=0
 
 before_install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ master
 
 * Improve message in case of encryption error
 * Add command to encrypt secrets
+* Drop support for PHP 7.1
+* Add PHP 7.4 in CI
+* Upgrade PhpUnit to 8
 
 v1.1.0
 ------

diff --git a/Tests/DependencyInjection/EnvVarEncryptedProcessorTest.php b/Tests/DependencyInjection/EnvVarEncryptedProcessorTest.php
@@ -59,12 +59,11 @@ public function testGetEnv(): void
 
     /**
      * Asserts getEnv throws an exception with wrong prefix.
-     *
-     * @expectedException        RuntimeException
-     * @expectedExceptionMessage Unsupported env var prefix "foo".
      */
     public function testGetEnvThrowException(): void
     {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Unsupported env var prefix "foo".');
         $this->processor->getEnv('foo', 'DATABASE_URL', function () {});
     }
 

diff --git a/composer.json b/composer.json
@@ -13,23 +13,23 @@
         }
     ],
     "require": {
-        "php":                          "^7.1",
+        "php":                          "^7.2",
         "ext-json":                     "*",
         "ext-openssl":                  "*",
         "monolog/monolog":              "~1.24|~2.0",
-        "symfony/config":               "~3.3|~4.0",
-        "symfony/console":              "~3.3|~4.0",
-        "symfony/dependency-injection": "~3.4.10|^4.0.10",
-        "symfony/form":                 "~3.3|~4.0",
-        "symfony/http-kernel":          "~3.3|~4.0",
-        "symfony/translation":          "~3.3|~4.0"
+        "symfony/config":               "~3.3|~4.4",
+        "symfony/console":              "~3.3|~4.4",
+        "symfony/dependency-injection": "~3.4.10|^4.4",
+        "symfony/form":                 "~3.3|~4.4",
+        "symfony/http-kernel":          "~3.3|~4.4",
+        "symfony/translation":          "~3.3|~4.4"
     },
     "require-dev": {
-        "ekino/phpstan-banned-code":   "^0.1",
+        "ekino/phpstan-banned-code":   "^0.2 || ^0.3",
         "friendsofphp/php-cs-fixer":   "^2.12",
-        "phpstan/phpstan-phpunit":     "^0.11",
-        "phpunit/phpunit":             "^7.2",
-        "sensiolabs/security-checker": "^5.0",
+        "phpstan/phpstan-phpunit":     "^0.12",
+        "phpunit/phpunit":             "^8.5",
+        "sensiolabs/security-checker": "^6.0",
         "sonata-project/admin-bundle": "3.*"
     },
     "autoload": {