diff --git a/.circleci/config.yml b/.circleci/config.yml index a3c169eb4a..87716a3e7b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -396,6 +396,30 @@ executors: - <<: *IMAGE_DOCKER_REQUEST_REPLAYER jobs: + "Lint PHP 5": + parameters: + resource_class: + type: string + default: small + <<: *BARE_DOCKER_MACHINE + steps: + - restore_cache: + keys: + - source-v1-{{ .Branch }}-{{ .Revision }} + - <<: *STEP_CHECKOUT + - <<: *STEP_ATTACH_WORKSPACE + - run: + command: | + docker run --rm -v "$HOME/datadog:/src" -i php:5.4-cli bash \<<'CMD' + set -eu + cd /src/bridge + for file in *.php; do + if [ "$file" != "_generated_integrations.php" ]; then + php -l "$file" + fi + done + CMD + "Lint files": working_directory: ~/datadog docker: @@ -3514,6 +3538,8 @@ workflows: docker_image: "datadog/dd-trace-ci:php-8.0-shared-ext" - "Lint files": requires: [ 'Prepare Code' ] + - "Lint PHP 5": + requires: [ 'Prepare Code' ] - static_analysis: requires: [ 'Prepare Code' ] name: "Static Analysis 71" diff --git a/src/Integrations/Util/Normalizer.php b/src/Integrations/Util/Normalizer.php index da127c69a1..5ee7093339 100644 --- a/src/Integrations/Util/Normalizer.php +++ b/src/Integrations/Util/Normalizer.php @@ -200,17 +200,13 @@ public static function sanitizedQueryString() ); } - private static function normalizeString(string $str) + private static function normalizeString($str) { return preg_replace('/[^a-zA-Z0-9\-\_)]+/', '_', $str); } - private static function generateFilteredPostFields( - string $postKey, - $postVal, - array $whitelist, - bool $isPrefixed - ): array { + private static function generateFilteredPostFields($postKey, $postVal, array $whitelist, $isPrefixed) + { if (is_array($postVal)) { $filteredPostFields = []; foreach ($postVal as $key => $val) { @@ -252,13 +248,13 @@ private static function generateFilteredPostFields( } } - private static function cleanRequestBody(array $requestBody, string $allowedParams): array + private static function cleanRequestBody(array $requestBody, $allowedParams) { $whitelist = self::decodeConfigSet($allowedParams); return self::generateFilteredPostFields('', $requestBody, $whitelist, false); } - public static function sanitizePostFields(array $postFields): array + public static function sanitizePostFields(array $postFields) { return self::cleanRequestBody( $postFields,