Merge pull request #71 from getsentry/change_build_matrix

Add PHP 7.2 support

Author: Jean85

.travis.yml

@@ -8,6 +8,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - hhvm
 
 matrix:

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+ - Add official support to PHP 7.2 (#71)
+### Fixed
+ - Remove usage of create_function to avoid deprecations (#71)
 
 ## 0.8.3 - 2017-08-07
 ### Changed

src/Sentry/SentryBundle/ErrorTypesParser.php

@@ -33,25 +33,23 @@ public function parse()
             array(".", ""),
             $this->expression
         );
-        // remove anything which could be a security issue
-        $this->expression = preg_replace("/[^\d.+*%^|&~<>\/()-]/", "", $this->expression);
 
         return $this->compute($this->expression);
     }
 
-
     /**
      * Converts error constants from string to int.
      *
      * @param  string $expression e.g. E_ALL & ~E_DEPRECATED & ~E_NOTICE
-     * @return string   convertes expression e.g. 32767 & ~8192 & ~8
+     * @return string   converted expression e.g. 32767 & ~8192 & ~8
      */
     private function convertErrorConstants($expression)
     {
         $output = preg_replace_callback("/(E_[a-zA-Z_]+)/", function ($errorConstant) {
             if (defined($errorConstant[1])) {
                 return constant($errorConstant[1]);
             }
+
             return $errorConstant[0];
         }, $expression);
 
@@ -66,8 +64,11 @@ private function convertErrorConstants($expression)
      */
     private function compute($expression)
     {
-        $compute = create_function("", "return " . $expression . ";");
+        // catch anything which could be a security issue
+        if (0 !== preg_match("/[^\d.+*%^|&~<>\/()-]/", $this->expression)) {
+            throw new \InvalidArgumentException('Wrong value in error types config value');
+        }
 
-        return 0 + $compute();
+        return 0 + (int)eval('return ' . $expression . ';');
     }
 }

test/ErrorTypesParserTest.php

@@ -11,4 +11,12 @@ public function test_error_types_parser()
         $ex = new ErrorTypesParser('E_ALL & ~E_DEPRECATED & ~E_NOTICE');
         $this->assertEquals($ex->parse(), E_ALL & ~E_DEPRECATED & ~E_NOTICE);
     }
+
+    public function test_error_types_parser_throws_exception_for_unwanted_values()
+    {
+        $ex = new ErrorTypesParser('exec(something-dangerous)');
+
+        $this->setExpectedException('\InvalidArgumentException');
+        $ex->parse();
+    }
 }