Merge pull request #217 from romainneutron/2.8.0

Prepare version 2.8.0
nelmio · Mar 2, 2020 · c4d55c4 · c4d55c4
2 parents 40d253b + 12e7862
commit c4d55c4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,6 @@ php:
 
 matrix:
   include:
-    - php: 5.4
-      dist: trusty
     - php: 5.5
       dist: trusty
 
@@ -34,6 +32,6 @@ install:
   - if [[ $TRAVIS_PHP_VERSION == '5.5' ]]; then composer update --prefer-lowest ; fi
 
 script:
-  - export SYMFONY_DEPRECATIONS_HELPER=weak_vendors
+  - export SYMFONY_DEPRECATIONS_HELPER=max[self]=0
   - export SYMFONY_PHPUNIT_DIR=`pwd`/.phpunit
   - ./vendor/bin/simple-phpunit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 2.8.0 (2020-03-02)
+
+  * Fixed deprecated/invalid method usage on logger interface
+  * Drop tests for PHP 5.4
+
 ### 2.7.0 (2019-04-03)
 
   * Use base64 for encoding nonces

diff --git a/composer.json b/composer.json
@@ -15,6 +15,7 @@
         }
     ],
     "require": {
+        "php": ">5.4",
         "paragonie/random_compat": "~1.0|~2.0|9.99.99",
         "symfony/framework-bundle": "~2.3|~3.0|~4.0",
         "symfony/security": "~2.3|~3.0|~4.0",
@@ -25,7 +26,7 @@
         "psr/cache": "^1.0",
         "twig/twig": "^1.24",
         "symfony/yaml": "~2.3|~3.0|~4.0",
-        "symfony/phpunit-bridge": "^3.4.24|~4.0"
+        "symfony/phpunit-bridge": "~5.0"
     },
     "suggest": {
         "ua-parser/uap-php": "To allow adapt CSP directives given the user-agent"
@@ -38,7 +39,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7.x-dev"
+            "dev-master": "2.8.x-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="Tests/bootstrap.php"
 >
     <testsuites>
@@ -17,6 +16,10 @@
         </testsuite>
     </testsuites>
 
+    <php>
+        <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
+    </php>
+
     <filter>
         <whitelist>
             <directory>./</directory>