Merge pull request #195 from Jean85/master

[PHP7] Deprecation of String class; hard constraint of supported PHP versions
schmittjoh · Dec 17, 2015 · bbd5eb7 · bbd5eb7
2 parents 75bd0f7 + 968e5e7
commit bbd5eb7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 phpunit.xml
 vendor/
-
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,8 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
+  - 5.6
 
 before_script: composer install --dev
 

diff --git a/Security/Util/String.php b/Security/Util/String.php
@@ -5,6 +5,8 @@
 /**
  * String utility functions.
  *
+ * @deprecated This class will break in PHP 7; use hash_equals() instead
+ *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
 final class String

diff --git a/composer.json b/composer.json
@@ -13,6 +13,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
+        "php": "~5.3",
         "symfony/framework-bundle": "~2.1",
         "symfony/security-bundle": "*",
         "jms/metadata": "~1.0",